@graphql-mesh/runtime 0.96.2 → 0.96.3-alpha-20230904123445-50ae3894a

package/cjs/get-mesh.js

@@ -12,6 +12,7 @@ const fetch_1 = require("@whatwg-node/fetch");
 const constants_js_1 = require("./constants.js");
 const in_context_sdk_js_1 = require("./in-context-sdk.js");
 const useSubschema_js_1 = require("./useSubschema.js");
+const utils_js_1 = require("./utils.js");
 const memoizedGetEnvelopedFactory = (0, utils_2.memoize1)(function getEnvelopedFactory(plugins) {
     return (0, core_1.envelop)({
         plugins,
@@ -25,7 +26,13 @@ const memoizedGetOperationType = (0, utils_2.memoize1)((document) => {
     return operationAST.operation;
 });
 function wrapFetchWithPlugins(plugins) {
-    return async function wrappedFetchFn(url, options, context, info) {
+    const onFetchHooks = [];
+    for (const plugin of plugins) {
+        if (plugin?.onFetch != null) {
+            onFetchHooks.push(plugin.onFetch);
+        }
+    }
+    return function wrappedFetchFn(url, options, context, info) {
         if (url != null && typeof url !== 'string') {
             throw new TypeError(`First parameter(url) of 'fetch' must be a string, got ${(0, utils_2.inspect)(url)}`);
         }
@@ -40,33 +47,31 @@ function wrapFetchWithPlugins(plugins) {
         }
         let fetchFn;
         const doneHooks = [];
-        for (const plugin of plugins) {
-            if (plugin?.onFetch != null) {
-                const doneHook = await plugin.onFetch({
-                    fetchFn,
-                    setFetchFn(newFetchFn) {
-                        fetchFn = newFetchFn;
-                    },
-                    url,
-                    options,
-                    context,
-                    info,
-                });
-                if (doneHook) {
-                    doneHooks.push(doneHook);
-                }
+        function setFetchFn(newFetchFn) {
+            fetchFn = newFetchFn;
+        }
+        const result$ = (0, utils_js_1.iterateAsync)(onFetchHooks, onFetch => onFetch({
+            fetchFn,
+            setFetchFn,
+            url,
+            options,
+            context,
+            info,
+        }), doneHooks);
+        function handleIterationResult() {
+            const response$ = fetchFn(url, options, context, info);
+            if (doneHooks.length === 0) {
+                return response$;
             }
+            if ((0, utils_2.isPromise)(response$)) {
+                return response$.then(response => handleOnFetchDone(response, doneHooks));
+            }
+            return handleOnFetchDone(response$, doneHooks);
         }
-        let response = await fetchFn(url, options, context, info);
-        for (const doneHook of doneHooks) {
-            await doneHook({
-                response,
-                setResponse(newResponse) {
-                    response = newResponse;
-                },
-            });
+        if ((0, utils_2.isPromise)(result$)) {
+            return result$.then(handleIterationResult);
         }
-        return response;
+        return handleIterationResult();
     };
 }
 exports.wrapFetchWithPlugins = wrapFetchWithPlugins;
@@ -182,7 +187,7 @@ async function getMesh(options) {
             unifiedSubschema.transforms.push(rootLevelTransform);
         }
     }
-    let inContextSDK$;
+    let inContextSDK;
     const subschema = new delegate_1.Subschema(unifiedSubschema);
     const plugins = [
         (0, core_1.useEngine)({
@@ -192,16 +197,16 @@ async function getMesh(options) {
         }),
         (0, useSubschema_js_1.useSubschema)(subschema),
         (0, core_1.useExtendContext)(() => {
-            if (!inContextSDK$) {
+            if (!inContextSDK) {
                 const onDelegateHooks = [];
                 for (const plugin of initialPluginList) {
                     if (plugin?.onDelegate != null) {
                         onDelegateHooks.push(plugin.onDelegate);
                     }
                 }
-                inContextSDK$ = (0, in_context_sdk_js_1.getInContextSDK)(subschema.transformedSchema, rawSources, logger, onDelegateHooks);
+                inContextSDK = (0, in_context_sdk_js_1.getInContextSDK)(subschema.transformedSchema, rawSources, logger, onDelegateHooks);
             }
-            return inContextSDK$;
+            return inContextSDK;
         }),
         (0, extended_validation_1.useExtendedValidation)({
             rules: [extended_validation_1.OneOfInputObjectsRule],
@@ -214,13 +219,24 @@ async function getMesh(options) {
     function createExecutor(globalContext = EMPTY_CONTEXT_VALUE) {
         const getEnveloped = memoizedGetEnvelopedFactory(plugins);
         const { schema, parse, execute, subscribe, contextFactory } = getEnveloped(globalContext);
-        return async function meshExecutor(documentOrSDL, variableValues = EMPTY_VARIABLES_VALUE, contextValue = EMPTY_CONTEXT_VALUE, rootValue = EMPTY_ROOT_VALUE, operationName) {
+        return function meshExecutor(documentOrSDL, variableValues = EMPTY_VARIABLES_VALUE, contextValue = EMPTY_CONTEXT_VALUE, rootValue = EMPTY_ROOT_VALUE, operationName) {
             const document = typeof documentOrSDL === 'string' ? parse(documentOrSDL) : documentOrSDL;
             const executeFn = memoizedGetOperationType(document) === 'subscription' ? subscribe : execute;
+            const contextValue$ = contextFactory(contextValue);
+            if ((0, utils_2.isPromise)(contextValue$)) {
+                return contextValue$.then(contextValue => executeFn({
+                    schema,
+                    document,
+                    contextValue,
+                    rootValue,
+                    variableValues: variableValues,
+                    operationName,
+                }));
+            }
             return executeFn({
                 schema,
                 document,
-                contextValue: await contextFactory(contextValue),
+                contextValue: contextValue$,
                 rootValue,
                 variableValues: variableValues,
                 operationName,
@@ -229,12 +245,12 @@ async function getMesh(options) {
     }
     function sdkRequesterFactory(globalContext) {
         const executor = createExecutor(globalContext);
-        return async function sdkRequester(...args) {
-            const result = await executor(...args);
-            if ((0, utils_2.isAsyncIterable)(result)) {
-                return (0, utils_2.mapAsyncIterator)(result, extractDataOrThrowErrors);
+        return function sdkRequester(...args) {
+            const result$ = executor(...args);
+            if ((0, utils_2.isPromise)(result$)) {
+                return result$.then(handleExecutorResultForSdk);
             }
-            return extractDataOrThrowErrors(result);
+            return handleExecutorResultForSdk(result$);
         };
     }
     function meshDestroy() {
@@ -264,6 +280,12 @@ async function getMesh(options) {
     };
 }
 exports.getMesh = getMesh;
+function handleExecutorResultForSdk(result) {
+    if ((0, utils_2.isAsyncIterable)(result)) {
+        return (0, utils_2.mapAsyncIterator)(result, extractDataOrThrowErrors);
+    }
+    return extractDataOrThrowErrors(result);
+}
 function extractDataOrThrowErrors(result) {
     if (result.errors) {
         if (result.errors.length === 1) {
@@ -273,3 +295,16 @@ function extractDataOrThrowErrors(result) {
     }
     return result.data;
 }
+function handleOnFetchDone(response, onFetchDoneHooks) {
+    function setResponse(newResponse) {
+        response = newResponse;
+    }
+    const result$ = (0, utils_js_1.iterateAsync)(onFetchDoneHooks, onFetchDone => onFetchDone({
+        response,
+        setResponse,
+    }));
+    if ((0, utils_2.isPromise)(result$)) {
+        return result$.then(() => response);
+    }
+    return response;
+}

package/cjs/in-context-sdk.js

@@ -8,7 +8,8 @@ const delegate_1 = require("@graphql-tools/delegate");
 const utils_2 = require("@graphql-tools/utils");
 const wrap_1 = require("@graphql-tools/wrap");
 const constants_js_1 = require("./constants.js");
-async function getInContextSDK(unifiedSchema, rawSources, logger, onDelegateHooks) {
+const utils_js_1 = require("./utils.js");
+function getInContextSDK(unifiedSchema, rawSources, logger, onDelegateHooks) {
     const inContextSDK = {};
     const sourceMap = unifiedSchema.extensions.sourceMap;
     for (const rawSource of rawSources) {
@@ -49,7 +50,7 @@ async function getInContextSDK(unifiedSchema, rawSources, logger, onDelegateHook
                     const inContextSdkLogger = rawSourceLogger.child(`InContextSDK.${rootType.name}.${fieldName}`);
                     const namedReturnType = (0, graphql_1.getNamedType)(rootTypeField.type);
                     const shouldHaveSelectionSet = !(0, graphql_1.isLeafType)(namedReturnType);
-                    rawSourceContext[rootType.name][fieldName] = async ({ root, args, context, info = {
+                    rawSourceContext[rootType.name][fieldName] = ({ root, args, context, info = {
                         fieldName,
                         fieldNodes: [],
                         returnType: namedReturnType,
@@ -150,27 +151,17 @@ async function getInContextSDK(unifiedSchema, rawSources, logger, onDelegateHook
                                 batchDelegationOptions.transforms = [wrapQueryTransform];
                             }
                             const onDelegateHookDones = [];
-                            for (const onDelegateHook of onDelegateHooks) {
-                                const onDelegateDone = await onDelegateHook({
-                                    ...batchDelegationOptions,
-                                    sourceName: rawSource.name,
-                                    typeName: rootType.name,
-                                    fieldName,
-                                });
-                                if (onDelegateDone) {
-                                    onDelegateHookDones.push(onDelegateDone);
-                                }
-                            }
-                            let result = await (0, batch_delegate_1.batchDelegateToSchema)(batchDelegationOptions);
-                            for (const onDelegateHookDone of onDelegateHookDones) {
-                                await onDelegateHookDone({
-                                    result,
-                                    setResult(newResult) {
-                                        result = newResult;
-                                    },
-                                });
+                            const onDelegatePayload = {
+                                ...batchDelegationOptions,
+                                sourceName: rawSource.name,
+                                typeName: rootType.name,
+                                fieldName,
+                            };
+                            const onDelegateResult$ = (0, utils_js_1.iterateAsync)(onDelegateHooks, onDelegateHook => onDelegateHook(onDelegatePayload), onDelegateHookDones);
+                            if ((0, utils_2.isPromise)(onDelegateResult$)) {
+                                return onDelegateResult$.then(() => handleIterationResult(batch_delegate_1.batchDelegateToSchema, batchDelegationOptions, onDelegateHookDones));
                             }
-                            return result;
+                            return handleIterationResult(batch_delegate_1.batchDelegateToSchema, batchDelegationOptions, onDelegateHookDones);
                         }
                         else {
                             const regularDelegateOptions = {
@@ -184,27 +175,17 @@ async function getInContextSDK(unifiedSchema, rawSources, logger, onDelegateHook
                                 regularDelegateOptions.transforms = [wrapQueryTransform];
                             }
                             const onDelegateHookDones = [];
-                            for (const onDelegateHook of onDelegateHooks) {
-                                const onDelegateDone = await onDelegateHook({
-                                    ...regularDelegateOptions,
-                                    sourceName: rawSource.name,
-                                    typeName: rootType.name,
-                                    fieldName,
-                                });
-                                if (onDelegateDone) {
-                                    onDelegateHookDones.push(onDelegateDone);
-                                }
-                            }
-                            let result = await (0, delegate_1.delegateToSchema)(regularDelegateOptions);
-                            for (const onDelegateHookDone of onDelegateHookDones) {
-                                await onDelegateHookDone({
-                                    result,
-                                    setResult(newResult) {
-                                        result = newResult;
-                                    },
-                                });
+                            const onDelegatePayload = {
+                                ...regularDelegateOptions,
+                                sourceName: rawSource.name,
+                                typeName: rootType.name,
+                                fieldName,
+                            };
+                            const onDelegateResult$ = (0, utils_js_1.iterateAsync)(onDelegateHooks, onDelegateHook => onDelegateHook(onDelegatePayload), onDelegateHookDones);
+                            if ((0, utils_2.isPromise)(onDelegateResult$)) {
+                                return onDelegateResult$.then(() => handleIterationResult(delegate_1.delegateToSchema, regularDelegateOptions, onDelegateHookDones));
                             }
-                            return result;
+                            return handleIterationResult(delegate_1.delegateToSchema, regularDelegateOptions, onDelegateHookDones);
                         }
                     };
                 }
@@ -248,3 +229,23 @@ function normalizeSelectionSetParamOrFactory(selectionSetParamOrFactory) {
 function identical(val) {
     return val;
 }
+function handleIterationResult(delegateFn, delegateOptions, onDelegateHookDones) {
+    const delegationResult$ = delegateFn(delegateOptions);
+    if ((0, utils_2.isPromise)(delegationResult$)) {
+        return delegationResult$.then(delegationResult => handleOnDelegateDone(delegationResult, onDelegateHookDones));
+    }
+    return handleOnDelegateDone(delegationResult$, onDelegateHookDones);
+}
+function handleOnDelegateDone(delegationResult, onDelegateHookDones) {
+    function setResult(newResult) {
+        delegationResult = newResult;
+    }
+    const onDelegateDoneResult$ = (0, utils_js_1.iterateAsync)(onDelegateHookDones, onDelegateHookDone => onDelegateHookDone({
+        result: delegationResult,
+        setResult,
+    }));
+    if ((0, utils_2.isPromise)(onDelegateDoneResult$)) {
+        return onDelegateDoneResult$.then(() => delegationResult);
+    }
+    return delegationResult;
+}

package/cjs/useSubschema.js

@@ -28,7 +28,7 @@ function getIntrospectionOperationType(operationAST) {
     return introspectionQueryType;
 }
 function getExecuteFn(subschema) {
-    return async function subschemaExecute(args) {
+    return function subschemaExecute(args) {
         const originalRequest = {
             document: args.document,
             variables: args.variableValues,
@@ -76,12 +76,18 @@ function getExecuteFn(subschema) {
         */
         const transformationContext = {};
         const transformedRequest = (0, utils_1.applyRequestTransforms)(originalRequest, delegationContext, transformationContext, subschema.transforms);
-        const originalResult = await executor(transformedRequest);
-        if ((0, utils_2.isAsyncIterable)(originalResult)) {
-            return (0, core_1.mapAsyncIterator)(originalResult, singleResult => (0, utils_1.applyResultTransforms)(singleResult, delegationContext, transformationContext, subschema.transforms));
+        function handleResult(originalResult) {
+            if ((0, utils_2.isAsyncIterable)(originalResult)) {
+                return (0, core_1.mapAsyncIterator)(originalResult, singleResult => (0, utils_1.applyResultTransforms)(singleResult, delegationContext, transformationContext, subschema.transforms));
+            }
+            const transformedResult = (0, utils_1.applyResultTransforms)(originalResult, delegationContext, transformationContext, subschema.transforms);
+            return transformedResult;
+        }
+        const originalResult$ = executor(transformedRequest);
+        if ((0, utils_2.isPromise)(originalResult$)) {
+            return originalResult$.then(handleResult);
         }
-        const transformedResult = (0, utils_1.applyResultTransforms)(originalResult, delegationContext, transformationContext, subschema.transforms);
-        return transformedResult;
+        return handleResult(originalResult$);
     };
 }
 // Creates an envelop plugin to execute a subschema inside Envelop

package/cjs/utils.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.iterateAsync = void 0;
+const utils_1 = require("@graphql-tools/utils");
+function iterateAsync(iterable, callback, results) {
+    const iterator = iterable[Symbol.iterator]();
+    function iterate() {
+        const { done: endOfIterator, value } = iterator.next();
+        if (endOfIterator) {
+            return;
+        }
+        const result$ = callback(value);
+        if ((0, utils_1.isPromise)(result$)) {
+            return result$.then(result => {
+                if (result) {
+                    results?.push(result);
+                }
+                return iterate();
+            });
+        }
+        if (result$) {
+            results?.push(result$);
+        }
+        return iterate();
+    }
+    return iterate();
+}
+exports.iterateAsync = iterateAsync;

package/esm/get-mesh.js

@@ -4,11 +4,12 @@ import { OneOfInputObjectsRule, useExtendedValidation } from '@envelop/extended-
 import { process } from '@graphql-mesh/cross-helpers';
 import { applySchemaTransforms, DefaultLogger, getHeadersObj, groupTransforms, parseWithCache, PubSub, } from '@graphql-mesh/utils';
 import { Subschema } from '@graphql-tools/delegate';
-import { getRootTypeMap, inspect, isAsyncIterable, mapAsyncIterator, memoize1, } from '@graphql-tools/utils';
+import { getRootTypeMap, inspect, isAsyncIterable, isPromise, mapAsyncIterator, memoize1, } from '@graphql-tools/utils';
 import { fetch as defaultFetchFn } from '@whatwg-node/fetch';
 import { MESH_CONTEXT_SYMBOL } from './constants.js';
 import { getInContextSDK } from './in-context-sdk.js';
 import { useSubschema } from './useSubschema.js';
+import { iterateAsync } from './utils.js';
 const memoizedGetEnvelopedFactory = memoize1(function getEnvelopedFactory(plugins) {
     return envelop({
         plugins,
@@ -22,7 +23,13 @@ const memoizedGetOperationType = memoize1((document) => {
     return operationAST.operation;
 });
 export function wrapFetchWithPlugins(plugins) {
-    return async function wrappedFetchFn(url, options, context, info) {
+    const onFetchHooks = [];
+    for (const plugin of plugins) {
+        if (plugin?.onFetch != null) {
+            onFetchHooks.push(plugin.onFetch);
+        }
+    }
+    return function wrappedFetchFn(url, options, context, info) {
         if (url != null && typeof url !== 'string') {
             throw new TypeError(`First parameter(url) of 'fetch' must be a string, got ${inspect(url)}`);
         }
@@ -37,33 +44,31 @@ export function wrapFetchWithPlugins(plugins) {
         }
         let fetchFn;
         const doneHooks = [];
-        for (const plugin of plugins) {
-            if (plugin?.onFetch != null) {
-                const doneHook = await plugin.onFetch({
-                    fetchFn,
-                    setFetchFn(newFetchFn) {
-                        fetchFn = newFetchFn;
-                    },
-                    url,
-                    options,
-                    context,
-                    info,
-                });
-                if (doneHook) {
-                    doneHooks.push(doneHook);
-                }
+        function setFetchFn(newFetchFn) {
+            fetchFn = newFetchFn;
+        }
+        const result$ = iterateAsync(onFetchHooks, onFetch => onFetch({
+            fetchFn,
+            setFetchFn,
+            url,
+            options,
+            context,
+            info,
+        }), doneHooks);
+        function handleIterationResult() {
+            const response$ = fetchFn(url, options, context, info);
+            if (doneHooks.length === 0) {
+                return response$;
             }
+            if (isPromise(response$)) {
+                return response$.then(response => handleOnFetchDone(response, doneHooks));
+            }
+            return handleOnFetchDone(response$, doneHooks);
         }
-        let response = await fetchFn(url, options, context, info);
-        for (const doneHook of doneHooks) {
-            await doneHook({
-                response,
-                setResponse(newResponse) {
-                    response = newResponse;
-                },
-            });
+        if (isPromise(result$)) {
+            return result$.then(handleIterationResult);
         }
-        return response;
+        return handleIterationResult();
     };
 }
 // Use in-context-sdk for tracing
@@ -178,7 +183,7 @@ export async function getMesh(options) {
             unifiedSubschema.transforms.push(rootLevelTransform);
         }
     }
-    let inContextSDK$;
+    let inContextSDK;
     const subschema = new Subschema(unifiedSubschema);
     const plugins = [
         useEngine({
@@ -188,16 +193,16 @@ export async function getMesh(options) {
         }),
         useSubschema(subschema),
         useExtendContext(() => {
-            if (!inContextSDK$) {
+            if (!inContextSDK) {
                 const onDelegateHooks = [];
                 for (const plugin of initialPluginList) {
                     if (plugin?.onDelegate != null) {
                         onDelegateHooks.push(plugin.onDelegate);
                     }
                 }
-                inContextSDK$ = getInContextSDK(subschema.transformedSchema, rawSources, logger, onDelegateHooks);
+                inContextSDK = getInContextSDK(subschema.transformedSchema, rawSources, logger, onDelegateHooks);
             }
-            return inContextSDK$;
+            return inContextSDK;
         }),
         useExtendedValidation({
             rules: [OneOfInputObjectsRule],
@@ -210,13 +215,24 @@ export async function getMesh(options) {
     function createExecutor(globalContext = EMPTY_CONTEXT_VALUE) {
         const getEnveloped = memoizedGetEnvelopedFactory(plugins);
         const { schema, parse, execute, subscribe, contextFactory } = getEnveloped(globalContext);
-        return async function meshExecutor(documentOrSDL, variableValues = EMPTY_VARIABLES_VALUE, contextValue = EMPTY_CONTEXT_VALUE, rootValue = EMPTY_ROOT_VALUE, operationName) {
+        return function meshExecutor(documentOrSDL, variableValues = EMPTY_VARIABLES_VALUE, contextValue = EMPTY_CONTEXT_VALUE, rootValue = EMPTY_ROOT_VALUE, operationName) {
             const document = typeof documentOrSDL === 'string' ? parse(documentOrSDL) : documentOrSDL;
             const executeFn = memoizedGetOperationType(document) === 'subscription' ? subscribe : execute;
+            const contextValue$ = contextFactory(contextValue);
+            if (isPromise(contextValue$)) {
+                return contextValue$.then(contextValue => executeFn({
+                    schema,
+                    document,
+                    contextValue,
+                    rootValue,
+                    variableValues: variableValues,
+                    operationName,
+                }));
+            }
             return executeFn({
                 schema,
                 document,
-                contextValue: await contextFactory(contextValue),
+                contextValue: contextValue$,
                 rootValue,
                 variableValues: variableValues,
                 operationName,
@@ -225,12 +241,12 @@ export async function getMesh(options) {
     }
     function sdkRequesterFactory(globalContext) {
         const executor = createExecutor(globalContext);
-        return async function sdkRequester(...args) {
-            const result = await executor(...args);
-            if (isAsyncIterable(result)) {
-                return mapAsyncIterator(result, extractDataOrThrowErrors);
+        return function sdkRequester(...args) {
+            const result$ = executor(...args);
+            if (isPromise(result$)) {
+                return result$.then(handleExecutorResultForSdk);
             }
-            return extractDataOrThrowErrors(result);
+            return handleExecutorResultForSdk(result$);
         };
     }
     function meshDestroy() {
@@ -259,6 +275,12 @@ export async function getMesh(options) {
         sdkRequesterFactory,
     };
 }
+function handleExecutorResultForSdk(result) {
+    if (isAsyncIterable(result)) {
+        return mapAsyncIterator(result, extractDataOrThrowErrors);
+    }
+    return extractDataOrThrowErrors(result);
+}
 function extractDataOrThrowErrors(result) {
     if (result.errors) {
         if (result.errors.length === 1) {
@@ -268,3 +290,16 @@ function extractDataOrThrowErrors(result) {
     }
     return result.data;
 }
+function handleOnFetchDone(response, onFetchDoneHooks) {
+    function setResponse(newResponse) {
+        response = newResponse;
+    }
+    const result$ = iterateAsync(onFetchDoneHooks, onFetchDone => onFetchDone({
+        response,
+        setResponse,
+    }));
+    if (isPromise(result$)) {
+        return result$.then(() => response);
+    }
+    return response;
+}

package/esm/in-context-sdk.js

@@ -2,10 +2,11 @@ import { getNamedType, isLeafType, Kind, print, } from 'graphql';
 import { parseWithCache } from '@graphql-mesh/utils';
 import { batchDelegateToSchema } from '@graphql-tools/batch-delegate';
 import { delegateToSchema, } from '@graphql-tools/delegate';
-import { buildOperationNodeForField, isDocumentNode, memoize1 } from '@graphql-tools/utils';
+import { buildOperationNodeForField, isDocumentNode, isPromise, memoize1, } from '@graphql-tools/utils';
 import { WrapQuery } from '@graphql-tools/wrap';
 import { MESH_API_CONTEXT_SYMBOL } from './constants.js';
-export async function getInContextSDK(unifiedSchema, rawSources, logger, onDelegateHooks) {
+import { iterateAsync } from './utils.js';
+export function getInContextSDK(unifiedSchema, rawSources, logger, onDelegateHooks) {
     const inContextSDK = {};
     const sourceMap = unifiedSchema.extensions.sourceMap;
     for (const rawSource of rawSources) {
@@ -46,7 +47,7 @@ export async function getInContextSDK(unifiedSchema, rawSources, logger, onDeleg
                     const inContextSdkLogger = rawSourceLogger.child(`InContextSDK.${rootType.name}.${fieldName}`);
                     const namedReturnType = getNamedType(rootTypeField.type);
                     const shouldHaveSelectionSet = !isLeafType(namedReturnType);
-                    rawSourceContext[rootType.name][fieldName] = async ({ root, args, context, info = {
+                    rawSourceContext[rootType.name][fieldName] = ({ root, args, context, info = {
                         fieldName,
                         fieldNodes: [],
                         returnType: namedReturnType,
@@ -147,27 +148,17 @@ export async function getInContextSDK(unifiedSchema, rawSources, logger, onDeleg
                                 batchDelegationOptions.transforms = [wrapQueryTransform];
                             }
                             const onDelegateHookDones = [];
-                            for (const onDelegateHook of onDelegateHooks) {
-                                const onDelegateDone = await onDelegateHook({
-                                    ...batchDelegationOptions,
-                                    sourceName: rawSource.name,
-                                    typeName: rootType.name,
-                                    fieldName,
-                                });
-                                if (onDelegateDone) {
-                                    onDelegateHookDones.push(onDelegateDone);
-                                }
-                            }
-                            let result = await batchDelegateToSchema(batchDelegationOptions);
-                            for (const onDelegateHookDone of onDelegateHookDones) {
-                                await onDelegateHookDone({
-                                    result,
-                                    setResult(newResult) {
-                                        result = newResult;
-                                    },
-                                });
+                            const onDelegatePayload = {
+                                ...batchDelegationOptions,
+                                sourceName: rawSource.name,
+                                typeName: rootType.name,
+                                fieldName,
+                            };
+                            const onDelegateResult$ = iterateAsync(onDelegateHooks, onDelegateHook => onDelegateHook(onDelegatePayload), onDelegateHookDones);
+                            if (isPromise(onDelegateResult$)) {
+                                return onDelegateResult$.then(() => handleIterationResult(batchDelegateToSchema, batchDelegationOptions, onDelegateHookDones));
                             }
-                            return result;
+                            return handleIterationResult(batchDelegateToSchema, batchDelegationOptions, onDelegateHookDones);
                         }
                         else {
                             const regularDelegateOptions = {
@@ -181,27 +172,17 @@ export async function getInContextSDK(unifiedSchema, rawSources, logger, onDeleg
                                 regularDelegateOptions.transforms = [wrapQueryTransform];
                             }
                             const onDelegateHookDones = [];
-                            for (const onDelegateHook of onDelegateHooks) {
-                                const onDelegateDone = await onDelegateHook({
-                                    ...regularDelegateOptions,
-                                    sourceName: rawSource.name,
-                                    typeName: rootType.name,
-                                    fieldName,
-                                });
-                                if (onDelegateDone) {
-                                    onDelegateHookDones.push(onDelegateDone);
-                                }
-                            }
-                            let result = await delegateToSchema(regularDelegateOptions);
-                            for (const onDelegateHookDone of onDelegateHookDones) {
-                                await onDelegateHookDone({
-                                    result,
-                                    setResult(newResult) {
-                                        result = newResult;
-                                    },
-                                });
+                            const onDelegatePayload = {
+                                ...regularDelegateOptions,
+                                sourceName: rawSource.name,
+                                typeName: rootType.name,
+                                fieldName,
+                            };
+                            const onDelegateResult$ = iterateAsync(onDelegateHooks, onDelegateHook => onDelegateHook(onDelegatePayload), onDelegateHookDones);
+                            if (isPromise(onDelegateResult$)) {
+                                return onDelegateResult$.then(() => handleIterationResult(delegateToSchema, regularDelegateOptions, onDelegateHookDones));
                             }
-                            return result;
+                            return handleIterationResult(delegateToSchema, regularDelegateOptions, onDelegateHookDones);
                         }
                     };
                 }
@@ -244,3 +225,23 @@ function normalizeSelectionSetParamOrFactory(selectionSetParamOrFactory) {
 function identical(val) {
     return val;
 }
+function handleIterationResult(delegateFn, delegateOptions, onDelegateHookDones) {
+    const delegationResult$ = delegateFn(delegateOptions);
+    if (isPromise(delegationResult$)) {
+        return delegationResult$.then(delegationResult => handleOnDelegateDone(delegationResult, onDelegateHookDones));
+    }
+    return handleOnDelegateDone(delegationResult$, onDelegateHookDones);
+}
+function handleOnDelegateDone(delegationResult, onDelegateHookDones) {
+    function setResult(newResult) {
+        delegationResult = newResult;
+    }
+    const onDelegateDoneResult$ = iterateAsync(onDelegateHookDones, onDelegateHookDone => onDelegateHookDone({
+        result: delegationResult,
+        setResult,
+    }));
+    if (isPromise(onDelegateDoneResult$)) {
+        return onDelegateDoneResult$.then(() => delegationResult);
+    }
+    return delegationResult;
+}

package/esm/useSubschema.js

@@ -2,7 +2,7 @@ import { BREAK, execute, visit } from 'graphql';
 import { mapAsyncIterator } from '@envelop/core';
 import { applyRequestTransforms, applyResultTransforms } from '@graphql-mesh/utils';
 import { applySchemaTransforms, createDefaultExecutor, } from '@graphql-tools/delegate';
-import { getDefinedRootType, getOperationASTFromRequest, isAsyncIterable, printSchemaWithDirectives, } from '@graphql-tools/utils';
+import { getDefinedRootType, getOperationASTFromRequest, isAsyncIterable, isPromise, printSchemaWithDirectives, } from '@graphql-tools/utils';
 var IntrospectionQueryType;
 (function (IntrospectionQueryType) {
     IntrospectionQueryType["FEDERATION"] = "FEDERATION";
@@ -25,7 +25,7 @@ function getIntrospectionOperationType(operationAST) {
     return introspectionQueryType;
 }
 function getExecuteFn(subschema) {
-    return async function subschemaExecute(args) {
+    return function subschemaExecute(args) {
         const originalRequest = {
             document: args.document,
             variables: args.variableValues,
@@ -73,12 +73,18 @@ function getExecuteFn(subschema) {
         */
         const transformationContext = {};
         const transformedRequest = applyRequestTransforms(originalRequest, delegationContext, transformationContext, subschema.transforms);
-        const originalResult = await executor(transformedRequest);
-        if (isAsyncIterable(originalResult)) {
-            return mapAsyncIterator(originalResult, singleResult => applyResultTransforms(singleResult, delegationContext, transformationContext, subschema.transforms));
+        function handleResult(originalResult) {
+            if (isAsyncIterable(originalResult)) {
+                return mapAsyncIterator(originalResult, singleResult => applyResultTransforms(singleResult, delegationContext, transformationContext, subschema.transforms));
+            }
+            const transformedResult = applyResultTransforms(originalResult, delegationContext, transformationContext, subschema.transforms);
+            return transformedResult;
+        }
+        const originalResult$ = executor(transformedRequest);
+        if (isPromise(originalResult$)) {
+            return originalResult$.then(handleResult);
         }
-        const transformedResult = applyResultTransforms(originalResult, delegationContext, transformationContext, subschema.transforms);
-        return transformedResult;
+        return handleResult(originalResult$);
     };
 }
 // Creates an envelop plugin to execute a subschema inside Envelop

package/esm/utils.js

@@ -0,0 +1,24 @@
+import { isPromise } from '@graphql-tools/utils';
+export function iterateAsync(iterable, callback, results) {
+    const iterator = iterable[Symbol.iterator]();
+    function iterate() {
+        const { done: endOfIterator, value } = iterator.next();
+        if (endOfIterator) {
+            return;
+        }
+        const result$ = callback(value);
+        if (isPromise(result$)) {
+            return result$.then(result => {
+                if (result) {
+                    results?.push(result);
+                }
+                return iterate();
+            });
+        }
+        if (result$) {
+            results?.push(result$);
+        }
+        return iterate();
+    }
+    return iterate();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-mesh/runtime",
-  "version": "0.96.2",
+  "version": "0.96.3-alpha-20230904123445-50ae3894a",
   "sideEffects": false,
   "peerDependencies": {
     "@graphql-mesh/cross-helpers": "^0.4.0",

package/typings/in-context-sdk.d.cts

@@ -1,3 +1,3 @@
 import { GraphQLSchema } from 'graphql';
 import { Logger, OnDelegateHook, RawSourceOutput } from '@graphql-mesh/types';
-export declare function getInContextSDK(unifiedSchema: GraphQLSchema, rawSources: RawSourceOutput[], logger: Logger, onDelegateHooks: OnDelegateHook<any>[]): Promise<Record<string, any>>;
+export declare function getInContextSDK(unifiedSchema: GraphQLSchema, rawSources: RawSourceOutput[], logger: Logger, onDelegateHooks: OnDelegateHook<any>[]): Record<string, any>;

package/typings/in-context-sdk.d.ts

@@ -1,3 +1,3 @@
 import { GraphQLSchema } from 'graphql';
 import { Logger, OnDelegateHook, RawSourceOutput } from '@graphql-mesh/types';
-export declare function getInContextSDK(unifiedSchema: GraphQLSchema, rawSources: RawSourceOutput[], logger: Logger, onDelegateHooks: OnDelegateHook<any>[]): Promise<Record<string, any>>;
+export declare function getInContextSDK(unifiedSchema: GraphQLSchema, rawSources: RawSourceOutput[], logger: Logger, onDelegateHooks: OnDelegateHook<any>[]): Record<string, any>;

package/typings/utils.d.cts

@@ -0,0 +1 @@
+export declare function iterateAsync<TInput, TOutput>(iterable: Iterable<TInput>, callback: (input: TInput) => Promise<TOutput> | TOutput, results?: TOutput[]): Promise<void> | void;

package/typings/utils.d.ts

@@ -0,0 +1 @@
+export declare function iterateAsync<TInput, TOutput>(iterable: Iterable<TInput>, callback: (input: TInput) => Promise<TOutput> | TOutput, results?: TOutput[]): Promise<void> | void;