@graphql-tools/batch-execute 9.0.16 → 9.0.17-alpha-071d64e79465dc9de058cc16c99ec1a5472d2bc1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @graphql-tools/batch-execute
 
+## 9.0.17-alpha-071d64e79465dc9de058cc16c99ec1a5472d2bc1
+
+### Patch Changes
+
+- [#1134](https://github.com/graphql-hive/gateway/pull/1134) [`071d64e`](https://github.com/graphql-hive/gateway/commit/071d64e79465dc9de058cc16c99ec1a5472d2bc1) Thanks [@ardatan](https://github.com/ardatan)! - Small improvements on usage of promise helpers
+
 ## 9.0.16
 
 ### Patch Changes

package/dist/index.cjs

@@ -237,27 +237,27 @@ function isFragmentDefinition(def) {
   return def.kind === graphql.Kind.FRAGMENT_DEFINITION;
 }
 
-function splitResult({ data, errors }, numResults) {
-  const splitResults = [];
-  for (let i = 0; i < numResults; i++) {
-    splitResults.push({});
-  }
-  if (data) {
-    for (const prefixedKey in data) {
+function splitResult(mergedResult, numResults) {
+  const splitResults = new Array(numResults);
+  if (mergedResult.data) {
+    for (const prefixedKey in mergedResult.data) {
       const { index, originalKey } = parseKey(prefixedKey);
       const result = splitResults[index];
       if (result == null) {
-        continue;
-      }
-      if (result.data == null) {
-        result.data = { [originalKey]: data[prefixedKey] };
+        splitResults[index] = {
+          data: {
+            [originalKey]: mergedResult.data[prefixedKey]
+          }
+        };
+      } else if (result.data == null) {
+        result.data = { [originalKey]: mergedResult.data[prefixedKey] };
       } else {
-        result.data[originalKey] = data[prefixedKey];
+        result.data[originalKey] = mergedResult.data[prefixedKey];
       }
     }
   }
-  if (errors) {
-    for (const error of errors) {
+  if (mergedResult.errors) {
+    for (const error of mergedResult.errors) {
       if (error.path) {
         const { index, originalKey, keyOffset } = parseKeyFromPath(error.path);
         const newError = utils.relocatedError(error, [
@@ -265,15 +265,28 @@ function splitResult({ data, errors }, numResults) {
           ...error.path.slice(keyOffset)
         ]);
         const splittedResult = splitResults[index];
-        if (splittedResult) {
-          const resultErrors = splittedResult.errors ||= [];
-          resultErrors.push(newError);
+        if (splittedResult == null) {
+          splitResults[index] = { errors: [newError] };
+          continue;
+        } else if (splittedResult.errors == null) {
+          splittedResult.errors = [newError];
+          continue;
+        } else {
+          splittedResult.errors.push(newError);
         }
       } else {
-        splitResults.forEach((result) => {
-          const resultErrors = result.errors ||= [];
-          resultErrors.push(error);
-        });
+        for (let i = 0; i < numResults; i++) {
+          const splittedResult = splitResults[i];
+          if (splittedResult == null) {
+            splitResults[i] = { errors: [error] };
+            continue;
+          } else if (splittedResult.errors == null) {
+            splittedResult.errors = [error];
+            continue;
+          } else {
+            splittedResult.errors.push(error);
+          }
+        }
       }
     }
   }
@@ -302,29 +315,12 @@ function createLoadFn(executor, extensionsReducer) {
   return function batchExecuteLoadFn(requests) {
     if (requests.length === 1 && requests[0]) {
       const request = requests[0];
-      return promiseHelpers.fakePromise(
-        promiseHelpers.handleMaybePromise(
-          () => executor(request),
-          (result) => [result],
-          (err) => [err]
-        )
-      );
+      return promiseHelpers.fakePromise().then(() => executor(request)).catch((err) => err).then((res) => [res]);
     }
     const mergedRequests = mergeRequests(requests, extensionsReducer);
-    return promiseHelpers.fakePromise(
-      promiseHelpers.handleMaybePromise(
-        () => executor(mergedRequests),
-        (resultBatches) => {
-          if (utils.isAsyncIterable(resultBatches)) {
-            throw new Error(
-              "Executor must not return incremental results for batching"
-            );
-          }
-          return splitResult(resultBatches, requests.length);
-        },
-        (err) => requests.map(() => err)
-      )
-    );
+    return promiseHelpers.fakePromise().then(() => executor(mergedRequests)).then(
+      (resultBatches) => splitResult(resultBatches, requests.length)
+    ).catch((err) => requests.map(() => err));
   };
 }
 function defaultExtensionsReducer(mergedExtensions, request) {

package/dist/index.js

@@ -1,5 +1,5 @@
-import { getOperationASTFromRequest, relocatedError, isAsyncIterable, memoize2of4 } from '@graphql-tools/utils';
-import { fakePromise, handleMaybePromise } from '@whatwg-node/promise-helpers';
+import { getOperationASTFromRequest, relocatedError, memoize2of4 } from '@graphql-tools/utils';
+import { fakePromise } from '@whatwg-node/promise-helpers';
 import DataLoader from 'dataloader';
 import { Kind, visit } from 'graphql';
 
@@ -231,27 +231,27 @@ function isFragmentDefinition(def) {
   return def.kind === Kind.FRAGMENT_DEFINITION;
 }
 
-function splitResult({ data, errors }, numResults) {
-  const splitResults = [];
-  for (let i = 0; i < numResults; i++) {
-    splitResults.push({});
-  }
-  if (data) {
-    for (const prefixedKey in data) {
+function splitResult(mergedResult, numResults) {
+  const splitResults = new Array(numResults);
+  if (mergedResult.data) {
+    for (const prefixedKey in mergedResult.data) {
       const { index, originalKey } = parseKey(prefixedKey);
       const result = splitResults[index];
       if (result == null) {
-        continue;
-      }
-      if (result.data == null) {
-        result.data = { [originalKey]: data[prefixedKey] };
+        splitResults[index] = {
+          data: {
+            [originalKey]: mergedResult.data[prefixedKey]
+          }
+        };
+      } else if (result.data == null) {
+        result.data = { [originalKey]: mergedResult.data[prefixedKey] };
       } else {
-        result.data[originalKey] = data[prefixedKey];
+        result.data[originalKey] = mergedResult.data[prefixedKey];
       }
     }
   }
-  if (errors) {
-    for (const error of errors) {
+  if (mergedResult.errors) {
+    for (const error of mergedResult.errors) {
       if (error.path) {
         const { index, originalKey, keyOffset } = parseKeyFromPath(error.path);
         const newError = relocatedError(error, [
@@ -259,15 +259,28 @@ function splitResult({ data, errors }, numResults) {
           ...error.path.slice(keyOffset)
         ]);
         const splittedResult = splitResults[index];
-        if (splittedResult) {
-          const resultErrors = splittedResult.errors ||= [];
-          resultErrors.push(newError);
+        if (splittedResult == null) {
+          splitResults[index] = { errors: [newError] };
+          continue;
+        } else if (splittedResult.errors == null) {
+          splittedResult.errors = [newError];
+          continue;
+        } else {
+          splittedResult.errors.push(newError);
         }
       } else {
-        splitResults.forEach((result) => {
-          const resultErrors = result.errors ||= [];
-          resultErrors.push(error);
-        });
+        for (let i = 0; i < numResults; i++) {
+          const splittedResult = splitResults[i];
+          if (splittedResult == null) {
+            splitResults[i] = { errors: [error] };
+            continue;
+          } else if (splittedResult.errors == null) {
+            splittedResult.errors = [error];
+            continue;
+          } else {
+            splittedResult.errors.push(error);
+          }
+        }
       }
     }
   }
@@ -296,29 +309,12 @@ function createLoadFn(executor, extensionsReducer) {
   return function batchExecuteLoadFn(requests) {
     if (requests.length === 1 && requests[0]) {
       const request = requests[0];
-      return fakePromise(
-        handleMaybePromise(
-          () => executor(request),
-          (result) => [result],
-          (err) => [err]
-        )
-      );
+      return fakePromise().then(() => executor(request)).catch((err) => err).then((res) => [res]);
     }
     const mergedRequests = mergeRequests(requests, extensionsReducer);
-    return fakePromise(
-      handleMaybePromise(
-        () => executor(mergedRequests),
-        (resultBatches) => {
-          if (isAsyncIterable(resultBatches)) {
-            throw new Error(
-              "Executor must not return incremental results for batching"
-            );
-          }
-          return splitResult(resultBatches, requests.length);
-        },
-        (err) => requests.map(() => err)
-      )
-    );
+    return fakePromise().then(() => executor(mergedRequests)).then(
+      (resultBatches) => splitResult(resultBatches, requests.length)
+    ).catch((err) => requests.map(() => err));
   };
 }
 function defaultExtensionsReducer(mergedExtensions, request) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/batch-execute",
-  "version": "9.0.16",
+  "version": "9.0.17-alpha-071d64e79465dc9de058cc16c99ec1a5472d2bc1",
   "type": "module",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {