@graphql-eslint/eslint-plugin 3.16.2-alpha-20230322145450-ffe6eec → 3.17.0-alpha-20230323123320-43244a5

package/cjs/rules/alphabetize.js

@@ -185,7 +185,7 @@ exports.rule = {
             },
         },
         messages: {
-            [RULE_ID]: '`{{ currName }}` should be before {{ prevName }}.',
+            [RULE_ID]: '{{ currNode }} should be before {{ prevNode }}',
         },
         schema,
     },
@@ -277,8 +277,8 @@ exports.rule = {
                     node: ('alias' in currNode && currNode.alias) || currNode.name,
                     messageId: RULE_ID,
                     data: {
-                        currName,
-                        prevName: prevName ? `\`${prevName}\`` : (0, lodash_lowercase_1.default)(prevNode.kind),
+                        currNode: (0, utils_js_1.displayNodeName)(currNode),
+                        prevNode: prevName ? (0, utils_js_1.displayNodeName)(prevNode) : (0, lodash_lowercase_1.default)(prevNode.kind),
                     },
                     *fix(fixer) {
                         const prevRange = getRangeWithComments(prevNode);

package/cjs/rules/description-style.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rule = void 0;
+const utils_js_1 = require("../utils.js");
 const schema = {
     type: 'array',
     maxItems: 1,
@@ -57,7 +58,7 @@ exports.rule = {
             [`.description[type=StringValue][block!=${isBlock}]`](node) {
                 context.report({
                     loc: isBlock ? node.loc : node.loc.start,
-                    message: `Unexpected ${isBlock ? 'inline' : 'block'} description.`,
+                    message: `Unexpected ${isBlock ? 'inline' : 'block'} description for ${(0, utils_js_1.getNodeName)(node.parent)}`,
                     suggest: [
                         {
                             desc: `Change to ${isBlock ? 'block' : 'inline'} style description`,

package/cjs/rules/input-name.js

@@ -89,11 +89,12 @@ exports.rule = {
             false;
         const listeners = {
             'FieldDefinition > InputValueDefinition[name.value!=input] > Name'(node) {
-                if (shouldCheckType(node.parent.parent.parent)) {
+                const fieldDef = node.parent.parent;
+                if (shouldCheckType(fieldDef.parent)) {
                     const inputName = node.value;
                     context.report({
                         node,
-                        message: `Input \`${inputName}\` should be called \`input\`.`,
+                        message: `Input "${inputName}" should be named "input" for "${fieldDef.parent.name.value}.${fieldDef.name.value}"`,
                         suggest: [
                             {
                                 desc: 'Rename to `input`',

package/cjs/rules/no-case-insensitive-enum-values-duplicates.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rule = void 0;
 const graphql_1 = require("graphql");
+const utils_js_1 = require("../utils.js");
 exports.rule = {
     meta: {
         type: 'suggestion',
@@ -47,7 +48,7 @@ exports.rule = {
                     const enumName = duplicate.name.value;
                     context.report({
                         node: duplicate.name,
-                        message: `Case-insensitive enum values duplicates are not allowed! Found: \`${enumName}\`.`,
+                        message: `Unexpected case-insensitive enum values duplicates for ${(0, utils_js_1.getNodeName)(duplicate)}`,
                         suggest: [
                             {
                                 desc: `Remove \`${enumName}\` enum value`,

package/cjs/rules/no-hashtag-description.js

@@ -1,15 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rule = void 0;
+exports.rule = exports.RULE_ID = void 0;
 const graphql_1 = require("graphql");
-const HASHTAG_COMMENT = 'HASHTAG_COMMENT';
+const utils_js_1 = require("../utils.js");
+exports.RULE_ID = 'HASHTAG_COMMENT';
 exports.rule = {
     meta: {
         type: 'suggestion',
         hasSuggestions: true,
         schema: [],
         messages: {
-            [HASHTAG_COMMENT]: 'Using hashtag `#` for adding GraphQL descriptions is not allowed. Prefer using `"""` for multiline, or `"` for a single line description.',
+            [exports.RULE_ID]: 'Unexpected GraphQL descriptions as hashtag `#` for {{ nodeName }}.\nPrefer using `"""` for multiline, or `"` for a single line description.',
         },
         docs: {
             description: 'Requires to use `"""` or `"` for adding a GraphQL description instead of `#`.\nAllows to use hashtag for comments, as long as it\'s not attached to an AST definition.',
@@ -69,8 +70,15 @@ exports.rule = {
                             line !== prev.line &&
                             next.kind === graphql_1.TokenKind.NAME &&
                             linesAfter < 2) {
+                            const sourceCode = context.getSourceCode();
+                            const { tokens } = sourceCode.ast;
+                            const t = tokens.find(token => token.loc.start.line === next.line && token.loc.start.column === next.column - 1);
+                            const nextNode = sourceCode.getNodeByRangeIndex(t.range[1] + 1);
                             context.report({
-                                messageId: HASHTAG_COMMENT,
+                                messageId: exports.RULE_ID,
+                                data: {
+                                    nodeName: (0, utils_js_1.getNodeName)('name' in nextNode ? nextNode : nextNode.parent),
+                                },
                                 loc: {
                                     line,
                                     column: column - 1,

package/cjs/rules/no-scalar-result-type-on-mutation.js

@@ -49,9 +49,13 @@ exports.rule = {
                 const typeName = node.value;
                 const graphQLType = schema.getType(typeName);
                 if ((0, graphql_1.isScalarType)(graphQLType)) {
+                    let fieldDef = node.parent;
+                    while (fieldDef.kind !== graphql_1.Kind.FIELD_DEFINITION) {
+                        fieldDef = fieldDef.parent;
+                    }
                     context.report({
                         node,
-                        message: `Unexpected scalar result type \`${typeName}\`.`,
+                        message: `Unexpected scalar result type \`${typeName}\` for ${(0, utils_js_1.getNodeName)(fieldDef)}`,
                         suggest: [
                             {
                                 desc: `Remove \`${typeName}\``,

package/cjs/rules/require-deprecation-date.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rule = void 0;
 const index_js_1 = require("../estree-converter/index.js");
+const utils_js_1 = require("../utils.js");
 // eslint-disable-next-line unicorn/better-regex
 const DATE_REGEX = /^\d{2}\/\d{2}\/\d{4}$/;
 const MESSAGE_REQUIRE_DATE = 'MESSAGE_REQUIRE_DATE';
@@ -61,10 +62,10 @@ exports.rule = {
             ],
         },
         messages: {
-            [MESSAGE_REQUIRE_DATE]: 'Directive "@deprecated" must have a deletion date',
-            [MESSAGE_INVALID_FORMAT]: 'Deletion date must be in format "DD/MM/YYYY"',
-            [MESSAGE_INVALID_DATE]: 'Invalid "{{ deletionDate }}" deletion date',
-            [MESSAGE_CAN_BE_REMOVED]: '"{{ nodeName }}" сan be removed',
+            [MESSAGE_REQUIRE_DATE]: 'Directive "@deprecated" must have a deletion date for {{ nodeName }}',
+            [MESSAGE_INVALID_FORMAT]: 'Deletion date must be in format "DD/MM/YYYY" for {{ nodeName }}',
+            [MESSAGE_INVALID_DATE]: 'Invalid "{{ deletionDate }}" deletion date for {{ nodeName }}',
+            [MESSAGE_CAN_BE_REMOVED]: '{{ nodeName }} сan be removed',
         },
         schema,
     },
@@ -78,13 +79,20 @@ exports.rule = {
                     context.report({
                         node: node.name,
                         messageId: MESSAGE_REQUIRE_DATE,
+                        data: {
+                            nodeName: (0, utils_js_1.getNodeName)(node.parent),
+                        },
                     });
                     return;
                 }
                 const deletionDate = (0, index_js_1.valueFromNode)(deletionDateNode.value);
                 const isValidDate = DATE_REGEX.test(deletionDate);
                 if (!isValidDate) {
-                    context.report({ node: deletionDateNode.value, messageId: MESSAGE_INVALID_FORMAT });
+                    context.report({
+                        node: deletionDateNode.value,
+                        messageId: MESSAGE_INVALID_FORMAT,
+                        data: { nodeName: (0, utils_js_1.getNodeName)(node.parent) },
+                    });
                     return;
                 }
                 let [day, month, year] = deletionDate.split('/');
@@ -97,6 +105,7 @@ exports.rule = {
                         messageId: MESSAGE_INVALID_DATE,
                         data: {
                             deletionDate,
+                            nodeName: (0, utils_js_1.getNodeName)(node.parent),
                         },
                     });
                     return;
@@ -108,7 +117,7 @@ exports.rule = {
                     context.report({
                         node: parent.name,
                         messageId: MESSAGE_CAN_BE_REMOVED,
-                        data: { nodeName },
+                        data: { nodeName: (0, utils_js_1.getNodeName)(parent) },
                         suggest: [
                             {
                                 desc: `Remove \`${nodeName}\``,

package/cjs/rules/require-nullable-fields-with-oneof.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rule = void 0;
 const graphql_1 = require("graphql");
+const utils_js_1 = require("../utils.js");
 const RULE_ID = 'require-nullable-fields-with-oneof';
 exports.rule = {
     meta: {
@@ -32,7 +33,7 @@ exports.rule = {
             ],
         },
         messages: {
-            [RULE_ID]: 'Field `{{fieldName}}` must be nullable.',
+            [RULE_ID]: '{{ nodeName }} must be nullable when "@oneOf" is in use',
         },
         schema: [],
     },
@@ -51,7 +52,7 @@ exports.rule = {
                         context.report({
                             node: field.name,
                             messageId: RULE_ID,
-                            data: { fieldName: field.name.value },
+                            data: { nodeName: (0, utils_js_1.getNodeName)(field) },
                         });
                     }
                 }

package/cjs/rules/require-type-pattern-with-oneof.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rule = void 0;
+const utils_js_1 = require("../utils.js");
 const RULE_ID = 'require-type-pattern-with-oneof';
 exports.rule = {
     meta: {
@@ -34,7 +35,7 @@ exports.rule = {
             ],
         },
         messages: {
-            [RULE_ID]: 'Type `{{typeName}}` should have `{{fieldName}}` field.',
+            [RULE_ID]: '{{ nodeName }} is defined as output with "@oneOf" and must be defined with "{{ fieldName }}" field',
         },
         schema: [],
     },
@@ -49,7 +50,7 @@ exports.rule = {
                             node: parent.name,
                             messageId: RULE_ID,
                             data: {
-                                typeName: parent.name.value,
+                                nodeName: (0, utils_js_1.displayNodeName)(parent),
                                 fieldName,
                             },
                         });

package/cjs/rules/strict-id-in-types.js

@@ -153,7 +153,9 @@ exports.rule = {
                     const pluralTypesSuffix = options.acceptedIdTypes.length > 1 ? 's' : '';
                     context.report({
                         node: node.name,
-                        message: `${typeName} must have exactly one non-nullable unique identifier. Accepted name${pluralNamesSuffix}: ${(0, utils_js_1.englishJoinWords)(options.acceptedIdNames)}. Accepted type${pluralTypesSuffix}: ${(0, utils_js_1.englishJoinWords)(options.acceptedIdTypes)}.`,
+                        message: `${(0, utils_js_1.displayNodeName)(node)} must have exactly one non-nullable unique identifier.
+Accepted name${pluralNamesSuffix}: ${(0, utils_js_1.englishJoinWords)(options.acceptedIdNames)}.
+Accepted type${pluralTypesSuffix}: ${(0, utils_js_1.englishJoinWords)(options.acceptedIdTypes)}.`,
                     });
                 }
             },

package/cjs/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNodeName = exports.truthy = exports.englishJoinWords = exports.ARRAY_DEFAULT_OPTIONS = exports.REPORT_ON_FIRST_CHARACTER = exports.getLocation = exports.convertCase = exports.camelCase = exports.pascalCase = exports.TYPES_KINDS = exports.getTypeName = exports.IS_BROWSER = exports.CWD = exports.VIRTUAL_DOCUMENT_REGEX = exports.normalizePath = exports.logger = exports.requireGraphQLSchemaFromContext = exports.requireSiblingsOperations = void 0;
+exports.getNodeName = exports.displayNodeName = exports.truthy = exports.englishJoinWords = exports.ARRAY_DEFAULT_OPTIONS = exports.REPORT_ON_FIRST_CHARACTER = exports.getLocation = exports.convertCase = exports.camelCase = exports.pascalCase = exports.TYPES_KINDS = exports.getTypeName = exports.CWD = exports.VIRTUAL_DOCUMENT_REGEX = exports.normalizePath = exports.logger = exports.requireGraphQLSchemaFromContext = exports.requireSiblingsOperations = void 0;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const graphql_1 = require("graphql");
@@ -33,7 +33,6 @@ const normalizePath = (path) => (path || '').replace(/\\/g, '/');
 exports.normalizePath = normalizePath;
 exports.VIRTUAL_DOCUMENT_REGEX = /\/\d+_document.graphql$/;
 exports.CWD = process.cwd();
-exports.IS_BROWSER = typeof window !== 'undefined';
 const getTypeName = (node) => 'type' in node ? (0, exports.getTypeName)(node.type) : 'name' in node && node.name ? node.name.value : '';
 exports.getTypeName = getTypeName;
 exports.TYPES_KINDS = [
@@ -98,19 +97,34 @@ function truthy(value) {
     return !!value;
 }
 exports.truthy = truthy;
+const DisplayNodeNameMap = {
+    [graphql_1.Kind.OBJECT_TYPE_DEFINITION]: 'type',
+    [graphql_1.Kind.OBJECT_TYPE_EXTENSION]: 'type',
+    [graphql_1.Kind.INTERFACE_TYPE_DEFINITION]: 'interface',
+    [graphql_1.Kind.INTERFACE_TYPE_EXTENSION]: 'interface',
+    [graphql_1.Kind.ENUM_TYPE_DEFINITION]: 'enum',
+    [graphql_1.Kind.ENUM_TYPE_EXTENSION]: 'enum',
+    [graphql_1.Kind.SCALAR_TYPE_DEFINITION]: 'scalar',
+    [graphql_1.Kind.INPUT_OBJECT_TYPE_DEFINITION]: 'input',
+    [graphql_1.Kind.INPUT_OBJECT_TYPE_EXTENSION]: 'input',
+    [graphql_1.Kind.UNION_TYPE_DEFINITION]: 'union',
+    [graphql_1.Kind.UNION_TYPE_EXTENSION]: 'union',
+    [graphql_1.Kind.DIRECTIVE_DEFINITION]: 'directive',
+    [graphql_1.Kind.FIELD_DEFINITION]: 'field',
+    [graphql_1.Kind.ENUM_VALUE_DEFINITION]: 'value',
+    [graphql_1.Kind.INPUT_VALUE_DEFINITION]: 'value',
+    [graphql_1.Kind.ARGUMENT]: 'argument',
+    [graphql_1.Kind.VARIABLE]: 'variable',
+    [graphql_1.Kind.FRAGMENT_DEFINITION]: 'fragment',
+    [graphql_1.Kind.OPERATION_DEFINITION]: 'operation',
+    [graphql_1.Kind.FIELD]: 'field',
+};
+function displayNodeName(node) {
+    var _a, _b;
+    return `${node.kind === graphql_1.Kind.OPERATION_DEFINITION ? node.operation : DisplayNodeNameMap[node.kind]} "${('alias' in node && ((_a = node.alias) === null || _a === void 0 ? void 0 : _a.value)) || ('name' in node && ((_b = node.name) === null || _b === void 0 ? void 0 : _b.value))}"`;
+}
+exports.displayNodeName = displayNodeName;
 function getNodeName(node) {
-    const DisplayNodeNameMap = {
-        [graphql_1.Kind.OBJECT_TYPE_DEFINITION]: 'type',
-        [graphql_1.Kind.INTERFACE_TYPE_DEFINITION]: 'interface',
-        [graphql_1.Kind.ENUM_TYPE_DEFINITION]: 'enum',
-        [graphql_1.Kind.SCALAR_TYPE_DEFINITION]: 'scalar',
-        [graphql_1.Kind.INPUT_OBJECT_TYPE_DEFINITION]: 'input',
-        [graphql_1.Kind.UNION_TYPE_DEFINITION]: 'union',
-        [graphql_1.Kind.DIRECTIVE_DEFINITION]: 'directive',
-        [graphql_1.Kind.FIELD_DEFINITION]: 'field',
-        [graphql_1.Kind.ENUM_VALUE_DEFINITION]: 'value',
-        [graphql_1.Kind.INPUT_VALUE_DEFINITION]: 'value',
-    };
     switch (node.kind) {
         case graphql_1.Kind.OBJECT_TYPE_DEFINITION:
         case graphql_1.Kind.INTERFACE_TYPE_DEFINITION:
@@ -119,13 +133,13 @@ function getNodeName(node) {
         case graphql_1.Kind.INPUT_OBJECT_TYPE_DEFINITION:
         case graphql_1.Kind.UNION_TYPE_DEFINITION:
         case graphql_1.Kind.DIRECTIVE_DEFINITION:
-            return `${DisplayNodeNameMap[node.kind]} "${node.name.value}"`;
+            return displayNodeName(node);
         case graphql_1.Kind.FIELD_DEFINITION:
         case graphql_1.Kind.INPUT_VALUE_DEFINITION:
         case graphql_1.Kind.ENUM_VALUE_DEFINITION:
-            return `${DisplayNodeNameMap[node.kind]} "${node.name.value}" in ${DisplayNodeNameMap[node.parent.kind]} "${node.parent.name.value}"`;
+            return `${displayNodeName(node)} in ${displayNodeName(node.parent)}`;
         case graphql_1.Kind.OPERATION_DEFINITION:
-            return node.name ? `${node.operation} "${node.name.value}"` : node.operation;
+            return node.name ? displayNodeName(node) : node.operation;
     }
     return '';
 }

package/esm/rules/alphabetize.js

@@ -1,6 +1,6 @@
 import { Kind, } from 'graphql';
 import lowerCase from 'lodash.lowercase';
-import { ARRAY_DEFAULT_OPTIONS, truthy } from '../utils.js';
+import { ARRAY_DEFAULT_OPTIONS, displayNodeName, truthy } from '../utils.js';
 const RULE_ID = 'alphabetize';
 const fieldsEnum = [
     Kind.OBJECT_TYPE_DEFINITION,
@@ -181,7 +181,7 @@ export const rule = {
             },
         },
         messages: {
-            [RULE_ID]: '`{{ currName }}` should be before {{ prevName }}.',
+            [RULE_ID]: '{{ currNode }} should be before {{ prevNode }}',
         },
         schema,
     },
@@ -273,8 +273,8 @@ export const rule = {
                     node: ('alias' in currNode && currNode.alias) || currNode.name,
                     messageId: RULE_ID,
                     data: {
-                        currName,
-                        prevName: prevName ? `\`${prevName}\`` : lowerCase(prevNode.kind),
+                        currNode: displayNodeName(currNode),
+                        prevNode: prevName ? displayNodeName(prevNode) : lowerCase(prevNode.kind),
                     },
                     *fix(fixer) {
                         const prevRange = getRangeWithComments(prevNode);

package/esm/rules/description-style.js

@@ -1,3 +1,4 @@
+import { getNodeName } from '../utils.js';
 const schema = {
     type: 'array',
     maxItems: 1,
@@ -54,7 +55,7 @@ export const rule = {
             [`.description[type=StringValue][block!=${isBlock}]`](node) {
                 context.report({
                     loc: isBlock ? node.loc : node.loc.start,
-                    message: `Unexpected ${isBlock ? 'inline' : 'block'} description.`,
+                    message: `Unexpected ${isBlock ? 'inline' : 'block'} description for ${getNodeName(node.parent)}`,
                     suggest: [
                         {
                             desc: `Change to ${isBlock ? 'block' : 'inline'} style description`,

package/esm/rules/input-name.js

@@ -86,11 +86,12 @@ export const rule = {
             false;
         const listeners = {
             'FieldDefinition > InputValueDefinition[name.value!=input] > Name'(node) {
-                if (shouldCheckType(node.parent.parent.parent)) {
+                const fieldDef = node.parent.parent;
+                if (shouldCheckType(fieldDef.parent)) {
                     const inputName = node.value;
                     context.report({
                         node,
-                        message: `Input \`${inputName}\` should be called \`input\`.`,
+                        message: `Input "${inputName}" should be named "input" for "${fieldDef.parent.name.value}.${fieldDef.name.value}"`,
                         suggest: [
                             {
                                 desc: 'Rename to `input`',

package/esm/rules/no-case-insensitive-enum-values-duplicates.js

@@ -1,4 +1,5 @@
 import { Kind } from 'graphql';
+import { getNodeName } from '../utils.js';
 export const rule = {
     meta: {
         type: 'suggestion',
@@ -44,7 +45,7 @@ export const rule = {
                     const enumName = duplicate.name.value;
                     context.report({
                         node: duplicate.name,
-                        message: `Case-insensitive enum values duplicates are not allowed! Found: \`${enumName}\`.`,
+                        message: `Unexpected case-insensitive enum values duplicates for ${getNodeName(duplicate)}`,
                         suggest: [
                             {
                                 desc: `Remove \`${enumName}\` enum value`,

package/esm/rules/no-hashtag-description.js

@@ -1,12 +1,13 @@
 import { TokenKind } from 'graphql';
-const HASHTAG_COMMENT = 'HASHTAG_COMMENT';
+import { getNodeName } from '../utils.js';
+export const RULE_ID = 'HASHTAG_COMMENT';
 export const rule = {
     meta: {
         type: 'suggestion',
         hasSuggestions: true,
         schema: [],
         messages: {
-            [HASHTAG_COMMENT]: 'Using hashtag `#` for adding GraphQL descriptions is not allowed. Prefer using `"""` for multiline, or `"` for a single line description.',
+            [RULE_ID]: 'Unexpected GraphQL descriptions as hashtag `#` for {{ nodeName }}.\nPrefer using `"""` for multiline, or `"` for a single line description.',
         },
         docs: {
             description: 'Requires to use `"""` or `"` for adding a GraphQL description instead of `#`.\nAllows to use hashtag for comments, as long as it\'s not attached to an AST definition.',
@@ -66,8 +67,15 @@ export const rule = {
                             line !== prev.line &&
                             next.kind === TokenKind.NAME &&
                             linesAfter < 2) {
+                            const sourceCode = context.getSourceCode();
+                            const { tokens } = sourceCode.ast;
+                            const t = tokens.find(token => token.loc.start.line === next.line && token.loc.start.column === next.column - 1);
+                            const nextNode = sourceCode.getNodeByRangeIndex(t.range[1] + 1);
                             context.report({
-                                messageId: HASHTAG_COMMENT,
+                                messageId: RULE_ID,
+                                data: {
+                                    nodeName: getNodeName('name' in nextNode ? nextNode : nextNode.parent),
+                                },
                                 loc: {
                                     line,
                                     column: column - 1,

package/esm/rules/no-scalar-result-type-on-mutation.js

@@ -1,5 +1,5 @@
-import { isScalarType } from 'graphql';
-import { requireGraphQLSchemaFromContext } from '../utils.js';
+import { isScalarType, Kind } from 'graphql';
+import { getNodeName, requireGraphQLSchemaFromContext } from '../utils.js';
 const RULE_ID = 'no-scalar-result-type-on-mutation';
 export const rule = {
     meta: {
@@ -46,9 +46,13 @@ export const rule = {
                 const typeName = node.value;
                 const graphQLType = schema.getType(typeName);
                 if (isScalarType(graphQLType)) {
+                    let fieldDef = node.parent;
+                    while (fieldDef.kind !== Kind.FIELD_DEFINITION) {
+                        fieldDef = fieldDef.parent;
+                    }
                     context.report({
                         node,
-                        message: `Unexpected scalar result type \`${typeName}\`.`,
+                        message: `Unexpected scalar result type \`${typeName}\` for ${getNodeName(fieldDef)}`,
                         suggest: [
                             {
                                 desc: `Remove \`${typeName}\``,

package/esm/rules/require-deprecation-date.js

@@ -1,4 +1,5 @@
 import { valueFromNode } from '../estree-converter/index.js';
+import { getNodeName } from '../utils.js';
 // eslint-disable-next-line unicorn/better-regex
 const DATE_REGEX = /^\d{2}\/\d{2}\/\d{4}$/;
 const MESSAGE_REQUIRE_DATE = 'MESSAGE_REQUIRE_DATE';
@@ -58,10 +59,10 @@ export const rule = {
             ],
         },
         messages: {
-            [MESSAGE_REQUIRE_DATE]: 'Directive "@deprecated" must have a deletion date',
-            [MESSAGE_INVALID_FORMAT]: 'Deletion date must be in format "DD/MM/YYYY"',
-            [MESSAGE_INVALID_DATE]: 'Invalid "{{ deletionDate }}" deletion date',
-            [MESSAGE_CAN_BE_REMOVED]: '"{{ nodeName }}" сan be removed',
+            [MESSAGE_REQUIRE_DATE]: 'Directive "@deprecated" must have a deletion date for {{ nodeName }}',
+            [MESSAGE_INVALID_FORMAT]: 'Deletion date must be in format "DD/MM/YYYY" for {{ nodeName }}',
+            [MESSAGE_INVALID_DATE]: 'Invalid "{{ deletionDate }}" deletion date for {{ nodeName }}',
+            [MESSAGE_CAN_BE_REMOVED]: '{{ nodeName }} сan be removed',
         },
         schema,
     },
@@ -75,13 +76,20 @@ export const rule = {
                     context.report({
                         node: node.name,
                         messageId: MESSAGE_REQUIRE_DATE,
+                        data: {
+                            nodeName: getNodeName(node.parent),
+                        },
                     });
                     return;
                 }
                 const deletionDate = valueFromNode(deletionDateNode.value);
                 const isValidDate = DATE_REGEX.test(deletionDate);
                 if (!isValidDate) {
-                    context.report({ node: deletionDateNode.value, messageId: MESSAGE_INVALID_FORMAT });
+                    context.report({
+                        node: deletionDateNode.value,
+                        messageId: MESSAGE_INVALID_FORMAT,
+                        data: { nodeName: getNodeName(node.parent) },
+                    });
                     return;
                 }
                 let [day, month, year] = deletionDate.split('/');
@@ -94,6 +102,7 @@ export const rule = {
                         messageId: MESSAGE_INVALID_DATE,
                         data: {
                             deletionDate,
+                            nodeName: getNodeName(node.parent),
                         },
                     });
                     return;
@@ -105,7 +114,7 @@ export const rule = {
                     context.report({
                         node: parent.name,
                         messageId: MESSAGE_CAN_BE_REMOVED,
-                        data: { nodeName },
+                        data: { nodeName: getNodeName(parent) },
                         suggest: [
                             {
                                 desc: `Remove \`${nodeName}\``,

package/esm/rules/require-nullable-fields-with-oneof.js

@@ -1,4 +1,5 @@
 import { Kind } from 'graphql';
+import { getNodeName } from '../utils.js';
 const RULE_ID = 'require-nullable-fields-with-oneof';
 export const rule = {
     meta: {
@@ -29,7 +30,7 @@ export const rule = {
             ],
         },
         messages: {
-            [RULE_ID]: 'Field `{{fieldName}}` must be nullable.',
+            [RULE_ID]: '{{ nodeName }} must be nullable when "@oneOf" is in use',
         },
         schema: [],
     },
@@ -48,7 +49,7 @@ export const rule = {
                         context.report({
                             node: field.name,
                             messageId: RULE_ID,
-                            data: { fieldName: field.name.value },
+                            data: { nodeName: getNodeName(field) },
                         });
                     }
                 }

package/esm/rules/require-type-pattern-with-oneof.js

@@ -1,3 +1,4 @@
+import { displayNodeName } from '../utils.js';
 const RULE_ID = 'require-type-pattern-with-oneof';
 export const rule = {
     meta: {
@@ -31,7 +32,7 @@ export const rule = {
             ],
         },
         messages: {
-            [RULE_ID]: 'Type `{{typeName}}` should have `{{fieldName}}` field.',
+            [RULE_ID]: '{{ nodeName }} is defined as output with "@oneOf" and must be defined with "{{ fieldName }}" field',
         },
         schema: [],
     },
@@ -46,7 +47,7 @@ export const rule = {
                             node: parent.name,
                             messageId: RULE_ID,
                             data: {
-                                typeName: parent.name.value,
+                                nodeName: displayNodeName(parent),
                                 fieldName,
                             },
                         });

package/esm/rules/strict-id-in-types.js

@@ -1,5 +1,5 @@
 import { Kind } from 'graphql';
-import { ARRAY_DEFAULT_OPTIONS, englishJoinWords, requireGraphQLSchemaFromContext, truthy, } from '../utils.js';
+import { ARRAY_DEFAULT_OPTIONS, displayNodeName, englishJoinWords, requireGraphQLSchemaFromContext, truthy, } from '../utils.js';
 const RULE_ID = 'strict-id-in-types';
 const schema = {
     type: 'array',
@@ -150,7 +150,9 @@ export const rule = {
                     const pluralTypesSuffix = options.acceptedIdTypes.length > 1 ? 's' : '';
                     context.report({
                         node: node.name,
-                        message: `${typeName} must have exactly one non-nullable unique identifier. Accepted name${pluralNamesSuffix}: ${englishJoinWords(options.acceptedIdNames)}. Accepted type${pluralTypesSuffix}: ${englishJoinWords(options.acceptedIdTypes)}.`,
+                        message: `${displayNodeName(node)} must have exactly one non-nullable unique identifier.
+Accepted name${pluralNamesSuffix}: ${englishJoinWords(options.acceptedIdNames)}.
+Accepted type${pluralTypesSuffix}: ${englishJoinWords(options.acceptedIdTypes)}.`,
                     });
                 }
             },

package/esm/utils.js

@@ -26,7 +26,6 @@ export const logger = {
 export const normalizePath = (path) => (path || '').replace(/\\/g, '/');
 export const VIRTUAL_DOCUMENT_REGEX = /\/\d+_document.graphql$/;
 export const CWD = process.cwd();
-export const IS_BROWSER = typeof window !== 'undefined';
 export const getTypeName = (node) => 'type' in node ? getTypeName(node.type) : 'name' in node && node.name ? node.name.value : '';
 export const TYPES_KINDS = [
     Kind.OBJECT_TYPE_DEFINITION,
@@ -84,19 +83,33 @@ export const englishJoinWords = (words) => new Intl.ListFormat('en-US', { type:
 export function truthy(value) {
     return !!value;
 }
+const DisplayNodeNameMap = {
+    [Kind.OBJECT_TYPE_DEFINITION]: 'type',
+    [Kind.OBJECT_TYPE_EXTENSION]: 'type',
+    [Kind.INTERFACE_TYPE_DEFINITION]: 'interface',
+    [Kind.INTERFACE_TYPE_EXTENSION]: 'interface',
+    [Kind.ENUM_TYPE_DEFINITION]: 'enum',
+    [Kind.ENUM_TYPE_EXTENSION]: 'enum',
+    [Kind.SCALAR_TYPE_DEFINITION]: 'scalar',
+    [Kind.INPUT_OBJECT_TYPE_DEFINITION]: 'input',
+    [Kind.INPUT_OBJECT_TYPE_EXTENSION]: 'input',
+    [Kind.UNION_TYPE_DEFINITION]: 'union',
+    [Kind.UNION_TYPE_EXTENSION]: 'union',
+    [Kind.DIRECTIVE_DEFINITION]: 'directive',
+    [Kind.FIELD_DEFINITION]: 'field',
+    [Kind.ENUM_VALUE_DEFINITION]: 'value',
+    [Kind.INPUT_VALUE_DEFINITION]: 'value',
+    [Kind.ARGUMENT]: 'argument',
+    [Kind.VARIABLE]: 'variable',
+    [Kind.FRAGMENT_DEFINITION]: 'fragment',
+    [Kind.OPERATION_DEFINITION]: 'operation',
+    [Kind.FIELD]: 'field',
+};
+export function displayNodeName(node) {
+    var _a, _b;
+    return `${node.kind === Kind.OPERATION_DEFINITION ? node.operation : DisplayNodeNameMap[node.kind]} "${('alias' in node && ((_a = node.alias) === null || _a === void 0 ? void 0 : _a.value)) || ('name' in node && ((_b = node.name) === null || _b === void 0 ? void 0 : _b.value))}"`;
+}
 export function getNodeName(node) {
-    const DisplayNodeNameMap = {
-        [Kind.OBJECT_TYPE_DEFINITION]: 'type',
-        [Kind.INTERFACE_TYPE_DEFINITION]: 'interface',
-        [Kind.ENUM_TYPE_DEFINITION]: 'enum',
-        [Kind.SCALAR_TYPE_DEFINITION]: 'scalar',
-        [Kind.INPUT_OBJECT_TYPE_DEFINITION]: 'input',
-        [Kind.UNION_TYPE_DEFINITION]: 'union',
-        [Kind.DIRECTIVE_DEFINITION]: 'directive',
-        [Kind.FIELD_DEFINITION]: 'field',
-        [Kind.ENUM_VALUE_DEFINITION]: 'value',
-        [Kind.INPUT_VALUE_DEFINITION]: 'value',
-    };
     switch (node.kind) {
         case Kind.OBJECT_TYPE_DEFINITION:
         case Kind.INTERFACE_TYPE_DEFINITION:
@@ -105,13 +118,13 @@ export function getNodeName(node) {
         case Kind.INPUT_OBJECT_TYPE_DEFINITION:
         case Kind.UNION_TYPE_DEFINITION:
         case Kind.DIRECTIVE_DEFINITION:
-            return `${DisplayNodeNameMap[node.kind]} "${node.name.value}"`;
+            return displayNodeName(node);
         case Kind.FIELD_DEFINITION:
         case Kind.INPUT_VALUE_DEFINITION:
         case Kind.ENUM_VALUE_DEFINITION:
-            return `${DisplayNodeNameMap[node.kind]} "${node.name.value}" in ${DisplayNodeNameMap[node.parent.kind]} "${node.parent.name.value}"`;
+            return `${displayNodeName(node)} in ${displayNodeName(node.parent)}`;
         case Kind.OPERATION_DEFINITION:
-            return node.name ? `${node.operation} "${node.name.value}"` : node.operation;
+            return node.name ? displayNodeName(node) : node.operation;
     }
     return '';
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-eslint/eslint-plugin",
-  "version": "3.16.2-alpha-20230322145450-ffe6eec",
+  "version": "3.17.0-alpha-20230323123320-43244a5",
   "description": "GraphQL plugin for ESLint",
   "sideEffects": false,
   "peerDependencies": {

package/typings/rules/no-hashtag-description.d.cts

@@ -1,2 +1,3 @@
 import { GraphQLESLintRule } from '../types.cjs';
+export declare const RULE_ID = "HASHTAG_COMMENT";
 export declare const rule: GraphQLESLintRule;

package/typings/rules/no-hashtag-description.d.ts

@@ -1,2 +1,3 @@
 import { GraphQLESLintRule } from '../types.js';
+export declare const RULE_ID = "HASHTAG_COMMENT";
 export declare const rule: GraphQLESLintRule;

package/typings/utils.d.cts

@@ -13,7 +13,6 @@ export declare const logger: {
 export declare const normalizePath: (path: string) => string;
 export declare const VIRTUAL_DOCUMENT_REGEX: RegExp;
 export declare const CWD: string;
-export declare const IS_BROWSER: boolean;
 export declare const getTypeName: (node: ASTNode) => string;
 export declare const TYPES_KINDS: readonly [Kind.OBJECT_TYPE_DEFINITION, Kind.INTERFACE_TYPE_DEFINITION, Kind.ENUM_TYPE_DEFINITION, Kind.SCALAR_TYPE_DEFINITION, Kind.INPUT_OBJECT_TYPE_DEFINITION, Kind.UNION_TYPE_DEFINITION];
 export type CaseStyle = 'camelCase' | 'kebab-case' | 'PascalCase' | 'snake_case' | 'UPPER_CASE';
@@ -36,5 +35,6 @@ export declare const ARRAY_DEFAULT_OPTIONS: {
 export declare const englishJoinWords: (words: string[]) => string;
 type Truthy<T> = T extends '' | 0 | false | null | undefined ? never : T;
 export declare function truthy<T>(value: T): value is Truthy<T>;
+export declare function displayNodeName(node: GraphQLESTreeNode<ASTNode>): string;
 export declare function getNodeName(node: GraphQLESTreeNode<ASTNode>): string;
 export {};

package/typings/utils.d.ts

@@ -13,7 +13,6 @@ export declare const logger: {
 export declare const normalizePath: (path: string) => string;
 export declare const VIRTUAL_DOCUMENT_REGEX: RegExp;
 export declare const CWD: string;
-export declare const IS_BROWSER: boolean;
 export declare const getTypeName: (node: ASTNode) => string;
 export declare const TYPES_KINDS: readonly [Kind.OBJECT_TYPE_DEFINITION, Kind.INTERFACE_TYPE_DEFINITION, Kind.ENUM_TYPE_DEFINITION, Kind.SCALAR_TYPE_DEFINITION, Kind.INPUT_OBJECT_TYPE_DEFINITION, Kind.UNION_TYPE_DEFINITION];
 export type CaseStyle = 'camelCase' | 'kebab-case' | 'PascalCase' | 'snake_case' | 'UPPER_CASE';
@@ -36,5 +35,6 @@ export declare const ARRAY_DEFAULT_OPTIONS: {
 export declare const englishJoinWords: (words: string[]) => string;
 type Truthy<T> = T extends '' | 0 | false | null | undefined ? never : T;
 export declare function truthy<T>(value: T): value is Truthy<T>;
+export declare function displayNodeName(node: GraphQLESTreeNode<ASTNode>): string;
 export declare function getNodeName(node: GraphQLESTreeNode<ASTNode>): string;
 export {};