@graphql-tools/delegate 10.2.13 → 10.2.14-alpha-0700d88cf1e9c11bc4b7dab376d3eb21c02cb1d6

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @graphql-tools/delegate
 
+## 10.2.14-alpha-0700d88cf1e9c11bc4b7dab376d3eb21c02cb1d6
+
+### Patch Changes
+
+- [#726](https://github.com/graphql-hive/gateway/pull/726) [`0700d88`](https://github.com/graphql-hive/gateway/commit/0700d88cf1e9c11bc4b7dab376d3eb21c02cb1d6) Thanks [@ardatan](https://github.com/ardatan)! - dependencies updates:
+
+  - Added dependency [`@whatwg-node/promise-helpers@^1.0.0` ↗︎](https://www.npmjs.com/package/@whatwg-node/promise-helpers/v/1.0.0) (to `dependencies`)
+
+- Updated dependencies [[`0700d88`](https://github.com/graphql-hive/gateway/commit/0700d88cf1e9c11bc4b7dab376d3eb21c02cb1d6)]:
+  - @graphql-tools/batch-execute@9.0.13-alpha-0700d88cf1e9c11bc4b7dab376d3eb21c02cb1d6
+
 ## 10.2.13
 
 ### Patch Changes

package/dist/index.cjs

@@ -2,6 +2,7 @@
 
 var utils = require('@graphql-tools/utils');
 var graphql = require('graphql');
+var promiseHelpers = require('@whatwg-node/promise-helpers');
 var executor = require('@graphql-tools/executor');
 var batchExecute = require('@graphql-tools/batch-execute');
 var repeater = require('@repeaterjs/repeater');
@@ -115,17 +116,15 @@ function mergeFields(mergedTypeInfo, object, sourceSubschema, context, info) {
   if (leftOver) {
     object[PLAN_LEFT_OVER] = leftOver;
   }
-  return utils.mapMaybePromise(
-    delegationMaps.reduce(
-      (prev, delegationMap) => utils.mapMaybePromise(
-        prev,
-        () => executeDelegationStage(
-          mergedTypeInfo,
-          delegationMap,
-          object,
-          context,
-          info
-        )
+  return promiseHelpers.handleMaybePromise(
+    () => utils.promiseReduce(
+      delegationMaps,
+      (_, delegationMap) => executeDelegationStage(
+        mergedTypeInfo,
+        delegationMap,
+        object,
+        context,
+        info
       ),
       void 0
     ),
@@ -230,7 +229,7 @@ function executeDelegationStage(mergedTypeInfo, delegationMap, object, context,
           void 0,
           type
         );
-        if (utils.isPromise(resolverResult$)) {
+        if (promiseHelpers.isPromise(resolverResult$)) {
           jobs.push(
             resolverResult$.then(
               (resolverResult) => handleResolverResult(
@@ -304,19 +303,18 @@ function resolveExternalValue(result, unpathedErrors, subschema, context, info,
       return null;
     }
   } else if (graphql.isCompositeType(type)) {
-    const result$ = resolveExternalObject(
-      type,
-      result,
-      unpathedErrors,
-      subschema,
-      context,
-      info,
-      skipTypeMerging
-    );
-    if (info && graphql.isAbstractType(type)) {
-      return utils.mapMaybePromise(
-        result$,
-        function checkAbstractResolvedCorrectly(result2) {
+    return promiseHelpers.handleMaybePromise(
+      () => resolveExternalObject(
+        type,
+        result,
+        unpathedErrors,
+        subschema,
+        context,
+        info,
+        skipTypeMerging
+      ),
+      (result2) => {
+        if (info && graphql.isAbstractType(type)) {
           if (result2.__typename != null) {
             const resolvedType = info.schema.getType(result2.__typename);
             if (!resolvedType) {
@@ -325,9 +323,9 @@ function resolveExternalValue(result, unpathedErrors, subschema, context, info,
           }
           return result2;
         }
-      );
-    }
-    return result$;
+        return result2;
+      }
+    );
   } else if (graphql.isListType(type)) {
     if (Array.isArray(result)) {
       return resolveExternalList(
@@ -1937,7 +1935,7 @@ function defaultMergedResolver(parent, args, context, info) {
           missingDeferredFields
         );
       }
-      const deferred = utils.createDeferred();
+      const deferred = promiseHelpers.createDeferredPromise();
       missingDeferredFields.set(responseKey, deferred);
       const stitchingInfo = info.schema.extensions?.["stitchingInfo"];
       const parentTypeName = parent?.__typename || info.parentType.name;
@@ -1970,11 +1968,14 @@ function handleResult(parent, responseKey, context, info) {
   );
   const leftOver = getPlanLeftOverFromParent(parent);
   if (leftOver) {
-    return utils.mapMaybePromise(resolvedData$, (resolvedData) => {
-      parent[responseKey] = resolvedData;
-      handleLeftOver(parent, context, info, leftOver);
-      return resolvedData;
-    });
+    return promiseHelpers.handleMaybePromise(
+      () => resolvedData$,
+      (resolvedData) => {
+        parent[responseKey] = resolvedData;
+        handleLeftOver(parent, context, info, leftOver);
+        return resolvedData;
+      }
+    );
   }
   return resolvedData$;
 }
@@ -2006,19 +2007,22 @@ function handleLeftOver(parent, context, info, leftOver) {
             (selectionSet2) => selectionSet2.selections
           )
         };
-        utils.mapMaybePromise(flattenPromise(parent), (flattenedParent) => {
-          handleFlattenedParent(
-            flattenedParent,
-            parent,
-            possibleSubschema,
-            selectionSet,
-            leftOver,
-            stitchingInfo,
-            parentTypeName,
-            context,
-            info
-          );
-        });
+        promiseHelpers.handleMaybePromise(
+          () => flattenPromise(parent),
+          (flattenedParent) => {
+            handleFlattenedParent(
+              flattenedParent,
+              parent,
+              possibleSubschema,
+              selectionSet,
+              leftOver,
+              stitchingInfo,
+              parentTypeName,
+              context,
+              info
+            );
+          }
+        );
       }
     }
   }
@@ -2036,8 +2040,8 @@ function handleFlattenedParent(flattenedParent, leftOverParent, possibleSubschem
           kind: graphql.Kind.SELECTION_SET,
           selections: missingFieldNodes
         };
-        utils.mapMaybePromise(
-          resolver(
+        promiseHelpers.handleMaybePromise(
+          () => resolver(
             leftOverParent,
             context,
             info,
@@ -2239,7 +2243,7 @@ function parentSatisfiedSelectionSet(parent, selectionSet) {
   return subschemas;
 }
 function flattenPromise(data) {
-  if (utils.isPromise(data)) {
+  if (promiseHelpers.isPromise(data)) {
     return data.then(flattenPromise);
   }
   if (Array.isArray(data)) {
@@ -2250,7 +2254,7 @@ function flattenPromise(data) {
     const newData = {};
     for (const key in data) {
       const keyResult = flattenPromise(data[key]);
-      if (utils.isPromise(keyResult)) {
+      if (promiseHelpers.isPromise(keyResult)) {
         jobs.push(
           keyResult.then((resolvedKeyResult) => {
             newData[key] = resolvedKeyResult;
@@ -2361,9 +2365,8 @@ function delegateRequest(options) {
   if (options.validateRequest) {
     validateRequest(delegationContext, processedRequest.document);
   }
-  const executor = getExecutor(delegationContext);
-  return utils.mapMaybePromise(
-    executor(processedRequest),
+  return promiseHelpers.handleMaybePromise(
+    () => getExecutor(delegationContext)(processedRequest),
     function handleExecutorResult(executorResult) {
       if (utils.isAsyncIterable(executorResult)) {
         if (delegationContext.operation === "query" && graphql.isListType(delegationContext.returnType)) {
@@ -2420,7 +2423,7 @@ function delegateRequest(options) {
             }
           });
         }
-        return utils.mapAsyncIterator(
+        return promiseHelpers.mapAsyncIterator(
           executorResult,
           (result) => transformer.transformResult(result)
         );

package/dist/index.d.cts

@@ -1,8 +1,9 @@
-import { ExecutionRequest, ExecutionResult, Executor, MaybePromise, PromiseWithResolvers, Maybe } from '@graphql-tools/utils';
+import { ExecutionRequest, ExecutionResult, Executor, Maybe } from '@graphql-tools/utils';
 export { createDeferred } from '@graphql-tools/utils';
 import * as graphql from 'graphql';
 import { GraphQLSchema, OperationTypeNode, GraphQLFieldResolver, GraphQLResolveInfo, GraphQLOutputType, GraphQLError, SelectionSetNode, GraphQLObjectType, FragmentDefinitionNode, VariableDefinitionNode, FieldNode, GraphQLNamedType, GraphQLNamedOutputType, GraphQLInterfaceType, SelectionNode, GraphQLField, TypeInfo, GraphQLType } from 'graphql';
 import DataLoader from 'dataloader';
+import { MaybePromise } from '@whatwg-node/promise-helpers';
 export { executorFromSchema as createDefaultExecutor } from '@graphql-tools/executor';
 
 declare const UNPATHED_ERRORS_SYMBOL: unique symbol;

package/dist/index.d.ts

@@ -1,8 +1,9 @@
-import { ExecutionRequest, ExecutionResult, Executor, MaybePromise, PromiseWithResolvers, Maybe } from '@graphql-tools/utils';
+import { ExecutionRequest, ExecutionResult, Executor, Maybe } from '@graphql-tools/utils';
 export { createDeferred } from '@graphql-tools/utils';
 import * as graphql from 'graphql';
 import { GraphQLSchema, OperationTypeNode, GraphQLFieldResolver, GraphQLResolveInfo, GraphQLOutputType, GraphQLError, SelectionSetNode, GraphQLObjectType, FragmentDefinitionNode, VariableDefinitionNode, FieldNode, GraphQLNamedType, GraphQLNamedOutputType, GraphQLInterfaceType, SelectionNode, GraphQLField, TypeInfo, GraphQLType } from 'graphql';
 import DataLoader from 'dataloader';
+import { MaybePromise } from '@whatwg-node/promise-helpers';
 export { executorFromSchema as createDefaultExecutor } from '@graphql-tools/executor';
 
 declare const UNPATHED_ERRORS_SYMBOL: unique symbol;

package/dist/index.js

@@ -1,6 +1,7 @@
-import { memoize2, memoize1, mapMaybePromise, collectFields, relocatedError, mergeDeep, pathToArray, isPromise, getResponseKeyFromInfo, astFromType, getDefinedRootType, createGraphQLError, serializeInputValue, implementsAbstractType, getRootTypeNames, createDeferred, isAsyncIterable, mapAsyncIterator, getOperationASTFromRequest } from '@graphql-tools/utils';
+import { memoize2, memoize1, promiseReduce, collectFields, relocatedError, mergeDeep, pathToArray, getResponseKeyFromInfo, astFromType, getDefinedRootType, createGraphQLError, serializeInputValue, implementsAbstractType, getRootTypeNames, isAsyncIterable, getOperationASTFromRequest } from '@graphql-tools/utils';
 export { createDeferred } from '@graphql-tools/utils';
 import { GraphQLError, locatedError, isAbstractType, getNullableType, isLeafType, isCompositeType, isListType, responsePathAsArray, Kind, TypeInfo, versionInfo, visit, visitWithTypeInfo, isNullableType, isUnionType, getNamedType, isObjectType, isInterfaceType, typeFromAST, defaultFieldResolver, validate } from 'graphql';
+import { handleMaybePromise, isPromise, createDeferredPromise, mapAsyncIterator } from '@whatwg-node/promise-helpers';
 import { CRITICAL_ERROR, executorFromSchema } from '@graphql-tools/executor';
 export { executorFromSchema as createDefaultExecutor } from '@graphql-tools/executor';
 import { getBatchingExecutor } from '@graphql-tools/batch-execute';
@@ -115,17 +116,15 @@ function mergeFields(mergedTypeInfo, object, sourceSubschema, context, info) {
   if (leftOver) {
     object[PLAN_LEFT_OVER] = leftOver;
   }
-  return mapMaybePromise(
-    delegationMaps.reduce(
-      (prev, delegationMap) => mapMaybePromise(
-        prev,
-        () => executeDelegationStage(
-          mergedTypeInfo,
-          delegationMap,
-          object,
-          context,
-          info
-        )
+  return handleMaybePromise(
+    () => promiseReduce(
+      delegationMaps,
+      (_, delegationMap) => executeDelegationStage(
+        mergedTypeInfo,
+        delegationMap,
+        object,
+        context,
+        info
       ),
       void 0
     ),
@@ -304,19 +303,18 @@ function resolveExternalValue(result, unpathedErrors, subschema, context, info,
       return null;
     }
   } else if (isCompositeType(type)) {
-    const result$ = resolveExternalObject(
-      type,
-      result,
-      unpathedErrors,
-      subschema,
-      context,
-      info,
-      skipTypeMerging
-    );
-    if (info && isAbstractType(type)) {
-      return mapMaybePromise(
-        result$,
-        function checkAbstractResolvedCorrectly(result2) {
+    return handleMaybePromise(
+      () => resolveExternalObject(
+        type,
+        result,
+        unpathedErrors,
+        subschema,
+        context,
+        info,
+        skipTypeMerging
+      ),
+      (result2) => {
+        if (info && isAbstractType(type)) {
           if (result2.__typename != null) {
             const resolvedType = info.schema.getType(result2.__typename);
             if (!resolvedType) {
@@ -325,9 +323,9 @@ function resolveExternalValue(result, unpathedErrors, subschema, context, info,
           }
           return result2;
         }
-      );
-    }
-    return result$;
+        return result2;
+      }
+    );
   } else if (isListType(type)) {
     if (Array.isArray(result)) {
       return resolveExternalList(
@@ -1937,7 +1935,7 @@ function defaultMergedResolver(parent, args, context, info) {
           missingDeferredFields
         );
       }
-      const deferred = createDeferred();
+      const deferred = createDeferredPromise();
       missingDeferredFields.set(responseKey, deferred);
       const stitchingInfo = info.schema.extensions?.["stitchingInfo"];
       const parentTypeName = parent?.__typename || info.parentType.name;
@@ -1970,11 +1968,14 @@ function handleResult(parent, responseKey, context, info) {
   );
   const leftOver = getPlanLeftOverFromParent(parent);
   if (leftOver) {
-    return mapMaybePromise(resolvedData$, (resolvedData) => {
-      parent[responseKey] = resolvedData;
-      handleLeftOver(parent, context, info, leftOver);
-      return resolvedData;
-    });
+    return handleMaybePromise(
+      () => resolvedData$,
+      (resolvedData) => {
+        parent[responseKey] = resolvedData;
+        handleLeftOver(parent, context, info, leftOver);
+        return resolvedData;
+      }
+    );
   }
   return resolvedData$;
 }
@@ -2006,19 +2007,22 @@ function handleLeftOver(parent, context, info, leftOver) {
             (selectionSet2) => selectionSet2.selections
           )
         };
-        mapMaybePromise(flattenPromise(parent), (flattenedParent) => {
-          handleFlattenedParent(
-            flattenedParent,
-            parent,
-            possibleSubschema,
-            selectionSet,
-            leftOver,
-            stitchingInfo,
-            parentTypeName,
-            context,
-            info
-          );
-        });
+        handleMaybePromise(
+          () => flattenPromise(parent),
+          (flattenedParent) => {
+            handleFlattenedParent(
+              flattenedParent,
+              parent,
+              possibleSubschema,
+              selectionSet,
+              leftOver,
+              stitchingInfo,
+              parentTypeName,
+              context,
+              info
+            );
+          }
+        );
       }
     }
   }
@@ -2036,8 +2040,8 @@ function handleFlattenedParent(flattenedParent, leftOverParent, possibleSubschem
           kind: Kind.SELECTION_SET,
           selections: missingFieldNodes
         };
-        mapMaybePromise(
-          resolver(
+        handleMaybePromise(
+          () => resolver(
             leftOverParent,
             context,
             info,
@@ -2361,9 +2365,8 @@ function delegateRequest(options) {
   if (options.validateRequest) {
     validateRequest(delegationContext, processedRequest.document);
   }
-  const executor = getExecutor(delegationContext);
-  return mapMaybePromise(
-    executor(processedRequest),
+  return handleMaybePromise(
+    () => getExecutor(delegationContext)(processedRequest),
     function handleExecutorResult(executorResult) {
       if (isAsyncIterable(executorResult)) {
         if (delegationContext.operation === "query" && isListType(delegationContext.returnType)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/delegate",
-  "version": "10.2.13",
+  "version": "10.2.14-alpha-0700d88cf1e9c11bc4b7dab376d3eb21c02cb1d6",
   "type": "module",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
@@ -38,18 +38,20 @@
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
-    "@graphql-tools/batch-execute": "^9.0.12",
+    "@graphql-tools/batch-execute": "9.0.13-alpha-0700d88cf1e9c11bc4b7dab376d3eb21c02cb1d6",
     "@graphql-tools/executor": "^1.3.10",
     "@graphql-tools/schema": "^10.0.11",
     "@graphql-tools/utils": "^10.8.1",
     "@repeaterjs/repeater": "^3.0.6",
+    "@whatwg-node/promise-helpers": "^1.0.0",
     "dataloader": "^2.2.3",
     "dset": "^3.1.2",
     "tslib": "^2.8.1"
   },
   "devDependencies": {
+    "@types/lodash": "4.17.15",
     "graphql": "^16.9.0",
-    "pkgroll": "2.10.0"
+    "pkgroll": "2.11.0"
   },
   "sideEffects": false
 }