refactor: on parsing Lambda result

serverless-appsync · Nov 13, 2023 · dbc1872 · dbc1872
1 parent 89838f3
commit dbc1872
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/src/config.ts b/src/config.ts
@@ -507,25 +507,20 @@ function buildDataSource(
               `Request failed with status code ${result.StatusCode ?? ''}`,
             );
           }
+          const s = result.Payload?.toLocaleString();
+          const res = s == null || s.length === 0 ? null : JSON.parse(s);
           if (result.FunctionError) {
-            const s = result.Payload?.toLocaleString();
-            if (s != null) {
-              const data = JSON.parse(s);
+            if (res != null) {
               throw {
                 // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-                type: `Lambda:${data.errorType}`,
-                message: data.errorMessage,
+                type: `Lambda:${res.errorType}`,
+                message: res.errorMessage,
               };
             } else {
               throw new Error(result.FunctionError);
             }
           }
-          const s = result.Payload?.toLocaleString();
-          if (s == null) {
-            return null;
-          } else {
-            return JSON.parse(s);
-          }
+          return res;
         },
       };
     }