@brightsideoy/kama 0.1.0-alpha.17 → 0.1.0-alpha.22

package/bin/cli.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import { execSync } from 'node:child_process';
 import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import * as readline from 'node:readline/promises';
@@ -35,10 +36,54 @@ async function createFullWorkspace() {
     const siteDomain = (await rl.question('First Website Domain (e.g., www.example.com): ')) || 'www.example.com';
 
     const rootDir = join(process.cwd(), projName);
+    const dbName = `${projName}-db`.replace(/[^a-zA-Z0-9_-]/g, '_'); // safe DB name
 
     console.log(`\n📁 Creating workspace folder at ./${projName}...`);
     mkdirSync(rootDir, { recursive: true });
 
+    // --- AUTO D1 CREATION MAGIC ---
+    let d1DatabaseId = 'REPLACE_WITH_YOUR_D1_ID';
+    let isAuthenticated = false;
+
+    console.log(`\n🔑 Checking Cloudflare authentication...`);
+    try {
+        execSync('npx wrangler whoami', { stdio: 'pipe' });
+        isAuthenticated = true;
+        console.log(`✅ Logged in to Cloudflare.`);
+    } catch (error) {
+        console.log(`⚠️ You are not logged in to Cloudflare.`);
+        console.log(`🌐 Launching browser for Cloudflare login...`);
+        try {
+            execSync('npx wrangler login', { stdio: 'inherit' });
+            isAuthenticated = true;
+            console.log(`✅ Successfully logged in!`);
+        } catch (loginError) {
+            console.log(`❌ Login failed or was cancelled.`);
+        }
+    }
+
+    if (isAuthenticated) {
+        console.log(`\n🗄️ Attempting to auto-create Cloudflare D1 Database '${dbName}'...`);
+        try {
+            const d1Output = execSync(`npx wrangler d1 create ${dbName}`, { encoding: 'utf-8', stdio: 'pipe' });
+
+            const uuidRegex = /[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/;
+            const match = d1Output.match(uuidRegex);
+
+            if (match) {
+                d1DatabaseId = match[0];
+                console.log(`✅ Success! Database ID bound: ${d1DatabaseId}`);
+            } else {
+                console.log(`⚠️ Could not parse the database ID from Wrangler. You may need to update wrangler.json manually.`);
+            }
+        } catch (error) {
+            console.log(`⚠️ Auto-creation failed. We'll leave a placeholder.`);
+        }
+    } else {
+        console.log(`⚠️ Skipping database creation. We'll leave a placeholder in wrangler.json.`);
+    }
+    // ------------------------------
+
     // 1. Root package.json
     writeFileSync(
         join(rootDir, 'package.json'),
@@ -66,8 +111,12 @@ async function createFullWorkspace() {
             type: 'module',
             version: '1.0.0',
             scripts: {
-                dev: 'wrangler dev',
-                deploy: 'wrangler deploy',
+                "build-schema": "tsx node_modules/@brightsideoy/kama/scripts/build-schema.ts",
+                "bundle-schemas": "node node_modules/@brightsideoy/kama/scripts/bundle-definitions.js",
+                "schema:local": `npm run build-schema && wrangler d1 execute ${dbName} --local --file=./schema.sql`,
+                "schema:remote": `npm run build-schema && wrangler d1 execute ${dbName} --remote --file=./schema.sql`,
+                "dev": "npm run schema:local && npm run bundle-schemas && wrangler dev",
+                "deploy": "npm run schema:remote && npm run bundle-schemas && wrangler deploy"
             },
             dependencies: {
                 '@brightsideoy/kama': 'latest',
@@ -92,8 +141,8 @@ async function createFullWorkspace() {
             vars: { CDN_DOMAIN: cmsDomain },
             d1_databases: [{
                 binding: 'DB',
-                database_name: 'kama_cms_db',
-                database_id: 'REPLACE_WITH_YOUR_D1_ID',
+                database_name: dbName,
+                database_id: d1DatabaseId,
             }],
             r2_buckets: [{
                 binding: 'MEDIA_BUCKET',
@@ -103,13 +152,17 @@ async function createFullWorkspace() {
     );
 
     // 3. Setup First Astro Site
-    const siteFolderName = siteDomain.split('.')[0]; // e.g. "www" or "demo"
+    const siteFolderName = siteDomain.split('.')[0];
     await generateAstroSite(rootDir, siteFolderName, siteDomain, cmsDomain);
 
     console.log(`\n✨ Workspace ready! Next steps:`);
     console.log(`  1. cd ${projName}`);
     console.log(`  2. npm install`);
-    console.log(`  3. Update D1 ID in cms-worker/wrangler.json`);
+    if (d1DatabaseId === 'REPLACE_WITH_YOUR_D1_ID') {
+        console.log(`  3. Run 'npx wrangler login', create a D1 database, and update cms-worker/wrangler.json`);
+    } else {
+        console.log(`  3. You are fully configured! Run 'npm run dev:cms' from the workspace root to start the backend.`);
+    }
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brightsideoy/kama",
-  "version": "0.1.0-alpha.17",
+  "version": "0.1.0-alpha.22",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -11,8 +11,8 @@
     }
   },
   "bin": {
-    "kama": "./bin/cli.js",
-    "create-kama": "./bin/cli.js"
+    "kama": "bin/cli.js",
+    "create-kama": "bin/cli.js"
   },
   "files": [
     "dist",