@graphql-mesh/fusion-runtime 1.11.1 → 1.11.2

package/CHANGELOG.md

@@ -1,5 +1,46 @@
 # @graphql-mesh/fusion-runtime
 
+## 1.11.2
+### Patch Changes
+
+
+
+- [#2473](https://github.com/graphql-hive/gateway/pull/2473) [`6f2c3b6`](https://github.com/graphql-hive/gateway/commit/6f2c3b64b05f6ba17928fd098915c2167f3daedc) Thanks [@enisdenjo](https://github.com/enisdenjo)! - dependencies updates:
+  
+  - Updated dependency [`@graphql-mesh/utils@^0.104.38` ↗︎](https://www.npmjs.com/package/@graphql-mesh/utils/v/0.104.38) (from `^0.104.36`, in `dependencies`)
+
+
+- [#2473](https://github.com/graphql-hive/gateway/pull/2473) [`6f2c3b6`](https://github.com/graphql-hive/gateway/commit/6f2c3b64b05f6ba17928fd098915c2167f3daedc) Thanks [@enisdenjo](https://github.com/enisdenjo)! - Fields that are not provided by any subschema (added through `typeDefs` or `resolvers`) can now return partial objects of merged types; the missing fields are resolved from the owning subschema automatically
+  
+  ```graphql
+  type Query {
+    personCreated: PersonCreated
+  }
+  
+  type PersonCreated {
+    person: Person # merged type, owned by a subschema
+    cursor: String
+  }
+  ```
+  
+  ```ts
+  const resolvers = {
+    Query: {
+      // only the key of `Person` is provided locally
+      personCreated: () => ({ person: { id: '1' }, cursor: 'c1' }),
+    },
+  };
+  ```
+  
+  Before, `person` had to be resolved manually even though the stitched schema knows `Person` and its keys. Now the key is enough: `{ person { name } }` runs through the standard stitching planner, while local data (`cursor`) and local field resolvers on `Person` keep working as before. Computed fields, `@requires` dependencies, batching, and fields from other subschemas use the same type-merging flow as regular delegated results.
+- Updated dependencies [[`6f2c3b6`](https://github.com/graphql-hive/gateway/commit/6f2c3b64b05f6ba17928fd098915c2167f3daedc), [`6f2c3b6`](https://github.com/graphql-hive/gateway/commit/6f2c3b64b05f6ba17928fd098915c2167f3daedc), [`6f2c3b6`](https://github.com/graphql-hive/gateway/commit/6f2c3b64b05f6ba17928fd098915c2167f3daedc)]:
+  - @graphql-tools/delegate@12.1.0
+  - @graphql-tools/stitch@10.2.0
+  - @graphql-mesh/transport-common@1.0.18
+  - @graphql-tools/federation@4.4.10
+  - @graphql-tools/stitching-directives@4.0.26
+  - @graphql-tools/wrap@11.1.20
+
 ## 1.11.1
 ### Patch Changes
 

package/dist/index.cjs

@@ -706,6 +706,24 @@ const handleFederationSupergraph = function({
       }
     }
   }
+  const subscriptionType = unifiedGraph.getSubscriptionType();
+  if (subscriptionType) {
+    for (const field of Object.values(subscriptionType.getFields())) {
+      const pubsubOperations = utils.getDirectiveExtensions(field, unifiedGraph).pubsubOperation;
+      if (pubsubOperations?.length) {
+        const resolver = {};
+        for (const pubsubOperationArgs of pubsubOperations) {
+          Object.assign(
+            resolver,
+            utils$1.getResolverForPubSubOperation(pubsubOperationArgs)
+          );
+        }
+        additionalResolvers.push({
+          [subscriptionType.name]: { [field.name]: resolver }
+        });
+      }
+    }
+  }
   const unifiedGraphDirectives = utils.getDirectiveExtensions(unifiedGraph);
   let executableUnifiedGraph = federation.getStitchedSchemaFromSupergraphSdl({
     supergraphSdl: utils.getDocumentNodeFromSchema(unifiedGraph),
@@ -858,21 +876,6 @@ const handleFederationSupergraph = function({
       }
     }
   }
-  if (executableUnifiedGraph.getDirective("pubsubOperation")) {
-    executableUnifiedGraph = utils.mapSchema(executableUnifiedGraph, {
-      [utils.MapperKind.ROOT_FIELD](fieldConfig) {
-        const directiveExtensions = utils.getDirectiveExtensions(fieldConfig, executableUnifiedGraph);
-        if (directiveExtensions.pubsubOperation?.length) {
-          for (const pubsubOperationArgs of directiveExtensions.pubsubOperation) {
-            const { subscribe, resolve } = utils$1.getResolverForPubSubOperation(pubsubOperationArgs);
-            fieldConfig.subscribe = subscribe;
-            fieldConfig.resolve = resolve;
-          }
-        }
-        return fieldConfig;
-      }
-    });
-  }
   if (executableUnifiedGraph.getDirective("pubsubPublish")) {
     executableUnifiedGraph = utils.mapSchema(executableUnifiedGraph, {
       [utils.MapperKind.ROOT_FIELD](fieldConfig) {
@@ -1238,7 +1241,7 @@ function compareSubgraphNames(name1, name2) {
   return constantCase(name1) === constantCase(name2);
 }
 function wrapMergedTypeResolver(originalResolver, typeName, onDelegationStageExecuteHooks, log) {
-  return (object, context, info, subschema, selectionSet, key, type) => {
+  return (object, context, info, subschema, selectionSet, key, type, skipTypeMerging) => {
     if (subschema.name) {
       log = log.child({ subgraph: subschema.name });
     }
@@ -1274,7 +1277,8 @@ function wrapMergedTypeResolver(originalResolver, typeName, onDelegationStageExe
         subschema,
         selectionSet,
         key,
-        type
+        type,
+        skipTypeMerging
       ),
       (result) => {
         function setResult(newResult) {

package/dist/index.js

@@ -1,7 +1,7 @@
 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, makeAsyncDisposable } from '@graphql-mesh/utils';
+import { getResolverForPubSubOperation, getInContextSDK, 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';
@@ -704,6 +704,24 @@ const handleFederationSupergraph = function({
       }
     }
   }
+  const subscriptionType = unifiedGraph.getSubscriptionType();
+  if (subscriptionType) {
+    for (const field of Object.values(subscriptionType.getFields())) {
+      const pubsubOperations = getDirectiveExtensions(field, unifiedGraph).pubsubOperation;
+      if (pubsubOperations?.length) {
+        const resolver = {};
+        for (const pubsubOperationArgs of pubsubOperations) {
+          Object.assign(
+            resolver,
+            getResolverForPubSubOperation(pubsubOperationArgs)
+          );
+        }
+        additionalResolvers.push({
+          [subscriptionType.name]: { [field.name]: resolver }
+        });
+      }
+    }
+  }
   const unifiedGraphDirectives = getDirectiveExtensions(unifiedGraph);
   let executableUnifiedGraph = getStitchedSchemaFromSupergraphSdl({
     supergraphSdl: getDocumentNodeFromSchema(unifiedGraph),
@@ -856,21 +874,6 @@ const handleFederationSupergraph = function({
       }
     }
   }
-  if (executableUnifiedGraph.getDirective("pubsubOperation")) {
-    executableUnifiedGraph = mapSchema(executableUnifiedGraph, {
-      [MapperKind.ROOT_FIELD](fieldConfig) {
-        const directiveExtensions = getDirectiveExtensions(fieldConfig, executableUnifiedGraph);
-        if (directiveExtensions.pubsubOperation?.length) {
-          for (const pubsubOperationArgs of directiveExtensions.pubsubOperation) {
-            const { subscribe, resolve } = getResolverForPubSubOperation(pubsubOperationArgs);
-            fieldConfig.subscribe = subscribe;
-            fieldConfig.resolve = resolve;
-          }
-        }
-        return fieldConfig;
-      }
-    });
-  }
   if (executableUnifiedGraph.getDirective("pubsubPublish")) {
     executableUnifiedGraph = mapSchema(executableUnifiedGraph, {
       [MapperKind.ROOT_FIELD](fieldConfig) {
@@ -1236,7 +1239,7 @@ function compareSubgraphNames(name1, name2) {
   return constantCase(name1) === constantCase(name2);
 }
 function wrapMergedTypeResolver(originalResolver, typeName, onDelegationStageExecuteHooks, log) {
-  return (object, context, info, subschema, selectionSet, key, type) => {
+  return (object, context, info, subschema, selectionSet, key, type, skipTypeMerging) => {
     if (subschema.name) {
       log = log.child({ subgraph: subschema.name });
     }
@@ -1272,7 +1275,8 @@ function wrapMergedTypeResolver(originalResolver, typeName, onDelegationStageExe
         subschema,
         selectionSet,
         key,
-        type
+        type,
+        skipTypeMerging
       ),
       (result) => {
         function setResult(newResult) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-mesh/fusion-runtime",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "type": "module",
   "description": "Runtime for GraphQL Mesh Fusion Supergraph",
   "repository": {
@@ -47,25 +47,25 @@
     "@envelop/instrumentation": "^1.0.0",
     "@graphql-hive/logger": "^1.1.1",
     "@graphql-mesh/cross-helpers": "^0.4.13",
-    "@graphql-mesh/transport-common": "^1.0.17",
+    "@graphql-mesh/transport-common": "^1.0.18",
     "@graphql-mesh/types": "^0.104.28",
-    "@graphql-mesh/utils": "^0.104.36",
+    "@graphql-mesh/utils": "^0.104.38",
     "@graphql-tools/batch-execute": "^10.0.9",
-    "@graphql-tools/delegate": "^12.0.20",
+    "@graphql-tools/delegate": "^12.1.0",
     "@graphql-tools/executor": "^1.4.13",
-    "@graphql-tools/federation": "^4.4.9",
+    "@graphql-tools/federation": "^4.4.10",
     "@graphql-tools/merge": "^9.1.5",
-    "@graphql-tools/stitch": "^10.1.25",
-    "@graphql-tools/stitching-directives": "^4.0.25",
+    "@graphql-tools/stitch": "^10.2.0",
+    "@graphql-tools/stitching-directives": "^4.0.26",
     "@graphql-tools/utils": "^11.0.0",
-    "@graphql-tools/wrap": "^11.1.19",
+    "@graphql-tools/wrap": "^11.1.20",
     "@whatwg-node/disposablestack": "^0.0.6",
     "@whatwg-node/promise-helpers": "^1.3.2",
     "graphql-yoga": "^5.21.1",
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@graphql-hive/router-runtime": "^1.4.17",
+    "@graphql-hive/router-runtime": "^1.4.18",
     "change-case": "^5.4.4",
     "graphql": "^16.12.0",
     "pkgroll": "2.27.1"