eslint-plugin-ts-data-forge 0.8.6 → 0.10.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.
- package/README.md +21 -19
- package/dist/plugin.d.mts +4 -0
- package/dist/plugin.d.mts.map +1 -1
- package/dist/plugin.mjs +2 -0
- package/dist/plugin.mjs.map +1 -1
- package/dist/rule-types.d.mts +31 -1
- package/dist/rule-types.d.mts.map +1 -1
- package/dist/rule-types.mjs.map +1 -1
- package/dist/rules/ast-utils.d.mts +21 -2
- package/dist/rules/ast-utils.d.mts.map +1 -1
- package/dist/rules/ast-utils.mjs +51 -4
- package/dist/rules/ast-utils.mjs.map +1 -1
- package/dist/rules/constants.d.mts +2 -0
- package/dist/rules/constants.d.mts.map +1 -1
- package/dist/rules/constants.mjs +9 -0
- package/dist/rules/constants.mjs.map +1 -1
- package/dist/rules/mutable-result.d.mts +10 -0
- package/dist/rules/mutable-result.d.mts.map +1 -0
- package/dist/rules/mutable-result.mjs +145 -0
- package/dist/rules/mutable-result.mjs.map +1 -0
- package/dist/rules/prefer-arr-generate.d.mts +57 -0
- package/dist/rules/prefer-arr-generate.d.mts.map +1 -0
- package/dist/rules/prefer-arr-generate.mjs +588 -0
- package/dist/rules/prefer-arr-generate.mjs.map +1 -0
- package/dist/rules/prefer-arr-uniq.d.mts.map +1 -1
- package/dist/rules/prefer-arr-uniq.mjs +2 -149
- package/dist/rules/prefer-arr-uniq.mjs.map +1 -1
- package/dist/rules/prefer-canonical-array-slicing.d.mts.map +1 -1
- package/dist/rules/prefer-canonical-array-slicing.mjs +47 -28
- package/dist/rules/prefer-canonical-array-slicing.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 +110 -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 +102 -45
- package/dist/rules/prefer-is-record-and-has-key.mjs.map +1 -1
- package/dist/rules/prefer-pipe-map-nullable.d.mts +24 -0
- package/dist/rules/prefer-pipe-map-nullable.d.mts.map +1 -0
- package/dist/rules/prefer-pipe-map-nullable.mjs +266 -0
- package/dist/rules/prefer-pipe-map-nullable.mjs.map +1 -0
- package/dist/rules/prefer-range-for-loop.d.mts.map +1 -1
- package/dist/rules/prefer-range-for-loop.mjs +97 -16
- package/dist/rules/prefer-range-for-loop.mjs.map +1 -1
- package/dist/rules/rules.d.mts +2 -0
- package/dist/rules/rules.d.mts.map +1 -1
- package/dist/rules/rules.mjs +4 -0
- package/dist/rules/rules.mjs.map +1 -1
- package/package.json +11 -11
- package/src/plugin.mts +2 -0
- package/src/rule-types.mts +33 -1
- package/src/rules/ast-utils.mts +72 -5
- package/src/rules/constants.mts +12 -0
- package/src/rules/mutable-result.mts +204 -0
- package/src/rules/prefer-arr-generate.mts +918 -0
- package/src/rules/prefer-arr-generate.test.mts +967 -0
- package/src/rules/prefer-arr-is-bounded-length-array.test.mts +19 -0
- package/src/rules/prefer-arr-is-max-length-array.test.mts +8 -0
- package/src/rules/prefer-arr-is-min-length-array.test.mts +8 -0
- package/src/rules/prefer-arr-uniq.mts +2 -207
- package/src/rules/prefer-canonical-array-slicing.mts +57 -40
- package/src/rules/prefer-canonical-array-slicing.test.mts +55 -0
- package/src/rules/prefer-is-non-null-object.mts +160 -57
- package/src/rules/prefer-is-non-null-object.test.mts +138 -0
- package/src/rules/prefer-is-record-and-has-key.mts +148 -67
- package/src/rules/prefer-is-record-and-has-key.test.mts +118 -23
- package/src/rules/prefer-pipe-map-nullable.mts +391 -0
- package/src/rules/prefer-pipe-map-nullable.test.mts +470 -0
- package/src/rules/prefer-range-for-loop.mts +142 -21
- package/src/rules/prefer-range-for-loop.test.mts +127 -5
- package/src/rules/rules.mts +4 -0
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { AST_NODE_TYPES, } from '@typescript-eslint/utils';
|
|
2
|
-
import { buildNamedImportFix, getImportDeclarations, getNamedImports, skipTypeWrappers, } from 'eslint-rule-forge';
|
|
2
|
+
import { buildNamedImportFix, getImportDeclarations, getNamedImports, getRangeWithParens, parenthesesDepth, skipTypeWrappers, } from 'eslint-rule-forge';
|
|
3
3
|
import { TS_DATA_FORGE_MODULE } from './constants.mjs';
|
|
4
4
|
export const preferIsNonNullObject = {
|
|
5
5
|
meta: {
|
|
6
6
|
type: 'suggestion',
|
|
7
7
|
docs: {
|
|
8
|
-
description: 'Replace `typeof u === "object" && u !== null
|
|
8
|
+
description: 'Replace `typeof u === "object" && u !== null`, in either order and anywhere in an `&&` chain, with `isNonNullObject(u)` from ts-data-forge.',
|
|
9
9
|
},
|
|
10
10
|
fixable: 'code',
|
|
11
11
|
schema: [],
|
|
@@ -17,35 +17,40 @@ export const preferIsNonNullObject = {
|
|
|
17
17
|
const sourceCode = context.sourceCode;
|
|
18
18
|
const program = sourceCode.ast;
|
|
19
19
|
const tsDataForgeImports = getImportDeclarations(program, TS_DATA_FORGE_MODULE);
|
|
20
|
-
const
|
|
20
|
+
const mut_pairsToFix = [];
|
|
21
21
|
return {
|
|
22
22
|
LogicalExpression: (node) => {
|
|
23
|
-
|
|
24
|
-
if (
|
|
23
|
+
|
|
24
|
+
if (node.operator !== '&&' || isChainOperand(sourceCode, node)) {
|
|
25
25
|
return;
|
|
26
26
|
}
|
|
27
|
-
|
|
27
|
+
mut_pairsToFix.push(...findNonNullObjectPairs(sourceCode, node));
|
|
28
28
|
},
|
|
29
29
|
'Program:exit': () => {
|
|
30
|
-
|
|
31
30
|
const hasIsNonNullObjectImport = getNamedImports(tsDataForgeImports).includes('isNonNullObject');
|
|
32
31
|
|
|
33
32
|
|
|
34
33
|
|
|
35
34
|
|
|
36
|
-
|
|
35
|
+
|
|
36
|
+
for (const [index, { range, identifierName },] of mut_pairsToFix.entries()) {
|
|
37
37
|
context.report({
|
|
38
|
-
|
|
38
|
+
loc: {
|
|
39
|
+
start: sourceCode.getLocFromIndex(range[0]),
|
|
40
|
+
end: sourceCode.getLocFromIndex(range[1]),
|
|
41
|
+
},
|
|
39
42
|
messageId: 'useIsNonNullObject',
|
|
40
43
|
fix: (fixer) => {
|
|
41
44
|
const replacement = `isNonNullObject(${identifierName})`;
|
|
42
|
-
|
|
43
45
|
const importFixes = index === 0 && !hasIsNonNullObjectImport
|
|
44
46
|
? buildNamedImportFix(fixer, program, TS_DATA_FORGE_MODULE, [
|
|
45
47
|
'isNonNullObject',
|
|
46
48
|
])
|
|
47
49
|
: [];
|
|
48
|
-
return [
|
|
50
|
+
return [
|
|
51
|
+
...importFixes,
|
|
52
|
+
fixer.replaceTextRange(range, replacement),
|
|
53
|
+
];
|
|
49
54
|
},
|
|
50
55
|
});
|
|
51
56
|
}
|
|
@@ -58,59 +63,124 @@ export const preferIsNonNullObject = {
|
|
|
58
63
|
|
|
59
64
|
|
|
60
65
|
|
|
66
|
+
const isChainOperand = (
|
|
67
|
+
|
|
68
|
+
sourceCode,
|
|
69
|
+
|
|
70
|
+
node) => node.parent.type === AST_NODE_TYPES.LogicalExpression &&
|
|
71
|
+
node.parent.operator === '&&' &&
|
|
72
|
+
parenthesesDepth(sourceCode, node) === 0;
|
|
73
|
+
|
|
74
|
+
|
|
75
|
+
|
|
76
|
+
|
|
61
77
|
|
|
62
|
-
const getNonNullObjectIdentifierName = (
|
|
63
78
|
|
|
79
|
+
const findNonNullObjectPairs = (
|
|
80
|
+
|
|
81
|
+
sourceCode,
|
|
64
82
|
|
|
65
83
|
node) => {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
84
|
+
const operands = chainOperands(sourceCode, node);
|
|
85
|
+
const pairsFrom = (index) => {
|
|
86
|
+
const first = operands[index];
|
|
87
|
+
const second = operands[index + 1];
|
|
88
|
+
if (first === undefined || second === undefined) {
|
|
89
|
+
return [];
|
|
90
|
+
}
|
|
91
|
+
const identifierName = pairIdentifierName(first, second) ?? pairIdentifierName(second, first);
|
|
92
|
+
return identifierName === undefined
|
|
93
|
+
? pairsFrom(index + 1)
|
|
94
|
+
: [
|
|
95
|
+
{
|
|
96
|
+
range: [
|
|
97
|
+
getRangeWithParens(sourceCode, first)[0],
|
|
98
|
+
getRangeWithParens(sourceCode, second)[1],
|
|
99
|
+
],
|
|
100
|
+
identifierName,
|
|
101
|
+
},
|
|
102
|
+
...pairsFrom(index + 2),
|
|
103
|
+
];
|
|
104
|
+
};
|
|
105
|
+
return pairsFrom(0);
|
|
76
106
|
};
|
|
107
|
+
|
|
108
|
+
|
|
109
|
+
|
|
110
|
+
|
|
111
|
+
const chainOperands = (
|
|
112
|
+
|
|
113
|
+
sourceCode,
|
|
114
|
+
|
|
115
|
+
node) => [node.left, node.right].flatMap((operand) => operand.type === AST_NODE_TYPES.LogicalExpression &&
|
|
116
|
+
operand.operator === '&&' &&
|
|
117
|
+
parenthesesDepth(sourceCode, operand) === 0
|
|
118
|
+
? chainOperands(sourceCode, operand)
|
|
119
|
+
: [operand]);
|
|
120
|
+
|
|
121
|
+
|
|
122
|
+
|
|
123
|
+
|
|
124
|
+
|
|
125
|
+
|
|
126
|
+
const pairIdentifierName = (
|
|
127
|
+
|
|
128
|
+
typeofCheck,
|
|
129
|
+
|
|
130
|
+
nullCheck) => {
|
|
131
|
+
const identifierName = getTypeofObjectIdentifierName(skipTypeWrappers(typeofCheck));
|
|
132
|
+
return identifierName !== undefined &&
|
|
133
|
+
identifierName ===
|
|
134
|
+
getNonNullCheckIdentifierName(skipTypeWrappers(nullCheck))
|
|
135
|
+
? identifierName
|
|
136
|
+
: undefined;
|
|
137
|
+
};
|
|
138
|
+
|
|
77
139
|
const getTypeofObjectIdentifierName = (
|
|
78
140
|
|
|
79
141
|
node) => {
|
|
80
|
-
if (node.type !== AST_NODE_TYPES.BinaryExpression
|
|
81
|
-
|
|
82
|
-
}
|
|
83
|
-
if (node.operator !== '===') {
|
|
142
|
+
if (node.type !== AST_NODE_TYPES.BinaryExpression ||
|
|
143
|
+
node.operator !== '===') {
|
|
84
144
|
return undefined;
|
|
85
145
|
}
|
|
86
146
|
const left = skipTypeWrappers(node.left);
|
|
87
147
|
const right = skipTypeWrappers(node.right);
|
|
88
|
-
|
|
89
|
-
left
|
|
90
|
-
|
|
91
|
-
|
|
148
|
+
const typeofSide = isLiteralOf(right, 'object')
|
|
149
|
+
? left
|
|
150
|
+
: isLiteralOf(left, 'object')
|
|
151
|
+
? right
|
|
152
|
+
: undefined;
|
|
153
|
+
if (typeofSide?.type !== AST_NODE_TYPES.UnaryExpression ||
|
|
154
|
+
typeofSide.operator !== 'typeof') {
|
|
92
155
|
return undefined;
|
|
93
156
|
}
|
|
94
|
-
const argument = skipTypeWrappers(
|
|
157
|
+
const argument = skipTypeWrappers(typeofSide.argument);
|
|
95
158
|
return argument.type === AST_NODE_TYPES.Identifier
|
|
96
159
|
? argument.name
|
|
97
160
|
: undefined;
|
|
98
161
|
};
|
|
162
|
+
|
|
163
|
+
|
|
164
|
+
|
|
165
|
+
|
|
166
|
+
|
|
99
167
|
const getNonNullCheckIdentifierName = (
|
|
100
168
|
|
|
101
169
|
node) => {
|
|
102
|
-
if (node.type !== AST_NODE_TYPES.BinaryExpression
|
|
103
|
-
|
|
104
|
-
}
|
|
105
|
-
if (node.operator !== '!==') {
|
|
170
|
+
if (node.type !== AST_NODE_TYPES.BinaryExpression ||
|
|
171
|
+
(node.operator !== '!==' && node.operator !== '!=')) {
|
|
106
172
|
return undefined;
|
|
107
173
|
}
|
|
108
174
|
const left = skipTypeWrappers(node.left);
|
|
109
175
|
const right = skipTypeWrappers(node.right);
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
176
|
+
const checked = isLiteralOf(right, null)
|
|
177
|
+
? left
|
|
178
|
+
: isLiteralOf(left, null)
|
|
179
|
+
? right
|
|
180
|
+
: undefined;
|
|
181
|
+
return checked?.type === AST_NODE_TYPES.Identifier ? checked.name : undefined;
|
|
115
182
|
};
|
|
183
|
+
const isLiteralOf = (
|
|
184
|
+
|
|
185
|
+
node, value) => node.type === AST_NODE_TYPES.Literal && node.value === value;
|
|
116
186
|
//# sourceMappingURL=prefer-is-non-null-object.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prefer-is-non-null-object.mjs","sourceRoot":"","sources":["../../src/rules/prefer-is-non-null-object.mts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,GAGf,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,mBAAmB,EACnB,qBAAqB,EACrB,eAAe,EACf,gBAAgB,GACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAMvD,MAAM,CAAC,MAAM,qBAAqB,GAA6C;IAC7E,IAAI,EAAE;QACJ,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE;YACJ,WAAW,EACT,
|
|
1
|
+
{"version":3,"file":"prefer-is-non-null-object.mjs","sourceRoot":"","sources":["../../src/rules/prefer-is-non-null-object.mts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prefer-is-record-and-has-key.d.mts","sourceRoot":"","sources":["../../src/rules/prefer-is-record-and-has-key.mts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,QAAQ,EAEd,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"prefer-is-record-and-has-key.d.mts","sourceRoot":"","sources":["../../src/rules/prefer-is-record-and-has-key.mts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,QAAQ,EAEd,MAAM,0BAA0B,CAAC;AAalC,KAAK,OAAO,GAAG,SAAS,EAAE,CAAC;AAE3B,KAAK,UAAU,GAAG,sBAAsB,GAAG,WAAW,CAAC;AAEvD,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE,OAAO,CA0NjE,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { AST_NODE_TYPES, } from '@typescript-eslint/utils';
|
|
2
|
-
import { buildNamedImportFix, getImportDeclarations, getNamedImports,
|
|
2
|
+
import { buildNamedImportFix, getArgumentText, getImportDeclarations, getNamedImports, skipTypeWrappers, } from 'eslint-rule-forge';
|
|
3
3
|
import { Arr } from 'ts-data-forge';
|
|
4
4
|
import * as ts from 'typescript';
|
|
5
|
+
import { isIdentifierNamed, typeHoldsAtEveryLayer } from './ast-utils.mjs';
|
|
5
6
|
import { TS_DATA_FORGE_MODULE } from './constants.mjs';
|
|
6
7
|
export const preferIsRecordAndHasKey = {
|
|
7
8
|
meta: {
|
|
@@ -20,8 +21,9 @@ export const preferIsRecordAndHasKey = {
|
|
|
20
21
|
const sourceCode = context.sourceCode;
|
|
21
22
|
const program = sourceCode.ast;
|
|
22
23
|
const tsDataForgeImports = getImportDeclarations(program, TS_DATA_FORGE_MODULE);
|
|
23
|
-
|
|
24
|
-
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
|
|
25
27
|
|
|
26
28
|
|
|
27
29
|
|
|
@@ -30,27 +32,27 @@ export const preferIsRecordAndHasKey = {
|
|
|
30
32
|
|
|
31
33
|
const isKnownRecord = (
|
|
32
34
|
|
|
33
|
-
expression) =>
|
|
34
|
-
if (checker === undefined) {
|
|
35
|
-
return false;
|
|
36
|
-
}
|
|
35
|
+
expression) => typeHoldsAtEveryLayer(sourceCode, expression, (type, checker) => isAlreadyRecordType(checker, type));
|
|
37
36
|
|
|
38
37
|
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
38
|
+
|
|
39
|
+
|
|
40
|
+
|
|
41
|
+
|
|
42
|
+
|
|
43
|
+
const mayBeArray = (
|
|
44
|
+
|
|
45
|
+
expression) => sourceCode.parserServices?.program != null &&
|
|
46
|
+
!typeHoldsAtEveryLayer(sourceCode, expression, (type, checker) => !mayBeArrayType(checker, type));
|
|
45
47
|
const mut_nodesToFix = [];
|
|
46
48
|
return {
|
|
47
49
|
|
|
48
50
|
CallExpression: (node) => {
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
51
|
+
const callee = skipTypeWrappers(node.callee);
|
|
52
|
+
if (callee.type !== AST_NODE_TYPES.MemberExpression ||
|
|
53
|
+
!isIdentifierNamed(callee.object, 'Object') ||
|
|
54
|
+
callee.property.type !== AST_NODE_TYPES.Identifier ||
|
|
55
|
+
callee.property.name !== 'hasOwn') {
|
|
54
56
|
return;
|
|
55
57
|
}
|
|
56
58
|
|
|
@@ -64,7 +66,8 @@ export const preferIsRecordAndHasKey = {
|
|
|
64
66
|
}
|
|
65
67
|
|
|
66
68
|
if (objArg.type === AST_NODE_TYPES.SpreadElement ||
|
|
67
|
-
keyArg.type === AST_NODE_TYPES.SpreadElement
|
|
69
|
+
keyArg.type === AST_NODE_TYPES.SpreadElement ||
|
|
70
|
+
mayBeArray(objArg)) {
|
|
68
71
|
return;
|
|
69
72
|
}
|
|
70
73
|
mut_nodesToFix.push({
|
|
@@ -81,7 +84,8 @@ export const preferIsRecordAndHasKey = {
|
|
|
81
84
|
const keyExpression = node.left;
|
|
82
85
|
const objExpression = node.right;
|
|
83
86
|
|
|
84
|
-
if (keyExpression.type === AST_NODE_TYPES.PrivateIdentifier
|
|
87
|
+
if (keyExpression.type === AST_NODE_TYPES.PrivateIdentifier ||
|
|
88
|
+
mayBeArray(objExpression)) {
|
|
85
89
|
return;
|
|
86
90
|
}
|
|
87
91
|
mut_nodesToFix.push({
|
|
@@ -92,22 +96,31 @@ export const preferIsRecordAndHasKey = {
|
|
|
92
96
|
},
|
|
93
97
|
'Program:exit': () => {
|
|
94
98
|
const namedImports = getNamedImports(tsDataForgeImports);
|
|
95
|
-
const rewrites = mut_nodesToFix.map((entry) =>
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
!
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
99
|
+
const rewrites = mut_nodesToFix.map((entry) => {
|
|
100
|
+
|
|
101
|
+
|
|
102
|
+
const needsIsRecord = !isKnownRecord(entry.objExpression);
|
|
103
|
+
return {
|
|
104
|
+
...entry,
|
|
105
|
+
needsIsRecord,
|
|
106
|
+
|
|
107
|
+
fixable: !needsIsRecord || isSideEffectFree(entry.objExpression),
|
|
108
|
+
};
|
|
109
|
+
});
|
|
110
|
+
const fixableRewrites = rewrites.filter(({ fixable }) => fixable);
|
|
111
|
+
const importsToAdd = Arr.isEmpty(fixableRewrites)
|
|
112
|
+
? []
|
|
113
|
+
: [
|
|
114
|
+
...(fixableRewrites.some(({ needsIsRecord }) => needsIsRecord) && !namedImports.includes('isRecord')
|
|
115
|
+
? ['isRecord']
|
|
116
|
+
: []),
|
|
117
|
+
...(namedImports.includes('hasKey') ? [] : ['hasKey']),
|
|
118
|
+
];
|
|
119
|
+
const importCarrier = fixableRewrites[0];
|
|
120
|
+
for (const rewrite of rewrites) {
|
|
121
|
+
const { node, objExpression, keyExpression, needsIsRecord } = rewrite;
|
|
122
|
+
const objText = getArgumentText(sourceCode, objExpression);
|
|
123
|
+
const keyText = getArgumentText(sourceCode, keyExpression);
|
|
111
124
|
const originalText = sourceCode.getText(node);
|
|
112
125
|
context.report({
|
|
113
126
|
node,
|
|
@@ -117,18 +130,24 @@ export const preferIsRecordAndHasKey = {
|
|
|
117
130
|
objName: objText,
|
|
118
131
|
keyName: keyText,
|
|
119
132
|
},
|
|
120
|
-
fix:
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
133
|
+
fix: !rewrite.fixable
|
|
134
|
+
? undefined
|
|
135
|
+
: (fixer) => {
|
|
136
|
+
const replacement = needsIsRecord
|
|
137
|
+
? `(isRecord(${objText}) && hasKey(${objText}, ${keyText}))`
|
|
138
|
+
: `hasKey(${objText}, ${keyText})`;
|
|
124
139
|
|
|
125
140
|
|
|
126
141
|
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
142
|
+
|
|
143
|
+
const importFixes = rewrite === importCarrier && importsToAdd.length > 0
|
|
144
|
+
? buildNamedImportFix(fixer, program, TS_DATA_FORGE_MODULE, importsToAdd)
|
|
145
|
+
: [];
|
|
146
|
+
return [
|
|
147
|
+
...importFixes,
|
|
148
|
+
fixer.replaceText(node, replacement),
|
|
149
|
+
];
|
|
150
|
+
},
|
|
132
151
|
});
|
|
133
152
|
}
|
|
134
153
|
},
|
|
@@ -140,6 +159,44 @@ export const preferIsRecordAndHasKey = {
|
|
|
140
159
|
|
|
141
160
|
|
|
142
161
|
|
|
162
|
+
const isSideEffectFree = (
|
|
163
|
+
|
|
164
|
+
wrapped) => {
|
|
165
|
+
const node = skipTypeWrappers(wrapped);
|
|
166
|
+
return (node.type === AST_NODE_TYPES.Identifier ||
|
|
167
|
+
node.type === AST_NODE_TYPES.ThisExpression ||
|
|
168
|
+
(node.type === AST_NODE_TYPES.MemberExpression &&
|
|
169
|
+
!node.computed &&
|
|
170
|
+
isSideEffectFree(node.object)));
|
|
171
|
+
};
|
|
172
|
+
|
|
173
|
+
|
|
174
|
+
|
|
175
|
+
|
|
176
|
+
|
|
177
|
+
const mayBeArrayType = (
|
|
178
|
+
|
|
179
|
+
checker,
|
|
180
|
+
|
|
181
|
+
type) => {
|
|
182
|
+
if (type.isUnionOrIntersection()) {
|
|
183
|
+
return type.types.some((member) => mayBeArrayType(checker, member));
|
|
184
|
+
}
|
|
185
|
+
if ((type.flags &
|
|
186
|
+
(ts.TypeFlags.TypeParameter |
|
|
187
|
+
ts.TypeFlags.IndexedAccess |
|
|
188
|
+
ts.TypeFlags.Conditional |
|
|
189
|
+
ts.TypeFlags.Substitution)) !==
|
|
190
|
+
0) {
|
|
191
|
+
const constraint = checker.getBaseConstraintOfType(type);
|
|
192
|
+
return constraint !== undefined && mayBeArrayType(checker, constraint);
|
|
193
|
+
}
|
|
194
|
+
return checker.isArrayType(type) || checker.isTupleType(type);
|
|
195
|
+
};
|
|
196
|
+
|
|
197
|
+
|
|
198
|
+
|
|
199
|
+
|
|
143
200
|
|
|
144
201
|
|
|
145
202
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prefer-is-record-and-has-key.mjs","sourceRoot":"","sources":["../../src/rules/prefer-is-record-and-has-key.mts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,GAGf,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,mBAAmB,EACnB,qBAAqB,EACrB,eAAe,EACf,
|
|
1
|
+
{"version":3,"file":"prefer-is-record-and-has-key.mjs","sourceRoot":"","sources":["../../src/rules/prefer-is-record-and-has-key.mts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { type TSESLint } from '@typescript-eslint/utils';
|
|
2
|
+
type Options = readonly [];
|
|
3
|
+
type MessageIds = 'useMapNullable' | 'suggestMapNullable';
|
|
4
|
+
/**
|
|
5
|
+
* `pipe(x).map(mapNullable(fn))` and `pipe(x).mapNullable(fn)` compute the same
|
|
6
|
+
* value: `mapNullable(fn)` is `(v) => v == null ? undefined : fn(v)`, and
|
|
7
|
+
* `Pipe.mapNullable(fn)` is `pipe(a == null ? undefined : fn(a))`.
|
|
8
|
+
*
|
|
9
|
+
* Only the curried `mapNullable(fn)` imported from ts-data-forge is rewritten,
|
|
10
|
+
* and only on a receiver this rule can see is a pipe: a `pipe(…)` call, or a
|
|
11
|
+
* chain of `map` / `mapNullable` / `mapOptional` calls on one.
|
|
12
|
+
*
|
|
13
|
+
* The static type can differ. `mapNullable` declares `const B` and
|
|
14
|
+
* `Pipe.mapNullable` a plain `B`, so for an inline function `(v) => 'a'` the
|
|
15
|
+
* first infers `'a'` and the second `string`, and `(v) => [v, 1]` becomes
|
|
16
|
+
* `number[]` instead of `readonly [number, 1]`. The fix is therefore applied
|
|
17
|
+
* automatically only when the function's return type is not inferred, or is
|
|
18
|
+
* inferred with nothing such a widening could change; otherwise, and whenever
|
|
19
|
+
* a comment or a type wrapper around `mapNullable` would be dropped, it is
|
|
20
|
+
* offered as a suggestion.
|
|
21
|
+
*/
|
|
22
|
+
export declare const preferPipeMapNullable: TSESLint.RuleModule<MessageIds, Options>;
|
|
23
|
+
export {};
|
|
24
|
+
//# sourceMappingURL=prefer-pipe-map-nullable.d.mts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"prefer-pipe-map-nullable.d.mts","sourceRoot":"","sources":["../../src/rules/prefer-pipe-map-nullable.mts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,QAAQ,EAEd,MAAM,0BAA0B,CAAC;AAalC,KAAK,OAAO,GAAG,SAAS,EAAE,CAAC;AAE3B,KAAK,UAAU,GAAG,gBAAgB,GAAG,oBAAoB,CAAC;AAE1D;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE,OAAO,CAuPjE,CAAC"}
|