@immense/vue-pom-generator 1.0.39 → 1.0.40

package/dist/index.mjs

@@ -2054,9 +2054,6 @@ Fix: either (1) include ${args.bestKeyPlaceholder} in your :${attrLabel} templat
   })();
   const tryMergeWithExistingPrimary = (candidateActionName) => {
     const mergeKey = (args.pomMergeKey ?? "").trim();
-    if (isKeyed) {
-      return false;
-    }
     const existingEntry = primaryByActionName.get(candidateActionName);
     const existingPom = existingEntry?.pom;
     if (!existingEntry || !existingPom) {
@@ -2067,6 +2064,9 @@ Fix: either (1) include ${args.bestKeyPlaceholder} in your :${attrLabel} templat
       ...existingPom.alternateFormattedDataTestIds ?? []
     ];
     const sharesSelectorIdentity = existingSelectors.includes(formattedDataTestIdForPom);
+    if (isKeyed && !sharesSelectorIdentity) {
+      return false;
+    }
     if (!mergeKey && !sharesSelectorIdentity) {
       return false;
     }
@@ -2113,6 +2113,11 @@ Fix: either (1) include ${args.bestKeyPlaceholder} in your :${attrLabel} templat
           conflicts = false;
         }
       }
+      if (conflicts && nameCollisionBehavior === "error" && tryMergeWithExistingPrimary(actionName)) {
+        methodName = candidate;
+        mergedIntoExisting = true;
+        break;
+      }
       if (conflicts && nameCollisionBehavior === "error") {
         const roleSuffix = upperFirst(normalizedRole || "Element");
         const baseNameUpper = upperFirst(baseWithSuffix);
@@ -2159,11 +2164,6 @@ Fix: either (1) include ${args.bestKeyPlaceholder} in your :${attrLabel} templat
         reservedMembers.add(actionName);
         break;
       }
-      if (nameCollisionBehavior === "error" && tryMergeWithExistingPrimary(actionName)) {
-        methodName = candidate;
-        mergedIntoExisting = true;
-        break;
-      }
       if (!collisionDetails) {
         collisionDetails = { getterName: chosenGetterName, actionName };
         collisionHint = hint || (args.semanticNameHint ?? "").trim() || null;
@@ -3740,6 +3740,7 @@ function generateAggregatedCSharpFiles(componentHierarchyMap, outDir, options =
         chunks.push("    {");
         if (pom.formattedDataTestId.includes("${") || allTestIds.length <= 1) {
           chunks.push(`        await ${locatorName}${pom.formattedDataTestId.includes("${") ? `(${args})` : ""}.ClickAsync();`);
+          chunks.push(`        return new ${target}(Page);`);
         } else {
           chunks.push("        Exception? lastError = null;");
           chunks.push(`        foreach (var testId in new[] { ${allTestIds.map(toCSharpTestIdExpression).join(", ")} })`);
@@ -3760,7 +3761,6 @@ function generateAggregatedCSharpFiles(componentHierarchyMap, outDir, options =
           chunks.push("        }");
           chunks.push('        throw lastError ?? new System.Exception("[pom] Failed to navigate using any candidate test id.");');
         }
-        chunks.push(`        return new ${target}(Page);`);
         chunks.push("    }");
         chunks.push("");
         continue;