@brightsideoy/kama 0.1.0-alpha.142 → 0.1.0-alpha.145

package/dist/schema-compiler.js

@@ -0,0 +1,38 @@
+import { fileURLToPath as e, pathToFileURL as t } from "node:url";
+import { existsSync as n, mkdirSync as r, readFileSync as i, writeFileSync as a } from "node:fs";
+import { dirname as o, join as s } from "node:path";
+//#region scripts/schema-compiler.ts
+var c = e(import.meta.url), l = o(c);
+async function u() {
+	let e = process.cwd(), o = !1;
+	try {
+		JSON.parse(i(s(e, "package.json"), "utf-8")).name === "@brightsideoy/kama" && (o = !0);
+	} catch {}
+	let c;
+	if (o) {
+		let t = s(e, "server", "db");
+		n(t) || r(t, { recursive: !0 }), c = s(t, "bundled-definitions.js");
+	} else {
+		let t = s(e, "kama-worker");
+		n(t) || r(t, { recursive: !0 }), c = s(t, "bundled-definitions.js");
+	}
+	let u, d = s(l, "../server/schema/engine.ts"), f = s(l, "../dist/index.js");
+	if (n(d)) u = (await import(t(d).href)).compileDefinitions;
+	else if (n(f)) u = (await import(t(f).href)).compileDefinitions;
+	else try {
+		u = (await import("./dist-CZEgSuN0.js")).compileDefinitions;
+	} catch (e) {
+		console.error("❌ Could not resolve Kama Schema Engine:", e), process.exit(1);
+	}
+	u || (console.error("❌ compileDefinitions function missing from resolved module"), process.exit(1));
+	let p = u(), m = Object.keys(p?.nodes || {}).length, h = Object.keys(p?.blocks || {}).length, g = `// AUTO-GENERATED BUNDLE - DO NOT EDIT
+const defs = ${JSON.stringify(p, null, 2)};
+export const BUNDLED_DEFINITIONS = defs;
+export default defs;
+`;
+	a(c, g, "utf-8"), console.log(`✅ Schema securely compiled using engine.ts to ${c} (${m} nodes, ${h} blocks)`);
+}
+u().catch((e) => {
+	console.error("❌ Schema Compiler Runtime Error:", e), process.exit(1);
+});
+//#endregion

package/npm-test.sh

@@ -0,0 +1,75 @@
+#!/bin/bash
+
+# Exit immediately if any command fails
+set -e
+
+# Define absolute test directory path
+TEST_DIR="$(cd .. && pwd)/npm-test"
+
+echo "🧹 1. Nuking old test environment & caches..."
+rm -rf "$TEST_DIR"
+mkdir -p "$TEST_DIR"
+rm -rf ~/.npm/_npx/
+
+# 🎯 FIX 1: Nuke the global npm cache so npx doesn't silently use an old cached version of the tarball!
+npm cache clean --force
+
+# Ensure CLI binary permissions are intact
+chmod +x bin/cli.js
+
+echo "🔥 2. Building & packing KAMA package locally..."
+npm run build --loglevel error
+npm pack --loglevel error
+
+# Find the newly created tarball
+TARBALL=$(ls -1t *.tgz | head -n 1)
+
+if [ -z "$TARBALL" ]; then
+  echo "❌ Error: Failed to find the packed .tgz file."
+  exit 1
+fi
+
+mv "$TARBALL" "$TEST_DIR/"
+cd "$TEST_DIR"
+
+echo "🚀 3. Initializing test workspace..."
+echo "------------------------------------------------------"
+npx --yes --package "$TEST_DIR/$TARBALL" kama init
+echo "------------------------------------------------------"
+
+# Detect workspace root
+WORKSPACE_DIR="."
+if [ ! -f "package.json" ]; then
+  WORKSPACE_DIR=$(find . -mindepth 2 -maxdepth 2 -name "package.json" | head -n 1 | xargs dirname)
+fi
+
+if [ ! -f "$WORKSPACE_DIR/package.json" ]; then
+  echo "❌ Could not find package.json. Aborting test."
+  exit 1
+fi
+
+cd "$WORKSPACE_DIR"
+
+echo "📦 4. Installing workspace dependencies quietly..."
+npm install --loglevel error
+npm install "$TEST_DIR/$TARBALL" --save --loglevel error
+
+if [ -d "kama-worker" ]; then
+  npm install "$TEST_DIR/$TARBALL" -w kama-worker --save --loglevel error
+fi
+
+# 🎯 FIX 2: You MUST inject the local tarball into the site too!
+# Otherwise, Astro will download an old Kama package from the internet.
+if [ -d "sites/kama-starter" ]; then
+  npm install "$TEST_DIR/$TARBALL" -w sites/kama-starter --save --loglevel error
+fi
+
+echo ""
+echo "======================================================"
+echo "✨ KAMA ENVIRONMENT BOOTSTRAPPED SUCCESSFULLY!"
+echo "   - Backend Worker: http://localhost:8787"
+echo "   - Astro Site:     http://localhost:4321"
+echo "======================================================"
+echo ""
+
+npm run dev --loglevel error

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brightsideoy/kama",
-  "version": "0.1.0-alpha.142",
+  "version": "0.1.0-alpha.145",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -15,15 +15,19 @@
     "create-kama": "bin/cli.js"
   },
   "scripts": {
-    "build:schema": "tsx scripts/bundle-schemas.ts",
+    "predev": "npm run bundle:definitions && npm run build:schema",
+    "dev": "npm run dev:local",
+    "dev:local": "concurrently \"vite\" \"KAMA_RUNTIME=node tsx server/dev.ts\"",
+    "dev:cf": "concurrently \"vite\" \"wrangler dev server/index.ts\"",
+    "bundle:definitions": "node bin/cli.js bundle",
+    "build:schema": "tsx scripts/build-schema.ts",
+    "build:seed": "tsx scripts/build-seed.ts",
     "build:server": "vite build",
     "build:ui": "vite build --config vite.config.ui.ts",
-    "build": "npm run build:schema && npm run build:server && npm run build:ui",
+    "build": "npm run bundle:definitions && npm run build:schema && npm run build:server && npm run build:ui",
     "build:cms": "npm run build",
-    "predev": "npm run build:schema",
-    "dev": "concurrently \"vite\" \"tsx watch server/dev.ts\"",
-    "prepack": "npm run build && chmod +x bin/cli.js",
-    "serve": "tsx server/dev.ts"
+    "prepublishOnly": "npm run build",
+    "serve": "wrangler dev server/index.ts"
   },
   "publishConfig": {
     "access": "public"
@@ -41,7 +45,6 @@
     "@tiptap/pm": "^3.30.0",
     "@tiptap/starter-kit": "^3.30.0",
     "@tiptap/vue-3": "^3.30.0",
-    "better-sqlite3": "^13.0.3",
     "drizzle-orm": "^0.45.2",
     "hono": "^4.13.2",
     "locale-codes": "^1.3.1",
@@ -56,7 +59,7 @@
   "devDependencies": {
     "@iconify-json/heroicons": "^1.2.3",
     "@iconify-json/lucide": "^1.2.123",
-    "@types/better-sqlite3": "^9.6.0",
+    "@libsql/client": "^0.14.0",
     "@types/node": "^26.2.0",
     "@types/sharp": "^0.31.1",
     "@types/yaml": "^1.9.6",
@@ -67,6 +70,7 @@
     "typescript": "~5.7.2",
     "unplugin-icons": "^23.0.1",
     "vite": "^8.2.1",
-    "vue-tsc": "^2.2.0"
+    "vue-tsc": "^2.2.0",
+    "wrangler": "^4.134.0"
   }
 }

package/schema.sql

@@ -1,4 +1,5 @@
--- Kama Core System Schema
+-- Kama Core System Schema 
+-- Auto-generated from server/db/schema.ts
 
 CREATE TABLE IF NOT EXISTS "content_schemas" (
     id TEXT PRIMARY KEY,
@@ -197,7 +198,7 @@ CREATE INDEX IF NOT EXISTS idx_node_channels_channel ON node_channels(channelId,
 CREATE INDEX IF NOT EXISTS idx_node_channels_node ON node_channels(nodeId, channelId);
 CREATE INDEX IF NOT EXISTS idx_node_assets_node_asset ON node_assets(nodeId, assetId);
 CREATE INDEX IF NOT EXISTS idx_node_assets_asset_node ON node_assets(assetId, nodeId);
-CREATE INDEX IF NOT EXISTS idx_node_revisions_node ON node_revisions(nodeId, version);
+CREATE UNIQUE INDEX IF NOT EXISTS idx_node_revisions_version ON node_revisions(nodeId, version);
 CREATE INDEX IF NOT EXISTS idx_assets_system_created ON assets(isSystemVariant, createdAt DESC);
 CREATE INDEX IF NOT EXISTS idx_assets_system_mime ON assets(isSystemVariant, mimeType);
 CREATE INDEX IF NOT EXISTS idx_assets_deleted ON assets(deletedAt);

package/templates/astro-starter/src/components/blocks/ImageBlock.astro

@@ -32,18 +32,15 @@ interface Props {
         [key: string]: CropVariant | undefined;
       };
     };
-
     image_meta?: {
       cropCoordinates?: {
         width?: number;
         height?: number;
       };
     };
-
     width?: number | string;
     height?: number | string;
   };
-
   region?: string;
   isFirst?: boolean;
 }
@@ -51,44 +48,22 @@ interface Props {
 const { data, region = "main", isFirst = false } = Astro.props;
 
 const img = data?.image;
+const isValid = Boolean(img && (img.url || img.path || img.variants));
 
-if (!img || (!img.url && !img.path && !img.variants)) {
-  return null;
-}
-
-/**
- * Determine whether this is likely to be LCP.
- */
 const isLcp = region === "header" || (region === "main" && isFirst);
 
-/**
- * Determine grid column count from the region name.
- */
 let columnCount = 1;
-
 if (region.includes("_")) {
   columnCount = 2;
-
-  if (region.includes("_middle") || region.includes("_col3")) {
-    columnCount = 3;
-  }
-
-  if (region.includes("_col4")) {
-    columnCount = 4;
-  }
+  if (region.includes("_middle") || region.includes("_col3")) columnCount = 3;
+  if (region.includes("_col4")) columnCount = 4;
 }
 
-/**
- * Default single-column layout.
- */
 let maxWidth = "1352";
 let targetColumnWidth = 1352;
 let optimizedWidths = [768, 1352];
 let sizes = "(max-width: 1399px) calc(100vw - 48px), 1352px";
 
-/**
- * Two-column layout.
- */
 if (columnCount === 2) {
   maxWidth = "660";
   targetColumnWidth = 660;
@@ -97,12 +72,7 @@ if (columnCount === 2) {
     "(max-width: 767px) calc(100vw - 48px), " +
     "(max-width: 1399px) calc((100vw - 80px) / 2), " +
     "660px";
-}
-
-/**
- * Three-column layout.
- */
-else if (columnCount === 3) {
+} else if (columnCount === 3) {
   maxWidth = "429";
   targetColumnWidth = 429;
   optimizedWidths = [300, 429];
@@ -110,12 +80,7 @@ else if (columnCount === 3) {
     "(max-width: 767px) calc(100vw - 48px), " +
     "(max-width: 1399px) calc((100vw - 112px) / 3), " +
     "429px";
-}
-
-/**
- * Four-column layout.
- */
-else if (columnCount === 4) {
+} else if (columnCount === 4) {
   maxWidth = "314";
   targetColumnWidth = 314;
   optimizedWidths = [264, 314];
@@ -126,22 +91,21 @@ else if (columnCount === 4) {
 }
 ---
 
-<div class="cms-block cms-block-image" style={`--max-w: ${maxWidth}px;`}>
-  <KamaImage
-    image={img}
-    sizes={sizes}
-    desktopWidths={optimizedWidths}
-    idealWidth={targetColumnWidth}
-    width={data.width || data.image_meta?.cropCoordinates?.width || img.width}
-    height={data.height ||
-      data.image_meta?.cropCoordinates?.height ||
-      img.height}
-    class="free-crop-image"
-    loading={isLcp ? "eager" : "lazy"}
-    fetchpriority={isLcp ? "high" : "auto"}
-    decoding={isLcp ? "sync" : "async"}
-  />
-</div>
+{
+  isValid && (
+    <div class="cms-block cms-block-image" style={`--max-w: ${maxWidth}px;`}>
+      <KamaImage
+        image={img}
+        sizes={sizes}
+        desktopWidths={optimizedWidths}
+        idealWidth={targetColumnWidth}
+        class="free-crop-image"
+        loading={isLcp ? "eager" : "lazy"}
+        fetchpriority={isLcp ? "high" : "auto"}
+      />
+    </div>
+  )
+}
 
 <style>
   .cms-block-image {

package/templates/astro-starter/src/components/global/Header.astro

@@ -1,5 +1,5 @@
 ---
-// src/components/global/Header.astro
+// templates/astro-starter/src/components/global/Header.astro
 import NavigationMenu from "@/components/global/NavigationMenu.astro";
 import { getTree, getTreeId, getChannelId } from "@/lib/cms";
 import type { TreeNode } from "@/lib/cms";
@@ -9,12 +9,12 @@ interface Props {
   tree?: TreeNode[];
 }
 
-const { node, tree } = Astro.props;
-
-let rawTree = tree || [];
+const props = Astro.props as Props;
+const currentPropsNode = props.node || {};
+let rawTree: TreeNode[] = props.tree || [];
 
 // Fallback: If the layout didn't pass the tree, fetch it directly
-if (rawTree.length === 0) {
+if (!rawTree || rawTree.length === 0) {
   const locals = Astro.locals as Record<string, any>;
   const runtimeEnv = locals?.runtime?.env || {};
   const cmsWorker = runtimeEnv.CMS_WORKER;
@@ -27,17 +27,24 @@ if (rawTree.length === 0) {
     return fetch(input, init);
   };
 
-  rawTree = await getTree(getTreeId(), getChannelId(), customFetch);
+  try {
+    rawTree = await getTree(getTreeId(), getChannelId(), customFetch);
+  } catch (e) {
+    rawTree = [];
+  }
 }
 
 const homeSlug = import.meta.env.PUBLIC_HOME_SLUG || "home";
-const homeNodeInTree = rawTree.find(n => n.slug === homeSlug) || rawTree[0];
+const homeNodeInTree =
+  rawTree.find(n => n.slug === homeSlug) || rawTree[0] || {};
 
-const siteName =
-  node?.logoText ||
-  homeNodeInTree?.logoText ||
-  import.meta.env.PUBLIC_SITE_NAME ||
-  "KAMA";
+let siteName = currentPropsNode.logoText;
+if (!siteName && homeNodeInTree && "logoText" in homeNodeInTree) {
+  siteName = homeNodeInTree.logoText as string;
+}
+if (!siteName) {
+  siteName = import.meta.env.PUBLIC_SITE_NAME || "KAMA";
+}
 ---
 
 <header class="site-header">

package/templates/astro-starter/src/components/ui/KamaImage.astro

@@ -1,8 +1,6 @@
 ---
 // src/components/ui/KamaImage.astro
-
 import { getMediaUrl } from "@/lib/cms";
-// 🎯 FIX: Updated import path to match our new folder structure
 import { buildAgnosticImageUrl } from "@/lib/media/media-url";
 
 interface Props {
@@ -25,25 +23,18 @@ const {
   fetchpriority = "auto",
 } = Astro.props;
 
-if (!image || (!image.url && !image.path && !image.variants)) {
-  return null;
-}
+const isValidImage = Boolean(
+  image && (image.url || image.path || image.variants),
+);
 
-const variants = image.variants || {};
+const variants = image?.variants || {};
 
-/**
- * Resolve CMS media URLs.
- */
 const rawMobileUrl = getMediaUrl(variants.mobile?.url);
 const rawTabletUrl = getMediaUrl(variants.tablet?.url);
 const rawDesktopUrl = getMediaUrl(
-  variants.standard?.url || image.url || image.path,
+  variants.standard?.url || image?.url || image?.path,
 );
 
-/**
- * Resolve dimensions.
- * Crop dimensions take precedence over original image dimensions.
- */
 const mobileW = Number(variants.mobile?.cropCoordinates?.width || 768);
 const mobileH = Number(variants.mobile?.cropCoordinates?.height || 576);
 
@@ -51,32 +42,25 @@ const tabletW = Number(variants.tablet?.cropCoordinates?.width || 1024);
 const tabletH = Number(variants.tablet?.cropCoordinates?.height || 512);
 
 const baseWidth = Number(
-  variants.standard?.cropCoordinates?.width || image.width || idealWidth,
+  variants.standard?.cropCoordinates?.width || image?.width || idealWidth,
 );
 const baseHeight = Number(
   variants.standard?.cropCoordinates?.height ||
-    image.height ||
+    image?.height ||
     Math.round(idealWidth * 0.5),
 );
 
-/**
- * Build responsive srcset using query-based media proxy URLs (/media/foo.jpg?w=768&q=75&f=auto)
- */
 function buildAgnosticSrcset(
   url: string,
   targetWidths: number[],
   quality = 75,
 ): string {
   if (!url) return "";
-
   return targetWidths
     .map(width => `${buildAgnosticImageUrl(url, width, quality)} ${width}w`)
     .join(", ");
 }
 
-/**
- * Build srcsets.
- */
 const mobileSrcset = rawMobileUrl
   ? buildAgnosticSrcset(rawMobileUrl, [400, 768])
   : null;
@@ -89,61 +73,53 @@ const desktopSrcset = rawDesktopUrl
   ? buildAgnosticSrcset(rawDesktopUrl, desktopWidths)
   : null;
 
-/**
- * Fallback image URL: /media/foo.jpg?w=1352&q=75&f=auto
- */
 const absoluteFallback = rawDesktopUrl
   ? buildAgnosticImageUrl(rawDesktopUrl, idealWidth, 75)
   : "";
 ---
 
-<picture>
-  {/* Mobile Variant (< 768px) */}
-  {
-    mobileSrcset && (
-      <source
-        media="(max-width: 767px)"
-        srcset={mobileSrcset}
-        sizes="(max-width: 767px) calc(100vw - 48px), 768px"
-        width={mobileW}
-        height={mobileH}
-      />
-    )
-  }
-
-  {/* Tablet Variant (768px - 1024px) */}
-  {
-    tabletSrcset && (
-      <source
-        media="(min-width: 768px) and (max-width: 1024px)"
-        srcset={tabletSrcset}
-        sizes="(max-width: 1024px) calc(100vw - 48px), 1024px"
-        width={tabletW}
-        height={tabletH}
-      />
-    )
-  }
-
-  {/* Desktop Variant (> 1024px) */}
-  {
-    desktopSrcset && (
-      <source
-        srcset={desktopSrcset}
-        sizes={sizes}
+{
+  isValidImage && (
+    <picture>
+      {Boolean(mobileSrcset) && (
+        <source
+          media="(max-width: 767px)"
+          srcset={mobileSrcset as string}
+          sizes="(max-width: 767px) calc(100vw - 48px), 768px"
+          width={mobileW}
+          height={mobileH}
+        />
+      )}
+
+      {Boolean(tabletSrcset) && (
+        <source
+          media="(min-width: 768px) and (max-width: 1024px)"
+          srcset={tabletSrcset as string}
+          sizes="(max-width: 1024px) calc(100vw - 48px), 1024px"
+          width={tabletW}
+          height={tabletH}
+        />
+      )}
+
+      {Boolean(desktopSrcset) && (
+        <source
+          srcset={desktopSrcset as string}
+          sizes={sizes}
+          width={baseWidth}
+          height={baseHeight}
+        />
+      )}
+
+      <img
+        src={absoluteFallback}
+        alt={image.alt || image.filename || ""}
         width={baseWidth}
         height={baseHeight}
+        loading={loading}
+        fetchpriority={fetchpriority}
+        decoding={loading === "eager" ? "sync" : "async"}
+        class={className}
       />
-    )
-  }
-
-  <img
-    src={absoluteFallback}
-    alt={image.alt || image.filename || ""}
-    width={baseWidth}
-    height={baseHeight}
-    loading={loading}
-    fetchpriority={fetchpriority}
-    decoding={loading === "eager" ? "sync" : "async"}
-    class={className}
-  />
-</picture>
+    </picture>
+  )
+}