@graphql-tools/stitch 10.2.3 → 10.2.4-alpha-8e3a749008cfbbbaddf5a726e6631941007ebf7a

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @graphql-tools/stitch
 
+## 10.2.4-alpha-8e3a749008cfbbbaddf5a726e6631941007ebf7a
+### Patch Changes
+
+
+
+- [#2555](https://github.com/graphql-hive/gateway/pull/2555) [`8e3a749`](https://github.com/graphql-hive/gateway/commit/8e3a749008cfbbbaddf5a726e6631941007ebf7a) Thanks [@enisdenjo](https://github.com/enisdenjo)! - Flush deferred merged fields without blocking the initial payload
+  
+  Deferred fields on merged entity types are now delegated when their deferred resolvers run instead of being included in the initial delegation plan. This allows the initial payload to be delivered before slower merged subgraph fields resolve.
+- Updated dependencies [[`8e3a749`](https://github.com/graphql-hive/gateway/commit/8e3a749008cfbbbaddf5a726e6631941007ebf7a)]:
+  - @graphql-tools/delegate@12.1.3-alpha-8e3a749008cfbbbaddf5a726e6631941007ebf7a
+  - @graphql-tools/batch-delegate@10.0.31-alpha-8e3a749008cfbbbaddf5a726e6631941007ebf7a
+  - @graphql-tools/wrap@11.1.23-alpha-8e3a749008cfbbbaddf5a726e6631941007ebf7a
+
 ## 10.2.3
 ### Patch Changes
 

package/dist/index.cjs

@@ -189,7 +189,7 @@ function resolveOne(value, context, info, stitchingInfo, providedFields) {
 
 function getFieldsNotInSubschema(schema, stitchingInfo, gatewayType, subschemaType, fieldNodes, fragments, variableValues, subschema, providedSelectionNode, context, info) {
   const sourceSchema = subschema.transformedSchema;
-  let { fields: subFieldNodesByResponseKey, patches } = utils.collectSubFields(
+  let { fields: subFieldNodesByResponseKey } = utils.collectSubFields(
     schema,
     fragments,
     variableValues,
@@ -197,23 +197,6 @@ function getFieldsNotInSubschema(schema, stitchingInfo, gatewayType, subschemaTy
     fieldNodes
   );
   let mapChanged = false;
-  if (patches.length) {
-    subFieldNodesByResponseKey = new Map(subFieldNodesByResponseKey);
-    for (const patch of patches) {
-      for (const [responseKey, fields2] of patch.fields) {
-        if (!mapChanged) {
-          subFieldNodesByResponseKey = new Map(subFieldNodesByResponseKey);
-          mapChanged = true;
-        }
-        const existingSubFieldNodes = subFieldNodesByResponseKey.get(responseKey);
-        if (existingSubFieldNodes) {
-          existingSubFieldNodes.push(...fields2);
-        } else {
-          subFieldNodesByResponseKey.set(responseKey, fields2);
-        }
-      }
-    }
-  }
   const fieldsNotInSchema = /* @__PURE__ */ new Set();
   if (graphql.isAbstractType(gatewayType)) {
     fieldsNotInSchema.add({
@@ -224,27 +207,13 @@ function getFieldsNotInSubschema(schema, stitchingInfo, gatewayType, subschemaTy
       }
     });
     for (const possibleType of schema.getPossibleTypes(gatewayType)) {
-      const { fields: subFieldNodesOfPossibleType, patches: patches2 } = utils.collectSubFields(
+      const { fields: subFieldNodesOfPossibleType } = utils.collectSubFields(
         schema,
         fragments,
         variableValues,
         possibleType,
         fieldNodes
       );
-      for (const patch of patches2) {
-        for (const [responseKey, fields2] of patch.fields) {
-          if (!mapChanged) {
-            subFieldNodesByResponseKey = new Map(subFieldNodesByResponseKey);
-            mapChanged = true;
-          }
-          const existingSubFieldNodes = subFieldNodesByResponseKey.get(responseKey);
-          if (existingSubFieldNodes) {
-            existingSubFieldNodes.push(...fields2);
-          } else {
-            subFieldNodesByResponseKey.set(responseKey, fields2);
-          }
-        }
-      }
       for (const [responseKey, subFieldNodes] of subFieldNodesOfPossibleType) {
         if (!mapChanged) {
           subFieldNodesByResponseKey = new Map(subFieldNodesByResponseKey);

package/dist/index.js

@@ -187,7 +187,7 @@ function resolveOne(value, context, info, stitchingInfo, providedFields) {
 
 function getFieldsNotInSubschema(schema, stitchingInfo, gatewayType, subschemaType, fieldNodes, fragments, variableValues, subschema, providedSelectionNode, context, info) {
   const sourceSchema = subschema.transformedSchema;
-  let { fields: subFieldNodesByResponseKey, patches } = collectSubFields(
+  let { fields: subFieldNodesByResponseKey } = collectSubFields(
     schema,
     fragments,
     variableValues,
@@ -195,23 +195,6 @@ function getFieldsNotInSubschema(schema, stitchingInfo, gatewayType, subschemaTy
     fieldNodes
   );
   let mapChanged = false;
-  if (patches.length) {
-    subFieldNodesByResponseKey = new Map(subFieldNodesByResponseKey);
-    for (const patch of patches) {
-      for (const [responseKey, fields2] of patch.fields) {
-        if (!mapChanged) {
-          subFieldNodesByResponseKey = new Map(subFieldNodesByResponseKey);
-          mapChanged = true;
-        }
-        const existingSubFieldNodes = subFieldNodesByResponseKey.get(responseKey);
-        if (existingSubFieldNodes) {
-          existingSubFieldNodes.push(...fields2);
-        } else {
-          subFieldNodesByResponseKey.set(responseKey, fields2);
-        }
-      }
-    }
-  }
   const fieldsNotInSchema = /* @__PURE__ */ new Set();
   if (isAbstractType(gatewayType)) {
     fieldsNotInSchema.add({
@@ -222,27 +205,13 @@ function getFieldsNotInSubschema(schema, stitchingInfo, gatewayType, subschemaTy
       }
     });
     for (const possibleType of schema.getPossibleTypes(gatewayType)) {
-      const { fields: subFieldNodesOfPossibleType, patches: patches2 } = collectSubFields(
+      const { fields: subFieldNodesOfPossibleType } = collectSubFields(
         schema,
         fragments,
         variableValues,
         possibleType,
         fieldNodes
       );
-      for (const patch of patches2) {
-        for (const [responseKey, fields2] of patch.fields) {
-          if (!mapChanged) {
-            subFieldNodesByResponseKey = new Map(subFieldNodesByResponseKey);
-            mapChanged = true;
-          }
-          const existingSubFieldNodes = subFieldNodesByResponseKey.get(responseKey);
-          if (existingSubFieldNodes) {
-            existingSubFieldNodes.push(...fields2);
-          } else {
-            subFieldNodesByResponseKey.set(responseKey, fields2);
-          }
-        }
-      }
       for (const [responseKey, subFieldNodes] of subFieldNodesOfPossibleType) {
         if (!mapChanged) {
           subFieldNodesByResponseKey = new Map(subFieldNodesByResponseKey);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/stitch",
-  "version": "10.2.3",
+  "version": "10.2.4-alpha-8e3a749008cfbbbaddf5a726e6631941007ebf7a",
   "type": "module",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
@@ -38,13 +38,13 @@
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
-    "@graphql-tools/batch-delegate": "^10.0.30",
-    "@graphql-tools/delegate": "^12.1.2",
+    "@graphql-tools/batch-delegate": "10.0.31-alpha-8e3a749008cfbbbaddf5a726e6631941007ebf7a",
+    "@graphql-tools/delegate": "12.1.3-alpha-8e3a749008cfbbbaddf5a726e6631941007ebf7a",
     "@graphql-tools/executor": "^1.4.13",
     "@graphql-tools/merge": "^9.1.5",
     "@graphql-tools/schema": "^10.0.29",
     "@graphql-tools/utils": "^11.0.0",
-    "@graphql-tools/wrap": "^11.1.22",
+    "@graphql-tools/wrap": "11.1.23-alpha-8e3a749008cfbbbaddf5a726e6631941007ebf7a",
     "@whatwg-node/promise-helpers": "^1.3.2",
     "tslib": "^2.8.1"
   },