@open-mercato/cli 0.6.6-develop.6290.1.4bb5a8ba3f → 0.6.6-develop.6296.1.5e8bdfee17

package/dist/lib/generators/module-registry.js

@@ -981,8 +981,6 @@ async function loadPageMetadataForManifest(options) {
 }
 async function processPageFiles(options) {
   const { files, type, modId, appDir, pkgDir, appImportBase, pkgImportBase, eagerImports, runtimeImports, manifestImports, importIdRef } = options;
-  const prefix = type === "frontend" ? "C" : "B";
-  const modPrefix = type === "frontend" ? "CM" : "BM";
   const metaPrefix = type === "frontend" ? "M" : "BM";
   const eagerRoutes = [];
   const runtimeRoutes = [];
@@ -991,8 +989,8 @@ async function processPageFiles(options) {
     const segs = relPath.split("/");
     const pageFile = segs.pop();
     const pageBaseName = stripModuleCodeExtension(pageFile);
-    const importName = `${prefix}${importIdRef.value++}_${toVar(modId)}_${toVar(segs.join("_") || "index")}`;
-    const pageModName = `${modPrefix}${importIdRef.value++}_${toVar(modId)}_${toVar(segs.join("_") || "index")}`;
+    importIdRef.value++;
+    importIdRef.value++;
     const runtimeMetaName = `${metaPrefix}Runtime${importIdRef.value++}_${toVar(modId)}_${toVar(segs.join("_") || "index")}`;
     const sub = segs.length ? `${segs.join("/")}/${pageBaseName}` : pageBaseName;
     const importPath = sanitizeGeneratedModuleSpecifier(`${fromApp ? appImportBase : pkgImportBase}/${type}/${sub}`);
@@ -1025,10 +1023,14 @@ async function processPageFiles(options) {
       if (manifestMetadata.requiresRuntimeImport) {
         manifestImportStatement = buildImportStatement(`* as ${manifestMetaImportName}`, metaImportPath);
       }
-      eagerImports.push(buildImportStatement(importName, importPath));
     } else {
-      metaExpr = `(${pageModName} as any).metadata`;
       runtimeMetaExpr = `(((${runtimeMetaName} as any).metadata) as any)`;
+      const staticMetadata = await loadPageMetadataForManifest({
+        sourceFile,
+        runtimeExpr: "(undefined as any)",
+        allowRuntimeFallback: false
+      });
+      metaExpr = staticMetadata.manifestExpr;
       const manifestMetaImportName = `${metaPrefix}Manifest${importIdRef.value++}_${toVar(modId)}_${toVar(segs.join("_") || "index")}`;
       const manifestMetadata = await loadPageMetadataForManifest({
         sourceFile,
@@ -1039,7 +1041,6 @@ async function processPageFiles(options) {
       if (manifestMetadata.requiresRuntimeImport) {
         manifestImportStatement = buildImportStatement(`* as ${manifestMetaImportName}`, importPath);
       }
-      eagerImports.push(buildImportStatement(`${importName}, * as ${pageModName}`, importPath));
       runtimeImports.push(buildImportStatement(`* as ${runtimeMetaName}`, importPath));
     }
     if (manifestImportStatement) {
@@ -1048,8 +1049,8 @@ async function processPageFiles(options) {
     const baseProps = buildPageRouteProps(metaExpr, routePath);
     const runtimeBaseProps = buildPageRouteProps(runtimeMetaExpr, routePath);
     const manifestBaseProps = buildPageRouteProps(manifestMetaExpr, routePath);
-    eagerRoutes.push(`{ ${baseProps}, Component: ${importName} }`);
-    runtimeRoutes.push(`{ ${runtimeBaseProps}, Component: async (props: any) => { const mod = await ${buildDynamicImportExpression(importPath)}; const Component = (mod.default ?? mod) as any; return createElement(Component, props) } }`);
+    eagerRoutes.push(`{ ${baseProps}, Component: ${buildLazyRouteComponentExpression(importPath)} }`);
+    runtimeRoutes.push(`{ ${runtimeBaseProps}, Component: ${buildLazyRouteComponentExpression(importPath)} }`);
     manifestRoutes.push(`{ moduleId: ${toLiteral(modId)}, ${manifestBaseProps}, load: async () => { const mod = await ${buildDynamicImportExpression(importPath)}; return (mod.default ?? mod) as any } }`);
   }
   for (const { relPath, fromApp } of files.filter(({ relPath: f }) => !isModulePageFile(path.basename(f)))) {
@@ -1057,8 +1058,8 @@ async function processPageFiles(options) {
     const file = segs.pop();
     const name = stripModuleCodeExtension(file);
     const routeSegs = [...segs, name].filter(Boolean);
-    const importName = `${prefix}${importIdRef.value++}_${toVar(modId)}_${toVar(routeSegs.join("_") || "index")}`;
-    const pageModName = `${modPrefix}${importIdRef.value++}_${toVar(modId)}_${toVar(routeSegs.join("_") || "index")}`;
+    importIdRef.value++;
+    importIdRef.value++;
     const runtimeMetaName = `${metaPrefix}Runtime${importIdRef.value++}_${toVar(modId)}_${toVar(routeSegs.join("_") || "index")}`;
     const importPath = sanitizeGeneratedModuleSpecifier(
       `${fromApp ? appImportBase : pkgImportBase}/${type}/${[...segs, name].join("/")}`
@@ -1094,10 +1095,14 @@ async function processPageFiles(options) {
       if (manifestMetadata.requiresRuntimeImport) {
         manifestImportStatement = buildImportStatement(`* as ${manifestMetaImportName}`, metaImportPath);
       }
-      eagerImports.push(buildImportStatement(importName, importPath));
     } else {
-      metaExpr = `(${pageModName} as any).metadata`;
       runtimeMetaExpr = `(((${runtimeMetaName} as any).metadata) as any)`;
+      const staticMetadata = await loadPageMetadataForManifest({
+        sourceFile,
+        runtimeExpr: "(undefined as any)",
+        allowRuntimeFallback: false
+      });
+      metaExpr = staticMetadata.manifestExpr;
       const manifestMetaImportName = `${metaPrefix}Manifest${importIdRef.value++}_${toVar(modId)}_${toVar(routeSegs.join("_") || "index")}`;
       const manifestMetadata = await loadPageMetadataForManifest({
         sourceFile,
@@ -1108,7 +1113,6 @@ async function processPageFiles(options) {
       if (manifestMetadata.requiresRuntimeImport) {
         manifestImportStatement = buildImportStatement(`* as ${manifestMetaImportName}`, importPath);
       }
-      eagerImports.push(buildImportStatement(`${importName}, * as ${pageModName}`, importPath));
       runtimeImports.push(buildImportStatement(`* as ${runtimeMetaName}`, importPath));
     }
     if (manifestImportStatement) {
@@ -1117,8 +1121,8 @@ async function processPageFiles(options) {
     const baseProps = buildPageRouteProps(metaExpr, routePath);
     const runtimeBaseProps = buildPageRouteProps(runtimeMetaExpr, routePath);
     const manifestBaseProps = buildPageRouteProps(manifestMetaExpr, routePath);
-    eagerRoutes.push(`{ ${baseProps}, Component: ${importName} }`);
-    runtimeRoutes.push(`{ ${runtimeBaseProps}, Component: async (props: any) => { const mod = await ${buildDynamicImportExpression(importPath)}; const Component = (mod.default ?? mod) as any; return createElement(Component, props) } }`);
+    eagerRoutes.push(`{ ${baseProps}, Component: ${buildLazyRouteComponentExpression(importPath)} }`);
+    runtimeRoutes.push(`{ ${runtimeBaseProps}, Component: ${buildLazyRouteComponentExpression(importPath)} }`);
     manifestRoutes.push(`{ moduleId: ${toLiteral(modId)}, ${manifestBaseProps}, load: async () => { const mod = await ${buildDynamicImportExpression(importPath)}; return (mod.default ?? mod) as any } }`);
   }
   return {
@@ -1594,6 +1598,9 @@ function renderLegacyCompatibleArray(entries) {
   ${entries.join(",\n  ")}
 ]`;
 }
+function buildLazyRouteComponentExpression(importPath) {
+  return `async (props: any) => { const mod = await ${buildDynamicImportExpression(importPath)}; const Component = (mod.default ?? mod) as any; return createElement(Component, props) }`;
+}
 function renderAstLegacyModuleRegistryOutput(options) {
   const importSection = [
     ...options.includeCreateElementImport ? ["import { createElement } from 'react'"] : [],
@@ -1652,6 +1659,9 @@ function buildRuntimeRouteComponent(importPath) {
     })
   });
 }
+function rawExpression(source) {
+  return (writer) => writer.write(source);
+}
 function buildPageRouteEntries(metaExpr, routePath) {
   const meta = parenthesized(metaExpr);
   return [
@@ -1750,30 +1760,30 @@ async function processPageFilesAst(options) {
     if (!sourceFile || !hasDefaultExport(sourceFile)) continue;
     const metaPath = findExistingModuleFileByBaseNames(moduleBaseDir, ["page.meta", "meta"]);
     if (metaPath) {
-      const metaImportName2 = `${metaPrefix}${importIdRef.value++}_${toVar(modId)}_${toVar(segs.join("_") || "index")}`;
+      const metaImportName = `${metaPrefix}${importIdRef.value++}_${toVar(modId)}_${toVar(segs.join("_") || "index")}`;
       const metaImportPath = sanitizeGeneratedModuleSpecifier(
         `${fromApp ? appImportBase : pkgImportBase}/${type}/${toModuleImportSubpath(metaPath, fromApp ? appDir : pkgDir)}`
       );
-      imports.push(buildImportStatement(`* as ${metaImportName2}`, metaImportPath));
+      imports.push(buildImportStatement(`* as ${metaImportName}`, metaImportPath));
       addRoute({
         importPath,
         routePath,
         metaExpr: asExpression(
-          propertyAccess(asExpression(identifier(metaImportName2), "any"), "metadata"),
+          propertyAccess(asExpression(identifier(metaImportName), "any"), "metadata"),
           "any"
         )
       });
       continue;
     }
-    const metaImportName = `${metaPrefix}${importIdRef.value++}_${toVar(modId)}_${toVar(segs.join("_") || "index")}`;
-    imports.push(buildImportStatement(`* as ${metaImportName}`, importPath));
+    const staticMetadata = await loadPageMetadataForManifest({
+      sourceFile,
+      runtimeExpr: "(undefined as any)",
+      allowRuntimeFallback: false
+    });
     addRoute({
       importPath,
       routePath,
-      metaExpr: asExpression(
-        propertyAccess(asExpression(identifier(metaImportName), "any"), "metadata"),
-        "any"
-      )
+      metaExpr: rawExpression(staticMetadata.manifestExpr)
     });
   }
   for (const { relPath, fromApp } of files.filter(({ relPath: filePath }) => !isModulePageFile(path.basename(filePath)))) {
@@ -1790,32 +1800,32 @@ async function processPageFilesAst(options) {
     if (!sourceFile || !hasDefaultExport(sourceFile)) continue;
     const metaPath = findExistingModuleFileByBaseNames(moduleBaseDir, [`${name}.meta`, "meta"]);
     if (metaPath) {
-      const metaImportName2 = `${metaPrefix}${importIdRef.value++}_${toVar(modId)}_${toVar(routeSegs.join("_") || "index")}`;
+      const metaImportName = `${metaPrefix}${importIdRef.value++}_${toVar(modId)}_${toVar(routeSegs.join("_") || "index")}`;
       const metaBase = path.basename(metaPath);
       const metaImportSub = stripModuleCodeExtension(metaBase) === "meta" ? "meta" : `${name}.meta`;
       const metaImportPath = sanitizeGeneratedModuleSpecifier(
         `${fromApp ? appImportBase : pkgImportBase}/${type}/${[...segs, metaImportSub].join("/")}`
       );
-      imports.push(buildImportStatement(`* as ${metaImportName2}`, metaImportPath));
+      imports.push(buildImportStatement(`* as ${metaImportName}`, metaImportPath));
       addRoute({
         importPath,
         routePath,
         metaExpr: asExpression(
-          propertyAccess(asExpression(identifier(metaImportName2), "any"), "metadata"),
+          propertyAccess(asExpression(identifier(metaImportName), "any"), "metadata"),
           "any"
         )
       });
       continue;
     }
-    const metaImportName = `${metaPrefix}${importIdRef.value++}_${toVar(modId)}_${toVar(routeSegs.join("_") || "index")}`;
-    imports.push(buildImportStatement(`* as ${metaImportName}`, importPath));
+    const staticMetadata = await loadPageMetadataForManifest({
+      sourceFile,
+      runtimeExpr: "(undefined as any)",
+      allowRuntimeFallback: false
+    });
     addRoute({
       importPath,
       routePath,
-      metaExpr: asExpression(
-        propertyAccess(asExpression(identifier(metaImportName), "any"), "metadata"),
-        "any"
-      )
+      metaExpr: rawExpression(staticMetadata.manifestExpr)
     });
   }
   return routes;
@@ -2023,6 +2033,7 @@ async function generateModuleRegistry(options) {
   const importIdRef = { value: 0 };
   const trackedRoots = /* @__PURE__ */ new Set();
   const requiresByModule = /* @__PURE__ */ new Map();
+  let hasRouteComponents = false;
   const umesConflictSources = [];
   for (const entry of enabled) {
     const modId = entry.id;
@@ -2087,6 +2098,7 @@ async function generateModuleRegistry(options) {
         frontendRoutes.push(...generatedFrontendRoutes.eagerRoutes);
         runtimeFrontendRoutes.push(...generatedFrontendRoutes.runtimeRoutes);
         frontendRouteManifestDecls.push(...generatedFrontendRoutes.manifestRoutes);
+        hasRouteComponents = true;
       }
     }
     {
@@ -2187,6 +2199,7 @@ async function generateModuleRegistry(options) {
         backendRoutes.push(...generatedBackendRoutes.eagerRoutes);
         runtimeBackendRoutes.push(...generatedBackendRoutes.runtimeRoutes);
         backendRouteManifestDecls.push(...generatedBackendRoutes.manifestRoutes);
+        hasRouteComponents = true;
       }
     }
     {
@@ -2386,7 +2399,8 @@ async function generateModuleRegistry(options) {
   const output = renderAstLegacyModuleRegistryOutput({
     fileName: "modules.generated.ts",
     imports,
-    moduleEntries: moduleDecls
+    moduleEntries: moduleDecls,
+    includeCreateElementImport: hasRouteComponents
   });
   const runtimeOutput = renderAstLegacyModuleRegistryOutput({
     fileName: "modules.runtime.generated.ts",