@graphql-mesh/fusion-runtime 1.7.0 → 1.8.0-alpha-4e9b1cb7a0b759840f7f11f208e2cbd12b552dbf

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @graphql-mesh/fusion-runtime
 
+## 1.8.0-alpha-4e9b1cb7a0b759840f7f11f208e2cbd12b552dbf
+### Minor Changes
+
+
+
+- [#2076](https://github.com/graphql-hive/gateway/pull/2076) [`b8f9a4a`](https://github.com/graphql-hive/gateway/commit/b8f9a4a67984af67191079e5ce5ddbe232c0624d) Thanks [@ardatan](https://github.com/ardatan)! - Add automatic batching to SDK requester
+
+
+### Patch Changes
+
+- Updated dependencies [[`b8f9a4a`](https://github.com/graphql-hive/gateway/commit/b8f9a4a67984af67191079e5ce5ddbe232c0624d)]:
+  - @graphql-tools/batch-execute@10.0.6-alpha-4e9b1cb7a0b759840f7f11f208e2cbd12b552dbf
+  - @graphql-tools/delegate@12.0.10-alpha-4e9b1cb7a0b759840f7f11f208e2cbd12b552dbf
+  - @graphql-tools/federation@4.2.14-alpha-4e9b1cb7a0b759840f7f11f208e2cbd12b552dbf
+  - @graphql-tools/stitch@10.1.14-alpha-4e9b1cb7a0b759840f7f11f208e2cbd12b552dbf
+  - @graphql-tools/stitching-directives@4.0.16-alpha-4e9b1cb7a0b759840f7f11f208e2cbd12b552dbf
+  - @graphql-tools/wrap@11.1.10-alpha-4e9b1cb7a0b759840f7f11f208e2cbd12b552dbf
+
 ## 1.7.0
 ### Minor Changes
 

package/dist/index.cjs

@@ -1729,7 +1729,7 @@ function getExecutorForUnifiedGraph(opts) {
         function handleExecutor(executor) {
           opts?.transportContext?.log.debug(
             "Executing request on unified graph",
-            () => graphql.print(execReq.document)
+            () => transportCommon.defaultPrintFn(execReq.document)
           );
           return executor({
             ...execReq,
@@ -1745,7 +1745,7 @@ function getExecutorForUnifiedGraph(opts) {
                 (unifiedGraph) => {
                   opts?.transportContext?.log.debug(
                     "Executing request on unified graph",
-                    () => graphql.print(execReq.document)
+                    () => transportCommon.defaultPrintFn(execReq.document)
                   );
                   executor = transportCommon.createDefaultExecutor(unifiedGraph);
                   return handleExecutor(executor);
@@ -1758,32 +1758,45 @@ function getExecutorForUnifiedGraph(opts) {
       }
     );
   };
-  Object.defineProperty(unifiedGraphExecutor, disposablestack.DisposableSymbols.asyncDispose, {
-    configurable: true,
-    enumerable: true,
-    get() {
-      return function unifiedGraphExecutorDispose() {
-        opts?.transportContext?.log.debug("Disposing unified graph executor");
-        return unifiedGraphManager[disposablestack.DisposableSymbols.asyncDispose]();
-      };
+  return utils$1.makeAsyncDisposable(
+    unifiedGraphExecutor,
+    function unifiedGraphExecutorDispose() {
+      opts?.transportContext?.log.debug("Disposing unified graph executor");
+      return unifiedGraphManager[disposablestack.DisposableSymbols.asyncDispose]();
     }
-  });
-  return unifiedGraphExecutor;
+  );
 }
+const identity = (x) => x;
 function getSdkRequesterForUnifiedGraph(opts) {
   const unifiedGraphExecutor = getExecutorForUnifiedGraph(opts);
+  const onExecutionRequest = opts.onExecutionRequest || identity;
   return function sdkRequester(document, variables, operationContext) {
+    let executionRequest = {
+      document,
+      variables,
+      context: operationContext
+    };
     return promiseHelpers.handleMaybePromise(
-      () => unifiedGraphExecutor({
-        document,
-        variables,
-        context: operationContext
-      }),
-      (result) => {
-        if (utils.isAsyncIterable(result)) {
-          return promiseHelpers.mapAsyncIterator(result, extractDataOrThrowErrors);
+      () => onExecutionRequest(executionRequest),
+      (onExecutionRequestResult) => {
+        if (onExecutionRequestResult != null) {
+          executionRequest = onExecutionRequestResult;
         }
-        return extractDataOrThrowErrors(result);
+        const executor = executionRequest.context != null ? batchExecute.getBatchingExecutor(
+          executionRequest.context,
+          unifiedGraphExecutor,
+          opts?.dataLoaderOptions,
+          opts?.extensionsReducer
+        ) : unifiedGraphExecutor;
+        return promiseHelpers.handleMaybePromise(
+          () => executor(executionRequest),
+          (result) => {
+            if (utils.isAsyncIterable(result)) {
+              return promiseHelpers.mapAsyncIterator(result, extractDataOrThrowErrors);
+            }
+            return extractDataOrThrowErrors(result);
+          }
+        );
       }
     );
   };

package/dist/index.d.cts

@@ -1,7 +1,7 @@
 import * as _graphql_tools_utils from '@graphql-tools/utils';
-import { ExecutionRequest, Executor, TypeSource, IResolvers, MaybePromise as MaybePromise$1, Maybe, DisposableExecutor } from '@graphql-tools/utils';
+import { ExecutionRequest, Executor, TypeSource, IResolvers, MaybePromise as MaybePromise$1, Maybe, ExecutionResult as ExecutionResult$1 } from '@graphql-tools/utils';
 import { Logger } from '@graphql-hive/logger';
-import { TransportEntry, TransportContext, Transport } from '@graphql-mesh/transport-common';
+import { TransportContext, TransportEntry, Transport } from '@graphql-mesh/transport-common';
 export { TransportEntry, TransportGetSubgraphExecutor, TransportGetSubgraphExecutorOptions } from '@graphql-mesh/transport-common';
 import { DelegationPlanBuilder, Subschema, MergedTypeResolver, SubschemaConfig } from '@graphql-tools/delegate';
 import * as graphql from 'graphql';
@@ -10,6 +10,7 @@ import { GraphQLResolveInfo, GraphQLOutputType } from 'graphql/type';
 import { OnDelegateHook } from '@graphql-mesh/types';
 import { DisposableSymbols } from '@whatwg-node/disposablestack';
 import { MaybePromise } from '@whatwg-node/promise-helpers';
+import { getBatchingExecutor } from '@graphql-tools/batch-execute';
 
 type TransportEntryAdditions = {
     [subgraph: '*' | string]: Partial<TransportEntry>;
@@ -263,7 +264,12 @@ declare function handleFederationSubschema({ subschemaConfig, unifiedGraphDirect
 };
 
 type SdkRequester = (document: DocumentNode, variables?: any, operationContext?: any) => any;
-declare function getExecutorForUnifiedGraph<TContext>(opts: UnifiedGraphManagerOptions<TContext>): DisposableExecutor<TContext>;
-declare function getSdkRequesterForUnifiedGraph(opts: UnifiedGraphManagerOptions<any>): SdkRequester;
+declare function getExecutorForUnifiedGraph<TContext>(opts: UnifiedGraphManagerOptions<TContext>): ((execReq: ExecutionRequest) => MaybePromise<_graphql_tools_utils.MaybeAsyncIterable<ExecutionResult$1<any, any>>>) & AsyncDisposable;
+interface SdkRequesterOptions extends UnifiedGraphManagerOptions<any> {
+    dataLoaderOptions?: Parameters<typeof getBatchingExecutor>[2];
+    extensionsReducer?: (mergedExtensions: Record<string, any>, request: ExecutionRequest) => Record<string, any>;
+    onExecutionRequest?(request: ExecutionRequest): MaybePromise<ExecutionRequest>;
+}
+declare function getSdkRequesterForUnifiedGraph(opts: SdkRequesterOptions): SdkRequester;
 
-export { type BatchDelegateOptions, type HandleFederationSubschemaOpts, type HandleFederationSupergraphResult, type Instrumentation, type OnDelegationPlanDoneHook, type OnDelegationPlanDonePayload, type OnDelegationPlanHook, type OnDelegationPlanHookPayload, type OnDelegationStageExecuteDoneHook, type OnDelegationStageExecuteDonePayload, type OnDelegationStageExecuteHook, type OnDelegationStageExecutePayload, type OnSubgraphExecuteDoneHook, type OnSubgraphExecuteDoneOnNextPayload, type OnSubgraphExecuteDonePayload, type OnSubgraphExecuteDoneResult, type OnSubgraphExecuteDoneResultOnEnd, type OnSubgraphExecuteDoneResultOnNext, type OnSubgraphExecuteHook, type OnSubgraphExecutePayload, type TransportEntryAdditions, type Transports, type UnifiedGraphHandler, type UnifiedGraphHandlerOpts, type UnifiedGraphHandlerResult, UnifiedGraphManager, type UnifiedGraphManagerOptions, type UnifiedGraphPlugin, type WrapExecuteWithHooksOptions, compareSchemas, compareSubgraphNames, ensureSchema, getExecutorForUnifiedGraph, getOnSubgraphExecute, getSdkRequesterForUnifiedGraph, getStitchingDirectivesTransformerForSubschema, getTransportEntryMapUsingFusionAndFederationDirectives, handleFederationSubschema, handleFederationSupergraph, handleResolveToDirectives, millisecondsToStr, restoreExtraDirectives, wrapExecutorWithHooks, wrapMergedTypeResolver };
+export { type BatchDelegateOptions, type HandleFederationSubschemaOpts, type HandleFederationSupergraphResult, type Instrumentation, type OnDelegationPlanDoneHook, type OnDelegationPlanDonePayload, type OnDelegationPlanHook, type OnDelegationPlanHookPayload, type OnDelegationStageExecuteDoneHook, type OnDelegationStageExecuteDonePayload, type OnDelegationStageExecuteHook, type OnDelegationStageExecutePayload, type OnSubgraphExecuteDoneHook, type OnSubgraphExecuteDoneOnNextPayload, type OnSubgraphExecuteDonePayload, type OnSubgraphExecuteDoneResult, type OnSubgraphExecuteDoneResultOnEnd, type OnSubgraphExecuteDoneResultOnNext, type OnSubgraphExecuteHook, type OnSubgraphExecutePayload, type SdkRequesterOptions, type TransportEntryAdditions, type Transports, type UnifiedGraphHandler, type UnifiedGraphHandlerOpts, type UnifiedGraphHandlerResult, UnifiedGraphManager, type UnifiedGraphManagerOptions, type UnifiedGraphPlugin, type WrapExecuteWithHooksOptions, compareSchemas, compareSubgraphNames, ensureSchema, getExecutorForUnifiedGraph, getOnSubgraphExecute, getSdkRequesterForUnifiedGraph, getStitchingDirectivesTransformerForSubschema, getTransportEntryMapUsingFusionAndFederationDirectives, handleFederationSubschema, handleFederationSupergraph, handleResolveToDirectives, millisecondsToStr, restoreExtraDirectives, wrapExecutorWithHooks, wrapMergedTypeResolver };

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import * as _graphql_tools_utils from '@graphql-tools/utils';
-import { ExecutionRequest, Executor, TypeSource, IResolvers, MaybePromise as MaybePromise$1, Maybe, DisposableExecutor } from '@graphql-tools/utils';
+import { ExecutionRequest, Executor, TypeSource, IResolvers, MaybePromise as MaybePromise$1, Maybe, ExecutionResult as ExecutionResult$1 } from '@graphql-tools/utils';
 import { Logger } from '@graphql-hive/logger';
-import { TransportEntry, TransportContext, Transport } from '@graphql-mesh/transport-common';
+import { TransportContext, TransportEntry, Transport } from '@graphql-mesh/transport-common';
 export { TransportEntry, TransportGetSubgraphExecutor, TransportGetSubgraphExecutorOptions } from '@graphql-mesh/transport-common';
 import { DelegationPlanBuilder, Subschema, MergedTypeResolver, SubschemaConfig } from '@graphql-tools/delegate';
 import * as graphql from 'graphql';
@@ -10,6 +10,7 @@ import { GraphQLResolveInfo, GraphQLOutputType } from 'graphql/type';
 import { OnDelegateHook } from '@graphql-mesh/types';
 import { DisposableSymbols } from '@whatwg-node/disposablestack';
 import { MaybePromise } from '@whatwg-node/promise-helpers';
+import { getBatchingExecutor } from '@graphql-tools/batch-execute';
 
 type TransportEntryAdditions = {
     [subgraph: '*' | string]: Partial<TransportEntry>;
@@ -263,7 +264,12 @@ declare function handleFederationSubschema({ subschemaConfig, unifiedGraphDirect
 };
 
 type SdkRequester = (document: DocumentNode, variables?: any, operationContext?: any) => any;
-declare function getExecutorForUnifiedGraph<TContext>(opts: UnifiedGraphManagerOptions<TContext>): DisposableExecutor<TContext>;
-declare function getSdkRequesterForUnifiedGraph(opts: UnifiedGraphManagerOptions<any>): SdkRequester;
+declare function getExecutorForUnifiedGraph<TContext>(opts: UnifiedGraphManagerOptions<TContext>): ((execReq: ExecutionRequest) => MaybePromise<_graphql_tools_utils.MaybeAsyncIterable<ExecutionResult$1<any, any>>>) & AsyncDisposable;
+interface SdkRequesterOptions extends UnifiedGraphManagerOptions<any> {
+    dataLoaderOptions?: Parameters<typeof getBatchingExecutor>[2];
+    extensionsReducer?: (mergedExtensions: Record<string, any>, request: ExecutionRequest) => Record<string, any>;
+    onExecutionRequest?(request: ExecutionRequest): MaybePromise<ExecutionRequest>;
+}
+declare function getSdkRequesterForUnifiedGraph(opts: SdkRequesterOptions): SdkRequester;
 
-export { type BatchDelegateOptions, type HandleFederationSubschemaOpts, type HandleFederationSupergraphResult, type Instrumentation, type OnDelegationPlanDoneHook, type OnDelegationPlanDonePayload, type OnDelegationPlanHook, type OnDelegationPlanHookPayload, type OnDelegationStageExecuteDoneHook, type OnDelegationStageExecuteDonePayload, type OnDelegationStageExecuteHook, type OnDelegationStageExecutePayload, type OnSubgraphExecuteDoneHook, type OnSubgraphExecuteDoneOnNextPayload, type OnSubgraphExecuteDonePayload, type OnSubgraphExecuteDoneResult, type OnSubgraphExecuteDoneResultOnEnd, type OnSubgraphExecuteDoneResultOnNext, type OnSubgraphExecuteHook, type OnSubgraphExecutePayload, type TransportEntryAdditions, type Transports, type UnifiedGraphHandler, type UnifiedGraphHandlerOpts, type UnifiedGraphHandlerResult, UnifiedGraphManager, type UnifiedGraphManagerOptions, type UnifiedGraphPlugin, type WrapExecuteWithHooksOptions, compareSchemas, compareSubgraphNames, ensureSchema, getExecutorForUnifiedGraph, getOnSubgraphExecute, getSdkRequesterForUnifiedGraph, getStitchingDirectivesTransformerForSubschema, getTransportEntryMapUsingFusionAndFederationDirectives, handleFederationSubschema, handleFederationSupergraph, handleResolveToDirectives, millisecondsToStr, restoreExtraDirectives, wrapExecutorWithHooks, wrapMergedTypeResolver };
+export { type BatchDelegateOptions, type HandleFederationSubschemaOpts, type HandleFederationSupergraphResult, type Instrumentation, type OnDelegationPlanDoneHook, type OnDelegationPlanDonePayload, type OnDelegationPlanHook, type OnDelegationPlanHookPayload, type OnDelegationStageExecuteDoneHook, type OnDelegationStageExecuteDonePayload, type OnDelegationStageExecuteHook, type OnDelegationStageExecutePayload, type OnSubgraphExecuteDoneHook, type OnSubgraphExecuteDoneOnNextPayload, type OnSubgraphExecuteDonePayload, type OnSubgraphExecuteDoneResult, type OnSubgraphExecuteDoneResultOnEnd, type OnSubgraphExecuteDoneResultOnNext, type OnSubgraphExecuteHook, type OnSubgraphExecutePayload, type SdkRequesterOptions, type TransportEntryAdditions, type Transports, type UnifiedGraphHandler, type UnifiedGraphHandlerOpts, type UnifiedGraphHandlerResult, UnifiedGraphManager, type UnifiedGraphManagerOptions, type UnifiedGraphPlugin, type WrapExecuteWithHooksOptions, compareSchemas, compareSubgraphNames, ensureSchema, getExecutorForUnifiedGraph, getOnSubgraphExecute, getSdkRequesterForUnifiedGraph, getStitchingDirectivesTransformerForSubschema, getTransportEntryMapUsingFusionAndFederationDirectives, handleFederationSubschema, handleFederationSupergraph, handleResolveToDirectives, millisecondsToStr, restoreExtraDirectives, wrapExecutorWithHooks, wrapMergedTypeResolver };

package/dist/index.js

@@ -1,11 +1,11 @@
 import { getInstrumented } from '@envelop/instrumentation';
 import { LegacyLogger, Logger } from '@graphql-hive/logger';
 import { defaultPrintFn, createDefaultExecutor } from '@graphql-mesh/transport-common';
-import { getInContextSDK, getResolverForPubSubOperation, resolveAdditionalResolversWithoutImport, isDisposable, iterateAsync, dispose } from '@graphql-mesh/utils';
+import { getInContextSDK, getResolverForPubSubOperation, resolveAdditionalResolversWithoutImport, isDisposable, iterateAsync, dispose, makeAsyncDisposable } from '@graphql-mesh/utils';
 import { getBatchingExecutor } from '@graphql-tools/batch-execute';
 import { getDirectiveExtensions, mapSchema, MapperKind, astFromField, asArray, getDocumentNodeFromSchema, memoize1, isDocumentNode, printSchemaWithDirectives, mergeDeep, isAsyncIterable, createGraphQLError } from '@graphql-tools/utils';
 import { handleMaybePromise, isPromise, mapAsyncIterator } from '@whatwg-node/promise-helpers';
-import { isInterfaceType, Kind, isObjectType, typeFromAST, isOutputType, GraphQLSchema, GraphQLDirective, parseType, visit, GraphQLString, DirectiveLocation, isEnumType, isSchema, buildSchema, buildASTSchema, print } from 'graphql';
+import { isInterfaceType, Kind, isObjectType, typeFromAST, isOutputType, GraphQLSchema, GraphQLDirective, parseType, visit, GraphQLString, DirectiveLocation, isEnumType, isSchema, buildSchema, buildASTSchema } from 'graphql';
 import { defaultMergedResolver } from '@graphql-tools/delegate';
 import { getStitchedSchemaFromSupergraphSdl } from '@graphql-tools/federation';
 import { mergeTypeDefs } from '@graphql-tools/merge';
@@ -1727,7 +1727,7 @@ function getExecutorForUnifiedGraph(opts) {
         function handleExecutor(executor) {
           opts?.transportContext?.log.debug(
             "Executing request on unified graph",
-            () => print(execReq.document)
+            () => defaultPrintFn(execReq.document)
           );
           return executor({
             ...execReq,
@@ -1743,7 +1743,7 @@ function getExecutorForUnifiedGraph(opts) {
                 (unifiedGraph) => {
                   opts?.transportContext?.log.debug(
                     "Executing request on unified graph",
-                    () => print(execReq.document)
+                    () => defaultPrintFn(execReq.document)
                   );
                   executor = createDefaultExecutor(unifiedGraph);
                   return handleExecutor(executor);
@@ -1756,32 +1756,45 @@ function getExecutorForUnifiedGraph(opts) {
       }
     );
   };
-  Object.defineProperty(unifiedGraphExecutor, DisposableSymbols.asyncDispose, {
-    configurable: true,
-    enumerable: true,
-    get() {
-      return function unifiedGraphExecutorDispose() {
-        opts?.transportContext?.log.debug("Disposing unified graph executor");
-        return unifiedGraphManager[DisposableSymbols.asyncDispose]();
-      };
+  return makeAsyncDisposable(
+    unifiedGraphExecutor,
+    function unifiedGraphExecutorDispose() {
+      opts?.transportContext?.log.debug("Disposing unified graph executor");
+      return unifiedGraphManager[DisposableSymbols.asyncDispose]();
     }
-  });
-  return unifiedGraphExecutor;
+  );
 }
+const identity = (x) => x;
 function getSdkRequesterForUnifiedGraph(opts) {
   const unifiedGraphExecutor = getExecutorForUnifiedGraph(opts);
+  const onExecutionRequest = opts.onExecutionRequest || identity;
   return function sdkRequester(document, variables, operationContext) {
+    let executionRequest = {
+      document,
+      variables,
+      context: operationContext
+    };
     return handleMaybePromise(
-      () => unifiedGraphExecutor({
-        document,
-        variables,
-        context: operationContext
-      }),
-      (result) => {
-        if (isAsyncIterable(result)) {
-          return mapAsyncIterator(result, extractDataOrThrowErrors);
+      () => onExecutionRequest(executionRequest),
+      (onExecutionRequestResult) => {
+        if (onExecutionRequestResult != null) {
+          executionRequest = onExecutionRequestResult;
         }
-        return extractDataOrThrowErrors(result);
+        const executor = executionRequest.context != null ? getBatchingExecutor(
+          executionRequest.context,
+          unifiedGraphExecutor,
+          opts?.dataLoaderOptions,
+          opts?.extensionsReducer
+        ) : unifiedGraphExecutor;
+        return handleMaybePromise(
+          () => executor(executionRequest),
+          (result) => {
+            if (isAsyncIterable(result)) {
+              return mapAsyncIterator(result, extractDataOrThrowErrors);
+            }
+            return extractDataOrThrowErrors(result);
+          }
+        );
       }
     );
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-mesh/fusion-runtime",
-  "version": "1.7.0",
+  "version": "1.8.0-alpha-4e9b1cb7a0b759840f7f11f208e2cbd12b552dbf",
   "type": "module",
   "description": "Runtime for GraphQL Mesh Fusion Supergraph",
   "repository": {
@@ -50,22 +50,22 @@
     "@graphql-mesh/transport-common": "^1.0.15",
     "@graphql-mesh/types": "^0.104.16",
     "@graphql-mesh/utils": "^0.104.16",
-    "@graphql-tools/batch-execute": "^10.0.5",
-    "@graphql-tools/delegate": "^12.0.9",
+    "@graphql-tools/batch-execute": "10.0.6-alpha-4e9b1cb7a0b759840f7f11f208e2cbd12b552dbf",
+    "@graphql-tools/delegate": "12.0.10-alpha-4e9b1cb7a0b759840f7f11f208e2cbd12b552dbf",
     "@graphql-tools/executor": "^1.4.13",
-    "@graphql-tools/federation": "^4.2.13",
+    "@graphql-tools/federation": "4.2.14-alpha-4e9b1cb7a0b759840f7f11f208e2cbd12b552dbf",
     "@graphql-tools/merge": "^9.1.5",
-    "@graphql-tools/stitch": "^10.1.13",
-    "@graphql-tools/stitching-directives": "^4.0.15",
+    "@graphql-tools/stitch": "10.1.14-alpha-4e9b1cb7a0b759840f7f11f208e2cbd12b552dbf",
+    "@graphql-tools/stitching-directives": "4.0.16-alpha-4e9b1cb7a0b759840f7f11f208e2cbd12b552dbf",
     "@graphql-tools/utils": "^11.0.0",
-    "@graphql-tools/wrap": "^11.1.9",
+    "@graphql-tools/wrap": "11.1.10-alpha-4e9b1cb7a0b759840f7f11f208e2cbd12b552dbf",
     "@whatwg-node/disposablestack": "^0.0.6",
     "@whatwg-node/promise-helpers": "^1.3.2",
     "graphql-yoga": "^5.16.2",
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@graphql-hive/router-runtime": "^1.1.15",
+    "@graphql-hive/router-runtime": "1.1.16-alpha-4e9b1cb7a0b759840f7f11f208e2cbd12b552dbf",
     "change-case": "^5.4.4",
     "graphql": "^16.12.0",
     "pkgroll": "2.27.0"