@immense/vue-pom-generator 1.0.31 → 1.0.32

package/dist/index.mjs

@@ -1818,6 +1818,12 @@ function applyResolvedDataTestId(args) {
   const existingIdBehavior = args.existingIdBehavior ?? "preserve";
   const nameCollisionBehavior = args.nameCollisionBehavior ?? "suffix";
   const warn = args.warn;
+  const getBestKeyAccessCandidates = (expr) => {
+    if (!expr) {
+      return [];
+    }
+    return expr.split("??").map((part) => part.trim()).filter(Boolean);
+  };
   let dataTestId = args.preferredGeneratedValue;
   let fromExisting = false;
   const existing = tryGetExistingElementDataTestId(args.element, testIdAttribute);
@@ -1840,6 +1846,7 @@ Bulk cleanup: run ESLint with the @immense/vue-pom-generator/remove-existing-tes
     if (existingIdBehavior === "preserve") {
       if (existing.isDynamic) {
         if (existing.template) {
+          const existingTemplate = existing.template;
           if ((existing.templateExpressionCount ?? 0) !== 1) {
             throw new Error(
               `[vue-pom-generator] Existing ${attrLabel} is a template literal with multiple interpolations and cannot be preserved safely.
@@ -1850,8 +1857,8 @@ Existing ${attrLabel}: ${JSON.stringify(existing.value)}
 Fix: reduce the template to a single key-based interpolation, or remove the explicit ${attrLabel} so it can be auto-generated.`
             );
           }
-          const hasExact = args.bestKeyPlaceholder && existing.template.includes(args.bestKeyPlaceholder);
-          const hasVarAccess = args.bestKeyVariable && existing.template.includes(args.bestKeyVariable);
+          const hasExact = args.bestKeyPlaceholder && existingTemplate.includes(args.bestKeyPlaceholder);
+          const hasVarAccess = getBestKeyAccessCandidates(args.bestKeyVariable).some((candidate) => existingTemplate.includes(candidate));
           if (!hasExact && !hasVarAccess && args.bestKeyPlaceholder) {
             throw new Error(
               `[vue-pom-generator] Existing ${attrLabel} appears to be missing the key placeholder needed to keep it unique.
@@ -3842,14 +3849,18 @@ function generateViewObjectModelContent(componentName, dependencies, componentHi
     }
     return false;
   };
+  const customPomClassIdentifierMap = options.customPomClassIdentifierMap ?? {};
+  const customPomAvailableClassIdentifiers = options.customPomAvailableClassIdentifiers ?? /* @__PURE__ */ new Set();
   const attachmentsForThisClass = customPomAttachments.filter((a) => {
+    if (!Object.prototype.hasOwnProperty.call(customPomClassIdentifierMap, a.className))
+      return false;
     const scope = a.attachTo ?? "views";
     const scopeOk = isView ? scope === "views" || scope === "both" : scope === "components" || scope === "both";
     if (!scopeOk)
       return false;
     return a.attachWhenUsesComponents.some((c) => hasChildComponent(c));
   }).map((a) => ({
-    className: options.customPomClassIdentifierMap?.[a.className] ?? a.className,
+    className: customPomClassIdentifierMap[a.className],
     propertyName: a.propertyName
   }));
   let content = "";
@@ -3889,7 +3900,7 @@ function generateViewObjectModelContent(componentName, dependencies, componentHi
   content += `
 export class ${className} extends BasePage {
 `;
-  const widgetInstances = isView ? getWidgetInstancesForView(componentName, dependencies.dataTestIdSet) : [];
+  const widgetInstances = isView ? getWidgetInstancesForView(componentName, dependencies.dataTestIdSet, customPomAvailableClassIdentifiers) : [];
   const componentRefsForInstances = isView ? usedComponentSet?.size ? usedComponentSet : childrenComponentSet : childrenComponentSet;
   if (isView && (componentRefsForInstances.size > 0 || attachmentsForThisClass.length > 0 || widgetInstances.length > 0)) {
     content += getComponentInstances(componentRefsForInstances, componentHierarchyMap, attachmentsForThisClass, widgetInstances);
@@ -4047,6 +4058,7 @@ Fix by setting generation.playwright.customPoms.importAliases["${exportName}"] t
       return customPomClassIdentifierMap2;
     };
     const customPomClassIdentifierMap = addCustomPomImports();
+    const customPomAvailableClassIdentifiers = new Set(Object.values(customPomClassIdentifierMap ?? {}));
     const referencedTargets = /* @__PURE__ */ new Set();
     for (const [, deps] of items) {
       for (const dt of deps.dataTestIdSet) {
@@ -4199,6 +4211,7 @@ Fix by setting generation.playwright.customPoms.importAliases["${exportName}"] t
         aggregated: true,
         customPomAttachments: options.customPomAttachments ?? [],
         customPomClassIdentifierMap,
+        customPomAvailableClassIdentifiers,
         testIdAttribute: options.testIdAttribute,
         vueRouterFluentChaining: options.vueRouterFluentChaining,
         routeMetaByComponent: options.routeMetaByComponent
@@ -4293,7 +4306,7 @@ function toPascalCaseLocal(str) {
     return preserveInternalCaps ? upperFirst(word) : upperFirst(word.toLowerCase());
   }).join("");
 }
-function getWidgetInstancesForView(componentName, dataTestIdSet) {
+function getWidgetInstancesForView(componentName, dataTestIdSet, availableClassIdentifiers) {
   const out = [];
   const usedPropNames = /* @__PURE__ */ new Set();
   const ensureUnique = (base) => {
@@ -4324,6 +4337,8 @@ function getWidgetInstancesForView(componentName, dataTestIdSet) {
     } else {
       continue;
     }
+    if (!availableClassIdentifiers.has(className))
+      continue;
     const viewPrefix = `${componentName}-`;
     const descriptorRaw = stem.startsWith(viewPrefix) ? stem.slice(viewPrefix.length) : stem;
     const descriptorPascal = toPascalCaseLocal(descriptorRaw);