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

package/src/commands/onboard.ts

@@ -1,32 +1,32 @@
-// SPDX-License-Identifier: MIT
-// Copyright (c) 2024–2026 Flavio De Musso
-
-import pc from 'picocolors'
-import type { Seed } from '@beechcms/core'
-import { init } from './init.js'
-import { seedLoad } from './seed-load.js'
-
-export interface OnboardOptions {
-  local: boolean
-  yes: boolean
-  db?: string
-  registry?: Record<string, Seed> | null
-}
-
-export async function onboard(args: OnboardOptions): Promise<void> {
-  console.log(pc.cyan('\n  beech onboard — full provisioning\n'))
-
-  // Step 1: file check + DB init
-  await init({ initDb: true, local: args.local, db: args.db, nonInteractive: args.yes })
-
-  // Step 2: create content tables + register definitions + bump registry_version
-  await seedLoad({ dryRun: false, diff: false, local: args.local, db: args.db, registry: args.registry ?? null })
-
-  // Step 3: next steps
-  console.log(pc.cyan('\n  Provisioning complete.\n'))
-  console.log(pc.dim('  Next steps:'))
-  console.log(pc.cyan('  1. npx wrangler dev'))
-  console.log(pc.dim('      → start API + dashboard'))
-  console.log(pc.dim('  2. Open http://localhost:8789/admin'))
-  console.log(pc.dim('      → complete setup wizard to create admin user\n'))
-}
+// SPDX-License-Identifier: MIT
+// Copyright (c) 2024–2026 Flavio De Musso
+
+import pc from 'picocolors'
+import type { Seed } from '@beechcms/core'
+import { init } from './init.js'
+import { seedLoad } from './seed-load.js'
+
+export interface OnboardOptions {
+  local: boolean
+  yes: boolean
+  db?: string
+  registry?: Record<string, Seed> | null
+}
+
+export async function onboard(args: OnboardOptions): Promise<void> {
+  console.log(pc.cyan('\n  beech onboard — full provisioning\n'))
+
+  // Step 1: file check + DB init
+  await init({ initDb: true, local: args.local, db: args.db, nonInteractive: args.yes })
+
+  // Step 2: create content tables + register definitions + bump registry_version
+  await seedLoad({ dryRun: false, diff: false, local: args.local, db: args.db, registry: args.registry ?? null })
+
+  // Step 3: next steps
+  console.log(pc.cyan('\n  Provisioning complete.\n'))
+  console.log(pc.dim('  Next steps:'))
+  console.log(pc.cyan('  1. npx wrangler dev'))
+  console.log(pc.dim('      → start API + dashboard'))
+  console.log(pc.dim('  2. Open http://localhost:8789/admin'))
+  console.log(pc.dim('      → complete setup wizard to create admin user\n'))
+}

package/src/commands/schema-diff.ts

@@ -0,0 +1,78 @@
+// SPDX-License-Identifier: MIT
+// Copyright (c) 2024–2026 Flavio De Musso
+
+import pc from 'picocolors'
+import { resolve } from 'node:path'
+import { SEED_REGISTRY, sortSeedsByDependencies, type Seed } from '@beechcms/core'
+import { findWranglerConfig, resolveDbName, type WranglerOptions } from '../lib/wrangler.js'
+import { diffSeed, renderSeedDiff, isSeedClean } from '../lib/schema-diff.js'
+import { nextMigrationIndex, buildMigrationSql, writeMigrationFile } from '../lib/migration-writer.js'
+
+export interface SchemaDiffOptions {
+  /** Compare against remote D1 (default: local). */
+  local: boolean
+  /** When set, write an additive migration file instead of just printing. */
+  write: boolean
+  /** Optional migration name (used in the filename). */
+  name?: string
+  /** Override migrations dir (default: <cwd>/apps/api/migrations). */
+  migrationsDir?: string
+  /** Override D1 database name. */
+  db?: string
+  registry?: Record<string, Seed> | null
+}
+
+function resolveMigrationsDir(override?: string): string {
+  if (override) return resolve(process.cwd(), override)
+  return resolve(process.cwd(), 'apps', 'api', 'migrations')
+}
+
+export async function schemaDiff(args: SchemaDiffOptions): Promise<void> {
+  const registry = args.registry ?? SEED_REGISTRY
+  if (Object.keys(registry).length === 0) {
+    console.log(pc.yellow('\n  ✗ No seeds found — nothing to diff.\n'))
+    return
+  }
+
+  const configPath = findWranglerConfig()
+  const options: WranglerOptions = { db: args.db ?? resolveDbName(configPath), local: args.local, configPath }
+  const seeds = sortSeedsByDependencies(Object.values(registry))
+
+  console.log(pc.cyan(`\n  Diffing schema vs ${args.local ? 'local' : 'remote'} D1 (${options.db})…\n`))
+  const diffs = []
+  let clean = true
+  for (const seed of seeds) {
+    const d = await diffSeed(seed, options)
+    diffs.push(d)
+    renderSeedDiff(d)
+    if (!isSeedClean(d)) clean = false
+  }
+
+  if (clean) { console.log(pc.green('\n  Schema matches seeds. No migration needed.\n')); return }
+
+  const plan = buildMigrationSql(diffs, registry)
+  if (!args.write) {
+    console.log(pc.dim('\n  -- proposed additive migration (preview):\n'))
+    console.log(plan.sql)
+    if (plan.destructiveSlugs.length) {
+      console.log(pc.yellow(`\n  ⚠ Destructive drift in: ${plan.destructiveSlugs.join(', ')} — not auto-migrated.`))
+    }
+    console.log(pc.cyan('\n  → Re-run with --write to save the migration file.\n'))
+    return
+  }
+
+  if (plan.additiveCount === 0) {
+    console.log(pc.yellow('\n  ⚠ Only destructive drift detected — no additive migration written.'))
+    console.log(pc.dim('  Author a reviewed migration by hand for renames/drops/type changes.\n'))
+    return
+  }
+
+  const dir = resolveMigrationsDir(args.migrationsDir)
+  const index = nextMigrationIndex(dir)
+  const file = writeMigrationFile(dir, index, args.name ?? 'schema_sync', plan.sql)
+  console.log(pc.green(`\n  ✓ Wrote ${file} (${plan.additiveCount} statement(s)).`))
+  console.log(pc.dim('  Review, commit, then `wrangler d1 migrations apply --remote` in CI.\n'))
+  if (plan.destructiveSlugs.length) {
+    console.log(pc.yellow(`  ⚠ Destructive drift in ${plan.destructiveSlugs.join(', ')} was NOT included.\n`))
+  }
+}

package/src/commands/seed-create.ts

@@ -1,192 +1,192 @@
-// SPDX-License-Identifier: MIT
-// Copyright (c) 2024–2026 Flavio De Musso
-
-import pc from 'picocolors'
-import { createInterface } from 'node:readline/promises'
-import { existsSync, readFileSync, writeFileSync } from 'node:fs'
-import { resolve } from 'node:path'
-import type { BranchType } from '@beechcms/core'
-
-export type SeedCreateOptions = Record<string, never>
-
-const BRANCH_TYPES: BranchType[] = ['text', 'number', 'boolean', 'date', 'richtext', 'file', 'tags']
-
-function slugify(str: string): string {
-  return str
-    .toLowerCase()
-    .trim()
-    .replace(/\s+/g, '-')
-    .replace(/[^a-z0-9-]/g, '')
-}
-
-function toConstName(slug: string): string {
-  return slug.replace(/-/g, '_').toUpperCase() + '_SEED'
-}
-
-function toLabel(alias: string): string {
-  return alias
-    .replace(/([A-Z])/g, ' $1')
-    .replace(/^./, s => s.toUpperCase())
-    .trim()
-}
-
-interface BranchDef {
-  alias: string
-  label: string
-  type: BranchType
-  required: boolean
-}
-
-function generateSeedBlock(slug: string, label: string, labelPlural: string, branches: BranchDef[]): string {
-  const displayAlias =
-    branches.find(b => b.type === 'text')?.alias ??
-    branches[0]?.alias ??
-    'name'
-
-  const cName = toConstName(slug)
-  const branchLines = branches.map(b => {
-    const parts: string[] = [
-      `alias: '${b.alias}'`,
-      `label: '${b.label}'`,
-      `type: '${b.type}'`,
-    ]
-    if (b.required) parts.push('requiredOnCreate: true')
-    return `    { ${parts.join(', ')} },`
-  })
-
-  return [
-    '',
-    `export const ${cName} = defineSeed({`,
-    `  slug: '${slug}',`,
-    `  label: '${label}',`,
-    `  labelPlural: '${labelPlural}',`,
-    `  displayNameAlias: '${displayAlias}',`,
-    '  branches: [',
-    ...branchLines,
-    '  ],',
-    '  dashboard: {',
-    "    icon: 'Folder',",
-    "    group: 'Content',",
-    '  },',
-    '})',
-    '',
-  ].join('\n')
-}
-
-function ensureDefineSeedImport(content: string): string {
-  if (content.includes('defineSeed')) return content
-  return `import { defineSeed } from '@beechcms/core'\n` + content
-}
-
-function tryInsertRegistryEntry(content: string, slug: string, cName: string): string | null {
-  const match = content.match(/(SEED_REGISTRY[^{]*\{)([\s\S]*?)(\n\})/m)
-  if (!match) return null
-  const [full, open, inner, close] = match
-  const newEntry = `\n  ${slug}: ${cName},`
-  return content.replace(full, open + inner + newEntry + close)
-}
-
-function findSeedsFile(): string | null {
-  const cwd = process.cwd()
-  const searchDirs = [cwd, resolve(cwd, 'apps', 'api')]
-  for (const dir of searchDirs) {
-    for (const name of ['seeds.ts', 'seed.ts']) {
-      const p = resolve(dir, name)
-      if (existsSync(p)) return p
-    }
-  }
-  return null
-}
-
-export async function seedCreate(_args: SeedCreateOptions): Promise<void> {
-  const rl = createInterface({ input: process.stdin, output: process.stdout })
-
-  const ask = async (q: string, fallback = ''): Promise<string> => {
-    const hint = fallback ? pc.dim(` [${fallback}]`) : ''
-    const answer = await rl.question(`  ${q}${hint}: `)
-    return answer.trim() || fallback
-  }
-
-  const askYN = async (q: string, defaultYes = true): Promise<boolean> => {
-    const hint = defaultYes ? pc.dim(' (Y/n)') : pc.dim(' (y/N)')
-    const answer = (await rl.question(`  ${q}${hint}: `)).trim().toLowerCase()
-    if (!answer) return defaultYes
-    return answer === 'y' || answer === 'yes'
-  }
-
-  console.log(pc.cyan('\n  beech seed:create — new content type wizard\n'))
-
-  try {
-    const label = await ask('Content type name (singular, e.g. "Article")')
-    if (!label) {
-      rl.close()
-      console.log(pc.red('\n  ✗ Name required.\n'))
-      process.exit(1)
-    }
-
-    const defaultSlug = slugify(label) + 's'
-    const slug = slugify(await ask('Slug (plural, used in URL + table name)', defaultSlug)) || defaultSlug
-    const labelPlural = (await ask('Plural label', label + 's')) || label + 's'
-
-    const branches: BranchDef[] = []
-    console.log(pc.dim('\n  Now define the fields. Press Enter to accept defaults.\n'))
-
-    let addMore = true
-    while (addMore) {
-      console.log(pc.dim(`  ─── Field ${branches.length + 1} ───`))
-      const alias = await ask('  Alias (camelCase, e.g. "title", "publishedAt")')
-      if (!alias) {
-        console.log(pc.yellow('  Alias required — skipping.'))
-        addMore = await askYN('\n  Add a field?')
-        continue
-      }
-
-      const fieldLabel = (await ask('  Label', toLabel(alias))) || toLabel(alias)
-      const typeList = BRANCH_TYPES.join(' | ')
-      const rawType = (await ask(`  Type (${typeList})`, 'text')).toLowerCase()
-      const type: BranchType = (BRANCH_TYPES.includes(rawType as BranchType) ? rawType : 'text') as BranchType
-      const required = await askYN('  Required on create?', false)
-
-      branches.push({ alias, label: fieldLabel, type, required })
-      addMore = await askYN('\n  Add another field?')
-    }
-
-    rl.close()
-
-    if (branches.length === 0) {
-      console.log(pc.yellow('\n  No fields defined — seed not created.\n'))
-      process.exit(0)
-    }
-
-    const seedBlock = generateSeedBlock(slug, label, labelPlural, branches)
-    const cName = toConstName(slug)
-    const seedsPath = findSeedsFile()
-
-    if (!seedsPath) {
-      console.log(pc.yellow('\n  Could not find seeds.ts. Add this to your seeds file manually:\n'))
-      console.log(seedBlock)
-      process.exit(0)
-    }
-
-    let content = readFileSync(seedsPath, 'utf-8')
-    content = ensureDefineSeedImport(content)
-
-    const withSeed = content + seedBlock
-    const withRegistry = tryInsertRegistryEntry(withSeed, slug, cName)
-    writeFileSync(seedsPath, withRegistry ?? withSeed, 'utf-8')
-
-    console.log(pc.green(`\n  ✓ Seed "${slug}" appended to ${seedsPath}\n`))
-
-    if (!withRegistry) {
-      console.log(pc.yellow(`  ⚠ Could not auto-update SEED_REGISTRY — add this entry manually:\n`))
-      console.log(pc.cyan(`    ${slug}: ${cName},\n`))
-    }
-
-    console.log(pc.dim('  Next steps:'))
-    console.log(pc.cyan('  npx beech seed:load --local'))
-    console.log(pc.dim('  → create the new content table in your local D1 database\n'))
-  } catch (err) {
-    rl.close()
-    throw err
-  }
-}
+// SPDX-License-Identifier: MIT
+// Copyright (c) 2024–2026 Flavio De Musso
+
+import pc from 'picocolors'
+import { createInterface } from 'node:readline/promises'
+import { existsSync, readFileSync, writeFileSync } from 'node:fs'
+import { resolve } from 'node:path'
+import type { BranchType } from '@beechcms/core'
+
+export type SeedCreateOptions = Record<string, never>
+
+const BRANCH_TYPES: BranchType[] = ['text', 'number', 'boolean', 'date', 'richtext', 'file', 'tags']
+
+function slugify(str: string): string {
+  return str
+    .toLowerCase()
+    .trim()
+    .replace(/\s+/g, '-')
+    .replace(/[^a-z0-9-]/g, '')
+}
+
+function toConstName(slug: string): string {
+  return slug.replace(/-/g, '_').toUpperCase() + '_SEED'
+}
+
+function toLabel(alias: string): string {
+  return alias
+    .replace(/([A-Z])/g, ' $1')
+    .replace(/^./, s => s.toUpperCase())
+    .trim()
+}
+
+interface BranchDef {
+  alias: string
+  label: string
+  type: BranchType
+  required: boolean
+}
+
+function generateSeedBlock(slug: string, label: string, labelPlural: string, branches: BranchDef[]): string {
+  const displayAlias =
+    branches.find(b => b.type === 'text')?.alias ??
+    branches[0]?.alias ??
+    'name'
+
+  const cName = toConstName(slug)
+  const branchLines = branches.map(b => {
+    const parts: string[] = [
+      `alias: '${b.alias}'`,
+      `label: '${b.label}'`,
+      `type: '${b.type}'`,
+    ]
+    if (b.required) parts.push('requiredOnCreate: true')
+    return `    { ${parts.join(', ')} },`
+  })
+
+  return [
+    '',
+    `export const ${cName} = defineSeed({`,
+    `  slug: '${slug}',`,
+    `  label: '${label}',`,
+    `  labelPlural: '${labelPlural}',`,
+    `  displayNameAlias: '${displayAlias}',`,
+    '  branches: [',
+    ...branchLines,
+    '  ],',
+    '  dashboard: {',
+    "    icon: 'Folder',",
+    "    group: 'Content',",
+    '  },',
+    '})',
+    '',
+  ].join('\n')
+}
+
+function ensureDefineSeedImport(content: string): string {
+  if (content.includes('defineSeed')) return content
+  return `import { defineSeed } from '@beechcms/core'\n` + content
+}
+
+function tryInsertRegistryEntry(content: string, slug: string, cName: string): string | null {
+  const match = content.match(/(SEED_REGISTRY[^{]*\{)([\s\S]*?)(\n\})/m)
+  if (!match) return null
+  const [full, open, inner, close] = match
+  const newEntry = `\n  ${slug}: ${cName},`
+  return content.replace(full, open + inner + newEntry + close)
+}
+
+function findSeedsFile(): string | null {
+  const cwd = process.cwd()
+  const searchDirs = [cwd, resolve(cwd, 'apps', 'api')]
+  for (const dir of searchDirs) {
+    for (const name of ['seeds.ts', 'seed.ts']) {
+      const p = resolve(dir, name)
+      if (existsSync(p)) return p
+    }
+  }
+  return null
+}
+
+export async function seedCreate(_args: SeedCreateOptions): Promise<void> {
+  const rl = createInterface({ input: process.stdin, output: process.stdout })
+
+  const ask = async (q: string, fallback = ''): Promise<string> => {
+    const hint = fallback ? pc.dim(` [${fallback}]`) : ''
+    const answer = await rl.question(`  ${q}${hint}: `)
+    return answer.trim() || fallback
+  }
+
+  const askYN = async (q: string, defaultYes = true): Promise<boolean> => {
+    const hint = defaultYes ? pc.dim(' (Y/n)') : pc.dim(' (y/N)')
+    const answer = (await rl.question(`  ${q}${hint}: `)).trim().toLowerCase()
+    if (!answer) return defaultYes
+    return answer === 'y' || answer === 'yes'
+  }
+
+  console.log(pc.cyan('\n  beech seed:create — new content type wizard\n'))
+
+  try {
+    const label = await ask('Content type name (singular, e.g. "Article")')
+    if (!label) {
+      rl.close()
+      console.log(pc.red('\n  ✗ Name required.\n'))
+      process.exit(1)
+    }
+
+    const defaultSlug = slugify(label) + 's'
+    const slug = slugify(await ask('Slug (plural, used in URL + table name)', defaultSlug)) || defaultSlug
+    const labelPlural = (await ask('Plural label', label + 's')) || label + 's'
+
+    const branches: BranchDef[] = []
+    console.log(pc.dim('\n  Now define the fields. Press Enter to accept defaults.\n'))
+
+    let addMore = true
+    while (addMore) {
+      console.log(pc.dim(`  ─── Field ${branches.length + 1} ───`))
+      const alias = await ask('  Alias (camelCase, e.g. "title", "publishedAt")')
+      if (!alias) {
+        console.log(pc.yellow('  Alias required — skipping.'))
+        addMore = await askYN('\n  Add a field?')
+        continue
+      }
+
+      const fieldLabel = (await ask('  Label', toLabel(alias))) || toLabel(alias)
+      const typeList = BRANCH_TYPES.join(' | ')
+      const rawType = (await ask(`  Type (${typeList})`, 'text')).toLowerCase()
+      const type: BranchType = (BRANCH_TYPES.includes(rawType as BranchType) ? rawType : 'text') as BranchType
+      const required = await askYN('  Required on create?', false)
+
+      branches.push({ alias, label: fieldLabel, type, required })
+      addMore = await askYN('\n  Add another field?')
+    }
+
+    rl.close()
+
+    if (branches.length === 0) {
+      console.log(pc.yellow('\n  No fields defined — seed not created.\n'))
+      process.exit(0)
+    }
+
+    const seedBlock = generateSeedBlock(slug, label, labelPlural, branches)
+    const cName = toConstName(slug)
+    const seedsPath = findSeedsFile()
+
+    if (!seedsPath) {
+      console.log(pc.yellow('\n  Could not find seeds.ts. Add this to your seeds file manually:\n'))
+      console.log(seedBlock)
+      process.exit(0)
+    }
+
+    let content = readFileSync(seedsPath, 'utf-8')
+    content = ensureDefineSeedImport(content)
+
+    const withSeed = content + seedBlock
+    const withRegistry = tryInsertRegistryEntry(withSeed, slug, cName)
+    writeFileSync(seedsPath, withRegistry ?? withSeed, 'utf-8')
+
+    console.log(pc.green(`\n  ✓ Seed "${slug}" appended to ${seedsPath}\n`))
+
+    if (!withRegistry) {
+      console.log(pc.yellow(`  ⚠ Could not auto-update SEED_REGISTRY — add this entry manually:\n`))
+      console.log(pc.cyan(`    ${slug}: ${cName},\n`))
+    }
+
+    console.log(pc.dim('  Next steps:'))
+    console.log(pc.cyan('  npx beech seed:load --local'))
+    console.log(pc.dim('  → create the new content table in your local D1 database\n'))
+  } catch (err) {
+    rl.close()
+    throw err
+  }
+}