@brightsideoy/kama 0.1.0-alpha.170 → 0.1.0-alpha.172

package/dist/index.js

@@ -5558,7 +5558,7 @@ var b = { hasSubscribers: !1 }, x = b, S = b, C = typeof performance == "object"
 	async clear() {
 		this.cache.clear();
 	}
-}, P = class {
+}, te = class {
 	kv;
 	constructor(e) {
 		this.kv = e;
@@ -5575,21 +5575,21 @@ var b = { hasSubscribers: !1 }, x = b, S = b, C = typeof performance == "object"
 		this.kv && await this.kv.delete(e);
 	}
 	async clear() {}
-}, te = class {
+}, ne = class {
 	async get() {
 		return null;
 	}
 	async set() {}
 	async delete() {}
 	async clear() {}
-}, F = null;
-function I(e) {
+}, P = null;
+function F(e) {
 	let t = process.env.CACHE_DRIVER || "lru";
-	return t === "none" || t === "off" || t === "false" ? new te() : e?.env?.CMS_CACHE_KV ? new P(e.env.CMS_CACHE_KV) : t === "lru" ? (F ||= new ee(), F) : new te();
+	return t === "none" || t === "off" || t === "false" ? new ne() : e?.env?.CMS_CACHE_KV ? new te(e.env.CMS_CACHE_KV) : t === "lru" ? (P ||= new ee(), P) : new ne();
 }
 //#endregion
 //#region server/storage/local.ts
-var L = class {
+var re = class {
 	customStoragePath;
 	constructor(e) {
 		this.customStoragePath = e;
@@ -5658,7 +5658,7 @@ var L = class {
 			if (e.code !== "ENOENT") throw e;
 		}
 	}
-}, ne = class {
+}, ie = class {
 	async process(e, t, n) {
 		let r = await import(
 			/* @vite-ignore */
@@ -5685,7 +5685,7 @@ var L = class {
 			return console.warn("⚠️ [SharpImageOptimizer] Processing failed, returning raw buffer."), e;
 		}
 	}
-}, re = class {
+}, ae = class {
 	bucket;
 	publicDomain;
 	constructor(e, t) {
@@ -5730,7 +5730,7 @@ var L = class {
 	async delete(e) {
 		await this.bucket.delete(e);
 	}
-}, ie = class {
+}, oe = class {
 	async process(e, t, n) {
 		let { env: r, key: i, req: a } = n;
 		if (r.IMAGES) try {
@@ -5767,18 +5767,18 @@ var L = class {
 };
 //#endregion
 //#region server/storage/factory.ts
-function ae(e) {
+function I(e) {
 	return e.KAMA_RUNTIME === "cloudflare" || e.MEDIA_BUCKET ? {
-		storage: new re(e.MEDIA_BUCKET, e.CDN_DOMAIN || ""),
-		optimizer: new ie()
+		storage: new ae(e.MEDIA_BUCKET, e.CDN_DOMAIN || ""),
+		optimizer: new oe()
 	} : {
-		storage: new L(e.LOCAL_MEDIA_PATH),
-		optimizer: new ne()
+		storage: new re(e.LOCAL_MEDIA_PATH),
+		optimizer: new ie()
 	};
 }
 //#endregion
 //#region server/utils/node-assets-interceptor.ts
-function R(e) {
+function se(e) {
 	if (!e || typeof e != "object") return {
 		cleanedData: e,
 		assetRefs: []
@@ -5837,7 +5837,7 @@ function R(e) {
 		assetRefs: t
 	};
 }
-async function oe(e, t, n) {
+async function ce(e, t, n) {
 	if (await e.prepare("DELETE FROM node_assets WHERE nodeId = ?").run(t), n.length === 0) return;
 	let r = /* @__PURE__ */ new Set();
 	for (let i of n) {
@@ -5847,23 +5847,23 @@ async function oe(e, t, n) {
 }
 //#endregion
 //#region server/utils/asset-hydrator.ts
-function z(e) {
+function L(e) {
 	if (!e) return null;
 	if (typeof e == "string" && e.startsWith("ast_")) return e;
 	if (typeof e == "object" && e) {
 		if (typeof e.id == "string" && e.id.startsWith("ast_")) return e.id;
-		if (typeof e.id == "object") return z(e.id);
+		if (typeof e.id == "object") return L(e.id);
 	}
 	return null;
 }
-async function B(e, t) {
+async function R(e, t) {
 	if (!t || typeof t != "object") return t;
 	let n = /* @__PURE__ */ new Set(), r = (e) => {
 		if (!e) return;
-		let t = z(e);
+		let t = L(e);
 		if (t) {
 			if (n.add(t), typeof e == "object" && e.parentAssetId) {
-				let t = z(e.parentAssetId);
+				let t = L(e.parentAssetId);
 				t && n.add(t);
 			}
 			typeof e == "object" && e.variants && Object.values(e.variants).forEach(r);
@@ -5895,7 +5895,7 @@ async function B(e, t) {
       AND (parentAssetId IN (${i}) OR ${Array.from(n).map(() => "filename LIKE ?").join(" OR ")})
   `).all(...Array.from(n), ...Array.from(n).map((e) => `%${e}%`)), c = Array.isArray(s) ? s : s?.results || [], l = /* @__PURE__ */ new Map();
 	for (let e of c) {
-		let t = z(e.parentAssetId) || Array.from(n).find((t) => e.filename.includes(t));
+		let t = L(e.parentAssetId) || Array.from(n).find((t) => e.filename.includes(t));
 		if (!t) continue;
 		let r = e.filename.match(/^crop_([a-z0-9]+)_/i), i = r ? r[1] : "standard", a = null;
 		if (e.cropCoordinatesJson) try {
@@ -5933,7 +5933,7 @@ async function B(e, t) {
 			id: e.id,
 			url: r,
 			originalUrl: i,
-			parentAssetId: z(e.parentAssetId) || null,
+			parentAssetId: L(e.parentAssetId) || null,
 			cropCoordinates: a,
 			variants: o && Object.keys(o).length > 0 ? o : void 0,
 			filename: e.filename,
@@ -5945,7 +5945,7 @@ async function B(e, t) {
 	}
 	let d = (e) => {
 		if (!e) return e;
-		let t = z(e);
+		let t = L(e);
 		if (t) {
 			let n = u.get(t), r = typeof e == "object" && e.variants ? e.variants : void 0, i = typeof e == "object" && e.cropCoordinates ? e.cropCoordinates : void 0, a = typeof e == "object" && e.metadataOverrides ? e.metadataOverrides : void 0, o = n?.url || (typeof e == "object" && e.url && !e.url.startsWith("blob:") ? e.url : ""), s = n?.originalUrl || (typeof e == "object" && e.originalUrl && !e.originalUrl.startsWith("blob:") ? e.originalUrl : o), c;
 			if (r || n?.variants) {
@@ -5956,7 +5956,7 @@ async function B(e, t) {
 			return {
 				...n || {},
 				id: t,
-				parentAssetId: n?.parentAssetId ? z(n.parentAssetId) : null,
+				parentAssetId: n?.parentAssetId ? L(n.parentAssetId) : null,
 				url: o,
 				originalUrl: s,
 				cropCoordinates: i || n?.cropCoordinates || null,
@@ -5976,7 +5976,7 @@ async function B(e, t) {
 }
 //#endregion
 //#region src/utils/schema-loader.ts
-function se(e) {
+function le(e) {
 	return e ? {
 		nodes: e.nodes || {},
 		trees: e.trees || {},
@@ -5995,7 +5995,7 @@ function se(e) {
 }
 //#endregion
 //#region server/services/cache-manager.ts
-var V = class {
+var z = class {
 	env;
 	constructor(e) {
 		this.env = e || {};
@@ -6060,7 +6060,7 @@ var V = class {
 	}
 	async purgeInternalWorkerCache(e, t, n, r, i) {
 		try {
-			let a = I(e);
+			let a = F(e);
 			if (n) {
 				let e = t.prepare("SELECT treeId FROM tree_nodes WHERE contentId = ?"), r = typeof e.all == "function" ? await e.all(n) : await e.bind(n).all(), i = Array.isArray(r) ? r : r?.results || [];
 				for (let e of i) await a.delete(`tree:default:${e.treeId}`), await a.delete(`tree:all:${e.treeId}`);
@@ -6203,8 +6203,8 @@ var V = class {
 			console.warn("⚠️ [CacheWarmer] Tree-wide warming failed:", e);
 		}
 	}
-}, H = new e();
-async function ce(e, t, n = []) {
+}, B = new e();
+async function ue(e, t, n = []) {
 	let r = e.prepare(t);
 	if (typeof r.bind == "function") {
 		let e = await r.bind(...n).all();
@@ -6216,23 +6216,23 @@ async function ce(e, t, n = []) {
 	}
 	return [];
 }
-async function le(e, t, n = []) {
+async function de(e, t, n = []) {
 	let r = e.prepare(t);
 	if (typeof r.bind == "function") return r.bind(...n).run();
 	if (typeof r.run == "function") return r.run(...n);
 }
-function U(e) {
+function fe(e) {
 	return !e || !e.trim() ? null : e.normalize("NFD").replace(/[\u0300-\u036f]/g, "").toLowerCase().trim().replace(/[^a-z0-9\s-]/g, "").replace(/[\s-]+/g, "-").replace(/^-+|-+$/g, "") || null;
 }
-function ue(e) {
+function V(e) {
 	return +(e === !0 || e === 1 || e === "1" || e === "true");
 }
-function de(e) {
+function H(e) {
 	if (e == null || e === "null" || e === "" || typeof e == "string" && e.startsWith("draft-")) return null;
 	let t = Number(e);
 	return isNaN(t) ? null : t;
 }
-function fe(e) {
+function pe(e) {
 	let t = { ...e };
 	delete t.language, delete t.defaultLanguage;
 	for (let e of [
@@ -6261,22 +6261,22 @@ function fe(e) {
 	]) delete t[e];
 	return t;
 }
-function pe(e, t = /* @__PURE__ */ new Set()) {
-	return e ? typeof e == "string" ? (e.startsWith("ast_") && t.add(e), t) : Array.isArray(e) ? (e.forEach((e) => pe(e, t)), t) : (typeof e == "object" && Object.values(e).forEach((e) => pe(e, t)), t) : t;
+function me(e, t = /* @__PURE__ */ new Set()) {
+	return e ? typeof e == "string" ? (e.startsWith("ast_") && t.add(e), t) : Array.isArray(e) ? (e.forEach((e) => me(e, t)), t) : (typeof e == "object" && Object.values(e).forEach((e) => me(e, t)), t) : t;
 }
-function me(e, t) {
+function he(e, t) {
 	if (!e) return !0;
-	let n = t.title !== void 0 && t.title?.trim() !== e.title?.trim(), r = t.slug !== void 0 && t.slug !== e.slug, i = t.isHidden !== void 0 && ue(t.isHidden) !== ue(e.isHidden), a = t.status !== void 0 && t.status !== e.status, o = typeof e.draftDataJson == "string" ? JSON.parse(e.draftDataJson || "{}") : e.draftDataJson || {}, s = t.sanitizedFields || {}, c = s.menuTitle !== void 0 && s.menuTitle !== o.menuTitle;
+	let n = t.title !== void 0 && t.title?.trim() !== e.title?.trim(), r = t.slug !== void 0 && t.slug !== e.slug, i = t.isHidden !== void 0 && V(t.isHidden) !== V(e.isHidden), a = t.status !== void 0 && t.status !== e.status, o = typeof e.draftDataJson == "string" ? JSON.parse(e.draftDataJson || "{}") : e.draftDataJson || {}, s = t.sanitizedFields || {}, c = s.menuTitle !== void 0 && s.menuTitle !== o.menuTitle;
 	return n || r || i || a || c;
 }
-async function he(e, t, n) {
+async function ge(e, t, n) {
 	for (let r of n) {
-		let n = (await ce(e, "\n      SELECT id, storageKeyPrivate, isSystemVariant, parentAssetId, filename\n      FROM assets WHERE id = ?\n    ", [r]))[0];
-		if (!n || (await ce(e, "SELECT 1 FROM node_assets WHERE assetId = ? LIMIT 1", [n.id])).length > 0) continue;
+		let n = (await ue(e, "\n      SELECT id, storageKeyPrivate, isSystemVariant, parentAssetId, filename\n      FROM assets WHERE id = ?\n    ", [r]))[0];
+		if (!n || (await ue(e, "SELECT 1 FROM node_assets WHERE assetId = ? LIMIT 1", [n.id])).length > 0) continue;
 		let i = [n];
 		if (!n.isSystemVariant) {
-			let t = await ce(e, "\n        SELECT id, storageKeyPrivate, isSystemVariant, parentAssetId, filename\n        FROM assets\n        WHERE parentAssetId = ? OR (isSystemVariant = 1 AND filename LIKE ?)\n      ", [n.id, `crop_%${String(n.filename || "").replace(/\.[^/.]+$/, "")}%`]), r = t.map((e) => e.id);
-			if (r.length > 0 && (await ce(e, `SELECT DISTINCT assetId FROM node_assets WHERE assetId IN (${r.map(() => "?").join(",")})`, r)).length > 0) continue;
+			let t = await ue(e, "\n        SELECT id, storageKeyPrivate, isSystemVariant, parentAssetId, filename\n        FROM assets\n        WHERE parentAssetId = ? OR (isSystemVariant = 1 AND filename LIKE ?)\n      ", [n.id, `crop_%${String(n.filename || "").replace(/\.[^/.]+$/, "")}%`]), r = t.map((e) => e.id);
+			if (r.length > 0 && (await ue(e, `SELECT DISTINCT assetId FROM node_assets WHERE assetId IN (${r.map(() => "?").join(",")})`, r)).length > 0) continue;
 			i = [n, ...t];
 		}
 		for (let e of i) if (e.storageKeyPrivate) try {
@@ -6285,10 +6285,10 @@ async function he(e, t, n) {
 			console.warn(`[Asset Cleanup] Failed to delete ${e.storageKeyPrivate}:`, t);
 		}
 		let a = i.map((e) => e.id), o = a.map(() => "?").join(",");
-		await le(e, `DELETE FROM node_assets WHERE assetId IN (${o})`, a), await le(e, `DELETE FROM assets WHERE id IN (${o})`, a);
+		await de(e, `DELETE FROM node_assets WHERE assetId IN (${o})`, a), await de(e, `DELETE FROM assets WHERE id IN (${o})`, a);
 	}
 }
-async function ge(e, t, n) {
+async function _e(e, t, n) {
 	let r = {}, i = null;
 	if (t) {
 		let a = await e.prepare("\n      WITH RECURSIVE ancestor_path(id, parentId, draftDataJson, dataJson, level) AS (\n        SELECT t.contentId as id, t.parentId, c.draftDataJson, c.dataJson, 0\n        FROM tree_nodes t\n        INNER JOIN content_nodes c ON t.contentId = c.id\n        WHERE t.contentId = ? AND t.treeId = ?\n        UNION ALL\n        SELECT t.contentId as id, t.parentId, c.draftDataJson, c.dataJson, 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.contentId = ap.parentId AND t.treeId = ?\n      )\n      SELECT draftDataJson, dataJson FROM ancestor_path ORDER BY level ASC\n    ").all(t, n, n), o = Array.isArray(a) ? a : a?.results || [];
@@ -6313,7 +6313,7 @@ async function ge(e, t, n) {
 		inheritedFields: r
 	};
 }
-H.get("/", async (e) => {
+B.get("/", async (e) => {
 	let t = e.get("db"), n = e.req.query("id"), r = e.req.query("type"), i = e.req.query("q") || e.req.query("search"), a = e.req.query("channelId"), o = e.req.query("trashed") === "true", s = e.req.query("assetId"), c = e.req.query("sort") || "updatedAt", l = (e.req.query("order") || "DESC").toUpperCase() === "ASC" ? "ASC" : "DESC", u = e.req.query("limit"), d = e.req.query("offset"), f = Math.max(1, Math.min(100, parseInt(u || "50", 10))), p = Math.max(0, parseInt(d || "0", 10));
 	if (n) {
 		let r = Number(n);
@@ -6338,9 +6338,9 @@ H.get("/", async (e) => {
 			updatedAt: i.updatedAt
 		}, s = i.draftDataJson || i.dataJson;
 		if (s) try {
-			let n = typeof s == "string" ? JSON.parse(s) : s, a = await t.prepare("SELECT contentId as treeNodeId, treeId, parentId FROM tree_nodes WHERE contentId = ? LIMIT 1").get(r), c = se(e.env?.BUNDLED_DEFINITIONS).nodes?.[i.contentType] || {}, l = n.layoutId || null;
+			let n = typeof s == "string" ? JSON.parse(s) : s, a = await t.prepare("SELECT contentId as treeNodeId, treeId, parentId FROM tree_nodes WHERE contentId = ? LIMIT 1").get(r), c = le(e.env?.BUNDLED_DEFINITIONS).nodes?.[i.contentType] || {}, l = n.layoutId || null;
 			if (a) {
-				let { resolvedLayoutId: e, inheritedFields: r } = await ge(t, a.parentId, a.treeId);
+				let { resolvedLayoutId: e, inheritedFields: r } = await _e(t, a.parentId, a.treeId);
 				(l === "inherit" || !l) && (l = e);
 				for (let [e, t] of Object.entries(r)) e !== "layoutId" && e !== "subpageLayoutId" && (n[e] === void 0 || n[e] === null || n[e] === "") && t !== void 0 && (n[e] = t);
 			}
@@ -6355,7 +6355,7 @@ H.get("/", async (e) => {
 				let r = t.allowedLayouts;
 				return r ? typeof r == "string" ? r === e : !Array.isArray(r) || r.length === 0 || r.includes(e) : !0;
 			})(l) && (l = null), (l === "inherit" || !l) && (l = c.defaultLayout || null);
-			let u = await B(t, fe(n));
+			let u = await R(t, pe(n));
 			Object.assign(o, u), o.resolvedLayoutId = l;
 		} catch {}
 		let c = await t.prepare("SELECT channelId FROM node_channels WHERE nodeId = ?").all(r);
@@ -6365,7 +6365,7 @@ H.get("/", async (e) => {
 		let u = await t.prepare("SELECT * FROM content_blocks WHERE contentId = ? AND isDraft = 1 ORDER BY sortOrder ASC").all(r), d = Array.isArray(u) ? u : u?.results || [], f = await Promise.all(d.map(async (e) => {
 			let n = {};
 			try {
-				n = typeof e.dataJson == "string" ? JSON.parse(e.dataJson || "{}") : e.dataJson || {}, n && typeof n == "object" && (n = await B(t, n));
+				n = typeof e.dataJson == "string" ? JSON.parse(e.dataJson || "{}") : e.dataJson || {}, n && typeof n == "object" && (n = await R(t, n));
 			} catch {
 				n = {};
 			}
@@ -6453,7 +6453,7 @@ H.get("/", async (e) => {
 			assetCount: e.assetCount || 0
 		}, i = e.draftDataJson || e.dataJson;
 		if (i) try {
-			let e = typeof i == "string" ? JSON.parse(i) : i, n = await B(t, fe(e));
+			let e = typeof i == "string" ? JSON.parse(i) : i, n = await R(t, pe(e));
 			Object.assign(r, n);
 		} catch {}
 		return r;
@@ -6465,8 +6465,8 @@ H.get("/", async (e) => {
 		offset: p,
 		limit: f
 	});
-}), H.post("/", async (e) => {
-	let t = e.get("db"), n = await e.req.json(), r = n.node || n.activeNode || n, i = r.id || n.id, a = i != null && i !== "" && !isNaN(Number(i)) ? Number(i) : null, { title: o, slug: s, language: c, nodeType: l, contentType: u, isHidden: d, hidden: f, is_hidden: p, blocks: m, channels: h, trees: g, ..._ } = r, { cleanedData: v, assetRefs: y } = R(fe(_)), b = ue(d === void 0 ? f === void 0 ? p : f : d), x = l || u || "page", S = e.get("user")?.id || null, C = typeof c == "string" && c.trim() !== "" ? c.trim() : null, w = g && Array.isArray(g) && g.length > 0 ? g[0] : null, T = w ? w.treeId || w.id : null, E = null;
+}), B.post("/", async (e) => {
+	let t = e.get("db"), n = await e.req.json(), r = n.node || n.activeNode || n, i = r.id || n.id, a = i != null && i !== "" && !isNaN(Number(i)) ? Number(i) : null, { title: o, slug: s, language: c, nodeType: l, contentType: u, isHidden: d, hidden: f, is_hidden: p, blocks: m, channels: h, trees: g, ..._ } = r, { cleanedData: v, assetRefs: y } = se(pe(_)), b = V(d === void 0 ? f === void 0 ? p : f : d), x = l || u || "page", S = e.get("user")?.id || null, C = typeof c == "string" && c.trim() !== "" ? c.trim() : null, w = g && Array.isArray(g) && g.length > 0 ? g[0] : null, T = w ? w.treeId || w.id : null, E = null;
 	if (T) {
 		let e = await t.prepare("SELECT dataJson FROM trees WHERE id = ? OR key = ? LIMIT 1").get(Number(T) || -1, String(T));
 		if (e?.dataJson) try {
@@ -6488,12 +6488,12 @@ H.get("/", async (e) => {
 		}
 	}
 	C && E && C === E && (C = null);
-	let D = a, O = /* @__PURE__ */ new Set(), k = !1, A = "draft", j = 0, M = s === void 0 ? null : U(s);
+	let D = a, O = /* @__PURE__ */ new Set(), k = !1, A = "draft", j = 0, M = s === void 0 ? null : fe(s);
 	if (M) {
 		let n = [];
 		if (g !== void 0 && Array.isArray(g) && g.length > 0) for (let e of g) n.push({
 			treeId: Number(e.treeId),
-			parentId: de(e.parentId ?? e._draftParentId ?? null)
+			parentId: H(e.parentId ?? e._draftParentId ?? null)
 		});
 		else if (a) {
 			let e = await t.prepare("SELECT treeId, parentId FROM tree_nodes WHERE contentId = ?").all(a), r = Array.isArray(e) ? e : e?.results || [];
@@ -6520,7 +6520,7 @@ H.get("/", async (e) => {
 	}
 	if (a) {
 		let e = await t.prepare("SELECT title, slug, language, contentType, isHidden, draftDataJson, dataJson, publishedAt, status, hasUnpublishedChanges FROM content_nodes WHERE id = ?").get(a);
-		k = me(e, {
+		k = he(e, {
 			title: o,
 			slug: M,
 			isHidden: b,
@@ -6528,7 +6528,7 @@ H.get("/", async (e) => {
 		});
 		let n = e?.draftDataJson || e?.dataJson || "{}";
 		try {
-			pe(typeof n == "string" ? JSON.parse(n) : n, O);
+			me(typeof n == "string" ? JSON.parse(n) : n, O);
 		} catch {}
 		let r = {};
 		try {
@@ -6579,7 +6579,7 @@ H.get("/", async (e) => {
 	}
 	if (g !== void 0 && Array.isArray(g) && g.length > 0 && D) for (let e of g) {
 		if (!e || !e.treeId) continue;
-		let n = Number(e.treeId) || e.treeId, r = de(e.parentId ?? e._draftParentId ?? null), i = typeof e.sortOrder == "number" ? e.sortOrder : 0, a = await t.prepare("SELECT contentId, parentId, sortOrder FROM tree_nodes WHERE treeId = ? AND contentId = ?").get(n, D);
+		let n = Number(e.treeId) || e.treeId, r = H(e.parentId ?? e._draftParentId ?? null), i = typeof e.sortOrder == "number" ? e.sortOrder : 0, a = await t.prepare("SELECT contentId, parentId, sortOrder FROM tree_nodes WHERE treeId = ? AND contentId = ?").get(n, D);
 		a ? ((a.parentId !== r || a.sortOrder !== i) && (k = !0), await t.prepare("UPDATE tree_nodes SET parentId = ?, sortOrder = ? WHERE treeId = ? AND contentId = ?").run(r, i, n, D)) : (k = !0, await t.prepare("INSERT INTO tree_nodes (treeId, contentId, parentId, sortOrder) VALUES (?, ?, ?, ?)").run(n, D, r, i));
 	}
 	let N = [];
@@ -6587,7 +6587,7 @@ H.get("/", async (e) => {
 		await t.prepare("DELETE FROM content_blocks WHERE contentId = ? AND isDraft = 1").run(D);
 		let e = [], n = [];
 		for (let t = 0; t < m.length; t++) {
-			let r = m[t], i = r.componentId || r.elementType || "text-block", a = r.data || {}, o = String(r.blockId || a.blockId || r.instanceId || r.id || `block-${Date.now()}`), { cleanedData: s, assetRefs: c } = R({
+			let r = m[t], i = r.componentId || r.elementType || "text-block", a = r.data || {}, o = String(r.blockId || a.blockId || r.instanceId || r.id || `block-${Date.now()}`), { cleanedData: s, assetRefs: c } = se({
 				...a,
 				blockId: o,
 				_instanceId: o
@@ -6603,21 +6603,21 @@ H.get("/", async (e) => {
 	}
 	if (D) {
 		let n = [...y, ...N];
-		await oe(t, D, n);
+		await ce(t, D, n);
 		let r = new Set(n.map((e) => e.assetId)), i = new Set([...O].filter((e) => !r.has(e)));
 		if (i.size > 0) {
-			let { storage: n } = ae(e.env);
-			await he(t, n, i);
+			let { storage: n } = I(e.env);
+			await ge(t, n, i);
 		}
 	}
-	return await I(e).clear(), e.json({
+	return await F(e).clear(), e.json({
 		success: !0,
 		id: D,
 		status: A,
 		hasUnpublishedChanges: j === 1 || A === "draft",
 		isStructuralChange: k
 	});
-}), H.post("/publish", async (e) => {
+}), B.post("/publish", async (e) => {
 	let t = e.get("db"), n = await e.req.json(), r = n.id || n.nodeId;
 	if (!r || isNaN(Number(r))) return e.json({ error: "Node ID required for publishing" }, 400);
 	let i = Number(r), a = e.get("user")?.id || null, o = await t.prepare("SELECT * FROM content_nodes WHERE id = ?").get(i);
@@ -6650,7 +6650,7 @@ H.get("/", async (e) => {
 		},
 		blocks: v
 	};
-	return await t.prepare("INSERT INTO node_revisions (nodeId, version, snapshotJson, createdById) VALUES (?, ?, ?, ?)").run(i, y, JSON.stringify(b), a), await I(e).clear(), new V(e.env).purgeNode(e, t, i, h), e.json({
+	return await t.prepare("INSERT INTO node_revisions (nodeId, version, snapshotJson, createdById) VALUES (?, ?, ?, ?)").run(i, y, JSON.stringify(b), a), await F(e).clear(), new z(e.env).purgeNode(e, t, i, h), e.json({
 		success: !0,
 		id: i,
 		status: "published",
@@ -6659,29 +6659,29 @@ H.get("/", async (e) => {
 		hasUnpublishedChanges: !1,
 		isStructuralChange: h
 	});
-}), H.delete("/", async (e) => {
+}), B.delete("/", async (e) => {
 	let t = e.get("db"), n = e.req.query("id");
 	if (!n) return e.json({ error: "Node ID required" }, 400);
 	let r = Number(n);
-	return await t.prepare("UPDATE content_nodes SET deletedAt = CURRENT_TIMESTAMP WHERE id = ?").run(r), await I(e).clear(), new V(e.env).purgeNode(e, t, r, !0), e.json({
+	return await t.prepare("UPDATE content_nodes SET deletedAt = CURRENT_TIMESTAMP WHERE id = ?").run(r), await F(e).clear(), new z(e.env).purgeNode(e, t, r, !0), e.json({
 		success: !0,
 		deletedNodeId: r
 	});
-}), H.post("/restore", async (e) => {
+}), B.post("/restore", async (e) => {
 	let t = e.get("db"), n = await e.req.json(), r = Number(n.id);
-	return r ? await t.prepare("SELECT id FROM content_nodes WHERE id = ?").get(r) ? (await t.prepare("UPDATE content_nodes SET deletedAt = NULL WHERE id = ?").run(r), await I(e).clear(), new V(e.env).purgeNode(e, t, r, !0), e.json({
+	return r ? await t.prepare("SELECT id FROM content_nodes WHERE id = ?").get(r) ? (await t.prepare("UPDATE content_nodes SET deletedAt = NULL WHERE id = ?").run(r), await F(e).clear(), new z(e.env).purgeNode(e, t, r, !0), e.json({
 		success: !0,
 		restoredNodeId: r
 	})) : e.json({ error: "Node not found" }, 404) : e.json({ error: "Node ID required" }, 400);
-}), H.delete("/purge", async (e) => {
+}), B.delete("/purge", async (e) => {
 	let t = e.get("db"), n = e.req.query("id");
 	if (!n) return e.json({ error: "Node ID required" }, 400);
 	let r = Number(n);
-	return new V(e.env).purgeNode(e, t, r, !0), await t.prepare("DELETE FROM node_channels WHERE nodeId = ?").run(r), await t.prepare("DELETE FROM tree_nodes WHERE contentId = ?").run(r), await t.prepare("DELETE FROM content_blocks WHERE contentId = ?").run(r), await t.prepare("DELETE FROM node_revisions WHERE nodeId = ?").run(r), await t.prepare("DELETE FROM node_assets WHERE nodeId = ?").run(r), await t.prepare("DELETE FROM content_nodes WHERE id = ?").run(r), await I(e).clear(), e.json({
+	return new z(e.env).purgeNode(e, t, r, !0), await t.prepare("DELETE FROM node_channels WHERE nodeId = ?").run(r), await t.prepare("DELETE FROM tree_nodes WHERE contentId = ?").run(r), await t.prepare("DELETE FROM content_blocks WHERE contentId = ?").run(r), await t.prepare("DELETE FROM node_revisions WHERE nodeId = ?").run(r), await t.prepare("DELETE FROM node_assets WHERE nodeId = ?").run(r), await t.prepare("DELETE FROM content_nodes WHERE id = ?").run(r), await F(e).clear(), e.json({
 		success: !0,
 		purgedNodeId: r
 	});
-}), H.get("/:id/revisions", async (e) => {
+}), B.get("/:id/revisions", async (e) => {
 	let t = e.get("db"), n = Number(e.req.param("id"));
 	if (isNaN(n)) return e.json({ error: "Invalid Node ID" }, 400);
 	let r = await t.prepare("\n    SELECT version, createdById, snapshotJson \n    FROM node_revisions \n    WHERE nodeId = ? \n    ORDER BY version DESC\n  ").all(n), i = (Array.isArray(r) ? r : r?.results || []).map((e) => {
@@ -6697,7 +6697,7 @@ H.get("/", async (e) => {
 		};
 	});
 	return e.json({ revisions: i });
-}), H.get("/:id/revisions/:version", async (e) => {
+}), B.get("/:id/revisions/:version", async (e) => {
 	let t = e.get("db"), n = Number(e.req.param("id")), r = Number(e.req.param("version")), i = await t.prepare("SELECT snapshotJson FROM node_revisions WHERE nodeId = ? AND version = ?").get(n, r);
 	if (!i) return e.json({ error: "Snapshot not found" }, 404);
 	let a = {};
@@ -6707,7 +6707,7 @@ H.get("/", async (e) => {
 		return e.json({ error: "Corrupt snapshot data" }, 500);
 	}
 	return e.json({ snapshot: a });
-}), H.post("/:id/revisions/:version/restore", async (e) => {
+}), B.post("/:id/revisions/:version/restore", async (e) => {
 	let t = e.get("db"), n = Number(e.req.param("id")), r = Number(e.req.param("version")), i = e.get("user")?.id || null, a = await t.prepare("SELECT snapshotJson FROM node_revisions WHERE nodeId = ? AND version = ?").get(n, r);
 	if (!a) return e.json({ error: "Snapshot not found" }, 404);
 	let o = {};
@@ -6721,15 +6721,15 @@ H.get("/", async (e) => {
 		for (let t of o.blocks) e.push("(?, ?, ?, ?, ?, 1)"), r.push(n, t.sortOrder, t.elementType, t.dataJson, t.region || "content");
 		await t.prepare(`INSERT INTO content_blocks (contentId, sortOrder, elementType, dataJson, region, isDraft) VALUES ${e.join(", ")}`).run(...r);
 	}
-	return await I(e).clear(), e.json({
+	return await F(e).clear(), e.json({
 		success: !0,
 		restoredVersion: r
 	});
 });
 //#endregion
 //#region server/routes/admin/trees.ts
-var W = new e();
-function _e(e, t = null) {
+var U = new e();
+function ve(e, t = null) {
 	let n = [];
 	for (let r = 0; r < e.length; r++) {
 		let i = e[r];
@@ -6741,19 +6741,19 @@ function _e(e, t = null) {
 			id: o,
 			parentId: t,
 			sortOrder: r
-		}), i.children && Array.isArray(i.children) && i.children.length > 0 && n.push(..._e(i.children, o)));
+		}), i.children && Array.isArray(i.children) && i.children.length > 0 && n.push(...ve(i.children, o)));
 	}
 	return n;
 }
-function G(e) {
+function W(e) {
 	if (e == null || e === "null" || e === "" || typeof e == "string" && e.startsWith("draft-")) return null;
 	let t = Number(e);
 	return isNaN(t) ? null : t;
 }
-function ve(e) {
+function G(e) {
 	return +(e === !0 || e === 1 || e === "1" || e === "true");
 }
-W.get("/tree.json", async (e) => {
+U.get("/tree.json", async (e) => {
 	try {
 		let t = e.get("db"), n = e.req.query("treeId") || "main-nav", r = e.req.query("preview") === "true", i = 1;
 		if (isNaN(Number(n))) {
@@ -6806,9 +6806,9 @@ W.get("/tree.json", async (e) => {
 	} catch (t) {
 		return console.error("[CMS Tree API] GET Error:", t), e.json({ error: t.message || "Failed to fetch tree" }, 500);
 	}
-}), W.post("/tree.json", async (e) => {
+}), U.post("/tree.json", async (e) => {
 	try {
-		let t = e.get("db"), n = await e.req.json(), r = n.treeId ? String(n.treeId).trim() : "main-nav", i = I(e), a = new V(e.env), o = 1;
+		let t = e.get("db"), n = await e.req.json(), r = n.treeId ? String(n.treeId).trim() : "main-nav", i = F(e), a = new z(e.env), o = 1;
 		if (isNaN(Number(r))) {
 			let e = await t.prepare("SELECT id FROM trees WHERE key = ?").get(r);
 			if (e && e.id) o = Number(e.id);
@@ -6818,7 +6818,7 @@ W.get("/tree.json", async (e) => {
 			}
 		} else o = Number(r);
 		if (n.tree && Array.isArray(n.tree)) {
-			let r = _e(n.tree, null);
+			let r = ve(n.tree, null);
 			if (r.length > 0) for (let e = 0; e < r.length; e += 50) {
 				let n = r.slice(e, e + 50), i = n.map((e) => e.id), a = i.map(() => "?").join(","), s = "UPDATE tree_nodes SET \n";
 				s += "parentId = CASE contentId \n", n.forEach(() => {
@@ -6838,9 +6838,9 @@ W.get("/tree.json", async (e) => {
 				reorderedCount: r.length
 			});
 		}
-		let { action: s, title: c, nodeType: l, parentId: u, contentId: d, nodeData: f = {}, pageData: p = {} } = n, m = Object.keys(f).length > 0 ? { ...f } : { ...p }, h = ve(n.isHidden === void 0 ? m.isHidden === void 0 ? m.hidden : m.isHidden : n.isHidden);
+		let { action: s, title: c, nodeType: l, parentId: u, contentId: d, nodeData: f = {}, pageData: p = {} } = n, m = Object.keys(f).length > 0 ? { ...f } : { ...p }, h = G(n.isHidden === void 0 ? m.isHidden === void 0 ? m.hidden : m.isHidden : n.isHidden);
 		delete m._isTreeDraft, delete m._draftParentId, delete m.isNew, delete m.nodeType, delete m.contentType, delete m.title, delete m.slug, delete m.hidden, delete m.is_hidden, delete m.isHidden, delete m.status;
-		let g = G(u), _ = e.get("user")?.id || null;
+		let g = W(u), _ = e.get("user")?.id || null;
 		if (s === "create") {
 			let r = m.slug || n.slug || c, a = r ? String(r).toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/(^-|-$)/g, "") : null;
 			if (a) {
@@ -6948,7 +6948,7 @@ W.get("/tree.json", async (e) => {
 			details: t.message
 		}, 500);
 	}
-}), W.get("/trees.json", async (e) => {
+}), U.get("/trees.json", async (e) => {
 	try {
 		let t = e.get("db"), n = await t.prepare("SELECT * FROM trees ORDER BY LOWER(label) ASC").all(), r = Array.isArray(n) ? n : n?.results || [], i = await t.prepare("SELECT channelId, treeId FROM channel_trees").all(), a = (Array.isArray(i) ? i : i?.results || []).reduce((e, t) => {
 			let n = Number(t.treeId), r = Number(t.channelId);
@@ -6978,7 +6978,7 @@ W.get("/tree.json", async (e) => {
 	} catch {
 		return e.json([]);
 	}
-}), W.post("/trees.json", async (e) => {
+}), U.post("/trees.json", async (e) => {
 	try {
 		let t = e.get("db"), n = await e.req.json(), r = n.id, i = r != null && r !== "" && !isNaN(Number(r)) ? Number(r) : null, a = `tree-${Date.now().toString(36)}`, o = (n.key || n.slug || a).toLowerCase().replace(/[^a-z0-9_-]/g, "-"), s = n.label?.trim() || o, c = n.treeType !== void 0 && n.treeType !== null ? n.treeType : n.type ?? "site", l = n.channelId !== void 0 && n.channelId !== null && Number(n.channelId) || null, u = +(n.isHidden === !0 || n.isHidden === 1 || n.isHidden === "true"), d = e.get("user")?.id || null, f = { ...n };
 		if (delete f.id, delete f.key, delete f.label, delete f.treeType, delete f.type, delete f.channelId, delete f.channels, delete f.isHidden, delete f.createdById, delete f.updatedById, delete f.createdAt, delete f.updatedAt, await t.prepare("SELECT id FROM trees WHERE key = ? AND id != ? LIMIT 1").get(o, i ?? -1)) return e.json({
@@ -7003,7 +7003,7 @@ W.get("/tree.json", async (e) => {
 				await t.prepare(`INSERT OR IGNORE INTO channel_trees (channelId, treeId, key) VALUES ${n}`).run(...r);
 			}
 		}
-		return await I(e).clear(), new V(e.env).purgeGlobalCache(e, t), e.json({
+		return await F(e).clear(), new z(e.env).purgeGlobalCache(e, t), e.json({
 			success: !0,
 			id: p,
 			key: o,
@@ -7017,12 +7017,12 @@ W.get("/tree.json", async (e) => {
 	} catch (t) {
 		return console.error("[API Trees] Error saving tree:", t), e.json({ error: t.message || "Failed to save tree" }, 500);
 	}
-}), W.delete("/trees.json", async (e) => {
+}), U.delete("/trees.json", async (e) => {
 	let t = e.get("db"), n = e.req.query("id");
 	if (!n) return e.json({ error: "Tree ID required" }, 400);
 	let r = Number(n);
 	try {
-		return await t.prepare("DELETE FROM trees WHERE id = ?").run(r), await t.prepare("DELETE FROM channel_trees WHERE treeId = ?").run(r), await t.prepare("DELETE FROM tree_nodes WHERE treeId = ?").run(r), await I(e).clear(), new V(e.env).purgeGlobalCache(e, t), e.json({
+		return await t.prepare("DELETE FROM trees WHERE id = ?").run(r), await t.prepare("DELETE FROM channel_trees WHERE treeId = ?").run(r), await t.prepare("DELETE FROM tree_nodes WHERE treeId = ?").run(r), await F(e).clear(), new z(e.env).purgeGlobalCache(e, t), e.json({
 			success: !0,
 			deletedTreeId: r
 		});
@@ -7057,7 +7057,7 @@ ye.get("/", async (e) => {
 				isHidden: !!e.isHidden,
 				trees: a[e.id] || []
 			};
-		}), s = e.env?.BUNDLED_DEFINITIONS, c = se(s), l = c?.channelTemplate || Object.values(c?.channels || {})[0] || {
+		}), s = e.env?.BUNDLED_DEFINITIONS, c = le(s), l = c?.channelTemplate || Object.values(c?.channels || {})[0] || {
 			label: "Channel Settings",
 			fields: {
 				key: {
@@ -7128,8 +7128,8 @@ ye.get("/", async (e) => {
         VALUES ${e}
       `).run(...n);
 		}
-		let M = I(e);
-		return await M.delete(`channel:${C}`), await M.delete(`channel:${A}`), await M.clear(), new V(e.env).purgeGlobalCache(e, t), e.json({
+		let M = F(e);
+		return await M.delete(`channel:${C}`), await M.delete(`channel:${A}`), await M.clear(), new z(e.env).purgeGlobalCache(e, t), e.json({
 			success: !0,
 			id: A
 		});
@@ -7145,8 +7145,8 @@ ye.get("/", async (e) => {
 	let r = Number(n);
 	try {
 		await t.prepare("DELETE FROM channel_trees WHERE channelId = ?").run(r), await t.prepare("DELETE FROM node_channels WHERE channelId = ?").run(r), await t.prepare("DELETE FROM channels WHERE id = ?").run(r);
-		let n = I(e);
-		return await n.delete(`channel:${r}`), await n.clear(), new V(e.env).purgeGlobalCache(e, t), e.json({
+		let n = F(e);
+		return await n.delete(`channel:${r}`), await n.clear(), new z(e.env).purgeGlobalCache(e, t), e.json({
 			success: !0,
 			deletedSiteId: r
 		});
@@ -7560,7 +7560,7 @@ function je(e) {
 			fields: n
 		};
 	});
-	let P = {};
+	let te = {};
 	Object.entries(T).forEach(([e, t]) => {
 		let n = A(t.tabs), r = k(t.fields || [], "settings", n), i = {}, a = t.regions || { content: { label: "Content" } };
 		Object.entries(a).forEach(([e, t]) => {
@@ -7570,7 +7570,7 @@ function je(e) {
 				allowedBlocks: Se(t.allowedBlocks),
 				disallowedBlocks: t.disallowedBlocks ? Se(t.disallowedBlocks) : void 0
 			};
-		}), P[e] = {
+		}), te[e] = {
 			...t,
 			id: t.id || e,
 			label: t.label || e,
@@ -7583,7 +7583,7 @@ function je(e) {
 			tabs: n
 		};
 	});
-	let te = {};
+	let ne = {};
 	Object.entries(E).forEach(([e, t]) => {
 		let n = A(t.tabs), r = k(t.fields || [], "settings", n), i = {}, a = t.regions || { main: { label: "Main Content" } };
 		Object.entries(a).forEach(([e, t]) => {
@@ -7593,7 +7593,7 @@ function je(e) {
 				allowedBlocks: Se(t.allowedBlocks),
 				disallowedBlocks: t.disallowedBlocks ? Se(t.disallowedBlocks) : void 0
 			};
-		}), te[e] = {
+		}), ne[e] = {
 			...t,
 			id: t.id || e,
 			label: t.label || e,
@@ -7606,39 +7606,39 @@ function je(e) {
 			tabs: n
 		};
 	});
-	let F = m?.fields || {};
+	let P = m?.fields || {};
 	Array.isArray(m?.fieldSets) && m?.fieldSets.forEach((e) => {
 		let t = O[e] || {}, n = t.fields || t, r = k(n);
 		Object.entries(r).forEach(([e, t]) => {
-			F[e] = Y(F[e] || {}, t);
+			P[e] = Y(P[e] || {}, t);
 		});
 	});
-	let I = m ? {
+	let F = m ? {
 		...m,
-		fields: F
-	} : null, L = h?.fields || {};
+		fields: P
+	} : null, re = h?.fields || {};
 	Array.isArray(h?.fieldSets) && h?.fieldSets.forEach((e) => {
 		let t = O[e] || {}, n = t.fields || t, r = k(n);
 		Object.entries(r).forEach(([e, t]) => {
-			L[e] = Y(L[e] || {}, t);
+			re[e] = Y(re[e] || {}, t);
 		});
 	});
-	let ne = h ? {
+	let ie = h ? {
 		...h,
-		fields: L
+		fields: re
 	} : null;
 	return {
 		nodes: j,
 		trees: M,
 		channels: N,
 		blocks: ee,
-		nodeLayouts: P,
-		blockLayouts: te,
+		nodeLayouts: te,
+		blockLayouts: ne,
 		fieldSets: O,
 		nodeTemplate: f || null,
 		treeTemplate: p || null,
-		channelTemplate: I,
-		userTemplate: ne
+		channelTemplate: F,
+		userTemplate: ie
 	};
 }
 //#endregion
@@ -7765,7 +7765,7 @@ Le.get("/", async (e) => {
 			isHidden: !!e.isHidden,
 			channelNames: e.channelLabels ? e.channelLabels.split(",") : [],
 			treeNames: e.treeLabels ? e.treeLabels.split(",") : []
-		})), p = e.env?.BUNDLED_DEFINITIONS, m = se(p), h = m.nodes || m.nodeSchemas || {}, g = c.map((e) => {
+		})), p = e.env?.BUNDLED_DEFINITIONS, m = le(p), h = m.nodes || m.nodeSchemas || {}, g = c.map((e) => {
 			let t = e.type || "node", n = h[t]?.label || t.charAt(0).toUpperCase() + t.slice(1);
 			return {
 				type: t,
@@ -7895,7 +7895,7 @@ X.get("/", async (e) => {
 	}
 }), X.post("/upload", async (e) => {
 	try {
-		let t = l(e), { storage: n } = ae(e.env), r = await e.req.parseBody(), i = r.file, a = r.isVariant === "true" || r.isVariant === "1" || r.temporary === "true", o = r.replaceAssetId, s = typeof o == "string" && o.trim().length > 0 ? o.trim() : null, c = r.parentAssetId || r.parentAsset, u = typeof c == "string" && c.trim().length > 0 ? c.trim() : null;
+		let t = l(e), { storage: n } = I(e.env), r = await e.req.parseBody(), i = r.file, a = r.isVariant === "true" || r.isVariant === "1" || r.temporary === "true", o = r.replaceAssetId, s = typeof o == "string" && o.trim().length > 0 ? o.trim() : null, c = r.parentAssetId || r.parentAsset, u = typeof c == "string" && c.trim().length > 0 ? c.trim() : null;
 		if (!i || !(i instanceof File)) return e.json({ error: "No file uploaded" }, 400);
 		let d = r.cropCoordinates, f = null, p = null;
 		if (d) {
@@ -7910,7 +7910,7 @@ X.get("/", async (e) => {
 		if (!y) throw Error("Storage provider failed to return a valid storage key");
 		let b = e.env.CDN_DOMAIN, x = y.replace(/^\//, ""), S = b ? `https://${b}/media/${x}` : `/media/${x}`, C = i.type || "application/octet-stream", w = i.size || 0, T = e.get("userId"), E = typeof T == "string" && T.trim().length > 0 ? T : null;
 		E && (await Z(t, "SELECT id FROM users WHERE id = ?", [E])).length === 0 && (E = null);
-		let D = new V(e.env);
+		let D = new z(e.env);
 		if (s) {
 			let r = await Z(t, "SELECT storageKeyPrivate, isSystemVariant, parentAssetId FROM assets WHERE id = ?", [s]);
 			if (r.length > 0) {
@@ -8041,14 +8041,14 @@ X.get("/", async (e) => {
 			r.filename === void 0 ? a.filename : r.filename,
 			JSON.stringify(o),
 			n
-		]), new V(e.env).purgeAsset(e, t, n), e.json({ success: !0 });
+		]), new z(e.env).purgeAsset(e, t, n), e.json({ success: !0 });
 	} catch {
 		return e.json({ error: "Failed to update asset" }, 500);
 	}
 }), X.delete("/:id", async (e) => {
 	try {
 		let t = l(e), n = e.req.param("id"), r = (await Z(t, "SELECT id, filename, isSystemVariant FROM assets WHERE id = ?", [n]))[0];
-		return r ? (new V(e.env).purgeAsset(e, t, n), r.isSystemVariant ? await Q(t, "UPDATE assets SET deletedAt = CURRENT_TIMESTAMP WHERE id = ?", [n]) : await Q(t, "UPDATE assets SET deletedAt = CURRENT_TIMESTAMP WHERE id = ? OR (isSystemVariant = 1 AND parentAssetId = ?)", [n, n]), e.json({
+		return r ? (new z(e.env).purgeAsset(e, t, n), r.isSystemVariant ? await Q(t, "UPDATE assets SET deletedAt = CURRENT_TIMESTAMP WHERE id = ?", [n]) : await Q(t, "UPDATE assets SET deletedAt = CURRENT_TIMESTAMP WHERE id = ? OR (isSystemVariant = 1 AND parentAssetId = ?)", [n, n]), e.json({
 			success: !0,
 			id: n,
 			trashed: !0
@@ -8062,7 +8062,7 @@ X.get("/", async (e) => {
 }), X.post("/restore", async (e) => {
 	try {
 		let t = l(e), n = await e.req.json(), r = n.id || n.assetId;
-		return r ? (await Z(t, "SELECT id, filename FROM assets WHERE id = ?", [r]))[0] ? (await Q(t, "UPDATE assets SET deletedAt = NULL WHERE id = ? OR (isSystemVariant = 1 AND parentAssetId = ?)", [r, r]), new V(e.env).purgeAsset(e, t, r), e.json({
+		return r ? (await Z(t, "SELECT id, filename FROM assets WHERE id = ?", [r]))[0] ? (await Q(t, "UPDATE assets SET deletedAt = NULL WHERE id = ? OR (isSystemVariant = 1 AND parentAssetId = ?)", [r, r]), new z(e.env).purgeAsset(e, t, r), e.json({
 			success: !0,
 			id: r,
 			restored: !0
@@ -8075,9 +8075,9 @@ X.get("/", async (e) => {
 	}
 }), X.delete("/purge/:id", async (e) => {
 	try {
-		let t = l(e), { storage: n } = ae(e.env), r = e.req.param("id"), i = (await Z(t, "SELECT id, filename, storageKeyPrivate, isSystemVariant FROM assets WHERE id = ?", [r]))[0];
+		let t = l(e), { storage: n } = I(e.env), r = e.req.param("id"), i = (await Z(t, "SELECT id, filename, storageKeyPrivate, isSystemVariant FROM assets WHERE id = ?", [r]))[0];
 		if (!i) return e.json({ error: "Asset not found" }, 404);
-		new V(e.env).purgeAsset(e, t, r);
+		new z(e.env).purgeAsset(e, t, r);
 		let a = [i];
 		i.isSystemVariant || (a = [i, ...await Z(t, "SELECT id, storageKeyPrivate FROM assets WHERE isSystemVariant = 1 AND parentAssetId = ?", [r])]);
 		let o = a.map((e) => e.id);
@@ -8201,7 +8201,7 @@ async function We(e, t, n, r, i, a = !1, o) {
 			let o = n.hidden === !0 || n.hidden === 1 || n.hidden === "1" || n.hidden === "true", s = He(n.startShowingAt, n.stopShowingAt);
 			if (!a && (o || !s)) return null;
 			let c = t.elementType || t.componentId || "text-block", l = i.blocks?.[c]?.fields || i.elements?.[c]?.fields || i.components?.[c]?.fields || {}, u = String(n.blockId || n._instanceId || n.id || t.blockId || t.id), d = Ge(n, l);
-			return d = await B(e, d), d = Ke(d), d.blockId = u, {
+			return d = await R(e, d), d = Ke(d), d.blockId = u, {
 				region: t.region || r,
 				block: {
 					instanceId: t.id,
@@ -8449,85 +8449,94 @@ async function nt(e, t, n, r) {
 }
 ze.get("/*", async (e) => {
 	try {
-		let t = e.get("db"), n = Be(), r = new URL(e.req.url).pathname.match(/\/node\/(.+)$/), i = (r ? r[1] : "home").replace(/^\/+|\/+$/g, ""), a = e.req.query("channelId") || e.req.query("channel") || "1", o = e.req.query("lang"), s = e.req.query("preview") === "true", c = isNaN(Number(a)) ? await t.prepare("SELECT * FROM channels WHERE key = ?").get(a) : await t.prepare("SELECT * FROM channels WHERE id = ?").get(Number(a));
-		if (!c) return e.json({ error: `Channel '${a}' not found` }, 404);
-		let l = c.status === "disabled" || c.status === "inactive" || c.isEnabled === 0 || c.isEnabled === !1;
-		if (!s && l) return e.json({ error: `Channel '${c.key || a}' is currently inactive` }, 404);
-		let u = c.id, d = c.key || a, f = I(e), p = se(e.env?.BUNDLED_DEFINITIONS), m = /^\d+$/.test(i), h = null, g = null, _ = e.req.query("treeId"), v = i.split("/"), y = v[v.length - 1], b = "/" + i.replace(/^\/+|\/+$/g, ""), x = `
+		let t = e.get("db"), n = Be(), r = new URL(e.req.url).pathname.match(/\/node\/(.+)$/), i = (r ? r[1] : "home").replace(/^\/+|\/+$/g, ""), a = e.req.query("channelId") || e.req.query("channel") || "1", o = e.req.query("lang"), s = e.req.query("preview") === "true", c = e.req.query("revisionId"), l = isNaN(Number(a)) ? await t.prepare("SELECT * FROM channels WHERE key = ?").get(a) : await t.prepare("SELECT * FROM channels WHERE id = ?").get(Number(a));
+		if (!l) return e.json({ error: `Channel '${a}' not found` }, 404);
+		let u = l.status === "disabled" || l.status === "inactive" || l.isEnabled === 0 || l.isEnabled === !1;
+		if (!s && u) return e.json({ error: `Channel '${l.key || a}' is currently inactive` }, 404);
+		let d = l.id, f = l.key || a, p = F(e), m = le(e.env?.BUNDLED_DEFINITIONS), h = /^\d+$/.test(i), g = null, _ = null, v = e.req.query("treeId"), y = i.split("/"), b = y[y.length - 1], x = "/" + i.replace(/^\/+|\/+$/g, ""), S = `
       SELECT cn.*, tn.contentId as treeNodeId, tn.parentId, tn.treeId FROM content_nodes cn
       INNER JOIN tree_nodes tn ON cn.id = tn.contentId
-      ${u === null ? "" : "INNER JOIN node_channels nc ON cn.id = nc.nodeId"}
-      WHERE cn.slug = ? ${u === null ? "" : "AND nc.channelId = ?"}
-    `, S = u === null ? [y] : [y, u], C = await t.prepare(x).all(...S), w = Array.isArray(C) ? C : C?.results || [];
-		if (w.length > 0) {
-			let e = await Promise.all(w.map(async (e) => ({
+      ${d === null ? "" : "INNER JOIN node_channels nc ON cn.id = nc.nodeId"}
+      WHERE cn.slug = ? ${d === null ? "" : "AND nc.channelId = ?"}
+    `, C = d === null ? [b] : [b, d], w = await t.prepare(S).all(...C), T = Array.isArray(w) ? w : w?.results || [];
+		if (T.length > 0) {
+			let e = await Promise.all(T.map(async (e) => ({
 				candidate: e,
 				calculatedPath: await $e(t, String(e.treeNodeId), String(e.treeId), n)
-			}))), r = b.replace(/^\/+|\/+$/g, "");
+			}))), r = x.replace(/^\/+|\/+$/g, "");
 			for (let { candidate: t, calculatedPath: n } of e) {
 				let e = n.replace(/^\/+|\/+$/g, "");
 				if (e === r || r === "home" && (e === "" || e === "home")) {
-					h = t, g = t;
+					g = t, _ = t;
 					break;
 				}
 			}
 		}
-		if (!h && v.length === 1 && (h = u === null ? await t.prepare("SELECT * FROM content_nodes WHERE slug = ?").get(y) : await t.prepare("SELECT cn.* FROM content_nodes cn INNER JOIN node_channels nc ON cn.id = nc.nodeId WHERE cn.slug = ? AND nc.channelId = ?").get(y, u)), !h && m && (h = u === null ? await t.prepare("SELECT * FROM content_nodes WHERE id = ?").get(Number(i)) : await t.prepare("SELECT cn.* FROM content_nodes cn INNER JOIN node_channels nc ON cn.id = nc.nodeId WHERE cn.id = ? AND nc.channelId = ?").get(Number(i), u)), !h) return e.json({ error: `Node '${i}' not found for Channel '${a}'` }, 404);
-		if (!g) {
-			let e = _ ? [h.id, _] : [h.id];
-			g = await t.prepare(`SELECT contentId as treeNodeId, treeId, parentId FROM tree_nodes WHERE contentId = ? ${_ ? "AND treeId = ?" : ""} LIMIT 1`).get(...e);
+		if (!g && y.length === 1 && (g = d === null ? await t.prepare("SELECT * FROM content_nodes WHERE slug = ?").get(b) : await t.prepare("SELECT cn.* FROM content_nodes cn INNER JOIN node_channels nc ON cn.id = nc.nodeId WHERE cn.slug = ? AND nc.channelId = ?").get(b, d)), !g && h && (g = d === null ? await t.prepare("SELECT * FROM content_nodes WHERE id = ?").get(Number(i)) : await t.prepare("SELECT cn.* FROM content_nodes cn INNER JOIN node_channels nc ON cn.id = nc.nodeId WHERE cn.id = ? AND nc.channelId = ?").get(Number(i), d)), !g) return e.json({ error: `Node '${i}' not found for Channel '${a}'` }, 404);
+		let E = null;
+		if (c) {
+			let e = await t.prepare("SELECT snapshotJson FROM node_revisions WHERE nodeId = ? AND version = ?").get(g.id, Number(c));
+			if (e && e.snapshotJson) try {
+				E = JSON.parse(e.snapshotJson), E.node && (E.node.title && (g.title = E.node.title), E.node.slug && (g.slug = E.node.slug));
+			} catch (e) {
+				console.error("[CMS] Failed to parse snapshotJson", e);
+			}
+		}
+		if (!_) {
+			let e = v ? [g.id, v] : [g.id];
+			_ = await t.prepare(`SELECT contentId as treeNodeId, treeId, parentId FROM tree_nodes WHERE contentId = ? ${v ? "AND treeId = ?" : ""} LIMIT 1`).get(...e);
 		}
-		let T = g?.treeId || _ || "main-nav", E = null;
-		if (T) {
-			let e = await t.prepare("\n        SELECT dataJson \n        FROM trees \n        WHERE id = ? OR key = ? \n        LIMIT 1\n      ").get(Number(T) || -1, String(T));
+		let D = _?.treeId || v || "main-nav", O = null;
+		if (D) {
+			let e = await t.prepare("\n        SELECT dataJson \n        FROM trees \n        WHERE id = ? OR key = ? \n        LIMIT 1\n      ").get(Number(D) || -1, String(D));
 			if (e?.dataJson) try {
 				let t = typeof e.dataJson == "string" ? JSON.parse(e.dataJson) : e.dataJson;
-				t.defaultLanguage ? E = String(t.defaultLanguage).trim() : t.language && (E = String(t.language).trim());
+				t.defaultLanguage ? O = String(t.defaultLanguage).trim() : t.language && (O = String(t.language).trim());
 			} catch {}
 		}
-		let D = null;
-		if (c) {
-			if (c.defaultLanguage) D = String(c.defaultLanguage).trim();
-			else if (c.dataJson) try {
-				let e = typeof c.dataJson == "string" ? JSON.parse(c.dataJson) : c.dataJson;
-				e.defaultLanguage ? D = String(e.defaultLanguage).trim() : e.language && (D = String(e.language).trim());
+		let k = null;
+		if (l) {
+			if (l.defaultLanguage) k = String(l.defaultLanguage).trim();
+			else if (l.dataJson) try {
+				let e = typeof l.dataJson == "string" ? JSON.parse(l.dataJson) : l.dataJson;
+				e.defaultLanguage ? k = String(e.defaultLanguage).trim() : e.language && (k = String(e.language).trim());
 			} catch {}
 		}
-		let O = h.language?.trim() || null, k = E || D || o?.trim() || null, A = O || k || null, j = `node:${u || d}:${A || "default"}:${i}`, M = e.req.header("x-bypass-cache") === "true";
-		if (!s && !M) {
-			let t = await f.get(j);
+		let A = g.language?.trim() || null, j = O || k || o?.trim() || null, M = A || j || null, N = `node:${d || f}:${M || "default"}:${i}`, ee = e.req.header("x-bypass-cache") === "true" || !!c;
+		if (!s && !ee) {
+			let t = await p.get(N);
 			if (t) return e.header("X-Cache", "HIT"), e.json(t);
 		}
-		let N = g?.parentId || null, ee = g?.treeNodeId ? await $e(t, String(g.treeNodeId), String(T), n) : `/${(h.slug || "").replace(/^\/+|\/+$/g, "")}`, P = {
-			id: h.id,
-			title: h.title,
-			slug: h.slug,
-			language: A,
-			path: ee === "" ? "/" : ee,
-			nodeType: h.contentType,
-			createdAt: h.createdAt,
-			updatedAt: h.updatedAt
-		}, te = h.contentType || "node", F = p.nodes?.[te] || Object.values(p.nodes || {})[0] || {}, L = { ...F.fields || {} };
-		F.tabs && Object.values(F.tabs).forEach((e) => {
-			Object.assign(L, e.fields || {});
+		let te = _?.parentId || null, ne = _?.treeNodeId ? await $e(t, String(_.treeNodeId), String(D), n) : `/${(g.slug || "").replace(/^\/+|\/+$/g, "")}`, P = {
+			id: g.id,
+			title: g.title,
+			slug: g.slug,
+			language: M,
+			path: ne === "" ? "/" : ne,
+			nodeType: g.contentType,
+			createdAt: g.createdAt,
+			updatedAt: g.updatedAt
+		}, re = g.contentType || "node", ie = m.nodes?.[re] || Object.values(m.nodes || {})[0] || {}, ae = { ...ie.fields || {} };
+		ie.tabs && Object.values(ie.tabs).forEach((e) => {
+			Object.assign(ae, e.fields || {});
 		});
-		let ne = {}, re = null, ie = null, ae = !1, R = {}, oe = s && h.draftDataJson || h.dataJson;
-		if (oe) try {
-			R = typeof oe == "string" ? JSON.parse(oe) : oe;
+		let oe = {}, I = null, se = null, ce = !1, L = {}, z = s && g.draftDataJson || g.dataJson;
+		if (E && E.node && E.node.dataJson && (z = E.node.dataJson), z) try {
+			L = typeof z == "string" ? JSON.parse(z) : z;
 		} catch {}
-		R.disabledRegions && (ne = R.disabledRegions), ae = R.hidden === !0 || R.hidden === 1 || R.hidden === "1" || R.hidden === "true", re = R.startShowingAt || null, ie = R.stopShowingAt || null;
-		let z = R.layoutId, V = z && z !== "inherit", { resolvedLayoutId: H, inheritedFields: ce } = await et(t, N, T, s, L), le = V ? z : H || F.defaultLayout || null;
-		for (let [e, t] of Object.entries(ce)) (R[e] === void 0 || R[e] === null || R[e] === "" || R[e] === "inherit") && t !== void 0 && (R[e] = t);
-		let U = await B(t, Ge(R, L));
-		U = Ke(U), U = await qe(t, U, n), delete U.language;
-		let ue = Qe(U);
-		delete U.socialImage, delete U.fbImage, delete U.xImage, delete U.whatsappImage, ue && (U.socialImages = ue), P.slug = h.slug, P.title = h.title, Object.assign(P, U), P.layoutId = le;
-		let de = Number(h.isHidden) === 1 || ae, fe = !He(re, ie), pe = h.status === "draft" || h.status === "new", me = h.dataJson && h.dataJson !== "{}" && h.dataJson !== "null";
-		if (!s && (de || fe || pe && !me)) return e.json({ error: "Node is hidden, offline, or has never been published." }, 404);
-		let he = [];
-		if (g?.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(g.treeNodeId, T), n = Array.isArray(e) ? e : e?.results || [], r = P.path === "/" ? "" : P.path;
-			he = n.map((e) => {
+		L.disabledRegions && (oe = L.disabledRegions), ce = L.hidden === !0 || L.hidden === 1 || L.hidden === "1" || L.hidden === "true", I = L.startShowingAt || null, se = L.stopShowingAt || null;
+		let B = L.layoutId, ue = B && B !== "inherit", { resolvedLayoutId: de, inheritedFields: fe } = await et(t, te, D, s, ae), V = ue ? B : de || ie.defaultLayout || null;
+		for (let [e, t] of Object.entries(fe)) (L[e] === void 0 || L[e] === null || L[e] === "" || L[e] === "inherit") && t !== void 0 && (L[e] = t);
+		let H = await R(t, Ge(L, ae));
+		H = Ke(H), H = await qe(t, H, n), delete H.language;
+		let pe = Qe(H);
+		delete H.socialImage, delete H.fbImage, delete H.xImage, delete H.whatsappImage, pe && (H.socialImages = pe), P.slug = g.slug, P.title = g.title, Object.assign(P, H), P.layoutId = V;
+		let me = Number(g.isHidden) === 1 || ce, he = !He(I, se), ge = g.status === "draft" || g.status === "new", _e = g.dataJson && g.dataJson !== "{}" && g.dataJson !== "null";
+		if (!s && (me || he || ge && !_e)) return e.json({ error: "Node is hidden, offline, or has never been published." }, 404);
+		let U = [];
+		if (_?.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(_.treeNodeId, D), n = Array.isArray(e) ? e : e?.results || [], r = P.path === "/" ? "" : P.path;
+			U = n.map((e) => {
 				let t = {}, n = s && e.draftDataJson || e.dataJson;
 				if (!n) return null;
 				try {
@@ -8539,22 +8548,31 @@ ze.get("/*", async (e) => {
 					id: e.id,
 					title: e.title,
 					slug: o,
-					language: e.language?.trim() || A || null,
+					language: e.language?.trim() || M || null,
 					path: `${r}/${o}`.replace(/\/+/g, "/"),
 					nodeType: e.nodeType
 				};
 			}).filter(Boolean);
 		}
-		P.children = he;
-		let ge = +!!s, W = await t.prepare("SELECT * FROM content_blocks WHERE contentId = ? AND isDraft = ? ORDER BY sortOrder ASC").all(h.id, ge), _e = Array.isArray(W) ? W : W?.results || [], G = {}, ve = {}, ye = await Promise.all(_e.map(async (e) => {
+		P.children = U;
+		let ve = [];
+		if (E && E.blocks && Array.isArray(E.blocks)) ve = E.blocks.map((e) => ({
+			...e,
+			isDraft: 1
+		}));
+		else {
+			let e = +!!s, n = await t.prepare("SELECT * FROM content_blocks WHERE contentId = ? AND isDraft = ? ORDER BY sortOrder ASC").all(g.id, e);
+			ve = Array.isArray(n) ? n : n?.results || [];
+		}
+		let W = {}, G = {}, ye = await Promise.all(ve.map(async (e) => {
 			let r = e.region || "main", i = {};
 			try {
 				i = (typeof e.dataJson == "string" ? JSON.parse(e.dataJson) : e.dataJson) || {};
 			} catch {}
 			let a = i.hidden === !0 || i.hidden === 1 || i.hidden === "1" || i.hidden === "true", o = He(i.startShowingAt, i.stopShowingAt);
 			if (!s && (a || !o)) return null;
-			let c = e.elementType || e.componentId || "text-block", l = p.blocks?.[c]?.fields || p.elements?.[c]?.fields || p.components?.[c]?.fields || {}, u = String(i.blockId || i._instanceId || i.id || e.blockId || e.id), d = Ge(i, l);
-			return d = await B(t, d), d = Ke(d), d = await qe(t, d, n), d.blockId = u, {
+			let c = e.elementType || e.componentId || "text-block", l = m.blocks?.[c]?.fields || m.elements?.[c]?.fields || m.components?.[c]?.fields || {}, u = String(i.blockId || i._instanceId || i.id || e.blockId || e.id), d = Ge(i, l);
+			return d = await R(t, d), d = Ke(d), d = await qe(t, d, n), d.blockId = u, {
 				region: r,
 				block: {
 					instanceId: e.id,
@@ -8564,7 +8582,7 @@ ze.get("/*", async (e) => {
 				}
 			};
 		}));
-		for (let e of ye) e && (G[e.region] || (G[e.region] = [], ve[e.region] = { isInherited: !1 }), G[e.region].push(e.block));
+		for (let e of ye) e && (W[e.region] || (W[e.region] = [], G[e.region] = { isInherited: !1 }), W[e.region].push(e.block));
 		let K = {
 			header: {
 				label: "Header",
@@ -8574,33 +8592,33 @@ ze.get("/*", async (e) => {
 				label: "Footer",
 				inherit: "parent"
 			},
-			...(le ? p.nodeLayouts?.[le] || p.layouts?.[le] : null)?.regions || { main: { label: "Content" } }
+			...(V ? m.nodeLayouts?.[V] || m.layouts?.[V] : null)?.regions || { main: { label: "Content" } }
 		};
 		for (let [e, r] of Object.entries(K)) {
-			let i = G[e] && G[e].length > 0, a = !!ne[e];
-			if (G[e] || (G[e] = [], ve[e] = { isInherited: !1 }), (r?.inherit === "parent" || r?.inherit === !0 || r?.inherit === "true" || e === "header" || e === "footer") && !i && !a && N) {
-				let r = await We(t, N, String(T), e, p, s, n);
-				if (r.blocks.length > 0 && (G[e] = r.blocks, ve[e] = {
+			let i = W[e] && W[e].length > 0, a = !!oe[e];
+			if (W[e] || (W[e] = [], G[e] = { isInherited: !1 }), (r?.inherit === "parent" || r?.inherit === !0 || r?.inherit === "true" || e === "header" || e === "footer") && !i && !a && te) {
+				let r = await We(t, te, String(D), e, m, s, n);
+				if (r.blocks.length > 0 && (W[e] = r.blocks, G[e] = {
 					isInherited: !0,
 					inheritedFromId: r.inheritedFromId,
 					inheritedFromTitle: r.inheritedFromTitle
-				}, r.subRegions)) for (let [t, n] of Object.entries(r.subRegions)) t !== e && (G[t] = n, ve[t] = {
+				}, r.subRegions)) for (let [t, n] of Object.entries(r.subRegions)) t !== e && (W[t] = n, G[t] = {
 					isInherited: !0,
 					inheritedFromId: r.inheritedFromId,
 					inheritedFromTitle: r.inheritedFromTitle
 				});
 			}
 		}
-		await Promise.all(Object.keys(G).map((e) => Ue(t, G[e], u, A)));
+		await Promise.all(Object.keys(W).map((e) => Ue(t, W[e], d, M)));
 		let q = {
-			channelId: u || d,
-			treeId: T,
-			language: A,
+			channelId: d || f,
+			treeId: D,
+			language: M,
 			node: P,
-			content: G,
-			regionMeta: ve
+			content: W,
+			regionMeta: G
 		};
-		return !s && !M && (e.header("X-Cache", "MISS"), await nt(f, j, q, tt(e))), e.json(q);
+		return !s && !ee && (e.header("X-Cache", "MISS"), await nt(p, N, q, tt(e))), e.json(q);
 	} catch (t) {
 		return console.error("[CMS Public API] Error fetching node by path:", t), e.json({
 			error: "Failed to fetch JSON payload",
@@ -8651,14 +8669,14 @@ rt.get("/:treeParam", async (e) => {
 				e.defaultLanguage && (l = String(e.defaultLanguage).trim());
 			} catch {}
 		}
-		let u = l || o || i?.trim() || null, d = I(e), f = `tree:${r}:${n}:${u || "default"}`, p = e.req.header("x-bypass-cache") === "true";
+		let u = l || o || i?.trim() || null, d = F(e), f = `tree:${r}:${n}:${u || "default"}`, p = e.req.header("x-bypass-cache") === "true";
 		if (!a && !p) {
 			let t = await d.get(f);
 			if (t) return e.header("X-Cache", "HIT"), e.json(t);
 		}
 		let m = c?.id || (s ? Number(n) : null), h = {};
 		if (c && c.dataJson) try {
-			let t = typeof c.dataJson == "string" ? JSON.parse(c.dataJson) : c.dataJson, r = e.env?.BUNDLED_DEFINITIONS, i = se(r), a = (i.trees?.[c.treeType || n] || i.trees?.site || {}).fields || {};
+			let t = typeof c.dataJson == "string" ? JSON.parse(c.dataJson) : c.dataJson, r = e.env?.BUNDLED_DEFINITIONS, i = le(r), a = (i.trees?.[c.treeType || n] || i.trees?.site || {}).fields || {};
 			for (let [e, n] of Object.entries(t)) a[e]?.public === !0 && (h[e] = n);
 		} catch (e) {
 			console.warn("[CMS Public Tree API] Failed to parse tree dataJson", e);
@@ -8833,7 +8851,7 @@ async function ft(e, t) {
 }
 ot.get("/:channelParam", async (e) => {
 	try {
-		let t = e.get("db"), n = e.req.param("channelParam"), r = e.req.query("preview") === "true", i = e.req.header("x-bypass-cache") === "true", a = `channel:${n}:${r ? "preview" : "live"}`, o = I(e);
+		let t = e.get("db"), n = e.req.param("channelParam"), r = e.req.query("preview") === "true", i = e.req.header("x-bypass-cache") === "true", a = `channel:${n}:${r ? "preview" : "live"}`, o = F(e);
 		if (!r && !i) {
 			let t = await o.get(a);
 			if (t) return e.header("X-Cache", "HIT"), e.json(t);
@@ -8842,7 +8860,7 @@ ot.get("/:channelParam", async (e) => {
 		if (!s) return e.json({ error: `Channel '${n}' not found` }, 404);
 		let c = s.status === "disabled" || s.status === "inactive" || s.isEnabled === 0 || s.isEnabled === !1;
 		if (!r && c) return e.json({ error: `Channel '${s.key || n}' is currently inactive` }, 404);
-		let l = e.env?.BUNDLED_DEFINITIONS, u = se(l), d = s.channelType || s.key || "website", f = lt(u.channels?.[d] || u.channels?.[s.key] || u.channels?.website || u.definitions?.["channel-base"] || {}, u), p = {}, m = r && s.draftDataJson || s.dataJson;
+		let l = e.env?.BUNDLED_DEFINITIONS, u = le(l), d = s.channelType || s.key || "website", f = lt(u.channels?.[d] || u.channels?.[s.key] || u.channels?.website || u.definitions?.["channel-base"] || {}, u), p = {}, m = r && s.draftDataJson || s.dataJson;
 		if (m) try {
 			p = typeof m == "string" ? JSON.parse(m) : m;
 		} catch (e) {
@@ -8852,7 +8870,7 @@ ot.get("/:channelParam", async (e) => {
 			...p,
 			...s
 		}, f);
-		h = await B(t, h), h = dt(h), h = await ft(t, h);
+		h = await R(t, h), h = dt(h), h = await ft(t, h);
 		let g = {
 			id: s.id,
 			key: s.key,
@@ -8893,7 +8911,7 @@ pt.get("/*", async (e) => {
 			let e = await l.match(d);
 			if (e) return e;
 		}
-		let { storage: f, optimizer: p } = ae(e.env), m = await f.get(t);
+		let { storage: f, optimizer: p } = I(e.env), m = await f.get(t);
 		if (!m) return e.text(`Asset not found: ${t}`, 404);
 		if (!o) {
 			let n = e.body(m, 200, {
@@ -9003,7 +9021,7 @@ $.use("*", t()), $.use("/media/*", t({
 		console.error("❌ [CMS Server] Failed to initialize system tables on cold start:", e);
 	}
 	await t();
-}), $.route("/media", pt), $.use("/media/*", y()), $.route("/api/cms/nodes", H), $.route("/api/cms/nodes.json", H), $.route("/api/cms/formcsv", H), $.route("/api/cms/formcsv.json", H), $.route("/api/cms/stats", Le), $.route("/api/cms/stats.json", Le), $.route("/api/cms", W), $.route("/api/cms/channels", ye), $.route("/api/cms/channels.json", ye), $.route("/api/cms/schemas", Me), $.route("/api/cms/schemas.json", Me), $.route("/api/cms", Pe), $.route("/api/admin/assets", X), $.route("/api/v1/node", ze), $.route("/api/v1/page", ze), $.route("/api/v1/tree", rt), $.route("/api/v1/channel", ot), $.route("/api/v1/all-paths", ht), $.get("*", async (e, t) => {
+}), $.route("/media", pt), $.use("/media/*", y()), $.route("/api/cms/nodes", B), $.route("/api/cms/nodes.json", B), $.route("/api/cms/formcsv", B), $.route("/api/cms/formcsv.json", B), $.route("/api/cms/stats", Le), $.route("/api/cms/stats.json", Le), $.route("/api/cms", U), $.route("/api/cms/channels", ye), $.route("/api/cms/channels.json", ye), $.route("/api/cms/schemas", Me), $.route("/api/cms/schemas.json", Me), $.route("/api/cms", Pe), $.route("/api/admin/assets", X), $.route("/api/v1/node", ze), $.route("/api/v1/page", ze), $.route("/api/v1/tree", rt), $.route("/api/v1/channel", ot), $.route("/api/v1/all-paths", ht), $.get("*", async (e, t) => {
 	if (e.env?.ASSETS) {
 		let t = await e.env.ASSETS.fetch(e.req.raw);
 		if (t.status === 404) {