@immense/vue-pom-generator 1.0.39 → 1.0.41

package/dist/index.mjs

@@ -698,14 +698,16 @@ function nodeHasForDirective(node) {
 function getKeyDirective(node) {
   return findDirectiveByName(node, "bind", "key") ?? null;
 }
-function getKeyDirectiveValue(node, context = null) {
+function getKeyDirectiveValue(node, _context = null) {
   const keyDirective = getKeyDirective(node);
-  let value = keyDirective?.exp?.loc.source;
-  if (value) {
-    if (context) {
-      value = stringifyExpression(keyDirective.exp);
-    }
-    return `\${${value}}`;
+  const rawSource = keyDirective?.exp?.loc.source?.trim();
+  if (rawSource) {
+    return `\${${rawSource}}`;
+  }
+  if (keyDirective?.exp) {
+    const value = stringifyExpression(keyDirective.exp);
+    if (value)
+      return `\${${value}}`;
   }
   return null;
 }
@@ -2054,9 +2056,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 +2066,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 +2115,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 +2166,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 +3742,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 +3763,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;
@@ -5967,6 +5969,7 @@ function createDevProcessorPlugin(options) {
     customPomDir,
     customPomImportAliases,
     customPomImportNameCollisionBehavior,
+    nameCollisionBehavior = "suffix",
     testIdAttribute,
     routerAwarePoms,
     resolvedRouterEntry,
@@ -6114,7 +6117,14 @@ function createDevProcessorPlugin(options) {
                 nativeWrappers,
                 excludedComponents,
                 getViewsDirAbs(),
-                { existingIdBehavior: "preserve", testIdAttribute, wrapperSearchRoots: getWrapperSearchRoots() }
+                {
+                  existingIdBehavior: "preserve",
+                  nameCollisionBehavior,
+                  testIdAttribute,
+                  warn: (message) => loggerRef.current.warn(message),
+                  vueFilesPathMap: snapshotVuePathMap,
+                  wrapperSearchRoots: getWrapperSearchRoots()
+                }
               )
             ]
           });
@@ -6157,6 +6167,8 @@ function createDevProcessorPlugin(options) {
           customPomDir,
           customPomImportAliases,
           customPomImportNameCollisionBehavior,
+          viewsDir,
+          scanDirs,
           testIdAttribute,
           vueRouterFluentChaining: routerAwarePoms,
           routerEntry: resolvedRouterEntry,
@@ -6340,6 +6352,7 @@ function createSupportPlugins(options) {
     viewsDir,
     scanDirs,
     getWrapperSearchRoots,
+    nameCollisionBehavior = "suffix",
     outDir,
     emitLanguages,
     csharp,
@@ -6416,6 +6429,7 @@ function createSupportPlugins(options) {
     customPomDir,
     customPomImportAliases,
     customPomImportNameCollisionBehavior,
+    nameCollisionBehavior,
     testIdAttribute,
     routerAwarePoms,
     routerType,
@@ -6996,6 +7010,7 @@ function createVuePomGeneratorPlugins(options = {}) {
     viewsDir,
     scanDirs,
     getWrapperSearchRoots: getWrapperSearchRootsAbs,
+    nameCollisionBehavior,
     outDir,
     emitLanguages,
     csharp,