@eslinted/core 24.3.0 → 24.4.0-rc.1

package/dist/factory.d.ts

@@ -36,27 +36,23 @@ export declare class Factory<RequiredPlugin extends string, RequiredParser exten
         Scope,
         readonly Scope[]
     ]>, optionalScopes: readonly Scope[], { plugins, parsers, }: Input<RequiredPlugin, RequiredParser, Scope, OptionalScope>["imports"], settings: Input<RequiredPlugin, RequiredParser, Scope, OptionalScope>["configuration"]["settings"], defaults: Input<RequiredPlugin, RequiredParser, Scope, OptionalScope>["configuration"]["defaults"], extensions?: Input<RequiredPlugin, RequiredParser, Scope, OptionalScope>["configuration"]["extensions"], attachments?: Input<RequiredPlugin, RequiredParser, Scope, OptionalScope>["configuration"]["attachments"]);
-    get globals(): readonly [
-        {
-            name: "linted/*/plugins/";
-            plugins: Record<RequiredPlugin, unknown>;
-        },
-        {
-            name: "linted/*/settings/";
-            linterOptions: {
-                noInlineConfig: boolean;
-                reportUnusedDisableDirectives: "off" | "warn" | "error";
-            };
-            languageOptions: {
-                sourceType: "script" | "module";
-                ecmaVersion: 3 | 5 | "latest" | 2015 | 2016 | 2017 | 2018 | 2019 | 2020 | 2021 | 2022 | 2023 | 2024;
-            };
-        },
-        {
-            name: "linted/*/ignores/";
-            ignores: string[];
-        }
-    ];
+    get globals(): ({
+        name: "linted/*/plugins/";
+        plugins: Record<RequiredPlugin, unknown>;
+    } | {
+        name: "linted/*/settings/";
+        linterOptions: {
+            noInlineConfig: boolean;
+            reportUnusedDisableDirectives: "off" | "warn" | "error";
+        };
+        languageOptions: {
+            sourceType: "script" | "module";
+            ecmaVersion: 3 | 5 | "latest" | 2015 | 2016 | 2017 | 2018 | 2019 | 2020 | 2021 | 2022 | 2023 | 2024;
+        };
+    } | {
+        name: "linted/*/ignores/";
+        ignores: string[];
+    })[];
     scope(scope: Scope): ({
         name: `linted/${string}/`;
         files: Record<Scope, string[]>[Scope];

package/dist/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEzC,qBAAa,OAAO,CAClB,cAAc,SAAS,MAAM,EAC7B,cAAc,SAAS,KAAK,EAC5B,KAAK,SAAS,MAAM,EACpB,aAAa,SAAS,KAAK;IAuBzB,OAAO,CAAC,QAAQ,CAAC,QAAQ;aAkBT,WAAW,EAAE,KAAK,CAChC,cAAc,EACd,cAAc,EACd,KAAK,EACL,aAAa,CACd,CAAC,eAAe,CAAC,CAAC,aAAa,CAAC;IA5C5B,aAAa;;;;;;;;;;;;;;;;;;;;MAAC;IACd,MAAM;;;;;;;MAAC;IACP,OAAO,kCAAC;gBAGb,IAAI,EAAE,KAAK,CACT,SAAS;QACP,KAAK;QACL,SAAS,KAAK,EAAE;KACjB,CACF,EACD,cAAc,EAAE,SAAS,KAAK,EAAE,EAChC,EACE,OAAO,EACP,OAAO,GACR,EAAE,KAAK,CACN,cAAc,EACd,cAAc,EACd,KAAK,EACL,aAAa,CACd,CAAC,SAAS,CAAC,EACK,QAAQ,EAAE,KAAK,CAC9B,cAAc,EACd,cAAc,EACd,KAAK,EACL,aAAa,CACd,CAAC,eAAe,CAAC,CAAC,UAAU,CAAC,EAC9B,QAAQ,EAAE,KAAK,CACb,cAAc,EACd,cAAc,EACd,KAAK,EACL,aAAa,CACd,CAAC,eAAe,CAAC,CAAC,UAAU,CAAC,EAC9B,UAAU,GAAE,KAAK,CACf,cAAc,EACd,cAAc,EACd,KAAK,EACL,aAAa,CACd,CAAC,eAAe,CAAC,CAAC,YAAY,CAAM,EACrB,WAAW,GAAE,KAAK,CAChC,cAAc,EACd,cAAc,EACd,KAAK,EACL,aAAa,CACd,CAAC,eAAe,CAAC,CAAC,aAAa,CAAM;IAmHxC,IAAW,OAAO;;;;;;;;;;;;;;;;OAMjB;IAEM,KAAK,CAAC,KAAK,EAAE,KAAK;;;;;;;;;;;;;;;;;;CAwG1B"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEzC,qBAAa,OAAO,CAClB,cAAc,SAAS,MAAM,EAC7B,cAAc,SAAS,KAAK,EAC5B,KAAK,SAAS,MAAM,EACpB,aAAa,SAAS,KAAK;IAuBzB,OAAO,CAAC,QAAQ,CAAC,QAAQ;aAkBT,WAAW,EAAE,KAAK,CAChC,cAAc,EACd,cAAc,EACd,KAAK,EACL,aAAa,CACd,CAAC,eAAe,CAAC,CAAC,aAAa,CAAC;IA5C5B,aAAa;;;;;;;;;;;;;;;;;;;;MAAC;IACd,MAAM;;;;;;;MAAC;IACP,OAAO,kCAAC;gBAGb,IAAI,EAAE,KAAK,CACT,SAAS;QACP,KAAK;QACL,SAAS,KAAK,EAAE;KACjB,CACF,EACD,cAAc,EAAE,SAAS,KAAK,EAAE,EAChC,EACE,OAAO,EACP,OAAO,GACR,EAAE,KAAK,CACN,cAAc,EACd,cAAc,EACd,KAAK,EACL,aAAa,CACd,CAAC,SAAS,CAAC,EACK,QAAQ,EAAE,KAAK,CAC9B,cAAc,EACd,cAAc,EACd,KAAK,EACL,aAAa,CACd,CAAC,eAAe,CAAC,CAAC,UAAU,CAAC,EAC9B,QAAQ,EAAE,KAAK,CACb,cAAc,EACd,cAAc,EACd,KAAK,EACL,aAAa,CACd,CAAC,eAAe,CAAC,CAAC,UAAU,CAAC,EAC9B,UAAU,GAAE,KAAK,CACf,cAAc,EACd,cAAc,EACd,KAAK,EACL,aAAa,CACd,CAAC,eAAe,CAAC,CAAC,YAAY,CAAM,EACrB,WAAW,GAAE,KAAK,CAChC,cAAc,EACd,cAAc,EACd,KAAK,EACL,aAAa,CACd,CAAC,eAAe,CAAC,CAAC,aAAa,CAAM;IAyIxC,IAAW,OAAO;;;;;;;;;;;;;;;;SAMjB;IAEM,KAAK,CAAC,KAAK,EAAE,KAAK;;;;;;;;;;;;;;;;;;CAwG1B"}

package/dist/factory.js

@@ -54,16 +54,22 @@ export class Factory {
             rules: defaults.rules,
         };
         this.parsers = parsers;
-        for (const scope in extensions) {
+        const extended = new Set(Object.keys(extensions));
+        extended.delete("*");
+        for (const scope of extended) {
             const { [scope]: { files = [], ignores = [], rules = null, } = {}, } = extensions;
-            this
-                .scopes
-                .files[scope]
-                .push(...files);
-            this
-                .scopes
-                .ignores[scope]
-                .push(...ignores);
+            if (files.length !== 0) {
+                const defaultFiles = this.scopes.files[scope], fEnd = defaultFiles.length;
+                defaultFiles.length += files.length;
+                for (let i = 0; i < files.length; i++)
+                    defaultFiles[fEnd + i] = files[i];
+            }
+            if (ignores.length !== 0) {
+                const defaultIgnores = this.scopes.ignores[scope], iEnd = defaultIgnores.length;
+                defaultIgnores.length += ignores.length;
+                for (let i = 0; i < ignores.length; i++)
+                    defaultIgnores[iEnd + i] = ignores[i];
+            }
             if (rules !== null)
                 this
                     .scopes
@@ -76,21 +82,23 @@ export class Factory {
         const OptionalScopes = new Set(optionalScopes);
         for (const [scope, parents] of tree)
             if (!OptionalScopes.has(scope)
-                || scope in this.parsers)
-                for (const parent of parents) {
-                    this
-                        .scopes
-                        .files[parent]
-                        .push(...this
-                        .scopes
-                        .files[scope]);
-                    this
-                        .scopes
-                        .ignores[parent]
-                        .push(...this
-                        .scopes
-                        .ignores[scope]);
-                }
+                || scope in this.parsers) {
+                const files = this.scopes.files[scope], ignores = this.scopes.ignores[scope];
+                if (files.length !== 0)
+                    for (const parent of parents) {
+                        const parentFiles = this.scopes.files[parent], fEnd = parentFiles.length;
+                        parentFiles.length += files.length;
+                        for (let i = 0; i < files.length; i++)
+                            parentFiles[fEnd + i] = files[i];
+                    }
+                if (ignores.length !== 0)
+                    for (const parent of parents) {
+                        const parentIgnores = this.scopes.ignores[parent], iEnd = parentIgnores.length;
+                        parentIgnores.length += ignores.length;
+                        for (let i = 0; i < ignores.length; i++)
+                            parentIgnores[iEnd + i] = ignores[i];
+                    }
+            }
     }
     get globals() {
         return [

package/dist/factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"factory.js","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"factory.js","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,KAAK,EAEN,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EACV,cAAc,EACd,cAAc,EACf,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,MAAM,EACN,cAAc,EAEf,MAAM,SAAS,CAAC;AAGjB,MAAM,CAAC,OAAO,WACZ,EACE,OAAO,EACP,aAAa,EAAE,EACb,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,WAAW,GACZ,GACF,EAAE,KAAK,CACN,cAAc,EACd,cAAc,EACd,CAAC,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,EACvB,CAAC,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC,CAChC,aAgCF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,EACV,cAAc,EACd,cAAc,EACf,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,MAAM,EACN,cAAc,EAEf,MAAM,SAAS,CAAC;AAGjB,MAAM,CAAC,OAAO,WACZ,EACE,OAAO,EACP,aAAa,EAAE,EACb,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,WAAW,GACZ,GACF,EAAE,KAAK,CACN,cAAc,EACd,cAAc,EACd,CAAC,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,EACvB,CAAC,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC,CAChC,aAgCF"}

package/dist/index.js

@@ -3,11 +3,8 @@ import { Factory } from "./factory.js";
 export default function ({ imports, configuration: { settings, defaults, extensions, attachments, }, }) {
     try {
         const factory = new Factory(tree, optionalScopes, imports, settings, defaults, extensions, attachments);
-        return [
-            ...factory.globals,
-            ...scopes.flatMap(scope => factory.scope(scope)),
-            ...factory.attachments,
-        ];
+        return factory.globals
+            .concat(scopes.flatMap(scope => factory.scope(scope)), factory.attachments);
     }
     catch (e) {
         throw TypeError("linted-core: ", { cause: e });

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,MAAM,EACN,cAAc,EACd,IAAI,GACL,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,MAAM,CAAC,OAAO,WACZ,EACE,OAAO,EACP,aAAa,EAAE,EACb,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,WAAW,GACZ,GAMF;IAED,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,IAAI,OAAO,CAMzB,IAAI,EACJ,cAAc,EACd,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,WAAW,CACZ,CAAC;QAEF,OAAO;YACL,GAAG,OAAO,CAAC,OAAO;YAClB,GAAG,MAAM,CAAC,OAAO,CACf,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAC9B;YACD,GAAG,OAAO,CAAC,WAAW;SACO,CAAC;IAClC,CAAC;IACD,OAAO,CAAC,EAAE,CAAC;QACT,MAAM,SAAS,CACb,eAAe,EACf,EAAE,KAAK,EAAE,CAAC,EAAE,CACb,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,MAAM,EACN,cAAc,EACd,IAAI,GACL,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,MAAM,CAAC,OAAO,WACZ,EACE,OAAO,EACP,aAAa,EAAE,EACb,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,WAAW,GACZ,GAMF;IAED,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,IAAI,OAAO,CAMzB,IAAI,EACJ,cAAc,EACd,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,WAAW,CACZ,CAAC;QAEF,OAAQ,OAAO,CAAC,OAAqB;aAClC,MAAM,CACL,MAAM,CAAC,OAAO,CACZ,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAC9B,EACD,OAAO,CAAC,WAAW,CACpB,CAAC;IACN,CAAC;IACD,OAAO,CAAC,EAAE,CAAC;QACT,MAAM,SAAS,CACb,eAAe,EACf,EAAE,KAAK,EAAE,CAAC,EAAE,CACb,CAAC;IACJ,CAAC;AACH,CAAC"}

package/dist/interface/index.d.ts

@@ -1,4 +1,3 @@
 export type * from "./input/index.js";
-export type * from "./output";
 export type * from "./config/index.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/interface/index.ts"],"names":[],"mappings":"AAAA,mBAAmB,SAAS,CAAC;AAC7B,mBAAmB,UAAU,CAAC;AAC9B,mBAAmB,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/interface/index.ts"],"names":[],"mappings":"AAAA,mBAAmB,SAAS,CAAC;AAC7B,mBAAmB,UAAU,CAAC"}

package/package.json

@@ -3,7 +3,7 @@
   "$schema": "https://json.schemastore.org/package",
   "$help": "https://docs.npmjs.com/cli/configuring-npm/package-json",
   "name": "@eslinted/core",
-  "version": "24.3.0",
+  "version": "24.4.0-rc.1",
   "repository": "github:jimmy-zhening-luo/linted-core",
   "description": "Internal core for npm package `linted`, responsible for producing an array of fully-formed ESLint configurations according to `linted` spec.",
   "keywords": [],

package/src/factory.ts

@@ -108,28 +108,43 @@ export class Factory<
     };
     this.parsers = parsers;
 
-    for (const scope in extensions) {
+    const extended = new Set<Scope>(Object.keys(extensions) as unknown[] as readonly Scope[]);
+
+    extended.delete("*" as unknown as Scope);
+
+    for (const scope of extended) {
       const {
-        [scope as keyof typeof extensions]: {
+        [scope]: {
           files = [],
           ignores = [],
           rules = null,
         } = {},
       } = extensions;
 
-      this
-        .scopes
-        .files[scope as Scope]
-        .push(...files);
-      this
-        .scopes
-        .ignores[scope as Scope]
-        .push(...ignores);
+      if (files.length !== 0) {
+        const defaultFiles = this.scopes.files[scope],
+        fEnd = defaultFiles.length;
+
+        defaultFiles.length += files.length;
+
+        for (let i = 0; i < files.length; i++)
+          defaultFiles[fEnd + i] = files[i] as string;
+      }
+
+      if (ignores.length !== 0) {
+        const defaultIgnores = this.scopes.ignores[scope],
+        iEnd = defaultIgnores.length;
+
+        defaultIgnores.length += ignores.length;
+
+        for (let i = 0; i < ignores.length; i++)
+          defaultIgnores[iEnd + i] = ignores[i] as string;
+      }
 
       if (rules !== null)
         this
           .scopes
-          .rules[scope as Scope]
+          .rules[scope]
           .push(
             {
               id: scope.concat("/override"),
@@ -144,25 +159,32 @@ export class Factory<
       if (
         !OptionalScopes.has(scope)
         || scope in this.parsers
-      )
-        for (const parent of parents) {
-          this
-            .scopes
-            .files[parent]
-            .push(
-              ...this
-                .scopes
-                .files[scope],
-            );
-          this
-            .scopes
-            .ignores[parent]
-            .push(
-              ...this
-                .scopes
-                .ignores[scope],
-            );
-        }
+      ) {
+        const files = this.scopes.files[scope],
+        ignores = this.scopes.ignores[scope];
+
+        if (files.length !== 0)
+          for (const parent of parents) {
+            const parentFiles = this.scopes.files[parent],
+            fEnd = parentFiles.length;
+
+            parentFiles.length += files.length;
+
+            for (let i = 0; i < files.length; i++)
+              parentFiles[fEnd + i] = files[i] as string;
+          }
+
+        if (ignores.length !== 0)
+          for (const parent of parents) {
+            const parentIgnores = this.scopes.ignores[parent],
+            iEnd = parentIgnores.length;
+
+            parentIgnores.length += ignores.length;
+
+            for (let i = 0; i < ignores.length; i++)
+              parentIgnores[iEnd + i] = ignores[i] as string;
+          }
+      }
   }
 
   public get globals() {
@@ -170,7 +192,7 @@ export class Factory<
       this.globalConfigs.plugins,
       this.globalConfigs.settings,
       this.globalConfigs.ignores,
-    ] as const;
+    ];
   }
 
   public scope(scope: Scope) {

package/src/index.ts

@@ -1,7 +1,4 @@
-import type {
-  Input,
-  Output,
-} from "./interface";
+import type { Input } from "./interface";
 import type {
   RequiredPlugin,
   RequiredParser,
@@ -45,13 +42,13 @@ export default function (
       attachments,
     );
 
-    return [
-      ...factory.globals,
-      ...scopes.flatMap(
-        scope => factory.scope(scope),
-      ),
-      ...factory.attachments,
-    ] satisfies Output as unknown[];
+    return (factory.globals as unknown[])
+      .concat(
+        scopes.flatMap(
+          scope => factory.scope(scope),
+        ),
+        factory.attachments,
+      );
   }
   catch (e) {
     throw TypeError(

package/src/interface/index.ts

@@ -1,3 +1,2 @@
 export type * from "./input";
-export type * from "./output";
 export type * from "./config";

package/dist/interface/output/configs/attachment.d.ts

@@ -1,5 +0,0 @@
-import type { IConfig } from "../../config/index.js";
-export type Attachment = {
-    files: string[];
-} & Partial<Omit<IConfig, "files">>;
-//# sourceMappingURL=attachment.d.ts.map

package/dist/interface/output/configs/attachment.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"attachment.d.ts","sourceRoot":"","sources":["../../../../src/interface/output/configs/attachment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,MAAM,MAAM,UAAU,GAClB;IACF,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,GACC,OAAO,CACP,IAAI,CACF,OAAO,EACP,OAAO,CACR,CACF,CAAC"}

package/dist/interface/output/configs/attachment.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=attachment.js.map

package/dist/interface/output/configs/attachment.js.map

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

package/src/interface/output/configs/attachment.ts

@@ -1,12 +0,0 @@
-import type { IConfig } from "../../config";
-
-export type Attachment
-= & {
-  files: string[];
-}
-& Partial<
-  Omit<
-    IConfig,
-    "files"
-  >
->;

package/src/interface/output/configs/global/ignores.d.ts

@@ -1,6 +0,0 @@
-import type { IConfig } from "../../../config";
-
-export interface GlobalIgnores {
-  name: "linted/*/ignores/";
-  ignores: IConfig["ignores"];
-}

package/src/interface/output/configs/global/index.d.ts

@@ -1,3 +0,0 @@
-export type { Plugins } from "./plugins";
-export type { Settings } from "./settings";
-export type { GlobalIgnores } from "./ignores";

package/src/interface/output/configs/global/plugins.d.ts

@@ -1,6 +0,0 @@
-import type { IConfig } from "../../../config";
-
-export interface Plugins {
-  name: "linted/*/plugins/";
-  plugins: IConfig["plugins"];
-}

package/src/interface/output/configs/global/settings.d.ts

@@ -1,11 +0,0 @@
-import type { IConfig } from "../../../config";
-
-export type Settings = {
-  name: "linted/*/settings/";
-} & Pick<
-  IConfig,
-  (
-    | "linterOptions"
-    | "languageOptions"
-  )
->;

package/src/interface/output/configs/index.d.ts

@@ -1,3 +0,0 @@
-export type * from "./global";
-export type * from "./scoped";
-export type { Attachment } from "./attachment";

package/src/interface/output/configs/scoped/index.d.ts

@@ -1,2 +0,0 @@
-export type { ScopeSettings } from "./settings";
-export type { ScopeRules } from "./rules";

package/src/interface/output/configs/scoped/rules.d.ts

@@ -1,12 +0,0 @@
-import type { IConfig } from "../../../config";
-
-export type ScopeRules = {
-  name: `linted/${string}`;
-} & Pick<
-  IConfig,
-  (
-    | "files"
-    | "ignores"
-    | "rules"
-  )
->;

package/src/interface/output/configs/scoped/settings.d.ts

@@ -1,15 +0,0 @@
-import type { IConfig } from "../../../config";
-
-export type ScopeSettings = {
-  name: `linted/${string}`;
-  languageOptions?: object;
-} & Pick<
-  IConfig,
-  (
-    | "files"
-    | "ignores"
-    | "processor"
-    | "language"
-    | "settings"
-  )
->;

package/src/interface/output/index.d.ts

@@ -1,12 +0,0 @@
-import type * as Config from "./configs";
-
-export type Output = readonly [
-  Config.Plugins,
-  Config.Settings,
-  Config.GlobalIgnores,
-  ...(
-    | Config.ScopeSettings
-    | Config.ScopeRules
-    | Config.Attachment
-  )[],
-];