@graphql-tools/utils 8.1.0 → 8.1.1

package/es5/index.js

@@ -1537,19 +1537,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 +1561,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 +1608,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 +1652,7 @@ function resolveSelectionSet(_a) {
                         depth: depth,
                         argNames: argNames,
                         selectedFields: selectedFields,
+                        rootTypeNames: rootTypeNames,
                     }),
                 };
             })
@@ -1688,13 +1692,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 +1741,7 @@ function resolveSelectionSet(_a) {
                         depth: depth,
                         argNames: argNames,
                         selectedFields: selectedSubFields,
+                        rootTypeNames: rootTypeNames,
                     });
                 }
                 return null;
@@ -1791,7 +1797,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 +1859,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: {

package/es5/index.mjs

@@ -1531,19 +1531,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 +1555,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 +1602,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 +1646,7 @@ function resolveSelectionSet(_a) {
                         depth: depth,
                         argNames: argNames,
                         selectedFields: selectedFields,
+                        rootTypeNames: rootTypeNames,
                     }),
                 };
             })
@@ -1682,13 +1686,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 +1735,7 @@ function resolveSelectionSet(_a) {
                         depth: depth,
                         argNames: argNames,
                         selectedFields: selectedSubFields,
+                        rootTypeNames: rootTypeNames,
                     });
                 }
                 return null;
@@ -1785,7 +1791,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 +1853,7 @@ function resolveField(_a) {
                 depth: depth + 1,
                 argNames: argNames,
                 selectedFields: selectedFields,
+                rootTypeNames: rootTypeNames,
             }) || undefined, arguments: args });
     }
     return __assign(__assign({ kind: Kind.FIELD, name: {

package/es5/package.json

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

package/index.js

@@ -1257,19 +1257,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 +1279,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 +1316,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 +1357,7 @@ function resolveSelectionSet({ parent, type, models, firstCall, path, ancestors,
                         depth,
                         argNames,
                         selectedFields,
+                        rootTypeNames,
                     }),
                 };
             })
@@ -1391,13 +1395,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 +1444,7 @@ function resolveSelectionSet({ parent, type, models, firstCall, path, ancestors,
                         depth,
                         argNames,
                         selectedFields: selectedSubFields,
+                        rootTypeNames,
                     });
                 }
                 return null;
@@ -1493,7 +1499,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 +1565,7 @@ function resolveField({ type, field, models, firstCall, path, ancestors, ignore,
                 depth: depth + 1,
                 argNames,
                 selectedFields,
+                rootTypeNames,
             }) || undefined,
             arguments: args,
         };

package/index.mjs

@@ -1251,19 +1251,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 +1273,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 +1310,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 +1351,7 @@ function resolveSelectionSet({ parent, type, models, firstCall, path, ancestors,
                         depth,
                         argNames,
                         selectedFields,
+                        rootTypeNames,
                     }),
                 };
             })
@@ -1385,13 +1389,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 +1438,7 @@ function resolveSelectionSet({ parent, type, models, firstCall, path, ancestors,
                         depth,
                         argNames,
                         selectedFields: selectedSubFields,
+                        rootTypeNames,
                     });
                 }
                 return null;
@@ -1487,7 +1493,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 +1559,7 @@ function resolveField({ type, field, models, firstCall, path, ancestors, ignore,
                 depth: depth + 1,
                 argNames,
                 selectedFields,
+                rootTypeNames,
             }) || undefined,
             arguments: args,
         };

package/package.json

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