@typescript-eslint/eslint-plugin 7.2.1-alpha.0 → 7.2.1-alpha.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.
Files changed (11) hide show
  1. package/dist/rules/consistent-type-imports.js +1 -0
  2. package/dist/rules/consistent-type-imports.js.map +1 -1
  3. package/dist/rules/no-redundant-type-constituents.js +42 -0
  4. package/dist/rules/no-redundant-type-constituents.js.map +1 -1
  5. package/dist/rules/restrict-template-expressions.js +39 -86
  6. package/dist/rules/restrict-template-expressions.js.map +1 -1
  7. package/dist/rules/unbound-method.js +28 -17
  8. package/dist/rules/unbound-method.js.map +1 -1
  9. package/docs/rules/prefer-optional-chain.md +1 -1
  10. package/docs/rules/restrict-template-expressions.md +11 -2
  11. package/package.json +8 -8
package/dist/rules/consistent-type-imports.js CHANGED
@@ -75,6 +75,7 @@ exports.default = (0, util_1.createRule)({
75
75
  }
76
76
  else {
77
77
  if (!sourceImports.valueOnlyNamedImport &&
78
+ node.specifiers.length &&
78
79
  node.specifiers.every(specifier => specifier.type === utils_1.AST_NODE_TYPES.ImportSpecifier)) {
79
80
  sourceImports.valueOnlyNamedImport = node;
80
81
  sourceImports.valueImport = node;
package/dist/rules/consistent-type-imports.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"consistent-type-imports.js","sourceRoot":"","sources":["../../src/rules/consistent-type-imports.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"consistent-type-imports.js","sourceRoot":"","sources":["../../src/rules/consistent-type-imports.ts"],"names":[],"mappings":"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"}
package/dist/rules/no-redundant-type-constituents.js CHANGED
@@ -221,6 +221,7 @@ exports.default = (0, util_1.createRule)({
221
221
  'TSIntersectionType:exit'(node) {
222
222
  const seenLiteralTypes = new Map();
223
223
  const seenPrimitiveTypes = new Map();
224
+ const seenUnionTypes = new Map();
224
225
  function checkIntersectionBottomAndTopTypes({ typeFlags, typeName }, typeNode) {
225
226
  for (const [messageId, checkFlag] of [
226
227
  ['overrides', ts.TypeFlags.Any],
@@ -259,6 +260,47 @@ exports.default = (0, util_1.createRule)({
259
260
  }
260
261
  }
261
262
  }
263
+ // if any typeNode is TSTypeReference and typePartFlags have more than 1 element, than the referenced type is definitely a union.
264
+ if (typePartFlags.length >= 2) {
265
+ seenUnionTypes.set(typeNode, typePartFlags);
266
+ }
267
+ }
268
+ /**
269
+ * @example
270
+ * ```ts
271
+ * type F = "a"|2|"b";
272
+ * type I = F & string;
273
+ * ```
274
+ * This function checks if all the union members of `F` are assignable to the other member of `I`. If every member is assignable, then its reported else not.
275
+ */
276
+ const checkIfUnionsAreAssignable = () => {
277
+ for (const [typeRef, typeValues] of seenUnionTypes) {
278
+ let primitive = undefined;
279
+ for (const { typeFlags } of typeValues) {
280
+ if (seenPrimitiveTypes.has(literalToPrimitiveTypeFlags[typeFlags])) {
281
+ primitive =
282
+ literalToPrimitiveTypeFlags[typeFlags];
283
+ }
284
+ else {
285
+ primitive = undefined;
286
+ break;
287
+ }
288
+ }
289
+ if (Number.isInteger(primitive)) {
290
+ context.report({
291
+ data: {
292
+ literal: typeValues.map(name => name.typeName).join(' | '),
293
+ primitive: primitiveTypeFlagNames[primitive],
294
+ },
295
+ messageId: 'primitiveOverridden',
296
+ node: typeRef,
297
+ });
298
+ }
299
+ }
300
+ };
301
+ if (seenUnionTypes.size > 0) {
302
+ checkIfUnionsAreAssignable();
303
+ return;
262
304
  }
263
305
  // For each primitive type of all the seen primitive types,
264
306
  // if there was a literal type seen that overrides it,
package/dist/rules/no-redundant-type-constituents.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"no-redundant-type-constituents.js","sourceRoot":"","sources":["../../src/rules/no-redundant-type-constituents.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"no-redundant-type-constituents.js","sourceRoot":"","sources":["../../src/rules/no-redundant-type-constituents.ts"],"names":[],"mappings":"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"}
package/dist/rules/restrict-template-expressions.js CHANGED
@@ -1,31 +1,31 @@
1
1
  "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
2
  Object.defineProperty(exports, "__esModule", { value: true });
26
3
  const utils_1 = require("@typescript-eslint/utils");
27
- const ts = __importStar(require("typescript"));
4
+ const typescript_1 = require("typescript");
28
5
  const util_1 = require("../util");
6
+ const testTypeFlag = (flagsToCheck) => type => (0, util_1.isTypeFlagSet)(type, flagsToCheck);
7
+ const optionTesters = ([
8
+ ['Any', util_1.isTypeAnyType],
9
+ [
10
+ 'Array',
11
+ (type, checker, recursivelyCheckType) => checker.isArrayType(type) &&
12
+ // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
13
+ recursivelyCheckType(type.getNumberIndexType()),
14
+ ],
15
+ // eslint-disable-next-line @typescript-eslint/internal/prefer-ast-types-enum
16
+ ['Boolean', testTypeFlag(typescript_1.TypeFlags.BooleanLike)],
17
+ ['Nullish', testTypeFlag(typescript_1.TypeFlags.Null | typescript_1.TypeFlags.Undefined)],
18
+ ['Number', testTypeFlag(typescript_1.TypeFlags.NumberLike | typescript_1.TypeFlags.BigIntLike)],
19
+ [
20
+ 'RegExp',
21
+ (type, checker) => (0, util_1.getTypeName)(checker, type) === 'RegExp',
22
+ ],
23
+ ['Never', util_1.isTypeNeverType],
24
+ ]).map(([type, tester]) => ({
25
+ type,
26
+ option: `allow${type}`,
27
+ tester,
28
+ }));
29
29
  exports.default = (0, util_1.createRule)({
30
30
  name: 'restrict-template-expressions',
31
31
  meta: {
@@ -42,32 +42,13 @@ exports.default = (0, util_1.createRule)({
42
42
  {
43
43
  type: 'object',
44
44
  additionalProperties: false,
45
- properties: {
46
- allowAny: {
47
- description: 'Whether to allow `any` typed values in template expressions.',
48
- type: 'boolean',
49
- },
50
- allowBoolean: {
51
- description: 'Whether to allow `boolean` typed values in template expressions.',
52
- type: 'boolean',
53
- },
54
- allowNullish: {
55
- description: 'Whether to allow `nullish` typed values in template expressions.',
56
- type: 'boolean',
57
- },
58
- allowNumber: {
59
- description: 'Whether to allow `number` typed values in template expressions.',
60
- type: 'boolean',
61
- },
62
- allowRegExp: {
63
- description: 'Whether to allow `regexp` typed values in template expressions.',
45
+ properties: Object.fromEntries(optionTesters.map(({ option, type }) => [
46
+ option,
47
+ {
48
+ description: `Whether to allow \`${type.toLowerCase()}\` typed values in template expressions.`,
64
49
  type: 'boolean',
65
50
  },
66
- allowNever: {
67
- description: 'Whether to allow `never` typed values in template expressions.',
68
- type: 'boolean',
69
- },
70
- },
51
+ ])),
71
52
  },
72
53
  ],
73
54
  },
@@ -83,33 +64,7 @@ exports.default = (0, util_1.createRule)({
83
64
  create(context, [options]) {
84
65
  const services = (0, util_1.getParserServices)(context);
85
66
  const checker = services.program.getTypeChecker();
86
- function isUnderlyingTypePrimitive(type) {
87
- if ((0, util_1.isTypeFlagSet)(type, ts.TypeFlags.StringLike)) {
88
- return true;
89
- }
90
- if (options.allowNumber &&
91
- (0, util_1.isTypeFlagSet)(type, ts.TypeFlags.NumberLike | ts.TypeFlags.BigIntLike)) {
92
- return true;
93
- }
94
- if (options.allowBoolean &&
95
- (0, util_1.isTypeFlagSet)(type, ts.TypeFlags.BooleanLike)) {
96
- return true;
97
- }
98
- if (options.allowAny && (0, util_1.isTypeAnyType)(type)) {
99
- return true;
100
- }
101
- if (options.allowRegExp && (0, util_1.getTypeName)(checker, type) === 'RegExp') {
102
- return true;
103
- }
104
- if (options.allowNullish &&
105
- (0, util_1.isTypeFlagSet)(type, ts.TypeFlags.Null | ts.TypeFlags.Undefined)) {
106
- return true;
107
- }
108
- if (options.allowNever && (0, util_1.isTypeNeverType)(type)) {
109
- return true;
110
- }
111
- return false;
112
- }
67
+ const enabledOptionTesters = optionTesters.filter(({ option }) => options[option]);
113
68
  return {
114
69
  TemplateLiteral(node) {
115
70
  // don't check tagged template literals
@@ -118,7 +73,7 @@ exports.default = (0, util_1.createRule)({
118
73
  }
119
74
  for (const expression of node.expressions) {
120
75
  const expressionType = (0, util_1.getConstrainedTypeAtLocation)(services, expression);
121
- if (!isInnerUnionOrIntersectionConformingTo(expressionType, isUnderlyingTypePrimitive)) {
76
+ if (!recursivelyCheckType(expressionType)) {
122
77
  context.report({
123
78
  node: expression,
124
79
  messageId: 'invalidType',
@@ -128,17 +83,15 @@ exports.default = (0, util_1.createRule)({
128
83
  }
129
84
  },
130
85
  };
131
- function isInnerUnionOrIntersectionConformingTo(type, predicate) {
132
- return rec(type);
133
- function rec(innerType) {
134
- if (innerType.isUnion()) {
135
- return innerType.types.every(rec);
136
- }
137
- if (innerType.isIntersection()) {
138
- return innerType.types.some(rec);
139
- }
140
- return predicate(innerType);
86
+ function recursivelyCheckType(innerType) {
87
+ if (innerType.isUnion()) {
88
+ return innerType.types.every(recursivelyCheckType);
89
+ }
90
+ if (innerType.isIntersection()) {
91
+ return innerType.types.some(recursivelyCheckType);
141
92
  }
93
+ return ((0, util_1.isTypeFlagSet)(innerType, typescript_1.TypeFlags.StringLike) ||
94
+ enabledOptionTesters.some(({ tester }) => tester(innerType, checker, recursivelyCheckType)));
142
95
  }
143
96
  },
144
97
  });
package/dist/rules/restrict-template-expressions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"restrict-template-expressions.js","sourceRoot":"","sources":["../../src/rules/restrict-template-expressions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"restrict-template-expressions.js","sourceRoot":"","sources":["../../src/rules/restrict-template-expressions.ts"],"names":[],"mappings":"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"}
package/dist/rules/unbound-method.js CHANGED
@@ -114,11 +114,11 @@ exports.default = (0, util_1.createRule)({
114
114
  create(context, [{ ignoreStatic }]) {
115
115
  const services = (0, util_1.getParserServices)(context);
116
116
  const currentSourceFile = services.program.getSourceFile(context.filename);
117
- function checkMethodAndReport(node, symbol) {
117
+ function checkIfMethodAndReport(node, symbol) {
118
118
  if (!symbol) {
119
119
  return;
120
120
  }
121
- const { dangerous, firstParamIsThis } = checkMethod(symbol, ignoreStatic);
121
+ const { dangerous, firstParamIsThis } = checkIfMethod(symbol, ignoreStatic);
122
122
  if (dangerous) {
123
123
  context.report({
124
124
  messageId: firstParamIsThis === false
@@ -139,7 +139,7 @@ exports.default = (0, util_1.createRule)({
139
139
  isNotImported(objectSymbol, currentSourceFile)) {
140
140
  return;
141
141
  }
142
- checkMethodAndReport(node, services.getSymbolAtLocation(node));
142
+ checkIfMethodAndReport(node, services.getSymbolAtLocation(node));
143
143
  },
144
144
  'VariableDeclarator, AssignmentExpression'(node) {
145
145
  const [idNode, initNode] = node.type === utils_1.AST_NODE_TYPES.VariableDeclarator
@@ -157,7 +157,7 @@ exports.default = (0, util_1.createRule)({
157
157
  nativelyBoundMembers.has(`${initNode.name}.${property.key.name}`)) {
158
158
  return;
159
159
  }
160
- checkMethodAndReport(property.key, initTypes.getProperty(property.key.name));
160
+ checkIfMethodAndReport(property.key, initTypes.getProperty(property.key.name));
161
161
  }
162
162
  });
163
163
  }
@@ -165,7 +165,7 @@ exports.default = (0, util_1.createRule)({
165
165
  };
166
166
  },
167
167
  });
168
- function checkMethod(symbol, ignoreStatic) {
168
+ function checkIfMethod(symbol, ignoreStatic) {
169
169
  const { valueDeclaration } = symbol;
170
170
  if (!valueDeclaration) {
171
171
  // working around https://github.com/microsoft/TypeScript/issues/31294
@@ -177,24 +177,35 @@ function checkMethod(symbol, ignoreStatic) {
177
177
  dangerous: valueDeclaration.initializer?.kind ===
178
178
  ts.SyntaxKind.FunctionExpression,
179
179
  };
180
+ case ts.SyntaxKind.PropertyAssignment: {
181
+ const assignee = valueDeclaration.initializer;
182
+ if (assignee.kind !== ts.SyntaxKind.FunctionExpression) {
183
+ return {
184
+ dangerous: false,
185
+ };
186
+ }
187
+ return checkMethod(assignee, ignoreStatic);
188
+ }
180
189
  case ts.SyntaxKind.MethodDeclaration:
181
190
  case ts.SyntaxKind.MethodSignature: {
182
- const decl = valueDeclaration;
183
- const firstParam = decl.parameters.at(0);
184
- const firstParamIsThis = firstParam?.name.kind === ts.SyntaxKind.Identifier &&
185
- // eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
186
- firstParam.name.escapedText === 'this';
187
- const thisArgIsVoid = firstParamIsThis && firstParam.type?.kind === ts.SyntaxKind.VoidKeyword;
188
- return {
189
- dangerous: !thisArgIsVoid &&
190
- !(ignoreStatic &&
191
- tsutils.includesModifier((0, util_1.getModifiers)(valueDeclaration), ts.SyntaxKind.StaticKeyword)),
192
- firstParamIsThis,
193
- };
191
+ return checkMethod(valueDeclaration, ignoreStatic);
194
192
  }
195
193
  }
196
194
  return { dangerous: false };
197
195
  }
196
+ function checkMethod(valueDeclaration, ignoreStatic) {
197
+ const firstParam = valueDeclaration.parameters.at(0);
198
+ const firstParamIsThis = firstParam?.name.kind === ts.SyntaxKind.Identifier &&
199
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
200
+ firstParam.name.escapedText === 'this';
201
+ const thisArgIsVoid = firstParamIsThis && firstParam.type?.kind === ts.SyntaxKind.VoidKeyword;
202
+ return {
203
+ dangerous: !thisArgIsVoid &&
204
+ !(ignoreStatic &&
205
+ tsutils.includesModifier((0, util_1.getModifiers)(valueDeclaration), ts.SyntaxKind.StaticKeyword)),
206
+ firstParamIsThis,
207
+ };
208
+ }
198
209
  function isSafeUse(node) {
199
210
  const parent = node.parent;
200
211
  switch (parent?.type) {
package/dist/rules/unbound-method.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"unbound-method.js","sourceRoot":"","sources":["../../src/rules/unbound-method.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"unbound-method.js","sourceRoot":"","sources":["../../src/rules/unbound-method.ts"],"names":[],"mappings":"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"}
package/docs/rules/prefer-optional-chain.md CHANGED
@@ -64,7 +64,7 @@ Specifically the argument of the not operator (`!loose`) or a bare value in a lo
64
64
 
65
65
  ### `allowPotentiallyUnsafeFixesThatModifyTheReturnTypeIKnowWhatImDoing`
66
66
 
67
- When this option is `true`, the rule will not provide an auto-fixer for cases where the return type of the expression would change. For example for the expression `!foo || foo.bar` the return type of the expression is `true | T`, however for the equivalent optional chain `foo?.bar` the return type of the expression is `undefined | T`. Thus changing the code from a logical expression to an optional chain expression has altered the type of the expression.
67
+ When this option is `true`, the rule will provide an auto-fixer for cases where the return type of the expression would change. For example for the expression `!foo || foo.bar` the return type of the expression is `true | T`, however for the equivalent optional chain `foo?.bar` the return type of the expression is `undefined | T`. Thus changing the code from a logical expression to an optional chain expression has altered the type of the expression.
68
68
 
69
69
  In some cases this distinction _may_ matter - which is why these fixers are considered unsafe - they may break the build! For example in the following code:
70
70
 
package/docs/rules/restrict-template-expressions.md CHANGED
@@ -12,10 +12,10 @@ This rule reports on values used in a template literal string that aren't string
12
12
 
13
13
  :::note
14
14
 
15
- This rule intentionally does not allow objects with a custom `toString()` method to be used in template literals, because the stringification result may not be user-friendly.
15
+ The default settings of this rule intentionally do not allow objects with a custom `toString()` method to be used in template literals, because the stringification result may not be user-friendly.
16
16
 
17
17
  For example, arrays have a custom [`toString()`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/toString) method, which only calls `join()` internally, which joins the array elements with commas. This means that (1) array elements are not necessarily stringified to useful results (2) the commas don't have spaces after them, making the result not user-friendly. The best way to format arrays is to use [`Intl.ListFormat`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/ListFormat), which even supports adding the "and" conjunction where necessary.
18
- You must explicitly call `object.toString()` if you want to use this object in a template literal.
18
+ You must explicitly call `object.toString()` if you want to use this object in a template literal, or turn on the `allowArray` option to specifically allow arrays.
19
19
  The [`no-base-to-string`](./no-base-to-string.md) rule can be used to guard this case against producing `"[object Object]"` by accident.
20
20
 
21
21
  :::
@@ -111,6 +111,15 @@ const arg = 'something';
111
111
  const msg1 = typeof arg === 'string' ? arg : `arg = ${arg}`;
112
112
  ```
113
113
 
114
+ ### `allowArray`
115
+
116
+ Examples of additional **correct** code for this rule with `{ allowArray: true }`:
117
+
118
+ ```ts option='{ "allowArray": true }' showPlaygroundButton
119
+ const arg = ['foo', 'bar'];
120
+ const msg1 = `arg = ${arg}`;
121
+ ```
122
+
114
123
  ## When Not To Use It
115
124
 
116
125
  If you're not worried about incorrectly stringifying non-string values in template literals, then you likely don't need this rule.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@typescript-eslint/eslint-plugin",
3
- "version": "7.2.1-alpha.0",
3
+ "version": "7.2.1-alpha.2",
4
4
  "description": "TypeScript plugin for ESLint",
5
5
  "files": [
6
6
  "dist",
@@ -28,7 +28,7 @@
28
28
  }
29
29
  },
30
30
  "engines": {
31
- "node": "^16.0.0 || >=18.0.0"
31
+ "node": "^18.18.0 || >=20.0.0"
32
32
  },
33
33
  "repository": {
34
34
  "type": "git",
@@ -61,10 +61,10 @@
61
61
  },
62
62
  "dependencies": {
63
63
  "@eslint-community/regexpp": "^4.5.1",
64
- "@typescript-eslint/scope-manager": "7.2.1-alpha.0",
65
- "@typescript-eslint/type-utils": "7.2.1-alpha.0",
66
- "@typescript-eslint/utils": "7.2.1-alpha.0",
67
- "@typescript-eslint/visitor-keys": "7.2.1-alpha.0",
64
+ "@typescript-eslint/scope-manager": "7.2.1-alpha.2",
65
+ "@typescript-eslint/type-utils": "7.2.1-alpha.2",
66
+ "@typescript-eslint/utils": "7.2.1-alpha.2",
67
+ "@typescript-eslint/visitor-keys": "7.2.1-alpha.2",
68
68
  "debug": "^4.3.4",
69
69
  "graphemer": "^1.4.0",
70
70
  "ignore": "^5.2.4",
@@ -76,8 +76,8 @@
76
76
  "@types/debug": "*",
77
77
  "@types/marked": "*",
78
78
  "@types/natural-compare": "*",
79
- "@typescript-eslint/rule-schema-to-typescript-types": "7.2.1-alpha.0",
80
- "@typescript-eslint/rule-tester": "7.2.1-alpha.0",
79
+ "@typescript-eslint/rule-schema-to-typescript-types": "7.2.1-alpha.2",
80
+ "@typescript-eslint/rule-tester": "7.2.1-alpha.2",
81
81
  "ajv": "^6.12.6",
82
82
  "chalk": "^5.3.0",
83
83
  "cross-env": "^7.0.3",