@eslinted/core 31.1.1 → 31.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/factory.d.ts +10 -1
- package/dist/factory.d.ts.map +1 -1
- package/dist/factory.js +34 -13
- package/dist/factory.js.map +1 -1
- package/dist/index.d.ts +4 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/tests/index.spec.js +6 -3
- package/dist/tests/index.spec.js.map +1 -1
- package/package.json +1 -4
- package/src/factory.ts +54 -26
- package/src/index.ts +14 -18
- package/tests/index.spec.ts +8 -3
- package/typings/rules.d.ts +0 -24
package/dist/factory.d.ts
CHANGED
|
@@ -1,3 +1,12 @@
|
|
|
1
1
|
import type Core from "./index.js";
|
|
2
|
-
export default function factory<Scope extends string, Optional extends Scope, RequiredPlugin extends string, RequiredParser extends Scope, Parser extends RequiredParser | Optional>(scopes: Parameters<typeof Core<Scope, Optional, RequiredPlugin, RequiredParser, Parser>>[0], optional: Parameters<typeof Core<Scope, Optional, RequiredPlugin, RequiredParser, Parser>>[1], tree: Parameters<typeof Core<Scope, Optional, RequiredPlugin, RequiredParser, Parser>>[2], imports: Parameters<typeof Core<Scope, Optional, RequiredPlugin, RequiredParser, Parser>>[3], settings: Parameters<typeof Core<Scope, Optional, RequiredPlugin, RequiredParser, Parser>>[4], defaults: Parameters<typeof Core<Scope, Optional, RequiredPlugin, RequiredParser, Parser>>[5], extensions?: Parameters<typeof Core<Scope, Optional, RequiredPlugin, RequiredParser, Parser>>[6]):
|
|
2
|
+
export default function factory<Scope extends string, Optional extends Scope, RequiredPlugin extends string, RequiredParser extends Scope, Parser extends RequiredParser | Optional>(scopes: Parameters<typeof Core<Scope, Optional, RequiredPlugin, RequiredParser, Parser>>[0], optional: Parameters<typeof Core<Scope, Optional, RequiredPlugin, RequiredParser, Parser>>[1], tree: Parameters<typeof Core<Scope, Optional, RequiredPlugin, RequiredParser, Parser>>[2], imports: Parameters<typeof Core<Scope, Optional, RequiredPlugin, RequiredParser, Parser>>[3], settings: Parameters<typeof Core<Scope, Optional, RequiredPlugin, RequiredParser, Parser>>[4], defaults: Parameters<typeof Core<Scope, Optional, RequiredPlugin, RequiredParser, Parser>>[5], extensions?: Parameters<typeof Core<Scope, Optional, RequiredPlugin, RequiredParser, Parser>>[6]): {
|
|
3
|
+
name: string;
|
|
4
|
+
files?: Array<string | [
|
|
5
|
+
string,
|
|
6
|
+
string
|
|
7
|
+
]>;
|
|
8
|
+
ignores?: string[];
|
|
9
|
+
extends?: unknown;
|
|
10
|
+
plugins?: unknown;
|
|
11
|
+
}[];
|
|
3
12
|
//# sourceMappingURL=factory.d.ts.map
|
package/dist/factory.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,GAAG,CAAC;AAE1B,MAAM,CAAC,OAAO,UAAU,OAAO,CAC7B,KAAK,SAAS,MAAM,EACpB,QAAQ,SAAS,KAAK,EACtB,cAAc,SAAS,MAAM,EAC7B,cAAc,SAAS,KAAK,EAC5B,MAAM,SAAS,cAAc,GAAG,QAAQ,EAExC,MAAM,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAC3F,QAAQ,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAC7F,IAAI,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EACzF,OAAO,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAC5F,QAAQ,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAC7F,QAAQ,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAC7F,UAAU,CAAC,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;UAuFxF,MAAM;YACJ,KAAK,CAAC,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;cAC9B,MAAM,EAAE;cACN,OAAO;cACT,OAAO;IA8BpB"}
|
package/dist/factory.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { defineConfig, globalIgnores, } from "@eslint/config-helpers";
|
|
2
1
|
export default function factory(scopes, optional, tree, imports, settings, defaults, extensions) {
|
|
3
2
|
const Scopes = new Set(scopes);
|
|
4
3
|
if (extensions) {
|
|
@@ -40,18 +39,40 @@ export default function factory(scopes, optional, tree, imports, settings, defau
|
|
|
40
39
|
for (const scope of enabledScopes)
|
|
41
40
|
if (settings[scope])
|
|
42
41
|
if (settings[scope].languageOptions) {
|
|
43
|
-
|
|
44
|
-
if (
|
|
45
|
-
settings[scope]
|
|
42
|
+
const { parser, parserOptions: { parser: subparser } = {}, } = settings[scope].languageOptions;
|
|
43
|
+
if (parser)
|
|
44
|
+
settings[scope]
|
|
45
|
+
.languageOptions
|
|
46
|
+
.parser = imports.parsers[parser];
|
|
47
|
+
if (subparser)
|
|
48
|
+
settings[scope]
|
|
49
|
+
.languageOptions
|
|
50
|
+
.parserOptions
|
|
51
|
+
.parser = imports.parsers[subparser];
|
|
46
52
|
}
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
53
|
+
const configs = [
|
|
54
|
+
{
|
|
55
|
+
name: "*/plugins",
|
|
56
|
+
plugins: imports.plugins,
|
|
57
|
+
},
|
|
58
|
+
{
|
|
59
|
+
name: "*/ignores",
|
|
60
|
+
ignores: defaults.ignores["*"] ?? [],
|
|
61
|
+
},
|
|
62
|
+
], scopeCount = enabledScopes.length;
|
|
63
|
+
configs.length = 2 + scopeCount;
|
|
64
|
+
for (let i = 0; i < scopeCount; ++i) {
|
|
65
|
+
const scope = enabledScopes[i];
|
|
66
|
+
configs[i + 2] = {
|
|
67
|
+
name: scope,
|
|
68
|
+
files: defaults.files[scope],
|
|
69
|
+
ignores: defaults.ignores[scope] ?? [],
|
|
70
|
+
"extends": [
|
|
71
|
+
settings[scope] ?? [],
|
|
72
|
+
defaults.rules[scope],
|
|
73
|
+
],
|
|
74
|
+
};
|
|
75
|
+
}
|
|
76
|
+
return configs;
|
|
56
77
|
}
|
|
57
78
|
//# sourceMappingURL=factory.js.map
|
package/dist/factory.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,UAAU,OAAO,CAO7B,MAA2F,EAC3F,QAA6F,EAC7F,IAAyF,EACzF,OAA4F,EAC5F,QAA6F,EAC7F,QAA6F,EAC7F,UAAgG;IAEhG,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;IAE/B,IAAI,UAAU,EAAE,CAAC;QACf,KAAK,MAAM,KAAK,IAAI,QAAQ;YAC1B,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;gBACtB,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,MAA0C,CAAC;gBACtF,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,MAA0C,CAAC;YACxF,CAAC;;gBAEC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAEzB,KAAK,MAAM,KAAK,IAAI,MAAM;YACxB,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;gBACtB,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,KAAK;oBACzB,KAAK,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAC7B,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,KAAK,CAC3B,CAAC;gBAEJ,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,OAAO;oBAC3B,IAAI,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC;wBACzB,KAAK,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAC/B,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,OAAO,CAC7B,CAAC;;wBAEF,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC;gBAExD,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,KAAK;oBACzB,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CACnB,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAC7B,GAAG,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC;YAC3C,CAAC;IACL,CAAC;IAED,KAAK,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,IAAI;QACjC,IACE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC;eACd,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM;YAE/B,KAAK,MAAM,MAAM,IAAI,OAAO;gBAC1B,KAAK,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAC9B,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CACzB,CAAC;IAER,IAAI,UAAU;QACZ,IAAI,UAAU,CAAC,GAAG,CAAC;YACjB,IACE,UAAU,CAAC,GAAG,CAAC,CAAC,QAAQ;mBACrB,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC;gBAEzB,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC;iBAEtD,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM;gBACjC,KAAK,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAC7B,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,OAAO,CAC3B,CAAC;IAEV,MAAM,aAAa,GAAG,CAAC,GAAG,MAAM,CAAC;SAC9B,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;SAC7C,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC;IAEjD,KAAK,MAAM,KAAK,IAAI,aAAa;QAC/B,IAAI,QAAQ,CAAC,KAAK,CAAC;YACjB,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,eAAe,EAAE,CAAC;gBACpC,MAAM,EACJ,MAAM,EACN,aAAa,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAC1C,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,eAAe,CAAC;gBAEpC,IAAI,MAAM;oBACR,QAAQ,CAAC,KAAK,CAAC;yBACZ,eAAe;yBACf,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAW,CAAC;gBAEhD,IAAI,SAAS;oBACX,QAAQ,CAAC,KAAK,CAAC;yBACZ,eAAe;yBACf,aAAc;yBACd,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAW,CAAC;YACrD,CAAC;IAML,MAAM,OAAO,GAMR;QACH;YACE,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB;QACD;YACE,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE;SACrC;KACF,EACD,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC;IAElC,OAAO,CAAC,MAAM,GAAG,IAAe,UAAU,CAAC;IAE3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,EAAE,EAAE,CAAC,EAAE,CAAC;QACpC,MAAM,KAAK,GAAG,aAAa,CAAC,CAAC,CAAE,CAAC;QAEhC,OAAO,CAAC,CAAC,IAAe,CAAC,GAAG;YAC1B,IAAI,EAAE,KAAK;YACX,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC;YAC5B,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE;YACtC,SAAS,EAAE;gBACT,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE;gBACrB,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC;aACtB;SACF,CAAC;IACJ,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import type { Settings, Defaults, Extensions } from "../typings";
|
|
2
|
-
import type {
|
|
2
|
+
import type { Rules } from "../typings/rules";
|
|
3
3
|
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: {
|
|
4
4
|
plugins: Record<RequiredPlugin, unknown> & Partial<Record<Optional, unknown>>;
|
|
5
5
|
parsers: Record<RequiredParser, unknown> & Partial<Record<Optional, unknown>>;
|
|
6
6
|
}, settings: Settings<Scope, Parser>, defaults: Defaults<Scope>, extensions?: Extensions<Scope, Optional>): Array<{
|
|
7
|
-
files?:
|
|
8
|
-
ignores?:
|
|
9
|
-
rules?:
|
|
7
|
+
files?: Array<string | [string, string]>;
|
|
8
|
+
ignores?: string[];
|
|
9
|
+
rules?: Rules;
|
|
10
10
|
}>;
|
|
11
11
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,QAAQ,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,QAAQ,EACR,QAAQ,EACR,UAAU,EACX,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,CAAC,OAAO,WACZ,KAAK,SAAS,MAAM,EACpB,QAAQ,SAAS,KAAK,EACtB,cAAc,SAAS,MAAM,EAC7B,cAAc,SAAS,KAAK,EAC5B,MAAM,SAAS,cAAc,GAAG,QAAQ,EAExC,MAAM,EAAE,SAAS,KAAK,EAAE,EACxB,QAAQ,EAAE,SAAS,QAAQ,EAAE,EAC7B,IAAI,EAAE,KAAK,CACT,SAAS,CAAC,KAAK,EAAE,SAAS,KAAK,EAAE,CAAC,CACnC,EACD,OAAO,EAAE;IACP,OAAO,EACH,MAAM,CAAC,cAAc,EAAE,OAAO,CAAC,GAC/B,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;IACvC,OAAO,EACH,MAAM,CAAC,cAAc,EAAE,OAAO,CAAC,GAC/B,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;CACxC,EACD,QAAQ,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,EACjC,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,EACzB,UAAU,CAAC,EAAE,UAAU,CAAC,KAAK,EAAE,QAAQ,CAAC,GACvC,KAAK,CACN;IACE,KAAK,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACzC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC;CACf,CACF,CAUA"}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,WAAW,CAAC;AAQhC,MAAM,CAAC,OAAO,WAOZ,MAAwB,EACxB,QAA6B,EAC7B,IAEC,EACD,OAOC,EACD,QAAiC,EACjC,QAAyB,EACzB,UAAwC;IAQxC,OAAO,OAAO,CACZ,MAAM,EACN,QAAQ,EACR,IAAI,EACJ,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,UAAU,CACX,CAAC;AACJ,CAAC"}
|
package/dist/tests/index.spec.js
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import "chai/register-should.js";
|
|
2
2
|
import Core from "../index.js";
|
|
3
3
|
import { scopes, optional, tree, imports, settings, defaults, extensions, } from "./index.input.spec.js";
|
|
4
|
-
const configs = Core(scopes, optional, tree, imports, settings, defaults, extensions);
|
|
4
|
+
const configs = Core(scopes, optional, tree, imports, settings, defaults, extensions), Scopes = new Set(scopes);
|
|
5
|
+
for (const scope of optional)
|
|
6
|
+
Scopes.delete(scope);
|
|
5
7
|
describe("Core", () => {
|
|
6
8
|
describe("module", () => {
|
|
7
9
|
it("is a function", () => {
|
|
@@ -17,10 +19,11 @@ describe("Core", () => {
|
|
|
17
19
|
.an("array")
|
|
18
20
|
.not.empty;
|
|
19
21
|
});
|
|
20
|
-
it(`length >= (
|
|
22
|
+
it(`length >= (*/plugins + */ignores + ${Scopes.size} scopes = ${Scopes.size + 2}) [Actual: ${configs.length}]`, () => {
|
|
21
23
|
configs
|
|
22
24
|
.should.have
|
|
23
|
-
.lengthOf
|
|
25
|
+
.lengthOf
|
|
26
|
+
.at.least(Scopes.size + 2);
|
|
24
27
|
});
|
|
25
28
|
it("of config objects", () => {
|
|
26
29
|
for (const config of configs)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.spec.js","sourceRoot":"","sources":["../../tests/index.spec.ts"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,CAAC;AACjC,OAAO,IAAI,MAAM,IAAI,CAAC;AACtB,OAAO,EACL,MAAM,EACN,QAAQ,EACR,IAAI,EACJ,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,UAAU,GACX,MAAM,oBAAoB,CAAC;AAE5B,MAAM,OAAO,GAAG,IAAI,CAClB,MAAM,EACN,QAAQ,EACR,IAAI,EACJ,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,UAAU,CACX,CAAC;
|
|
1
|
+
{"version":3,"file":"index.spec.js","sourceRoot":"","sources":["../../tests/index.spec.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"$schema": "https://json.schemastore.org/package",
|
|
4
4
|
"$help": "https://docs.npmjs.com/cli/configuring-npm/package-json",
|
|
5
5
|
"name": "@eslinted/core",
|
|
6
|
-
"version": "31.
|
|
6
|
+
"version": "31.2.0",
|
|
7
7
|
"repository": "github:jimmy-zhening-luo/linted-core",
|
|
8
8
|
"description": "Internal core for npm package `linted`, responsible for producing an array of fully-formed ESLint configurations according to `linted` spec.",
|
|
9
9
|
"keywords": [],
|
|
@@ -17,9 +17,6 @@
|
|
|
17
17
|
"type": "module",
|
|
18
18
|
"main": "dist/index.js",
|
|
19
19
|
"types": "dist/index.d.ts",
|
|
20
|
-
"dependencies": {
|
|
21
|
-
"@eslint/config-helpers": "^0.5.0"
|
|
22
|
-
},
|
|
23
20
|
"devDependencies": {
|
|
24
21
|
"@types/chai": "^5.2.3",
|
|
25
22
|
"@types/mocha": "^10.0.10",
|
package/src/factory.ts
CHANGED
|
@@ -1,9 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
defineConfig,
|
|
3
|
-
globalIgnores,
|
|
4
|
-
} from "@eslint/config-helpers";
|
|
5
1
|
import type Core from ".";
|
|
6
|
-
import type { MutableRuleConfigs } from "../typings/rules";
|
|
7
2
|
|
|
8
3
|
export default function factory<
|
|
9
4
|
Scope extends string,
|
|
@@ -71,9 +66,7 @@ export default function factory<
|
|
|
71
66
|
)
|
|
72
67
|
defaults.ignores["*"] = extensions["*"].ignores ?? [];
|
|
73
68
|
else
|
|
74
|
-
if (
|
|
75
|
-
extensions["*"].ignores?.length
|
|
76
|
-
)
|
|
69
|
+
if (extensions["*"].ignores?.length)
|
|
77
70
|
void defaults.ignores["*"].push(
|
|
78
71
|
...extensions["*"].ignores,
|
|
79
72
|
);
|
|
@@ -85,25 +78,60 @@ export default function factory<
|
|
|
85
78
|
for (const scope of enabledScopes)
|
|
86
79
|
if (settings[scope])
|
|
87
80
|
if (settings[scope].languageOptions) {
|
|
88
|
-
|
|
81
|
+
const {
|
|
82
|
+
parser,
|
|
83
|
+
parserOptions: { parser: subparser } = {},
|
|
84
|
+
} = settings[scope].languageOptions;
|
|
89
85
|
|
|
90
|
-
if (
|
|
91
|
-
settings[scope]
|
|
86
|
+
if (parser)
|
|
87
|
+
settings[scope]
|
|
88
|
+
.languageOptions
|
|
89
|
+
.parser = imports.parsers[parser] as Parser;
|
|
90
|
+
|
|
91
|
+
if (subparser)
|
|
92
|
+
settings[scope]
|
|
93
|
+
.languageOptions
|
|
94
|
+
.parserOptions!
|
|
95
|
+
.parser = imports.parsers[subparser] as Parser;
|
|
92
96
|
}
|
|
93
97
|
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
98
|
+
const enum Count {
|
|
99
|
+
Global = 2,
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
const configs: Array<{
|
|
103
|
+
name: string;
|
|
104
|
+
files?: Array<string | [string, string]>;
|
|
105
|
+
ignores?: string[];
|
|
106
|
+
"extends"?: unknown;
|
|
107
|
+
plugins?: unknown;
|
|
108
|
+
}> = [
|
|
109
|
+
{
|
|
110
|
+
name: "*/plugins",
|
|
111
|
+
plugins: imports.plugins,
|
|
112
|
+
},
|
|
113
|
+
{
|
|
114
|
+
name: "*/ignores",
|
|
115
|
+
ignores: defaults.ignores["*"] ?? [],
|
|
116
|
+
},
|
|
117
|
+
],
|
|
118
|
+
scopeCount = enabledScopes.length;
|
|
119
|
+
|
|
120
|
+
configs.length = Count.Global + scopeCount;
|
|
121
|
+
|
|
122
|
+
for (let i = 0; i < scopeCount; ++i) {
|
|
123
|
+
const scope = enabledScopes[i]!;
|
|
124
|
+
|
|
125
|
+
configs[i + Count.Global] = {
|
|
126
|
+
name: scope,
|
|
127
|
+
files: defaults.files[scope],
|
|
128
|
+
ignores: defaults.ignores[scope] ?? [],
|
|
129
|
+
"extends": [
|
|
130
|
+
settings[scope] ?? [],
|
|
131
|
+
defaults.rules[scope],
|
|
132
|
+
],
|
|
133
|
+
};
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
return configs;
|
|
109
137
|
}
|
package/src/index.ts
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import factory from "./factory";
|
|
2
2
|
import type {
|
|
3
|
-
Settings,
|
|
3
|
+
Settings,
|
|
4
|
+
Defaults,
|
|
5
|
+
Extensions,
|
|
4
6
|
} from "../typings";
|
|
5
|
-
import type {
|
|
7
|
+
import type { Rules } from "../typings/rules";
|
|
6
8
|
|
|
7
9
|
export default function<
|
|
8
10
|
Scope extends string,
|
|
@@ -24,16 +26,16 @@ export default function<
|
|
|
24
26
|
& Record<RequiredParser, unknown>
|
|
25
27
|
& Partial<Record<Optional, unknown>>;
|
|
26
28
|
},
|
|
27
|
-
settings: Settings<
|
|
28
|
-
Scope,
|
|
29
|
-
Parser
|
|
30
|
-
>,
|
|
29
|
+
settings: Settings<Scope, Parser>,
|
|
31
30
|
defaults: Defaults<Scope>,
|
|
32
|
-
extensions?: Extensions<
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
31
|
+
extensions?: Extensions<Scope, Optional>,
|
|
32
|
+
): Array<
|
|
33
|
+
{
|
|
34
|
+
files?: Array<string | [string, string]>;
|
|
35
|
+
ignores?: string[];
|
|
36
|
+
rules?: Rules;
|
|
37
|
+
}
|
|
38
|
+
> {
|
|
37
39
|
return factory(
|
|
38
40
|
scopes,
|
|
39
41
|
optional,
|
|
@@ -42,11 +44,5 @@ export default function<
|
|
|
42
44
|
settings,
|
|
43
45
|
defaults,
|
|
44
46
|
extensions,
|
|
45
|
-
)
|
|
46
|
-
{
|
|
47
|
-
files?: (string | string[])[];
|
|
48
|
-
ignores?: (string)[];
|
|
49
|
-
rules?: MutableRules;
|
|
50
|
-
}
|
|
51
|
-
>;
|
|
47
|
+
);
|
|
52
48
|
}
|
package/tests/index.spec.ts
CHANGED
|
@@ -18,7 +18,11 @@ const configs = Core(
|
|
|
18
18
|
settings,
|
|
19
19
|
defaults,
|
|
20
20
|
extensions,
|
|
21
|
-
)
|
|
21
|
+
),
|
|
22
|
+
Scopes = new Set(scopes);
|
|
23
|
+
|
|
24
|
+
for (const scope of optional)
|
|
25
|
+
Scopes.delete(scope);
|
|
22
26
|
|
|
23
27
|
describe(
|
|
24
28
|
"Core",
|
|
@@ -49,11 +53,12 @@ describe(
|
|
|
49
53
|
},
|
|
50
54
|
);
|
|
51
55
|
it(
|
|
52
|
-
`length >= (
|
|
56
|
+
`length >= (*/plugins + */ignores + ${Scopes.size} scopes = ${Scopes.size + 2}) [Actual: ${configs.length}]`,
|
|
53
57
|
() => {
|
|
54
58
|
configs
|
|
55
59
|
.should.have
|
|
56
|
-
.lengthOf
|
|
60
|
+
.lengthOf
|
|
61
|
+
.at.least(Scopes.size + 2);
|
|
57
62
|
},
|
|
58
63
|
);
|
|
59
64
|
it(
|
package/typings/rules.d.ts
CHANGED
|
@@ -10,27 +10,3 @@ export type Rules = Record<
|
|
|
10
10
|
string,
|
|
11
11
|
Readonly<Rule>
|
|
12
12
|
>;
|
|
13
|
-
|
|
14
|
-
export type MutableRules = {
|
|
15
|
-
[Rule in keyof Rules]: Mutable<Rules[Rule]>
|
|
16
|
-
};
|
|
17
|
-
|
|
18
|
-
export type MutableRuleConfigs<Configs> = Configs extends Array<
|
|
19
|
-
infer Config extends {
|
|
20
|
-
rules: Rules;
|
|
21
|
-
}
|
|
22
|
-
>
|
|
23
|
-
? Array<
|
|
24
|
-
{
|
|
25
|
-
rules: {
|
|
26
|
-
[Rule in keyof Config["rules"]]: Mutable<
|
|
27
|
-
Config["rules"][Rule]
|
|
28
|
-
>
|
|
29
|
-
};
|
|
30
|
-
}
|
|
31
|
-
>
|
|
32
|
-
: Configs;
|
|
33
|
-
|
|
34
|
-
export type Mutable<Rule> = Rule extends object
|
|
35
|
-
? { -readonly [Index in keyof Rule]: Rule[Index] }
|
|
36
|
-
: Rule;
|