@brightsideoy/kama 0.1.0-alpha.158 → 0.1.0-alpha.159

package/bin/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { execSync } from 'node:child_process';
-import { existsSync, mkdirSync, writeFileSync, readFileSync, readdirSync, cpSync, statSync, unlinkSync, appendFileSync } from 'node:fs';
+import { existsSync, mkdirSync, writeFileSync, readFileSync, readdirSync, cpSync, unlinkSync, appendFileSync } from 'node:fs';
 import { join, dirname, basename, resolve } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import * as readline from 'node:readline/promises';
@@ -81,15 +81,15 @@ async function main() {
         console.log('  4) npx kama promote      - Promote current Local workspace to Cloudflare Edge');
         console.log('  5) Help                  - Show all commands and usage');
 
-        const choice = await rl.question('\nSelect choice [1/2/3/4/5]: ');
+        const choice = (await rl.question('\nSelect choice [1/2/3/4/5]: ')).trim();
 
-        if (choice.trim() === '5') {
+        if (choice === '5') {
             showHelp();
-        } else if (choice.trim() === '4') {
+        } else if (choice === '4') {
             await promoteLocalToCloudflare();
-        } else if (choice.trim() === '3') {
+        } else if (choice === '3') {
             await bundleWorkspaceSchemas();
-        } else if (choice.trim() === '2') {
+        } else if (choice === '2') {
             await createNewSiteOnly();
         } else {
             await createFullWorkspace();
@@ -99,6 +99,20 @@ async function main() {
     rl.close();
 }
 
+/**
+ * Helper to update astro.config.mjs for Cloudflare
+ */
+function convertAstroConfigToCloudflare(siteDir) {
+    const configPath = join(siteDir, 'astro.config.mjs');
+    if (existsSync(configPath)) {
+        let content = readFileSync(configPath, 'utf-8');
+        content = content
+            .replace("import node from '@astrojs/node';", "import cloudflare from '@astrojs/cloudflare';")
+            .replace('adapter: node({ mode: "standalone" })', 'adapter: cloudflare({ imageService: process.env.NODE_ENV === "production" ? "cloudflare" : "passthrough" })');
+        writeFileSync(configPath, content, 'utf-8');
+    }
+}
+
 /**
  * COMMAND: npx kama init
  * Kickstart full Monorepo Workspace
@@ -174,14 +188,15 @@ async function createFullWorkspace() {
     if (isCloudflare) {
         console.log(`\n🔑 Checking Cloudflare authentication...`);
         try {
-            execSync('npx wrangler whoami', { stdio: 'pipe' });
+            // Pass stdio: 'ignore' so child process doesn't drain parent stdin stream!
+            execSync('npx wrangler whoami', { stdio: 'ignore' });
             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' });
+                execSync('npx wrangler login', { stdio: 'ignore' });
                 isAuthenticated = true;
                 console.log(`✅ Successfully logged in!`);
             } catch (loginError) {
@@ -192,7 +207,7 @@ async function createFullWorkspace() {
         if (isAuthenticated) {
             try {
                 console.log(`\n🗄️ Checking existing Cloudflare D1 databases...`);
-                const listOutput = execSync(`npx wrangler d1 list --json`, { encoding: 'utf-8', stdio: 'pipe' });
+                const listOutput = execSync(`npx wrangler d1 list --json`, { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] });
                 const jsonStart = listOutput.indexOf('[');
                 const jsonEnd = listOutput.lastIndexOf(']') + 1;
                 let databases = [];
@@ -213,7 +228,7 @@ async function createFullWorkspace() {
                     } else {
                         dbName = (await rl.question(`Enter a new database name: `)).trim();
                         console.log(`\n🗄️ Creating new database '${dbName}'...`);
-                        const d1Output = execSync(`npx wrangler d1 create ${dbName}`, { encoding: 'utf-8', stdio: 'pipe' });
+                        const d1Output = execSync(`npx wrangler d1 create ${dbName}`, { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] });
                         const match = d1Output.match(/[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}/);
                         if (match) {
                             d1DatabaseId = match[0];
@@ -222,7 +237,7 @@ async function createFullWorkspace() {
                     }
                 } else {
                     console.log(`\n🗄️ Attempting to auto-create Cloudflare D1 Database '${dbName}'...`);
-                    const d1Output = execSync(`npx wrangler d1 create ${dbName}`, { encoding: 'utf-8', stdio: 'pipe' });
+                    const d1Output = execSync(`npx wrangler d1 create ${dbName}`, { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] });
                     const match = d1Output.match(/[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}/);
                     if (match) {
                         d1DatabaseId = match[0];
@@ -283,27 +298,10 @@ async function createFullWorkspace() {
     writeFileSync(join(cmsDir, 'bundled-definitions.js'), `const defs = ${emptyDefs};\nexport const BUNDLED_DEFINITIONS = defs;\nexport default defs;\n`);
 
     if (isCloudflare) {
-        const cmsWorkerIndexContent = `import kamaWorker from '@brightsideoy/kama';
-import * as localBundle from './bundled-definitions.js';
-
-export default {
-  async fetch(request, env, ctx) {
-    const schemas = localBundle.BUNDLED_DEFINITIONS || localBundle.default || localBundle;
-    const customEnv = { ...env, BUNDLED_DEFINITIONS: schemas, KAMA_RUNTIME: 'cloudflare' };
-
-    if (kamaWorker && typeof kamaWorker.fetch === 'function') {
-      return kamaWorker.fetch(request, customEnv, ctx);
-    }
-    
-    if (kamaWorker && kamaWorker.app && typeof kamaWorker.app.fetch === 'function') {
-      return kamaWorker.app.fetch(request, customEnv, ctx);
-    }
-    
-    return new Response('Kama Engine Worker Ready', { status: 200 });
-  }
-};
-`;
-        writeFileSync(join(cmsDir, 'index.js'), cmsWorkerIndexContent);
+        const templateIndexPath = join(__dirname, '../templates/kama-worker/index.js');
+        if (existsSync(templateIndexPath)) {
+            cpSync(templateIndexPath, join(cmsDir, 'index.js'));
+        }
 
         writeFileSync(
             join(cmsDir, 'package.json'),
@@ -352,71 +350,18 @@ export default {
 
         writeFileSync(join(cmsDir, 'wrangler.json'), JSON.stringify(cmsWranglerConfig, null, 2));
 
-        // 🎯 FIX: CDN_DOMAIN left empty to auto-detect http://localhost:8787
         writeFileSync(join(cmsDir, '.dev.vars'), `# Cloudflare Edge Cache Purging Secrets
 CLOUDFLARE_API_TOKEN=cfut_YOUR_CUSTOM_PURGE_TOKEN
 
-# Local Development Overrides (Takes precedence over wrangler.json vars during local dev)
+# Local Development Overrides
 CDN_DOMAIN=
 PUBLIC_FRONTEND_URL=http://localhost:4321
 `);
     } else {
-        const nodeServerContent = `import { serve } from '@hono/node-server';
-import { serveStatic } from '@hono/node-server/serve-static';
-import kamaApp from '@brightsideoy/kama';
-import * as localBundle from './bundled-definitions.js';
-import dotenv from 'dotenv';
-import { readFileSync, existsSync } from 'node:fs';
-import { join } from 'node:path';
-
-dotenv.config();
-
-const possiblePaths = [
-  './node_modules/@brightsideoy/kama/dist',
-  '../node_modules/@brightsideoy/kama/dist',
-  '../../node_modules/@brightsideoy/kama/dist'
-];
-const distPath = possiblePaths.find(p => existsSync(p));
-
-if (!distPath) {
-  console.warn('⚠️ Could not locate @brightsideoy/kama/dist folder. Admin UI will not load.');
-}
-
-kamaApp.use('*', async (c, next) => {
-  c.env = { 
-    ...process.env, 
-    ...c.env, 
-    BUNDLED_DEFINITIONS: localBundle.BUNDLED_DEFINITIONS, 
-    KAMA_RUNTIME: 'node' 
-  };
-  await next();
-});
-
-kamaApp.use('/media/*', serveStatic({ root: './' }));
-
-if (distPath) {
-  kamaApp.use('/assets/*', serveStatic({ root: distPath }));
-  
-  kamaApp.get('/*', async (c, next) => {
-    if (c.req.path.startsWith('/api') || c.req.path.startsWith('/media')) return next();
-    
-    const indexPath = join(distPath, 'index.html');
-    if (existsSync(indexPath)) {
-      return c.html(readFileSync(indexPath, 'utf-8'));
-    }
-    return next();
-  });
-}
-
-const port = process.env.PORT ? parseInt(process.env.PORT, 10) : 8787;
-
-serve({ fetch: kamaApp.fetch, port }, (info) => {
-  console.log(\`\\n🔥 KAMA CMS Node Server is running!\`);
-  console.log(\`┃ Local    http://localhost:\${info.port}/\`);
-  if (distPath) console.log(\`┃ Admin UI Serving from: \${distPath}\\n\`);
-});
-`;
-        writeFileSync(join(cmsDir, 'server.js'), nodeServerContent);
+        const templateServerPath = join(__dirname, '../templates/kama-worker/server.js');
+        if (existsSync(templateServerPath)) {
+            cpSync(templateServerPath, join(cmsDir, 'server.js'));
+        }
 
         writeFileSync(
             join(cmsDir, 'package.json'),
@@ -443,7 +388,6 @@ serve({ fetch: kamaApp.fetch, port }, (info) => {
             }, null, 2)
         );
 
-        // For Node mode, localhost is explicitly used
         writeFileSync(join(cmsDir, '.env'), `PORT=8787\nKAMA_RUNTIME=node\nDB_PATH=./kama.db\nLOCAL_MEDIA_PATH=./public/media\nPUBLIC_CMS_URL=http://127.0.0.1:8787\nPUBLIC_API_URL=http://127.0.0.1:8787\nPUBLIC_FRONTEND_URL=http://127.0.0.1:4321\n`);
     }
 
@@ -554,11 +498,11 @@ async function promoteLocalToCloudflare() {
     console.log('\n🌐 --- UPGRADING WORKSPACE TO CLOUDFLARE EDGE --- 🌐\n');
 
     try {
-        execSync('npx wrangler whoami', { stdio: 'pipe' });
+        execSync('npx wrangler whoami', { stdio: 'ignore' });
         console.log('✅ Logged in to Cloudflare.');
     } catch (e) {
         console.log('🌐 Launching browser for Cloudflare login...');
-        try { execSync('npx wrangler login', { stdio: 'inherit' }); }
+        try { execSync('npx wrangler login', { stdio: 'ignore' }); }
         catch (loginError) { console.log('❌ Cloudflare login failed.'); return; }
     }
 
@@ -580,18 +524,16 @@ async function promoteLocalToCloudflare() {
     let d1DatabaseId = '00000000-0000-0000-0000-000000000000';
 
     try {
-        const d1Output = execSync(`npx wrangler d1 create ${dbName}`, { encoding: 'utf-8', stdio: 'pipe' });
+        const d1Output = execSync(`npx wrangler d1 create ${dbName}`, { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] });
         const match = d1Output.match(/[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}/);
         if (match) d1DatabaseId = match[0];
     } catch (err) { }
 
-    // 1. Upgrade Root
     const rootPkg = JSON.parse(readFileSync(rootPkgPath, 'utf-8'));
     rootPkg.devDependencies = rootPkg.devDependencies || {};
     rootPkg.devDependencies['wrangler'] = WRANGLER_LATEST;
     writeFileSync(rootPkgPath, JSON.stringify(rootPkg, null, 2));
 
-    // 2. Upgrade Worker
     const workerName = `${projName}-worker`.toLowerCase().replace(/[^a-z0-9_-]/g, '-');
     const bucketName = `${projName}-media-prod`.toLowerCase().replace(/[^a-z0-9_-]/g, '-');
     const workerWranglerPath = join(workerDir, 'wrangler.json');
@@ -619,14 +561,16 @@ async function promoteLocalToCloudflare() {
 
     writeFileSync(workerWranglerPath, JSON.stringify(currentConfig, null, 2));
 
-    // 🎯 FIX: CDN_DOMAIN left empty to auto-detect http://localhost:8787
     if (!existsSync(join(workerDir, '.dev.vars'))) {
         writeFileSync(join(workerDir, '.dev.vars'), `CLOUDFLARE_API_TOKEN=cfut_YOUR_CUSTOM_PURGE_TOKEN\nCDN_DOMAIN=\nPUBLIC_FRONTEND_URL=http://localhost:4321\n`);
     }
 
     const workerIndexPath = join(workerDir, 'index.js');
     if (!existsSync(workerIndexPath)) {
-        writeFileSync(workerIndexPath, `import kamaWorker from '@brightsideoy/kama';\nimport * as localBundle from './bundled-definitions.js';\nexport default {\n  async fetch(request, env, ctx) {\n    const schemas = localBundle.BUNDLED_DEFINITIONS || localBundle.default || localBundle;\n    const customEnv = { ...env, BUNDLED_DEFINITIONS: schemas, KAMA_RUNTIME: 'cloudflare' };\n    if (kamaWorker && typeof kamaWorker.fetch === 'function') return kamaWorker.fetch(request, customEnv, ctx);\n    if (kamaWorker && kamaWorker.app && typeof kamaWorker.app.fetch === 'function') return kamaWorker.app.fetch(request, customEnv, ctx);\n    return new Response('Kama Engine Worker Ready', { status: 200 });\n  }\n};\n`);
+        const templateIndexPath = join(__dirname, '../templates/kama-worker/index.js');
+        if (existsSync(templateIndexPath)) {
+            cpSync(templateIndexPath, workerIndexPath);
+        }
     }
 
     const workerPkgPath = join(workerDir, 'package.json');
@@ -641,16 +585,15 @@ async function promoteLocalToCloudflare() {
         writeFileSync(workerPkgPath, JSON.stringify(workerPkg, null, 2));
     }
 
-    // 3. Upgrade Site
     if (siteDir && siteDomain) {
         let sessionId = "REPLACE_WITH_YOUR_SESSION_KV_ID";
         let htmlCacheId = "REPLACE_WITH_YOUR_HTML_CACHE_KV_ID";
         const prefix = basename(siteDir).replace(/[^a-zA-Z0-9]/g, '_').toUpperCase();
 
         try {
-            const sessionOut = execSync(`npx wrangler kv namespace create "SESSION_${prefix}"`, { encoding: 'utf-8', stdio: 'pipe' });
+            const sessionOut = execSync(`npx wrangler kv namespace create "SESSION_${prefix}"`, { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] });
             if (sessionOut.match(/"id":\s*"([a-f0-9]{32})"/)) sessionId = sessionOut.match(/"id":\s*"([a-f0-9]{32})"/)[1];
-            const cacheOut = execSync(`npx wrangler kv namespace create "HTML_CACHE_${prefix}"`, { encoding: 'utf-8', stdio: 'pipe' });
+            const cacheOut = execSync(`npx wrangler kv namespace create "HTML_CACHE_${prefix}"`, { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] });
             if (cacheOut.match(/"id":\s*"([a-f0-9]{32})"/)) htmlCacheId = cacheOut.match(/"id":\s*"([a-f0-9]{32})"/)[1];
         } catch (err) { }
 
@@ -685,10 +628,7 @@ async function promoteLocalToCloudflare() {
             writeFileSync(sitePkgPath, JSON.stringify(sitePkg, null, 2));
         }
 
-        // 🎯 100% BULLETPROOF CONFIG WRITE FOR CLOUDFLARE
-        const astroConfigPath = join(siteDir, 'astro.config.mjs');
-        const cfConfigContent = `import { defineConfig } from 'astro/config';\nimport cloudflare from '@astrojs/cloudflare';\nimport path from 'node:path';\nimport { fileURLToPath } from 'node:url';\n\nconst __dirname = path.dirname(fileURLToPath(import.meta.url));\n\nexport default defineConfig({\n    output: 'server',\n    trailingSlash: 'ignore',\n    image: { service: { entrypoint: './src/lib/media/kama-image-service.ts' } },\n    adapter: cloudflare({ imageService: process.env.NODE_ENV === 'production' ? "cloudflare" : "passthrough" }),\n    vite: {\n        resolve: { alias: { '@': path.resolve(__dirname, './src') } },\n        ssr: {\n            external: ['cloudflare:workers', 'tinyexec', 'node:child_process', 'node:fs', 'node:url', 'node:path', 'node:stream', 'node:readline', 'node:stream/promises']\n        },\n        environments: {\n            ssr: {\n                external: ['cloudflare:workers', 'tinyexec', 'node:child_process', 'node:fs', 'node:url', 'node:path', 'node:stream', 'node:readline', 'node:stream/promises']\n            }\n        }\n    }\n});\n`;
-        writeFileSync(astroConfigPath, cfConfigContent);
+        convertAstroConfigToCloudflare(siteDir);
 
         const tsConfigPath = join(siteDir, 'tsconfig.json');
         if (existsSync(tsConfigPath)) {
@@ -742,22 +682,13 @@ async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsFullUrl, wo
             if (sitePkg.devDependencies && sitePkg.devDependencies['wrangler']) delete sitePkg.devDependencies['wrangler'];
 
             sitePkg.dependencies['@astrojs/node'] = ASTRO_NODE_LATEST;
-
-            // 🎯 100% BULLETPROOF CONFIG WRITE FOR NODE
-            const astroConfigPath = join(siteDir, 'astro.config.mjs');
-            const nodeConfigContent = `import { defineConfig } from 'astro/config';\nimport node from '@astrojs/node';\nimport path from 'node:path';\nimport { fileURLToPath } from 'node:url';\n\nconst __dirname = path.dirname(fileURLToPath(import.meta.url));\n\nexport default defineConfig({\n    output: 'server',\n    trailingSlash: 'ignore',\n    image: { service: { entrypoint: './src/lib/media/kama-image-service.ts' } },\n    adapter: node({ mode: "standalone" }),\n    vite: {\n        resolve: { alias: { '@': path.resolve(__dirname, './src') } },\n        ssr: {\n            external: ['cloudflare:workers', 'tinyexec', 'node:child_process', 'node:fs', 'node:url', 'node:path', 'node:stream', 'node:readline', 'node:stream/promises']\n        },\n        environments: {\n            ssr: {\n                external: ['cloudflare:workers', 'tinyexec', 'node:child_process', 'node:fs', 'node:url', 'node:path', 'node:stream', 'node:readline', 'node:stream/promises']\n            }\n        }\n    }\n});\n`;
-            writeFileSync(astroConfigPath, nodeConfigContent);
-
         } else {
             sitePkg.dependencies['@astrojs/cloudflare'] = ASTRO_CF_LATEST;
             if (sitePkg.dependencies['wrangler']) delete sitePkg.dependencies['wrangler'];
             sitePkg.devDependencies = sitePkg.devDependencies || {};
             sitePkg.devDependencies['wrangler'] = WRANGLER_LATEST;
 
-            // 🎯 100% BULLETPROOF CONFIG WRITE FOR CLOUDFLARE
-            const astroConfigPath = join(siteDir, 'astro.config.mjs');
-            const cfConfigContent = `import { defineConfig } from 'astro/config';\nimport cloudflare from '@astrojs/cloudflare';\nimport path from 'node:path';\nimport { fileURLToPath } from 'node:url';\n\nconst __dirname = path.dirname(fileURLToPath(import.meta.url));\n\nexport default defineConfig({\n    output: 'server',\n    trailingSlash: 'ignore',\n    image: { service: { entrypoint: './src/lib/media/kama-image-service.ts' } },\n    adapter: cloudflare({ imageService: process.env.NODE_ENV === 'production' ? "cloudflare" : "passthrough" }),\n    vite: {\n        resolve: { alias: { '@': path.resolve(__dirname, './src') } },\n        ssr: {\n            external: ['cloudflare:workers', 'tinyexec', 'node:child_process', 'node:fs', 'node:url', 'node:path', 'node:stream', 'node:readline', 'node:stream/promises']\n        },\n        environments: {\n            ssr: {\n                external: ['cloudflare:workers', 'tinyexec', 'node:child_process', 'node:fs', 'node:url', 'node:path', 'node:stream', 'node:readline', 'node:stream/promises']\n            }\n        }\n    }\n});\n`;
-            writeFileSync(astroConfigPath, cfConfigContent);
+            convertAstroConfigToCloudflare(siteDir);
         }
 
         writeFileSync(join(siteDir, 'package.json'), JSON.stringify(sitePkg, null, 2));
@@ -776,9 +707,9 @@ async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsFullUrl, wo
 
         try {
             const prefix = siteFolder.replace(/[^a-zA-Z0-9]/g, '_').toUpperCase();
-            const sessionOut = execSync(`npx wrangler kv namespace create "SESSION_${prefix}"`, { encoding: 'utf-8', stdio: 'pipe' });
+            const sessionOut = execSync(`npx wrangler kv namespace create "SESSION_${prefix}"`, { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] });
             if (sessionOut.match(/"id":\s*"([a-f0-9]{32})"/)) sessionId = sessionOut.match(/"id":\s*"([a-f0-9]{32})"/)[1];
-            const cacheOut = execSync(`npx wrangler kv namespace create "HTML_CACHE_${prefix}"`, { encoding: 'utf-8', stdio: 'pipe' });
+            const cacheOut = execSync(`npx wrangler kv namespace create "HTML_CACHE_${prefix}"`, { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] });
             if (cacheOut.match(/"id":\s*"([a-f0-9]{32})"/)) htmlCacheId = cacheOut.match(/"id":\s*"([a-f0-9]{32})"/)[1];
         } catch (err) { }
 

package/content/definitions/node-layouts/landing-page.yml

@@ -19,6 +19,8 @@ regions:
   footer:
     label: Footer
     inherit: parent
+    purgeTargets:
+      - "/partials/footer"
     disallowedBlocks:
       - hero
       - image_card

package/content/definitions/node-layouts/single-column.yml

@@ -35,6 +35,8 @@ regions:
   footer:
     label: Footer
     inherit: parent
+    purgeTargets:
+      - "/partials/footer"
     disallowedBlocks:
       - hero
       - image_card

package/content/definitions/node-layouts/two-column.yml

@@ -40,6 +40,8 @@ regions:
   footer:
     label: Footer
     inherit: parent
+    purgeTargets:
+      - "/partials/footer"
     disallowedBlocks:
       - hero
       - image_card