npm - @graphql-eslint/eslint-plugin - Versions diffs - 2.3.2-alpha-5f59ef8.0 → 2.3.2-alpha-6c4312e.0 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/index.js CHANGED Viewed

@@ -612,7 +612,7 @@ const rule = {
             ],
         },
         messages: {
-            [ALPHABETIZE]: '"{{ currName }}" should be before "{{ prevName }}".',
+            [ALPHABETIZE]: '"{{ currName }}" should be before "{{ prevName }}"',
         },
         schema: {
             type: 'array',
@@ -669,16 +669,9 @@ 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: {
-                            start: {
-                                line: start.line,
-                                column: start.column - (isVariableNode ? 2 : 1),
-                            },
-                            end,
-                        },
+                        loc: getLocation(node.loc, node.name.value, { offsetEnd: isVariableNode ? 0 : 1 }),
                         messageId: ALPHABETIZE,
                         data: isVariableNode
                             ? {
@@ -1126,7 +1119,7 @@ const rule$5 = {
             '[description.type="StringValue"]': node => {
                 if (node.description.block !== (style === 'block')) {
                     context.report({
-                        loc: getLocation(node.description.loc),
+                        node: node.description,
                         message: `Unexpected ${wrongDescriptionType} description`,
                     });
                 }
@@ -3793,7 +3786,25 @@ class GraphQLRuleTester extends eslint.RuleTester {
         return fs.readFileSync(path.resolve(__dirname, `../tests/mocks/${path$1}`), 'utf-8');
     }
     runGraphQLTests(name, rule, tests) {
-        super.run(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);
         // Skip snapshot testing if `expect` variable is not defined
         if (typeof expect === 'undefined') {
             return;

package/index.mjs CHANGED Viewed

@@ -606,7 +606,7 @@ const rule = {
             ],
         },
         messages: {
-            [ALPHABETIZE]: '"{{ currName }}" should be before "{{ prevName }}".',
+            [ALPHABETIZE]: '"{{ currName }}" should be before "{{ prevName }}"',
         },
         schema: {
             type: 'array',
@@ -663,16 +663,9 @@ 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: {
-                            start: {
-                                line: start.line,
-                                column: start.column - (isVariableNode ? 2 : 1),
-                            },
-                            end,
-                        },
+                        loc: getLocation(node.loc, node.name.value, { offsetEnd: isVariableNode ? 0 : 1 }),
                         messageId: ALPHABETIZE,
                         data: isVariableNode
                             ? {
@@ -1120,7 +1113,7 @@ const rule$5 = {
             '[description.type="StringValue"]': node => {
                 if (node.description.block !== (style === 'block')) {
                     context.report({
-                        loc: getLocation(node.description.loc),
+                        node: node.description,
                         message: `Unexpected ${wrongDescriptionType} description`,
                     });
                 }
@@ -3787,7 +3780,25 @@ class GraphQLRuleTester extends RuleTester {
         return readFileSync(resolve(__dirname, `../tests/mocks/${path}`), 'utf-8');
     }
     runGraphQLTests(name, rule, tests) {
-        super.run(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);
         // Skip snapshot testing if `expect` variable is not defined
         if (typeof expect === 'undefined') {
             return;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-eslint/eslint-plugin",
-  "version": "2.3.2-alpha-5f59ef8.0",
+  "version": "2.3.2-alpha-6c4312e.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/testkit.d.ts CHANGED Viewed

@@ -6,6 +6,7 @@ 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;
 };