@brightsideoy/kama 0.1.0-alpha.121 → 0.1.0-alpha.123

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, unlinkSync, statSync } from 'node:fs';
+import { existsSync, mkdirSync, writeFileSync, readFileSync, readdirSync, cpSync, unlinkSync, statSync, appendFileSync } from 'node:fs';
 import { join, dirname, basename, relative, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import * as readline from 'node:readline/promises';
@@ -24,11 +24,39 @@ const rl = readline.createInterface({
     output: process.stdout,
 });
 
+function showHelp() {
+    console.log('\n🔥 --- KAMA ENGINE CLI --- 🔥\n');
+    console.log('Usage: npx kama <command> [options]\n');
+    console.log('Commands:');
+    console.log('  init         Kickstart a new Monorepo (CMS Worker + Optional Astro Site)');
+    console.log('  add site     Add a new Astro Frontend Site to the current workspace (sites/)');
+    console.log('  bundle       Bundle YAML schemas into a static module for Edge deployment');
+    console.log('  promote      Promote the current Local workspace to Cloudflare Edge');
+    console.log('  help, -h     Show this help message\n');
+
+    console.log('Workspace Scripts (Run from project root):');
+    console.log('  npm update           Update to latest KAMA version');
+    console.log('  npm run dev          Boot up the CMS backend and Astro frontend concurrently');
+    console.log('  npm run deploy:cms   Deploy the backend worker and database to Cloudflare');
+    console.log('  npm run deploy:site  Deploy the Astro frontend site to Cloudflare\n');
+
+    console.log('Examples:');
+    console.log('  npx kama init');
+    console.log('  npx kama add site');
+    console.log('  npx kama bundle\n');
+}
+
 async function main() {
     const args = process.argv.slice(2);
     const command = args[0]?.toLowerCase();
     const subCommand = args[1]?.toLowerCase();
 
+    if (command === 'help' || command === '--help' || command === '-h') {
+        showHelp();
+        rl.close();
+        process.exit(0);
+    }
+
     console.log('\n🔥 --- KAMA ENGINE CLI --- 🔥\n');
 
     if (command === 'init') {
@@ -45,10 +73,13 @@ async function main() {
         console.log('  2) npx kama add site     - Add new Astro Site to current workspace (sites/)');
         console.log('  3) npx kama bundle       - Bundle YAML schemas for Edge deployment');
         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]: ');
+        const choice = await rl.question('\nSelect choice [1/2/3/4/5]: ');
 
-        if (choice.trim() === '4') {
+        if (choice.trim() === '5') {
+            showHelp();
+        } else if (choice.trim() === '4') {
             await promoteLocalToCloudflare();
         } else if (choice.trim() === '3') {
             await bundleWorkspaceSchemas();
@@ -88,8 +119,14 @@ async function createFullWorkspace() {
     const createSiteInput = await rl.question('\n🚀 Do you want to scaffold an initial Astro frontend site? (y/n) [y]: ');
     const shouldCreateSite = createSiteInput.trim().toLowerCase() !== 'n';
 
-    let cmsDomain = 'localhost:8787';
+    let siteFolderName = 'kama-starter';
     let siteDomain = 'localhost:4321';
+    let cmsDomain = 'localhost:8787';
+
+    if (shouldCreateSite) {
+        // 🎯 FIX: Default to 'kama-starter'
+        siteFolderName = (await rl.question('Astro package/folder name (e.g., my-website) [kama-starter]: ')).trim() || 'kama-starter';
+    }
 
     if (isCloudflare) {
         cmsDomain = (await rl.question('\nCMS Admin Domain (e.g., admin.t3cloud.eu): ')) || 'admin.t3cloud.eu';
@@ -105,8 +142,6 @@ async function createFullWorkspace() {
     let dbName = `${projName}-db`.replace(/[^a-zA-Z0-9_-]/g, '_');
     const bucketName = `${projName}-media-prod`.toLowerCase().replace(/[^a-z0-9_-]/g, '-');
 
-    const siteFolderName = isCloudflare ? siteDomain.split('.')[0] : 'web';
-
     if (!isCurrentDir) {
         console.log(`\n📁 Creating workspace folder at ./${projName}...`);
         mkdirSync(rootDir, { recursive: true });
@@ -250,7 +285,8 @@ kama-worker/workspace-schemas.js
     const cmsDir = join(rootDir, 'kama-worker');
     mkdirSync(cmsDir, { recursive: true });
 
-    // 🎯 FIX: Clones frozen Cloudflare env and safely injects BUNDLED_DEFINITIONS
+    writeFileSync(join(cmsDir, 'seed.sql'), '-- Kama Auto-Generated Seed File\nSELECT 1;\n');
+
     const cmsWorkerIndexContent = `import kamaWorker from '@brightsideoy/kama';
 import customSchemas from './workspace-schemas.js';
 
@@ -283,8 +319,10 @@ export default {
             scripts: {
                 "schema:local": `wrangler d1 execute ${dbName} --local --file=../node_modules/@brightsideoy/kama/schema.sql > /dev/null 2>&1`,
                 "schema:remote": `wrangler d1 execute ${dbName} --remote --file=../node_modules/@brightsideoy/kama/schema.sql`,
-                "dev": "npm run schema:local && wrangler dev",
-                "deploy": "npm run schema:remote && wrangler deploy"
+                "seed:local": `wrangler d1 execute ${dbName} --local --file=seed.sql > /dev/null 2>&1`,
+                "seed:remote": `wrangler d1 execute ${dbName} --remote --file=seed.sql`,
+                "dev": "npm run schema:local && npm run seed:local && wrangler dev",
+                "deploy": "npm run schema:remote && npm run seed:remote && wrangler deploy"
             },
             dependencies: {
                 '@brightsideoy/kama': currentKamaVersion,
@@ -392,7 +430,8 @@ async function createNewSiteOnly() {
     const envChoice = await rl.question('\nChoice [1/2]: ');
     const isCloudflare = envChoice.trim() === '2';
 
-    const siteFolder = await rl.question('Site folder name (e.g., my-new-site): ');
+    // 🎯 FIX: Default to 'kama-starter'
+    const siteFolder = (await rl.question('Astro package/folder name (e.g., my-new-site) [kama-starter]: ')).trim() || 'kama-starter';
 
     let siteDomain = 'localhost:4321';
     let cmsFullUrl = 'http://localhost:8787';
@@ -405,7 +444,9 @@ async function createNewSiteOnly() {
 
     await generateAstroSite(rootDir, siteFolder, siteDomain, cmsFullUrl, targetWorkerName, isCloudflare);
 
-    console.log(`\n✨ Site created in sites/${siteFolder}! Run 'npm install' at workspace root.`);
+    console.log(`\n✨ Site created in sites/${siteFolder}!`);
+    console.log(`📦 Run 'npm install' at workspace root.`);
+    console.log(`🌱 Run 'npm run dev' to boot up and seed the new site data.`);
 }
 
 /**
@@ -588,12 +629,58 @@ async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsFullUrl, wo
         writeFileSync(wranglerPath, wranglerStr);
     }
 
+    // 🎯 FIX: Smart capitalization for dynamic site labels
+    const siteLabel = siteFolder.split(/[-_]/).map(word => word.charAt(0).toUpperCase() + word.slice(1)).join(' ');
+    const safeSiteLabel = siteLabel.replace(/'/g, "''");
+
+    const channelKey = siteFolder.replace(/[^a-z0-9_-]/gi, '-').toLowerCase();
+    const treeKey = `${channelKey}-nav`;
+
+    // 🎯 FIX: Inject `safeSiteLabel` into the logoText, titleSuffix, and titles!
+    const seedSql = `
+-- Seed data for site: ${safeSiteLabel}
+INSERT OR IGNORE INTO channels (key, label, channelType, defaultLanguage, isHidden, dataJson)
+VALUES ('${channelKey}', '${safeSiteLabel}', 'website', 'en', 0, '{}');
+
+INSERT OR IGNORE INTO trees (key, label, treeType, channelId, isHidden, dataJson)
+VALUES ('${treeKey}', 'Main Navigation', 'main-navigation', (SELECT id FROM channels WHERE key = '${channelKey}'), 0, '{}');
+
+INSERT OR IGNORE INTO channel_trees (channelId, treeId, key)
+VALUES ((SELECT id FROM channels WHERE key = '${channelKey}'), (SELECT id FROM trees WHERE key = '${treeKey}'), 'main');
+
+INSERT INTO content_nodes (contentType, title, slug, language, status, dataJson)
+SELECT 'page', 'Welcome to ${safeSiteLabel}', 'home', 'en', 'published', '{"titleSuffix":"– ${safeSiteLabel}","layoutId":"single-column","subpageLayoutId":"two-column","logoText":"${safeSiteLabel}"}'
+WHERE NOT EXISTS (SELECT 1 FROM content_nodes WHERE slug = 'home' AND title = 'Welcome to ${safeSiteLabel}');
+
+INSERT OR IGNORE INTO node_channels (nodeId, channelId)
+VALUES (
+  (SELECT id FROM content_nodes WHERE slug = 'home' AND title = 'Welcome to ${safeSiteLabel}' ORDER BY id DESC LIMIT 1),
+  (SELECT id FROM channels WHERE key = '${channelKey}')
+);
+
+INSERT OR IGNORE INTO tree_nodes (treeId, contentId, parentId, sortOrder)
+VALUES (
+  (SELECT id FROM trees WHERE key = '${treeKey}'),
+  (SELECT id FROM content_nodes WHERE slug = 'home' AND title = 'Welcome to ${safeSiteLabel}' ORDER BY id DESC LIMIT 1),
+  NULL,
+  0
+);
+`;
+
+    const workerDir = join(rootDir, 'kama-worker');
+    const seedPath = join(workerDir, 'seed.sql');
+    if (existsSync(workerDir)) {
+        appendFileSync(seedPath, seedSql);
+    }
+
+    // 🎯 FIX: Expose the title-cased name to Astro ENV vars as well
     const envContent = [
         `PUBLIC_CMS_URL="${cmsFullUrl}"`,
         `PUBLIC_API_URL="${cmsFullUrl}"`,
-        `PUBLIC_CHANNEL_ID="website"`,
-        `PUBLIC_TREE_ID="main-navigation"`,
-        `PUBLIC_SITE_NAME="KAMA Starter"`
+        `PUBLIC_CHANNEL_ID="${channelKey}"`,
+        `PUBLIC_TREE_ID="${treeKey}"`,
+        `PUBLIC_HOME_SLUG="home"`,
+        `PUBLIC_SITE_NAME="${siteLabel.replace(/"/g, '\\"')}"`
     ].join('\n') + '\n';
 
     writeFileSync(join(siteDir, '.env'), envContent);

package/content/definitions/channels/website.yaml

@@ -11,6 +11,30 @@ tabs:
     fields:
       # 🎯 1. Natively merges channel-base fields into this tab
       fieldSet: channel-base
+  design:
+    label: "Design"
+    fields:
+      favicon:
+        label: "Favicon"
+        type: image
+        maxPreviewWidth: 200px
+        multiple: true
+        allowedTypes: ["image/png", "image/x-icon", "image/svg"]
+        public: true
+      logoText:
+        label: Logo Text
+        type: text
+        required: false
+        public: true
+
+      logoImage:
+        label: "Logo Image"
+        type: image
+        maxPreviewWidth: 300px
+        multiple: false
+        allowedTypes: ["image/svg"]
+        public: true
+
   meta:
     label: "SEO"
     fields:

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

@@ -21,14 +21,11 @@ regions:
     allowedTypes: ["image/*"]
     crops:
       standard:
-        label: "Desktop Header (4:1)"
-        aspectRatio: 4.0
+        label: "Desktop Header (3:1)"
+        aspectRatio: 3.0
       tablet:
         label: "Tablet Header (2:1)"
         aspectRatio: 2.0
-      mobile:
-        label: "Mobile Header (4:3)"
-        aspectRatio: 1.33
     public: true
 
   content:

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

@@ -22,14 +22,11 @@ regions:
     allowedTypes: ["image/*"]
     crops:
       standard:
-        label: "Desktop Header (4:1)"
-        aspectRatio: 4.0
+        label: "Desktop Header (3:1)"
+        aspectRatio: 3.0
       tablet:
         label: "Tablet Header (2:1)"
         aspectRatio: 2.0
-      mobile:
-        label: "Mobile Header (4:3)"
-        aspectRatio: 1.33
     public: true
   content: # 👈 Changed 'main' to 'content'
     label: Content

package/content/definitions/nodes/page.yaml

@@ -16,7 +16,22 @@ tabs:
       # 🎯 1. Include FieldSet Bundle
       - fieldSet: page-base
 
-      # 🎯 3. Inline Fields
+      - logoText:
+          label: Logo Text
+          type: text
+          required: false
+          public: true
+          inherits: logoText
+
+      - logoImage:
+          label: "Logo Image"
+          type: image
+          maxPreviewWidth: 300px
+          multiple: false
+          allowedTypes: ["image/svg"]
+          public: true
+          inherits: logoImage
+
       - layoutId:
           label: Page Layout
           type: layout-select
@@ -26,7 +41,6 @@ tabs:
           allowedLayouts:
             - two-column
             - single-column
-            - three-column
             - landing-page
           options:
             - { label: "Inherit Layout", value: "inherit" }
@@ -39,7 +53,6 @@ tabs:
           inheritsFromParent: true
           allowedLayouts:
             - two-column
-            - three-column
             - single-column
             - landing-page
           options: