@graphql-tools/delegate 8.4.2-alpha-9f8b9c45.0 → 8.4.4-alpha-b935d9b2.0

package/README.md

@@ -3,5 +3,3 @@ https://www.graphql-tools.com/docs/api/modules/delegate_src
 
 You can also learn more about Schema Delegation in this chapter;
 https://www.graphql-tools.com/docs/schema-delegation
-
-

package/index.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 const graphql = require('graphql');
 const utils = require('@graphql-tools/utils');
+const graphqlExecutor = require('graphql-executor');
 const valueOrPromise = require('value-or-promise');
 const batchExecute = require('@graphql-tools/batch-execute');
 
@@ -1185,8 +1186,9 @@ function delegateRequest(options) {
     return new valueOrPromise.ValueOrPromise(() => executor(processedRequest))
         .then(originalResult => {
         if (utils.isAsyncIterable(originalResult)) {
+            const iterator = originalResult[Symbol.asyncIterator]();
             // "subscribe" to the subscription result and map the result through the transforms
-            return utils.mapAsyncIterator(originalResult, result => transformer.transformResult(result));
+            return utils.mapAsyncIterator(iterator, result => transformer.transformResult(result));
         }
         return transformer.transformResult(originalResult);
     })
@@ -1250,17 +1252,18 @@ function validateRequest(delegationContext, document) {
         throw error.originalError || error;
     }
 }
+const GLOBAL_CONTEXT = {};
 function getExecutor(delegationContext) {
-    var _a, _b;
     const { subschemaConfig, targetSchema, context } = delegationContext;
     let executor = (subschemaConfig === null || subschemaConfig === void 0 ? void 0 : subschemaConfig.executor) || createDefaultExecutor(targetSchema);
     if (subschemaConfig === null || subschemaConfig === void 0 ? void 0 : subschemaConfig.batch) {
         const batchingOptions = subschemaConfig === null || subschemaConfig === void 0 ? void 0 : subschemaConfig.batchingOptions;
-        executor = batchExecute.getBatchingExecutor((_b = (_a = context !== null && context !== void 0 ? context : globalThis) !== null && _a !== void 0 ? _a : window) !== null && _b !== void 0 ? _b : global, executor, batchingOptions === null || batchingOptions === void 0 ? void 0 : batchingOptions.dataLoaderOptions, batchingOptions === null || batchingOptions === void 0 ? void 0 : batchingOptions.extensionsReducer);
+        executor = batchExecute.getBatchingExecutor(context !== null && context !== void 0 ? context : GLOBAL_CONTEXT, executor, batchingOptions === null || batchingOptions === void 0 ? void 0 : batchingOptions.dataLoaderOptions, batchingOptions === null || batchingOptions === void 0 ? void 0 : batchingOptions.extensionsReducer);
     }
     return executor;
 }
 const createDefaultExecutor = utils.memoize1(function createDefaultExecutor(schema) {
+    const executor = new graphqlExecutor.Executor({ schema });
     return function defaultExecutor(request) {
         const operationAst = utils.getOperationASTFromRequest(request);
         const executionArgs = {
@@ -1274,7 +1277,7 @@ const createDefaultExecutor = utils.memoize1(function createDefaultExecutor(sche
         if (operationAst.operation === 'subscription') {
             return graphql.subscribe(executionArgs);
         }
-        return graphql.execute(executionArgs);
+        return executor.execute(executionArgs);
     };
 });
 

package/index.mjs

@@ -1,5 +1,6 @@
-import { Kind, isAbstractType, isInterfaceType, TypeInfo, visit, visitWithTypeInfo, getNamedType, isObjectType, versionInfo, TypeNameMetaFieldDef, responsePathAsArray, GraphQLError, locatedError, getNullableType, isCompositeType, isListType, typeFromAST, defaultFieldResolver, validate, subscribe, execute } from 'graphql';
+import { Kind, isAbstractType, isInterfaceType, TypeInfo, visit, visitWithTypeInfo, getNamedType, isObjectType, versionInfo, TypeNameMetaFieldDef, responsePathAsArray, GraphQLError, locatedError, getNullableType, isCompositeType, isListType, typeFromAST, defaultFieldResolver, validate, subscribe } from 'graphql';
 import { memoize2, implementsAbstractType, getRootTypeNames, getDefinedRootType, createVariableNameGenerator, updateArgument, serializeInputValue, inspect, collectFields, relocatedError, AggregateError, getResponseKeyFromInfo, isAsyncIterable, mapAsyncIterator, getOperationASTFromRequest, memoize1 } from '@graphql-tools/utils';
+import { Executor } from 'graphql-executor';
 import { ValueOrPromise } from 'value-or-promise';
 import { getBatchingExecutor } from '@graphql-tools/batch-execute';
 
@@ -1181,8 +1182,9 @@ function delegateRequest(options) {
     return new ValueOrPromise(() => executor(processedRequest))
         .then(originalResult => {
         if (isAsyncIterable(originalResult)) {
+            const iterator = originalResult[Symbol.asyncIterator]();
             // "subscribe" to the subscription result and map the result through the transforms
-            return mapAsyncIterator(originalResult, result => transformer.transformResult(result));
+            return mapAsyncIterator(iterator, result => transformer.transformResult(result));
         }
         return transformer.transformResult(originalResult);
     })
@@ -1246,17 +1248,18 @@ function validateRequest(delegationContext, document) {
         throw error.originalError || error;
     }
 }
+const GLOBAL_CONTEXT = {};
 function getExecutor(delegationContext) {
-    var _a, _b;
     const { subschemaConfig, targetSchema, context } = delegationContext;
     let executor = (subschemaConfig === null || subschemaConfig === void 0 ? void 0 : subschemaConfig.executor) || createDefaultExecutor(targetSchema);
     if (subschemaConfig === null || subschemaConfig === void 0 ? void 0 : subschemaConfig.batch) {
         const batchingOptions = subschemaConfig === null || subschemaConfig === void 0 ? void 0 : subschemaConfig.batchingOptions;
-        executor = getBatchingExecutor((_b = (_a = context !== null && context !== void 0 ? context : globalThis) !== null && _a !== void 0 ? _a : window) !== null && _b !== void 0 ? _b : global, executor, batchingOptions === null || batchingOptions === void 0 ? void 0 : batchingOptions.dataLoaderOptions, batchingOptions === null || batchingOptions === void 0 ? void 0 : batchingOptions.extensionsReducer);
+        executor = getBatchingExecutor(context !== null && context !== void 0 ? context : GLOBAL_CONTEXT, executor, batchingOptions === null || batchingOptions === void 0 ? void 0 : batchingOptions.dataLoaderOptions, batchingOptions === null || batchingOptions === void 0 ? void 0 : batchingOptions.extensionsReducer);
     }
     return executor;
 }
 const createDefaultExecutor = memoize1(function createDefaultExecutor(schema) {
+    const executor = new Executor({ schema });
     return function defaultExecutor(request) {
         const operationAst = getOperationASTFromRequest(request);
         const executionArgs = {
@@ -1270,7 +1273,7 @@ const createDefaultExecutor = memoize1(function createDefaultExecutor(schema) {
         if (operationAst.operation === 'subscription') {
             return subscribe(executionArgs);
         }
-        return execute(executionArgs);
+        return executor.execute(executionArgs);
     };
 });
 

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "@graphql-tools/delegate",
-  "version": "8.4.2-alpha-9f8b9c45.0",
+  "version": "8.4.4-alpha-b935d9b2.0",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "dependencies": {
-    "@graphql-tools/batch-execute": "8.3.2-alpha-9f8b9c45.0",
-    "@graphql-tools/schema": "8.3.2-alpha-9f8b9c45.0",
-    "@graphql-tools/utils": "8.5.2-alpha-9f8b9c45.0",
+    "@graphql-tools/batch-execute": "8.3.2-alpha-b935d9b2.0",
+    "@graphql-tools/schema": "8.3.2-alpha-b935d9b2.0",
+    "@graphql-tools/utils": "8.6.1-alpha-b935d9b2.0",
     "dataloader": "2.0.0",
+    "graphql-executor": "0.0.14",
     "tslib": "~2.3.0",
     "value-or-promise": "1.0.11"
   },
@@ -34,6 +35,7 @@
     "./*": {
       "require": "./*.js",
       "import": "./*.mjs"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }