@brightsideoy/kama 0.1.0-alpha.143 → 0.1.0-alpha.146

package/bin/cli.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import { execSync } from 'node:child_process';
-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 { existsSync, mkdirSync, writeFileSync, readFileSync, readdirSync, cpSync, statSync, unlinkSync, appendFileSync } from 'node:fs';
+import { join, dirname, basename, resolve, relative } from 'node:path';
+import { fileURLToPath, pathToFileURL } from 'node:url';
 import * as readline from 'node:readline/promises';
 
 // Dynamically resolve current package version
@@ -30,7 +30,7 @@ function showHelp() {
     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('  bundle       Compile and bundle YAML schemas into bundled-definitions.js for Edge deployment');
     console.log('  promote      Promote the current Local workspace to Cloudflare Edge');
     console.log('  help, -h     Show this help message\n');
 
@@ -71,7 +71,7 @@ async function main() {
         console.log('Available Commands:');
         console.log('  1) npx kama init         - Kickstart new Monorepo (CMS + Optional Site)');
         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('  3) npx kama bundle       - Compile and 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');
 
@@ -110,9 +110,9 @@ async function createFullWorkspace() {
     const projName = isCurrentDir ? cwdName : chosenFolder;
     const rootDir = isCurrentDir ? process.cwd() : join(process.cwd(), projName);
 
-    console.log('\n🌍 Where do you plan to deploy KAMA?');
-    console.log('  1) Local Development Only (SQLite / Testing)');
-    console.log('  2) Cloudflare Edge (Workers / D1 / R2)');
+    console.log('\n🌍 Choose your Deployment Architecture:');
+    console.log('  1) VPS / Local Server (Node.js, SQLite, Sharp cropping)');
+    console.log('  2) Cloudflare Edge (Workers, D1, R2, CF Image Resizing)');
     const envChoice = await rl.question('\nChoice [1/2]: ');
     const isCloudflare = envChoice.trim() === '2';
 
@@ -150,16 +150,7 @@ async function createFullWorkspace() {
 
     writeFileSync(
         join(rootDir, '.gitignore'),
-        `node_modules/
-.env
-.DS_Store
-kama-worker/.dev.vars
-kama-worker/.wrangler/
-sites/*/.env
-sites/*/.astro/
-sites/*/dist/
-kama-worker/workspace-schemas.js
-`
+        `node_modules/\n.env\n.DS_Store\nkama-worker/.dev.vars\nkama-worker/.env\nkama-worker/.wrangler/\nkama-worker/public/\nkama-worker/*.db\nsites/*/.env\nsites/*/.astro/\nsites/*/dist/\nkama-worker/bundled-definitions.js\n`
     );
 
     console.log(`\n📄 Copying default content definitions...`);
@@ -239,7 +230,7 @@ kama-worker/workspace-schemas.js
             console.log(`⚠️ Skipping database creation. We'll leave a placeholder in wrangler.json.`);
         }
     } else {
-        console.log(`\n💻 Local mode selected. Skipping Cloudflare authentication and domain setup...`);
+        console.log(`\n💻 Local VPS mode selected. Skipping Cloudflare authentication and domain setup...`);
     }
 
     const rootScripts = {
@@ -257,21 +248,18 @@ kama-worker/workspace-schemas.js
             '@brightsideoy/kama': currentKamaVersion,
         },
         devDependencies: {
-            'wrangler': '^4.130.0'
+            'wrangler': '^4.0.0'
         }
     };
 
-    const bundleScript = 'npx kama bundle || node ./node_modules/@brightsideoy/kama/bin/cli.js bundle';
-
     if (shouldCreateSite) {
         rootPkg.devDependencies['concurrently'] = '^9.0.0';
         rootPkg.scripts['dev:site'] = `npm run dev -w sites/${siteFolderName}`;
-
-        rootPkg.scripts['predev'] = bundleScript;
+        rootPkg.scripts['predev'] = 'npx kama bundle';
         rootPkg.scripts['dev'] = 'npx concurrently "npm run dev:cms" "npm run dev:site"';
         rootPkg.scripts['deploy:site'] = `npm run deploy -w sites/${siteFolderName}`;
     } else {
-        rootPkg.scripts['predev'] = bundleScript;
+        rootPkg.scripts['predev'] = 'npx kama bundle';
         rootPkg.scripts['dev'] = 'npm run dev:cms';
     }
 
@@ -286,93 +274,183 @@ kama-worker/workspace-schemas.js
 
     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';
+    // 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';
 
 export default {
   async fetch(request, env, ctx) {
-    const resolvedSchemas = customSchemas.default || customSchemas;
-    env.BUNDLED_DEFINITIONS = resolvedSchemas;
+    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') {
-      return kamaWorker.fetch(request, env, ctx);
+      return kamaWorker.fetch(request, customEnv, ctx);
     }
     
     if (kamaWorker && kamaWorker.app && typeof kamaWorker.app.fetch === 'function') {
-      return kamaWorker.app.fetch(request, env, ctx);
+      return kamaWorker.app.fetch(request, customEnv, ctx);
     }
     
     return new Response('Kama Engine Worker Ready', { status: 200 });
   }
 };
 `;
-
-    writeFileSync(join(cmsDir, 'index.js'), cmsWorkerIndexContent);
-
-    writeFileSync(
-        join(cmsDir, 'package.json'),
-        JSON.stringify({
+        writeFileSync(join(cmsDir, 'index.js'), cmsWorkerIndexContent);
+
+        writeFileSync(
+            join(cmsDir, 'package.json'),
+            JSON.stringify({
+                name: workerName,
+                type: 'module',
+                version: '1.0.0',
+                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`,
+                    "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 --remote --log-level warn --inspector-port=9230",
+                    "deploy": "npm run schema:remote && npm run seed:remote && wrangler deploy"
+                },
+                dependencies: {
+                    '@brightsideoy/kama': currentKamaVersion,
+                    '@libsql/client': '^0.14.0'
+                },
+                devDependencies: {
+                    "wrangler": "^4.0.0"
+                },
+            }, null, 2)
+        );
+
+        const cmsWranglerConfig = {
+            $schema: '../node_modules/wrangler/config-schema.json',
             name: workerName,
-            type: 'module',
-            version: '1.0.0',
-            scripts: {
-                "bundle": "npx kama bundle",
-                "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`,
-                "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 bundle && npm run schema:local && npm run seed:local && wrangler dev",
-                "deploy": "npm run bundle && npm run schema:remote && npm run seed:remote && wrangler deploy"
+            main: 'index.js',
+            compatibility_date: '2024-09-23',
+            compatibility_flags: ['nodejs_compat'],
+            assets: {
+                directory: '../node_modules/@brightsideoy/kama/dist',
+                binding: 'ASSETS'
             },
-            dependencies: {
-                '@brightsideoy/kama': currentKamaVersion,
+            images: {
+                binding: 'IMAGES'
             },
-            devDependencies: {
-                "wrangler": "^4.130.0",
-                "tsx": "^4.19.2",
+            vars: {
+                CDN_DOMAIN: cmsDomain,
+                PUBLIC_FRONTEND_URL: (shouldCreateSite) ? `https://${siteDomain}` : 'http://localhost:4321',
+                CLOUDFLARE_ZONE_ID: "REPLACE_WITH_YOUR_32_CHAR_ZONE_ID",
+                KAMA_RUNTIME: 'cloudflare'
             },
-        }, null, 2)
-    );
+            d1_databases: [{
+                binding: 'DB',
+                database_name: dbName,
+                database_id: d1DatabaseId,
+            }],
+            r2_buckets: [{
+                binding: 'MEDIA_BUCKET',
+                bucket_name: bucketName,
+            }],
+            routes: [{ pattern: cmsDomain, custom_domain: true }]
+        };
+
+        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';
+import * as localBundle from './bundled-definitions.js';
+import dotenv from 'dotenv';
+import { readFileSync, existsSync } from 'node:fs';
+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',
+  '../../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.');
+}
 
-    const cmsWranglerConfig = {
-        $schema: '../node_modules/wrangler/config-schema.json',
-        name: workerName,
-        main: 'index.js',
-        compatibility_date: '2026-08-01',
-        compatibility_flags: ['nodejs_compat'],
-        assets: {
-            directory: '../node_modules/@brightsideoy/kama/dist',
-            binding: 'ASSETS'
-        },
-        images: {
-            binding: 'IMAGES'
-        },
-        vars: {
-            CDN_DOMAIN: cmsDomain,
-            PUBLIC_FRONTEND_URL: (isCloudflare && shouldCreateSite) ? `https://${siteDomain}` : 'http://localhost:4321',
-            CLOUDFLARE_ZONE_ID: isCloudflare ? "REPLACE_WITH_YOUR_32_CHAR_ZONE_ID" : "local-zone-not-needed"
-        },
-        d1_databases: [{
-            binding: 'DB',
-            database_name: dbName,
-            database_id: d1DatabaseId,
-        }],
-        r2_buckets: [{
-            binding: 'MEDIA_BUCKET',
-            bucket_name: bucketName,
-        }],
-    };
+kamaApp.use('*', async (c, next) => {
+  c.env = { 
+    ...process.env, 
+    ...c.env, 
+    BUNDLED_DEFINITIONS: localBundle.BUNDLED_DEFINITIONS, 
+    KAMA_RUNTIME: 'node' 
+  };
+  await next();
+});
 
-    if (isCloudflare) {
-        cmsWranglerConfig.routes = [{ pattern: cmsDomain, custom_domain: true }];
+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();
+  });
+}
 
-    writeFileSync(join(cmsDir, 'wrangler.json'), JSON.stringify(cmsWranglerConfig, null, 2));
+const port = process.env.PORT || 8787;
+console.log(\`🔥 Kama Node Server & Admin UI running on http://localhost:\${port}\`);
+if (distPath) console.log(\`👉 Serving Admin UI from: \${distPath}\`);
 
-    writeFileSync(
-        join(cmsDir, '.dev.vars'),
-        `# Cloudflare Edge Cache Purging Secrets\nCLOUDFLARE_API_TOKEN=${isCloudflare ? 'cfut_YOUR_CUSTOM_PURGE_TOKEN' : 'local_token'}\n`
-    );
+serve({ fetch: kamaApp.fetch, port });
+`;
+        writeFileSync(join(cmsDir, 'server.js'), nodeServerContent);
+
+        writeFileSync(
+            join(cmsDir, 'package.json'),
+            JSON.stringify({
+                name: workerName,
+                type: 'module',
+                version: '1.0.0',
+                scripts: {
+                    "schema:local": "sqlite3 kama.db < ../node_modules/@brightsideoy/kama/schema.sql",
+                    "seed:local": "sqlite3 kama.db < seed.sql",
+                    "dev": "npm run schema:local && npm run seed:local && tsx server.js",
+                    "start": "node server.js"
+                },
+                dependencies: {
+                    '@brightsideoy/kama': currentKamaVersion,
+                    '@hono/node-server': '^1.13.0',
+                    '@libsql/client': '^0.14.0',
+                    'sharp': '^0.33.5',
+                    'dotenv': '^16.4.5'
+                },
+                devDependencies: {
+                    "tsx": "^4.19.0"
+                },
+            }, null, 2)
+        );
+
+        writeFileSync(join(cmsDir, '.env'), `PORT=8787
+KAMA_RUNTIME=node
+DB_PATH=./kama.db
+LOCAL_MEDIA_PATH=./public/media
+PUBLIC_CMS_URL=${cmsFullUrl}
+PUBLIC_FRONTEND_URL=${shouldCreateSite ? `http://${siteDomain}` : 'http://localhost:4321'}
+`);
+    }
 
     await bundleWorkspaceSchemas(rootDir);
 
@@ -425,7 +503,7 @@ async function createNewSiteOnly() {
     }
 
     console.log('\n🌍 Deployment Mode:');
-    console.log('  1) Local Development');
+    console.log('  1) VPS / Local Server (Node.js)');
     console.log('  2) Cloudflare Edge');
     const envChoice = await rl.question('\nChoice [1/2]: ');
     const isCloudflare = envChoice.trim() === '2';
@@ -450,65 +528,30 @@ async function createNewSiteOnly() {
 
 /**
  * COMMAND: npx kama bundle
- * Reads YAML from workspace and builds a static module for the worker
+ * Loads the pre-compiled JS compiler natively without runtime tsx/type-stripping issues!
  */
 async function bundleWorkspaceSchemas(targetRootDir) {
     let rootDir = targetRootDir || process.cwd();
 
-    // Fix directory target if executed directly inside the worker package
     if (basename(rootDir) === 'kama-worker') {
         rootDir = resolve(rootDir, '..');
     }
 
-    const defsDir = join(rootDir, 'content', 'definitions');
-    const workerDir = join(rootDir, 'kama-worker');
-
-    if (!existsSync(defsDir)) {
-        console.warn(`\n⚠️  Skipping schema bundling: 'content/definitions' folder not found at ${defsDir}`);
-        return;
-    }
-
-    console.log(`\n📦 Bundling workspace YAML schemas for Edge deployment...`);
+    try {
+        // 1. First preference: built JavaScript bundle in node_modules/dist
+        let compilerPath = join(__dirname, '../dist/schema-compiler.js');
 
-    function crawlDirectory(dir, baseDir, result = {}) {
-        if (!existsSync(dir)) return result;
-        const items = readdirSync(dir);
-        for (const item of items) {
-            const fullPath = join(dir, item);
-            if (existsSync(fullPath) && statSync(fullPath).isDirectory()) {
-                crawlDirectory(fullPath, baseDir, result);
-            } else if (fullPath.endsWith('.yaml') || fullPath.endsWith('.yml')) {
-                const relativePath = './' + relative(baseDir, fullPath).replace(/\\/g, '/');
-                result[relativePath] = readFileSync(fullPath, 'utf-8');
-            }
+        // 2. Fallback for local monorepo dev where ts source exists
+        if (!existsSync(compilerPath)) {
+            compilerPath = join(__dirname, '../scripts/schema-compiler.ts');
         }
-        return result;
-    }
-
-    const rawGlobs = {
-        nodes: crawlDirectory(join(defsDir, 'nodes'), defsDir),
-        trees: crawlDirectory(join(defsDir, 'trees'), defsDir),
-        blocks: crawlDirectory(join(defsDir, 'blocks'), defsDir),
-        nodeLayouts: crawlDirectory(join(defsDir, 'node-layouts'), defsDir),
-        blockLayouts: crawlDirectory(join(defsDir, 'block-layouts'), defsDir),
-        fieldSets: crawlDirectory(join(defsDir, 'field-sets'), defsDir),
-        channels: crawlDirectory(join(defsDir, 'channels'), defsDir),
-    };
-
-    const fileContent = `// AUTO-GENERATED BUNDLE - DO NOT EDIT
-// This file is generated by 'npx kama bundle' prior to local dev or deployment.
-
-export default ${JSON.stringify(rawGlobs, null, 2)};
-`;
 
-    if (!existsSync(workerDir)) {
-        mkdirSync(workerDir, { recursive: true });
+        // 🎯 Native Node ESM Import — Loads pure JS with zero runtime type-stripping errors!
+        const compilerUrl = pathToFileURL(compilerPath).href;
+        await import(compilerUrl);
+    } catch (e) {
+        console.error(`❌ Schema compilation failed:`, e.message || e);
     }
-
-    const outPath = join(workerDir, 'workspace-schemas.js');
-    writeFileSync(outPath, fileContent, 'utf-8');
-
-    console.log(`✅ Schema bundle generated successfully at ${outPath}`);
 }
 
 /**
@@ -638,29 +681,35 @@ async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsFullUrl, wo
     const safeSiteLabel = siteLabel.replace(/'/g, "''");
 
     const channelKey = siteFolder.replace(/[^a-z0-9_-]/gi, '-').toLowerCase();
-    const treeKey = `${channelKey}-nav`;
+    const treeKey = 'main-tree';
 
     const seedSql = `
 -- Seed data for site: ${safeSiteLabel}
+
+-- 1. Create the Channel
 INSERT OR IGNORE INTO channels (key, label, channelType, defaultLanguage, isHidden, dataJson)
 VALUES ('${channelKey}', '${safeSiteLabel}', 'website', 'en', 0, '{}');
 
+-- 2. Create the Tree and link it to the Channel
 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, '{}');
+VALUES ('${treeKey}', 'Main Tree', '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');
 
+-- 3. Create the Home Page
 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}');
 
+-- 4. Attach the Home Page to the Channel
 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}')
 );
 
+-- 5. Attach the Home Page to the Main Tree
 INSERT OR IGNORE INTO tree_nodes (treeId, contentId, parentId, sortOrder)
 VALUES (
   (SELECT id FROM trees WHERE key = '${treeKey}'),

package/definitions/_page.yaml

@@ -0,0 +1,52 @@
+id: _page
+label: Page Old
+inTree: true
+inVault: true
+hasCanvas: true
+
+layout:
+  columns: "10fr 4fr"
+  areas:
+    - ["header", "header"]
+    - ["main", "sidebar"]
+    - ["footer", "footer"]
+
+regions:
+  header:
+    label: Header
+    inherit: parent
+  main:
+    label: Content
+  sidebar:
+    label: Sidebar
+  footer:
+    label: Footer
+    inherit: parent
+
+allowedBlocks:
+  - header
+  - hero
+  - text
+  - image_card
+
+# 👉 TABS DEFINITION
+tabs:
+  settings:
+    label: "Page"
+    fields:
+      # Imports core fields: title, slug, isHidden
+      - fieldSet: page-base
+
+      # Overrides & custom properties
+      - menuTitle:
+          label: Menu Title
+          type: text
+          dbType: text
+          public: true
+          placeholder: "Short title for navigation menus"
+
+      # SEO / OpenGraph metadata
+      - fieldSet: meta
+
+      # Role permissions & access control
+      - fieldSet: access