@brightsideoy/kama 1.0.0-alpha.19 → 1.0.0-alpha.20

package/dist/index.js

@@ -21285,6 +21285,13 @@ var Tb = /* @__PURE__ */ o({
 					public: !0,
 					allowedLinkTypes: ["tree", "node"],
 					rules: {}
+				},
+				sortBy: {
+					label: "Sort by",
+					type: "node-sort",
+					default: "updatedAt_desc",
+					public: !0,
+					rules: {}
 				}
 			},
 			tabs: { access: {
@@ -22254,7 +22261,8 @@ var Tb = /* @__PURE__ */ o({
 	nodeTemplate: null,
 	treeTemplate: null,
 	channelTemplate: null,
-	userTemplate: null
+	userTemplate: null,
+	treeExposedFields: ["summary"]
 }, Db = Eb, Ob = {
 	content_schemas: "\n    id TEXT PRIMARY KEY,\n    name TEXT NOT NULL,\n    type TEXT UNIQUE NOT NULL,\n    schemaJson TEXT NOT NULL,\n    isSystem INTEGER DEFAULT 1,\n    createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n    updatedAt TEXT DEFAULT CURRENT_TIMESTAMP\n  ",
 	users: "\n    id TEXT PRIMARY KEY,\n    email UNIQUE NOT NULL,\n    name TEXT NOT NULL,\n    globalRole TEXT DEFAULT 'editor',\n    createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n    updatedAt TEXT DEFAULT CURRENT_TIMESTAMP\n  ",
@@ -23632,7 +23640,8 @@ function px(e) {
 		nodeLayouts: e.nodeLayouts || {},
 		blockLayouts: e.blockLayouts || {},
 		channels: e.channels || {},
-		taxonomies: e.taxonomies || {}
+		taxonomies: e.taxonomies || {},
+		treeExposedFields: e.treeExposedFields || ["summary"]
 	} : {
 		nodes: {},
 		trees: {},
@@ -23640,7 +23649,8 @@ function px(e) {
 		nodeLayouts: {},
 		blockLayouts: {},
 		channels: {},
-		taxonomies: {}
+		taxonomies: {},
+		treeExposedFields: ["summary"]
 	};
 }
 //#endregion
@@ -25456,7 +25466,8 @@ function Qx(e) {
 		nodeTemplate: null,
 		treeTemplate: null,
 		channelTemplate: null,
-		userTemplate: null
+		userTemplate: null,
+		treeExposedFields: ["summary"]
 	};
 	let { rawNodes: t = {}, rawTrees: n = {}, rawChannels: r = {}, channels: i = {}, rawTaxonomies: a = {}, taxonomies: o = {}, rawBlocks: s = {}, rawElements: c = {}, rawNodeLayouts: l = {}, rawBlockLayouts: u = {}, rawLayouts: d = {}, rawFieldSets: f = {}, rawTemplates: p = {}, nodeTemplate: m = null, treeTemplate: h = null, channelTemplate: g = null, userTemplate: _ = null, nodes: v = {}, trees: y = {}, blocks: b = {}, nodeLayouts: x = {}, blockLayouts: S = {} } = e, C = Object.keys(t).length > 0 ? t : v, w = Object.keys(n).length > 0 ? n : y, T = Object.keys(r).length > 0 ? r : i, ee = Object.keys(a).length > 0 ? a : o, E = Object.keys(s).length > 0 ? s : Object.keys(c).length > 0 ? c : b, D = Object.keys(l).length > 0 ? l : Object.keys(d).length > 0 ? d : x, te = Object.keys(u).length > 0 ? u : S, O = m?.fields || {}, k = {
 		...p,
@@ -25729,7 +25740,15 @@ function Qx(e) {
 	let fe = _ ? {
 		..._,
 		fields: de
-	} : null;
+	} : null, pe = /* @__PURE__ */ new Set(["summary"]);
+	for (let e of Object.values(k)) {
+		let t = e.fields || e;
+		for (let [e, n] of Object.entries(t || {})) n && typeof n == "object" && n.inTree && pe.add(e);
+	}
+	for (let e of Object.values(j)) {
+		for (let [t, n] of Object.entries(e.fields || {})) n?.inTree && pe.add(t);
+		for (let t of Object.values(e.tabs || {})) for (let [e, n] of Object.entries(t.fields || {})) n?.inTree && pe.add(e);
+	}
 	return {
 		nodes: j,
 		trees: re,
@@ -25742,7 +25761,8 @@ function Qx(e) {
 		nodeTemplate: m || null,
 		treeTemplate: h || null,
 		channelTemplate: ue,
-		userTemplate: fe
+		userTemplate: fe,
+		treeExposedFields: Array.from(pe)
 	};
 }
 //#endregion
@@ -26241,21 +26261,30 @@ function fS(e, t) {
 	}
 	return !0;
 }
-async function pS(e, t, n, r, i) {
-	let a = t.filter((e) => e.componentId === "content-feed" || e.componentId === "article-list" || e.componentId === "nodeList" || e.componentId === "node-list");
-	await Promise.all(a.map(async (t) => {
-		let a = t.data || {}, o = a.nodeType || ["article"], s = (Array.isArray(o) ? o : String(o).split(",")).map((e) => String(e).trim()).filter(Boolean), c = Number(a.limit) || 12, l = Number(a.offset) || 0, u = a.sortBy || "updatedAt", d = new URLSearchParams();
-		d.set("nodeType", s.join(",")), d.set("limit", c.toString()), d.set("offset", (l + c).toString()), d.set("sortBy", u), n && n !== "all" && d.set("channelId", String(n));
-		let f = `FROM content_nodes WHERE contentType IN (${s.map(() => "?").join(",")}) AND isHidden = 0 AND IFNULL(status, 'published') = 'published'`, p = [...s];
-		n && n !== "all" && (f += " AND EXISTS (SELECT 1 FROM node_channels nc WHERE nc.nodeId = content_nodes.id AND nc.channelId = ?)", p.push(Number(n) || n));
-		let m = (/* @__PURE__ */ new Date()).toISOString();
-		f += " AND IFNULL(json_extract(dataJson, '$.startShowingAt'), '') <= ?", p.push(m), f += " AND IFNULL(json_extract(dataJson, '$.stopShowingAt'), '9999-12-31') >= ?", p.push(m);
+async function pS(e, t, n, r, i, a) {
+	let o = t.filter((e) => e.componentId === "content-feed" || e.componentId === "article-list" || e.componentId === "nodeList" || e.componentId === "node-list");
+	await Promise.all(o.map(async (t) => {
+		let o = t.data || {}, s = o.nodeType || ["article"], c = (Array.isArray(s) ? s : String(s).split(",")).map((e) => String(e).trim()).filter(Boolean), l = {};
+		if (a) for (let e of c) {
+			l[e] = [];
+			let t = a.nodes?.[e] || {}, n = { ...t.fields || {} };
+			t.tabs && Object.values(t.tabs).forEach((e) => {
+				Object.assign(n, e.fields || {});
+			});
+			for (let [t, r] of Object.entries(n)) (r.showInList || r.showInLists) && l[e].push(t);
+		}
+		let u = Number(o.limit) || 12, d = Number(o.offset) || 0, f = String(o.sortBy || "updatedAt_desc"), [p, m] = f.includes("_") ? f.split("_") : [f, "desc"], h = String(m).toLowerCase() === "asc" ? "ASC" : "DESC", g = String(p).replace(/[^a-zA-Z0-9_]/g, ""), _ = new URLSearchParams();
+		_.set("nodeType", c.join(",")), _.set("limit", u.toString()), _.set("offset", (d + u).toString()), _.set("sortBy", f), n && n !== "all" && _.set("channelId", String(n));
+		let v = `FROM content_nodes WHERE contentType IN (${c.map(() => "?").join(",")}) AND isHidden = 0 AND IFNULL(status, 'published') = 'published'`, y = [...c];
+		n && n !== "all" && (v += " AND EXISTS (SELECT 1 FROM node_channels nc WHERE nc.nodeId = content_nodes.id AND nc.channelId = ?)", y.push(Number(n) || n));
+		let b = (/* @__PURE__ */ new Date()).toISOString();
+		v += " AND IFNULL(json_extract(dataJson, '$.startShowingAt'), '') <= ?", y.push(b), v += " AND IFNULL(json_extract(dataJson, '$.stopShowingAt'), '9999-12-31') >= ?", y.push(b);
 		for (let e of [
 			"authors",
 			"categories",
 			"tags"
-		]) if (a[e]) {
-			let t = (Array.isArray(a[e]) ? a[e] : [a[e]]).map((e) => {
+		]) if (o[e]) {
+			let t = (Array.isArray(o[e]) ? o[e] : [o[e]]).map((e) => {
 				if (typeof e == "object" && e) {
 					if (e.key) return String(e.key);
 					if (e.nodeId) return String(e.nodeId);
@@ -26264,93 +26293,100 @@ async function pS(e, t, n, r, i) {
 				return String(e);
 			}).filter((e) => e !== "undefined" && e !== "null" && e !== "");
 			if (t.length > 0) {
-				d.set(e, t.join(","));
+				_.set(e, t.join(","));
 				let n = t.map(() => "?").join(",");
-				f += e === "authors" ? ` AND EXISTS (SELECT 1 FROM node_relations nr WHERE nr.sourceNodeId = content_nodes.id AND nr.fieldKey = ? AND nr.targetNodeId IN (${n}))` : ` AND EXISTS (SELECT 1 FROM node_terms nt INNER JOIN taxonomy_terms tt ON nt.termId = tt.id WHERE nt.nodeId = content_nodes.id AND tt.taxonomy = ? AND tt.key IN (${n}))`, p.push(e, ...t);
+				v += e === "authors" ? ` AND EXISTS (SELECT 1 FROM node_relations nr WHERE nr.sourceNodeId = content_nodes.id AND nr.fieldKey = ? AND nr.targetNodeId IN (${n}))` : ` AND EXISTS (SELECT 1 FROM node_terms nt INNER JOIN taxonomy_terms tt ON nt.termId = tt.id WHERE nt.nodeId = content_nodes.id AND tt.taxonomy = ? AND tt.key IN (${n}))`, y.push(e, ...t);
 			}
 		}
-		let h = "ORDER BY updatedAt DESC";
-		u === "published_desc" || u === "createdAt" ? h = "ORDER BY createdAt DESC" : u === "title_asc" && (h = "ORDER BY LOWER(title) ASC");
-		let g = `SELECT id, title, slug, language, dataJson, createdAt, updatedAt ${f} ${h} LIMIT ? OFFSET ?`;
-		p.push(c, l);
+		let x = `ORDER BY updatedAt ${h}`;
+		g === "createdAt" || g === "published" ? x = `ORDER BY createdAt ${h}` : g === "title" ? x = `ORDER BY LOWER(title) ${h}` : g !== "updatedAt" && g !== "" && (x = `ORDER BY json_extract(dataJson, '$.${g}') ${h}`);
+		let S = `SELECT id, title, slug, language, dataJson, createdAt, updatedAt ${v} ${x} LIMIT ? OFFSET ?`;
+		y.push(u, d);
 		try {
-			let n = await e.prepare(g).all(...p), o = Array.isArray(n) ? n : n?.results || [];
-			t.data.initialItems = o.map((e) => {
+			let n = await e.prepare(S).all(...y), s = Array.isArray(n) ? n : n?.results || [];
+			t.data.initialItems = s.map((e) => {
 				let t = {};
 				if (e.dataJson) try {
 					t = typeof e.dataJson == "string" ? JSON.parse(e.dataJson) : e.dataJson;
 				} catch {}
-				return i && dS(t.startShowingAt, t.stopShowingAt, i), {
+				i && dS(t.startShowingAt, t.stopShowingAt, i);
+				let n = {};
+				if (a) {
+					let r = l[e.contentType || "article"] || [];
+					for (let e of r) t[e] !== void 0 && (n[e] = t[e]);
+				}
+				return {
 					id: e.id,
 					title: e.title,
 					slug: e.slug,
 					language: e.language?.trim() || r || null,
 					createdAt: e.createdAt,
 					updatedAt: e.updatedAt,
+					...n,
 					excerpt: t.excerpt || "",
 					image: t.image || t.coverImage || null,
 					author: t.author || null
 				};
-			}), a.disablePagination !== !0 && a.disablePagination !== "1" && o.length === c ? t.data.loadMoreUrl = `/api/v1/nodes?${d.toString()}` : t.data.loadMoreUrl = null;
+			}), o.disablePagination !== !0 && o.disablePagination !== "1" && s.length === u ? t.data.loadMoreUrl = `/api/v1/nodes?${_.toString()}` : t.data.loadMoreUrl = null;
 		} catch (e) {
 			console.error("[CMS Hydration] Failed to hydrate content feed block", e), t.data.initialItems = [], t.data.loadMoreUrl = null;
 		}
 	}));
 }
-async function mS(e, t, n, r, i, a = !1, o, s) {
+async function mS(e, t, n, r, i, a, o = !1, s, c) {
 	if (!t) return { blocks: [] };
-	let c = await e.prepare("\n    WITH RECURSIVE ancestor_path(contentId, title, slug, parentId, level) AS (\n      SELECT t.contentId, c.title, c.slug, t.parentId, 0 FROM tree_nodes t INNER JOIN content_nodes c ON t.contentId = c.id WHERE t.contentId = ? AND t.treeId = ?\n      UNION ALL\n      SELECT t.contentId, c.title, c.slug, t.parentId, ap.level + 1 FROM tree_nodes t INNER JOIN content_nodes c ON t.contentId = c.id INNER JOIN ancestor_path ap ON t.contentId = ap.parentId AND t.treeId = ?\n    )\n    SELECT * FROM ancestor_path ORDER BY level ASC\n  ").all(t, n, n), l = Array.isArray(c) ? c : c?.results || [];
-	if (!l || l.length === 0) return { blocks: [] };
-	let u = l.map((e) => e.contentId).filter((e) => e != null);
-	if (u.length === 0) return { blocks: [] };
-	let d = u.map(() => "?").join(","), f = +!!a, p = await e.prepare(`SELECT * FROM content_blocks WHERE contentId IN (${d}) AND isDraft = ? ORDER BY contentId ASC, sortOrder ASC`).all(...u, f), m = Array.isArray(p) ? p : p?.results || [], h = /* @__PURE__ */ new Map();
-	m.forEach((e) => {
+	let l = await e.prepare("\n    WITH RECURSIVE ancestor_path(contentId, title, slug, parentId, level) AS (\n      SELECT t.contentId, c.title, c.slug, t.parentId, 0 FROM tree_nodes t INNER JOIN content_nodes c ON t.contentId = c.id WHERE t.contentId = ? AND t.treeId = ?\n      UNION ALL\n      SELECT t.contentId, c.title, c.slug, t.parentId, ap.level + 1 FROM tree_nodes t INNER JOIN content_nodes c ON t.contentId = c.id INNER JOIN ancestor_path ap ON t.contentId = ap.parentId AND t.treeId = ?\n    )\n    SELECT * FROM ancestor_path ORDER BY level ASC\n  ").all(t, n, n), u = Array.isArray(l) ? l : l?.results || [];
+	if (!u || u.length === 0) return { blocks: [] };
+	let d = u.map((e) => e.contentId).filter((e) => e != null);
+	if (d.length === 0) return { blocks: [] };
+	let f = d.map(() => "?").join(","), p = +!!o, m = await e.prepare(`SELECT * FROM content_blocks WHERE contentId IN (${f}) AND isDraft = ? ORDER BY contentId ASC, sortOrder ASC`).all(...d, p), h = Array.isArray(m) ? m : m?.results || [], g = /* @__PURE__ */ new Map();
+	h.forEach((e) => {
 		let t = String(e.contentId);
-		h.has(t) || h.set(t, []), h.get(t).push(e);
+		g.has(t) || g.set(t, []), g.get(t).push(e);
 	});
-	for (let t of l) {
-		let n = h.get(String(t.contentId)) || [];
+	for (let t of u) {
+		let n = g.get(String(t.contentId)) || [];
 		if (n.filter((e) => e.region === r).length === 0) continue;
-		let o = /* @__PURE__ */ new Set([r]), c = !0;
-		for (; c;) {
-			c = !1;
+		let l = /* @__PURE__ */ new Set([r]), u = !0;
+		for (; u;) {
+			u = !1;
 			for (let e of n) {
-				if (!o.has(e.region)) continue;
+				if (!l.has(e.region)) continue;
 				let t = {};
 				try {
 					t = (typeof e.dataJson == "string" ? JSON.parse(e.dataJson) : e.dataJson) || {};
 				} catch {}
 				let r = String(e.id), i = String(t.blockId || t._instanceId || t.id || e.blockId);
 				for (let e of n) {
-					if (!e.region || o.has(e.region)) continue;
+					if (!e.region || l.has(e.region)) continue;
 					let t = e.region;
-					(t.startsWith(`${r}-`) || t.startsWith(`${r}_`) || i && i !== "undefined" && i !== "null" && (t.startsWith(`${i}-`) || t.startsWith(`${i}_`) || t.startsWith(i))) && (o.add(t), c = !0);
+					(t.startsWith(`${r}-`) || t.startsWith(`${r}_`) || i && i !== "undefined" && i !== "null" && (t.startsWith(`${i}-`) || t.startsWith(`${i}_`) || t.startsWith(i))) && (l.add(t), u = !0);
 				}
 			}
 		}
-		let l = await Promise.all(n.filter((e) => o.has(e.region)).map(async (t) => {
+		let d = await Promise.all(n.filter((e) => l.has(e.region)).map(async (t) => {
 			let n = {};
 			try {
 				n = (typeof t.dataJson == "string" ? JSON.parse(t.dataJson) : t.dataJson) || {};
 			} catch {}
-			s && dS(n.startShowingAt, n.stopShowingAt, s);
-			let o = n.hidden === !0 || n.hidden === 1 || n.hidden === "1" || n.hidden === "true", c = fS(n.startShowingAt, n.stopShowingAt);
-			if (!a && (o || !c)) return null;
-			let l = t.elementType || t.componentId || "text-block", u = i.blocks?.[l]?.fields || i.elements?.[l]?.fields || i.components?.[l]?.fields || {}, d = String(n.blockId || n._instanceId || n.id || t.blockId || t.id), f = hS(n, u);
-			return f = await fx(e, f), f = gS(f), f.blockId = d, {
+			c && dS(n.startShowingAt, n.stopShowingAt, c);
+			let l = n.hidden === !0 || n.hidden === 1 || n.hidden === "1" || n.hidden === "true", u = fS(n.startShowingAt, n.stopShowingAt);
+			if (!o && (l || !u)) return null;
+			let d = t.elementType || t.componentId || "text-block", f = i.blocks?.[d]?.fields || i.elements?.[d]?.fields || i.components?.[d]?.fields || {}, p = String(n.blockId || n._instanceId || n.id || t.blockId || t.id), m = hS(n, f);
+			return m = await fx(e, m), m = gS(m), m = await _S(e, m, a, s), m.blockId = p, {
 				region: t.region || r,
 				block: {
 					instanceId: t.id,
-					blockId: d,
-					componentId: l,
-					data: f
+					blockId: p,
+					componentId: d,
+					data: m
 				}
 			};
-		})), u = {};
-		for (let e of l) e && (u[e.region] || (u[e.region] = []), u[e.region].push(e.block));
-		if (u[r] && u[r].length > 0) return {
-			blocks: u[r],
-			subRegions: u,
+		})), f = {};
+		for (let e of d) e && (f[e.region] || (f[e.region] = []), f[e.region].push(e.block));
+		if (f[r] && f[r].length > 0) return {
+			blocks: f[r],
+			subRegions: f,
 			inheritedFromId: String(t.contentId),
 			inheritedFromTitle: t.title || t.slug
 		};
@@ -26408,8 +26444,16 @@ async function _S(e, t, n, r) {
 		if (i.size === 0 && a.size === 0) return t;
 		let o = /* @__PURE__ */ new Map();
 		if (i.size > 0) {
-			let t = Array.from(i).map(() => "?").join(","), r = await e.prepare(`SELECT nodeId, path FROM node_routes WHERE channelId = ? AND nodeId IN (${t}) AND isCanonical = 1`).all(n, ...i);
-			(Array.isArray(r) ? r : r?.results || []).forEach((e) => o.set(String(e.nodeId), e.path));
+			let t = Array.from(i).map(() => "?").join(","), r = await e.prepare(`
+        SELECT nodeId, path, channelId 
+        FROM node_routes 
+        WHERE nodeId IN (${t}) AND isCanonical = 1
+        ORDER BY CASE WHEN channelId = ? THEN 0 ELSE 1 END ASC
+      `).all(...i, n);
+			(Array.isArray(r) ? r : r?.results || []).forEach((e) => {
+				let t = String(e.nodeId);
+				o.has(t) || o.set(t, e.path);
+			});
 		}
 		let s = Array.from(a).map(() => "?").join(","), c = a.size > 0 ? await e.prepare(`SELECT id, cdnUrl, storageKeyPrivate FROM assets WHERE id IN (${s})`).all(...a) : [], l = /* @__PURE__ */ new Map();
 		return (Array.isArray(c) ? c : c?.results || []).forEach((e) => l.set(String(e.id), e.cdnUrl || (e.storageKeyPrivate ? `/media/${e.storageKeyPrivate}` : ""))), t.replace(/<a\s+([^>]+)>/gi, (e, t) => {
@@ -26445,7 +26489,7 @@ async function vS(e, t, n, r) {
 	if (a) return yS(e, a[1], r);
 	if (!i) return t.href;
 	let o = i[1];
-	return (await e.prepare("SELECT path FROM node_routes WHERE nodeId = ? AND channelId = ? AND isCanonical = 1 LIMIT 1").get(Number(o), n))?.path || "#";
+	return (await e.prepare("\n    SELECT path \n    FROM node_routes \n    WHERE nodeId = ? AND isCanonical = 1 \n    ORDER BY CASE WHEN channelId = ? THEN 0 ELSE 1 END ASC \n    LIMIT 1\n  ").get(Number(o), n))?.path || "#";
 }
 async function yS(e, t, n) {
 	let r = String(t), i = n.assetUrls.get(r);
@@ -26548,7 +26592,7 @@ async function wS(e) {
 		if (!m) return e.json({ error: `Channel '${p}' not found` }, 404);
 		let h = m.status === "disabled" || m.status === "inactive" || m.isEnabled === 0 || m.isEnabled === !1;
 		if (!s && h) return e.json({ error: `Channel '${m.key || p}' is currently inactive` }, 404);
-		let g = m.id, _ = m.key || p, v = await t.prepare("\n      SELECT * FROM node_routes WHERE path = ? AND channelId = ? LIMIT 1\n    ").get(f, g);
+		let g = m.id, _ = m.key || p, v = await t.prepare("SELECT * FROM node_routes WHERE path = ? AND channelId = ? LIMIT 1").get(f, g);
 		if (v?.redirectUrl) return e.json({
 			redirect: v.redirectUrl,
 			isCanonical: !1
@@ -26566,9 +26610,7 @@ async function wS(e) {
 			let e = await t.prepare("SELECT snapshotJson FROM node_revisions WHERE nodeId = ? AND version = ?").get(y.id, Number(c));
 			if (e && e.snapshotJson) try {
 				x = JSON.parse(e.snapshotJson), x.node && (x.node.title && (y.title = x.node.title), x.node.slug && (y.slug = x.node.slug));
-			} catch (e) {
-				console.error("[CMS] Failed to parse snapshotJson", e);
-			}
+			} catch {}
 		}
 		let S = await t.prepare(`SELECT contentId as treeNodeId, treeId, parentId FROM tree_nodes WHERE contentId = ? ${b ? "AND treeId = ?" : ""} LIMIT 1`).get(y.id, ...b ? [b] : []);
 		!b && S?.treeId && (b = S.treeId), b ||= "main-nav";
@@ -26601,7 +26643,23 @@ async function wS(e) {
 				return n > 0 ? e.header("Cache-Control", `public, max-age=${n}, s-maxage=${n}`) : e.header("Cache-Control", "no-cache, no-store, must-revalidate"), e.json(t);
 			}
 		}
-		let A = S?.parentId || null, ne = v?.path || (f === "" ? "/" : f), j = {
+		let A = S?.parentId || null;
+		if (!S && !A) {
+			let e = f.split("/").filter(Boolean);
+			if (e.length > 1) {
+				e.pop();
+				let n = "/" + e.join("/"), r = await t.prepare("SELECT nodeId FROM node_routes WHERE path = ? AND channelId = ? LIMIT 1").get(n, g);
+				if (r?.nodeId) {
+					let e = await t.prepare("SELECT contentId, treeId FROM tree_nodes WHERE contentId = ? LIMIT 1").get(r.nodeId);
+					e && (A = e.contentId, b = e.treeId);
+				}
+			}
+			if (!A) {
+				let e = await t.prepare("SELECT contentId, treeId FROM tree_nodes WHERE parentId IS NULL ORDER BY sortOrder ASC LIMIT 1").get();
+				e && (A = e.contentId, b = e.treeId);
+			}
+		}
+		let ne = v?.path || (f === "" ? "/" : f), j = {
 			id: y.id,
 			title: y.title,
 			slug: y.slug,
@@ -26629,7 +26687,7 @@ async function wS(e) {
 		if (!s && (be || xe || Se && !Ce)) return e.json({ error: "Node is hidden, offline, or has never been published." }, 404);
 		let we = [];
 		if (S?.treeNodeId) {
-			let e = await t.prepare("\n        SELECT t.contentId as treeNodeId, t.contentId as id, c.title, c.slug, c.language, c.contentType as nodeType, c.isHidden, c.dataJson, c.draftDataJson\n        FROM tree_nodes t INNER JOIN content_nodes c ON t.contentId = c.id WHERE t.parentId = ? AND t.treeId = ? ORDER BY t.sortOrder ASC\n      ").all(S.treeNodeId, b), n = Array.isArray(e) ? e : e?.results || [], i = j.path || "", a = i === "/" ? "" : i;
+			let e = await t.prepare("SELECT t.contentId as treeNodeId, t.contentId as id, c.title, c.slug, c.language, c.contentType as nodeType, c.isHidden, c.dataJson, c.draftDataJson FROM tree_nodes t INNER JOIN content_nodes c ON t.contentId = c.id WHERE t.parentId = ? AND t.treeId = ? ORDER BY t.sortOrder ASC").all(S.treeNodeId, b), n = Array.isArray(e) ? e : e?.results || [], i = j.path || "", a = i === "/" ? "" : i;
 			we = n.map((e) => {
 				let t = {}, n = s && e.draftDataJson || e.dataJson;
 				if (!n) return null;
@@ -26692,7 +26750,7 @@ async function wS(e) {
 		for (let [e, i] of Object.entries(ke)) {
 			let a = Ee[e] && Ee[e].length > 0, o = !!se[e];
 			if (Ee[e] || (Ee[e] = [], De[e] = { isInherited: !1 }), (i?.inherit === "parent" || i?.inherit === !0 || i?.inherit === "true" || e === "header" || e === "footer") && !a && !o && A) {
-				let i = await mS(t, A, String(b), e, re, s, n, r);
+				let i = await mS(t, A, b, e, re, g, s, n, r);
 				if (i.blocks.length > 0 && (Ee[e] = i.blocks, De[e] = {
 					isInherited: !0,
 					inheritedFromId: i.inheritedFromId,
@@ -26704,7 +26762,7 @@ async function wS(e) {
 				});
 			}
 		}
-		await Promise.all(Object.keys(Ee).map((e) => pS(t, Ee[e], g, E, r)));
+		await Promise.all(Object.keys(Ee).map((e) => pS(t, Ee[e], g, E, r, re)));
 		let Ae = null, je = null;
 		if (r.length > 0) {
 			je = Math.min(...r);
@@ -26765,10 +26823,9 @@ var TS = X({
 	method: "get",
 	path: "/{path}",
 	summary: "Fetch CMS Node Content",
-	description: "Retrieves a fully hydrated CMS node along with its content blocks and inherited regions using $O(1)$ routing table lookups.",
 	tags: ["Public Node API"],
 	request: {
-		params: X({ path: J().optional().openapi({ description: "The full URL path or slug of the requested node" }) }),
+		params: X({ path: J().optional() }),
 		query: TS
 	},
 	responses: {
@@ -26777,11 +26834,11 @@ var TS = X({
 			content: { "application/json": { schema: DS } }
 		},
 		404: {
-			description: "Node or Channel not found",
+			description: "Not found",
 			content: { "application/json": { schema: ES } }
 		},
 		500: {
-			description: "Server error during hydration",
+			description: "Server error",
 			content: { "application/json": { schema: ES } }
 		}
 	}
@@ -26794,36 +26851,43 @@ var kS = new $y(), AS = X({
 	channelId: J().optional().openapi({ description: "Channel ID or key" }),
 	limit: Ky().min(1).max(50).default(12).openapi({ description: "Number of items (max 50)" }),
 	offset: Ky().min(0).default(0).openapi({ description: "Pagination offset" }),
-	sortBy: lv([
-		"updatedAt",
-		"createdAt",
-		"title_asc"
-	]).default("updatedAt"),
+	sortBy: J().default("updatedAt_desc").openapi({ description: "Sort field and direction" }),
 	authors: G_([J(), z_(J())]).optional(),
 	categories: G_([J(), z_(J())]).optional(),
 	tags: G_([J(), z_(J())]).optional()
 }), jS = async (e) => {
 	try {
-		let t = e.get("db"), n = e.req.valid("query"), r = n.nodeType || "article", i = String(r).split(",").map((e) => e.trim()).filter(Boolean), a = `FROM content_nodes WHERE contentType IN (${i.map(() => "?").join(",")}) AND isHidden = 0 AND IFNULL(status, 'published') = 'published'`, o = [...i];
-		n.channelId && n.channelId !== "all" && (a += " AND EXISTS (SELECT 1 FROM node_channels nc WHERE nc.nodeId = content_nodes.id AND nc.channelId = ?)", o.push(Number(n.channelId) || n.channelId));
-		let s = (/* @__PURE__ */ new Date()).toISOString();
-		a += " AND IFNULL(json_extract(dataJson, '$.startShowingAt'), '') <= ?", o.push(s), a += " AND IFNULL(json_extract(dataJson, '$.stopShowingAt'), '9999-12-31') >= ?", o.push(s);
-		let c = (e, t, n = !1) => {
+		let t = e.get("db"), n = e.req.valid("query"), r = n.nodeType || "article", i = String(r).split(",").map((e) => e.trim()).filter(Boolean), a = i.map(() => "?").join(","), o = px(e.env?.BUNDLED_DEFINITIONS), s = {};
+		for (let e of i) {
+			s[e] = [];
+			let t = o.nodes?.[e] || {}, n = { ...t.fields || {} };
+			t.tabs && Object.values(t.tabs).forEach((e) => {
+				Object.assign(n, e.fields || {});
+			});
+			for (let [t, r] of Object.entries(n)) (r.showInList || r.showInLists) && s[e].push(t);
+		}
+		let c = `FROM content_nodes WHERE contentType IN (${a}) AND isHidden = 0 AND IFNULL(status, 'published') = 'published'`, l = [...i];
+		n.channelId && n.channelId !== "all" && (c += " AND EXISTS (SELECT 1 FROM node_channels nc WHERE nc.nodeId = content_nodes.id AND nc.channelId = ?)", l.push(Number(n.channelId) || n.channelId));
+		let u = (/* @__PURE__ */ new Date()).toISOString();
+		c += " AND IFNULL(json_extract(dataJson, '$.startShowingAt'), '') <= ?", l.push(u), c += " AND IFNULL(json_extract(dataJson, '$.stopShowingAt'), '9999-12-31') >= ?", l.push(u);
+		let d = (e, t, n = !1) => {
 			let r = Array.isArray(t) ? t : t.split(",").map((e) => e.trim());
 			if (r.length === 0) return;
 			let i = r.map(() => "?").join(",");
-			n ? (a += ` AND EXISTS (SELECT 1 FROM node_relations nr WHERE nr.sourceNodeId = content_nodes.id AND nr.fieldKey = ? AND nr.targetNodeId IN (${i}))`, o.push(e, ...r)) : (a += ` AND EXISTS (SELECT 1 FROM node_terms nt INNER JOIN taxonomy_terms tt ON nt.termId = tt.id WHERE nt.nodeId = content_nodes.id AND tt.taxonomy = ? AND tt.key IN (${i}))`, o.push(e, ...r));
+			n ? (c += ` AND EXISTS (SELECT 1 FROM node_relations nr WHERE nr.sourceNodeId = content_nodes.id AND nr.fieldKey = ? AND nr.targetNodeId IN (${i}))`, l.push(e, ...r)) : (c += ` AND EXISTS (SELECT 1 FROM node_terms nt INNER JOIN taxonomy_terms tt ON nt.termId = tt.id WHERE nt.nodeId = content_nodes.id AND tt.taxonomy = ? AND tt.key IN (${i}))`, l.push(e, ...r));
 		};
-		n.authors && c("authors", n.authors, !0), n.categories && c("categories", n.categories, !1), n.tags && c("tags", n.tags, !1);
-		let l = "ORDER BY updatedAt DESC";
-		n.sortBy === "createdAt" ? l = "ORDER BY createdAt DESC" : n.sortBy === "title_asc" && (l = "ORDER BY LOWER(title) ASC");
-		let u = `SELECT id, title, slug, language, dataJson, createdAt, updatedAt ${a} ${l} LIMIT ? OFFSET ?`;
-		o.push(n.limit, n.offset);
-		let d = await t.prepare(u).all(...o), f = Array.isArray(d) ? d : d?.results || [], p = f.map((e) => {
+		n.authors && d("authors", n.authors, !0), n.categories && d("categories", n.categories, !1), n.tags && d("tags", n.tags, !1);
+		let f = String(n.sortBy || "updatedAt_desc"), [p, m] = f.includes("_") ? f.split("_") : [f, "desc"], h = String(m).toLowerCase() === "asc" ? "ASC" : "DESC", g = String(p).replace(/[^a-zA-Z0-9_]/g, ""), _ = `ORDER BY updatedAt ${h}`;
+		g === "createdAt" || g === "published" ? _ = `ORDER BY createdAt ${h}` : g === "title" ? _ = `ORDER BY LOWER(title) ${h}` : g !== "updatedAt" && g !== "" && (_ = `ORDER BY json_extract(dataJson, '$.${g}') ${h}`);
+		let v = `SELECT id, title, slug, language, dataJson, createdAt, updatedAt ${c} ${_} LIMIT ? OFFSET ?`;
+		l.push(n.limit, n.offset);
+		let y = await t.prepare(v).all(...l), b = Array.isArray(y) ? y : y?.results || [], x = b.map((e) => {
 			let t = {};
 			try {
 				t = typeof e.dataJson == "string" ? JSON.parse(e.dataJson) : e.dataJson || {};
 			} catch {}
+			let n = {}, r = s[e.contentType || "article"] || [];
+			for (let e of r) t[e] !== void 0 && (n[e] = t[e]);
 			return {
 				id: e.id,
 				title: e.title,
@@ -26831,15 +26895,16 @@ var kS = new $y(), AS = X({
 				language: e.language,
 				createdAt: e.createdAt,
 				updatedAt: e.updatedAt,
+				...n,
 				excerpt: t.excerpt || "",
 				image: t.image || t.coverImage || null,
 				author: t.author || null
 			};
 		});
 		return e.json({
-			items: p,
-			count: p.length,
-			rawCount: f.length,
+			items: x,
+			count: x.length,
+			rawCount: b.length,
 			limit: n.limit,
 			offset: n.offset
 		}, 200);
@@ -26901,11 +26966,11 @@ var IS = X({ treeParam: J().openapi({ description: "The ID or key of the request
 	path: J(),
 	nodeType: J().optional(),
 	hidden: c_(),
-	summary: J(),
+	summary: J().optional(),
 	url: J().optional(),
 	target: J().optional(),
 	children: z_(zS).optional()
-})).openapi("TreeItem"), BS = X({
+}).passthrough()).openapi("TreeItem"), BS = X({
 	treeId: G_([c_(), J()]),
 	key: J(),
 	channelId: J(),
@@ -26963,42 +27028,42 @@ NS.openapi(VS, async (e) => {
 			let t = await p.get(m);
 			if (t) return e.header("X-Cache", "HIT"), e.json(t, 200);
 		}
-		let g = u?.id || (l ? Number(n) : null), _ = {};
+		let g = u?.id || (l ? Number(n) : null), _ = e.env?.BUNDLED_DEFINITIONS, v = px(_), y = v.treeExposedFields || ["summary"], b = {};
 		if (u && u.dataJson) try {
-			let t = typeof u.dataJson == "string" ? JSON.parse(u.dataJson) : u.dataJson, r = e.env?.BUNDLED_DEFINITIONS, i = px(r), a = (i.trees?.[u.treeType || n] || i.trees?.site || {}).fields || {};
-			for (let [e, n] of Object.entries(t)) a[e]?.public === !0 && (_[e] = n);
+			let e = typeof u.dataJson == "string" ? JSON.parse(u.dataJson) : u.dataJson, t = (v.trees?.[u.treeType || n] || v.trees?.site || {}).fields || {};
+			for (let [n, r] of Object.entries(e)) t[n]?.public === !0 && (b[n] = r);
 		} catch (e) {
 			console.warn("[CMS Public Tree API] Failed to parse tree dataJson", e);
 		}
-		let v = [];
+		let x = [];
 		if (g !== null) {
 			let e = await t.prepare("\n          SELECT \n            t.contentId as treeNodeId,\n            t.treeId,\n            t.contentId as id,\n            t.parentId,\n            t.sortOrder,\n            c.title,\n            c.slug,\n            c.language,\n            c.contentType as nodeType,\n            c.isHidden,\n            c.startShowingAt,\n            c.stopShowingAt,\n            c.status,\n            c.dataJson,\n            c.draftDataJson,\n            (\n              SELECT path \n              FROM node_routes \n              WHERE nodeId = c.id AND channelId = ? \n              ORDER BY CASE WHEN treeId = t.treeId THEN 0 ELSE 1 END ASC \n              LIMIT 1\n            ) as materializedPath\n          FROM tree_nodes t\n          INNER JOIN content_nodes c ON t.contentId = c.id\n          WHERE t.treeId = ? AND (c.deletedAt IS NULL OR c.deletedAt = '')\n          ORDER BY t.sortOrder ASC\n        ").all(c, g);
-			v = Array.isArray(e) ? e : e?.results || [];
+			x = Array.isArray(e) ? e : e?.results || [];
 		}
-		if ((!v || v.length === 0) && !u) return e.json({ error: `Tree '${n}' not found` }, 404);
-		let y = /* @__PURE__ */ new Map();
-		for (let e of v) {
-			let t = !e.parentId || e.parentId === "null" || e.parentId === "" ? null : e.parentId, n = t === null ? "__ROOT__" : String(t), r = y.get(n);
-			r ? r.push(e) : y.set(n, [e]);
+		if ((!x || x.length === 0) && !u) return e.json({ error: `Tree '${n}' not found` }, 404);
+		let S = /* @__PURE__ */ new Map();
+		for (let e of x) {
+			let t = !e.parentId || e.parentId === "null" || e.parentId === "" ? null : e.parentId, n = t === null ? "__ROOT__" : String(t), r = S.get(n);
+			r ? r.push(e) : S.set(n, [e]);
 		}
-		let b = /* @__PURE__ */ new Map();
-		for (let e of v) {
+		let C = /* @__PURE__ */ new Map();
+		for (let e of x) {
 			let t = String(e.id), n = o && e.draftDataJson ? e.draftDataJson : e.dataJson;
 			if (!n) {
-				b.set(t, {});
+				C.set(t, {});
 				continue;
 			}
 			try {
 				let e = typeof n == "string" ? JSON.parse(n) : n;
-				b.set(t, e && typeof e == "object" ? e : {});
+				C.set(t, e && typeof e == "object" ? e : {});
 			} catch {
-				b.set(t, {});
+				C.set(t, {});
 			}
 		}
-		function x(e = null, t = "") {
+		function w(e = null, t = "") {
 			let n = e == null || e === "" || e === "null" ? "__ROOT__" : String(e);
-			return (y.get(n) || []).map((e) => {
-				let n = b.get(String(e.id)) || {}, r = {};
+			return (S.get(n) || []).map((e) => {
+				let n = C.get(String(e.id)) || {}, r = {};
 				for (let [e, t] of Object.entries(n)) e !== "_isTreeDraft" && e !== "_draftParentId" && e !== "isNew" && e !== "hidden" && e !== "is_hidden" && e !== "isHidden" && e !== "status" && (r[e] = t);
 				let i = !o && (e.status === "draft" || e.status === "new"), a = Number(e.isHidden) === 1 || i || n.hidden === !0 || n.hidden === 1 || n.hidden === "1" || n.hidden === "true", s = PS(e.startShowingAt === void 0 ? n.startShowingAt : e.startShowingAt, e.stopShowingAt === void 0 ? n.stopShowingAt : e.stopShowingAt), c = (e.slug || "").replace(/^\/+|\/+$/g, ""), l = !e.parentId || e.parentId === "null" || e.parentId === "", u = e.materializedPath || (l ? `/${c}` : `${t}/${c}`.replace(/\/+/g, "/")), d = e.language && String(e.language).trim() !== "" ? e.language.trim() : f, p = {
 					id: e.id,
@@ -27009,24 +27074,24 @@ NS.openapi(VS, async (e) => {
 					language: d,
 					path: u,
 					nodeType: e.nodeType,
-					hidden: a || !s ? 1 : 0,
-					summary: r.summary || ""
+					hidden: a || !s ? 1 : 0
 				};
+				for (let e of y) r[e] !== void 0 && (p[e] = r[e]);
 				e.nodeType === "external-link" && (r.url && (p.url = r.url), r.target && (p.target = r.target));
 				let m = u === "/" ? "" : u;
-				return p.children = x(e.id, m), p;
+				return p.children = w(e.id, m), p;
 			}).filter((e) => o || !e.hidden);
 		}
-		let S = {
+		let T = {
 			treeId: u?.id || g,
 			key: u?.key || n,
 			channelId: String(i),
 			language: f,
 			label: u?.label || n,
-			..._,
-			items: x(null)
+			...b,
+			items: w(null)
 		};
-		return !o && !h && (e.header("X-Cache", "MISS"), await FS(p, m, S, 300)), e.json(S, 200);
+		return !o && !h && (e.header("X-Cache", "MISS"), await FS(p, m, T, 300)), e.json(T, 200);
 	} catch (t) {
 		return console.error("[CMS Public Tree API] Error:", t), e.json({
 			error: "Failed to fetch public tree",

package/dist/schema-compiler.js

@@ -30,7 +30,7 @@ async function f() {
 	if (n(f)) l = (await import(t(f).href)).compileDefinitions;
 	else if (n(p)) l = (await import(t(p).href)).compileDefinitions;
 	else try {
-		l = (await import("./dist-Bta0OpXl.js")).compileDefinitions;
+		l = (await import("./dist-D_Q1y4Kh.js")).compileDefinitions;
 	} catch (e) {
 		console.error("\x1B[31m  ✖\x1B[0m \x1B[31mCould not resolve Kama Schema Engine:\x1B[0m", e), process.exit(1);
 	}

package/package.json

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