@graphql-eslint/eslint-plugin 2.3.2-alpha-6c4312e.0 → 2.3.2-alpha-5497183.0

package/docs/rules/avoid-duplicate-fields.md

@@ -14,11 +14,11 @@ Checks for duplicate fields in selection set, variables in operation definition,
 ```graphql
 # eslint @graphql-eslint/avoid-duplicate-fields: 'error'
 
-query getUserDetails {
+query {
   user {
-    name # first
+    name
     email
-    name # second
+    name # duplicate field
   }
 }
 ```
@@ -28,7 +28,7 @@ query getUserDetails {
 ```graphql
 # eslint @graphql-eslint/avoid-duplicate-fields: 'error'
 
-query getUsers {
+query {
   users(
     first: 100
     skip: 50
@@ -45,9 +45,11 @@ query getUsers {
 ```graphql
 # eslint @graphql-eslint/avoid-duplicate-fields: 'error'
 
-query getUsers($first: Int!, $first: Int!) {
-  # Duplicate variable
-  users(first: 100, skip: 50, after: "cji629tngfgou0b73kt7vi5jo") {
+query (
+  $first: Int!
+  $first: Int! # duplicate variable
+) {
+  users(first: $first, skip: 50) {
     id
   }
 }

package/index.js

@@ -612,7 +612,7 @@ const rule = {
             ],
         },
         messages: {
-            [ALPHABETIZE]: '"{{ currName }}" should be before "{{ prevName }}"',
+            [ALPHABETIZE]: '"{{ currName }}" should be before "{{ prevName }}".',
         },
         schema: {
             type: 'array',
@@ -669,9 +669,16 @@ const rule = {
             for (const node of nodes) {
                 const currName = node.name.value;
                 if (prevName && prevName > currName) {
+                    const { start, end } = node.name.loc;
                     const isVariableNode = node.kind === graphql.Kind.VARIABLE;
                     context.report({
-                        loc: getLocation(node.loc, node.name.value, { offsetEnd: isVariableNode ? 0 : 1 }),
+                        loc: {
+                            start: {
+                                line: start.line,
+                                column: start.column - (isVariableNode ? 2 : 1),
+                            },
+                            end,
+                        },
                         messageId: ALPHABETIZE,
                         data: isVariableNode
                             ? {
@@ -737,35 +744,22 @@ const rule = {
 };
 
 const AVOID_DUPLICATE_FIELDS = 'AVOID_DUPLICATE_FIELDS';
-const ensureUnique = () => {
-    const set = new Set();
-    return {
-        add: (item, onError) => {
-            if (set.has(item)) {
-                onError();
-            }
-            else {
-                set.add(item);
-            }
-        },
-    };
-};
 const rule$1 = {
     meta: {
         type: 'suggestion',
         docs: {
-            description: 'Checks for duplicate fields in selection set, variables in operation definition, or in arguments set of a field.',
+            description: `Checks for duplicate fields in selection set, variables in operation definition, or in arguments set of a field.`,
             category: 'Stylistic Issues',
             url: 'https://github.com/dotansimha/graphql-eslint/blob/master/docs/rules/avoid-duplicate-fields.md',
             examples: [
                 {
                     title: 'Incorrect',
                     code: /* GraphQL */ `
-            query getUserDetails {
+            query {
               user {
-                name # first
+                name
                 email
-                name # second
+                name # duplicate field
               }
             }
           `,
@@ -773,7 +767,7 @@ const rule$1 = {
                 {
                     title: 'Incorrect',
                     code: /* GraphQL */ `
-            query getUsers {
+            query {
               users(
                 first: 100
                 skip: 50
@@ -788,9 +782,11 @@ const rule$1 = {
                 {
                     title: 'Incorrect',
                     code: /* GraphQL */ `
-            query getUsers($first: Int!, $first: Int!) {
-              # Duplicate variable
-              users(first: 100, skip: 50, after: "cji629tngfgou0b73kt7vi5jo") {
+            query (
+              $first: Int!
+              $first: Int! # duplicate variable
+            ) {
+              users(first: $first, skip: 50) {
                 id
               }
             }
@@ -799,58 +795,47 @@ const rule$1 = {
             ],
         },
         messages: {
-            [AVOID_DUPLICATE_FIELDS]: `{{ type }} "{{ fieldName }}" defined multiple times.`,
+            [AVOID_DUPLICATE_FIELDS]: `{{ type }} "{{ fieldName }}" defined multiple times`,
         },
         schema: [],
     },
     create(context) {
+        function checkNode(usedFields, fieldName, type, node) {
+            if (usedFields.has(fieldName)) {
+                context.report({
+                    loc: getLocation((node.kind === graphql.Kind.FIELD && node.alias ? node.alias : node).loc, fieldName, {
+                        offsetEnd: node.kind === graphql.Kind.VARIABLE_DEFINITION ? 0 : 1,
+                    }),
+                    messageId: AVOID_DUPLICATE_FIELDS,
+                    data: {
+                        type,
+                        fieldName,
+                    },
+                });
+            }
+            else {
+                usedFields.add(fieldName);
+            }
+        }
         return {
             OperationDefinition(node) {
-                const uniqueCheck = ensureUnique();
-                for (const arg of node.variableDefinitions || []) {
-                    uniqueCheck.add(arg.variable.name.value, () => {
-                        context.report({
-                            messageId: AVOID_DUPLICATE_FIELDS,
-                            data: {
-                                type: 'Operation variable',
-                                fieldName: arg.variable.name.value,
-                            },
-                            node: arg,
-                        });
-                    });
+                const set = new Set();
+                for (const varDef of node.variableDefinitions) {
+                    checkNode(set, varDef.variable.name.value, 'Operation variable', varDef);
                 }
             },
             Field(node) {
-                const uniqueCheck = ensureUnique();
-                for (const arg of node.arguments || []) {
-                    uniqueCheck.add(arg.name.value, () => {
-                        context.report({
-                            messageId: AVOID_DUPLICATE_FIELDS,
-                            data: {
-                                type: 'Field argument',
-                                fieldName: arg.name.value,
-                            },
-                            node: arg,
-                        });
-                    });
+                const set = new Set();
+                for (const arg of node.arguments) {
+                    checkNode(set, arg.name.value, 'Field argument', arg);
                 }
             },
             SelectionSet(node) {
                 var _a;
-                const uniqueCheck = ensureUnique();
-                for (const selection of node.selections || []) {
+                const set = new Set();
+                for (const selection of node.selections) {
                     if (selection.kind === graphql.Kind.FIELD) {
-                        const nameToCheck = ((_a = selection.alias) === null || _a === void 0 ? void 0 : _a.value) || selection.name.value;
-                        uniqueCheck.add(nameToCheck, () => {
-                            context.report({
-                                messageId: AVOID_DUPLICATE_FIELDS,
-                                data: {
-                                    type: 'Field',
-                                    fieldName: nameToCheck,
-                                },
-                                node: selection,
-                            });
-                        });
+                        checkNode(set, ((_a = selection.alias) === null || _a === void 0 ? void 0 : _a.value) || selection.name.value, 'Field', selection);
                     }
                 }
             },
@@ -2023,10 +2008,7 @@ const rule$c = {
                         if (!isEslintComment && line !== prev.line && next.kind === graphql.TokenKind.NAME && linesAfter < 2) {
                             context.report({
                                 messageId: HASHTAG_COMMENT,
-                                loc: {
-                                    start: { line, column },
-                                    end: { line, column },
-                                },
+                                loc: getLocation({ start: { line, column } }),
                             });
                         }
                     }
@@ -3786,25 +3768,7 @@ class GraphQLRuleTester extends eslint.RuleTester {
         return fs.readFileSync(path.resolve(__dirname, `../tests/mocks/${path$1}`), 'utf-8');
     }
     runGraphQLTests(name, rule, tests) {
-        const ruleTests = eslint.Linter.version.startsWith('8')
-            ? tests
-            : {
-                valid: tests.valid.map(test => {
-                    if (typeof test === 'string') {
-                        return test;
-                    }
-                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                    const { name, ...testCaseOptions } = test;
-                    return testCaseOptions;
-                }),
-                invalid: tests.invalid.map(test => {
-                    // ESLint 7 throws an error on CI - Unexpected top-level property "name"
-                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                    const { name, ...testCaseOptions } = test;
-                    return testCaseOptions;
-                }),
-            };
-        super.run(name, rule, ruleTests);
+        super.run(name, rule, tests);
         // Skip snapshot testing if `expect` variable is not defined
         if (typeof expect === 'undefined') {
             return;

package/index.mjs

@@ -606,7 +606,7 @@ const rule = {
             ],
         },
         messages: {
-            [ALPHABETIZE]: '"{{ currName }}" should be before "{{ prevName }}"',
+            [ALPHABETIZE]: '"{{ currName }}" should be before "{{ prevName }}".',
         },
         schema: {
             type: 'array',
@@ -663,9 +663,16 @@ const rule = {
             for (const node of nodes) {
                 const currName = node.name.value;
                 if (prevName && prevName > currName) {
+                    const { start, end } = node.name.loc;
                     const isVariableNode = node.kind === Kind.VARIABLE;
                     context.report({
-                        loc: getLocation(node.loc, node.name.value, { offsetEnd: isVariableNode ? 0 : 1 }),
+                        loc: {
+                            start: {
+                                line: start.line,
+                                column: start.column - (isVariableNode ? 2 : 1),
+                            },
+                            end,
+                        },
                         messageId: ALPHABETIZE,
                         data: isVariableNode
                             ? {
@@ -731,35 +738,22 @@ const rule = {
 };
 
 const AVOID_DUPLICATE_FIELDS = 'AVOID_DUPLICATE_FIELDS';
-const ensureUnique = () => {
-    const set = new Set();
-    return {
-        add: (item, onError) => {
-            if (set.has(item)) {
-                onError();
-            }
-            else {
-                set.add(item);
-            }
-        },
-    };
-};
 const rule$1 = {
     meta: {
         type: 'suggestion',
         docs: {
-            description: 'Checks for duplicate fields in selection set, variables in operation definition, or in arguments set of a field.',
+            description: `Checks for duplicate fields in selection set, variables in operation definition, or in arguments set of a field.`,
             category: 'Stylistic Issues',
             url: 'https://github.com/dotansimha/graphql-eslint/blob/master/docs/rules/avoid-duplicate-fields.md',
             examples: [
                 {
                     title: 'Incorrect',
                     code: /* GraphQL */ `
-            query getUserDetails {
+            query {
               user {
-                name # first
+                name
                 email
-                name # second
+                name # duplicate field
               }
             }
           `,
@@ -767,7 +761,7 @@ const rule$1 = {
                 {
                     title: 'Incorrect',
                     code: /* GraphQL */ `
-            query getUsers {
+            query {
               users(
                 first: 100
                 skip: 50
@@ -782,9 +776,11 @@ const rule$1 = {
                 {
                     title: 'Incorrect',
                     code: /* GraphQL */ `
-            query getUsers($first: Int!, $first: Int!) {
-              # Duplicate variable
-              users(first: 100, skip: 50, after: "cji629tngfgou0b73kt7vi5jo") {
+            query (
+              $first: Int!
+              $first: Int! # duplicate variable
+            ) {
+              users(first: $first, skip: 50) {
                 id
               }
             }
@@ -793,58 +789,47 @@ const rule$1 = {
             ],
         },
         messages: {
-            [AVOID_DUPLICATE_FIELDS]: `{{ type }} "{{ fieldName }}" defined multiple times.`,
+            [AVOID_DUPLICATE_FIELDS]: `{{ type }} "{{ fieldName }}" defined multiple times`,
         },
         schema: [],
     },
     create(context) {
+        function checkNode(usedFields, fieldName, type, node) {
+            if (usedFields.has(fieldName)) {
+                context.report({
+                    loc: getLocation((node.kind === Kind.FIELD && node.alias ? node.alias : node).loc, fieldName, {
+                        offsetEnd: node.kind === Kind.VARIABLE_DEFINITION ? 0 : 1,
+                    }),
+                    messageId: AVOID_DUPLICATE_FIELDS,
+                    data: {
+                        type,
+                        fieldName,
+                    },
+                });
+            }
+            else {
+                usedFields.add(fieldName);
+            }
+        }
         return {
             OperationDefinition(node) {
-                const uniqueCheck = ensureUnique();
-                for (const arg of node.variableDefinitions || []) {
-                    uniqueCheck.add(arg.variable.name.value, () => {
-                        context.report({
-                            messageId: AVOID_DUPLICATE_FIELDS,
-                            data: {
-                                type: 'Operation variable',
-                                fieldName: arg.variable.name.value,
-                            },
-                            node: arg,
-                        });
-                    });
+                const set = new Set();
+                for (const varDef of node.variableDefinitions) {
+                    checkNode(set, varDef.variable.name.value, 'Operation variable', varDef);
                 }
             },
             Field(node) {
-                const uniqueCheck = ensureUnique();
-                for (const arg of node.arguments || []) {
-                    uniqueCheck.add(arg.name.value, () => {
-                        context.report({
-                            messageId: AVOID_DUPLICATE_FIELDS,
-                            data: {
-                                type: 'Field argument',
-                                fieldName: arg.name.value,
-                            },
-                            node: arg,
-                        });
-                    });
+                const set = new Set();
+                for (const arg of node.arguments) {
+                    checkNode(set, arg.name.value, 'Field argument', arg);
                 }
             },
             SelectionSet(node) {
                 var _a;
-                const uniqueCheck = ensureUnique();
-                for (const selection of node.selections || []) {
+                const set = new Set();
+                for (const selection of node.selections) {
                     if (selection.kind === Kind.FIELD) {
-                        const nameToCheck = ((_a = selection.alias) === null || _a === void 0 ? void 0 : _a.value) || selection.name.value;
-                        uniqueCheck.add(nameToCheck, () => {
-                            context.report({
-                                messageId: AVOID_DUPLICATE_FIELDS,
-                                data: {
-                                    type: 'Field',
-                                    fieldName: nameToCheck,
-                                },
-                                node: selection,
-                            });
-                        });
+                        checkNode(set, ((_a = selection.alias) === null || _a === void 0 ? void 0 : _a.value) || selection.name.value, 'Field', selection);
                     }
                 }
             },
@@ -2017,10 +2002,7 @@ const rule$c = {
                         if (!isEslintComment && line !== prev.line && next.kind === TokenKind.NAME && linesAfter < 2) {
                             context.report({
                                 messageId: HASHTAG_COMMENT,
-                                loc: {
-                                    start: { line, column },
-                                    end: { line, column },
-                                },
+                                loc: getLocation({ start: { line, column } }),
                             });
                         }
                     }
@@ -3780,25 +3762,7 @@ class GraphQLRuleTester extends RuleTester {
         return readFileSync(resolve(__dirname, `../tests/mocks/${path}`), 'utf-8');
     }
     runGraphQLTests(name, rule, tests) {
-        const ruleTests = Linter.version.startsWith('8')
-            ? tests
-            : {
-                valid: tests.valid.map(test => {
-                    if (typeof test === 'string') {
-                        return test;
-                    }
-                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                    const { name, ...testCaseOptions } = test;
-                    return testCaseOptions;
-                }),
-                invalid: tests.invalid.map(test => {
-                    // ESLint 7 throws an error on CI - Unexpected top-level property "name"
-                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                    const { name, ...testCaseOptions } = test;
-                    return testCaseOptions;
-                }),
-            };
-        super.run(name, rule, ruleTests);
+        super.run(name, rule, tests);
         // Skip snapshot testing if `expect` variable is not defined
         if (typeof expect === 'undefined') {
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-eslint/eslint-plugin",
-  "version": "2.3.2-alpha-6c4312e.0",
+  "version": "2.3.2-alpha-5497183.0",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"

package/rules/avoid-duplicate-fields.d.ts

@@ -1,3 +1,3 @@
 import { GraphQLESLintRule } from '../types';
-declare const rule: GraphQLESLintRule<[], false>;
+declare const rule: GraphQLESLintRule;
 export default rule;

package/rules/index.d.ts

@@ -6,7 +6,7 @@ export declare const rules: {
         variables?: "OperationDefinition"[];
         arguments?: ("Field" | "Directive" | "FieldDefinition" | "DirectiveDefinition")[];
     }], false>;
-    'avoid-duplicate-fields': import("..").GraphQLESLintRule<[], false>;
+    'avoid-duplicate-fields': import("..").GraphQLESLintRule<any[], false>;
     'avoid-operation-name-prefix': import("..").GraphQLESLintRule<import("./avoid-operation-name-prefix").AvoidOperationNamePrefixConfig, false>;
     'avoid-scalar-result-type-on-mutation': import("..").GraphQLESLintRule<any[], false>;
     'avoid-typename-prefix': import("..").GraphQLESLintRule<any[], false>;

package/testkit.d.ts

@@ -6,7 +6,6 @@ export declare type GraphQLESLintRuleListener<WithTypeInfo extends boolean = fal
     [K in keyof ASTKindToNode]?: (node: GraphQLESTreeNode<ASTKindToNode[K], WithTypeInfo>) => void;
 } & Record<string, any>;
 export declare type GraphQLValidTestCase<Options> = Omit<RuleTester.ValidTestCase, 'options' | 'parserOptions'> & {
-    name: string;
     options?: Options;
     parserOptions?: ParserOptions;
 };