@beechcms/cli 0.6.0-preview.1 → 0.6.0-preview.2

package/dist/commands/seed-load.js

@@ -0,0 +1,89 @@
+import pc from 'picocolors';
+import { SEED_REGISTRY, generateCreateTable, generateIndexes, generateFtsTable, generateFtsTriggers, } from '@beech/core';
+import { executeD1File, findWranglerConfig, resolveDbName } from '../lib/wrangler.js';
+import { diffSeed } from '../lib/schema-diff.js';
+function buildStatements(seed) {
+    const stmts = [generateCreateTable(seed), ...generateIndexes(seed)];
+    const fts = generateFtsTable(seed);
+    if (fts) {
+        stmts.push(fts, ...generateFtsTriggers(seed));
+    }
+    return stmts;
+}
+async function runDiff(options) {
+    const seeds = Object.values(SEED_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, dryRun) {
+    const seeds = Object.values(SEED_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) {
+    const configPath = findWranglerConfig();
+    const db = args.db ?? resolveDbName(configPath);
+    const options = {
+        db,
+        local: args.local,
+        configPath,
+    };
+    if (args.diff) {
+        await runDiff(options);
+    }
+    else {
+        await runLoad(options, args.dryRun);
+    }
+}

package/dist/index.d.ts

@@ -0,0 +1,3 @@
+export { seedLoad } from './commands/seed-load.js';
+export type { SeedLoadOptions } from './commands/seed-load.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAClD,YAAY,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA"}

package/dist/lib/schema-diff.d.ts

@@ -0,0 +1,15 @@
+import type { Seed } from '@beech/core';
+import type { WranglerOptions } from './wrangler.js';
+export interface ColumnDiff {
+    name: string;
+    status: 'ok' | 'missing' | 'extra' | 'type_mismatch';
+    expectedType?: string;
+    actualType?: string;
+}
+export interface SeedDiff {
+    slug: string;
+    tableExists: boolean;
+    columns: ColumnDiff[];
+}
+export declare function diffSeed(seed: Seed, options: WranglerOptions): Promise<SeedDiff>;
+//# sourceMappingURL=schema-diff.d.ts.map

package/dist/lib/schema-diff.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema-diff.d.ts","sourceRoot":"","sources":["../../src/lib/schema-diff.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAEvC,OAAO,KAAK,EAAE,eAAe,EAAS,MAAM,eAAe,CAAA;AAU3D,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,IAAI,GAAG,SAAS,GAAG,OAAO,GAAG,eAAe,CAAA;IACpD,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,OAAO,CAAA;IACpB,OAAO,EAAE,UAAU,EAAE,CAAA;CACtB;AAED,wBAAsB,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,QAAQ,CAAC,CAsCtF"}

package/dist/lib/schema-diff.js

@@ -0,0 +1,37 @@
+import { getExpectedColumns } from '@beech/core';
+import { queryD1 } from './wrangler.js';
+export async function diffSeed(seed, options) {
+    const tableName = `content_${seed.slug}`;
+    const expected = getExpectedColumns(seed);
+    let actual;
+    try {
+        actual = queryD1(`PRAGMA table_info(${tableName})`, options);
+    }
+    catch {
+        return { slug: seed.slug, tableExists: false, columns: expected.map(c => ({ name: c.name, status: 'missing', expectedType: c.sqlType })) };
+    }
+    if (actual.length === 0) {
+        return { slug: seed.slug, tableExists: false, columns: expected.map(c => ({ name: c.name, status: 'missing', expectedType: c.sqlType })) };
+    }
+    const actualMap = new Map(actual.map(r => [r.name, r]));
+    const expectedSet = new Set(expected.map(c => c.name));
+    const columns = [];
+    for (const col of expected) {
+        const actual = actualMap.get(col.name);
+        if (!actual) {
+            columns.push({ name: col.name, status: 'missing', expectedType: col.sqlType });
+        }
+        else if (actual.type.toUpperCase() !== col.sqlType) {
+            columns.push({ name: col.name, status: 'type_mismatch', expectedType: col.sqlType, actualType: actual.type });
+        }
+        else {
+            columns.push({ name: col.name, status: 'ok' });
+        }
+    }
+    for (const row of actual) {
+        if (!expectedSet.has(row.name)) {
+            columns.push({ name: row.name, status: 'extra', actualType: row.type });
+        }
+    }
+    return { slug: seed.slug, tableExists: true, columns };
+}

package/dist/lib/wrangler.d.ts

@@ -0,0 +1,17 @@
+export interface WranglerOptions {
+    db: string;
+    local: boolean;
+    configPath: string | null;
+}
+export interface D1Row {
+    [key: string]: unknown;
+}
+/** Esegue SQL da file temporaneo via `wrangler d1 execute --file`. */
+export declare function executeD1File(sql: string, options: WranglerOptions): void;
+/** Esegue una query SQL e ritorna i risultati come array di oggetti (--json). */
+export declare function queryD1<T extends D1Row = D1Row>(sql: string, options: WranglerOptions): T[];
+/** Trova il path di wrangler.jsonc in apps/api/ relativo a cwd. */
+export declare function findWranglerConfig(): string | null;
+/** Risolve il nome del database D1 da wrangler.jsonc (grepping 'database_name'). */
+export declare function resolveDbName(configPath: string | null): string;
+//# sourceMappingURL=wrangler.d.ts.map

package/dist/lib/wrangler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wrangler.d.ts","sourceRoot":"","sources":["../../src/lib/wrangler.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,OAAO,CAAA;IACd,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;CAC1B;AAED,MAAM,WAAW,KAAK;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAgBD,sEAAsE;AACtE,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,IAAI,CAYzE;AAED,iFAAiF;AACjF,wBAAgB,OAAO,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,CAAC,EAAE,CAc3F;AAED,mEAAmE;AACnE,wBAAgB,kBAAkB,IAAI,MAAM,GAAG,IAAI,CAGlD;AAED,oFAAoF;AACpF,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAS/D"}

package/dist/lib/wrangler.js

@@ -0,0 +1,65 @@
+import { execSync, spawnSync } from 'node:child_process';
+import { writeFileSync, rmSync, existsSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join, resolve } from 'node:path';
+function buildArgs(options) {
+    const args = [];
+    if (options.configPath)
+        args.push('--config', options.configPath);
+    if (options.local)
+        args.push('--local');
+    else
+        args.push('--remote');
+    return args;
+}
+/** Esegue SQL da file temporaneo via `wrangler d1 execute --file`. */
+export function executeD1File(sql, options) {
+    const tmpFile = join(tmpdir(), `beech-seed-${Date.now()}.sql`);
+    try {
+        writeFileSync(tmpFile, sql, 'utf-8');
+        const args = ['d1', 'execute', options.db, '--file', tmpFile, ...buildArgs(options)];
+        const result = spawnSync('npx', ['wrangler', ...args], { stdio: 'inherit', cwd: process.cwd() });
+        if (result.status !== 0) {
+            process.exit(result.status ?? 1);
+        }
+    }
+    finally {
+        try {
+            rmSync(tmpFile);
+        }
+        catch { }
+    }
+}
+/** Esegue una query SQL e ritorna i risultati come array di oggetti (--json). */
+export function queryD1(sql, options) {
+    const args = ['d1', 'execute', options.db, '--command', sql, '--json', ...buildArgs(options)];
+    const result = spawnSync('npx', ['wrangler', ...args], { encoding: 'utf-8', cwd: process.cwd() });
+    if (result.status !== 0) {
+        throw new Error(`wrangler d1 execute failed:\n${result.stderr}`);
+    }
+    try {
+        const parsed = JSON.parse(result.stdout);
+        return (parsed[0]?.results ?? []);
+    }
+    catch {
+        throw new Error(`Failed to parse wrangler JSON output:\n${result.stdout}`);
+    }
+}
+/** Trova il path di wrangler.jsonc in apps/api/ relativo a cwd. */
+export function findWranglerConfig() {
+    const candidate = resolve(process.cwd(), 'apps', 'api', 'wrangler.jsonc');
+    return existsSync(candidate) ? candidate : null;
+}
+/** Risolve il nome del database D1 da wrangler.jsonc (grepping 'database_name'). */
+export function resolveDbName(configPath) {
+    if (!configPath)
+        return 'beech-db';
+    try {
+        const content = execSync(`cat "${configPath}"`, { encoding: 'utf-8' });
+        const match = content.match(/"database_name"\s*:\s*"([^"]+)"/);
+        return match?.[1] ?? 'beech-db';
+    }
+    catch {
+        return 'beech-db';
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beechcms/cli",
-  "version": "0.6.0-preview.1",
+  "version": "0.6.0-preview.2",
   "type": "module",
   "main": "dist/index.js",
   "exports": {
@@ -13,7 +13,7 @@
     "test:coverage": "vitest run --coverage"
   },
   "dependencies": {
-    "@beechcms/core": "^0.6.0-preview.1",
+    "@beechcms/core": "^0.6.0-preview.2",
     "picocolors": "^1.1.1"
   },
   "devDependencies": {

package/src/commands/deploy.ts

@@ -1,126 +1,126 @@
-// SPDX-License-Identifier: MIT
-// Copyright (c) 2024–2026 Flavio De Musso
-
-import pc from 'picocolors'
-import { spawnSync } from 'node:child_process'
-import { readFileSync } from 'node:fs'
-import { findWranglerConfig } from '../lib/wrangler.js'
-
-export interface DeployOptions {
-  skipSeed?: boolean
-  skipCheck?: boolean
-}
-
-function readWorkerName(configPath: string | null): string | null {
-  if (!configPath) return null
-  try {
-    const raw = readFileSync(configPath, 'utf-8')
-    const stripped = raw
-      .replace(/\/\/[^\n]*/g, '')
-      .replace(/\/\*[\s\S]*?\*\//g, '')
-    const parsed = JSON.parse(stripped)
-    return (parsed?.name as string) ?? null
-  } catch {
-    return null
-  }
-}
-
-// Extracts the first workers.dev URL from wrangler deploy stdout.
-// wrangler writes progress to stderr (shown live) and the summary to stdout (captured).
-function extractWorkerUrl(output: string): string | null {
-  const match = output.match(/https:\/\/[a-zA-Z0-9-]+\.[a-zA-Z0-9-]+\.workers\.dev\b/)
-  return match?.[0] ?? null
-}
-
-async function checkAdmin(url: string): Promise<{ ok: boolean; status: number | null }> {
-  try {
-    const res = await fetch(`${url}/admin`, {
-      method: 'HEAD',
-      redirect: 'follow',
-      signal: AbortSignal.timeout(12_000),
-    })
-    return { ok: res.status < 500, status: res.status }
-  } catch {
-    return { ok: false, status: null }
-  }
-}
-
-export async function deploy(args: DeployOptions): Promise<void> {
-  console.log(pc.cyan('\n  beech deploy\n'))
-
-  // Step 1: wrangler deploy via npm run deploy.
-  // stdout captured to extract the deployed URL; stderr stays on the terminal for live progress.
-  console.log(pc.dim('  [1/3] Deploying Worker…\n'))
-  const deployResult = spawnSync('npm', ['run', 'deploy'], {
-    stdio: ['inherit', 'pipe', 'inherit'],
-    encoding: 'utf-8',
-    cwd: process.cwd(),
-    shell: true,
-  })
-
-  const deployStdout = deployResult.stdout ?? ''
-  if (deployStdout) process.stdout.write(deployStdout)
-
-  if (deployResult.status !== 0) {
-    console.log(pc.red('\n  ✗ Worker deploy failed\n'))
-    console.log(pc.dim('  Check the wrangler output above for details.'))
-    console.log(pc.cyan('\n  → Run:  npx wrangler login           # if not authenticated'))
-    console.log(pc.cyan('  → Or:   Update wrangler.jsonc        # if database_id is wrong\n'))
-    process.exit(1)
-  }
-
-  const deployedUrl = extractWorkerUrl(deployStdout)
-  console.log(pc.green('\n  ✓ Worker deployed'))
-
-  // Step 2: seed:load --remote as a subprocess so that wrangler failures
-  // (which call process.exit internally) don't abort our own process.
-  if (args.skipSeed) {
-    console.log(pc.dim('\n  [2/3] Skipping seed:load (--skip-seed)'))
-  } else {
-    console.log(pc.dim('\n  [2/3] Syncing content schema to remote D1…\n'))
-    const seedResult = spawnSync('npx', ['beech', 'seed:load'], {
-      stdio: 'inherit',
-      cwd: process.cwd(),
-      shell: true,
-    })
-    if (seedResult.status !== 0) {
-      console.log(pc.yellow('\n  ⚠ seed:load failed\n'))
-      console.log(pc.dim('  Sync the remote content schema manually:'))
-      console.log(pc.cyan('  → Run: npx beech seed:load\n'))
-    } else {
-      console.log(pc.green('\n  ✓ Content schema synced'))
-    }
-  }
-
-  // Step 3: check /admin reachability.
-  // Use URL extracted from deploy output; fall back to worker name from wrangler.jsonc.
-  if (args.skipCheck) {
-    console.log(pc.dim('\n  [3/3] Skipping admin check (--skip-check)\n'))
-    return
-  }
-
-  const adminBase = deployedUrl ?? (() => {
-    const workerName = readWorkerName(findWranglerConfig())
-    // We can't reliably construct the full workers.dev subdomain without knowing the account,
-    // so only use the name-based URL as a fallback when nothing better is available.
-    return workerName ? `https://${workerName}.workers.dev` : null
-  })()
-
-  if (!adminBase) {
-    console.log(pc.dim('\n  [3/3] Could not determine worker URL — skipping admin check\n'))
-    console.log(pc.dim('  The deployed URL is printed by wrangler above. Open <url>/admin to verify.\n'))
-    return
-  }
-
-  console.log(pc.dim(`\n  [3/3] Checking ${adminBase}/admin…\n`))
-  const { ok, status } = await checkAdmin(adminBase)
-
-  if (ok) {
-    console.log(pc.green(`  ✓ Admin reachable at: ${adminBase}/admin\n`))
-  } else {
-    const statusStr = status != null ? ` (HTTP ${status})` : ''
-    console.log(pc.yellow(`  ⚠ Admin returned an error${statusStr} at: ${adminBase}/admin\n`))
-    console.log(pc.dim('  The database may not be fully initialized.'))
-    console.log(pc.cyan('  → Run: npx beech init --db --remote\n'))
-  }
-}
+// SPDX-License-Identifier: MIT
+// Copyright (c) 2024–2026 Flavio De Musso
+
+import pc from 'picocolors'
+import { spawnSync } from 'node:child_process'
+import { readFileSync } from 'node:fs'
+import { findWranglerConfig } from '../lib/wrangler.js'
+
+export interface DeployOptions {
+  skipSeed?: boolean
+  skipCheck?: boolean
+}
+
+function readWorkerName(configPath: string | null): string | null {
+  if (!configPath) return null
+  try {
+    const raw = readFileSync(configPath, 'utf-8')
+    const stripped = raw
+      .replace(/\/\/[^\n]*/g, '')
+      .replace(/\/\*[\s\S]*?\*\//g, '')
+    const parsed = JSON.parse(stripped)
+    return (parsed?.name as string) ?? null
+  } catch {
+    return null
+  }
+}
+
+// Extracts the first workers.dev URL from wrangler deploy stdout.
+// wrangler writes progress to stderr (shown live) and the summary to stdout (captured).
+function extractWorkerUrl(output: string): string | null {
+  const match = output.match(/https:\/\/[a-zA-Z0-9-]+\.[a-zA-Z0-9-]+\.workers\.dev\b/)
+  return match?.[0] ?? null
+}
+
+async function checkAdmin(url: string): Promise<{ ok: boolean; status: number | null }> {
+  try {
+    const res = await fetch(`${url}/admin`, {
+      method: 'HEAD',
+      redirect: 'follow',
+      signal: AbortSignal.timeout(12_000),
+    })
+    return { ok: res.status < 500, status: res.status }
+  } catch {
+    return { ok: false, status: null }
+  }
+}
+
+export async function deploy(args: DeployOptions): Promise<void> {
+  console.log(pc.cyan('\n  beech deploy\n'))
+
+  // Step 1: wrangler deploy via npm run deploy.
+  // stdout captured to extract the deployed URL; stderr stays on the terminal for live progress.
+  console.log(pc.dim('  [1/3] Deploying Worker…\n'))
+  const deployResult = spawnSync('npm', ['run', 'deploy'], {
+    stdio: ['inherit', 'pipe', 'inherit'],
+    encoding: 'utf-8',
+    cwd: process.cwd(),
+    shell: true,
+  })
+
+  const deployStdout = deployResult.stdout ?? ''
+  if (deployStdout) process.stdout.write(deployStdout)
+
+  if (deployResult.status !== 0) {
+    console.log(pc.red('\n  ✗ Worker deploy failed\n'))
+    console.log(pc.dim('  Check the wrangler output above for details.'))
+    console.log(pc.cyan('\n  → Run:  npx wrangler login           # if not authenticated'))
+    console.log(pc.cyan('  → Or:   Update wrangler.jsonc        # if database_id is wrong\n'))
+    process.exit(1)
+  }
+
+  const deployedUrl = extractWorkerUrl(deployStdout)
+  console.log(pc.green('\n  ✓ Worker deployed'))
+
+  // Step 2: seed:load --remote as a subprocess so that wrangler failures
+  // (which call process.exit internally) don't abort our own process.
+  if (args.skipSeed) {
+    console.log(pc.dim('\n  [2/3] Skipping seed:load (--skip-seed)'))
+  } else {
+    console.log(pc.dim('\n  [2/3] Syncing content schema to remote D1…\n'))
+    const seedResult = spawnSync('npx', ['beech', 'seed:load'], {
+      stdio: 'inherit',
+      cwd: process.cwd(),
+      shell: true,
+    })
+    if (seedResult.status !== 0) {
+      console.log(pc.yellow('\n  ⚠ seed:load failed\n'))
+      console.log(pc.dim('  Sync the remote content schema manually:'))
+      console.log(pc.cyan('  → Run: npx beech seed:load\n'))
+    } else {
+      console.log(pc.green('\n  ✓ Content schema synced'))
+    }
+  }
+
+  // Step 3: check /admin reachability.
+  // Use URL extracted from deploy output; fall back to worker name from wrangler.jsonc.
+  if (args.skipCheck) {
+    console.log(pc.dim('\n  [3/3] Skipping admin check (--skip-check)\n'))
+    return
+  }
+
+  const adminBase = deployedUrl ?? (() => {
+    const workerName = readWorkerName(findWranglerConfig())
+    // We can't reliably construct the full workers.dev subdomain without knowing the account,
+    // so only use the name-based URL as a fallback when nothing better is available.
+    return workerName ? `https://${workerName}.workers.dev` : null
+  })()
+
+  if (!adminBase) {
+    console.log(pc.dim('\n  [3/3] Could not determine worker URL — skipping admin check\n'))
+    console.log(pc.dim('  The deployed URL is printed by wrangler above. Open <url>/admin to verify.\n'))
+    return
+  }
+
+  console.log(pc.dim(`\n  [3/3] Checking ${adminBase}/admin…\n`))
+  const { ok, status } = await checkAdmin(adminBase)
+
+  if (ok) {
+    console.log(pc.green(`  ✓ Admin reachable at: ${adminBase}/admin\n`))
+  } else {
+    const statusStr = status != null ? ` (HTTP ${status})` : ''
+    console.log(pc.yellow(`  ⚠ Admin returned an error${statusStr} at: ${adminBase}/admin\n`))
+    console.log(pc.dim('  The database may not be fully initialized.'))
+    console.log(pc.cyan('  → Run: npx beech init --db --remote\n'))
+  }
+}