@graphql-tools/federation 4.3.0 → 4.3.1-alpha-bcdf6a1333a84f3ead114d676e66e609c350e084

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @graphql-tools/federation
 
+## 4.3.1-alpha-bcdf6a1333a84f3ead114d676e66e609c350e084
+### Patch Changes
+
+
+
+- [#2106](https://github.com/graphql-hive/gateway/pull/2106) [`bcdf6a1`](https://github.com/graphql-hive/gateway/commit/bcdf6a1333a84f3ead114d676e66e609c350e084) Thanks [@ardatan](https://github.com/ardatan)! - - Optimizations to select ONLY required fields when fetching the missing fields from other subgraphs
+  - Do not try to resolve types from the subschemas which only have the stub types, for example if a subgraph only has `id` field as a stub, do not use that subgraph as a target subgraph for resolving the type, because it will not have any other fields than `id`.
+- Updated dependencies [[`bcdf6a1`](https://github.com/graphql-hive/gateway/commit/bcdf6a1333a84f3ead114d676e66e609c350e084)]:
+  - @graphql-tools/delegate@12.0.12-alpha-bcdf6a1333a84f3ead114d676e66e609c350e084
+  - @graphql-tools/stitch@10.1.16-alpha-bcdf6a1333a84f3ead114d676e66e609c350e084
+  - @graphql-tools/wrap@11.1.12-alpha-bcdf6a1333a84f3ead114d676e66e609c350e084
+
 ## 4.3.0
 ### Minor Changes
 

package/dist/index.cjs

@@ -447,27 +447,6 @@ function getStitchingOptionsFromSupergraphSdl(opts) {
         );
         if (joinTypeGraphArgNode?.value?.kind === graphql.Kind.ENUM) {
           const graphName = joinTypeGraphArgNode.value.value;
-          if (typeNode.kind === graphql.Kind.OBJECT_TYPE_DEFINITION || typeNode.kind === graphql.Kind.INTERFACE_TYPE_DEFINITION) {
-            const keyArgumentNode = directiveNode.arguments?.find(
-              (argumentNode) => argumentNode.name.value === "key"
-            );
-            const isResolvable = !directiveNode.arguments?.some(
-              (argumentNode) => argumentNode.name.value === "resolvable" && argumentNode.value?.kind === graphql.Kind.BOOLEAN && argumentNode.value.value === false
-            );
-            if (isResolvable && keyArgumentNode?.value?.kind === graphql.Kind.STRING) {
-              let typeNameKeysMap = typeNameKeysBySubgraphMap.get(graphName);
-              if (!typeNameKeysMap) {
-                typeNameKeysMap = /* @__PURE__ */ new Map();
-                typeNameKeysBySubgraphMap.set(graphName, typeNameKeysMap);
-              }
-              let keys = typeNameKeysMap.get(typeNode.name.value);
-              if (!keys) {
-                keys = [];
-                typeNameKeysMap.set(typeNode.name.value, keys);
-              }
-              keys.push(keyArgumentNode.value.value);
-            }
-          }
           const fieldDefinitionNodesOfSubgraph = [];
           typeNode.fields?.forEach((fieldNode) => {
             const joinFieldDirectives = fieldNode.directives?.filter(
@@ -721,6 +700,34 @@ function getStitchingOptionsFromSupergraphSdl(opts) {
             graphName,
             fieldDefinitionNodesOfSubgraph
           );
+          if (typeNode.kind === graphql.Kind.OBJECT_TYPE_DEFINITION || typeNode.kind === graphql.Kind.INTERFACE_TYPE_DEFINITION) {
+            const keyArgumentNode = directiveNode.arguments?.find(
+              (argumentNode) => argumentNode.name.value === "key"
+            );
+            const isResolvable = !directiveNode.arguments?.some(
+              (argumentNode) => argumentNode.name.value === "resolvable" && argumentNode.value?.kind === graphql.Kind.BOOLEAN && argumentNode.value.value === false
+            );
+            if (keyArgumentNode?.value?.kind === graphql.Kind.STRING) {
+              const keyArgVal = keyArgumentNode.value.value;
+              if (isResolvable) {
+                if (typeNode.kind !== graphql.Kind.OBJECT_TYPE_DEFINITION || !fieldDefinitionNodesOfSubgraph.every(
+                  (fieldDefNode) => keyArgVal.includes(fieldDefNode.name.value)
+                )) {
+                  let typeNameKeysMap = typeNameKeysBySubgraphMap.get(graphName);
+                  if (!typeNameKeysMap) {
+                    typeNameKeysMap = /* @__PURE__ */ new Map();
+                    typeNameKeysBySubgraphMap.set(graphName, typeNameKeysMap);
+                  }
+                  let keys = typeNameKeysMap.get(typeNode.name.value);
+                  if (!keys) {
+                    keys = [];
+                    typeNameKeysMap.set(typeNode.name.value, keys);
+                  }
+                  keys.push(keyArgVal);
+                }
+              }
+            }
+          }
         }
       }
     });

package/dist/index.js

@@ -445,27 +445,6 @@ function getStitchingOptionsFromSupergraphSdl(opts) {
         );
         if (joinTypeGraphArgNode?.value?.kind === Kind.ENUM) {
           const graphName = joinTypeGraphArgNode.value.value;
-          if (typeNode.kind === Kind.OBJECT_TYPE_DEFINITION || typeNode.kind === Kind.INTERFACE_TYPE_DEFINITION) {
-            const keyArgumentNode = directiveNode.arguments?.find(
-              (argumentNode) => argumentNode.name.value === "key"
-            );
-            const isResolvable = !directiveNode.arguments?.some(
-              (argumentNode) => argumentNode.name.value === "resolvable" && argumentNode.value?.kind === Kind.BOOLEAN && argumentNode.value.value === false
-            );
-            if (isResolvable && keyArgumentNode?.value?.kind === Kind.STRING) {
-              let typeNameKeysMap = typeNameKeysBySubgraphMap.get(graphName);
-              if (!typeNameKeysMap) {
-                typeNameKeysMap = /* @__PURE__ */ new Map();
-                typeNameKeysBySubgraphMap.set(graphName, typeNameKeysMap);
-              }
-              let keys = typeNameKeysMap.get(typeNode.name.value);
-              if (!keys) {
-                keys = [];
-                typeNameKeysMap.set(typeNode.name.value, keys);
-              }
-              keys.push(keyArgumentNode.value.value);
-            }
-          }
           const fieldDefinitionNodesOfSubgraph = [];
           typeNode.fields?.forEach((fieldNode) => {
             const joinFieldDirectives = fieldNode.directives?.filter(
@@ -719,6 +698,34 @@ function getStitchingOptionsFromSupergraphSdl(opts) {
             graphName,
             fieldDefinitionNodesOfSubgraph
           );
+          if (typeNode.kind === Kind.OBJECT_TYPE_DEFINITION || typeNode.kind === Kind.INTERFACE_TYPE_DEFINITION) {
+            const keyArgumentNode = directiveNode.arguments?.find(
+              (argumentNode) => argumentNode.name.value === "key"
+            );
+            const isResolvable = !directiveNode.arguments?.some(
+              (argumentNode) => argumentNode.name.value === "resolvable" && argumentNode.value?.kind === Kind.BOOLEAN && argumentNode.value.value === false
+            );
+            if (keyArgumentNode?.value?.kind === Kind.STRING) {
+              const keyArgVal = keyArgumentNode.value.value;
+              if (isResolvable) {
+                if (typeNode.kind !== Kind.OBJECT_TYPE_DEFINITION || !fieldDefinitionNodesOfSubgraph.every(
+                  (fieldDefNode) => keyArgVal.includes(fieldDefNode.name.value)
+                )) {
+                  let typeNameKeysMap = typeNameKeysBySubgraphMap.get(graphName);
+                  if (!typeNameKeysMap) {
+                    typeNameKeysMap = /* @__PURE__ */ new Map();
+                    typeNameKeysBySubgraphMap.set(graphName, typeNameKeysMap);
+                  }
+                  let keys = typeNameKeysMap.get(typeNode.name.value);
+                  if (!keys) {
+                    keys = [];
+                    typeNameKeysMap.set(typeNode.name.value, keys);
+                  }
+                  keys.push(keyArgVal);
+                }
+              }
+            }
+          }
         }
       }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/federation",
-  "version": "4.3.0",
+  "version": "4.3.1-alpha-bcdf6a1333a84f3ead114d676e66e609c350e084",
   "type": "module",
   "description": "Useful tools to create and manipulate GraphQL schemas.",
   "repository": {
@@ -38,14 +38,14 @@
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
-    "@graphql-tools/delegate": "^12.0.11",
+    "@graphql-tools/delegate": "12.0.12-alpha-bcdf6a1333a84f3ead114d676e66e609c350e084",
     "@graphql-tools/executor": "^1.4.13",
     "@graphql-tools/executor-http": "^3.1.1",
     "@graphql-tools/merge": "^9.1.5",
     "@graphql-tools/schema": "^10.0.29",
-    "@graphql-tools/stitch": "^10.1.15",
+    "@graphql-tools/stitch": "10.1.16-alpha-bcdf6a1333a84f3ead114d676e66e609c350e084",
     "@graphql-tools/utils": "^11.0.0",
-    "@graphql-tools/wrap": "^11.1.11",
+    "@graphql-tools/wrap": "11.1.12-alpha-bcdf6a1333a84f3ead114d676e66e609c350e084",
     "@graphql-yoga/typed-event-target": "^3.0.2",
     "@whatwg-node/disposablestack": "^0.0.6",
     "@whatwg-node/events": "^0.1.2",