@eslinted/core 29.0.4 → 29.1.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.
Files changed (12) hide show
  1. package/dist/factory/index.d.ts.map +1 -1
  2. package/dist/factory/index.js +49 -64
  3. package/dist/factory/index.js.map +1 -1
  4. package/dist/interface/configuration/defaults/index.d.ts +4 -2
  5. package/dist/interface/configuration/defaults/index.d.ts.map +1 -1
  6. package/dist/interface/configuration/extensions/index.d.ts.map +1 -1
  7. package/dist/interface/settings/index.d.ts.map +1 -1
  8. package/package.json +2 -2
  9. package/src/factory/index.ts +67 -114
  10. package/src/interface/configuration/defaults/index.ts +11 -27
  11. package/src/interface/configuration/extensions/index.ts +1 -4
  12. package/src/interface/settings/index.ts +1 -4
package/dist/factory/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/factory/index.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,IAAI,MAAM,IAAI,CAAC;AAuB3B,MAAM,CAAC,OAAO,UAAU,OAAO,CAC7B,KAAK,SAAS,MAAM,EACpB,QAAQ,SAAS,KAAK,EACtB,cAAc,SAAS,MAAM,EAC7B,cAAc,SAAS,KAAK,EAC5B,OAAO,SAAS,cAAc,GAAG,QAAQ,EACzC,MAAM,SAAS,cAAc,GAAG,QAAQ,EAExC,MAAM,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EACpG,QAAQ,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EACtG,IAAI,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAClG,EACE,OAAO,EACP,OAAO,GACR,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAC/F,QAAQ,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EACtG,EACE,QAAQ,EACR,UAAe,GAChB,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,6CA0OhG"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/factory/index.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,IAAI,MAAM,IAAI,CAAC;AAuB3B,MAAM,CAAC,OAAO,UAAU,OAAO,CAC7B,KAAK,SAAS,MAAM,EACpB,QAAQ,SAAS,KAAK,EACtB,cAAc,SAAS,MAAM,EAC7B,cAAc,SAAS,KAAK,EAC5B,OAAO,SAAS,cAAc,GAAG,QAAQ,EACzC,MAAM,SAAS,cAAc,GAAG,QAAQ,EAExC,MAAM,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EACpG,QAAQ,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EACtG,IAAI,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAClG,EACE,OAAO,EACP,OAAO,GACR,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAC/F,QAAQ,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EACtG,EACE,QAAQ,EACR,UAAe,GAChB,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,6CA2LhG"}
package/dist/factory/index.js CHANGED
@@ -2,87 +2,72 @@ import { defineConfig, globalIgnores, } from "@eslint/config-helpers";
2
2
  export default function factory(scopes, optional, tree, { plugins, parsers, }, settings, { defaults, extensions = {}, }) {
3
3
  for (const scope of optional)
4
4
  if (extensions[scope] !== undefined) {
5
- Object.assign(plugins, {
6
- [scope]: extensions[scope].plugin,
7
- });
8
- Object.assign(parsers, {
9
- [scope]: extensions[scope].parser,
10
- });
5
+ plugins[scope] = extensions[scope].plugin;
6
+ parsers[scope] = extensions[scope].parser;
11
7
  }
12
- for (const scope of scopes)
13
- if (extensions[scope] !== undefined) {
14
- const { [scope]: { files = [], ignores = [], rules = null, } = {}, } = extensions;
15
- if (files.length !== 0) {
16
- const defaultFiles = defaults.files[scope], L = defaultFiles.length;
17
- defaultFiles.length += files.length;
18
- for (let i = 0; i < files.length; i++)
19
- defaultFiles[L + i] = files[i];
20
- }
21
- if (ignores.length !== 0)
22
- if (defaults.ignores[scope] === undefined)
23
- Object.assign(defaults.ignores, { [scope]: ignores });
24
- else {
25
- const defaultIgnores = defaults.ignores[scope], L = defaultIgnores.length;
26
- defaultIgnores.length += ignores.length;
27
- for (let i = 0; i < ignores.length; i++)
28
- defaultIgnores[L + i] = ignores[i];
29
- }
30
- if (rules !== null)
31
- if (defaults.rules[scope] === undefined)
32
- Object.assign(defaults.rules, {
33
- [scope]: [
34
- {
35
- id: scope.concat("/override"),
36
- rules,
37
- },
38
- ],
39
- });
40
- else
41
- defaults.rules[scope][defaults.rules[scope].length] = {
42
- name: scope.concat("/override"),
8
+ const extended = scopes.filter(scope => extensions[scope] !== undefined);
9
+ for (const scope of extended) {
10
+ const { [scope]: { files, ignores, rules, } = {}, } = extensions;
11
+ if (files !== undefined)
12
+ defaults
13
+ .files[scope]
14
+ .push(...files);
15
+ if (ignores !== undefined)
16
+ if (defaults.ignores[scope] === undefined)
17
+ defaults.ignores[scope] = ignores;
18
+ else
19
+ defaults
20
+ .ignores[scope]
21
+ .push(...ignores);
22
+ if (rules !== undefined)
23
+ if (defaults.rules[scope] === undefined)
24
+ defaults.rules[scope] = [
25
+ {
43
26
  rules,
44
- };
45
- }
27
+ name: scope.concat("/user"),
28
+ },
29
+ ];
30
+ else
31
+ defaults.rules[scope][defaults.rules[scope].length] = {
32
+ rules,
33
+ name: scope.concat("/user"),
34
+ };
35
+ }
46
36
  const Optional = new Set(optional);
47
37
  for (const [scope, parents] of tree)
48
38
  if (!Optional.has(scope)
49
39
  || scope in parsers) {
50
40
  const files = defaults.files[scope], ignores = defaults.ignores[scope];
51
41
  if (files.length !== 0)
52
- for (const parent of parents) {
53
- const parentFiles = defaults.files[parent], L = parentFiles.length;
54
- parentFiles.length += files.length;
55
- for (let i = 0; i < files.length; i++)
56
- parentFiles[L + i] = files[i];
57
- }
42
+ for (const parent of parents)
43
+ defaults
44
+ .files[parent]
45
+ .push(...files);
58
46
  if (ignores !== undefined)
59
47
  if (ignores.length !== 0)
60
48
  for (const parent of parents)
61
49
  if (defaults.ignores[parent] === undefined)
62
- Object.assign(defaults.ignores, { [parent]: ignores });
63
- else {
64
- const parentIgnores = defaults.ignores[parent], L = parentIgnores.length;
65
- parentIgnores.length += ignores.length;
66
- for (let i = 0; i < ignores.length; i++)
67
- parentIgnores[L + i] = ignores[i];
68
- }
50
+ defaults.ignores[parent] = ignores;
51
+ else
52
+ defaults
53
+ .ignores[parent]
54
+ .push(...ignores);
69
55
  }
70
56
  if (extensions["*"] !== undefined)
71
- if (extensions["*"].override === true)
72
- Object.assign(defaults.ignores, { "*": extensions["*"].ignores ?? [] });
57
+ if (extensions["*"].override === true
58
+ || defaults.ignores["*"] === undefined)
59
+ defaults.ignores["*"] = extensions["*"].ignores ?? [];
73
60
  else if (extensions["*"].ignores !== undefined)
74
- if (extensions["*"].ignores.length !== 0) {
75
- const { ignores } = extensions["*"], defaultGlobals = defaults.ignores["*"], L = defaultGlobals.length;
76
- defaultGlobals.length += ignores.length;
77
- for (let i = 0; i < ignores.length; i++)
78
- defaultGlobals[L + i] = ignores[i];
79
- }
61
+ if (extensions["*"].ignores.length !== 0)
62
+ defaults
63
+ .ignores["*"]
64
+ .push(...extensions["*"].ignores);
80
65
  const activeScopes = scopes.filter(scope => defaults.rules[scope] !== undefined
81
66
  && defaults.files[scope].length !== 0
82
67
  && defaults.rules[scope].length !== 0
83
68
  && (!Optional.has(scope)
84
69
  || scope in parsers)), activeScopeSettings = activeScopes.filter(scope => settings[scope] !== undefined);
85
- return defineConfig(globalIgnores(defaults.ignores["*"]), activeScopeSettings
70
+ return defineConfig(activeScopeSettings
86
71
  .filter(scope => settings[scope].plugins !== undefined)
87
72
  .map(scope => ({
88
73
  files: defaults.files[scope],
@@ -94,7 +79,7 @@ export default function factory(scopes, optional, tree, { plugins, parsers, }, s
94
79
  },
95
80
  })),
96
81
  ],
97
- })), activeScopeSettings.map(scope => {
82
+ })), defaults.ignores["*"] === undefined ? [] : globalIgnores(defaults.ignores["*"]), activeScopeSettings.map(scope => {
98
83
  const { languageOptions, parserOptions, processor, language, } = settings[scope];
99
84
  if (languageOptions?.parser !== undefined)
100
85
  languageOptions.parser = parsers[languageOptions.parser];
@@ -114,9 +99,9 @@ export default function factory(scopes, optional, tree, { plugins, parsers, }, s
114
99
  : Object.assign(languageOptions, { parserOptions }),
115
100
  };
116
101
  if (processor !== undefined)
117
- Object.assign(definition, { processor });
102
+ definition.processor = processor;
118
103
  if (language !== undefined)
119
- Object.assign(definition, { language });
104
+ definition.language = language;
120
105
  return {
121
106
  name: "scope/".concat(scope, "/definition"),
122
107
  files: defaults.files[scope],
package/dist/factory/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/factory/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/factory/index.ts"],"names":[],"mappings":"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"}
package/dist/interface/configuration/defaults/index.d.ts CHANGED
@@ -1,10 +1,12 @@
1
1
  import type { RuleConfig } from "@eslint/config-helpers";
2
2
  export interface Defaults<Scope extends string> {
3
3
  files: Record<Scope, string[]>;
4
- ignores: Record<"*", string[]> & Partial<Record<Scope, string[]>>;
4
+ ignores: Partial<Record<Scope | "*", string[]>>;
5
5
  rules: Partial<Record<Scope, Array<{
6
6
  name: string;
7
- rules: Record<string, Readonly<RuleConfig>>;
7
+ rules: {
8
+ [rule: string]: Readonly<RuleConfig>;
9
+ };
8
10
  }>>>;
9
11
  }
10
12
  //# sourceMappingURL=index.d.ts.map
package/dist/interface/configuration/defaults/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/interface/configuration/defaults/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,WAAW,QAAQ,CAAC,KAAK,SAAS,MAAM;IAC5C,KAAK,EAAE,MAAM,CACX,KAAK,EACL,MAAM,EAAE,CACT,CAAC;IACF,OAAO,EACH,MAAM,CACN,GAAG,EACH,MAAM,EAAE,CACT,GACC,OAAO,CACP,MAAM,CACJ,KAAK,EACL,MAAM,EAAE,CACT,CACF,CAAC;IACJ,KAAK,EAAE,OAAO,CACZ,MAAM,CACJ,KAAK,EACL,KAAK,CACH;QACE,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CACX,MAAM,EACN,QAAQ,CAAC,UAAU,CAAC,CACrB,CAAC;KACH,CACF,CACF,CACF,CAAC;CACH"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/interface/configuration/defaults/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,WAAW,QAAQ,CAAC,KAAK,SAAS,MAAM;IAC5C,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IAC/B,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IAChD,KAAK,EAAE,OAAO,CAAC,MAAM,CACnB,KAAK,EACL,KAAK,CACH;QACE,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE;YACL,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;SACtC,CAAC;KACH,CACF,CACF,CAAC,CAAC;CACJ"}
package/dist/interface/configuration/extensions/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/interface/configuration/extensions/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAEhD,MAAM,MAAM,UAAU,CACpB,KAAK,SAAS,MAAM,EACpB,QAAQ,SAAS,KAAK,IAEpB,eAAe,GACf,eAAe,CACf,KAAK,EACL,QAAQ,CACT,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/interface/configuration/extensions/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAEhD,MAAM,MAAM,UAAU,CACpB,KAAK,SAAS,MAAM,EACpB,QAAQ,SAAS,KAAK,IAEpB,eAAe,GACf,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC"}
package/dist/interface/settings/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/interface/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,MAAM,EACrB,MAAM,SAAS,KAAK,IAClB,OAAO,CACT,MAAM,CACJ,KAAK,EACL,aAAa,CACX,MAAM,EACN,MAAM,CACP,CACF,CACF,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/interface/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,MAAM,EACrB,MAAM,SAAS,KAAK,IAClB,OAAO,CACT,MAAM,CACJ,KAAK,EACL,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAC9B,CACF,CAAC"}
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": "29.0.4",
6
+ "version": "29.1.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": [],
@@ -20,7 +20,7 @@
20
20
  "@eslint/config-helpers": "^0.4.1"
21
21
  },
22
22
  "devDependencies": {
23
- "@types/chai": "^5.2.2",
23
+ "@types/chai": "^5.2.3",
24
24
  "@types/mocha": "^10.0.10",
25
25
  "chai": "^6.2.0",
26
26
  "mocha": "^11.7.4",
package/src/factory/index.ts CHANGED
@@ -50,78 +50,56 @@ export default function factory<
50
50
  ) {
51
51
  for (const scope of optional)
52
52
  if (extensions[scope] !== undefined) {
53
- Object.assign(
54
- plugins,
55
- {
56
- [scope]: extensions[scope].plugin,
57
- },
58
- );
59
- Object.assign(
60
- parsers,
61
- {
62
- [scope]: extensions[scope].parser,
63
- },
64
- );
53
+ /* eslint-disable no-param-reassign */
54
+ plugins[scope] = extensions[scope].plugin as typeof plugins[Optional];
55
+ parsers[scope] = extensions[scope].parser as typeof parsers[Optional];
65
56
  }
66
57
 
67
- for (const scope of scopes)
68
- if (extensions[scope] !== undefined) {
69
- const {
70
- [scope]: {
71
- files = [],
72
- ignores = [],
73
- rules = null,
74
- } = {},
75
- } = extensions;
76
-
77
- if (files.length !== 0) {
78
- const defaultFiles = defaults.files[scope],
79
- L = defaultFiles.length;
80
-
81
- defaultFiles.length += files.length;
82
-
83
- for (let i = 0; i < files.length; i++)
84
- defaultFiles[L + i] = files[i]!;
85
- }
86
-
87
- if (ignores.length !== 0)
88
- if (defaults.ignores[scope] === undefined)
89
- Object.assign(
90
- defaults.ignores,
91
- { [scope]: ignores },
92
- );
93
- else {
94
- const defaultIgnores = defaults.ignores[scope],
95
- L = defaultIgnores.length;
96
-
97
- defaultIgnores.length += ignores.length;
98
-
99
- for (let i = 0; i < ignores.length; i++)
100
- defaultIgnores[L + i] = ignores[i]!;
101
- }
58
+ const extended = scopes.filter(
59
+ scope => extensions[scope] !== undefined,
60
+ );
102
61
 
103
- if (rules !== null)
104
- if (defaults.rules[scope] === undefined)
105
- Object.assign(
106
- defaults.rules,
107
- {
108
- [scope]: [
109
- {
110
- id: scope.concat("/override"),
111
- rules,
112
- },
113
- ],
114
- },
115
- );
116
- else
117
- /* eslint-disable no-param-reassign */
118
- defaults.rules[scope][
119
- defaults.rules[scope].length
120
- ] = {
121
- name: scope.concat("/override"),
62
+ for (const scope of extended) {
63
+ const {
64
+ [scope]: {
65
+ files,
66
+ ignores,
67
+ rules,
68
+ } = {},
69
+ } = extensions;
70
+
71
+ if (files !== undefined)
72
+ defaults
73
+ .files[scope]
74
+ .push(...files);
75
+
76
+ if (ignores !== undefined)
77
+ if (defaults.ignores[scope] === undefined)
78
+ /* eslint-disable no-param-reassign */
79
+ defaults.ignores[scope] = ignores;
80
+ else
81
+ defaults
82
+ .ignores[scope]
83
+ .push(...ignores);
84
+
85
+ if (rules !== undefined)
86
+ if (defaults.rules[scope] === undefined)
87
+ /* eslint-disable no-param-reassign */
88
+ defaults.rules[scope] = [
89
+ {
122
90
  rules,
123
- };
124
- }
91
+ name: scope.concat("/user"),
92
+ },
93
+ ];
94
+ else
95
+ /* eslint-disable no-param-reassign */
96
+ defaults.rules[scope][
97
+ defaults.rules[scope].length
98
+ ] = {
99
+ rules,
100
+ name: scope.concat("/user"),
101
+ };
102
+ }
125
103
 
126
104
  const Optional = new Set<Scope>(optional);
127
105
 
@@ -134,53 +112,34 @@ export default function factory<
134
112
  ignores = defaults.ignores[scope];
135
113
 
136
114
  if (files.length !== 0)
137
- for (const parent of parents) {
138
- const parentFiles = defaults.files[parent],
139
- L = parentFiles.length;
140
-
141
- parentFiles.length += files.length;
142
-
143
- for (let i = 0; i < files.length; i++)
144
- parentFiles[L + i] = files[i]!;
145
- }
115
+ for (const parent of parents)
116
+ defaults
117
+ .files[parent]
118
+ .push(...files);
146
119
 
147
120
  if (ignores !== undefined)
148
121
  if (ignores.length !== 0)
149
122
  for (const parent of parents)
150
123
  if (defaults.ignores[parent] === undefined)
151
- Object.assign(
152
- defaults.ignores,
153
- { [parent]: ignores },
154
- );
155
- else {
156
- const parentIgnores = defaults.ignores[parent],
157
- L = parentIgnores.length;
158
-
159
- parentIgnores.length += ignores.length;
160
-
161
- for (let i = 0; i < ignores.length; i++)
162
- parentIgnores[L + i] = ignores[i]!;
163
- }
124
+ defaults.ignores[parent] = ignores;
125
+ else
126
+ defaults
127
+ .ignores[parent]
128
+ .push(...ignores);
164
129
  }
165
130
 
166
131
  if (extensions["*"] !== undefined)
167
- if (extensions["*"].override === true)
168
- Object.assign(
169
- defaults.ignores,
170
- { "*": extensions["*"].ignores ?? [] },
171
- );
132
+ if (
133
+ extensions["*"].override === true
134
+ || defaults.ignores["*"] === undefined
135
+ )
136
+ defaults.ignores["*"] = extensions["*"].ignores ?? [];
172
137
  else
173
138
  if (extensions["*"].ignores !== undefined)
174
- if (extensions["*"].ignores.length !== 0) {
175
- const { ignores } = extensions["*"],
176
- defaultGlobals = defaults.ignores["*"],
177
- L = defaultGlobals.length;
178
-
179
- defaultGlobals.length += ignores.length;
180
-
181
- for (let i = 0; i < ignores.length; i++)
182
- defaultGlobals[L + i] = ignores[i]!;
183
- }
139
+ if (extensions["*"].ignores.length !== 0)
140
+ defaults
141
+ .ignores["*"]
142
+ .push(...extensions["*"].ignores);
184
143
 
185
144
  const activeScopes = scopes.filter(
186
145
  scope => defaults.rules[scope] !== undefined
@@ -196,7 +155,6 @@ export default function factory<
196
155
  );
197
156
 
198
157
  return defineConfig(
199
- globalIgnores(defaults.ignores["*"]),
200
158
  activeScopeSettings
201
159
  .filter(
202
160
  scope => settings[scope]!.plugins !== undefined,
@@ -216,6 +174,7 @@ export default function factory<
216
174
  ],
217
175
  }),
218
176
  ),
177
+ defaults.ignores["*"] === undefined ? [] : globalIgnores(defaults.ignores["*"]),
219
178
  activeScopeSettings.map(
220
179
  scope => {
221
180
  const {
@@ -249,16 +208,10 @@ export default function factory<
249
208
  };
250
209
 
251
210
  if (processor !== undefined)
252
- Object.assign(
253
- definition,
254
- { processor },
255
- );
211
+ (definition as typeof definition & { processor: string }).processor = processor;
256
212
 
257
213
  if (language !== undefined)
258
- Object.assign(
259
- definition,
260
- { language },
261
- );
214
+ (definition as typeof definition & { language: string }).language = language;
262
215
 
263
216
  return {
264
217
  name: "scope/".concat(
package/src/interface/configuration/defaults/index.ts CHANGED
@@ -1,33 +1,17 @@
1
1
  import type { RuleConfig } from "@eslint/config-helpers";
2
2
 
3
3
  export interface Defaults<Scope extends string> {
4
- files: Record<
4
+ files: Record<Scope, string[]>;
5
+ ignores: Partial<Record<Scope | "*", string[]>>;
6
+ rules: Partial<Record<
5
7
  Scope,
6
- string[]
7
- >;
8
- ignores:
9
- & Record<
10
- "*",
11
- string[]
8
+ Array<
9
+ {
10
+ name: string;
11
+ rules: {
12
+ [rule: string]: Readonly<RuleConfig>;
13
+ };
14
+ }
12
15
  >
13
- & Partial<
14
- Record<
15
- Scope,
16
- string[]
17
- >
18
- >;
19
- rules: Partial<
20
- Record<
21
- Scope,
22
- Array<
23
- {
24
- name: string;
25
- rules: Record<
26
- string,
27
- Readonly<RuleConfig>
28
- >;
29
- }
30
- >
31
- >
32
- >;
16
+ >>;
33
17
  }
package/src/interface/configuration/extensions/index.ts CHANGED
@@ -6,7 +6,4 @@ export type Extensions<
6
6
  Optional extends Scope,
7
7
  >
8
8
  = & GlobalExtension
9
- & ScopeExtensions<
10
- Scope,
11
- Optional
12
- >;
9
+ & ScopeExtensions<Scope, Optional>;
package/src/interface/settings/index.ts CHANGED
@@ -7,9 +7,6 @@ export type Settings<
7
7
  > = Partial<
8
8
  Record<
9
9
  Scope,
10
- ScopeManifest<
11
- Plugin,
12
- Parser
13
- >
10
+ ScopeManifest<Plugin, Parser>
14
11
  >
15
12
  >;