@graphql-tools/utils 8.6.0 → 8.6.1

package/index.js

@@ -226,7 +226,7 @@ function getArgumentValues(def, node, variableValues = {}) {
         let isNull = valueNode.kind === graphql.Kind.NULL;
         if (valueNode.kind === graphql.Kind.VARIABLE) {
             const variableName = valueNode.name.value;
-            if (variableValues == null || !variableMap[variableName]) {
+            if (variableValues == null || variableMap[variableName] == null) {
                 if (defaultValue !== undefined) {
                     coercedValues[name] = defaultValue;
                 }
@@ -3207,57 +3207,54 @@ function addTypes(schema, newTypesOrDirectives) {
  * @param options Additional options for removing unused types from the schema
  */
 function pruneSchema(schema, options = {}) {
-    const pruningContext = {
-        schema,
-        unusedTypes: Object.create(null),
-        implementations: Object.create(null),
-    };
-    for (const typeName in schema.getTypeMap()) {
-        const type = schema.getType(typeName);
-        if (type && 'getInterfaces' in type) {
-            for (const iface of type.getInterfaces()) {
-                const implementations = getImplementations(pruningContext, iface);
-                if (implementations == null) {
-                    pruningContext.implementations[iface.name] = Object.create(null);
-                }
-                pruningContext.implementations[iface.name][type.name] = true;
-            }
+    const pruningContext = createPruningContext(schema);
+    visitTypes(pruningContext);
+    const types = Object.values(schema.getTypeMap());
+    const typesToPrune = new Set();
+    for (const type of types) {
+        if (type.name.startsWith('__')) {
+            continue;
         }
-    }
-    visitTypes(pruningContext, schema);
-    return mapSchema(schema, {
-        [exports.MapperKind.TYPE]: (type) => {
-            // If we should NOT prune the type, return it immediately as unmodified
-            if (options.skipPruning && options.skipPruning(type)) {
-                return type;
+        // If we should NOT prune the type, return it immediately as unmodified
+        if (options.skipPruning && options.skipPruning(type)) {
+            continue;
+        }
+        if (graphql.isObjectType(type) || graphql.isInputObjectType(type)) {
+            if ((!Object.keys(type.getFields()).length && !options.skipEmptyCompositeTypePruning) ||
+                (pruningContext.unusedTypes[type.name] && !options.skipUnusedTypesPruning)) {
+                typesToPrune.add(type.name);
             }
-            if (graphql.isObjectType(type) || graphql.isInputObjectType(type)) {
-                if ((!Object.keys(type.getFields()).length && !options.skipEmptyCompositeTypePruning) ||
-                    (pruningContext.unusedTypes[type.name] && !options.skipUnusedTypesPruning)) {
-                    return null;
-                }
+        }
+        else if (graphql.isUnionType(type)) {
+            if ((!type.getTypes().length && !options.skipEmptyUnionPruning) ||
+                (pruningContext.unusedTypes[type.name] && !options.skipUnusedTypesPruning)) {
+                typesToPrune.add(type.name);
             }
-            else if (graphql.isUnionType(type)) {
-                if ((!type.getTypes().length && !options.skipEmptyUnionPruning) ||
-                    (pruningContext.unusedTypes[type.name] && !options.skipUnusedTypesPruning)) {
-                    return null;
-                }
+        }
+        else if (graphql.isInterfaceType(type)) {
+            const implementations = getImplementations(pruningContext, type);
+            if ((!Object.keys(type.getFields()).length && !options.skipEmptyCompositeTypePruning) ||
+                (implementations && !Object.keys(implementations).length && !options.skipUnimplementedInterfacesPruning) ||
+                (pruningContext.unusedTypes[type.name] && !options.skipUnusedTypesPruning)) {
+                typesToPrune.add(type.name);
             }
-            else if (graphql.isInterfaceType(type)) {
-                const implementations = getImplementations(pruningContext, type);
-                if ((!Object.keys(type.getFields()).length && !options.skipEmptyCompositeTypePruning) ||
-                    (implementations && !Object.keys(implementations).length && !options.skipUnimplementedInterfacesPruning) ||
-                    (pruningContext.unusedTypes[type.name] && !options.skipUnusedTypesPruning)) {
-                    return null;
-                }
+        }
+        else {
+            if (pruningContext.unusedTypes[type.name] && !options.skipUnusedTypesPruning) {
+                typesToPrune.add(type.name);
             }
-            else {
-                if (pruningContext.unusedTypes[type.name] && !options.skipUnusedTypesPruning) {
-                    return null;
-                }
+        }
+    }
+    // TODO: consider not returning a new schema if there was nothing to prune. This would be a breaking change.
+    const prunedSchema = mapSchema(schema, {
+        [exports.MapperKind.TYPE]: (type) => {
+            if (typesToPrune.has(type.name)) {
+                return null;
             }
         },
     });
+    // if we pruned something, we need to prune again in case there are now objects without fields
+    return typesToPrune.size ? pruneSchema(prunedSchema, options) : prunedSchema;
 }
 function visitOutputType(visitedTypes, pruningContext, type) {
     if (visitedTypes[type.name]) {
@@ -3297,6 +3294,29 @@ function visitOutputType(visitedTypes, pruningContext, type) {
         }
     }
 }
+/**
+ * Initialize a pruneContext given a schema.
+ */
+function createPruningContext(schema) {
+    const pruningContext = {
+        schema,
+        unusedTypes: Object.create(null),
+        implementations: Object.create(null),
+    };
+    for (const typeName in schema.getTypeMap()) {
+        const type = schema.getType(typeName);
+        if (type && 'getInterfaces' in type) {
+            for (const iface of type.getInterfaces()) {
+                const implementations = getImplementations(pruningContext, iface);
+                if (implementations == null) {
+                    pruningContext.implementations[iface.name] = Object.create(null);
+                }
+                pruningContext.implementations[iface.name][type.name] = true;
+            }
+        }
+    }
+    return pruningContext;
+}
 /**
  * Get the implementations of an interface. May return undefined.
  */
@@ -3318,7 +3338,8 @@ function visitInputType(visitedTypes, pruningContext, type) {
         }
     }
 }
-function visitTypes(pruningContext, schema) {
+function visitTypes(pruningContext) {
+    const schema = pruningContext.schema;
     for (const typeName in schema.getTypeMap()) {
         if (!typeName.startsWith('__')) {
             pruningContext.unusedTypes[typeName] = true;

package/index.mjs

@@ -223,7 +223,7 @@ function getArgumentValues(def, node, variableValues = {}) {
         let isNull = valueNode.kind === Kind.NULL;
         if (valueNode.kind === Kind.VARIABLE) {
             const variableName = valueNode.name.value;
-            if (variableValues == null || !variableMap[variableName]) {
+            if (variableValues == null || variableMap[variableName] == null) {
                 if (defaultValue !== undefined) {
                     coercedValues[name] = defaultValue;
                 }
@@ -3205,57 +3205,54 @@ function addTypes(schema, newTypesOrDirectives) {
  * @param options Additional options for removing unused types from the schema
  */
 function pruneSchema(schema, options = {}) {
-    const pruningContext = {
-        schema,
-        unusedTypes: Object.create(null),
-        implementations: Object.create(null),
-    };
-    for (const typeName in schema.getTypeMap()) {
-        const type = schema.getType(typeName);
-        if (type && 'getInterfaces' in type) {
-            for (const iface of type.getInterfaces()) {
-                const implementations = getImplementations(pruningContext, iface);
-                if (implementations == null) {
-                    pruningContext.implementations[iface.name] = Object.create(null);
-                }
-                pruningContext.implementations[iface.name][type.name] = true;
-            }
+    const pruningContext = createPruningContext(schema);
+    visitTypes(pruningContext);
+    const types = Object.values(schema.getTypeMap());
+    const typesToPrune = new Set();
+    for (const type of types) {
+        if (type.name.startsWith('__')) {
+            continue;
         }
-    }
-    visitTypes(pruningContext, schema);
-    return mapSchema(schema, {
-        [MapperKind.TYPE]: (type) => {
-            // If we should NOT prune the type, return it immediately as unmodified
-            if (options.skipPruning && options.skipPruning(type)) {
-                return type;
+        // If we should NOT prune the type, return it immediately as unmodified
+        if (options.skipPruning && options.skipPruning(type)) {
+            continue;
+        }
+        if (isObjectType(type) || isInputObjectType(type)) {
+            if ((!Object.keys(type.getFields()).length && !options.skipEmptyCompositeTypePruning) ||
+                (pruningContext.unusedTypes[type.name] && !options.skipUnusedTypesPruning)) {
+                typesToPrune.add(type.name);
             }
-            if (isObjectType(type) || isInputObjectType(type)) {
-                if ((!Object.keys(type.getFields()).length && !options.skipEmptyCompositeTypePruning) ||
-                    (pruningContext.unusedTypes[type.name] && !options.skipUnusedTypesPruning)) {
-                    return null;
-                }
+        }
+        else if (isUnionType(type)) {
+            if ((!type.getTypes().length && !options.skipEmptyUnionPruning) ||
+                (pruningContext.unusedTypes[type.name] && !options.skipUnusedTypesPruning)) {
+                typesToPrune.add(type.name);
             }
-            else if (isUnionType(type)) {
-                if ((!type.getTypes().length && !options.skipEmptyUnionPruning) ||
-                    (pruningContext.unusedTypes[type.name] && !options.skipUnusedTypesPruning)) {
-                    return null;
-                }
+        }
+        else if (isInterfaceType(type)) {
+            const implementations = getImplementations(pruningContext, type);
+            if ((!Object.keys(type.getFields()).length && !options.skipEmptyCompositeTypePruning) ||
+                (implementations && !Object.keys(implementations).length && !options.skipUnimplementedInterfacesPruning) ||
+                (pruningContext.unusedTypes[type.name] && !options.skipUnusedTypesPruning)) {
+                typesToPrune.add(type.name);
             }
-            else if (isInterfaceType(type)) {
-                const implementations = getImplementations(pruningContext, type);
-                if ((!Object.keys(type.getFields()).length && !options.skipEmptyCompositeTypePruning) ||
-                    (implementations && !Object.keys(implementations).length && !options.skipUnimplementedInterfacesPruning) ||
-                    (pruningContext.unusedTypes[type.name] && !options.skipUnusedTypesPruning)) {
-                    return null;
-                }
+        }
+        else {
+            if (pruningContext.unusedTypes[type.name] && !options.skipUnusedTypesPruning) {
+                typesToPrune.add(type.name);
             }
-            else {
-                if (pruningContext.unusedTypes[type.name] && !options.skipUnusedTypesPruning) {
-                    return null;
-                }
+        }
+    }
+    // TODO: consider not returning a new schema if there was nothing to prune. This would be a breaking change.
+    const prunedSchema = mapSchema(schema, {
+        [MapperKind.TYPE]: (type) => {
+            if (typesToPrune.has(type.name)) {
+                return null;
             }
         },
     });
+    // if we pruned something, we need to prune again in case there are now objects without fields
+    return typesToPrune.size ? pruneSchema(prunedSchema, options) : prunedSchema;
 }
 function visitOutputType(visitedTypes, pruningContext, type) {
     if (visitedTypes[type.name]) {
@@ -3295,6 +3292,29 @@ function visitOutputType(visitedTypes, pruningContext, type) {
         }
     }
 }
+/**
+ * Initialize a pruneContext given a schema.
+ */
+function createPruningContext(schema) {
+    const pruningContext = {
+        schema,
+        unusedTypes: Object.create(null),
+        implementations: Object.create(null),
+    };
+    for (const typeName in schema.getTypeMap()) {
+        const type = schema.getType(typeName);
+        if (type && 'getInterfaces' in type) {
+            for (const iface of type.getInterfaces()) {
+                const implementations = getImplementations(pruningContext, iface);
+                if (implementations == null) {
+                    pruningContext.implementations[iface.name] = Object.create(null);
+                }
+                pruningContext.implementations[iface.name][type.name] = true;
+            }
+        }
+    }
+    return pruningContext;
+}
 /**
  * Get the implementations of an interface. May return undefined.
  */
@@ -3316,7 +3336,8 @@ function visitInputType(visitedTypes, pruningContext, type) {
         }
     }
 }
-function visitTypes(pruningContext, schema) {
+function visitTypes(pruningContext) {
+    const schema = pruningContext.schema;
     for (const typeName in schema.getTypeMap()) {
         if (!typeName.startsWith('__')) {
             pruningContext.unusedTypes[typeName] = true;

package/package.json

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