linted 14.4.6-rc.3 → 14.4.6-rc.7

package/src/index.ts

@@ -1,185 +1,62 @@
-import type { Scopes } from "./default/scopes.js";
-import scopes from "./default/scopes.js";
-import files from "./default/files.js";
-import rulesets from "./default/rulesets.js";
-import options from "./default/options.js";
-import plugins from "./default/plugins.js";
-import parsers from "./default/parsers.js";
+import core from "@eslinted/core";
+import files from "./files.js";
+import parsers from "./parsers.js";
+import plugins from "./plugins.js";
+import rulesets from "./rulesets.js";
+import type { Scopes } from "@eslinted/core";
+import type { Rule } from "@eslinted/core";
 
 export default function (
-  scope: Partial<
-    typeof files
-  > = {},
-  override: Partial<
-    Record<
-      `override${
-        Capitalize<
-          Scopes
-        >
-      }`
-      ,
-      IRule
-    >
-  > = {},
-): IConfig[] {
+  scope: Partial<typeof files> = {},
+  override: Partial<Record<`override${Capitalize<Scopes>}`, Rule["rules"]>> = {},
+) {
   try {
-    const instantiatedOptions: {
-      [S in Scopes]: InstanceType<
-        typeof options[S]
-      >["body"]
-    } = {
-      js: new options
-        .js(
-          plugins
-            .js,
-          ...files
-            .js,
-          ...scope
-            .js
-            ?? [],
-        )
-        .body,
-      ts: new options
-        .ts(
-          plugins
-            .ts,
-          parsers
-            .ts,
-          ...files
-            .ts,
-          ...scope
-            .ts
-            ?? [],
-        )
-        .body,
-      svelte: new options
-        .svelte(
-          plugins
-            .svelte,
-          parsers
-            .svelte,
-          parsers
-            .ts,
-          ...files
-            .svelte,
-          ...scope
-            .svelte
-            ?? [],
-        )
-        .body,
-      html: new options
-        .html(
-          plugins
-            .html,
-          parsers
-            .html,
-          ...files
-            .html,
-          ...scope
-            .html
-            ?? [],
-        )
-        .body,
-      json: new options
-        .json(
-          plugins
-            .json,
-          parsers
-            .json,
-          ...files
-            .json,
-          ...scope
-            .json
-            ?? [],
-        )
-        .body,
-      jsonc: new options
-        .jsonc(
-          plugins
-            .jsonc,
-          parsers
-            .jsonc,
-          ...files
-            .jsonc,
-          ...scope
-            .jsonc
-            ?? [],
-        )
-        .body,
-      yml: new options
-        .yml(
-          plugins
-            .yml,
-          parsers
-            .yml,
-          ...files
-            .yml,
-          ...scope
-            .yml
-            ?? [],
-        )
-        .body,
-    };
     const overridenRulesets: typeof rulesets = {
-      js: rulesets
-        .js
-        .override(
-          override
-            .overrideJs,
-        ),
-      ts: rulesets
-        .ts
-        .override(
-          override
-            .overrideTs,
-        ),
-      svelte: rulesets
-        .svelte
-        .override(
-          override
-            .overrideSvelte,
-        ),
-      html: rulesets
-        .html
-        .override(
-          override
-            .overrideHtml,
-        ),
-      json: rulesets
-        .json
-        .override(
-          override
-            .overrideJson,
-        ),
-      jsonc: rulesets
-        .jsonc
-        .override(
-          override
-            .overrideJsonc,
-        ),
-      yml: rulesets
-        .yml
-        .override(
-          override
-            .overrideYml,
-        ),
+      js: rulesets.js.override(override.overrideJs),
+      ts: rulesets.ts.override(override.overrideTs),
+      svelte: rulesets.svelte.override(override.overrideSvelte),
+      html: rulesets.html.override(override.overrideHtml),
+      json: rulesets.json.override(override.overrideJson),
+      jsonc: rulesets.jsonc.override(override.overrideJsonc),
+      yml: rulesets.yml.override(override.overrideYml),
+    };
+    const combinedFiles = {
+      js: [
+        ...files.js,
+        ...scope.js ?? [],
+      ],
+      ts: [
+        ...files.ts,
+        ...scope.ts ?? [],
+      ],
+      svelte: [
+        ...files.svelte,
+        ...scope.svelte ?? [],
+      ],
+      html: [
+        ...files.html,
+        ...scope.html ?? [],
+      ],
+      json: [
+        ...files.json,
+        ...scope.json ?? [],
+      ],
+      jsonc: [
+        ...files.jsonc,
+        ...scope.jsonc ?? [],
+      ],
+      yml: [
+        ...files.yml,
+        ...scope.yml ?? [],
+      ],
     };
 
-    return scopes
-      .map(
-        scope =>
-          instantiatedOptions[scope].files.length > 0
-            ? overridenRulesets[scope].flat.map(
-              rules => {
-                return {
-                  rules,
-                  ...instantiatedOptions[scope],
-                };
-              },
-            )
-            : [],
-      )
-      .flat();
+    return core(
+      plugins,
+      parsers,
+      combinedFiles,
+      overridenRulesets,
+    );
   }
   catch (e) {
     throw new Error(

package/src/{default/parsers.ts → parsers.ts}

@@ -12,4 +12,4 @@ export default {
   json: jsonc,
   jsonc,
   yml,
-} satisfies Particord<Scopes, unknown>;
+} satisfies Partial<Record<Scopes, unknown>>;

package/src/{default/ruleset → rulesets}/HtmlRuleset.ts

@@ -1,4 +1,4 @@
-import Ruleset from "./base/Ruleset.js";
+import { Ruleset } from "@eslinted/core";
 import HtmlRecommended from "./rules/html/HtmlRecommended.js";
 import HtmlEnable from "./rules/html/HtmlEnable.js";
 

package/src/{default/ruleset → rulesets}/JsRuleset.ts

@@ -1,4 +1,4 @@
-import Ruleset from "./base/Ruleset.js";
+import { Ruleset } from "@eslinted/core";
 import StylisticEnable from "./rules/js/StylisticEnable.js";
 import JsEnable from "./rules/js/JsEnable.js";
 

package/src/{default/ruleset → rulesets}/JsonRuleset.ts

@@ -1,4 +1,4 @@
-import Ruleset from "./base/Ruleset.js";
+import { Ruleset } from "@eslinted/core";
 import JsonEnableX from "./rules/json/JsonEnableX.js";
 import JsonEnable from "./rules/json/JsonEnable.js";
 

package/src/{default/ruleset → rulesets}/JsoncRuleset.ts

@@ -1,4 +1,4 @@
-import Ruleset from "./base/Ruleset.js";
+import { Ruleset } from "@eslinted/core";
 import JsonRuleset from "./JsonRuleset.js";
 import JsoncOverride from "./rules/jsonc/JsoncOverride.js";
 

package/src/{default/ruleset → rulesets}/MdRuleset.ts

@@ -1,4 +1,4 @@
-import Ruleset from "./base/Ruleset.js";
+import { Ruleset } from "@eslinted/core";
 import MdEnable from "./rules/md/MdEnable.js";
 
 const MdRuleset = new Ruleset(

package/src/{default/ruleset → rulesets}/SvelteRuleset.ts

@@ -1,4 +1,4 @@
-import Ruleset from "./base/Ruleset.js";
+import { Ruleset } from "@eslinted/core";
 import TsRuleset from "./TsRuleset.js";
 import SvelteDisableJS from "./rules/svelte/SvelteDisableJS.js";
 import SvelteDisableTS from "./rules/svelte/SvelteDisableTS.js";

package/src/{default/ruleset → rulesets}/TsRuleset.ts

@@ -1,4 +1,4 @@
-import Ruleset from "./base/Ruleset.js";
+import { Ruleset } from "@eslinted/core";
 import JsRuleset from "./JsRuleset.js";
 import TsDisableCompiler from "./rules/ts/TsDisableCompiler.js";
 import TsDisableX from "./rules/ts/TsDisableX.js";

package/src/{default/ruleset → rulesets}/YmlRuleset.ts

@@ -1,4 +1,4 @@
-import Ruleset from "./base/Ruleset.js";
+import { Ruleset } from "@eslinted/core";
 import YmlEnableX from "./rules/yml/YmlEnableX.js";
 import YmlEnable from "./rules/yml/YmlEnable.js";
 

package/src/{default/ruleset → rulesets}/rules/html/HtmlEnable.ts

@@ -1,4 +1,4 @@
-import Rule from "../Rule.js";
+import { Rule } from "@eslinted/core";
 import { OFF } from "../state.js";
 import { Enable } from "../id.js";
 

package/src/rulesets/rules/html/HtmlRecommended.ts

@@ -0,0 +1,10 @@
+import html from "@html-eslint/eslint-plugin";
+import { Rule } from "@eslinted/core";
+import { Recommended } from "../id.js";
+
+const HtmlRecommended = new Rule(
+  Recommended,
+  (html.configs["flat/recommended"] as Record<"rules", Rule["rules"]>).rules, // Remove shared config once manually configured
+);
+
+export default HtmlRecommended;

package/src/{default/ruleset → rulesets}/rules/js/JsEnable.ts

@@ -1,4 +1,4 @@
-import Rule from "../Rule.js";
+import { Rule } from "@eslinted/core";
 import {
   ERROR,
   OFF,

package/src/{default/ruleset → rulesets}/rules/js/StylisticEnable.ts

@@ -1,4 +1,4 @@
-import Rule from "../Rule.js";
+import { Rule } from "@eslinted/core";
 import {
   ERROR,
   OFF,
@@ -282,17 +282,18 @@ const StylisticEnable = new Rule(
         multilineDetection: "brackets",
       },
     ],
+    "@stylistic/multiline-comment-style": OFF,
     "@stylistic/multiline-ternary": [
       ERROR,
-      ALWAYS,
+      ALWAYS_MULTILINE,
     ],
     "@stylistic/new-parens": [
       ERROR,
-      ALWAYS,
+      NEVER,
     ],
     "@stylistic/newline-per-chained-call": [
       ERROR,
-      { ignoreChainWithDepth: 1 },
+      { ignoreChainWithDepth: 2 },
     ],
     "@stylistic/no-confusing-arrow": OFF,
     "@stylistic/no-extra-parens": [

package/src/{default/ruleset → rulesets}/rules/json/JsonEnable.ts

@@ -1,4 +1,4 @@
-import Rule from "../Rule.js";
+import { Rule } from "@eslinted/core";
 import {
   ERROR,
   OFF,

package/src/{default/ruleset → rulesets}/rules/json/JsonEnableX.ts

@@ -1,4 +1,4 @@
-import Rule from "../Rule.js";
+import { Rule } from "@eslinted/core";
 import {
   ERROR,
   NEVER,

package/src/{default/ruleset → rulesets}/rules/jsonc/JsoncOverride.ts

@@ -1,4 +1,4 @@
-import Rule from "../Rule.js";
+import { Rule } from "@eslinted/core";
 import {
   ERROR,
   OFF,

package/src/{default/ruleset → rulesets}/rules/md/MdEnable.ts

@@ -1,4 +1,4 @@
-import Rule from "../Rule.js";
+import { Rule } from "@eslinted/core";
 import {
   ERROR,
   OFF,

package/src/{default/ruleset → rulesets}/rules/svelte/SvelteDisableJS.ts

@@ -1,4 +1,4 @@
-import Rule from "../Rule.js";
+import { Rule } from "@eslinted/core";
 import { OFF } from "../state.js";
 
 const SvelteDisableConflictJs = new Rule(

package/src/{default/ruleset → rulesets}/rules/svelte/SvelteDisableTS.ts

@@ -1,4 +1,4 @@
-import Rule from "../Rule.js";
+import { Rule } from "@eslinted/core";
 import { OFF } from "../state.js";
 
 const SvelteDisableConflictTs = new Rule(

package/src/{default/ruleset → rulesets}/rules/svelte/SvelteDisableX.ts

@@ -1,4 +1,4 @@
-import Rule from "../Rule.js";
+import { Rule } from "@eslinted/core";
 import { OFF } from "../state.js";
 import { DisableX } from "../id.js";
 

package/src/{default/ruleset → rulesets}/rules/svelte/SvelteEnable.ts

@@ -1,4 +1,4 @@
-import Rule from "../Rule.js";
+import { Rule } from "@eslinted/core";
 import {
   ERROR,
   OFF,

package/src/{default/ruleset → rulesets}/rules/svelte/SvelteEnableX.ts

@@ -1,4 +1,4 @@
-import Rule from "../Rule.js";
+import { Rule } from "@eslinted/core";
 import {
   ERROR,
   OFF,

package/src/{default/ruleset → rulesets}/rules/ts/TsDisableCompiler.ts

@@ -1,4 +1,4 @@
-import Rule from "../Rule.js";
+import { Rule } from "@eslinted/core";
 import { OFF } from "../state.js";
 
 const TsDisableCompiler = new Rule(

package/src/{default/ruleset → rulesets}/rules/ts/TsDisableX.ts

@@ -1,4 +1,4 @@
-import Rule from "../Rule.js";
+import { Rule } from "@eslinted/core";
 import { OFF } from "../state.js";
 import { DisableX } from "../id.js";
 

package/src/{default/ruleset → rulesets}/rules/ts/TsEnable.ts

@@ -1,4 +1,4 @@
-import Rule from "../Rule.js";
+import { Rule } from "@eslinted/core";
 import {
   ERROR,
   OFF,

package/src/{default/ruleset → rulesets}/rules/ts/TsEnableX.ts

@@ -1,4 +1,4 @@
-import Rule from "../Rule.js";
+import { Rule } from "@eslinted/core";
 import {
   ERROR,
   OFF,

package/src/{default/ruleset → rulesets}/rules/yml/YmlEnable.ts

@@ -1,4 +1,4 @@
-import Rule from "../Rule.js";
+import { Rule } from "@eslinted/core";
 import {
   ERROR,
   OFF,

package/src/{default/ruleset → rulesets}/rules/yml/YmlEnableX.ts

@@ -1,4 +1,4 @@
-import Rule from "../Rule.js";
+import { Rule } from "@eslinted/core";
 import {
   ERROR,
   NEVER,

package/src/rulesets.ts

@@ -0,0 +1,19 @@
+import JsRuleset from "./rulesets/JsRuleset.js";
+import TsRuleset from "./rulesets/TsRuleset.js";
+import SvelteRuleset from "./rulesets/SvelteRuleset.js";
+import HtmlRuleset from "./rulesets/HtmlRuleset.js";
+import JsonRuleset from "./rulesets/JsonRuleset.js";
+import JsoncRuleset from "./rulesets/JsoncRuleset.js";
+import YmlRuleset from "./rulesets/YmlRuleset.js";
+
+const rulesets = {
+  js: JsRuleset,
+  ts: TsRuleset,
+  svelte: SvelteRuleset,
+  html: HtmlRuleset,
+  json: JsonRuleset,
+  jsonc: JsoncRuleset,
+  yml: YmlRuleset,
+} as const;
+
+export default rulesets;

package/tsconfig.json

@@ -4,8 +4,7 @@
   "$schema": "https://json.schemastore.org/tsconfig",
   "include": [
     "src/**/*.ts",
-    "interface/**/*.d.ts",
-    "dependency/**/*.d.ts",
+    "types/**/*.d.ts",
     "*.config.ts",
   ],
   "compilerOptions": {

package/types/module/markdownlint/index.d.ts

@@ -0,0 +1,13 @@
+declare module "eslint-plugin-markdownlint" {
+  export const configs: Record<"flat/recommended", { rules: IRule }>;
+}
+
+declare module "eslint-plugin-markdownlint/parser" {
+  export const parseForESLint: (code: string)=> Record<
+    | "ast"
+    | "parserServices"
+    | "visitorKeys"
+    ,
+    unknown
+  >;
+}

package/dependency/module/markdownlint/index.d.ts

@@ -1,21 +0,0 @@
-declare module "eslint-plugin-markdownlint" {
-  export const configs: Record<
-    "flat/recommended"
-    ,
-    Record<
-      "rules"
-      ,
-      IRule
-    >
-  >;
-}
-
-declare module "eslint-plugin-markdownlint/parser" {
-  export const parseForESLint: (
-    code: string
-  )=> {
-    ast: unknown;
-    parserServices: unknown;
-    visitorKeys: unknown;
-  };
-}

package/dependency/types/literal/number/base32.d.ts

@@ -1,19 +0,0 @@
-declare type base32 =
-  | hex
-  | 16
-  | 17
-  | 18
-  | 19
-  | 20
-  | 21
-  | 22
-  | 23
-  | 24
-  | 25
-  | 26
-  | 27
-  | 28
-  | 29
-  | 30
-  | 31
-;

package/dependency/types/literal/number/base64.d.ts

@@ -1,35 +0,0 @@
-declare type base64 =
-  | base32
-  | 32
-  | 33
-  | 34
-  | 35
-  | 36
-  | 37
-  | 38
-  | 39
-  | 40
-  | 41
-  | 42
-  | 43
-  | 44
-  | 45
-  | 46
-  | 47
-  | 48
-  | 49
-  | 50
-  | 51
-  | 52
-  | 53
-  | 54
-  | 55
-  | 56
-  | 57
-  | 58
-  | 59
-  | 60
-  | 61
-  | 62
-  | 63
-;

package/dependency/types/literal/number/binary.d.ts

@@ -1,4 +0,0 @@
-declare type binary =
-  | 0
-  | 1
-;

package/dependency/types/literal/number/decimal.d.ts

@@ -1,5 +0,0 @@
-declare type decimal =
-  | octal
-  | 8
-  | 9
-;

package/dependency/types/literal/number/hex.d.ts

@@ -1,10 +0,0 @@
-declare type hex =
-  | decimal
-  | 9
-  | 10
-  | 11
-  | 12
-  | 13
-  | 14
-  | 15
-;

package/dependency/types/literal/number/octal.d.ts

@@ -1,7 +0,0 @@
-declare type octal =
-  | quatral
-  | 4
-  | 5
-  | 6
-  | 7
-;

package/dependency/types/literal/number/quatral.d.ts

@@ -1,4 +0,0 @@
-declare type quatral =
-  | ternary
-  | 3
-;

package/dependency/types/literal/number/ternary.d.ts

@@ -1,4 +0,0 @@
-declare type ternary =
-  | binary
-  | 2
-;

package/dependency/types/literal/string/base64char.d.ts

@@ -1,13 +0,0 @@
-declare type base64char =
-  | letter
-  | digit
-  | "+"
-  | "/"
-;
-
-declare type base64pad = "=";
-
-declare type base64paddedchar =
-  | base64char
-  | base64pad
-;

package/dependency/types/literal/string/digit.d.ts

@@ -1,12 +0,0 @@
-declare type digit =
-  | "0"
-  | "1"
-  | "2"
-  | "3"
-  | "4"
-  | "5"
-  | "6"
-  | "7"
-  | "8"
-  | "9"
-;