@graphql-tools/utils 8.2.0-alpha-5cac3eec.0 → 8.2.2

package/comments.d.ts

@@ -17,8 +17,10 @@ export declare function getDescription(node: {
 }, options?: {
     commentDescriptions?: boolean;
 }): string | undefined;
+export declare function getComment(node: {
+    loc?: Location;
+}): undefined | string;
 export declare function getLeadingCommentBlock(node: {
-    description?: StringValueNode;
     loc?: Location;
 }): void | string;
 export declare function dedentBlockStringValue(rawString: string): string;

package/es5/comments.d.ts

@@ -17,8 +17,10 @@ export declare function getDescription(node: {
 }, options?: {
     commentDescriptions?: boolean;
 }): string | undefined;
+export declare function getComment(node: {
+    loc?: Location;
+}): undefined | string;
 export declare function getLeadingCommentBlock(node: {
-    description?: StringValueNode;
     loc?: Location;
 }): void | string;
 export declare function dedentBlockStringValue(rawString: string): string;

package/es5/fixSchemaAst.d.ts

@@ -0,0 +1,3 @@
+import { GraphQLSchema, BuildSchemaOptions } from 'graphql';
+import { SchemaPrintOptions } from './types';
+export declare function fixSchemaAst(schema: GraphQLSchema, options: BuildSchemaOptions & SchemaPrintOptions): GraphQLSchema;

package/es5/index.d.ts

@@ -46,3 +46,4 @@ export * from './comments';
 export * from './collectFields';
 export * from './inspect';
 export * from './memoize';
+export * from './fixSchemaAst';

package/es5/index.js

@@ -1204,7 +1204,8 @@ function astFromScalarType(type, schema, pathToDirectivesInExtensions) {
     var directives = directivesInExtensions
         ? makeDirectiveNodes(schema, directivesInExtensions)
         : ((_a = type.astNode) === null || _a === void 0 ? void 0 : _a.directives) || [];
-    if ('specifiedBy' in type && !directives.some(function (directiveNode) { return directiveNode.name.value === 'specifiedBy'; })) {
+    if (type['specifiedByUrl'] &&
+        !directives.some(function (directiveNode) { return directiveNode.name.value === 'specifiedBy'; })) {
         var specifiedByArgs = {
             url: type['specifiedByUrl'],
         };
@@ -1637,7 +1638,7 @@ function collectComment(node) {
     }
 }
 function pushComment(node, entity, field, argument) {
-    var comment = getDescription(node, { commentDescriptions: true });
+    var comment = getComment(node);
     if (typeof comment !== 'string' || comment.length === 0) {
         return;
     }
@@ -1800,7 +1801,10 @@ var printDocASTReducer = {
     StringValue: {
         leave: function (_a) {
             var value = _a.value, isBlockString = _a.block;
-            return (isBlockString ? printBlockString(value) : JSON.stringify(value));
+            if (isBlockString) {
+                return printBlockString(value);
+            }
+            return JSON.stringify(value);
         },
     },
     BooleanValue: { leave: function (_a) {
@@ -1847,8 +1851,8 @@ var printDocASTReducer = {
     // Type System Definitions
     SchemaDefinition: {
         leave: function (_a) {
-            var description = _a.description, directives = _a.directives, operationTypes = _a.operationTypes;
-            return wrap('', description, '\n') + join(['schema', join(directives, ' '), block(operationTypes)], ' ');
+            var directives = _a.directives, operationTypes = _a.operationTypes;
+            return join(['schema', join(directives, ' '), block(operationTypes)], ' ');
         },
     },
     OperationTypeDefinition: {
@@ -1859,22 +1863,20 @@ var printDocASTReducer = {
     },
     ScalarTypeDefinition: {
         leave: function (_a) {
-            var description = _a.description, name = _a.name, directives = _a.directives;
-            return wrap('', description, '\n') + join(['scalar', name, join(directives, ' ')], ' ');
+            var name = _a.name, directives = _a.directives;
+            return join(['scalar', name, join(directives, ' ')], ' ');
         },
     },
     ObjectTypeDefinition: {
         leave: function (_a) {
-            var description = _a.description, name = _a.name, interfaces = _a.interfaces, directives = _a.directives, fields = _a.fields;
-            return wrap('', description, '\n') +
-                join(['type', name, wrap('implements ', join(interfaces, ' & ')), join(directives, ' '), block(fields)], ' ');
+            var name = _a.name, interfaces = _a.interfaces, directives = _a.directives, fields = _a.fields;
+            return join(['type', name, wrap('implements ', join(interfaces, ' & ')), join(directives, ' '), block(fields)], ' ');
         },
     },
     FieldDefinition: {
         leave: function (_a) {
-            var description = _a.description, name = _a.name, args = _a.arguments, type = _a.type, directives = _a.directives;
-            return wrap('', description, '\n') +
-                name +
+            var name = _a.name, args = _a.arguments, type = _a.type, directives = _a.directives;
+            return name +
                 (hasMultilineItems(args)
                     ? wrap('(\n', indent(join(args, '\n')), '\n)')
                     : wrap('(', join(args, ', '), ')')) +
@@ -1885,46 +1887,44 @@ var printDocASTReducer = {
     },
     InputValueDefinition: {
         leave: function (_a) {
-            var description = _a.description, name = _a.name, type = _a.type, defaultValue = _a.defaultValue, directives = _a.directives;
-            return wrap('', description, '\n') + join([name + ': ' + type, wrap('= ', defaultValue), join(directives, ' ')], ' ');
+            var name = _a.name, type = _a.type, defaultValue = _a.defaultValue, directives = _a.directives;
+            return join([name + ': ' + type, wrap('= ', defaultValue), join(directives, ' ')], ' ');
         },
     },
     InterfaceTypeDefinition: {
         leave: function (_a) {
-            var description = _a.description, name = _a.name, interfaces = _a.interfaces, directives = _a.directives, fields = _a.fields;
-            return wrap('', description, '\n') +
-                join(['interface', name, wrap('implements ', join(interfaces, ' & ')), join(directives, ' '), block(fields)], ' ');
+            var name = _a.name, interfaces = _a.interfaces, directives = _a.directives, fields = _a.fields;
+            return join(['interface', name, wrap('implements ', join(interfaces, ' & ')), join(directives, ' '), block(fields)], ' ');
         },
     },
     UnionTypeDefinition: {
         leave: function (_a) {
-            var description = _a.description, name = _a.name, directives = _a.directives, types = _a.types;
-            return wrap('', description, '\n') + join(['union', name, join(directives, ' '), wrap('= ', join(types, ' | '))], ' ');
+            var name = _a.name, directives = _a.directives, types = _a.types;
+            return join(['union', name, join(directives, ' '), wrap('= ', join(types, ' | '))], ' ');
         },
     },
     EnumTypeDefinition: {
         leave: function (_a) {
-            var description = _a.description, name = _a.name, directives = _a.directives, values = _a.values;
-            return wrap('', description, '\n') + join(['enum', name, join(directives, ' '), block(values)], ' ');
+            var name = _a.name, directives = _a.directives, values = _a.values;
+            return join(['enum', name, join(directives, ' '), block(values)], ' ');
         },
     },
     EnumValueDefinition: {
         leave: function (_a) {
-            var description = _a.description, name = _a.name, directives = _a.directives;
-            return wrap('', description, '\n') + join([name, join(directives, ' ')], ' ');
+            var name = _a.name, directives = _a.directives;
+            return join([name, join(directives, ' ')], ' ');
         },
     },
     InputObjectTypeDefinition: {
         leave: function (_a) {
-            var description = _a.description, name = _a.name, directives = _a.directives, fields = _a.fields;
-            return wrap('', description, '\n') + join(['input', name, join(directives, ' '), block(fields)], ' ');
+            var name = _a.name, directives = _a.directives, fields = _a.fields;
+            return join(['input', name, join(directives, ' '), block(fields)], ' ');
         },
     },
     DirectiveDefinition: {
         leave: function (_a) {
-            var description = _a.description, name = _a.name, args = _a.arguments, repeatable = _a.repeatable, locations = _a.locations;
-            return wrap('', description, '\n') +
-                'directive @' +
+            var name = _a.name, args = _a.arguments, repeatable = _a.repeatable, locations = _a.locations;
+            return 'directive @' +
                 name +
                 (hasMultilineItems(args)
                     ? wrap('(\n', indent(join(args, '\n')), '\n)')
@@ -1999,10 +1999,13 @@ function getDescription(node, options) {
         return node.description.value;
     }
     if (options === null || options === void 0 ? void 0 : options.commentDescriptions) {
-        var rawValue = getLeadingCommentBlock(node);
-        if (rawValue !== undefined) {
-            return dedentBlockStringValue("\n" + rawValue);
-        }
+        return getComment(node);
+    }
+}
+function getComment(node) {
+    var rawValue = getLeadingCommentBlock(node);
+    if (rawValue !== undefined) {
+        return dedentBlockStringValue("\n" + rawValue);
     }
 }
 function getLeadingCommentBlock(node) {
@@ -4712,6 +4715,25 @@ function withCancel(asyncIteratorLike, onCancel) {
     return asyncIterator;
 }
 
+function buildFixedSchema(schema, options) {
+    var document = getDocumentNodeFromSchema(schema);
+    return graphql.buildASTSchema(document, tslib.__assign({}, (options || {})));
+}
+function fixSchemaAst(schema, options) {
+    // eslint-disable-next-line no-undef-init
+    var schemaWithValidAst = undefined;
+    if (!schema.astNode || !schema.extensionASTNodes) {
+        schemaWithValidAst = buildFixedSchema(schema, options);
+    }
+    if (!schema.astNode && (schemaWithValidAst === null || schemaWithValidAst === void 0 ? void 0 : schemaWithValidAst.astNode)) {
+        schema.astNode = schemaWithValidAst.astNode;
+    }
+    if (!schema.extensionASTNodes && (schemaWithValidAst === null || schemaWithValidAst === void 0 ? void 0 : schemaWithValidAst.astNode)) {
+        schema.extensionASTNodes = schemaWithValidAst.extensionASTNodes;
+    }
+    return schema;
+}
+
 exports.addTypes = addTypes;
 exports.appendObjectFields = appendObjectFields;
 exports.asArray = asArray;
@@ -4742,11 +4764,13 @@ exports.createStub = createStub;
 exports.createVariableNameGenerator = createVariableNameGenerator;
 exports.dedentBlockStringValue = dedentBlockStringValue;
 exports.filterSchema = filterSchema;
+exports.fixSchemaAst = fixSchemaAst;
 exports.forEachDefaultValue = forEachDefaultValue;
 exports.forEachField = forEachField;
 exports.getArgumentValues = getArgumentValues;
 exports.getBlockStringIndentation = getBlockStringIndentation;
 exports.getBuiltInForStub = getBuiltInForStub;
+exports.getComment = getComment;
 exports.getDefinedRootType = getDefinedRootType;
 exports.getDeprecatableDirectiveNodes = getDeprecatableDirectiveNodes;
 exports.getDescription = getDescription;

package/es5/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, 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, getDirectiveValues, GraphQLSkipDirective, GraphQLIncludeDirective, typeFromAST, isAbstractType, getOperationAST, getOperationRootType, TypeNameMetaFieldDef } from 'graphql';
+import { parse, isNonNullType, GraphQLError, Kind, valueFromAST, print, isObjectType, isListType, isSpecifiedDirective, astFromValue, isSpecifiedScalarType, isIntrospectionType, isInterfaceType, isUnionType, isInputObjectType, isEnumType, isScalarType, GraphQLDeprecatedDirective, specifiedRules, concatAST, validate, 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, getDirectiveValues, GraphQLSkipDirective, GraphQLIncludeDirective, typeFromAST, isAbstractType, getOperationAST, getOperationRootType, TypeNameMetaFieldDef, buildASTSchema } from 'graphql';
 import { __spreadArray, __read, __assign, __values, __extends, __awaiter, __generator } from 'tslib';
 
 var asArray = function (fns) { return (Array.isArray(fns) ? fns : fns ? [fns] : []); };
@@ -1200,7 +1200,8 @@ function astFromScalarType(type, schema, pathToDirectivesInExtensions) {
     var directives = directivesInExtensions
         ? makeDirectiveNodes(schema, directivesInExtensions)
         : ((_a = type.astNode) === null || _a === void 0 ? void 0 : _a.directives) || [];
-    if ('specifiedBy' in type && !directives.some(function (directiveNode) { return directiveNode.name.value === 'specifiedBy'; })) {
+    if (type['specifiedByUrl'] &&
+        !directives.some(function (directiveNode) { return directiveNode.name.value === 'specifiedBy'; })) {
         var specifiedByArgs = {
             url: type['specifiedByUrl'],
         };
@@ -1633,7 +1634,7 @@ function collectComment(node) {
     }
 }
 function pushComment(node, entity, field, argument) {
-    var comment = getDescription(node, { commentDescriptions: true });
+    var comment = getComment(node);
     if (typeof comment !== 'string' || comment.length === 0) {
         return;
     }
@@ -1796,7 +1797,10 @@ var printDocASTReducer = {
     StringValue: {
         leave: function (_a) {
             var value = _a.value, isBlockString = _a.block;
-            return (isBlockString ? printBlockString(value) : JSON.stringify(value));
+            if (isBlockString) {
+                return printBlockString(value);
+            }
+            return JSON.stringify(value);
         },
     },
     BooleanValue: { leave: function (_a) {
@@ -1843,8 +1847,8 @@ var printDocASTReducer = {
     // Type System Definitions
     SchemaDefinition: {
         leave: function (_a) {
-            var description = _a.description, directives = _a.directives, operationTypes = _a.operationTypes;
-            return wrap('', description, '\n') + join(['schema', join(directives, ' '), block(operationTypes)], ' ');
+            var directives = _a.directives, operationTypes = _a.operationTypes;
+            return join(['schema', join(directives, ' '), block(operationTypes)], ' ');
         },
     },
     OperationTypeDefinition: {
@@ -1855,22 +1859,20 @@ var printDocASTReducer = {
     },
     ScalarTypeDefinition: {
         leave: function (_a) {
-            var description = _a.description, name = _a.name, directives = _a.directives;
-            return wrap('', description, '\n') + join(['scalar', name, join(directives, ' ')], ' ');
+            var name = _a.name, directives = _a.directives;
+            return join(['scalar', name, join(directives, ' ')], ' ');
         },
     },
     ObjectTypeDefinition: {
         leave: function (_a) {
-            var description = _a.description, name = _a.name, interfaces = _a.interfaces, directives = _a.directives, fields = _a.fields;
-            return wrap('', description, '\n') +
-                join(['type', name, wrap('implements ', join(interfaces, ' & ')), join(directives, ' '), block(fields)], ' ');
+            var name = _a.name, interfaces = _a.interfaces, directives = _a.directives, fields = _a.fields;
+            return join(['type', name, wrap('implements ', join(interfaces, ' & ')), join(directives, ' '), block(fields)], ' ');
         },
     },
     FieldDefinition: {
         leave: function (_a) {
-            var description = _a.description, name = _a.name, args = _a.arguments, type = _a.type, directives = _a.directives;
-            return wrap('', description, '\n') +
-                name +
+            var name = _a.name, args = _a.arguments, type = _a.type, directives = _a.directives;
+            return name +
                 (hasMultilineItems(args)
                     ? wrap('(\n', indent(join(args, '\n')), '\n)')
                     : wrap('(', join(args, ', '), ')')) +
@@ -1881,46 +1883,44 @@ var printDocASTReducer = {
     },
     InputValueDefinition: {
         leave: function (_a) {
-            var description = _a.description, name = _a.name, type = _a.type, defaultValue = _a.defaultValue, directives = _a.directives;
-            return wrap('', description, '\n') + join([name + ': ' + type, wrap('= ', defaultValue), join(directives, ' ')], ' ');
+            var name = _a.name, type = _a.type, defaultValue = _a.defaultValue, directives = _a.directives;
+            return join([name + ': ' + type, wrap('= ', defaultValue), join(directives, ' ')], ' ');
         },
     },
     InterfaceTypeDefinition: {
         leave: function (_a) {
-            var description = _a.description, name = _a.name, interfaces = _a.interfaces, directives = _a.directives, fields = _a.fields;
-            return wrap('', description, '\n') +
-                join(['interface', name, wrap('implements ', join(interfaces, ' & ')), join(directives, ' '), block(fields)], ' ');
+            var name = _a.name, interfaces = _a.interfaces, directives = _a.directives, fields = _a.fields;
+            return join(['interface', name, wrap('implements ', join(interfaces, ' & ')), join(directives, ' '), block(fields)], ' ');
         },
     },
     UnionTypeDefinition: {
         leave: function (_a) {
-            var description = _a.description, name = _a.name, directives = _a.directives, types = _a.types;
-            return wrap('', description, '\n') + join(['union', name, join(directives, ' '), wrap('= ', join(types, ' | '))], ' ');
+            var name = _a.name, directives = _a.directives, types = _a.types;
+            return join(['union', name, join(directives, ' '), wrap('= ', join(types, ' | '))], ' ');
         },
     },
     EnumTypeDefinition: {
         leave: function (_a) {
-            var description = _a.description, name = _a.name, directives = _a.directives, values = _a.values;
-            return wrap('', description, '\n') + join(['enum', name, join(directives, ' '), block(values)], ' ');
+            var name = _a.name, directives = _a.directives, values = _a.values;
+            return join(['enum', name, join(directives, ' '), block(values)], ' ');
         },
     },
     EnumValueDefinition: {
         leave: function (_a) {
-            var description = _a.description, name = _a.name, directives = _a.directives;
-            return wrap('', description, '\n') + join([name, join(directives, ' ')], ' ');
+            var name = _a.name, directives = _a.directives;
+            return join([name, join(directives, ' ')], ' ');
         },
     },
     InputObjectTypeDefinition: {
         leave: function (_a) {
-            var description = _a.description, name = _a.name, directives = _a.directives, fields = _a.fields;
-            return wrap('', description, '\n') + join(['input', name, join(directives, ' '), block(fields)], ' ');
+            var name = _a.name, directives = _a.directives, fields = _a.fields;
+            return join(['input', name, join(directives, ' '), block(fields)], ' ');
         },
     },
     DirectiveDefinition: {
         leave: function (_a) {
-            var description = _a.description, name = _a.name, args = _a.arguments, repeatable = _a.repeatable, locations = _a.locations;
-            return wrap('', description, '\n') +
-                'directive @' +
+            var name = _a.name, args = _a.arguments, repeatable = _a.repeatable, locations = _a.locations;
+            return 'directive @' +
                 name +
                 (hasMultilineItems(args)
                     ? wrap('(\n', indent(join(args, '\n')), '\n)')
@@ -1995,10 +1995,13 @@ function getDescription(node, options) {
         return node.description.value;
     }
     if (options === null || options === void 0 ? void 0 : options.commentDescriptions) {
-        var rawValue = getLeadingCommentBlock(node);
-        if (rawValue !== undefined) {
-            return dedentBlockStringValue("\n" + rawValue);
-        }
+        return getComment(node);
+    }
+}
+function getComment(node) {
+    var rawValue = getLeadingCommentBlock(node);
+    if (rawValue !== undefined) {
+        return dedentBlockStringValue("\n" + rawValue);
     }
 }
 function getLeadingCommentBlock(node) {
@@ -4709,4 +4712,23 @@ function withCancel(asyncIteratorLike, onCancel) {
     return asyncIterator;
 }
 
-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, createNamedStub, createStub, createVariableNameGenerator, dedentBlockStringValue, filterSchema, forEachDefaultValue, forEachField, getArgumentValues, getBlockStringIndentation, getBuiltInForStub, getDefinedRootType, getDeprecatableDirectiveNodes, getDescription, getDirective, getDirectiveInExtensions, getDirectiveNodes, getDirectives, getDirectivesInExtensions, getDocumentNodeFromSchema, getFieldsWithDirectives, getImplementingTypes, getLeadingCommentBlock, getResolversFromSchema, getResponseKeyFromInfo, getRootTypeMap, getRootTypeNames, getRootTypes, healSchema, healTypes, implementsAbstractType, inspect, 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, withCancel };
+function buildFixedSchema(schema, options) {
+    var document = getDocumentNodeFromSchema(schema);
+    return buildASTSchema(document, __assign({}, (options || {})));
+}
+function fixSchemaAst(schema, options) {
+    // eslint-disable-next-line no-undef-init
+    var schemaWithValidAst = undefined;
+    if (!schema.astNode || !schema.extensionASTNodes) {
+        schemaWithValidAst = buildFixedSchema(schema, options);
+    }
+    if (!schema.astNode && (schemaWithValidAst === null || schemaWithValidAst === void 0 ? void 0 : schemaWithValidAst.astNode)) {
+        schema.astNode = schemaWithValidAst.astNode;
+    }
+    if (!schema.extensionASTNodes && (schemaWithValidAst === null || schemaWithValidAst === void 0 ? void 0 : schemaWithValidAst.astNode)) {
+        schema.extensionASTNodes = schemaWithValidAst.extensionASTNodes;
+    }
+    return schema;
+}
+
+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, createNamedStub, createStub, createVariableNameGenerator, dedentBlockStringValue, filterSchema, fixSchemaAst, forEachDefaultValue, forEachField, getArgumentValues, getBlockStringIndentation, getBuiltInForStub, getComment, getDefinedRootType, getDeprecatableDirectiveNodes, getDescription, getDirective, getDirectiveInExtensions, getDirectiveNodes, getDirectives, getDirectivesInExtensions, getDocumentNodeFromSchema, getFieldsWithDirectives, getImplementingTypes, getLeadingCommentBlock, getResolversFromSchema, getResponseKeyFromInfo, getRootTypeMap, getRootTypeNames, getRootTypes, healSchema, healTypes, implementsAbstractType, inspect, 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, withCancel };

package/es5/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/utils/es5",
-  "version": "8.2.0-alpha-5cac3eec.0",
+  "version": "8.2.2",
   "description": "Common package containing utils and types for GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {

package/fixSchemaAst.d.ts

@@ -0,0 +1,3 @@
+import { GraphQLSchema, BuildSchemaOptions } from 'graphql';
+import { SchemaPrintOptions } from './types';
+export declare function fixSchemaAst(schema: GraphQLSchema, options: BuildSchemaOptions & SchemaPrintOptions): GraphQLSchema;

package/index.d.ts

@@ -46,3 +46,4 @@ export * from './comments';
 export * from './collectFields';
 export * from './inspect';
 export * from './memoize';
+export * from './fixSchemaAst';

package/index.js

@@ -1013,7 +1013,8 @@ function astFromScalarType(type, schema, pathToDirectivesInExtensions) {
     const directives = directivesInExtensions
         ? makeDirectiveNodes(schema, directivesInExtensions)
         : ((_a = type.astNode) === null || _a === void 0 ? void 0 : _a.directives) || [];
-    if ('specifiedBy' in type && !directives.some(directiveNode => directiveNode.name.value === 'specifiedBy')) {
+    if (type['specifiedByUrl'] &&
+        !directives.some(directiveNode => directiveNode.name.value === 'specifiedBy')) {
         const specifiedByArgs = {
             url: type['specifiedByUrl'],
         };
@@ -1323,7 +1324,7 @@ function collectComment(node) {
     }
 }
 function pushComment(node, entity, field, argument) {
-    const comment = getDescription(node, { commentDescriptions: true });
+    const comment = getComment(node);
     if (typeof comment !== 'string' || comment.length === 0) {
         return;
     }
@@ -1459,7 +1460,12 @@ const printDocASTReducer = {
     IntValue: { leave: ({ value }) => value },
     FloatValue: { leave: ({ value }) => value },
     StringValue: {
-        leave: ({ value, block: isBlockString }) => (isBlockString ? printBlockString(value) : JSON.stringify(value)),
+        leave: ({ value, block: isBlockString }) => {
+            if (isBlockString) {
+                return printBlockString(value);
+            }
+            return JSON.stringify(value);
+        },
     },
     BooleanValue: { leave: ({ value }) => (value ? 'true' : 'false') },
     NullValue: { leave: () => 'null' },
@@ -1477,21 +1483,19 @@ const printDocASTReducer = {
     NonNullType: { leave: ({ type }) => type + '!' },
     // Type System Definitions
     SchemaDefinition: {
-        leave: ({ description, directives, operationTypes }) => wrap('', description, '\n') + join(['schema', join(directives, ' '), block(operationTypes)], ' '),
+        leave: ({ directives, operationTypes }) => join(['schema', join(directives, ' '), block(operationTypes)], ' '),
     },
     OperationTypeDefinition: {
         leave: ({ operation, type }) => operation + ': ' + type,
     },
     ScalarTypeDefinition: {
-        leave: ({ description, name, directives }) => wrap('', description, '\n') + join(['scalar', name, join(directives, ' ')], ' '),
+        leave: ({ name, directives }) => join(['scalar', name, join(directives, ' ')], ' '),
     },
     ObjectTypeDefinition: {
-        leave: ({ description, name, interfaces, directives, fields }) => wrap('', description, '\n') +
-            join(['type', name, wrap('implements ', join(interfaces, ' & ')), join(directives, ' '), block(fields)], ' '),
+        leave: ({ name, interfaces, directives, fields }) => join(['type', name, wrap('implements ', join(interfaces, ' & ')), join(directives, ' '), block(fields)], ' '),
     },
     FieldDefinition: {
-        leave: ({ description, name, arguments: args, type, directives }) => wrap('', description, '\n') +
-            name +
+        leave: ({ name, arguments: args, type, directives }) => name +
             (hasMultilineItems(args)
                 ? wrap('(\n', indent(join(args, '\n')), '\n)')
                 : wrap('(', join(args, ', '), ')')) +
@@ -1500,27 +1504,25 @@ const printDocASTReducer = {
             wrap(' ', join(directives, ' ')),
     },
     InputValueDefinition: {
-        leave: ({ description, name, type, defaultValue, directives }) => wrap('', description, '\n') + join([name + ': ' + type, wrap('= ', defaultValue), join(directives, ' ')], ' '),
+        leave: ({ name, type, defaultValue, directives }) => join([name + ': ' + type, wrap('= ', defaultValue), join(directives, ' ')], ' '),
     },
     InterfaceTypeDefinition: {
-        leave: ({ description, name, interfaces, directives, fields }) => wrap('', description, '\n') +
-            join(['interface', name, wrap('implements ', join(interfaces, ' & ')), join(directives, ' '), block(fields)], ' '),
+        leave: ({ name, interfaces, directives, fields }) => join(['interface', name, wrap('implements ', join(interfaces, ' & ')), join(directives, ' '), block(fields)], ' '),
     },
     UnionTypeDefinition: {
-        leave: ({ description, name, directives, types }) => wrap('', description, '\n') + join(['union', name, join(directives, ' '), wrap('= ', join(types, ' | '))], ' '),
+        leave: ({ name, directives, types }) => join(['union', name, join(directives, ' '), wrap('= ', join(types, ' | '))], ' '),
     },
     EnumTypeDefinition: {
-        leave: ({ description, name, directives, values }) => wrap('', description, '\n') + join(['enum', name, join(directives, ' '), block(values)], ' '),
+        leave: ({ name, directives, values }) => join(['enum', name, join(directives, ' '), block(values)], ' '),
     },
     EnumValueDefinition: {
-        leave: ({ description, name, directives }) => wrap('', description, '\n') + join([name, join(directives, ' ')], ' '),
+        leave: ({ name, directives }) => join([name, join(directives, ' ')], ' '),
     },
     InputObjectTypeDefinition: {
-        leave: ({ description, name, directives, fields }) => wrap('', description, '\n') + join(['input', name, join(directives, ' '), block(fields)], ' '),
+        leave: ({ name, directives, fields }) => join(['input', name, join(directives, ' '), block(fields)], ' '),
     },
     DirectiveDefinition: {
-        leave: ({ description, name, arguments: args, repeatable, locations }) => wrap('', description, '\n') +
-            'directive @' +
+        leave: ({ name, arguments: args, repeatable, locations }) => 'directive @' +
             name +
             (hasMultilineItems(args)
                 ? wrap('(\n', indent(join(args, '\n')), '\n)')
@@ -1573,10 +1575,13 @@ function getDescription(node, options) {
         return node.description.value;
     }
     if (options === null || options === void 0 ? void 0 : options.commentDescriptions) {
-        const rawValue = getLeadingCommentBlock(node);
-        if (rawValue !== undefined) {
-            return dedentBlockStringValue(`\n${rawValue}`);
-        }
+        return getComment(node);
+    }
+}
+function getComment(node) {
+    const rawValue = getLeadingCommentBlock(node);
+    if (rawValue !== undefined) {
+        return dedentBlockStringValue(`\n${rawValue}`);
     }
 }
 function getLeadingCommentBlock(node) {
@@ -4153,6 +4158,27 @@ function withCancel(asyncIteratorLike, onCancel) {
     return asyncIterator;
 }
 
+function buildFixedSchema(schema, options) {
+    const document = getDocumentNodeFromSchema(schema);
+    return graphql.buildASTSchema(document, {
+        ...(options || {}),
+    });
+}
+function fixSchemaAst(schema, options) {
+    // eslint-disable-next-line no-undef-init
+    let schemaWithValidAst = undefined;
+    if (!schema.astNode || !schema.extensionASTNodes) {
+        schemaWithValidAst = buildFixedSchema(schema, options);
+    }
+    if (!schema.astNode && (schemaWithValidAst === null || schemaWithValidAst === void 0 ? void 0 : schemaWithValidAst.astNode)) {
+        schema.astNode = schemaWithValidAst.astNode;
+    }
+    if (!schema.extensionASTNodes && (schemaWithValidAst === null || schemaWithValidAst === void 0 ? void 0 : schemaWithValidAst.astNode)) {
+        schema.extensionASTNodes = schemaWithValidAst.extensionASTNodes;
+    }
+    return schema;
+}
+
 exports.addTypes = addTypes;
 exports.appendObjectFields = appendObjectFields;
 exports.asArray = asArray;
@@ -4183,11 +4209,13 @@ exports.createStub = createStub;
 exports.createVariableNameGenerator = createVariableNameGenerator;
 exports.dedentBlockStringValue = dedentBlockStringValue;
 exports.filterSchema = filterSchema;
+exports.fixSchemaAst = fixSchemaAst;
 exports.forEachDefaultValue = forEachDefaultValue;
 exports.forEachField = forEachField;
 exports.getArgumentValues = getArgumentValues;
 exports.getBlockStringIndentation = getBlockStringIndentation;
 exports.getBuiltInForStub = getBuiltInForStub;
+exports.getComment = getComment;
 exports.getDefinedRootType = getDefinedRootType;
 exports.getDeprecatableDirectiveNodes = getDeprecatableDirectiveNodes;
 exports.getDescription = getDescription;

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, 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, getDirectiveValues, GraphQLSkipDirective, GraphQLIncludeDirective, typeFromAST, isAbstractType, getOperationAST, getOperationRootType, TypeNameMetaFieldDef } from 'graphql';
+import { parse, isNonNullType, GraphQLError, Kind, valueFromAST, print, isObjectType, isListType, isSpecifiedDirective, astFromValue, isSpecifiedScalarType, isIntrospectionType, isInterfaceType, isUnionType, isInputObjectType, isEnumType, isScalarType, GraphQLDeprecatedDirective, specifiedRules, concatAST, validate, 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, getDirectiveValues, GraphQLSkipDirective, GraphQLIncludeDirective, typeFromAST, isAbstractType, getOperationAST, getOperationRootType, TypeNameMetaFieldDef, buildASTSchema } from 'graphql';
 
 const asArray = (fns) => (Array.isArray(fns) ? fns : fns ? [fns] : []);
 const invalidDocRegex = /\.[a-z0-9]+$/i;
@@ -1009,7 +1009,8 @@ function astFromScalarType(type, schema, pathToDirectivesInExtensions) {
     const directives = directivesInExtensions
         ? makeDirectiveNodes(schema, directivesInExtensions)
         : ((_a = type.astNode) === null || _a === void 0 ? void 0 : _a.directives) || [];
-    if ('specifiedBy' in type && !directives.some(directiveNode => directiveNode.name.value === 'specifiedBy')) {
+    if (type['specifiedByUrl'] &&
+        !directives.some(directiveNode => directiveNode.name.value === 'specifiedBy')) {
         const specifiedByArgs = {
             url: type['specifiedByUrl'],
         };
@@ -1319,7 +1320,7 @@ function collectComment(node) {
     }
 }
 function pushComment(node, entity, field, argument) {
-    const comment = getDescription(node, { commentDescriptions: true });
+    const comment = getComment(node);
     if (typeof comment !== 'string' || comment.length === 0) {
         return;
     }
@@ -1455,7 +1456,12 @@ const printDocASTReducer = {
     IntValue: { leave: ({ value }) => value },
     FloatValue: { leave: ({ value }) => value },
     StringValue: {
-        leave: ({ value, block: isBlockString }) => (isBlockString ? printBlockString(value) : JSON.stringify(value)),
+        leave: ({ value, block: isBlockString }) => {
+            if (isBlockString) {
+                return printBlockString(value);
+            }
+            return JSON.stringify(value);
+        },
     },
     BooleanValue: { leave: ({ value }) => (value ? 'true' : 'false') },
     NullValue: { leave: () => 'null' },
@@ -1473,21 +1479,19 @@ const printDocASTReducer = {
     NonNullType: { leave: ({ type }) => type + '!' },
     // Type System Definitions
     SchemaDefinition: {
-        leave: ({ description, directives, operationTypes }) => wrap('', description, '\n') + join(['schema', join(directives, ' '), block(operationTypes)], ' '),
+        leave: ({ directives, operationTypes }) => join(['schema', join(directives, ' '), block(operationTypes)], ' '),
     },
     OperationTypeDefinition: {
         leave: ({ operation, type }) => operation + ': ' + type,
     },
     ScalarTypeDefinition: {
-        leave: ({ description, name, directives }) => wrap('', description, '\n') + join(['scalar', name, join(directives, ' ')], ' '),
+        leave: ({ name, directives }) => join(['scalar', name, join(directives, ' ')], ' '),
     },
     ObjectTypeDefinition: {
-        leave: ({ description, name, interfaces, directives, fields }) => wrap('', description, '\n') +
-            join(['type', name, wrap('implements ', join(interfaces, ' & ')), join(directives, ' '), block(fields)], ' '),
+        leave: ({ name, interfaces, directives, fields }) => join(['type', name, wrap('implements ', join(interfaces, ' & ')), join(directives, ' '), block(fields)], ' '),
     },
     FieldDefinition: {
-        leave: ({ description, name, arguments: args, type, directives }) => wrap('', description, '\n') +
-            name +
+        leave: ({ name, arguments: args, type, directives }) => name +
             (hasMultilineItems(args)
                 ? wrap('(\n', indent(join(args, '\n')), '\n)')
                 : wrap('(', join(args, ', '), ')')) +
@@ -1496,27 +1500,25 @@ const printDocASTReducer = {
             wrap(' ', join(directives, ' ')),
     },
     InputValueDefinition: {
-        leave: ({ description, name, type, defaultValue, directives }) => wrap('', description, '\n') + join([name + ': ' + type, wrap('= ', defaultValue), join(directives, ' ')], ' '),
+        leave: ({ name, type, defaultValue, directives }) => join([name + ': ' + type, wrap('= ', defaultValue), join(directives, ' ')], ' '),
     },
     InterfaceTypeDefinition: {
-        leave: ({ description, name, interfaces, directives, fields }) => wrap('', description, '\n') +
-            join(['interface', name, wrap('implements ', join(interfaces, ' & ')), join(directives, ' '), block(fields)], ' '),
+        leave: ({ name, interfaces, directives, fields }) => join(['interface', name, wrap('implements ', join(interfaces, ' & ')), join(directives, ' '), block(fields)], ' '),
     },
     UnionTypeDefinition: {
-        leave: ({ description, name, directives, types }) => wrap('', description, '\n') + join(['union', name, join(directives, ' '), wrap('= ', join(types, ' | '))], ' '),
+        leave: ({ name, directives, types }) => join(['union', name, join(directives, ' '), wrap('= ', join(types, ' | '))], ' '),
     },
     EnumTypeDefinition: {
-        leave: ({ description, name, directives, values }) => wrap('', description, '\n') + join(['enum', name, join(directives, ' '), block(values)], ' '),
+        leave: ({ name, directives, values }) => join(['enum', name, join(directives, ' '), block(values)], ' '),
     },
     EnumValueDefinition: {
-        leave: ({ description, name, directives }) => wrap('', description, '\n') + join([name, join(directives, ' ')], ' '),
+        leave: ({ name, directives }) => join([name, join(directives, ' ')], ' '),
     },
     InputObjectTypeDefinition: {
-        leave: ({ description, name, directives, fields }) => wrap('', description, '\n') + join(['input', name, join(directives, ' '), block(fields)], ' '),
+        leave: ({ name, directives, fields }) => join(['input', name, join(directives, ' '), block(fields)], ' '),
     },
     DirectiveDefinition: {
-        leave: ({ description, name, arguments: args, repeatable, locations }) => wrap('', description, '\n') +
-            'directive @' +
+        leave: ({ name, arguments: args, repeatable, locations }) => 'directive @' +
             name +
             (hasMultilineItems(args)
                 ? wrap('(\n', indent(join(args, '\n')), '\n)')
@@ -1569,10 +1571,13 @@ function getDescription(node, options) {
         return node.description.value;
     }
     if (options === null || options === void 0 ? void 0 : options.commentDescriptions) {
-        const rawValue = getLeadingCommentBlock(node);
-        if (rawValue !== undefined) {
-            return dedentBlockStringValue(`\n${rawValue}`);
-        }
+        return getComment(node);
+    }
+}
+function getComment(node) {
+    const rawValue = getLeadingCommentBlock(node);
+    if (rawValue !== undefined) {
+        return dedentBlockStringValue(`\n${rawValue}`);
     }
 }
 function getLeadingCommentBlock(node) {
@@ -4150,4 +4155,25 @@ function withCancel(asyncIteratorLike, onCancel) {
     return asyncIterator;
 }
 
-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, createNamedStub, createStub, createVariableNameGenerator, dedentBlockStringValue, filterSchema, forEachDefaultValue, forEachField, getArgumentValues, getBlockStringIndentation, getBuiltInForStub, getDefinedRootType, getDeprecatableDirectiveNodes, getDescription, getDirective, getDirectiveInExtensions, getDirectiveNodes, getDirectives, getDirectivesInExtensions, getDocumentNodeFromSchema, getFieldsWithDirectives, getImplementingTypes, getLeadingCommentBlock, getResolversFromSchema, getResponseKeyFromInfo, getRootTypeMap, getRootTypeNames, getRootTypes, healSchema, healTypes, implementsAbstractType, inspect, 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, withCancel };
+function buildFixedSchema(schema, options) {
+    const document = getDocumentNodeFromSchema(schema);
+    return buildASTSchema(document, {
+        ...(options || {}),
+    });
+}
+function fixSchemaAst(schema, options) {
+    // eslint-disable-next-line no-undef-init
+    let schemaWithValidAst = undefined;
+    if (!schema.astNode || !schema.extensionASTNodes) {
+        schemaWithValidAst = buildFixedSchema(schema, options);
+    }
+    if (!schema.astNode && (schemaWithValidAst === null || schemaWithValidAst === void 0 ? void 0 : schemaWithValidAst.astNode)) {
+        schema.astNode = schemaWithValidAst.astNode;
+    }
+    if (!schema.extensionASTNodes && (schemaWithValidAst === null || schemaWithValidAst === void 0 ? void 0 : schemaWithValidAst.astNode)) {
+        schema.extensionASTNodes = schemaWithValidAst.extensionASTNodes;
+    }
+    return schema;
+}
+
+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, createNamedStub, createStub, createVariableNameGenerator, dedentBlockStringValue, filterSchema, fixSchemaAst, forEachDefaultValue, forEachField, getArgumentValues, getBlockStringIndentation, getBuiltInForStub, getComment, getDefinedRootType, getDeprecatableDirectiveNodes, getDescription, getDirective, getDirectiveInExtensions, getDirectiveNodes, getDirectives, getDirectivesInExtensions, getDocumentNodeFromSchema, getFieldsWithDirectives, getImplementingTypes, getLeadingCommentBlock, getResolversFromSchema, getResponseKeyFromInfo, getRootTypeMap, getRootTypeNames, getRootTypes, healSchema, healTypes, implementsAbstractType, inspect, 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, withCancel };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/utils",
-  "version": "8.2.0-alpha-5cac3eec.0",
+  "version": "8.2.2",
   "description": "Common package containing utils and types for GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {