@graphql-mesh/utils 0.103.19 → 0.103.20

package/cjs/in-context-sdk.js

@@ -7,6 +7,7 @@ const batch_delegate_1 = require("@graphql-tools/batch-delegate");
 const delegate_1 = require("@graphql-tools/delegate");
 const utils_1 = require("@graphql-tools/utils");
 const wrap_1 = require("@graphql-tools/wrap");
+const promise_helpers_1 = require("@whatwg-node/promise-helpers");
 const iterateAsync_js_1 = require("./iterateAsync.js");
 const parseAndPrintWithCache_js_1 = require("./parseAndPrintWithCache.js");
 exports.MESH_API_CONTEXT_SYMBOL = Symbol('isMeshAPIContext');
@@ -156,9 +157,8 @@ function getInContextSDK(unifiedSchema, rawSources, logger, onDelegateHooks) {
                                 typeName: rootType.name,
                                 fieldName,
                             };
-                            const onDelegateResult$ = (0, iterateAsync_js_1.iterateAsync)(onDelegateHooks, onDelegateHook => onDelegateHook(onDelegatePayload), onDelegateHookDones);
                             fixInfo(batchDelegationOptions.info, operationType);
-                            return (0, utils_1.mapMaybePromise)(onDelegateResult$, () => handleIterationResult(batch_delegate_1.batchDelegateToSchema, batchDelegationOptions, onDelegateHookDones));
+                            return (0, promise_helpers_1.handleMaybePromise)(() => (0, iterateAsync_js_1.iterateAsync)(onDelegateHooks, onDelegateHook => onDelegateHook(onDelegatePayload), onDelegateHookDones), () => handleIterationResult(batch_delegate_1.batchDelegateToSchema, batchDelegationOptions, onDelegateHookDones));
                         }
                         else {
                             const regularDelegateOptions = {
@@ -178,9 +178,8 @@ function getInContextSDK(unifiedSchema, rawSources, logger, onDelegateHooks) {
                                 typeName: rootType.name,
                                 fieldName,
                             };
-                            const onDelegateResult$ = (0, iterateAsync_js_1.iterateAsync)(onDelegateHooks, onDelegateHook => onDelegateHook(onDelegatePayload), onDelegateHookDones);
                             fixInfo(regularDelegateOptions.info, operationType);
-                            return (0, utils_1.mapMaybePromise)(onDelegateResult$, () => handleIterationResult(delegate_1.delegateToSchema, regularDelegateOptions, onDelegateHookDones));
+                            return (0, promise_helpers_1.handleMaybePromise)(() => (0, iterateAsync_js_1.iterateAsync)(onDelegateHooks, onDelegateHook => onDelegateHook(onDelegatePayload), onDelegateHookDones), () => handleIterationResult(delegate_1.delegateToSchema, regularDelegateOptions, onDelegateHookDones));
                         }
                     };
                 }
@@ -224,17 +223,12 @@ function identical(val) {
     return val;
 }
 function handleIterationResult(delegateFn, delegateOptions, onDelegateHookDones) {
-    const delegationResult$ = delegateFn(delegateOptions);
-    return (0, utils_1.mapMaybePromise)(delegationResult$, function handleOnDelegateDone(delegationResult) {
-        function setResult(newResult) {
+    return (0, promise_helpers_1.handleMaybePromise)(() => delegateFn(delegateOptions), delegationResult => (0, promise_helpers_1.handleMaybePromise)(() => (0, iterateAsync_js_1.iterateAsync)(onDelegateHookDones, onDelegateHookDone => onDelegateHookDone({
+        result: delegationResult,
+        setResult(newResult) {
             delegationResult = newResult;
-        }
-        const onDelegateDoneResult$ = (0, iterateAsync_js_1.iterateAsync)(onDelegateHookDones, onDelegateHookDone => onDelegateHookDone({
-            result: delegationResult,
-            setResult,
-        }));
-        return (0, utils_1.mapMaybePromise)(onDelegateDoneResult$, () => delegationResult);
-    });
+        },
+    })), () => delegationResult));
 }
 function fixInfo(info, operationType) {
     info.operation ||= {

package/cjs/iterateAsync.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.iterateAsync = iterateAsync;
-const utils_1 = require("@graphql-tools/utils");
+const promise_helpers_1 = require("@whatwg-node/promise-helpers");
 function iterateAsync(iterable, callback, results) {
+    if (iterable?.length === 0) {
+        return;
+    }
     const iterator = iterable[Symbol.iterator]();
     function iterate() {
         const { done: endOfIterator, value } = iterator.next();
@@ -13,7 +16,7 @@ function iterateAsync(iterable, callback, results) {
         function endEarly() {
             endedEarly = true;
         }
-        return (0, utils_1.mapMaybePromise)(callback(value, endEarly), result => {
+        return (0, promise_helpers_1.handleMaybePromise)(() => callback(value, endEarly), result => {
             if (endedEarly) {
                 return;
             }

package/cjs/load-from-module-export-expression.js

@@ -4,6 +4,7 @@ exports.loadFromModuleExportExpression = loadFromModuleExportExpression;
 /* eslint-disable @typescript-eslint/return-await */
 const cross_helpers_1 = require("@graphql-mesh/cross-helpers");
 const utils_1 = require("@graphql-tools/utils");
+const promise_helpers_1 = require("@whatwg-node/promise-helpers");
 const defaultImportFn_js_1 = require("./defaultImportFn.js");
 function loadFromModuleExportExpression(expression, options) {
     if (typeof expression !== 'string') {
@@ -11,10 +12,10 @@ function loadFromModuleExportExpression(expression, options) {
     }
     const { defaultExportName, cwd, importFn = defaultImportFn_js_1.defaultImportFn } = options || {};
     const [modulePath, exportName = defaultExportName] = expression.split('#');
-    return (0, utils_1.mapMaybePromise)(tryImport(modulePath, cwd, importFn), mod => mod[exportName] || (mod.default && mod.default[exportName]) || mod.default || mod);
+    return (0, promise_helpers_1.handleMaybePromise)(() => tryImport(modulePath, cwd, importFn), mod => mod[exportName] || (mod.default && mod.default[exportName]) || mod.default || mod);
 }
 function tryImport(modulePath, cwd, importFn) {
-    return (0, utils_1.mapMaybePromise)(importFn(modulePath), m => m, () => {
+    return (0, promise_helpers_1.handleMaybePromise)(() => importFn(modulePath), m => m, () => {
         if (!cross_helpers_1.path.isAbsolute(modulePath)) {
             const absoluteModulePath = cross_helpers_1.path.isAbsolute(modulePath)
                 ? modulePath

package/cjs/wrapFetchWithHooks.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loggerForExecutionRequest = exports.requestIdByRequest = void 0;
 exports.wrapFetchWithHooks = wrapFetchWithHooks;
-const utils_1 = require("@graphql-tools/utils");
+const promise_helpers_1 = require("@whatwg-node/promise-helpers");
 const iterateAsync_js_1 = require("./iterateAsync.js");
 const logger_js_1 = require("./logger.js");
 exports.requestIdByRequest = new WeakMap();
@@ -12,7 +12,7 @@ function wrapFetchWithHooks(onFetchHooks) {
         let fetchFn;
         let response$;
         const onFetchDoneHooks = [];
-        return (0, utils_1.mapMaybePromise)((0, iterateAsync_js_1.iterateAsync)(onFetchHooks, (onFetch, endEarly) => onFetch({
+        return (0, promise_helpers_1.handleMaybePromise)(() => (0, iterateAsync_js_1.iterateAsync)(onFetchHooks, (onFetch, endEarly) => onFetch({
             fetchFn,
             setFetchFn(newFetchFn) {
                 fetchFn = newFetchFn;
@@ -62,12 +62,8 @@ function wrapFetchWithHooks(onFetchHooks) {
             if (response$) {
                 return response$;
             }
-            response$ = fetchFn(url, options, context, info);
-            if (onFetchDoneHooks.length === 0) {
-                return response$;
-            }
-            return (0, utils_1.mapMaybePromise)(response$, function (response) {
-                return (0, utils_1.mapMaybePromise)((0, iterateAsync_js_1.iterateAsync)(onFetchDoneHooks, onFetchDone => onFetchDone({
+            return (0, promise_helpers_1.handleMaybePromise)(() => fetchFn(url, options, context, info), function (response) {
+                return (0, promise_helpers_1.handleMaybePromise)(() => (0, iterateAsync_js_1.iterateAsync)(onFetchDoneHooks, onFetchDone => onFetchDone({
                     response,
                     setResponse(newResponse) {
                         response = newResponse;

package/esm/in-context-sdk.js

@@ -1,8 +1,9 @@
 import { getNamedType, isLeafType, Kind, print } from 'graphql';
 import { batchDelegateToSchema } from '@graphql-tools/batch-delegate';
 import { applySchemaTransforms, delegateToSchema } from '@graphql-tools/delegate';
-import { buildOperationNodeForField, isDocumentNode, mapMaybePromise, memoize1, } from '@graphql-tools/utils';
+import { buildOperationNodeForField, isDocumentNode, memoize1 } from '@graphql-tools/utils';
 import { WrapQuery } from '@graphql-tools/wrap';
+import { handleMaybePromise } from '@whatwg-node/promise-helpers';
 import { iterateAsync } from './iterateAsync.js';
 import { parseWithCache } from './parseAndPrintWithCache.js';
 export const MESH_API_CONTEXT_SYMBOL = Symbol('isMeshAPIContext');
@@ -152,9 +153,8 @@ export function getInContextSDK(unifiedSchema, rawSources, logger, onDelegateHoo
                                 typeName: rootType.name,
                                 fieldName,
                             };
-                            const onDelegateResult$ = iterateAsync(onDelegateHooks, onDelegateHook => onDelegateHook(onDelegatePayload), onDelegateHookDones);
                             fixInfo(batchDelegationOptions.info, operationType);
-                            return mapMaybePromise(onDelegateResult$, () => handleIterationResult(batchDelegateToSchema, batchDelegationOptions, onDelegateHookDones));
+                            return handleMaybePromise(() => iterateAsync(onDelegateHooks, onDelegateHook => onDelegateHook(onDelegatePayload), onDelegateHookDones), () => handleIterationResult(batchDelegateToSchema, batchDelegationOptions, onDelegateHookDones));
                         }
                         else {
                             const regularDelegateOptions = {
@@ -174,9 +174,8 @@ export function getInContextSDK(unifiedSchema, rawSources, logger, onDelegateHoo
                                 typeName: rootType.name,
                                 fieldName,
                             };
-                            const onDelegateResult$ = iterateAsync(onDelegateHooks, onDelegateHook => onDelegateHook(onDelegatePayload), onDelegateHookDones);
                             fixInfo(regularDelegateOptions.info, operationType);
-                            return mapMaybePromise(onDelegateResult$, () => handleIterationResult(delegateToSchema, regularDelegateOptions, onDelegateHookDones));
+                            return handleMaybePromise(() => iterateAsync(onDelegateHooks, onDelegateHook => onDelegateHook(onDelegatePayload), onDelegateHookDones), () => handleIterationResult(delegateToSchema, regularDelegateOptions, onDelegateHookDones));
                         }
                     };
                 }
@@ -220,17 +219,12 @@ function identical(val) {
     return val;
 }
 function handleIterationResult(delegateFn, delegateOptions, onDelegateHookDones) {
-    const delegationResult$ = delegateFn(delegateOptions);
-    return mapMaybePromise(delegationResult$, function handleOnDelegateDone(delegationResult) {
-        function setResult(newResult) {
+    return handleMaybePromise(() => delegateFn(delegateOptions), delegationResult => handleMaybePromise(() => iterateAsync(onDelegateHookDones, onDelegateHookDone => onDelegateHookDone({
+        result: delegationResult,
+        setResult(newResult) {
             delegationResult = newResult;
-        }
-        const onDelegateDoneResult$ = iterateAsync(onDelegateHookDones, onDelegateHookDone => onDelegateHookDone({
-            result: delegationResult,
-            setResult,
-        }));
-        return mapMaybePromise(onDelegateDoneResult$, () => delegationResult);
-    });
+        },
+    })), () => delegationResult));
 }
 function fixInfo(info, operationType) {
     info.operation ||= {

package/esm/iterateAsync.js

@@ -1,5 +1,8 @@
-import { mapMaybePromise } from '@graphql-tools/utils';
+import { handleMaybePromise } from '@whatwg-node/promise-helpers';
 export function iterateAsync(iterable, callback, results) {
+    if (iterable?.length === 0) {
+        return;
+    }
     const iterator = iterable[Symbol.iterator]();
     function iterate() {
         const { done: endOfIterator, value } = iterator.next();
@@ -10,7 +13,7 @@ export function iterateAsync(iterable, callback, results) {
         function endEarly() {
             endedEarly = true;
         }
-        return mapMaybePromise(callback(value, endEarly), result => {
+        return handleMaybePromise(() => callback(value, endEarly), result => {
             if (endedEarly) {
                 return;
             }

package/esm/load-from-module-export-expression.js

@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/return-await */
 import { path } from '@graphql-mesh/cross-helpers';
-import { fakePromise, mapMaybePromise } from '@graphql-tools/utils';
+import { fakePromise } from '@graphql-tools/utils';
+import { handleMaybePromise } from '@whatwg-node/promise-helpers';
 import { defaultImportFn } from './defaultImportFn.js';
 export function loadFromModuleExportExpression(expression, options) {
     if (typeof expression !== 'string') {
@@ -8,10 +9,10 @@ export function loadFromModuleExportExpression(expression, options) {
     }
     const { defaultExportName, cwd, importFn = defaultImportFn } = options || {};
     const [modulePath, exportName = defaultExportName] = expression.split('#');
-    return mapMaybePromise(tryImport(modulePath, cwd, importFn), mod => mod[exportName] || (mod.default && mod.default[exportName]) || mod.default || mod);
+    return handleMaybePromise(() => tryImport(modulePath, cwd, importFn), mod => mod[exportName] || (mod.default && mod.default[exportName]) || mod.default || mod);
 }
 function tryImport(modulePath, cwd, importFn) {
-    return mapMaybePromise(importFn(modulePath), m => m, () => {
+    return handleMaybePromise(() => importFn(modulePath), m => m, () => {
         if (!path.isAbsolute(modulePath)) {
             const absoluteModulePath = path.isAbsolute(modulePath)
                 ? modulePath

package/esm/wrapFetchWithHooks.js

@@ -1,4 +1,4 @@
-import { mapMaybePromise } from '@graphql-tools/utils';
+import { handleMaybePromise } from '@whatwg-node/promise-helpers';
 import { iterateAsync } from './iterateAsync.js';
 import { DefaultLogger } from './logger.js';
 export const requestIdByRequest = new WeakMap();
@@ -8,7 +8,7 @@ export function wrapFetchWithHooks(onFetchHooks) {
         let fetchFn;
         let response$;
         const onFetchDoneHooks = [];
-        return mapMaybePromise(iterateAsync(onFetchHooks, (onFetch, endEarly) => onFetch({
+        return handleMaybePromise(() => iterateAsync(onFetchHooks, (onFetch, endEarly) => onFetch({
             fetchFn,
             setFetchFn(newFetchFn) {
                 fetchFn = newFetchFn;
@@ -58,12 +58,8 @@ export function wrapFetchWithHooks(onFetchHooks) {
             if (response$) {
                 return response$;
             }
-            response$ = fetchFn(url, options, context, info);
-            if (onFetchDoneHooks.length === 0) {
-                return response$;
-            }
-            return mapMaybePromise(response$, function (response) {
-                return mapMaybePromise(iterateAsync(onFetchDoneHooks, onFetchDone => onFetchDone({
+            return handleMaybePromise(() => fetchFn(url, options, context, info), function (response) {
+                return handleMaybePromise(() => iterateAsync(onFetchDoneHooks, onFetchDone => onFetchDone({
                     response,
                     setResponse(newResponse) {
                         response = newResponse;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-mesh/utils",
-  "version": "0.103.19",
+  "version": "0.103.20",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "*"
@@ -8,13 +8,14 @@
   "dependencies": {
     "@graphql-mesh/cross-helpers": "^0.4.10",
     "@graphql-mesh/string-interpolation": "^0.5.8",
-    "@graphql-mesh/types": "^0.103.19",
+    "@graphql-mesh/types": "^0.103.20",
     "@graphql-tools/batch-delegate": "^9.0.16",
     "@graphql-tools/delegate": "^10.0.28",
     "@graphql-tools/utils": "^10.8.0",
     "@graphql-tools/wrap": "^10.0.28",
     "@whatwg-node/disposablestack": "^0.0.5",
     "@whatwg-node/fetch": "^0.10.4",
+    "@whatwg-node/promise-helpers": "^1.0.0",
     "dset": "^3.1.2",
     "js-yaml": "^4.1.0",
     "lodash.get": "^4.4.2",