@typescript-eslint/eslint-plugin 6.21.1-alpha.1 → 7.0.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/dist/configs/base.js +0 -6
- package/dist/configs/base.js.map +1 -1
- package/dist/configs/disable-type-checked.js +1 -1
- package/dist/configs/disable-type-checked.js.map +1 -1
- package/dist/configs/eslint-recommended-raw.js +40 -0
- package/dist/configs/eslint-recommended-raw.js.map +1 -0
- package/dist/configs/eslint-recommended.js +10 -27
- package/dist/configs/eslint-recommended.js.map +1 -1
- package/dist/rules/adjacent-overload-signatures.js +2 -4
- package/dist/rules/adjacent-overload-signatures.js.map +1 -1
- package/dist/rules/array-type.js +2 -4
- package/dist/rules/array-type.js.map +1 -1
- package/dist/rules/await-thenable.js +1 -3
- package/dist/rules/await-thenable.js.map +1 -1
- package/dist/rules/ban-ts-comment.js +1 -3
- package/dist/rules/ban-ts-comment.js.map +1 -1
- package/dist/rules/ban-tslint-comment.js +3 -5
- package/dist/rules/ban-tslint-comment.js.map +1 -1
- package/dist/rules/ban-types.js +1 -2
- package/dist/rules/ban-types.js.map +1 -1
- package/dist/rules/block-spacing.js +5 -7
- package/dist/rules/block-spacing.js.map +1 -1
- package/dist/rules/brace-style.js +8 -10
- package/dist/rules/brace-style.js.map +1 -1
- package/dist/rules/class-literal-property-style.js +5 -8
- package/dist/rules/class-literal-property-style.js.map +1 -1
- package/dist/rules/class-methods-use-this.js +1 -3
- package/dist/rules/class-methods-use-this.js.map +1 -1
- package/dist/rules/comma-dangle.js +2 -4
- package/dist/rules/comma-dangle.js.map +1 -1
- package/dist/rules/comma-spacing.js +7 -11
- package/dist/rules/comma-spacing.js.map +1 -1
- package/dist/rules/consistent-generic-constructors.js +8 -9
- package/dist/rules/consistent-generic-constructors.js.map +1 -1
- package/dist/rules/consistent-indexed-object-style.js +6 -8
- package/dist/rules/consistent-indexed-object-style.js.map +1 -1
- package/dist/rules/consistent-type-assertions.js +12 -14
- package/dist/rules/consistent-type-assertions.js.map +1 -1
- package/dist/rules/consistent-type-definitions.js +9 -9
- package/dist/rules/consistent-type-definitions.js.map +1 -1
- package/dist/rules/consistent-type-exports.js +3 -5
- package/dist/rules/consistent-type-exports.js.map +1 -1
- package/dist/rules/consistent-type-imports.js +35 -35
- package/dist/rules/consistent-type-imports.js.map +1 -1
- package/dist/rules/explicit-function-return-type.js +2 -4
- package/dist/rules/explicit-function-return-type.js.map +1 -1
- package/dist/rules/explicit-member-accessibility.js +5 -7
- package/dist/rules/explicit-member-accessibility.js.map +1 -1
- package/dist/rules/explicit-module-boundary-types.js +3 -5
- package/dist/rules/explicit-module-boundary-types.js.map +1 -1
- package/dist/rules/func-call-spacing.js +5 -7
- package/dist/rules/func-call-spacing.js.map +1 -1
- package/dist/rules/indent.js +1 -3
- package/dist/rules/indent.js.map +1 -1
- package/dist/rules/key-spacing.js +9 -11
- package/dist/rules/key-spacing.js.map +1 -1
- package/dist/rules/keyword-spacing.js +3 -5
- package/dist/rules/keyword-spacing.js.map +1 -1
- package/dist/rules/lines-around-comment.js +7 -9
- package/dist/rules/lines-around-comment.js.map +1 -1
- package/dist/rules/member-delimiter-style.js +3 -5
- package/dist/rules/member-delimiter-style.js.map +1 -1
- package/dist/rules/member-ordering.js +3 -4
- package/dist/rules/member-ordering.js.map +1 -1
- package/dist/rules/method-signature-style.js +9 -11
- package/dist/rules/method-signature-style.js.map +1 -1
- package/dist/rules/naming-convention.js +12 -12
- package/dist/rules/naming-convention.js.map +1 -1
- package/dist/rules/no-array-constructor.js +1 -2
- package/dist/rules/no-array-constructor.js.map +1 -1
- package/dist/rules/no-array-delete.js +1 -3
- package/dist/rules/no-array-delete.js.map +1 -1
- package/dist/rules/no-base-to-string.js +1 -2
- package/dist/rules/no-base-to-string.js.map +1 -1
- package/dist/rules/no-confusing-non-null-assertion.js +2 -4
- package/dist/rules/no-confusing-non-null-assertion.js.map +1 -1
- package/dist/rules/no-confusing-void-expression.js +12 -14
- package/dist/rules/no-confusing-void-expression.js.map +1 -1
- package/dist/rules/no-dupe-class-members.js +1 -12
- package/dist/rules/no-dupe-class-members.js.map +1 -1
- package/dist/rules/no-duplicate-type-constituents.js +4 -6
- package/dist/rules/no-duplicate-type-constituents.js.map +1 -1
- package/dist/rules/no-dynamic-delete.js +2 -4
- package/dist/rules/no-dynamic-delete.js.map +1 -1
- package/dist/rules/no-empty-interface.js +4 -7
- package/dist/rules/no-empty-interface.js.map +1 -1
- package/dist/rules/no-extra-parens.js +24 -46
- package/dist/rules/no-extra-parens.js.map +1 -1
- package/dist/rules/no-extra-semi.js +1 -12
- package/dist/rules/no-extra-semi.js.map +1 -1
- package/dist/rules/no-implied-eval.js +5 -4
- package/dist/rules/no-implied-eval.js.map +1 -1
- package/dist/rules/no-import-type-side-effects.js +2 -4
- package/dist/rules/no-import-type-side-effects.js.map +1 -1
- package/dist/rules/no-inferrable-types.js +1 -3
- package/dist/rules/no-inferrable-types.js.map +1 -1
- package/dist/rules/no-invalid-this.js +2 -10
- package/dist/rules/no-invalid-this.js.map +1 -1
- package/dist/rules/no-invalid-void-type.js +1 -3
- package/dist/rules/no-invalid-void-type.js.map +1 -1
- package/dist/rules/no-loop-func.js +1 -2
- package/dist/rules/no-loop-func.js.map +1 -1
- package/dist/rules/no-loss-of-precision.js +3 -7
- package/dist/rules/no-loss-of-precision.js.map +1 -1
- package/dist/rules/no-meaningless-void-operator.js +2 -4
- package/dist/rules/no-meaningless-void-operator.js.map +1 -1
- package/dist/rules/no-mixed-enums.js +1 -2
- package/dist/rules/no-mixed-enums.js.map +1 -1
- package/dist/rules/no-namespace.js +1 -3
- package/dist/rules/no-namespace.js.map +1 -1
- package/dist/rules/no-non-null-asserted-nullish-coalescing.js +2 -4
- package/dist/rules/no-non-null-asserted-nullish-coalescing.js.map +1 -1
- package/dist/rules/no-non-null-assertion.js +2 -4
- package/dist/rules/no-non-null-assertion.js.map +1 -1
- package/dist/rules/no-redeclare.js +4 -6
- package/dist/rules/no-redeclare.js.map +1 -1
- package/dist/rules/no-require-imports.js +1 -2
- package/dist/rules/no-require-imports.js.map +1 -1
- package/dist/rules/no-shadow.js +2 -3
- package/dist/rules/no-shadow.js.map +1 -1
- package/dist/rules/no-unnecessary-boolean-literal-compare.js +1 -3
- package/dist/rules/no-unnecessary-boolean-literal-compare.js.map +1 -1
- package/dist/rules/no-unnecessary-condition.js +1 -3
- package/dist/rules/no-unnecessary-condition.js.map +1 -1
- package/dist/rules/no-unnecessary-qualifier.js +2 -4
- package/dist/rules/no-unnecessary-qualifier.js.map +1 -1
- package/dist/rules/no-unnecessary-type-assertion.js +5 -7
- package/dist/rules/no-unnecessary-type-assertion.js.map +1 -1
- package/dist/rules/no-unnecessary-type-constraint.js +2 -4
- package/dist/rules/no-unnecessary-type-constraint.js.map +1 -1
- package/dist/rules/no-unsafe-declaration-merging.js +2 -3
- package/dist/rules/no-unsafe-declaration-merging.js.map +1 -1
- package/dist/rules/no-unsafe-member-access.js +2 -4
- package/dist/rules/no-unsafe-member-access.js.map +1 -1
- package/dist/rules/no-unused-vars.js +4 -7
- package/dist/rules/no-unused-vars.js.map +1 -1
- package/dist/rules/no-use-before-define.js +2 -3
- package/dist/rules/no-use-before-define.js.map +1 -1
- package/dist/rules/no-useless-empty-export.js +1 -2
- package/dist/rules/no-useless-empty-export.js.map +1 -1
- package/dist/rules/no-var-requires.js +1 -2
- package/dist/rules/no-var-requires.js.map +1 -1
- package/dist/rules/non-nullable-type-assertion-style.js +1 -3
- package/dist/rules/non-nullable-type-assertion-style.js.map +1 -1
- package/dist/rules/object-curly-spacing.js +14 -16
- package/dist/rules/object-curly-spacing.js.map +1 -1
- package/dist/rules/padding-line-between-statements.js +7 -10
- package/dist/rules/padding-line-between-statements.js.map +1 -1
- package/dist/rules/parameter-properties.js +2 -4
- package/dist/rules/parameter-properties.js.map +1 -1
- package/dist/rules/prefer-enum-initializers.js +1 -3
- package/dist/rules/prefer-enum-initializers.js.map +1 -1
- package/dist/rules/prefer-find.js +18 -16
- package/dist/rules/prefer-find.js.map +1 -1
- package/dist/rules/prefer-for-of.js +3 -5
- package/dist/rules/prefer-for-of.js.map +1 -1
- package/dist/rules/prefer-function-type.js +6 -6
- package/dist/rules/prefer-function-type.js.map +1 -1
- package/dist/rules/prefer-includes.js +1 -2
- package/dist/rules/prefer-includes.js.map +1 -1
- package/dist/rules/prefer-namespace-keyword.js +1 -3
- package/dist/rules/prefer-namespace-keyword.js.map +1 -1
- package/dist/rules/prefer-nullish-coalescing.js +2 -4
- package/dist/rules/prefer-nullish-coalescing.js.map +1 -1
- package/dist/rules/prefer-optional-chain-utils/analyzeChain.js +2 -2
- package/dist/rules/prefer-optional-chain-utils/analyzeChain.js.map +1 -1
- package/dist/rules/prefer-optional-chain.js +4 -6
- package/dist/rules/prefer-optional-chain.js.map +1 -1
- package/dist/rules/prefer-promise-reject-errors.js +3 -2
- package/dist/rules/prefer-promise-reject-errors.js.map +1 -1
- package/dist/rules/prefer-readonly.js +1 -3
- package/dist/rules/prefer-readonly.js.map +1 -1
- package/dist/rules/prefer-reduce-type-parameter.js +1 -2
- package/dist/rules/prefer-reduce-type-parameter.js.map +1 -1
- package/dist/rules/prefer-regexp-exec.js +4 -6
- package/dist/rules/prefer-regexp-exec.js.map +1 -1
- package/dist/rules/prefer-string-starts-ends-with.js +4 -6
- package/dist/rules/prefer-string-starts-ends-with.js.map +1 -1
- package/dist/rules/prefer-ts-expect-error.js +1 -3
- package/dist/rules/prefer-ts-expect-error.js.map +1 -1
- package/dist/rules/promise-function-async.js +6 -8
- package/dist/rules/promise-function-async.js.map +1 -1
- package/dist/rules/require-await.js +1 -39
- package/dist/rules/require-await.js.map +1 -1
- package/dist/rules/return-await.js +2 -4
- package/dist/rules/return-await.js.map +1 -1
- package/dist/rules/sort-type-constituents.js +3 -5
- package/dist/rules/sort-type-constituents.js.map +1 -1
- package/dist/rules/space-before-blocks.js +3 -6
- package/dist/rules/space-before-blocks.js.map +1 -1
- package/dist/rules/space-before-function-paren.js +6 -9
- package/dist/rules/space-before-function-paren.js.map +1 -1
- package/dist/rules/space-infix-ops.js +13 -15
- package/dist/rules/space-infix-ops.js.map +1 -1
- package/dist/rules/strict-boolean-expressions.js +35 -37
- package/dist/rules/strict-boolean-expressions.js.map +1 -1
- package/dist/rules/switch-exhaustiveness-check.js +2 -4
- package/dist/rules/switch-exhaustiveness-check.js.map +1 -1
- package/dist/rules/triple-slash-reference.js +1 -3
- package/dist/rules/triple-slash-reference.js.map +1 -1
- package/dist/rules/type-annotation-spacing.js +5 -9
- package/dist/rules/type-annotation-spacing.js.map +1 -1
- package/dist/rules/unbound-method.js +1 -2
- package/dist/rules/unbound-method.js.map +1 -1
- package/dist/rules/unified-signatures.js +4 -6
- package/dist/rules/unified-signatures.js.map +1 -1
- package/dist/util/collectUnusedVariables.js +2 -3
- package/dist/util/collectUnusedVariables.js.map +1 -1
- package/dist/util/getESLintCoreRule.js +3 -31
- package/dist/util/getESLintCoreRule.js.map +1 -1
- package/docs/rules/restrict-plus-operands.md +2 -2
- package/index.d.ts +5 -1
- package/package.json +16 -11
- package/rules.d.ts +1 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"class-literal-property-style.js","sourceRoot":"","sources":["../../src/rules/class-literal-property-style.ts"],"names":[],"mappings":";;AACA,oDAA0D;
|
|
1
|
+
{"version":3,"file":"class-literal-property-style.js","sourceRoot":"","sources":["../../src/rules/class-literal-property-style.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const utils_1 = require("@typescript-eslint/utils");
|
|
4
|
-
const eslint_utils_1 = require("@typescript-eslint/utils/eslint-utils");
|
|
5
4
|
const util_1 = require("../util");
|
|
6
5
|
exports.default = (0, util_1.createRule)({
|
|
7
6
|
name: 'class-methods-use-this',
|
|
@@ -65,7 +64,6 @@ exports.default = (0, util_1.createRule)({
|
|
|
65
64
|
create(context, [{ enforceForClassFields, exceptMethods: exceptMethodsRaw, ignoreClassesThatImplementAnInterface, ignoreOverrideMethods, },]) {
|
|
66
65
|
const exceptMethods = new Set(exceptMethodsRaw);
|
|
67
66
|
let stack;
|
|
68
|
-
const sourceCode = (0, eslint_utils_1.getSourceCode)(context);
|
|
69
67
|
function pushContext(member) {
|
|
70
68
|
if (member?.parent.type === utils_1.AST_NODE_TYPES.ClassBody) {
|
|
71
69
|
stack = {
|
|
@@ -147,7 +145,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
147
145
|
if (isIncludedInstanceMethod(stackContext.member)) {
|
|
148
146
|
context.report({
|
|
149
147
|
node,
|
|
150
|
-
loc: (0, util_1.getFunctionHeadLoc)(node, sourceCode),
|
|
148
|
+
loc: (0, util_1.getFunctionHeadLoc)(node, context.sourceCode),
|
|
151
149
|
messageId: 'missingThis',
|
|
152
150
|
data: {
|
|
153
151
|
name: (0, util_1.getFunctionNameWithKind)(node),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"class-methods-use-this.js","sourceRoot":"","sources":["../../src/rules/class-methods-use-this.ts"],"names":[],"mappings":";;AACA,oDAA0D;
|
|
1
|
+
{"version":3,"file":"class-methods-use-this.js","sourceRoot":"","sources":["../../src/rules/class-methods-use-this.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const utils_1 = require("@typescript-eslint/utils");
|
|
4
|
-
const eslint_utils_1 = require("@typescript-eslint/utils/eslint-utils");
|
|
5
4
|
const util_1 = require("../util");
|
|
6
5
|
const getESLintCoreRule_1 = require("../util/getESLintCoreRule");
|
|
7
6
|
const baseRule = (0, getESLintCoreRule_1.getESLintCoreRule)('comma-dangle');
|
|
@@ -80,7 +79,6 @@ exports.default = (0, util_1.createRule)({
|
|
|
80
79
|
defaultOptions: ['never'],
|
|
81
80
|
create(context, [options]) {
|
|
82
81
|
const rules = baseRule.create(context);
|
|
83
|
-
const sourceCode = (0, eslint_utils_1.getSourceCode)(context);
|
|
84
82
|
const normalizedOptions = normalizeOptions(options);
|
|
85
83
|
const predicate = {
|
|
86
84
|
always: forceComma,
|
|
@@ -108,12 +106,12 @@ exports.default = (0, util_1.createRule)({
|
|
|
108
106
|
}
|
|
109
107
|
function getTrailingToken(node) {
|
|
110
108
|
const last = getLastItem(node);
|
|
111
|
-
const trailing = last && sourceCode.getTokenAfter(last);
|
|
109
|
+
const trailing = last && context.sourceCode.getTokenAfter(last);
|
|
112
110
|
return trailing;
|
|
113
111
|
}
|
|
114
112
|
function isMultiline(node) {
|
|
115
113
|
const last = getLastItem(node);
|
|
116
|
-
const lastToken = sourceCode.getLastToken(node);
|
|
114
|
+
const lastToken = context.sourceCode.getLastToken(node);
|
|
117
115
|
return last?.loc.end.line !== lastToken?.loc.end.line;
|
|
118
116
|
}
|
|
119
117
|
function forbidComma(node) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"comma-dangle.js","sourceRoot":"","sources":["../../src/rules/comma-dangle.ts"],"names":[],"mappings":";;AACA,oDAA0D;
|
|
1
|
+
{"version":3,"file":"comma-dangle.js","sourceRoot":"","sources":["../../src/rules/comma-dangle.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const utils_1 = require("@typescript-eslint/utils");
|
|
4
|
-
const eslint_utils_1 = require("@typescript-eslint/utils/eslint-utils");
|
|
5
4
|
const util_1 = require("../util");
|
|
6
5
|
exports.default = (0, util_1.createRule)({
|
|
7
6
|
name: 'comma-spacing',
|
|
@@ -42,25 +41,24 @@ exports.default = (0, util_1.createRule)({
|
|
|
42
41
|
},
|
|
43
42
|
],
|
|
44
43
|
create(context, [{ before: spaceBefore, after: spaceAfter }]) {
|
|
45
|
-
const
|
|
46
|
-
const tokensAndComments = sourceCode.tokensAndComments;
|
|
44
|
+
const tokensAndComments = context.sourceCode.tokensAndComments;
|
|
47
45
|
const ignoredTokens = new Set();
|
|
48
46
|
/**
|
|
49
47
|
* Adds null elements of the ArrayExpression or ArrayPattern node to the ignore list
|
|
50
48
|
* @param node node to evaluate
|
|
51
49
|
*/
|
|
52
50
|
function addNullElementsToIgnoreList(node) {
|
|
53
|
-
let previousToken = sourceCode.getFirstToken(node);
|
|
51
|
+
let previousToken = context.sourceCode.getFirstToken(node);
|
|
54
52
|
for (const element of node.elements) {
|
|
55
53
|
let token;
|
|
56
54
|
if (element == null) {
|
|
57
|
-
token = sourceCode.getTokenAfter(previousToken);
|
|
55
|
+
token = context.sourceCode.getTokenAfter(previousToken);
|
|
58
56
|
if (token && (0, util_1.isCommaToken)(token)) {
|
|
59
57
|
ignoredTokens.add(token);
|
|
60
58
|
}
|
|
61
59
|
}
|
|
62
60
|
else {
|
|
63
|
-
token = sourceCode.getTokenAfter(element);
|
|
61
|
+
token = context.sourceCode.getTokenAfter(element);
|
|
64
62
|
}
|
|
65
63
|
previousToken = token;
|
|
66
64
|
}
|
|
@@ -73,7 +71,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
73
71
|
const paramLength = node.params.length;
|
|
74
72
|
if (paramLength) {
|
|
75
73
|
const param = node.params[paramLength - 1];
|
|
76
|
-
const afterToken = sourceCode.getTokenAfter(param);
|
|
74
|
+
const afterToken = context.sourceCode.getTokenAfter(param);
|
|
77
75
|
if (afterToken && (0, util_1.isCommaToken)(afterToken)) {
|
|
78
76
|
ignoredTokens.add(afterToken);
|
|
79
77
|
}
|
|
@@ -88,8 +86,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
88
86
|
function validateCommaSpacing(commaToken, prevToken, nextToken) {
|
|
89
87
|
if (prevToken &&
|
|
90
88
|
(0, util_1.isTokenOnSameLine)(prevToken, commaToken) &&
|
|
91
|
-
|
|
92
|
-
spaceBefore !== sourceCode.isSpaceBetweenTokens(prevToken, commaToken)) {
|
|
89
|
+
spaceBefore !== context.sourceCode.isSpaceBetween(prevToken, commaToken)) {
|
|
93
90
|
context.report({
|
|
94
91
|
node: commaToken,
|
|
95
92
|
data: {
|
|
@@ -114,8 +111,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
114
111
|
}
|
|
115
112
|
if (nextToken &&
|
|
116
113
|
(0, util_1.isTokenOnSameLine)(commaToken, nextToken) &&
|
|
117
|
-
|
|
118
|
-
spaceAfter !== sourceCode.isSpaceBetweenTokens(commaToken, nextToken)) {
|
|
114
|
+
spaceAfter !== context.sourceCode.isSpaceBetween(commaToken, nextToken)) {
|
|
119
115
|
context.report({
|
|
120
116
|
node: commaToken,
|
|
121
117
|
data: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"comma-spacing.js","sourceRoot":"","sources":["../../src/rules/comma-spacing.ts"],"names":[],"mappings":";;AACA,oDAA2D;
|
|
1
|
+
{"version":3,"file":"comma-spacing.js","sourceRoot":"","sources":["../../src/rules/comma-spacing.ts"],"names":[],"mappings":";;AACA,oDAA2D;AAE3D,kCAOiB;AAUjB,kBAAe,IAAA,iBAAU,EAAsB;IAC7C,IAAI,EAAE,eAAe;IACrB,IAAI,EAAE;QACJ,UAAU,EAAE,IAAI;QAChB,UAAU,EAAE,CAAC,6BAA6B,CAAC;QAC3C,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE;YACJ,WAAW,EAAE,oDAAoD;YACjE,eAAe,EAAE,IAAI;SACtB;QACD,OAAO,EAAE,YAAY;QACrB,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACV,MAAM,EAAE;wBACN,IAAI,EAAE,SAAS;wBACf,OAAO,EAAE,KAAK;qBACf;oBACD,KAAK,EAAE;wBACL,IAAI,EAAE,SAAS;wBACf,OAAO,EAAE,IAAI;qBACd;iBACF;gBACD,oBAAoB,EAAE,KAAK;aAC5B;SACF;QACD,QAAQ,EAAE;YACR,UAAU,EAAE,uCAAuC;YACnD,OAAO,EAAE,kCAAkC;SAC5C;KACF;IACD,cAAc,EAAE;QACd;YACE,MAAM,EAAE,KAAK;YACb,KAAK,EAAE,IAAI;SACZ;KACF;IACD,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;QAC1D,MAAM,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC,iBAAiB,CAAC;QAC/D,MAAM,aAAa,GAAG,IAAI,GAAG,EAA4B,CAAC;QAE1D;;;WAGG;QACH,SAAS,2BAA2B,CAClC,IAAsD;YAEtD,IAAI,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YAC3D,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACpC,IAAI,KAA4B,CAAC;gBACjC,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;oBACpB,KAAK,GAAG,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,aAAc,CAAC,CAAC;oBACzD,IAAI,KAAK,IAAI,IAAA,mBAAY,EAAC,KAAK,CAAC,EAAE,CAAC;wBACjC,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;oBAC3B,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,KAAK,GAAG,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;gBACpD,CAAC;gBAED,aAAa,GAAG,KAAK,CAAC;YACxB,CAAC;QACH,CAAC;QAED;;;WAGG;QACH,SAAS,0CAA0C,CACjD,IAAyC;YAEzC,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;YACvC,IAAI,WAAW,EAAE,CAAC;gBAChB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC;gBAC3C,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;gBAC3D,IAAI,UAAU,IAAI,IAAA,mBAAY,EAAC,UAAU,CAAC,EAAE,CAAC;oBAC3C,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBAChC,CAAC;YACH,CAAC;QACH,CAAC;QAED;;;;;WAKG;QACH,SAAS,oBAAoB,CAC3B,UAAoC,EACpC,SAAgC,EAChC,SAAgC;YAEhC,IACE,SAAS;gBACT,IAAA,wBAAiB,EAAC,SAAS,EAAE,UAAU,CAAC;gBACxC,WAAW,KAAK,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,SAAS,EAAE,UAAU,CAAC,EACxE,CAAC;gBACD,OAAO,CAAC,MAAM,CAAC;oBACb,IAAI,EAAE,UAAU;oBAChB,IAAI,EAAE;wBACJ,GAAG,EAAE,QAAQ;qBACd;oBACD,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY;oBACjD,GAAG,EAAE,KAAK,CAAC,EAAE,CACX,WAAW;wBACT,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,UAAU,EAAE,GAAG,CAAC;wBACzC,CAAC,CAAC,KAAK,CAAC,gBAAgB,CACpB,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EACzC,EAAE,CACH;iBACR,CAAC,CAAC;YACL,CAAC;YAED,IAAI,SAAS,IAAI,IAAA,0BAAmB,EAAC,SAAS,CAAC,EAAE,CAAC;gBAChD,OAAO;YACT,CAAC;YAED,IACE,UAAU;gBACV,SAAS;gBACT,CAAC,IAAA,0BAAmB,EAAC,SAAS,CAAC,IAAI,IAAA,4BAAqB,EAAC,SAAS,CAAC,CAAC,EACpE,CAAC;gBACD,OAAO;YACT,CAAC;YAED,IAAI,CAAC,UAAU,IAAI,SAAS,IAAI,SAAS,CAAC,IAAI,KAAK,uBAAe,CAAC,IAAI,EAAE,CAAC;gBACxE,OAAO;YACT,CAAC;YAED,IACE,SAAS;gBACT,IAAA,wBAAiB,EAAC,UAAU,EAAE,SAAS,CAAC;gBACxC,UAAU,KAAK,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,UAAU,EAAE,SAAS,CAAC,EACvE,CAAC;gBACD,OAAO,CAAC,MAAM,CAAC;oBACb,IAAI,EAAE,UAAU;oBAChB,IAAI,EAAE;wBACJ,GAAG,EAAE,OAAO;qBACb;oBACD,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY;oBAChD,GAAG,EAAE,KAAK,CAAC,EAAE,CACX,UAAU;wBACR,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,UAAU,EAAE,GAAG,CAAC;wBACxC,CAAC,CAAC,KAAK,CAAC,gBAAgB,CACpB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EACzC,EAAE,CACH;iBACR,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO;YACL,0BAA0B,EAAE,0CAA0C;YACtE,eAAe,EAAE,2BAA2B;YAC5C,YAAY,EAAE,2BAA2B;YAEzC,cAAc;gBACZ,iBAAiB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;oBACrC,IAAI,CAAC,IAAA,mBAAY,EAAC,KAAK,CAAC,EAAE,CAAC;wBACzB,OAAO;oBACT,CAAC;oBAED,MAAM,SAAS,GAAG,iBAAiB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;oBAC3C,MAAM,SAAS,GAAG,iBAAiB,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;oBAE9C,oBAAoB,CAClB,KAAK,EACL,IAAA,mBAAY,EAAC,SAAS,CAAC,IAAI,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC;wBACjD,CAAC,CAAC,IAAI;wBACN,CAAC,CAAC,SAAS,EACb,CAAC,SAAS,IAAI,IAAA,mBAAY,EAAC,SAAS,CAAC,CAAC,IAAI,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC;wBAChE,CAAC,CAAC,IAAI;wBACN,CAAC,CAAC,SAAS,IAAI,IAAI,CACtB,CAAC;gBACJ,CAAC,CAAC,CAAC;YACL,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const utils_1 = require("@typescript-eslint/utils");
|
|
4
|
-
const eslint_utils_1 = require("@typescript-eslint/utils/eslint-utils");
|
|
5
4
|
const util_1 = require("../util");
|
|
6
5
|
exports.default = (0, util_1.createRule)({
|
|
7
6
|
name: 'consistent-generic-constructors',
|
|
@@ -25,7 +24,6 @@ exports.default = (0, util_1.createRule)({
|
|
|
25
24
|
},
|
|
26
25
|
defaultOptions: ['constructor'],
|
|
27
26
|
create(context, [mode]) {
|
|
28
|
-
const sourceCode = (0, eslint_utils_1.getSourceCode)(context);
|
|
29
27
|
return {
|
|
30
28
|
'VariableDeclarator,PropertyDefinition,:matches(FunctionDeclaration,FunctionExpression) > AssignmentPattern'(node) {
|
|
31
29
|
function getLHSRHS() {
|
|
@@ -56,7 +54,8 @@ exports.default = (0, util_1.createRule)({
|
|
|
56
54
|
if (mode === 'type-annotation') {
|
|
57
55
|
if (!lhs && rhs.typeArguments) {
|
|
58
56
|
const { typeArguments, callee } = rhs;
|
|
59
|
-
const typeAnnotation = sourceCode.getText(callee) +
|
|
57
|
+
const typeAnnotation = context.sourceCode.getText(callee) +
|
|
58
|
+
context.sourceCode.getText(typeArguments);
|
|
60
59
|
context.report({
|
|
61
60
|
node,
|
|
62
61
|
messageId: 'preferTypeAnnotation',
|
|
@@ -70,7 +69,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
70
69
|
}
|
|
71
70
|
// If the property's computed, we have to attach the
|
|
72
71
|
// annotation after the square bracket, not the enclosed expression
|
|
73
|
-
return sourceCode.getTokenAfter(node.key);
|
|
72
|
+
return context.sourceCode.getTokenAfter(node.key);
|
|
74
73
|
}
|
|
75
74
|
return [
|
|
76
75
|
fixer.remove(typeArguments),
|
|
@@ -82,9 +81,9 @@ exports.default = (0, util_1.createRule)({
|
|
|
82
81
|
return;
|
|
83
82
|
}
|
|
84
83
|
if (lhs?.typeArguments && !rhs.typeArguments) {
|
|
85
|
-
const hasParens = sourceCode.getTokenAfter(rhs.callee)?.value === '(';
|
|
86
|
-
const extraComments = new Set(sourceCode.getCommentsInside(lhs.parent));
|
|
87
|
-
sourceCode
|
|
84
|
+
const hasParens = context.sourceCode.getTokenAfter(rhs.callee)?.value === '(';
|
|
85
|
+
const extraComments = new Set(context.sourceCode.getCommentsInside(lhs.parent));
|
|
86
|
+
context.sourceCode
|
|
88
87
|
.getCommentsInside(lhs.typeArguments)
|
|
89
88
|
.forEach(c => extraComments.delete(c));
|
|
90
89
|
context.report({
|
|
@@ -93,9 +92,9 @@ exports.default = (0, util_1.createRule)({
|
|
|
93
92
|
*fix(fixer) {
|
|
94
93
|
yield fixer.remove(lhs.parent);
|
|
95
94
|
for (const comment of extraComments) {
|
|
96
|
-
yield fixer.insertTextAfter(rhs.callee, sourceCode.getText(comment));
|
|
95
|
+
yield fixer.insertTextAfter(rhs.callee, context.sourceCode.getText(comment));
|
|
97
96
|
}
|
|
98
|
-
yield fixer.insertTextAfter(rhs.callee, sourceCode.getText(lhs.typeArguments));
|
|
97
|
+
yield fixer.insertTextAfter(rhs.callee, context.sourceCode.getText(lhs.typeArguments));
|
|
99
98
|
if (!hasParens) {
|
|
100
99
|
yield fixer.insertTextAfter(rhs.callee, '()');
|
|
101
100
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consistent-generic-constructors.js","sourceRoot":"","sources":["../../src/rules/consistent-generic-constructors.ts"],"names":[],"mappings":";;AACA,oDAA0D;
|
|
1
|
+
{"version":3,"file":"consistent-generic-constructors.js","sourceRoot":"","sources":["../../src/rules/consistent-generic-constructors.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const utils_1 = require("@typescript-eslint/utils");
|
|
4
|
-
const eslint_utils_1 = require("@typescript-eslint/utils/eslint-utils");
|
|
5
4
|
const util_1 = require("../util");
|
|
6
5
|
exports.default = (0, util_1.createRule)({
|
|
7
6
|
name: 'consistent-indexed-object-style',
|
|
@@ -25,7 +24,6 @@ exports.default = (0, util_1.createRule)({
|
|
|
25
24
|
},
|
|
26
25
|
defaultOptions: ['record'],
|
|
27
26
|
create(context, [mode]) {
|
|
28
|
-
const sourceCode = (0, eslint_utils_1.getSourceCode)(context);
|
|
29
27
|
function checkMembers(members, node, parentId, prefix, postfix, safeFix = true) {
|
|
30
28
|
if (members.length !== 1) {
|
|
31
29
|
return;
|
|
@@ -47,7 +45,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
47
45
|
return;
|
|
48
46
|
}
|
|
49
47
|
if (parentId) {
|
|
50
|
-
const scope =
|
|
48
|
+
const scope = context.sourceCode.getScope(parentId);
|
|
51
49
|
const superVar = utils_1.ASTUtils.findVariable(scope, parentId.name);
|
|
52
50
|
if (superVar) {
|
|
53
51
|
const isCircular = superVar.references.some(item => item.isTypeReference &&
|
|
@@ -63,8 +61,8 @@ exports.default = (0, util_1.createRule)({
|
|
|
63
61
|
messageId: 'preferRecord',
|
|
64
62
|
fix: safeFix
|
|
65
63
|
? (fixer) => {
|
|
66
|
-
const key = sourceCode.getText(keyType.typeAnnotation);
|
|
67
|
-
const value = sourceCode.getText(valueType.typeAnnotation);
|
|
64
|
+
const key = context.sourceCode.getText(keyType.typeAnnotation);
|
|
65
|
+
const value = context.sourceCode.getText(valueType.typeAnnotation);
|
|
68
66
|
const record = member.readonly
|
|
69
67
|
? `Readonly<Record<${key}, ${value}>>`
|
|
70
68
|
: `Record<${key}, ${value}>`;
|
|
@@ -91,8 +89,8 @@ exports.default = (0, util_1.createRule)({
|
|
|
91
89
|
node,
|
|
92
90
|
messageId: 'preferIndexSignature',
|
|
93
91
|
fix(fixer) {
|
|
94
|
-
const key = sourceCode.getText(params[0]);
|
|
95
|
-
const type = sourceCode.getText(params[1]);
|
|
92
|
+
const key = context.sourceCode.getText(params[0]);
|
|
93
|
+
const type = context.sourceCode.getText(params[1]);
|
|
96
94
|
return fixer.replaceText(node, `{ [key: ${key}]: ${type} }`);
|
|
97
95
|
},
|
|
98
96
|
});
|
|
@@ -107,7 +105,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
107
105
|
let genericTypes = '';
|
|
108
106
|
if (node.typeParameters?.params.length) {
|
|
109
107
|
genericTypes = `<${node.typeParameters.params
|
|
110
|
-
.map(p => sourceCode.getText(p))
|
|
108
|
+
.map(p => context.sourceCode.getText(p))
|
|
111
109
|
.join(', ')}>`;
|
|
112
110
|
}
|
|
113
111
|
checkMembers(node.body.body, node, node.id, `type ${node.id.name}${genericTypes} = `, ';', !node.extends.length);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consistent-indexed-object-style.js","sourceRoot":"","sources":["../../src/rules/consistent-indexed-object-style.ts"],"names":[],"mappings":";;AACA,oDAAoE;
|
|
1
|
+
{"version":3,"file":"consistent-indexed-object-style.js","sourceRoot":"","sources":["../../src/rules/consistent-indexed-object-style.ts"],"names":[],"mappings":";;AACA,oDAAoE;AAEpE,kCAAqC;AAKrC,kBAAe,IAAA,iBAAU,EAAsB;IAC7C,IAAI,EAAE,iCAAiC;IACvC,IAAI,EAAE;QACJ,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE;YACJ,WAAW,EAAE,uCAAuC;YACpD,WAAW,EAAE,WAAW;SACzB;QACD,QAAQ,EAAE;YACR,YAAY,EAAE,gDAAgD;YAC9D,oBAAoB,EAAE,gDAAgD;SACvE;QACD,OAAO,EAAE,MAAM;QACf,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,CAAC,QAAQ,EAAE,iBAAiB,CAAC;aACpC;SACF;KACF;IACD,cAAc,EAAE,CAAC,QAAQ,CAAC;IAC1B,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC;QACpB,SAAS,YAAY,CACnB,OAA+B,EAC/B,IAA8D,EAC9D,QAAyC,EACzC,MAAc,EACd,OAAe,EACf,OAAO,GAAG,IAAI;YAEd,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACzB,OAAO;YACT,CAAC;YACD,MAAM,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC;YAEzB,IAAI,MAAM,CAAC,IAAI,KAAK,sBAAc,CAAC,gBAAgB,EAAE,CAAC;gBACpD,OAAO;YACT,CAAC;YAED,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAC1C,IAAI,SAAS,EAAE,IAAI,KAAK,sBAAc,CAAC,UAAU,EAAE,CAAC;gBAClD,OAAO;YACT,CAAC;YAED,MAAM,OAAO,GAAG,SAAS,CAAC,cAAc,CAAC;YACzC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO;YACT,CAAC;YAED,MAAM,SAAS,GAAG,MAAM,CAAC,cAAc,CAAC;YACxC,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,OAAO;YACT,CAAC;YAED,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,KAAK,GAAG,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;gBACpD,MAAM,QAAQ,GAAG,gBAAQ,CAAC,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAC7D,IAAI,QAAQ,EAAE,CAAC;oBACb,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC,IAAI,CACzC,IAAI,CAAC,EAAE,CACL,IAAI,CAAC,eAAe;wBACpB,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;wBACzC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAC5C,CAAC;oBACF,IAAI,UAAU,EAAE,CAAC;wBACf,OAAO;oBACT,CAAC;gBACH,CAAC;YACH,CAAC;YAED,OAAO,CAAC,MAAM,CAAC;gBACb,IAAI;gBACJ,SAAS,EAAE,cAAc;gBACzB,GAAG,EAAE,OAAO;oBACV,CAAC,CAAC,CAAC,KAAK,EAAoB,EAAE;wBAC1B,MAAM,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;wBAC/D,MAAM,KAAK,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CACtC,SAAS,CAAC,cAAc,CACzB,CAAC;wBACF,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ;4BAC5B,CAAC,CAAC,mBAAmB,GAAG,KAAK,KAAK,IAAI;4BACtC,CAAC,CAAC,UAAU,GAAG,KAAK,KAAK,GAAG,CAAC;wBAC/B,OAAO,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,EAAE,CAAC,CAAC;oBACjE,CAAC;oBACH,CAAC,CAAC,IAAI;aACT,CAAC,CAAC;QACL,CAAC;QAED,OAAO;YACL,GAAG,CAAC,IAAI,KAAK,iBAAiB,IAAI;gBAChC,eAAe,CAAC,IAAI;oBAClB,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;oBAC/B,IAAI,QAAQ,CAAC,IAAI,KAAK,sBAAc,CAAC,UAAU,EAAE,CAAC;wBAChD,OAAO;oBACT,CAAC;oBACD,IAAI,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;wBAC/B,OAAO;oBACT,CAAC;oBAED,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC;oBAC1C,IAAI,MAAM,EAAE,MAAM,KAAK,CAAC,EAAE,CAAC;wBACzB,OAAO;oBACT,CAAC;oBAED,OAAO,CAAC,MAAM,CAAC;wBACb,IAAI;wBACJ,SAAS,EAAE,sBAAsB;wBACjC,GAAG,CAAC,KAAK;4BACP,MAAM,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;4BAClD,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;4BACnD,OAAO,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,WAAW,GAAG,MAAM,IAAI,IAAI,CAAC,CAAC;wBAC/D,CAAC;qBACF,CAAC,CAAC;gBACL,CAAC;aACF,CAAC;YACF,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI;gBACvB,aAAa,CAAC,IAAI;oBAChB,MAAM,MAAM,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;oBAC3C,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;gBACvD,CAAC;gBACD,sBAAsB,CAAC,IAAI;oBACzB,IAAI,YAAY,GAAG,EAAE,CAAC;oBAEtB,IAAI,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;wBACvC,YAAY,GAAG,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM;6BAC1C,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;6BACvC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;oBACnB,CAAC;oBAED,YAAY,CACV,IAAI,CAAC,IAAI,CAAC,IAAI,EACd,IAAI,EACJ,IAAI,CAAC,EAAE,EACP,QAAQ,IAAI,CAAC,EAAE,CAAC,IAAI,GAAG,YAAY,KAAK,EACxC,GAAG,EACH,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CACrB,CAAC;gBACJ,CAAC;aACF,CAAC;SACH,CAAC;IACJ,CAAC;CACF,CAAC,CAAC;AAEH,SAAS,qBAAqB,CAC5B,IAAmB;IAEnB,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,sBAAc,CAAC,gBAAgB,EAAE,CAAC;QACxE,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,sBAAc,CAAC,sBAAsB,EAAE,CAAC;YAC/D,OAAO,IAAI,CAAC,MAAM,CAAC;QACrB,CAAC;QACD,OAAO,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -24,7 +24,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
const utils_1 = require("@typescript-eslint/utils");
|
|
27
|
-
const eslint_utils_1 = require("@typescript-eslint/utils/eslint-utils");
|
|
28
27
|
const ts = __importStar(require("typescript"));
|
|
29
28
|
const util_1 = require("../util");
|
|
30
29
|
const getWrappedCode_1 = require("../util/getWrappedCode");
|
|
@@ -86,7 +85,6 @@ exports.default = (0, util_1.createRule)({
|
|
|
86
85
|
},
|
|
87
86
|
],
|
|
88
87
|
create(context, [options]) {
|
|
89
|
-
const sourceCode = (0, eslint_utils_1.getSourceCode)(context);
|
|
90
88
|
const parserServices = (0, util_1.getParserServices)(context, true);
|
|
91
89
|
function isConst(node) {
|
|
92
90
|
if (node.type !== utils_1.AST_NODE_TYPES.TSTypeReference) {
|
|
@@ -99,13 +97,13 @@ exports.default = (0, util_1.createRule)({
|
|
|
99
97
|
// Capture parentheses before and after the node
|
|
100
98
|
let beforeCount = 0;
|
|
101
99
|
let afterCount = 0;
|
|
102
|
-
if ((0, util_1.isParenthesized)(node, sourceCode)) {
|
|
103
|
-
const bodyOpeningParen = sourceCode.getTokenBefore(node, util_1.isOpeningParenToken);
|
|
104
|
-
const bodyClosingParen = sourceCode.getTokenAfter(node, util_1.isClosingParenToken);
|
|
100
|
+
if ((0, util_1.isParenthesized)(node, context.sourceCode)) {
|
|
101
|
+
const bodyOpeningParen = context.sourceCode.getTokenBefore(node, util_1.isOpeningParenToken);
|
|
102
|
+
const bodyClosingParen = context.sourceCode.getTokenAfter(node, util_1.isClosingParenToken);
|
|
105
103
|
beforeCount = node.range[0] - bodyOpeningParen.range[0];
|
|
106
104
|
afterCount = bodyClosingParen.range[1] - node.range[1];
|
|
107
105
|
}
|
|
108
|
-
return sourceCode.getText(node, beforeCount, afterCount);
|
|
106
|
+
return context.sourceCode.getText(node, beforeCount, afterCount);
|
|
109
107
|
}
|
|
110
108
|
function reportIncorrectAssertionType(node) {
|
|
111
109
|
const messageId = options.assertionStyle;
|
|
@@ -117,7 +115,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
117
115
|
node,
|
|
118
116
|
messageId,
|
|
119
117
|
data: messageId !== 'never'
|
|
120
|
-
? { cast: sourceCode.getText(node.typeAnnotation) }
|
|
118
|
+
? { cast: context.sourceCode.getText(node.typeAnnotation) }
|
|
121
119
|
: {},
|
|
122
120
|
fix: messageId === 'as'
|
|
123
121
|
? (fixer) => {
|
|
@@ -126,8 +124,8 @@ exports.default = (0, util_1.createRule)({
|
|
|
126
124
|
* AsExpression has lower precedence than TypeAssertionExpression,
|
|
127
125
|
* so we don't need to wrap expression and typeAnnotation in parens.
|
|
128
126
|
*/
|
|
129
|
-
const expressionCode = sourceCode.getText(node.expression);
|
|
130
|
-
const typeAnnotationCode = sourceCode.getText(node.typeAnnotation);
|
|
127
|
+
const expressionCode = context.sourceCode.getText(node.expression);
|
|
128
|
+
const typeAnnotationCode = context.sourceCode.getText(node.typeAnnotation);
|
|
131
129
|
const asPrecedence = (0, util_1.getOperatorPrecedence)(ts.SyntaxKind.AsExpression, ts.SyntaxKind.Unknown);
|
|
132
130
|
const parentPrecedence = (0, util_1.getOperatorPrecedence)(tsNode.parent.kind, ts.isBinaryExpression(tsNode.parent)
|
|
133
131
|
? tsNode.parent.operatorToken.kind
|
|
@@ -136,7 +134,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
136
134
|
tsNode.parent.arguments.length > 0
|
|
137
135
|
: undefined);
|
|
138
136
|
const text = `${expressionCode} as ${typeAnnotationCode}`;
|
|
139
|
-
return fixer.replaceText(node, (0, util_1.isParenthesized)(node, sourceCode)
|
|
137
|
+
return fixer.replaceText(node, (0, util_1.isParenthesized)(node, context.sourceCode)
|
|
140
138
|
? text
|
|
141
139
|
: (0, getWrappedCode_1.getWrappedCode)(text, asPrecedence, parentPrecedence));
|
|
142
140
|
}
|
|
@@ -179,19 +177,19 @@ exports.default = (0, util_1.createRule)({
|
|
|
179
177
|
const { parent } = node;
|
|
180
178
|
suggest.push({
|
|
181
179
|
messageId: 'replaceObjectTypeAssertionWithAnnotation',
|
|
182
|
-
data: { cast: sourceCode.getText(node.typeAnnotation) },
|
|
180
|
+
data: { cast: context.sourceCode.getText(node.typeAnnotation) },
|
|
183
181
|
fix: fixer => [
|
|
184
|
-
fixer.insertTextAfter(parent.id, `: ${sourceCode.getText(node.typeAnnotation)}`),
|
|
182
|
+
fixer.insertTextAfter(parent.id, `: ${context.sourceCode.getText(node.typeAnnotation)}`),
|
|
185
183
|
fixer.replaceText(node, getTextWithParentheses(node.expression)),
|
|
186
184
|
],
|
|
187
185
|
});
|
|
188
186
|
}
|
|
189
187
|
suggest.push({
|
|
190
188
|
messageId: 'replaceObjectTypeAssertionWithSatisfies',
|
|
191
|
-
data: { cast: sourceCode.getText(node.typeAnnotation) },
|
|
189
|
+
data: { cast: context.sourceCode.getText(node.typeAnnotation) },
|
|
192
190
|
fix: fixer => [
|
|
193
191
|
fixer.replaceText(node, getTextWithParentheses(node.expression)),
|
|
194
|
-
fixer.insertTextAfter(node, ` satisfies ${
|
|
192
|
+
fixer.insertTextAfter(node, ` satisfies ${context.sourceCode.getText(node.typeAnnotation)}`),
|
|
195
193
|
],
|
|
196
194
|
});
|
|
197
195
|
context.report({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consistent-type-assertions.js","sourceRoot":"","sources":["../../src/rules/consistent-type-assertions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,oDAA0D;AAC1D
|
|
1
|
+
{"version":3,"file":"consistent-type-assertions.js","sourceRoot":"","sources":["../../src/rules/consistent-type-assertions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const utils_1 = require("@typescript-eslint/utils");
|
|
4
|
-
const eslint_utils_1 = require("@typescript-eslint/utils/eslint-utils");
|
|
5
4
|
const util_1 = require("../util");
|
|
6
5
|
exports.default = (0, util_1.createRule)({
|
|
7
6
|
name: 'consistent-type-definitions',
|
|
@@ -25,13 +24,14 @@ exports.default = (0, util_1.createRule)({
|
|
|
25
24
|
},
|
|
26
25
|
defaultOptions: ['interface'],
|
|
27
26
|
create(context, [option]) {
|
|
28
|
-
const sourceCode = (0, eslint_utils_1.getSourceCode)(context);
|
|
29
27
|
/**
|
|
30
28
|
* Iterates from the highest parent to the currently traversed node
|
|
31
29
|
* to determine whether any node in tree is globally declared module declaration
|
|
32
30
|
*/
|
|
33
|
-
function isCurrentlyTraversedNodeWithinModuleDeclaration() {
|
|
34
|
-
return
|
|
31
|
+
function isCurrentlyTraversedNodeWithinModuleDeclaration(node) {
|
|
32
|
+
return context.sourceCode
|
|
33
|
+
.getAncestors(node)
|
|
34
|
+
.some(node => node.type === utils_1.AST_NODE_TYPES.TSModuleDeclaration &&
|
|
35
35
|
node.declare &&
|
|
36
36
|
node.global);
|
|
37
37
|
}
|
|
@@ -44,12 +44,12 @@ exports.default = (0, util_1.createRule)({
|
|
|
44
44
|
fix(fixer) {
|
|
45
45
|
const typeNode = node.typeParameters ?? node.id;
|
|
46
46
|
const fixes = [];
|
|
47
|
-
const firstToken = sourceCode.getTokenBefore(node.id);
|
|
47
|
+
const firstToken = context.sourceCode.getTokenBefore(node.id);
|
|
48
48
|
if (firstToken) {
|
|
49
49
|
fixes.push(fixer.replaceText(firstToken, 'interface'));
|
|
50
50
|
fixes.push(fixer.replaceTextRange([typeNode.range[1], node.typeAnnotation.range[0]], ' '));
|
|
51
51
|
}
|
|
52
|
-
const afterToken = sourceCode.getTokenAfter(node.typeAnnotation);
|
|
52
|
+
const afterToken = context.sourceCode.getTokenAfter(node.typeAnnotation);
|
|
53
53
|
if (afterToken &&
|
|
54
54
|
afterToken.type === utils_1.AST_TOKEN_TYPES.Punctuator &&
|
|
55
55
|
afterToken.value === ';') {
|
|
@@ -62,18 +62,18 @@ exports.default = (0, util_1.createRule)({
|
|
|
62
62
|
}),
|
|
63
63
|
...(option === 'type' && {
|
|
64
64
|
TSInterfaceDeclaration(node) {
|
|
65
|
-
const fix = isCurrentlyTraversedNodeWithinModuleDeclaration()
|
|
65
|
+
const fix = isCurrentlyTraversedNodeWithinModuleDeclaration(node)
|
|
66
66
|
? null
|
|
67
67
|
: (fixer) => {
|
|
68
68
|
const typeNode = node.typeParameters ?? node.id;
|
|
69
69
|
const fixes = [];
|
|
70
|
-
const firstToken = sourceCode.getTokenBefore(node.id);
|
|
70
|
+
const firstToken = context.sourceCode.getTokenBefore(node.id);
|
|
71
71
|
if (firstToken) {
|
|
72
72
|
fixes.push(fixer.replaceText(firstToken, 'type'));
|
|
73
73
|
fixes.push(fixer.replaceTextRange([typeNode.range[1], node.body.range[0]], ' = '));
|
|
74
74
|
}
|
|
75
75
|
node.extends.forEach(heritage => {
|
|
76
|
-
const typeIdentifier = sourceCode.getText(heritage);
|
|
76
|
+
const typeIdentifier = context.sourceCode.getText(heritage);
|
|
77
77
|
fixes.push(fixer.insertTextAfter(node.body, ` & ${typeIdentifier}`));
|
|
78
78
|
});
|
|
79
79
|
if (node.parent.type === utils_1.AST_NODE_TYPES.ExportDefaultDeclaration) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consistent-type-definitions.js","sourceRoot":"","sources":["../../src/rules/consistent-type-definitions.ts"],"names":[],"mappings":";;AACA,oDAA2E;
|
|
1
|
+
{"version":3,"file":"consistent-type-definitions.js","sourceRoot":"","sources":["../../src/rules/consistent-type-definitions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const utils_1 = require("@typescript-eslint/utils");
|
|
4
|
-
const eslint_utils_1 = require("@typescript-eslint/utils/eslint-utils");
|
|
5
4
|
const typescript_1 = require("typescript");
|
|
6
5
|
const util_1 = require("../util");
|
|
7
6
|
exports.default = (0, util_1.createRule)({
|
|
@@ -36,7 +35,6 @@ exports.default = (0, util_1.createRule)({
|
|
|
36
35
|
},
|
|
37
36
|
],
|
|
38
37
|
create(context, [{ fixMixedExportsWithInlineTypeSpecifier }]) {
|
|
39
|
-
const sourceCode = (0, eslint_utils_1.getSourceCode)(context);
|
|
40
38
|
const sourceExportsMap = {};
|
|
41
39
|
const services = (0, util_1.getParserServices)(context);
|
|
42
40
|
/**
|
|
@@ -127,7 +125,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
127
125
|
node: report.node,
|
|
128
126
|
messageId: 'typeOverValue',
|
|
129
127
|
*fix(fixer) {
|
|
130
|
-
yield* fixExportInsertType(fixer, sourceCode, report.node);
|
|
128
|
+
yield* fixExportInsertType(fixer, context.sourceCode, report.node);
|
|
131
129
|
},
|
|
132
130
|
});
|
|
133
131
|
continue;
|
|
@@ -145,7 +143,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
145
143
|
yield* fixAddTypeSpecifierToNamedExports(fixer, report);
|
|
146
144
|
}
|
|
147
145
|
else {
|
|
148
|
-
yield* fixSeparateNamedExports(fixer, sourceCode, report);
|
|
146
|
+
yield* fixSeparateNamedExports(fixer, context.sourceCode, report);
|
|
149
147
|
}
|
|
150
148
|
},
|
|
151
149
|
});
|
|
@@ -161,7 +159,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
161
159
|
yield* fixAddTypeSpecifierToNamedExports(fixer, report);
|
|
162
160
|
}
|
|
163
161
|
else {
|
|
164
|
-
yield* fixSeparateNamedExports(fixer, sourceCode, report);
|
|
162
|
+
yield* fixSeparateNamedExports(fixer, context.sourceCode, report);
|
|
165
163
|
}
|
|
166
164
|
},
|
|
167
165
|
});
|