@nx/eslint 0.0.0-pr-33228-bcb0712 → 0.0.0-pr-33468-1bdc579
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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/eslint",
|
|
3
|
-
"version": "0.0.0-pr-
|
|
3
|
+
"version": "0.0.0-pr-33468-1bdc579",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The ESLint plugin for Nx contains executors, generators and utilities used for linting JavaScript/TypeScript projects within an Nx workspace.",
|
|
6
6
|
"repository": {
|
|
@@ -35,14 +35,14 @@
|
|
|
35
35
|
"eslint": "^8.0.0 || ^9.0.0"
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@nx/devkit": "0.0.0-pr-
|
|
39
|
-
"@nx/js": "0.0.0-pr-
|
|
38
|
+
"@nx/devkit": "0.0.0-pr-33468-1bdc579",
|
|
39
|
+
"@nx/js": "0.0.0-pr-33468-1bdc579",
|
|
40
40
|
"semver": "^7.6.3",
|
|
41
41
|
"tslib": "^2.3.0",
|
|
42
42
|
"typescript": "~5.9.2"
|
|
43
43
|
},
|
|
44
44
|
"devDependencies": {
|
|
45
|
-
"nx": "0.0.0-pr-
|
|
45
|
+
"nx": "0.0.0-pr-33468-1bdc579"
|
|
46
46
|
},
|
|
47
47
|
"peerDependenciesMeta": {
|
|
48
48
|
"@zkochan/js-yaml": {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast-utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/eslint/src/generators/utils/flat-config/ast-utils.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AASjC;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CA+BrE;AA2BD,wBAAgB,mCAAmC,CACjD,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,EAAE,GACvB,MAAM,CA0CR;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAgBlE;AA8BD,wBAAgB,WAAW,CACzB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,OAAO,GACvE,OAAO,
|
|
1
|
+
{"version":3,"file":"ast-utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/eslint/src/generators/utils/flat-config/ast-utils.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AASjC;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CA+BrE;AA2BD,wBAAgB,mCAAmC,CACjD,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,EAAE,GACvB,MAAM,CA0CR;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAgBlE;AA8BD,wBAAgB,WAAW,CACzB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,OAAO,GACvE,OAAO,CAoCT;AAuFD;;GAEG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,OAAO,EACxE,MAAM,CAAC,EAAE,CACP,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,KACzD,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,GACtD,MAAM,CAoER;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,EAC3B,GAAG,EAAE,MAAM,GACV,MAAM,CAgBR;AA+QD;;GAEG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,GACV,MAAM,CAeR;AA+DD;;GAEG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC,aAAa,EACxC,OAAO,GAAE;IAAE,cAAc,CAAC,EAAE,OAAO,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAA;CAE7D,GACA,MAAM,CA8BR;AAmGD,wBAAgB,YAAY,CAC1B,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,UA8JrB;AAED,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,EAAE,GACtB,MAAM,CA+DR;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,MAAM,EAAE,GAChB,MAAM,CA8CR;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,EAAE,GACxD,MAAM,CAoBR;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,UAYxD;AA6CD;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAC/B,cAAc,EAAE,EAAE,CAAC,UAAU,EAAE,EAC/B,MAAM,EAAE,KAAK,GAAG,KAAK,GACpB,EAAE,CAAC,SAAS,CACb,EAAE,CAAC,iBAAiB,GAAG,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC,mBAAmB,GAAG,EAAE,CAAC,UAAU,CAC9E,CA4BA;AAyBD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,EAAE,CAAC,aAAa,CAEpE;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,MAAM,EAAE,GAChB,EAAE,CAAC,aAAa,CAWlB;AAED,wBAAgB,2CAA2C,CACzD,MAAM,EAAE,MAAM,GACb,EAAE,CAAC,aAAa,CAiBlB;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,EAAE,CAAC,SAAS,CACf,EAAE,CAAC,iBAAiB,GACpB,EAAE,CAAC,UAAU,GACb,EAAE,CAAC,mBAAmB,GACtB,EAAE,CAAC,UAAU,CAChB,GACA,MAAM,CAuBR;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,YAAY,EAAE,MAAM,GAAG,EAAE,CAAC,oBAAoB,EAC9C,GAAG,EAAE,MAAM,GACV,EAAE,CAAC,iBAAiB,CAmBtB;AAGD,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,GAAG,EAAE,CAAC,oBAAoB,EAC9C,GAAG,EAAE,MAAM,GACV,EAAE,CAAC,iBAAiB,CAsCtB;AAsBD,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;;EAG7D;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,GAAG;IAC9D,OAAO,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;CACxC,EACD,MAAM,EAAE,KAAK,GAAG,KAAK,GACpB,EAAE,CAAC,uBAAuB,GAAG,EAAE,CAAC,aAAa,CAyL/C;AA8CD,wBAAgB,4BAA4B,CAC1C,oBAAoB,EAAE,MAAM,EAC5B,UAAU,SAAO,EACjB,MAAM,UAAO,GACZ,EAAE,CAAC,uBAAuB,GAAG,EAAE,CAAC,aAAa,GAAG,EAAE,CAAC,uBAAuB,CAU5E;AAED,wBAAgB,YAAY,CAC1B,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,EAC5D,SAAS,EAAE,CAAC,KAmBb;AAYD;;GAEG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAC3B,KAAK,EAAE,OAAO,EACd,0BAA0B,CAAC,EAAE;IAC3B,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,QAAQ,EAAE,CACR,kBAAkB,EAAE,EAAE,CAAC,kBAAkB,EACzC,YAAY,EAAE,MAAM,KACjB,EAAE,CAAC,kBAAkB,CAAC;CAC5B,GACA,CAAC,CAuCH"}
|
|
@@ -143,18 +143,20 @@ function hasOverride(content, lookup) {
|
|
|
143
143
|
}
|
|
144
144
|
for (const node of exportsArray) {
|
|
145
145
|
if (isOverride(node)) {
|
|
146
|
-
let
|
|
146
|
+
let data;
|
|
147
147
|
if (ts.isObjectLiteralExpression(node)) {
|
|
148
|
-
|
|
149
|
-
// strip any spread elements
|
|
150
|
-
objSource = objSource.replace(SPREAD_ELEMENTS_REGEXP, '');
|
|
148
|
+
data = extractPropertiesFromObjectLiteral(node);
|
|
151
149
|
}
|
|
152
150
|
else {
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
151
|
+
// Handle compat.config(...).map(...) pattern
|
|
152
|
+
const arrowBody = node['expression'].arguments[0].body.expression;
|
|
153
|
+
if (ts.isObjectLiteralExpression(arrowBody)) {
|
|
154
|
+
data = extractPropertiesFromObjectLiteral(arrowBody);
|
|
155
|
+
}
|
|
156
|
+
else {
|
|
157
|
+
continue;
|
|
158
|
+
}
|
|
156
159
|
}
|
|
157
|
-
const data = parseTextToJson(objSource);
|
|
158
160
|
if (lookup(data)) {
|
|
159
161
|
return true;
|
|
160
162
|
}
|
|
@@ -171,6 +173,77 @@ function parseTextToJson(text) {
|
|
|
171
173
|
.replace(/require\(['"]([^'"]+)['"]\)/g, '"$1"')
|
|
172
174
|
.replace(/\(?await import\(['"]([^'"]+)['"]\)\)?/g, '"$1"'));
|
|
173
175
|
}
|
|
176
|
+
/**
|
|
177
|
+
* Extracts literal values from AST nodes.
|
|
178
|
+
* Returns undefined for complex expressions that can't be statically evaluated.
|
|
179
|
+
*/
|
|
180
|
+
function extractLiteralValue(node) {
|
|
181
|
+
if (ts.isStringLiteral(node)) {
|
|
182
|
+
return node.text;
|
|
183
|
+
}
|
|
184
|
+
if (ts.isNumericLiteral(node)) {
|
|
185
|
+
return Number(node.text);
|
|
186
|
+
}
|
|
187
|
+
if (node.kind === ts.SyntaxKind.TrueKeyword)
|
|
188
|
+
return true;
|
|
189
|
+
if (node.kind === ts.SyntaxKind.FalseKeyword)
|
|
190
|
+
return false;
|
|
191
|
+
if (node.kind === ts.SyntaxKind.NullKeyword)
|
|
192
|
+
return null;
|
|
193
|
+
if (ts.isArrayLiteralExpression(node)) {
|
|
194
|
+
const arr = [];
|
|
195
|
+
for (const element of node.elements) {
|
|
196
|
+
const value = extractLiteralValue(element);
|
|
197
|
+
if (value === undefined)
|
|
198
|
+
return undefined;
|
|
199
|
+
arr.push(value);
|
|
200
|
+
}
|
|
201
|
+
return arr;
|
|
202
|
+
}
|
|
203
|
+
if (ts.isObjectLiteralExpression(node)) {
|
|
204
|
+
const obj = {};
|
|
205
|
+
for (const prop of node.properties) {
|
|
206
|
+
if (ts.isPropertyAssignment(prop)) {
|
|
207
|
+
const name = prop.name.getText().replace(/['"]/g, '');
|
|
208
|
+
const value = extractLiteralValue(prop.initializer);
|
|
209
|
+
if (value === undefined) {
|
|
210
|
+
// Skip properties with non-extractable values (like variable references)
|
|
211
|
+
continue;
|
|
212
|
+
}
|
|
213
|
+
obj[name] = value;
|
|
214
|
+
}
|
|
215
|
+
else if (ts.isSpreadAssignment(prop)) {
|
|
216
|
+
// Cannot extract spread assignments statically, skip them
|
|
217
|
+
continue;
|
|
218
|
+
}
|
|
219
|
+
else {
|
|
220
|
+
// Skip other property types (shorthand, method, etc.)
|
|
221
|
+
continue;
|
|
222
|
+
}
|
|
223
|
+
}
|
|
224
|
+
return obj;
|
|
225
|
+
}
|
|
226
|
+
// For complex expressions (identifiers, function calls, etc.), return undefined
|
|
227
|
+
return undefined;
|
|
228
|
+
}
|
|
229
|
+
/**
|
|
230
|
+
* Extracts property values from an ObjectLiteralExpression using AST.
|
|
231
|
+
* Only extracts properties that have simple literal values.
|
|
232
|
+
* Returns a partial object suitable for the lookup function.
|
|
233
|
+
*/
|
|
234
|
+
function extractPropertiesFromObjectLiteral(node) {
|
|
235
|
+
const result = {};
|
|
236
|
+
for (const prop of node.properties) {
|
|
237
|
+
if (ts.isPropertyAssignment(prop)) {
|
|
238
|
+
const name = prop.name.getText().replace(/['"]/g, '');
|
|
239
|
+
const value = extractLiteralValue(prop.initializer);
|
|
240
|
+
if (value !== undefined) {
|
|
241
|
+
result[name] = value;
|
|
242
|
+
}
|
|
243
|
+
}
|
|
244
|
+
}
|
|
245
|
+
return result;
|
|
246
|
+
}
|
|
174
247
|
/**
|
|
175
248
|
* Finds an override matching the lookup function and applies the update function to it
|
|
176
249
|
*/
|