@eslinted/core 31.1.1 → 31.2.1

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.
Files changed (14) hide show
  1. package/dist/factory.d.ts +12 -1
  2. package/dist/factory.d.ts.map +1 -1
  3. package/dist/factory.js +56 -34
  4. package/dist/factory.js.map +1 -1
  5. package/dist/index.d.ts +4 -4
  6. package/dist/index.d.ts.map +1 -1
  7. package/dist/index.js.map +1 -1
  8. package/dist/tests/index.spec.js +6 -3
  9. package/dist/tests/index.spec.js.map +1 -1
  10. package/package.json +1 -4
  11. package/src/factory.ts +92 -53
  12. package/src/index.ts +14 -18
  13. package/tests/index.spec.ts +8 -3
  14. package/typings/rules.d.ts +0 -24
package/dist/factory.d.ts CHANGED
@@ -1,3 +1,14 @@
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]): import("@eslint/config-helpers").Config[];
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
+ plugins?: unknown;
4
+ rules?: (typeof defaults.rules)[Scope][number]["rules"];
5
+ files?: Array<string | [
6
+ string,
7
+ string
8
+ ]>;
9
+ ignores?: string[];
10
+ languageOptions?: unknown;
11
+ language?: string;
12
+ processor?: string;
13
+ }[];
3
14
  //# 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":"AAIA,OAAO,KAAK,IAAI,MAAM,GAAG,CAAC;AAG1B,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,6CAwFjG"}
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;cAyGlF,OAAO;YACT,CAAA,OAAO,QAAQ,CAAC,KAAK,EAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YAC7C,KAAK,CAAC,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;cAC9B,MAAM,EAAE;sBACA,OAAO;eACd,MAAM;gBACL,MAAM;IAqBvB"}
package/dist/factory.js CHANGED
@@ -1,7 +1,13 @@
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) {
4
+ const global = extensions["*"];
5
+ if (global)
6
+ if (global.override
7
+ || !defaults.ignores["*"])
8
+ defaults.ignores["*"] = global.ignores ?? [];
9
+ else if (global.ignores?.length)
10
+ void defaults.ignores["*"].push(...global.ignores);
5
11
  for (const scope of optional)
6
12
  if (extensions[scope]) {
7
13
  imports.plugins[scope] = extensions[scope].plugin;
@@ -11,47 +17,63 @@ export default function factory(scopes, optional, tree, imports, settings, defau
11
17
  Scopes.delete(scope);
12
18
  for (const scope of Scopes)
13
19
  if (extensions[scope]) {
14
- if (extensions[scope].files)
15
- void defaults.files[scope].push(...extensions[scope].files);
16
- if (extensions[scope].ignores)
20
+ const extension = extensions[scope];
21
+ if (extension.files)
22
+ void defaults.files[scope].push(...extension.files);
23
+ if (extension.ignores)
17
24
  if (defaults.ignores[scope])
18
- void defaults.ignores[scope].push(...extensions[scope].ignores);
25
+ void defaults.ignores[scope].push(...extension.ignores);
19
26
  else
20
- defaults.ignores[scope] = extensions[scope].ignores;
21
- if (extensions[scope].rules)
22
- defaults.rules[scope][defaults.rules[scope].length] = { rules: extensions[scope].rules };
27
+ defaults.ignores[scope] = extension.ignores;
28
+ if (extension.rules)
29
+ defaults.rules[scope][defaults.rules[scope].length] = { rules: extension.rules };
23
30
  }
24
31
  }
25
32
  for (const [scope, parents] of tree)
26
33
  if (Scopes.has(scope)
27
- && defaults.files[scope].length)
34
+ && defaults.files[scope].length) {
35
+ const { [scope]: files } = defaults.files;
28
36
  for (const parent of parents)
29
- void defaults.files[parent].push(...defaults.files[scope]);
30
- if (extensions)
31
- if (extensions["*"])
32
- if (extensions["*"].override
33
- || !defaults.ignores["*"])
34
- defaults.ignores["*"] = extensions["*"].ignores ?? [];
35
- else if (extensions["*"].ignores?.length)
36
- void defaults.ignores["*"].push(...extensions["*"].ignores);
37
+ void defaults.files[parent].push(...files);
38
+ }
37
39
  const enabledScopes = [...Scopes]
38
- .filter(scope => defaults.files[scope].length)
39
- .filter(scope => defaults.rules[scope].length);
40
- for (const scope of enabledScopes)
41
- if (settings[scope])
42
- if (settings[scope].languageOptions) {
43
- settings[scope].languageOptions.parser &&= imports.parsers[settings[scope].languageOptions.parser];
44
- if (settings[scope].languageOptions.parserOptions)
45
- settings[scope].languageOptions.parserOptions.parser &&= imports.parsers[settings[scope].languageOptions.parserOptions.parser];
40
+ .filter(scope => defaults.files[scope].length), setScopes = enabledScopes
41
+ .filter(scope => settings[scope]);
42
+ for (const scope of enabledScopes) {
43
+ const files = defaults.files[scope], ignores = defaults.ignores[scope] ?? [];
44
+ for (const rule of defaults.rules[scope]) {
45
+ rule.files = files;
46
+ rule.ignores = ignores;
47
+ }
48
+ const setting = settings[scope];
49
+ if (setting) {
50
+ setting.files = files;
51
+ setting.ignores = ignores;
52
+ if (setting.languageOptions) {
53
+ const { parser, parserOptions: { parser: subparser } = {}, } = setting.languageOptions;
54
+ if (parser)
55
+ setting
56
+ .languageOptions
57
+ .parser = imports.parsers[parser];
58
+ if (subparser)
59
+ setting
60
+ .languageOptions
61
+ .parserOptions
62
+ .parser = imports.parsers[subparser];
46
63
  }
47
- return defineConfig({ plugins: imports.plugins }, globalIgnores(defaults.ignores["*"] ?? []), enabledScopes
48
- .map(scope => ({
49
- files: defaults.files[scope],
50
- ignores: defaults.ignores[scope] ?? [],
51
- "extends": [
52
- settings[scope] ?? [],
53
- defaults.rules[scope],
54
- ],
55
- })));
64
+ }
65
+ }
66
+ const configs = enabledScopes.flatMap(scope => defaults.rules[scope]), rulesGlobalTotal = configs.length + 2;
67
+ configs.length = rulesGlobalTotal + setScopes.length;
68
+ configs[rulesGlobalTotal - 2] = {
69
+ plugins: imports.plugins,
70
+ };
71
+ configs[rulesGlobalTotal - 1] = {
72
+ ignores: defaults.ignores["*"] ?? [],
73
+ };
74
+ setScopes.forEach((scope, i) => {
75
+ configs[rulesGlobalTotal + i] = settings[scope];
76
+ });
77
+ return configs;
56
78
  }
57
79
  //# 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":"AAAA,OAAO,EACL,YAAY,EACZ,aAAa,GACd,MAAM,wBAAwB,CAAC;AAIhC,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,IACE,UAAU,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM;gBAE/B,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,QAAQ,CAAC,KAAK,CAAC,CAAC,eAAe,CAAC,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,eAAe,CAAC,MAAM,CAAW,CAAC;gBAE7G,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,eAAe,CAAC,aAAa;oBAC/C,QAAQ,CAAC,KAAK,CAAC,CAAC,eAAe,CAAC,aAAa,CAAC,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,eAAe,CAAC,aAAa,CAAC,MAAM,CAAW,CAAC;YAC7I,CAAC;IAEL,OAAO,YAAY,CACjB,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,EAC5B,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,EAC1C,aAAa;SACV,GAAG,CACF,KAAK,CAAC,EAAE,CAAC,CAAC;QACR,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC;QAC5B,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE;QACtC,SAAS,EAAE;YACT,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE;YACrB,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAyE;SAC9F;KACF,CAAC,CACH,CACJ,CAAC;AACJ,CAAC"}
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,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;QAE/B,IAAI,MAAM;YACR,IACE,MAAM,CAAC,QAAQ;mBACZ,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC;gBAEzB,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;iBAE7C,IAAI,MAAM,CAAC,OAAO,EAAE,MAAM;gBACxB,KAAK,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAC7B,GAAG,MAAM,CAAC,OAAO,CAClB,CAAC;QAER,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;YAExF,CAAC;;gBAEC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAEzB,KAAK,MAAM,KAAK,IAAI,MAAM;YACxB,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;gBACtB,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAE,CAAC;gBAErC,IAAI,SAAS,CAAC,KAAK;oBACjB,KAAK,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAC7B,GAAG,SAAS,CAAC,KAAK,CACnB,CAAC;gBAEJ,IAAI,SAAS,CAAC,OAAO;oBACnB,IAAI,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC;wBACzB,KAAK,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAC/B,GAAG,SAAS,CAAC,OAAO,CACrB,CAAC;;wBAEF,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC;gBAEhD,IAAI,SAAS,CAAC,KAAK;oBACjB,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CACnB,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAC7B,GAAG,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,CAAC;YACnC,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,EAC/B,CAAC;YACD,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC;YAE1C,KAAK,MAAM,MAAM,IAAI,OAAO;gBAC1B,KAAK,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;QAC/C,CAAC;IAEH,MAAM,aAAa,GAAG,CAAC,GAAG,MAAM,CAAC;SAC9B,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,EAChD,SAAS,GAAG,aAAa;SACtB,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;IAEpC,KAAK,MAAM,KAAK,IAAI,aAAa,EAAE,CAAC;QAClC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EACnC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QAExC,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;YACxC,IAAkE,CAAC,KAAK,GAAG,KAAK,CAAC;YACjF,IAA4C,CAAC,OAAO,GAAG,OAAO,CAAC;QAClE,CAAC;QAED,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;QAEhC,IAAI,OAAO,EAAE,CAAC;YACX,OAAwE,CAAC,KAAK,GAAG,KAAK,CAAC;YACvF,OAAkD,CAAC,OAAO,GAAG,OAAO,CAAC;YAEtE,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;gBAC5B,MAAM,EACJ,MAAM,EACN,aAAa,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAC1C,GAAG,OAAO,CAAC,eAAe,CAAC;gBAE5B,IAAI,MAAM;oBACR,OAAO;yBACJ,eAAe;yBACf,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAW,CAAC;gBAEhD,IAAI,SAAS;oBACX,OAAO;yBACJ,eAAe;yBACf,aAAc;yBACd,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAW,CAAC;YACrD,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,OAAO,GAUT,aAAa,CAAC,OAAO,CACvB,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAC/B,EACD,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;IAEtC,OAAO,CAAC,MAAM,GAAG,gBAAgB,GAAG,SAAS,CAAC,MAAM,CAAC;IACrD,OAAO,CAAC,gBAAgB,GAAG,CAAC,CAAC,GAAG;QAC9B,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,CAAC;IACF,OAAO,CAAC,gBAAgB,GAAG,CAAC,CAAC,GAAG;QAC9B,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE;KACrC,CAAC;IACF,SAAS,CAAC,OAAO,CACf,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;QACX,OAAO,CAAC,gBAAgB,GAAG,CAAC,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAE,CAAC;IACnD,CAAC,CACF,CAAC;IAEF,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 { MutableRules } from "../typings/rules";
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?: (string | string[])[];
8
- ignores?: (string)[];
9
- rules?: MutableRules;
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,EAAE,QAAQ,EAAE,UAAU,EAC/B,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAErD,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,CAChB,KAAK,EACL,MAAM,CACP,EACD,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,EACzB,UAAU,CAAC,EAAE,UAAU,CACrB,KAAK,EACL,QAAQ,CACT,GAUI,KAAK,CACR;IACE,KAAK,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE,CAAC;IAC9B,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,YAAY,CAAC;CACtB,CACF,CACF"}
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;AAMhC,MAAM,CAAC,OAAO,WAOZ,MAAwB,EACxB,QAA6B,EAC7B,IAEC,EACD,OAOC,EACD,QAGC,EACD,QAAyB,EACzB,UAGC;IAED,OAAO,OAAO,CACZ,MAAM,EACN,QAAQ,EACR,IAAI,EACJ,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,UAAU,CAOX,CAAC;AACJ,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 >= (global/ignores + ${scopes.length} scopes = ${scopes.length + 1}) [Actual: ${configs.length}]`, () => {
22
+ it(`length >= (*/plugins + */ignores + ${Scopes.size} scopes = ${Scopes.size + 2}) [Actual: ${configs.length}]`, () => {
21
23
  configs
22
24
  .should.have
23
- .lengthOf.above(scopes.length + 1);
25
+ .lengthOf
26
+ .at.least(Scopes.size + 2);
24
27
  });
25
28
  it("of config objects", () => {
26
29
  for (const config of configs)
package/dist/tests/index.spec.js.map CHANGED
@@ -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;AAEF,QAAQ,CACN,MAAM,EACN,GAAG,EAAE;IACH,QAAQ,CACN,QAAQ,EACR,GAAG,EAAE;QACH,EAAE,CACA,eAAe,EACf,GAAG,EAAE;YACH,IAAI;iBACD,MAAM,CAAC,EAAE;iBACT,CAAC,CAAC,UAAU,CAAC,CAAC;QACnB,CAAC,CACF,CAAC;IACJ,CAAC,CACF,CAAC;IACF,QAAQ,CACN,QAAQ,EACR,GAAG,EAAE;QACH,EAAE,CACA,sBAAsB,EACtB,GAAG,EAAE;YACH,OAAO;iBACJ,MAAM,CAAC,EAAE;iBACT,EAAE,CAAC,OAAO,CAAC;iBACX,GAAG,CAAC,KAAK,CAAC;QACf,CAAC,CACF,CAAC;QACF,EAAE,CACA,+BAA+B,MAAM,CAAC,MAAM,aAAa,MAAM,CAAC,MAAM,GAAG,CAAC,cAAc,OAAO,CAAC,MAAM,GAAG,EACzG,GAAG,EAAE;YACH,OAAO;iBACJ,MAAM,CAAC,IAAI;iBACX,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACvC,CAAC,CACF,CAAC;QACF,EAAE,CACA,mBAAmB,EACnB,GAAG,EAAE;YACH,KAAK,MAAM,MAAM,IAAI,OAAO;gBAC1B,MAAM;qBACH,MAAM,CAAC,EAAE;qBACT,EAAE,CAAC,QAAQ,CAAC;qBACZ,QAAQ;qBACR,GAAG;qBACH,IAAI,CACH,SAAS,EACT,OAAO,EACP,SAAS,EACT,OAAO,CACR,CAAC;QACR,CAAC,CACF,CAAC;QACF,EAAE,CACA,oBAAoB,EACpB,GAAG,EAAE;YACH,KAAK,MAAM,MAAM,IAAI,OAAO;gBAC1B,IAAI,SAAS,IAAI,MAAM;oBACpB,MAAM,CAAC,OAAkB;yBACvB,MAAM,CAAC,EAAE;yBACT,EAAE,CAAC,QAAQ,CAAC,CAAC;QACtB,CAAC,CACF,CAAC;QACF,EAAE,CACA,gBAAgB,EAChB,GAAG,EAAE;YACH,KAAK,MAAM,MAAM,IAAI,OAAO;gBAC1B,IAAI,OAAO,IAAI,MAAM;oBACnB,MAAM;yBACH,KAAK;yBACL,MAAM,CAAC,EAAE;yBACT,EAAE,CAAC,OAAO,CAAC;yBACX,GAAG,CAAC,KAAK,CAAC;QACnB,CAAC,CACF,CAAC;QACF,EAAE,CACA,kBAAkB,EAClB,GAAG,EAAE;YACH,KAAK,MAAM,MAAM,IAAI,OAAO;gBAC1B,IAAI,SAAS,IAAI,MAAM,EAAE,CAAC;oBACxB,MAAM;yBACH,OAAO;yBACP,MAAM,CAAC,EAAE;yBACT,EAAE,CAAC,OAAO,CAAC,CAAC;oBAEf,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,OAAO;wBAClC,OAAO;6BACJ,MAAM,CAAC,EAAE;6BACT,CAAC,CAAC,QAAQ,CAAC;6BACX,GAAG,CAAC,KAAK,CAAC;gBACjB,CAAC;QACL,CAAC,CACF,CAAC;QACF,EAAE,CACA,gBAAgB,EAChB,GAAG,EAAE;YACH,KAAK,MAAM,MAAM,IAAI,OAAO;gBAC1B,IAAI,OAAO,IAAI,MAAM,EAAE,CAAC;oBACtB,MAAM;yBACH,KAAK;yBACL,MAAM,CAAC,EAAE;yBACT,EAAE,CAAC,QAAQ,CAAC;yBACZ,GAAG,CAAC,KAAK,CAAC;oBAEb,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;wBAC7C,IAAI;6BACD,MAAM;6BACN,EAAE;6BACF,CAAC,CAAC,QAAQ,CAAC,CAAC;wBAEf,IAAI,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,QAAQ;4BACxC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAE;iCAChB,MAAM;iCACN,EAAE;iCACF,EAAE,CAAC,OAAO,CAAC;iCACX,IAAI;iCACJ,QAAQ,CAAC,GAAG,CAAC;iCACb,CAAC,CAAC,QAAQ,CAAC,CAAC;oBACnB,CAAC;gBACH,CAAC;QACL,CAAC,CACF,CAAC;IACJ,CAAC,CACF,CAAC;AACJ,CAAC,CACF,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.1.1",
6
+ "version": "31.2.1",
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,
@@ -23,33 +18,50 @@ export default function factory<
23
18
  const Scopes = new Set(scopes);
24
19
 
25
20
  if (extensions) {
21
+ const global = extensions["*"];
22
+
23
+ if (global)
24
+ if (
25
+ global.override
26
+ || !defaults.ignores["*"]
27
+ )
28
+ defaults.ignores["*"] = global.ignores ?? [];
29
+ else
30
+ if (global.ignores?.length)
31
+ void defaults.ignores["*"].push(
32
+ ...global.ignores,
33
+ );
34
+
26
35
  for (const scope of optional)
27
36
  if (extensions[scope]) {
28
37
  imports.plugins[scope] = extensions[scope].plugin as typeof imports.plugins[Optional];
29
38
  imports.parsers[scope] = extensions[scope].parser as typeof imports.parsers[Optional];
39
+
30
40
  }
31
41
  else
32
42
  Scopes.delete(scope);
33
43
 
34
44
  for (const scope of Scopes)
35
45
  if (extensions[scope]) {
36
- if (extensions[scope].files)
46
+ const extension = extensions[scope]!;
47
+
48
+ if (extension.files)
37
49
  void defaults.files[scope].push(
38
- ...extensions[scope].files,
50
+ ...extension.files,
39
51
  );
40
52
 
41
- if (extensions[scope].ignores)
53
+ if (extension.ignores)
42
54
  if (defaults.ignores[scope])
43
55
  void defaults.ignores[scope].push(
44
- ...extensions[scope].ignores,
56
+ ...extension.ignores,
45
57
  );
46
58
  else
47
- defaults.ignores[scope] = extensions[scope].ignores;
59
+ defaults.ignores[scope] = extension.ignores;
48
60
 
49
- if (extensions[scope].rules)
61
+ if (extension.rules)
50
62
  defaults.rules[scope][
51
63
  defaults.rules[scope].length
52
- ] = { rules: extensions[scope].rules };
64
+ ] = { rules: extension.rules };
53
65
  }
54
66
  }
55
67
 
@@ -57,53 +69,80 @@ export default function factory<
57
69
  if (
58
70
  Scopes.has(scope)
59
71
  && defaults.files[scope].length
60
- )
61
- for (const parent of parents)
62
- void defaults.files[parent].push(
63
- ...defaults.files[scope],
64
- );
72
+ ) {
73
+ const { [scope]: files } = defaults.files;
65
74
 
66
- if (extensions)
67
- if (extensions["*"])
68
- if (
69
- extensions["*"].override
70
- || !defaults.ignores["*"]
71
- )
72
- defaults.ignores["*"] = extensions["*"].ignores ?? [];
73
- else
74
- if (
75
- extensions["*"].ignores?.length
76
- )
77
- void defaults.ignores["*"].push(
78
- ...extensions["*"].ignores,
79
- );
75
+ for (const parent of parents)
76
+ void defaults.files[parent].push(...files);
77
+ }
80
78
 
81
79
  const enabledScopes = [...Scopes]
82
- .filter(scope => defaults.files[scope].length)
83
- .filter(scope => defaults.rules[scope].length);
80
+ .filter(scope => defaults.files[scope].length),
81
+ setScopes = enabledScopes
82
+ .filter(scope => settings[scope]);
83
+
84
+ for (const scope of enabledScopes) {
85
+ const files = defaults.files[scope],
86
+ ignores = defaults.ignores[scope] ?? [];
87
+
88
+ for (const rule of defaults.rules[scope]) {
89
+ (rule as typeof rule & { files: Array<string | [string, string]> }).files = files;
90
+ (rule as typeof rule & { ignores: string[] }).ignores = ignores;
91
+ }
84
92
 
85
- for (const scope of enabledScopes)
86
- if (settings[scope])
87
- if (settings[scope].languageOptions) {
88
- settings[scope].languageOptions.parser &&= imports.parsers[settings[scope].languageOptions.parser] as Parser;
93
+ const setting = settings[scope];
89
94
 
90
- if (settings[scope].languageOptions.parserOptions)
91
- settings[scope].languageOptions.parserOptions.parser &&= imports.parsers[settings[scope].languageOptions.parserOptions.parser] as Parser;
95
+ if (setting) {
96
+ (setting as typeof setting & { files: Array<string | [string, string]> }).files = files;
97
+ (setting as typeof setting & { ignores: string[] }).ignores = ignores;
98
+
99
+ if (setting.languageOptions) {
100
+ const {
101
+ parser,
102
+ parserOptions: { parser: subparser } = {},
103
+ } = setting.languageOptions;
104
+
105
+ if (parser)
106
+ setting
107
+ .languageOptions
108
+ .parser = imports.parsers[parser] as Parser;
109
+
110
+ if (subparser)
111
+ setting
112
+ .languageOptions
113
+ .parserOptions!
114
+ .parser = imports.parsers[subparser] as Parser;
92
115
  }
116
+ }
117
+ }
118
+
119
+ const configs: Array<
120
+ {
121
+ plugins?: unknown;
122
+ rules?: typeof defaults.rules[Scope][number]["rules"];
123
+ files?: Array<string | [string, string]>;
124
+ ignores?: string[];
125
+ languageOptions?: unknown;
126
+ language?: string;
127
+ processor?: string;
128
+ }
129
+ > = enabledScopes.flatMap(
130
+ scope => defaults.rules[scope],
131
+ ),
132
+ rulesGlobalTotal = configs.length + 2;
93
133
 
94
- return defineConfig(
95
- { plugins: imports.plugins },
96
- globalIgnores(defaults.ignores["*"] ?? []),
97
- enabledScopes
98
- .map(
99
- scope => ({
100
- files: defaults.files[scope],
101
- ignores: defaults.ignores[scope] ?? [],
102
- "extends": [
103
- settings[scope] ?? [],
104
- defaults.rules[scope] as MutableRuleConfigs<NonNullable<typeof defaults.rules[typeof scope]>>,
105
- ],
106
- }),
107
- ),
134
+ configs.length = rulesGlobalTotal + setScopes.length;
135
+ configs[rulesGlobalTotal - 2] = {
136
+ plugins: imports.plugins,
137
+ };
138
+ configs[rulesGlobalTotal - 1] = {
139
+ ignores: defaults.ignores["*"] ?? [],
140
+ };
141
+ setScopes.forEach(
142
+ (scope, i) => {
143
+ configs[rulesGlobalTotal + i] = settings[scope]!;
144
+ },
108
145
  );
146
+
147
+ return configs;
109
148
  }
package/src/index.ts CHANGED
@@ -1,8 +1,10 @@
1
1
  import factory from "./factory";
2
2
  import type {
3
- Settings, Defaults, Extensions,
3
+ Settings,
4
+ Defaults,
5
+ Extensions,
4
6
  } from "../typings";
5
- import type { MutableRules } from "../typings/rules";
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
- Scope,
34
- Optional
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
- ) as Array<
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 >= (global/ignores + ${scopes.length} scopes = ${scopes.length + 1}) [Actual: ${configs.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.above(scopes.length + 1);
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;