@open-mercato/cli 0.10.1-develop.7990.1.82d0a183c5 → 0.10.1-develop.8004.1.a8a79ee43f

package/src/lib/resolver.ts

@@ -2,6 +2,7 @@ import path from 'node:path'
 import fs from 'node:fs'
 import ts from 'typescript-js'
 import { parseBooleanWithDefault } from '@open-mercato/shared/lib/boolean'
+import { resolveInstalledPackageRootWithRequire } from './module-package'
 
 /**
  * Resolved execution environment for the CLI.
@@ -25,6 +26,8 @@ export type CliEnvironment = {
 export type ModuleEntry = {
   id: string
   from?: '@open-mercato/core' | '@app' | string
+  locator?: string
+  packageName?: string
   devSupervisorRequiresFullBootstrap?: boolean
 }
 
@@ -49,47 +52,33 @@ export interface PackageResolver {
   getPackageRoot(from?: string): string
 }
 
-function pkgDirFor(rootDir: string, from?: string, isMonorepo = true): string {
-  if (!isMonorepo) {
-    const pkgName = from || '@open-mercato/core'
-    const pkgRoot = path.join(rootDir, 'node_modules', pkgName)
-    const distModules = path.join(pkgRoot, 'dist', 'modules')
-    if (fs.existsSync(distModules)) return distModules
-    return path.join(pkgRoot, 'src', 'modules')
-  }
-
-  // Monorepo mode - read from src/modules (TypeScript source)
-  if (!from || from === '@open-mercato/core') {
-    return path.resolve(rootDir, 'packages/core/src/modules')
-  }
-  // Support other local packages like '@open-mercato/onboarding' => packages/onboarding/src/modules
-  const m = from.match(/^@open-mercato\/(.+)$/)
-  if (m) {
-    return path.resolve(rootDir, `packages/${m[1]}/src/modules`)
-  }
-  // Fallback to core modules path
-  return path.resolve(rootDir, 'packages/core/src/modules')
+function pkgDirFor(rootDir: string, from?: string, isMonorepo = true, appDir = rootDir): string {
+  const packageRoot = pkgRootFor(rootDir, from, isMonorepo, appDir)
+  const sourceModules = path.join(packageRoot, 'src', 'modules')
+  const distModules = path.join(packageRoot, 'dist', 'modules')
+  const workspacePackage = isMonorepo && packageRoot.startsWith(path.join(rootDir, 'packages') + path.sep)
+  if (workspacePackage && fs.existsSync(sourceModules)) return sourceModules
+  if (fs.existsSync(distModules)) return distModules
+  return sourceModules
 }
 
-function pkgRootFor(rootDir: string, from?: string, isMonorepo = true): string {
-  if (!isMonorepo) {
-    const pkgName = from || '@open-mercato/core'
-    return path.join(rootDir, 'node_modules', pkgName)
-  }
-
-  if (!from || from === '@open-mercato/core') {
-    return path.resolve(rootDir, 'packages/core')
-  }
-  const m = from.match(/^@open-mercato\/(.+)$/)
-  if (m) {
-    return path.resolve(rootDir, `packages/${m[1]}`)
+function pkgRootFor(rootDir: string, from?: string, isMonorepo = true, appDir = rootDir): string {
+  const packageName = from || '@open-mercato/core'
+  if (isMonorepo) {
+    const workspaceMatch = packageName.match(/^@open-mercato\/(.+)$/)
+    if (workspaceMatch) {
+      const workspaceRoot = path.join(rootDir, 'packages', workspaceMatch[1])
+      if (fs.existsSync(workspaceRoot)) return workspaceRoot
+    }
   }
-  return path.resolve(rootDir, 'packages/core')
+  return resolveInstalledPackageRootWithRequire(packageName, appDir) ?? path.join(rootDir, 'node_modules', packageName)
 }
 
 function parseModuleEntryFromObjectLiteral(node: ts.ObjectLiteralExpression): ModuleEntry | null {
   let id: string | null = null
   let from: string | null = null
+  let locator: string | undefined
+  let packageName: string | undefined
   let devSupervisorRequiresFullBootstrap = false
   for (const property of node.properties) {
     if (!ts.isPropertyAssignment(property)) continue
@@ -102,6 +91,12 @@ function parseModuleEntryFromObjectLiteral(node: ts.ObjectLiteralExpression): Mo
     if (key === 'from' && ts.isStringLiteralLike(property.initializer)) {
       from = property.initializer.text
     }
+    if (key === 'packageName' && ts.isStringLiteralLike(property.initializer)) {
+      packageName = property.initializer.text
+    }
+    if (key === 'locator' && ts.isStringLiteralLike(property.initializer)) {
+      locator = property.initializer.text
+    }
     if (key === 'overrides') {
       if (!ts.isObjectLiteralExpression(property.initializer)) {
         devSupervisorRequiresFullBootstrap = true
@@ -127,6 +122,8 @@ function parseModuleEntryFromObjectLiteral(node: ts.ObjectLiteralExpression): Mo
   return {
     id,
     from: from ?? '@open-mercato/core',
+    ...(locator ? { locator } : {}),
+    ...(packageName ? { packageName } : {}),
     ...(devSupervisorRequiresFullBootstrap ? { devSupervisorRequiresFullBootstrap: true } : {}),
   }
 }
@@ -365,8 +362,7 @@ function loadEnabledModulesFromConfig(appDir: string): ModuleEntry[] {
   const cfgPath = path.resolve(appDir, 'src/modules.ts')
   if (fs.existsSync(cfgPath)) {
     try {
-      const loadedModules = readEnabledModulesFromConfig(cfgPath)
-      if (loadedModules.length > 0) return loadedModules
+      return readEnabledModulesFromConfig(cfgPath)
     } catch (error) {
       console.warn(
         '[resolver] Failed to read enabled modules from src/modules.ts, falling back to src/modules scan:',
@@ -582,7 +578,7 @@ export function createResolver(cwd: string = process.cwd()): PackageResolver {
 
     getModulePaths: (entry: ModuleEntry) => {
       const appBase = path.resolve(appDir, 'src/modules', entry.id)
-      const pkgModulesRoot = pkgDirFor(rootDir, entry.from, _isMonorepo)
+      const pkgModulesRoot = pkgDirFor(rootDir, entry.from, _isMonorepo, appDir)
       const pkgBase = path.join(pkgModulesRoot, entry.id)
       return { appBase, pkgBase }
     },
@@ -601,12 +597,12 @@ export function createResolver(cwd: string = process.cwd()): PackageResolver {
         // App output goes to .mercato/generated
         return path.join(appDir, '.mercato', 'generated')
       }
-      const pkgRoot = pkgRootFor(rootDir, packageName, _isMonorepo)
+      const pkgRoot = pkgRootFor(rootDir, packageName, _isMonorepo, appDir)
       return path.join(pkgRoot, 'generated')
     },
 
     getPackageRoot: (from?: string) => {
-      return pkgRootFor(rootDir, from, _isMonorepo)
+      return pkgRootFor(rootDir, from, _isMonorepo, appDir)
     },
   }
 }
@@ -624,6 +620,6 @@ export function resolveEnvironment(cwd: string = process.cwd()): CliEnvironment
     mode: _isMonorepo ? 'monorepo' : 'standalone',
     rootDir,
     appDir,
-    packageRoot: (packageName: string) => pkgRootFor(rootDir, packageName, _isMonorepo),
+    packageRoot: (packageName: string) => pkgRootFor(rootDir, packageName, _isMonorepo, appDir),
   }
 }

package/src/mercato.ts

@@ -9,7 +9,8 @@ export { getCliModules, hasCliModules, registerCliModules }
 import { parseBooleanToken } from '@open-mercato/shared/lib/boolean'
 import { getSslConfig } from '@open-mercato/shared/lib/db/ssl'
 import { getRedisUrl, getRedisUrlOrThrow, parseRedisUrl } from '@open-mercato/shared/lib/redis/connection'
-import { resolveInitDerivedSecrets } from './lib/init-secrets'
+import { formatInitSummary } from './lib/init-summary'
+import { resolveInitDerivedSecrets, resolveInitSuperadminCredentials } from './lib/init-secrets'
 import { decideExistingDatabase, formatSkipIfInitializedMessage } from './lib/init-existing-database'
 import {
   resolveAutoSpawnWorkersMode,
@@ -1031,6 +1032,7 @@ export async function run(argv = process.argv) {
         delete process.env.OM_INIT_REINSTALL
       }
       const skipIfInitialized = initArgs.includes('--skip-if-initialized')
+      const credentials = skipIfInitialized && !reinstall ? undefined : resolveInitSuperadminCredentials(initArgs)
       const skipExamples = initArgs.includes('--no-examples')
       const skipDemoUsers = initArgs.includes('--no-demo-users')
       const stressTestEnabled =
@@ -1208,6 +1210,8 @@ export async function run(argv = process.argv) {
         }
       }
 
+      const { email, password, skipPasswordPolicy } = credentials ?? resolveInitSuperadminCredentials(initArgs)
+
       // Step 1: Run generators directly (no process spawn)
       console.log('🔧 Preparing modules (registry, entities, DI)...')
       const { createResolver } = await import('./lib/resolver')
@@ -1256,16 +1260,7 @@ export async function run(argv = process.argv) {
         }
         return fallback
       }
-      const readEnvDefault = (key: string) => {
-        const value = process.env[key]
-        if (typeof value === 'string' && value.trim().length > 0) return value.trim()
-        return undefined
-      }
-      const defaultEmail = readEnvDefault('OM_INIT_SUPERADMIN_EMAIL') ?? 'superadmin@acme.com'
-      const defaultPassword = readEnvDefault('OM_INIT_SUPERADMIN_PASSWORD') ?? 'secret'
       const orgName = findArgValue(['--org=', '--orgName='], 'Acme Corp')
-      const email = findArgValue(['--email='], defaultEmail)
-      const password = findArgValue(['--password='], defaultPassword)
       const derivedSecrets = resolveInitDerivedSecrets({ email, env: process.env })
       const adminEmailDerived = derivedSecrets.adminEmail
       const employeeEmailDerived = derivedSecrets.employeeEmail
@@ -1299,16 +1294,6 @@ export async function run(argv = process.argv) {
         process.env.OM_INIT_EMPLOYEE_EMAIL = employeeEmailDerived
       }
       const roles = findArgValue(['--roles='], 'superadmin,admin,employee')
-      const skipPasswordPolicyRaw = initArgs.find((arg) =>
-        arg === '--skip-password-policy' ||
-        arg.startsWith('--skip-password-policy=') ||
-        arg === '--allow-weak-password' ||
-        arg.startsWith('--allow-weak-password=')
-      )
-      const skipPasswordPolicy = skipPasswordPolicyRaw
-        ? parseBooleanToken(skipPasswordPolicyRaw.split('=')[1] ?? 'true') ?? true
-        : true
-
       console.log('🔐 Setting up RBAC and users...')
       // Run auth setup command via CLI
       const setupArgs = [
@@ -1482,29 +1467,18 @@ export async function run(argv = process.argv) {
         pushUser('Admin', '🧰', adminEmailDerived, adminPasswordOverride ?? password)
         pushUser('Employee', '👷', employeeEmailDerived, employeePasswordOverride ?? password)
       }
-      // Simplified success message: we know which users were created
-      console.log('🎉 App initialization complete!\n')
-      console.log('╔══════════════════════════════════════════════════════════════╗')
-      console.log('║  🚀 You\'re now ready to start development!                   ║')
-      console.log('║                                                              ║')
-      if (parseBooleanToken(process.env.OM_INIT_DEV_AUTOSTART) === true) {
-        console.log('║  The dev server is starting now (next time run: yarn dev).   ║')
-      } else {
-        console.log('║  Start the dev server:                                       ║')
-        console.log('║    yarn dev                                                  ║')
-      }
-      console.log('║                                                              ║')
-      console.log('║  Users created:                                              ║')
-      for (const entry of createdUsers) {
-        const label = `${entry.icon} ${entry.label}:`
-        const labelPad = padByCodePointWidth(label, 13)
-        const entryPassword = createdPasswords.get(entry.email.toLowerCase()) ?? password
-        console.log(`║    ${labelPad}${entry.email.padEnd(42)} ║`)
-        console.log(`║       Password: ${entryPassword.padEnd(44)} ║`)
-      }
-      console.log('║                                                              ║')
-      console.log('║  Happy coding!                                               ║')
-      console.log('╚══════════════════════════════════════════════════════════════╝')
+      const summaryColor = parseBooleanToken(process.env.OM_INIT_SUMMARY_COLOR)
+      const summaryColumns = Number(process.env.OM_INIT_SUMMARY_COLUMNS ?? process.stdout.columns)
+      const summary = formatInitSummary({
+        users: createdUsers.map((entry) => ({
+          ...entry,
+          password: createdPasswords.get(entry.email.toLowerCase()) ?? password,
+        })),
+        autoStart: parseBooleanToken(process.env.OM_INIT_DEV_AUTOSTART) === true,
+        columns: summaryColumns,
+        color: process.env.NO_COLOR === undefined && (summaryColor ?? (Boolean(process.stdout.isTTY) || parseBooleanToken(process.env.FORCE_COLOR) === true)),
+      })
+      for (const line of summary) console.log(line)
 
       return 0
     } catch (error: unknown) {
@@ -2333,7 +2307,7 @@ export async function run(argv = process.argv) {
               )
               const nextProcess = spawn('node', nextDevCommand.args, {
                 stdio: ['inherit', 'pipe', 'pipe'],
-                env: runtimeEnv,
+                env: { ...runtimeEnv, NODE_ENV: 'development' },
                 cwd: appDir,
               })
               processes.push(nextProcess)

package/src/types/cross-spawn.d.ts

@@ -1,7 +1,7 @@
 declare module 'cross-spawn' {
-  import type { spawn as spawnFunction } from 'node:child_process'
+  import type { spawn as spawnFunction, spawnSync } from 'node:child_process'
 
-  const spawn: typeof spawnFunction
+  const spawn: typeof spawnFunction & { sync: typeof spawnSync }
 
   export default spawn
 }