@eslinted/core 24.4.0 → 25.0.0-rc.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.
- package/dist/factory.d.ts +9 -22
- package/dist/factory.d.ts.map +1 -1
- package/dist/factory.js +38 -64
- package/dist/factory.js.map +1 -1
- package/dist/index.spec.js +2 -2
- package/dist/index.spec.js.map +1 -1
- package/package.json +1 -1
- package/src/factory.ts +88 -110
- package/src/index.spec.ts +2 -2
package/dist/factory.d.ts
CHANGED
@@ -4,11 +4,11 @@ export declare class Factory<RequiredPlugin extends string, RequiredParser exten
|
|
4
4
|
readonly attachments: Input<RequiredPlugin, RequiredParser, Scope, OptionalScope>["configuration"]["attachments"];
|
5
5
|
globalConfigs: {
|
6
6
|
plugins: {
|
7
|
-
name:
|
7
|
+
name: string;
|
8
8
|
plugins: Record<RequiredPlugin, unknown>;
|
9
9
|
};
|
10
10
|
settings: {
|
11
|
-
name:
|
11
|
+
name: string;
|
12
12
|
linterOptions: {
|
13
13
|
noInlineConfig: boolean;
|
14
14
|
reportUnusedDisableDirectives: "off" | "warn" | "error";
|
@@ -19,7 +19,7 @@ export declare class Factory<RequiredPlugin extends string, RequiredParser exten
|
|
19
19
|
};
|
20
20
|
};
|
21
21
|
ignores: {
|
22
|
-
name:
|
22
|
+
name: string;
|
23
23
|
ignores: string[];
|
24
24
|
};
|
25
25
|
};
|
@@ -37,10 +37,10 @@ export declare class Factory<RequiredPlugin extends string, RequiredParser exten
|
|
37
37
|
readonly Scope[]
|
38
38
|
]>, 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"]);
|
39
39
|
get globals(): ({
|
40
|
-
name:
|
40
|
+
name: string;
|
41
41
|
plugins: Record<RequiredPlugin, unknown>;
|
42
42
|
} | {
|
43
|
-
name:
|
43
|
+
name: string;
|
44
44
|
linterOptions: {
|
45
45
|
noInlineConfig: boolean;
|
46
46
|
reportUnusedDisableDirectives: "off" | "warn" | "error";
|
@@ -50,26 +50,13 @@ export declare class Factory<RequiredPlugin extends string, RequiredParser exten
|
|
50
50
|
ecmaVersion: 3 | 5 | "latest" | 2015 | 2016 | 2017 | 2018 | 2019 | 2020 | 2021 | 2022 | 2023 | 2024;
|
51
51
|
};
|
52
52
|
} | {
|
53
|
-
name:
|
53
|
+
name: string;
|
54
54
|
ignores: string[];
|
55
55
|
})[];
|
56
|
-
scope(scope: Scope):
|
57
|
-
name:
|
56
|
+
scope(scope: Scope): {
|
57
|
+
name: string;
|
58
58
|
files: Record<Scope, string[]>[Scope];
|
59
59
|
ignores: Record<"*" | Scope, string[]>[Scope];
|
60
|
-
|
61
|
-
} | {
|
62
|
-
language?: string;
|
63
|
-
processor?: string;
|
64
|
-
languageOptions?: {
|
65
|
-
parserOptions?: {
|
66
|
-
parser?: Record<RequiredParser, unknown>[RequiredParser];
|
67
|
-
};
|
68
|
-
parser?: Record<RequiredParser, unknown>[RequiredParser];
|
69
|
-
};
|
70
|
-
name: `linted/${string}/`;
|
71
|
-
files: Record<Scope, string[]>[Scope];
|
72
|
-
ignores: Record<"*" | Scope, string[]>[Scope];
|
73
|
-
})[];
|
60
|
+
}[];
|
74
61
|
}
|
75
62
|
//# 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":"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;
|
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;IA4IxC,IAAW,OAAO;;;;;;;;;;;;;;;;SAMjB;IAEM,KAAK,CAAC,KAAK,EAAE,KAAK;;;;;CA4E1B"}
|
package/dist/factory.js
CHANGED
@@ -29,11 +29,11 @@ export class Factory {
|
|
29
29
|
: defaults.ignores["*"].concat(extensions["*"]?.ignores ?? []);
|
30
30
|
this.globalConfigs = {
|
31
31
|
plugins: {
|
32
|
-
name: "linted/*/plugins
|
32
|
+
name: "linted/*/plugins",
|
33
33
|
plugins,
|
34
34
|
},
|
35
35
|
settings: {
|
36
|
-
name: "linted/*/settings
|
36
|
+
name: "linted/*/settings",
|
37
37
|
linterOptions: {
|
38
38
|
noInlineConfig,
|
39
39
|
reportUnusedDisableDirectives,
|
@@ -44,7 +44,7 @@ export class Factory {
|
|
44
44
|
},
|
45
45
|
},
|
46
46
|
ignores: {
|
47
|
-
name: "linted/*/ignores
|
47
|
+
name: "linted/*/ignores",
|
48
48
|
ignores,
|
49
49
|
},
|
50
50
|
};
|
@@ -105,67 +105,41 @@ export class Factory {
|
|
105
105
|
];
|
106
106
|
}
|
107
107
|
scope(scope) {
|
108
|
-
const { files: { [scope]: files
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
: {
|
144
|
-
parserOptions: {
|
145
|
-
...extraParserOptions,
|
146
|
-
...subparser === null
|
147
|
-
? {}
|
148
|
-
: {
|
149
|
-
parser: this.parsers[subparser],
|
150
|
-
},
|
151
|
-
},
|
152
|
-
},
|
153
|
-
},
|
154
|
-
},
|
155
|
-
...processor === null
|
156
|
-
? {}
|
157
|
-
: { processor },
|
158
|
-
...language === null
|
159
|
-
? {}
|
160
|
-
: { language },
|
161
|
-
},
|
162
|
-
...ruleset.map(({ id, rules, }) => ({
|
163
|
-
name: `linted/${id}/`,
|
164
|
-
files,
|
165
|
-
ignores,
|
166
|
-
rules,
|
167
|
-
})),
|
168
|
-
];
|
108
|
+
const { files: { [scope]: files }, ignores: { [scope]: ignores }, rules: { [scope]: rules }, } = this.scopes;
|
109
|
+
if (files.length === 0 || rules.length === 0)
|
110
|
+
return [];
|
111
|
+
else {
|
112
|
+
const { languageOptions, parserOptions, processor, language, } = this.settings.registry[scope];
|
113
|
+
if ("parser" in languageOptions)
|
114
|
+
if (languageOptions.parser in this.parsers)
|
115
|
+
languageOptions.parser = this.parsers[languageOptions.parser];
|
116
|
+
else
|
117
|
+
return [];
|
118
|
+
if ("parser" in parserOptions)
|
119
|
+
if (parserOptions.parser in this.parsers)
|
120
|
+
parserOptions.parser = this.parsers[parserOptions.parser];
|
121
|
+
else
|
122
|
+
return [];
|
123
|
+
const manifest = {
|
124
|
+
name: "linted/".concat(scope),
|
125
|
+
files,
|
126
|
+
ignores,
|
127
|
+
};
|
128
|
+
if (Object.keys(languageOptions).length !== 0)
|
129
|
+
Object.assign(manifest, { languageOptions });
|
130
|
+
if (Object.keys(parserOptions).length !== 0)
|
131
|
+
Object.assign(manifest, { parserOptions });
|
132
|
+
if (processor !== undefined)
|
133
|
+
Object.assign(manifest, { processor });
|
134
|
+
if (language !== undefined)
|
135
|
+
Object.assign(manifest, { language });
|
136
|
+
return [manifest].concat(rules.map(({ id, rules, }) => ({
|
137
|
+
name: "linted/".concat(scope, "/", id),
|
138
|
+
files,
|
139
|
+
ignores,
|
140
|
+
rules,
|
141
|
+
})));
|
142
|
+
}
|
169
143
|
}
|
170
144
|
}
|
171
145
|
//# 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":"AAEA,MAAM,OAAO,OAAO;IA2BC;IAkBD;IAvCX,aAAa,CAAC;IACd,MAAM,CAAC;IACP,OAAO,CAAC;IAEf,YACE,IAKC,EACD,cAAgC,EAChC,EACE,OAAO,EACP,OAAO,GAMG,EACK,QAKa,EAC9B,QAK8B,EAC9B,aAKmC,EAAE,EACrB,cAKoB,EAAE;QAvBrB,aAAQ,GAAR,QAAQ,CAKK;QAad,gBAAW,GAAX,WAAW,CAKW;QAEtC,MAAM,EACJ,cAAc,GAAG,QAAQ;aACtB,MAAM;aACN,cAAc,EACjB,6BAA6B,GAAG,QAAQ;aACrC,MAAM;aACN,6BAA6B,EAChC,UAAU,GAAG,QAAQ;aAClB,MAAM;aACN,UAAU,EACb,WAAW,GAAG,QAAQ;aACnB,MAAM;aACN,WAAW,GACf,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QAE1B,IAAI,QAAQ,IAAI,UAAU,IAAI,QAAQ,IAAK,UAAU,CAAC,MAAiB,EAAE,CAAC;YACxE,MAAM,CAAC,MAAM,
|
1
|
+
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"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"}
|
package/dist/index.spec.js
CHANGED
@@ -38,7 +38,7 @@ describe("Core", function () {
|
|
38
38
|
it("begin with plugins", function () {
|
39
39
|
first
|
40
40
|
.should.have
|
41
|
-
.property("name", "linted/*/plugins
|
41
|
+
.property("name", "linted/*/plugins");
|
42
42
|
first
|
43
43
|
.should.have
|
44
44
|
.property("plugins")
|
@@ -47,7 +47,7 @@ describe("Core", function () {
|
|
47
47
|
it("followed by global settings", function () {
|
48
48
|
second
|
49
49
|
.should.have
|
50
|
-
.property("name", "linted/*/settings
|
50
|
+
.property("name", "linted/*/settings");
|
51
51
|
second
|
52
52
|
.should.have
|
53
53
|
.property("linterOptions")
|
package/dist/index.spec.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.spec.js","sourceRoot":"","sources":["../src/index.spec.ts"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,CAAC;AACjC,OAAO,IAAI,MAAM,GAAG,CAAC;AACrB,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC;AAEjC,QAAQ,CACN,MAAM,EACN;IACE,QAAQ,CACN,OAAO,EACP;QACE,EAAE,CACA,eAAe,EACf;YACE,IAAI;iBACD,MAAM,CAAC,EAAE;iBACT,CAAC,CAAC,UAAU,CAAC,CAAC;QACnB,CAAC,CACF,CAAC;IACJ,CAAC,CACF,CAAC;IACF,QAAQ,CACN,QAAQ,EACR;QACE,EAAE,CACA,sBAAsB,EACtB;YACE,OAAO;iBACJ,MAAM,CAAC,EAAE;iBACT,EAAE,CAAC,OAAO,CAAC;iBACX,GAAG,CAAC,KAAK,CAAC;QACf,CAAC,CACF,CAAC;QACF,EAAE,CACA,2DAA2D,MAAM,CAAC,MAAM,aAAa,MAAM,CAAC,MAAM,GAAG,CAAC,cAAc,OAAO,CAAC,MAAM,GAAG,EACrI;YACE,OAAO;iBACJ,MAAM,CAAC,IAAI;iBACX,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACvC,CAAC,CACF,CAAC;QACF,EAAE,CACA,qCAAqC,EACrC;YACE,OAAO;iBACJ,MAAM;iBACN,OAAO,CAAC,CAAC,OAAkB,EAAE,EAAE,CAAC,OAAO;iBACrC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,MAAM,KAAK,QAAQ;mBACtC,MAAM,KAAK,IAAI;mBACf,MAAM,IAAI,MAAM;mBAChB,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC;QAC7C,CAAC,CACF,CAAC;IACJ,CAAC,CACF,CAAC;IACF,QAAQ,CACN,SAAS,EACT;QACE,MAAM,CACJ,KAAK,EACL,MAAM,EACP,GAAG,OAA2B,CAAC;QAEhC,EAAE,CACA,oBAAoB,EACpB;YACE,KAAK;iBACF,MAAM,CAAC,IAAI;iBACX,QAAQ,CACP,MAAM,EACN,
|
1
|
+
{"version":3,"file":"index.spec.js","sourceRoot":"","sources":["../src/index.spec.ts"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,CAAC;AACjC,OAAO,IAAI,MAAM,GAAG,CAAC;AACrB,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC;AAEjC,QAAQ,CACN,MAAM,EACN;IACE,QAAQ,CACN,OAAO,EACP;QACE,EAAE,CACA,eAAe,EACf;YACE,IAAI;iBACD,MAAM,CAAC,EAAE;iBACT,CAAC,CAAC,UAAU,CAAC,CAAC;QACnB,CAAC,CACF,CAAC;IACJ,CAAC,CACF,CAAC;IACF,QAAQ,CACN,QAAQ,EACR;QACE,EAAE,CACA,sBAAsB,EACtB;YACE,OAAO;iBACJ,MAAM,CAAC,EAAE;iBACT,EAAE,CAAC,OAAO,CAAC;iBACX,GAAG,CAAC,KAAK,CAAC;QACf,CAAC,CACF,CAAC;QACF,EAAE,CACA,2DAA2D,MAAM,CAAC,MAAM,aAAa,MAAM,CAAC,MAAM,GAAG,CAAC,cAAc,OAAO,CAAC,MAAM,GAAG,EACrI;YACE,OAAO;iBACJ,MAAM,CAAC,IAAI;iBACX,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACvC,CAAC,CACF,CAAC;QACF,EAAE,CACA,qCAAqC,EACrC;YACE,OAAO;iBACJ,MAAM;iBACN,OAAO,CAAC,CAAC,OAAkB,EAAE,EAAE,CAAC,OAAO;iBACrC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,MAAM,KAAK,QAAQ;mBACtC,MAAM,KAAK,IAAI;mBACf,MAAM,IAAI,MAAM;mBAChB,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC;QAC7C,CAAC,CACF,CAAC;IACJ,CAAC,CACF,CAAC;IACF,QAAQ,CACN,SAAS,EACT;QACE,MAAM,CACJ,KAAK,EACL,MAAM,EACP,GAAG,OAA2B,CAAC;QAEhC,EAAE,CACA,oBAAoB,EACpB;YACE,KAAK;iBACF,MAAM,CAAC,IAAI;iBACX,QAAQ,CACP,MAAM,EACN,kBAAkB,CACnB,CAAC;YACJ,KAAK;iBACF,MAAM,CAAC,IAAI;iBACX,QAAQ,CAAC,SAAS,CAAC;iBACnB,EAAE,CAAC,QAAQ,CAAC,CAAC;QAClB,CAAC,CACF,CAAC;QACF,EAAE,CACA,6BAA6B,EAC7B;YACE,MAAM;iBACH,MAAM,CAAC,IAAI;iBACX,QAAQ,CACP,MAAM,EACN,mBAAmB,CACpB,CAAC;YACJ,MAAM;iBACH,MAAM,CAAC,IAAI;iBACX,QAAQ,CAAC,eAAe,CAAC;iBACzB,EAAE,CAAC,QAAQ,CAAC,CAAC;YAChB,MAAM;iBACH,MAAM,CAAC,IAAI;iBACX,MAAM,CAAC,QAAQ,CAAC,4BAA4B,CAAC;iBAC7C,CAAC,CAAC,QAAQ,CAAC,CAAC;YACf,MAAM;iBACH,MAAM,CAAC,IAAI;iBACX,MAAM,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAAC;QACpD,CAAC,CACF,CAAC;IACJ,CAAC,CACF,CAAC;AACJ,CAAC,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": "
|
6
|
+
"version": "25.0.0-rc.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": [],
|
package/src/factory.ts
CHANGED
@@ -68,12 +68,18 @@ export class Factory<
|
|
68
68
|
} = extensions["*"] ?? {};
|
69
69
|
|
70
70
|
if ("svelte" in extensions && "plugin" in (extensions.svelte as object)) {
|
71
|
-
Object.assign(
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
71
|
+
Object.assign(
|
72
|
+
plugins,
|
73
|
+
{
|
74
|
+
svelte: (extensions.svelte as { plugin: unknown }).plugin,
|
75
|
+
},
|
76
|
+
);
|
77
|
+
Object.assign(
|
78
|
+
parsers,
|
79
|
+
{
|
80
|
+
svelte: (extensions.svelte as { parser: unknown }).parser,
|
81
|
+
},
|
82
|
+
);
|
77
83
|
}
|
78
84
|
|
79
85
|
const ignores = extensions["*"]?.override === true
|
@@ -82,11 +88,11 @@ export class Factory<
|
|
82
88
|
|
83
89
|
this.globalConfigs = {
|
84
90
|
plugins: {
|
85
|
-
name: "linted/*/plugins
|
91
|
+
name: "linted/*/plugins",
|
86
92
|
plugins,
|
87
93
|
},
|
88
94
|
settings: {
|
89
|
-
name: "linted/*/settings
|
95
|
+
name: "linted/*/settings",
|
90
96
|
linterOptions: {
|
91
97
|
noInlineConfig,
|
92
98
|
reportUnusedDisableDirectives,
|
@@ -97,7 +103,7 @@ export class Factory<
|
|
97
103
|
},
|
98
104
|
},
|
99
105
|
ignores: {
|
100
|
-
name: "linted/*/ignores
|
106
|
+
name: "linted/*/ignores",
|
101
107
|
ignores,
|
102
108
|
},
|
103
109
|
};
|
@@ -108,7 +114,7 @@ export class Factory<
|
|
108
114
|
};
|
109
115
|
this.parsers = parsers;
|
110
116
|
|
111
|
-
const extended = new Set<Scope>(Object.keys(extensions) as unknown[] as
|
117
|
+
const extended = new Set<Scope>(Object.keys(extensions) as unknown[] as Scope[]);
|
112
118
|
|
113
119
|
extended.delete("*" as unknown as Scope);
|
114
120
|
|
@@ -194,106 +200,78 @@ export class Factory<
|
|
194
200
|
|
195
201
|
public scope(scope: Scope) {
|
196
202
|
const {
|
197
|
-
files: {
|
198
|
-
|
199
|
-
},
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
|
205
|
-
|
206
|
-
|
207
|
-
|
208
|
-
|
209
|
-
|
210
|
-
|
211
|
-
|
203
|
+
files: { [scope]: files },
|
204
|
+
ignores: { [scope]: ignores },
|
205
|
+
rules: { [scope]: rules },
|
206
|
+
} = this.scopes;
|
207
|
+
|
208
|
+
if (files.length === 0 || rules.length === 0)
|
209
|
+
return [];
|
210
|
+
else {
|
211
|
+
const {
|
212
|
+
languageOptions,
|
213
|
+
parserOptions,
|
214
|
+
processor,
|
215
|
+
language,
|
216
|
+
} = this.settings.registry[scope];
|
217
|
+
|
218
|
+
if ("parser" in languageOptions)
|
219
|
+
if (languageOptions.parser in this.parsers)
|
220
|
+
languageOptions.parser = this.parsers[languageOptions.parser as RequiredParser] as unknown as RequiredParser;
|
221
|
+
else
|
222
|
+
return [];
|
223
|
+
|
224
|
+
if ("parser" in parserOptions)
|
225
|
+
if (parserOptions.parser in this.parsers)
|
226
|
+
parserOptions.parser = this.parsers[parserOptions.parser as RequiredParser] as unknown as RequiredParser;
|
227
|
+
else
|
228
|
+
return [];
|
229
|
+
|
230
|
+
const manifest = {
|
231
|
+
name: "linted/".concat(scope),
|
232
|
+
files,
|
233
|
+
ignores,
|
234
|
+
};
|
235
|
+
|
236
|
+
if (Object.keys(languageOptions).length !== 0)
|
237
|
+
Object.assign(
|
238
|
+
manifest,
|
239
|
+
{ languageOptions },
|
240
|
+
);
|
241
|
+
|
242
|
+
if (Object.keys(parserOptions).length !== 0)
|
243
|
+
Object.assign(
|
244
|
+
manifest,
|
245
|
+
{ parserOptions },
|
246
|
+
);
|
247
|
+
|
248
|
+
if (processor !== undefined)
|
249
|
+
Object.assign(
|
250
|
+
manifest,
|
251
|
+
{ processor },
|
252
|
+
);
|
253
|
+
|
254
|
+
if (language !== undefined)
|
255
|
+
Object.assign(
|
256
|
+
manifest,
|
257
|
+
{ language },
|
258
|
+
);
|
259
|
+
|
260
|
+
return [manifest].concat(
|
261
|
+
rules.map(
|
262
|
+
(
|
263
|
+
{
|
264
|
+
id,
|
265
|
+
rules,
|
266
|
+
},
|
267
|
+
) => ({
|
268
|
+
name: "linted/".concat(scope, "/", id),
|
269
|
+
files,
|
270
|
+
ignores,
|
212
271
|
rules,
|
213
|
-
},
|
214
|
-
)
|
215
|
-
|
216
|
-
|
217
|
-
id,
|
218
|
-
),
|
219
|
-
rules,
|
220
|
-
}),
|
221
|
-
),
|
222
|
-
{
|
223
|
-
languageOptions: {
|
224
|
-
parser = null,
|
225
|
-
...extraLanguageOptions
|
226
|
-
},
|
227
|
-
parserOptions: {
|
228
|
-
parser: subparser = null,
|
229
|
-
...extraParserOptions
|
230
|
-
},
|
231
|
-
processor = null,
|
232
|
-
language = null,
|
233
|
-
} = this.settings.registry[scope];
|
234
|
-
|
235
|
-
return files.length === 0
|
236
|
-
? []
|
237
|
-
: ruleset.length === 0
|
238
|
-
? []
|
239
|
-
: parser !== null
|
240
|
-
&& !(parser in this.parsers)
|
241
|
-
|| subparser !== null
|
242
|
-
&& !(subparser in this.parsers)
|
243
|
-
? []
|
244
|
-
: [
|
245
|
-
{
|
246
|
-
name: `linted/${scope as string}/` as const,
|
247
|
-
files,
|
248
|
-
ignores,
|
249
|
-
...parser === null
|
250
|
-
&& subparser === null
|
251
|
-
&& Object.keys(extraLanguageOptions).length === 0
|
252
|
-
&& Object.keys(extraParserOptions).length === 0
|
253
|
-
? {}
|
254
|
-
: {
|
255
|
-
languageOptions: {
|
256
|
-
...extraLanguageOptions,
|
257
|
-
...parser === null
|
258
|
-
? {}
|
259
|
-
: {
|
260
|
-
parser: this.parsers[parser as RequiredParser],
|
261
|
-
},
|
262
|
-
...subparser === null
|
263
|
-
&& [...Object.keys(extraParserOptions)].length === 0
|
264
|
-
? {}
|
265
|
-
: {
|
266
|
-
parserOptions: {
|
267
|
-
...extraParserOptions,
|
268
|
-
...subparser === null
|
269
|
-
? {}
|
270
|
-
: {
|
271
|
-
parser: this.parsers[subparser as RequiredParser],
|
272
|
-
},
|
273
|
-
},
|
274
|
-
},
|
275
|
-
},
|
276
|
-
},
|
277
|
-
...processor === null
|
278
|
-
? {}
|
279
|
-
: { processor },
|
280
|
-
...language === null
|
281
|
-
? {}
|
282
|
-
: { language },
|
283
|
-
},
|
284
|
-
...ruleset.map(
|
285
|
-
(
|
286
|
-
{
|
287
|
-
id,
|
288
|
-
rules,
|
289
|
-
},
|
290
|
-
) => ({
|
291
|
-
name: `linted/${id}/` as const,
|
292
|
-
files,
|
293
|
-
ignores,
|
294
|
-
rules,
|
295
|
-
}),
|
296
|
-
),
|
297
|
-
];
|
272
|
+
}),
|
273
|
+
),
|
274
|
+
);
|
275
|
+
}
|
298
276
|
}
|
299
277
|
}
|
package/src/index.spec.ts
CHANGED
@@ -70,7 +70,7 @@ describe(
|
|
70
70
|
.should.have
|
71
71
|
.property(
|
72
72
|
"name",
|
73
|
-
"linted/*/plugins
|
73
|
+
"linted/*/plugins",
|
74
74
|
);
|
75
75
|
first
|
76
76
|
.should.have
|
@@ -85,7 +85,7 @@ describe(
|
|
85
85
|
.should.have
|
86
86
|
.property(
|
87
87
|
"name",
|
88
|
-
"linted/*/settings
|
88
|
+
"linted/*/settings",
|
89
89
|
);
|
90
90
|
second
|
91
91
|
.should.have
|