@graphql-tools/utils 8.6.0-alpha-4a5363f2.0 → 8.6.1-alpha-40340ed2.0

package/AggregateError.d.ts

@@ -8,3 +8,4 @@ interface AggregateErrorConstructor {
 }
 declare let AggregateErrorImpl: AggregateErrorConstructor;
 export { AggregateErrorImpl as AggregateError };
+export declare function isAggregateError(error: Error): error is AggregateError;

package/executor.d.ts

@@ -1,7 +1,7 @@
 import { ExecutionResult, ExecutionRequest } from './Interfaces';
 declare type MaybePromise<T> = Promise<T> | T;
-declare type MaybeAsyncIterableIterator<T> = AsyncIterableIterator<T> | T;
-export declare type AsyncExecutor<TBaseContext = Record<string, any>, TBaseExtensions = Record<string, any>> = <TReturn = any, TArgs = Record<string, any>, TContext extends TBaseContext = TBaseContext, TRoot = any, TExtensions extends TBaseExtensions = TBaseExtensions>(request: ExecutionRequest<TArgs, TContext, TRoot, TExtensions>) => Promise<MaybeAsyncIterableIterator<ExecutionResult<TReturn>>>;
+declare type MaybeAsyncIterable<T> = AsyncIterable<T> | T;
+export declare type AsyncExecutor<TBaseContext = Record<string, any>, TBaseExtensions = Record<string, any>> = <TReturn = any, TArgs = Record<string, any>, TContext extends TBaseContext = TBaseContext, TRoot = any, TExtensions extends TBaseExtensions = TBaseExtensions>(request: ExecutionRequest<TArgs, TContext, TRoot, TExtensions>) => Promise<MaybeAsyncIterable<ExecutionResult<TReturn>>>;
 export declare type SyncExecutor<TBaseContext = Record<string, any>, TBaseExtensions = Record<string, any>> = <TReturn = any, TArgs = Record<string, any>, TContext extends TBaseContext = TBaseContext, TRoot = any, TExtensions extends TBaseExtensions = TBaseExtensions>(request: ExecutionRequest<TArgs, TContext, TRoot, TExtensions>) => ExecutionResult<TReturn>;
-export declare type Executor<TBaseContext = Record<string, any>, TBaseExtensions = Record<string, any>> = <TReturn = any, TArgs = Record<string, any>, TContext extends TBaseContext = TBaseContext, TRoot = any, TExtensions extends TBaseExtensions = TBaseExtensions>(request: ExecutionRequest<TArgs, TContext, TRoot, TExtensions>) => MaybePromise<MaybeAsyncIterableIterator<ExecutionResult<TReturn>>>;
+export declare type Executor<TBaseContext = Record<string, any>, TBaseExtensions = Record<string, any>> = <TReturn = any, TArgs = Record<string, any>, TContext extends TBaseContext = TBaseContext, TRoot = any, TExtensions extends TBaseExtensions = TBaseExtensions>(request: ExecutionRequest<TArgs, TContext, TRoot, TExtensions>) => MaybePromise<MaybeAsyncIterable<ExecutionResult<TReturn>>>;
 export {};

package/index.d.ts

@@ -48,4 +48,3 @@ export * from './inspect';
 export * from './memoize';
 export * from './fixSchemaAst';
 export * from './getOperationASTFromRequest';
-export * from './path';

package/index.js

@@ -69,9 +69,27 @@ function assertSome(input, message = 'Value should be something') {
     }
 }
 
+if (typeof AggregateError === 'undefined') {
+    class AggregateErrorClass extends Error {
+        constructor(errors, message = '') {
+            super(message);
+            this.errors = errors;
+            this.name = 'AggregateError';
+            Error.captureStackTrace(this, AggregateErrorClass);
+        }
+    }
+    exports.AggregateError = function (errors, message) {
+        return new AggregateErrorClass(errors, message);
+    };
+}
+else {
+    exports.AggregateError = AggregateError;
+}
+function isAggregateError(error) {
+    return 'errors' in error && Array.isArray(error['errors']);
+}
+
 // Taken from graphql-js
-// https://github.com/graphql/graphql-js/blob/main/src/jsutils/inspect.ts
-/* eslint-disable @typescript-eslint/ban-types */
 const MAX_ARRAY_LENGTH = 10;
 const MAX_RECURSIVE_DEPTH = 2;
 /**
@@ -92,10 +110,22 @@ function formatValue(value, seenValues) {
             return String(value);
     }
 }
+function formatError(value) {
+    if (value instanceof graphql.GraphQLError) {
+        return value.toString();
+    }
+    return `${value.name}: ${value.message};\n ${value.stack}`;
+}
 function formatObjectValue(value, previouslySeenValues) {
     if (value === null) {
         return 'null';
     }
+    if (value instanceof Error) {
+        if (isAggregateError(value)) {
+            return formatError(value) + '\n' + formatArray(value.errors, previouslySeenValues);
+        }
+        return formatError(value);
+    }
     if (previouslySeenValues.includes(value)) {
         return '[Circular]';
     }
@@ -176,7 +206,6 @@ function getArgumentValues(def, node, variableValues = {}) {
         [key]: value,
     }), {});
     const coercedValues = {};
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     const argumentNodes = (_a = node.arguments) !== null && _a !== void 0 ? _a : [];
     const argNodeMap = argumentNodes.reduce((prev, arg) => ({
         ...prev,
@@ -1013,10 +1042,10 @@ function astFromScalarType(type, schema, pathToDirectivesInExtensions) {
     const directives = directivesInExtensions
         ? makeDirectiveNodes(schema, directivesInExtensions)
         : ((_a = type.astNode) === null || _a === void 0 ? void 0 : _a.directives) || [];
-    if (type['specifiedByUrl'] &&
-        !directives.some(directiveNode => directiveNode.name.value === 'specifiedBy')) {
+    const specifiedByValue = (type['specifiedByUrl'] || type['specifiedByURL']);
+    if (specifiedByValue && !directives.some(directiveNode => directiveNode.name.value === 'specifiedBy')) {
         const specifiedByArgs = {
-            url: type['specifiedByUrl'],
+            url: specifiedByValue,
         };
         directives.push(makeDirectiveNode('specifiedBy', specifiedByArgs));
     }
@@ -1164,21 +1193,6 @@ function makeDirectiveNodes(schema, directiveValues) {
     return directiveNodes;
 }
 
-exports.AggregateError = globalThis.AggregateError;
-if (typeof exports.AggregateError === 'undefined') {
-    class AggregateErrorClass extends Error {
-        constructor(errors, message = '') {
-            super(message);
-            this.errors = errors;
-            this.name = 'AggregateError';
-            Error.captureStackTrace(this, AggregateErrorClass);
-        }
-    }
-    exports.AggregateError = function (errors, message) {
-        return new AggregateErrorClass(errors, message);
-    };
-}
-
 async function validateGraphQlDocuments(schema, documentFiles, effectiveRules = createDefaultRules()) {
     const allFragmentMap = new Map();
     const documentFileObjectsToValidate = [];
@@ -3193,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]) {
@@ -3283,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.
  */
@@ -3304,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;
@@ -3323,7 +3358,6 @@ function visitTypes(pruningContext, schema) {
     }
 }
 
-// eslint-disable-next-line @typescript-eslint/ban-types
 function mergeDeep(sources, respectPrototype = false) {
     const target = sources[0] || {};
     const output = {};
@@ -4152,24 +4186,64 @@ function valueMatchesCriteria(value, criteria) {
 }
 
 function isAsyncIterable(value) {
-    return typeof value === 'object' && value != null && Symbol.asyncIterator in value;
+    return (typeof value === 'object' &&
+        value != null &&
+        Symbol.asyncIterator in value &&
+        typeof value[Symbol.asyncIterator] === 'function');
 }
 
 function isDocumentNode(object) {
     return object && typeof object === 'object' && 'kind' in object && object.kind === graphql.Kind.DOCUMENT;
 }
 
-function withCancel(asyncIteratorLike, onCancel) {
-    const asyncIterator = asyncIteratorLike[Symbol.asyncIterator]();
-    if (!asyncIterator.return) {
-        asyncIterator.return = () => Promise.resolve({ value: undefined, done: true });
-    }
-    const savedReturn = asyncIterator.return.bind(asyncIterator);
-    asyncIterator.return = () => {
-        onCancel();
-        return savedReturn();
+async function defaultAsyncIteratorReturn(value) {
+    return { value, done: true };
+}
+const proxyMethodFactory = memoize2(function proxyMethodFactory(target, targetMethod) {
+    return function proxyMethod(...args) {
+        return Reflect.apply(targetMethod, target, args);
     };
-    return asyncIterator;
+});
+function getAsyncIteratorWithCancel(asyncIterator, onCancel) {
+    return new Proxy(asyncIterator, {
+        has(asyncIterator, prop) {
+            if (prop === 'return') {
+                return true;
+            }
+            return Reflect.has(asyncIterator, prop);
+        },
+        get(asyncIterator, prop, receiver) {
+            const existingPropValue = Reflect.get(asyncIterator, prop, receiver);
+            if (prop === 'return') {
+                const existingReturn = existingPropValue || defaultAsyncIteratorReturn;
+                return async function returnWithCancel(value) {
+                    const returnValue = await onCancel(value);
+                    return Reflect.apply(existingReturn, asyncIterator, [returnValue]);
+                };
+            }
+            else if (typeof existingPropValue === 'function') {
+                return proxyMethodFactory(asyncIterator, existingPropValue);
+            }
+            return existingPropValue;
+        },
+    });
+}
+function getAsyncIterableWithCancel(asyncIterable, onCancel) {
+    return new Proxy(asyncIterable, {
+        get(asyncIterable, prop, receiver) {
+            const existingPropValue = Reflect.get(asyncIterable, prop, receiver);
+            if (Symbol.asyncIterator === prop) {
+                return function asyncIteratorFactory() {
+                    const asyncIterator = Reflect.apply(existingPropValue, asyncIterable, []);
+                    return getAsyncIteratorWithCancel(asyncIterator, onCancel);
+                };
+            }
+            else if (typeof existingPropValue === 'function') {
+                return proxyMethodFactory(asyncIterable, existingPropValue);
+            }
+            return existingPropValue;
+        },
+    });
 }
 
 function buildFixedSchema(schema, options) {
@@ -4193,17 +4267,6 @@ function fixSchemaAst(schema, options) {
     return schema;
 }
 
-function joinPaths(...paths) {
-    const seperator = paths.some(path => path.includes('\\')) ? '\\' : '/';
-    return paths.join(seperator);
-}
-function isAbsolutePath(path) {
-    if (path.includes('\\')) {
-        return path[1] === ':';
-    }
-    return path.startsWith('/');
-}
-
 exports.addTypes = addTypes;
 exports.appendObjectFields = appendObjectFields;
 exports.asArray = asArray;
@@ -4239,6 +4302,8 @@ exports.fixSchemaAst = fixSchemaAst;
 exports.forEachDefaultValue = forEachDefaultValue;
 exports.forEachField = forEachField;
 exports.getArgumentValues = getArgumentValues;
+exports.getAsyncIterableWithCancel = getAsyncIterableWithCancel;
+exports.getAsyncIteratorWithCancel = getAsyncIteratorWithCancel;
 exports.getBlockStringIndentation = getBlockStringIndentation;
 exports.getBuiltInForStub = getBuiltInForStub;
 exports.getComment = getComment;
@@ -4265,7 +4330,7 @@ exports.healSchema = healSchema;
 exports.healTypes = healTypes;
 exports.implementsAbstractType = implementsAbstractType;
 exports.inspect = inspect;
-exports.isAbsolutePath = isAbsolutePath;
+exports.isAggregateError = isAggregateError;
 exports.isAsyncIterable = isAsyncIterable;
 exports.isDescribable = isDescribable;
 exports.isDocumentNode = isDocumentNode;
@@ -4273,7 +4338,6 @@ exports.isDocumentString = isDocumentString;
 exports.isNamedStub = isNamedStub;
 exports.isSome = isSome;
 exports.isValidPath = isValidPath;
-exports.joinPaths = joinPaths;
 exports.makeDeprecatedDirective = makeDeprecatedDirective;
 exports.makeDirectiveNode = makeDirectiveNode;
 exports.makeDirectiveNodes = makeDirectiveNodes;
@@ -4314,4 +4378,4 @@ exports.valueMatchesCriteria = valueMatchesCriteria;
 exports.visitData = visitData;
 exports.visitErrors = visitErrors;
 exports.visitResult = visitResult;
-exports.withCancel = withCancel;
+exports.withCancel = getAsyncIterableWithCancel;

package/index.mjs

@@ -1,4 +1,4 @@
-import { parse, isNonNullType, GraphQLError, 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, getOperationRootType, TypeNameMetaFieldDef, buildASTSchema } from 'graphql';
 
 const asArray = (fns) => (Array.isArray(fns) ? fns : fns ? [fns] : []);
 const invalidDocRegex = /\.[a-z0-9]+$/i;
@@ -65,9 +65,28 @@ function assertSome(input, message = 'Value should be something') {
     }
 }
 
+let AggregateErrorImpl;
+if (typeof AggregateError === 'undefined') {
+    class AggregateErrorClass extends Error {
+        constructor(errors, message = '') {
+            super(message);
+            this.errors = errors;
+            this.name = 'AggregateError';
+            Error.captureStackTrace(this, AggregateErrorClass);
+        }
+    }
+    AggregateErrorImpl = function (errors, message) {
+        return new AggregateErrorClass(errors, message);
+    };
+}
+else {
+    AggregateErrorImpl = AggregateError;
+}
+function isAggregateError(error) {
+    return 'errors' in error && Array.isArray(error['errors']);
+}
+
 // Taken from graphql-js
-// https://github.com/graphql/graphql-js/blob/main/src/jsutils/inspect.ts
-/* eslint-disable @typescript-eslint/ban-types */
 const MAX_ARRAY_LENGTH = 10;
 const MAX_RECURSIVE_DEPTH = 2;
 /**
@@ -88,10 +107,22 @@ function formatValue(value, seenValues) {
             return String(value);
     }
 }
+function formatError(value) {
+    if (value instanceof GraphQLError) {
+        return value.toString();
+    }
+    return `${value.name}: ${value.message};\n ${value.stack}`;
+}
 function formatObjectValue(value, previouslySeenValues) {
     if (value === null) {
         return 'null';
     }
+    if (value instanceof Error) {
+        if (isAggregateError(value)) {
+            return formatError(value) + '\n' + formatArray(value.errors, previouslySeenValues);
+        }
+        return formatError(value);
+    }
     if (previouslySeenValues.includes(value)) {
         return '[Circular]';
     }
@@ -172,7 +203,6 @@ function getArgumentValues(def, node, variableValues = {}) {
         [key]: value,
     }), {});
     const coercedValues = {};
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     const argumentNodes = (_a = node.arguments) !== null && _a !== void 0 ? _a : [];
     const argNodeMap = argumentNodes.reduce((prev, arg) => ({
         ...prev,
@@ -1009,10 +1039,10 @@ function astFromScalarType(type, schema, pathToDirectivesInExtensions) {
     const directives = directivesInExtensions
         ? makeDirectiveNodes(schema, directivesInExtensions)
         : ((_a = type.astNode) === null || _a === void 0 ? void 0 : _a.directives) || [];
-    if (type['specifiedByUrl'] &&
-        !directives.some(directiveNode => directiveNode.name.value === 'specifiedBy')) {
+    const specifiedByValue = (type['specifiedByUrl'] || type['specifiedByURL']);
+    if (specifiedByValue && !directives.some(directiveNode => directiveNode.name.value === 'specifiedBy')) {
         const specifiedByArgs = {
-            url: type['specifiedByUrl'],
+            url: specifiedByValue,
         };
         directives.push(makeDirectiveNode('specifiedBy', specifiedByArgs));
     }
@@ -1160,21 +1190,6 @@ function makeDirectiveNodes(schema, directiveValues) {
     return directiveNodes;
 }
 
-let AggregateErrorImpl = globalThis.AggregateError;
-if (typeof AggregateErrorImpl === 'undefined') {
-    class AggregateErrorClass extends Error {
-        constructor(errors, message = '') {
-            super(message);
-            this.errors = errors;
-            this.name = 'AggregateError';
-            Error.captureStackTrace(this, AggregateErrorClass);
-        }
-    }
-    AggregateErrorImpl = function (errors, message) {
-        return new AggregateErrorClass(errors, message);
-    };
-}
-
 async function validateGraphQlDocuments(schema, documentFiles, effectiveRules = createDefaultRules()) {
     const allFragmentMap = new Map();
     const documentFileObjectsToValidate = [];
@@ -3190,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]) {
@@ -3280,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.
  */
@@ -3301,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;
@@ -3320,7 +3356,6 @@ function visitTypes(pruningContext, schema) {
     }
 }
 
-// eslint-disable-next-line @typescript-eslint/ban-types
 function mergeDeep(sources, respectPrototype = false) {
     const target = sources[0] || {};
     const output = {};
@@ -4149,24 +4184,64 @@ function valueMatchesCriteria(value, criteria) {
 }
 
 function isAsyncIterable(value) {
-    return typeof value === 'object' && value != null && Symbol.asyncIterator in value;
+    return (typeof value === 'object' &&
+        value != null &&
+        Symbol.asyncIterator in value &&
+        typeof value[Symbol.asyncIterator] === 'function');
 }
 
 function isDocumentNode(object) {
     return object && typeof object === 'object' && 'kind' in object && object.kind === Kind.DOCUMENT;
 }
 
-function withCancel(asyncIteratorLike, onCancel) {
-    const asyncIterator = asyncIteratorLike[Symbol.asyncIterator]();
-    if (!asyncIterator.return) {
-        asyncIterator.return = () => Promise.resolve({ value: undefined, done: true });
-    }
-    const savedReturn = asyncIterator.return.bind(asyncIterator);
-    asyncIterator.return = () => {
-        onCancel();
-        return savedReturn();
+async function defaultAsyncIteratorReturn(value) {
+    return { value, done: true };
+}
+const proxyMethodFactory = memoize2(function proxyMethodFactory(target, targetMethod) {
+    return function proxyMethod(...args) {
+        return Reflect.apply(targetMethod, target, args);
     };
-    return asyncIterator;
+});
+function getAsyncIteratorWithCancel(asyncIterator, onCancel) {
+    return new Proxy(asyncIterator, {
+        has(asyncIterator, prop) {
+            if (prop === 'return') {
+                return true;
+            }
+            return Reflect.has(asyncIterator, prop);
+        },
+        get(asyncIterator, prop, receiver) {
+            const existingPropValue = Reflect.get(asyncIterator, prop, receiver);
+            if (prop === 'return') {
+                const existingReturn = existingPropValue || defaultAsyncIteratorReturn;
+                return async function returnWithCancel(value) {
+                    const returnValue = await onCancel(value);
+                    return Reflect.apply(existingReturn, asyncIterator, [returnValue]);
+                };
+            }
+            else if (typeof existingPropValue === 'function') {
+                return proxyMethodFactory(asyncIterator, existingPropValue);
+            }
+            return existingPropValue;
+        },
+    });
+}
+function getAsyncIterableWithCancel(asyncIterable, onCancel) {
+    return new Proxy(asyncIterable, {
+        get(asyncIterable, prop, receiver) {
+            const existingPropValue = Reflect.get(asyncIterable, prop, receiver);
+            if (Symbol.asyncIterator === prop) {
+                return function asyncIteratorFactory() {
+                    const asyncIterator = Reflect.apply(existingPropValue, asyncIterable, []);
+                    return getAsyncIteratorWithCancel(asyncIterator, onCancel);
+                };
+            }
+            else if (typeof existingPropValue === 'function') {
+                return proxyMethodFactory(asyncIterable, existingPropValue);
+            }
+            return existingPropValue;
+        },
+    });
 }
 
 function buildFixedSchema(schema, options) {
@@ -4190,15 +4265,4 @@ function fixSchemaAst(schema, options) {
     return schema;
 }
 
-function joinPaths(...paths) {
-    const seperator = paths.some(path => path.includes('\\')) ? '\\' : '/';
-    return paths.join(seperator);
-}
-function isAbsolutePath(path) {
-    if (path.includes('\\')) {
-        return path[1] === ':';
-    }
-    return path.startsWith('/');
-}
-
-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, collectFields, collectSubFields, compareNodes, compareStrings, correctASTNodes, createDefaultRules, createNamedStub, createStub, createVariableNameGenerator, dedentBlockStringValue, filterSchema, fixSchemaAst, forEachDefaultValue, forEachField, getArgumentValues, getBlockStringIndentation, getBuiltInForStub, getComment, getDefinedRootType, getDeprecatableDirectiveNodes, getDescription, getDirective, getDirectiveInExtensions, getDirectiveNodes, getDirectives, getDirectivesInExtensions, getDocumentNodeFromSchema, getFieldsWithDirectives, getImplementingTypes, getLeadingCommentBlock, getOperationASTFromDocument, getOperationASTFromRequest, getResolversFromSchema, getResponseKeyFromInfo, getRootTypeMap, getRootTypeNames, getRootTypes, healSchema, healTypes, implementsAbstractType, inspect, isAbsolutePath, isAsyncIterable, isDescribable, isDocumentNode, isDocumentString, isNamedStub, isSome, isValidPath, joinPaths, makeDeprecatedDirective, makeDirectiveNode, makeDirectiveNodes, mapAsyncIterator, mapSchema, memoize1, memoize2, memoize2of4, memoize3, memoize4, memoize5, 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, collectFields, collectSubFields, compareNodes, compareStrings, correctASTNodes, createDefaultRules, createNamedStub, createStub, createVariableNameGenerator, dedentBlockStringValue, filterSchema, fixSchemaAst, forEachDefaultValue, forEachField, getArgumentValues, getAsyncIterableWithCancel, getAsyncIteratorWithCancel, getBlockStringIndentation, getBuiltInForStub, getComment, getDefinedRootType, getDeprecatableDirectiveNodes, getDescription, getDirective, getDirectiveInExtensions, getDirectiveNodes, getDirectives, getDirectivesInExtensions, getDocumentNodeFromSchema, getFieldsWithDirectives, getImplementingTypes, getLeadingCommentBlock, getOperationASTFromDocument, getOperationASTFromRequest, getResolversFromSchema, getResponseKeyFromInfo, getRootTypeMap, getRootTypeNames, getRootTypes, healSchema, healTypes, implementsAbstractType, inspect, isAggregateError, isAsyncIterable, isDescribable, isDocumentNode, isDocumentString, isNamedStub, isSome, isValidPath, makeDeprecatedDirective, makeDirectiveNode, makeDirectiveNodes, mapAsyncIterator, mapSchema, memoize1, memoize2, memoize2of4, memoize3, memoize4, memoize5, 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, getAsyncIterableWithCancel as withCancel };

package/isAsyncIterable.d.ts

@@ -1 +1 @@
-export declare function isAsyncIterable<T>(value: any): value is AsyncIterableIterator<T>;
+export declare function isAsyncIterable<T>(value: any): value is AsyncIterable<T>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/utils",
-  "version": "8.6.0-alpha-4a5363f2.0",
+  "version": "8.6.1-alpha-40340ed2.0",
   "description": "Common package containing utils and types for GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
@@ -30,6 +30,7 @@
     "./*": {
       "require": "./*.js",
       "import": "./*.mjs"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }

package/withCancel.d.ts

@@ -1,3 +1,3 @@
-export declare function withCancel<T>(asyncIteratorLike: {
-    [Symbol.asyncIterator](): AsyncIterator<T>;
-}, onCancel: () => void): AsyncIterator<T | undefined>;
+export declare function getAsyncIteratorWithCancel<T, TReturn = any>(asyncIterator: AsyncIterator<T>, onCancel: (value?: TReturn) => void | Promise<void>): AsyncIterator<T>;
+export declare function getAsyncIterableWithCancel<T, TAsyncIterable extends AsyncIterable<T>, TReturn = any>(asyncIterable: TAsyncIterable, onCancel: (value?: TReturn) => void | Promise<void>): TAsyncIterable;
+export { getAsyncIterableWithCancel as withCancel };

package/path.d.ts

@@ -1,2 +0,0 @@
-export declare function joinPaths(...paths: string[]): string;
-export declare function isAbsolutePath(path: string): boolean;