@typescript-eslint/eslint-plugin 8.70.1-alpha.12 → 8.70.1-alpha.14

package/dist/rules/await-thenable.js

@@ -77,7 +77,18 @@ exports.default = (0, util_1.createRule)({
                                 messageId: 'removeAwait',
                                 fix(fixer) {
                                     const awaitKeyword = (0, util_1.nullThrows)(context.sourceCode.getFirstToken(node, util_1.isAwaitKeyword), util_1.NullThrowsReasons.MissingToken('await', 'await expression'));
-                                    return fixer.remove(awaitKeyword);
+                                    const awaitTokenRemovalRange = (0, util_1.getAwaitTokenRemovalRange)(context.sourceCode, awaitKeyword);
+                                    const awaitRemovalFix = fixer.removeRange(awaitTokenRemovalRange);
+                                    const firstOperandToken = (0, util_1.nullThrows)(context.sourceCode.getTokenAfter(awaitKeyword), util_1.NullThrowsReasons.MissingToken('operand', 'await expression'));
+                                    if ((0, util_1.isStartOfArrowFunctionBodyNeedingParentheses)(node, firstOperandToken, context.sourceCode) ||
+                                        (0, util_1.isStartOfExpressionStatementNeedingParentheses)(node, firstOperandToken)) {
+                                        return [
+                                            awaitRemovalFix,
+                                            fixer.insertTextBefore(awaitArgumentEsNode, '('),
+                                            fixer.insertTextAfter(awaitArgumentEsNode, ')'),
+                                        ];
+                                    }
+                                    return awaitRemovalFix;
                                 },
                             },
                         ],
@@ -135,7 +146,7 @@ exports.default = (0, util_1.createRule)({
                                 messageId: 'convertToOrdinaryFor',
                                 fix(fixer) {
                                     const awaitToken = (0, util_1.nullThrows)(context.sourceCode.getFirstToken(node, util_1.isAwaitKeyword), util_1.NullThrowsReasons.MissingToken('await', 'for await loop'));
-                                    return fixer.remove(awaitToken);
+                                    return fixer.removeRange((0, util_1.getAwaitTokenRemovalRange)(context.sourceCode, awaitToken));
                                 },
                             },
                         ],
@@ -168,7 +179,7 @@ exports.default = (0, util_1.createRule)({
                                     messageId: 'removeAwait',
                                     fix(fixer) {
                                         const awaitToken = (0, util_1.nullThrows)(context.sourceCode.getFirstToken(node, util_1.isAwaitKeyword), util_1.NullThrowsReasons.MissingToken('await', 'await using'));
-                                        return fixer.remove(awaitToken);
+                                        return fixer.removeRange((0, util_1.getAwaitTokenRemovalRange)(context.sourceCode, awaitToken));
                                     },
                                 },
                             }),

package/dist/rules/no-unnecessary-type-assertion.js

@@ -587,11 +587,8 @@ exports.default = (0, util_1.createRule)({
                     // is parsed as a block body. In those positions the operand must be
                     // wrapped in parentheses to stay an expression.
                     const firstOperandToken = (0, util_1.nullThrows)(context.sourceCode.getTokenAfter(closingAngleBracket), util_1.NullThrowsReasons.MissingToken('operand', 'type assertion'));
-                    const breaksExpressionStatement = ['{', 'function', 'class'].includes(firstOperandToken.value) &&
-                        (0, util_1.isStartOfExpressionStatement)(node);
-                    const breaksArrowFunctionBody = firstOperandToken.value === '{' &&
-                        (0, util_1.isStartOfArrowFunctionBody)(node, context.sourceCode);
-                    const needsParens = breaksExpressionStatement || breaksArrowFunctionBody;
+                    const needsParens = (0, util_1.isStartOfExpressionStatementNeedingParentheses)(node, firstOperandToken) ||
+                        (0, util_1.isStartOfArrowFunctionBodyNeedingParentheses)(node, firstOperandToken, context.sourceCode);
                     const fixes = [];
                     if (needsParens) {
                         fixes.push(fixer.insertTextBefore(node, '('));

package/dist/rules/return-await.js

@@ -211,20 +211,10 @@ exports.default = (0, util_1.createRule)({
             /* istanbul ignore if */ if (!awaitToken) {
                 return null;
             }
-            const startAt = awaitToken.range[0];
-            let endAt = awaitToken.range[1];
-            // Also remove any extraneous whitespace after `await`, if there is any.
-            const nextToken = context.sourceCode.getTokenAfter(awaitToken, {
-                includeComments: true,
-            });
-            if (nextToken) {
-                endAt = nextToken.range[0];
-            }
-            const awaitRemovalFix = fixer.removeRange([startAt, endAt]);
+            const awaitTokenRemovalRange = (0, util_1.getAwaitTokenRemovalRange)(context.sourceCode, awaitToken);
+            const awaitRemovalFix = fixer.removeRange(awaitTokenRemovalRange);
             const firstOperandToken = (0, util_1.nullThrows)(context.sourceCode.getTokenAfter(awaitToken), util_1.NullThrowsReasons.MissingToken('operand', 'await expression'));
-            const shouldWrapInParentheses = (0, util_1.isOpeningBraceToken)(firstOperandToken) &&
-                (0, util_1.isStartOfArrowFunctionBody)(node, context.sourceCode);
-            if (shouldWrapInParentheses) {
+            if ((0, util_1.isStartOfArrowFunctionBodyNeedingParentheses)(node, firstOperandToken, context.sourceCode)) {
                 return [
                     awaitRemovalFix,
                     fixer.insertTextBefore(node.argument, '('),

package/dist/util/getAwaitTokenRemovalRange.d.ts

@@ -0,0 +1,4 @@
+import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
+export declare function getAwaitTokenRemovalRange(sourceCode: TSESLint.SourceCode, awaitToken: TSESTree.IdentifierToken & {
+    value: 'await';
+}): TSESTree.Range;

package/dist/util/getAwaitTokenRemovalRange.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAwaitTokenRemovalRange = getAwaitTokenRemovalRange;
+function getAwaitTokenRemovalRange(sourceCode, awaitToken) {
+    const startAt = awaitToken.range[0];
+    let endAt = awaitToken.range[1];
+    const nextToken = sourceCode.getTokenAfter(awaitToken, {
+        includeComments: true,
+    });
+    /* istanbul ignore else */ if (nextToken) {
+        endAt = nextToken.range[0];
+    }
+    return [startAt, endAt];
+}
+//# sourceMappingURL=getAwaitTokenRemovalRange.js.map

package/dist/util/index.d.ts

@@ -4,6 +4,7 @@ export * from './baseTypeUtils';
 export * from './collectUnusedVariables';
 export * from './createRule';
 export * from './FunctionSignature';
+export * from './getAwaitTokenRemovalRange';
 export * from './getBaseTypesOfClassMember';
 export * from './getFixOrSuggest';
 export * from './getFunctionHeadLoc';
@@ -19,8 +20,9 @@ export * from './isAssignee';
 export * from './isConditionalTest';
 export * from './isNodeEqual';
 export * from './isNullLiteral';
-export * from './isStartOfArrowFunctionBody';
+export * from './isStartOfArrowFunctionBodyNeedingParentheses';
 export * from './isStartOfExpressionStatement';
+export * from './isStartOfExpressionStatementNeedingParentheses';
 export * from './isUndefinedIdentifier';
 export * from './misc';
 export * from './needsPrecedingSemiColon';

package/dist/util/index.js

@@ -21,6 +21,7 @@ __exportStar(require("./baseTypeUtils"), exports);
 __exportStar(require("./collectUnusedVariables"), exports);
 __exportStar(require("./createRule"), exports);
 __exportStar(require("./FunctionSignature"), exports);
+__exportStar(require("./getAwaitTokenRemovalRange"), exports);
 __exportStar(require("./getBaseTypesOfClassMember"), exports);
 __exportStar(require("./getFixOrSuggest"), exports);
 __exportStar(require("./getFunctionHeadLoc"), exports);
@@ -36,8 +37,9 @@ __exportStar(require("./isAssignee"), exports);
 __exportStar(require("./isConditionalTest"), exports);
 __exportStar(require("./isNodeEqual"), exports);
 __exportStar(require("./isNullLiteral"), exports);
-__exportStar(require("./isStartOfArrowFunctionBody"), exports);
+__exportStar(require("./isStartOfArrowFunctionBodyNeedingParentheses"), exports);
 __exportStar(require("./isStartOfExpressionStatement"), exports);
+__exportStar(require("./isStartOfExpressionStatementNeedingParentheses"), exports);
 __exportStar(require("./isUndefinedIdentifier"), exports);
 __exportStar(require("./misc"), exports);
 __exportStar(require("./needsPrecedingSemiColon"), exports);

package/dist/util/isStartOfArrowFunctionBodyNeedingParentheses.d.ts

@@ -0,0 +1,2 @@
+import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
+export declare function isStartOfArrowFunctionBodyNeedingParentheses(node: TSESTree.Node, firstToken: TSESTree.Token, sourceCode: TSESLint.SourceCode): boolean;

package/dist/util/{isStartOfArrowFunctionBody.js → isStartOfArrowFunctionBodyNeedingParentheses.js}

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isStartOfArrowFunctionBody = isStartOfArrowFunctionBody;
+exports.isStartOfArrowFunctionBodyNeedingParentheses = isStartOfArrowFunctionBodyNeedingParentheses;
 const utils_1 = require("@typescript-eslint/utils");
 const astUtils_1 = require("./astUtils");
+function isStartOfArrowFunctionBodyNeedingParentheses(node, firstToken, sourceCode) {
+    return ((0, astUtils_1.isOpeningBraceToken)(firstToken) &&
+        isStartOfArrowFunctionBody(node, sourceCode));
+}
 function isStartOfArrowFunctionBody(node, sourceCode) {
     let current = node;
     while (true) {
@@ -23,4 +27,4 @@ function isStartOfArrowFunctionBody(node, sourceCode) {
         current = parent;
     }
 }
-//# sourceMappingURL=isStartOfArrowFunctionBody.js.map
+//# sourceMappingURL=isStartOfArrowFunctionBodyNeedingParentheses.js.map

package/dist/util/isStartOfExpressionStatementNeedingParentheses.d.ts

@@ -0,0 +1,2 @@
+import type { TSESTree } from '@typescript-eslint/utils';
+export declare function isStartOfExpressionStatementNeedingParentheses(node: TSESTree.Node, firstToken: TSESTree.Token): boolean;

package/dist/util/isStartOfExpressionStatementNeedingParentheses.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isStartOfExpressionStatementNeedingParentheses = isStartOfExpressionStatementNeedingParentheses;
+const isStartOfExpressionStatement_1 = require("./isStartOfExpressionStatement");
+function isStartOfExpressionStatementNeedingParentheses(node, firstToken) {
+    return (['{', 'class', 'function'].includes(firstToken.value) &&
+        (0, isStartOfExpressionStatement_1.isStartOfExpressionStatement)(node));
+}
+//# sourceMappingURL=isStartOfExpressionStatementNeedingParentheses.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typescript-eslint/eslint-plugin",
-  "version": "8.70.1-alpha.12",
+  "version": "8.70.1-alpha.14",
   "description": "TypeScript plugin for ESLint",
   "files": [
     "dist",
@@ -47,10 +47,10 @@
   ],
   "dependencies": {
     "@eslint-community/regexpp": "^4.12.2",
-    "@typescript-eslint/scope-manager": "8.70.1-alpha.12",
-    "@typescript-eslint/type-utils": "8.70.1-alpha.12",
-    "@typescript-eslint/utils": "8.70.1-alpha.12",
-    "@typescript-eslint/visitor-keys": "8.70.1-alpha.12",
+    "@typescript-eslint/scope-manager": "8.70.1-alpha.14",
+    "@typescript-eslint/type-utils": "8.70.1-alpha.14",
+    "@typescript-eslint/utils": "8.70.1-alpha.14",
+    "@typescript-eslint/visitor-keys": "8.70.1-alpha.14",
     "ignore": "^7.0.5",
     "natural-compare": "^1.4.0",
     "ts-api-utils": "^2.5.0"
@@ -60,8 +60,8 @@
     "@types/mdast": "^4.0.4",
     "@types/natural-compare": "^1.4.3",
     "@types/react": "^18.3.21",
-    "@typescript-eslint/rule-schema-to-typescript-types": "8.70.1-alpha.12",
-    "@typescript-eslint/rule-tester": "8.70.1-alpha.12",
+    "@typescript-eslint/rule-schema-to-typescript-types": "8.70.1-alpha.14",
+    "@typescript-eslint/rule-tester": "8.70.1-alpha.14",
     "@typescript/native": "npm:typescript@^7.0.2",
     "@vitest/coverage-v8": "^4.0.18",
     "ajv": "^6.12.6",
@@ -81,7 +81,7 @@
     "vitest": "^4.0.18"
   },
   "peerDependencies": {
-    "@typescript-eslint/parser": "^8.70.1-alpha.12",
+    "@typescript-eslint/parser": "^8.70.1-alpha.14",
     "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
     "typescript": ">=4.8.4 <6.1.0"
   },

package/dist/util/isStartOfArrowFunctionBody.d.ts

@@ -1,2 +0,0 @@
-import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
-export declare function isStartOfArrowFunctionBody(node: TSESTree.Node, sourceCode: TSESLint.SourceCode): boolean;