@immense/vue-pom-generator 1.0.33 → 1.0.34

package/dist/index.mjs

@@ -2528,6 +2528,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);
@@ -2807,20 +2854,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>";
@@ -3066,7 +3177,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) {
@@ -3124,9 +3236,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) ?? [];
@@ -3303,11 +3426,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);
@@ -4437,6 +4566,8 @@ function createBuildProcessorPlugin(options) {
   const {
     componentHierarchyMap,
     vueFilesPathMap,
+    viewsDir,
+    scanDirs,
     basePageClassPath,
     normalizedBasePagePath,
     outDir,
@@ -4472,7 +4603,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);
@@ -4523,7 +4661,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)`);
@@ -5179,14 +5319,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();
@@ -5274,7 +5414,7 @@ function createTestIdTransform(componentName, componentHierarchyMap, nativeWrapp
     const parentIsRoot = context?.parent?.type === NodeTypes.ROOT;
     const parentElement = !parentIsRoot && context?.parent?.type === 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 = (() => {
@@ -5558,12 +5698,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
       });
       {
@@ -5604,37 +5746,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 {
@@ -5681,6 +5792,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());
@@ -5693,7 +5805,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);
@@ -5716,7 +5836,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 } = parse$1(source, {
           filename: filename ?? "anonymous.vue"
@@ -5858,7 +5977,9 @@ function createDevProcessorPlugin(options) {
           testIdAttribute,
           vueRouterFluentChaining: routerAwarePoms,
           routerEntry: resolvedRouterEntry,
-          routerType
+          routerType,
+          viewsDir,
+          scanDirs
         });
         if (reason === "startup") {
           devStartupMetricsByOutputKey.set(generationMetricsKey, metrics);
@@ -6080,6 +6201,8 @@ function createSupportPlugins(options) {
   const tsProcessor = createBuildProcessorPlugin({
     componentHierarchyMap,
     vueFilesPathMap,
+    viewsDir,
+    scanDirs,
     basePageClassPath,
     normalizedBasePagePath,
     outDir,