@beechcms/cli 0.4.0-preview.9 → 0.4.0

package/src/commands/seed-create.ts

@@ -0,0 +1,189 @@
+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
+  }
+}

package/src/commands/seed-load.ts

@@ -1,128 +1,155 @@
-import pc from 'picocolors'
-import {
-  SEED_REGISTRY,
-  generateCreateTable,
-  generateDraftTable,
-  generateIndexes,
-  generateFtsTable,
-  generateFtsTriggers,
-  type Seed,
-} from '@beechcms/core'
-import { executeD1File, findWranglerConfig, resolveDbName, type WranglerOptions } from '../lib/wrangler.js'
-import { diffSeed } from '../lib/schema-diff.js'
-
-export interface SeedLoadOptions {
-  dryRun: boolean
-  diff: boolean
-  local: boolean
-  db?: string
-  registry?: Record<string, Seed> | null
-}
-
-function buildStatements(seed: Seed): string[] {
-  const stmts: string[] = [generateCreateTable(seed), ...generateIndexes(seed)]
-
-  const draft = generateDraftTable(seed)
-  if (draft) stmts.push(draft)
-
-  const fts = generateFtsTable(seed)
-  if (fts) {
-    stmts.push(fts, ...generateFtsTriggers(seed))
-  }
-
-  return stmts
-}
-
-async function runDiff(options: WranglerOptions, registry: Record<string, Seed>): Promise<void> {
-  const seeds = Object.values(registry)
-  console.log(pc.cyan('\n  Diffing schema…\n'))
-
-  let allOk = true
-  for (const seed of seeds) {
-    const result = await diffSeed(seed, options)
-    const tableName = `content_${seed.slug}`
-
-    if (!result.tableExists) {
-      console.log(pc.red(`  ✗ ${tableName} — table missing`))
-      allOk = false
-      continue
-    }
-
-    const problems = result.columns.filter(c => c.status !== 'ok')
-    if (problems.length === 0) {
-      console.log(pc.green(`  ✓ ${tableName}`))
-      continue
-    }
-
-    allOk = false
-    console.log(pc.yellow(`  ⚠ ${tableName}`))
-    for (const col of problems) {
-      if (col.status === 'missing') {
-        console.log(pc.red(`    + missing column: ${col.name} ${col.expectedType}`))
-      } else if (col.status === 'extra') {
-        console.log(pc.dim(`    ~ extra column:   ${col.name} ${col.actualType}`))
-      } else if (col.status === 'type_mismatch') {
-        console.log(pc.red(`    ≠ type mismatch:  ${col.name} (expected ${col.expectedType}, got ${col.actualType})`))
-      }
-    }
-  }
-
-  console.log('')
-  if (allOk) {
-    console.log(pc.green('  Schema matches seeds. No action needed.\n'))
-  } else {
-    console.log(pc.yellow('  Run `beech seed:load` to apply missing tables/columns.\n'))
-  }
-}
-
-async function runLoad(options: WranglerOptions, dryRun: boolean, registry: Record<string, Seed>): Promise<void> {
-  const seeds = Object.values(registry)
-
-  if (dryRun) {
-    console.log(pc.cyan('\n  -- dry-run: SQL that would be executed\n'))
-    for (const seed of seeds) {
-      const stmts = buildStatements(seed)
-      console.log(pc.dim(`  -- content_${seed.slug}`))
-      for (const stmt of stmts) {
-        console.log(stmt + '\n')
-      }
-    }
-    return
-  }
-
-  console.log(pc.cyan(`\n  Loading seeds into ${options.local ? 'local' : 'remote'} D1 (${options.db})…\n`))
-
-  for (const seed of seeds) {
-    const stmts = buildStatements(seed)
-    const sql = stmts.join('\n\n') + '\n'
-    process.stdout.write(`  ${pc.dim('→')} content_${seed.slug}… `)
-    executeD1File(sql, options)
-    console.log(pc.green('done'))
-  }
-
-  console.log(pc.green('\n  All seeds loaded.\n'))
-}
-
-export async function seedLoad(args: SeedLoadOptions): Promise<void> {
-  const registry = args.registry ?? SEED_REGISTRY
-
-  if (Object.keys(registry).length === 0) {
-    console.warn(pc.yellow('\n  Warning: SEED_REGISTRY is empty. Create a seeds.ts in your project root.\n'))
-    return
-  }
-
-  const configPath = findWranglerConfig()
-  const db = args.db ?? resolveDbName(configPath)
-
-  const options: WranglerOptions = {
-    db,
-    local: args.local,
-    configPath,
-  }
-
-  if (args.diff) {
-    await runDiff(options, registry)
-  } else {
-    await runLoad(options, args.dryRun, registry)
-  }
-}
+import pc from 'picocolors'
+import {
+  SEED_REGISTRY,
+  generateCreateTable,
+  generateDraftTable,
+  generateIndexes,
+  generateFtsTable,
+  generateFtsTriggers,
+  type Seed,
+} from '@beechcms/core'
+import { executeD1File, findWranglerConfig, resolveDbName, type WranglerOptions } from '../lib/wrangler.js'
+import { diffSeed } from '../lib/schema-diff.js'
+import { validateSeeds } from './validate.js'
+
+export interface SeedLoadOptions {
+  dryRun: boolean
+  diff: boolean
+  local: boolean
+  db?: string
+  registry?: Record<string, Seed> | null
+}
+
+function buildStatements(seed: Seed): string[] {
+  const stmts: string[] = [generateCreateTable(seed), ...generateIndexes(seed)]
+
+  const draft = generateDraftTable(seed)
+  if (draft) stmts.push(draft)
+
+  const fts = generateFtsTable(seed)
+  if (fts) {
+    stmts.push(fts, ...generateFtsTriggers(seed))
+  }
+
+  return stmts
+}
+
+async function runDiff(options: WranglerOptions, registry: Record<string, Seed>): Promise<void> {
+  const seeds = Object.values(registry)
+  console.log(pc.cyan('\n  Diffing schema…\n'))
+
+  let allOk = true
+  for (const seed of seeds) {
+    const result = await diffSeed(seed, options)
+    const tableName = `content_${seed.slug}`
+
+    if (!result.tableExists) {
+      console.log(pc.red(`  ✗ ${tableName} — table missing`))
+      allOk = false
+      continue
+    }
+
+    const problems = result.columns.filter(c => c.status !== 'ok')
+    if (problems.length === 0) {
+      console.log(pc.green(`  ✓ ${tableName}`))
+      continue
+    }
+
+    allOk = false
+    console.log(pc.yellow(`  ⚠ ${tableName}`))
+    for (const col of problems) {
+      if (col.status === 'missing') {
+        console.log(pc.red(`    + missing column: ${col.name} ${col.expectedType}`))
+      } else if (col.status === 'extra') {
+        console.log(pc.dim(`    ~ orphaned column: "${col.name}" (${col.actualType}) — exists in DB but not in seeds.ts`))
+      } else if (col.status === 'type_mismatch') {
+        console.log(pc.red(`    ≠ type mismatch:  ${col.name} (expected ${col.expectedType}, got ${col.actualType})`))
+      }
+    }
+  }
+
+  console.log('')
+  if (allOk) {
+    console.log(pc.green('  Schema matches seeds. No action needed.\n'))
+  } else {
+    console.log(pc.yellow('  Run `beech seed:load` to apply missing tables/columns.\n'))
+  }
+}
+
+async function runLoad(options: WranglerOptions, dryRun: boolean, registry: Record<string, Seed>): Promise<void> {
+  const seeds = Object.values(registry)
+
+  if (dryRun) {
+    console.log(pc.cyan('\n  -- dry-run: SQL that would be executed\n'))
+    for (const seed of seeds) {
+      const stmts = buildStatements(seed)
+      console.log(pc.dim(`  -- content_${seed.slug}`))
+      for (const stmt of stmts) {
+        console.log(stmt + '\n')
+      }
+    }
+    return
+  }
+
+  console.log(pc.cyan(`\n  Loading seeds into ${options.local ? 'local' : 'remote'} D1 (${options.db})…\n`))
+
+  for (const seed of seeds) {
+    const stmts = buildStatements(seed)
+    const sql = stmts.join('\n\n') + '\n'
+    process.stdout.write(`  ${pc.dim('→')} content_${seed.slug}… `)
+    const ok = executeD1File(sql, options)
+    if (!ok) {
+      console.log(pc.red('failed'))
+      console.log(pc.red(`\n  ✗ Failed to apply schema for content_${seed.slug}\n`))
+      console.log(pc.dim('  wrangler reported an error above.'))
+      console.log(pc.dim(`  Most likely causes:`))
+      console.log(pc.dim(`    - Database "${options.db}" not found or wrong database_id`))
+      if (!options.local) {
+        console.log(pc.dim('    - Not logged in to Cloudflare'))
+        console.log(pc.cyan('\n  → Run:  npx wrangler login'))
+        console.log(pc.cyan('  → Then: npx beech seed:load\n'))
+      } else {
+        console.log(pc.cyan('\n  → Run:  npx beech init --db --local   # re-initialise local DB'))
+        console.log(pc.cyan('  → Then: npx beech seed:load --local\n'))
+      }
+      process.exit(1)
+    }
+    console.log(pc.green('done'))
+  }
+
+  console.log(pc.green('\n  All seeds loaded.\n'))
+}
+
+export async function seedLoad(args: SeedLoadOptions): Promise<void> {
+  const registry = args.registry ?? SEED_REGISTRY
+
+  if (Object.keys(registry).length === 0) {
+    console.log(pc.yellow('\n  ✗ No seeds found\n'))
+    console.log(pc.dim('  Create a seeds.ts file in your project root with at least one content type.'))
+    console.log(pc.cyan('\n  → Run: npx beech seed:create\n'))
+    return
+  }
+
+  const validationErrors = validateSeeds(registry)
+  if (validationErrors.length > 0) {
+    const total = validationErrors.reduce((n, e) => n + e.messages.length, 0)
+    const s = total !== 1 ? 's' : ''
+    console.log(pc.yellow(`\n  ⚠ Seed validation found ${total} issue${s}. Schema changes will still be applied.\n`))
+    console.log(pc.dim('  Run "npx beech validate" for details.\n'))
+  }
+
+  const configPath = findWranglerConfig()
+  const db = args.db ?? resolveDbName(configPath)
+
+  const options: WranglerOptions = {
+    db,
+    local: args.local,
+    configPath,
+  }
+
+  if (args.diff) {
+    await runDiff(options, registry)
+  } else {
+    await runLoad(options, args.dryRun, registry)
+  }
+}

package/src/commands/update.ts

@@ -0,0 +1,51 @@
+import pc from 'picocolors'
+import { spawnSync } from 'node:child_process'
+
+export interface UpdateOptions {}
+
+export async function update(_args: UpdateOptions): Promise<void> {
+  console.log(pc.cyan('\n  beech update\n'))
+
+  // Step 1 — install latest BeechCMS packages
+  console.log(pc.dim('  [1/2] Installing latest BeechCMS packages…\n'))
+  const installResult = spawnSync(
+    'npm',
+    ['install', '@beechcms/api@latest', '@beechcms/core@latest'],
+    { stdio: 'inherit', cwd: process.cwd(), shell: true }
+  )
+
+  if (installResult.status !== 0) {
+    console.log(pc.red('\n  ✗ npm install failed\n'))
+    console.log(pc.dim('  Check the output above for details.'))
+    console.log(pc.dim('  You may need to resolve version conflicts manually.'))
+    console.log(pc.cyan('\n  → Try: npm install --legacy-peer-deps\n'))
+    process.exit(1)
+  }
+
+  console.log(pc.green('\n  ✓ Packages updated'))
+
+  // Step 2 — apply any new system migrations to local DB
+  console.log(pc.dim('\n  [2/2] Applying system migrations to local database…\n'))
+  const initResult = spawnSync(
+    'npx',
+    ['beech', 'init', '--db', '--local'],
+    { stdio: 'inherit', cwd: process.cwd(), shell: true }
+  )
+
+  if (initResult.status !== 0) {
+    console.log(pc.yellow('\n  ⚠ Local DB update failed\n'))
+    console.log(pc.dim('  Apply system migrations manually:'))
+    console.log(pc.cyan('  → Run: npx beech init --db --local\n'))
+  } else {
+    console.log(pc.green('\n  ✓ Local database updated'))
+  }
+
+  console.log(pc.dim('\n  Local update complete.\n'))
+  console.log(pc.dim('  Next steps:'))
+  console.log(pc.cyan('  1. npx beech seed:load --local'))
+  console.log(pc.dim('      → sync content schema to local DB'))
+  console.log(pc.cyan('  2. npm run deploy'))
+  console.log(pc.dim('      → deploy updated API + dashboard'))
+  console.log(pc.cyan('  3. npx beech seed:load'))
+  console.log(pc.dim('      → sync remote schema\n'))
+}

package/src/commands/validate.ts

@@ -0,0 +1,83 @@
+import pc from 'picocolors'
+import type { Seed } from '@beechcms/core'
+import { SEED_REGISTRY } from '@beechcms/core'
+
+export interface ValidateOptions {
+  registry?: Record<string, Seed> | null
+}
+
+export interface SeedValidationError {
+  slug: string
+  messages: string[]
+}
+
+export function validateSeeds(registry: Record<string, Seed>): SeedValidationError[] {
+  const result: SeedValidationError[] = []
+  const slugsSeen = new Set<string>()
+
+  for (const seed of Object.values(registry)) {
+    const messages: string[] = []
+
+    if (slugsSeen.has(seed.slug)) {
+      messages.push(`duplicate slug "${seed.slug}" — each seed must have a unique slug`)
+    }
+    slugsSeen.add(seed.slug)
+
+    const aliasesSeen = new Set<string>()
+    for (const branch of seed.branches) {
+      if (aliasesSeen.has(branch.alias)) {
+        messages.push(`duplicate branch alias "${branch.alias}"`)
+      }
+      aliasesSeen.add(branch.alias)
+    }
+
+    const allAliases = new Set(seed.branches.map(b => b.alias))
+    if (!allAliases.has(seed.displayNameAlias)) {
+      messages.push(`displayNameAlias "${seed.displayNameAlias}" not found in branches`)
+    }
+
+    if (messages.length > 0) {
+      result.push({ slug: seed.slug, messages })
+    }
+  }
+
+  return result
+}
+
+export async function validate(args: ValidateOptions): Promise<void> {
+  const registry = args.registry ?? SEED_REGISTRY
+
+  if (Object.keys(registry).length === 0) {
+    console.warn(pc.yellow('\n  Warning: SEED_REGISTRY is empty. Create a seeds.ts in your project root.\n'))
+    return
+  }
+
+  console.log(pc.cyan('\n  beech validate — checking seeds\n'))
+
+  const errors = validateSeeds(registry)
+  const errorMap = new Map(errors.map(e => [e.slug, e.messages]))
+
+  let totalIssues = 0
+  for (const seed of Object.values(registry)) {
+    const msgs = errorMap.get(seed.slug)
+    if (!msgs) {
+      console.log(pc.green(`  ✓ ${seed.slug}`))
+    } else {
+      totalIssues += msgs.length
+      console.log(pc.red(`  ✗ ${seed.slug}`))
+      for (const msg of msgs) {
+        console.log(pc.red(`      → ${msg}`))
+      }
+    }
+  }
+
+  console.log('')
+
+  if (totalIssues > 0) {
+    const s = totalIssues !== 1 ? 's' : ''
+    console.log(pc.red(`  Found ${totalIssues} issue${s}. Fix the seeds above before loading.\n`))
+    process.exit(1)
+  } else {
+    console.log(pc.green('  All seeds valid.\n'))
+  }
+}

package/src/index.ts

@@ -1,2 +1,12 @@
-export { seedLoad } from './commands/seed-load.js'
-export type { SeedLoadOptions } from './commands/seed-load.js'
+export { seedLoad } from './commands/seed-load.js'
+export type { SeedLoadOptions } from './commands/seed-load.js'
+export { init } from './commands/init.js'
+export type { InitOptions } from './commands/init.js'
+export { validate, validateSeeds } from './commands/validate.js'
+export type { ValidateOptions, SeedValidationError } from './commands/validate.js'
+export { seedCreate } from './commands/seed-create.js'
+export type { SeedCreateOptions } from './commands/seed-create.js'
+export { deploy } from './commands/deploy.js'
+export type { DeployOptions } from './commands/deploy.js'
+export { update } from './commands/update.js'
+export type { UpdateOptions } from './commands/update.js'