refactor: rewrite run and createRule

Author: SukkaW

patches/@typescript-eslint+utils+7.4.0.patch

@@ -1,27 +1,3 @@
-diff --git a/node_modules/@typescript-eslint/utils/dist/ts-eslint/Rule.d.ts b/node_modules/@typescript-eslint/utils/dist/ts-eslint/Rule.d.ts
-index 5ae7288..3d14a45 100644
---- a/node_modules/@typescript-eslint/utils/dist/ts-eslint/Rule.d.ts
-+++ b/node_modules/@typescript-eslint/utils/dist/ts-eslint/Rule.d.ts
-@@ -11,6 +11,10 @@ export interface RuleRecommendationAcrossConfigs<Options extends readonly unknow
-     strict: Partial<Options>;
- }
- export interface RuleMetaDataDocs<Options extends readonly unknown[]> {
-+    /**
-+     * The category the rule falls under
-+     */
-+    category?: string;
-     /**
-      * Concise description of the rule
-      */
-@@ -20,7 +24,7 @@ export interface RuleMetaDataDocs<Options extends readonly unknown[]> {
-      * Used by the build tools to generate the recommended and strict configs.
-      * Exclude to not include it as a recommendation.
-      */
--    recommended?: RuleRecommendation | RuleRecommendationAcrossConfigs<Options>;
-+    recommended?: RuleRecommendation | RuleRecommendationAcrossConfigs<Options> | boolean;
-     /**
-      * The URL of the rule's docs
-      */
 diff --git a/node_modules/@typescript-eslint/utils/dist/ts-eslint/RuleTester.d.ts b/node_modules/@typescript-eslint/utils/dist/ts-eslint/RuleTester.d.ts
 index 38d1f12..bf897a3 100644
 --- a/node_modules/@typescript-eslint/utils/dist/ts-eslint/RuleTester.d.ts

src/index.ts

@@ -1,5 +1,3 @@
-import type { TSESLint } from '@typescript-eslint/utils'
-
 // rules
 import electron from './config/electron'
 import errors from './config/errors'
@@ -56,6 +54,7 @@ import preferDefaultExport from './rules/prefer-default-export'
 import unambiguous from './rules/unambiguous'
 // configs
 import type { PluginConfig } from './types'
+import type { RuleModuleWithCustomMeta } from './utils'
 
 const configs = {
   recommended,
@@ -127,7 +126,7 @@ const rules = {
 
   // deprecated aliases to rules
   'imports-first': importsFirst,
-} satisfies Record<string, TSESLint.RuleModule<string, readonly unknown[]>>
+} satisfies Record<string, RuleModuleWithCustomMeta<string, readonly unknown[]>>
 
 export = {
   configs,

src/rules/imports-first.ts

@@ -1,15 +1,10 @@
-import { ESLintUtils } from '@typescript-eslint/utils'
-
-import { docsUrl } from '../utils/docs-url'
+import { createRule } from '../utils'
 
 import first from './first'
 
-const createRule = ESLintUtils.RuleCreator(ruleName =>
-  docsUrl(ruleName, '7b25c1cb95ee18acc1531002fd343e1e6031f9ed'),
-)
-
 export = createRule({
   ...first,
+  commitHash: '7b25c1cb95ee18acc1531002fd343e1e6031f9ed',
   name: 'imports-first',
   meta: {
     ...first.meta,

src/utils/create-rule.ts

@@ -1,5 +1,70 @@
+import type { TSESLint } from '@typescript-eslint/utils'
 import { ESLintUtils } from '@typescript-eslint/utils'
 
 import { docsUrl } from './docs-url'
 
-export const createRule = ESLintUtils.RuleCreator(docsUrl)
+// TSESLint.RuleMetaDataDocs, but with "category" property for eslint-doc-generator
+type MetaDataDocsWithCategory<Options extends readonly unknown[]> = {
+  /**
+   * The category the rule falls under
+   */
+  category?: string
+
+  recommended?:
+    | TSESLint.RuleRecommendation
+    | TSESLint.RuleRecommendationAcrossConfigs<Options>
+    | boolean
+} & Omit<TSESLint.RuleMetaDataDocs<Options>, 'recommended'>
+
+// TSESLint.RuleMetaData, but with "docs" property overriden for eslint-doc-generator
+type MetadataWithCustomDocs<
+  MessageIDs extends string,
+  Options extends readonly unknown[],
+> = {
+  docs: MetaDataDocsWithCategory<Options>
+} & Omit<TSESLint.RuleMetaData<MessageIDs, Options>, 'docs'>
+
+// TSESLint.RuleModule, but with "meta" property overriden for eslint-doc-generator
+export type RuleModuleWithCustomMeta<
+  MessageIds extends string,
+  Options extends readonly unknown[] = [],
+  ExtendedRuleListener extends TSESLint.RuleListener = TSESLint.RuleListener,
+> = {
+  meta: MetadataWithCustomDocs<MessageIds, Options>
+} & Omit<TSESLint.RuleModule<MessageIds, Options, ExtendedRuleListener>, 'meta'>
+
+type RuleCreateOption<
+  Options extends readonly unknown[],
+  MessageIds extends string,
+> = {
+  meta: MetadataWithCustomDocs<MessageIds, Options>
+  commitHash?: string
+} & Omit<ESLintUtils.RuleWithMetaAndName<Options, MessageIds>, 'meta'>
+
+export function createRule<
+  Options extends readonly unknown[],
+  MessageIds extends string,
+>({
+  name,
+  meta,
+  commitHash,
+  ...rules
+}: Readonly<RuleCreateOption<Options, MessageIds>>): RuleModuleWithCustomMeta<
+  MessageIds,
+  Options
+> {
+  const { docs, ...metaWithoutDocs } = meta
+  return {
+    ...ESLintUtils.RuleCreator.withoutDocs({
+      meta: metaWithoutDocs,
+      ...rules,
+    }),
+    meta: {
+      ...meta,
+      docs: {
+        ...docs,
+        url: docsUrl(name, commitHash),
+      },
+    },
+  }
+}

test/rules/consistent-type-specifier-style.spec.ts

@@ -1,6 +1,6 @@
 import { TSESLint, TSESTree } from '@typescript-eslint/utils'
 
-import { parsers, test } from '../utils'
+import { parsers, test, wrapRun } from '../utils'
 
 import rule from 'eslint-plugin-import-x/rules/consistent-type-specifier-style'
 
@@ -452,7 +452,7 @@ describe('TypeScript', () => {
       sourceType: 'module',
     },
   })
-  ruleTester.run('consistent-type-specifier-style', rule, {
+  wrapRun(ruleTester.run)('consistent-type-specifier-style', rule, {
     valid: [...COMMON_TESTS.valid, ...TS_ONLY.valid],
     invalid: [...COMMON_TESTS.invalid, ...TS_ONLY.invalid],
   })
@@ -466,7 +466,7 @@ describe('Babel/Flow', () => {
       sourceType: 'module',
     },
   })
-  ruleTester.run('consistent-type-specifier-style', rule, {
+  wrapRun(ruleTester.run)('consistent-type-specifier-style', rule, {
     valid: [...COMMON_TESTS.valid, ...FLOW_ONLY.valid],
     invalid: [...COMMON_TESTS.invalid, ...FLOW_ONLY.invalid],
   })

test/rules/default.spec.ts

@@ -2,14 +2,14 @@ import path from 'node:path'
 
 import { TSESLint } from '@typescript-eslint/utils'
 
-import { test, SYNTAX_CASES, parsers } from '../utils'
+import { test, SYNTAX_CASES, parsers, wrapRun } from '../utils'
 
 import rule from 'eslint-plugin-import-x/rules/default'
 import { CASE_SENSITIVE_FS } from 'eslint-plugin-import-x/utils'
 
 const ruleTester = new TSESLint.RuleTester()
 
-ruleTester.run('default', rule, {
+wrapRun(ruleTester.run)('default', rule, {
   valid: [
     test({ code: 'import "./malformed.js"' }),
 
@@ -161,7 +161,7 @@ ruleTester.run('default', rule, {
 
 // #311: import of mismatched case
 if (!CASE_SENSITIVE_FS) {
-  ruleTester.run('default (path case-insensitivity)', rule, {
+  wrapRun(ruleTester.run)('default (path case-insensitivity)', rule, {
     valid: [
       test({
         code: 'import foo from "./jsx/MyUncoolComponent.jsx"',
@@ -180,7 +180,7 @@ if (!CASE_SENSITIVE_FS) {
 
 describe('TypeScript', () => {
   const parser = parsers.TS
-  ruleTester.run(`default`, rule, {
+  wrapRun(ruleTester.run)(`default`, rule, {
     valid: [
       test({
         code: `import foobar from "./typescript-default"`,

test/rules/dynamic-import-chunkname.spec.ts

@@ -1,6 +1,6 @@
 import { TSESLint, TSESTree } from '@typescript-eslint/utils'
 
-import { SYNTAX_CASES, parsers } from '../utils'
+import { SYNTAX_CASES, parsers, wrapRun } from '../utils'
 
 import rule from 'eslint-plugin-import-x/rules/dynamic-import-chunkname'
 
@@ -43,7 +43,7 @@ const pickyChunkNameFormatError = {
   },
 } as const
 
-ruleTester.run('dynamic-import-chunkname', rule, {
+wrapRun(ruleTester.run)('dynamic-import-chunkname', rule, {
   valid: [
     {
       code: `dynamicImport(
@@ -971,7 +971,7 @@ describe('TypeScript', () => {
   const typescriptParser = parsers.TS
   const nodeType = TSESTree.AST_NODE_TYPES.ImportExpression
 
-  ruleTester.run('dynamic-import-chunkname', rule, {
+  wrapRun(ruleTester.run)('dynamic-import-chunkname', rule, {
     valid: [
       {
         code: `import('test')`,

test/rules/export.spec.ts

@@ -1,12 +1,12 @@
 import { TSESLint } from '@typescript-eslint/utils'
 
-import { test, testFilePath, SYNTAX_CASES, parsers } from '../utils'
+import { test, testFilePath, SYNTAX_CASES, parsers, wrapRun } from '../utils'
 
 import rule from 'eslint-plugin-import-x/rules/export'
 
 const ruleTester = new TSESLint.RuleTester()
 
-ruleTester.run('export', rule, {
+wrapRun(ruleTester.run)('export', rule, {
   valid: [
     test({ code: 'import "./malformed.js"' }),
 
@@ -166,7 +166,7 @@ describe('TypeScript', () => {
     },
   }
 
-  ruleTester.run('export', rule, {
+  wrapRun(ruleTester.run)('export', rule, {
     valid: [
       // type/value name clash
       test({

test/rules/exports-last.spec.ts

@@ -1,7 +1,7 @@
 import { TSESLint } from '@typescript-eslint/utils'
 import type { TSESTree } from '@typescript-eslint/utils'
 
-import { test } from '../utils'
+import { test, wrapRun } from '../utils'
 
 import rule from 'eslint-plugin-import-x/rules/exports-last'
 
@@ -13,7 +13,7 @@ const error = (type: `${TSESTree.AST_NODE_TYPES}`) =>
     type,
   }) as const
 
-ruleTester.run('exports-last', rule, {
+wrapRun(ruleTester.run)('exports-last', rule, {
   valid: [
     // Empty file
     test({

test/rules/extensions.spec.ts

@@ -1,12 +1,12 @@
 import { TSESLint } from '@typescript-eslint/utils'
 
-import { test, testFilePath, parsers } from '../utils'
+import { test, testFilePath, parsers, wrapRun } from '../utils'
 
 import rule from 'eslint-plugin-import-x/rules/extensions'
 
 const ruleTester = new TSESLint.RuleTester()
 
-ruleTester.run('extensions', rule, {
+wrapRun(ruleTester.run)('extensions', rule, {
   valid: [
     test({ code: 'import a from "@/a"' }),
     test({ code: 'import a from "a"' }),
@@ -662,7 +662,7 @@ ruleTester.run('extensions', rule, {
 describe('TypeScript', () => {
   const parser = parsers.TS
 
-  ruleTester.run(`${parser}: extensions ignore type-only`, rule, {
+  wrapRun(ruleTester.run)(`${parser}: extensions ignore type-only`, rule, {
     valid: [
       test({
         code: 'import type T from "./typescript-declare";',