@graphql-eslint/eslint-plugin 2.3.2-alpha-78e0315.0 → 2.3.2-alpha-6c8a706.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 {
+query getUserDetails {
   user {
-    name
+    name # first
     email
-    name # duplicate field
+    name # second
   }
 }
 ```
@@ -28,7 +28,7 @@ query {
 ```graphql
 # eslint @graphql-eslint/avoid-duplicate-fields: 'error'
 
-query {
+query getUsers {
   users(
     first: 100
     skip: 50
@@ -45,11 +45,9 @@ query {
 ```graphql
 # eslint @graphql-eslint/avoid-duplicate-fields: 'error'
 
-query (
-  $first: Int!
-  $first: Int! # duplicate variable
-) {
-  users(first: $first, skip: 50) {
+query getUsers($first: Int!, $first: Int!) {
+  # Duplicate variable
+  users(first: 100, skip: 50, after: "cji629tngfgou0b73kt7vi5jo") {
     id
   }
 }

package/index.js

@@ -275,7 +275,7 @@ function validateDoc(sourceNode, context, schema, documentNode, rules, ruleName
             for (const error of validationErrors) {
                 const validateRuleName = ruleName || `[${extractRuleName(error.stack)}]`;
                 context.report({
-                    loc: error.locations[0],
+                    loc: getLocation({ start: error.locations[0] }),
                     message: ruleName ? error.message : `${validateRuleName} ${error.message}`,
                 });
             }
@@ -744,22 +744,35 @@ 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 {
+            query getUserDetails {
               user {
-                name
+                name # first
                 email
-                name # duplicate field
+                name # second
               }
             }
           `,
@@ -767,7 +780,7 @@ const rule$1 = {
                 {
                     title: 'Incorrect',
                     code: /* GraphQL */ `
-            query {
+            query getUsers {
               users(
                 first: 100
                 skip: 50
@@ -782,11 +795,9 @@ const rule$1 = {
                 {
                     title: 'Incorrect',
                     code: /* GraphQL */ `
-            query (
-              $first: Int!
-              $first: Int! # duplicate variable
-            ) {
-              users(first: $first, skip: 50) {
+            query getUsers($first: Int!, $first: Int!) {
+              # Duplicate variable
+              users(first: 100, skip: 50, after: "cji629tngfgou0b73kt7vi5jo") {
                 id
               }
             }
@@ -795,47 +806,58 @@ 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 set = new Set();
-                for (const varDef of node.variableDefinitions) {
-                    checkNode(set, varDef.variable.name.value, 'Operation variable', varDef);
+                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,
+                        });
+                    });
                 }
             },
             Field(node) {
-                const set = new Set();
-                for (const arg of node.arguments) {
-                    checkNode(set, arg.name.value, 'Field argument', arg);
+                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,
+                        });
+                    });
                 }
             },
             SelectionSet(node) {
                 var _a;
-                const set = new Set();
-                for (const selection of node.selections) {
+                const uniqueCheck = ensureUnique();
+                for (const selection of node.selections || []) {
                     if (selection.kind === graphql.Kind.FIELD) {
-                        checkNode(set, ((_a = selection.alias) === null || _a === void 0 ? void 0 : _a.value) || selection.name.value, 'Field', selection);
+                        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,
+                            });
+                        });
                     }
                 }
             },
@@ -1028,23 +1050,13 @@ const rule$4 = {
                 for (const field of node.fields) {
                     const fieldName = field.name.value;
                     if (fieldName.toLowerCase().startsWith(lowerTypeName)) {
-                        const { start } = field.loc;
                         context.report({
                             data: {
                                 fieldName,
                                 typeName,
                             },
                             messageId: AVOID_TYPENAME_PREFIX,
-                            loc: {
-                                start: {
-                                    line: start.line,
-                                    column: start.column - 1,
-                                },
-                                end: {
-                                    line: start.line,
-                                    column: start.column - 1 + lowerTypeName.length,
-                                },
-                            },
+                            loc: getLocation(field.loc, lowerTypeName),
                         });
                     }
                 }
@@ -1748,28 +1760,14 @@ const rule$9 = {
     },
     create(context) {
         return {
-            OperationDefinition(node) {
-                var _a;
-                const isAnonymous = (((_a = node.name) === null || _a === void 0 ? void 0 : _a.value) || '').length === 0;
-                if (isAnonymous) {
-                    const { start } = node.loc;
-                    context.report({
-                        loc: {
-                            start: {
-                                column: start.column - 1,
-                                line: start.line,
-                            },
-                            end: {
-                                column: start.column - 1 + node.operation.length,
-                                line: start.line,
-                            },
-                        },
-                        data: {
-                            operation: node.operation,
-                        },
-                        messageId: NO_ANONYMOUS_OPERATIONS,
-                    });
-                }
+            'OperationDefinition[name=undefined]'(node) {
+                context.report({
+                    loc: getLocation(node.loc, node.operation),
+                    data: {
+                        operation: node.operation,
+                    },
+                    messageId: NO_ANONYMOUS_OPERATIONS,
+                });
             },
         };
     },
@@ -2008,7 +2006,10 @@ const rule$c = {
                         if (!isEslintComment && line !== prev.line && next.kind === graphql.TokenKind.NAME && linesAfter < 2) {
                             context.report({
                                 messageId: HASHTAG_COMMENT,
-                                loc: getLocation({ start: { line, column } }),
+                                loc: {
+                                    start: { line, column },
+                                    end: { line, column },
+                                },
                             });
                         }
                     }
@@ -2524,20 +2525,8 @@ const DESCRIBABLE_NODES = [
 function verifyRule(context, node) {
     if (node) {
         if (!node.description || !node.description.value || node.description.value.trim().length === 0) {
-            const { start, end } = ('name' in node ? node.name : node).loc;
             context.report({
-                loc: {
-                    start: {
-                        line: start.line,
-                        column: start.column - 1,
-                    },
-                    end: {
-                        line: end.line,
-                        column: 
-                        // node.name don't exist on SchemaDefinition
-                        'name' in node ? end.column - 1 + node.name.value.length : end.column,
-                    },
-                },
+                loc: getLocation(('name' in node ? node.name : node).loc, 'name' in node ? node.name.value : 'schema'),
                 messageId: REQUIRE_DESCRIPTION_ERROR,
                 data: {
                     nodeType: node.kind,
@@ -3008,7 +2997,7 @@ const rule$l = {
                         getDocument: () => document,
                         reportError: (error) => {
                             context.report({
-                                loc: error.locations[0],
+                                loc: getLocation({ start: error.locations[0] }),
                                 message: error.message,
                             });
                         },

package/index.mjs

@@ -269,7 +269,7 @@ function validateDoc(sourceNode, context, schema, documentNode, rules, ruleName
             for (const error of validationErrors) {
                 const validateRuleName = ruleName || `[${extractRuleName(error.stack)}]`;
                 context.report({
-                    loc: error.locations[0],
+                    loc: getLocation({ start: error.locations[0] }),
                     message: ruleName ? error.message : `${validateRuleName} ${error.message}`,
                 });
             }
@@ -738,22 +738,35 @@ 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 {
+            query getUserDetails {
               user {
-                name
+                name # first
                 email
-                name # duplicate field
+                name # second
               }
             }
           `,
@@ -761,7 +774,7 @@ const rule$1 = {
                 {
                     title: 'Incorrect',
                     code: /* GraphQL */ `
-            query {
+            query getUsers {
               users(
                 first: 100
                 skip: 50
@@ -776,11 +789,9 @@ const rule$1 = {
                 {
                     title: 'Incorrect',
                     code: /* GraphQL */ `
-            query (
-              $first: Int!
-              $first: Int! # duplicate variable
-            ) {
-              users(first: $first, skip: 50) {
+            query getUsers($first: Int!, $first: Int!) {
+              # Duplicate variable
+              users(first: 100, skip: 50, after: "cji629tngfgou0b73kt7vi5jo") {
                 id
               }
             }
@@ -789,47 +800,58 @@ 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 set = new Set();
-                for (const varDef of node.variableDefinitions) {
-                    checkNode(set, varDef.variable.name.value, 'Operation variable', varDef);
+                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,
+                        });
+                    });
                 }
             },
             Field(node) {
-                const set = new Set();
-                for (const arg of node.arguments) {
-                    checkNode(set, arg.name.value, 'Field argument', arg);
+                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,
+                        });
+                    });
                 }
             },
             SelectionSet(node) {
                 var _a;
-                const set = new Set();
-                for (const selection of node.selections) {
+                const uniqueCheck = ensureUnique();
+                for (const selection of node.selections || []) {
                     if (selection.kind === Kind.FIELD) {
-                        checkNode(set, ((_a = selection.alias) === null || _a === void 0 ? void 0 : _a.value) || selection.name.value, 'Field', selection);
+                        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,
+                            });
+                        });
                     }
                 }
             },
@@ -1022,23 +1044,13 @@ const rule$4 = {
                 for (const field of node.fields) {
                     const fieldName = field.name.value;
                     if (fieldName.toLowerCase().startsWith(lowerTypeName)) {
-                        const { start } = field.loc;
                         context.report({
                             data: {
                                 fieldName,
                                 typeName,
                             },
                             messageId: AVOID_TYPENAME_PREFIX,
-                            loc: {
-                                start: {
-                                    line: start.line,
-                                    column: start.column - 1,
-                                },
-                                end: {
-                                    line: start.line,
-                                    column: start.column - 1 + lowerTypeName.length,
-                                },
-                            },
+                            loc: getLocation(field.loc, lowerTypeName),
                         });
                     }
                 }
@@ -1742,28 +1754,14 @@ const rule$9 = {
     },
     create(context) {
         return {
-            OperationDefinition(node) {
-                var _a;
-                const isAnonymous = (((_a = node.name) === null || _a === void 0 ? void 0 : _a.value) || '').length === 0;
-                if (isAnonymous) {
-                    const { start } = node.loc;
-                    context.report({
-                        loc: {
-                            start: {
-                                column: start.column - 1,
-                                line: start.line,
-                            },
-                            end: {
-                                column: start.column - 1 + node.operation.length,
-                                line: start.line,
-                            },
-                        },
-                        data: {
-                            operation: node.operation,
-                        },
-                        messageId: NO_ANONYMOUS_OPERATIONS,
-                    });
-                }
+            'OperationDefinition[name=undefined]'(node) {
+                context.report({
+                    loc: getLocation(node.loc, node.operation),
+                    data: {
+                        operation: node.operation,
+                    },
+                    messageId: NO_ANONYMOUS_OPERATIONS,
+                });
             },
         };
     },
@@ -2002,7 +2000,10 @@ const rule$c = {
                         if (!isEslintComment && line !== prev.line && next.kind === TokenKind.NAME && linesAfter < 2) {
                             context.report({
                                 messageId: HASHTAG_COMMENT,
-                                loc: getLocation({ start: { line, column } }),
+                                loc: {
+                                    start: { line, column },
+                                    end: { line, column },
+                                },
                             });
                         }
                     }
@@ -2518,20 +2519,8 @@ const DESCRIBABLE_NODES = [
 function verifyRule(context, node) {
     if (node) {
         if (!node.description || !node.description.value || node.description.value.trim().length === 0) {
-            const { start, end } = ('name' in node ? node.name : node).loc;
             context.report({
-                loc: {
-                    start: {
-                        line: start.line,
-                        column: start.column - 1,
-                    },
-                    end: {
-                        line: end.line,
-                        column: 
-                        // node.name don't exist on SchemaDefinition
-                        'name' in node ? end.column - 1 + node.name.value.length : end.column,
-                    },
-                },
+                loc: getLocation(('name' in node ? node.name : node).loc, 'name' in node ? node.name.value : 'schema'),
                 messageId: REQUIRE_DESCRIPTION_ERROR,
                 data: {
                     nodeType: node.kind,
@@ -3002,7 +2991,7 @@ const rule$l = {
                         getDocument: () => document,
                         reportError: (error) => {
                             context.report({
-                                loc: error.locations[0],
+                                loc: getLocation({ start: error.locations[0] }),
                                 message: error.message,
                             });
                         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-eslint/eslint-plugin",
-  "version": "2.3.2-alpha-78e0315.0",
+  "version": "2.3.2-alpha-6c8a706.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;
+declare const rule: GraphQLESLintRule<[], false>;
 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<any[], false>;
+    'avoid-duplicate-fields': import("..").GraphQLESLintRule<[], 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>;