@eslinted/core 26.1.4 → 27.0.0-rc.0

package/src/factory/index.ts

@@ -1,10 +1,11 @@
-import type { Input } from "../interface";
+import type { Configuration } from "../interface";
 
 export default function factory<
   Scope extends string,
   Optional extends Scope,
-  Plugin extends string,
-  Parser extends Scope,
+  RequiredPlugin extends string,
+  RequiredParser extends Scope,
+  Parser extends RequiredParser | Optional,
 >(
   scopes: readonly Scope[],
   optional: readonly Optional[],
@@ -18,21 +19,17 @@ export default function factory<
     plugins,
     parsers,
   }: {
-    plugins: Record<Plugin, unknown>;
-    parsers: Record<Parser, unknown>;
+    plugins: Record<RequiredPlugin, unknown>;
+    parsers: Record<RequiredParser, unknown> & Partial<Record<Optional, unknown>>;
   },
-  defaults: Input<
-    Scope,
-    Optional,
-    Plugin,
-    Parser
-  >["configuration"]["defaults"],
-  extensions: Input<
+  {
+    defaults,
+    extensions = {},
+  }: Configuration<
     Scope,
     Optional,
-    Plugin,
     Parser
-  >["configuration"]["extensions"] = {},
+  >,
 ) {
   for (const scope of optional)
     if (extensions[scope] !== undefined) {
@@ -226,10 +223,10 @@ export default function factory<
           } = settings;
 
           if (languageOptions?.parser !== undefined)
-            languageOptions.parser = parsers[languageOptions.parser as Parser] as unknown as Parser;
+            languageOptions.parser = parsers[languageOptions.parser] as unknown as Parser;
 
           if (parserOptions?.parser !== undefined)
-            parserOptions.parser = parsers[parserOptions.parser as Parser] as unknown as Parser;
+            parserOptions.parser = parsers[parserOptions.parser] as unknown as Parser;
 
           if (languageOptions === undefined) {
             if (

package/src/index.input.spec.ts

@@ -6,236 +6,231 @@ const enum State {
 const Plugin = "MOCK_PLUGIN",
 Parser = (scope: string) => `MOCK_PARSER:${scope}`;
 
-export const MOCK_INPUT = {
-  imports: {
-    plugins: {
-      "@stylistic": Plugin,
-      "@typescript-eslint": Plugin,
-      mocha: Plugin,
-      "chai-friendly": Plugin,
-      "chai-expect": Plugin,
-      html: Plugin,
-      css: Plugin,
-      json: Plugin,
-      jsonc: Plugin,
-      yml: Plugin,
-    },
-    parsers: {
-      ts: Parser("TS"),
-      html: Parser("HTML"),
-      yml: Parser("YML"),
-    },
+export const scopes = [
+  "js",
+  "ts",
+  "mocha",
+  "svelte",
+  "html",
+  "json",
+  "jsonc",
+  "jsoncc",
+] as const,
+optional = ["svelte"] as const,
+tree = [
+  [
+    "jsoncc",
+    ["jsonc"],
+  ] as const,
+  [
+    "jsonc",
+    ["json"],
+  ] as const,
+  [
+    "mocha",
+    ["ts"],
+  ] as const,
+  [
+    "svelte",
+    ["ts"],
+  ] as const,
+  [
+    "ts",
+    ["js"],
+  ] as const,
+],
+imports = {
+  plugins: {
+    "@stylistic": Plugin,
+    "@typescript-eslint": Plugin,
+    mocha: Plugin,
+    "chai-friendly": Plugin,
+    "chai-expect": Plugin,
+    html: Plugin,
+    json: Plugin,
+    jsonc: Plugin,
   },
-  configuration: {
-    defaults: {
-      settings: {
-        js: {},
-        ts: {
-          languageOptions: {
-            parser: "ts" as const,
-          },
-        },
-        mocha: {},
-        svelte: {
-          languageOptions: {
-            parser: "svelte" as const,
-          },
-          parserOptions: {
-            parser: "ts" as const,
-            extraFileExtensions: [".svelte"],
-          },
-          processor: "svelte/svelte",
-        },
-        html: {
-          languageOptions: {
-            parser: "html" as const,
-          },
-          parserOptions: {
-            frontmatter: true,
-          },
-          language: "html/html",
+  parsers: {
+    ts: Parser("TS"),
+    html: Parser("HTML"),
+  },
+},
+configuration = {
+  defaults: {
+    settings: {
+      ts: {
+        languageOptions: {
+          parser: "ts" as const,
         },
-        css: {
-          languageOptions: {
-            tolerant: false,
-          },
-          language: "css/css",
+      },
+      svelte: {
+        languageOptions: {
+          parser: "svelte" as const,
         },
-        json: {
-          languageOptions: {
-            allowTrailingCommas: true,
-          },
-          language: "json/jsonc",
+        parserOptions: {
+          parser: "ts" as const,
+          extraFileExtensions: [".svelte"],
         },
-        jsonc: {
-          language: "json/jsonc",
+        processor: "svelte/svelte",
+      },
+      html: {
+        languageOptions: {
+          parser: "html" as const,
         },
-        jsoncc: {
-          language: "json/jsonc",
+        parserOptions: {
+          frontmatter: true,
         },
-        yml: {
-          languageOptions: {
-            parser: "yml" as const,
-          },
+        language: "html/html",
+      },
+      json: {
+        languageOptions: {
+          allowTrailingCommas: true,
         },
+        language: "json/jsonc",
       },
-      files: {
-        js: ["default.js"],
-        ts: ["default.ts"],
-        mocha: ["default.mocha"],
-        svelte: ["default.svelte"],
-        html: ["default.html"],
-        css: ["default.css"],
-        json: ["default.json"],
-        jsonc: ["default.jsonc"],
-        jsoncc: ["default-comma.jsonc"],
-        yml: ["default.yml"],
+      jsonc: {
+        language: "json/jsonc",
       },
-      ignores: {
-        "*": ["ignore/default.*"],
-        js: ["ignore/default.js"],
-        ts: ["ignore/default.ts"],
-        mocha: ["ignore/default.mocha"],
-        svelte: ["ignore/default.svelte"],
-        html: ["ignore/default.html"],
-        css: ["ignore/default.css"],
-        json: ["ignore/default.json"],
-        jsonc: ["ignore/default.jsonc"],
-        jsoncc: ["ignore/default-comma.jsonc"],
-        yml: ["ignore/default.yml"],
+      jsoncc: {
+        language: "json/jsonc",
       },
-      rules: {
-        js: [
-          {
-            id: "enable",
-            rules: {
-              vanilla: State.ERROR,
-              vanilla0: State.ERROR,
-              vanilla1: State.ERROR,
-              vanilla2: State.ERROR,
-            },
-          },
-          {
-            id: "enable/stylistic",
-            rules: {
-              "@stylistic/style-rule": State.ERROR,
-            },
-          },
-        ],
-        ts: [
-          {
-            id: "disable",
-            rules: {
-              vanilla0: State.OFF,
-            },
+    },
+    files: {
+      js: ["default.js"],
+      ts: ["default.ts"],
+      mocha: ["default.mocha"],
+      svelte: ["default.svelte"],
+      html: ["default.html"],
+      json: ["default.json"],
+      jsonc: ["default.jsonc"],
+      jsoncc: ["default-comma.jsonc"],
+    },
+    ignores: {
+      "*": ["ignore/default.*"],
+      js: ["ignore/default.js"],
+      ts: ["ignore/default.ts"],
+      mocha: ["ignore/default.mocha"],
+      svelte: ["ignore/default.svelte"],
+      html: ["ignore/default.html"],
+      json: ["ignore/default.json"],
+      jsonc: ["ignore/default.jsonc"],
+      jsoncc: ["ignore/default-comma.jsonc"],
+    },
+    rules: {
+      js: [
+        {
+          id: "enable",
+          rules: {
+            vanilla: State.ERROR,
+            vanilla0: State.ERROR,
+            vanilla1: State.ERROR,
+            vanilla2: State.ERROR,
           },
-          {
-            id: "enable/extension",
-            rules: {
-              "@typescript-eslint/enums": State.ERROR,
-              "@typescript-eslint/destructure-expression": State.ERROR,
-              "@typescript-eslint/global": State.ERROR,
-            },
+        },
+        {
+          id: "enable/stylistic",
+          rules: {
+            "@stylistic/style-rule": State.ERROR,
           },
-        ],
-        mocha: [
-          {
-            id: "disable",
-            rules: {
-              vanilla2: State.OFF,
-            },
+        },
+      ],
+      ts: [
+        {
+          id: "disable",
+          rules: {
+            vanilla0: State.OFF,
           },
-          {
-            id: "disable/ts",
-            rules: {
-              "@typescript-eslint/global": State.ERROR,
-            },
+        },
+        {
+          id: "enable/extension",
+          rules: {
+            "@typescript-eslint/enums": State.ERROR,
+            "@typescript-eslint/destructure-expression": State.ERROR,
+            "@typescript-eslint/global": State.ERROR,
           },
-          {
-            id: "enable",
-            rules: {
-              "mocha/test-expression": State.ERROR,
-            },
+        },
+      ],
+      mocha: [
+        {
+          id: "disable",
+          rules: {
+            vanilla2: State.OFF,
           },
-        ],
-        svelte: [
-          {
-            id: "disable",
-            rules: {
-              vanilla1: State.OFF,
-            },
+        },
+        {
+          id: "disable/ts",
+          rules: {
+            "@typescript-eslint/global": State.ERROR,
           },
-          {
-            id: "enable-extension",
-            rules: {
-              "svelte/tags": State.ERROR,
-            },
+        },
+        {
+          id: "enable",
+          rules: {
+            "mocha/test-expression": State.ERROR,
           },
-        ],
-        html: [
-          {
-            id: "enable",
-            rules: {
-              "html/attribute": State.ERROR,
-            },
+        },
+      ],
+      svelte: [
+        {
+          id: "disable",
+          rules: {
+            vanilla1: State.OFF,
           },
-        ],
-        css: [
-          {
-            id: "enable",
-            rules: {
-              "css/property": State.ERROR,
-            },
+        },
+        {
+          id: "enable-extension",
+          rules: {
+            "svelte/tags": State.ERROR,
           },
-        ],
-        json: [
-          {
-            id: "enable",
-            rules: {
-              "jsonc/property-check": State.ERROR,
-              "jsonc/comment": [
-                State.ERROR,
-                "never",
-              ] as const,
-              "jsonc/trailing-comma": [
-                State.ERROR,
-                "never",
-              ] as const,
-            },
+        },
+      ],
+      html: [
+        {
+          id: "enable",
+          rules: {
+            "html/attribute": State.ERROR,
           },
-        ],
-        jsonc: [
-          {
-            id: "override-comment",
-            rules: {
-              "jsonc/comment": [
-                State.ERROR,
-                "allow",
-              ] as const,
-            },
+        },
+      ],
+      json: [
+        {
+          id: "enable",
+          rules: {
+            "jsonc/property-check": State.ERROR,
+            "jsonc/comment": [
+              State.ERROR,
+              "never",
+            ] as const,
+            "jsonc/trailing-comma": [
+              State.ERROR,
+              "never",
+            ] as const,
           },
-        ],
-        jsoncc: [
-          {
-            id: "override-comma",
-            rules: {
-              "jsonc/trailing-comma": [
-                State.ERROR,
-                "allow",
-              ] as const,
-            },
+        },
+      ],
+      jsonc: [
+        {
+          id: "override-comment",
+          rules: {
+            "jsonc/comment": [
+              State.ERROR,
+              "allow",
+            ] as const,
           },
-        ],
-        yml: [
-          {
-            id: "enable",
-            rules: {
-              "yml/property-check": State.ERROR,
-            },
+        },
+      ],
+      jsoncc: [
+        {
+          id: "override-comma",
+          rules: {
+            "jsonc/trailing-comma": [
+              State.ERROR,
+              "allow",
+            ] as const,
           },
-        ],
-      },
+        },
+      ],
     },
-    extensions: {},
   },
+  extensions: {},
 };

package/src/index.spec.ts

@@ -1,9 +1,20 @@
 import "chai/register-should.js";
 import Core from ".";
-import { scopes } from "./scope";
-import { MOCK_INPUT } from "./index.input.spec";
+import {
+  scopes,
+  optional,
+  tree,
+  imports,
+  configuration,
+} from "./index.input.spec";
 
-const configs = Core(MOCK_INPUT);
+const configs = Core(
+  scopes,
+  optional,
+  tree,
+  imports,
+  configuration,
+);
 
 describe(
   "Core",

package/src/index.ts

@@ -1,26 +1,28 @@
-import type { Input } from "./interface";
-import type {
-  Plugin,
-  Parser,
-} from "./scope";
-import {
-  scopes,
-  optional,
-  tree,
-} from "./scope";
+import type { Configuration } from "./interface";
 import factory from "./factory";
 
-export default function (
-  {
-    imports,
-    configuration: {
-      defaults,
-      extensions,
-    },
-  }: Input<
-    (typeof scopes[number]),
-    (typeof optional[number]),
-    Plugin,
+export default function<
+  Scope extends string,
+  Optional extends Scope,
+  RequiredPlugin extends string,
+  RequiredParser extends Scope,
+  Parser extends RequiredParser | Optional,
+>(
+  scopes: readonly Scope[],
+  optional: readonly Optional[],
+  tree: Array<
+    readonly [
+      Scope,
+      readonly Scope[],
+    ]
+  >,
+  imports: {
+    plugins: Record<RequiredPlugin, unknown>;
+    parsers: Record<RequiredParser, unknown> & Partial<Record<Optional, unknown>>;
+  },
+  configuration: Configuration<
+    Scope,
+    Optional,
     Parser
   >,
 ) {
@@ -29,7 +31,6 @@ export default function (
     optional,
     tree,
     imports,
-    defaults,
-    extensions,
+    configuration,
   );
 }

package/src/interface/{configuration/defaults → defaults}/index.ts

@@ -1,5 +1,5 @@
 import type { Settings } from "./settings";
-import type { Rules } from "../../rules";
+import type { Rules } from "../rules";
 
 export interface Defaults<
   Scope extends string,

package/src/interface/{configuration/defaults → defaults}/settings/index.ts

@@ -3,4 +3,7 @@ import type { ScopeManifest } from "./manifest";
 export type Settings<
   Scope extends string,
   Parser extends Scope,
-> = Record<Scope, ScopeManifest<Parser>>;
+> = Record<
+  Scope,
+  ScopeManifest<Parser>
+>;

package/src/interface/{configuration/extensions → extensions}/scopes.ts

@@ -1,4 +1,4 @@
-import type { Rules } from "../../rules";
+import type { Rules } from "../rules";
 
 export type ScopeExtensions<
   Scope extends string,

package/src/interface/index.ts

@@ -1,22 +1,19 @@
-import type { Imports } from "./imports";
-import type { Configuration } from "./configuration";
+import type { Defaults } from "./defaults";
+import type { Extensions } from "./extensions";
 
-export interface Input<
+export interface Configuration<
   Scope extends string,
   Optional extends Scope,
-  Plugin extends string,
   Parser extends Scope,
 > {
-  imports: Imports<
-    Plugin,
+  defaults: Defaults<
+    Scope,
     Parser
   >;
-  configuration: Configuration<
-    Scope,
-    Optional,
-    (
-      | Parser
-      | Optional
-    )
+  extensions: Partial<
+    Extensions<
+      Scope,
+      Optional
+    >
   >;
 }

package/dist/interface/configuration/defaults/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/interface/configuration/defaults/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEzC,MAAM,WAAW,QAAQ,CACvB,KAAK,SAAS,MAAM,EACpB,MAAM,SAAS,KAAK;IAEpB,QAAQ,EAAE,OAAO,CAAC,QAAQ,CACxB,KAAK,EACL,MAAM,CACP,CAAC,CAAC;IACH,KAAK,EAAE,OAAO,CAAC,MAAM,CACnB,KAAK,EACL,MAAM,EAAE,CACT,CAAC,CAAC;IACH,OAAO,EACH,MAAM,CACN,GAAG,EACH,MAAM,EAAE,CACT,GACC,OAAO,CAAC,MAAM,CACd,KAAK,EACL,MAAM,EAAE,CACT,CAAC,CAAC;IACL,KAAK,EAAE,OAAO,CAAC,MAAM,CACnB,KAAK,EACL;QACE,EAAE,EAAE,MAAM,CAAC;QACX,KAAK,EAAE,KAAK,CAAC;KACd,EAAE,CACJ,CAAC,CAAC;CACJ"}

package/dist/interface/configuration/defaults/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/interface/configuration/defaults/index.ts"],"names":[],"mappings":""}

package/dist/interface/configuration/defaults/settings/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/interface/configuration/defaults/settings/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD,MAAM,MAAM,QAAQ,CAClB,KAAK,SAAS,MAAM,EACpB,MAAM,SAAS,KAAK,IAClB,MAAM,CAAC,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC"}

package/dist/interface/configuration/defaults/settings/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/interface/configuration/defaults/settings/index.ts"],"names":[],"mappings":""}

package/dist/interface/configuration/defaults/settings/manifest.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../../../../../src/interface/configuration/defaults/settings/manifest.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa,CAC5B,MAAM,SAAS,MAAM;IAErB,eAAe,CAAC,EAAE;QAChB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;QAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,aAAa,CAAC,EAAE;QACd,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;QAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB"}

package/dist/interface/configuration/defaults/settings/manifest.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../../../../src/interface/configuration/defaults/settings/manifest.ts"],"names":[],"mappings":""}

package/dist/interface/configuration/extensions/global.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"global.d.ts","sourceRoot":"","sources":["../../../../src/interface/configuration/extensions/global.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE;QACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,CAAC;CACH"}

package/dist/interface/configuration/extensions/global.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"global.js","sourceRoot":"","sources":["../../../../src/interface/configuration/extensions/global.ts"],"names":[],"mappings":""}