eslint-plugin-etc-misc 1.1.4 → 1.1.6
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/_internal/casing.js +1 -1
- package/dist/_internal/casing.js.map +1 -1
- package/dist/_internal/create-external-rule.d.ts +2 -1
- package/dist/_internal/create-external-rule.d.ts.map +1 -1
- package/dist/_internal/create-external-rule.js +56 -7
- package/dist/_internal/create-external-rule.js.map +1 -1
- package/dist/_internal/get-core-rule.d.ts +1 -5
- package/dist/_internal/get-core-rule.d.ts.map +1 -1
- package/dist/_internal/get-core-rule.js.map +1 -1
- package/dist/_internal/identifier-blocks.js +3 -3
- package/dist/_internal/import-patterns.d.ts.map +1 -1
- package/dist/_internal/import-patterns.js +6 -5
- package/dist/_internal/import-patterns.js.map +1 -1
- package/dist/_internal/rule-creator.d.ts +7 -7
- package/dist/_internal/rule-creator.d.ts.map +1 -1
- package/dist/_internal/rule-creator.js +2 -1
- package/dist/_internal/rule-creator.js.map +1 -1
- package/dist/_internal/symbol-usage.d.ts.map +1 -1
- package/dist/_internal/symbol-usage.js +15 -14
- package/dist/_internal/symbol-usage.js.map +1 -1
- package/dist/_internal/syntax-selectors.js +1 -1
- package/dist/_internal/syntax-selectors.js.map +1 -1
- package/dist/configs/all-strict.d.ts +2 -2
- package/dist/configs/all-strict.d.ts.map +1 -1
- package/dist/configs/all-strict.js +9 -6
- package/dist/configs/all-strict.js.map +1 -1
- package/dist/configs/all.d.ts +2 -2
- package/dist/configs/all.d.ts.map +1 -1
- package/dist/configs/all.js +9 -3
- package/dist/configs/all.js.map +1 -1
- package/dist/configs/strict-type-checked.d.ts +2 -2
- package/dist/configs/strict-type-checked.d.ts.map +1 -1
- package/dist/configs/strict-type-checked.js +5 -4
- package/dist/configs/strict-type-checked.js.map +1 -1
- package/dist/configs/strict.d.ts +2 -2
- package/dist/configs/strict.d.ts.map +1 -1
- package/dist/configs/strict.js +6 -1
- package/dist/configs/strict.js.map +1 -1
- package/dist/configs.d.ts +7 -6
- package/dist/configs.d.ts.map +1 -1
- package/dist/configs.js.map +1 -1
- package/dist/plugin.cjs +633 -540
- package/dist/plugin.cjs.map +3 -3
- package/dist/plugin.d.cts +2 -2
- package/dist/plugin.d.ts +2 -2
- package/dist/plugin.d.ts.map +1 -1
- package/dist/rules/class-match-filename.js +3 -3
- package/dist/rules/class-match-filename.js.map +1 -1
- package/dist/rules/comment-spacing.d.ts.map +1 -1
- package/dist/rules/comment-spacing.js +6 -3
- package/dist/rules/comment-spacing.js.map +1 -1
- package/dist/rules/consistent-empty-lines.js +1 -1
- package/dist/rules/consistent-import.d.ts.map +1 -1
- package/dist/rules/consistent-import.js +4 -3
- package/dist/rules/consistent-import.js.map +1 -1
- package/dist/rules/consistent-optional-props.d.ts.map +1 -1
- package/dist/rules/consistent-optional-props.js +3 -2
- package/dist/rules/consistent-optional-props.js.map +1 -1
- package/dist/rules/export-matching-filename-only.d.ts.map +1 -1
- package/dist/rules/export-matching-filename-only.js +13 -14
- package/dist/rules/export-matching-filename-only.js.map +1 -1
- package/dist/rules/match-filename.d.ts.map +1 -1
- package/dist/rules/match-filename.js +4 -3
- package/dist/rules/match-filename.js.map +1 -1
- package/dist/rules/no-assign-mutated-array.d.ts.map +1 -1
- package/dist/rules/no-assign-mutated-array.js +14 -14
- package/dist/rules/no-assign-mutated-array.js.map +1 -1
- package/dist/rules/no-commented-out-code.d.ts.map +1 -1
- package/dist/rules/no-commented-out-code.js +15 -13
- package/dist/rules/no-commented-out-code.js.map +1 -1
- package/dist/rules/no-const-enum.d.ts.map +1 -1
- package/dist/rules/no-const-enum.js +2 -1
- package/dist/rules/no-const-enum.js.map +1 -1
- package/dist/rules/no-expression-empty-lines.js +1 -1
- package/dist/rules/no-foreach.d.ts.map +1 -1
- package/dist/rules/no-foreach.js +2 -2
- package/dist/rules/no-foreach.js.map +1 -1
- package/dist/rules/no-function-declare-after-return.d.ts.map +1 -1
- package/dist/rules/no-function-declare-after-return.js +17 -12
- package/dist/rules/no-function-declare-after-return.js.map +1 -1
- package/dist/rules/no-implicit-any-catch.d.ts.map +1 -1
- package/dist/rules/no-implicit-any-catch.js +8 -7
- package/dist/rules/no-implicit-any-catch.js.map +1 -1
- package/dist/rules/no-misused-generics.d.ts.map +1 -1
- package/dist/rules/no-misused-generics.js +0 -1
- package/dist/rules/no-misused-generics.js.map +1 -1
- package/dist/rules/no-param-reassign.d.ts.map +1 -1
- package/dist/rules/no-param-reassign.js +9 -9
- package/dist/rules/no-param-reassign.js.map +1 -1
- package/dist/rules/no-self-import.js +11 -11
- package/dist/rules/no-self-import.js.map +1 -1
- package/dist/rules/no-shadow.d.ts.map +1 -1
- package/dist/rules/no-shadow.js +2 -1
- package/dist/rules/no-shadow.js.map +1 -1
- package/dist/rules/no-single-line-comment.d.ts.map +1 -1
- package/dist/rules/no-single-line-comment.js +3 -2
- package/dist/rules/no-single-line-comment.js.map +1 -1
- package/dist/rules/no-unnecessary-as-const.d.ts.map +1 -1
- package/dist/rules/no-unnecessary-as-const.js +4 -3
- package/dist/rules/no-unnecessary-as-const.js.map +1 -1
- package/dist/rules/no-unnecessary-break.d.ts.map +1 -1
- package/dist/rules/no-unnecessary-break.js +4 -2
- package/dist/rules/no-unnecessary-break.js.map +1 -1
- package/dist/rules/no-unnecessary-template-literal.d.ts.map +1 -1
- package/dist/rules/no-unnecessary-template-literal.js +3 -2
- package/dist/rules/no-unnecessary-template-literal.js.map +1 -1
- package/dist/rules/no-use-extend-native.d.ts.map +1 -1
- package/dist/rules/no-use-extend-native.js +23 -19
- package/dist/rules/no-use-extend-native.js.map +1 -1
- package/dist/rules/no-vulnerable.d.ts.map +1 -1
- package/dist/rules/no-vulnerable.js +14 -23
- package/dist/rules/no-vulnerable.js.map +1 -1
- package/dist/rules/only-export-name.d.ts.map +1 -1
- package/dist/rules/only-export-name.js +7 -8
- package/dist/rules/only-export-name.js.map +1 -1
- package/dist/rules/prefer-includes.js +2 -2
- package/dist/rules/prefer-includes.js.map +1 -1
- package/dist/rules/prefer-interface.d.ts.map +1 -1
- package/dist/rules/prefer-interface.js +6 -5
- package/dist/rules/prefer-interface.js.map +1 -1
- package/dist/rules/require-jsdoc.d.ts.map +1 -1
- package/dist/rules/require-jsdoc.js +8 -7
- package/dist/rules/require-jsdoc.js.map +1 -1
- package/dist/rules/sort-array.d.ts.map +1 -1
- package/dist/rules/sort-array.js +2 -1
- package/dist/rules/sort-array.js.map +1 -1
- package/dist/rules/sort-class-members.d.ts.map +1 -1
- package/dist/rules/sort-class-members.js +6 -4
- package/dist/rules/sort-class-members.js.map +1 -1
- package/dist/rules/sort-export-specifiers.d.ts.map +1 -1
- package/dist/rules/sort-export-specifiers.js +3 -4
- package/dist/rules/sort-export-specifiers.js.map +1 -1
- package/dist/rules/sort-keys.d.ts.map +1 -1
- package/dist/rules/sort-keys.js +4 -3
- package/dist/rules/sort-keys.js.map +1 -1
- package/dist/rules/switch-case-spacing.d.ts.map +1 -1
- package/dist/rules/switch-case-spacing.js +3 -2
- package/dist/rules/switch-case-spacing.js.map +1 -1
- package/dist/rules/template-literal-format.js +2 -2
- package/dist/rules/throw-error.d.ts.map +1 -1
- package/dist/rules/throw-error.js +7 -10
- package/dist/rules/throw-error.js.map +1 -1
- package/dist/rules/throw-new-error.js +2 -2
- package/dist/rules/throw-new-error.js.map +1 -1
- package/dist/rules/typescript-array-callback-return-type.d.ts.map +1 -1
- package/dist/rules/typescript-array-callback-return-type.js +5 -5
- package/dist/rules/typescript-array-callback-return-type.js.map +1 -1
- package/dist/rules/typescript-class-methods-use-this.d.ts.map +1 -1
- package/dist/rules/typescript-class-methods-use-this.js +4 -2
- package/dist/rules/typescript-class-methods-use-this.js.map +1 -1
- package/dist/rules/typescript-no-boolean-literal-type.d.ts.map +1 -1
- package/dist/rules/typescript-no-boolean-literal-type.js +2 -1
- package/dist/rules/typescript-no-boolean-literal-type.js.map +1 -1
- package/dist/rules/typescript-no-never.d.ts.map +1 -1
- package/dist/rules/typescript-no-never.js +3 -3
- package/dist/rules/typescript-no-never.js.map +1 -1
- package/dist/rules/typescript-no-redundant-undefined-const.d.ts.map +1 -1
- package/dist/rules/typescript-no-redundant-undefined-const.js +18 -23
- package/dist/rules/typescript-no-redundant-undefined-const.js.map +1 -1
- package/dist/rules/typescript-no-redundant-undefined-default-parameter.d.ts.map +1 -1
- package/dist/rules/typescript-no-redundant-undefined-default-parameter.js +35 -36
- package/dist/rules/typescript-no-redundant-undefined-default-parameter.js.map +1 -1
- package/dist/rules/typescript-no-redundant-undefined-let.d.ts.map +1 -1
- package/dist/rules/typescript-no-redundant-undefined-let.js +17 -15
- package/dist/rules/typescript-no-redundant-undefined-let.js.map +1 -1
- package/dist/rules/typescript-no-redundant-undefined-optional.d.ts.map +1 -1
- package/dist/rules/typescript-no-redundant-undefined-optional.js +3 -2
- package/dist/rules/typescript-no-redundant-undefined-optional.js.map +1 -1
- package/dist/rules/typescript-no-redundant-undefined-promise-return-type.d.ts.map +1 -1
- package/dist/rules/typescript-no-redundant-undefined-promise-return-type.js +25 -24
- package/dist/rules/typescript-no-redundant-undefined-promise-return-type.js.map +1 -1
- package/dist/rules/typescript-no-redundant-undefined-readonly-property.d.ts.map +1 -1
- package/dist/rules/typescript-no-redundant-undefined-readonly-property.js +17 -15
- package/dist/rules/typescript-no-redundant-undefined-readonly-property.js.map +1 -1
- package/dist/rules/typescript-no-redundant-undefined-return-type.d.ts.map +1 -1
- package/dist/rules/typescript-no-redundant-undefined-return-type.js +24 -22
- package/dist/rules/typescript-no-redundant-undefined-return-type.js.map +1 -1
- package/dist/rules/typescript-no-redundant-undefined-var.d.ts.map +1 -1
- package/dist/rules/typescript-no-redundant-undefined-var.js +17 -15
- package/dist/rules/typescript-no-redundant-undefined-var.js.map +1 -1
- package/dist/rules/typescript-no-restricted-syntax.d.ts +4 -3
- package/dist/rules/typescript-no-restricted-syntax.d.ts.map +1 -1
- package/dist/rules/typescript-no-restricted-syntax.js +8 -4
- package/dist/rules/typescript-no-restricted-syntax.js.map +1 -1
- package/dist/rules/typescript-no-unsafe-object-assignment.d.ts +4 -3
- package/dist/rules/typescript-no-unsafe-object-assignment.d.ts.map +1 -1
- package/dist/rules/typescript-no-unsafe-object-assignment.js +8 -4
- package/dist/rules/typescript-no-unsafe-object-assignment.js.map +1 -1
- package/dist/rules/typescript-prefer-enum.d.ts.map +1 -1
- package/dist/rules/typescript-prefer-enum.js +15 -16
- package/dist/rules/typescript-prefer-enum.js.map +1 -1
- package/dist/rules/typescript-prefer-named-tuple-members.d.ts.map +1 -1
- package/dist/rules/typescript-prefer-named-tuple-members.js +10 -10
- package/dist/rules/typescript-prefer-named-tuple-members.js.map +1 -1
- package/dist/rules/typescript-prefer-readonly-array-parameter.d.ts.map +1 -1
- package/dist/rules/typescript-prefer-readonly-array-parameter.js +25 -22
- package/dist/rules/typescript-prefer-readonly-array-parameter.js.map +1 -1
- package/dist/rules/typescript-prefer-readonly-array.d.ts.map +1 -1
- package/dist/rules/typescript-prefer-readonly-array.js +5 -4
- package/dist/rules/typescript-prefer-readonly-array.js.map +1 -1
- package/dist/rules/typescript-prefer-readonly-index-signature.d.ts.map +1 -1
- package/dist/rules/typescript-prefer-readonly-index-signature.js +3 -1
- package/dist/rules/typescript-prefer-readonly-index-signature.js.map +1 -1
- package/dist/rules/typescript-prefer-readonly-map.d.ts.map +1 -1
- package/dist/rules/typescript-prefer-readonly-map.js +2 -1
- package/dist/rules/typescript-prefer-readonly-map.js.map +1 -1
- package/dist/rules/typescript-prefer-readonly-property.d.ts.map +1 -1
- package/dist/rules/typescript-prefer-readonly-property.js +6 -5
- package/dist/rules/typescript-prefer-readonly-property.js.map +1 -1
- package/dist/rules/typescript-prefer-readonly-record.d.ts.map +1 -1
- package/dist/rules/typescript-prefer-readonly-record.js +8 -6
- package/dist/rules/typescript-prefer-readonly-record.js.map +1 -1
- package/dist/rules/typescript-prefer-readonly-set.d.ts.map +1 -1
- package/dist/rules/typescript-prefer-readonly-set.js +2 -1
- package/dist/rules/typescript-prefer-readonly-set.js.map +1 -1
- package/dist/rules/typescript-require-prop-type-annotation.d.ts.map +1 -1
- package/dist/rules/typescript-require-prop-type-annotation.js +3 -2
- package/dist/rules/typescript-require-prop-type-annotation.js.map +1 -1
- package/dist/rules/typescript-require-readonly-array-property-type.d.ts.map +1 -1
- package/dist/rules/typescript-require-readonly-array-property-type.js +11 -11
- package/dist/rules/typescript-require-readonly-array-property-type.js.map +1 -1
- package/dist/rules/typescript-require-readonly-array-return-type.d.ts.map +1 -1
- package/dist/rules/typescript-require-readonly-array-return-type.js +19 -16
- package/dist/rules/typescript-require-readonly-array-return-type.js.map +1 -1
- package/dist/rules/typescript-require-readonly-array-type-alias.d.ts.map +1 -1
- package/dist/rules/typescript-require-readonly-array-type-alias.js +9 -6
- package/dist/rules/typescript-require-readonly-array-type-alias.js.map +1 -1
- package/dist/rules/typescript-require-readonly-map-parameter-type.d.ts.map +1 -1
- package/dist/rules/typescript-require-readonly-map-parameter-type.js +23 -20
- package/dist/rules/typescript-require-readonly-map-parameter-type.js.map +1 -1
- package/dist/rules/typescript-require-readonly-map-property-type.d.ts.map +1 -1
- package/dist/rules/typescript-require-readonly-map-property-type.js +9 -9
- package/dist/rules/typescript-require-readonly-map-property-type.js.map +1 -1
- package/dist/rules/typescript-require-readonly-map-return-type.d.ts.map +1 -1
- package/dist/rules/typescript-require-readonly-map-return-type.js +17 -14
- package/dist/rules/typescript-require-readonly-map-return-type.js.map +1 -1
- package/dist/rules/typescript-require-readonly-map-type-alias.d.ts.map +1 -1
- package/dist/rules/typescript-require-readonly-map-type-alias.js +7 -4
- package/dist/rules/typescript-require-readonly-map-type-alias.js.map +1 -1
- package/dist/rules/typescript-require-readonly-record-parameter-type.d.ts.map +1 -1
- package/dist/rules/typescript-require-readonly-record-parameter-type.js +26 -23
- package/dist/rules/typescript-require-readonly-record-parameter-type.js.map +1 -1
- package/dist/rules/typescript-require-readonly-record-property-type.d.ts.map +1 -1
- package/dist/rules/typescript-require-readonly-record-property-type.js +12 -12
- package/dist/rules/typescript-require-readonly-record-property-type.js.map +1 -1
- package/dist/rules/typescript-require-readonly-record-return-type.d.ts.map +1 -1
- package/dist/rules/typescript-require-readonly-record-return-type.js +20 -17
- package/dist/rules/typescript-require-readonly-record-return-type.js.map +1 -1
- package/dist/rules/typescript-require-readonly-record-type-alias.d.ts.map +1 -1
- package/dist/rules/typescript-require-readonly-record-type-alias.js +10 -7
- package/dist/rules/typescript-require-readonly-record-type-alias.js.map +1 -1
- package/dist/rules/typescript-require-readonly-set-parameter-type.d.ts.map +1 -1
- package/dist/rules/typescript-require-readonly-set-parameter-type.js +23 -20
- package/dist/rules/typescript-require-readonly-set-parameter-type.js.map +1 -1
- package/dist/rules/typescript-require-readonly-set-property-type.d.ts.map +1 -1
- package/dist/rules/typescript-require-readonly-set-property-type.js +9 -9
- package/dist/rules/typescript-require-readonly-set-property-type.js.map +1 -1
- package/dist/rules/typescript-require-readonly-set-return-type.d.ts.map +1 -1
- package/dist/rules/typescript-require-readonly-set-return-type.js +17 -14
- package/dist/rules/typescript-require-readonly-set-return-type.js.map +1 -1
- package/dist/rules/typescript-require-readonly-set-type-alias.d.ts.map +1 -1
- package/dist/rules/typescript-require-readonly-set-type-alias.js +7 -4
- package/dist/rules/typescript-require-readonly-set-type-alias.js.map +1 -1
- package/dist/rules/typescript-require-this-void.d.ts.map +1 -1
- package/dist/rules/typescript-require-this-void.js +3 -2
- package/dist/rules/typescript-require-this-void.js.map +1 -1
- package/dist/rules/underscore-internal.d.ts.map +1 -1
- package/dist/rules/underscore-internal.js +10 -12
- package/dist/rules/underscore-internal.js.map +1 -1
- package/dist/rules/unused-internal-properties.js +2 -2
- package/dist/rules/unused-internal-properties.js.map +1 -1
- package/dist/rules/uppercase-iife.js +2 -2
- package/dist/rules/uppercase-iife.js.map +1 -1
- package/dist/rules/words.js +2 -2
- package/dist/rules/words.js.map +1 -1
- package/dist/rules.d.ts +2 -1
- package/dist/rules.d.ts.map +1 -1
- package/dist/rules.js +269 -268
- package/dist/rules.js.map +1 -1
- package/docs/docusaurus/package.json +1 -1
- package/docs/docusaurus/src/components/GitHubStats.jsx +7 -1
- package/docs/docusaurus/src/pages/index.jsx +5 -0
- package/docs/docusaurus/typedoc-plugins/hashToBangLinksCore.mjs +1 -1
- package/docs/docusaurus/typedoc-plugins/prefixDocLinksCore.mjs +4 -5
- package/package.json +37 -39
|
@@ -1,9 +1,10 @@
|
|
|
1
|
+
import { AST_NODE_TYPES } from "@typescript-eslint/utils";
|
|
1
2
|
import { arrayAt, arrayFirst, arrayJoin, isDefined, isEmpty } from "ts-extras";
|
|
2
3
|
import { ruleCreator } from "../_internal/rule-creator.js";
|
|
3
4
|
const buildFixedTypeText = (sourceCode, unionType) => {
|
|
4
5
|
let nonUndefinedTypeTexts = [];
|
|
5
6
|
for (const typeNode of unionType.types) {
|
|
6
|
-
if (typeNode.type ===
|
|
7
|
+
if (typeNode.type === AST_NODE_TYPES.TSUndefinedKeyword) {
|
|
7
8
|
continue;
|
|
8
9
|
}
|
|
9
10
|
nonUndefinedTypeTexts = [
|
|
@@ -18,58 +19,58 @@ const buildFixedTypeText = (sourceCode, unionType) => {
|
|
|
18
19
|
return arrayJoin(nonUndefinedTypeTexts, " | ");
|
|
19
20
|
};
|
|
20
21
|
const unwrapExpression = (expression) => {
|
|
21
|
-
if (expression.type ===
|
|
22
|
-
expression.type ===
|
|
23
|
-
expression.type ===
|
|
24
|
-
expression.type ===
|
|
22
|
+
if (expression.type === AST_NODE_TYPES.TSAsExpression ||
|
|
23
|
+
expression.type === AST_NODE_TYPES.TSSatisfiesExpression ||
|
|
24
|
+
expression.type === AST_NODE_TYPES.TSNonNullExpression ||
|
|
25
|
+
expression.type === AST_NODE_TYPES.TSTypeAssertion) {
|
|
25
26
|
return unwrapExpression(expression.expression);
|
|
26
27
|
}
|
|
27
28
|
return expression;
|
|
28
29
|
};
|
|
29
30
|
const isDefinitelyDefinedExpression = (expression) => {
|
|
30
31
|
const unwrappedExpression = unwrapExpression(expression);
|
|
31
|
-
if (unwrappedExpression.type ===
|
|
32
|
+
if (unwrappedExpression.type === AST_NODE_TYPES.ArrayExpression) {
|
|
32
33
|
return true;
|
|
33
34
|
}
|
|
34
|
-
if (unwrappedExpression.type ===
|
|
35
|
+
if (unwrappedExpression.type === AST_NODE_TYPES.ArrowFunctionExpression) {
|
|
35
36
|
return true;
|
|
36
37
|
}
|
|
37
|
-
if (unwrappedExpression.type ===
|
|
38
|
+
if (unwrappedExpression.type === AST_NODE_TYPES.ClassExpression) {
|
|
38
39
|
return true;
|
|
39
40
|
}
|
|
40
|
-
if (unwrappedExpression.type ===
|
|
41
|
+
if (unwrappedExpression.type === AST_NODE_TYPES.ConditionalExpression) {
|
|
41
42
|
return (isDefinitelyDefinedExpression(unwrappedExpression.consequent) &&
|
|
42
43
|
isDefinitelyDefinedExpression(unwrappedExpression.alternate));
|
|
43
44
|
}
|
|
44
|
-
if (unwrappedExpression.type ===
|
|
45
|
+
if (unwrappedExpression.type === AST_NODE_TYPES.FunctionExpression) {
|
|
45
46
|
return true;
|
|
46
47
|
}
|
|
47
|
-
if (unwrappedExpression.type ===
|
|
48
|
+
if (unwrappedExpression.type === AST_NODE_TYPES.Literal) {
|
|
48
49
|
return true;
|
|
49
50
|
}
|
|
50
|
-
if (unwrappedExpression.type ===
|
|
51
|
+
if (unwrappedExpression.type === AST_NODE_TYPES.LogicalExpression &&
|
|
51
52
|
unwrappedExpression.operator === "??") {
|
|
52
53
|
return isDefinitelyDefinedExpression(unwrappedExpression.right);
|
|
53
54
|
}
|
|
54
|
-
if (unwrappedExpression.type ===
|
|
55
|
+
if (unwrappedExpression.type === AST_NODE_TYPES.NewExpression) {
|
|
55
56
|
return true;
|
|
56
57
|
}
|
|
57
|
-
if (unwrappedExpression.type ===
|
|
58
|
+
if (unwrappedExpression.type === AST_NODE_TYPES.ObjectExpression) {
|
|
58
59
|
return true;
|
|
59
60
|
}
|
|
60
|
-
if (unwrappedExpression.type ===
|
|
61
|
+
if (unwrappedExpression.type === AST_NODE_TYPES.SequenceExpression) {
|
|
61
62
|
const lastExpression = arrayAt(unwrappedExpression.expressions, -1);
|
|
62
63
|
return (lastExpression !== undefined &&
|
|
63
64
|
isDefinitelyDefinedExpression(lastExpression));
|
|
64
65
|
}
|
|
65
|
-
if (unwrappedExpression.type ===
|
|
66
|
+
if (unwrappedExpression.type === AST_NODE_TYPES.TemplateLiteral) {
|
|
66
67
|
return true;
|
|
67
68
|
}
|
|
68
69
|
return false;
|
|
69
70
|
};
|
|
70
71
|
const hasDefinitelyDefinedReturnValue = (node) => {
|
|
71
72
|
const body = node.body;
|
|
72
|
-
if (body.type !==
|
|
73
|
+
if (body.type !== AST_NODE_TYPES.BlockStatement) {
|
|
73
74
|
return isDefinitelyDefinedExpression(body);
|
|
74
75
|
}
|
|
75
76
|
if (body.body.length !== 1) {
|
|
@@ -79,7 +80,7 @@ const hasDefinitelyDefinedReturnValue = (node) => {
|
|
|
79
80
|
if (statement === undefined) {
|
|
80
81
|
return false;
|
|
81
82
|
}
|
|
82
|
-
if (statement.type !==
|
|
83
|
+
if (statement.type !== AST_NODE_TYPES.ReturnStatement) {
|
|
83
84
|
return false;
|
|
84
85
|
}
|
|
85
86
|
if (statement.argument === null) {
|
|
@@ -96,16 +97,17 @@ const rule = ruleCreator({
|
|
|
96
97
|
const sourceCode = context.sourceCode;
|
|
97
98
|
return {
|
|
98
99
|
":matches(ArrowFunctionExpression, FunctionDeclaration, FunctionExpression)": (node) => {
|
|
99
|
-
if (node.type !==
|
|
100
|
-
node.type !==
|
|
101
|
-
node.type !==
|
|
100
|
+
if (node.type !== AST_NODE_TYPES.ArrowFunctionExpression &&
|
|
101
|
+
node.type !== AST_NODE_TYPES.FunctionDeclaration &&
|
|
102
|
+
node.type !== AST_NODE_TYPES.FunctionExpression) {
|
|
102
103
|
return;
|
|
103
104
|
}
|
|
104
105
|
const returnType = node.returnType;
|
|
105
106
|
if (returnType === undefined) {
|
|
106
107
|
return;
|
|
107
108
|
}
|
|
108
|
-
if (returnType.typeAnnotation.type !==
|
|
109
|
+
if (returnType.typeAnnotation.type !==
|
|
110
|
+
AST_NODE_TYPES.TSUnionType) {
|
|
109
111
|
return;
|
|
110
112
|
}
|
|
111
113
|
if (!hasDefinitelyDefinedReturnValue(node)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescript-no-redundant-undefined-return-type.js","sourceRoot":"","sources":["../../src/rules/typescript-no-redundant-undefined-return-type.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE/E,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAW3D,MAAM,kBAAkB,GAAG,CACvB,UAAyC,EACzC,SAAmC,EACjB,EAAE;IACpB,IAAI,qBAAqB,GAAsB,EAAE,CAAC;IAElD,KAAK,MAAM,QAAQ,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;QACrC,IAAI,QAAQ,CAAC,IAAI,KAAK,
|
|
1
|
+
{"version":3,"file":"typescript-no-redundant-undefined-return-type.js","sourceRoot":"","sources":["../../src/rules/typescript-no-redundant-undefined-return-type.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE/E,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAW3D,MAAM,kBAAkB,GAAG,CACvB,UAAyC,EACzC,SAAmC,EACjB,EAAE;IACpB,IAAI,qBAAqB,GAAsB,EAAE,CAAC;IAElD,KAAK,MAAM,QAAQ,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;QACrC,IAAI,QAAQ,CAAC,IAAI,KAAK,cAAc,CAAC,kBAAkB,EAAE,CAAC;YACtD,SAAS;QACb,CAAC;QAED,qBAAqB,GAAG;YACpB,GAAG,qBAAqB;YACxB,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC;SAC/B,CAAC;IACN,CAAC;IAED,IACI,OAAO,CAAC,qBAAqB,CAAC;QAC9B,qBAAqB,CAAC,MAAM,KAAK,SAAS,CAAC,KAAK,CAAC,MAAM,EACzD,CAAC;QACC,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,SAAS,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;AACnD,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CACrB,UAAmC,EACZ,EAAE;IACzB,IACI,UAAU,CAAC,IAAI,KAAK,cAAc,CAAC,cAAc;QACjD,UAAU,CAAC,IAAI,KAAK,cAAc,CAAC,qBAAqB;QACxD,UAAU,CAAC,IAAI,KAAK,cAAc,CAAC,mBAAmB;QACtD,UAAU,CAAC,IAAI,KAAK,cAAc,CAAC,eAAe,EACpD,CAAC;QACC,OAAO,gBAAgB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IACnD,CAAC;IAED,OAAO,UAAU,CAAC;AACtB,CAAC,CAAC;AAEF,MAAM,6BAA6B,GAAG,CAClC,UAAmC,EAC5B,EAAE;IACT,MAAM,mBAAmB,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAEzD,IAAI,mBAAmB,CAAC,IAAI,KAAK,cAAc,CAAC,eAAe,EAAE,CAAC;QAC9D,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,mBAAmB,CAAC,IAAI,KAAK,cAAc,CAAC,uBAAuB,EAAE,CAAC;QACtE,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,mBAAmB,CAAC,IAAI,KAAK,cAAc,CAAC,eAAe,EAAE,CAAC;QAC9D,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,mBAAmB,CAAC,IAAI,KAAK,cAAc,CAAC,qBAAqB,EAAE,CAAC;QACpE,OAAO,CACH,6BAA6B,CAAC,mBAAmB,CAAC,UAAU,CAAC;YAC7D,6BAA6B,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAC/D,CAAC;IACN,CAAC;IAED,IAAI,mBAAmB,CAAC,IAAI,KAAK,cAAc,CAAC,kBAAkB,EAAE,CAAC;QACjE,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,mBAAmB,CAAC,IAAI,KAAK,cAAc,CAAC,OAAO,EAAE,CAAC;QACtD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IACI,mBAAmB,CAAC,IAAI,KAAK,cAAc,CAAC,iBAAiB;QAC7D,mBAAmB,CAAC,QAAQ,KAAK,IAAI,EACvC,CAAC;QACC,OAAO,6BAA6B,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;IACpE,CAAC;IAED,IAAI,mBAAmB,CAAC,IAAI,KAAK,cAAc,CAAC,aAAa,EAAE,CAAC;QAC5D,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,mBAAmB,CAAC,IAAI,KAAK,cAAc,CAAC,gBAAgB,EAAE,CAAC;QAC/D,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,mBAAmB,CAAC,IAAI,KAAK,cAAc,CAAC,kBAAkB,EAAE,CAAC;QACjE,MAAM,cAAc,GAAG,OAAO,CAAC,mBAAmB,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC;QAEpE,OAAO,CACH,cAAc,KAAK,SAAS;YAC5B,6BAA6B,CAAC,cAAc,CAAC,CAChD,CAAC;IACN,CAAC;IAED,IAAI,mBAAmB,CAAC,IAAI,KAAK,cAAc,CAAC,eAAe,EAAE,CAAC;QAC9D,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,+BAA+B,GAAG,CACpC,IAAsC,EAC/B,EAAE;IACT,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IAEvB,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,cAAc,EAAE,CAAC;QAC9C,OAAO,6BAA6B,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAExC,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,IAAI,SAAS,CAAC,IAAI,KAAK,cAAc,CAAC,eAAe,EAAE,CAAC;QACpD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,IAAI,SAAS,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,OAAO,6BAA6B,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;AAC7D,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,IAAI,GAAwD,WAAW,CAG3E;IACE,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE;QAChB,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;QAEtC,OAAO;YACH,4EAA4E,EACxE,CAAC,IAAuB,EAAQ,EAAE;gBAC9B,IACI,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,uBAAuB;oBACpD,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,mBAAmB;oBAChD,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,kBAAkB,EACjD,CAAC;oBACC,OAAO;gBACX,CAAC;gBAED,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;gBAEnC,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;oBAC3B,OAAO;gBACX,CAAC;gBAED,IACI,UAAU,CAAC,cAAc,CAAC,IAAI;oBAC9B,cAAc,CAAC,WAAW,EAC5B,CAAC;oBACC,OAAO;gBACX,CAAC;gBAED,IAAI,CAAC,+BAA+B,CAAC,IAAI,CAAC,EAAE,CAAC;oBACzC,OAAO;gBACX,CAAC;gBAED,MAAM,aAAa,GAAG,kBAAkB,CACpC,UAAU,EACV,UAAU,CAAC,cAAc,CAC5B,CAAC;gBAEF,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAAC;oBAC5B,OAAO;gBACX,CAAC;gBAED,MAAM,GAAG,GAAG,CACR,KAAmC,EACnB,EAAE,CAClB,KAAK,CAAC,WAAW,CACb,UAAU,CAAC,cAAc,EACzB,aAAa,CAChB,CAAC;gBAEN,OAAO,CAAC,MAAM,CAAC;oBACX,GAAG;oBACH,SAAS,EAAE,WAAW;oBACtB,IAAI,EAAE,UAAU,CAAC,cAAc;oBAC/B,OAAO,EAAE;wBACL;4BACI,GAAG;4BACH,SAAS,EAAE,iCAAiC;yBAC/C;qBACJ;iBACJ,CAAC,CAAC;YACP,CAAC;SACR,CAAC;IACN,CAAC;IACD,IAAI,EAAE;QACF,UAAU,EAAE,KAAK;QACjB,IAAI,EAAE;YACF,UAAU,EAAE,KAAK;YACjB,WAAW,EACP,8HAA8H;YAClI,MAAM,EAAE,KAAK;YACb,WAAW,EAAE,KAAK;YAClB,GAAG,EAAE,8GAA8G;SACtH;QACD,OAAO,EAAE,MAAM;QACf,cAAc,EAAE,IAAI;QACpB,QAAQ,EAAE;YACN,SAAS,EACL,iIAAiI;YACrI,+BAA+B,EAC3B,2DAA2D;SAClE;QACD,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,YAAY;KACrB;IACD,IAAI,EAAE,+CAA+C;CACxD,CAAC,CAAC;AAEH,eAAe,IAAI,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescript-no-redundant-undefined-var.d.ts","sourceRoot":"","sources":["../../src/rules/typescript-no-redundant-undefined-var.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"typescript-no-redundant-undefined-var.d.ts","sourceRoot":"","sources":["../../src/rules/typescript-no-redundant-undefined-var.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,KAAK,UAAU,GAAG,WAAW,GAAG,iCAAiC,CAAC;AAElE,KAAK,OAAO,GAAG,SAAS,EAAE,CAAC;AAmG3B;;;GAGG;AACH,QAAA,MAAM,IAAI,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,OAAO,EAAE,UAAU,CAAC,CAgG5D,CAAC;AAEH,eAAe,IAAI,CAAC"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
+
import { AST_NODE_TYPES } from "@typescript-eslint/utils";
|
|
1
2
|
import { arrayJoin, isDefined, isEmpty } from "ts-extras";
|
|
2
3
|
import { ruleCreator } from "../_internal/rule-creator.js";
|
|
3
4
|
const buildFixedTypeText = (sourceCode, unionType) => {
|
|
4
5
|
let nonUndefinedTypeTexts = [];
|
|
5
6
|
for (const typeNode of unionType.types) {
|
|
6
|
-
if (typeNode.type ===
|
|
7
|
+
if (typeNode.type === AST_NODE_TYPES.TSUndefinedKeyword) {
|
|
7
8
|
continue;
|
|
8
9
|
}
|
|
9
10
|
nonUndefinedTypeTexts = [
|
|
@@ -18,38 +19,38 @@ const buildFixedTypeText = (sourceCode, unionType) => {
|
|
|
18
19
|
return arrayJoin(nonUndefinedTypeTexts, " | ");
|
|
19
20
|
};
|
|
20
21
|
const unwrapExpression = (expression) => {
|
|
21
|
-
if (expression.type ===
|
|
22
|
-
expression.type ===
|
|
23
|
-
expression.type ===
|
|
24
|
-
expression.type ===
|
|
22
|
+
if (expression.type === AST_NODE_TYPES.TSAsExpression ||
|
|
23
|
+
expression.type === AST_NODE_TYPES.TSSatisfiesExpression ||
|
|
24
|
+
expression.type === AST_NODE_TYPES.TSNonNullExpression ||
|
|
25
|
+
expression.type === AST_NODE_TYPES.TSTypeAssertion) {
|
|
25
26
|
return unwrapExpression(expression.expression);
|
|
26
27
|
}
|
|
27
28
|
return expression;
|
|
28
29
|
};
|
|
29
30
|
const isDefinitelyDefinedExpression = (expression) => {
|
|
30
31
|
const unwrappedExpression = unwrapExpression(expression);
|
|
31
|
-
if (unwrappedExpression.type ===
|
|
32
|
+
if (unwrappedExpression.type === AST_NODE_TYPES.ArrayExpression) {
|
|
32
33
|
return true;
|
|
33
34
|
}
|
|
34
|
-
if (unwrappedExpression.type ===
|
|
35
|
+
if (unwrappedExpression.type === AST_NODE_TYPES.ArrowFunctionExpression) {
|
|
35
36
|
return true;
|
|
36
37
|
}
|
|
37
|
-
if (unwrappedExpression.type ===
|
|
38
|
+
if (unwrappedExpression.type === AST_NODE_TYPES.ClassExpression) {
|
|
38
39
|
return true;
|
|
39
40
|
}
|
|
40
|
-
if (unwrappedExpression.type ===
|
|
41
|
+
if (unwrappedExpression.type === AST_NODE_TYPES.FunctionExpression) {
|
|
41
42
|
return true;
|
|
42
43
|
}
|
|
43
|
-
if (unwrappedExpression.type ===
|
|
44
|
+
if (unwrappedExpression.type === AST_NODE_TYPES.Literal) {
|
|
44
45
|
return true;
|
|
45
46
|
}
|
|
46
|
-
if (unwrappedExpression.type ===
|
|
47
|
+
if (unwrappedExpression.type === AST_NODE_TYPES.NewExpression) {
|
|
47
48
|
return true;
|
|
48
49
|
}
|
|
49
|
-
if (unwrappedExpression.type ===
|
|
50
|
+
if (unwrappedExpression.type === AST_NODE_TYPES.ObjectExpression) {
|
|
50
51
|
return true;
|
|
51
52
|
}
|
|
52
|
-
if (unwrappedExpression.type ===
|
|
53
|
+
if (unwrappedExpression.type === AST_NODE_TYPES.TemplateLiteral) {
|
|
53
54
|
return true;
|
|
54
55
|
}
|
|
55
56
|
return false;
|
|
@@ -81,14 +82,15 @@ const rule = ruleCreator({
|
|
|
81
82
|
return;
|
|
82
83
|
}
|
|
83
84
|
const id = node.id;
|
|
84
|
-
if (id.type !==
|
|
85
|
+
if (id.type !== AST_NODE_TYPES.Identifier) {
|
|
85
86
|
return;
|
|
86
87
|
}
|
|
87
88
|
const typeAnnotation = id.typeAnnotation;
|
|
88
89
|
if (typeAnnotation === undefined) {
|
|
89
90
|
return;
|
|
90
91
|
}
|
|
91
|
-
if (typeAnnotation.typeAnnotation.type !==
|
|
92
|
+
if (typeAnnotation.typeAnnotation.type !==
|
|
93
|
+
AST_NODE_TYPES.TSUnionType) {
|
|
92
94
|
return;
|
|
93
95
|
}
|
|
94
96
|
const fixedTypeText = buildFixedTypeText(sourceCode, typeAnnotation.typeAnnotation);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescript-no-redundant-undefined-var.js","sourceRoot":"","sources":["../../src/rules/typescript-no-redundant-undefined-var.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE1D,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAM3D,MAAM,kBAAkB,GAAG,CACvB,UAAyC,EACzC,SAAmC,EACjB,EAAE;IACpB,IAAI,qBAAqB,GAAsB,EAAE,CAAC;IAElD,KAAK,MAAM,QAAQ,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;QACrC,IAAI,QAAQ,CAAC,IAAI,KAAK,
|
|
1
|
+
{"version":3,"file":"typescript-no-redundant-undefined-var.js","sourceRoot":"","sources":["../../src/rules/typescript-no-redundant-undefined-var.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import
|
|
1
|
+
import deprecatedRule from "./no-restricted-syntax.js";
|
|
2
|
+
declare const noRestrictedSyntaxRule: typeof deprecatedRule;
|
|
2
3
|
/**
|
|
3
4
|
* TypeScript-prefixed alias for selector-based restricted syntax checks.
|
|
4
5
|
*/
|
|
@@ -6,6 +7,6 @@ declare const typescriptNoRestrictedSyntaxRule: typeof noRestrictedSyntaxRule;
|
|
|
6
7
|
/**
|
|
7
8
|
* Wrapper rule with explicit lifecycle metadata and replacement mapping.
|
|
8
9
|
*/
|
|
9
|
-
declare const
|
|
10
|
-
export default
|
|
10
|
+
declare const rule: typeof typescriptNoRestrictedSyntaxRule;
|
|
11
|
+
export default rule;
|
|
11
12
|
//# sourceMappingURL=typescript-no-restricted-syntax.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescript-no-restricted-syntax.d.ts","sourceRoot":"","sources":["../../src/rules/typescript-no-restricted-syntax.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"typescript-no-restricted-syntax.d.ts","sourceRoot":"","sources":["../../src/rules/typescript-no-restricted-syntax.ts"],"names":[],"mappings":"AAMA,OAAO,cAAc,MAAM,2BAA2B,CAAC;AAEvD,QAAA,MAAM,sBAAsB,EAAE,OAAO,cAA+B,CAAC;AAIrE;;GAEG;AACH,QAAA,MAAM,gCAAgC,EAAE,OAAO,sBAa9C,CAAC;AAEF;;GAEG;AACH,QAAA,MAAM,IAAI,EAAE,OAAO,gCAiBb,CAAC;AAEP,eAAe,IAAI,CAAC"}
|
|
@@ -1,5 +1,9 @@
|
|
|
1
|
+
import { assertDefined } from "ts-extras";
|
|
1
2
|
import { createReplacementRuleInfo, withDeprecatedRuleLifecycle, } from "../_internal/rule-deprecation.js";
|
|
2
|
-
import
|
|
3
|
+
import deprecatedRule from "./no-restricted-syntax.js";
|
|
4
|
+
const noRestrictedSyntaxRule = deprecatedRule;
|
|
5
|
+
const baseDocs = noRestrictedSyntaxRule.meta.docs;
|
|
6
|
+
assertDefined(baseDocs);
|
|
3
7
|
/**
|
|
4
8
|
* TypeScript-prefixed alias for selector-based restricted syntax checks.
|
|
5
9
|
*/
|
|
@@ -9,10 +13,10 @@ const typescriptNoRestrictedSyntaxRule = {
|
|
|
9
13
|
deprecated: true,
|
|
10
14
|
...noRestrictedSyntaxRule.meta,
|
|
11
15
|
docs: {
|
|
16
|
+
...baseDocs,
|
|
12
17
|
deprecated: true,
|
|
13
18
|
frozen: true,
|
|
14
19
|
recommended: false,
|
|
15
|
-
...noRestrictedSyntaxRule.meta.docs,
|
|
16
20
|
url: "https://nick2bad4u.github.io/eslint-plugin-etc-misc/docs/rules/typescript-no-restricted-syntax",
|
|
17
21
|
},
|
|
18
22
|
},
|
|
@@ -20,7 +24,7 @@ const typescriptNoRestrictedSyntaxRule = {
|
|
|
20
24
|
/**
|
|
21
25
|
* Wrapper rule with explicit lifecycle metadata and replacement mapping.
|
|
22
26
|
*/
|
|
23
|
-
const
|
|
27
|
+
const rule = withDeprecatedRuleLifecycle(typescriptNoRestrictedSyntaxRule, {
|
|
24
28
|
message: "Deprecated in favor of @typescript-eslint/no-restricted-syntax.",
|
|
25
29
|
replacedBy: [
|
|
26
30
|
createReplacementRuleInfo({
|
|
@@ -36,5 +40,5 @@ const deprecatedRule = withDeprecatedRuleLifecycle(typescriptNoRestrictedSyntaxR
|
|
|
36
40
|
],
|
|
37
41
|
ruleId: "typescript/no-restricted-syntax",
|
|
38
42
|
});
|
|
39
|
-
export default
|
|
43
|
+
export default rule;
|
|
40
44
|
//# sourceMappingURL=typescript-no-restricted-syntax.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescript-no-restricted-syntax.js","sourceRoot":"","sources":["../../src/rules/typescript-no-restricted-syntax.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,yBAAyB,EACzB,2BAA2B,GAC9B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,
|
|
1
|
+
{"version":3,"file":"typescript-no-restricted-syntax.js","sourceRoot":"","sources":["../../src/rules/typescript-no-restricted-syntax.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1C,OAAO,EACH,yBAAyB,EACzB,2BAA2B,GAC9B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,cAAc,MAAM,2BAA2B,CAAC;AAEvD,MAAM,sBAAsB,GAA0B,cAAc,CAAC;AACrE,MAAM,QAAQ,GAAG,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC;AAClD,aAAa,CAAC,QAAQ,CAAC,CAAC;AAExB;;GAEG;AACH,MAAM,gCAAgC,GAAkC;IACpE,GAAG,sBAAsB;IACzB,IAAI,EAAE;QACF,UAAU,EAAE,IAAI;QAChB,GAAG,sBAAsB,CAAC,IAAI;QAC9B,IAAI,EAAE;YACF,GAAG,QAAQ;YACX,UAAU,EAAE,IAAI;YAChB,MAAM,EAAE,IAAI;YACZ,WAAW,EAAE,KAAK;YAClB,GAAG,EAAE,gGAAgG;SACxG;KACJ;CACJ,CAAC;AAEF;;GAEG;AACH,MAAM,IAAI,GACN,2BAA2B,CAAC,gCAAgC,EAAE;IAC1D,OAAO,EACH,iEAAiE;IACrE,UAAU,EAAE;QACR,yBAAyB,CAAC;YACtB,MAAM,EAAE;gBACJ,IAAI,EAAE,oBAAoB;gBAC1B,GAAG,EAAE,+BAA+B;aACvC;YACD,IAAI,EAAE;gBACF,IAAI,EAAE,sBAAsB;gBAC5B,GAAG,EAAE,yDAAyD;aACjE;SACJ,CAAC;KACL;IACD,MAAM,EAAE,iCAAiC;CAC5C,CAAC,CAAC;AAEP,eAAe,IAAI,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import
|
|
1
|
+
import rule from "./typescript-no-unsafe-object-assign.js";
|
|
2
|
+
declare const coreNoUnsafeObjectAssignRule: typeof rule;
|
|
2
3
|
/**
|
|
3
4
|
* TypeScript-prefixed alias for Object.assign readonly-target safety checks.
|
|
4
5
|
*/
|
|
5
|
-
declare const
|
|
6
|
-
export default
|
|
6
|
+
declare const typescriptNoUnsafeObjectAssignmentRule: typeof coreNoUnsafeObjectAssignRule;
|
|
7
|
+
export default typescriptNoUnsafeObjectAssignmentRule;
|
|
7
8
|
//# sourceMappingURL=typescript-no-unsafe-object-assignment.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescript-no-unsafe-object-assignment.d.ts","sourceRoot":"","sources":["../../src/rules/typescript-no-unsafe-object-assignment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"typescript-no-unsafe-object-assignment.d.ts","sourceRoot":"","sources":["../../src/rules/typescript-no-unsafe-object-assignment.ts"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,yCAAyC,CAAC;AAE3D,QAAA,MAAM,4BAA4B,EAAE,OAAO,IAAW,CAAC;AAIvD;;GAEG;AACH,QAAA,MAAM,sCAAsC,EAAE,OAAO,4BAchD,CAAC;AAEN,eAAe,sCAAsC,CAAC"}
|
|
@@ -1,20 +1,24 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { assertDefined } from "ts-extras";
|
|
2
|
+
import rule from "./typescript-no-unsafe-object-assign.js";
|
|
3
|
+
const coreNoUnsafeObjectAssignRule = rule;
|
|
4
|
+
const baseDocs = coreNoUnsafeObjectAssignRule.meta.docs;
|
|
5
|
+
assertDefined(baseDocs);
|
|
2
6
|
/**
|
|
3
7
|
* TypeScript-prefixed alias for Object.assign readonly-target safety checks.
|
|
4
8
|
*/
|
|
5
|
-
const
|
|
9
|
+
const typescriptNoUnsafeObjectAssignmentRule = {
|
|
6
10
|
...coreNoUnsafeObjectAssignRule,
|
|
7
11
|
meta: {
|
|
8
12
|
deprecated: false,
|
|
9
13
|
...coreNoUnsafeObjectAssignRule.meta,
|
|
10
14
|
docs: {
|
|
15
|
+
...baseDocs,
|
|
11
16
|
deprecated: false,
|
|
12
17
|
frozen: false,
|
|
13
18
|
recommended: false,
|
|
14
|
-
...coreNoUnsafeObjectAssignRule.meta.docs,
|
|
15
19
|
url: "https://nick2bad4u.github.io/eslint-plugin-etc-misc/docs/rules/typescript-no-unsafe-object-assignment",
|
|
16
20
|
},
|
|
17
21
|
},
|
|
18
22
|
};
|
|
19
|
-
export default
|
|
23
|
+
export default typescriptNoUnsafeObjectAssignmentRule;
|
|
20
24
|
//# sourceMappingURL=typescript-no-unsafe-object-assignment.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescript-no-unsafe-object-assignment.js","sourceRoot":"","sources":["../../src/rules/typescript-no-unsafe-object-assignment.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"typescript-no-unsafe-object-assignment.js","sourceRoot":"","sources":["../../src/rules/typescript-no-unsafe-object-assignment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1C,OAAO,IAAI,MAAM,yCAAyC,CAAC;AAE3D,MAAM,4BAA4B,GAAgB,IAAI,CAAC;AACvD,MAAM,QAAQ,GAAG,4BAA4B,CAAC,IAAI,CAAC,IAAI,CAAC;AACxD,aAAa,CAAC,QAAQ,CAAC,CAAC;AAExB;;GAEG;AACH,MAAM,sCAAsC,GACxC;IACI,GAAG,4BAA4B;IAC/B,IAAI,EAAE;QACF,UAAU,EAAE,KAAK;QACjB,GAAG,4BAA4B,CAAC,IAAI;QACpC,IAAI,EAAE;YACF,GAAG,QAAQ;YACX,UAAU,EAAE,KAAK;YACjB,MAAM,EAAE,KAAK;YACb,WAAW,EAAE,KAAK;YAClB,GAAG,EAAE,uGAAuG;SAC/G;KACJ;CACJ,CAAC;AAEN,eAAe,sCAAsC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescript-prefer-enum.d.ts","sourceRoot":"","sources":["../../src/rules/typescript-prefer-enum.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"typescript-prefer-enum.d.ts","sourceRoot":"","sources":["../../src/rules/typescript-prefer-enum.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,KAAK,UAAU,GACT,sBAAsB,GACtB,kBAAkB,GAClB,iBAAiB,CAAC;AAExB,KAAK,OAAO,GAAG,SAAS,EAAE,CAAC;AAgC3B;;GAEG;AACH,QAAA,MAAM,IAAI,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,OAAO,EAAE,UAAU,CAAC,CA8I5D,CAAC;AAEH,eAAe,IAAI,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { getConstrainedTypeAtLocation, isTypeFlagSet, } from "@typescript-eslint/type-utils";
|
|
2
|
-
import { ESLintUtils } from "@typescript-eslint/utils";
|
|
2
|
+
import { AST_NODE_TYPES, ESLintUtils, } from "@typescript-eslint/utils";
|
|
3
3
|
import { arrayFirst, isDefined } from "ts-extras";
|
|
4
4
|
import * as tsutils from "tsutils";
|
|
5
5
|
import ts from "typescript";
|
|
@@ -20,7 +20,7 @@ const isEnumLikeOrUndefinedType = (checker, type) => {
|
|
|
20
20
|
}
|
|
21
21
|
return hasEnumLike;
|
|
22
22
|
};
|
|
23
|
-
const isStringLiteral = (node) => node.type ===
|
|
23
|
+
const isStringLiteral = (node) => node.type === AST_NODE_TYPES.Literal && typeof node.value === "string";
|
|
24
24
|
/**
|
|
25
25
|
* Prefer enums over string literal comparisons and unions.
|
|
26
26
|
*/
|
|
@@ -37,17 +37,15 @@ const rule = ruleCreator({
|
|
|
37
37
|
if (!isEqualityOperator) {
|
|
38
38
|
return;
|
|
39
39
|
}
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
literalNode = node.right;
|
|
46
|
-
}
|
|
47
|
-
const expressionNode = literalNode === node.left ? node.right : node.left;
|
|
40
|
+
const literalNode = isStringLiteral(node.left)
|
|
41
|
+
? node.left
|
|
42
|
+
: isStringLiteral(node.right)
|
|
43
|
+
? node.right
|
|
44
|
+
: null;
|
|
48
45
|
if (literalNode === null) {
|
|
49
46
|
return;
|
|
50
47
|
}
|
|
48
|
+
const expressionNode = literalNode === node.left ? node.right : node.left;
|
|
51
49
|
const expressionType = getConstrainedTypeAtLocation(parserServices, expressionNode);
|
|
52
50
|
if (!isEnumLikeOrUndefinedType(checker, expressionType)) {
|
|
53
51
|
return;
|
|
@@ -63,9 +61,10 @@ const rule = ruleCreator({
|
|
|
63
61
|
}
|
|
64
62
|
let functionNode = null;
|
|
65
63
|
for (const ancestor of context.sourceCode.getAncestors(node)) {
|
|
66
|
-
if (ancestor.type ===
|
|
67
|
-
|
|
68
|
-
ancestor.type ===
|
|
64
|
+
if (ancestor.type ===
|
|
65
|
+
AST_NODE_TYPES.ArrowFunctionExpression ||
|
|
66
|
+
ancestor.type === AST_NODE_TYPES.FunctionDeclaration ||
|
|
67
|
+
ancestor.type === AST_NODE_TYPES.FunctionExpression) {
|
|
69
68
|
functionNode = ancestor;
|
|
70
69
|
}
|
|
71
70
|
}
|
|
@@ -88,13 +87,13 @@ const rule = ruleCreator({
|
|
|
88
87
|
});
|
|
89
88
|
},
|
|
90
89
|
TSTypeAliasDeclaration: (node) => {
|
|
91
|
-
if (node.typeAnnotation.type !==
|
|
90
|
+
if (node.typeAnnotation.type !== AST_NODE_TYPES.TSUnionType) {
|
|
92
91
|
return;
|
|
93
92
|
}
|
|
94
93
|
let literalCount = 0;
|
|
95
94
|
for (const typeNode of node.typeAnnotation.types) {
|
|
96
|
-
if (typeNode.type ===
|
|
97
|
-
typeNode.literal.type ===
|
|
95
|
+
if (typeNode.type === AST_NODE_TYPES.TSLiteralType &&
|
|
96
|
+
typeNode.literal.type === AST_NODE_TYPES.Literal &&
|
|
98
97
|
typeof typeNode.literal.value === "string") {
|
|
99
98
|
literalCount += 1;
|
|
100
99
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescript-prefer-enum.js","sourceRoot":"","sources":["../../src/rules/typescript-prefer-enum.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,4BAA4B,EAC5B,aAAa,GAChB,MAAM,+BAA+B,CAAC;AACvC,OAAO,
|
|
1
|
+
{"version":3,"file":"typescript-prefer-enum.js","sourceRoot":"","sources":["../../src/rules/typescript-prefer-enum.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescript-prefer-named-tuple-members.d.ts","sourceRoot":"","sources":["../../src/rules/typescript-prefer-named-tuple-members.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"typescript-prefer-named-tuple-members.d.ts","sourceRoot":"","sources":["../../src/rules/typescript-prefer-named-tuple-members.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,KAAK,UAAU,GAAG,WAAW,GAAG,gCAAgC,CAAC;AAEjE,KAAK,OAAO,GAAG,SAAS,EAAE,CAAC;AAoE3B;;GAEG;AACH,QAAA,MAAM,IAAI,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,OAAO,EAAE,UAAU,CAAC,CAuG5D,CAAC;AAEH,eAAe,IAAI,CAAC"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
+
import { AST_NODE_TYPES } from "@typescript-eslint/utils";
|
|
1
2
|
import { ruleCreator } from "../_internal/rule-creator.js";
|
|
2
3
|
const isUnnamedTupleElement = (tupleElement) => {
|
|
3
|
-
if (tupleElement.type ===
|
|
4
|
+
if (tupleElement.type === AST_NODE_TYPES.TSNamedTupleMember) {
|
|
4
5
|
return false;
|
|
5
6
|
}
|
|
6
|
-
if (tupleElement.type ===
|
|
7
|
-
tupleElement.typeAnnotation.type ===
|
|
7
|
+
if (tupleElement.type === AST_NODE_TYPES.TSRestType &&
|
|
8
|
+
tupleElement.typeAnnotation.type === AST_NODE_TYPES.TSNamedTupleMember) {
|
|
8
9
|
return false;
|
|
9
10
|
}
|
|
10
11
|
return true;
|
|
@@ -23,11 +24,12 @@ const generateUniqueTupleMemberName = (preferredName, usedNames) => {
|
|
|
23
24
|
return generatedName;
|
|
24
25
|
};
|
|
25
26
|
const getTupleMemberReplacementText = (tupleElement, memberName, sourceCode) => {
|
|
26
|
-
if (tupleElement.type ===
|
|
27
|
+
if (tupleElement.type === AST_NODE_TYPES.TSOptionalType) {
|
|
27
28
|
return `${memberName}?: ${sourceCode.getText(tupleElement.typeAnnotation)}`;
|
|
28
29
|
}
|
|
29
|
-
if (tupleElement.type ===
|
|
30
|
-
if (tupleElement.typeAnnotation.type ===
|
|
30
|
+
if (tupleElement.type === AST_NODE_TYPES.TSRestType) {
|
|
31
|
+
if (tupleElement.typeAnnotation.type ===
|
|
32
|
+
AST_NODE_TYPES.TSNamedTupleMember) {
|
|
31
33
|
return sourceCode.getText(tupleElement);
|
|
32
34
|
}
|
|
33
35
|
return `...${memberName}: ${sourceCode.getText(tupleElement.typeAnnotation)}`;
|
|
@@ -47,10 +49,8 @@ const rule = ruleCreator({
|
|
|
47
49
|
return;
|
|
48
50
|
}
|
|
49
51
|
const usedNames = new Set(node.elementTypes.flatMap((tupleElement) => {
|
|
50
|
-
if (tupleElement.type !==
|
|
51
|
-
|
|
52
|
-
}
|
|
53
|
-
if (tupleElement.label.type !== "Identifier") {
|
|
52
|
+
if (tupleElement.type !==
|
|
53
|
+
AST_NODE_TYPES.TSNamedTupleMember) {
|
|
54
54
|
return [];
|
|
55
55
|
}
|
|
56
56
|
return [tupleElement.label.name];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescript-prefer-named-tuple-members.js","sourceRoot":"","sources":["../../src/rules/typescript-prefer-named-tuple-members.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAM3D,MAAM,qBAAqB,GAAG,CAC1B,YAAmC,EAC5B,EAAE;IACT,IAAI,YAAY,CAAC,IAAI,KAAK,
|
|
1
|
+
{"version":3,"file":"typescript-prefer-named-tuple-members.js","sourceRoot":"","sources":["../../src/rules/typescript-prefer-named-tuple-members.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescript-prefer-readonly-array-parameter.d.ts","sourceRoot":"","sources":["../../src/rules/typescript-prefer-readonly-array-parameter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"typescript-prefer-readonly-array-parameter.d.ts","sourceRoot":"","sources":["../../src/rules/typescript-prefer-readonly-array-parameter.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,KAAK,UAAU,GAAG,WAAW,GAAG,qCAAqC,CAAC;AAItE,KAAK,OAAO,GAAG,SAAS,EAAE,CAAC;AAmH3B;;GAEG;AACH,QAAA,MAAM,IAAI,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,OAAO,EAAE,UAAU,CAAC,CAwE5D,CAAC;AAEH,eAAe,IAAI,CAAC"}
|