@beechcms/cli 0.4.0-preview.2 → 0.4.0-preview.3

package/dist/index.js

@@ -10,8 +10,8 @@ import {
 } from "@beechcms/core";
 
 // src/lib/wrangler.ts
-import { execSync, spawnSync } from "node:child_process";
-import { writeFileSync, rmSync, existsSync } from "node:fs";
+import { spawnSync } from "node:child_process";
+import { writeFileSync, rmSync, existsSync, readFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join, resolve } from "node:path";
 function buildArgs(options) {
@@ -53,13 +53,18 @@ ${result.stdout}`);
   }
 }
 function findWranglerConfig() {
-  const candidate = resolve(process.cwd(), "apps", "api", "wrangler.jsonc");
-  return existsSync(candidate) ? candidate : null;
+  const candidates = [
+    resolve(process.cwd(), "wrangler.jsonc"),
+    resolve(process.cwd(), "wrangler.json"),
+    resolve(process.cwd(), "apps", "api", "wrangler.jsonc"),
+    resolve(process.cwd(), "apps", "api", "wrangler.json")
+  ];
+  return candidates.find(existsSync) ?? null;
 }
 function resolveDbName(configPath) {
   if (!configPath) return "beech-db";
   try {
-    const content = execSync(`cat "${configPath}"`, { encoding: "utf-8" });
+    const content = readFileSync(configPath, "utf-8");
     const match = content.match(/"database_name"\s*:\s*"([^"]+)"/);
     return match?.[1] ?? "beech-db";
   } catch {
@@ -113,8 +118,8 @@ function buildStatements(seed) {
   }
   return stmts;
 }
-async function runDiff(options) {
-  const seeds = Object.values(SEED_REGISTRY);
+async function runDiff(options, registry) {
+  const seeds = Object.values(registry);
   console.log(pc.cyan("\n  Diffing schema\u2026\n"));
   let allOk = true;
   for (const seed of seeds) {
@@ -149,8 +154,8 @@ async function runDiff(options) {
     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);
+async function runLoad(options, dryRun, registry) {
+  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) {
@@ -175,6 +180,11 @@ async function runLoad(options, dryRun) {
   console.log(pc.green("\n  All seeds loaded.\n"));
 }
 async function seedLoad(args) {
+  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 = {
@@ -183,9 +193,9 @@ async function seedLoad(args) {
     configPath
   };
   if (args.diff) {
-    await runDiff(options);
+    await runDiff(options, registry);
   } else {
-    await runLoad(options, args.dryRun);
+    await runLoad(options, args.dryRun, registry);
   }
 }
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beechcms/cli",
-  "version": "0.4.0-preview.2",
+  "version": "0.4.0-preview.3",
   "type": "module",
   "main": "dist/index.js",
   "exports": {
@@ -11,7 +11,7 @@
     "dev": "esbuild src/index.ts --bundle --packages=external --platform=node --format=esm --outfile=dist/index.js --watch"
   },
   "dependencies": {
-    "@beechcms/core": "^0.4.0-preview.2",
+    "@beechcms/core": "^0.4.0-preview.3",
     "picocolors": "^1.1.1"
   },
   "devDependencies": {

package/src/commands/seed-load.ts

@@ -16,6 +16,7 @@ export interface SeedLoadOptions {
   diff: boolean
   local: boolean
   db?: string
+  registry?: Record<string, Seed> | null
 }
 
 function buildStatements(seed: Seed): string[] {
@@ -32,8 +33,8 @@ function buildStatements(seed: Seed): string[] {
   return stmts
 }
 
-async function runDiff(options: WranglerOptions): Promise<void> {
-  const seeds = Object.values(SEED_REGISTRY)
+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
@@ -74,8 +75,8 @@ async function runDiff(options: WranglerOptions): Promise<void> {
   }
 }
 
-async function runLoad(options: WranglerOptions, dryRun: boolean): Promise<void> {
-  const seeds = Object.values(SEED_REGISTRY)
+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'))
@@ -103,6 +104,13 @@ async function runLoad(options: WranglerOptions, dryRun: boolean): Promise<void>
 }
 
 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)
 
@@ -113,8 +121,8 @@ export async function seedLoad(args: SeedLoadOptions): Promise<void> {
   }
 
   if (args.diff) {
-    await runDiff(options)
+    await runDiff(options, registry)
   } else {
-    await runLoad(options, args.dryRun)
+    await runLoad(options, args.dryRun, registry)
   }
 }

package/src/lib/wrangler.ts

@@ -1,5 +1,5 @@
-import { execSync, spawnSync } from 'node:child_process'
-import { writeFileSync, rmSync, existsSync } from 'node:fs'
+import { spawnSync } from 'node:child_process'
+import { writeFileSync, rmSync, existsSync, readFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join, resolve } from 'node:path'
 
@@ -59,17 +59,22 @@ export function queryD1<T extends D1Row = D1Row>(sql: string, options: WranglerO
   }
 }
 
-/** Trova il path di wrangler.jsonc in apps/api/ relativo a cwd. */
+/** Trova il path di wrangler.jsonc — prima in CWD (user project), poi in apps/api/ (monorepo). */
 export function findWranglerConfig(): string | null {
-  const candidate = resolve(process.cwd(), 'apps', 'api', 'wrangler.jsonc')
-  return existsSync(candidate) ? candidate : null
+  const candidates = [
+    resolve(process.cwd(), 'wrangler.jsonc'),
+    resolve(process.cwd(), 'wrangler.json'),
+    resolve(process.cwd(), 'apps', 'api', 'wrangler.jsonc'),
+    resolve(process.cwd(), 'apps', 'api', 'wrangler.json'),
+  ]
+  return candidates.find(existsSync) ?? null
 }
 
-/** Risolve il nome del database D1 da wrangler.jsonc (grepping 'database_name'). */
+/** Risolve il nome del database D1 da wrangler.jsonc (cerca 'database_name'). */
 export function resolveDbName(configPath: string | null): string {
   if (!configPath) return 'beech-db'
   try {
-    const content = execSync(`cat "${configPath}"`, { encoding: 'utf-8' })
+    const content = readFileSync(configPath, 'utf-8')
     const match = content.match(/"database_name"\s*:\s*"([^"]+)"/)
     return match?.[1] ?? 'beech-db'
   } catch {