@beechcms/cli 0.4.0-preview.6 → 0.4.0-preview.7

package/dist/index.js

@@ -26,7 +26,7 @@ function executeD1File(sql, options) {
   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() });
+    const result = spawnSync("npx", ["wrangler", ...args], { stdio: "inherit", cwd: process.cwd(), shell: true });
     if (result.status !== 0) {
       process.exit(result.status ?? 1);
     }
@@ -39,7 +39,7 @@ function executeD1File(sql, options) {
 }
 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() });
+  const result = spawnSync("npx", ["wrangler", ...args], { encoding: "utf-8", cwd: process.cwd(), shell: true });
   if (result.status !== 0) {
     throw new Error(`wrangler d1 execute failed:
 ${result.stderr}`);
@@ -53,20 +53,30 @@ ${result.stdout}`);
   }
 }
 function findWranglerConfig() {
-  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;
+  let dir = process.cwd();
+  while (true) {
+    for (const name of ["wrangler.jsonc", "wrangler.json"]) {
+      const p = resolve(dir, name);
+      if (existsSync(p)) return p;
+    }
+    for (const name of ["wrangler.jsonc", "wrangler.json"]) {
+      const p = resolve(dir, "apps", "api", name);
+      if (existsSync(p)) return p;
+    }
+    const parent = resolve(dir, "..");
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return null;
 }
 function resolveDbName(configPath) {
   if (!configPath) return "beech-db";
   try {
-    const content = readFileSync(configPath, "utf-8");
-    const match = content.match(/"database_name"\s*:\s*"([^"]+)"/);
-    return match?.[1] ?? "beech-db";
+    const raw = readFileSync(configPath, "utf-8");
+    const stripped = raw.replace(/\/\/[^\n]*/g, "").replace(/\/\*[\s\S]*?\*\//g, "");
+    const parsed = JSON.parse(stripped);
+    const bindings = parsed?.d1_databases ?? [];
+    return bindings[0]?.database_name ?? "beech-db";
   } catch {
     return "beech-db";
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beechcms/cli",
-  "version": "0.4.0-preview.6",
+  "version": "0.4.0-preview.7",
   "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.6",
+    "@beechcms/core": "^0.4.0-preview.7",
     "picocolors": "^1.1.1"
   },
   "devDependencies": {