@open-mercato/cli 0.6.6-develop.6362.1.a3dd164018 → 0.6.6-develop.6363.1.03c5e3429a

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

@@ -985,6 +985,9 @@ function detectExportedHttpMethods(sourceFile) {
 function buildPageRouteProps(metaExpr, routePath) {
   return `pattern: ${toLiteral(routePath || "/")}, requireAuth: (${metaExpr})?.requireAuth, requireRoles: (${metaExpr})?.requireRoles, requireFeatures: (${metaExpr})?.requireFeatures, requireCustomerAuth: (${metaExpr})?.requireCustomerAuth, requireCustomerFeatures: (${metaExpr})?.requireCustomerFeatures, nav: (${metaExpr})?.nav, title: (${metaExpr})?.pageTitle ?? (${metaExpr})?.title, titleKey: (${metaExpr})?.pageTitleKey ?? (${metaExpr})?.titleKey, group: (${metaExpr})?.pageGroup ?? (${metaExpr})?.group, groupKey: (${metaExpr})?.pageGroupKey ?? (${metaExpr})?.groupKey, icon: (${metaExpr})?.icon, order: (${metaExpr})?.pageOrder ?? (${metaExpr})?.order, priority: (${metaExpr})?.pagePriority ?? (${metaExpr})?.priority, navHidden: (${metaExpr})?.navHidden, visible: (${metaExpr})?.visible, enabled: (${metaExpr})?.enabled, breadcrumb: (${metaExpr})?.breadcrumb, pageContext: (${metaExpr})?.pageContext, placement: (${metaExpr})?.placement`;
 }
+function buildPageRouteManifestSpread(metaExpr, routePath) {
+  return `...resolvePageRouteMetadata(${toLiteral(routePath || "/")}, ${metaExpr})`;
+}
 function normalizeBreadcrumb(raw) {
   if (!Array.isArray(raw)) return void 0;
   const breadcrumb = raw.map((entry) => {
@@ -1147,7 +1150,7 @@ async function processPageFiles(options) {
         sourceFile: metaPath,
         metaPath,
         runtimeExpr: `(((${manifestMetaImportName} as any).metadata) as any)`,
-        allowRuntimeFallback: type === "backend"
+        allowRuntimeFallback: true
       });
       manifestMetaExpr = manifestMetadata.manifestExpr;
       if (manifestMetadata.requiresRuntimeImport) {
@@ -1165,7 +1168,7 @@ async function processPageFiles(options) {
       const manifestMetadata = await loadPageMetadataForManifest({
         sourceFile,
         runtimeExpr: `(((${manifestMetaImportName} as any).metadata) as any)`,
-        allowRuntimeFallback: type === "backend"
+        allowRuntimeFallback: true
       });
       manifestMetaExpr = manifestMetadata.manifestExpr;
       if (manifestMetadata.requiresRuntimeImport) {
@@ -1178,7 +1181,7 @@ async function processPageFiles(options) {
     }
     const baseProps = buildPageRouteProps(metaExpr, routePath);
     const runtimeBaseProps = buildPageRouteProps(runtimeMetaExpr, routePath);
-    const manifestBaseProps = buildPageRouteProps(manifestMetaExpr, routePath);
+    const manifestBaseProps = buildPageRouteManifestSpread(manifestMetaExpr, routePath);
     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 } }`);
@@ -1219,7 +1222,7 @@ async function processPageFiles(options) {
         sourceFile: metaPath,
         metaPath,
         runtimeExpr: `(((${manifestMetaImportName} as any).metadata) as any)`,
-        allowRuntimeFallback: type === "backend"
+        allowRuntimeFallback: false
       });
       manifestMetaExpr = manifestMetadata.manifestExpr;
       if (manifestMetadata.requiresRuntimeImport) {
@@ -1237,7 +1240,7 @@ async function processPageFiles(options) {
       const manifestMetadata = await loadPageMetadataForManifest({
         sourceFile,
         runtimeExpr: `(((${manifestMetaImportName} as any).metadata) as any)`,
-        allowRuntimeFallback: type === "backend"
+        allowRuntimeFallback: false
       });
       manifestMetaExpr = manifestMetadata.manifestExpr;
       if (manifestMetadata.requiresRuntimeImport) {
@@ -1250,7 +1253,7 @@ async function processPageFiles(options) {
     }
     const baseProps = buildPageRouteProps(metaExpr, routePath);
     const runtimeBaseProps = buildPageRouteProps(runtimeMetaExpr, routePath);
-    const manifestBaseProps = buildPageRouteProps(manifestMetaExpr, routePath);
+    const manifestBaseProps = buildPageRouteManifestSpread(manifestMetaExpr, routePath);
     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 } }`);
@@ -1746,8 +1749,9 @@ export default modules
 `;
 }
 function renderAstLegacyManifestOutput(options) {
+  const usesPageRouteMetadataHelper = options.typeName === "FrontendRouteManifestEntry" || options.typeName === "BackendRouteManifestEntry";
   const importSection = [
-    `import type { ${options.typeName} } from '@open-mercato/shared/modules/registry'`,
+    usesPageRouteMetadataHelper ? `import { resolvePageRouteMetadata, type ${options.typeName} } from '@open-mercato/shared/modules/registry'` : `import type { ${options.typeName} } from '@open-mercato/shared/modules/registry'`,
     ...(options.imports ?? []).map((entry) => serializeGeneratedImport(entry))
   ].join("\n");
   return `// AUTO-GENERATED by mercato generate registry
@@ -2035,7 +2039,7 @@ async function processWorkersAst(options) {
   return workers;
 }
 function processTranslationsAst(options) {
-  const { roots, modId, appImportBase, pkgImportBase, imports } = options;
+  const { roots, modId, appImportBase, pkgImportBase, imports, extraImports } = options;
   const i18nApp = path.join(roots.appBase, "i18n");
   const pkgI18nBase = resolveStandaloneSourceMirrorBase(roots.pkgBase) ?? roots.pkgBase;
   const i18nCore = path.join(pkgI18nBase, "i18n");
@@ -2063,6 +2067,8 @@ function processTranslationsAst(options) {
       const appName = `T_${toVar(modId)}_${toVar(locale)}_A`;
       imports.push(buildImportStatement(coreName, `${pkgImportBase}/i18n/${locale}.json`));
       imports.push(buildImportStatement(appName, `${appImportBase}/i18n/${locale}.json`));
+      extraImports?.push(buildImportStatement(coreName, `${pkgImportBase}/i18n/${locale}.json`));
+      extraImports?.push(buildImportStatement(appName, `${appImportBase}/i18n/${locale}.json`));
       translations.push({
         name: JSON.stringify(locale),
         value: objectLiteral([
@@ -2075,6 +2081,7 @@ function processTranslationsAst(options) {
     if (appHas) {
       const appName = `T_${toVar(modId)}_${toVar(locale)}_A`;
       imports.push(buildImportStatement(appName, `${appImportBase}/i18n/${locale}.json`));
+      extraImports?.push(buildImportStatement(appName, `${appImportBase}/i18n/${locale}.json`));
       translations.push({
         name: JSON.stringify(locale),
         value: asExpression(identifier(appName), "unknown as Record<string, string>")
@@ -2084,6 +2091,7 @@ function processTranslationsAst(options) {
     if (coreHas) {
       const coreName = `T_${toVar(modId)}_${toVar(locale)}_C`;
       imports.push(buildImportStatement(coreName, `${pkgImportBase}/i18n/${locale}.json`));
+      extraImports?.push(buildImportStatement(coreName, `${pkgImportBase}/i18n/${locale}.json`));
       translations.push({
         name: JSON.stringify(locale),
         value: asExpression(identifier(coreName), "unknown as Record<string, string>")
@@ -2671,6 +2679,10 @@ async function generateModuleRegistryApp(options) {
   const outputDir = resolver.getOutputDir();
   const outFile = path.join(outputDir, "modules.app.generated.ts");
   const checksumFile = path.join(outputDir, "modules.app.generated.checksum");
+  const bootstrapOutFile = path.join(outputDir, "modules.bootstrap.generated.ts");
+  const bootstrapChecksumFile = path.join(outputDir, "modules.bootstrap.generated.checksum");
+  const i18nOutFile = path.join(outputDir, "modules.i18n.generated.ts");
+  const i18nChecksumFile = path.join(outputDir, "modules.i18n.generated.checksum");
   const legacyOutFile = path.join(outputDir, "bootstrap-modules.generated.ts");
   const legacyChecksumFile = path.join(outputDir, "bootstrap-modules.generated.checksum");
   const enabledIdsOutFile = path.join(outputDir, "enabled-module-ids.generated.ts");
@@ -2682,7 +2694,11 @@ async function generateModuleRegistryApp(options) {
     verifyThirdPartyModuleShape(entry, resolver.getModulePaths(entry).pkgBase);
   }
   const imports = [];
+  const bootstrapImports = [];
+  const i18nImports = [];
   const moduleDecls = [];
+  const bootstrapModuleDecls = [];
+  const i18nModuleDecls = [];
   const importIdRef = { value: 0 };
   const trackedRoots = /* @__PURE__ */ new Set();
   const requiresByModule = /* @__PURE__ */ new Map();
@@ -2717,6 +2733,7 @@ async function generateModuleRegistryApp(options) {
       infoImportName = `I${importIdRef.value++}_${toVar(modId)}`;
       const importPath = sanitizeGeneratedModuleSpecifier(indexResolved.importPath);
       imports.push(buildImportStatement(`* as ${infoImportName}`, importPath));
+      bootstrapImports.push(buildImportStatement(`* as ${infoImportName}`, importPath));
       try {
         const mod = require(indexResolved.absolutePath);
         const reqs = mod?.metadata && Array.isArray(mod.metadata.requires) ? mod.metadata.requires : void 0;
@@ -2726,10 +2743,12 @@ async function generateModuleRegistryApp(options) {
     }
     {
       const setup = resolveConventionFile(roots, imps, "setup.ts", "SETUP", modId, importIdRef, imports);
+      if (setup) bootstrapImports.push(buildImportStatement(`* as ${setup.importName}`, setup.importPath));
       if (setup) setupImportName = setup.importName;
     }
     {
       const encryption = resolveConventionFile(roots, imps, "encryption.ts", "ENCRYPTION", modId, importIdRef, imports);
+      if (encryption) bootstrapImports.push(buildImportStatement(`* as ${encryption.importName}`, encryption.importPath));
       if (encryption) encryptionImportName = encryption.importName;
     }
     {
@@ -2737,11 +2756,12 @@ async function generateModuleRegistryApp(options) {
       if (resolved) {
         const importName = `INTEGRATION_${toVar(modId)}_${importIdRef.value++}`;
         imports.push(buildImportStatement(`* as ${importName}`, resolved.importPath));
+        bootstrapImports.push(buildImportStatement(`* as ${importName}`, resolved.importPath));
         integrationImportName = importName;
       }
     }
     {
-      const ext = resolveConventionFile(roots, imps, "data/extensions.ts", "X", modId, importIdRef, imports);
+      const ext = resolveConventionFile(roots, imps, "data/extensions.ts", "X", modId, importIdRef, imports, bootstrapImports);
       if (ext) extensionsImportName = ext.importName;
     }
     {
@@ -2750,15 +2770,16 @@ async function generateModuleRegistryApp(options) {
         const importName = `ACL_${toVar(modId)}_${importIdRef.value++}`;
         const importPath = sanitizeGeneratedModuleSpecifier(aclResolved.importPath);
         imports.push(buildImportStatement(`* as ${importName}`, importPath));
+        bootstrapImports.push(buildImportStatement(`* as ${importName}`, importPath));
         featuresImportName = importName;
       }
     }
     {
-      const ce = resolveConventionFile(roots, imps, "ce.ts", "CE", modId, importIdRef, imports);
+      const ce = resolveConventionFile(roots, imps, "ce.ts", "CE", modId, importIdRef, imports, bootstrapImports);
       if (ce) customEntitiesImportName = ce.importName;
     }
     {
-      const fields = resolveConventionFile(roots, imps, "data/fields.ts", "F", modId, importIdRef, imports);
+      const fields = resolveConventionFile(roots, imps, "data/fields.ts", "F", modId, importIdRef, imports, bootstrapImports);
       if (fields) fieldsImportName = fields.importName;
     }
     {
@@ -2799,13 +2820,17 @@ async function generateModuleRegistryApp(options) {
         hasRouteComponents = true;
       }
     }
+    const translationImports = [];
     translations.push(...processTranslationsAst({
       roots,
       modId,
       appImportBase,
       pkgImportBase: imps.pkgBase,
-      imports
+      imports,
+      extraImports: translationImports
     }));
+    bootstrapImports.push(...translationImports);
+    i18nImports.push(...translationImports);
     subscribers.push(...await processSubscribersAst({
       roots,
       modId,
@@ -2831,17 +2856,15 @@ async function generateModuleRegistryApp(options) {
       { name: "id", value: modId },
       { name: "customFieldSets", value: buildModuleCustomFieldSetsValue({ fieldsImportName, customEntitiesImportName, moduleId: modId }) }
     ];
+    const i18nModuleEntries = [
+      { name: "id", value: modId }
+    ];
     if (infoImportName) {
       moduleEntries.push({ name: "info", value: propertyAccess(identifier(infoImportName), "metadata") });
     }
-    if (frontendRoutes.length > 0) {
-      moduleEntries.push({ name: "frontendRoutes", value: arrayLiteral(frontendRoutes, writeValue) });
-    }
-    if (backendRoutes.length > 0) {
-      moduleEntries.push({ name: "backendRoutes", value: arrayLiteral(backendRoutes, writeValue) });
-    }
     if (translations.length > 0) {
       moduleEntries.push({ name: "translations", value: objectLiteral(translations) });
+      i18nModuleEntries.push({ name: "translations", value: objectLiteral(translations) });
     }
     if (subscribers.length > 0) {
       moduleEntries.push({ name: "subscribers", value: arrayLiteral(subscribers, writeValue) });
@@ -2924,7 +2947,16 @@ async function generateModuleRegistryApp(options) {
         )
       });
     }
-    moduleDecls.push(objectLiteral(moduleEntries));
+    const routeAwareModuleEntries = [...moduleEntries];
+    if (frontendRoutes.length > 0) {
+      routeAwareModuleEntries.push({ name: "frontendRoutes", value: arrayLiteral(frontendRoutes, writeValue) });
+    }
+    if (backendRoutes.length > 0) {
+      routeAwareModuleEntries.push({ name: "backendRoutes", value: arrayLiteral(backendRoutes, writeValue) });
+    }
+    moduleDecls.push(objectLiteral(routeAwareModuleEntries));
+    bootstrapModuleDecls.push(objectLiteral(moduleEntries));
+    i18nModuleDecls.push(objectLiteral(i18nModuleEntries));
   }
   const output = renderAstModuleRegistryFile({
     fileName: "modules.app.generated.ts",
@@ -2933,11 +2965,23 @@ async function generateModuleRegistryApp(options) {
     moduleEntries: moduleDecls,
     includeCreateElementImport: hasRouteComponents
   });
+  const bootstrapOutput = renderAstModuleRegistryFile({
+    fileName: "modules.bootstrap.generated.ts",
+    generator: "registry (bootstrap version)",
+    imports: bootstrapImports,
+    moduleEntries: bootstrapModuleDecls
+  });
+  const i18nOutput = renderAstModuleRegistryFile({
+    fileName: "modules.i18n.generated.ts",
+    generator: "registry (i18n version)",
+    imports: i18nImports,
+    moduleEntries: i18nModuleDecls
+  });
   const legacyOutput = renderAstLegacyAliasFile({
     fileName: "bootstrap-modules.generated.ts",
     exportName: "bootstrapModules",
     exportType: "Module[]",
-    sourceFileName: "modules.app.generated.ts",
+    sourceFileName: "modules.bootstrap.generated.ts",
     initializer: identifier("modules")
   });
   {
@@ -2961,6 +3005,8 @@ async function generateModuleRegistryApp(options) {
   }
   const structureChecksum = calculateStructureChecksum(Array.from(trackedRoots));
   writeGeneratedFile({ outFile, checksumFile, content: output, structureChecksum, result, quiet });
+  writeGeneratedFile({ outFile: bootstrapOutFile, checksumFile: bootstrapChecksumFile, content: bootstrapOutput, structureChecksum, result, quiet });
+  writeGeneratedFile({ outFile: i18nOutFile, checksumFile: i18nChecksumFile, content: i18nOutput, structureChecksum, result, quiet });
   writeGeneratedFile({ outFile: legacyOutFile, checksumFile: legacyChecksumFile, content: legacyOutput, structureChecksum, result, quiet });
   const enabledIdsOutput = renderEnabledModuleIdsFile(enabled.map((entry) => entry.id));
   writeGeneratedFile({ outFile: enabledIdsOutFile, checksumFile: enabledIdsChecksumFile, content: enabledIdsOutput, structureChecksum, result, quiet });