eslint-plugin-ts-data-forge 0.8.1 → 0.8.3
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/plugin.d.mts +1 -1
- package/dist/plugin.d.mts.map +1 -1
- package/dist/plugin.mjs +1 -0
- package/dist/plugin.mjs.map +1 -1
- package/dist/rule-types.d.mts +3 -3
- package/dist/rule-types.d.mts.map +1 -1
- package/dist/rules/ast-utils.d.mts +59 -3
- package/dist/rules/ast-utils.d.mts.map +1 -1
- package/dist/rules/ast-utils.mjs +142 -31
- package/dist/rules/ast-utils.mjs.map +1 -1
- package/dist/rules/branded-number-types.mjs.map +1 -1
- package/dist/rules/import-utils.d.mts +1 -1
- package/dist/rules/import-utils.d.mts.map +1 -1
- package/dist/rules/import-utils.mjs +26 -13
- package/dist/rules/import-utils.mjs.map +1 -1
- package/dist/rules/no-side-effect-import.d.mts +1 -1
- package/dist/rules/no-side-effect-import.d.mts.map +1 -1
- package/dist/rules/no-unnecessary-type-guard.d.mts.map +1 -1
- package/dist/rules/no-unnecessary-type-guard.mjs +161 -101
- package/dist/rules/no-unnecessary-type-guard.mjs.map +1 -1
- package/dist/rules/prefer-arr-is-array.d.mts.map +1 -1
- package/dist/rules/prefer-arr-is-array.mjs +25 -11
- package/dist/rules/prefer-arr-is-array.mjs.map +1 -1
- package/dist/rules/prefer-arr-is-bounded-length-array.d.mts +1 -1
- package/dist/rules/prefer-arr-is-bounded-length-array.d.mts.map +1 -1
- package/dist/rules/prefer-arr-is-bounded-length-array.mjs +11 -21
- package/dist/rules/prefer-arr-is-bounded-length-array.mjs.map +1 -1
- package/dist/rules/prefer-arr-is-fixed-length-array.d.mts +1 -1
- package/dist/rules/prefer-arr-is-fixed-length-array.d.mts.map +1 -1
- package/dist/rules/prefer-arr-is-fixed-length-array.mjs +16 -28
- package/dist/rules/prefer-arr-is-fixed-length-array.mjs.map +1 -1
- package/dist/rules/prefer-arr-is-max-length-array.d.mts +1 -1
- package/dist/rules/prefer-arr-is-max-length-array.d.mts.map +1 -1
- package/dist/rules/prefer-arr-is-max-length-array.mjs +16 -24
- package/dist/rules/prefer-arr-is-max-length-array.mjs.map +1 -1
- package/dist/rules/prefer-arr-is-min-length-array.d.mts +1 -1
- package/dist/rules/prefer-arr-is-min-length-array.d.mts.map +1 -1
- package/dist/rules/prefer-arr-is-min-length-array.mjs +16 -24
- package/dist/rules/prefer-arr-is-min-length-array.mjs.map +1 -1
- package/dist/rules/prefer-arr-is-non-empty.d.mts.map +1 -1
- package/dist/rules/prefer-arr-is-non-empty.mjs +9 -22
- package/dist/rules/prefer-arr-is-non-empty.mjs.map +1 -1
- package/dist/rules/prefer-arr-scan.d.mts +6 -5
- package/dist/rules/prefer-arr-scan.d.mts.map +1 -1
- package/dist/rules/prefer-arr-scan.mjs +68 -31
- package/dist/rules/prefer-arr-scan.mjs.map +1 -1
- package/dist/rules/prefer-arr-sum.d.mts.map +1 -1
- package/dist/rules/prefer-arr-sum.mjs +57 -40
- package/dist/rules/prefer-arr-sum.mjs.map +1 -1
- package/dist/rules/prefer-arr-uniq.d.mts.map +1 -1
- package/dist/rules/prefer-arr-uniq.mjs +59 -30
- package/dist/rules/prefer-arr-uniq.mjs.map +1 -1
- package/dist/rules/prefer-as-int.d.mts.map +1 -1
- package/dist/rules/prefer-as-int.mjs +27 -24
- package/dist/rules/prefer-as-int.mjs.map +1 -1
- package/dist/rules/prefer-canonical-array-slicing.d.mts.map +1 -1
- package/dist/rules/prefer-canonical-array-slicing.mjs +59 -28
- package/dist/rules/prefer-canonical-array-slicing.mjs.map +1 -1
- package/dist/rules/prefer-canonical-length-cast.d.mts.map +1 -1
- package/dist/rules/prefer-canonical-length-cast.mjs +41 -16
- package/dist/rules/prefer-canonical-length-cast.mjs.map +1 -1
- package/dist/rules/prefer-canonical-length-guard.d.mts.map +1 -1
- package/dist/rules/prefer-canonical-length-guard.mjs +18 -8
- package/dist/rules/prefer-canonical-length-guard.mjs.map +1 -1
- package/dist/rules/prefer-comparison-over-nullish-guard.d.mts.map +1 -1
- package/dist/rules/prefer-comparison-over-nullish-guard.mjs +31 -6
- package/dist/rules/prefer-comparison-over-nullish-guard.mjs.map +1 -1
- package/dist/rules/prefer-is-non-null-object.d.mts.map +1 -1
- package/dist/rules/prefer-is-non-null-object.mjs +56 -40
- package/dist/rules/prefer-is-non-null-object.mjs.map +1 -1
- package/dist/rules/prefer-is-record-and-has-key.d.mts.map +1 -1
- package/dist/rules/prefer-is-record-and-has-key.mjs +18 -8
- package/dist/rules/prefer-is-record-and-has-key.mjs.map +1 -1
- package/dist/rules/prefer-num-safe-parse-float.d.mts +3 -1
- package/dist/rules/prefer-num-safe-parse-float.d.mts.map +1 -1
- package/dist/rules/prefer-num-safe-parse-float.mjs +27 -10
- package/dist/rules/prefer-num-safe-parse-float.mjs.map +1 -1
- package/dist/rules/prefer-num-safe-parse-int.d.mts.map +1 -1
- package/dist/rules/prefer-num-safe-parse-int.mjs +24 -11
- package/dist/rules/prefer-num-safe-parse-int.mjs.map +1 -1
- package/dist/rules/prefer-obj-over-entries-round-trip.d.mts.map +1 -1
- package/dist/rules/prefer-obj-over-entries-round-trip.mjs +22 -11
- package/dist/rules/prefer-obj-over-entries-round-trip.mjs.map +1 -1
- package/dist/rules/prefer-range-for-loop.d.mts.map +1 -1
- package/dist/rules/prefer-range-for-loop.mjs +15 -8
- package/dist/rules/prefer-range-for-loop.mjs.map +1 -1
- package/dist/types.d.mts +2 -2
- package/dist/types.d.mts.map +1 -1
- package/package.json +25 -23
- package/src/plugin.mts +5 -4
- package/src/plugin.test.mts +0 -13
- package/src/rule-types.mts +3 -3
- package/src/rules/ast-utils.mts +192 -37
- package/src/rules/branded-number-types.mts +1 -1
- package/src/rules/import-utils.mts +41 -17
- package/src/rules/no-side-effect-import.mts +1 -1
- package/src/rules/no-unnecessary-type-guard.mts +249 -148
- package/src/rules/no-unnecessary-type-guard.test.mts +100 -0
- package/src/rules/prefer-arr-is-array.mts +32 -13
- package/src/rules/prefer-arr-is-array.test.mts +40 -0
- package/src/rules/prefer-arr-is-bounded-length-array.mts +22 -26
- package/src/rules/prefer-arr-is-bounded-length-array.test.mts +68 -0
- package/src/rules/prefer-arr-is-fixed-length-array.mts +26 -38
- package/src/rules/prefer-arr-is-fixed-length-array.test.mts +63 -0
- package/src/rules/prefer-arr-is-max-length-array.mts +26 -27
- package/src/rules/prefer-arr-is-max-length-array.test.mts +67 -0
- package/src/rules/prefer-arr-is-min-length-array.mts +26 -27
- package/src/rules/prefer-arr-is-min-length-array.test.mts +70 -0
- package/src/rules/prefer-arr-is-non-empty.mts +19 -24
- package/src/rules/prefer-arr-is-non-empty.test.mts +79 -0
- package/src/rules/prefer-arr-scan.mts +107 -37
- package/src/rules/prefer-arr-scan.test.mts +149 -0
- package/src/rules/prefer-arr-sum.mts +87 -50
- package/src/rules/prefer-arr-sum.test.mts +97 -0
- package/src/rules/prefer-arr-uniq.mts +83 -33
- package/src/rules/prefer-arr-uniq.test.mts +71 -0
- package/src/rules/prefer-as-int.mts +38 -38
- package/src/rules/prefer-as-int.test.mts +51 -0
- package/src/rules/prefer-canonical-array-slicing.mts +84 -29
- package/src/rules/prefer-canonical-array-slicing.test.mts +92 -0
- package/src/rules/prefer-canonical-length-cast.mts +56 -18
- package/src/rules/prefer-canonical-length-cast.test.mts +111 -0
- package/src/rules/prefer-canonical-length-guard.mts +25 -11
- package/src/rules/prefer-canonical-length-guard.test.mts +99 -0
- package/src/rules/prefer-comparison-over-nullish-guard.mts +42 -9
- package/src/rules/prefer-comparison-over-nullish-guard.test.mts +136 -0
- package/src/rules/prefer-is-non-null-object.mts +57 -33
- package/src/rules/prefer-is-non-null-object.test.mts +42 -0
- package/src/rules/prefer-is-record-and-has-key.mts +27 -12
- package/src/rules/prefer-is-record-and-has-key.test.mts +34 -0
- package/src/rules/prefer-num-safe-parse-float.mts +37 -13
- package/src/rules/prefer-num-safe-parse-float.test.mts +79 -0
- package/src/rules/prefer-num-safe-parse-int.mts +41 -15
- package/src/rules/prefer-num-safe-parse-int.test.mts +64 -0
- package/src/rules/prefer-obj-over-entries-round-trip.mts +34 -12
- package/src/rules/prefer-range-for-loop.mts +21 -9
- package/src/rules/prefer-range-for-loop.test.mts +75 -0
- package/src/rules/rules.mts +1 -1
- package/src/types.mts +2 -2
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { AST_NODE_TYPES, ESLintUtils, } from '@typescript-eslint/utils';
|
|
2
2
|
import * as ts from 'typescript';
|
|
3
|
+
import { typeWrapperLayers } from './ast-utils.mjs';
|
|
3
4
|
import { buildCalleeResolver, buildImportFixes, getImportedLocalName, getTsDataForgeImport, } from './import-utils.mjs';
|
|
4
5
|
|
|
5
6
|
|
|
@@ -90,8 +91,9 @@ export const noUnnecessaryTypeGuard = {
|
|
|
90
91
|
|
|
91
92
|
|
|
92
93
|
const strictNullChecks = compilerOptions.strictNullChecks ?? compilerOptions.strict ?? false;
|
|
93
|
-
if (!strictNullChecks)
|
|
94
|
+
if (!strictNullChecks) {
|
|
94
95
|
return {};
|
|
96
|
+
}
|
|
95
97
|
const checker = parserServices.program.getTypeChecker();
|
|
96
98
|
const sourceCode = context.sourceCode;
|
|
97
99
|
const program = sourceCode.ast;
|
|
@@ -149,102 +151,44 @@ export const noUnnecessaryTypeGuard = {
|
|
|
149
151
|
};
|
|
150
152
|
return {
|
|
151
153
|
CallExpression: (node) => {
|
|
152
|
-
if (node.arguments.length !== 1)
|
|
154
|
+
if (node.arguments.length !== 1) {
|
|
153
155
|
return;
|
|
156
|
+
}
|
|
154
157
|
const argument = node.arguments[0];
|
|
155
158
|
if (argument === undefined ||
|
|
156
159
|
argument.type === AST_NODE_TYPES.SpreadElement) {
|
|
157
160
|
return;
|
|
158
161
|
}
|
|
159
162
|
const resolved = resolveGuard(node.callee);
|
|
160
|
-
if (resolved === undefined)
|
|
163
|
+
if (resolved === undefined) {
|
|
161
164
|
return;
|
|
165
|
+
}
|
|
162
166
|
const { canonicalName, propertyNode, isNamespace } = resolved;
|
|
163
|
-
if (ignored.has(canonicalName))
|
|
167
|
+
if (ignored.has(canonicalName)) {
|
|
164
168
|
return;
|
|
169
|
+
}
|
|
165
170
|
const spec = GUARD_SPECS[canonicalName];
|
|
166
|
-
if (spec === undefined)
|
|
171
|
+
if (spec === undefined) {
|
|
167
172
|
return;
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
173
|
+
}
|
|
174
|
+
|
|
175
|
+
|
|
176
|
+
|
|
177
|
+
|
|
178
|
+
|
|
179
|
+
const layerTypes = typeWrapperLayers(argument).map((layer) => checker.getTypeAtLocation(parserServices.esTreeNodeToTSNodeMap.get(layer)));
|
|
180
|
+
const verdict = layerTypes
|
|
181
|
+
.map((type) => verdictOf(spec, type, checker))
|
|
182
|
+
.find((candidate) => candidate !== undefined &&
|
|
183
|
+
layerTypes.every((type) => holdsOn(candidate, spec, type, checker)));
|
|
184
|
+
if (verdict === undefined) {
|
|
172
185
|
return;
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
case 'excludeFrom': {
|
|
180
|
-
const removable = spec.atoms.filter((a) => inputAtoms.has(a));
|
|
181
|
-
if (removable.length === 0) {
|
|
182
|
-
|
|
183
|
-
reportConstant(node, canonicalName, true, argument);
|
|
184
|
-
}
|
|
185
|
-
else if (!hasMemberOutsideTarget(spec.atoms)) {
|
|
186
|
-
|
|
187
|
-
reportConstant(node, canonicalName, false, argument);
|
|
188
|
-
}
|
|
189
|
-
else if (removable.length < spec.atoms.length) {
|
|
190
|
-
const replacement = spec.replacements?.[joinAtoms(removable)];
|
|
191
|
-
if (replacement !== undefined) {
|
|
192
|
-
reportReplace(node, canonicalName, replacement, isNamespace, propertyNode);
|
|
193
|
-
}
|
|
194
|
-
}
|
|
195
|
-
break;
|
|
196
|
-
}
|
|
197
|
-
case 'narrowTo': {
|
|
198
|
-
const present = spec.atoms.filter((a) => inputAtoms.has(a));
|
|
199
|
-
if (present.length === 0) {
|
|
200
|
-
|
|
201
|
-
reportConstant(node, canonicalName, false, argument);
|
|
202
|
-
}
|
|
203
|
-
else if (!hasMemberOutsideTarget(spec.atoms)) {
|
|
204
|
-
|
|
205
|
-
reportConstant(node, canonicalName, true, argument);
|
|
206
|
-
}
|
|
207
|
-
else if (present.length < spec.atoms.length) {
|
|
208
|
-
const replacement = spec.replacements?.[joinAtoms(present)];
|
|
209
|
-
if (replacement !== undefined) {
|
|
210
|
-
reportReplace(node, canonicalName, replacement, isNamespace, propertyNode);
|
|
211
|
-
}
|
|
212
|
-
}
|
|
213
|
-
break;
|
|
214
|
-
}
|
|
215
|
-
case 'record': {
|
|
216
|
-
if (parts.every((p) => isGuaranteedRecord(p, checker))) {
|
|
217
|
-
|
|
218
|
-
reportConstant(node, canonicalName, true, argument);
|
|
219
|
-
}
|
|
220
|
-
else if (parts.every((p) => isGuaranteedNotRecord(p, checker))) {
|
|
221
|
-
|
|
222
|
-
reportConstant(node, canonicalName, false, argument);
|
|
223
|
-
}
|
|
224
|
-
break;
|
|
225
|
-
}
|
|
226
|
-
case 'nonEmptyString': {
|
|
227
|
-
const hasNullish = inputAtoms.has('undefined') || inputAtoms.has('null');
|
|
228
|
-
const nonNullishParts = parts.filter((p) => {
|
|
229
|
-
const atom = classifyAtom(p);
|
|
230
|
-
return atom !== 'undefined' && atom !== 'null';
|
|
231
|
-
});
|
|
232
|
-
if (!nonNullishParts.some(couldBeNonEmptyString)) {
|
|
233
|
-
|
|
234
|
-
reportConstant(node, canonicalName, false, argument);
|
|
235
|
-
break;
|
|
236
|
-
}
|
|
237
|
-
if (nonNullishParts.some((p) => !isGuaranteedNonEmptyString(p, checker))) {
|
|
238
|
-
break;
|
|
239
|
-
}
|
|
240
|
-
if (hasNullish) {
|
|
241
|
-
reportReplace(node, canonicalName, 'isNonNullish', isNamespace, propertyNode);
|
|
242
|
-
}
|
|
243
|
-
else {
|
|
244
|
-
reportConstant(node, canonicalName, true, argument);
|
|
245
|
-
}
|
|
246
|
-
break;
|
|
247
|
-
}
|
|
186
|
+
}
|
|
187
|
+
if (verdict.kind === 'constant') {
|
|
188
|
+
reportConstant(node, canonicalName, verdict.value, argument);
|
|
189
|
+
}
|
|
190
|
+
else {
|
|
191
|
+
reportReplace(node, canonicalName, verdict.replacement, isNamespace, propertyNode);
|
|
248
192
|
}
|
|
249
193
|
},
|
|
250
194
|
};
|
|
@@ -255,13 +199,117 @@ export const noUnnecessaryTypeGuard = {
|
|
|
255
199
|
|
|
256
200
|
|
|
257
201
|
|
|
202
|
+
const verdictOf = (spec,
|
|
203
|
+
|
|
204
|
+
type,
|
|
205
|
+
|
|
206
|
+
checker) => {
|
|
207
|
+
const parts = collectUnionParts(type);
|
|
208
|
+
if (parts === undefined) {
|
|
209
|
+
return undefined;
|
|
210
|
+
}
|
|
211
|
+
const inputAtoms = new Set(parts.map(classifyAtom));
|
|
212
|
+
const hasMemberOutsideTarget = (atoms) => {
|
|
213
|
+
const targetSet = new Set(atoms);
|
|
214
|
+
return parts.some((p) => !targetSet.has(classifyAtom(p)));
|
|
215
|
+
};
|
|
216
|
+
switch (spec.kind) {
|
|
217
|
+
case 'excludeFrom': {
|
|
218
|
+
const removable = spec.atoms.filter((a) => inputAtoms.has(a));
|
|
219
|
+
if (removable.length === 0) {
|
|
220
|
+
|
|
221
|
+
return { kind: 'constant', value: true };
|
|
222
|
+
}
|
|
223
|
+
if (!hasMemberOutsideTarget(spec.atoms)) {
|
|
224
|
+
|
|
225
|
+
return { kind: 'constant', value: false };
|
|
226
|
+
}
|
|
227
|
+
return replacementVerdict(removable.length < spec.atoms.length
|
|
228
|
+
? spec.replacements?.[joinAtoms(removable)]
|
|
229
|
+
: undefined);
|
|
230
|
+
}
|
|
231
|
+
case 'narrowTo': {
|
|
232
|
+
const present = spec.atoms.filter((a) => inputAtoms.has(a));
|
|
233
|
+
if (present.length === 0) {
|
|
234
|
+
|
|
235
|
+
return { kind: 'constant', value: false };
|
|
236
|
+
}
|
|
237
|
+
if (!hasMemberOutsideTarget(spec.atoms)) {
|
|
238
|
+
|
|
239
|
+
return { kind: 'constant', value: true };
|
|
240
|
+
}
|
|
241
|
+
return replacementVerdict(present.length < spec.atoms.length
|
|
242
|
+
? spec.replacements?.[joinAtoms(present)]
|
|
243
|
+
: undefined);
|
|
244
|
+
}
|
|
245
|
+
case 'record':
|
|
246
|
+
|
|
247
|
+
|
|
248
|
+
return parts.every((p) => isGuaranteedRecord(p, checker))
|
|
249
|
+
? { kind: 'constant', value: true }
|
|
250
|
+
: parts.every((p) => isGuaranteedNotRecord(p, checker))
|
|
251
|
+
? { kind: 'constant', value: false }
|
|
252
|
+
: undefined;
|
|
253
|
+
case 'nonEmptyString': {
|
|
254
|
+
const nonNullishParts = parts.filter((p) => {
|
|
255
|
+
const atom = classifyAtom(p);
|
|
256
|
+
return atom !== 'undefined' && atom !== 'null';
|
|
257
|
+
});
|
|
258
|
+
if (!nonNullishParts.some(couldBeNonEmptyString)) {
|
|
259
|
+
|
|
260
|
+
return { kind: 'constant', value: false };
|
|
261
|
+
}
|
|
262
|
+
if (nonNullishParts.some((p) => !isGuaranteedNonEmptyString(p, checker))) {
|
|
263
|
+
return undefined;
|
|
264
|
+
}
|
|
265
|
+
return inputAtoms.has('undefined') || inputAtoms.has('null')
|
|
266
|
+
? { kind: 'replace', replacement: 'isNonNullish' }
|
|
267
|
+
: { kind: 'constant', value: true };
|
|
268
|
+
}
|
|
269
|
+
}
|
|
270
|
+
};
|
|
271
|
+
const replacementVerdict = (replacement) => replacement === undefined
|
|
272
|
+
? undefined
|
|
273
|
+
: { kind: 'replace', replacement };
|
|
274
|
+
|
|
275
|
+
|
|
276
|
+
|
|
277
|
+
|
|
278
|
+
|
|
279
|
+
|
|
280
|
+
|
|
281
|
+
const holdsOn = (verdict, spec,
|
|
282
|
+
|
|
283
|
+
type,
|
|
284
|
+
|
|
285
|
+
checker) => {
|
|
286
|
+
const onType = verdictOf(spec, type, checker);
|
|
287
|
+
if (verdict.kind === 'constant') {
|
|
288
|
+
return onType?.kind === 'constant' && onType.value === verdict.value;
|
|
289
|
+
}
|
|
290
|
+
if (onType?.kind === 'replace') {
|
|
291
|
+
return onType.replacement === verdict.replacement;
|
|
292
|
+
}
|
|
293
|
+
const replacementSpec = GUARD_SPECS[verdict.replacement];
|
|
294
|
+
const replacementOnType = replacementSpec === undefined
|
|
295
|
+
? undefined
|
|
296
|
+
: verdictOf(replacementSpec, type, checker);
|
|
297
|
+
return (onType?.kind === 'constant' &&
|
|
298
|
+
replacementOnType?.kind === 'constant' &&
|
|
299
|
+
replacementOnType.value === onType.value);
|
|
300
|
+
};
|
|
301
|
+
|
|
302
|
+
|
|
303
|
+
|
|
304
|
+
|
|
258
305
|
|
|
259
306
|
|
|
260
307
|
const collectUnionParts = (type) => {
|
|
261
308
|
const parts = type.isUnion() ? type.types : [type];
|
|
262
309
|
for (const part of parts) {
|
|
263
|
-
if ((part.flags & DEFERRED_OR_OPAQUE_FLAGS) !== 0)
|
|
310
|
+
if ((part.flags & DEFERRED_OR_OPAQUE_FLAGS) !== 0) {
|
|
264
311
|
return undefined;
|
|
312
|
+
}
|
|
265
313
|
}
|
|
266
314
|
return parts;
|
|
267
315
|
};
|
|
@@ -309,27 +357,35 @@ checker) => checker.getSignaturesOfType(type, ts.SignatureKind.Call).length > 0
|
|
|
309
357
|
|
|
310
358
|
const classifyAtom = (type) => {
|
|
311
359
|
const { flags } = type;
|
|
312
|
-
if ((flags & ts.TypeFlags.Undefined) !== 0)
|
|
360
|
+
if ((flags & ts.TypeFlags.Undefined) !== 0) {
|
|
313
361
|
return 'undefined';
|
|
314
|
-
|
|
362
|
+
}
|
|
363
|
+
if ((flags & ts.TypeFlags.Null) !== 0) {
|
|
315
364
|
return 'null';
|
|
316
|
-
|
|
365
|
+
}
|
|
366
|
+
if ((flags & ts.TypeFlags.BooleanLike) !== 0) {
|
|
317
367
|
return 'boolean';
|
|
318
|
-
|
|
368
|
+
}
|
|
369
|
+
if ((flags & ts.TypeFlags.NumberLike) !== 0) {
|
|
319
370
|
return 'number';
|
|
320
|
-
|
|
371
|
+
}
|
|
372
|
+
if ((flags & ts.TypeFlags.StringLike) !== 0) {
|
|
321
373
|
return 'string';
|
|
322
|
-
|
|
374
|
+
}
|
|
375
|
+
if ((flags & ts.TypeFlags.BigIntLike) !== 0) {
|
|
323
376
|
return 'bigint';
|
|
324
|
-
|
|
377
|
+
}
|
|
378
|
+
if ((flags & ts.TypeFlags.ESSymbolLike) !== 0) {
|
|
325
379
|
return 'symbol';
|
|
380
|
+
}
|
|
326
381
|
|
|
327
382
|
|
|
328
383
|
if (type.isIntersection()) {
|
|
329
384
|
for (const constituent of type.types) {
|
|
330
385
|
const atom = classifyAtom(constituent);
|
|
331
|
-
if (atom !== 'other')
|
|
386
|
+
if (atom !== 'other') {
|
|
332
387
|
return atom;
|
|
388
|
+
}
|
|
333
389
|
}
|
|
334
390
|
}
|
|
335
391
|
return 'other';
|
|
@@ -355,13 +411,16 @@ const isGuaranteedNonEmptyString = (
|
|
|
355
411
|
type,
|
|
356
412
|
|
|
357
413
|
checker) => {
|
|
358
|
-
if (type.isStringLiteral())
|
|
414
|
+
if (type.isStringLiteral()) {
|
|
359
415
|
return type.value !== '';
|
|
360
|
-
|
|
416
|
+
}
|
|
417
|
+
if (type.getProperty(BRAND_MARKER_PROPERTY) === undefined) {
|
|
361
418
|
return false;
|
|
419
|
+
}
|
|
362
420
|
const minLengthSymbol = type.getProperty(MIN_LENGTH_BRAND_KEY);
|
|
363
|
-
if (minLengthSymbol === undefined)
|
|
421
|
+
if (minLengthSymbol === undefined) {
|
|
364
422
|
return false;
|
|
423
|
+
}
|
|
365
424
|
|
|
366
425
|
|
|
367
426
|
|
|
@@ -373,11 +432,7 @@ checker) => {
|
|
|
373
432
|
|
|
374
433
|
|
|
375
434
|
|
|
376
|
-
const couldBeNonEmptyString = (type) =>
|
|
377
|
-
if (type.isStringLiteral())
|
|
378
|
-
return type.value !== '';
|
|
379
|
-
return classifyAtom(type) === 'string';
|
|
380
|
-
};
|
|
435
|
+
const couldBeNonEmptyString = (type) => type.isStringLiteral() ? type.value !== '' : classifyAtom(type) === 'string';
|
|
381
436
|
|
|
382
437
|
|
|
383
438
|
|
|
@@ -394,6 +449,11 @@ const isSideEffectFreeArg = (node) => {
|
|
|
394
449
|
case AST_NODE_TYPES.MemberExpression:
|
|
395
450
|
return (isSideEffectFreeArg(node.object) &&
|
|
396
451
|
(!node.computed || isSideEffectFreeArg(node.property)));
|
|
452
|
+
case AST_NODE_TYPES.TSAsExpression:
|
|
453
|
+
case AST_NODE_TYPES.TSNonNullExpression:
|
|
454
|
+
case AST_NODE_TYPES.TSSatisfiesExpression:
|
|
455
|
+
case AST_NODE_TYPES.TSTypeAssertion:
|
|
456
|
+
return isSideEffectFreeArg(node.expression);
|
|
397
457
|
default:
|
|
398
458
|
return false;
|
|
399
459
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"no-unnecessary-type-guard.mjs","sourceRoot":"","sources":["../../src/rules/no-unnecessary-type-guard.mts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"no-unnecessary-type-guard.mjs","sourceRoot":"","sources":["../../src/rules/no-unnecessary-type-guard.mts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prefer-arr-is-array.d.mts","sourceRoot":"","sources":["../../src/rules/prefer-arr-is-array.mts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,QAAQ,EAEd,MAAM,0BAA0B,CAAC;AAQlC,KAAK,OAAO,GAAG,SAAS,EAAE,CAAC;AAE3B,KAAK,UAAU,GAAG,eAAe,CAAC;AAElC,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"prefer-arr-is-array.d.mts","sourceRoot":"","sources":["../../src/rules/prefer-arr-is-array.mts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,QAAQ,EAEd,MAAM,0BAA0B,CAAC;AAQlC,KAAK,OAAO,GAAG,SAAS,EAAE,CAAC;AAE3B,KAAK,UAAU,GAAG,eAAe,CAAC;AAElC,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE,OAAO,CAmE5D,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { AST_NODE_TYPES, } from '@typescript-eslint/utils';
|
|
2
|
+
import { skipTypeWrappers } from './ast-utils.mjs';
|
|
2
3
|
import { buildImportFixes, getNamedImports, getTsDataForgeImport, } from './import-utils.mjs';
|
|
3
4
|
export const preferArrIsArray = {
|
|
4
5
|
meta: {
|
|
@@ -19,8 +20,9 @@ export const preferArrIsArray = {
|
|
|
19
20
|
const mut_nodesToFix = [];
|
|
20
21
|
return {
|
|
21
22
|
CallExpression: (node) => {
|
|
22
|
-
if (!isArrayIsArrayCall(node))
|
|
23
|
+
if (!isArrayIsArrayCall(node)) {
|
|
23
24
|
return;
|
|
25
|
+
}
|
|
24
26
|
mut_nodesToFix.push(node);
|
|
25
27
|
},
|
|
26
28
|
'Program:exit': () => {
|
|
@@ -36,14 +38,16 @@ export const preferArrIsArray = {
|
|
|
36
38
|
messageId: 'useArrIsArray',
|
|
37
39
|
fix: (fixer) => {
|
|
38
40
|
const callee = node.callee;
|
|
39
|
-
if (callee.type !== AST_NODE_TYPES.MemberExpression)
|
|
41
|
+
if (callee.type !== AST_NODE_TYPES.MemberExpression) {
|
|
40
42
|
return [];
|
|
41
|
-
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
|
|
42
46
|
|
|
43
47
|
const importFixes = index === 0 && !hasArrImport
|
|
44
48
|
? buildImportFixes(fixer, program, tsDataForgeImport, ['Arr'])
|
|
45
49
|
: [];
|
|
46
|
-
return [...importFixes, fixer.replaceText(
|
|
50
|
+
return [...importFixes, fixer.replaceText(callee, 'Arr.isArray')];
|
|
47
51
|
},
|
|
48
52
|
});
|
|
49
53
|
}
|
|
@@ -52,18 +56,28 @@ export const preferArrIsArray = {
|
|
|
52
56
|
},
|
|
53
57
|
defaultOptions: [],
|
|
54
58
|
};
|
|
55
|
-
const isArrayIsArrayCall = (
|
|
56
|
-
|
|
59
|
+
const isArrayIsArrayCall = (
|
|
60
|
+
|
|
61
|
+
|
|
62
|
+
node) => {
|
|
63
|
+
if (node.callee.type !== AST_NODE_TYPES.MemberExpression) {
|
|
57
64
|
return false;
|
|
58
|
-
|
|
59
|
-
|
|
65
|
+
}
|
|
66
|
+
const { property } = node.callee;
|
|
67
|
+
|
|
68
|
+
const object = skipTypeWrappers(node.callee.object);
|
|
69
|
+
if (object.type !== AST_NODE_TYPES.Identifier) {
|
|
60
70
|
return false;
|
|
61
|
-
|
|
71
|
+
}
|
|
72
|
+
if (object.name !== 'Array') {
|
|
62
73
|
return false;
|
|
63
|
-
|
|
74
|
+
}
|
|
75
|
+
if (property.type !== AST_NODE_TYPES.Identifier) {
|
|
64
76
|
return false;
|
|
65
|
-
|
|
77
|
+
}
|
|
78
|
+
if (property.name !== 'isArray') {
|
|
66
79
|
return false;
|
|
80
|
+
}
|
|
67
81
|
return true;
|
|
68
82
|
};
|
|
69
83
|
//# sourceMappingURL=prefer-arr-is-array.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prefer-arr-is-array.mjs","sourceRoot":"","sources":["../../src/rules/prefer-arr-is-array.mts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,GAGf,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"prefer-arr-is-array.mjs","sourceRoot":"","sources":["../../src/rules/prefer-arr-is-array.mts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { TSESLint } from '@typescript-eslint/utils';
|
|
2
2
|
type Options = readonly [];
|
|
3
3
|
type MessageIds = 'useIsBoundedLengthArray';
|
|
4
4
|
export declare const preferArrIsBoundedLengthArray: TSESLint.RuleModule<MessageIds, Options>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prefer-arr-is-bounded-length-array.d.mts","sourceRoot":"","sources":["../../src/rules/prefer-arr-is-bounded-length-array.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"prefer-arr-is-bounded-length-array.d.mts","sourceRoot":"","sources":["../../src/rules/prefer-arr-is-bounded-length-array.mts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAY,MAAM,0BAA0B,CAAC;AAanE,KAAK,OAAO,GAAG,SAAS,EAAE,CAAC;AAE3B,KAAK,UAAU,GAAG,yBAAyB,CAAC;AAE5C,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,UAAU,CAC7D,UAAU,EACV,OAAO,CAuHC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { parseLengthComparison } from './ast-utils.mjs';
|
|
1
|
+
import { isArrayOrTupleExpression, isSameArrayText, parseLengthComparison, toArgumentText, } from './ast-utils.mjs';
|
|
2
2
|
import { buildImportFixes, getNamedImports, getTsDataForgeImport, } from './import-utils.mjs';
|
|
3
3
|
export const preferArrIsBoundedLengthArray = {
|
|
4
4
|
meta: {
|
|
@@ -21,37 +21,27 @@ export const preferArrIsBoundedLengthArray = {
|
|
|
21
21
|
return {
|
|
22
22
|
LogicalExpression: (node) => {
|
|
23
23
|
|
|
24
|
-
if (node.operator !== '&&')
|
|
24
|
+
if (node.operator !== '&&') {
|
|
25
25
|
return;
|
|
26
|
+
}
|
|
26
27
|
const left = parseLengthComparison(node.left, sourceCode);
|
|
27
28
|
const right = parseLengthComparison(node.right, sourceCode);
|
|
28
|
-
if (left === undefined || right === undefined)
|
|
29
|
+
if (left === undefined || right === undefined) {
|
|
29
30
|
return;
|
|
31
|
+
}
|
|
30
32
|
|
|
31
|
-
if (left.kind === right.kind)
|
|
33
|
+
if (left.kind === right.kind) {
|
|
32
34
|
return;
|
|
33
|
-
|
|
35
|
+
}
|
|
36
|
+
if (!isSameArrayText(left.array, right.array, sourceCode)) {
|
|
34
37
|
return;
|
|
35
38
|
}
|
|
36
39
|
const min = left.kind === 'min' ? left : right;
|
|
37
40
|
const max = left.kind === 'min' ? right : left;
|
|
38
41
|
const arrayExpression = min.array;
|
|
39
42
|
|
|
40
|
-
if (services
|
|
41
|
-
|
|
42
|
-
const tsNode = services.esTreeNodeToTSNodeMap?.get(arrayExpression);
|
|
43
|
-
if (tsNode !== undefined) {
|
|
44
|
-
const type = checker.getTypeAtLocation(tsNode);
|
|
45
|
-
|
|
46
|
-
const isArrayType = checker.isArrayType(type) || checker.isTupleType(type);
|
|
47
|
-
if (!isArrayType)
|
|
48
|
-
return;
|
|
49
|
-
}
|
|
50
|
-
else {
|
|
51
|
-
return;
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
else {
|
|
43
|
+
if (!isArrayOrTupleExpression(services, min.array) ||
|
|
44
|
+
!isArrayOrTupleExpression(services, max.array)) {
|
|
55
45
|
return;
|
|
56
46
|
}
|
|
57
47
|
mut_nodesToFix.push({
|
|
@@ -65,7 +55,7 @@ export const preferArrIsBoundedLengthArray = {
|
|
|
65
55
|
const namedImports = getNamedImports(tsDataForgeImport);
|
|
66
56
|
const hasArrImport = namedImports.includes('Arr');
|
|
67
57
|
for (const [index, { node, arrayExpression, minExpression, maxExpression },] of mut_nodesToFix.entries()) {
|
|
68
|
-
const arrayText =
|
|
58
|
+
const arrayText = toArgumentText(arrayExpression, sourceCode);
|
|
69
59
|
const minText = sourceCode.getText(minExpression);
|
|
70
60
|
const maxText = sourceCode.getText(maxExpression);
|
|
71
61
|
const originalText = sourceCode.getText(node);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prefer-arr-is-bounded-length-array.mjs","sourceRoot":"","sources":["../../src/rules/prefer-arr-is-bounded-length-array.mts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"prefer-arr-is-bounded-length-array.mjs","sourceRoot":"","sources":["../../src/rules/prefer-arr-is-bounded-length-array.mts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { TSESLint } from '@typescript-eslint/utils';
|
|
2
2
|
type Options = readonly [];
|
|
3
3
|
type MessageIds = 'useIsFixedLengthArray';
|
|
4
4
|
export declare const preferArrIsFixedLengthArray: TSESLint.RuleModule<MessageIds, Options>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prefer-arr-is-fixed-length-array.d.mts","sourceRoot":"","sources":["../../src/rules/prefer-arr-is-fixed-length-array.mts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"prefer-arr-is-fixed-length-array.d.mts","sourceRoot":"","sources":["../../src/rules/prefer-arr-is-fixed-length-array.mts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAY,MAAM,0BAA0B,CAAC;AAcnE,KAAK,OAAO,GAAG,SAAS,EAAE,CAAC;AAE3B,KAAK,UAAU,GAAG,uBAAuB,CAAC;AAE1C,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,UAAU,CAC3D,UAAU,EACV,OAAO,CAoHC,CAAC"}
|