create-mercato-app 0.5.1-develop.2744.9c8be0dd93 → 0.5.1-develop.2756.cce1739df3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-mercato-app",
-  "version": "0.5.1-develop.2744.9c8be0dd93",
+  "version": "0.5.1-develop.2756.cce1739df3",
   "type": "module",
   "description": "Create a new Open Mercato application",
   "main": "./dist/index.js",

package/template/.env.example

@@ -178,10 +178,10 @@ CACHE_TTL=300000
 #CACHE_REDIS_URL=redis://localhost:6379
 
 # SQLite configuration (for sqlite strategy)
-CACHE_SQLITE_PATH=./data/cache.db
+CACHE_SQLITE_PATH=./.mercato/cache/cache.db
 
 # JSON file configuration (for jsonfile strategy)
-#CACHE_JSON_FILE_PATH=./data/cache.json
+#CACHE_JSON_FILE_PATH=./.mercato/cache/cache.json
 
 # Database pooling settings
 DB_POOL_MIN=5

package/template/scripts/dev-runtime.mjs

@@ -55,9 +55,9 @@ const {
   stripAnsi,
   wrapListLines,
 } = await import(resolveSplashHelpersImport())
-const { resolveSpawnCommand } = await import(resolveSpawnUtilsImport())
+const { resolveProjectBinary, resolveSpawnCommand } = await import(resolveSpawnUtilsImport())
 
-const command = process.platform === 'win32' ? 'mercato.cmd' : 'mercato'
+const command = resolveProjectBinary(process.platform === 'win32' ? 'mercato.cmd' : 'mercato')
 const classic = process.argv.includes('--classic') || isEnabledEnvFlag(process.env.OM_DEV_CLASSIC)
 const verbose = !classic && (process.argv.includes('--verbose') || process.env.MERCATO_DEV_OUTPUT === 'verbose')
 const rawPassthrough = classic || verbose
@@ -412,10 +412,10 @@ function spawnMercato(args) {
   return child
 }
 
-function waitForExit(child) {
+function waitForExit(child, label = 'Child process') {
   return new Promise((resolve) => {
     child.on('exit', (code, signal) => {
-      resolve({ code, signal })
+      resolve({ label, code, signal })
     })
   })
 }
@@ -441,6 +441,32 @@ function resolveChildExitCode(result, fallback = 1) {
   return fallback
 }
 
+function formatChildExitStatus(result) {
+  if (typeof result?.code === 'number') {
+    return `exit code ${result.code}`
+  }
+  if (result?.signal) {
+    return `signal ${result.signal}`
+  }
+  return 'an unknown status'
+}
+
+function resolveUnexpectedExitCode(result) {
+  const exitCode = resolveChildExitCode(result, 1)
+  return exitCode === 0 ? 1 : exitCode
+}
+
+function reportUnexpectedChildExit(result) {
+  const message = `❌ ${result?.label ?? 'Child process'} exited unexpectedly with ${formatChildExitStatus(result)}`
+  console.error(message)
+  rememberRawLog(message)
+  publishRuntimeFailure(message, {
+    progressCurrent: splashState.progressCurrent >= runtimeProgressCurrent ? splashState.progressCurrent : runtimeProgressCurrent,
+    progressLabel: splashState.progressLabel || startupProgress.label,
+    failureLines: [...collectRuntimeFailureLines(), message].slice(-10),
+  })
+}
+
 function joinBaseUrl(baseUrl, pathname) {
   return `${String(baseUrl ?? '').replace(/\/$/, '')}${pathname}`
 }
@@ -1521,12 +1547,16 @@ async function runClassicRuntime() {
 
   const watch = spawnMercato(['generate', 'watch', '--skip-initial'])
   const server = spawnMercato(['server', 'dev'])
-  const result = await Promise.race([waitForExit(watch), waitForExit(server)])
+  const result = await Promise.race([
+    waitForExit(watch, 'Generator watch'),
+    waitForExit(server, 'App runtime'),
+  ])
   if (isGracefulShutdownResult(result)) {
     return
   }
 
-  shutdown(resolveChildExitCode(result, 0))
+  reportUnexpectedChildExit(result)
+  shutdown(resolveUnexpectedExitCode(result))
 }
 
 if (classic) {
@@ -1541,7 +1571,11 @@ printRuntimePackagesSummary()
 const watch = startFilteredChild(['generate', 'watch', '--skip-initial'], 'Generator watch', classifyWatchLine)
 const server = startFilteredChild(['server', 'dev'], 'App runtime', classifyServerLine)
 
-const result = await Promise.race([waitForExit(watch), waitForExit(server)])
+const result = await Promise.race([
+  waitForExit(watch, 'Generator watch'),
+  waitForExit(server, 'App runtime'),
+])
 if (!isGracefulShutdownResult(result)) {
-  shutdown(resolveChildExitCode(result, 0))
+  reportUnexpectedChildExit(result)
+  shutdown(resolveUnexpectedExitCode(result))
 }

package/template/scripts/dev-spawn-utils.mjs

@@ -1,3 +1,6 @@
+import fs from 'node:fs'
+import path from 'node:path'
+
 function isWindowsCmdScript(command, platform = process.platform) {
   return platform === 'win32' && /\.(cmd|bat)$/i.test(String(command))
 }
@@ -23,6 +26,34 @@ function assertWindowsCmdSafeValue(value, label) {
   return stringValue
 }
 
+export function resolveProjectBinary(command, options = {}) {
+  const safeCommand = assertProcessSafeValue(command, 'Process command')
+  const cwd = options.cwd ?? process.cwd()
+  const platform = options.platform ?? process.platform
+
+  if (path.isAbsolute(safeCommand) || safeCommand.includes('/') || safeCommand.includes('\\')) {
+    return safeCommand
+  }
+
+  const binDir = path.join(cwd, 'node_modules', '.bin')
+  const candidates = platform === 'win32'
+    ? [
+        path.join(binDir, safeCommand),
+        path.join(binDir, `${safeCommand}.cmd`),
+        path.join(binDir, `${safeCommand}.bat`),
+        path.join(binDir, `${safeCommand}.exe`),
+      ]
+    : [path.join(binDir, safeCommand)]
+
+  for (const candidate of candidates) {
+    if (fs.existsSync(candidate)) {
+      return candidate
+    }
+  }
+
+  return safeCommand
+}
+
 export function resolveSpawnCommand(command, commandArgs = [], options = {}) {
   const platform = options.platform ?? process.platform
   const safeCommand = assertProcessSafeValue(command, 'Process command')

package/template/scripts/setup.mjs

@@ -1,7 +1,17 @@
 import { spawnSync } from 'node:child_process'
+import { existsSync } from 'node:fs'
 
 const reinstall = process.argv.includes('--reinstall')
 const classic = process.argv.includes('--classic')
+
+if (!existsSync('node_modules/cross-spawn')) {
+  const bootstrap = spawnSync('yarn', ['install'], {
+    stdio: 'inherit',
+    shell: process.platform === 'win32',
+  })
+  if (bootstrap.status !== 0) process.exit(bootstrap.status ?? 1)
+}
+
 const result = spawnSync(
   process.execPath,
   ['./scripts/dev.mjs', '--setup', ...(reinstall ? ['--reinstall'] : []), ...(classic ? ['--classic'] : [])],