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

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/index.js

@@ -1248,10 +1248,147 @@ async function update(_args) {
   console.log(pc7.cyan("  3. npx beech seed:load"));
   console.log(pc7.dim("      \u2192 sync remote schema\n"));
 }
+
+// src/commands/reset.ts
+import pc8 from "picocolors";
+import { spawnSync as spawnSync5 } from "node:child_process";
+import { existsSync as existsSync4, readFileSync as readFileSync5, rmSync as rmSync2 } from "node:fs";
+import { resolve as resolve4 } from "node:path";
+import { createInterface as createInterface3 } from "node:readline/promises";
+function isDockerInstalled() {
+  try {
+    const result = spawnSync5("docker", ["--version"], { stdio: "ignore", shell: true });
+    return result.status === 0;
+  } catch {
+    return false;
+  }
+}
+function isDockerRunning() {
+  try {
+    const result = spawnSync5("docker", ["info"], { stdio: "ignore", shell: true });
+    return result.status === 0;
+  } catch {
+    return false;
+  }
+}
+async function reset(args) {
+  console.log(pc8.cyan("\n  beech reset \u2014 cleanup environments\n"));
+  let resetDb = args.db || args.all;
+  let resetDocker = args.docker || args.all;
+  if (!args.db && !args.docker && !args.all) {
+    if (process.stdin.isTTY) {
+      const rl = createInterface3({ input: process.stdin, output: process.stdout });
+      try {
+        const answer = (await rl.question(
+          pc8.cyan("  \u2192 No options provided. Would you like to reset everything (DB & Docker)? (y/N): ")
+        )).trim().toLowerCase();
+        if (answer === "y" || answer === "yes") {
+          resetDb = true;
+          resetDocker = true;
+        } else {
+          console.log(pc8.dim("\n  Reset cancelled. Use --db, --docker, or --all.\n"));
+          return;
+        }
+      } finally {
+        rl.close();
+      }
+    } else {
+      console.log(pc8.red("\n  \u2717 Error: Please specify what to reset using --db, --docker, or --all.\n"));
+      process.exit(1);
+    }
+  }
+  const cwd = process.cwd();
+  if (resetDocker) {
+    if (!isDockerInstalled()) {
+      console.log(pc8.red("  \u2717 Docker is not installed or not found in your PATH."));
+      console.log(pc8.dim("    Please install Docker to reset Docker containers and volumes.\n"));
+      if (!args.all) {
+        process.exit(1);
+      }
+    } else if (!isDockerRunning()) {
+      console.log(pc8.yellow("  \u26A0 Docker is installed, but the Docker daemon is NOT running."));
+      console.log(pc8.dim("    Please start Docker Desktop or your Docker daemon to reset containers.\n"));
+      if (!args.all) {
+        process.exit(1);
+      }
+    } else {
+      console.log(pc8.dim("  Resetting Docker containers and volumes\u2026\n"));
+      const result = spawnSync5("docker", ["compose", "down", "-v"], {
+        stdio: "inherit",
+        cwd,
+        shell: true
+      });
+      if (result.status === 0) {
+        console.log(pc8.green("\n  \u2713 Docker containers stopped and volumes removed."));
+      } else {
+        console.log(pc8.red("\n  \u2717 Docker reset failed."));
+      }
+    }
+  }
+  if (resetDb) {
+    console.log(pc8.dim("\n  Resetting local database\u2026\n"));
+    let dbResetSuccess = false;
+    const apiDir = resolve4(cwd, "apps", "api");
+    if (existsSync4(resolve4(apiDir, "package.json"))) {
+      const result = spawnSync5("npm", ["run", "db:reset:local"], {
+        stdio: "inherit",
+        cwd: apiDir,
+        shell: true
+      });
+      dbResetSuccess = result.status === 0;
+    } else if (existsSync4(resolve4(cwd, "package.json"))) {
+      const pkg = JSON.parse(readFileSync5(resolve4(cwd, "package.json"), "utf-8"));
+      if (pkg.scripts?.["db:reset:local"]) {
+        const result = spawnSync5("npm", ["run", "db:reset:local"], {
+          stdio: "inherit",
+          cwd,
+          shell: true
+        });
+        dbResetSuccess = result.status === 0;
+      } else {
+        const wranglerStateDir = resolve4(cwd, ".wrangler/state");
+        if (existsSync4(wranglerStateDir)) {
+          console.log(pc8.dim("  Removing .wrangler/state\u2026"));
+          rmSync2(wranglerStateDir, { recursive: true, force: true });
+        }
+        if (existsSync4(resolve4(cwd, "scripts", "bootstrap-d1.mjs"))) {
+          const result = spawnSync5("node", ["scripts/bootstrap-d1.mjs"], {
+            stdio: "inherit",
+            cwd,
+            shell: true
+          });
+          dbResetSuccess = result.status === 0;
+        } else {
+          console.log(pc8.yellow("  \u26A0 Could not find database reset script."));
+          const initResult = spawnSync5("npx", ["beech", "init", "--db", "--local"], {
+            stdio: "inherit",
+            cwd,
+            shell: true
+          });
+          dbResetSuccess = initResult.status === 0;
+        }
+      }
+    } else {
+      const wranglerStateDir = resolve4(cwd, ".wrangler/state");
+      if (existsSync4(wranglerStateDir)) {
+        console.log(pc8.dim("  Removing .wrangler/state\u2026"));
+        rmSync2(wranglerStateDir, { recursive: true, force: true });
+      }
+      dbResetSuccess = true;
+    }
+    if (dbResetSuccess) {
+      console.log(pc8.green("\n  \u2713 Local database reset completed."));
+    } else {
+      console.log(pc8.red("\n  \u2717 Database reset failed."));
+    }
+  }
+  console.log(pc8.dim("\n  Reset process finished.\n"));
+}
 export {
   deploy,
   init,
   onboard,
+  reset,
   seedCreate,
   seedLoad,
   update,

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,25 +1,25 @@
 {
   "name": "@beechcms/cli",
-  "version": "0.6.0-preview.1",
+  "version": "0.6.0-preview.3",
   "type": "module",
   "main": "dist/index.js",
   "exports": {
     ".": "./dist/index.js"
   },
-  "scripts": {
-    "build": "tsc --noEmit && esbuild src/index.ts --bundle --packages=external --platform=node --format=esm --outfile=dist/index.js",
-    "dev": "esbuild src/index.ts --bundle --packages=external --platform=node --format=esm --outfile=dist/index.js --watch",
-    "test": "vitest run",
-    "test:coverage": "vitest run --coverage"
-  },
   "dependencies": {
-    "@beechcms/core": "^0.6.0-preview.1",
+    "@beechcms/core": "^0.6.0-preview.3",
     "picocolors": "^1.1.1"
   },
   "devDependencies": {
-    "esbuild": "^0.27.3",
+    "esbuild": "^0.28.1",
     "typescript": "^5.9.3",
     "vitest": "^4.1.0"
   },
-  "license": "MIT"
-}
+  "license": "MIT",
+  "scripts": {
+    "build": "tsc --noEmit && esbuild src/index.ts --bundle --packages=external --platform=node --format=esm --outfile=dist/index.js",
+    "dev": "esbuild src/index.ts --bundle --packages=external --platform=node --format=esm --outfile=dist/index.js --watch",
+    "test": "vitest run",
+    "test:coverage": "vitest run --coverage"
+  }
+}