@brightsideoy/kama 0.1.0-alpha.148 → 0.1.0-alpha.150

package/bin/cli.js

@@ -128,14 +128,14 @@ async function createFullWorkspace() {
     }
 
     if (isCloudflare) {
-        cmsDomain = (await rl.question('\nCMS Admin Domain (e.g., admin.t3cloud.eu): ')) || 'admin.t3cloud.eu';
+        cmsDomain = (await rl.question('\nCMS Admin Domain (e.g., admin.yourdomain.com): ')).trim();
         if (shouldCreateSite) {
-            siteDomain = (await rl.question('First Website Domain (e.g., kama.t3cloud.eu): ')) || 'kama.t3cloud.eu';
+            siteDomain = (await rl.question('First Website Domain (e.g., yourdomain.com): ')).trim();
         }
     }
 
     const cmsProtocol = isCloudflare ? 'https://' : 'http://';
-    const cmsFullUrl = `${cmsProtocol}${cmsDomain.replace(/^https?:\/\//, '')}`;
+    const cmsFullUrl = cmsDomain ? `${cmsProtocol}${cmsDomain.replace(/^https?:\/\//, '')}` : 'http://localhost:8787';
 
     const workerName = `${projName}-worker`.toLowerCase().replace(/[^a-z0-9_-]/g, '-');
     let dbName = `${projName}-db`.replace(/[^a-zA-Z0-9_-]/g, '_');
@@ -268,17 +268,15 @@ async function createFullWorkspace() {
         JSON.stringify(rootPkg, null, 2)
     );
 
-    console.log(`\n☁️ Configuring CMS Worker '${workerName}' (${cmsDomain})...`);
+    console.log(`\n☁️ Configuring CMS Worker '${workerName}' (${cmsDomain || 'localhost:8787'})...`);
     const cmsDir = join(rootDir, 'kama-worker');
     mkdirSync(cmsDir, { recursive: true });
 
     writeFileSync(join(cmsDir, 'seed.sql'), '-- Kama Auto-Generated Seed File\nSELECT 1;\n');
 
-    // Initial default bundle with dual exports to satisfy ESM and CJS consumers
     const emptyDefs = `{ nodes: {}, trees: {}, blocks: {}, nodeLayouts: {}, blockLayouts: {}, channels: {} }`;
     writeFileSync(join(cmsDir, 'bundled-definitions.js'), `const defs = ${emptyDefs};\nexport const BUNDLED_DEFINITIONS = defs;\nexport default defs;\n`);
 
-    // 🎯 ARCHITECTURE SPLIT: Node.js vs Cloudflare
     if (isCloudflare) {
         const cmsWorkerIndexContent = `import kamaWorker from '@brightsideoy/kama';
 import * as localBundle from './bundled-definitions.js';
@@ -286,7 +284,6 @@ import * as localBundle from './bundled-definitions.js';
 export default {
   async fetch(request, env, ctx) {
     const schemas = localBundle.BUNDLED_DEFINITIONS || localBundle.default || localBundle;
-    // Inject runtime flag natively
     const customEnv = { ...env, BUNDLED_DEFINITIONS: schemas, KAMA_RUNTIME: 'cloudflare' };
 
     if (kamaWorker && typeof kamaWorker.fetch === 'function') {
@@ -333,6 +330,9 @@ export default {
             main: 'index.js',
             compatibility_date: '2024-09-23',
             compatibility_flags: ['nodejs_compat'],
+            cache: {
+                enabled: true
+            },
             assets: {
                 directory: '../node_modules/@brightsideoy/kama/dist',
                 binding: 'ASSETS'
@@ -361,7 +361,6 @@ export default {
         writeFileSync(join(cmsDir, 'wrangler.json'), JSON.stringify(cmsWranglerConfig, null, 2));
         writeFileSync(join(cmsDir, '.dev.vars'), `# Cloudflare Edge Cache Purging Secrets\nCLOUDFLARE_API_TOKEN=cfut_YOUR_CUSTOM_PURGE_TOKEN\n`);
     } else {
-        // --- NODE.JS ARCHITECTURE ---
         const nodeServerContent = `import { serve } from '@hono/node-server';
 import { serveStatic } from '@hono/node-server/serve-static';
 import kamaApp from '@brightsideoy/kama';
@@ -372,7 +371,6 @@ import { join } from 'node:path';
 
 dotenv.config();
 
-// 🎯 Dynamically find the Kama package dist folder (handles NPM workspace hoisting)
 const possiblePaths = [
   './node_modules/@brightsideoy/kama/dist',
   '../node_modules/@brightsideoy/kama/dist',
@@ -448,6 +446,7 @@ KAMA_RUNTIME=node
 DB_PATH=./kama.db
 LOCAL_MEDIA_PATH=./public/media
 PUBLIC_CMS_URL=${cmsFullUrl}
+PUBLIC_API_URL=${cmsFullUrl}
 PUBLIC_FRONTEND_URL=${shouldCreateSite ? `http://${siteDomain}` : 'http://localhost:4321'}
 `);
     }
@@ -469,7 +468,7 @@ PUBLIC_FRONTEND_URL=${shouldCreateSite ? `http://${siteDomain}` : 'http://localh
     }
 
     if (isCloudflare) {
-        if (d1DatabaseId === '00000000-0000-0000-0000-000000000000' || d1DatabaseId === 'REPLACE_WITH_YOUR_D1_ID') {
+        if (d1DatabaseId === '00000000-0000-0000-0000-000000000000') {
             console.log(`  3. Run 'npx wrangler login' and create a D1 database manually.`);
         }
         console.log(`  4. Update CLOUDFLARE_ZONE_ID in kama-worker/wrangler.json with your actual Zone ID`);
@@ -514,8 +513,8 @@ async function createNewSiteOnly() {
     let cmsFullUrl = 'http://localhost:8787';
 
     if (isCloudflare) {
-        siteDomain = await rl.question('Website Domain (e.g., brand.com): ');
-        const cmsDomainInput = (await rl.question('CMS API Domain (e.g., admin.t3cloud.eu): ')) || 'admin.t3cloud.eu';
+        siteDomain = (await rl.question('Website Domain (e.g., brand.com): ')).trim();
+        const cmsDomainInput = (await rl.question('CMS API Domain (e.g., admin.brand.com): ')).trim();
         cmsFullUrl = `https://${cmsDomainInput.replace(/^https?:\/\//, '')}`;
     }
 
@@ -528,7 +527,6 @@ async function createNewSiteOnly() {
 
 /**
  * COMMAND: npx kama bundle
- * Loads the pre-compiled JS compiler natively without runtime tsx/type-stripping issues!
  */
 async function bundleWorkspaceSchemas(targetRootDir) {
     let rootDir = targetRootDir || process.cwd();
@@ -538,15 +536,12 @@ async function bundleWorkspaceSchemas(targetRootDir) {
     }
 
     try {
-        // 1. First preference: built JavaScript bundle in node_modules/dist
         let compilerPath = join(__dirname, '../dist/schema-compiler.js');
 
-        // 2. Fallback for local monorepo dev where ts source exists
         if (!existsSync(compilerPath)) {
             compilerPath = join(__dirname, '../scripts/schema-compiler.ts');
         }
 
-        // 🎯 Native Node ESM Import — Loads pure JS with zero runtime type-stripping errors!
         const compilerUrl = pathToFileURL(compilerPath).href;
         await import(compilerUrl);
     } catch (e) {
@@ -582,12 +577,12 @@ async function promoteLocalToCloudflare() {
         }
     }
 
-    const cmsDomain = (await rl.question('\nCMS Admin Domain (e.g., admin.t3cloud.eu): ')) || 'admin.t3cloud.eu';
+    const cmsDomain = (await rl.question('\nCMS Admin Domain (e.g., admin.yourdomain.com): ')).trim();
 
     const sitesFolderDir = join(rootDir, 'sites');
     let siteDomain = '';
     if (existsSync(sitesFolderDir)) {
-        siteDomain = await rl.question('Frontend Website Domain (e.g., kama.t3cloud.eu): ');
+        siteDomain = (await rl.question('Frontend Website Domain (e.g., yourdomain.com): ')).trim();
     }
 
     const currentConfig = JSON.parse(readFileSync(workerWranglerPath, 'utf-8'));
@@ -604,6 +599,7 @@ async function promoteLocalToCloudflare() {
         console.log('⚠️ Could not auto-create D1 (it may already exist). Please verify on your Cloudflare dashboard.');
     }
 
+    currentConfig.cache = { enabled: true };
     currentConfig.vars.CDN_DOMAIN = cmsDomain;
     if (siteDomain) {
         currentConfig.vars.PUBLIC_FRONTEND_URL = `https://${siteDomain}`;
@@ -621,9 +617,26 @@ async function promoteLocalToCloudflare() {
             const siteWranglerPath = join(sitesFolderDir, sites[0], 'wrangler.json');
             if (existsSync(siteWranglerPath)) {
                 const siteConfig = JSON.parse(readFileSync(siteWranglerPath, 'utf-8'));
-                siteConfig.routes = [{ pattern: siteDomain, custom_domain: true }];
+
+                siteConfig.cache = { enabled: true };
+                siteConfig.routes = [{
+                    pattern: siteDomain,
+                    zone_name: siteDomain,
+                    custom_domain: true,
+                    enabled: true,
+                    previews_enabled: false
+                }];
+
+                siteConfig.assets = {
+                    directory: "./dist/client",
+                    binding: "ASSETS",
+                    run_worker_first: true
+                };
+
+                siteConfig.vars = siteConfig.vars || {};
                 siteConfig.vars.PUBLIC_CMS_URL = `https://${cmsDomain}`;
                 siteConfig.vars.PUBLIC_API_URL = `https://${cmsDomain}`;
+
                 writeFileSync(siteWranglerPath, JSON.stringify(siteConfig, null, 2));
             }
         }
@@ -668,10 +681,34 @@ async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsFullUrl, wo
             .replace(/\{\{WORKER_NAME\}\}/g, workerName)
             .replace(/\{\{CMS_URL\}\}/g, cmsFullUrl);
 
-        if (isCloudflare) {
+        try {
             const configObj = JSON.parse(wranglerStr);
-            configObj.routes = [{ pattern: siteDomain, custom_domain: true }];
+
+            // Enforce worker-level execution & caching controls dynamically
+            configObj.cache = { enabled: true };
+            configObj.assets = {
+                directory: "./dist/client",
+                binding: "ASSETS",
+                run_worker_first: true
+            };
+
+            configObj.vars = configObj.vars || {};
+            configObj.vars.PUBLIC_CMS_URL = cmsFullUrl;
+            configObj.vars.PUBLIC_API_URL = cmsFullUrl;
+
+            if (isCloudflare && siteDomain !== 'localhost:4321') {
+                configObj.routes = [{
+                    pattern: siteDomain,
+                    zone_name: siteDomain,
+                    custom_domain: true,
+                    enabled: true,
+                    previews_enabled: false
+                }];
+            }
+
             wranglerStr = JSON.stringify(configObj, null, 2);
+        } catch (e) {
+            console.warn("⚠️ Could not parse wrangler.json template as JSON, writing raw string.");
         }
 
         writeFileSync(wranglerPath, wranglerStr);