eslint-plugin-mgw-eslint-rules 2.3.38 → 2.3.40

package/dist/index.js

@@ -44219,9 +44219,19 @@ var rule6 = createRule6({
   create(context) {
     const services = (0, import_eslint_utils2.getParserServices)(context);
     const checker = services.program.getTypeChecker();
-    const listeArraysTypes = ["ArrayLike", "Set", "ReadonlySet", "Map", "ReadonlyMap"];
-    function getTypeWithoutGeneric(type) {
-      return type.split("<")[0];
+    function isTypeArrayLike(types) {
+      for (const type of types) {
+        if (["ArrayLike", "Set", "ReadonlySet", "Map", "ReadonlyMap"].includes(type)) {
+          return true;
+        }
+        if (/(Array|\[])$/.test(type) || /^\[.*]$/.test(type)) {
+          return true;
+        }
+      }
+      return false;
+    }
+    function getTypesWithoutGeneric(types) {
+      return types.replace(/<[^>]*>/g, "").split("|").map((t) => t.trim());
     }
     function fixNodeName(node, name) {
       const sourceCode = context.sourceCode;
@@ -44256,8 +44266,7 @@ var rule6 = createRule6({
       const tsNode = services.esTreeNodeToTSNodeMap.get(node);
       const type = checker.getTypeAtLocation(tsNode);
       const typeName = checker.typeToString(type);
-      const typeNameWithoutGeneric = getTypeWithoutGeneric(typeName);
-      if (!typeNameWithoutGeneric || !listeArraysTypes.includes(typeNameWithoutGeneric) || !/(Array|\[])$/.test(typeNameWithoutGeneric) || !/^\[.*]$/.test(typeNameWithoutGeneric)) {
+      if (!isTypeArrayLike(getTypesWithoutGeneric(typeName))) {
         return;
       }
       const listSuffixRegexp = /liste?$/i;