@immense/vue-pom-generator 1.0.26 → 1.0.27

package/RELEASE_NOTES.md

@@ -1,31 +1,36 @@
-● ## Highlights
+● ```markdown
+  ## Highlights
 
-  - Fixed issue where radio options were incorrectly inferred as wrapper elements
-  - Added test coverage for radio option inference logic
-  - Improved PR workflow with automated release-notes preview comments
+  - Fixed strict wrapper selector collision merging to prevent duplicate or conflicting selectors
+  - Enhanced utility functions for better selector handling and conflict detection
+  - Added comprehensive test coverage for selector collision scenarios
 
   ## Changes
 
-  **Bug Fixes**
-  - Avoid inferring radio options as wrappers ([5f6d7bf])
+  ### Bug Fixes
+  - Resolved strict wrapper selector collisions that could occur during transformation
+  - Improved selector merging logic to handle edge cases
 
-  **Testing**
-  - Added test cases for utils coverage
+  ### Testing
+  - Added 45 new test cases covering selector collision scenarios
+  - Expanded test suite in `tests/transform.test.ts`
 
-  **Developer Experience**
-  - Added PR release-notes preview comments (#1)
+  ### Internal
+  - Enhanced `utils.ts` with improved selector handling utilities (12 additions, 4 deletions)
+  - Updated `transform.ts` with collision resolution logic (80 additions, 1 deletion)
 
   ## Breaking Changes
 
-  None
+  None.
 
   ## Pull Requests Included
 
   - #1 [Add PR release-notes preview
-  comments](https://github.com/immense/vue-pom-generator/pull/1) by @dkattan
+  comments](https://github.com/immense/vue-pom-generator/pull/1) (by @dkattan)
 
   ## Testing
 
-  Added 11 lines of test coverage in `tests/utils-coverage.test.ts` to verify the radio options
-  inference fix.
+  Comprehensive test coverage added with 45 new test cases validating selector collision handling
+  and merge behavior.
+  ```
 

package/dist/index.cjs

@@ -1863,9 +1863,6 @@ Fix: either (1) include ${args.bestKeyPlaceholder} in your :${attrLabel} templat
   })();
   const tryMergeWithExistingPrimary = (candidateActionName) => {
     const mergeKey = (args.pomMergeKey ?? "").trim();
-    if (!mergeKey) {
-      return false;
-    }
     if (isKeyed) {
       return false;
     }
@@ -1874,7 +1871,15 @@ Fix: either (1) include ${args.bestKeyPlaceholder} in your :${attrLabel} templat
     if (!existingEntry || !existingPom) {
       return false;
     }
-    if ((existingPom.mergeKey ?? "").trim() !== mergeKey) {
+    const existingSelectors = [
+      existingPom.formattedDataTestId,
+      ...existingPom.alternateFormattedDataTestIds ?? []
+    ];
+    const sharesSelectorIdentity = existingSelectors.includes(formattedDataTestIdForPom);
+    if (!mergeKey && !sharesSelectorIdentity) {
+      return false;
+    }
+    if (mergeKey && (existingPom.mergeKey ?? "").trim() !== mergeKey && !sharesSelectorIdentity) {
       return false;
     }
     if (existingPom.nativeRole !== normalizedRole) {
@@ -4840,8 +4845,46 @@ function createTestIdTransform(componentName, componentHierarchyMap, nativeWrapp
   const normalizedViewsDirAbs = path.normalize(safeRealpath(path.resolve(viewsDirAbs)));
   const generatedMethodContentByComponent = /* @__PURE__ */ new Map();
   const lastConditionalHintByParent = /* @__PURE__ */ new WeakMap();
+  const lastConditionalMergeGroupByParent = /* @__PURE__ */ new WeakMap();
   const conditionalHintByElement = /* @__PURE__ */ new WeakMap();
   const conditionalHintByIfBranch = /* @__PURE__ */ new WeakMap();
+  const conditionalMergeGroupByElement = /* @__PURE__ */ new WeakMap();
+  const conditionalMergeGroupByElementLoc = /* @__PURE__ */ new Map();
+  const conditionalMergeGroupByIfBranch = /* @__PURE__ */ new WeakMap();
+  let conditionalMergeGroupCounter = 0;
+  const getElementLocationKey = (element) => {
+    const startOffset = element.loc?.start.offset;
+    const endOffset = element.loc?.end.offset;
+    if (typeof startOffset !== "number" || typeof endOffset !== "number") {
+      return null;
+    }
+    return `${element.tag}:${startOffset}:${endOffset}`;
+  };
+  const markConditionalMergeGroup = (nodes, mergeGroupKey) => {
+    for (const child of nodes) {
+      if (child.type === compilerCore.NodeTypes.ELEMENT) {
+        const element = child;
+        conditionalMergeGroupByElement.set(element, mergeGroupKey);
+        const elementLocationKey = getElementLocationKey(element);
+        if (elementLocationKey) {
+          conditionalMergeGroupByElementLoc.set(elementLocationKey, mergeGroupKey);
+        }
+        markConditionalMergeGroup(element.children, mergeGroupKey);
+        continue;
+      }
+      if (child.type === compilerCore.NodeTypes.IF) {
+        const ifNode = child;
+        for (const branch of ifNode.branches ?? []) {
+          markConditionalMergeGroup(branch.children, mergeGroupKey);
+        }
+        continue;
+      }
+      if (child.type === compilerCore.NodeTypes.IF_BRANCH || child.type === compilerCore.NodeTypes.FOR) {
+        const branchLike = child;
+        markConditionalMergeGroup(branchLike.children ?? [], mergeGroupKey);
+      }
+    }
+  };
   return (node, context) => {
     if (excludedComponents.includes(componentName)) {
       return;
@@ -4849,8 +4892,15 @@ function createTestIdTransform(componentName, componentHierarchyMap, nativeWrapp
     if (node.type === compilerCore.NodeTypes.IF) {
       const ifNode = node;
       const branches = ifNode.branches ?? [];
+      const mergeGroupKey = `if-group:${++conditionalMergeGroupCounter}`;
+      const ifParentKey = context?.parent ? context.parent : null;
+      if (ifParentKey) {
+        lastConditionalMergeGroupByParent.set(ifParentKey, mergeGroupKey);
+      }
       let lastHint = null;
       for (const branch of branches) {
+        conditionalMergeGroupByIfBranch.set(branch, mergeGroupKey);
+        markConditionalMergeGroup(branch.children ?? [], mergeGroupKey);
         const cond = branch.condition ?? null;
         if (!cond) {
           const hint = lastHint ? `else ${lastHint}` : "else";
@@ -4929,10 +4979,28 @@ function createTestIdTransform(componentName, componentHierarchyMap, nativeWrapp
     const bestKeyPlaceholder = isSlotKey ? `\${${bestKeyInferred}}` : bestKeyInferred;
     const bestKeyVariable = isSlotKey ? bestKeyInferred : null;
     const keyValuesOverride = tryGetContainedInStaticVForSourceLiteralValues(context);
-    const parentKey = !parentIsRoot && context?.parent ? context.parent : null;
+    const parentKey = context?.parent ? context.parent : null;
     const conditional = getConditionalDirectiveInfo(element);
     let conditionalHint = null;
+    const elementLocationKey = getElementLocationKey(element);
+    let conditionalMergeGroupKey = (elementLocationKey ? conditionalMergeGroupByElementLoc.get(elementLocationKey) ?? null : null) ?? conditionalMergeGroupByElement.get(element) ?? null;
+    if (!conditionalMergeGroupKey && context?.parent?.type === compilerCore.NodeTypes.IF_BRANCH) {
+      const branch = context.parent;
+      conditionalMergeGroupKey = conditionalMergeGroupByIfBranch.get(branch) ?? null;
+    }
     if (conditional && (conditional.kind === "if" || conditional.kind === "else-if")) {
+      if (parentKey) {
+        if (!conditionalMergeGroupKey) {
+          if (conditional.kind === "if") {
+            conditionalMergeGroupKey = `if-group:${++conditionalMergeGroupCounter}`;
+          } else {
+            conditionalMergeGroupKey = lastConditionalMergeGroupByParent.get(parentKey) ?? null;
+          }
+        }
+        if (conditionalMergeGroupKey) {
+          lastConditionalMergeGroupByParent.set(parentKey, conditionalMergeGroupKey);
+        }
+      }
       conditionalHint = tryExtractStableHintFromConditionalExpressionSource(conditional.source);
       if (conditionalHint && parentKey) {
         lastConditionalHintByParent.set(parentKey, conditionalHint);
@@ -4941,6 +5009,7 @@ function createTestIdTransform(componentName, componentHierarchyMap, nativeWrapp
       if (parentKey) {
         const previousHint = lastConditionalHintByParent.get(parentKey) ?? null;
         conditionalHint = previousHint ? `else ${previousHint}` : null;
+        conditionalMergeGroupKey = lastConditionalMergeGroupByParent.get(parentKey) ?? null;
       }
     }
     if (!conditionalHint && context?.parent?.type === compilerCore.NodeTypes.IF_BRANCH) {
@@ -5048,11 +5117,13 @@ Fix: remove the explicit ${attrLabel}, or change existingIdBehavior to "overwrit
       const nativeRole = nativeWrappers[element.tag]?.role ?? element.tag;
       const primarySemanticHint = semanticNameHint || conditionalHint || void 0;
       const alternates = nameCollisionBehavior === "error" && semanticNameHint && conditionalHint ? [`${semanticNameHint} ${conditionalHint}`] : void 0;
+      const pomMergeKey = semanticNameHint && conditionalMergeGroupKey ? `wrapper:ifgroup:${conditionalMergeGroupKey}:model:${semanticNameHint}` : void 0;
       applyResolvedDataTestIdForElement({
         preferredGeneratedValue: nativeWrappersValue,
         nativeRoleOverride: nativeRole,
         semanticNameHint: primarySemanticHint,
-        semanticNameHintAlternates: alternates
+        semanticNameHintAlternates: alternates,
+        pomMergeKey
       });
       return;
     }