@graphql-mesh/fusion-runtime 1.11.8 → 1.11.9

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @graphql-mesh/fusion-runtime
 
+## 1.11.9
+### Patch Changes
+
+
+
+- [#2542](https://github.com/graphql-hive/gateway/pull/2542) [`48e4ab3`](https://github.com/graphql-hive/gateway/commit/48e4ab36ac50dbd29c4855bb8087989b128e4351) Thanks [@dotansimha](https://github.com/dotansimha)! - ### Expose `cache` instance to unified graph handler
+  
+  The gateway `UnifiedGraphHandlerOpts` now includes an optinal `cache` instance that can be passed to the handler from the gateway.
+
 ## 1.11.8
 ### Patch Changes
 

package/dist/index.cjs

@@ -6,7 +6,7 @@ var transportCommon = require('@graphql-mesh/transport-common');
 var utils$1 = require('@graphql-mesh/utils');
 var batchExecute = require('@graphql-tools/batch-execute');
 var utils = require('@graphql-tools/utils');
-var promiseHelpers = require('@whatwg-node/promise-helpers');
+var require$$3 = require('@whatwg-node/promise-helpers');
 var graphql = require('graphql');
 var delegate = require('@graphql-tools/delegate');
 var federation = require('@graphql-tools/federation');
@@ -15,7 +15,7 @@ var stitch = require('@graphql-tools/stitch');
 var stitchingDirectives = require('@graphql-tools/stitching-directives');
 var wrap = require('@graphql-tools/wrap');
 var executor = require('@graphql-tools/executor');
-var disposablestack = require('@whatwg-node/disposablestack');
+var require$$1 = require('@whatwg-node/disposablestack');
 
 // Regexps involved with splitting words in various case formats.
 const SPLIT_LOWER_UPPER_RE = /([\p{Ll}\d])(\p{Lu})/gu;
@@ -883,7 +883,7 @@ const handleFederationSupergraph = function({
         if (directiveExtensions.pubsubPublish?.length) {
           const originalResolve = fieldConfig.resolve || delegate.defaultMergedResolver;
           fieldConfig.resolve = function(root, args, context, info) {
-            return promiseHelpers.handleMaybePromise(
+            return require$$3.handleMaybePromise(
               () => originalResolve(root, args, context, info),
               (payload) => {
                 const jobs = [];
@@ -892,7 +892,7 @@ const handleFederationSupergraph = function({
                     pubsubPublishArgs.pubsubTopic,
                     payload
                   );
-                  if (promiseHelpers.isPromise(job)) {
+                  if (require$$3.isPromise(job)) {
                     jobs.push(job);
                   }
                 }
@@ -933,7 +933,7 @@ const handleFederationSupergraph = function({
 
 function defaultTransportsGetter(kind) {
   const moduleName = `@graphql-mesh/transport-${kind}`;
-  return promiseHelpers.handleMaybePromise(
+  return require$$3.handleMaybePromise(
     () => require(moduleName),
     (transport) => {
       if (!transport) {
@@ -977,7 +977,7 @@ function getTransportExecutor({
 }) {
   const kind = transportEntry?.kind || "";
   transportContext?.log.debug(`Loading transport "${kind}"`);
-  return promiseHelpers.handleMaybePromise(
+  return require$$3.handleMaybePromise(
     () => typeof transports === "function" ? transports(kind) : transports[kind],
     (transport) => {
       if (!transport) {
@@ -1051,7 +1051,7 @@ function getOnSubgraphExecute({
         log.debug("Initializing executor");
       }
       executor = function lazyExecutor(subgraphExecReq) {
-        return promiseHelpers.handleMaybePromise(
+        return require$$3.handleMaybePromise(
           () => (
             // Gets the transport executor for the given subgraph
             getTransportExecutor({
@@ -1118,7 +1118,7 @@ function wrapExecutorWithHooks({
     let executor = baseExecutor;
     let executionRequest = baseExecutionRequest;
     const onSubgraphExecuteDoneHooks = [];
-    return promiseHelpers.handleMaybePromise(
+    return require$$3.handleMaybePromise(
       () => utils$1.iterateAsync(
         onSubgraphExecuteHooks,
         (onSubgraphExecuteHook) => onSubgraphExecuteHook({
@@ -1146,11 +1146,11 @@ function wrapExecutorWithHooks({
         if (onSubgraphExecuteDoneHooks.length === 0) {
           return executor(executionRequest);
         }
-        return promiseHelpers.handleMaybePromise(
+        return require$$3.handleMaybePromise(
           () => executor(executionRequest),
           (currentResult) => {
             const executeDoneResults = [];
-            return promiseHelpers.handleMaybePromise(
+            return require$$3.handleMaybePromise(
               () => utils$1.iterateAsync(
                 onSubgraphExecuteDoneHooks,
                 (onSubgraphExecuteDoneHook) => onSubgraphExecuteDoneHook({
@@ -1182,9 +1182,9 @@ function wrapExecutorWithHooks({
                 if (onNextHooks.length === 0 && onEndHooks.length === 0) {
                   return currentResult;
                 }
-                return promiseHelpers.mapAsyncIterator(
+                return require$$3.mapAsyncIterator(
                   currentResult,
-                  (currentResult2) => promiseHelpers.handleMaybePromise(
+                  (currentResult2) => require$$3.handleMaybePromise(
                     () => utils$1.iterateAsync(
                       onNextHooks,
                       (onNext) => onNext({
@@ -1269,7 +1269,7 @@ function wrapMergedTypeResolver(originalResolver, typeName, onDelegationStageExe
         onDelegationStageExecuteDoneHooks.push(onDelegationStageExecuteDone);
       }
     }
-    return promiseHelpers.handleMaybePromise(
+    return require$$3.handleMaybePromise(
       () => resolver(
         object,
         context,
@@ -1449,7 +1449,7 @@ class UnifiedGraphManager {
   ensureUnifiedGraph() {
     if (this.polling$ == null && this.opts?.pollingInterval != null && this.lastLoadTime != null && Date.now() - this.lastLoadTime >= this.opts.pollingInterval) {
       this.opts?.transportContext?.log.debug(`Polling Supergraph`);
-      this.polling$ = promiseHelpers.handleMaybePromise(
+      this.polling$ = require$$3.handleMaybePromise(
         () => this.getAndSetUnifiedGraph(),
         () => {
           this.polling$ = void 0;
@@ -1473,7 +1473,7 @@ class UnifiedGraphManager {
             { key: UNIFIEDGRAPH_CACHE_KEY },
             "Searching for Supergraph in cache..."
           );
-          this.initialUnifiedGraph$ = promiseHelpers.handleMaybePromise(
+          this.initialUnifiedGraph$ = require$$3.handleMaybePromise(
             () => this.opts.transportContext?.cache?.get(UNIFIEDGRAPH_CACHE_KEY),
             (cachedUnifiedGraph) => {
               if (cachedUnifiedGraph) {
@@ -1492,7 +1492,7 @@ class UnifiedGraphManager {
         } else {
           this.initialUnifiedGraph$ = this.getAndSetUnifiedGraph();
         }
-        this.initialUnifiedGraph$ = promiseHelpers.handleMaybePromise(
+        this.initialUnifiedGraph$ = require$$3.handleMaybePromise(
           () => this.initialUnifiedGraph$,
           (v) => {
             this.initialUnifiedGraph$ = void 0;
@@ -1549,7 +1549,7 @@ class UnifiedGraphManager {
                 serializedUnifiedGraph,
                 { ttl }
               );
-              if (promiseHelpers.isPromise(result)) {
+              if (require$$3.isPromise(result)) {
                 cacheSet$ = result;
                 result.then(() => {
                 }, logCacheSetError);
@@ -1571,7 +1571,7 @@ class UnifiedGraphManager {
         this.opts.transportEntryAdditions
       );
       let onSubgraphExecute;
-      return promiseHelpers.handleMaybePromise(
+      return require$$3.handleMaybePromise(
         () => this.handleUnifiedGraph({
           unifiedGraph: ensuredSchema,
           getUnifiedGraphSDL() {
@@ -1588,6 +1588,7 @@ class UnifiedGraphManager {
           onDelegateHooks: this.opts.onDelegateHooks,
           batchDelegateOptions: this.opts.batchDelegateOptions,
           log: this.opts.transportContext?.log,
+          cache: this.opts.transportContext?.cache,
           handleProgressiveOverride: this.opts.handleProgressiveOverride ? (label, context) => {
             const labels = this.overrideLabelsByContext.get(context);
             if (labels?.has(label)) {
@@ -1604,7 +1605,7 @@ class UnifiedGraphManager {
           overrideLabels
         }) => {
           this.overrideLabels = overrideLabels;
-          const transportExecutorStack = new disposablestack.AsyncDisposableStack();
+          const transportExecutorStack = new require$$1.AsyncDisposableStack();
           const generation = {
             executor,
             transportExecutorStack,
@@ -1645,7 +1646,7 @@ class UnifiedGraphManager {
             this.opts.transportContext?.log.debug(
               "Supergraph has been changed, updating..."
             );
-            return promiseHelpers.handleMaybePromise(
+            return require$$3.handleMaybePromise(
               () => disposePrevious,
               () => this.unifiedGraph,
               (err) => {
@@ -1774,7 +1775,7 @@ class UnifiedGraphManager {
       generation.forceDisposeTimer = void 0;
     }
     this.drainingGenerations.delete(generation);
-    return promiseHelpers.handleMaybePromise(
+    return require$$3.handleMaybePromise(
       () => disposeAll([generation.transportExecutorStack, generation.executor]),
       () => void 0,
       (err) => {
@@ -1786,7 +1787,7 @@ class UnifiedGraphManager {
     );
   }
   getAndSetUnifiedGraph() {
-    return promiseHelpers.handleMaybePromise(
+    return require$$3.handleMaybePromise(
       () => this.opts.getUnifiedGraph(this.opts.transportContext),
       (loadedUnifiedGraph) => this.handleLoadedUnifiedGraph(loadedUnifiedGraph),
       (err) => {
@@ -1802,7 +1803,7 @@ class UnifiedGraphManager {
     );
   }
   getUnifiedGraph() {
-    return promiseHelpers.handleMaybePromise(
+    return require$$3.handleMaybePromise(
       () => this.ensureUnifiedGraph(),
       () => {
         if (!this.unifiedGraph) {
@@ -1813,13 +1814,13 @@ class UnifiedGraphManager {
     );
   }
   getExecutor() {
-    return promiseHelpers.handleMaybePromise(
+    return require$$3.handleMaybePromise(
       () => this.ensureUnifiedGraph(),
       () => this.currentGeneration?.executor
     );
   }
   getContext(base = {}) {
-    return promiseHelpers.handleMaybePromise(
+    return require$$3.handleMaybePromise(
       () => this.ensureUnifiedGraph(),
       () => {
         if (this.inContextSDK) {
@@ -1847,7 +1848,7 @@ class UnifiedGraphManager {
                 labels.add(label);
               }
             };
-            if (promiseHelpers.isPromise(result$)) {
+            if (require$$3.isPromise(result$)) {
               jobs$.push(result$.then(handleResult));
             } else {
               handleResult(result$);
@@ -1862,7 +1863,7 @@ class UnifiedGraphManager {
     );
   }
   getTransportEntryMap() {
-    return promiseHelpers.handleMaybePromise(
+    return require$$3.handleMaybePromise(
       () => this.ensureUnifiedGraph(),
       () => {
         if (!this._transportEntryMap) {
@@ -1875,7 +1876,7 @@ class UnifiedGraphManager {
   invalidateUnifiedGraph() {
     return this.getAndSetUnifiedGraph();
   }
-  [disposablestack.DisposableSymbols.asyncDispose]() {
+  [require$$1.DisposableSymbols.asyncDispose]() {
     this.disposeReason = utils.createGraphQLError(
       "operation has been aborted because the server is shutting down",
       {
@@ -1903,7 +1904,7 @@ class UnifiedGraphManager {
       disposables.push(generation.transportExecutorStack, generation.executor);
     }
     this.drainingGenerations.clear();
-    return promiseHelpers.handleMaybePromise(
+    return require$$3.handleMaybePromise(
       () => disposeAll(disposables),
       () => {
         this.unifiedGraph = void 0;
@@ -1921,7 +1922,7 @@ class UnifiedGraphManager {
 function disposeAll(disposables) {
   const disposalJobs = disposables.map(
     (disposable) => utils$1.isDisposable(disposable) ? utils$1.dispose(disposable) : void 0
-  ).filter(promiseHelpers.isPromise);
+  ).filter(require$$3.isPromise);
   if (disposalJobs.length === 0) {
     return void 0;
   } else if (disposalJobs.length === 1) {
@@ -1943,7 +1944,7 @@ function serializeLoadedUnifiedGraph(loadedUnifiedGraph) {
 function getExecutorForUnifiedGraph(opts) {
   const unifiedGraphManager = new UnifiedGraphManager(opts);
   const unifiedGraphExecutor = function unifiedGraphExecutor2(execReq) {
-    return promiseHelpers.handleMaybePromise(
+    return require$$3.handleMaybePromise(
       () => unifiedGraphManager.getContext(execReq.context),
       (context) => {
         function handleExecutor(executor) {
@@ -1956,11 +1957,11 @@ function getExecutorForUnifiedGraph(opts) {
             context
           });
         }
-        return promiseHelpers.handleMaybePromise(
+        return require$$3.handleMaybePromise(
           () => unifiedGraphManager.getExecutor(),
           (executor) => {
             if (!executor) {
-              return promiseHelpers.handleMaybePromise(
+              return require$$3.handleMaybePromise(
                 () => unifiedGraphManager.getUnifiedGraph(),
                 (unifiedGraph) => {
                   opts?.transportContext?.log.debug(
@@ -1982,7 +1983,7 @@ function getExecutorForUnifiedGraph(opts) {
     unifiedGraphExecutor,
     function unifiedGraphExecutorDispose() {
       opts?.transportContext?.log.debug("Disposing unified graph executor");
-      return unifiedGraphManager[disposablestack.DisposableSymbols.asyncDispose]();
+      return unifiedGraphManager[require$$1.DisposableSymbols.asyncDispose]();
     }
   );
 }
@@ -1996,7 +1997,7 @@ function getSdkRequesterForUnifiedGraph(opts) {
       variables,
       context: operationContext
     };
-    return promiseHelpers.handleMaybePromise(
+    return require$$3.handleMaybePromise(
       () => onExecutionRequest(executionRequest),
       (onExecutionRequestResult) => {
         if (onExecutionRequestResult != null) {
@@ -2008,7 +2009,7 @@ function getSdkRequesterForUnifiedGraph(opts) {
           opts?.dataLoaderOptions,
           opts?.extensionsReducer
         ) : unifiedGraphExecutor;
-        return promiseHelpers.handleMaybePromise(
+        return require$$3.handleMaybePromise(
           () => executor(executionRequest),
           handleMaybePromiseMaybeAsyncIterableResult
         );
@@ -2017,11 +2018,11 @@ function getSdkRequesterForUnifiedGraph(opts) {
   };
 }
 function handleMaybePromiseMaybeAsyncIterableResult(result) {
-  return promiseHelpers.handleMaybePromise(
+  return require$$3.handleMaybePromise(
     () => result,
     (resolvedResult) => {
       if (utils.isAsyncIterable(resolvedResult)) {
-        return promiseHelpers.mapAsyncIterator(resolvedResult, extractDataOrThrowErrors);
+        return require$$3.mapAsyncIterator(resolvedResult, extractDataOrThrowErrors);
       }
       return extractDataOrThrowErrors(resolvedResult);
     }

package/dist/index.d.cts

@@ -6,7 +6,7 @@ export { TransportEntry, TransportGetSubgraphExecutor, TransportGetSubgraphExecu
 import { DelegationPlanBuilder, Subschema, MergedTypeResolver, SubschemaConfig } from '@graphql-tools/delegate';
 import { GraphQLSchema, DocumentNode, ExecutionResult, GraphQLError, FragmentDefinitionNode, SelectionNode, SelectionSetNode } from 'graphql';
 import { GraphQLResolveInfo, GraphQLOutputType } from 'graphql/type';
-import { OnDelegateHook } from '@graphql-mesh/types';
+import { OnDelegateHook, KeyValueCache } from '@graphql-mesh/types';
 import { DisposableSymbols } from '@whatwg-node/disposablestack';
 import { MaybePromise } from '@whatwg-node/promise-helpers';
 import { getBatchingExecutor } from '@graphql-tools/batch-execute';
@@ -41,6 +41,8 @@ interface UnifiedGraphHandlerOpts {
      */
     batchDelegateOptions?: BatchDelegateOptions;
     log?: Logger;
+    /** Shared cache instance (e.g. Redis), used by handlers that support cross-process caching. */
+    cache?: KeyValueCache;
 }
 interface UnifiedGraphHandlerResult {
     unifiedGraph: GraphQLSchema;

package/dist/index.d.ts

@@ -6,7 +6,7 @@ export { TransportEntry, TransportGetSubgraphExecutor, TransportGetSubgraphExecu
 import { DelegationPlanBuilder, Subschema, MergedTypeResolver, SubschemaConfig } from '@graphql-tools/delegate';
 import { GraphQLSchema, DocumentNode, ExecutionResult, GraphQLError, FragmentDefinitionNode, SelectionNode, SelectionSetNode } from 'graphql';
 import { GraphQLResolveInfo, GraphQLOutputType } from 'graphql/type';
-import { OnDelegateHook } from '@graphql-mesh/types';
+import { OnDelegateHook, KeyValueCache } from '@graphql-mesh/types';
 import { DisposableSymbols } from '@whatwg-node/disposablestack';
 import { MaybePromise } from '@whatwg-node/promise-helpers';
 import { getBatchingExecutor } from '@graphql-tools/batch-execute';
@@ -41,6 +41,8 @@ interface UnifiedGraphHandlerOpts {
      */
     batchDelegateOptions?: BatchDelegateOptions;
     log?: Logger;
+    /** Shared cache instance (e.g. Redis), used by handlers that support cross-process caching. */
+    cache?: KeyValueCache;
 }
 interface UnifiedGraphHandlerResult {
     unifiedGraph: GraphQLSchema;

package/dist/index.js

@@ -1586,6 +1586,7 @@ class UnifiedGraphManager {
           onDelegateHooks: this.opts.onDelegateHooks,
           batchDelegateOptions: this.opts.batchDelegateOptions,
           log: this.opts.transportContext?.log,
+          cache: this.opts.transportContext?.cache,
           handleProgressiveOverride: this.opts.handleProgressiveOverride ? (label, context) => {
             const labels = this.overrideLabelsByContext.get(context);
             if (labels?.has(label)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-mesh/fusion-runtime",
-  "version": "1.11.8",
+  "version": "1.11.9",
   "type": "module",
   "description": "Runtime for GraphQL Mesh Fusion Supergraph",
   "repository": {
@@ -65,7 +65,7 @@
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@graphql-hive/router-runtime": "^1.4.25",
+    "@graphql-hive/router-runtime": "^1.5.0",
     "change-case": "^5.4.4",
     "graphql": "^16.12.0",
     "pkgroll": "2.27.1"