eslint-plugin-rxjs-x 0.8.1 → 0.8.3

package/dist/index.d.mts

@@ -159,7 +159,9 @@ declare const allRules: {
         description: "Disallow unsafe `shareReplay` usage.";
         recommended: "recommended";
     }, TSESLint.RuleListener>;
-    'no-sharereplay-before-takeuntil': TSESLint.RuleModule<"forbidden", [], {
+    'no-sharereplay-before-takeuntil': TSESLint.RuleModule<"forbidden", readonly {
+        takeUntilAlias?: string[];
+    }[], {
         description: "Disallow using `shareReplay({ refCount: false })` before `takeUntil`.";
         recommended: "strict";
     }, TSESLint.RuleListener>;

package/dist/index.d.ts

@@ -159,7 +159,9 @@ declare const allRules: {
         description: "Disallow unsafe `shareReplay` usage.";
         recommended: "recommended";
     }, TSESLint.RuleListener>;
-    'no-sharereplay-before-takeuntil': TSESLint.RuleModule<"forbidden", [], {
+    'no-sharereplay-before-takeuntil': TSESLint.RuleModule<"forbidden", readonly {
+        takeUntilAlias?: string[];
+    }[], {
         description: "Disallow using `shareReplay({ refCount: false })` before `takeUntil`.";
         recommended: "strict";
     }, TSESLint.RuleListener>;

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.8.1";
+var version = "0.8.3";
 
 // src/configs/recommended.ts
 var createRecommendedConfig = (plugin2) => ({
@@ -288,6 +288,9 @@ function isProperty(node) {
 function isPropertyDefinition(node) {
   return node.type === _utils.AST_NODE_TYPES.PropertyDefinition;
 }
+function isSpreadElement(node) {
+  return node.type === _utils.AST_NODE_TYPES.SpreadElement;
+}
 function isUnaryExpression(node) {
   return node.type === _utils.AST_NODE_TYPES.UnaryExpression;
 }
@@ -2836,29 +2839,39 @@ var noSharereplayRule = ruleCreator({
 });
 
 // src/rules/no-sharereplay-before-takeuntil.ts
+var defaultOptions11 = [];
 var noSharereplayBeforeTakeuntilRule = ruleCreator({
-  defaultOptions: [],
+  defaultOptions: defaultOptions11,
   meta: {
     docs: {
       description: "Disallow using `shareReplay({ refCount: false })` before `takeUntil`.",
       recommended: "strict"
     },
     messages: {
-      forbidden: "shareReplay before takeUntil is forbidden unless 'refCount: true' is specified."
+      forbidden: "shareReplay before '{{takeUntilAlias}}' is forbidden unless 'refCount: true' is specified."
     },
-    schema: [],
+    schema: [{
+      properties: {
+        takeUntilAlias: { type: "array", description: "List of operators to treat as takeUntil.", default: ["takeUntilDestroyed"] }
+      },
+      type: "object"
+    }],
     type: "problem"
   },
   name: "no-sharereplay-before-takeuntil",
   create: (context) => {
+    const [config = {}] = context.options;
+    const { takeUntilAlias = ["takeUntilDestroyed"] } = config;
     function checkCallExpression(node) {
       const pipeCallExpression = node.parent;
       if (!pipeCallExpression.arguments || !isMemberExpression(pipeCallExpression.callee) || !isIdentifier(pipeCallExpression.callee.property) || pipeCallExpression.callee.property.name !== "pipe") {
         return;
       }
+      const allTakeUntilAlias = ["takeUntil", ...takeUntilAlias];
+      const takeUntilRegex = new RegExp(`^(${allTakeUntilAlias.join("|")})$`);
       const { isOrderValid, operatorNode: takeUntilNode } = findIsLastOperatorOrderValid(
         pipeCallExpression,
-        /^takeUntil$/,
+        takeUntilRegex,
         DEFAULT_VALID_POST_COMPLETION_OPERATORS
       );
       if (!isOrderValid || !takeUntilNode) {
@@ -2871,6 +2884,7 @@ var noSharereplayBeforeTakeuntilRule = ruleCreator({
       if (!shareReplayConfig || !isObjectExpression(shareReplayConfig)) {
         context.report({
           messageId: "forbidden",
+          data: { takeUntilAlias: isIdentifier(takeUntilNode) ? takeUntilNode.name : "takeUntil" },
           node: node.callee
         });
         return;
@@ -2879,6 +2893,7 @@ var noSharereplayBeforeTakeuntilRule = ruleCreator({
       if (!refCountElement || isLiteral(refCountElement.value) && refCountElement.value.value === false) {
         context.report({
           messageId: "forbidden",
+          data: { takeUntilAlias: isIdentifier(takeUntilNode) ? takeUntilNode.name : "takeUntil" },
           node: node.callee
         });
       }
@@ -3229,9 +3244,9 @@ import { ${functionName} } from ${quote}rxjs${quote};`
 
 // src/rules/no-unbound-methods.ts
 
-var defaultOptions11 = [];
+var defaultOptions12 = [];
 var noUnboundMethodsRule = ruleCreator({
-  defaultOptions: defaultOptions11,
+  defaultOptions: defaultOptions12,
   meta: {
     docs: {
       description: "Disallow passing unbound methods.",
@@ -3361,7 +3376,7 @@ var noUnnecessaryCollectionRule = ruleCreator({
         }
         return;
       }
-      if (args.length === 1 && couldBeObservable(firstArg)) {
+      if (args.length === 1 && !isSpreadElement(firstArg) && couldBeObservable(firstArg)) {
         context.report({
           messageId: "forbidden",
           node: node.callee,
@@ -3394,9 +3409,9 @@ var noUnnecessaryCollectionRule = ruleCreator({
 
 // src/rules/no-unsafe-catch.ts
 
-var defaultOptions12 = [];
+var defaultOptions13 = [];
 var noUnsafeCatchRule = ruleCreator({
-  defaultOptions: defaultOptions12,
+  defaultOptions: defaultOptions13,
   meta: {
     docs: {
       description: "Disallow unsafe `catchError` usage in effects and epics.",
@@ -3455,9 +3470,9 @@ var noUnsafeCatchRule = ruleCreator({
 
 // src/rules/no-unsafe-first.ts
 
-var defaultOptions13 = [];
+var defaultOptions14 = [];
 var noUnsafeFirstRule = ruleCreator({
-  defaultOptions: defaultOptions13,
+  defaultOptions: defaultOptions14,
   meta: {
     docs: {
       description: "Disallow unsafe `first`/`take` usage in effects and epics.",
@@ -3579,9 +3594,9 @@ var noUnsafeSubjectNext = ruleCreator({
 // src/rules/no-unsafe-switchmap.ts
 
 var _decamelize = require('decamelize'); var _decamelize2 = _interopRequireDefault(_decamelize);
-var defaultOptions14 = [];
+var defaultOptions15 = [];
 var noUnsafeSwitchmapRule = ruleCreator({
-  defaultOptions: defaultOptions14,
+  defaultOptions: defaultOptions15,
   meta: {
     docs: {
       description: "Disallow unsafe `switchMap` usage in effects and epics.",
@@ -3704,9 +3719,9 @@ var noUnsafeSwitchmapRule = ruleCreator({
 
 // src/rules/no-unsafe-takeuntil.ts
 
-var defaultOptions15 = [];
+var defaultOptions16 = [];
 var noUnsafeTakeuntilRule = ruleCreator({
-  defaultOptions: defaultOptions15,
+  defaultOptions: defaultOptions16,
   meta: {
     docs: {
       description: "Disallow applying operators after `takeUntil`.",
@@ -3767,9 +3782,9 @@ var noUnsafeTakeuntilRule = ruleCreator({
 });
 
 // src/rules/prefer-observer.ts
-var defaultOptions16 = [];
+var defaultOptions17 = [];
 var preferObserverRule = ruleCreator({
-  defaultOptions: defaultOptions16,
+  defaultOptions: defaultOptions17,
   meta: {
     docs: {
       description: "Disallow passing separate handlers to `subscribe` and `tap`.",
@@ -4005,9 +4020,9 @@ var preferRootOperatorsRule = ruleCreator({
 
 // src/rules/suffix-subjects.ts
 
-var defaultOptions17 = [];
+var defaultOptions18 = [];
 var suffixSubjectsRule = ruleCreator({
-  defaultOptions: defaultOptions17,
+  defaultOptions: defaultOptions18,
   meta: {
     docs: {
       description: "Enforce the use of a suffix in subject identifiers.",
@@ -4204,9 +4219,9 @@ var suffixSubjectsRule = ruleCreator({
 // src/rules/throw-error.ts
 
 
-var defaultOptions18 = [];
+var defaultOptions19 = [];
 var throwErrorRule = ruleCreator({
-  defaultOptions: defaultOptions18,
+  defaultOptions: defaultOptions19,
   meta: {
     docs: {
       description: "Enforce passing only `Error` values to `throwError` or `Subject.error`.",

package/dist/index.mjs

@@ -1,6 +1,6 @@
 // package.json
 var name = "eslint-plugin-rxjs-x";
-var version = "0.8.1";
+var version = "0.8.3";
 
 // src/configs/recommended.ts
 var createRecommendedConfig = (plugin2) => ({
@@ -288,6 +288,9 @@ function isProperty(node) {
 function isPropertyDefinition(node) {
   return node.type === AST_NODE_TYPES.PropertyDefinition;
 }
+function isSpreadElement(node) {
+  return node.type === AST_NODE_TYPES.SpreadElement;
+}
 function isUnaryExpression(node) {
   return node.type === AST_NODE_TYPES.UnaryExpression;
 }
@@ -2836,29 +2839,39 @@ var noSharereplayRule = ruleCreator({
 });
 
 // src/rules/no-sharereplay-before-takeuntil.ts
+var defaultOptions11 = [];
 var noSharereplayBeforeTakeuntilRule = ruleCreator({
-  defaultOptions: [],
+  defaultOptions: defaultOptions11,
   meta: {
     docs: {
       description: "Disallow using `shareReplay({ refCount: false })` before `takeUntil`.",
       recommended: "strict"
     },
     messages: {
-      forbidden: "shareReplay before takeUntil is forbidden unless 'refCount: true' is specified."
+      forbidden: "shareReplay before '{{takeUntilAlias}}' is forbidden unless 'refCount: true' is specified."
     },
-    schema: [],
+    schema: [{
+      properties: {
+        takeUntilAlias: { type: "array", description: "List of operators to treat as takeUntil.", default: ["takeUntilDestroyed"] }
+      },
+      type: "object"
+    }],
     type: "problem"
   },
   name: "no-sharereplay-before-takeuntil",
   create: (context) => {
+    const [config = {}] = context.options;
+    const { takeUntilAlias = ["takeUntilDestroyed"] } = config;
     function checkCallExpression(node) {
       const pipeCallExpression = node.parent;
       if (!pipeCallExpression.arguments || !isMemberExpression(pipeCallExpression.callee) || !isIdentifier(pipeCallExpression.callee.property) || pipeCallExpression.callee.property.name !== "pipe") {
         return;
       }
+      const allTakeUntilAlias = ["takeUntil", ...takeUntilAlias];
+      const takeUntilRegex = new RegExp(`^(${allTakeUntilAlias.join("|")})$`);
       const { isOrderValid, operatorNode: takeUntilNode } = findIsLastOperatorOrderValid(
         pipeCallExpression,
-        /^takeUntil$/,
+        takeUntilRegex,
         DEFAULT_VALID_POST_COMPLETION_OPERATORS
       );
       if (!isOrderValid || !takeUntilNode) {
@@ -2871,6 +2884,7 @@ var noSharereplayBeforeTakeuntilRule = ruleCreator({
       if (!shareReplayConfig || !isObjectExpression(shareReplayConfig)) {
         context.report({
           messageId: "forbidden",
+          data: { takeUntilAlias: isIdentifier(takeUntilNode) ? takeUntilNode.name : "takeUntil" },
           node: node.callee
         });
         return;
@@ -2879,6 +2893,7 @@ var noSharereplayBeforeTakeuntilRule = ruleCreator({
       if (!refCountElement || isLiteral(refCountElement.value) && refCountElement.value.value === false) {
         context.report({
           messageId: "forbidden",
+          data: { takeUntilAlias: isIdentifier(takeUntilNode) ? takeUntilNode.name : "takeUntil" },
           node: node.callee
         });
       }
@@ -3229,9 +3244,9 @@ import { ${functionName} } from ${quote}rxjs${quote};`
 
 // src/rules/no-unbound-methods.ts
 import { ESLintUtils as ESLintUtils9 } from "@typescript-eslint/utils";
-var defaultOptions11 = [];
+var defaultOptions12 = [];
 var noUnboundMethodsRule = ruleCreator({
-  defaultOptions: defaultOptions11,
+  defaultOptions: defaultOptions12,
   meta: {
     docs: {
       description: "Disallow passing unbound methods.",
@@ -3361,7 +3376,7 @@ var noUnnecessaryCollectionRule = ruleCreator({
         }
         return;
       }
-      if (args.length === 1 && couldBeObservable(firstArg)) {
+      if (args.length === 1 && !isSpreadElement(firstArg) && couldBeObservable(firstArg)) {
         context.report({
           messageId: "forbidden",
           node: node.callee,
@@ -3394,9 +3409,9 @@ var noUnnecessaryCollectionRule = ruleCreator({
 
 // src/rules/no-unsafe-catch.ts
 import { stripIndent as stripIndent5 } from "common-tags";
-var defaultOptions12 = [];
+var defaultOptions13 = [];
 var noUnsafeCatchRule = ruleCreator({
-  defaultOptions: defaultOptions12,
+  defaultOptions: defaultOptions13,
   meta: {
     docs: {
       description: "Disallow unsafe `catchError` usage in effects and epics.",
@@ -3455,9 +3470,9 @@ var noUnsafeCatchRule = ruleCreator({
 
 // src/rules/no-unsafe-first.ts
 import { stripIndent as stripIndent6 } from "common-tags";
-var defaultOptions13 = [];
+var defaultOptions14 = [];
 var noUnsafeFirstRule = ruleCreator({
-  defaultOptions: defaultOptions13,
+  defaultOptions: defaultOptions14,
   meta: {
     docs: {
       description: "Disallow unsafe `first`/`take` usage in effects and epics.",
@@ -3579,9 +3594,9 @@ var noUnsafeSubjectNext = ruleCreator({
 // src/rules/no-unsafe-switchmap.ts
 import { stripIndent as stripIndent7 } from "common-tags";
 import decamelize from "decamelize";
-var defaultOptions14 = [];
+var defaultOptions15 = [];
 var noUnsafeSwitchmapRule = ruleCreator({
-  defaultOptions: defaultOptions14,
+  defaultOptions: defaultOptions15,
   meta: {
     docs: {
       description: "Disallow unsafe `switchMap` usage in effects and epics.",
@@ -3704,9 +3719,9 @@ var noUnsafeSwitchmapRule = ruleCreator({
 
 // src/rules/no-unsafe-takeuntil.ts
 import { stripIndent as stripIndent8 } from "common-tags";
-var defaultOptions15 = [];
+var defaultOptions16 = [];
 var noUnsafeTakeuntilRule = ruleCreator({
-  defaultOptions: defaultOptions15,
+  defaultOptions: defaultOptions16,
   meta: {
     docs: {
       description: "Disallow applying operators after `takeUntil`.",
@@ -3767,9 +3782,9 @@ var noUnsafeTakeuntilRule = ruleCreator({
 });
 
 // src/rules/prefer-observer.ts
-var defaultOptions16 = [];
+var defaultOptions17 = [];
 var preferObserverRule = ruleCreator({
-  defaultOptions: defaultOptions16,
+  defaultOptions: defaultOptions17,
   meta: {
     docs: {
       description: "Disallow passing separate handlers to `subscribe` and `tap`.",
@@ -4005,9 +4020,9 @@ var preferRootOperatorsRule = ruleCreator({
 
 // src/rules/suffix-subjects.ts
 import { AST_NODE_TYPES as AST_NODE_TYPES9, ESLintUtils as ESLintUtils11 } from "@typescript-eslint/utils";
-var defaultOptions17 = [];
+var defaultOptions18 = [];
 var suffixSubjectsRule = ruleCreator({
-  defaultOptions: defaultOptions17,
+  defaultOptions: defaultOptions18,
   meta: {
     docs: {
       description: "Enforce the use of a suffix in subject identifiers.",
@@ -4204,9 +4219,9 @@ var suffixSubjectsRule = ruleCreator({
 // src/rules/throw-error.ts
 import { ESLintUtils as ESLintUtils12 } from "@typescript-eslint/utils";
 import * as tsutils4 from "ts-api-utils";
-var defaultOptions18 = [];
+var defaultOptions19 = [];
 var throwErrorRule = ruleCreator({
-  defaultOptions: defaultOptions18,
+  defaultOptions: defaultOptions19,
   meta: {
     docs: {
       description: "Enforce passing only `Error` values to `throwError` or `Subject.error`.",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eslint-plugin-rxjs-x",
   "type": "commonjs",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "packageManager": "yarn@4.10.3+sha512.c38cafb5c7bb273f3926d04e55e1d8c9dfa7d9c3ea1f36a4868fa028b9e5f72298f0b7f401ad5eb921749eb012eb1c3bb74bf7503df3ee43fd600d14a018266f",
   "description": "ESLint v9+ plugin for RxJS",
   "author": "Jason Weinzierl <weinzierljason@gmail.com>",
@@ -11,6 +11,10 @@
     "type": "git",
     "url": "git+https://github.com/JasonWeinzierl/eslint-plugin-rxjs-x.git"
   },
+  "publishConfig": {
+    "provenance": true,
+    "registry": "https://registry.npmjs.org"
+  },
   "bugs": {
     "url": "https://github.com/JasonWeinzierl/eslint-plugin-rxjs-x/issues"
   },