@brightsideoy/kama 0.1.0-alpha.114 → 0.1.0-alpha.116

package/README.md

@@ -81,7 +81,7 @@ KAMA doesn't just serve content; it actively manages its lifecycle across the gl
 
 At the heart of KAMA is the Schema Engine. Instead of complex database migrations, you define your content models, layouts, and reusable blocks in simple YAML files. KAMA dynamically bundles these definitions at build-time to auto-generate your entire Admin UI, database indexes, and API endpoints.
 
-**[Read the full Schema Documentation here](documentation/SCHEMAS.md)**
+**[Read the full Schema Documentation here](/@brightsideoy/kama/documentation/SCHEMAS.md)**
 
 <br>
 

package/bin/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { execSync } from 'node:child_process';
-import { existsSync, mkdirSync, writeFileSync, readFileSync, readdirSync, cpSync, unlinkSync } from 'node:fs';
-import { join, dirname, basename } from 'node:path';
+import { existsSync, mkdirSync, writeFileSync, readFileSync, readdirSync, cpSync, unlinkSync, statSync } from 'node:fs';
+import { join, dirname, basename, relative, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import * as readline from 'node:readline/promises';
 
@@ -37,16 +37,21 @@ async function main() {
         await createNewSiteOnly();
     } else if (command === 'promote') {
         await promoteLocalToCloudflare();
+    } else if (command === 'bundle') {
+        await bundleWorkspaceSchemas();
     } else {
         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 promote      - Promote current Local workspace to Cloudflare Edge');
+        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');
 
-        const choice = await rl.question('\nSelect choice [1/2/3]: ');
+        const choice = await rl.question('\nSelect choice [1/2/3/4]: ');
 
-        if (choice.trim() === '3') {
+        if (choice.trim() === '4') {
             await promoteLocalToCloudflare();
+        } else if (choice.trim() === '3') {
+            await bundleWorkspaceSchemas();
         } else if (choice.trim() === '2') {
             await createNewSiteOnly();
         } else {
@@ -115,31 +120,23 @@ async function createFullWorkspace() {
 .env
 .DS_Store
 kama-worker/.dev.vars
-kama-worker/bundled-definitions.js
-kama-worker/bundled-definitions.ts
 kama-worker/.wrangler/
 sites/*/.env
 sites/*/.astro/
 sites/*/dist/
+kama-worker/workspace-schemas.js
 `
     );
 
-    const schemaCategories = [
-        'block-layouts',
-        'blocks',
-        'channels',
-        'field-sets',
-        'node-layouts',
-        'nodes',
-        'trees'
-    ];
-
-    for (const category of schemaCategories) {
-        mkdirSync(join(rootDir, 'content', 'definitions', category), { recursive: true });
+    console.log(`\n📄 Copying default content definitions...`);
+    const sourceDefsDir = join(__dirname, '../content/definitions');
+    const targetDefsDir = join(rootDir, 'content', 'definitions');
+    if (existsSync(sourceDefsDir)) {
+        cpSync(sourceDefsDir, targetDefsDir, { recursive: true });
+    } else {
+        console.warn(`⚠️ Could not find default content definitions at ${sourceDefsDir}`);
     }
 
-    scaffoldSampleSchemas(rootDir);
-
     let d1DatabaseId = '00000000-0000-0000-0000-000000000000';
     let isAuthenticated = false;
 
@@ -212,9 +209,8 @@ sites/*/dist/
     }
 
     const rootScripts = {
-        'bundle:schemas': 'node node_modules/@brightsideoy/kama/scripts/bundle-definitions.js',
-        'dev:cms': 'npm run bundle:schemas && npm run dev -w kama-worker',
-        'deploy:cms': 'npm run bundle:schemas && npm run deploy -w kama-worker',
+        'dev:cms': 'npm run dev -w kama-worker',
+        'deploy:cms': 'npm run deploy -w kama-worker',
     };
 
     const rootPkg = {
@@ -226,15 +222,23 @@ sites/*/dist/
         dependencies: {
             '@brightsideoy/kama': currentKamaVersion,
         },
-        devDependencies: {}
+        devDependencies: {
+            'wrangler': '^4.130.0' // 🎯 UPDATED TO V4
+        }
     };
 
+    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}`;
+
+        // 🎯 Inject schema bundling hook with fallback execution path
+        rootPkg.scripts['predev'] = bundleScript;
         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['dev'] = 'npm run dev:cms';
     }
 
@@ -247,20 +251,20 @@ sites/*/dist/
     const cmsDir = join(rootDir, 'kama-worker');
     mkdirSync(cmsDir, { recursive: true });
 
+    // 🎯 Worker entry point now attempts to load the workspace schemas
     const cmsWorkerIndexContent = `import kamaWorker from '@brightsideoy/kama';
-import * as bundledModule from './bundled-definitions.js';
-
-const BUNDLED_DEFINITIONS = bundledModule.BUNDLED_DEFINITIONS || bundledModule;
+import customSchemas from './workspace-schemas.js';
 
 export default {
   async fetch(request, env, ctx) {
-    const customEnv = {
-      ...env,
-      BUNDLED_DEFINITIONS,
-    };
-
-    return kamaWorker.fetch(request, customEnv, ctx);
-  },
+    if (typeof kamaWorker === 'function') {
+      return kamaWorker(request, env, ctx, customSchemas);
+    }
+    if (kamaWorker && typeof kamaWorker.fetch === 'function') {
+      return kamaWorker.fetch(request, env, ctx, customSchemas);
+    }
+    return new Response('Kama Engine Worker Ready', { status: 200 });
+  }
 };
 `;
 
@@ -273,9 +277,9 @@ export default {
             type: 'module',
             version: '1.0.0',
             scripts: {
-                "bundle:schemas": "node ../node_modules/@brightsideoy/kama/scripts/bundle-definitions.js",
-                "schema:local": `npm run bundle:schemas && wrangler d1 execute ${dbName} --local --file=../node_modules/@brightsideoy/kama/schema.sql`,
-                "schema:remote": `npm run bundle:schemas && wrangler d1 execute ${dbName} --remote --file=../node_modules/@brightsideoy/kama/schema.sql`,
+                // 🎯 SILENCED SQL ARRAYS ON LOCAL DEV
+                "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"
             },
@@ -283,8 +287,8 @@ export default {
                 '@brightsideoy/kama': currentKamaVersion,
             },
             devDependencies: {
-                wrangler: '^4.0.0',
-                tsx: '^4.19.2',
+                "wrangler": "^4.130.0", // 🎯 UPDATED TO V4
+                "tsx": "^4.19.2",
             },
         }, null, 2)
     );
@@ -329,6 +333,9 @@ export default {
         `# Cloudflare Edge Cache Purging Secrets\nCLOUDFLARE_API_TOKEN=${isCloudflare ? 'cfut_YOUR_CUSTOM_PURGE_TOKEN' : 'local_token'}\n`
     );
 
+    // Attempt an initial bundle right away so it exists before the user runs anything
+    await bundleWorkspaceSchemas(rootDir);
+
     if (shouldCreateSite) {
         await generateAstroSite(rootDir, siteFolderName, siteDomain, cmsFullUrl, workerName, isCloudflare);
     } else {
@@ -399,6 +406,63 @@ async function createNewSiteOnly() {
     console.log(`\n✨ Site created in sites/${siteFolder}! Run 'npm install' at workspace root.`);
 }
 
+/**
+ * COMMAND: npx kama bundle
+ * Reads YAML from workspace and builds a static module for the worker
+ */
+async function bundleWorkspaceSchemas(targetRootDir) {
+    const rootDir = targetRootDir || process.cwd();
+    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...`);
+
+    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');
+            }
+        }
+        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 });
+    }
+
+    const outPath = join(workerDir, 'workspace-schemas.js');
+    writeFileSync(outPath, fileContent, 'utf-8');
+
+    console.log(`✅ Schema bundle generated successfully at ${outPath}`);
+}
+
 /**
  * COMMAND: npx kama promote
  * Promote current Local workspace to Cloudflare Edge
@@ -480,114 +544,7 @@ async function promoteLocalToCloudflare() {
 }
 
 /**
- * Helper: Scaffolds initial starter schemas for all category folders
- */
-function scaffoldSampleSchemas(rootDir) {
-    const defsDir = join(rootDir, 'content', 'definitions');
-
-    writeFileSync(join(defsDir, 'channels', 'website.yaml'), `id: website
-label: Main Website
-defaultLanguage: en
-languages:
-  - en
-  - fi
-`);
-
-    writeFileSync(join(defsDir, 'nodes', 'page.yaml'), `id: page
-label: Page
-inTree: true
-inVault: false
-hasCanvas: true
-tabs:
-  settings:
-    label: Settings
-    fields:
-      title:
-        label: Page Title
-        type: text
-        required: true
-      slug:
-        label: URL Slug
-        type: slug
-        linkedTo: title
-`);
-
-    writeFileSync(join(defsDir, 'nodes', 'article.yaml'), `id: article
-label: Article
-inTree: false
-inVault: true
-hasCanvas: true
-tabs:
-  settings:
-    label: Settings
-    fields:
-      title:
-        label: Title
-        type: text
-        required: true
-      slug:
-        label: Slug
-        type: slug
-        linkedTo: title
-`);
-
-    writeFileSync(join(defsDir, 'blocks', 'hero.yaml'), `id: hero
-label: Hero Section
-fields:
-  heading:
-    label: Heading
-    type: text
-    required: true
-  subheading:
-    label: Subheading
-    type: text
-`);
-
-    writeFileSync(join(defsDir, 'blocks', 'text.yaml'), `id: text
-label: Text Block
-fields:
-  content:
-    label: Content
-    type: richtext
-`);
-
-    writeFileSync(join(defsDir, 'block-layouts', 'two-column.yaml'), `id: two-column
-label: Two Column Layout
-regions:
-  left:
-    label: Left Column
-  right:
-    label: Right Column
-`);
-
-    writeFileSync(join(defsDir, 'node-layouts', 'single-column.yml'), `id: single-column
-label: Single Column Page
-regions:
-  main:
-    label: Main Content Area
-`);
-
-    writeFileSync(join(defsDir, 'field-sets', 'page-base.yaml'), `id: page-base
-label: Base Page Fields
-fields:
-  metaTitle:
-    label: Meta Title
-    type: text
-  metaDescription:
-    label: Meta Description
-    type: text
-`);
-
-    writeFileSync(join(defsDir, 'trees', 'navigation.yaml'), `id: navigation
-label: Main Navigation Tree
-maxDepth: 3
-allowedNodeTypes:
-  - page
-`);
-}
-
-/**
- * Helper: Copies the Astro starter template and configures environment variables
+ * Helper: Copies the Astro starter template and hydrates runtime tokens
  */
 async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsFullUrl, workerName = 'kama-worker', isCloudflare = false) {
     console.log(`\n🚀 Scaffolding Astro site (${siteFolder}) mapped to ${siteDomain} (Service: ${workerName})...`);
@@ -601,10 +558,10 @@ async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsFullUrl, wo
         return;
     }
 
-    // 1. Copy the full template structure recursively
+    // 1. Copy the full, complete starter template directory directly
     cpSync(templateDir, siteDir, { recursive: true });
 
-    // 2. Hydrate package.json template with dynamic values
+    // 2. Hydrate package.json from template
     const templatePkgPath = join(siteDir, 'package.json.template');
     if (existsSync(templatePkgPath)) {
         const pkgContent = readFileSync(templatePkgPath, 'utf-8')
@@ -615,81 +572,33 @@ async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsFullUrl, wo
         unlinkSync(templatePkgPath);
     }
 
-    // 3. Generate dynamic wrangler.json configuration for the frontend
-    const siteWranglerConfig = {
-        $schema: 'node_modules/wrangler/config-schema.json',
-        name: siteFolder,
-        compatibility_date: '2026-08-01',
-        compatibility_flags: ['nodejs_compat'],
-        assets: {
-            directory: './dist/client',
-            binding: 'ASSETS',
-            html_handling: 'drop-trailing-slash',
-            not_found_handling: '404-page',
-            run_worker_first: true
-        },
-        services: [{ binding: 'CMS_WORKER', service: workerName }],
-        kv_namespaces: [{ binding: "HTML_CACHE", id: "REPLACE_WITH_YOUR_KV_ID", preview_id: "LOCAL_DEV_KV" }],
-        vars: {
-            PUBLIC_CMS_URL: cmsFullUrl,
-            PUBLIC_API_URL: cmsFullUrl,
-        },
-    };
-
-    if (isCloudflare) {
-        siteWranglerConfig.routes = [{ pattern: siteDomain, custom_domain: true }];
-    }
-
-    writeFileSync(
-        join(siteDir, 'wrangler.json'),
-        JSON.stringify(siteWranglerConfig, null, 2)
-    );
+    // 3. Hydrate wrangler.json tokens
+    const wranglerPath = join(siteDir, 'wrangler.json');
+    if (existsSync(wranglerPath)) {
+        let wranglerStr = readFileSync(wranglerPath, 'utf-8')
+            .replace(/\{\{SITE_NAME\}\}/g, siteFolder)
+            .replace(/\{\{WORKER_NAME\}\}/g, workerName)
+            .replace(/\{\{CMS_URL\}\}/g, cmsFullUrl);
 
-    // 4. Create dynamic .env file
-    writeFileSync(
-        join(siteDir, '.env'),
-        `PUBLIC_CMS_URL="${cmsFullUrl}"\nPUBLIC_API_URL="${cmsFullUrl}"\n`
-    );
+        if (isCloudflare) {
+            const configObj = JSON.parse(wranglerStr);
+            configObj.routes = [{ pattern: siteDomain, custom_domain: true }];
+            wranglerStr = JSON.stringify(configObj, null, 2);
+        }
 
-    // 5. Configure Astro & Vite to bypass disk-based SSR dependency optimization
-    const cmsHostname = cmsFullUrl.replace(/^https?:\/\//, '').split(':')[0];
-    const astroConfigContent = `import { defineConfig } from 'astro/config';
-import cloudflare from '@astrojs/cloudflare';
-
-export default defineConfig({
-  output: 'server',
-  trailingSlash: 'ignore',
-  image: {
-    remotePatterns: [
-      { protocol: 'http', hostname: 'localhost', port: '8787' },
-      { protocol: '${isCloudflare ? 'https' : 'http'}', hostname: '${cmsHostname}' }
-    ]
-  },
-  build: {
-    inlineStylesheets: 'always',
-  },
-  adapter: cloudflare({
-    imageService: 'cloudflare',
-  }),
-  vite: {
-    optimizeDeps: {
-      exclude: ['cloudflare:workers', 'astro']
-    },
-    ssr: {
-      target: 'webworker',
-      noExternal: true,
-      external: ['cloudflare:workers', 'node:process']
+        writeFileSync(wranglerPath, wranglerStr);
     }
-  }
-});`;
-
-    writeFileSync(join(siteDir, 'astro.config.mjs'), astroConfigContent);
 
-    if (isCloudflare) {
-        console.log(`\n⚠️ Note for Astro Frontend: You will need to create a KV Namespace for the HTML Cache.`);
-        console.log(`   Run: npx wrangler kv:namespace create HTML_CACHE`);
-        console.log(`   Then update the ID in sites/${siteFolder}/wrangler.json`);
-    }
+    // 4. Create dynamic .env file
+    const envContent = [
+        `PUBLIC_CMS_URL="${cmsFullUrl}"`,
+        `PUBLIC_API_URL="${cmsFullUrl}"`,
+        `PUBLIC_CHANNEL_ID="website"`,
+        `PUBLIC_TREE_ID="main-navigation"`,
+        `PUBLIC_SITE_NAME="KAMA Starter"`
+    ].join('\n') + '\n';
+
+    writeFileSync(join(siteDir, '.env'), envContent);
 }
 
 main().catch(console.error);

package/content/definitions/blocks/button.yaml

@@ -4,12 +4,11 @@ group: Content
 description: Button text
 
 fields:
-  - text:
-      label: Text
-      type: richtext
-      editor: button
-      public: true
+  text:
+    label: Text
+    type: richtext
+    editor: button
+    public: true
 
-  - fieldSet: access
-  - hidden:
-      default: false
+tabs:
+  access: !include ../field-sets/access.yaml

package/content/definitions/blocks/header.yaml

@@ -3,13 +3,11 @@ label: Header
 group: Content
 
 fields:
-  - headline:
-      type: richtext
-      editor: header
-      label: Headline
-      public: true
-      default: "Header here..."
+  headline:
+    type: richtext
+    editor: header
+    label: Headline
+    public: true
 
-  - fieldSet: access
-  - hidden:
-      default: false
+tabs:
+  access: !include ../field-sets/access.yaml

package/content/definitions/blocks/header_image.yaml

@@ -4,19 +4,18 @@ group: Media
 description: Image for page header.
 
 fields:
-  - image:
-      label: Image
-      type: asset
-      required: true
-      multiple: false
-      maxSizeMB: 15
-      allowedTypes: ["image/*"]
-      crops:
-        standard:
-          label: "Page header (21:9)"
-          aspectRatio: 2.333
-      public: true
+  image:
+    label: Image
+    type: asset
+    required: true
+    multiple: false
+    maxSizeMB: 15
+    allowedTypes: ["image/*"]
+    crops:
+      standard:
+        label: "Page header (21:9)"
+        aspectRatio: 2.333
+    public: true
 
-  - fieldSet: access
-  - hidden:
-      default: false
+tabs:
+  access: !include ../field-sets/access.yaml

package/content/definitions/blocks/hero.yaml

@@ -3,25 +3,26 @@ label: Hero
 group: Content
 
 fields:
-  - heroBadge:
-      type: text
-      label: Badge
-      public: true
-  - heroTitle:
-      type: text
-      label: Title
-      public: true
-  - heroSubTitle:
-      type: text
-      label: Sub-Title
-      public: true
-  - headline:
-      type: richtext
-      editor: header
-      label: Headline
-      public: true
-      default: "Header here..."
+  heroBadge:
+    type: text
+    label: Badge
+    public: true
 
-  - fieldSet: access
-  - hidden:
-      default: false
+  heroTitle:
+    type: text
+    label: Title
+    public: true
+
+  heroSubTitle:
+    type: text
+    label: Sub-Title
+    public: true
+
+  headline:
+    type: richtext
+    editor: header
+    label: Headline
+    public: true
+
+tabs:
+  access: !include ../field-sets/access.yaml