@graphql-tools/utils 8.1.0 → 8.1.2

package/es5/helpers.d.ts

@@ -1,10 +1,8 @@
 import { ASTNode } from 'graphql';
 export declare const asArray: <T>(fns: T | T[]) => T[];
-export declare function isEqual<T>(a: T, b: T): boolean;
-export declare function isNotEqual<T>(a: T, b: T): boolean;
-export declare function isDocumentString(str: string): boolean;
-export declare function isValidPath(str: string): boolean;
-export declare function compareStrings<A, B>(a: A, b: B): 0 | 1 | -1;
+export declare function isDocumentString(str: any): boolean;
+export declare function isValidPath(str: any): boolean;
+export declare function compareStrings<A, B>(a: A, b: B): 1 | -1 | 0;
 export declare function nodeToString(a: ASTNode): string;
 export declare function compareNodes(a: ASTNode, b: ASTNode, customFn?: (a: any, b: any) => number): number;
 export declare function isSome<T>(input: T): input is Exclude<T, null | undefined>;

package/es5/index.js

@@ -11,30 +11,17 @@ const blockString_js = require('graphql/language/blockString.js');
 const execute_js = require('graphql/execution/execute.js');
 
 var asArray = function (fns) { return (Array.isArray(fns) ? fns : fns ? [fns] : []); };
-function isEqual(a, b) {
-    if (Array.isArray(a) && Array.isArray(b)) {
-        if (a.length !== b.length) {
-            return false;
-        }
-        for (var index = 0; index < a.length; index++) {
-            if (a[index] !== b[index]) {
-                return false;
-            }
-        }
-        return true;
-    }
-    return a === b || (!a && !b);
-}
-function isNotEqual(a, b) {
-    return !isEqual(a, b);
-}
+var invalidDocRegex = /\.[a-z0-9]+$/i;
 function isDocumentString(str) {
+    if (typeof str !== 'string') {
+        return false;
+    }
     // XXX: is-valid-path or is-glob treat SDL as a valid path
     // (`scalar Date` for example)
     // this why checking the extension is fast enough
     // and prevent from parsing the string in order to find out
     // if the string is a SDL
-    if (/\.[a-z0-9]+$/i.test(str)) {
+    if (invalidDocRegex.test(str)) {
         return false;
     }
     try {
@@ -1537,19 +1524,21 @@ function resetFieldMap() {
     fieldTypeMap = new Map();
 }
 function buildOperationNodeForField(_a) {
-    var schema = _a.schema, kind = _a.kind, field = _a.field, models = _a.models, ignore = _a.ignore, depthLimit = _a.depthLimit, circularReferenceDepth = _a.circularReferenceDepth, argNames = _a.argNames, _b = _a.selectedFields, selectedFields = _b === void 0 ? true : _b;
+    var schema = _a.schema, kind = _a.kind, field = _a.field, models = _a.models, _b = _a.ignore, ignore = _b === void 0 ? [] : _b, depthLimit = _a.depthLimit, circularReferenceDepth = _a.circularReferenceDepth, argNames = _a.argNames, _c = _a.selectedFields, selectedFields = _c === void 0 ? true : _c;
     resetOperationVariables();
     resetFieldMap();
+    var rootTypeNames = getRootTypeNames(schema);
     var operationNode = buildOperationAndCollectVariables({
         schema: schema,
         fieldName: field,
         kind: kind,
         models: models || [],
-        ignore: ignore || [],
+        ignore: ignore,
         depthLimit: depthLimit || Infinity,
         circularReferenceDepth: circularReferenceDepth || 1,
         argNames: argNames,
         selectedFields: selectedFields,
+        rootTypeNames: rootTypeNames,
     });
     // attach variables
     operationNode.variableDefinitions = tslib.__spreadArray([], tslib.__read(operationVariables));
@@ -1559,7 +1548,7 @@ function buildOperationNodeForField(_a) {
 }
 function buildOperationAndCollectVariables(_a) {
     var e_1, _b;
-    var schema = _a.schema, fieldName = _a.fieldName, kind = _a.kind, models = _a.models, ignore = _a.ignore, depthLimit = _a.depthLimit, circularReferenceDepth = _a.circularReferenceDepth, argNames = _a.argNames, selectedFields = _a.selectedFields;
+    var schema = _a.schema, fieldName = _a.fieldName, kind = _a.kind, models = _a.models, ignore = _a.ignore, depthLimit = _a.depthLimit, circularReferenceDepth = _a.circularReferenceDepth, argNames = _a.argNames, selectedFields = _a.selectedFields, rootTypeNames = _a.rootTypeNames;
     var type = getDefinedRootType(schema, kind);
     var field = type.getFields()[fieldName];
     var operationName = fieldName + "_" + kind;
@@ -1606,13 +1595,14 @@ function buildOperationAndCollectVariables(_a) {
                     depth: 0,
                     argNames: argNames,
                     selectedFields: selectedFields,
+                    rootTypeNames: rootTypeNames,
                 }),
             ],
         },
     };
 }
 function resolveSelectionSet(_a) {
-    var parent = _a.parent, type = _a.type, models = _a.models, firstCall = _a.firstCall, path = _a.path, ancestors = _a.ancestors, ignore = _a.ignore, depthLimit = _a.depthLimit, circularReferenceDepth = _a.circularReferenceDepth, schema = _a.schema, depth = _a.depth, argNames = _a.argNames, selectedFields = _a.selectedFields;
+    var parent = _a.parent, type = _a.type, models = _a.models, firstCall = _a.firstCall, path = _a.path, ancestors = _a.ancestors, ignore = _a.ignore, depthLimit = _a.depthLimit, circularReferenceDepth = _a.circularReferenceDepth, schema = _a.schema, depth = _a.depth, argNames = _a.argNames, selectedFields = _a.selectedFields, rootTypeNames = _a.rootTypeNames;
     if (typeof selectedFields === 'boolean' && depth > depthLimit) {
         return;
     }
@@ -1649,6 +1639,7 @@ function resolveSelectionSet(_a) {
                         depth: depth,
                         argNames: argNames,
                         selectedFields: selectedFields,
+                        rootTypeNames: rootTypeNames,
                     }),
                 };
             })
@@ -1688,13 +1679,14 @@ function resolveSelectionSet(_a) {
                         depth: depth,
                         argNames: argNames,
                         selectedFields: selectedFields,
+                        rootTypeNames: rootTypeNames,
                     }),
                 };
             })
                 .filter(function (fragmentNode) { var _a, _b; return ((_b = (_a = fragmentNode === null || fragmentNode === void 0 ? void 0 : fragmentNode.selectionSet) === null || _a === void 0 ? void 0 : _a.selections) === null || _b === void 0 ? void 0 : _b.length) > 0; }),
         };
     }
-    if (graphql.isObjectType(type)) {
+    if (graphql.isObjectType(type) && !rootTypeNames.has(type.name)) {
         var isIgnored = ignore.includes(type.name) || ignore.includes(parent.name + "." + path[path.length - 1]);
         var isModel = models.includes(type.name);
         if (!firstCall && isModel && !isIgnored) {
@@ -1736,6 +1728,7 @@ function resolveSelectionSet(_a) {
                         depth: depth,
                         argNames: argNames,
                         selectedFields: selectedSubFields,
+                        rootTypeNames: rootTypeNames,
                     });
                 }
                 return null;
@@ -1791,7 +1784,7 @@ function getArgumentName(name, path) {
     return tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(path)), [name]).join('_');
 }
 function resolveField(_a) {
-    var type = _a.type, field = _a.field, models = _a.models, firstCall = _a.firstCall, path = _a.path, ancestors = _a.ancestors, ignore = _a.ignore, depthLimit = _a.depthLimit, circularReferenceDepth = _a.circularReferenceDepth, schema = _a.schema, depth = _a.depth, argNames = _a.argNames, selectedFields = _a.selectedFields;
+    var type = _a.type, field = _a.field, models = _a.models, firstCall = _a.firstCall, path = _a.path, ancestors = _a.ancestors, ignore = _a.ignore, depthLimit = _a.depthLimit, circularReferenceDepth = _a.circularReferenceDepth, schema = _a.schema, depth = _a.depth, argNames = _a.argNames, selectedFields = _a.selectedFields, rootTypeNames = _a.rootTypeNames;
     var namedType = graphql.getNamedType(field.type);
     var args = [];
     var removeField = false;
@@ -1853,6 +1846,7 @@ function resolveField(_a) {
                 depth: depth + 1,
                 argNames: argNames,
                 selectedFields: selectedFields,
+                rootTypeNames: rootTypeNames,
             }) || undefined, arguments: args });
     }
     return tslib.__assign(tslib.__assign({ kind: graphql.Kind.FIELD, name: {
@@ -4480,9 +4474,7 @@ exports.isAsyncIterable = isAsyncIterable;
 exports.isDescribable = isDescribable;
 exports.isDocumentNode = isDocumentNode;
 exports.isDocumentString = isDocumentString;
-exports.isEqual = isEqual;
 exports.isNamedStub = isNamedStub;
-exports.isNotEqual = isNotEqual;
 exports.isSome = isSome;
 exports.isValidPath = isValidPath;
 exports.makeDeprecatedDirective = makeDeprecatedDirective;

package/es5/index.mjs

@@ -5,30 +5,17 @@ import { dedentBlockStringValue } from 'graphql/language/blockString.js';
 import { collectFields } from 'graphql/execution/execute.js';
 
 var asArray = function (fns) { return (Array.isArray(fns) ? fns : fns ? [fns] : []); };
-function isEqual(a, b) {
-    if (Array.isArray(a) && Array.isArray(b)) {
-        if (a.length !== b.length) {
-            return false;
-        }
-        for (var index = 0; index < a.length; index++) {
-            if (a[index] !== b[index]) {
-                return false;
-            }
-        }
-        return true;
-    }
-    return a === b || (!a && !b);
-}
-function isNotEqual(a, b) {
-    return !isEqual(a, b);
-}
+var invalidDocRegex = /\.[a-z0-9]+$/i;
 function isDocumentString(str) {
+    if (typeof str !== 'string') {
+        return false;
+    }
     // XXX: is-valid-path or is-glob treat SDL as a valid path
     // (`scalar Date` for example)
     // this why checking the extension is fast enough
     // and prevent from parsing the string in order to find out
     // if the string is a SDL
-    if (/\.[a-z0-9]+$/i.test(str)) {
+    if (invalidDocRegex.test(str)) {
         return false;
     }
     try {
@@ -1531,19 +1518,21 @@ function resetFieldMap() {
     fieldTypeMap = new Map();
 }
 function buildOperationNodeForField(_a) {
-    var schema = _a.schema, kind = _a.kind, field = _a.field, models = _a.models, ignore = _a.ignore, depthLimit = _a.depthLimit, circularReferenceDepth = _a.circularReferenceDepth, argNames = _a.argNames, _b = _a.selectedFields, selectedFields = _b === void 0 ? true : _b;
+    var schema = _a.schema, kind = _a.kind, field = _a.field, models = _a.models, _b = _a.ignore, ignore = _b === void 0 ? [] : _b, depthLimit = _a.depthLimit, circularReferenceDepth = _a.circularReferenceDepth, argNames = _a.argNames, _c = _a.selectedFields, selectedFields = _c === void 0 ? true : _c;
     resetOperationVariables();
     resetFieldMap();
+    var rootTypeNames = getRootTypeNames(schema);
     var operationNode = buildOperationAndCollectVariables({
         schema: schema,
         fieldName: field,
         kind: kind,
         models: models || [],
-        ignore: ignore || [],
+        ignore: ignore,
         depthLimit: depthLimit || Infinity,
         circularReferenceDepth: circularReferenceDepth || 1,
         argNames: argNames,
         selectedFields: selectedFields,
+        rootTypeNames: rootTypeNames,
     });
     // attach variables
     operationNode.variableDefinitions = __spreadArray([], __read(operationVariables));
@@ -1553,7 +1542,7 @@ function buildOperationNodeForField(_a) {
 }
 function buildOperationAndCollectVariables(_a) {
     var e_1, _b;
-    var schema = _a.schema, fieldName = _a.fieldName, kind = _a.kind, models = _a.models, ignore = _a.ignore, depthLimit = _a.depthLimit, circularReferenceDepth = _a.circularReferenceDepth, argNames = _a.argNames, selectedFields = _a.selectedFields;
+    var schema = _a.schema, fieldName = _a.fieldName, kind = _a.kind, models = _a.models, ignore = _a.ignore, depthLimit = _a.depthLimit, circularReferenceDepth = _a.circularReferenceDepth, argNames = _a.argNames, selectedFields = _a.selectedFields, rootTypeNames = _a.rootTypeNames;
     var type = getDefinedRootType(schema, kind);
     var field = type.getFields()[fieldName];
     var operationName = fieldName + "_" + kind;
@@ -1600,13 +1589,14 @@ function buildOperationAndCollectVariables(_a) {
                     depth: 0,
                     argNames: argNames,
                     selectedFields: selectedFields,
+                    rootTypeNames: rootTypeNames,
                 }),
             ],
         },
     };
 }
 function resolveSelectionSet(_a) {
-    var parent = _a.parent, type = _a.type, models = _a.models, firstCall = _a.firstCall, path = _a.path, ancestors = _a.ancestors, ignore = _a.ignore, depthLimit = _a.depthLimit, circularReferenceDepth = _a.circularReferenceDepth, schema = _a.schema, depth = _a.depth, argNames = _a.argNames, selectedFields = _a.selectedFields;
+    var parent = _a.parent, type = _a.type, models = _a.models, firstCall = _a.firstCall, path = _a.path, ancestors = _a.ancestors, ignore = _a.ignore, depthLimit = _a.depthLimit, circularReferenceDepth = _a.circularReferenceDepth, schema = _a.schema, depth = _a.depth, argNames = _a.argNames, selectedFields = _a.selectedFields, rootTypeNames = _a.rootTypeNames;
     if (typeof selectedFields === 'boolean' && depth > depthLimit) {
         return;
     }
@@ -1643,6 +1633,7 @@ function resolveSelectionSet(_a) {
                         depth: depth,
                         argNames: argNames,
                         selectedFields: selectedFields,
+                        rootTypeNames: rootTypeNames,
                     }),
                 };
             })
@@ -1682,13 +1673,14 @@ function resolveSelectionSet(_a) {
                         depth: depth,
                         argNames: argNames,
                         selectedFields: selectedFields,
+                        rootTypeNames: rootTypeNames,
                     }),
                 };
             })
                 .filter(function (fragmentNode) { var _a, _b; return ((_b = (_a = fragmentNode === null || fragmentNode === void 0 ? void 0 : fragmentNode.selectionSet) === null || _a === void 0 ? void 0 : _a.selections) === null || _b === void 0 ? void 0 : _b.length) > 0; }),
         };
     }
-    if (isObjectType(type)) {
+    if (isObjectType(type) && !rootTypeNames.has(type.name)) {
         var isIgnored = ignore.includes(type.name) || ignore.includes(parent.name + "." + path[path.length - 1]);
         var isModel = models.includes(type.name);
         if (!firstCall && isModel && !isIgnored) {
@@ -1730,6 +1722,7 @@ function resolveSelectionSet(_a) {
                         depth: depth,
                         argNames: argNames,
                         selectedFields: selectedSubFields,
+                        rootTypeNames: rootTypeNames,
                     });
                 }
                 return null;
@@ -1785,7 +1778,7 @@ function getArgumentName(name, path) {
     return __spreadArray(__spreadArray([], __read(path)), [name]).join('_');
 }
 function resolveField(_a) {
-    var type = _a.type, field = _a.field, models = _a.models, firstCall = _a.firstCall, path = _a.path, ancestors = _a.ancestors, ignore = _a.ignore, depthLimit = _a.depthLimit, circularReferenceDepth = _a.circularReferenceDepth, schema = _a.schema, depth = _a.depth, argNames = _a.argNames, selectedFields = _a.selectedFields;
+    var type = _a.type, field = _a.field, models = _a.models, firstCall = _a.firstCall, path = _a.path, ancestors = _a.ancestors, ignore = _a.ignore, depthLimit = _a.depthLimit, circularReferenceDepth = _a.circularReferenceDepth, schema = _a.schema, depth = _a.depth, argNames = _a.argNames, selectedFields = _a.selectedFields, rootTypeNames = _a.rootTypeNames;
     var namedType = getNamedType(field.type);
     var args = [];
     var removeField = false;
@@ -1847,6 +1840,7 @@ function resolveField(_a) {
                 depth: depth + 1,
                 argNames: argNames,
                 selectedFields: selectedFields,
+                rootTypeNames: rootTypeNames,
             }) || undefined, arguments: args });
     }
     return __assign(__assign({ kind: Kind.FIELD, name: {
@@ -4418,4 +4412,4 @@ function isFieldDefinitionNode(node) {
     return node.kind === 'FieldDefinition';
 }
 
-export { AggregateErrorImpl as AggregateError, MapperKind, addTypes, appendObjectFields, asArray, assertSome, astFromArg, astFromDirective, astFromEnumType, astFromEnumValue, astFromField, astFromInputField, astFromInputObjectType, astFromInterfaceType, astFromObjectType, astFromScalarType, astFromSchema, astFromUnionType, astFromValueUntyped, buildOperationNodeForField, checkValidationErrors, collectComment, compareNodes, compareStrings, correctASTNodes, createNamedStub, createSchemaDefinition, createStub, createVariableNameGenerator, filterSchema, fixSchemaAst, forEachDefaultValue, forEachField, getArgumentValues, getBuiltInForStub, getDefinedRootType, getDeprecatableDirectiveNodes, getDirective, getDirectiveInExtensions, getDirectiveNodes, getDirectives, getDirectivesInExtensions, getDocumentNodeFromSchema, getFieldsWithDirectives, getImplementingTypes, getLeadingCommentBlock, getResolversFromSchema, getResponseKeyFromInfo, getRootTypeMap, getRootTypeNames, getRootTypes, getUserTypesFromSchema, healSchema, healTypes, implementsAbstractType, isAsyncIterable, isDescribable, isDocumentNode, isDocumentString, isEqual, isNamedStub, isNotEqual, isSome, isValidPath, makeDeprecatedDirective, makeDirectiveNode, makeDirectiveNodes, mapAsyncIterator, mapSchema, mergeDeep, modifyObjectFields, nodeToString, observableToAsyncIterable, parseGraphQLJSON, parseGraphQLSDL, parseInputValue, parseInputValueLiteral, parseSelectionSet, printComment, printSchemaWithDirectives, printWithComments, pruneSchema, pushComment, relocatedError, removeObjectFields, renameType, resetComments, rewireTypes, selectObjectFields, serializeInputValue, transformCommentsToDescriptions, transformInputValue, updateArgument, validateGraphQlDocuments, valueMatchesCriteria, visitData, visitErrors, visitResult, withCancel };
+export { AggregateErrorImpl as AggregateError, MapperKind, addTypes, appendObjectFields, asArray, assertSome, astFromArg, astFromDirective, astFromEnumType, astFromEnumValue, astFromField, astFromInputField, astFromInputObjectType, astFromInterfaceType, astFromObjectType, astFromScalarType, astFromSchema, astFromUnionType, astFromValueUntyped, buildOperationNodeForField, checkValidationErrors, collectComment, compareNodes, compareStrings, correctASTNodes, createNamedStub, createSchemaDefinition, createStub, createVariableNameGenerator, filterSchema, fixSchemaAst, forEachDefaultValue, forEachField, getArgumentValues, getBuiltInForStub, getDefinedRootType, getDeprecatableDirectiveNodes, getDirective, getDirectiveInExtensions, getDirectiveNodes, getDirectives, getDirectivesInExtensions, getDocumentNodeFromSchema, getFieldsWithDirectives, getImplementingTypes, getLeadingCommentBlock, getResolversFromSchema, getResponseKeyFromInfo, getRootTypeMap, getRootTypeNames, getRootTypes, getUserTypesFromSchema, healSchema, healTypes, implementsAbstractType, isAsyncIterable, isDescribable, isDocumentNode, isDocumentString, isNamedStub, isSome, isValidPath, makeDeprecatedDirective, makeDirectiveNode, makeDirectiveNodes, mapAsyncIterator, mapSchema, mergeDeep, modifyObjectFields, nodeToString, observableToAsyncIterable, parseGraphQLJSON, parseGraphQLSDL, parseInputValue, parseInputValueLiteral, parseSelectionSet, printComment, printSchemaWithDirectives, printWithComments, pruneSchema, pushComment, relocatedError, removeObjectFields, renameType, resetComments, rewireTypes, selectObjectFields, serializeInputValue, transformCommentsToDescriptions, transformInputValue, updateArgument, validateGraphQlDocuments, valueMatchesCriteria, visitData, visitErrors, visitResult, withCancel };

package/es5/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/utils/es5",
-  "version": "8.1.0",
+  "version": "8.1.2",
   "description": "Common package containing utils and types for GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {

package/es5/rewire.d.ts

@@ -1,6 +1,5 @@
 import { GraphQLDirective, GraphQLNamedType } from 'graphql';
-import { TypeMap } from 'graphql/type/schema';
 export declare function rewireTypes(originalTypeMap: Record<string, GraphQLNamedType | null>, directives: ReadonlyArray<GraphQLDirective>): {
-    typeMap: TypeMap;
+    typeMap: Record<string, GraphQLNamedType>;
     directives: Array<GraphQLDirective>;
 };

package/helpers.d.ts

@@ -1,10 +1,8 @@
 import { ASTNode } from 'graphql';
 export declare const asArray: <T>(fns: T | T[]) => T[];
-export declare function isEqual<T>(a: T, b: T): boolean;
-export declare function isNotEqual<T>(a: T, b: T): boolean;
-export declare function isDocumentString(str: string): boolean;
-export declare function isValidPath(str: string): boolean;
-export declare function compareStrings<A, B>(a: A, b: B): 0 | 1 | -1;
+export declare function isDocumentString(str: any): boolean;
+export declare function isValidPath(str: any): boolean;
+export declare function compareStrings<A, B>(a: A, b: B): 1 | -1 | 0;
 export declare function nodeToString(a: ASTNode): string;
 export declare function compareNodes(a: ASTNode, b: ASTNode, customFn?: (a: any, b: any) => number): number;
 export declare function isSome<T>(input: T): input is Exclude<T, null | undefined>;

package/index.js

@@ -10,30 +10,17 @@ const blockString_js = require('graphql/language/blockString.js');
 const execute_js = require('graphql/execution/execute.js');
 
 const asArray = (fns) => (Array.isArray(fns) ? fns : fns ? [fns] : []);
-function isEqual(a, b) {
-    if (Array.isArray(a) && Array.isArray(b)) {
-        if (a.length !== b.length) {
-            return false;
-        }
-        for (let index = 0; index < a.length; index++) {
-            if (a[index] !== b[index]) {
-                return false;
-            }
-        }
-        return true;
-    }
-    return a === b || (!a && !b);
-}
-function isNotEqual(a, b) {
-    return !isEqual(a, b);
-}
+const invalidDocRegex = /\.[a-z0-9]+$/i;
 function isDocumentString(str) {
+    if (typeof str !== 'string') {
+        return false;
+    }
     // XXX: is-valid-path or is-glob treat SDL as a valid path
     // (`scalar Date` for example)
     // this why checking the extension is fast enough
     // and prevent from parsing the string in order to find out
     // if the string is a SDL
-    if (/\.[a-z0-9]+$/i.test(str)) {
+    if (invalidDocRegex.test(str)) {
         return false;
     }
     try {
@@ -1257,19 +1244,21 @@ function resetOperationVariables() {
 function resetFieldMap() {
     fieldTypeMap = new Map();
 }
-function buildOperationNodeForField({ schema, kind, field, models, ignore, depthLimit, circularReferenceDepth, argNames, selectedFields = true, }) {
+function buildOperationNodeForField({ schema, kind, field, models, ignore = [], depthLimit, circularReferenceDepth, argNames, selectedFields = true, }) {
     resetOperationVariables();
     resetFieldMap();
+    const rootTypeNames = getRootTypeNames(schema);
     const operationNode = buildOperationAndCollectVariables({
         schema,
         fieldName: field,
         kind,
         models: models || [],
-        ignore: ignore || [],
+        ignore,
         depthLimit: depthLimit || Infinity,
         circularReferenceDepth: circularReferenceDepth || 1,
         argNames,
         selectedFields,
+        rootTypeNames,
     });
     // attach variables
     operationNode.variableDefinitions = [...operationVariables];
@@ -1277,7 +1266,7 @@ function buildOperationNodeForField({ schema, kind, field, models, ignore, depth
     resetFieldMap();
     return operationNode;
 }
-function buildOperationAndCollectVariables({ schema, fieldName, kind, models, ignore, depthLimit, circularReferenceDepth, argNames, selectedFields, }) {
+function buildOperationAndCollectVariables({ schema, fieldName, kind, models, ignore, depthLimit, circularReferenceDepth, argNames, selectedFields, rootTypeNames, }) {
     const type = getDefinedRootType(schema, kind);
     const field = type.getFields()[fieldName];
     const operationName = `${fieldName}_${kind}`;
@@ -1314,12 +1303,13 @@ function buildOperationAndCollectVariables({ schema, fieldName, kind, models, ig
                     depth: 0,
                     argNames,
                     selectedFields,
+                    rootTypeNames,
                 }),
             ],
         },
     };
 }
-function resolveSelectionSet({ parent, type, models, firstCall, path, ancestors, ignore, depthLimit, circularReferenceDepth, schema, depth, argNames, selectedFields, }) {
+function resolveSelectionSet({ parent, type, models, firstCall, path, ancestors, ignore, depthLimit, circularReferenceDepth, schema, depth, argNames, selectedFields, rootTypeNames, }) {
     if (typeof selectedFields === 'boolean' && depth > depthLimit) {
         return;
     }
@@ -1354,6 +1344,7 @@ function resolveSelectionSet({ parent, type, models, firstCall, path, ancestors,
                         depth,
                         argNames,
                         selectedFields,
+                        rootTypeNames,
                     }),
                 };
             })
@@ -1391,13 +1382,14 @@ function resolveSelectionSet({ parent, type, models, firstCall, path, ancestors,
                         depth,
                         argNames,
                         selectedFields,
+                        rootTypeNames,
                     }),
                 };
             })
                 .filter(fragmentNode => { var _a, _b; return ((_b = (_a = fragmentNode === null || fragmentNode === void 0 ? void 0 : fragmentNode.selectionSet) === null || _a === void 0 ? void 0 : _a.selections) === null || _b === void 0 ? void 0 : _b.length) > 0; }),
         };
     }
-    if (graphql.isObjectType(type)) {
+    if (graphql.isObjectType(type) && !rootTypeNames.has(type.name)) {
         const isIgnored = ignore.includes(type.name) || ignore.includes(`${parent.name}.${path[path.length - 1]}`);
         const isModel = models.includes(type.name);
         if (!firstCall && isModel && !isIgnored) {
@@ -1439,6 +1431,7 @@ function resolveSelectionSet({ parent, type, models, firstCall, path, ancestors,
                         depth,
                         argNames,
                         selectedFields: selectedSubFields,
+                        rootTypeNames,
                     });
                 }
                 return null;
@@ -1493,7 +1486,7 @@ function resolveVariable(arg, name) {
 function getArgumentName(name, path) {
     return [...path, name].join('_');
 }
-function resolveField({ type, field, models, firstCall, path, ancestors, ignore, depthLimit, circularReferenceDepth, schema, depth, argNames, selectedFields, }) {
+function resolveField({ type, field, models, firstCall, path, ancestors, ignore, depthLimit, circularReferenceDepth, schema, depth, argNames, selectedFields, rootTypeNames, }) {
     const namedType = graphql.getNamedType(field.type);
     let args = [];
     let removeField = false;
@@ -1559,6 +1552,7 @@ function resolveField({ type, field, models, firstCall, path, ancestors, ignore,
                 depth: depth + 1,
                 argNames,
                 selectedFields,
+                rootTypeNames,
             }) || undefined,
             arguments: args,
         };
@@ -3925,9 +3919,7 @@ exports.isAsyncIterable = isAsyncIterable;
 exports.isDescribable = isDescribable;
 exports.isDocumentNode = isDocumentNode;
 exports.isDocumentString = isDocumentString;
-exports.isEqual = isEqual;
 exports.isNamedStub = isNamedStub;
-exports.isNotEqual = isNotEqual;
 exports.isSome = isSome;
 exports.isValidPath = isValidPath;
 exports.makeDeprecatedDirective = makeDeprecatedDirective;

package/index.mjs

@@ -4,30 +4,17 @@ import { dedentBlockStringValue } from 'graphql/language/blockString.js';
 import { collectFields } from 'graphql/execution/execute.js';
 
 const asArray = (fns) => (Array.isArray(fns) ? fns : fns ? [fns] : []);
-function isEqual(a, b) {
-    if (Array.isArray(a) && Array.isArray(b)) {
-        if (a.length !== b.length) {
-            return false;
-        }
-        for (let index = 0; index < a.length; index++) {
-            if (a[index] !== b[index]) {
-                return false;
-            }
-        }
-        return true;
-    }
-    return a === b || (!a && !b);
-}
-function isNotEqual(a, b) {
-    return !isEqual(a, b);
-}
+const invalidDocRegex = /\.[a-z0-9]+$/i;
 function isDocumentString(str) {
+    if (typeof str !== 'string') {
+        return false;
+    }
     // XXX: is-valid-path or is-glob treat SDL as a valid path
     // (`scalar Date` for example)
     // this why checking the extension is fast enough
     // and prevent from parsing the string in order to find out
     // if the string is a SDL
-    if (/\.[a-z0-9]+$/i.test(str)) {
+    if (invalidDocRegex.test(str)) {
         return false;
     }
     try {
@@ -1251,19 +1238,21 @@ function resetOperationVariables() {
 function resetFieldMap() {
     fieldTypeMap = new Map();
 }
-function buildOperationNodeForField({ schema, kind, field, models, ignore, depthLimit, circularReferenceDepth, argNames, selectedFields = true, }) {
+function buildOperationNodeForField({ schema, kind, field, models, ignore = [], depthLimit, circularReferenceDepth, argNames, selectedFields = true, }) {
     resetOperationVariables();
     resetFieldMap();
+    const rootTypeNames = getRootTypeNames(schema);
     const operationNode = buildOperationAndCollectVariables({
         schema,
         fieldName: field,
         kind,
         models: models || [],
-        ignore: ignore || [],
+        ignore,
         depthLimit: depthLimit || Infinity,
         circularReferenceDepth: circularReferenceDepth || 1,
         argNames,
         selectedFields,
+        rootTypeNames,
     });
     // attach variables
     operationNode.variableDefinitions = [...operationVariables];
@@ -1271,7 +1260,7 @@ function buildOperationNodeForField({ schema, kind, field, models, ignore, depth
     resetFieldMap();
     return operationNode;
 }
-function buildOperationAndCollectVariables({ schema, fieldName, kind, models, ignore, depthLimit, circularReferenceDepth, argNames, selectedFields, }) {
+function buildOperationAndCollectVariables({ schema, fieldName, kind, models, ignore, depthLimit, circularReferenceDepth, argNames, selectedFields, rootTypeNames, }) {
     const type = getDefinedRootType(schema, kind);
     const field = type.getFields()[fieldName];
     const operationName = `${fieldName}_${kind}`;
@@ -1308,12 +1297,13 @@ function buildOperationAndCollectVariables({ schema, fieldName, kind, models, ig
                     depth: 0,
                     argNames,
                     selectedFields,
+                    rootTypeNames,
                 }),
             ],
         },
     };
 }
-function resolveSelectionSet({ parent, type, models, firstCall, path, ancestors, ignore, depthLimit, circularReferenceDepth, schema, depth, argNames, selectedFields, }) {
+function resolveSelectionSet({ parent, type, models, firstCall, path, ancestors, ignore, depthLimit, circularReferenceDepth, schema, depth, argNames, selectedFields, rootTypeNames, }) {
     if (typeof selectedFields === 'boolean' && depth > depthLimit) {
         return;
     }
@@ -1348,6 +1338,7 @@ function resolveSelectionSet({ parent, type, models, firstCall, path, ancestors,
                         depth,
                         argNames,
                         selectedFields,
+                        rootTypeNames,
                     }),
                 };
             })
@@ -1385,13 +1376,14 @@ function resolveSelectionSet({ parent, type, models, firstCall, path, ancestors,
                         depth,
                         argNames,
                         selectedFields,
+                        rootTypeNames,
                     }),
                 };
             })
                 .filter(fragmentNode => { var _a, _b; return ((_b = (_a = fragmentNode === null || fragmentNode === void 0 ? void 0 : fragmentNode.selectionSet) === null || _a === void 0 ? void 0 : _a.selections) === null || _b === void 0 ? void 0 : _b.length) > 0; }),
         };
     }
-    if (isObjectType(type)) {
+    if (isObjectType(type) && !rootTypeNames.has(type.name)) {
         const isIgnored = ignore.includes(type.name) || ignore.includes(`${parent.name}.${path[path.length - 1]}`);
         const isModel = models.includes(type.name);
         if (!firstCall && isModel && !isIgnored) {
@@ -1433,6 +1425,7 @@ function resolveSelectionSet({ parent, type, models, firstCall, path, ancestors,
                         depth,
                         argNames,
                         selectedFields: selectedSubFields,
+                        rootTypeNames,
                     });
                 }
                 return null;
@@ -1487,7 +1480,7 @@ function resolveVariable(arg, name) {
 function getArgumentName(name, path) {
     return [...path, name].join('_');
 }
-function resolveField({ type, field, models, firstCall, path, ancestors, ignore, depthLimit, circularReferenceDepth, schema, depth, argNames, selectedFields, }) {
+function resolveField({ type, field, models, firstCall, path, ancestors, ignore, depthLimit, circularReferenceDepth, schema, depth, argNames, selectedFields, rootTypeNames, }) {
     const namedType = getNamedType(field.type);
     let args = [];
     let removeField = false;
@@ -1553,6 +1546,7 @@ function resolveField({ type, field, models, firstCall, path, ancestors, ignore,
                 depth: depth + 1,
                 argNames,
                 selectedFields,
+                rootTypeNames,
             }) || undefined,
             arguments: args,
         };
@@ -3863,4 +3857,4 @@ function isFieldDefinitionNode(node) {
     return node.kind === 'FieldDefinition';
 }
 
-export { AggregateErrorImpl as AggregateError, MapperKind, addTypes, appendObjectFields, asArray, assertSome, astFromArg, astFromDirective, astFromEnumType, astFromEnumValue, astFromField, astFromInputField, astFromInputObjectType, astFromInterfaceType, astFromObjectType, astFromScalarType, astFromSchema, astFromUnionType, astFromValueUntyped, buildOperationNodeForField, checkValidationErrors, collectComment, compareNodes, compareStrings, correctASTNodes, createNamedStub, createSchemaDefinition, createStub, createVariableNameGenerator, filterSchema, fixSchemaAst, forEachDefaultValue, forEachField, getArgumentValues, getBuiltInForStub, getDefinedRootType, getDeprecatableDirectiveNodes, getDirective, getDirectiveInExtensions, getDirectiveNodes, getDirectives, getDirectivesInExtensions, getDocumentNodeFromSchema, getFieldsWithDirectives, getImplementingTypes, getLeadingCommentBlock, getResolversFromSchema, getResponseKeyFromInfo, getRootTypeMap, getRootTypeNames, getRootTypes, getUserTypesFromSchema, healSchema, healTypes, implementsAbstractType, isAsyncIterable, isDescribable, isDocumentNode, isDocumentString, isEqual, isNamedStub, isNotEqual, isSome, isValidPath, makeDeprecatedDirective, makeDirectiveNode, makeDirectiveNodes, mapAsyncIterator, mapSchema, mergeDeep, modifyObjectFields, nodeToString, observableToAsyncIterable, parseGraphQLJSON, parseGraphQLSDL, parseInputValue, parseInputValueLiteral, parseSelectionSet, printComment, printSchemaWithDirectives, printWithComments, pruneSchema, pushComment, relocatedError, removeObjectFields, renameType, resetComments, rewireTypes, selectObjectFields, serializeInputValue, transformCommentsToDescriptions, transformInputValue, updateArgument, validateGraphQlDocuments, valueMatchesCriteria, visitData, visitErrors, visitResult, withCancel };
+export { AggregateErrorImpl as AggregateError, MapperKind, addTypes, appendObjectFields, asArray, assertSome, astFromArg, astFromDirective, astFromEnumType, astFromEnumValue, astFromField, astFromInputField, astFromInputObjectType, astFromInterfaceType, astFromObjectType, astFromScalarType, astFromSchema, astFromUnionType, astFromValueUntyped, buildOperationNodeForField, checkValidationErrors, collectComment, compareNodes, compareStrings, correctASTNodes, createNamedStub, createSchemaDefinition, createStub, createVariableNameGenerator, filterSchema, fixSchemaAst, forEachDefaultValue, forEachField, getArgumentValues, getBuiltInForStub, getDefinedRootType, getDeprecatableDirectiveNodes, getDirective, getDirectiveInExtensions, getDirectiveNodes, getDirectives, getDirectivesInExtensions, getDocumentNodeFromSchema, getFieldsWithDirectives, getImplementingTypes, getLeadingCommentBlock, getResolversFromSchema, getResponseKeyFromInfo, getRootTypeMap, getRootTypeNames, getRootTypes, getUserTypesFromSchema, healSchema, healTypes, implementsAbstractType, isAsyncIterable, isDescribable, isDocumentNode, isDocumentString, isNamedStub, isSome, isValidPath, makeDeprecatedDirective, makeDirectiveNode, makeDirectiveNodes, mapAsyncIterator, mapSchema, mergeDeep, modifyObjectFields, nodeToString, observableToAsyncIterable, parseGraphQLJSON, parseGraphQLSDL, parseInputValue, parseInputValueLiteral, parseSelectionSet, printComment, printSchemaWithDirectives, printWithComments, pruneSchema, pushComment, relocatedError, removeObjectFields, renameType, resetComments, rewireTypes, selectObjectFields, serializeInputValue, transformCommentsToDescriptions, transformInputValue, updateArgument, validateGraphQlDocuments, valueMatchesCriteria, visitData, visitErrors, visitResult, withCancel };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/utils",
-  "version": "8.1.0",
+  "version": "8.1.2",
   "description": "Common package containing utils and types for GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {

package/rewire.d.ts

@@ -1,6 +1,5 @@
 import { GraphQLDirective, GraphQLNamedType } from 'graphql';
-import { TypeMap } from 'graphql/type/schema';
 export declare function rewireTypes(originalTypeMap: Record<string, GraphQLNamedType | null>, directives: ReadonlyArray<GraphQLDirective>): {
-    typeMap: TypeMap;
+    typeMap: Record<string, GraphQLNamedType>;
     directives: Array<GraphQLDirective>;
 };