@graphql-tools/utils 8.6.8 → 8.6.11

package/index.js

@@ -3287,11 +3287,13 @@ function visitSchema(schema) {
     return visitQueue(queue, schema);
 }
 function visitQueue(queue, schema, visited = new Set()) {
+    // Interfaces encountered that are field return types need to be revisited to add their implementations
+    const revisit = new Map();
     // Navigate all types starting with pre-queued types (root types)
     while (queue.length) {
         const typeName = queue.pop();
-        // Skip types we already visited
-        if (visited.has(typeName)) {
+        // Skip types we already visited unless it is an interface type that needs revisiting
+        if (visited.has(typeName) && revisit[typeName] !== true) {
             continue;
         }
         const type = schema.getType(typeName);
@@ -3300,6 +3302,17 @@ function visitQueue(queue, schema, visited = new Set()) {
             if (graphql.isUnionType(type)) {
                 queue.push(...type.getTypes().map(type => type.name));
             }
+            // If it is an interface and it is a returned type, grab all implementations so we can use proper __typename in fragments
+            if (graphql.isInterfaceType(type) && revisit[typeName] === true) {
+                queue.push(...getImplementingTypes(type.name, schema));
+                // No need to revisit this interface again
+                revisit[typeName] = false;
+            }
+            // Visit interfaces this type is implementing if they haven't been visited yet
+            if ('getInterfaces' in type) {
+                // Only pushes to queue to visit but not return types
+                queue.push(...type.getInterfaces().map(iface => iface.name));
+            }
             // If the type has files visit those field types
             if ('getFields' in type) {
                 const fields = type.getFields();
@@ -3308,18 +3321,18 @@ function visitQueue(queue, schema, visited = new Set()) {
                     continue;
                 }
                 for (const [, field] of entries) {
-                    if (graphql.isInputObjectType(type)) {
-                        for (const arg of field.args) {
-                            queue.push(graphql.getNamedType(arg.type).name); // Visit arg types
-                        }
+                    if (graphql.isObjectType(type)) {
+                        // Visit arg types
+                        queue.push(...field.args.map(arg => graphql.getNamedType(arg.type).name));
+                    }
+                    const namedType = graphql.getNamedType(field.type);
+                    queue.push(namedType.name);
+                    // Interfaces returned on fields need to be revisited to add their implementations
+                    if (graphql.isInterfaceType(namedType) && !(namedType.name in revisit)) {
+                        revisit[namedType.name] = true;
                     }
-                    queue.push(graphql.getNamedType(field.type).name);
                 }
             }
-            // Visit interfaces this type is implementing if they haven't been visited yet
-            if ('getInterfaces' in type) {
-                queue.push(...type.getInterfaces().map(iface => iface.name));
-            }
             visited.add(typeName); // Mark as visited (and therefore it is used and should be kept)
         }
     }
@@ -4003,8 +4016,18 @@ function visitErrorsByType(errors, errorVisitorMap, errorInfo) {
         return newError;
     });
 }
+function getOperationRootType(schema, operationDef) {
+    switch (operationDef.operation) {
+        case 'query':
+            return schema.getQueryType();
+        case 'mutation':
+            return schema.getMutationType();
+        case 'subscription':
+            return schema.getSubscriptionType();
+    }
+}
 function visitRoot(root, operation, schema, fragments, variableValues, resultVisitorMap, errors, errorInfo) {
-    const operationRootType = graphql.getOperationRootType(schema, operation);
+    const operationRootType = getOperationRootType(schema, operation);
     const collectedFields = collectFields(schema, fragments, variableValues, operationRootType, operation.selectionSet, new Map(), new Set());
     return visitObjectValue(root, operationRootType, collectedFields, schema, fragments, variableValues, resultVisitorMap, 0, errors, errorInfo);
 }

package/index.mjs

@@ -1,4 +1,4 @@
-import { parse, GraphQLError, isNonNullType, Kind, valueFromAST, print, isObjectType, isListType, isSpecifiedDirective, astFromValue, isSpecifiedScalarType, isIntrospectionType, isInterfaceType, isUnionType, isInputObjectType, isEnumType, isScalarType, GraphQLDeprecatedDirective, specifiedRules, concatAST, validate, versionInfo, buildClientSchema, visit, TokenKind, Source, isTypeSystemDefinitionNode, getNamedType, GraphQLString, GraphQLNonNull, GraphQLList, GraphQLID, GraphQLBoolean, GraphQLFloat, GraphQLInt, GraphQLObjectType, GraphQLInterfaceType, GraphQLInputObjectType, GraphQLDirective, GraphQLUnionType, GraphQLEnumType, GraphQLScalarType, isNamedType, getNullableType, isLeafType, GraphQLSchema, isDirective, isCompositeType, doTypesOverlap, getOperationAST, getDirectiveValues, GraphQLSkipDirective, GraphQLIncludeDirective, typeFromAST, isAbstractType, getOperationRootType, TypeNameMetaFieldDef, buildASTSchema } from 'graphql';
+import { parse, GraphQLError, isNonNullType, Kind, valueFromAST, print, isObjectType, isListType, isSpecifiedDirective, astFromValue, isSpecifiedScalarType, isIntrospectionType, isInterfaceType, isUnionType, isInputObjectType, isEnumType, isScalarType, GraphQLDeprecatedDirective, specifiedRules, concatAST, validate, versionInfo, buildClientSchema, visit, TokenKind, Source, isTypeSystemDefinitionNode, getNamedType, GraphQLString, GraphQLNonNull, GraphQLList, GraphQLID, GraphQLBoolean, GraphQLFloat, GraphQLInt, GraphQLObjectType, GraphQLInterfaceType, GraphQLInputObjectType, GraphQLDirective, GraphQLUnionType, GraphQLEnumType, GraphQLScalarType, isNamedType, getNullableType, isLeafType, GraphQLSchema, isDirective, isCompositeType, doTypesOverlap, getOperationAST, getDirectiveValues, GraphQLSkipDirective, GraphQLIncludeDirective, typeFromAST, isAbstractType, TypeNameMetaFieldDef, buildASTSchema } from 'graphql';
 
 const asArray = (fns) => (Array.isArray(fns) ? fns : fns ? [fns] : []);
 const invalidDocRegex = /\.[a-z0-9]+$/i;
@@ -3285,11 +3285,13 @@ function visitSchema(schema) {
     return visitQueue(queue, schema);
 }
 function visitQueue(queue, schema, visited = new Set()) {
+    // Interfaces encountered that are field return types need to be revisited to add their implementations
+    const revisit = new Map();
     // Navigate all types starting with pre-queued types (root types)
     while (queue.length) {
         const typeName = queue.pop();
-        // Skip types we already visited
-        if (visited.has(typeName)) {
+        // Skip types we already visited unless it is an interface type that needs revisiting
+        if (visited.has(typeName) && revisit[typeName] !== true) {
             continue;
         }
         const type = schema.getType(typeName);
@@ -3298,6 +3300,17 @@ function visitQueue(queue, schema, visited = new Set()) {
             if (isUnionType(type)) {
                 queue.push(...type.getTypes().map(type => type.name));
             }
+            // If it is an interface and it is a returned type, grab all implementations so we can use proper __typename in fragments
+            if (isInterfaceType(type) && revisit[typeName] === true) {
+                queue.push(...getImplementingTypes(type.name, schema));
+                // No need to revisit this interface again
+                revisit[typeName] = false;
+            }
+            // Visit interfaces this type is implementing if they haven't been visited yet
+            if ('getInterfaces' in type) {
+                // Only pushes to queue to visit but not return types
+                queue.push(...type.getInterfaces().map(iface => iface.name));
+            }
             // If the type has files visit those field types
             if ('getFields' in type) {
                 const fields = type.getFields();
@@ -3306,18 +3319,18 @@ function visitQueue(queue, schema, visited = new Set()) {
                     continue;
                 }
                 for (const [, field] of entries) {
-                    if (isInputObjectType(type)) {
-                        for (const arg of field.args) {
-                            queue.push(getNamedType(arg.type).name); // Visit arg types
-                        }
+                    if (isObjectType(type)) {
+                        // Visit arg types
+                        queue.push(...field.args.map(arg => getNamedType(arg.type).name));
+                    }
+                    const namedType = getNamedType(field.type);
+                    queue.push(namedType.name);
+                    // Interfaces returned on fields need to be revisited to add their implementations
+                    if (isInterfaceType(namedType) && !(namedType.name in revisit)) {
+                        revisit[namedType.name] = true;
                     }
-                    queue.push(getNamedType(field.type).name);
                 }
             }
-            // Visit interfaces this type is implementing if they haven't been visited yet
-            if ('getInterfaces' in type) {
-                queue.push(...type.getInterfaces().map(iface => iface.name));
-            }
             visited.add(typeName); // Mark as visited (and therefore it is used and should be kept)
         }
     }
@@ -4001,6 +4014,16 @@ function visitErrorsByType(errors, errorVisitorMap, errorInfo) {
         return newError;
     });
 }
+function getOperationRootType(schema, operationDef) {
+    switch (operationDef.operation) {
+        case 'query':
+            return schema.getQueryType();
+        case 'mutation':
+            return schema.getMutationType();
+        case 'subscription':
+            return schema.getSubscriptionType();
+    }
+}
 function visitRoot(root, operation, schema, fragments, variableValues, resultVisitorMap, errors, errorInfo) {
     const operationRootType = getOperationRootType(schema, operation);
     const collectedFields = collectFields(schema, fragments, variableValues, operationRootType, operation.selectionSet, new Map(), new Set());

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@graphql-tools/utils",
-  "version": "8.6.8",
+  "version": "8.6.11",
   "description": "Common package containing utils and types for GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "dependencies": {
-    "tslib": "~2.3.0"
+    "tslib": "~2.4.0"
   },
   "repository": {
     "type": "git",