fix(stitch): respect interface types as computed field types

ardatan · Apr 24, 2024 · 6d26702 · 6d26702
1 parent ee853ed
commit 6d26702
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 30 deletions.
diff --git a/.changeset/purple-monkeys-vanish.md b/.changeset/purple-monkeys-vanish.md
@@ -0,0 +1,5 @@
+---
+"@graphql-tools/stitch": patch
+---
+
+Respect interface types as computed field types
diff --git a/packages/federation/test/__snapshots__/supergraphs.test.ts.snap b/packages/federation/test/__snapshots__/supergraphs.test.ts.snap
@@ -525,7 +525,11 @@ exports[`Supergraphs d.graphql matches: d.graphql - stitchedSchema 1`] = `
 }
 
 type Query {
-  getAuthor: ReactionAuthor
+  node(id: ID!): Node
+}
+
+interface Node {
+  id: ID!
 }
 
 type Mutation {
@@ -556,10 +560,6 @@ type ConcreteBoard implements Board & Node & SomeBoard {
 
 scalar Url @specifiedBy(url: "https://datatracker.ietf.org/doc/html/rfc1738")
 
-interface Node {
-  id: ID!
-}
-
 union Mentionable = ReactionAuthor | OwnerChangedNotification
 
 type OwnerChangedNotification implements AppNotification {
@@ -594,9 +594,14 @@ exports[`Supergraphs d.graphql subgraphs: d.graphql - NODERESOLVER 1`] = `
 }
 
 type Query {
+  node(id: ID!): Node
   _entities(representations: [_Any!]!): _Entity
 }
 
+interface Node {
+  id: ID!
+}
+
 union _Entity
 
 scalar _Any"
@@ -613,7 +618,6 @@ type Mutation {
 }
 
 type Query {
-  getAuthor: ReactionAuthor
   _entities(representations: [_Any!]!): _Entity
 }
 

diff --git a/packages/federation/test/fixtures/supergraphs/d.graphql b/packages/federation/test/fixtures/supergraphs/d.graphql
@@ -78,6 +78,10 @@ interface Board {
   isVisible: Boolean!
 }
 
+type Query {
+  node(id: ID!): Node @join__field(graph: NODERESOLVER)
+}
+
 interface SomeBoard {
   # introducing this interface and field causes:
   # Mesh - Supergraph 💥 Failed to generate the schema Error: Unknown type: "SomeEntity".

diff --git a/packages/stitch/src/subschemaConfigTransforms/isolateComputedFieldsTransformer.ts b/packages/stitch/src/subschemaConfigTransforms/isolateComputedFieldsTransformer.ts
@@ -227,16 +227,11 @@ type IsolatedSubschemaInput = Exclude<SubschemaConfig, 'merge'> & {
 function filterIsolatedSubschema(subschemaConfig: IsolatedSubschemaInput): SubschemaConfig {
   const rootFields: Record<string, boolean> = {};
   const computedFieldTypes: Record<string, boolean> = {}; // contains types of computed fields that have no root field
-  const visitedTypes = new WeakSet<GraphQLNamedOutputType>();
   function listReachableTypesToIsolate(
     subschemaConfig: SubschemaConfig,
     type: GraphQLNamedOutputType,
-    typeNames: string[] = [],
+    typeNames = new Set<string>(),
   ) {
-    if (visitedTypes.has(type)) {
-      return typeNames;
-    }
-    visitedTypes.add(type);
     if (isScalarType(type)) {
       return typeNames;
     } else if (
@@ -246,38 +241,30 @@ function filterIsolatedSubschema(subschemaConfig: IsolatedSubschemaInput): Subsc
       subschemaConfig.merge[type.name].selectionSet
     ) {
       // this is a merged type, no need to descend further
-      if (!typeNames.includes(type.name)) {
-        typeNames.push(type.name);
-      }
+      typeNames.add(type.name);
       return typeNames;
     } else if (isCompositeType(type)) {
-      if (!typeNames.includes(type.name)) {
-        typeNames.push(type.name);
-      }
+      typeNames.add(type.name);
 
       // descent into all field types potentially via interfaces implementations/unions members
-      const types: GraphQLObjectType[] = [];
+      const types = new Set<GraphQLObjectType>();
       if (isObjectType(type)) {
-        types.push(type);
+        types.add(type);
       } else if (isInterfaceType(type)) {
-        types.push(
-          ...getImplementingTypes(type.name, subschemaConfig.schema).map(
-            name => subschemaConfig.schema.getType(name)! as GraphQLObjectType,
-          ),
+        getImplementingTypes(type.name, subschemaConfig.schema).forEach(name =>
+          types.add(subschemaConfig.schema.getType(name)! as GraphQLObjectType),
         );
       } else if (isUnionType(type)) {
-        types.push(...type.getTypes());
+        type.getTypes().forEach(t => types.add(t));
       }
 
       for (const type of types) {
-        if (!typeNames.includes(type.name)) {
-          typeNames.push(type.name);
-        }
+        typeNames.add(type.name);
 
         for (const f of Object.values(type.getFields())) {
           const fieldType = getNamedType(f.type);
-          if (!typeNames.includes(fieldType.name) && isCompositeType(fieldType)) {
-            typeNames.push(...listReachableTypesToIsolate(subschemaConfig, fieldType));
+          if (!typeNames.has(fieldType.name) && isCompositeType(fieldType)) {
+            listReachableTypesToIsolate(subschemaConfig, fieldType, typeNames);
           }
         }
       }
@@ -310,6 +297,7 @@ function filterIsolatedSubschema(subschemaConfig: IsolatedSubschemaInput): Subsc
 
     for (const fieldName of computedFields) {
       const fieldType = getNamedType(type.getFields()[fieldName!].type);
+      computedFieldTypes[fieldType.name] = true;
       listReachableTypesToIsolate(subschemaConfig, fieldType).forEach(tn => {
         computedFieldTypes[tn] = true;
       });