@beechcms/cms 0.6.0-preview.3 → 0.6.0-preview.4

package/bin/cli.mjs

@@ -1,231 +1,270 @@
-#!/usr/bin/env node
-// @ts-check
-
-import { spawnSync } from 'node:child_process'
-import { existsSync } from 'node:fs'
-import { resolve } from 'node:path'
-import { pathToFileURL } from 'node:url'
-
-
-const [,, command, ...args] = process.argv
-
-const COMMANDS = {
-  build:          cmdBuild,
-  'seed:load':    cmdSeedLoad,
-  'seed:create':  cmdSeedCreate,
-  'init':         cmdInit,
-  'validate':     cmdValidate,
-  'deploy':       cmdDeploy,
-  'update':       cmdUpdate,
-  'onboard':      cmdOnboard,
-  'reset':        cmdReset,
-}
-
-function help() {
-  console.log(`
-  beech <command> [options]
-
-  Commands:
-    init            Check project files and optionally initialise the database
-      --db            Also initialise the D1 database (system tables)
-      --remote        Target remote D1 instead of local (default: local)
-      --db-name <n>   Override D1 database name
-
-    build           Rebuild @beechcms/core after editing seeds.ts
-
-    validate        Validate SEED_REGISTRY for common errors (duplicate aliases,
-                    missing displayNameAlias, duplicate slugs). Exit code 1 on errors.
-
-    seed:load       Create/update content tables from SEED_REGISTRY
-      --dry-run       Print SQL without executing
-      --diff          Show schema differences vs current DB
-      --remote        Execute against remote D1 (default: local)
-      --db <name>     Override D1 database name
-
-    seed:create     Interactive wizard — generate a new Seed definition and append
-                    it to seeds.ts, including SEED_REGISTRY entry
-
-    deploy          Deploy Worker, sync remote schema, and verify /admin
-      --skip-seed     Skip remote seed:load step
-      --skip-check    Skip /admin reachability check
-
-    update          Update @beechcms/api and @beechcms/core to latest, then
-                    apply any new system migrations to the local database
-
-    onboard         One-command local provisioning (init + seed:load). Designed
-                    for non-interactive use by agents and CI.
-      --remote        Target remote D1 instead of local (default: local)
-      --yes           Skip all interactive prompts (non-interactive mode)
-      --db <name>     Override D1 database name
-
-    reset           Reset database and/or Docker containers/volumes
-      --db            Wipe local Wrangler state & bootstrap D1 DB
-      --docker        Down Docker containers and wipe volumes
-      --all           Reset both (database & docker)
-
-  Scaffold a new project (interactive, or pass --yes for non-interactive defaults):
-    npm create @beechcms/cms [project-name] [--yes] [--with-examples]
-
-  Golden path (local):
-    npx beech onboard --local --yes   # fully automated
-    # or step by step:
-    npx beech init --db --local
-    npx beech seed:load --local
-    npx wrangler dev
-
-  Golden path (deploy):
-    npx beech deploy
-    npx beech init --db --remote   # verify remote DB post-deploy
-`)
-}
-
-function cmdBuild() {
-  console.log(
-    '\nNo build step needed for BeechCMS projects.\n' +
-    'Edit seeds.ts then run `npx beech seed:load` to sync schema changes to D1.\n'
-  )
-}
-
-async function tryLoadLocalRegistry() {
-  const cwd = process.cwd()
-
-  // Try compiled JS first (root or apps/api)
-  const searchDirs = [cwd, resolve(cwd, 'apps', 'api')]
-  for (const dir of searchDirs) {
-    for (const name of ['seeds.js', 'seeds.mjs', 'seed.js', 'seed.mjs']) {
-      const p = resolve(dir, name)
-      if (existsSync(p)) {
-        try {
-          const mod = await import(pathToFileURL(p).href)
-          if (mod.SEED_REGISTRY && typeof mod.SEED_REGISTRY === 'object') {
-            return mod.SEED_REGISTRY
-          }
-          if (Array.isArray(mod.seeds)) {
-            return Object.fromEntries(mod.seeds.map(s => [s.slug, s]))
-          }
-          if (Array.isArray(mod.default)) {
-            return Object.fromEntries(mod.default.map(s => [s.slug, s]))
-          }
-        } catch {}
-      }
-    }
-  }
-
-  // Try seeds.ts / seed.ts (root or apps/api)
-  let tsPath = null
-  for (const dir of searchDirs) {
-    const p = existsSync(resolve(dir, 'seeds.ts')) 
-      ? resolve(dir, 'seeds.ts') 
-      : resolve(dir, 'seed.ts')
-    if (existsSync(p)) {
-      tsPath = p
-      break
-    }
-  }
-
-  if (tsPath) {
-    const result = spawnSync(process.execPath, [
-      '--experimental-strip-types',
-      '--input-type=module',
-      '--eval',
-      `
-import * as mod from ${JSON.stringify(pathToFileURL(tsPath).href)};
-let out = null;
-if (mod.SEED_REGISTRY && typeof mod.SEED_REGISTRY === 'object') out = mod.SEED_REGISTRY;
-else if (Array.isArray(mod.seeds)) out = Object.fromEntries(mod.seeds.map(s => [s.slug, s]));
-else if (Array.isArray(mod.default)) out = Object.fromEntries(mod.default.map(s => [s.slug, s]));
-if (out) process.stdout.write(JSON.stringify(out));
-      `.trim(),
-    ], { encoding: 'utf-8' })
-    
-    if (result.status === 0 && result.stdout) {
-      try { return JSON.parse(result.stdout) } catch (err) {
-        console.error('  Failed to parse seeds.ts output:', err)
-      }
-    } else if (result.status !== 0) {
-      console.error('  Error loading seeds.ts:')
-      console.error(result.stderr || result.stdout || 'Unknown error')
-      if (process.version.slice(1).split('.')[0] < 22) {
-        console.warn('  Note: Node.js 22.6+ is required to load .ts files directly. Current version:', process.version)
-      }
-    }
-  }
-
-  return null
-}
-
-async function cmdInit(args) {
-  const initDb  = args.includes('--db')
-  const remote  = args.includes('--remote')
-  const dbIdx   = args.indexOf('--db-name')
-  const db      = dbIdx !== -1 ? args[dbIdx + 1] : undefined
-
-  const { init } = await import('@beechcms/cli')
-  await init({ initDb, local: !remote, db })
-}
-
-async function cmdSeedLoad(args) {
-  const dryRun = args.includes('--dry-run')
-  const diff   = args.includes('--diff')
-  const remote = args.includes('--remote')
-  const dbIdx  = args.indexOf('--db')
-  const db     = dbIdx !== -1 ? args[dbIdx + 1] : undefined
-
-  const registry = await tryLoadLocalRegistry()
-
-  const { seedLoad } = await import('@beechcms/cli')
-  await seedLoad({ dryRun, diff, local: !remote, db, registry })
-}
-
-async function cmdValidate(args) {
-  const registry = await tryLoadLocalRegistry()
-  const { validate } = await import('@beechcms/cli')
-  await validate({ registry })
-}
-
-async function cmdSeedCreate(_args) {
-  const { seedCreate } = await import('@beechcms/cli')
-  await seedCreate({})
-}
-
-async function cmdDeploy(args) {
-  const skipSeed  = args.includes('--skip-seed')
-  const skipCheck = args.includes('--skip-check')
-  const registry  = skipSeed ? null : await tryLoadLocalRegistry()
-  const { deploy } = await import('@beechcms/cli')
-  await deploy({ registry, skipSeed, skipCheck })
-}
-
-async function cmdUpdate(_args) {
-  const { update } = await import('@beechcms/cli')
-  await update({})
-}
-
-async function cmdOnboard(args) {
-  const local    = !args.includes('--remote')
-  const yes      = args.includes('--yes')
-  const dbIdx    = args.indexOf('--db')
-  const db       = dbIdx !== -1 ? args[dbIdx + 1] : undefined
-  const registry = await tryLoadLocalRegistry()
-  const { onboard } = await import('@beechcms/cli')
-  await onboard({ local, yes, db, registry })
-}
-
-async function cmdReset(args) {
-  const db     = args.includes('--db')
-  const docker = args.includes('--docker')
-  const all    = args.includes('--all')
-  
-  const { reset } = await import('@beechcms/cli')
-  await reset({ db, docker, all })
-}
-
-const handler = COMMANDS[command]
-if (!handler) {
-  help()
-  if (command) process.exit(1)
-} else if (args.includes('--help') || args.includes('-h')) {
-  help()
-} else {
-  await handler(args)
-}
+#!/usr/bin/env node
+// @ts-check
+
+import { spawnSync } from 'node:child_process'
+import { existsSync } from 'node:fs'
+import { resolve } from 'node:path'
+import { pathToFileURL } from 'node:url'
+
+
+const [,, command, ...args] = process.argv
+
+const COMMANDS = {
+  build:            cmdBuild,
+  'seed:load':      cmdSeedLoad,
+  'seed:create':    cmdSeedCreate,
+  'schema:diff':    cmdSchemaDiff,
+  'init':           cmdInit,
+  'validate':       cmdValidate,
+  'deploy':         cmdDeploy,
+  'update':         cmdUpdate,
+  'onboard':        cmdOnboard,
+  'reset':          cmdReset,
+  'generate:types': cmdGenerateTypes,
+}
+
+function help() {
+  console.log(`
+  beech <command> [options]
+
+  Commands:
+    init            Check project files and optionally initialise the database
+      --db            Also initialise the D1 database (system tables)
+      --remote        Target remote D1 instead of local (default: local)
+      --db-name <n>   Override D1 database name
+
+    build           Rebuild @beechcms/core after editing seeds.ts
+
+    validate        Validate SEED_REGISTRY for common errors (duplicate aliases,
+                    missing displayNameAlias, duplicate slugs). Exit code 1 on errors.
+
+    seed:load       Create/update content tables from SEED_REGISTRY
+      --dry-run       Print SQL without executing
+      --diff          Show schema differences vs current DB
+      --remote        Execute against remote D1 (default: local)
+      --db <name>     Override D1 database name
+
+    seed:create     Interactive wizard — generate a new Seed definition and append
+                    it to seeds.ts, including SEED_REGISTRY entry
+
+    schema:diff     Diff SEED_REGISTRY vs the live D1 schema and generate an
+                    additive SQL migration in apps/api/migrations/
+      --write         Write the migration file (default: preview only)
+      --name <name>   Migration name used in the filename
+      --remote        Diff against remote D1 (default: local)
+      --db <name>     Override D1 database name
+
+    deploy          Deploy Worker, sync remote schema, and verify /admin
+      --skip-seed     Skip remote seed:load step
+      --skip-check    Skip /admin reachability check
+
+    update          Update @beechcms/api and @beechcms/core to latest, then
+                    apply any new system migrations to the local database
+
+    onboard         One-command local provisioning (init + seed:load). Designed
+                    for non-interactive use by agents and CI.
+      --remote        Target remote D1 instead of local (default: local)
+      --yes           Skip all interactive prompts (non-interactive mode)
+      --db <name>     Override D1 database name
+
+    reset           Reset database and/or Docker containers/volumes
+      --db            Wipe local Wrangler state & bootstrap D1 DB
+      --docker        Down Docker containers and wipe volumes
+      --all           Reset both (database & docker)
+
+    generate:types  Generate TypeScript interfaces from the Seed registry
+      --out <path>    Output file (default: src/types/beech.ts)
+      --local         Read from seeds.ts instead of querying remote D1
+      --db <name>     Override D1 database name (remote mode)
+
+  Scaffold a new project (interactive, or pass --yes for non-interactive defaults):
+    npm create @beechcms/cms [project-name] [--yes] [--with-examples]
+
+  Golden path (local):
+    npx beech onboard --local --yes   # fully automated
+    # or step by step:
+    npx beech init --db --local
+    npx beech seed:load --local
+    npx wrangler dev
+
+  Golden path (deploy):
+    npx beech deploy
+    npx beech init --db --remote   # verify remote DB post-deploy
+`)
+}
+
+function cmdBuild() {
+  console.log(
+    '\nNo build step needed for BeechCMS projects.\n' +
+    'Edit seeds.ts then run `npx beech seed:load` to sync schema changes to D1.\n'
+  )
+}
+
+async function tryLoadLocalRegistry() {
+  const cwd = process.cwd()
+
+  // Try compiled JS first (root or apps/api)
+  const searchDirs = [cwd, resolve(cwd, 'apps', 'api')]
+  for (const dir of searchDirs) {
+    for (const name of ['seeds.js', 'seeds.mjs', 'seed.js', 'seed.mjs']) {
+      const p = resolve(dir, name)
+      if (existsSync(p)) {
+        try {
+          const mod = await import(pathToFileURL(p).href)
+          if (mod.SEED_REGISTRY && typeof mod.SEED_REGISTRY === 'object') {
+            return mod.SEED_REGISTRY
+          }
+          if (Array.isArray(mod.seeds)) {
+            return Object.fromEntries(mod.seeds.map(s => [s.slug, s]))
+          }
+          if (Array.isArray(mod.default)) {
+            return Object.fromEntries(mod.default.map(s => [s.slug, s]))
+          }
+        } catch {}
+      }
+    }
+  }
+
+  // Try seeds.ts / seed.ts (root or apps/api)
+  let tsPath = null
+  for (const dir of searchDirs) {
+    const p = existsSync(resolve(dir, 'seeds.ts')) 
+      ? resolve(dir, 'seeds.ts') 
+      : resolve(dir, 'seed.ts')
+    if (existsSync(p)) {
+      tsPath = p
+      break
+    }
+  }
+
+  if (tsPath) {
+    const result = spawnSync(process.execPath, [
+      '--experimental-strip-types',
+      '--input-type=module',
+      '--eval',
+      `
+import * as mod from ${JSON.stringify(pathToFileURL(tsPath).href)};
+let out = null;
+if (mod.SEED_REGISTRY && typeof mod.SEED_REGISTRY === 'object') out = mod.SEED_REGISTRY;
+else if (Array.isArray(mod.seeds)) out = Object.fromEntries(mod.seeds.map(s => [s.slug, s]));
+else if (Array.isArray(mod.default)) out = Object.fromEntries(mod.default.map(s => [s.slug, s]));
+if (out) process.stdout.write(JSON.stringify(out));
+      `.trim(),
+    ], { encoding: 'utf-8' })
+    
+    if (result.status === 0 && result.stdout) {
+      try { return JSON.parse(result.stdout) } catch (err) {
+        console.error('  Failed to parse seeds.ts output:', err)
+      }
+    } else if (result.status !== 0) {
+      console.error('  Error loading seeds.ts:')
+      console.error(result.stderr || result.stdout || 'Unknown error')
+      if (process.version.slice(1).split('.')[0] < 22) {
+        console.warn('  Note: Node.js 22.6+ is required to load .ts files directly. Current version:', process.version)
+      }
+    }
+  }
+
+  return null
+}
+
+async function cmdInit(args) {
+  const initDb  = args.includes('--db')
+  const remote  = args.includes('--remote')
+  const dbIdx   = args.indexOf('--db-name')
+  const db      = dbIdx !== -1 ? args[dbIdx + 1] : undefined
+
+  const { init } = await import('@beechcms/cli')
+  await init({ initDb, local: !remote, db })
+}
+
+async function cmdSeedLoad(args) {
+  const dryRun = args.includes('--dry-run')
+  const diff   = args.includes('--diff')
+  const remote = args.includes('--remote')
+  const dbIdx  = args.indexOf('--db')
+  const db     = dbIdx !== -1 ? args[dbIdx + 1] : undefined
+
+  const registry = await tryLoadLocalRegistry()
+
+  const { seedLoad } = await import('@beechcms/cli')
+  await seedLoad({ dryRun, diff, local: !remote, db, registry })
+}
+
+async function cmdValidate(args) {
+  const registry = await tryLoadLocalRegistry()
+  const { validate } = await import('@beechcms/cli')
+  await validate({ registry })
+}
+
+async function cmdSeedCreate(_args) {
+  const { seedCreate } = await import('@beechcms/cli')
+  await seedCreate({})
+}
+
+async function cmdDeploy(args) {
+  const skipSeed  = args.includes('--skip-seed')
+  const skipCheck = args.includes('--skip-check')
+  const registry  = skipSeed ? null : await tryLoadLocalRegistry()
+  const { deploy } = await import('@beechcms/cli')
+  await deploy({ registry, skipSeed, skipCheck })
+}
+
+async function cmdUpdate(_args) {
+  const { update } = await import('@beechcms/cli')
+  await update({})
+}
+
+async function cmdOnboard(args) {
+  const local    = !args.includes('--remote')
+  const yes      = args.includes('--yes')
+  const dbIdx    = args.indexOf('--db')
+  const db       = dbIdx !== -1 ? args[dbIdx + 1] : undefined
+  const registry = await tryLoadLocalRegistry()
+  const { onboard } = await import('@beechcms/cli')
+  await onboard({ local, yes, db, registry })
+}
+
+async function cmdReset(args) {
+  const db     = args.includes('--db')
+  const docker = args.includes('--docker')
+  const all    = args.includes('--all')
+
+  const { reset } = await import('@beechcms/cli')
+  await reset({ db, docker, all })
+}
+
+async function cmdSchemaDiff(args) {
+  const remote  = args.includes('--remote')
+  const write   = args.includes('--write')
+  const nameIdx = args.indexOf('--name')
+  const name    = nameIdx !== -1 ? args[nameIdx + 1] : undefined
+  const dbIdx   = args.indexOf('--db')
+  const db      = dbIdx !== -1 ? args[dbIdx + 1] : undefined
+  const registry = await tryLoadLocalRegistry()
+  const { schemaDiff } = await import('@beechcms/cli')
+  await schemaDiff({ local: !remote, write, name, db, registry })
+}
+
+async function cmdGenerateTypes(args) {
+  const outIdx = args.indexOf('--out')
+  const out    = outIdx !== -1 ? args[outIdx + 1] : 'src/types/beech.ts'
+  const local  = args.includes('--local')
+  const dbIdx  = args.indexOf('--db')
+  const db     = dbIdx !== -1 ? args[dbIdx + 1] : undefined
+
+  const registry = local ? await tryLoadLocalRegistry() : null
+
+  const { generateTypes } = await import('@beechcms/cli')
+  await generateTypes({ out, local, db, registry })
+}
+
+const handler = COMMANDS[command]
+if (!handler) {
+  help()
+  if (command) process.exit(1)
+} else if (args.includes('--help') || args.includes('-h')) {
+  help()
+} else {
+  await handler(args)
+}