@typescript-eslint/eslint-plugin 8.31.2-alpha.4 → 8.31.2-alpha.5

package/dist/rules/unified-signatures.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unified-signatures.d.ts","sourceRoot":"","sources":["../../src/rules/unified-signatures.ts"],"names":[],"mappings":"AAuDA,MAAM,MAAM,UAAU,GAClB,uBAAuB,GACvB,yBAAyB,GACzB,2BAA2B,CAAC;AAEhC,MAAM,MAAM,OAAO,GAAG;IACpB;QACE,gCAAgC,CAAC,EAAE,OAAO,CAAC;QAC3C,iCAAiC,CAAC,EAAE,OAAO,CAAC;KAC7C;CACF,CAAC;;AAEF,wBAyiBG"}
+{"version":3,"file":"unified-signatures.d.ts","sourceRoot":"","sources":["../../src/rules/unified-signatures.ts"],"names":[],"mappings":"AAuDA,MAAM,MAAM,UAAU,GAClB,uBAAuB,GACvB,yBAAyB,GACzB,2BAA2B,CAAC;AAEhC,MAAM,MAAM,OAAO,GAAG;IACpB;QACE,gCAAgC,CAAC,EAAE,OAAO,CAAC;QAC3C,iCAAiC,CAAC,EAAE,OAAO,CAAC;KAC7C;CACF,CAAC;;AAEF,wBA8kBG"}

package/dist/rules/unified-signatures.js

@@ -147,6 +147,12 @@ exports.default = (0, util_1.createRule)({
         }
         /** Detect `a(x: number, y: number, z: number)` and `a(x: number, y: string, z: number)`. */
         function signaturesDifferBySingleParameter(types1, types2) {
+            const firstParam1 = types1[0];
+            const firstParam2 = types2[0];
+            // exempt signatures with `this: void` from the rule
+            if (isThisVoidParam(firstParam1) || isThisVoidParam(firstParam2)) {
+                return undefined;
+            }
             const index = getIndexOfFirstDifference(types1, types2, parametersAreEqual);
             if (index == null) {
                 return undefined;
@@ -164,6 +170,16 @@ exports.default = (0, util_1.createRule)({
                 ? { kind: 'single-parameter-difference', p0: a, p1: b }
                 : undefined;
         }
+        function isThisParam(param) {
+            return (param != null &&
+                param.type === utils_1.AST_NODE_TYPES.Identifier &&
+                param.name === 'this');
+        }
+        function isThisVoidParam(param) {
+            return (isThisParam(param) &&
+                param.typeAnnotation?.typeAnnotation.type ===
+                    utils_1.AST_NODE_TYPES.TSVoidKeyword);
+        }
         /**
          * Detect `a(): void` and `a(x: number): void`.
          * Returns the parameter declaration (`x: number` in this example) that should be optional/rest, and overload it's a part of.
@@ -175,6 +191,17 @@ exports.default = (0, util_1.createRule)({
             const longer = sig1.length < sig2.length ? sig2 : sig1;
             const shorter = sig1.length < sig2.length ? sig1 : sig2;
             const shorterSig = sig1.length < sig2.length ? a : b;
+            const firstParam1 = sig1.at(0);
+            const firstParam2 = sig2.at(0);
+            // If one signature has explicit this type and another doesn't, they can't
+            // be unified.
+            if (isThisParam(firstParam1) !== isThisParam(firstParam2)) {
+                return undefined;
+            }
+            // exempt signatures with `this: void` from the rule
+            if (isThisVoidParam(firstParam1) || isThisVoidParam(firstParam2)) {
+                return undefined;
+            }
             // If one is has 2+ parameters more than the other, they must all be optional/rest.
             // Differ by optional parameters: f() and f(x), f() and f(x, ?y, ...z)
             // Not allowed: f() and f(x, y)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typescript-eslint/eslint-plugin",
-  "version": "8.31.2-alpha.4",
+  "version": "8.31.2-alpha.5",
   "description": "TypeScript plugin for ESLint",
   "files": [
     "dist",
@@ -62,10 +62,10 @@
   },
   "dependencies": {
     "@eslint-community/regexpp": "^4.10.0",
-    "@typescript-eslint/scope-manager": "8.31.2-alpha.4",
-    "@typescript-eslint/type-utils": "8.31.2-alpha.4",
-    "@typescript-eslint/utils": "8.31.2-alpha.4",
-    "@typescript-eslint/visitor-keys": "8.31.2-alpha.4",
+    "@typescript-eslint/scope-manager": "8.31.2-alpha.5",
+    "@typescript-eslint/type-utils": "8.31.2-alpha.5",
+    "@typescript-eslint/utils": "8.31.2-alpha.5",
+    "@typescript-eslint/visitor-keys": "8.31.2-alpha.5",
     "graphemer": "^1.4.0",
     "ignore": "^5.3.1",
     "natural-compare": "^1.4.0",
@@ -75,8 +75,8 @@
     "@types/marked": "^5.0.2",
     "@types/mdast": "^4.0.3",
     "@types/natural-compare": "*",
-    "@typescript-eslint/rule-schema-to-typescript-types": "8.31.2-alpha.4",
-    "@typescript-eslint/rule-tester": "8.31.2-alpha.4",
+    "@typescript-eslint/rule-schema-to-typescript-types": "8.31.2-alpha.5",
+    "@typescript-eslint/rule-tester": "8.31.2-alpha.5",
     "@vitest/coverage-v8": "^3.1.1",
     "ajv": "^6.12.6",
     "cross-fetch": "*",