eslint-plugin-rxjs-x 0.7.5 → 0.7.7

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }// package.json
 var name = "eslint-plugin-rxjs-x";
-var version = "0.7.5";
+var version = "0.7.7";
 
 // src/configs/recommended.ts
 var createRecommendedConfig = (plugin2) => ({
@@ -218,6 +218,9 @@ function getLoc(node) {
 function hasTypeAnnotation(node) {
   return "typeAnnotation" in node && !!node.typeAnnotation;
 }
+function isAccessorProperty(node) {
+  return node.type === _utils.AST_NODE_TYPES.AccessorProperty;
+}
 function isArrayExpression(node) {
   return node.type === _utils.AST_NODE_TYPES.ArrayExpression;
 }
@@ -2032,7 +2035,7 @@ var noImplicitAnyCatchRule = ruleCreator({
     const sourceCode = context.sourceCode;
     function checkCallback(callback) {
       if (isArrowFunctionExpression(callback) || isFunctionExpression(callback)) {
-        const [param] = callback.params;
+        const [param, ...restParams] = callback.params;
         if (!param) {
           return;
         }
@@ -2078,7 +2081,7 @@ var noImplicitAnyCatchRule = ruleCreator({
           }
         } else {
           let fix2 = function(fixer) {
-            if (isParenthesised(sourceCode, param)) {
+            if (isParenthesised(sourceCode, param) || restParams.length > 0) {
               return fixer.insertTextAfter(param, ": unknown");
             }
             return [
@@ -2235,6 +2238,7 @@ var noInternalRule = ruleCreator({
 
 // src/rules/no-misused-observables.ts
 
+var _astutils = require('@typescript-eslint/utils/ast-utils');
 
 
 function parseChecksVoidReturn(checksVoidReturn) {
@@ -2376,10 +2380,14 @@ var noMisusedObservablesRule = ruleCreator({
       }
     }
     function checkJSXAttribute(node) {
-      if (!node.value || !isJSXExpressionContainer(node.value)) {
+      if (node.value == null || !isJSXExpressionContainer(node.value)) {
         return;
       }
-      if (couldReturnObservable(node.value.expression)) {
+      const expressionContainer = esTreeNodeToTSNodeMap.get(
+        node.value
+      );
+      const contextualType = checker.getContextualType(expressionContainer);
+      if (contextualType != null && isVoidReturningFunctionType(contextualType) && couldReturnObservable(node.value.expression)) {
         context.report({
           messageId: "forbiddenVoidReturnAttribute",
           node: node.value
@@ -2396,7 +2404,7 @@ var noMisusedObservablesRule = ruleCreator({
       for (const element of node.body.body) {
         const tsElement = esTreeNodeToTSNodeMap.get(element);
         const memberName = (_a = tsElement == null ? void 0 : tsElement.name) == null ? void 0 : _a.getText();
-        if (memberName === void 0) {
+        if (memberName == null) {
           continue;
         }
         if (!couldReturnObservable(element)) {
@@ -2407,7 +2415,7 @@ var noMisusedObservablesRule = ruleCreator({
         }
         for (const heritageType of heritageTypes) {
           const heritageMember = getMemberIfExists(heritageType, memberName);
-          if (heritageMember === void 0) {
+          if (heritageMember == null) {
             continue;
           }
           const memberType = checker.getTypeOfSymbolAtLocation(heritageMember, tsElement);
@@ -2425,7 +2433,7 @@ var noMisusedObservablesRule = ruleCreator({
     function checkProperty(node) {
       const tsNode = esTreeNodeToTSNodeMap.get(node);
       const contextualType = getPropertyContextualType(checker, tsNode);
-      if (contextualType === void 0) {
+      if (contextualType == null) {
         return;
       }
       if (!isVoidReturningFunctionType(contextualType)) {
@@ -2434,14 +2442,29 @@ var noMisusedObservablesRule = ruleCreator({
       if (!couldReturnObservable(node.value)) {
         return;
       }
-      context.report({
-        messageId: "forbiddenVoidReturnProperty",
-        node: node.value
-      });
+      if (_astutils.isFunction.call(void 0, node.value)) {
+        const functionNode = node.value;
+        if (functionNode.returnType) {
+          context.report({
+            messageId: "forbiddenVoidReturnProperty",
+            node: functionNode.returnType.typeAnnotation
+          });
+        } else {
+          context.report({
+            messageId: "forbiddenVoidReturnProperty",
+            loc: _astutils.getFunctionHeadLocation.call(void 0, functionNode, context.sourceCode)
+          });
+        }
+      } else {
+        context.report({
+          messageId: "forbiddenVoidReturnProperty",
+          node: node.value
+        });
+      }
     }
     function checkReturnStatement(node) {
       const tsNode = esTreeNodeToTSNodeMap.get(node);
-      if (tsNode.expression === void 0 || !node.argument) {
+      if (tsNode.expression == null || !node.argument) {
         return;
       }
       function getFunctionNode() {
@@ -2456,7 +2479,7 @@ var noMisusedObservablesRule = ruleCreator({
         return;
       }
       const contextualType = checker.getContextualType(tsNode.expression);
-      if (contextualType === void 0) {
+      if (contextualType == null) {
         return;
       }
       if (!isVoidReturningFunctionType(contextualType)) {
@@ -2484,7 +2507,7 @@ var noMisusedObservablesRule = ruleCreator({
     }
     function checkVariableDeclaration(node) {
       const tsNode = esTreeNodeToTSNodeMap.get(node);
-      if (tsNode.initializer === void 0 || !node.init || !node.id.typeAnnotation) {
+      if (tsNode.initializer == null || node.init == null || node.id.typeAnnotation == null) {
         return;
       }
       if (!isPossiblyFunctionType(node.id.typeAnnotation)) {
@@ -2531,6 +2554,9 @@ function isVoidReturningFunctionType(type) {
   for (const subType of tsutils2.unionTypeParts(type)) {
     for (const signature of subType.getCallSignatures()) {
       const returnType = signature.getReturnType();
+      if (couldBeType(returnType, "Observable")) {
+        return false;
+      }
       hasVoidReturn || (hasVoidReturn = tsutils2.isTypeFlagSet(returnType, _typescript2.default.TypeFlags.Void));
     }
   }
@@ -2547,7 +2573,7 @@ function getMemberIfExists(type, memberName) {
   return symbolMemberMatch != null ? symbolMemberMatch : tsutils2.getPropertyOfType(type, escapedMemberName);
 }
 function isStaticMember(node) {
-  return (isMethodDefinition(node) || isPropertyDefinition(node)) && node.static;
+  return (isMethodDefinition(node) || isPropertyDefinition(node) || isAccessorProperty(node)) && node.static;
 }
 function getPropertyContextualType(checker, tsNode) {
   if (_typescript2.default.isPropertyAssignment(tsNode)) {
@@ -2563,11 +2589,11 @@ function getPropertyContextualType(checker, tsNode) {
       return;
     }
     const objType = checker.getContextualType(obj);
-    if (objType === void 0) {
+    if (objType == null) {
       return;
     }
     const propertySymbol = checker.getPropertyOfType(objType, tsNode.name.text);
-    if (propertySymbol === void 0) {
+    if (propertySymbol == null) {
       return;
     }
     return checker.getTypeOfSymbolAtLocation(propertySymbol, tsNode.name);

package/dist/index.mjs

@@ -1,6 +1,6 @@
 // package.json
 var name = "eslint-plugin-rxjs-x";
-var version = "0.7.5";
+var version = "0.7.7";
 
 // src/configs/recommended.ts
 var createRecommendedConfig = (plugin2) => ({
@@ -218,6 +218,9 @@ import { AST_NODE_TYPES } from "@typescript-eslint/utils";
 function hasTypeAnnotation(node) {
   return "typeAnnotation" in node && !!node.typeAnnotation;
 }
+function isAccessorProperty(node) {
+  return node.type === AST_NODE_TYPES.AccessorProperty;
+}
 function isArrayExpression(node) {
   return node.type === AST_NODE_TYPES.ArrayExpression;
 }
@@ -2032,7 +2035,7 @@ var noImplicitAnyCatchRule = ruleCreator({
     const sourceCode = context.sourceCode;
     function checkCallback(callback) {
       if (isArrowFunctionExpression(callback) || isFunctionExpression(callback)) {
-        const [param] = callback.params;
+        const [param, ...restParams] = callback.params;
         if (!param) {
           return;
         }
@@ -2078,7 +2081,7 @@ var noImplicitAnyCatchRule = ruleCreator({
           }
         } else {
           let fix2 = function(fixer) {
-            if (isParenthesised(sourceCode, param)) {
+            if (isParenthesised(sourceCode, param) || restParams.length > 0) {
               return fixer.insertTextAfter(param, ": unknown");
             }
             return [
@@ -2235,6 +2238,7 @@ var noInternalRule = ruleCreator({
 
 // src/rules/no-misused-observables.ts
 import { AST_NODE_TYPES as AST_NODE_TYPES6, ESLintUtils as ESLintUtils8 } from "@typescript-eslint/utils";
+import { getFunctionHeadLocation, isFunction } from "@typescript-eslint/utils/ast-utils";
 import * as tsutils2 from "ts-api-utils";
 import ts6 from "typescript";
 function parseChecksVoidReturn(checksVoidReturn) {
@@ -2376,10 +2380,14 @@ var noMisusedObservablesRule = ruleCreator({
       }
     }
     function checkJSXAttribute(node) {
-      if (!node.value || !isJSXExpressionContainer(node.value)) {
+      if (node.value == null || !isJSXExpressionContainer(node.value)) {
         return;
       }
-      if (couldReturnObservable(node.value.expression)) {
+      const expressionContainer = esTreeNodeToTSNodeMap.get(
+        node.value
+      );
+      const contextualType = checker.getContextualType(expressionContainer);
+      if (contextualType != null && isVoidReturningFunctionType(contextualType) && couldReturnObservable(node.value.expression)) {
         context.report({
           messageId: "forbiddenVoidReturnAttribute",
           node: node.value
@@ -2396,7 +2404,7 @@ var noMisusedObservablesRule = ruleCreator({
       for (const element of node.body.body) {
         const tsElement = esTreeNodeToTSNodeMap.get(element);
         const memberName = (_a = tsElement == null ? void 0 : tsElement.name) == null ? void 0 : _a.getText();
-        if (memberName === void 0) {
+        if (memberName == null) {
           continue;
         }
         if (!couldReturnObservable(element)) {
@@ -2407,7 +2415,7 @@ var noMisusedObservablesRule = ruleCreator({
         }
         for (const heritageType of heritageTypes) {
           const heritageMember = getMemberIfExists(heritageType, memberName);
-          if (heritageMember === void 0) {
+          if (heritageMember == null) {
             continue;
           }
           const memberType = checker.getTypeOfSymbolAtLocation(heritageMember, tsElement);
@@ -2425,7 +2433,7 @@ var noMisusedObservablesRule = ruleCreator({
     function checkProperty(node) {
       const tsNode = esTreeNodeToTSNodeMap.get(node);
       const contextualType = getPropertyContextualType(checker, tsNode);
-      if (contextualType === void 0) {
+      if (contextualType == null) {
         return;
       }
       if (!isVoidReturningFunctionType(contextualType)) {
@@ -2434,14 +2442,29 @@ var noMisusedObservablesRule = ruleCreator({
       if (!couldReturnObservable(node.value)) {
         return;
       }
-      context.report({
-        messageId: "forbiddenVoidReturnProperty",
-        node: node.value
-      });
+      if (isFunction(node.value)) {
+        const functionNode = node.value;
+        if (functionNode.returnType) {
+          context.report({
+            messageId: "forbiddenVoidReturnProperty",
+            node: functionNode.returnType.typeAnnotation
+          });
+        } else {
+          context.report({
+            messageId: "forbiddenVoidReturnProperty",
+            loc: getFunctionHeadLocation(functionNode, context.sourceCode)
+          });
+        }
+      } else {
+        context.report({
+          messageId: "forbiddenVoidReturnProperty",
+          node: node.value
+        });
+      }
     }
     function checkReturnStatement(node) {
       const tsNode = esTreeNodeToTSNodeMap.get(node);
-      if (tsNode.expression === void 0 || !node.argument) {
+      if (tsNode.expression == null || !node.argument) {
         return;
       }
       function getFunctionNode() {
@@ -2456,7 +2479,7 @@ var noMisusedObservablesRule = ruleCreator({
         return;
       }
       const contextualType = checker.getContextualType(tsNode.expression);
-      if (contextualType === void 0) {
+      if (contextualType == null) {
         return;
       }
       if (!isVoidReturningFunctionType(contextualType)) {
@@ -2484,7 +2507,7 @@ var noMisusedObservablesRule = ruleCreator({
     }
     function checkVariableDeclaration(node) {
       const tsNode = esTreeNodeToTSNodeMap.get(node);
-      if (tsNode.initializer === void 0 || !node.init || !node.id.typeAnnotation) {
+      if (tsNode.initializer == null || node.init == null || node.id.typeAnnotation == null) {
         return;
       }
       if (!isPossiblyFunctionType(node.id.typeAnnotation)) {
@@ -2531,6 +2554,9 @@ function isVoidReturningFunctionType(type) {
   for (const subType of tsutils2.unionTypeParts(type)) {
     for (const signature of subType.getCallSignatures()) {
       const returnType = signature.getReturnType();
+      if (couldBeType(returnType, "Observable")) {
+        return false;
+      }
       hasVoidReturn || (hasVoidReturn = tsutils2.isTypeFlagSet(returnType, ts6.TypeFlags.Void));
     }
   }
@@ -2547,7 +2573,7 @@ function getMemberIfExists(type, memberName) {
   return symbolMemberMatch != null ? symbolMemberMatch : tsutils2.getPropertyOfType(type, escapedMemberName);
 }
 function isStaticMember(node) {
-  return (isMethodDefinition(node) || isPropertyDefinition(node)) && node.static;
+  return (isMethodDefinition(node) || isPropertyDefinition(node) || isAccessorProperty(node)) && node.static;
 }
 function getPropertyContextualType(checker, tsNode) {
   if (ts6.isPropertyAssignment(tsNode)) {
@@ -2563,11 +2589,11 @@ function getPropertyContextualType(checker, tsNode) {
       return;
     }
     const objType = checker.getContextualType(obj);
-    if (objType === void 0) {
+    if (objType == null) {
       return;
     }
     const propertySymbol = checker.getPropertyOfType(objType, tsNode.name.text);
-    if (propertySymbol === void 0) {
+    if (propertySymbol == null) {
       return;
     }
     return checker.getTypeOfSymbolAtLocation(propertySymbol, tsNode.name);

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "eslint-plugin-rxjs-x",
   "type": "commonjs",
-  "version": "0.7.5",
-  "packageManager": "yarn@4.9.1+sha512.f95ce356460e05be48d66401c1ae64ef84d163dd689964962c6888a9810865e39097a5e9de748876c2e0bf89b232d583c33982773e9903ae7a76257270986538",
+  "version": "0.7.7",
+  "packageManager": "yarn@4.9.2+sha512.1fc009bc09d13cfd0e19efa44cbfc2b9cf6ca61482725eb35bbc5e257e093ebf4130db6dfe15d604ff4b79efd8e1e8e99b25fa7d0a6197c9f9826358d4d65c3c",
   "description": "ESLint v9+ plugin for RxJS",
   "author": "Jason Weinzierl <weinzierljason@gmail.com>",
   "license": "MIT",
@@ -72,29 +72,29 @@
     }
   },
   "devDependencies": {
-    "@eslint/js": "^9.28.0",
-    "@stylistic/eslint-plugin": "^4.4.0",
+    "@eslint/js": "^9.29.0",
+    "@stylistic/eslint-plugin": "^5.0.0",
     "@types/common-tags": "^1.8.4",
     "@types/node": "~18.18.0",
-    "@typescript-eslint/rule-tester": "^8.33.1",
+    "@typescript-eslint/rule-tester": "^8.34.1",
     "@typescript/vfs": "^1.6.1",
-    "@vitest/coverage-v8": "^3.2.0",
-    "@vitest/eslint-plugin": "^1.2.1",
-    "bumpp": "^10.1.1",
-    "eslint": "^9.28.0",
+    "@vitest/coverage-v8": "^3.2.4",
+    "@vitest/eslint-plugin": "^1.2.7",
+    "bumpp": "^10.2.0",
+    "eslint": "^9.29.0",
     "eslint-config-flat-gitignore": "^2.1.0",
-    "eslint-doc-generator": "^2.1.2",
-    "eslint-import-resolver-typescript": "^4.4.2",
-    "eslint-plugin-eslint-plugin": "^6.4.0",
-    "eslint-plugin-import-x": "^4.15.0",
-    "eslint-plugin-n": "^17.19.0",
+    "eslint-doc-generator": "^2.2.2",
+    "eslint-import-resolver-typescript": "^4.4.3",
+    "eslint-plugin-eslint-plugin": "^6.5.0",
+    "eslint-plugin-import-x": "^4.15.2",
+    "eslint-plugin-n": "^17.20.0",
     "markdownlint-cli2": "^0.18.1",
     "rxjs": "^7.8.2",
     "tsup": "^8.5.0",
     "typescript": "~5.8.3",
-    "typescript-eslint": "^8.33.1",
+    "typescript-eslint": "^8.34.1",
     "vite": "^6.3.5",
-    "vitest": "^3.2.0"
+    "vitest": "^3.2.4"
   },
   "engines": {
     "node": "^18.18.0 || ^20.9.0 || >= 21.1.0"