@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
|
@@ -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
|
exports.default = (0, util_1.createRule)({
|
|
@@ -88,7 +87,6 @@ exports.default = (0, util_1.createRule)({
|
|
|
88
87
|
]);
|
|
89
88
|
const services = (0, util_1.getParserServices)(context);
|
|
90
89
|
const checker = services.program.getTypeChecker();
|
|
91
|
-
const sourceCode = (0, eslint_utils_1.getSourceCode)(context);
|
|
92
90
|
function validateNode(node) {
|
|
93
91
|
const signatures = services.getTypeAtLocation(node).getCallSignatures();
|
|
94
92
|
if (!signatures.length) {
|
|
@@ -116,33 +114,33 @@ exports.default = (0, util_1.createRule)({
|
|
|
116
114
|
return context.report({
|
|
117
115
|
messageId: 'missingAsync',
|
|
118
116
|
node,
|
|
119
|
-
loc: (0, util_1.getFunctionHeadLoc)(node, sourceCode),
|
|
117
|
+
loc: (0, util_1.getFunctionHeadLoc)(node, context.sourceCode),
|
|
120
118
|
});
|
|
121
119
|
}
|
|
122
120
|
context.report({
|
|
123
121
|
messageId: 'missingAsync',
|
|
124
122
|
node,
|
|
125
|
-
loc: (0, util_1.getFunctionHeadLoc)(node, sourceCode),
|
|
123
|
+
loc: (0, util_1.getFunctionHeadLoc)(node, context.sourceCode),
|
|
126
124
|
fix: fixer => {
|
|
127
125
|
if (node.parent.type === utils_1.AST_NODE_TYPES.MethodDefinition ||
|
|
128
126
|
(node.parent.type === utils_1.AST_NODE_TYPES.Property && node.parent.method)) {
|
|
129
127
|
// this function is a class method or object function property shorthand
|
|
130
128
|
const method = node.parent;
|
|
131
129
|
// the token to put `async` before
|
|
132
|
-
let keyToken = sourceCode.getFirstToken(method);
|
|
130
|
+
let keyToken = context.sourceCode.getFirstToken(method);
|
|
133
131
|
// if there are decorators then skip past them
|
|
134
132
|
if (method.type === utils_1.AST_NODE_TYPES.MethodDefinition &&
|
|
135
133
|
method.decorators.length) {
|
|
136
134
|
const lastDecorator = method.decorators[method.decorators.length - 1];
|
|
137
|
-
keyToken = sourceCode.getTokenAfter(lastDecorator);
|
|
135
|
+
keyToken = context.sourceCode.getTokenAfter(lastDecorator);
|
|
138
136
|
}
|
|
139
137
|
// if current token is a keyword like `static` or `public` then skip it
|
|
140
138
|
while (keyToken.type === utils_1.AST_TOKEN_TYPES.Keyword &&
|
|
141
139
|
keyToken.range[0] < method.key.range[0]) {
|
|
142
|
-
keyToken = sourceCode.getTokenAfter(keyToken);
|
|
140
|
+
keyToken = context.sourceCode.getTokenAfter(keyToken);
|
|
143
141
|
}
|
|
144
142
|
// check if there is a space between key and previous token
|
|
145
|
-
const insertSpace = !sourceCode.isSpaceBetween(sourceCode.getTokenBefore(keyToken), keyToken);
|
|
143
|
+
const insertSpace = !context.sourceCode.isSpaceBetween(context.sourceCode.getTokenBefore(keyToken), keyToken);
|
|
146
144
|
let code = 'async ';
|
|
147
145
|
if (insertSpace) {
|
|
148
146
|
code = ` ${code}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"promise-function-async.js","sourceRoot":"","sources":["../../src/rules/promise-function-async.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,oDAA2E;AAC3E
|
|
1
|
+
{"version":3,"file":"promise-function-async.js","sourceRoot":"","sources":["../../src/rules/promise-function-async.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 tsutils = __importStar(require("ts-api-utils"));
|
|
29
28
|
const util_1 = require("../util");
|
|
30
29
|
exports.default = (0, util_1.createRule)({
|
|
@@ -46,7 +45,6 @@ exports.default = (0, util_1.createRule)({
|
|
|
46
45
|
create(context) {
|
|
47
46
|
const services = (0, util_1.getParserServices)(context);
|
|
48
47
|
const checker = services.program.getTypeChecker();
|
|
49
|
-
const sourceCode = (0, eslint_utils_1.getSourceCode)(context);
|
|
50
48
|
let scopeInfo = null;
|
|
51
49
|
/**
|
|
52
50
|
* Push the scope info object to the stack.
|
|
@@ -75,7 +73,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
75
73
|
!(scopeInfo.isGen && scopeInfo.isAsyncYield)) {
|
|
76
74
|
context.report({
|
|
77
75
|
node,
|
|
78
|
-
loc: getFunctionHeadLoc(node, sourceCode),
|
|
76
|
+
loc: (0, util_1.getFunctionHeadLoc)(node, context.sourceCode),
|
|
79
77
|
messageId: 'missingAwait',
|
|
80
78
|
data: {
|
|
81
79
|
name: (0, util_1.upperCaseFirst)((0, util_1.getFunctionNameWithKind)(node)),
|
|
@@ -167,42 +165,6 @@ function isEmptyFunction(node) {
|
|
|
167
165
|
return (node.body.type === utils_1.AST_NODE_TYPES.BlockStatement &&
|
|
168
166
|
node.body.body.length === 0);
|
|
169
167
|
}
|
|
170
|
-
// https://github.com/eslint/eslint/blob/03a69dbe86d5b5768a310105416ae726822e3c1c/lib/rules/utils/ast-utils.js#L382-L392
|
|
171
|
-
/**
|
|
172
|
-
* Gets the `(` token of the given function node.
|
|
173
|
-
*/
|
|
174
|
-
function getOpeningParenOfParams(node, sourceCode) {
|
|
175
|
-
return (0, util_1.nullThrows)(node.id
|
|
176
|
-
? sourceCode.getTokenAfter(node.id, util_1.isOpeningParenToken)
|
|
177
|
-
: sourceCode.getFirstToken(node, util_1.isOpeningParenToken), util_1.NullThrowsReasons.MissingToken('(', node.type));
|
|
178
|
-
}
|
|
179
|
-
// https://github.com/eslint/eslint/blob/03a69dbe86d5b5768a310105416ae726822e3c1c/lib/rules/utils/ast-utils.js#L1220-L1242
|
|
180
|
-
/**
|
|
181
|
-
* Gets the location of the given function node for reporting.
|
|
182
|
-
*/
|
|
183
|
-
function getFunctionHeadLoc(node, sourceCode) {
|
|
184
|
-
const parent = (0, util_1.nullThrows)(node.parent, util_1.NullThrowsReasons.MissingParent);
|
|
185
|
-
let start = null;
|
|
186
|
-
let end = null;
|
|
187
|
-
if (node.type === utils_1.AST_NODE_TYPES.ArrowFunctionExpression) {
|
|
188
|
-
const arrowToken = (0, util_1.nullThrows)(sourceCode.getTokenBefore(node.body, util_1.isArrowToken), util_1.NullThrowsReasons.MissingToken('=>', node.type));
|
|
189
|
-
start = arrowToken.loc.start;
|
|
190
|
-
end = arrowToken.loc.end;
|
|
191
|
-
}
|
|
192
|
-
else if (parent.type === utils_1.AST_NODE_TYPES.Property ||
|
|
193
|
-
parent.type === utils_1.AST_NODE_TYPES.MethodDefinition) {
|
|
194
|
-
start = parent.loc.start;
|
|
195
|
-
end = getOpeningParenOfParams(node, sourceCode).loc.start;
|
|
196
|
-
}
|
|
197
|
-
else {
|
|
198
|
-
start = node.loc.start;
|
|
199
|
-
end = getOpeningParenOfParams(node, sourceCode).loc.start;
|
|
200
|
-
}
|
|
201
|
-
return {
|
|
202
|
-
start,
|
|
203
|
-
end,
|
|
204
|
-
};
|
|
205
|
-
}
|
|
206
168
|
function expandUnionOrIntersectionType(type) {
|
|
207
169
|
if (type.isUnionOrIntersection()) {
|
|
208
170
|
return type.types.flatMap(expandUnionOrIntersectionType);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"require-await.js","sourceRoot":"","sources":["../../src/rules/require-await.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,oDAA0D;AAC1D,
|
|
1
|
+
{"version":3,"file":"require-await.js","sourceRoot":"","sources":["../../src/rules/require-await.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 tsutils = __importStar(require("ts-api-utils"));
|
|
29
28
|
const ts = __importStar(require("typescript"));
|
|
30
29
|
const util_1 = require("../util");
|
|
@@ -56,7 +55,6 @@ exports.default = (0, util_1.createRule)({
|
|
|
56
55
|
create(context, [option]) {
|
|
57
56
|
const services = (0, util_1.getParserServices)(context);
|
|
58
57
|
const checker = services.program.getTypeChecker();
|
|
59
|
-
const sourceCode = (0, eslint_utils_1.getSourceCode)(context);
|
|
60
58
|
const scopeInfoStack = [];
|
|
61
59
|
function enterFunction(node) {
|
|
62
60
|
scopeInfoStack.push({
|
|
@@ -115,7 +113,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
115
113
|
/* istanbul ignore if */ if (!(0, util_1.isAwaitExpression)(node)) {
|
|
116
114
|
return null;
|
|
117
115
|
}
|
|
118
|
-
const awaitToken = sourceCode.getFirstToken(node, util_1.isAwaitKeyword);
|
|
116
|
+
const awaitToken = context.sourceCode.getFirstToken(node, util_1.isAwaitKeyword);
|
|
119
117
|
// Should always be the case; but let's be safe.
|
|
120
118
|
/* istanbul ignore if */ if (!awaitToken) {
|
|
121
119
|
return null;
|
|
@@ -123,7 +121,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
123
121
|
const startAt = awaitToken.range[0];
|
|
124
122
|
let endAt = awaitToken.range[1];
|
|
125
123
|
// Also remove any extraneous whitespace after `await`, if there is any.
|
|
126
|
-
const nextToken = sourceCode.getTokenAfter(awaitToken, {
|
|
124
|
+
const nextToken = context.sourceCode.getTokenAfter(awaitToken, {
|
|
127
125
|
includeComments: true,
|
|
128
126
|
});
|
|
129
127
|
if (nextToken) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"return-await.js","sourceRoot":"","sources":["../../src/rules/return-await.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,oDAA0D;AAC1D,
|
|
1
|
+
{"version":3,"file":"return-await.js","sourceRoot":"","sources":["../../src/rules/return-await.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
|
var Group;
|
|
7
6
|
(function (Group) {
|
|
@@ -142,7 +141,6 @@ exports.default = (0, util_1.createRule)({
|
|
|
142
141
|
},
|
|
143
142
|
],
|
|
144
143
|
create(context, [{ checkIntersections, checkUnions, groupOrder }]) {
|
|
145
|
-
const sourceCode = (0, eslint_utils_1.getSourceCode)(context);
|
|
146
144
|
const collator = new Intl.Collator('en', {
|
|
147
145
|
sensitivity: 'base',
|
|
148
146
|
numeric: true,
|
|
@@ -153,7 +151,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
153
151
|
return {
|
|
154
152
|
group: group === -1 ? Number.MAX_SAFE_INTEGER : group,
|
|
155
153
|
node: type,
|
|
156
|
-
text: sourceCode.getText(type),
|
|
154
|
+
text: context.sourceCode.getText(type),
|
|
157
155
|
};
|
|
158
156
|
});
|
|
159
157
|
const expectedOrder = [...sourceOrder].sort((a, b) => {
|
|
@@ -164,8 +162,8 @@ exports.default = (0, util_1.createRule)({
|
|
|
164
162
|
(a.text < b.text ? -1 : a.text > b.text ? 1 : 0));
|
|
165
163
|
});
|
|
166
164
|
const hasComments = node.types.some(type => {
|
|
167
|
-
const count = sourceCode.getCommentsBefore(type).length +
|
|
168
|
-
sourceCode.getCommentsAfter(type).length;
|
|
165
|
+
const count = context.sourceCode.getCommentsBefore(type).length +
|
|
166
|
+
context.sourceCode.getCommentsAfter(type).length;
|
|
169
167
|
return count > 0;
|
|
170
168
|
});
|
|
171
169
|
for (let i = 0; i < expectedOrder.length; i += 1) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sort-type-constituents.js","sourceRoot":"","sources":["../../src/rules/sort-type-constituents.ts"],"names":[],"mappings":";;AACA,oDAA0D;
|
|
1
|
+
{"version":3,"file":"sort-type-constituents.js","sourceRoot":"","sources":["../../src/rules/sort-type-constituents.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const eslint_utils_1 = require("@typescript-eslint/utils/eslint-utils");
|
|
4
3
|
const util_1 = require("../util");
|
|
5
4
|
const getESLintCoreRule_1 = require("../util/getESLintCoreRule");
|
|
6
5
|
const baseRule = (0, getESLintCoreRule_1.getESLintCoreRule)('space-before-blocks');
|
|
@@ -28,7 +27,6 @@ exports.default = (0, util_1.createRule)({
|
|
|
28
27
|
defaultOptions: ['always'],
|
|
29
28
|
create(context, [config]) {
|
|
30
29
|
const rules = baseRule.create(context);
|
|
31
|
-
const sourceCode = (0, eslint_utils_1.getSourceCode)(context);
|
|
32
30
|
let requireSpace = true;
|
|
33
31
|
if (typeof config === 'object') {
|
|
34
32
|
requireSpace = config.classes === 'always';
|
|
@@ -37,10 +35,9 @@ exports.default = (0, util_1.createRule)({
|
|
|
37
35
|
requireSpace = false;
|
|
38
36
|
}
|
|
39
37
|
function checkPrecedingSpace(node) {
|
|
40
|
-
const precedingToken = sourceCode.getTokenBefore(node);
|
|
38
|
+
const precedingToken = context.sourceCode.getTokenBefore(node);
|
|
41
39
|
if (precedingToken && (0, util_1.isTokenOnSameLine)(precedingToken, node)) {
|
|
42
|
-
|
|
43
|
-
const hasSpace = sourceCode.isSpaceBetweenTokens(precedingToken, node);
|
|
40
|
+
const hasSpace = context.sourceCode.isSpaceBetween(precedingToken, node);
|
|
44
41
|
if (requireSpace && !hasSpace) {
|
|
45
42
|
context.report({
|
|
46
43
|
node,
|
|
@@ -65,7 +62,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
65
62
|
}
|
|
66
63
|
}
|
|
67
64
|
function checkSpaceAfterEnum(node) {
|
|
68
|
-
const punctuator = sourceCode.getTokenAfter(node.id);
|
|
65
|
+
const punctuator = context.sourceCode.getTokenAfter(node.id);
|
|
69
66
|
if (punctuator) {
|
|
70
67
|
checkPrecedingSpace(punctuator);
|
|
71
68
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"space-before-blocks.js","sourceRoot":"","sources":["../../src/rules/space-before-blocks.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"space-before-blocks.js","sourceRoot":"","sources":["../../src/rules/space-before-blocks.ts"],"names":[],"mappings":";;AAMA,kCAAwD;AACxD,iEAA8D;AAE9D,MAAM,QAAQ,GAAG,IAAA,qCAAiB,EAAC,qBAAqB,CAAC,CAAC;AAK1D,kBAAe,IAAA,iBAAU,EAAsB;IAC7C,IAAI,EAAE,qBAAqB;IAC3B,IAAI,EAAE;QACJ,UAAU,EAAE,IAAI;QAChB,UAAU,EAAE,CAAC,mCAAmC,CAAC;QACjD,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE;YACJ,WAAW,EAAE,0CAA0C;YACvD,eAAe,EAAE,IAAI;SACtB;QACD,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,OAAO;QAC9B,cAAc,EAAE,QAAQ,CAAC,IAAI,CAAC,cAAc;QAC5C,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM;QAC5B,QAAQ,EAAE;YACR,mHAAmH;YACnH,eAAe,EAAE,wCAAwC;YACzD,mHAAmH;YACnH,YAAY,EAAE,qCAAqC;YACnD,GAAG,QAAQ,CAAC,IAAI,CAAC,QAAQ;SAC1B;KACF;IACD,cAAc,EAAE,CAAC,QAAQ,CAAC;IAC1B,MAAM,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC;QACtB,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAEvC,IAAI,YAAY,GAAG,IAAI,CAAC;QAExB,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC/B,YAAY,GAAG,MAAM,CAAC,OAAO,KAAK,QAAQ,CAAC;QAC7C,CAAC;aAAM,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;YAC9B,YAAY,GAAG,KAAK,CAAC;QACvB,CAAC;QAED,SAAS,mBAAmB,CAC1B,IAA+C;YAE/C,MAAM,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YAC/D,IAAI,cAAc,IAAI,IAAA,wBAAiB,EAAC,cAAc,EAAE,IAAI,CAAC,EAAE,CAAC;gBAC9D,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,cAAc,CAChD,cAAc,EACd,IAAsB,CACvB,CAAC;gBAEF,IAAI,YAAY,IAAI,CAAC,QAAQ,EAAE,CAAC;oBAC9B,OAAO,CAAC,MAAM,CAAC;wBACb,IAAI;wBACJ,SAAS,EAAE,cAAc;wBACzB,GAAG,CAAC,KAAK;4BACP,OAAO,KAAK,CAAC,gBAAgB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;wBAC3C,CAAC;qBACF,CAAC,CAAC;gBACL,CAAC;qBAAM,IAAI,CAAC,YAAY,IAAI,QAAQ,EAAE,CAAC;oBACrC,OAAO,CAAC,MAAM,CAAC;wBACb,IAAI;wBACJ,SAAS,EAAE,iBAAiB;wBAC5B,GAAG,CAAC,KAAK;4BACP,OAAO,KAAK,CAAC,WAAW,CAAC;gCACvB,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;gCACvB,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;6BACd,CAAC,CAAC;wBACL,CAAC;qBACF,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;QAED,SAAS,mBAAmB,CAAC,IAAgC;YAC3D,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC7D,IAAI,UAAU,EAAE,CAAC;gBACf,mBAAmB,CAAC,UAAU,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;QAED,OAAO;YACL,GAAG,KAAK;YACR,iBAAiB,EAAE,mBAAmB;YACtC,eAAe,EAAE,mBAAmB;SACrC,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: 'space-before-function-paren',
|
|
@@ -49,7 +48,6 @@ exports.default = (0, util_1.createRule)({
|
|
|
49
48
|
},
|
|
50
49
|
defaultOptions: ['always'],
|
|
51
50
|
create(context, [firstOption]) {
|
|
52
|
-
const sourceCode = (0, eslint_utils_1.getSourceCode)(context);
|
|
53
51
|
const baseConfig = typeof firstOption === 'string' ? firstOption : 'always';
|
|
54
52
|
const overrideConfig = typeof firstOption === 'object' ? firstOption : {};
|
|
55
53
|
/**
|
|
@@ -75,7 +73,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
75
73
|
if (node.type === utils_1.AST_NODE_TYPES.ArrowFunctionExpression) {
|
|
76
74
|
// Always ignore non-async functions and arrow functions without parens, e.g. async foo => bar
|
|
77
75
|
if (node.async &&
|
|
78
|
-
(0, util_1.isOpeningParenToken)(sourceCode.getFirstToken(node, { skip: 1 }))) {
|
|
76
|
+
(0, util_1.isOpeningParenToken)(context.sourceCode.getFirstToken(node, { skip: 1 }))) {
|
|
79
77
|
return overrideConfig.asyncArrow ?? baseConfig;
|
|
80
78
|
}
|
|
81
79
|
}
|
|
@@ -100,15 +98,14 @@ exports.default = (0, util_1.createRule)({
|
|
|
100
98
|
let leftToken;
|
|
101
99
|
let rightToken;
|
|
102
100
|
if (node.typeParameters) {
|
|
103
|
-
leftToken = sourceCode.getLastToken(node.typeParameters);
|
|
104
|
-
rightToken = sourceCode.getTokenAfter(leftToken);
|
|
101
|
+
leftToken = context.sourceCode.getLastToken(node.typeParameters);
|
|
102
|
+
rightToken = context.sourceCode.getTokenAfter(leftToken);
|
|
105
103
|
}
|
|
106
104
|
else {
|
|
107
|
-
rightToken = sourceCode.getFirstToken(node, util_1.isOpeningParenToken);
|
|
108
|
-
leftToken = sourceCode.getTokenBefore(rightToken);
|
|
105
|
+
rightToken = context.sourceCode.getFirstToken(node, util_1.isOpeningParenToken);
|
|
106
|
+
leftToken = context.sourceCode.getTokenBefore(rightToken);
|
|
109
107
|
}
|
|
110
|
-
|
|
111
|
-
const hasSpacing = sourceCode.isSpaceBetweenTokens(leftToken, rightToken);
|
|
108
|
+
const hasSpacing = context.sourceCode.isSpaceBetween(leftToken, rightToken);
|
|
112
109
|
if (hasSpacing && functionConfig === 'never') {
|
|
113
110
|
context.report({
|
|
114
111
|
node,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"space-before-function-paren.js","sourceRoot":"","sources":["../../src/rules/space-before-function-paren.ts"],"names":[],"mappings":";;AACA,oDAA0D;
|
|
1
|
+
{"version":3,"file":"space-before-function-paren.js","sourceRoot":"","sources":["../../src/rules/space-before-function-paren.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)('space-infix-ops');
|
|
@@ -32,7 +31,6 @@ exports.default = (0, util_1.createRule)({
|
|
|
32
31
|
],
|
|
33
32
|
create(context) {
|
|
34
33
|
const rules = baseRule.create(context);
|
|
35
|
-
const sourceCode = (0, eslint_utils_1.getSourceCode)(context);
|
|
36
34
|
function report(operator) {
|
|
37
35
|
context.report({
|
|
38
36
|
node: operator,
|
|
@@ -41,8 +39,8 @@ exports.default = (0, util_1.createRule)({
|
|
|
41
39
|
operator: operator.value,
|
|
42
40
|
},
|
|
43
41
|
fix(fixer) {
|
|
44
|
-
const previousToken = sourceCode.getTokenBefore(operator);
|
|
45
|
-
const afterToken = sourceCode.getTokenAfter(operator);
|
|
42
|
+
const previousToken = context.sourceCode.getTokenBefore(operator);
|
|
43
|
+
const afterToken = context.sourceCode.getTokenAfter(operator);
|
|
46
44
|
let fixString = '';
|
|
47
45
|
if (operator.range[0] - previousToken.range[1] === 0) {
|
|
48
46
|
fixString = ' ';
|
|
@@ -62,11 +60,11 @@ exports.default = (0, util_1.createRule)({
|
|
|
62
60
|
if (!rightNode || !leftNode) {
|
|
63
61
|
return;
|
|
64
62
|
}
|
|
65
|
-
const operator = sourceCode.getFirstTokenBetween(leftNode, rightNode, isSpaceChar);
|
|
66
|
-
const prev = sourceCode.getTokenBefore(operator);
|
|
67
|
-
const next = sourceCode.getTokenAfter(operator);
|
|
68
|
-
if (!sourceCode.isSpaceBetween(prev, operator) ||
|
|
69
|
-
!sourceCode.isSpaceBetween(operator, next)) {
|
|
63
|
+
const operator = context.sourceCode.getFirstTokenBetween(leftNode, rightNode, isSpaceChar);
|
|
64
|
+
const prev = context.sourceCode.getTokenBefore(operator);
|
|
65
|
+
const next = context.sourceCode.getTokenAfter(operator);
|
|
66
|
+
if (!context.sourceCode.isSpaceBetween(prev, operator) ||
|
|
67
|
+
!context.sourceCode.isSpaceBetween(operator, next)) {
|
|
70
68
|
report(operator);
|
|
71
69
|
}
|
|
72
70
|
}
|
|
@@ -83,7 +81,7 @@ exports.default = (0, util_1.createRule)({
|
|
|
83
81
|
*/
|
|
84
82
|
function checkForPropertyDefinitionAssignmentSpace(node) {
|
|
85
83
|
const leftNode = node.optional && !node.typeAnnotation
|
|
86
|
-
? sourceCode.getTokenAfter(node.key)
|
|
84
|
+
? context.sourceCode.getTokenAfter(node.key)
|
|
87
85
|
: node.typeAnnotation ?? node.key;
|
|
88
86
|
checkAndReportAssignmentSpace(leftNode, node.value);
|
|
89
87
|
}
|
|
@@ -97,12 +95,12 @@ exports.default = (0, util_1.createRule)({
|
|
|
97
95
|
const skipFunctionParenthesis = type.type === utils_1.TSESTree.AST_NODE_TYPES.TSFunctionType
|
|
98
96
|
? util_1.isNotOpeningParenToken
|
|
99
97
|
: 0;
|
|
100
|
-
const operator = sourceCode.getTokenBefore(type, skipFunctionParenthesis);
|
|
98
|
+
const operator = context.sourceCode.getTokenBefore(type, skipFunctionParenthesis);
|
|
101
99
|
if (operator != null && UNIONS.includes(operator.value)) {
|
|
102
|
-
const prev = sourceCode.getTokenBefore(operator);
|
|
103
|
-
const next = sourceCode.getTokenAfter(operator);
|
|
104
|
-
if (!sourceCode.isSpaceBetween(prev, operator) ||
|
|
105
|
-
!sourceCode.isSpaceBetween(operator, next)) {
|
|
100
|
+
const prev = context.sourceCode.getTokenBefore(operator);
|
|
101
|
+
const next = context.sourceCode.getTokenAfter(operator);
|
|
102
|
+
if (!context.sourceCode.isSpaceBetween(prev, operator) ||
|
|
103
|
+
!context.sourceCode.isSpaceBetween(operator, next)) {
|
|
106
104
|
report(operator);
|
|
107
105
|
}
|
|
108
106
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"space-infix-ops.js","sourceRoot":"","sources":["../../src/rules/space-infix-ops.ts"],"names":[],"mappings":";;AAAA,oDAAqE;
|
|
1
|
+
{"version":3,"file":"space-infix-ops.js","sourceRoot":"","sources":["../../src/rules/space-infix-ops.ts"],"names":[],"mappings":";;AAAA,oDAAqE;AAMrE,kCAA6D;AAC7D,iEAA8D;AAE9D,MAAM,QAAQ,GAAG,IAAA,qCAAiB,EAAC,iBAAiB,CAAC,CAAC;AAKtD,MAAM,MAAM,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAE1B,kBAAe,IAAA,iBAAU,EAAsB;IAC7C,IAAI,EAAE,iBAAiB;IACvB,IAAI,EAAE;QACJ,UAAU,EAAE,IAAI;QAChB,UAAU,EAAE,CAAC,+BAA+B,CAAC;QAC7C,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE;YACJ,WAAW,EAAE,wCAAwC;YACrD,eAAe,EAAE,IAAI;SACtB;QACD,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,OAAO;QAC9B,cAAc,EAAE,QAAQ,CAAC,IAAI,CAAC,cAAc;QAC5C,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM;QAC5B,QAAQ,EAAE;YACR,mHAAmH;YACnH,YAAY,EAAE,yCAAyC;YACvD,GAAG,QAAQ,CAAC,IAAI,CAAC,QAAQ;SAC1B;KACF;IACD,cAAc,EAAE;QACd;YACE,SAAS,EAAE,KAAK;SACjB;KACF;IACD,MAAM,CAAC,OAAO;QACZ,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAEvC,SAAS,MAAM,CAAC,QAAwB;YACtC,OAAO,CAAC,MAAM,CAAC;gBACb,IAAI,EAAE,QAAQ;gBACd,SAAS,EAAE,cAAc;gBACzB,IAAI,EAAE;oBACJ,QAAQ,EAAE,QAAQ,CAAC,KAAK;iBACzB;gBACD,GAAG,CAAC,KAAK;oBACP,MAAM,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;oBAClE,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;oBAC9D,IAAI,SAAS,GAAG,EAAE,CAAC;oBAEnB,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,aAAc,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;wBACtD,SAAS,GAAG,GAAG,CAAC;oBAClB,CAAC;oBAED,SAAS,IAAI,QAAQ,CAAC,KAAK,CAAC;oBAE5B,IAAI,UAAW,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;wBACnD,SAAS,IAAI,GAAG,CAAC;oBACnB,CAAC;oBAED,OAAO,KAAK,CAAC,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;gBAChD,CAAC;aACF,CAAC,CAAC;QACL,CAAC;QAED,SAAS,WAAW,CAAC,KAAqB;YACxC,OAAO,CACL,KAAK,CAAC,IAAI,KAAK,uBAAe,CAAC,UAAU,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CACzE,CAAC;QACJ,CAAC;QAED,SAAS,6BAA6B,CACpC,QAA+C,EAC/C,SAAiD;YAEjD,IAAI,CAAC,SAAS,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAC5B,OAAO;YACT,CAAC;YAED,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,oBAAoB,CACtD,QAAQ,EACR,SAAS,EACT,WAAW,CACX,CAAC;YAEH,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAE,CAAC;YAC1D,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAE,CAAC;YAEzD,IACE,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC;gBAClD,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,EAClD,CAAC;gBACD,MAAM,CAAC,QAAQ,CAAC,CAAC;YACnB,CAAC;QACH,CAAC;QAED;;;WAGG;QACH,SAAS,2BAA2B,CAAC,IAA2B;YAC9D,6BAA6B,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAC3D,CAAC;QAED;;;WAGG;QACH,SAAS,yCAAyC,CAChD,IAAiC;YAEjC,MAAM,QAAQ,GACZ,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,cAAc;gBACnC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC;gBAC5C,CAAC,CAAC,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,GAAG,CAAC;YAEtC,6BAA6B,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACtD,CAAC;QAED;;;WAGG;QACH,SAAS,2BAA2B,CAClC,cAAkE;YAElE,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC;YAEnC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACnB,MAAM,uBAAuB,GAC3B,IAAI,CAAC,IAAI,KAAK,gBAAQ,CAAC,cAAc,CAAC,cAAc;oBAClD,CAAC,CAAC,6BAAsB;oBACxB,CAAC,CAAC,CAAC,CAAC;gBACR,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,cAAc,CAChD,IAAI,EACJ,uBAAuB,CACxB,CAAC;gBAEF,IAAI,QAAQ,IAAI,IAAI,IAAI,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;oBACxD,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;oBACzD,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;oBAExD,IACE,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,IAAK,EAAE,QAAQ,CAAC;wBACnD,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAK,CAAC,EACnD,CAAC;wBACD,MAAM,CAAC,QAAQ,CAAC,CAAC;oBACnB,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAED;;;WAGG;QACH,SAAS,2BAA2B,CAClC,IAAqC;YAErC,6BAA6B,CAC3B,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,EAAE,EAC9B,IAAI,CAAC,cAAc,CACpB,CAAC;QACJ,CAAC;QAED,SAAS,uBAAuB,CAAC,IAAgC;YAC/D,6BAA6B,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC/D,6BAA6B,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAC/D,CAAC;QAED,OAAO;YACL,GAAG,KAAK;YACR,YAAY,EAAE,2BAA2B;YACzC,kBAAkB,EAAE,yCAAyC;YAC7D,sBAAsB,EAAE,2BAA2B;YACnD,WAAW,EAAE,2BAA2B;YACxC,kBAAkB,EAAE,2BAA2B;YAC/C,iBAAiB,EAAE,uBAAuB;SAC3C,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}
|