@brightsideoy/kama 0.1.0-alpha.42 → 0.1.0-alpha.44

package/bin/cli.js

@@ -37,12 +37,15 @@ async function createFullWorkspace() {
 
     const rootDir = join(process.cwd(), projName);
 
+    // 🎯 Derive dynamic worker, database, and bucket names from project folder name
+    const workerName = `${projName}-worker`.toLowerCase().replace(/[^a-z0-9_-]/g, '-');
     let dbName = `${projName}-db`.replace(/[^a-zA-Z0-9_-]/g, '_');
+    const bucketName = `${projName}-media-prod`.toLowerCase().replace(/[^a-z0-9_-]/g, '-');
 
     console.log(`\n📁 Creating workspace folder at ./${projName}...`);
     mkdirSync(rootDir, { recursive: true });
 
-    // 🎯 Scaffold schemas directory for custom project YAML definitions
+    // 🎯 Scaffold schemas directory for project-level custom YAML definitions
     mkdirSync(join(rootDir, 'schemas', 'nodes'), { recursive: true });
     mkdirSync(join(rootDir, 'schemas', 'blocks'), { recursive: true });
 
@@ -116,7 +119,7 @@ async function createFullWorkspace() {
     }
     // ------------------------------
 
-    // 🎯 1. Root package.json with bundle:schemas hooked
+    // 🎯 1. Root package.json
     writeFileSync(
         join(rootDir, 'package.json'),
         JSON.stringify({
@@ -135,8 +138,8 @@ async function createFullWorkspace() {
         }, null, 2)
     );
 
-    // 🎯 2. Setup CMS Worker
-    console.log(`\n☁️ Configuring CMS Worker (${cmsDomain})...`);
+    // 🎯 2. Setup CMS Worker with Dynamic Names
+    console.log(`\n☁️ Configuring CMS Worker '${workerName}' (${cmsDomain})...`);
     const cmsDir = join(rootDir, 'cms-worker');
     mkdirSync(cmsDir, { recursive: true });
 
@@ -148,7 +151,7 @@ async function createFullWorkspace() {
     writeFileSync(
         join(cmsDir, 'package.json'),
         JSON.stringify({
-            name: 'kama-worker',
+            name: workerName,
             type: 'module',
             version: '1.0.0',
             scripts: {
@@ -172,7 +175,7 @@ async function createFullWorkspace() {
         join(cmsDir, 'wrangler.json'),
         JSON.stringify({
             $schema: '../node_modules/wrangler/config-schema.json',
-            name: 'kama-worker',
+            name: workerName,
             main: 'index.js',
             compatibility_date: '2026-08-01',
             compatibility_flags: ['nodejs_compat'],
@@ -189,14 +192,14 @@ async function createFullWorkspace() {
             }],
             r2_buckets: [{
                 binding: 'MEDIA_BUCKET',
-                bucket_name: 'kama-media-prod',
+                bucket_name: bucketName,
             }],
         }, null, 2)
     );
 
-    // 3. Setup First Astro Site
+    // 🎯 3. Setup First Astro Site tied to target workerName
     const siteFolderName = siteDomain.split('.')[0];
-    await generateAstroSite(rootDir, siteFolderName, siteDomain, cmsDomain);
+    await generateAstroSite(rootDir, siteFolderName, siteDomain, cmsDomain, workerName);
 
     console.log(`\n✨ Workspace ready! Next steps:`);
     console.log(`  1. cd ${projName}`);
@@ -219,11 +222,21 @@ async function createNewSiteOnly() {
         return;
     }
 
+    // Try reading cms-worker/wrangler.json to determine workerName dynamically
+    let targetWorkerName = 'kama-worker';
+    const cmsWranglerPath = join(rootDir, 'cms-worker', 'wrangler.json');
+    if (existsSync(cmsWranglerPath)) {
+        try {
+            const cmsWrangler = JSON.parse(readFileSync(cmsWranglerPath, 'utf-8'));
+            if (cmsWrangler.name) targetWorkerName = cmsWrangler.name;
+        } catch (e) { }
+    }
+
     const siteFolder = await rl.question('Site folder name (e.g., my-new-site): ');
     const siteDomain = await rl.question('Website Domain (e.g., brand.com): ');
     const cmsDomain = (await rl.question('CMS API Domain (e.g., cms.example.com): ')) || 'cms.example.com';
 
-    await generateAstroSite(rootDir, siteFolder, siteDomain, cmsDomain.replace(/^https?:\/\//, ''));
+    await generateAstroSite(rootDir, siteFolder, siteDomain, cmsDomain.replace(/^https?:\/\//, ''), targetWorkerName);
 
     console.log(`\n✨ Site created in sites/${siteFolder}! Run 'npm install' at workspace root.`);
 }
@@ -231,8 +244,8 @@ async function createNewSiteOnly() {
 /**
  * Helper: Scaffolds the Astro site with middleware, wrangler.json, & slug page
  */
-async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsDomain) {
-    console.log(`\n🚀 Scaffolding Astro site (${siteFolder}) mapped to ${siteDomain}...`);
+async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsDomain, workerName = 'kama-worker') {
+    console.log(`\n🚀 Scaffolding Astro site (${siteFolder}) mapped to ${siteDomain} (Service: ${workerName})...`);
 
     const siteDir = join(rootDir, 'sites', siteFolder);
     mkdirSync(join(siteDir, 'src/pages'), { recursive: true });
@@ -275,7 +288,7 @@ async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsDomain) {
                 html_handling: 'drop-trailing-slash',
                 not_found_handling: '404-page',
             },
-            services: [{ binding: 'CMS_WORKER', service: 'kama-worker' }],
+            services: [{ binding: 'CMS_WORKER', service: workerName }],
             routes: [{ pattern: siteDomain, custom_domain: true }],
             vars: {
                 PUBLIC_CMS_URL: `https://${cmsDomain}`,