@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,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: 'method-signature-style',
|
|
@@ -24,9 +23,8 @@ exports.default = (0, util_1.createRule)({
|
|
|
24
23
|
},
|
|
25
24
|
defaultOptions: ['property'],
|
|
26
25
|
create(context, [mode]) {
|
|
27
|
-
const sourceCode = (0, eslint_utils_1.getSourceCode)(context);
|
|
28
26
|
function getMethodKey(node) {
|
|
29
|
-
let key = sourceCode.getText(node.key);
|
|
27
|
+
let key = context.sourceCode.getText(node.key);
|
|
30
28
|
if (node.computed) {
|
|
31
29
|
key = `[${key}]`;
|
|
32
30
|
}
|
|
@@ -41,12 +39,12 @@ exports.default = (0, util_1.createRule)({
|
|
|
41
39
|
function getMethodParams(node) {
|
|
42
40
|
let params = '()';
|
|
43
41
|
if (node.params.length > 0) {
|
|
44
|
-
const openingParen = (0, util_1.nullThrows)(sourceCode.getTokenBefore(node.params[0], util_1.isOpeningParenToken), 'Missing opening paren before first parameter');
|
|
45
|
-
const closingParen = (0, util_1.nullThrows)(sourceCode.getTokenAfter(node.params[node.params.length - 1], util_1.isClosingParenToken), 'Missing closing paren after last parameter');
|
|
46
|
-
params = sourceCode.text.substring(openingParen.range[0], closingParen.range[1]);
|
|
42
|
+
const openingParen = (0, util_1.nullThrows)(context.sourceCode.getTokenBefore(node.params[0], util_1.isOpeningParenToken), 'Missing opening paren before first parameter');
|
|
43
|
+
const closingParen = (0, util_1.nullThrows)(context.sourceCode.getTokenAfter(node.params[node.params.length - 1], util_1.isClosingParenToken), 'Missing closing paren after last parameter');
|
|
44
|
+
params = context.sourceCode.text.substring(openingParen.range[0], closingParen.range[1]);
|
|
47
45
|
}
|
|
48
46
|
if (node.typeParameters != null) {
|
|
49
|
-
const typeParams = sourceCode.getText(node.typeParameters);
|
|
47
|
+
const typeParams = context.sourceCode.getText(node.typeParameters);
|
|
50
48
|
params = `${typeParams}${params}`;
|
|
51
49
|
}
|
|
52
50
|
return params;
|
|
@@ -56,10 +54,10 @@ exports.default = (0, util_1.createRule)({
|
|
|
56
54
|
? // if the method has no return type, it implicitly has an `any` return type
|
|
57
55
|
// we just make it explicit here so we can do the fix
|
|
58
56
|
'any'
|
|
59
|
-
: sourceCode.getText(node.returnType.typeAnnotation);
|
|
57
|
+
: context.sourceCode.getText(node.returnType.typeAnnotation);
|
|
60
58
|
}
|
|
61
59
|
function getDelimiter(node) {
|
|
62
|
-
const lastToken = sourceCode.getLastToken(node);
|
|
60
|
+
const lastToken = context.sourceCode.getLastToken(node);
|
|
63
61
|
if (lastToken &&
|
|
64
62
|
((0, util_1.isSemicolonToken)(lastToken) || (0, util_1.isCommaToken)(lastToken))) {
|
|
65
63
|
return lastToken.value;
|
|
@@ -121,9 +119,9 @@ exports.default = (0, util_1.createRule)({
|
|
|
121
119
|
const delimiter = getDelimiter(methodNode);
|
|
122
120
|
yield fixer.replaceText(methodNode, `${key}: ${typeString}${delimiter}`);
|
|
123
121
|
for (const node of duplicatedKeyMethodNodes) {
|
|
124
|
-
const lastToken = sourceCode.getLastToken(node);
|
|
122
|
+
const lastToken = context.sourceCode.getLastToken(node);
|
|
125
123
|
if (lastToken) {
|
|
126
|
-
const nextToken = sourceCode.getTokenAfter(lastToken);
|
|
124
|
+
const nextToken = context.sourceCode.getTokenAfter(lastToken);
|
|
127
125
|
if (nextToken) {
|
|
128
126
|
yield fixer.remove(node);
|
|
129
127
|
yield fixer.replaceTextRange([lastToken.range[1], nextToken.range[0]], '');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"method-signature-style.js","sourceRoot":"","sources":["../../src/rules/method-signature-style.ts"],"names":[],"mappings":";;AACA,oDAA0D;
|
|
1
|
+
{"version":3,"file":"method-signature-style.js","sourceRoot":"","sources":["../../src/rules/method-signature-style.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const scope_manager_1 = require("@typescript-eslint/scope-manager");
|
|
4
4
|
const utils_1 = require("@typescript-eslint/utils");
|
|
5
|
-
const eslint_utils_1 = require("@typescript-eslint/utils/eslint-utils");
|
|
6
5
|
const util_1 = require("../util");
|
|
7
6
|
const naming_convention_utils_1 = require("./naming-convention-utils");
|
|
8
7
|
// This essentially mirrors ESLint's `camelcase` rule
|
|
@@ -92,7 +91,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
92
91
|
return modifiers;
|
|
93
92
|
}
|
|
94
93
|
const unusedVariables = (0, util_1.collectUnusedVariables)(context);
|
|
95
|
-
function isUnused(name, initialScope
|
|
94
|
+
function isUnused(name, initialScope) {
|
|
96
95
|
let variable = null;
|
|
97
96
|
let scope = initialScope;
|
|
98
97
|
while (scope) {
|
|
@@ -167,7 +166,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
167
166
|
if (parent.kind === 'const') {
|
|
168
167
|
baseModifiers.add(naming_convention_utils_1.Modifiers.const);
|
|
169
168
|
}
|
|
170
|
-
if (isGlobal(
|
|
169
|
+
if (isGlobal(context.sourceCode.getScope(node))) {
|
|
171
170
|
baseModifiers.add(naming_convention_utils_1.Modifiers.global);
|
|
172
171
|
}
|
|
173
172
|
}
|
|
@@ -176,10 +175,11 @@ exports.default = (0, util_1.createRule)({
|
|
|
176
175
|
if (isDestructured(id)) {
|
|
177
176
|
modifiers.add(naming_convention_utils_1.Modifiers.destructured);
|
|
178
177
|
}
|
|
179
|
-
|
|
178
|
+
const scope = context.sourceCode.getScope(id);
|
|
179
|
+
if (isExported(parent, id.name, scope)) {
|
|
180
180
|
modifiers.add(naming_convention_utils_1.Modifiers.exported);
|
|
181
181
|
}
|
|
182
|
-
if (isUnused(id.name)) {
|
|
182
|
+
if (isUnused(id.name, scope)) {
|
|
183
183
|
modifiers.add(naming_convention_utils_1.Modifiers.unused);
|
|
184
184
|
}
|
|
185
185
|
if (isAsyncVariableIdentifier(id)) {
|
|
@@ -199,7 +199,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
199
199
|
}
|
|
200
200
|
const modifiers = new Set();
|
|
201
201
|
// functions create their own nested scope
|
|
202
|
-
const scope =
|
|
202
|
+
const scope = context.sourceCode.getScope(node).upper;
|
|
203
203
|
if (isGlobal(scope)) {
|
|
204
204
|
modifiers.add(naming_convention_utils_1.Modifiers.global);
|
|
205
205
|
}
|
|
@@ -230,7 +230,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
230
230
|
if (isDestructured(i)) {
|
|
231
231
|
modifiers.add(naming_convention_utils_1.Modifiers.destructured);
|
|
232
232
|
}
|
|
233
|
-
if (isUnused(i.name)) {
|
|
233
|
+
if (isUnused(i.name, context.sourceCode.getScope(i))) {
|
|
234
234
|
modifiers.add(naming_convention_utils_1.Modifiers.unused);
|
|
235
235
|
}
|
|
236
236
|
validator(i, modifiers);
|
|
@@ -358,7 +358,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
358
358
|
}
|
|
359
359
|
const modifiers = new Set();
|
|
360
360
|
// classes create their own nested scope
|
|
361
|
-
const scope =
|
|
361
|
+
const scope = context.sourceCode.getScope(node).upper;
|
|
362
362
|
if (node.abstract) {
|
|
363
363
|
modifiers.add(naming_convention_utils_1.Modifiers.abstract);
|
|
364
364
|
}
|
|
@@ -377,7 +377,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
377
377
|
validator: validators.interface,
|
|
378
378
|
handler: (node, validator) => {
|
|
379
379
|
const modifiers = new Set();
|
|
380
|
-
const scope =
|
|
380
|
+
const scope = context.sourceCode.getScope(node);
|
|
381
381
|
if (isExported(node, node.id.name, scope)) {
|
|
382
382
|
modifiers.add(naming_convention_utils_1.Modifiers.exported);
|
|
383
383
|
}
|
|
@@ -393,7 +393,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
393
393
|
validator: validators.typeAlias,
|
|
394
394
|
handler: (node, validator) => {
|
|
395
395
|
const modifiers = new Set();
|
|
396
|
-
const scope =
|
|
396
|
+
const scope = context.sourceCode.getScope(node);
|
|
397
397
|
if (isExported(node, node.id.name, scope)) {
|
|
398
398
|
modifiers.add(naming_convention_utils_1.Modifiers.exported);
|
|
399
399
|
}
|
|
@@ -410,7 +410,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
410
410
|
handler: (node, validator) => {
|
|
411
411
|
const modifiers = new Set();
|
|
412
412
|
// enums create their own nested scope
|
|
413
|
-
const scope =
|
|
413
|
+
const scope = context.sourceCode.getScope(node).upper;
|
|
414
414
|
if (isExported(node, node.id.name, scope)) {
|
|
415
415
|
modifiers.add(naming_convention_utils_1.Modifiers.exported);
|
|
416
416
|
}
|
|
@@ -426,7 +426,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
426
426
|
validator: validators.typeParameter,
|
|
427
427
|
handler: (node, validator) => {
|
|
428
428
|
const modifiers = new Set();
|
|
429
|
-
const scope =
|
|
429
|
+
const scope = context.sourceCode.getScope(node);
|
|
430
430
|
if (isUnused(node.name.name, scope)) {
|
|
431
431
|
modifiers.add(naming_convention_utils_1.Modifiers.unused);
|
|
432
432
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"naming-convention.js","sourceRoot":"","sources":["../../src/rules/naming-convention.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"naming-convention.js","sourceRoot":"","sources":["../../src/rules/naming-convention.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: 'no-array-constructor',
|
|
@@ -37,7 +36,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
37
36
|
if (node.arguments.length === 0) {
|
|
38
37
|
return fixer.replaceText(node, '[]');
|
|
39
38
|
}
|
|
40
|
-
const fullText =
|
|
39
|
+
const fullText = context.sourceCode.getText(node);
|
|
41
40
|
const preambleLength = node.callee.range[1] - node.range[0];
|
|
42
41
|
return fixer.replaceText(node, `[${fullText.slice(preambleLength + 1, -1)}]`);
|
|
43
42
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"no-array-constructor.js","sourceRoot":"","sources":["../../src/rules/no-array-constructor.ts"],"names":[],"mappings":";;AACA,oDAA0D;
|
|
1
|
+
{"version":3,"file":"no-array-constructor.js","sourceRoot":"","sources":["../../src/rules/no-array-constructor.ts"],"names":[],"mappings":";;AACA,oDAA0D;AAE1D,kCAA+D;AAE/D,kBAAe,IAAA,iBAAU,EAAC;IACxB,IAAI,EAAE,sBAAsB;IAC5B,IAAI,EAAE;QACJ,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE;YACJ,WAAW,EAAE,uCAAuC;YACpD,WAAW,EAAE,aAAa;YAC1B,eAAe,EAAE,IAAI;SACtB;QACD,OAAO,EAAE,MAAM;QACf,QAAQ,EAAE;YACR,UAAU,EAAE,8CAA8C;SAC3D;QACD,MAAM,EAAE,EAAE;KACX;IACD,cAAc,EAAE,EAAE;IAClB,MAAM,CAAC,OAAO;QACZ;;;WAGG;QACH,SAAS,KAAK,CACZ,IAAsD;YAEtD,IACE,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;gBAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,sBAAc,CAAC,UAAU;gBAC9C,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,OAAO;gBAC5B,CAAC,IAAI,CAAC,aAAa;gBACnB,CAAC,IAAA,+BAAwB,EAAC,IAAI,CAAC,EAC/B,CAAC;gBACD,OAAO,CAAC,MAAM,CAAC;oBACb,IAAI;oBACJ,SAAS,EAAE,YAAY;oBACvB,GAAG,CAAC,KAAK;wBACP,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;4BAChC,OAAO,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;wBACvC,CAAC;wBACD,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;wBAClD,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;wBAE5D,OAAO,KAAK,CAAC,WAAW,CACtB,IAAI,EACJ,IAAI,QAAQ,CAAC,KAAK,CAAC,cAAc,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAC9C,CAAC;oBACJ,CAAC;iBACF,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO;YACL,cAAc,EAAE,KAAK;YACrB,aAAa,EAAE,KAAK;SACrB,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: 'no-array-delete',
|
|
@@ -57,8 +56,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
57
56
|
const rawKey = nodeMap.get(property).getText();
|
|
58
57
|
const key = shouldHaveParentheses ? `(${rawKey})` : rawKey;
|
|
59
58
|
let suggestion = `${target}.splice(${key}, 1)`;
|
|
60
|
-
const
|
|
61
|
-
const comments = sourceCode.getCommentsInside(node);
|
|
59
|
+
const comments = context.sourceCode.getCommentsInside(node);
|
|
62
60
|
if (comments.length > 0) {
|
|
63
61
|
const indentationCount = node.loc.start.column;
|
|
64
62
|
const indentation = ' '.repeat(indentationCount);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"no-array-delete.js","sourceRoot":"","sources":["../../src/rules/no-array-delete.ts"],"names":[],"mappings":";;AACA,oDAA2E;
|
|
1
|
+
{"version":3,"file":"no-array-delete.js","sourceRoot":"","sources":["../../src/rules/no-array-delete.ts"],"names":[],"mappings":"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"}
|
|
@@ -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
|
var Usefulness;
|
|
@@ -80,7 +79,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
80
79
|
context.report({
|
|
81
80
|
data: {
|
|
82
81
|
certainty,
|
|
83
|
-
name:
|
|
82
|
+
name: context.sourceCode.getText(node),
|
|
84
83
|
},
|
|
85
84
|
messageId: 'baseToString',
|
|
86
85
|
node,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"no-base-to-string.js","sourceRoot":"","sources":["../../src/rules/no-base-to-string.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,oDAA0D;AAC1D
|
|
1
|
+
{"version":3,"file":"no-base-to-string.js","sourceRoot":"","sources":["../../src/rules/no-base-to-string.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: 'no-confusing-non-null-assertion',
|
|
@@ -23,7 +22,6 @@ exports.default = (0, util_1.createRule)({
|
|
|
23
22
|
},
|
|
24
23
|
defaultOptions: [],
|
|
25
24
|
create(context) {
|
|
26
|
-
const sourceCode = (0, eslint_utils_1.getSourceCode)(context);
|
|
27
25
|
return {
|
|
28
26
|
'BinaryExpression, AssignmentExpression'(node) {
|
|
29
27
|
function isLeftHandPrimaryExpression(node) {
|
|
@@ -33,8 +31,8 @@ exports.default = (0, util_1.createRule)({
|
|
|
33
31
|
node.operator === '===' ||
|
|
34
32
|
node.operator === '=') {
|
|
35
33
|
const isAssign = node.operator === '=';
|
|
36
|
-
const leftHandFinalToken = sourceCode.getLastToken(node.left);
|
|
37
|
-
const tokenAfterLeft = sourceCode.getTokenAfter(node.left);
|
|
34
|
+
const leftHandFinalToken = context.sourceCode.getLastToken(node.left);
|
|
35
|
+
const tokenAfterLeft = context.sourceCode.getTokenAfter(node.left);
|
|
38
36
|
if (leftHandFinalToken?.type === utils_1.AST_TOKEN_TYPES.Punctuator &&
|
|
39
37
|
leftHandFinalToken.value === '!' &&
|
|
40
38
|
tokenAfterLeft?.value !== ')') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"no-confusing-non-null-assertion.js","sourceRoot":"","sources":["../../src/rules/no-confusing-non-null-assertion.ts"],"names":[],"mappings":";;AACA,oDAA2E;
|
|
1
|
+
{"version":3,"file":"no-confusing-non-null-assertion.js","sourceRoot":"","sources":["../../src/rules/no-confusing-non-null-assertion.ts"],"names":[],"mappings":";;AACA,oDAA2E;AAE3E,kCAAqC;AAErC,kBAAe,IAAA,iBAAU,EAAC;IACxB,IAAI,EAAE,iCAAiC;IACvC,IAAI,EAAE;QACJ,IAAI,EAAE,SAAS;QACf,IAAI,EAAE;YACJ,WAAW,EACT,gEAAgE;YAClE,WAAW,EAAE,WAAW;SACzB;QACD,cAAc,EAAE,IAAI;QACpB,QAAQ,EAAE;YACR,cAAc,EACZ,8HAA8H;YAChI,eAAe,EACb,4HAA4H;YAC9H,kBAAkB,EAAE,mDAAmD;YACvE,eAAe,EACb,6DAA6D;YAC/D,UAAU,EACR,6EAA6E;SAChF;QACD,MAAM,EAAE,EAAE;KACX;IACD,cAAc,EAAE,EAAE;IAClB,MAAM,CAAC,OAAO;QACZ,OAAO;YACL,wCAAwC,CACtC,IAA+D;gBAE/D,SAAS,2BAA2B,CAClC,IAAsD;oBAEtD,OAAO,IAAI,CAAC,IAAI,KAAK,sBAAc,CAAC,mBAAmB,CAAC;gBAC1D,CAAC;gBAED,IACE,IAAI,CAAC,QAAQ,KAAK,IAAI;oBACtB,IAAI,CAAC,QAAQ,KAAK,KAAK;oBACvB,IAAI,CAAC,QAAQ,KAAK,GAAG,EACrB,CAAC;oBACD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,KAAK,GAAG,CAAC;oBACvC,MAAM,kBAAkB,GAAG,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBACtE,MAAM,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBACnE,IACE,kBAAkB,EAAE,IAAI,KAAK,uBAAe,CAAC,UAAU;wBACvD,kBAAkB,CAAC,KAAK,KAAK,GAAG;wBAChC,cAAc,EAAE,KAAK,KAAK,GAAG,EAC7B,CAAC;wBACD,IAAI,2BAA2B,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;4BAC3C,OAAO,CAAC,MAAM,CAAC;gCACb,IAAI;gCACJ,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,gBAAgB;gCAC1D,OAAO,EAAE;oCACP;wCACE,SAAS,EAAE,QAAQ;4CACjB,CAAC,CAAC,iBAAiB;4CACnB,CAAC,CAAC,oBAAoB;wCACxB,GAAG,EAAE,CAAC,KAAK,EAAsB,EAAE,CAAC;4CAClC,KAAK,CAAC,MAAM,CAAC,kBAAkB,CAAC;yCACjC;qCACF;iCACF;6BACF,CAAC,CAAC;wBACL,CAAC;6BAAM,CAAC;4BACN,OAAO,CAAC,MAAM,CAAC;gCACb,IAAI;gCACJ,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,gBAAgB;gCAC1D,OAAO,EAAE;oCACP;wCACE,SAAS,EAAE,YAAY;wCACvB,GAAG,EAAE,CAAC,KAAK,EAAsB,EAAE,CAAC;4CAClC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC;4CACtC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC;yCACtC;qCACF;iCACF;6BACF,CAAC,CAAC;wBACL,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC,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 tsutils = __importStar(require("ts-api-utils"));
|
|
29
28
|
const ts = __importStar(require("typescript"));
|
|
30
29
|
const util_1 = require("../util");
|
|
@@ -68,7 +67,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
68
67
|
fixable: 'code',
|
|
69
68
|
hasSuggestions: true,
|
|
70
69
|
},
|
|
71
|
-
defaultOptions: [{}],
|
|
70
|
+
defaultOptions: [{ ignoreArrowShorthand: false, ignoreVoidOperator: false }],
|
|
72
71
|
create(context, [options]) {
|
|
73
72
|
return {
|
|
74
73
|
'AwaitExpression, CallExpression, TaggedTemplateExpression'(node) {
|
|
@@ -83,9 +82,8 @@ exports.default = (0, util_1.createRule)({
|
|
|
83
82
|
// void expression is in valid position
|
|
84
83
|
return;
|
|
85
84
|
}
|
|
86
|
-
const sourceCode = (0, eslint_utils_1.getSourceCode)(context);
|
|
87
85
|
const wrapVoidFix = (fixer) => {
|
|
88
|
-
const nodeText = sourceCode.getText(node);
|
|
86
|
+
const nodeText = context.sourceCode.getText(node);
|
|
89
87
|
const newNodeText = `void ${nodeText}`;
|
|
90
88
|
return fixer.replaceText(node, newNodeText);
|
|
91
89
|
};
|
|
@@ -109,11 +107,11 @@ exports.default = (0, util_1.createRule)({
|
|
|
109
107
|
return null;
|
|
110
108
|
}
|
|
111
109
|
const arrowBody = arrowFunction.body;
|
|
112
|
-
const arrowBodyText = sourceCode.getText(arrowBody);
|
|
110
|
+
const arrowBodyText = context.sourceCode.getText(arrowBody);
|
|
113
111
|
const newArrowBodyText = `{ ${arrowBodyText}; }`;
|
|
114
|
-
if ((0, util_1.isParenthesized)(arrowBody, sourceCode)) {
|
|
115
|
-
const bodyOpeningParen = sourceCode.getTokenBefore(arrowBody, util_1.isOpeningParenToken);
|
|
116
|
-
const bodyClosingParen = sourceCode.getTokenAfter(arrowBody, util_1.isClosingParenToken);
|
|
112
|
+
if ((0, util_1.isParenthesized)(arrowBody, context.sourceCode)) {
|
|
113
|
+
const bodyOpeningParen = context.sourceCode.getTokenBefore(arrowBody, util_1.isOpeningParenToken);
|
|
114
|
+
const bodyClosingParen = context.sourceCode.getTokenAfter(arrowBody, util_1.isClosingParenToken);
|
|
117
115
|
return fixer.replaceTextRange([bodyOpeningParen.range[0], bodyClosingParen.range[1]], newArrowBodyText);
|
|
118
116
|
}
|
|
119
117
|
return fixer.replaceText(arrowBody, newArrowBodyText);
|
|
@@ -141,9 +139,9 @@ exports.default = (0, util_1.createRule)({
|
|
|
141
139
|
return null;
|
|
142
140
|
}
|
|
143
141
|
const returnValue = returnStmt.argument;
|
|
144
|
-
const returnValueText = sourceCode.getText(returnValue);
|
|
142
|
+
const returnValueText = context.sourceCode.getText(returnValue);
|
|
145
143
|
let newReturnStmtText = `${returnValueText};`;
|
|
146
|
-
if (isPreventingASI(returnValue
|
|
144
|
+
if (isPreventingASI(returnValue)) {
|
|
147
145
|
// put a semicolon at the beginning of the line
|
|
148
146
|
newReturnStmtText = `;${newReturnStmtText}`;
|
|
149
147
|
}
|
|
@@ -157,9 +155,9 @@ exports.default = (0, util_1.createRule)({
|
|
|
157
155
|
messageId: 'invalidVoidExprReturn',
|
|
158
156
|
fix(fixer) {
|
|
159
157
|
const returnValue = returnStmt.argument;
|
|
160
|
-
const returnValueText = sourceCode.getText(returnValue);
|
|
158
|
+
const returnValueText = context.sourceCode.getText(returnValue);
|
|
161
159
|
let newReturnStmtText = `${returnValueText}; return;`;
|
|
162
|
-
if (isPreventingASI(returnValue
|
|
160
|
+
if (isPreventingASI(returnValue)) {
|
|
163
161
|
// put a semicolon at the beginning of the line
|
|
164
162
|
newReturnStmtText = `;${newReturnStmtText}`;
|
|
165
163
|
}
|
|
@@ -276,8 +274,8 @@ exports.default = (0, util_1.createRule)({
|
|
|
276
274
|
*
|
|
277
275
|
* This happens if the line begins with `(`, `[` or `` ` ``
|
|
278
276
|
*/
|
|
279
|
-
function isPreventingASI(node
|
|
280
|
-
const startToken = (0, util_1.nullThrows)(sourceCode.getFirstToken(node), util_1.NullThrowsReasons.MissingToken('first token', node.type));
|
|
277
|
+
function isPreventingASI(node) {
|
|
278
|
+
const startToken = (0, util_1.nullThrows)(context.sourceCode.getFirstToken(node), util_1.NullThrowsReasons.MissingToken('first token', node.type));
|
|
281
279
|
return ['(', '[', '`'].includes(startToken.value);
|
|
282
280
|
}
|
|
283
281
|
function canFix(node) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"no-confusing-void-expression.js","sourceRoot":"","sources":["../../src/rules/no-confusing-void-expression.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,oDAA0D;AAC1D,
|
|
1
|
+
{"version":3,"file":"no-confusing-void-expression.js","sourceRoot":"","sources":["../../src/rules/no-confusing-void-expression.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,18 +33,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
33
33
|
}
|
|
34
34
|
return {
|
|
35
35
|
...rules,
|
|
36
|
-
|
|
37
|
-
...(rules.MethodDefinition
|
|
38
|
-
? {
|
|
39
|
-
MethodDefinition: wrapMemberDefinitionListener(rules.MethodDefinition),
|
|
40
|
-
}
|
|
41
|
-
: {}),
|
|
42
|
-
// for ESLint v8
|
|
43
|
-
...(rules['MethodDefinition, PropertyDefinition']
|
|
44
|
-
? {
|
|
45
|
-
'MethodDefinition, PropertyDefinition': wrapMemberDefinitionListener(rules['MethodDefinition, PropertyDefinition']),
|
|
46
|
-
}
|
|
47
|
-
: {}),
|
|
36
|
+
'MethodDefinition, PropertyDefinition': wrapMemberDefinitionListener(rules['MethodDefinition, PropertyDefinition']),
|
|
48
37
|
};
|
|
49
38
|
},
|
|
50
39
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"no-dupe-class-members.js","sourceRoot":"","sources":["../../src/rules/no-dupe-class-members.ts"],"names":[],"mappings":";;AACA,oDAA0D;AAM1D,kCAAqC;AACrC,iEAA8D;AAE9D,MAAM,QAAQ,GAAG,IAAA,qCAAiB,EAAC,uBAAuB,CAAC,CAAC;AAK5D,kBAAe,IAAA,iBAAU,EAAsB;IAC7C,IAAI,EAAE,uBAAuB;IAC7B,IAAI,EAAE;QACJ,IAAI,EAAE,SAAS;QACf,IAAI,EAAE;YACJ,WAAW,EAAE,kCAAkC;YAC/C,eAAe,EAAE,IAAI;SACtB;QACD,cAAc,EAAE,QAAQ,CAAC,IAAI,CAAC,cAAc;QAC5C,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM;QAC5B,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ;KACjC;IACD,cAAc,EAAE,EAAE;IAClB,MAAM,CAAC,OAAO;QACZ,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAEvC,SAAS,4BAA4B,CAEnC,YAA+B;YAC/B,OAAO,CAAC,IAAO,EAAQ,EAAE;gBACvB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;oBAClB,OAAO;gBACT,CAAC;gBAED,IACE,IAAI,CAAC,KAAK;oBACV,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,sBAAc,CAAC,6BAA6B,EAChE,CAAC;oBACD,OAAO;gBACT,CAAC;gBAED,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC;YAC5B,CAAC,CAAC;QACJ,CAAC;QAED,OAAO;YACL,GAAG,KAAK;YACR,
|
|
1
|
+
{"version":3,"file":"no-dupe-class-members.js","sourceRoot":"","sources":["../../src/rules/no-dupe-class-members.ts"],"names":[],"mappings":";;AACA,oDAA0D;AAM1D,kCAAqC;AACrC,iEAA8D;AAE9D,MAAM,QAAQ,GAAG,IAAA,qCAAiB,EAAC,uBAAuB,CAAC,CAAC;AAK5D,kBAAe,IAAA,iBAAU,EAAsB;IAC7C,IAAI,EAAE,uBAAuB;IAC7B,IAAI,EAAE;QACJ,IAAI,EAAE,SAAS;QACf,IAAI,EAAE;YACJ,WAAW,EAAE,kCAAkC;YAC/C,eAAe,EAAE,IAAI;SACtB;QACD,cAAc,EAAE,QAAQ,CAAC,IAAI,CAAC,cAAc;QAC5C,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM;QAC5B,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ;KACjC;IACD,cAAc,EAAE,EAAE;IAClB,MAAM,CAAC,OAAO;QACZ,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAEvC,SAAS,4BAA4B,CAEnC,YAA+B;YAC/B,OAAO,CAAC,IAAO,EAAQ,EAAE;gBACvB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;oBAClB,OAAO;gBACT,CAAC;gBAED,IACE,IAAI,CAAC,KAAK;oBACV,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,sBAAc,CAAC,6BAA6B,EAChE,CAAC;oBACD,OAAO;gBACT,CAAC;gBAED,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC;YAC5B,CAAC,CAAC;QACJ,CAAC;QAED,OAAO;YACL,GAAG,KAAK;YACR,sCAAsC,EAAE,4BAA4B,CAClE,KAAK,CAAC,sCAAsC,CAAC,CAC9C;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
|
const astIgnoreKeys = new Set(['range', 'loc', 'parent']);
|
|
7
6
|
const isSameAstNode = (actualNode, expectedNode) => {
|
|
@@ -95,11 +94,10 @@ exports.default = (0, util_1.createRule)({
|
|
|
95
94
|
}, []);
|
|
96
95
|
}
|
|
97
96
|
function reportDuplicate(duplicateConstituent, parentNode) {
|
|
98
|
-
const
|
|
99
|
-
const beforeTokens = sourceCode.getTokensBefore(duplicateConstituent.duplicated, { filter: token => token.value === '|' || token.value === '&' });
|
|
97
|
+
const beforeTokens = context.sourceCode.getTokensBefore(duplicateConstituent.duplicated, { filter: token => token.value === '|' || token.value === '&' });
|
|
100
98
|
const beforeUnionOrIntersectionToken = beforeTokens[beforeTokens.length - 1];
|
|
101
|
-
const bracketBeforeTokens = sourceCode.getTokensBetween(beforeUnionOrIntersectionToken, duplicateConstituent.duplicated);
|
|
102
|
-
const bracketAfterTokens = sourceCode.getTokensAfter(duplicateConstituent.duplicated, { count: bracketBeforeTokens.length });
|
|
99
|
+
const bracketBeforeTokens = context.sourceCode.getTokensBetween(beforeUnionOrIntersectionToken, duplicateConstituent.duplicated);
|
|
100
|
+
const bracketAfterTokens = context.sourceCode.getTokensAfter(duplicateConstituent.duplicated, { count: bracketBeforeTokens.length });
|
|
103
101
|
const reportLocation = {
|
|
104
102
|
start: duplicateConstituent.duplicated.loc.start,
|
|
105
103
|
end: bracketAfterTokens.length > 0
|
|
@@ -111,7 +109,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
111
109
|
type: parentNode.type === utils_1.AST_NODE_TYPES.TSIntersectionType
|
|
112
110
|
? 'Intersection'
|
|
113
111
|
: 'Union',
|
|
114
|
-
previous: sourceCode.getText(duplicateConstituent.duplicatePrevious),
|
|
112
|
+
previous: context.sourceCode.getText(duplicateConstituent.duplicatePrevious),
|
|
115
113
|
},
|
|
116
114
|
messageId: 'duplicate',
|
|
117
115
|
node: duplicateConstituent.duplicated,
|