@graphql-tools/utils 8.2.1 → 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/index.js

@@ -1638,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;
     }
@@ -1801,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) {
@@ -1848,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: {
@@ -1860,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, ', '), ')')) +
@@ -1886,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)')
@@ -2000,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) {
@@ -4768,6 +4770,7 @@ 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

@@ -1634,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;
     }
@@ -1797,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) {
@@ -1844,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: {
@@ -1856,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, ', '), ')')) +
@@ -1882,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)')
@@ -1996,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) {
@@ -4729,4 +4731,4 @@ function fixSchemaAst(schema, options) {
     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, 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 };
+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.1",
+  "version": "8.2.2",
   "description": "Common package containing utils and types for GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {

package/index.js

@@ -1324,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;
     }
@@ -1460,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' },
@@ -1478,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, ', '), ')')) +
@@ -1501,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)')
@@ -1574,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) {
@@ -4211,6 +4215,7 @@ 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

@@ -1320,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;
     }
@@ -1456,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' },
@@ -1474,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, ', '), ')')) +
@@ -1497,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)')
@@ -1570,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) {
@@ -4172,4 +4176,4 @@ function fixSchemaAst(schema, options) {
     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, 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 };
+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.1",
+  "version": "8.2.2",
   "description": "Common package containing utils and types for GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {