@graphql-tools/delegate 7.0.0-alpha-624d205a.0 → 7.0.0

package/es5/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/delegate/es5",
-  "version": "7.0.0-alpha-624d205a.0",
+  "version": "7.0.0",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
@@ -8,9 +8,9 @@
   },
   "dependencies": {
     "@ardatan/aggregate-error": "0.0.6",
-    "@graphql-tools/batch-execute": "7.0.0-alpha-624d205a.0",
-    "@graphql-tools/schema": "6.2.5-alpha-624d205a.0",
-    "@graphql-tools/utils": "7.0.0-alpha-624d205a.0",
+    "@graphql-tools/batch-execute": "^7.0.0",
+    "@graphql-tools/schema": "^7.0.0",
+    "@graphql-tools/utils": "^7.0.0",
     "dataloader": "2.0.0",
     "is-promise": "4.0.0",
     "tslib": "~2.0.1"

package/es5/types.d.ts

@@ -96,25 +96,20 @@ export interface ICreateProxyingResolverOptions {
     fieldName?: string;
 }
 export declare type CreateProxyingResolverFn = (options: ICreateProxyingResolverOptions) => GraphQLFieldResolver<any, any>;
-export interface Endpoint<K = any, V = any, C = K> {
-    rootValue?: Record<string, any>;
-    executor?: Executor;
-    subscriber?: Subscriber;
-    batch?: boolean;
-    batchingOptions?: EndpointBatchingOptions<K, V, C>;
-}
-export interface EndpointBatchingOptions<K = any, V = any, C = K> {
+export interface BatchingOptions<K = any, V = any, C = K> {
     extensionsReducer?: (mergedExtensions: Record<string, any>, executionParams: ExecutionParams) => Record<string, any>;
     dataLoaderOptions?: DataLoader.Options<K, V, C>;
 }
-export interface SubschemaPermutation {
+export interface SubschemaConfig<K = any, V = any, C = K> {
+    schema: GraphQLSchema;
     createProxyingResolver?: CreateProxyingResolverFn;
     transforms?: Array<Transform>;
     merge?: Record<string, MergedTypeConfig>;
-}
-export interface SubschemaConfig<K = any, V = any, C = K> extends SubschemaPermutation, Endpoint<K, V, C> {
-    schema: GraphQLSchema;
-    endpoint?: Endpoint;
+    rootValue?: Record<string, any>;
+    executor?: Executor;
+    subscriber?: Subscriber;
+    batch?: boolean;
+    batchingOptions?: BatchingOptions<K, V, C>;
 }
 export interface MergedTypeConfig<K = any, V = any> {
     selectionSet?: string;

package/index.cjs.js

@@ -32,7 +32,6 @@ class Subschema {
         this.subscriber = config.subscriber;
         this.batch = config.batch;
         this.batchingOptions = config.batchingOptions;
-        this.endpoint = config.endpoint;
         this.createProxyingResolver = config.createProxyingResolver;
         this.transforms = (_a = config.transforms) !== null && _a !== void 0 ? _a : [];
         this.transformedSchema = applySchemaTransforms(this.schema, config);
@@ -1583,7 +1582,7 @@ function getDelegationReturnType(targetSchema, operation, fieldName) {
     return rootType.getFields()[fieldName].type;
 }
 function delegateRequest({ request, schema: subschemaOrSubschemaConfig, rootValue, info, operation, fieldName, args, returnType, context, transforms = [], transformedSchema, skipValidation, skipTypeMerging, binding, }) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c;
     let operationDefinition;
     let targetOperation;
     let targetFieldName;
@@ -1601,7 +1600,7 @@ function delegateRequest({ request, schema: subschemaOrSubschemaConfig, rootValu
     else {
         targetFieldName = fieldName;
     }
-    const { targetSchema, targetRootValue, subschemaConfig, endpoint, allTransforms } = collectTargetParameters(subschemaOrSubschemaConfig, rootValue, info, transforms);
+    const { targetSchema, targetRootValue, subschemaConfig, allTransforms } = collectTargetParameters(subschemaOrSubschemaConfig, rootValue, info, transforms);
     const delegationContext = {
         subschema: subschemaOrSubschemaConfig,
         targetSchema,
@@ -1621,9 +1620,10 @@ function delegateRequest({ request, schema: subschemaOrSubschemaConfig, rootValu
         validateRequest(targetSchema, processedRequest.document);
     }
     if (targetOperation === 'query' || targetOperation === 'mutation') {
-        let executor = (endpoint === null || endpoint === void 0 ? void 0 : endpoint.executor) || createDefaultExecutor(targetSchema, (subschemaConfig === null || subschemaConfig === void 0 ? void 0 : subschemaConfig.rootValue) || targetRootValue);
-        if (endpoint === null || endpoint === void 0 ? void 0 : endpoint.batch) {
-            executor = batchExecute.getBatchingExecutor(context, executor, (_d = endpoint === null || endpoint === void 0 ? void 0 : endpoint.batchingOptions) === null || _d === void 0 ? void 0 : _d.dataLoaderOptions, (_e = endpoint === null || endpoint === void 0 ? void 0 : endpoint.batchingOptions) === null || _e === void 0 ? void 0 : _e.extensionsReducer);
+        let executor = (subschemaConfig === null || subschemaConfig === void 0 ? void 0 : subschemaConfig.executor) || createDefaultExecutor(targetSchema, (subschemaConfig === null || subschemaConfig === void 0 ? void 0 : subschemaConfig.rootValue) || targetRootValue);
+        if (subschemaConfig === null || subschemaConfig === void 0 ? void 0 : subschemaConfig.batch) {
+            const batchingOptions = subschemaConfig === null || subschemaConfig === void 0 ? void 0 : subschemaConfig.batchingOptions;
+            executor = batchExecute.getBatchingExecutor(context, executor, batchingOptions === null || batchingOptions === void 0 ? void 0 : batchingOptions.dataLoaderOptions, batchingOptions === null || batchingOptions === void 0 ? void 0 : batchingOptions.extensionsReducer);
         }
         const executionResult = executor({
             ...processedRequest,
@@ -1637,7 +1637,7 @@ function delegateRequest({ request, schema: subschemaOrSubschemaConfig, rootValu
         }
         return transformer.transformResult(executionResult);
     }
-    const subscriber = (endpoint === null || endpoint === void 0 ? void 0 : endpoint.subscriber) || createDefaultSubscriber(targetSchema, (subschemaConfig === null || subschemaConfig === void 0 ? void 0 : subschemaConfig.rootValue) || targetRootValue);
+    const subscriber = (subschemaConfig === null || subschemaConfig === void 0 ? void 0 : subschemaConfig.subscriber) || createDefaultSubscriber(targetSchema, (subschemaConfig === null || subschemaConfig === void 0 ? void 0 : subschemaConfig.rootValue) || targetRootValue);
     return subscriber({
         ...processedRequest,
         context,
@@ -1652,16 +1652,16 @@ function delegateRequest({ request, schema: subschemaOrSubschemaConfig, rootValu
         return transformer.transformResult(subscriptionResult);
     });
 }
+const emptyObject = {};
 function collectTargetParameters(subschema, rootValue, info, transforms = []) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const stitchingInfo = (_a = info === null || info === void 0 ? void 0 : info.schema.extensions) === null || _a === void 0 ? void 0 : _a.stitchingInfo;
     const subschemaOrSubschemaConfig = (_b = stitchingInfo === null || stitchingInfo === void 0 ? void 0 : stitchingInfo.subschemaMap.get(subschema)) !== null && _b !== void 0 ? _b : subschema;
     if (isSubschemaConfig(subschemaOrSubschemaConfig)) {
         return {
             targetSchema: subschemaOrSubschemaConfig.schema,
-            targetRootValue: (_c = rootValue !== null && rootValue !== void 0 ? rootValue : subschemaOrSubschemaConfig === null || subschemaOrSubschemaConfig === void 0 ? void 0 : subschemaOrSubschemaConfig.rootValue) !== null && _c !== void 0 ? _c : info === null || info === void 0 ? void 0 : info.rootValue,
+            targetRootValue: (_d = (_c = rootValue !== null && rootValue !== void 0 ? rootValue : subschemaOrSubschemaConfig === null || subschemaOrSubschemaConfig === void 0 ? void 0 : subschemaOrSubschemaConfig.rootValue) !== null && _c !== void 0 ? _c : info === null || info === void 0 ? void 0 : info.rootValue) !== null && _d !== void 0 ? _d : emptyObject,
             subschemaConfig: subschemaOrSubschemaConfig,
-            endpoint: (_d = subschemaOrSubschemaConfig.endpoint) !== null && _d !== void 0 ? _d : subschemaOrSubschemaConfig,
             allTransforms: subschemaOrSubschemaConfig.transforms != null
                 ? subschemaOrSubschemaConfig.transforms.concat(transforms)
                 : transforms,
@@ -1669,7 +1669,7 @@ function collectTargetParameters(subschema, rootValue, info, transforms = []) {
     }
     return {
         targetSchema: subschemaOrSubschemaConfig,
-        targetRootValue: rootValue !== null && rootValue !== void 0 ? rootValue : info === null || info === void 0 ? void 0 : info.rootValue,
+        targetRootValue: (_e = rootValue !== null && rootValue !== void 0 ? rootValue : info === null || info === void 0 ? void 0 : info.rootValue) !== null && _e !== void 0 ? _e : emptyObject,
         allTransforms: transforms,
     };
 }
@@ -1684,7 +1684,7 @@ function validateRequest(targetSchema, document) {
         throw error.originalError || error;
     }
 }
-function createDefaultExecutor(schema, rootValue) {
+const createDefaultExecutor = memoize2(function (schema, rootValue) {
     return (({ document, context, variables, info }) => graphql.execute({
         schema,
         document,
@@ -1692,7 +1692,7 @@ function createDefaultExecutor(schema, rootValue) {
         variableValues: variables,
         rootValue: rootValue !== null && rootValue !== void 0 ? rootValue : info === null || info === void 0 ? void 0 : info.rootValue,
     }));
-}
+});
 function createDefaultSubscriber(schema, rootValue) {
     return ({ document, context, variables, info }) => graphql.subscribe({
         schema,