eslint-plugin-complete 1.13.0 → 1.13.2
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/package.json +1 -1
- package/dist/src/list.js +2 -2
- package/dist/src/list.js.map +1 -1
- package/dist/src/patch.d.ts.map +1 -1
- package/dist/src/patch.js +1 -5
- package/dist/src/patch.js.map +1 -1
- package/dist/src/rules/require-capital-const-assertions.d.ts.map +1 -1
- package/dist/src/rules/require-capital-const-assertions.js +7 -9
- package/dist/src/rules/require-capital-const-assertions.js.map +1 -1
- package/dist/src/rules/sort-objects.js +139 -12
- package/dist/src/rules/sort-objects.js.map +1 -1
- package/dist/src/rules/type-declaration-immutability.d.ts.map +1 -1
- package/dist/src/rules/type-declaration-immutability.js +1 -6
- package/dist/src/rules/type-declaration-immutability.js.map +1 -1
- package/package.json +1 -1
package/dist/package.json
CHANGED
package/dist/src/list.js
CHANGED
|
@@ -120,8 +120,8 @@ function getJSDocTagName(text) {
|
|
|
120
120
|
if (paramMatch === null || paramMatch.groups === undefined) {
|
|
121
121
|
return "@param";
|
|
122
122
|
}
|
|
123
|
-
const { tagWithVariableName } = paramMatch.groups;
|
|
124
|
-
return tagWithVariableName
|
|
123
|
+
const { tagWithVariableName = "@param" } = paramMatch.groups;
|
|
124
|
+
return tagWithVariableName;
|
|
125
125
|
}
|
|
126
126
|
return `@${tagName}`;
|
|
127
127
|
}
|
package/dist/src/list.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/list.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/list.ts"],"names":[],"mappings":"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"}
|
package/dist/src/patch.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"patch.d.ts","sourceRoot":"","sources":["../../src/patch.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"patch.d.ts","sourceRoot":"","sources":["../../src/patch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,qBAAqB,EACtB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,8DAA8D;AAC9D,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,EAAE,CAAC,OAAO,EACnB,IAAI,EAAE,EAAE,CAAC,IAAI,EACb,SAAS,EAAE,qBAAqB,EAChC,KAAK,EAAE,iBAAiB,GACvB,OAAO,CAGT"}
|
package/dist/src/patch.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { getTypeOfPropertyOfType } from "@typescript-eslint/type-utils";
|
|
2
1
|
import { Immutability, isImmutableType } from "is-immutable-type";
|
|
3
2
|
import ts from "typescript";
|
|
4
3
|
/** TODO: Open a PR for this once the other PR is accepted. */
|
|
@@ -57,10 +56,7 @@ function cachePatchedImmutableTypes(program, type, overrides, cache) {
|
|
|
57
56
|
}
|
|
58
57
|
}
|
|
59
58
|
for (const property of typeToVisit.getProperties()) {
|
|
60
|
-
|
|
61
|
-
if (propertyType !== undefined) {
|
|
62
|
-
visitType(propertyType);
|
|
63
|
-
}
|
|
59
|
+
visitType(checker.getTypeOfSymbol(property));
|
|
64
60
|
}
|
|
65
61
|
for (const indexKind of [ts.IndexKind.String, ts.IndexKind.Number]) {
|
|
66
62
|
const indexInfo = checker.getIndexInfoOfType(typeToVisit, indexKind);
|
package/dist/src/patch.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"patch.js","sourceRoot":"","sources":["../../../../src/patch.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"patch.js","sourceRoot":"","sources":["../../../../src/patch.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"require-capital-const-assertions.d.ts","sourceRoot":"","sources":["../../../src/rules/require-capital-const-assertions.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,OAAO,GAAG,EAAE,CAAC;AACzB,MAAM,MAAM,UAAU,GAAG,kBAAkB,CAAC;AAkB5C,eAAO,MAAM,6BAA6B;;
|
|
1
|
+
{"version":3,"file":"require-capital-const-assertions.d.ts","sourceRoot":"","sources":["../../../src/rules/require-capital-const-assertions.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,OAAO,GAAG,EAAE,CAAC;AACzB,MAAM,MAAM,UAAU,GAAG,kBAAkB,CAAC;AAkB5C,eAAO,MAAM,6BAA6B;;CA6DxC,CAAC"}
|
|
@@ -55,15 +55,13 @@ export const requireCapitalConstAssertions = createRule({
|
|
|
55
55
|
context.report({
|
|
56
56
|
loc: node.loc,
|
|
57
57
|
messageId: "noConstAssertion",
|
|
58
|
-
fix: (fixer) =>
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
return fixer.insertTextAfter(init, " as const");
|
|
66
|
-
},
|
|
58
|
+
fix: (fixer) =>
|
|
59
|
+
// If this variable is not being assigned to anything, then there is nothing we can fix.
|
|
60
|
+
init.type === AST_NODE_TYPES.TSAsExpression
|
|
61
|
+
|| AUTO_FIX_TYPE_BLACKLIST.has(init.type)
|
|
62
|
+
? // eslint-disable-next-line unicorn/no-null
|
|
63
|
+
null
|
|
64
|
+
: fixer.insertTextAfter(init, " as const"),
|
|
67
65
|
});
|
|
68
66
|
}
|
|
69
67
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"require-capital-const-assertions.js","sourceRoot":"","sources":["../../../../../src/rules/require-capital-const-assertions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAKzC,MAAM,gCAAgC,GAAgC,IAAI,GAAG,CAAC;IAC5E,cAAc,CAAC,eAAe;IAC9B,cAAc,CAAC,gBAAgB;IAC/B,cAAc,CAAC,qBAAqB;CACrC,CAAC,CAAC;AAEH,MAAM,uBAAuB,GAAgC,IAAI,GAAG,CAAC;IACnE,8FAA8F;IAC9F,uCAAuC;IACvC,cAAc,CAAC,cAAc;IAE7B,+FAA+F;IAC/F,sBAAsB;IACtB,cAAc,CAAC,qBAAqB;CACrC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,6BAA6B,GAAG,UAAU,CAAsB;IAC3E,IAAI,EAAE,kCAAkC;IACxC,IAAI,EAAE;QACJ,IAAI,EAAE,SAAS;QACf,IAAI,EAAE;YACJ,WAAW,EACT,oFAAoF;YACtF,WAAW,EAAE,IAAI;YACjB,oBAAoB,EAAE,KAAK;SAC5B;QACD,OAAO,EAAE,MAAM;QACf,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE;YACR,gBAAgB,EACd,0FAA0F;SAC7F;KACF;IACD,cAAc,EAAE,EAAE;IAClB,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACpB,mBAAmB,CAAC,IAAI;YACtB,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAC1B,OAAO;YACT,CAAC;YAED,KAAK,MAAM,WAAW,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBAC5C,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,CAAC;gBAC3B,IACE,EAAE,CAAC,IAAI,KAAK,cAAc,CAAC,UAAU;uBAClC,CAAC,wBAAwB,CAAC,EAAE,CAAC,IAAI,CAAC,EACrC,CAAC;oBACD,SAAS;gBACX,CAAC;gBAED,MAAM,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC;gBAC7B,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;oBAClB,SAAS;gBACX,CAAC;gBAED,2DAA2D;gBAC3D,IAAI,CAAC,gCAAgC,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;oBACrD,SAAS;gBACX,CAAC;gBAED,IAAI,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC5B,SAAS;gBACX,CAAC;gBAED,OAAO,CAAC,MAAM,CAAC;oBACb,GAAG,EAAE,IAAI,CAAC,GAAG;oBACb,SAAS,EAAE,kBAAkB;oBAC7B,GAAG,EAAE,CAAC,KAAK,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"require-capital-const-assertions.js","sourceRoot":"","sources":["../../../../../src/rules/require-capital-const-assertions.ts"],"names":[],"mappings":"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"}
|
|
@@ -184,15 +184,79 @@ function getDeclaredPropertyOrder(checker, type, tsNode, node) {
|
|
|
184
184
|
const typeWithDeclaredProperties = getTypeWithDeclaredProperties(checker, type, tsNode, node);
|
|
185
185
|
return typeWithDeclaredProperties === undefined
|
|
186
186
|
? new Map()
|
|
187
|
-
: (getDeclarationPropertyOrder(typeWithDeclaredProperties, tsNode, node)
|
|
188
|
-
??
|
|
187
|
+
: (getDeclarationPropertyOrder(checker, typeWithDeclaredProperties, tsNode, node)
|
|
188
|
+
?? getMappedPropertyOrder(checker, typeWithDeclaredProperties, node)
|
|
189
|
+
?? new Map());
|
|
189
190
|
}
|
|
190
|
-
function
|
|
191
|
+
function getMappedPropertyOrder(checker, type, node) {
|
|
192
|
+
const keyType = getMappedTypeArgument(checker, type.aliasSymbol, type.aliasTypeArguments ?? [], "keys");
|
|
193
|
+
const keyDeclarations = keyType?.aliasSymbol?.declarations;
|
|
194
|
+
const keyDeclaration = keyDeclarations?.[0];
|
|
195
|
+
if (keyDeclaration === undefined
|
|
196
|
+
|| keyDeclarations?.length !== 1
|
|
197
|
+
|| !ts.isTypeAliasDeclaration(keyDeclaration)
|
|
198
|
+
|| !ts.isUnionTypeNode(keyDeclaration.type)) {
|
|
199
|
+
return undefined;
|
|
200
|
+
}
|
|
191
201
|
const propertyOrder = new Map();
|
|
192
|
-
for (const
|
|
193
|
-
|
|
202
|
+
for (const member of keyDeclaration.type.types) {
|
|
203
|
+
if (!ts.isLiteralTypeNode(member) || !ts.isStringLiteral(member.literal)) {
|
|
204
|
+
return undefined;
|
|
205
|
+
}
|
|
206
|
+
const propertyName = member.literal.text;
|
|
207
|
+
if (!propertyOrder.has(propertyName)) {
|
|
208
|
+
propertyOrder.set(propertyName, propertyOrder.size);
|
|
209
|
+
}
|
|
194
210
|
}
|
|
195
|
-
return propertyOrder
|
|
211
|
+
return getObjectExpressionPropertyNames(node).every((propertyName) => propertyOrder.has(propertyName))
|
|
212
|
+
? propertyOrder
|
|
213
|
+
: undefined;
|
|
214
|
+
}
|
|
215
|
+
function getMappedTypeArgument(checker, symbol, typeArguments, kind) {
|
|
216
|
+
const visited = new Set();
|
|
217
|
+
let currentSymbol = symbol;
|
|
218
|
+
let currentTypeArguments = typeArguments;
|
|
219
|
+
while (currentSymbol !== undefined && !visited.has(currentSymbol)) {
|
|
220
|
+
visited.add(currentSymbol);
|
|
221
|
+
if (isFlagSet(currentSymbol.flags, ts.SymbolFlags.Alias)) {
|
|
222
|
+
currentSymbol = checker.getAliasedSymbol(currentSymbol);
|
|
223
|
+
continue;
|
|
224
|
+
}
|
|
225
|
+
const { declarations } = currentSymbol;
|
|
226
|
+
const declaration = declarations?.[0];
|
|
227
|
+
if (declaration === undefined
|
|
228
|
+
|| declarations?.length !== 1
|
|
229
|
+
|| !ts.isTypeAliasDeclaration(declaration)) {
|
|
230
|
+
return undefined;
|
|
231
|
+
}
|
|
232
|
+
const resolvedTypeArguments = currentTypeArguments;
|
|
233
|
+
const resolveType = (node) => resolveAliasTypeArgument(checker, declaration, node, resolvedTypeArguments);
|
|
234
|
+
const { type } = declaration;
|
|
235
|
+
if (ts.isTypeReferenceNode(type)) {
|
|
236
|
+
currentSymbol = checker.getSymbolAtLocation(type.typeName);
|
|
237
|
+
currentTypeArguments = type.typeArguments?.map(resolveType) ?? [];
|
|
238
|
+
continue;
|
|
239
|
+
}
|
|
240
|
+
if (!ts.isMappedTypeNode(type) || type.nameType !== undefined) {
|
|
241
|
+
return undefined;
|
|
242
|
+
}
|
|
243
|
+
let argument = type.typeParameter.constraint;
|
|
244
|
+
if (kind === "source") {
|
|
245
|
+
argument =
|
|
246
|
+
type.type !== undefined && ts.isIndexedAccessTypeNode(type.type)
|
|
247
|
+
? type.type.objectType
|
|
248
|
+
: undefined;
|
|
249
|
+
}
|
|
250
|
+
return argument === undefined ? undefined : resolveType(argument);
|
|
251
|
+
}
|
|
252
|
+
return undefined;
|
|
253
|
+
}
|
|
254
|
+
function resolveAliasTypeArgument(checker, declaration, node, typeArguments) {
|
|
255
|
+
const type = checker.getTypeFromTypeNode(node);
|
|
256
|
+
const parameterIndex = declaration.typeParameters?.findIndex((parameter) => checker.getSymbolAtLocation(parameter.name) === type.symbol);
|
|
257
|
+
return parameterIndex === undefined || parameterIndex === -1
|
|
258
|
+
? type
|
|
259
|
+
: (typeArguments[parameterIndex] ?? type);
|
|
196
260
|
}
|
|
197
261
|
function getTypeWithDeclaredProperties(checker, type, tsNode, node) {
|
|
198
262
|
const objectTypes = unionTypeParts(type).filter(isObjectTypeWithProperties);
|
|
@@ -228,7 +292,7 @@ function hasAllObjectExpressionProperties(type, node) {
|
|
|
228
292
|
}
|
|
229
293
|
return true;
|
|
230
294
|
}
|
|
231
|
-
function getDeclarationPropertyOrder(type, tsNode, node) {
|
|
295
|
+
function getDeclarationPropertyOrder(checker, type, tsNode, node) {
|
|
232
296
|
const propertyDeclarationPositions = [];
|
|
233
297
|
for (const propertyName of getObjectExpressionPropertyNames(node)) {
|
|
234
298
|
const property = type.getProperty(propertyName);
|
|
@@ -248,10 +312,18 @@ function getDeclarationPropertyOrder(type, tsNode, node) {
|
|
|
248
312
|
const firstContainerEnd = propertyDeclarationPositions.at(0)?.declarationPosition.containerEnd;
|
|
249
313
|
if (firstFileName === undefined
|
|
250
314
|
|| firstContainerStart === undefined
|
|
251
|
-
|| firstContainerEnd === undefined
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
315
|
+
|| firstContainerEnd === undefined) {
|
|
316
|
+
return undefined;
|
|
317
|
+
}
|
|
318
|
+
const hasMultipleContainers = propertyDeclarationPositions.some(({ declarationPosition }) => declarationPosition.fileName !== firstFileName
|
|
319
|
+
|| declarationPosition.containerStart !== firstContainerStart
|
|
320
|
+
|| declarationPosition.containerEnd !== firstContainerEnd);
|
|
321
|
+
const containerOrder = hasMultipleContainers
|
|
322
|
+
? getInheritanceContainerOrder(checker, type)
|
|
323
|
+
: undefined;
|
|
324
|
+
if (hasMultipleContainers
|
|
325
|
+
&& (containerOrder === undefined
|
|
326
|
+
|| propertyDeclarationPositions.some(({ declarationPosition }) => !containerOrder.has(declarationPosition.containerKey)))) {
|
|
255
327
|
return undefined;
|
|
256
328
|
}
|
|
257
329
|
if (firstFileName === tsNode.getSourceFile().fileName
|
|
@@ -260,12 +332,63 @@ function getDeclarationPropertyOrder(type, tsNode, node) {
|
|
|
260
332
|
return new Map();
|
|
261
333
|
}
|
|
262
334
|
const propertyOrder = new Map();
|
|
263
|
-
const sortedPropertyDeclarationPositions = propertyDeclarationPositions.toSorted((a, b) =>
|
|
335
|
+
const sortedPropertyDeclarationPositions = propertyDeclarationPositions.toSorted((a, b) => {
|
|
336
|
+
const containerDifference = (containerOrder?.get(a.declarationPosition.containerKey) ?? 0)
|
|
337
|
+
- (containerOrder?.get(b.declarationPosition.containerKey) ?? 0);
|
|
338
|
+
return containerDifference === 0
|
|
339
|
+
? a.declarationPosition.start - b.declarationPosition.start
|
|
340
|
+
: containerDifference;
|
|
341
|
+
});
|
|
264
342
|
for (const [i, { propertyName },] of sortedPropertyDeclarationPositions.entries()) {
|
|
265
343
|
propertyOrder.set(propertyName, i);
|
|
266
344
|
}
|
|
267
345
|
return propertyOrder;
|
|
268
346
|
}
|
|
347
|
+
function getInheritanceContainerOrder(checker, type) {
|
|
348
|
+
const containerOrder = new Map();
|
|
349
|
+
const visited = new Set();
|
|
350
|
+
let currentType = type;
|
|
351
|
+
while (currentType !== undefined) {
|
|
352
|
+
if (visited.has(currentType)) {
|
|
353
|
+
return undefined;
|
|
354
|
+
}
|
|
355
|
+
visited.add(currentType);
|
|
356
|
+
const declarations = currentType.getSymbol()?.declarations;
|
|
357
|
+
const declaration = declarations?.[0];
|
|
358
|
+
if (declaration === undefined || declarations?.length !== 1) {
|
|
359
|
+
return undefined;
|
|
360
|
+
}
|
|
361
|
+
if (ts.isInterfaceDeclaration(declaration)
|
|
362
|
+
|| ts.isTypeLiteralNode(declaration)) {
|
|
363
|
+
containerOrder.set(getContainerKey(declaration), containerOrder.size);
|
|
364
|
+
const baseTypes = ts.isInterfaceDeclaration(declaration)
|
|
365
|
+
? (declaration.heritageClauses?.flatMap((clause) => clause.types)
|
|
366
|
+
?? [])
|
|
367
|
+
: [];
|
|
368
|
+
if (baseTypes.length > 1) {
|
|
369
|
+
return undefined;
|
|
370
|
+
}
|
|
371
|
+
const baseType = baseTypes[0];
|
|
372
|
+
currentType =
|
|
373
|
+
baseType === undefined
|
|
374
|
+
? undefined
|
|
375
|
+
: checker.getTypeAtLocation(baseType);
|
|
376
|
+
continue;
|
|
377
|
+
}
|
|
378
|
+
const sourceType = getMappedTypeArgument(checker, currentType.aliasSymbol, currentType.aliasTypeArguments ?? [], "source");
|
|
379
|
+
if (sourceType === undefined
|
|
380
|
+
|| !currentType.getProperties().every((property) => {
|
|
381
|
+
const sourceProperty = sourceType.getProperty(property.getName());
|
|
382
|
+
return (property.declarations?.length === 1
|
|
383
|
+
&& sourceProperty?.declarations?.length === 1
|
|
384
|
+
&& property.declarations[0] === sourceProperty.declarations[0]);
|
|
385
|
+
})) {
|
|
386
|
+
return undefined;
|
|
387
|
+
}
|
|
388
|
+
currentType = sourceType;
|
|
389
|
+
}
|
|
390
|
+
return containerOrder;
|
|
391
|
+
}
|
|
269
392
|
function getPropertyDeclarationPosition(property) {
|
|
270
393
|
if (property.declarations?.length !== 1) {
|
|
271
394
|
return undefined;
|
|
@@ -276,11 +399,15 @@ function getPropertyDeclarationPosition(property) {
|
|
|
276
399
|
}
|
|
277
400
|
return {
|
|
278
401
|
containerEnd: declaration.parent.getEnd(),
|
|
402
|
+
containerKey: getContainerKey(declaration.parent),
|
|
279
403
|
containerStart: declaration.parent.getStart(),
|
|
280
404
|
fileName: declaration.getSourceFile().fileName,
|
|
281
405
|
start: declaration.getStart(),
|
|
282
406
|
};
|
|
283
407
|
}
|
|
408
|
+
function getContainerKey(node) {
|
|
409
|
+
return `${node.getSourceFile().fileName}:${node.getStart()}:${node.getEnd()}`;
|
|
410
|
+
}
|
|
284
411
|
function getObjectExpressionPropertyNames(node) {
|
|
285
412
|
return node.properties
|
|
286
413
|
.filter((property) => property.type !== AST_NODE_TYPES.SpreadElement)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sort-objects.js","sourceRoot":"","sources":["../../../../../src/rules/sort-objects.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sort-objects.js","sourceRoot":"","sources":["../../../../../src/rules/sort-objects.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type-declaration-immutability.d.ts","sourceRoot":"","sources":["../../../src/rules/type-declaration-immutability.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"type-declaration-immutability.d.ts","sourceRoot":"","sources":["../../../src/rules/type-declaration-immutability.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAuCvD,eAAO,MAAM,2BAA2B;;CAoGtC,CAAC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { getTypeOfPropertyOfType } from "@typescript-eslint/type-utils";
|
|
2
1
|
import { ESLintUtils } from "@typescript-eslint/utils";
|
|
3
2
|
import { getDefaultOverrides, Immutability } from "is-immutable-type";
|
|
4
3
|
import { isPropertyReadonlyInType } from "ts-api-utils";
|
|
@@ -88,11 +87,7 @@ export const typeDeclarationImmutability = createRule({
|
|
|
88
87
|
return offendingFields;
|
|
89
88
|
}
|
|
90
89
|
function isOffendingProperty(containingType, property) {
|
|
91
|
-
|
|
92
|
-
return true;
|
|
93
|
-
}
|
|
94
|
-
const propertyType = getTypeOfPropertyOfType(checker, containingType, property);
|
|
95
|
-
return propertyType !== undefined && !isImmutable(propertyType);
|
|
90
|
+
return (!isPropertyReadonlyInType(containingType, property.getEscapedName(), checker) || !isImmutable(checker.getTypeOfSymbol(property)));
|
|
96
91
|
}
|
|
97
92
|
function isImmutable(type) {
|
|
98
93
|
return isImmutableTypeWithPatches(program, type, IMMUTABILITY_OVERRIDES, new WeakMap());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type-declaration-immutability.js","sourceRoot":"","sources":["../../../../../src/rules/type-declaration-immutability.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"type-declaration-immutability.js","sourceRoot":"","sources":["../../../../../src/rules/type-declaration-immutability.ts"],"names":[],"mappings":"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"}
|