@immense/vue-pom-generator 1.0.40 → 1.0.42

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;
 }
@@ -5967,6 +5969,7 @@ function createDevProcessorPlugin(options) {
     customPomDir,
     customPomImportAliases,
     customPomImportNameCollisionBehavior,
+    nameCollisionBehavior = "suffix",
     testIdAttribute,
     routerAwarePoms,
     resolvedRouterEntry,
@@ -5993,7 +5996,7 @@ function createDevProcessorPlugin(options) {
         return;
       scheduleVueFileRegen(ctx.file, "hmr");
     },
-    configureServer(server) {
+    async configureServer(server) {
       const getViewsDirAbs = () => path.isAbsolute(viewsDir) ? viewsDir : path.resolve(projectRootRef.current, viewsDir);
       const routerInitPromise = (async () => {
         if (!routerAwarePoms) {
@@ -6070,8 +6073,8 @@ function createDevProcessorPlugin(options) {
         }
         return out;
       };
-      const snapshotHierarchy = /* @__PURE__ */ new Map();
-      const snapshotVuePathMap = /* @__PURE__ */ new Map();
+      let snapshotHierarchy = /* @__PURE__ */ new Map();
+      let snapshotVuePathMap = /* @__PURE__ */ new Map();
       const filePathToComponentName = /* @__PURE__ */ new Map();
       const getComponentNameForFile = (filePath) => {
         const normalized = path.resolve(filePath);
@@ -6088,12 +6091,12 @@ function createDevProcessorPlugin(options) {
         filePathToComponentName.set(normalized, name);
         return name;
       };
-      const compileVueFileIntoSnapshot = (filePath) => {
+      const compileVueFileIntoSnapshot = (filePath, targetHierarchy = snapshotHierarchy, targetVuePathMap = snapshotVuePathMap) => {
         const started = performance.now();
         const absolutePath = path.resolve(filePath);
         const componentName = getComponentNameForFile(absolutePath);
-        snapshotVuePathMap.set(componentName, absolutePath);
-        snapshotHierarchy.delete(componentName);
+        targetVuePathMap.set(componentName, absolutePath);
+        targetHierarchy.delete(componentName);
         let sfc = "";
         try {
           sfc = fs.readFileSync(absolutePath, "utf8");
@@ -6103,29 +6106,33 @@ function createDevProcessorPlugin(options) {
         const template = extractTemplateFromSfc(sfc, absolutePath);
         if (!template.trim())
           return { componentName, ms: performance.now() - started, compiled: true };
-        try {
-          compilerDom.compile(template, {
-            filename: absolutePath,
-            prefixIdentifiers: true,
-            nodeTransforms: [
-              createTestIdTransform(
-                componentName,
-                snapshotHierarchy,
-                nativeWrappers,
-                excludedComponents,
-                getViewsDirAbs(),
-                { existingIdBehavior: "preserve", testIdAttribute, wrapperSearchRoots: getWrapperSearchRoots() }
-              )
-            ]
-          });
-        } catch {
-        }
+        compilerDom.compile(template, {
+          filename: absolutePath,
+          prefixIdentifiers: true,
+          nodeTransforms: [
+            createTestIdTransform(
+              componentName,
+              targetHierarchy,
+              nativeWrappers,
+              excludedComponents,
+              getViewsDirAbs(),
+              {
+                existingIdBehavior: "preserve",
+                nameCollisionBehavior,
+                testIdAttribute,
+                warn: (message) => loggerRef.current.warn(message),
+                vueFilesPathMap: targetVuePathMap,
+                wrapperSearchRoots: getWrapperSearchRoots()
+              }
+            )
+          ]
+        });
         return { componentName, ms: performance.now() - started, compiled: true };
       };
       const fullRebuildSnapshotFromFilesystem = () => {
         const t0 = performance.now();
-        snapshotHierarchy.clear();
-        snapshotVuePathMap.clear();
+        const nextHierarchy = /* @__PURE__ */ new Map();
+        const nextVuePathMap = /* @__PURE__ */ new Map();
         filePathToComponentName.clear();
         let totalVueFiles = 0;
         let compiledCount = 0;
@@ -6136,11 +6143,13 @@ function createDevProcessorPlugin(options) {
           const vueFiles = walkFilesRecursive(absDir);
           totalVueFiles += vueFiles.length;
           for (const file of vueFiles) {
-            const res = compileVueFileIntoSnapshot(file);
+            const res = compileVueFileIntoSnapshot(file, nextHierarchy, nextVuePathMap);
             if (res.compiled)
               compiledCount++;
           }
         }
+        snapshotHierarchy = nextHierarchy;
+        snapshotVuePathMap = nextVuePathMap;
         const t1 = performance.now();
         logInfo(`initial scan: found ${totalVueFiles} .vue files in ${scanDirs.join(", ")}`);
         logInfo(`initial compile: ${compiledCount}/${totalVueFiles} files in ${formatMs(t1 - t0)} (components=${snapshotHierarchy.size})`);
@@ -6157,6 +6166,8 @@ function createDevProcessorPlugin(options) {
           customPomDir,
           customPomImportAliases,
           customPomImportNameCollisionBehavior,
+          viewsDir,
+          scanDirs,
           testIdAttribute,
           vueRouterFluentChaining: routerAwarePoms,
           routerEntry: resolvedRouterEntry,
@@ -6165,6 +6176,10 @@ function createDevProcessorPlugin(options) {
         const t1 = performance.now();
         logInfo(`generate(${reason}): components=${snapshotHierarchy.size} in ${formatMs(t1 - t0)}`);
       };
+      let timer = null;
+      let maxWaitTimer = null;
+      const pendingChangedVueFiles = /* @__PURE__ */ new Set();
+      const pendingDeletedComponents = /* @__PURE__ */ new Set();
       const initialBuildPromise = (async () => {
         const t0 = performance.now();
         await routerInitPromise;
@@ -6173,13 +6188,44 @@ function createDevProcessorPlugin(options) {
         const t1 = performance.now();
         logInfo(`startup total: ${formatMs(t1 - t0)}`);
       })();
+      const logGenerationError = (reason, message) => {
+        server.config.logger.error(`[vue-pom-generator] dev generation failed during ${reason}: ${message}`);
+      };
+      const regenerateFromPending = async (reason) => {
+        const t0 = performance.now();
+        await initialBuildPromise;
+        const nextHierarchy = new Map(snapshotHierarchy);
+        const nextVuePathMap = new Map(snapshotVuePathMap);
+        for (const componentName of pendingDeletedComponents) {
+          nextHierarchy.delete(componentName);
+          nextVuePathMap.delete(componentName);
+        }
+        const files = Array.from(pendingChangedVueFiles);
+        const deletedCount = pendingDeletedComponents.size;
+        pendingChangedVueFiles.clear();
+        pendingDeletedComponents.clear();
+        let compileMs = 0;
+        for (const f of files) {
+          const res = compileVueFileIntoSnapshot(f, nextHierarchy, nextVuePathMap);
+          compileMs += res.ms;
+        }
+        snapshotHierarchy = nextHierarchy;
+        snapshotVuePathMap = nextVuePathMap;
+        const t1 = performance.now();
+        generateAggregatedFromSnapshot(reason);
+        const t2 = performance.now();
+        return {
+          files,
+          deletedCount,
+          compileMs,
+          preGenerateMs: t1 - t0,
+          generateMs: t2 - t1,
+          totalMs: t2 - t0
+        };
+      };
       const watchedVueGlobs = scanDirs.map((dir) => path.resolve(projectRootRef.current, dir, "**", "*.vue"));
       const watchedPluginGlob = path.resolve(projectRootRef.current, "vite-plugins", "vue-pom-generator", "**", "*.ts");
       server.watcher.add([...watchedVueGlobs, watchedPluginGlob, basePageClassPath]);
-      let timer = null;
-      let maxWaitTimer = null;
-      const pendingChangedVueFiles = /* @__PURE__ */ new Set();
-      const pendingDeletedComponents = /* @__PURE__ */ new Set();
       scheduleVueFileRegenLocal = (filePath, source) => {
         pendingChangedVueFiles.add(filePath);
         logDebug(`queued(${source}): files=${pendingChangedVueFiles.size} deleted=${pendingDeletedComponents.size}`);
@@ -6196,29 +6242,14 @@ function createDevProcessorPlugin(options) {
               timer = null;
             }
             maxWaitTimer = null;
-            void (async () => {
-              const t0 = performance.now();
-              await initialBuildPromise;
-              for (const componentName of pendingDeletedComponents) {
-                snapshotHierarchy.delete(componentName);
-                snapshotVuePathMap.delete(componentName);
-              }
-              const files = Array.from(pendingChangedVueFiles);
-              const deletedCount = pendingDeletedComponents.size;
-              pendingChangedVueFiles.clear();
-              pendingDeletedComponents.clear();
-              let compileMs = 0;
-              for (const f of files) {
-                const res = compileVueFileIntoSnapshot(f);
-                compileMs += res.ms;
-              }
-              const t1 = performance.now();
-              generateAggregatedFromSnapshot("max-wait");
-              const t2 = performance.now();
+            void regenerateFromPending("max-wait").then(({ files, deletedCount, compileMs, preGenerateMs, generateMs, totalMs }) => {
               logInfo(
-                `max-wait: files=${files.length} deleted=${deletedCount} compile=${formatMs(compileMs)} wall=${formatMs(t1 - t0)} gen=${formatMs(t2 - t1)} total=${formatMs(t2 - t0)}`
+                `max-wait: files=${files.length} deleted=${deletedCount} compile=${formatMs(compileMs)} wall=${formatMs(preGenerateMs)} gen=${formatMs(generateMs)} total=${formatMs(totalMs)}`
               );
-            })();
+            }).catch((error) => {
+              const message = error instanceof Error ? error.message : String(error);
+              logGenerationError("max-wait", message);
+            });
           }, MAX_WAIT_MS);
         }
         if (wasEmpty) {
@@ -6234,31 +6265,17 @@ function createDevProcessorPlugin(options) {
             clearTimeout(maxWaitTimer);
             maxWaitTimer = null;
           }
-          void (async () => {
-            const t0 = performance.now();
-            await initialBuildPromise;
-            for (const componentName of pendingDeletedComponents) {
-              snapshotHierarchy.delete(componentName);
-              snapshotVuePathMap.delete(componentName);
-            }
-            const files = Array.from(pendingChangedVueFiles);
-            const deletedCount = pendingDeletedComponents.size;
-            pendingChangedVueFiles.clear();
-            pendingDeletedComponents.clear();
-            let compileMs = 0;
-            for (const f of files) {
-              const res = compileVueFileIntoSnapshot(f);
-              compileMs += res.ms;
-            }
-            const t1 = performance.now();
-            generateAggregatedFromSnapshot(files.length || deletedCount ? "batched" : "noop");
-            const t2 = performance.now();
+          const reason = pendingChangedVueFiles.size || pendingDeletedComponents.size ? "batched" : "noop";
+          void regenerateFromPending(reason).then(({ files, deletedCount, compileMs, preGenerateMs, generateMs, totalMs }) => {
             if (files.length || deletedCount) {
               logInfo(
-                `batched: files=${files.length} deleted=${deletedCount} compile=${formatMs(compileMs)} wall=${formatMs(t1 - t0)} gen=${formatMs(t2 - t1)} total=${formatMs(t2 - t0)}`
+                `batched: files=${files.length} deleted=${deletedCount} compile=${formatMs(compileMs)} wall=${formatMs(preGenerateMs)} gen=${formatMs(generateMs)} total=${formatMs(totalMs)}`
               );
             }
-          })();
+          }).catch((error) => {
+            const message = error instanceof Error ? error.message : String(error);
+            logGenerationError(reason, message);
+          });
         }, 75);
       }
       server.watcher.on("change", async (changedPath) => {
@@ -6310,6 +6327,7 @@ function createDevProcessorPlugin(options) {
       });
       setTimeout(() => {
       }, 250);
+      await initialBuildPromise;
     }
   };
 }
@@ -6340,6 +6358,7 @@ function createSupportPlugins(options) {
     viewsDir,
     scanDirs,
     getWrapperSearchRoots,
+    nameCollisionBehavior = "suffix",
     outDir,
     emitLanguages,
     csharp,
@@ -6416,6 +6435,7 @@ function createSupportPlugins(options) {
     customPomDir,
     customPomImportAliases,
     customPomImportNameCollisionBehavior,
+    nameCollisionBehavior,
     testIdAttribute,
     routerAwarePoms,
     routerType,
@@ -6996,6 +7016,7 @@ function createVuePomGeneratorPlugins(options = {}) {
     viewsDir,
     scanDirs,
     getWrapperSearchRoots: getWrapperSearchRootsAbs,
+    nameCollisionBehavior,
     outDir,
     emitLanguages,
     csharp,