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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/cli",
-  "version": "0.6.6-develop.6290.1.4bb5a8ba3f",
+  "version": "0.6.6-develop.6296.1.5e8bdfee17",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -60,8 +60,8 @@
     "@mikro-orm/decorators": "^7.1.4",
     "@mikro-orm/migrations": "^7.1.4",
     "@mikro-orm/postgresql": "^7.1.4",
-    "@open-mercato/queue": "0.6.6-develop.6290.1.4bb5a8ba3f",
-    "@open-mercato/shared": "0.6.6-develop.6290.1.4bb5a8ba3f",
+    "@open-mercato/queue": "0.6.6-develop.6296.1.5e8bdfee17",
+    "@open-mercato/shared": "0.6.6-develop.6296.1.5e8bdfee17",
     "cross-spawn": "^7.0.6",
     "pg": "8.22.0",
     "semver": "^7.8.5",
@@ -71,10 +71,10 @@
     "typescript": "^6.0.3"
   },
   "peerDependencies": {
-    "@open-mercato/shared": "0.6.6-develop.6290.1.4bb5a8ba3f"
+    "@open-mercato/shared": "0.6.6-develop.6296.1.5e8bdfee17"
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.6.6-develop.6290.1.4bb5a8ba3f",
+    "@open-mercato/shared": "0.6.6-develop.6296.1.5e8bdfee17",
     "@types/jest": "^30.0.0",
     "jest": "^30.4.2",
     "ts-jest": "^29.4.11"

package/src/lib/generators/__tests__/module-subset.test.ts

@@ -266,39 +266,16 @@ describe('generateModuleRegistry with module subsets', () => {
     const result = await generateModuleRegistry({ resolver, quiet: true })
 
     expect(result.errors).toEqual([])
-    expect(readGenerated(tmpDir, 'modules.generated.ts')).toBe(dedent(`
-      // AUTO-GENERATED by mercato generate registry
-      import { createLazyModuleSubscriber, createLazyModuleWorker, type Module } from '@open-mercato/shared/modules/registry'
-      import * as I0_orders from "@open-mercato/core/modules/orders/index"
-      import C1_orders_index, * as CM2_orders_index from "@open-mercato/core/modules/orders/frontend/page"
-      import B5_orders_index, * as BM6_orders_index from "@open-mercato/core/modules/orders/backend/page"
-      import * as R9_orders_orders from "@open-mercato/core/modules/orders/api/orders/route"
-
-      export const modules: Module[] = [
-        {
-            id: "orders",
-            info: I0_orders.metadata,
-            frontendRoutes: [{ pattern: "/", requireAuth: ((CM2_orders_index as any).metadata)?.requireAuth, requireRoles: ((CM2_orders_index as any).metadata)?.requireRoles, requireFeatures: ((CM2_orders_index as any).metadata)?.requireFeatures, requireCustomerAuth: ((CM2_orders_index as any).metadata)?.requireCustomerAuth, requireCustomerFeatures: ((CM2_orders_index as any).metadata)?.requireCustomerFeatures, nav: ((CM2_orders_index as any).metadata)?.nav, title: ((CM2_orders_index as any).metadata)?.pageTitle ?? ((CM2_orders_index as any).metadata)?.title, titleKey: ((CM2_orders_index as any).metadata)?.pageTitleKey ?? ((CM2_orders_index as any).metadata)?.titleKey, group: ((CM2_orders_index as any).metadata)?.pageGroup ?? ((CM2_orders_index as any).metadata)?.group, groupKey: ((CM2_orders_index as any).metadata)?.pageGroupKey ?? ((CM2_orders_index as any).metadata)?.groupKey, icon: ((CM2_orders_index as any).metadata)?.icon, order: ((CM2_orders_index as any).metadata)?.pageOrder ?? ((CM2_orders_index as any).metadata)?.order, priority: ((CM2_orders_index as any).metadata)?.pagePriority ?? ((CM2_orders_index as any).metadata)?.priority, navHidden: ((CM2_orders_index as any).metadata)?.navHidden, visible: ((CM2_orders_index as any).metadata)?.visible, enabled: ((CM2_orders_index as any).metadata)?.enabled, breadcrumb: ((CM2_orders_index as any).metadata)?.breadcrumb, pageContext: ((CM2_orders_index as any).metadata)?.pageContext, placement: ((CM2_orders_index as any).metadata)?.placement, Component: C1_orders_index }],
-            backendRoutes: [{ pattern: "/backend/orders", requireAuth: ((BM6_orders_index as any).metadata)?.requireAuth, requireRoles: ((BM6_orders_index as any).metadata)?.requireRoles, requireFeatures: ((BM6_orders_index as any).metadata)?.requireFeatures, requireCustomerAuth: ((BM6_orders_index as any).metadata)?.requireCustomerAuth, requireCustomerFeatures: ((BM6_orders_index as any).metadata)?.requireCustomerFeatures, nav: ((BM6_orders_index as any).metadata)?.nav, title: ((BM6_orders_index as any).metadata)?.pageTitle ?? ((BM6_orders_index as any).metadata)?.title, titleKey: ((BM6_orders_index as any).metadata)?.pageTitleKey ?? ((BM6_orders_index as any).metadata)?.titleKey, group: ((BM6_orders_index as any).metadata)?.pageGroup ?? ((BM6_orders_index as any).metadata)?.group, groupKey: ((BM6_orders_index as any).metadata)?.pageGroupKey ?? ((BM6_orders_index as any).metadata)?.groupKey, icon: ((BM6_orders_index as any).metadata)?.icon, order: ((BM6_orders_index as any).metadata)?.pageOrder ?? ((BM6_orders_index as any).metadata)?.order, priority: ((BM6_orders_index as any).metadata)?.pagePriority ?? ((BM6_orders_index as any).metadata)?.priority, navHidden: ((BM6_orders_index as any).metadata)?.navHidden, visible: ((BM6_orders_index as any).metadata)?.visible, enabled: ((BM6_orders_index as any).metadata)?.enabled, breadcrumb: ((BM6_orders_index as any).metadata)?.breadcrumb, pageContext: ((BM6_orders_index as any).metadata)?.pageContext, placement: ((BM6_orders_index as any).metadata)?.placement, Component: B5_orders_index }],
-            apis: [{ path: ((R9_orders_orders as any).metadata?.path ?? "/orders/orders"), metadata: (R9_orders_orders as any).metadata, handlers: R9_orders_orders as any }],
-            
-            
-            
-            
-            
-            customFieldSets: [],
-            
-            
-            
-            
-            
-            
-            
-          }
-      ]
-      export const modulesInfo = modules.map(m => ({ id: m.id, ...(m.info || {}) }))
-      export default modules
-    `))
+    const modulesGenerated = readGenerated(tmpDir, 'modules.generated.ts')
+    expect(modulesGenerated).toContain(`import { createElement } from 'react'`)
+    expect(modulesGenerated).toContain(`import * as I0_orders from "@open-mercato/core/modules/orders/index"`)
+    expect(modulesGenerated).not.toContain(`import C1_orders_index`)
+    expect(modulesGenerated).not.toContain(`import B5_orders_index`)
+    expect(modulesGenerated).toContain(`frontendRoutes: [{ pattern: "/"`)
+    expect(modulesGenerated).toContain(`backendRoutes: [{ pattern: "/backend/orders"`)
+    expect(modulesGenerated).toContain(`Component: async (props: any) => { const mod = await import("@open-mercato/core/modules/orders/frontend/page")`)
+    expect(modulesGenerated).toContain(`Component: async (props: any) => { const mod = await import("@open-mercato/core/modules/orders/backend/page")`)
+    expect(modulesGenerated).toContain(`apis: [{ path: ((R9_orders_orders as any).metadata?.path ?? "/orders/orders"), metadata: (R9_orders_orders as any).metadata, handlers: R9_orders_orders as any }]`)
     expect(readGenerated(tmpDir, 'modules.runtime.generated.ts')).toBe(dedent(`
       // AUTO-GENERATED by mercato generate registry
       import { createElement } from 'react'

package/src/lib/generators/module-registry.ts

@@ -1378,8 +1378,6 @@ async function processPageFiles(options: {
   importIdRef: { value: number }
 }): Promise<PageRouteGenerationResult> {
   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: string[] = []
   const runtimeRoutes: string[] = []
@@ -1390,8 +1388,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}`)
@@ -1426,10 +1424,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,
@@ -1440,7 +1442,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) {
@@ -1449,8 +1450,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 } }`)
   }
 
@@ -1460,8 +1461,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('/')}`
@@ -1501,10 +1502,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,
@@ -1515,7 +1520,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) {
@@ -1524,8 +1528,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 } }`)
   }
 
@@ -2090,6 +2094,10 @@ function renderLegacyCompatibleArray(entries: readonly string[]): string {
 ]`
 }
 
+function buildLazyRouteComponentExpression(importPath: string): string {
+  return `async (props: any) => { const mod = await ${buildDynamicImportExpression(importPath)}; const Component = (mod.default ?? mod) as any; return createElement(Component, props) }`
+}
+
 function renderAstLegacyModuleRegistryOutput(options: {
   fileName: string
   imports: GeneratedImportStatement[]
@@ -2164,6 +2172,10 @@ function buildRuntimeRouteComponent(importPath: string): WriterFunction {
   })
 }
 
+function rawExpression(source: string): WriterFunction {
+  return (writer) => writer.write(source)
+}
+
 function buildPageRouteEntries(metaExpr: WriterFunction, routePath: string): GeneratedObjectEntry[] {
   const meta = parenthesized(metaExpr)
   return [
@@ -2298,15 +2310,15 @@ async function processPageFilesAst(options: {
       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),
     })
   }
 
@@ -2347,15 +2359,15 @@ async function processPageFilesAst(options: {
       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),
     })
   }
 
@@ -2609,6 +2621,7 @@ export async function generateModuleRegistry(options: ModuleRegistryOptions): Pr
   const importIdRef = { value: 0 }
   const trackedRoots = new Set<string>()
   const requiresByModule = new Map<string, string[]>()
+  let hasRouteComponents = false
 
   // UMES conflict detection: collect file paths during module processing
   const umesConflictSources: Array<{
@@ -2690,6 +2703,7 @@ export async function generateModuleRegistry(options: ModuleRegistryOptions): Pr
         frontendRoutes.push(...generatedFrontendRoutes.eagerRoutes)
         runtimeFrontendRoutes.push(...generatedFrontendRoutes.runtimeRoutes)
         frontendRouteManifestDecls.push(...generatedFrontendRoutes.manifestRoutes)
+        hasRouteComponents = true
       }
     }
 
@@ -2808,6 +2822,7 @@ export async function generateModuleRegistry(options: ModuleRegistryOptions): Pr
         backendRoutes.push(...generatedBackendRoutes.eagerRoutes)
         runtimeBackendRoutes.push(...generatedBackendRoutes.runtimeRoutes)
         backendRouteManifestDecls.push(...generatedBackendRoutes.manifestRoutes)
+        hasRouteComponents = true
       }
     }
 
@@ -3031,6 +3046,7 @@ export async function generateModuleRegistry(options: ModuleRegistryOptions): Pr
     fileName: 'modules.generated.ts',
     imports,
     moduleEntries: moduleDecls,
+    includeCreateElementImport: hasRouteComponents,
   })
   const runtimeOutput = renderAstLegacyModuleRegistryOutput({
     fileName: 'modules.runtime.generated.ts',