@immense/vue-pom-generator 1.0.33 → 1.0.35

package/RELEASE_NOTES.md

@@ -1,43 +1,28 @@
-● # Release Notes: v1.0.33
+● # Release Notes: v1.0.35
 
   ## Highlights
-
-  - Fixed singleton key test-id inference to correctly handle edge cases
-  - Added comprehensive generation metrics and diagnostics system for better visibility into
-  transform operations
-  - Introduced new `generation-metrics.ts` module for tracking and reporting code generation
-  statistics
-  - Expanded transform logic with 192 additional lines of processing logic
-  - Enhanced plugin architecture with improved metric collection in dev and build modes
+  - Fixed wrapper collision fallbacks in transform logic
+  - Added comprehensive test coverage for wrapper collision scenarios
+  - Improved PR workflow with release-notes preview comments
 
   ## Changes
 
-  **Core Transformation**
-  - Fixed singleton key test-id inference logic
-  - Expanded `transform.ts` with enhanced processing capabilities
+  ### Bug Fixes
+  - Resolved issues with wrapper collision fallback behavior in transform module
 
-  **Metrics & Diagnostics**
-  - Added `plugin/support/generation-metrics.ts` for tracking generation statistics
-  - Updated `plugin/vue-plugin.ts` with enhanced metrics collection (85 lines modified)
-  - Improved diagnostic output in `plugin/support/dev-plugin.ts` and
-  `plugin/support/build-plugin.ts`
+  ### Testing
+  - Added 41 lines of new tests for wrapper collision scenarios in `transform.test.ts`
 
-  **Testing**
-  - Added comprehensive test suite in `tests/generation-metrics.test.ts` (47 tests)
-  - Expanded `tests/transform.test.ts` with 131 additional test cases
-  - Enhanced `tests/options.test.ts` with 72 new test cases
+  ### Developer Experience
+  - Integrated automated release-notes preview comments on pull requests
 
-  **Infrastructure**
-  - Updated plugin creation in `plugin/create-vue-pom-generator-plugins.ts`
-  - Minor utility adjustments in `utils.ts`
+  ## Breaking Changes
+  None
 
   ## Pull Requests Included
-
   - #1 Add PR release-notes preview comments (https://github.com/immense/vue-pom-generator/pull/1)
    by @dkattan
 
   ## Testing
-
-  Added 250+ new test cases across generation metrics, transform logic, and options handling. All
-  tests passing.
+  New test cases added to validate wrapper collision fallback fixes. All tests passing.
 

package/class-generation/index.ts

@@ -66,12 +66,27 @@ async function getRouteMetaByComponent(
   projectRoot?: string,
   routerEntry?: string,
   routerType?: "vue-router" | "nuxt",
+  options: {
+    viewsDir?: string;
+    scanDirs?: string[];
+  } = {},
 ): Promise<Record<string, RouteMeta>> {
   const root = projectRoot ?? process.cwd();
+  const viewsDir = options.viewsDir ?? "src/views";
+  const viewsDirAbs = path.isAbsolute(viewsDir) ? viewsDir : path.resolve(root, viewsDir);
+  const scanDirs = options.scanDirs?.length ? options.scanDirs : ["src"];
+  const extraRoots = process.cwd() !== root ? [process.cwd()] : [];
 
   const { routeMetaEntries } = routerType === "nuxt"
     ? await introspectNuxtPages(root)
-    : await parseRouterFileFromCwd(resolveRouterEntry(root, routerEntry));
+    : await parseRouterFileFromCwd(resolveRouterEntry(root, routerEntry), {
+      componentNaming: {
+        projectRoot: root,
+        viewsDirAbs,
+        scanDirs,
+        extraRoots,
+      },
+    });
 
   const map = new Map<string, RouteMeta[]>();
   for (const entry of routeMetaEntries) {
@@ -382,6 +397,9 @@ export interface GenerateFilesOptions {
   /** The type of router introspection to perform. */
   routerType?: "vue-router" | "nuxt";
 
+  viewsDir?: string;
+  scanDirs?: string[];
+
   routeMetaByComponent?: Record<string, RouteMeta>;
 }
 
@@ -443,6 +461,9 @@ export async function generateFiles(
     vueRouterFluentChaining,
     routerEntry,
     routerType,
+    viewsDir,
+    scanDirs,
+    routeMetaByComponent: routeMetaByComponentOverride,
   } = options;
 
   const emitLanguages: Array<"ts" | "csharp"> = emitLanguagesOverride?.length
@@ -451,9 +472,13 @@ export async function generateFiles(
 
   const outDir = outDirOverride ?? "./pom";
 
-  const routeMetaByComponent = vueRouterFluentChaining
-    ? await getRouteMetaByComponent(projectRoot, routerEntry, routerType)
-    : undefined;
+  const routeMetaByComponent = routeMetaByComponentOverride
+    ?? (vueRouterFluentChaining
+      ? await getRouteMetaByComponent(projectRoot, routerEntry, routerType, {
+        viewsDir,
+        scanDirs,
+      })
+      : undefined);
   const generatedFilePaths: string[] = [];
   const writeGeneratedFile = (file: GeneratedFileOutput) => {
     const resolvedFilePath = path.resolve(file.filePath);

package/dist/class-generation/index.d.ts

@@ -81,6 +81,8 @@ export interface GenerateFilesOptions {
     routerEntry?: string;
     /** The type of router introspection to perform. */
     routerType?: "vue-router" | "nuxt";
+    viewsDir?: string;
+    scanDirs?: string[];
     routeMetaByComponent?: Record<string, RouteMeta>;
 }
 export declare function generateFiles(componentHierarchyMap: Map<string, IComponentDependencies>, vueFilesPathMap: Map<string, string>, basePageClassPath: string, options?: GenerateFilesOptions): Promise<void>;

package/dist/class-generation/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../class-generation/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,oCAAoC,EAAE,MAAM,sBAAsB,CAAC;AAE5E,OAAO,EAAE,sBAAsB,EAAoE,MAAM,UAAU,CAAC;AAQpH,OAAO,EAAE,oCAAoC,EAAE,CAAC;AA8ChD,UAAU,SAAS;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAyOD,MAAM,WAAW,oBAAoB;IACnC;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;;;;;;;OAWG;IACH,gBAAgB,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAE1D;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;;;OAOG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEhD;;;;;OAKG;IACH,oCAAoC,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;IAEzD;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,KAAK,CAAC;QAC3B,SAAS,EAAE,MAAM,CAAC;QAClB,YAAY,EAAE,MAAM,CAAC;QACrB,wBAAwB,EAAE,MAAM,EAAE,CAAC;QAEnC;;;WAGG;QACH,QAAQ,CAAC,EAAE,OAAO,GAAG,YAAY,GAAG,MAAM,CAAC;KAC5C,CAAC,CAAC;IAEH,yEAAyE;IACzE,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,uDAAuD;IACvD,aAAa,CAAC,EAAE,KAAK,CAAC,IAAI,GAAG,QAAQ,CAAC,CAAC;IAEvC,6BAA6B;IAC7B,MAAM,CAAC,EAAE;QACP,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IAEF,6EAA6E;IAC7E,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAElC,2FAA2F;IAC3F,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,mDAAmD;IACnD,UAAU,CAAC,EAAE,YAAY,GAAG,MAAM,CAAC;IAEnC,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAClD;AAwCD,wBAAsB,aAAa,CACjC,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,EAC1D,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,iBAAiB,EAAE,MAAM,EACzB,OAAO,GAAE,oBAAyB,iBA2EnC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../class-generation/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,oCAAoC,EAAE,MAAM,sBAAsB,CAAC;AAE5E,OAAO,EAAE,sBAAsB,EAAoE,MAAM,UAAU,CAAC;AAQpH,OAAO,EAAE,oCAAoC,EAAE,CAAC;AA8ChD,UAAU,SAAS;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAwPD,MAAM,WAAW,oBAAoB;IACnC;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;;;;;;;OAWG;IACH,gBAAgB,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAE1D;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;;;OAOG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEhD;;;;;OAKG;IACH,oCAAoC,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;IAEzD;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,KAAK,CAAC;QAC3B,SAAS,EAAE,MAAM,CAAC;QAClB,YAAY,EAAE,MAAM,CAAC;QACrB,wBAAwB,EAAE,MAAM,EAAE,CAAC;QAEnC;;;WAGG;QACH,QAAQ,CAAC,EAAE,OAAO,GAAG,YAAY,GAAG,MAAM,CAAC;KAC5C,CAAC,CAAC;IAEH,yEAAyE;IACzE,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,uDAAuD;IACvD,aAAa,CAAC,EAAE,KAAK,CAAC,IAAI,GAAG,QAAQ,CAAC,CAAC;IAEvC,6BAA6B;IAC7B,MAAM,CAAC,EAAE;QACP,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IAEF,6EAA6E;IAC7E,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAElC,2FAA2F;IAC3F,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,mDAAmD;IACnD,UAAU,CAAC,EAAE,YAAY,GAAG,MAAM,CAAC;IAEnC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IAEpB,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAClD;AAwCD,wBAAsB,aAAa,CACjC,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,EAC1D,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,iBAAiB,EAAE,MAAM,EACzB,OAAO,GAAE,oBAAyB,iBAkFnC"}

package/dist/index.cjs

@@ -2569,6 +2569,53 @@ Fix: make the element identifiable (e.g. add id/name/inner text or use a more sp
     registerGeneratedMethodSignature(generatedName, signature);
   }
 }
+function safeRealpath(value) {
+  try {
+    if (fs.existsSync(value)) {
+      return fs.realpathSync(value);
+    }
+  } catch {
+    return value;
+  }
+  const parent = path.dirname(value);
+  if (!parent || parent === value) {
+    return value;
+  }
+  const resolvedParent = safeRealpath(parent);
+  return resolvedParent === parent ? value : path.join(resolvedParent, path.basename(value));
+}
+function resolveComponentNameFromPath(options) {
+  const { projectRoot, viewsDirAbs, scanDirs, extraRoots = [] } = options;
+  const cleanFilename = options.filename.includes("?") ? options.filename.substring(0, options.filename.indexOf("?")) : options.filename;
+  const absFilename = path.isAbsolute(cleanFilename) ? cleanFilename : path.resolve(projectRoot, cleanFilename);
+  const normalizedAbsFilename = path.normalize(safeRealpath(absFilename));
+  const rootBases = [projectRoot, ...extraRoots.filter((r) => r !== projectRoot)];
+  const roots = [viewsDirAbs, ...rootBases.flatMap((base) => scanDirs.map((d) => path.resolve(base, d)))];
+  for (const base of rootBases) {
+    for (const dir of scanDirs) {
+      const absDir = path.resolve(base, dir);
+      try {
+        const pagesDir = path.join(absDir, "pages");
+        if (fs.existsSync(pagesDir))
+          roots.push(pagesDir);
+        const componentsDir = path.join(absDir, "components");
+        if (fs.existsSync(componentsDir))
+          roots.push(componentsDir);
+      } catch {
+      }
+    }
+  }
+  const potentialRoots = Array.from(new Set(roots.map((r) => path.normalize(safeRealpath(r))))).sort((a, b) => b.length - a.length);
+  for (const root of potentialRoots) {
+    if (normalizedAbsFilename.startsWith(root + path.sep) || normalizedAbsFilename === root) {
+      const rel = path.relative(root, normalizedAbsFilename);
+      const parsed = path.parse(rel);
+      const segments = path.join(parsed.dir, parsed.name);
+      return toPascalCase(segments);
+    }
+  }
+  return toPascalCase(path.parse(normalizedAbsFilename).name);
+}
 let routerIntrospectionQueue = Promise.resolve();
 async function runRouterIntrospectionExclusive(fn) {
   const prev = routerIntrospectionQueue.catch(() => void 0);
@@ -2848,20 +2895,84 @@ function getRouteParamMeta(router, record, paramNames) {
     }
   });
 }
-function getComponentNameFromRouteRecord(record) {
-  const comp = record.components?.default;
-  if (!comp)
+function normalizeRouteComponentFilePath(filePath, options = {}) {
+  const queryIndex = filePath.indexOf("?");
+  const cleanPath = queryIndex === -1 ? filePath : filePath.slice(0, queryIndex);
+  if (cleanPath.startsWith("/@fs/")) {
+    return path.normalize(cleanPath.slice("/@fs/".length));
+  }
+  if (path.isAbsolute(cleanPath)) {
+    if (fs.existsSync(cleanPath) || !options.rootDir)
+      return path.normalize(cleanPath);
+    return path.normalize(path.resolve(options.rootDir, `.${cleanPath}`));
+  }
+  if (!options.rootDir)
     return null;
+  return path.normalize(path.resolve(options.rootDir, cleanPath));
+}
+function getComponentInfoFromVueComponent(comp, options = {}) {
+  if (!comp) {
+    return {
+      componentName: null,
+      filePath: null
+    };
+  }
+  let componentName = null;
+  let filePath = null;
   if (typeof comp.__file === "string" && comp.__file.length) {
+    filePath = normalizeRouteComponentFilePath(comp.__file, { rootDir: options.rootDir });
     const base = path.posix.basename(path.posix.normalize(comp.__file));
     if (base.toLowerCase().endsWith(".vue"))
-      return base.slice(0, -".vue".length);
+      componentName = base.slice(0, -".vue".length);
   }
-  if (typeof comp.__name === "string" && comp.__name.length)
-    return comp.__name;
-  if (typeof comp.name === "string" && comp.name.length)
-    return comp.name;
-  return null;
+  if (!componentName && typeof comp.__name === "string" && comp.__name.length)
+    componentName = comp.__name;
+  if (!componentName && options.allowFunctionNameFallback !== false && typeof comp.name === "string" && comp.name.length) {
+    componentName = comp.name;
+  }
+  return {
+    componentName,
+    filePath
+  };
+}
+async function getComponentInfoFromRouteRecord(record, options = {}) {
+  const comp = record.components?.default;
+  if (!comp) {
+    return {
+      componentName: null,
+      filePath: null
+    };
+  }
+  if (typeof comp !== "function") {
+    return getComponentInfoFromVueComponent(comp, options);
+  }
+  const directInfo = getComponentInfoFromVueComponent(comp, {
+    allowFunctionNameFallback: false,
+    rootDir: options.rootDir
+  });
+  if (directInfo.componentName || directInfo.filePath)
+    return directInfo;
+  try {
+    const loaded = await comp();
+    const resolved = loaded && typeof loaded === "object" && "default" in loaded ? loaded.default : loaded;
+    const loadedInfo = getComponentInfoFromVueComponent(resolved, options);
+    if (loadedInfo.componentName || loadedInfo.filePath)
+      return loadedInfo;
+  } catch {
+  }
+  return getComponentInfoFromVueComponent(comp, options);
+}
+function resolveIntrospectedComponentName(componentInfo, componentNaming) {
+  if (componentInfo.filePath && componentNaming) {
+    return resolveComponentNameFromPath({
+      filename: componentInfo.filePath,
+      projectRoot: componentNaming.projectRoot,
+      viewsDirAbs: componentNaming.viewsDirAbs,
+      scanDirs: componentNaming.scanDirs,
+      extraRoots: componentNaming.extraRoots
+    });
+  }
+  return componentInfo.componentName;
 }
 async function ensureDomShim() {
   const domShimHtml = "<!doctype html><html><head></head><body><div id='app'></div></body></html>";
@@ -3107,7 +3218,8 @@ async function parseRouterFileFromCwd(routerEntryPath, options = {}) {
       const routePathMap = /* @__PURE__ */ new Map();
       const routeMetaEntries = [];
       for (const r of router.getRoutes()) {
-        const componentName = getComponentNameFromRouteRecord(r);
+        const componentInfo = await getComponentInfoFromRouteRecord(r, { rootDir: cwd });
+        const componentName = resolveIntrospectedComponentName(componentInfo, options.componentNaming);
         if (!componentName)
           continue;
         if (typeof r.path === "string" && r.path.length) {
@@ -3165,9 +3277,20 @@ function resolveRouterEntry(projectRoot, routerEntry) {
   const root = projectRoot ?? process.cwd();
   return path.isAbsolute(routerEntry) ? routerEntry : path.resolve(root, routerEntry);
 }
-async function getRouteMetaByComponent(projectRoot, routerEntry, routerType) {
+async function getRouteMetaByComponent(projectRoot, routerEntry, routerType, options = {}) {
   const root = projectRoot ?? process.cwd();
-  const { routeMetaEntries } = routerType === "nuxt" ? await introspectNuxtPages(root) : await parseRouterFileFromCwd(resolveRouterEntry(root, routerEntry));
+  const viewsDir = options.viewsDir ?? "src/views";
+  const viewsDirAbs = path.isAbsolute(viewsDir) ? viewsDir : path.resolve(root, viewsDir);
+  const scanDirs = options.scanDirs?.length ? options.scanDirs : ["src"];
+  const extraRoots = process.cwd() !== root ? [process.cwd()] : [];
+  const { routeMetaEntries } = routerType === "nuxt" ? await introspectNuxtPages(root) : await parseRouterFileFromCwd(resolveRouterEntry(root, routerEntry), {
+    componentNaming: {
+      projectRoot: root,
+      viewsDirAbs,
+      scanDirs,
+      extraRoots
+    }
+  });
   const map = /* @__PURE__ */ new Map();
   for (const entry of routeMetaEntries) {
     const list = map.get(entry.componentName) ?? [];
@@ -3344,11 +3467,17 @@ async function generateFiles(componentHierarchyMap, vueFilesPathMap, basePageCla
     csharp,
     vueRouterFluentChaining,
     routerEntry,
-    routerType
+    routerType,
+    viewsDir,
+    scanDirs,
+    routeMetaByComponent: routeMetaByComponentOverride
   } = options;
   const emitLanguages = emitLanguagesOverride?.length ? emitLanguagesOverride : ["ts"];
   const outDir = outDirOverride ?? "./pom";
-  const routeMetaByComponent = vueRouterFluentChaining ? await getRouteMetaByComponent(projectRoot, routerEntry, routerType) : void 0;
+  const routeMetaByComponent = routeMetaByComponentOverride ?? (vueRouterFluentChaining ? await getRouteMetaByComponent(projectRoot, routerEntry, routerType, {
+    viewsDir,
+    scanDirs
+  }) : void 0);
   const generatedFilePaths = [];
   const writeGeneratedFile = (file) => {
     const resolvedFilePath = path.resolve(file.filePath);
@@ -4478,6 +4607,8 @@ function createBuildProcessorPlugin(options) {
   const {
     componentHierarchyMap,
     vueFilesPathMap,
+    viewsDir,
+    scanDirs,
     basePageClassPath,
     normalizedBasePagePath,
     outDir,
@@ -4513,7 +4644,14 @@ function createBuildProcessorPlugin(options) {
       } else {
         if (!resolvedRouterEntry)
           throw new Error("[vue-pom-generator] router.entry is required when router introspection is enabled.");
-        result = await parseRouterFileFromCwd(resolvedRouterEntry, { moduleShims: routerModuleShims });
+        result = await parseRouterFileFromCwd(resolvedRouterEntry, {
+          moduleShims: routerModuleShims,
+          componentNaming: {
+            projectRoot: projectRootRef.current,
+            viewsDirAbs: path.isAbsolute(viewsDir) ? viewsDir : path.resolve(projectRootRef.current, viewsDir),
+            scanDirs
+          }
+        });
       }
       const { routeNameMap, routePathMap } = result;
       setRouteNameToComponentNameMap(routeNameMap);
@@ -4564,7 +4702,9 @@ function createBuildProcessorPlugin(options) {
         testIdAttribute,
         vueRouterFluentChaining: routerAwarePoms,
         routerEntry: resolvedRouterEntry,
-        routerType
+        routerType,
+        viewsDir,
+        scanDirs
       });
       buildGenerationMetricsByOutputKey.set(generationMetricsKey, metrics);
       loggerRef.current.info(`generated POMs (${metrics.entryCount} entries, ${metrics.selectorCount} selectors)`);
@@ -5220,14 +5360,14 @@ function createTestIdTransform(componentName, componentHierarchyMap, nativeWrapp
   const warn = options.warn;
   const vueFilesPathMap = options.vueFilesPathMap;
   const wrapperSearchRoots = options.wrapperSearchRoots ?? [];
-  const safeRealpath = (p) => {
+  const safeRealpath2 = (p) => {
     try {
       return fs.existsSync(p) ? fs.realpathSync(p) : p;
     } catch {
       return p;
     }
   };
-  const normalizedViewsDirAbs = path.normalize(safeRealpath(path.resolve(viewsDirAbs)));
+  const normalizedViewsDirAbs = path.normalize(safeRealpath2(path.resolve(viewsDirAbs)));
   const generatedMethodContentByComponent = /* @__PURE__ */ new Map();
   const lastConditionalHintByParent = /* @__PURE__ */ new WeakMap();
   const lastConditionalMergeGroupByParent = /* @__PURE__ */ new WeakMap();
@@ -5315,7 +5455,7 @@ function createTestIdTransform(componentName, componentHierarchyMap, nativeWrapp
     const parentIsRoot = context?.parent?.type === compilerCore.NodeTypes.ROOT;
     const parentElement = !parentIsRoot && context?.parent?.type === compilerCore.NodeTypes.ELEMENT ? context.parent : null;
     hierarchyMap.set(element, parentElement);
-    const normalizeFilePath = (filePath) => path.normalize(safeRealpath(path.resolve(filePath)));
+    const normalizeFilePath = (filePath) => path.normalize(safeRealpath2(path.resolve(filePath)));
     const normalizedFilePath = normalizeFilePath(context.filename);
     const parentComponentName = componentName;
     const dependencies = (() => {
@@ -5502,14 +5642,23 @@ Fix: remove the explicit ${attrLabel}, or change existingIdBehavior to "overwrit
         upsertAttribute(element, "option-data-testid-prefix", optionDataTestIdPrefixValue);
       }
       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 wrapperHintCandidates = [
+        semanticNameHint,
+        getStaticAttributeContent(element, "title"),
+        getStaticAttributeContent(element, "label"),
+        getStaticAttributeContent(element, "okTitle"),
+        getStaticAttributeContent(element, "cancelTitle"),
+        getStaticAttributeContent(element, "id") || getStaticAttributeContent(element, "name"),
+        getInnerText(element) || null,
+        nameCollisionBehavior === "error" && semanticNameHint && conditionalHint ? `${semanticNameHint} ${conditionalHint}` : conditionalHint
+      ].map((value) => (value ?? "").trim()).filter(Boolean).filter((value, index, values) => values.indexOf(value) === index);
+      const [primarySemanticHint, ...alternates] = wrapperHintCandidates;
       const pomMergeKey = semanticNameHint && conditionalMergeGroupKey ? `wrapper:ifgroup:${conditionalMergeGroupKey}:model:${semanticNameHint}` : void 0;
       applyResolvedDataTestIdForElement({
         preferredGeneratedValue: nativeWrappersValue,
         nativeRoleOverride: nativeRole,
         semanticNameHint: primarySemanticHint,
-        semanticNameHintAlternates: alternates,
+        semanticNameHintAlternates: alternates.length ? alternates : void 0,
         pomMergeKey
       });
       return;
@@ -5599,12 +5748,14 @@ Fix: remove the explicit ${attrLabel}, or change existingIdBehavior to "overwrit
       });
       const clickHint = trimLeadingSeparators(clickSuffix) || void 0;
       const idOrName = getIdOrName(element) || void 0;
-      const semanticNameHint2 = clickHint || idOrName || innerText || conditionalHint || void 0;
+      const semanticHintCandidates = [clickHint, idOrName, innerText, conditionalHint].map((value) => (value ?? "").trim()).filter(Boolean).filter((value, index, values) => values.indexOf(value) === index);
+      const [semanticNameHint2, ...semanticNameHintAlternates] = semanticHintCandidates;
       const pomMergeKey = clickHint ? `click:hint:${clickHint}` : void 0;
       const testId = getClickDataTestId(clickSuffix);
       applyResolvedDataTestIdForElement({
         preferredGeneratedValue: testId,
         semanticNameHint: semanticNameHint2,
+        semanticNameHintAlternates,
         pomMergeKey
       });
       {
@@ -5645,37 +5796,6 @@ Fix: remove the explicit ${attrLabel}, or change existingIdBehavior to "overwrit
     }
   };
 }
-function resolveComponentNameFromPath(options) {
-  const { projectRoot, viewsDirAbs, scanDirs, extraRoots = [] } = options;
-  const cleanFilename = options.filename.includes("?") ? options.filename.substring(0, options.filename.indexOf("?")) : options.filename;
-  const absFilename = path.isAbsolute(cleanFilename) ? cleanFilename : path.resolve(projectRoot, cleanFilename);
-  const rootBases = [projectRoot, ...extraRoots.filter((r) => r !== projectRoot)];
-  const roots = [viewsDirAbs, ...rootBases.flatMap((base) => scanDirs.map((d) => path.resolve(base, d)))];
-  for (const base of rootBases) {
-    for (const dir of scanDirs) {
-      const absDir = path.resolve(base, dir);
-      try {
-        const pagesDir = path.join(absDir, "pages");
-        if (fs.existsSync(pagesDir))
-          roots.push(pagesDir);
-        const componentsDir = path.join(absDir, "components");
-        if (fs.existsSync(componentsDir))
-          roots.push(componentsDir);
-      } catch {
-      }
-    }
-  }
-  const potentialRoots = Array.from(new Set(roots.map((r) => path.normalize(r)))).sort((a, b) => b.length - a.length);
-  for (const root of potentialRoots) {
-    if (absFilename.startsWith(root + path.sep) || absFilename === root) {
-      const rel = path.relative(root, absFilename);
-      const parsed = path.parse(rel);
-      const segments = path.join(parsed.dir, parsed.name);
-      return toPascalCase(segments);
-    }
-  }
-  return toPascalCase(path.parse(absFilename).name);
-}
 const devStartupMetricsByOutputKey = /* @__PURE__ */ new Map();
 function createDevProcessorPlugin(options) {
   const {
@@ -5722,6 +5842,7 @@ function createDevProcessorPlugin(options) {
       scheduleVueFileRegen(ctx.file, "hmr");
     },
     configureServer(server) {
+      const getViewsDirAbs = () => path.isAbsolute(viewsDir) ? viewsDir : path.resolve(projectRootRef.current, viewsDir);
       const routerInitPromise = (async () => {
         if (!routerAwarePoms) {
           setRouteNameToComponentNameMap(/* @__PURE__ */ new Map());
@@ -5734,7 +5855,15 @@ function createDevProcessorPlugin(options) {
         } else {
           if (!resolvedRouterEntry)
             throw new Error("[vue-pom-generator] router.entry is required when router introspection is enabled.");
-          result = await parseRouterFileFromCwd(resolvedRouterEntry, { moduleShims: routerModuleShims });
+          result = await parseRouterFileFromCwd(resolvedRouterEntry, {
+            moduleShims: routerModuleShims,
+            componentNaming: {
+              projectRoot: projectRootRef.current,
+              viewsDirAbs: getViewsDirAbs(),
+              scanDirs,
+              extraRoots: [process.cwd()]
+            }
+          });
         }
         const { routeNameMap, routePathMap } = result;
         setRouteNameToComponentNameMap(routeNameMap);
@@ -5757,7 +5886,6 @@ function createDevProcessorPlugin(options) {
       const logDebug = (message) => loggerRef.current.debug(message);
       let scheduleVueFileRegenLocal = null;
       const formatMs = (ms) => `${ms.toFixed(1)}ms`;
-      const getViewsDirAbs = () => path.isAbsolute(viewsDir) ? viewsDir : path.resolve(projectRootRef.current, viewsDir);
       const extractTemplateFromSfc = (source, filename) => {
         const { descriptor } = compilerSfc.parse(source, {
           filename: filename ?? "anonymous.vue"
@@ -5899,7 +6027,9 @@ function createDevProcessorPlugin(options) {
           testIdAttribute,
           vueRouterFluentChaining: routerAwarePoms,
           routerEntry: resolvedRouterEntry,
-          routerType
+          routerType,
+          viewsDir,
+          scanDirs
         });
         if (reason === "startup") {
           devStartupMetricsByOutputKey.set(generationMetricsKey, metrics);
@@ -6121,6 +6251,8 @@ function createSupportPlugins(options) {
   const tsProcessor = createBuildProcessorPlugin({
     componentHierarchyMap,
     vueFilesPathMap,
+    viewsDir,
+    scanDirs,
     basePageClassPath,
     normalizedBasePagePath,
     outDir,