@brightsideoy/kama 0.1.0-alpha.46 → 0.1.0-alpha.50

package/dist/index.html

@@ -4,8 +4,8 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>KAMA</title>
-    <script type="module" crossorigin src="/assets/index-Bk-A6B6d.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-nbx_ufxX.css">
+    <script type="module" crossorigin src="/assets/index-BsVawKU0.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-BpDJdGFw.css">
   </head>
   <body>
     <div id="app"></div>

package/dist/index.js

@@ -4433,6 +4433,7 @@ var Or = /* @__PURE__ */ a({
 			label: "Article",
 			inTree: !1,
 			hasCanvas: !0,
+			directLinking: !0,
 			regions: { content: { label: "Content" } },
 			allowedElements: [
 				"header",
@@ -4475,6 +4476,7 @@ var Or = /* @__PURE__ */ a({
 			label: "Event",
 			inTree: !1,
 			hasCanvas: !0,
+			directLinking: !0,
 			regions: { main: { label: "Content" } },
 			allowedElements: ["title-set", "text-block"],
 			tabs: { settings: {
@@ -4548,6 +4550,7 @@ var Or = /* @__PURE__ */ a({
 			inTree: !0,
 			inVault: !0,
 			hasCanvas: !0,
+			directLinking: !0,
 			defaultLayout: "single-column",
 			allowedBlocks: [
 				"header",
@@ -4648,6 +4651,7 @@ var Or = /* @__PURE__ */ a({
 			inTree: !1,
 			inVault: !0,
 			hasCanvas: !1,
+			directLinking: !0,
 			layout: {
 				columns: "3fr 1fr",
 				areas: [["main", "sidebar"]]
@@ -8694,7 +8698,46 @@ function Ri(e, t = {}) {
 	}
 	return n;
 }
-function zi(e) {
+async function zi(e, t) {
+	if (typeof t == "string") {
+		if (!t.includes("#node:") && !t.includes("data-node-id") && !t.includes("#asset:") && !t.includes("data-asset-id")) return t;
+		let n = /* @__PURE__ */ new Set();
+		for (let e of t.matchAll(/(?:#node:|data-node-id=["'])([^"'\s>]+)/gi)) n.add(e[1]);
+		let r = /* @__PURE__ */ new Set();
+		for (let e of t.matchAll(/(?:#asset:|data-asset-id=["'])([^"'\s>]+)/gi)) r.add(e[1]);
+		if (n.size === 0 && r.size === 0) return t;
+		let i = Array.from(n).map(() => "?").join(","), a = n.size > 0 ? await e.prepare(`SELECT id, slug FROM content_nodes WHERE id IN (${i})`).all(...n) : [], o = /* @__PURE__ */ new Map();
+		for (let e of a || []) o.set(String(e.id), String(e.slug || "").replace(/^\/+|\/+$/g, ""));
+		let s = Array.from(r).map(() => "?").join(","), c = r.size > 0 ? await e.prepare("SELECT id, cdnUrl, storageKeyPrivate FROM assets WHERE id IN (" + s + ")").all(...r) : [], l = /* @__PURE__ */ new Map();
+		for (let e of c || []) l.set(String(e.id), e.cdnUrl || (e.storageKeyPrivate ? `/media/${e.storageKeyPrivate}` : ""));
+		let u = /* @__PURE__ */ new Map(), d = /<a\b([^>]*?)>/gi;
+		for (let n of t.matchAll(d)) {
+			let t = n[1], r = t.match(/data-node-id=["']([^"']+)["']/i), i = t.match(/data-tree-id=["']([^"']+)["']/i);
+			if (!r || !i) continue;
+			let a = await e.prepare("SELECT id as treeNodeId FROM tree_nodes WHERE contentId = ? AND treeId = ? LIMIT 1").get(r[1], i[1]);
+			a?.treeNodeId && u.set(`${r[1]}:${i[1]}`, await Vi(e, String(a.treeNodeId), i[1]));
+		}
+		return t.replace(d, (e, t) => {
+			let n = t.match(/data-node-id=["']([^"']+)["']/i), r = t.match(/data-asset-id=["']([^"']+)["']/i), i = t.match(/href=["']([^"']+)["']/i);
+			if (i?.[1].startsWith("mailto:")) return `<a${t.replace(/\s+target=["'][^"']*["']/i, "")}>`;
+			let a = i?.[1].match(/^#node:(.+)$/i), s = i?.[1].match(/^#asset:(.+)$/i), c = r?.[1] || s?.[1], d = n?.[1] || a?.[1];
+			if (!d && !c) return e;
+			if (c && !d) {
+				let n = l.get(c);
+				return n && i ? `<a${t.replace(/href=["'][^"']*["']/i, `href="${n}"`).replace(/data-asset-id=["'][^"']*["']/i, `data-asset-id="${c}"`)}>` : e;
+			}
+			let f = t.match(/data-tree-id=["']([^"']+)["']/i), p = d, m = f ? u.get(`${p}:${f[1]}`) : void 0, h = o.get(p), g = m || (h === void 0 ? "#" : `/${h}`);
+			return i ? `<a${t.replace(/href=["'][^"']*["']/i, `href="${g || "/"}"`)}>` : e;
+		});
+	}
+	if (Array.isArray(t)) return Promise.all(t.map((t) => zi(e, t)));
+	if (t && typeof t == "object") {
+		let n = await Promise.all(Object.entries(t).map(async ([t, n]) => [t, await zi(e, n)]));
+		return Object.fromEntries(n);
+	}
+	return t;
+}
+function Bi(e) {
 	let t = e.socialImage;
 	if (!t || typeof t != "object") return null;
 	let n = (e, t) => {
@@ -8725,7 +8768,7 @@ function zi(e) {
 		])
 	};
 }
-async function Bi(e, t, n) {
+async function Vi(e, t, n) {
 	if (!t) return "";
 	let r = await e.prepare("\n    WITH RECURSIVE ancestor_path(id, parentId, slug, level) AS (\n      SELECT t.id, t.parentId, c.slug, 0\n      FROM tree_nodes t\n      INNER JOIN content_nodes c ON t.contentId = c.id\n      WHERE t.id = ? AND t.treeId = ?\n      UNION ALL\n      SELECT t.id, t.parentId, c.slug, ap.level + 1\n      FROM tree_nodes t\n      INNER JOIN content_nodes c ON t.contentId = c.id\n      INNER JOIN ancestor_path ap ON t.id = ap.parentId\n      WHERE t.treeId = ?\n    )\n    SELECT slug FROM ancestor_path ORDER BY level DESC\n  ").all(t, n, n), i = Array.isArray(r) ? r : r?.results || [], a = [];
 	for (let e of i) {
@@ -8734,7 +8777,7 @@ async function Bi(e, t, n) {
 	}
 	return "/" + a.join("/");
 }
-async function Vi(e, t, n, r, i) {
+async function Hi(e, t, n, r, i) {
 	let a = {}, o = null;
 	if (t) {
 		let n = await e.prepare("\n      WITH RECURSIVE ancestor_path(id, contentId, title, slug, parentId, level) AS (\n        SELECT t.id, t.contentId, c.title, c.slug, t.parentId, 0\n        FROM tree_nodes t\n        INNER JOIN content_nodes c ON t.contentId = c.id\n        WHERE t.id = ? OR c.id = ?\n        UNION ALL\n        SELECT t.id, t.contentId, c.title, c.slug, t.parentId, ap.level + 1\n        FROM tree_nodes t\n        INNER JOIN content_nodes c ON t.contentId = c.id\n        INNER JOIN ancestor_path ap ON t.id = ap.parentId\n      )\n      SELECT c.dataJson, c.draftDataJson \n      FROM ancestor_path ap\n      INNER JOIN content_nodes c ON ap.contentId = c.id\n      ORDER BY ap.level ASC\n    ").all(t, t), i = Array.isArray(n) ? n : n?.results || [], s = /* @__PURE__ */ new Set([
@@ -8794,7 +8837,7 @@ Ni.get("/*", async (e) => {
         WHERE cn.slug = ? ${l === null ? "" : "AND nc.channelId = ?"}
       `, o = l === null ? [n] : [n, l], s = await t.prepare(a).all(...o), c = Array.isArray(s) ? s : s?.results || [];
 			if (c.length > 0) for (let e of c) {
-				let n = (await Bi(t, e.treeNodeId, e.treeId)).replace(/^\/+|\/+$/g, ""), r = i.replace(/^\/+|\/+$/g, "");
+				let n = (await Vi(t, e.treeNodeId, e.treeId)).replace(/^\/+|\/+$/g, ""), r = i.replace(/^\/+|\/+$/g, "");
 				if (n === r || r === "home" && (n === "" || n === "home")) {
 					h = e, g = e;
 					break;
@@ -8812,7 +8855,7 @@ Ni.get("/*", async (e) => {
         LIMIT 1
       `).get(...e);
 		}
-		let v = g?.treeId || _ || "main-nav", y = g?.parentId || null, b = g?.treeNodeId ? await Bi(t, g.treeNodeId, v) : `/${(h.slug || "").replace(/^\/+|\/+$/g, "")}`, x = {
+		let v = g?.treeId || _ || "main-nav", y = g?.parentId || null, b = g?.treeNodeId ? await Vi(t, g.treeNodeId, v) : `/${(h.slug || "").replace(/^\/+|\/+$/g, "")}`, x = {
 			id: h.id,
 			title: h.title,
 			slug: h.slug,
@@ -8830,11 +8873,11 @@ Ni.get("/*", async (e) => {
 			k = typeof A == "string" ? JSON.parse(A) : A;
 		} catch {}
 		k.disabledRegions && (T = k.disabledRegions), O = k.hidden === !0 || k.hidden === 1 || k.hidden === "1" || k.hidden === "true", E = k.startShowingAt || null, D = k.stopShowingAt || null;
-		let j = k.layoutId, ee = j && j !== "inherit", { resolvedLayoutId: te, inheritedFields: ne } = await Vi(t, y, v, o, w), re = ee ? j : te || C.defaultLayout || null;
+		let j = k.layoutId, ee = j && j !== "inherit", { resolvedLayoutId: te, inheritedFields: ne } = await Hi(t, y, v, o, w), re = ee ? j : te || C.defaultLayout || null;
 		for (let [e, t] of Object.entries(ne)) (k[e] === void 0 || k[e] === null || k[e] === "" || k[e] === "inherit") && t !== void 0 && (k[e] = t);
 		let M = await oi(t, Ri(k, w));
-		M = await Fi(t, M);
-		let ie = zi(M);
+		M = await Fi(t, M), M = await zi(t, M);
+		let ie = Bi(M);
 		delete M.socialImage, delete M.fbImage, delete M.xImage, delete M.whatsappImage, ie && (M.socialImages = ie), x.slug = h.slug, x.title = h.title, Object.assign(x, M), x.layoutId = re;
 		let ae = !!h.isHidden || O, oe = !Pi(E, D);
 		if (!o && (ae || oe)) return e.json({ error: "Node is hidden or outside its scheduled publishing window" }, 404);
@@ -8872,7 +8915,7 @@ Ni.get("/*", async (e) => {
 			let i = r.hidden === !0 || r.hidden === 1 || r.hidden === "1" || r.hidden === "true", a = Pi(r.startShowingAt, r.stopShowingAt);
 			if (!o && (i || !a)) continue;
 			let s = e.elementType || e.componentId || "text-block", c = p.blocks?.[s]?.fields || p.elements?.[s]?.fields || p.components?.[s]?.fields || {}, l = String(r.blockId || r._instanceId || r.id || e.blockId || e.id), u = Ri(r, c);
-			u = await oi(t, u), u.blockId = l, P[n].push({
+			u = await oi(t, u), u = await zi(t, u), u.blockId = l, P[n].push({
 				instanceId: e.id,
 				blockId: l,
 				componentId: s,
@@ -8924,8 +8967,8 @@ Ni.get("/*", async (e) => {
 });
 //#endregion
 //#region server/routes/public/tree.ts
-var Hi = new e();
-function Ui(e, t) {
+var Ui = new e();
+function Wi(e, t) {
 	let n = /* @__PURE__ */ new Date();
 	if (e && String(e).trim() !== "") {
 		let t = new Date(e);
@@ -8937,7 +8980,7 @@ function Ui(e, t) {
 	}
 	return !0;
 }
-Hi.get("/:treeParam", async (e) => {
+Ui.get("/:treeParam", async (e) => {
 	try {
 		let t = e.get("db"), n = e.req.param("treeParam"), r = e.req.query("channelId") || e.req.query("channel") || "default", i = e.req.query("preview") === "true";
 		if (r && r !== "default" && r !== "all") {
@@ -8976,7 +9019,7 @@ Hi.get("/:treeParam", async (e) => {
 				if (r) try {
 					n = typeof r == "string" ? JSON.parse(r) : r, delete n._isTreeDraft, delete n._draftParentId, delete n.isNew, delete n.hidden, delete n.is_hidden, delete n.isHidden, delete n.status;
 				} catch {}
-				let a = !i && (e.status === "draft" || e.status === "new"), o = !!e.isHidden || a || n.hidden === !0 || n.hidden === 1 || n.hidden === "1" || n.hidden === "true", s = Ui(n.startShowingAt, n.stopShowingAt), c = (e.slug || "").replace(/^\/+|\/+$/g, ""), l = c === "home" || c === "homee" ? "/" : `${t}/${c}`.replace(/\/+/g, "/"), u = {
+				let a = !i && (e.status === "draft" || e.status === "new"), o = !!e.isHidden || a || n.hidden === !0 || n.hidden === 1 || n.hidden === "1" || n.hidden === "true", s = Wi(n.startShowingAt, n.stopShowingAt), c = (e.slug || "").replace(/^\/+|\/+$/g, ""), l = c === "home" || c === "homee" ? "/" : `${t}/${c}`.replace(/\/+/g, "/"), u = {
 					id: e.id,
 					treeNodeId: e.treeNodeId,
 					parentId: e.parentId || null,
@@ -9011,8 +9054,8 @@ Hi.get("/:treeParam", async (e) => {
 });
 //#endregion
 //#region server/routes/public/assets.ts
-var Wi = new e();
-function Gi(e, t) {
+var Gi = new e();
+function Ki(e, t) {
 	if (t === "webp") return "image/webp";
 	if (t === "avif") return "image/avif";
 	if (t === "jpeg" || t === "jpg") return "image/jpeg";
@@ -9020,7 +9063,7 @@ function Gi(e, t) {
 	let n = e.toLowerCase();
 	return n.endsWith(".jpg") || n.endsWith(".jpeg") ? "image/jpeg" : n.endsWith(".png") ? "image/png" : n.endsWith(".webp") ? "image/webp" : n.endsWith(".gif") ? "image/gif" : n.endsWith(".svg") ? "image/svg+xml" : n.endsWith(".pdf") ? "application/pdf" : n.endsWith(".mp4") ? "video/mp4" : n.endsWith(".webm") ? "video/webm" : "application/octet-stream";
 }
-Wi.get("/*", async (e) => {
+Gi.get("/*", async (e) => {
 	let t = e.req.path.replace(/^\/media\//, "").replace(/^\//, "");
 	if (!t) return e.text("Asset key missing", 400);
 	let n = e.env?.MEDIA_BUCKET, { w: r, h: i, q: a, f: o } = e.req.query(), s = !!(r || i || a || o), c = e.req.header("Via")?.includes("image-resizing") || e.req.header("User-Agent")?.includes("Cloudflare-ImgRen");
@@ -9066,7 +9109,7 @@ Wi.get("/*", async (e) => {
 		if (!s) {
 			let n = u(g);
 			return e.body(n, 200, {
-				"Content-Type": Gi(t),
+				"Content-Type": Ki(t),
 				"Cache-Control": "public, max-age=86400"
 			});
 		}
@@ -9074,7 +9117,7 @@ Wi.get("/*", async (e) => {
 		if (l(b)) {
 			let n = u(b);
 			return e.body(n, 200, {
-				"Content-Type": Gi(t, v),
+				"Content-Type": Ki(t, v),
 				"Cache-Control": "public, max-age=31536000, immutable",
 				"X-Local-Cache": "HIT"
 			});
@@ -9087,14 +9130,14 @@ Wi.get("/*", async (e) => {
 			typeof n == "number" && (a.width = n), typeof c == "number" && (a.height = c), (a.width || a.height) && (a.fit = "cover", i = i.resize(a)), v === "webp" ? i = i.webp({ quality: typeof _ == "number" ? _ : 80 }) : v === "avif" ? i = i.avif({ quality: typeof _ == "number" ? _ : 70 }) : v === "jpeg" || v === "jpg" ? i = i.jpeg({ quality: typeof _ == "number" ? _ : 80 }) : v === "png" && (i = i.png({ quality: typeof _ == "number" ? _ : 80 }));
 			let o = await i.toBuffer();
 			return d(m(b), { recursive: !0 }), f(b, o), e.body(o, 200, {
-				"Content-Type": Gi(t, v),
+				"Content-Type": Ki(t, v),
 				"Cache-Control": "public, max-age=31536000, immutable",
 				"X-Local-Cache": "MISS"
 			});
 		} catch {
 			let n = u(g);
 			return e.body(n, 200, {
-				"Content-Type": Gi(t),
+				"Content-Type": Ki(t),
 				"Cache-Control": "public, max-age=86400"
 			});
 		}
@@ -9105,8 +9148,8 @@ Wi.get("/*", async (e) => {
 });
 //#endregion
 //#region server/routes/public/paths.ts
-var Ki = new e();
-function qi(e, t) {
+var qi = new e();
+function Ji(e, t) {
 	let n = /* @__PURE__ */ new Date();
 	if (e && String(e).trim() !== "") {
 		let t = new Date(e);
@@ -9118,7 +9161,7 @@ function qi(e, t) {
 	}
 	return !0;
 }
-Ki.get("/", async (e) => {
+qi.get("/", async (e) => {
 	try {
 		let t = await e.get("db").prepare("\n      SELECT \n        t.id as treeNodeId,\n        t.parentId,\n        c.slug,\n        c.contentType as nodeType,\n        c.status,\n        c.dataJson\n      FROM tree_nodes t\n      INNER JOIN content_nodes c ON t.contentId = c.id\n      WHERE (c.deletedAt IS NULL OR c.deletedAt = '')\n    ").all(), n = Array.isArray(t) ? t : t?.results || [], r = [];
 		function i(e = null, t = "") {
@@ -9131,7 +9174,7 @@ Ki.get("/", async (e) => {
 				if (e.dataJson) try {
 					n = typeof e.dataJson == "string" ? JSON.parse(e.dataJson) : e.dataJson;
 				} catch {}
-				let a = e.status === "published" || e.status === "active", o = qi(n.startShowingAt, n.stopShowingAt);
+				let a = e.status === "published" || e.status === "active", o = Ji(n.startShowingAt, n.stopShowingAt);
 				if (!a || !o) continue;
 				let s = (e.slug || "").replace(/^\/+|\/+$/g, ""), c = s === "home" || s === "homee" ? "/" : `${t}/${s}`.replace(/\/+/g, "/");
 				e.nodeType !== "external-link" && r.push(c);
@@ -9148,7 +9191,7 @@ Ki.get("/", async (e) => {
 });
 //#endregion
 //#region server/index.ts
-var $ = new e(), Ji = !1;
+var $ = new e(), Yi = !1;
 $.use("*", o()), $.use("/media/*", o({
 	origin: "*",
 	allowMethods: [
@@ -9169,13 +9212,13 @@ $.use("*", o()), $.use("/media/*", o({
 	let n = new URL(e.req.url), r = (e.req.header("host") || n.hostname).split(":")[0];
 	e.set("currentDomain", r);
 	let i = u(e);
-	if (e.set("db", i), !Ji) try {
-		await Nr(i), Ji = !0;
+	if (e.set("db", i), !Yi) try {
+		await Nr(i), Yi = !0;
 	} catch (e) {
 		console.error("❌ [CMS Server] Failed to initialize system tables on cold start:", e);
 	}
 	await t();
-}), $.route("/media", Wi), $.use("/media/*", Ir()), $.route("/api/cms/nodes", X), $.route("/api/cms/nodes.json", X), $.route("/api/cms/formcsv", X), $.route("/api/cms/formcsv.json", X), $.route("/api/cms/stats", Ai), $.route("/api/cms/stats.json", Ai), $.route("/api/cms", yi), $.route("/api/cms/channels", Ci), $.route("/api/cms/channels.json", Ci), $.route("/api/cms/schemas", wi), $.route("/api/cms/schemas.json", wi), $.route("/api/cms", Di), $.route("/api/admin/assets", Z), $.route("/api/v1/node", Ni), $.route("/api/v1/page", Ni), $.route("/api/v1/tree", Hi), $.route("/api/v1/all-paths", Ki), $.get("*", async (e) => {
+}), $.route("/media", Gi), $.use("/media/*", Ir()), $.route("/api/cms/nodes", X), $.route("/api/cms/nodes.json", X), $.route("/api/cms/formcsv", X), $.route("/api/cms/formcsv.json", X), $.route("/api/cms/stats", Ai), $.route("/api/cms/stats.json", Ai), $.route("/api/cms", yi), $.route("/api/cms/channels", Ci), $.route("/api/cms/channels.json", Ci), $.route("/api/cms/schemas", wi), $.route("/api/cms/schemas.json", wi), $.route("/api/cms", Di), $.route("/api/admin/assets", Z), $.route("/api/v1/node", Ni), $.route("/api/v1/page", Ni), $.route("/api/v1/tree", Ui), $.route("/api/v1/all-paths", qi), $.get("*", async (e) => {
 	if (e.env?.ASSETS) {
 		let t = await e.env.ASSETS.fetch(e.req.raw);
 		if (t.status === 404) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brightsideoy/kama",
-  "version": "0.1.0-alpha.46",
+  "version": "0.1.0-alpha.50",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",