@graphql-tools/federation 3.1.7 → 3.1.8-rc-2f72fd40bed22a2864173f14d4cdcedacc503a73

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @graphql-tools/federation
 
+## 3.1.8-rc-2f72fd40bed22a2864173f14d4cdcedacc503a73
+
+### Patch Changes
+
+- [#950](https://github.com/graphql-hive/gateway/pull/950) [`c7ea2c5`](https://github.com/graphql-hive/gateway/commit/c7ea2c5ae71b6b338ef22edd927a3fc93803965f) Thanks [@kroupacz](https://github.com/kroupacz)! - Errors should not be swallowed when it is thrown from the shared root
+
+- Updated dependencies [[`c7ea2c5`](https://github.com/graphql-hive/gateway/commit/c7ea2c5ae71b6b338ef22edd927a3fc93803965f)]:
+  - @graphql-tools/delegate@10.2.17-rc-2f72fd40bed22a2864173f14d4cdcedacc503a73
+  - @graphql-tools/stitch@9.4.22-rc-2f72fd40bed22a2864173f14d4cdcedacc503a73
+  - @graphql-tools/wrap@10.0.35-rc-2f72fd40bed22a2864173f14d4cdcedacc503a73
+
 ## 3.1.7
 
 ### Patch Changes

package/dist/index.cjs

@@ -980,6 +980,7 @@ function getStitchingOptionsFromSupergraphSdl(opts) {
     }
     let executor = executorHttp.buildHTTPExecutor({
       endpoint,
+      serviceName: subgraphName,
       ...httpExecutorOpts
     });
     if (globalThis.process?.env?.["DEBUG"]) {
@@ -1197,6 +1198,25 @@ function getStitchingOptionsFromSupergraphSdl(opts) {
         }
         const jobs = [];
         let hasPromise = false;
+        const fieldNames = /* @__PURE__ */ new Set();
+        currentAvailableSelectionSet?.selections.forEach((selection) => {
+          if (selection.kind === graphql.Kind.FIELD && selection.name.value === info.fieldName) {
+            selection.selectionSet?.selections.forEach((selection2) => {
+              if (selection2.kind === graphql.Kind.FIELD) {
+                fieldNames.add(selection2.name.value);
+              }
+            });
+          }
+        });
+        currentUnavailableSelectionSet?.selections.forEach((selection) => {
+          if (selection.kind === graphql.Kind.FIELD && selection.name.value === info.fieldName) {
+            selection.selectionSet?.selections.forEach((selection2) => {
+              if (selection2.kind === graphql.Kind.FIELD) {
+                fieldNames.add(selection2.name.value);
+              }
+            });
+          }
+        });
         const mainJob = delegate.delegateToSchema({
           schema: currentSubschema,
           operation: rootTypeMap.get(info.parentType.name) || "query",
@@ -1241,9 +1261,11 @@ function getStitchingOptionsFromSupergraphSdl(opts) {
           return jobs[0];
         }
         if (hasPromise) {
-          return Promise.all(jobs).then((results) => mergeResults(results));
+          return Promise.all(jobs).then(
+            (results) => mergeResults(results, fieldNames)
+          );
         }
-        return mergeResults(jobs);
+        return mergeResults(jobs, fieldNames);
       };
       if (operationType === "subscription") {
         return {
@@ -1428,13 +1450,45 @@ const specifiedTypeNames = [
   "_Any",
   "_Entity"
 ];
-function makeExternalObject(data, errors) {
+function makeExternalObject(data, errors, fieldNames) {
   if (!delegate.isExternalObject(data) && typeof data === "object" && data != null) {
     data[delegate.UNPATHED_ERRORS_SYMBOL] = errors;
   }
+  if (errors.length) {
+    const errorsToPop = [...errors];
+    const fieldNamesToPop = [];
+    for (const fieldName of fieldNames) {
+      if (data?.[fieldName] == null) {
+        fieldNamesToPop.push(fieldName);
+      }
+    }
+    while (fieldNamesToPop.length && errorsToPop.length) {
+      const fieldName = fieldNamesToPop.pop();
+      if (!fieldName) {
+        break;
+      }
+      const error = errorsToPop.pop();
+      if (!error) {
+        break;
+      }
+      let errorToSet;
+      if (fieldNamesToPop.length || !errorsToPop.length) {
+        errorToSet = error;
+      } else {
+        errorToSet = new AggregateError(
+          errorsToPop,
+          errorsToPop.map((error2) => error2.message).join(", \n")
+        );
+      }
+      if (errorToSet) {
+        data ||= {};
+        data[fieldName] = errorToSet;
+      }
+    }
+  }
   return data;
 }
-function mergeResults(results) {
+function mergeResults(results, fieldNames) {
   const errors = [];
   const datas = [];
   for (const result of results) {
@@ -1448,9 +1502,13 @@ function mergeResults(results) {
   }
   if (datas.length) {
     if (datas.length === 1) {
-      return makeExternalObject(datas[0], errors);
+      return makeExternalObject(datas[0], errors, fieldNames);
     }
-    return makeExternalObject(utils.mergeDeep(datas, void 0, true, true), errors);
+    return makeExternalObject(
+      utils.mergeDeep(datas, void 0, true, true),
+      errors,
+      fieldNames
+    );
   }
   if (errors.length) {
     if (errors.length === 1) {

package/dist/index.js

@@ -978,6 +978,7 @@ function getStitchingOptionsFromSupergraphSdl(opts) {
     }
     let executor = buildHTTPExecutor({
       endpoint,
+      serviceName: subgraphName,
       ...httpExecutorOpts
     });
     if (globalThis.process?.env?.["DEBUG"]) {
@@ -1195,6 +1196,25 @@ function getStitchingOptionsFromSupergraphSdl(opts) {
         }
         const jobs = [];
         let hasPromise = false;
+        const fieldNames = /* @__PURE__ */ new Set();
+        currentAvailableSelectionSet?.selections.forEach((selection) => {
+          if (selection.kind === Kind.FIELD && selection.name.value === info.fieldName) {
+            selection.selectionSet?.selections.forEach((selection2) => {
+              if (selection2.kind === Kind.FIELD) {
+                fieldNames.add(selection2.name.value);
+              }
+            });
+          }
+        });
+        currentUnavailableSelectionSet?.selections.forEach((selection) => {
+          if (selection.kind === Kind.FIELD && selection.name.value === info.fieldName) {
+            selection.selectionSet?.selections.forEach((selection2) => {
+              if (selection2.kind === Kind.FIELD) {
+                fieldNames.add(selection2.name.value);
+              }
+            });
+          }
+        });
         const mainJob = delegateToSchema({
           schema: currentSubschema,
           operation: rootTypeMap.get(info.parentType.name) || "query",
@@ -1239,9 +1259,11 @@ function getStitchingOptionsFromSupergraphSdl(opts) {
           return jobs[0];
         }
         if (hasPromise) {
-          return Promise.all(jobs).then((results) => mergeResults(results));
+          return Promise.all(jobs).then(
+            (results) => mergeResults(results, fieldNames)
+          );
         }
-        return mergeResults(jobs);
+        return mergeResults(jobs, fieldNames);
       };
       if (operationType === "subscription") {
         return {
@@ -1426,13 +1448,45 @@ const specifiedTypeNames = [
   "_Any",
   "_Entity"
 ];
-function makeExternalObject(data, errors) {
+function makeExternalObject(data, errors, fieldNames) {
   if (!isExternalObject(data) && typeof data === "object" && data != null) {
     data[UNPATHED_ERRORS_SYMBOL] = errors;
   }
+  if (errors.length) {
+    const errorsToPop = [...errors];
+    const fieldNamesToPop = [];
+    for (const fieldName of fieldNames) {
+      if (data?.[fieldName] == null) {
+        fieldNamesToPop.push(fieldName);
+      }
+    }
+    while (fieldNamesToPop.length && errorsToPop.length) {
+      const fieldName = fieldNamesToPop.pop();
+      if (!fieldName) {
+        break;
+      }
+      const error = errorsToPop.pop();
+      if (!error) {
+        break;
+      }
+      let errorToSet;
+      if (fieldNamesToPop.length || !errorsToPop.length) {
+        errorToSet = error;
+      } else {
+        errorToSet = new AggregateError(
+          errorsToPop,
+          errorsToPop.map((error2) => error2.message).join(", \n")
+        );
+      }
+      if (errorToSet) {
+        data ||= {};
+        data[fieldName] = errorToSet;
+      }
+    }
+  }
   return data;
 }
-function mergeResults(results) {
+function mergeResults(results, fieldNames) {
   const errors = [];
   const datas = [];
   for (const result of results) {
@@ -1446,9 +1500,13 @@ function mergeResults(results) {
   }
   if (datas.length) {
     if (datas.length === 1) {
-      return makeExternalObject(datas[0], errors);
+      return makeExternalObject(datas[0], errors, fieldNames);
     }
-    return makeExternalObject(mergeDeep(datas, void 0, true, true), errors);
+    return makeExternalObject(
+      mergeDeep(datas, void 0, true, true),
+      errors,
+      fieldNames
+    );
   }
   if (errors.length) {
     if (errors.length === 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/federation",
-  "version": "3.1.7",
+  "version": "3.1.8-rc-2f72fd40bed22a2864173f14d4cdcedacc503a73",
   "type": "module",
   "description": "Useful tools to create and manipulate GraphQL schemas.",
   "repository": {
@@ -38,13 +38,13 @@
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
-    "@graphql-tools/delegate": "^10.2.16",
+    "@graphql-tools/delegate": "10.2.17-rc-2f72fd40bed22a2864173f14d4cdcedacc503a73",
     "@graphql-tools/executor-http": "^1.3.2",
     "@graphql-tools/merge": "^9.0.12",
     "@graphql-tools/schema": "^10.0.11",
-    "@graphql-tools/stitch": "^9.4.21",
+    "@graphql-tools/stitch": "9.4.22-rc-2f72fd40bed22a2864173f14d4cdcedacc503a73",
     "@graphql-tools/utils": "^10.8.1",
-    "@graphql-tools/wrap": "^10.0.34",
+    "@graphql-tools/wrap": "10.0.35-rc-2f72fd40bed22a2864173f14d4cdcedacc503a73",
     "@graphql-yoga/typed-event-target": "^3.0.1",
     "@whatwg-node/disposablestack": "^0.0.6",
     "@whatwg-node/events": "^0.1.2",