@typescript-eslint/eslint-plugin 8.1.1-alpha.10 → 8.1.1-alpha.11

package/dist/util/needsPrecedingSemiColon.js

@@ -0,0 +1,98 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.needsPrecedingSemicolon = needsPrecedingSemicolon;
+const utils_1 = require("@typescript-eslint/utils");
+const ast_utils_1 = require("@typescript-eslint/utils/ast-utils");
+// The following is adapted from `eslint`'s source code.
+// https://github.com/eslint/eslint/blob/3a4eaf921543b1cd5d1df4ea9dec02fab396af2a/lib/rules/utils/ast-utils.js#L1043-L1132
+// Could be export { isStartOfExpressionStatement } from 'eslint/lib/rules/utils/ast-utils'
+const BREAK_OR_CONTINUE = new Set([
+    utils_1.AST_NODE_TYPES.BreakStatement,
+    utils_1.AST_NODE_TYPES.ContinueStatement,
+]);
+// Declaration types that must contain a string Literal node at the end.
+const DECLARATIONS = new Set([
+    utils_1.AST_NODE_TYPES.ExportAllDeclaration,
+    utils_1.AST_NODE_TYPES.ExportNamedDeclaration,
+    utils_1.AST_NODE_TYPES.ImportDeclaration,
+]);
+const IDENTIFIER_OR_KEYWORD = new Set([
+    utils_1.AST_NODE_TYPES.Identifier,
+    utils_1.AST_TOKEN_TYPES.Keyword,
+]);
+// Keywords that can immediately precede an ExpressionStatement node, mapped to the their node types.
+const NODE_TYPES_BY_KEYWORD = {
+    __proto__: null,
+    break: utils_1.AST_NODE_TYPES.BreakStatement,
+    continue: utils_1.AST_NODE_TYPES.ContinueStatement,
+    debugger: utils_1.AST_NODE_TYPES.DebuggerStatement,
+    do: utils_1.AST_NODE_TYPES.DoWhileStatement,
+    else: utils_1.AST_NODE_TYPES.IfStatement,
+    return: utils_1.AST_NODE_TYPES.ReturnStatement,
+    yield: utils_1.AST_NODE_TYPES.YieldExpression,
+};
+/*
+ * Before an opening parenthesis, postfix `++` and `--` always trigger ASI;
+ * the tokens `:`, `;`, `{` and `=>` don't expect a semicolon, as that would count as an empty statement.
+ */
+const PUNCTUATORS = new Set([':', ';', '{', '=>', '++', '--']);
+/*
+ * Statements that can contain an `ExpressionStatement` after a closing parenthesis.
+ * DoWhileStatement is an exception in that it always triggers ASI after the closing parenthesis.
+ */
+const STATEMENTS = new Set([
+    utils_1.AST_NODE_TYPES.DoWhileStatement,
+    utils_1.AST_NODE_TYPES.ForInStatement,
+    utils_1.AST_NODE_TYPES.ForOfStatement,
+    utils_1.AST_NODE_TYPES.ForStatement,
+    utils_1.AST_NODE_TYPES.IfStatement,
+    utils_1.AST_NODE_TYPES.WhileStatement,
+    utils_1.AST_NODE_TYPES.WithStatement,
+]);
+/**
+ * Determines whether an opening parenthesis `(`, bracket `[` or backtick ``` ` ``` needs to be preceded by a semicolon.
+ * This opening parenthesis or bracket should be at the start of an `ExpressionStatement`, a `MethodDefinition` or at
+ * the start of the body of an `ArrowFunctionExpression`.
+ * @param sourceCode The source code object.
+ * @param node A node at the position where an opening parenthesis or bracket will be inserted.
+ * @returns Whether a semicolon is required before the opening parenthesis or bracket.
+ */
+function needsPrecedingSemicolon(sourceCode, node) {
+    const prevToken = sourceCode.getTokenBefore(node);
+    if (!prevToken ||
+        (prevToken.type === utils_1.AST_TOKEN_TYPES.Punctuator &&
+            PUNCTUATORS.has(prevToken.value))) {
+        return false;
+    }
+    const prevNode = sourceCode.getNodeByRangeIndex(prevToken.range[0]);
+    if (!prevNode) {
+        return false;
+    }
+    if ((0, ast_utils_1.isClosingParenToken)(prevToken)) {
+        return !STATEMENTS.has(prevNode.type);
+    }
+    if ((0, ast_utils_1.isClosingBraceToken)(prevToken)) {
+        return ((prevNode.type === utils_1.AST_NODE_TYPES.BlockStatement &&
+            prevNode.parent.type === utils_1.AST_NODE_TYPES.FunctionExpression &&
+            prevNode.parent.parent.type !== utils_1.AST_NODE_TYPES.MethodDefinition) ||
+            (prevNode.type === utils_1.AST_NODE_TYPES.ClassBody &&
+                prevNode.parent.type === utils_1.AST_NODE_TYPES.ClassExpression) ||
+            prevNode.type === utils_1.AST_NODE_TYPES.ObjectExpression);
+    }
+    if (!prevNode.parent) {
+        return false;
+    }
+    if (IDENTIFIER_OR_KEYWORD.has(prevToken.type)) {
+        if (BREAK_OR_CONTINUE.has(prevNode.parent.type)) {
+            return false;
+        }
+        const keyword = prevToken.value;
+        const nodeType = NODE_TYPES_BY_KEYWORD[keyword];
+        return prevNode.type !== nodeType;
+    }
+    if (prevToken.type === utils_1.AST_TOKEN_TYPES.String) {
+        return !DECLARATIONS.has(prevNode.parent.type);
+    }
+    return true;
+}
+//# sourceMappingURL=needsPrecedingSemiColon.js.map

package/dist/util/needsPrecedingSemiColon.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"needsPrecedingSemiColon.js","sourceRoot":"","sources":["../../src/util/needsPrecedingSemiColon.ts"],"names":[],"mappings":"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"}

package/docs/rules/use-unknown-in-catch-callback-variable.mdx

@@ -1,5 +1,5 @@
 ---
-description: 'Enforce typing arguments in `.catch()` callbacks as `unknown`.'
+description: 'Enforce typing arguments in Promise rejection callbacks as `unknown`.'
 ---
 
 import Tabs from '@theme/Tabs';
@@ -9,7 +9,7 @@ import TabItem from '@theme/TabItem';
 >
 > See **https://typescript-eslint.io/rules/use-unknown-in-catch-callback-variable** for documentation.
 
-This rule enforces that you always use the `unknown` type for the parameter of a `Promise.prototype.catch()` callback.
+This rule enforces that you always use the `unknown` type for the parameter of a Promise rejection callback.
 
 <Tabs>
 <TabItem value="❌ Incorrect">
@@ -26,6 +26,15 @@ Promise.reject(new Error('I will reject!')).catch((err: any) => {
 Promise.reject(new Error('I will reject!')).catch((err: Error) => {
   console.log(err);
 });
+
+Promise.reject(new Error('I will reject!')).then(
+  result => {
+    console.log(result);
+  },
+  err => {
+    console.log(err);
+  },
+);
 ```
 
 </TabItem>
@@ -70,7 +79,7 @@ Promise.reject(x).catch((err: unknown) => {
 ```
 
 :::info
-There is actually a way to have the `catch()` callback variable use the `unknown` type _without_ an explicit type annotation at the call sites, but it has the drawback that it involves overriding global type declarations.
+There is actually a way to have the `catch()` and `then()` callback variables use the `unknown` type _without_ an explicit type annotation at the call sites, but it has the drawback that it involves overriding global type declarations.
 For example, the library [better-TypeScript-lib](https://github.com/uhyo/better-typescript-lib) sets this up globally for your project (see [the relevant lines in the better-TypeScript-lib source code](https://github.com/uhyo/better-typescript-lib/blob/c294e177d1cc2b1d1803febf8192a4c83a1fe028/lib/lib.es5.d.ts#L635) for details on how).
 
 For further reading on this, you may also want to look into
@@ -81,4 +90,4 @@ For further reading on this, you may also want to look into
 
 If your codebase is not yet able to enable `useUnknownInCatchVariables`, it likely would be similarly difficult to enable this rule.
 
-If you have modified the global type declarations in order to make `catch()` callbacks use the `unknown` type without an explicit type annotation, you do not need this rule.
+If you have modified the global type declarations in order to make `then()` and `catch()` callbacks use the `unknown` type without an explicit type annotation, you do not need this rule.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typescript-eslint/eslint-plugin",
-  "version": "8.1.1-alpha.10",
+  "version": "8.1.1-alpha.11",
   "description": "TypeScript plugin for ESLint",
   "files": [
     "dist",
@@ -60,10 +60,10 @@
   },
   "dependencies": {
     "@eslint-community/regexpp": "^4.10.0",
-    "@typescript-eslint/scope-manager": "8.1.1-alpha.10",
-    "@typescript-eslint/type-utils": "8.1.1-alpha.10",
-    "@typescript-eslint/utils": "8.1.1-alpha.10",
-    "@typescript-eslint/visitor-keys": "8.1.1-alpha.10",
+    "@typescript-eslint/scope-manager": "8.1.1-alpha.11",
+    "@typescript-eslint/type-utils": "8.1.1-alpha.11",
+    "@typescript-eslint/utils": "8.1.1-alpha.11",
+    "@typescript-eslint/visitor-keys": "8.1.1-alpha.11",
     "graphemer": "^1.4.0",
     "ignore": "^5.3.1",
     "natural-compare": "^1.4.0",
@@ -74,8 +74,8 @@
     "@types/marked": "^5.0.2",
     "@types/mdast": "^4.0.3",
     "@types/natural-compare": "*",
-    "@typescript-eslint/rule-schema-to-typescript-types": "8.1.1-alpha.10",
-    "@typescript-eslint/rule-tester": "8.1.1-alpha.10",
+    "@typescript-eslint/rule-schema-to-typescript-types": "8.1.1-alpha.11",
+    "@typescript-eslint/rule-tester": "8.1.1-alpha.11",
     "ajv": "^6.12.6",
     "cross-env": "^7.0.3",
     "cross-fetch": "*",