@graphql-tools/delegate 10.2.0 → 10.2.1-alpha-63d80f9d08b5d8448f4bfb8b04aeff28b977dec8

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @graphql-tools/delegate
 
+## 10.2.1-alpha-63d80f9d08b5d8448f4bfb8b04aeff28b977dec8
+
+### Patch Changes
+
+- [#164](https://github.com/graphql-hive/gateway/pull/164) [`310613d`](https://github.com/graphql-hive/gateway/commit/310613d68d1df3e2bceafbd0730084a4c83527bf) Thanks [@ardatan](https://github.com/ardatan)! - dependencies updates:
+
+  - Updated dependency [`@graphql-tools/utils@^10.6.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.6.0) (from `^10.5.6`, in `dependencies`)
+
+- Updated dependencies [[`310613d`](https://github.com/graphql-hive/gateway/commit/310613d68d1df3e2bceafbd0730084a4c83527bf)]:
+  - @graphql-tools/batch-execute@9.0.7-alpha-63d80f9d08b5d8448f4bfb8b04aeff28b977dec8
+
 ## 10.2.0
 
 ### Minor Changes

package/dist/index.cjs

@@ -57,18 +57,6 @@ class Subschema {
   }
 }
 
-function createDeferred() {
-  if (Promise.withResolvers) {
-    return Promise.withResolvers();
-  }
-  let resolve;
-  let reject;
-  const promise = new Promise((_resolve, _reject) => {
-    resolve = _resolve;
-    reject = _reject;
-  });
-  return { promise, resolve, reject };
-}
 const leftOverByDelegationPlan = /* @__PURE__ */ new WeakMap();
 const PLAN_LEFT_OVER = Symbol("PLAN_LEFT_OVER");
 function getPlanLeftOverFromParent(parent) {
@@ -118,31 +106,22 @@ function mergeFields(mergedTypeInfo, object, sourceSubschema, context, info) {
   if (leftOver) {
     object[PLAN_LEFT_OVER] = leftOver;
   }
-  const res$ = delegationMaps.reduce(
-    (prev, delegationMap) => {
-      function executeFn() {
-        return executeDelegationStage(
+  return utils.mapMaybePromise(
+    delegationMaps.reduce(
+      (prev, delegationMap) => utils.mapMaybePromise(
+        prev,
+        () => executeDelegationStage(
           mergedTypeInfo,
           delegationMap,
           object,
           context,
           info
-        );
-      }
-      if (utils.isPromise(prev)) {
-        return prev.then(executeFn);
-      }
-      return executeFn();
-    },
-    void 0
+        )
+      ),
+      void 0
+    ),
+    () => object
   );
-  function handleDelegationPlanResult() {
-    return object;
-  }
-  if (utils.isPromise(res$)) {
-    return res$.then(handleDelegationPlanResult);
-  }
-  return handleDelegationPlanResult();
 }
 function handleResolverResult(resolverResult, subschema, selectionSet, object, combinedFieldSubschemaMap, info, path, combinedErrors) {
   if (resolverResult instanceof Error || resolverResult == null) {
@@ -318,19 +297,18 @@ function resolveExternalValue(result, unpathedErrors, subschema, context, info,
       skipTypeMerging
     );
     if (info && graphql.isAbstractType(type)) {
-      let checkAbstractResolvedCorrectly2 = function(result2) {
-        if (result2.__typename != null) {
-          const resolvedType = info.schema.getType(result2.__typename);
-          if (!resolvedType) {
-            return null;
+      return utils.mapMaybePromise(
+        result$,
+        function checkAbstractResolvedCorrectly(result2) {
+          if (result2.__typename != null) {
+            const resolvedType = info.schema.getType(result2.__typename);
+            if (!resolvedType) {
+              return null;
+            }
           }
+          return result2;
         }
-        return result2;
-      };
-      if (utils.isPromise(result$)) {
-        return result$.then(checkAbstractResolvedCorrectly2);
-      }
-      return checkAbstractResolvedCorrectly2(result$);
+      );
     }
     return result$;
   } else if (graphql.isListType(type)) {
@@ -1843,7 +1821,7 @@ function defaultMergedResolver(parent, args, context, info) {
           missingDeferredFields
         );
       }
-      const deferred = createDeferred();
+      const deferred = utils.createDeferred();
       missingDeferredFields.set(responseKey, deferred);
       const stitchingInfo = info.schema.extensions?.["stitchingInfo"];
       const parentTypeName = parent?.__typename || info.parentType.name;
@@ -1876,15 +1854,11 @@ function handleResult(parent, responseKey, context, info) {
   );
   const leftOver = getPlanLeftOverFromParent(parent);
   if (leftOver) {
-    if (utils.isPromise(resolvedData$)) {
-      return resolvedData$.then((resolvedData) => {
-        parent[responseKey] = resolvedData;
-        handleLeftOver(parent, context, info, leftOver);
-        return resolvedData;
-      });
-    }
-    parent[responseKey] = resolvedData$;
-    handleLeftOver(parent, context, info, leftOver);
+    return utils.mapMaybePromise(resolvedData$, (resolvedData) => {
+      parent[responseKey] = resolvedData;
+      handleLeftOver(parent, context, info, leftOver);
+      return resolvedData;
+    });
   }
   return resolvedData$;
 }
@@ -1916,24 +1890,9 @@ function handleLeftOver(parent, context, info, leftOver) {
             (selectionSet2) => selectionSet2.selections
           )
         };
-        const flattenedParent$ = flattenPromise(parent);
-        if (utils.isPromise(flattenedParent$)) {
-          flattenedParent$.then((flattenedParent) => {
-            handleFlattenedParent(
-              flattenedParent,
-              parent,
-              possibleSubschema,
-              selectionSet,
-              leftOver,
-              stitchingInfo,
-              parentTypeName,
-              context,
-              info
-            );
-          });
-        } else {
+        utils.mapMaybePromise(flattenPromise(parent), (flattenedParent) => {
           handleFlattenedParent(
-            flattenedParent$,
+            flattenedParent,
             parent,
             possibleSubschema,
             selectionSet,
@@ -1943,7 +1902,7 @@ function handleLeftOver(parent, context, info, leftOver) {
             context,
             info
           );
-        }
+        });
       }
     }
   }
@@ -1956,13 +1915,13 @@ function handleFlattenedParent(flattenedParent, leftOverParent, possibleSubschem
         possibleSubschema
       );
       if (resolver) {
-        try {
-          Object.assign(leftOverParent, flattenedParent);
-          const selectionSet2 = {
-            kind: graphql.Kind.SELECTION_SET,
-            selections: missingFieldNodes
-          };
-          const resolverResult$ = resolver(
+        Object.assign(leftOverParent, flattenedParent);
+        const selectionSet2 = {
+          kind: graphql.Kind.SELECTION_SET,
+          selections: missingFieldNodes
+        };
+        utils.mapMaybePromise(
+          resolver(
             leftOverParent,
             context,
             info,
@@ -1970,24 +1929,10 @@ function handleFlattenedParent(flattenedParent, leftOverParent, possibleSubschem
             selectionSet2,
             info.parentType,
             info.parentType
-          );
-          if (utils.isPromise(resolverResult$)) {
-            resolverResult$.then(
-              (resolverResult) => handleDeferredResolverResult(
-                resolverResult,
-                possibleSubschema,
-                selectionSet2,
-                leftOverParent,
-                leftOver,
-                context,
-                info
-              )
-            ).catch(
-              (error) => handleDeferredResolverFailure(leftOver, leftOverParent, error)
-            );
-          } else {
+          ),
+          (resolverResult) => {
             handleDeferredResolverResult(
-              resolverResult$,
+              resolverResult,
               possibleSubschema,
               selectionSet2,
               leftOverParent,
@@ -1995,10 +1940,9 @@ function handleFlattenedParent(flattenedParent, leftOverParent, possibleSubschem
               context,
               info
             );
-          }
-        } catch (error) {
-          handleDeferredResolverFailure(leftOver, leftOverParent, error);
-        }
+          },
+          (error) => handleDeferredResolverFailure(leftOver, leftOverParent, error)
+        );
       }
     }
   } else {
@@ -2300,74 +2244,72 @@ function delegateRequest(options) {
     validateRequest(delegationContext, processedRequest.document);
   }
   const executor = getExecutor(delegationContext);
-  const result$ = executor(processedRequest);
-  function handleExecutorResult(executorResult) {
-    if (utils.isAsyncIterable(executorResult)) {
-      if (delegationContext.operation === "query" && graphql.isListType(delegationContext.returnType)) {
-        return new repeater.Repeater(async (push, stop) => {
-          const pushed = /* @__PURE__ */ new WeakSet();
-          let stopped = false;
-          stop.finally(() => {
-            stopped = true;
-          });
-          try {
-            for await (const result of executorResult) {
-              if (stopped) {
-                break;
-              }
-              if (result.incremental) {
-                const data = {};
-                for (const incrementalRes of result.incremental) {
-                  if (incrementalRes.items?.length) {
-                    for (const item of incrementalRes.items) {
-                      merge.dset(
-                        data,
-                        (incrementalRes.path || []).slice(0, -1),
-                        item
-                      );
-                    }
-                    await push(await transformer.transformResult({ data }));
-                  }
-                }
-                if (result.hasNext === false) {
+  return utils.mapMaybePromise(
+    executor(processedRequest),
+    function handleExecutorResult(executorResult) {
+      if (utils.isAsyncIterable(executorResult)) {
+        if (delegationContext.operation === "query" && graphql.isListType(delegationContext.returnType)) {
+          return new repeater.Repeater(async (push, stop) => {
+            const pushed = /* @__PURE__ */ new WeakSet();
+            let stopped = false;
+            stop.finally(() => {
+              stopped = true;
+            });
+            try {
+              for await (const result of executorResult) {
+                if (stopped) {
                   break;
-                } else {
-                  continue;
                 }
-              }
-              const transformedResult = await transformer.transformResult(result);
-              if (Array.isArray(transformedResult)) {
-                for (const individualResult$ of transformedResult) {
-                  if (stopped) {
+                if (result.incremental) {
+                  const data = {};
+                  for (const incrementalRes of result.incremental) {
+                    if (incrementalRes.items?.length) {
+                      for (const item of incrementalRes.items) {
+                        merge.dset(
+                          data,
+                          (incrementalRes.path || []).slice(0, -1),
+                          item
+                        );
+                      }
+                      await push(await transformer.transformResult({ data }));
+                    }
+                  }
+                  if (result.hasNext === false) {
                     break;
+                  } else {
+                    continue;
                   }
-                  const individualResult = await individualResult$;
-                  if (!pushed.has(individualResult)) {
-                    pushed.add(individualResult);
-                    await push(individualResult);
+                }
+                const transformedResult = await transformer.transformResult(result);
+                if (Array.isArray(transformedResult)) {
+                  for (const individualResult$ of transformedResult) {
+                    if (stopped) {
+                      break;
+                    }
+                    const individualResult = await individualResult$;
+                    if (!pushed.has(individualResult)) {
+                      pushed.add(individualResult);
+                      await push(individualResult);
+                    }
                   }
+                } else {
+                  await push(await transformedResult);
                 }
-              } else {
-                await push(await transformedResult);
               }
+              stop();
+            } catch (error) {
+              stop(error);
             }
-            stop();
-          } catch (error) {
-            stop(error);
-          }
-        });
+          });
+        }
+        return utils.mapAsyncIterator(
+          executorResult,
+          (result) => transformer.transformResult(result)
+        );
       }
-      return utils.mapAsyncIterator(
-        executorResult,
-        (result) => transformer.transformResult(result)
-      );
+      return transformer.transformResult(executorResult);
     }
-    return transformer.transformResult(executorResult);
-  }
-  if (utils.isPromise(result$)) {
-    return result$.then(handleExecutorResult);
-  }
-  return handleExecutorResult(result$);
+  );
 }
 function getDelegationContext({
   request,
@@ -2640,6 +2582,10 @@ function subtractSelectionSets(selectionSetA, selectionSetB) {
   });
 }
 
+Object.defineProperty(exports, "createDeferred", {
+  enumerable: true,
+  get: function () { return utils.createDeferred; }
+});
 exports.FIELD_SUBSCHEMA_MAP_SYMBOL = FIELD_SUBSCHEMA_MAP_SYMBOL;
 exports.OBJECT_SUBSCHEMA_SYMBOL = OBJECT_SUBSCHEMA_SYMBOL;
 exports.PLAN_LEFT_OVER = PLAN_LEFT_OVER;
@@ -2650,7 +2596,6 @@ exports.annotateExternalObject = annotateExternalObject;
 exports.applySchemaTransforms = applySchemaTransforms;
 exports.cloneSubschemaConfig = cloneSubschemaConfig;
 exports.createDefaultExecutor = createDefaultExecutor;
-exports.createDeferred = createDeferred;
 exports.createRequest = createRequest;
 exports.defaultMergedResolver = defaultMergedResolver;
 exports.delegateRequest = delegateRequest;

package/dist/index.d.cts

@@ -1,4 +1,5 @@
-import { ExecutionRequest, ExecutionResult, Executor, MaybePromise } from '@graphql-tools/utils';
+import { ExecutionRequest, ExecutionResult, Executor, MaybePromise, PromiseWithResolvers } from '@graphql-tools/utils';
+export { createDeferred } from '@graphql-tools/utils';
 import * as graphql from 'graphql';
 import { GraphQLSchema, OperationTypeNode, GraphQLResolveInfo, GraphQLOutputType, GraphQLError, SelectionSetNode, FieldNode, GraphQLObjectType, FragmentDefinitionNode, VariableDefinitionNode, GraphQLNamedType, GraphQLFieldResolver, GraphQLNamedOutputType, GraphQLInterfaceType, SelectionNode, GraphQLField } from 'graphql';
 import DataLoader from 'dataloader';
@@ -206,7 +207,7 @@ declare const extractUnavailableFields: (schema: GraphQLSchema, field: GraphQLFi
 declare function subtractSelectionSets(selectionSetA: SelectionSetNode, selectionSetB: SelectionSetNode): SelectionSetNode;
 
 type Deferred<T = unknown> = PromiseWithResolvers<T>;
-declare function createDeferred<T>(): Deferred<T>;
+
 interface DelegationPlanLeftOver {
     unproxiableFieldNodes: Array<FieldNode>;
     nonProxiableSubschemas: Array<Subschema>;
@@ -217,4 +218,4 @@ declare const leftOverByDelegationPlan: WeakMap<Map<Subschema<any, any, any, Rec
 declare const PLAN_LEFT_OVER: unique symbol;
 declare function getPlanLeftOverFromParent(parent: any): DelegationPlanLeftOver | undefined;
 
-export { type BatchingOptions, type CreateProxyingResolverFn, type Deferred, type DelegationContext, type DelegationPlanBuilder, type DelegationPlanLeftOver, type ExternalObject, FIELD_SUBSCHEMA_MAP_SYMBOL, type ICreateProxyingResolverOptions, type ICreateRequest, type IDelegateRequestOptions, type IDelegateToSchemaOptions, type MergedFieldConfig, type MergedTypeConfig, type MergedTypeEntryPoint, type MergedTypeInfo, type MergedTypeResolver, type MergedTypeResolverOptions, OBJECT_SUBSCHEMA_SYMBOL, PLAN_LEFT_OVER, type RequestTransform, type ResultTransform, type SchemaTransform, type StitchingInfo, Subschema, type SubschemaConfig, type Transform, Transformer, UNPATHED_ERRORS_SYMBOL, annotateExternalObject, applySchemaTransforms, cloneSubschemaConfig, createDefaultExecutor, createDeferred, createRequest, defaultMergedResolver, delegateRequest, delegateToSchema, extractUnavailableFields, extractUnavailableFieldsFromSelectionSet, getActualFieldNodes, getDelegatingOperation, getPlanLeftOverFromParent, getSubschema, getUnpathedErrors, handleResolverResult, isExternalObject, isSubschema, isSubschemaConfig, leftOverByDelegationPlan, mergeFields, resolveExternalValue, subtractSelectionSets };
+export { type BatchingOptions, type CreateProxyingResolverFn, type Deferred, type DelegationContext, type DelegationPlanBuilder, type DelegationPlanLeftOver, type ExternalObject, FIELD_SUBSCHEMA_MAP_SYMBOL, type ICreateProxyingResolverOptions, type ICreateRequest, type IDelegateRequestOptions, type IDelegateToSchemaOptions, type MergedFieldConfig, type MergedTypeConfig, type MergedTypeEntryPoint, type MergedTypeInfo, type MergedTypeResolver, type MergedTypeResolverOptions, OBJECT_SUBSCHEMA_SYMBOL, PLAN_LEFT_OVER, type RequestTransform, type ResultTransform, type SchemaTransform, type StitchingInfo, Subschema, type SubschemaConfig, type Transform, Transformer, UNPATHED_ERRORS_SYMBOL, annotateExternalObject, applySchemaTransforms, cloneSubschemaConfig, createDefaultExecutor, createRequest, defaultMergedResolver, delegateRequest, delegateToSchema, extractUnavailableFields, extractUnavailableFieldsFromSelectionSet, getActualFieldNodes, getDelegatingOperation, getPlanLeftOverFromParent, getSubschema, getUnpathedErrors, handleResolverResult, isExternalObject, isSubschema, isSubschemaConfig, leftOverByDelegationPlan, mergeFields, resolveExternalValue, subtractSelectionSets };

package/dist/index.d.ts

@@ -1,4 +1,5 @@
-import { ExecutionRequest, ExecutionResult, Executor, MaybePromise } from '@graphql-tools/utils';
+import { ExecutionRequest, ExecutionResult, Executor, MaybePromise, PromiseWithResolvers } from '@graphql-tools/utils';
+export { createDeferred } from '@graphql-tools/utils';
 import * as graphql from 'graphql';
 import { GraphQLSchema, OperationTypeNode, GraphQLResolveInfo, GraphQLOutputType, GraphQLError, SelectionSetNode, FieldNode, GraphQLObjectType, FragmentDefinitionNode, VariableDefinitionNode, GraphQLNamedType, GraphQLFieldResolver, GraphQLNamedOutputType, GraphQLInterfaceType, SelectionNode, GraphQLField } from 'graphql';
 import DataLoader from 'dataloader';
@@ -206,7 +207,7 @@ declare const extractUnavailableFields: (schema: GraphQLSchema, field: GraphQLFi
 declare function subtractSelectionSets(selectionSetA: SelectionSetNode, selectionSetB: SelectionSetNode): SelectionSetNode;
 
 type Deferred<T = unknown> = PromiseWithResolvers<T>;
-declare function createDeferred<T>(): Deferred<T>;
+
 interface DelegationPlanLeftOver {
     unproxiableFieldNodes: Array<FieldNode>;
     nonProxiableSubschemas: Array<Subschema>;
@@ -217,4 +218,4 @@ declare const leftOverByDelegationPlan: WeakMap<Map<Subschema<any, any, any, Rec
 declare const PLAN_LEFT_OVER: unique symbol;
 declare function getPlanLeftOverFromParent(parent: any): DelegationPlanLeftOver | undefined;
 
-export { type BatchingOptions, type CreateProxyingResolverFn, type Deferred, type DelegationContext, type DelegationPlanBuilder, type DelegationPlanLeftOver, type ExternalObject, FIELD_SUBSCHEMA_MAP_SYMBOL, type ICreateProxyingResolverOptions, type ICreateRequest, type IDelegateRequestOptions, type IDelegateToSchemaOptions, type MergedFieldConfig, type MergedTypeConfig, type MergedTypeEntryPoint, type MergedTypeInfo, type MergedTypeResolver, type MergedTypeResolverOptions, OBJECT_SUBSCHEMA_SYMBOL, PLAN_LEFT_OVER, type RequestTransform, type ResultTransform, type SchemaTransform, type StitchingInfo, Subschema, type SubschemaConfig, type Transform, Transformer, UNPATHED_ERRORS_SYMBOL, annotateExternalObject, applySchemaTransforms, cloneSubschemaConfig, createDefaultExecutor, createDeferred, createRequest, defaultMergedResolver, delegateRequest, delegateToSchema, extractUnavailableFields, extractUnavailableFieldsFromSelectionSet, getActualFieldNodes, getDelegatingOperation, getPlanLeftOverFromParent, getSubschema, getUnpathedErrors, handleResolverResult, isExternalObject, isSubschema, isSubschemaConfig, leftOverByDelegationPlan, mergeFields, resolveExternalValue, subtractSelectionSets };
+export { type BatchingOptions, type CreateProxyingResolverFn, type Deferred, type DelegationContext, type DelegationPlanBuilder, type DelegationPlanLeftOver, type ExternalObject, FIELD_SUBSCHEMA_MAP_SYMBOL, type ICreateProxyingResolverOptions, type ICreateRequest, type IDelegateRequestOptions, type IDelegateToSchemaOptions, type MergedFieldConfig, type MergedTypeConfig, type MergedTypeEntryPoint, type MergedTypeInfo, type MergedTypeResolver, type MergedTypeResolverOptions, OBJECT_SUBSCHEMA_SYMBOL, PLAN_LEFT_OVER, type RequestTransform, type ResultTransform, type SchemaTransform, type StitchingInfo, Subschema, type SubschemaConfig, type Transform, Transformer, UNPATHED_ERRORS_SYMBOL, annotateExternalObject, applySchemaTransforms, cloneSubschemaConfig, createDefaultExecutor, createRequest, defaultMergedResolver, delegateRequest, delegateToSchema, extractUnavailableFields, extractUnavailableFieldsFromSelectionSet, getActualFieldNodes, getDelegatingOperation, getPlanLeftOverFromParent, getSubschema, getUnpathedErrors, handleResolverResult, isExternalObject, isSubschema, isSubschemaConfig, leftOverByDelegationPlan, mergeFields, resolveExternalValue, subtractSelectionSets };

package/dist/index.js

@@ -1,4 +1,5 @@
-import { memoize2, memoize1, isPromise, collectFields, relocatedError, mergeDeep, pathToArray, getResponseKeyFromInfo, getDefinedRootType, createVariableNameGenerator, updateArgument, serializeInputValue, createGraphQLError, implementsAbstractType, getRootTypeNames, getOperationASTFromRequest, isAsyncIterable, mapAsyncIterator, memoize4 } from '@graphql-tools/utils';
+import { memoize2, memoize1, mapMaybePromise, collectFields, relocatedError, mergeDeep, pathToArray, isPromise, getResponseKeyFromInfo, getDefinedRootType, createVariableNameGenerator, updateArgument, serializeInputValue, createGraphQLError, implementsAbstractType, getRootTypeNames, createDeferred, isAsyncIterable, mapAsyncIterator, getOperationASTFromRequest, memoize4 } from '@graphql-tools/utils';
+export { createDeferred } from '@graphql-tools/utils';
 import { GraphQLError, locatedError, isAbstractType, getNullableType, isLeafType, isCompositeType, isListType, responsePathAsArray, Kind, versionInfo, TypeInfo, visit, visitWithTypeInfo, isObjectType, isInterfaceType, TypeNameMetaFieldDef, isUnionType, getNamedType, isNullableType, typeFromAST, defaultFieldResolver, validate } from 'graphql';
 import { CRITICAL_ERROR, normalizedExecutor } from '@graphql-tools/executor';
 import { getBatchingExecutor } from '@graphql-tools/batch-execute';
@@ -55,18 +56,6 @@ class Subschema {
   }
 }
 
-function createDeferred() {
-  if (Promise.withResolvers) {
-    return Promise.withResolvers();
-  }
-  let resolve;
-  let reject;
-  const promise = new Promise((_resolve, _reject) => {
-    resolve = _resolve;
-    reject = _reject;
-  });
-  return { promise, resolve, reject };
-}
 const leftOverByDelegationPlan = /* @__PURE__ */ new WeakMap();
 const PLAN_LEFT_OVER = Symbol("PLAN_LEFT_OVER");
 function getPlanLeftOverFromParent(parent) {
@@ -116,31 +105,22 @@ function mergeFields(mergedTypeInfo, object, sourceSubschema, context, info) {
   if (leftOver) {
     object[PLAN_LEFT_OVER] = leftOver;
   }
-  const res$ = delegationMaps.reduce(
-    (prev, delegationMap) => {
-      function executeFn() {
-        return executeDelegationStage(
+  return mapMaybePromise(
+    delegationMaps.reduce(
+      (prev, delegationMap) => mapMaybePromise(
+        prev,
+        () => executeDelegationStage(
           mergedTypeInfo,
           delegationMap,
           object,
           context,
           info
-        );
-      }
-      if (isPromise(prev)) {
-        return prev.then(executeFn);
-      }
-      return executeFn();
-    },
-    void 0
+        )
+      ),
+      void 0
+    ),
+    () => object
   );
-  function handleDelegationPlanResult() {
-    return object;
-  }
-  if (isPromise(res$)) {
-    return res$.then(handleDelegationPlanResult);
-  }
-  return handleDelegationPlanResult();
 }
 function handleResolverResult(resolverResult, subschema, selectionSet, object, combinedFieldSubschemaMap, info, path, combinedErrors) {
   if (resolverResult instanceof Error || resolverResult == null) {
@@ -316,19 +296,18 @@ function resolveExternalValue(result, unpathedErrors, subschema, context, info,
       skipTypeMerging
     );
     if (info && isAbstractType(type)) {
-      let checkAbstractResolvedCorrectly2 = function(result2) {
-        if (result2.__typename != null) {
-          const resolvedType = info.schema.getType(result2.__typename);
-          if (!resolvedType) {
-            return null;
+      return mapMaybePromise(
+        result$,
+        function checkAbstractResolvedCorrectly(result2) {
+          if (result2.__typename != null) {
+            const resolvedType = info.schema.getType(result2.__typename);
+            if (!resolvedType) {
+              return null;
+            }
           }
+          return result2;
         }
-        return result2;
-      };
-      if (isPromise(result$)) {
-        return result$.then(checkAbstractResolvedCorrectly2);
-      }
-      return checkAbstractResolvedCorrectly2(result$);
+      );
     }
     return result$;
   } else if (isListType(type)) {
@@ -1874,15 +1853,11 @@ function handleResult(parent, responseKey, context, info) {
   );
   const leftOver = getPlanLeftOverFromParent(parent);
   if (leftOver) {
-    if (isPromise(resolvedData$)) {
-      return resolvedData$.then((resolvedData) => {
-        parent[responseKey] = resolvedData;
-        handleLeftOver(parent, context, info, leftOver);
-        return resolvedData;
-      });
-    }
-    parent[responseKey] = resolvedData$;
-    handleLeftOver(parent, context, info, leftOver);
+    return mapMaybePromise(resolvedData$, (resolvedData) => {
+      parent[responseKey] = resolvedData;
+      handleLeftOver(parent, context, info, leftOver);
+      return resolvedData;
+    });
   }
   return resolvedData$;
 }
@@ -1914,24 +1889,9 @@ function handleLeftOver(parent, context, info, leftOver) {
             (selectionSet2) => selectionSet2.selections
           )
         };
-        const flattenedParent$ = flattenPromise(parent);
-        if (isPromise(flattenedParent$)) {
-          flattenedParent$.then((flattenedParent) => {
-            handleFlattenedParent(
-              flattenedParent,
-              parent,
-              possibleSubschema,
-              selectionSet,
-              leftOver,
-              stitchingInfo,
-              parentTypeName,
-              context,
-              info
-            );
-          });
-        } else {
+        mapMaybePromise(flattenPromise(parent), (flattenedParent) => {
           handleFlattenedParent(
-            flattenedParent$,
+            flattenedParent,
             parent,
             possibleSubschema,
             selectionSet,
@@ -1941,7 +1901,7 @@ function handleLeftOver(parent, context, info, leftOver) {
             context,
             info
           );
-        }
+        });
       }
     }
   }
@@ -1954,13 +1914,13 @@ function handleFlattenedParent(flattenedParent, leftOverParent, possibleSubschem
         possibleSubschema
       );
       if (resolver) {
-        try {
-          Object.assign(leftOverParent, flattenedParent);
-          const selectionSet2 = {
-            kind: Kind.SELECTION_SET,
-            selections: missingFieldNodes
-          };
-          const resolverResult$ = resolver(
+        Object.assign(leftOverParent, flattenedParent);
+        const selectionSet2 = {
+          kind: Kind.SELECTION_SET,
+          selections: missingFieldNodes
+        };
+        mapMaybePromise(
+          resolver(
             leftOverParent,
             context,
             info,
@@ -1968,24 +1928,10 @@ function handleFlattenedParent(flattenedParent, leftOverParent, possibleSubschem
             selectionSet2,
             info.parentType,
             info.parentType
-          );
-          if (isPromise(resolverResult$)) {
-            resolverResult$.then(
-              (resolverResult) => handleDeferredResolverResult(
-                resolverResult,
-                possibleSubschema,
-                selectionSet2,
-                leftOverParent,
-                leftOver,
-                context,
-                info
-              )
-            ).catch(
-              (error) => handleDeferredResolverFailure(leftOver, leftOverParent, error)
-            );
-          } else {
+          ),
+          (resolverResult) => {
             handleDeferredResolverResult(
-              resolverResult$,
+              resolverResult,
               possibleSubschema,
               selectionSet2,
               leftOverParent,
@@ -1993,10 +1939,9 @@ function handleFlattenedParent(flattenedParent, leftOverParent, possibleSubschem
               context,
               info
             );
-          }
-        } catch (error) {
-          handleDeferredResolverFailure(leftOver, leftOverParent, error);
-        }
+          },
+          (error) => handleDeferredResolverFailure(leftOver, leftOverParent, error)
+        );
       }
     }
   } else {
@@ -2298,74 +2243,72 @@ function delegateRequest(options) {
     validateRequest(delegationContext, processedRequest.document);
   }
   const executor = getExecutor(delegationContext);
-  const result$ = executor(processedRequest);
-  function handleExecutorResult(executorResult) {
-    if (isAsyncIterable(executorResult)) {
-      if (delegationContext.operation === "query" && isListType(delegationContext.returnType)) {
-        return new Repeater(async (push, stop) => {
-          const pushed = /* @__PURE__ */ new WeakSet();
-          let stopped = false;
-          stop.finally(() => {
-            stopped = true;
-          });
-          try {
-            for await (const result of executorResult) {
-              if (stopped) {
-                break;
-              }
-              if (result.incremental) {
-                const data = {};
-                for (const incrementalRes of result.incremental) {
-                  if (incrementalRes.items?.length) {
-                    for (const item of incrementalRes.items) {
-                      dset(
-                        data,
-                        (incrementalRes.path || []).slice(0, -1),
-                        item
-                      );
-                    }
-                    await push(await transformer.transformResult({ data }));
-                  }
-                }
-                if (result.hasNext === false) {
+  return mapMaybePromise(
+    executor(processedRequest),
+    function handleExecutorResult(executorResult) {
+      if (isAsyncIterable(executorResult)) {
+        if (delegationContext.operation === "query" && isListType(delegationContext.returnType)) {
+          return new Repeater(async (push, stop) => {
+            const pushed = /* @__PURE__ */ new WeakSet();
+            let stopped = false;
+            stop.finally(() => {
+              stopped = true;
+            });
+            try {
+              for await (const result of executorResult) {
+                if (stopped) {
                   break;
-                } else {
-                  continue;
                 }
-              }
-              const transformedResult = await transformer.transformResult(result);
-              if (Array.isArray(transformedResult)) {
-                for (const individualResult$ of transformedResult) {
-                  if (stopped) {
+                if (result.incremental) {
+                  const data = {};
+                  for (const incrementalRes of result.incremental) {
+                    if (incrementalRes.items?.length) {
+                      for (const item of incrementalRes.items) {
+                        dset(
+                          data,
+                          (incrementalRes.path || []).slice(0, -1),
+                          item
+                        );
+                      }
+                      await push(await transformer.transformResult({ data }));
+                    }
+                  }
+                  if (result.hasNext === false) {
                     break;
+                  } else {
+                    continue;
                   }
-                  const individualResult = await individualResult$;
-                  if (!pushed.has(individualResult)) {
-                    pushed.add(individualResult);
-                    await push(individualResult);
+                }
+                const transformedResult = await transformer.transformResult(result);
+                if (Array.isArray(transformedResult)) {
+                  for (const individualResult$ of transformedResult) {
+                    if (stopped) {
+                      break;
+                    }
+                    const individualResult = await individualResult$;
+                    if (!pushed.has(individualResult)) {
+                      pushed.add(individualResult);
+                      await push(individualResult);
+                    }
                   }
+                } else {
+                  await push(await transformedResult);
                 }
-              } else {
-                await push(await transformedResult);
               }
+              stop();
+            } catch (error) {
+              stop(error);
             }
-            stop();
-          } catch (error) {
-            stop(error);
-          }
-        });
+          });
+        }
+        return mapAsyncIterator(
+          executorResult,
+          (result) => transformer.transformResult(result)
+        );
       }
-      return mapAsyncIterator(
-        executorResult,
-        (result) => transformer.transformResult(result)
-      );
+      return transformer.transformResult(executorResult);
     }
-    return transformer.transformResult(executorResult);
-  }
-  if (isPromise(result$)) {
-    return result$.then(handleExecutorResult);
-  }
-  return handleExecutorResult(result$);
+  );
 }
 function getDelegationContext({
   request,
@@ -2638,4 +2581,4 @@ function subtractSelectionSets(selectionSetA, selectionSetB) {
   });
 }
 
-export { FIELD_SUBSCHEMA_MAP_SYMBOL, OBJECT_SUBSCHEMA_SYMBOL, PLAN_LEFT_OVER, Subschema, Transformer, UNPATHED_ERRORS_SYMBOL, annotateExternalObject, applySchemaTransforms, cloneSubschemaConfig, createDefaultExecutor, createDeferred, createRequest, defaultMergedResolver, delegateRequest, delegateToSchema, extractUnavailableFields, extractUnavailableFieldsFromSelectionSet, getActualFieldNodes, getDelegatingOperation, getPlanLeftOverFromParent, getSubschema, getUnpathedErrors, handleResolverResult, isExternalObject, isSubschema, isSubschemaConfig, leftOverByDelegationPlan, mergeFields, resolveExternalValue, subtractSelectionSets };
+export { FIELD_SUBSCHEMA_MAP_SYMBOL, OBJECT_SUBSCHEMA_SYMBOL, PLAN_LEFT_OVER, Subschema, Transformer, UNPATHED_ERRORS_SYMBOL, annotateExternalObject, applySchemaTransforms, cloneSubschemaConfig, createDefaultExecutor, createRequest, defaultMergedResolver, delegateRequest, delegateToSchema, extractUnavailableFields, extractUnavailableFieldsFromSelectionSet, getActualFieldNodes, getDelegatingOperation, getPlanLeftOverFromParent, getSubschema, getUnpathedErrors, handleResolverResult, isExternalObject, isSubschema, isSubschemaConfig, leftOverByDelegationPlan, mergeFields, resolveExternalValue, subtractSelectionSets };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/delegate",
-  "version": "10.2.0",
+  "version": "10.2.1-alpha-63d80f9d08b5d8448f4bfb8b04aeff28b977dec8",
   "type": "module",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
@@ -38,10 +38,10 @@
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
-    "@graphql-tools/batch-execute": "^9.0.6",
+    "@graphql-tools/batch-execute": "^9.0.7-alpha-63d80f9d08b5d8448f4bfb8b04aeff28b977dec8",
     "@graphql-tools/executor": "^1.3.3",
     "@graphql-tools/schema": "^10.0.8",
-    "@graphql-tools/utils": "^10.5.6",
+    "@graphql-tools/utils": "^10.6.0",
     "@repeaterjs/repeater": "^3.0.6",
     "dataloader": "^2.2.2",
     "dset": "^3.1.2",