eslint-plugin-mgw-eslint-rules 2.3.29 → 2.3.31

package/dist/index.js

@@ -44260,7 +44260,8 @@ var rule7 = createRule7({
       recommended: true
     },
     messages: {
-      reactiveNamingConvention: "Element {{ typeName }} names {{ name }} must end with `{{ suffix }}`."
+      reactiveVariableNamingConvention: "Variable `{{ name }}` must end with `{{ suffix }}`.",
+      reactivePropertyNamingConvention: "Property `{{ name }}` must end with `{{ suffix }}`."
     },
     schema: []
     // No options
@@ -44271,10 +44272,10 @@ var rule7 = createRule7({
     if (!parserServices?.program || !parserServices.esTreeNodeToTSNodeMap) {
       return {};
     }
-    const listeReactiveWritableTypes = ["Subject", "BehaviorSubject", "ReplaySubject", "AsyncSubject", "WritableSignal", "InputSignal"];
+    const listeReactiveWritableTypes = ["Subject", "WritableSignal", "InputSignal"];
     const listeReactiveReadonlyTypes = ["Signal", "Observable", "Promise"];
     const checker = parserServices.program.getTypeChecker();
-    function checkNode(node) {
+    function checkNode(node, messageId) {
       const name = node.name;
       if (!name || name === "_" || !parserServices?.esTreeNodeToTSNodeMap) {
         return;
@@ -44282,21 +44283,12 @@ var rule7 = createRule7({
       const tsNode = parserServices.esTreeNodeToTSNodeMap.get(node);
       const type = checker.getTypeAtLocation(tsNode);
       const typeName = checker.typeToString(type);
-      const isReactiveReadonlyTypes = listeReactiveReadonlyTypes.includes(typeName);
-      const suffix = isReactiveReadonlyTypes ? "$" : "$$";
-      context.report({
-        node,
-        messageId: "reactiveNamingConvention",
-        data: {
-          typeName,
-          name,
-          suffix
-        }
-      });
-      if ((isReactiveReadonlyTypes || listeReactiveWritableTypes.includes(typeName)) && (!name.endsWith(suffix) || suffix === "$" && name.endsWith("$$"))) {
+      const isReactiveWritableTypes = listeReactiveWritableTypes.some((t) => new RegExp(`${t}<.+>`).test(typeName));
+      const suffix = isReactiveWritableTypes ? "$$" : "$";
+      if ((isReactiveWritableTypes || listeReactiveReadonlyTypes.some((t) => new RegExp(`${t}<.+>`).test(typeName))) && (!name.endsWith(suffix) || suffix === "$" && name.endsWith("$$"))) {
         context.report({
           node,
-          messageId: "reactiveNamingConvention",
+          messageId,
           data: {
             typeName,
             name,
@@ -44336,13 +44328,13 @@ var rule7 = createRule7({
       // Déclarations de variables : const x = signal(0)
       VariableDeclarator(node) {
         if (node.id?.type === "Identifier") {
-          checkNode(node.id);
+          checkNode(node.id, "reactiveVariableNamingConvention");
         }
       },
       // Propriétés de classe : count = signal(0)
       PropertyDefinition(node) {
         if (node.key?.type === "Identifier") {
-          checkNode(node.key);
+          checkNode(node.key, "reactivePropertyNamingConvention");
         }
       }
     };