@graphql-eslint/eslint-plugin 4.4.0-alpha-20241210130004-c86c74902285624344165bb32d972962226b7df8 → 4.4.0-alpha-20241210205144-662e65e39b519504be52c4dba23aaa08280b6322

package/esm/rules/require-selections/index.d.ts

@@ -1,10 +1,10 @@
 import { FromSchema } from 'json-schema-to-ts';
 import { GraphQLESLintRule } from '../../types.js';
 import 'eslint';
+import 'estree';
 import 'graphql';
 import 'graphql-config';
 import '../../estree-converter/types.js';
-import 'estree';
 import '../../siblings.js';
 import '@graphql-tools/utils';
 

package/esm/rules/require-selections/index.js

@@ -12,7 +12,6 @@ import { getBaseType } from "../../estree-converter/index.js";
 import {
   ARRAY_DEFAULT_OPTIONS,
   englishJoinWords,
-  pluralize,
   requireGraphQLOperations,
   requireGraphQLSchema
 } from "../../utils.js";
@@ -47,7 +46,7 @@ const rule = {
     type: "suggestion",
     hasSuggestions: true,
     docs: {
-      category: "operations",
+      category: "Operations",
       description: "Enforce selecting specific fields when they are available on the GraphQL type.",
       url: `https://the-guild.dev/graphql/eslint/rules/${RULE_ID}`,
       requiresSchema: true,
@@ -108,7 +107,6 @@ const rule = {
     messages: {
       [RULE_ID]: "Field{{ pluralSuffix }} {{ fieldName }} must be selected when it's available on a type.\nInclude it in your selection set{{ addition }}."
     },
-    // @ts-expect-error -- fixme
     schema
   },
   create(context) {
@@ -214,14 +212,13 @@ const rule = {
         const fieldName2 = englishJoinWords(
           idNames2.map((name) => `\`${(parent.alias || parent.name).value}.${name}\``)
         );
-        const addition = checkedFragmentSpreads.size === 0 ? "" : ` or add to used fragment${pluralize(
-          checkedFragmentSpreads.size
-        )} ${englishJoinWords([...checkedFragmentSpreads].map((name) => `\`${name}\``))}`;
+        const pluralSuffix = idNames2.length > 1 ? "s" : "";
+        const addition = checkedFragmentSpreads.size === 0 ? "" : ` or add to used fragment${checkedFragmentSpreads.size > 1 ? "s" : ""} ${englishJoinWords([...checkedFragmentSpreads].map((name) => `\`${name}\``))}`;
         const problem = {
           loc,
           messageId: RULE_ID,
           data: {
-            pluralSuffix: pluralize(idNames2.length),
+            pluralSuffix,
             fieldName: fieldName2,
             addition
           }
@@ -229,7 +226,6 @@ const rule = {
         if ("type" in node) {
           problem.suggest = idNames2.map((idName) => ({
             desc: `Add \`${idName}\` selection`,
-            // @ts-expect-error -- fixme
             fix: (fixer) => {
               let insertNode = node.selections[0];
               insertNode = insertNode.kind === Kind.INLINE_FRAGMENT ? insertNode.selectionSet.selections[0] : insertNode;

package/esm/rules/require-type-pattern-with-oneof/index.d.ts

@@ -1,9 +1,10 @@
 import { GraphQLESLintRule } from '../../types.js';
 import 'eslint';
+import 'estree';
 import 'graphql';
 import 'graphql-config';
+import 'json-schema-to-ts';
 import '../../estree-converter/types.js';
-import 'estree';
 import '../../siblings.js';
 import '@graphql-tools/utils';
 

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

@@ -4,7 +4,7 @@ const rule = {
   meta: {
     type: "suggestion",
     docs: {
-      category: "schema",
+      category: "Schema",
       description: "Enforce types with `@oneOf` directive have `error` and `ok` fields.",
       url: `https://the-guild.dev/graphql/eslint/rules/${RULE_ID}`,
       examples: [

package/esm/rules/selection-set-depth/index.d.ts

@@ -1,10 +1,10 @@
 import { FromSchema } from 'json-schema-to-ts';
 import { GraphQLESLintRule } from '../../types.js';
 import 'eslint';
+import 'estree';
 import 'graphql';
 import 'graphql-config';
 import '../../estree-converter/types.js';
-import 'estree';
 import '../../siblings.js';
 import '@graphql-tools/utils';
 

package/esm/rules/selection-set-depth/index.js

@@ -23,7 +23,7 @@ const rule = {
     type: "suggestion",
     hasSuggestions: true,
     docs: {
-      category: "operations",
+      category: "Operations",
       description: "Limit the complexity of the GraphQL operations solely by their depth. Based on [graphql-depth-limit](https://npmjs.com/package/graphql-depth-limit).",
       url: `https://the-guild.dev/graphql/eslint/rules/${RULE_ID}`,
       requiresSiblings: true,
@@ -71,7 +71,6 @@ const rule = {
       recommended: true,
       configOptions: [{ maxDepth: 7 }]
     },
-    // @ts-expect-error -- fixme
     schema
   },
   create(context) {
@@ -113,7 +112,6 @@ const rule = {
                   suggest: [
                     {
                       desc: "Remove selections",
-                      // @ts-expect-error -- fixme
                       fix(fixer) {
                         const sourceCode = context.getSourceCode();
                         const foundNode = sourceCode.getNodeByRangeIndex(token.range[0]);

package/esm/rules/strict-id-in-types/index.d.ts

@@ -1,10 +1,10 @@
 import { FromSchema } from 'json-schema-to-ts';
 import { GraphQLESLintRule } from '../../types.js';
 import 'eslint';
+import 'estree';
 import 'graphql';
 import 'graphql-config';
 import '../../estree-converter/types.js';
-import 'estree';
 import '../../siblings.js';
 import '@graphql-tools/utils';
 

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

@@ -3,7 +3,6 @@ import {
   ARRAY_DEFAULT_OPTIONS,
   displayNodeName,
   englishJoinWords,
-  pluralize,
   requireGraphQLSchema
 } from "../../utils.js";
 const RULE_ID = "strict-id-in-types";
@@ -44,7 +43,7 @@ const rule = {
     type: "suggestion",
     docs: {
       description: "Requires output types to have one unique identifier unless they do not have a logical one. Exceptions can be used to ignore output types that do not have unique identifiers.",
-      category: "schema",
+      category: "Schema",
       recommended: true,
       url: `https://the-guild.dev/graphql/eslint/rules/${RULE_ID}`,
       requiresSchema: true,
@@ -116,7 +115,6 @@ const rule = {
         }
       ]
     },
-    // @ts-expect-error -- fixme
     schema
   },
   create(context) {
@@ -150,11 +148,13 @@ const rule = {
           return isValidIdName && isValidIdType;
         });
         if (validIds?.length !== 1) {
+          const pluralNamesSuffix = options.acceptedIdNames.length > 1 ? "s" : "";
+          const pluralTypesSuffix = options.acceptedIdTypes.length > 1 ? "s" : "";
           context.report({
             node: node.name,
             message: `${displayNodeName(node)} must have exactly one non-nullable unique identifier.
-Accepted name${pluralize(options.acceptedIdNames.length)}: ${englishJoinWords(options.acceptedIdNames)}.
-Accepted type${pluralize(options.acceptedIdTypes.length)}: ${englishJoinWords(options.acceptedIdTypes)}.`
+Accepted name${pluralNamesSuffix}: ${englishJoinWords(options.acceptedIdNames)}.
+Accepted type${pluralTypesSuffix}: ${englishJoinWords(options.acceptedIdTypes)}.`
           });
         }
       }

package/esm/rules/unique-enum-value-names/index.d.ts

@@ -1,9 +1,10 @@
 import { GraphQLESLintRule } from '../../types.js';
 import 'eslint';
+import 'estree';
 import 'graphql';
 import 'graphql-config';
+import 'json-schema-to-ts';
 import '../../estree-converter/types.js';
-import 'estree';
 import '../../siblings.js';
 import '@graphql-tools/utils';
 

package/esm/rules/unique-enum-value-names/index.js

@@ -6,7 +6,7 @@ const rule = {
     hasSuggestions: true,
     docs: {
       url: "https://the-guild.dev/graphql/eslint/rules/unique-enum-value-names",
-      category: "schema",
+      category: "Schema",
       recommended: true,
       description: `A GraphQL enum type is only valid if all its values are uniquely named.
 > This rule disallows case-insensitive enum values duplicates too.`,
@@ -58,7 +58,6 @@ const rule = {
             suggest: [
               {
                 desc: `Remove \`${enumName}\` enum value`,
-                // @ts-expect-error -- fixme
                 fix: (fixer) => fixer.remove(duplicate)
               }
             ]

package/esm/rules/unique-fragment-name/index.d.ts

@@ -4,6 +4,7 @@ import { GraphQLESLintRuleContext, GraphQLESLintRule } from '../../types.js';
 import 'eslint';
 import 'estree';
 import 'graphql-config';
+import 'json-schema-to-ts';
 import '../../siblings.js';
 import '@graphql-tools/utils';
 

package/esm/rules/unique-fragment-name/index.js

@@ -19,6 +19,7 @@ const checkNode = (context, node, ruleId) => {
         documentName,
         summary: conflictingDocuments.map((f) => `	${relative(CWD, f.filePath.replace(VIRTUAL_DOCUMENT_REGEX, ""))}`).join("\n")
       },
+      // @ts-expect-error name will exist
       node: node.name
     });
   }
@@ -27,7 +28,7 @@ const rule = {
   meta: {
     type: "suggestion",
     docs: {
-      category: "operations",
+      category: "Operations",
       description: "Enforce unique fragment names across your project.",
       url: `https://the-guild.dev/graphql/eslint/rules/${RULE_ID}`,
       requiresSiblings: true,

package/esm/rules/unique-operation-name/index.d.ts

@@ -1,9 +1,10 @@
 import { GraphQLESLintRule } from '../../types.js';
 import 'eslint';
+import 'estree';
 import 'graphql';
 import 'graphql-config';
+import 'json-schema-to-ts';
 import '../../estree-converter/types.js';
-import 'estree';
 import '../../siblings.js';
 import '@graphql-tools/utils';
 

package/esm/rules/unique-operation-name/index.js

@@ -4,7 +4,7 @@ const rule = {
   meta: {
     type: "suggestion",
     docs: {
-      category: "operations",
+      category: "Operations",
       description: "Enforce unique operation names across your project.",
       url: `https://the-guild.dev/graphql/eslint/rules/${RULE_ID}`,
       requiresSiblings: true,

package/esm/schema.d.ts

@@ -1,9 +1,10 @@
 import { GraphQLProjectConfig } from 'graphql-config';
 import { Schema } from './types.js';
 import 'eslint';
+import 'estree';
 import 'graphql';
+import 'json-schema-to-ts';
 import './estree-converter/types.js';
-import 'estree';
 import './siblings.js';
 import '@graphql-tools/utils';
 

package/esm/types.d.ts

@@ -1,9 +1,10 @@
-import { Linter, Rule } from 'eslint';
+import { Linter, Rule, AST } from 'eslint';
+import * as ESTree from 'estree';
 import { GraphQLSchema, ASTKindToNode } from 'graphql';
 import { IGraphQLConfig } from 'graphql-config';
+import { JSONSchema } from 'json-schema-to-ts';
 import { GraphQLESTreeNode } from './estree-converter/types.js';
 import { SiblingOperations } from './siblings.js';
-import 'estree';
 import '@graphql-tools/utils';
 
 type Schema = GraphQLSchema | null;
@@ -20,16 +21,24 @@ type ParserServices = {
 type GraphQLESLintParseResult = Linter.ESLintParseResult & {
     services: ParserServices;
 };
-type ReportDescriptorLocation = any;
+type Location = AST.SourceLocation | ESTree.Position;
+type ReportDescriptorLocation = {
+    loc: Location;
+} | {
+    node: {
+        loc: Location;
+    };
+};
 type ReportDescriptor = ReportDescriptorLocation & Rule.ReportDescriptorMessage & Rule.ReportDescriptorOptions;
-type GraphQLESLintRuleContext<Options = any[]> = Omit<Rule.RuleContext, 'options' | 'report'> & {
+type GraphQLESLintRuleContext<Options = any[]> = Omit<Rule.RuleContext, 'options' | 'parserServices' | 'report'> & {
     options: Options;
+    parserServices: ParserServices;
     report(descriptor: ReportDescriptor): void;
 };
-type CategoryType = 'schema' | 'operations' | 'schema-and-operations';
+type CategoryType = 'Operations' | 'Schema';
 type RuleMetaDataDocs = Required<Rule.RuleMetaData>['docs'];
 type RuleDocsInfo<T> = Omit<RuleMetaDataDocs, 'category' | 'suggestion'> & {
-    category?: string;
+    category: CategoryType | CategoryType[];
     requiresSchema?: true;
     requiresSiblings?: true;
     examples?: {
@@ -49,8 +58,9 @@ type GraphQLESLintRuleListener<WithTypeInfo extends boolean = false> = Record<st
     [K in keyof ASTKindToNode]?: (node: GraphQLESTreeNode<ASTKindToNode[K], WithTypeInfo>) => void;
 };
 type GraphQLESLintRule<Options = [], WithTypeInfo extends boolean = false> = {
-    meta?: Omit<Rule.RuleMetaData, 'docs'> & {
+    meta: Omit<Rule.RuleMetaData, 'docs' | 'schema'> & {
         docs?: RuleDocsInfo<Options>;
+        schema: Readonly<JSONSchema> | [];
     };
     create(context: GraphQLESLintRuleContext<Options>): GraphQLESLintRuleListener<WithTypeInfo>;
 };

package/esm/utils.d.ts

@@ -6,6 +6,7 @@ import { SiblingOperations } from './siblings.js';
 import { GraphQLESLintRuleContext } from './types.js';
 import '@graphql-tools/utils';
 import 'graphql-config';
+import 'json-schema-to-ts';
 
 declare function requireGraphQLOperations(ruleId: string, context: GraphQLESLintRuleContext): SiblingOperations | never;
 declare function requireGraphQLSchema(ruleId: string, context: GraphQLESLintRuleContext): GraphQLSchema | never;
@@ -39,6 +40,5 @@ declare const englishJoinWords: (words: string[]) => string;
 declare function displayNodeName(node: GraphQLESTreeNode<ASTNode, boolean>): string;
 declare function getNodeName(node: GraphQLESTreeNode<ASTNode>): string;
 declare const eslintSelectorsTip = "> [!TIP]\n>\n> These fields are defined by ESLint [`selectors`](https://eslint.org/docs/developer-guide/selectors).\n> Paste or drop code into the editor in [ASTExplorer](https://astexplorer.net) and inspect the generated AST to compose your selector.";
-declare function pluralize(size: number): "" | "s";
 
-export { ARRAY_DEFAULT_OPTIONS, CWD, type CaseStyle, REPORT_ON_FIRST_CHARACTER, TYPES_KINDS, VIRTUAL_DOCUMENT_REGEX, camelCase, convertCase, displayNodeName, englishJoinWords, eslintSelectorsTip, getLocation, getNodeName, getTypeName, logger, pascalCase, pluralize, requireGraphQLOperations, requireGraphQLSchema, slash };
+export { ARRAY_DEFAULT_OPTIONS, CWD, type CaseStyle, REPORT_ON_FIRST_CHARACTER, TYPES_KINDS, VIRTUAL_DOCUMENT_REGEX, camelCase, convertCase, displayNodeName, englishJoinWords, eslintSelectorsTip, getLocation, getNodeName, getTypeName, logger, pascalCase, requireGraphQLOperations, requireGraphQLSchema, slash };

package/esm/utils.js

@@ -158,9 +158,6 @@ const eslintSelectorsTip = `> [!TIP]
 >
 > These fields are defined by ESLint [\`selectors\`](https://eslint.org/docs/developer-guide/selectors).
 > Paste or drop code into the editor in [ASTExplorer](https://astexplorer.net) and inspect the generated AST to compose your selector.`;
-function pluralize(size) {
-  return size > 1 ? "s" : "";
-}
 export {
   ARRAY_DEFAULT_OPTIONS,
   CWD,
@@ -177,7 +174,6 @@ export {
   getTypeName,
   logger,
   pascalCase,
-  pluralize,
   requireGraphQLOperations,
   requireGraphQLSchema,
   slash

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-eslint/eslint-plugin",
-  "version": "4.4.0-alpha-20241210130004-c86c74902285624344165bb32d972962226b7df8",
+  "version": "4.4.0-alpha-20241210205144-662e65e39b519504be52c4dba23aaa08280b6322",
   "type": "module",
   "description": "GraphQL plugin for ESLint",
   "repository": "https://github.com/dimaMachina/graphql-eslint",
@@ -21,9 +21,15 @@
         "default": "./esm/index.js"
       }
     },
-    "./programmatic": {
-      "import": "./programmatic.js",
-      "types": "./programmatic.d.ts"
+    "./*": {
+      "require": {
+        "types": "./cjs/*.d.cts",
+        "default": "./cjs/*.js"
+      },
+      "import": {
+        "types": "./esm/*.d.ts",
+        "default": "./esm/*.js"
+      }
     }
   },
   "types": "esm/index.d.ts",