@brightsideoy/kama 0.1.0-alpha.162 → 0.1.0-alpha.164

package/dist/{dist-V9vwVhix.js → dist-DkBY_SfG.js}

@@ -4785,7 +4785,7 @@ var u = /* @__PURE__ */ o({
 	channel_trees: "\n    channelId INTEGER NOT NULL,\n    treeId INTEGER NOT NULL,\n    key TEXT NOT NULL DEFAULT 'main',\n    metaJson TEXT,\n    PRIMARY KEY (channelId, treeId, key),\n    FOREIGN KEY (channelId) REFERENCES channels(id) ON DELETE CASCADE,\n    FOREIGN KEY (treeId) REFERENCES trees(id) ON DELETE CASCADE\n  ",
 	content_nodes: "\n    id INTEGER PRIMARY KEY AUTOINCREMENT,\n    contentType TEXT NOT NULL,\n    title TEXT NOT NULL,\n    slug TEXT,\n    language TEXT,\n    isHidden INTEGER NOT NULL DEFAULT 0,\n    status TEXT DEFAULT 'draft',\n    hasUnpublishedChanges INTEGER DEFAULT 0,\n    disabledRegionsJson TEXT DEFAULT '{}',\n    dataJson TEXT,\n    draftDataJson TEXT,\n    publishedDataJson TEXT,\n    publishedAt TEXT,\n    createdById TEXT,\n    updatedById TEXT,\n    createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n    updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n    deletedAt TEXT,\n    FOREIGN KEY (createdById) REFERENCES users(id) ON DELETE SET NULL,\n    FOREIGN KEY (updatedById) REFERENCES users(id) ON DELETE SET NULL\n  ",
 	node_channels: "\n    nodeId INTEGER NOT NULL,\n    channelId INTEGER NOT NULL,\n    PRIMARY KEY (nodeId, channelId),\n    FOREIGN KEY (nodeId) REFERENCES content_nodes(id) ON DELETE CASCADE,\n    FOREIGN KEY (channelId) REFERENCES channels(id) ON DELETE CASCADE\n  ",
-	tree_nodes: "\n    id INTEGER PRIMARY KEY AUTOINCREMENT,\n    treeId INTEGER NOT NULL,\n    contentId INTEGER NOT NULL,\n    parentId INTEGER,\n    sortOrder INTEGER DEFAULT 0,\n    FOREIGN KEY (treeId) REFERENCES trees(id) ON DELETE CASCADE,\n    FOREIGN KEY (contentId) REFERENCES content_nodes(id) ON DELETE CASCADE,\n    FOREIGN KEY (parentId) REFERENCES tree_nodes(id) ON DELETE CASCADE\n  ",
+	tree_nodes: "\n    treeId INTEGER NOT NULL,\n    contentId INTEGER NOT NULL,\n    parentId INTEGER,\n    sortOrder INTEGER DEFAULT 0,\n    PRIMARY KEY (treeId, contentId),\n    FOREIGN KEY (treeId) REFERENCES trees(id) ON DELETE CASCADE,\n    FOREIGN KEY (contentId) REFERENCES content_nodes(id) ON DELETE CASCADE,\n    FOREIGN KEY (parentId) REFERENCES content_nodes(id) ON DELETE CASCADE\n  ",
 	content_blocks: "\n    id INTEGER PRIMARY KEY AUTOINCREMENT,\n    contentId INTEGER NOT NULL,\n    region TEXT DEFAULT 'main',\n    elementType TEXT NOT NULL,\n    dataJson TEXT,\n    sortOrder INTEGER DEFAULT 0,\n    isDraft INTEGER NOT NULL DEFAULT 1,\n    FOREIGN KEY (contentId) REFERENCES content_nodes(id) ON DELETE CASCADE\n  ",
 	node_revisions: "\n    id INTEGER PRIMARY KEY AUTOINCREMENT,\n    nodeId INTEGER NOT NULL,\n    version INTEGER NOT NULL DEFAULT 1,\n    snapshotJson TEXT NOT NULL,\n    createdById TEXT,\n    createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n    FOREIGN KEY (nodeId) REFERENCES content_nodes(id) ON DELETE CASCADE,\n    FOREIGN KEY (createdById) REFERENCES users(id) ON DELETE SET NULL\n  ",
 	assets: "\n    id TEXT PRIMARY KEY,\n    filename TEXT NOT NULL,\n    mimeType TEXT NOT NULL,\n    sizeBytes INTEGER NOT NULL,\n    storageKeyPrivate TEXT,\n    cdnUrl TEXT,\n    parentAssetId TEXT,\n    cropCoordinatesJson TEXT,\n    isSystemVariant INTEGER DEFAULT 0,\n    dataJson TEXT DEFAULT '{}',\n    createdById TEXT,\n    createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n    updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n    deletedAt TEXT,\n    FOREIGN KEY (parentAssetId) REFERENCES assets(id) ON DELETE SET NULL,\n    FOREIGN KEY (createdById) REFERENCES users(id) ON DELETE SET NULL\n  ",
@@ -4830,6 +4830,14 @@ async function _(e, t) {
 					await e.prepare("ALTER TABLE \"assets\" ADD COLUMN cropCoordinatesJson TEXT;").run();
 				} catch {}
 			}
+			if (t === "tree_nodes" && n.has("id")) {
+				console.log("[Schema Sync] Migrating tree_nodes to Content-to-Content hierarchy...");
+				try {
+					await e.prepare("\n                        CREATE TABLE \"tree_nodes_new\" (\n                            treeId INTEGER NOT NULL,\n                            contentId INTEGER NOT NULL,\n                            parentId INTEGER,\n                            sortOrder INTEGER DEFAULT 0,\n                            PRIMARY KEY (treeId, contentId),\n                            FOREIGN KEY (treeId) REFERENCES trees(id) ON DELETE CASCADE,\n                            FOREIGN KEY (contentId) REFERENCES content_nodes(id) ON DELETE CASCADE,\n                            FOREIGN KEY (parentId) REFERENCES content_nodes(id) ON DELETE CASCADE\n                        )\n                    ").run(), await e.prepare("\n                        INSERT OR IGNORE INTO tree_nodes_new (treeId, contentId, parentId, sortOrder)\n                        SELECT t1.treeId, t1.contentId, t2.contentId as parentId, t1.sortOrder\n                        FROM tree_nodes t1\n                        LEFT JOIN tree_nodes t2 ON t1.parentId = t2.id\n                    ").run(), await e.prepare("DROP TABLE \"tree_nodes\"").run(), await e.prepare("ALTER TABLE \"tree_nodes_new\" RENAME TO \"tree_nodes\"").run(), console.log("[Schema Sync] Tree migration complete.");
+				} catch (e) {
+					console.error("[Schema Sync] Failed to migrate tree_nodes schema:", e);
+				}
+			}
 		}
 	}
 	for (let t of m) try {
@@ -5844,6 +5852,7 @@ async function B(e, t) {
 				let t = z(e.parentAssetId);
 				t && n.add(t);
 			}
+			typeof e == "object" && e.variants && Object.values(e.variants).forEach(r);
 		} else Array.isArray(e) ? e.forEach(r) : typeof e == "object" && Object.values(e).forEach(r);
 	};
 	if (r(t), n.size === 0) return t;
@@ -5857,14 +5866,16 @@ async function B(e, t) {
       a.parentAssetId,
       a.cropCoordinatesJson,
       a.dataJson,
+      a.updatedAt,
       p.cdnUrl AS parentCdnUrl,
       p.storageKeyPrivate AS parentStorageKeyPrivate,
-      p.dataJson AS parentDataJson
+      p.dataJson AS parentDataJson,
+      p.updatedAt AS parentUpdatedAt
     FROM assets a
     LEFT JOIN assets p ON a.parentAssetId = p.id
     WHERE a.id IN (${i})
   `).all(...Array.from(n)), o = Array.isArray(a) ? a : a?.results || [], s = await e.prepare(`
-    SELECT id, cdnUrl, storageKeyPrivate, filename, parentAssetId, cropCoordinatesJson, dataJson
+    SELECT id, cdnUrl, storageKeyPrivate, filename, parentAssetId, cropCoordinatesJson, dataJson, updatedAt
     FROM assets 
     WHERE isSystemVariant = 1 
       AND (parentAssetId IN (${i}) OR ${Array.from(n).map(() => "filename LIKE ?").join(" OR ")})
@@ -5876,62 +5887,66 @@ async function B(e, t) {
 		if (e.cropCoordinatesJson) try {
 			a = typeof e.cropCoordinatesJson == "string" ? JSON.parse(e.cropCoordinatesJson) : e.cropCoordinatesJson;
 		} catch {}
-		let o = e.cdnUrl || (e.storageKeyPrivate ? `/media/${e.storageKeyPrivate}` : "");
+		let o = e.cdnUrl || (e.storageKeyPrivate ? `/media/${e.storageKeyPrivate}` : ""), s = e.updatedAt ? new Date(e.updatedAt).getTime() : Date.now(), c = o ? `${o}?v=${s}` : "";
 		l.has(t) || l.set(t, {}), l.get(t)[i] = {
 			id: e.id,
-			url: o,
+			url: c,
 			cropCoordinates: a
 		};
 	}
 	let u = /* @__PURE__ */ new Map();
 	for (let e of o) {
-		let t = e.cdnUrl || (e.storageKeyPrivate ? `/media/${e.storageKeyPrivate}` : ""), n = t;
-		e.parentAssetId && (e.parentCdnUrl || e.parentStorageKeyPrivate) && (n = e.parentCdnUrl || `/media/${e.parentStorageKeyPrivate}`);
-		let r = null;
+		let t = e.updatedAt ? new Date(e.updatedAt).getTime() : Date.now(), n = e.cdnUrl || (e.storageKeyPrivate ? `/media/${e.storageKeyPrivate}` : ""), r = n ? `${n}?v=${t}` : "", i = r;
+		if (e.parentAssetId && (e.parentCdnUrl || e.parentStorageKeyPrivate)) {
+			let n = e.parentUpdatedAt ? new Date(e.parentUpdatedAt).getTime() : t;
+			i = `${e.parentCdnUrl || `/media/${e.parentStorageKeyPrivate}`}?v=${n}`;
+		}
+		let a = null;
 		if (e.cropCoordinatesJson) try {
-			r = typeof e.cropCoordinatesJson == "string" ? JSON.parse(e.cropCoordinatesJson) : e.cropCoordinatesJson;
+			a = typeof e.cropCoordinatesJson == "string" ? JSON.parse(e.cropCoordinatesJson) : e.cropCoordinatesJson;
 		} catch {}
-		let i = l.get(e.id), a = {};
+		let o = l.get(e.id), s = {};
 		try {
-			a = JSON.parse(e.dataJson || "{}");
+			s = JSON.parse(e.dataJson || "{}");
 		} catch {}
 		if (e.parentAssetId && e.parentDataJson) try {
-			a = {
+			s = {
 				...JSON.parse(e.parentDataJson),
-				...a
+				...s
 			};
 		} catch {}
 		u.set(e.id, {
 			id: e.id,
-			url: t,
-			originalUrl: n,
+			url: r,
+			originalUrl: i,
 			parentAssetId: z(e.parentAssetId) || null,
-			cropCoordinates: r,
-			variants: i && Object.keys(i).length > 0 ? i : void 0,
+			cropCoordinates: a,
+			variants: o && Object.keys(o).length > 0 ? o : void 0,
 			filename: e.filename,
 			mimeType: e.mimeType,
-			title: a.title || "",
-			alt: a.alt || "",
-			description: a.description || ""
+			title: s.title || "",
+			alt: s.alt || "",
+			description: s.description || ""
 		});
 	}
 	let d = (e) => {
 		if (!e) return e;
 		let t = z(e);
 		if (t) {
-			let n = u.get(t) || {
-				id: t,
-				url: "",
-				originalUrl: ""
-			}, 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;
+			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) {
+				c = {};
+				let e = r || n?.variants;
+				for (let [t, n] of Object.entries(e)) c[t] = d(n);
+			}
 			return {
-				...n,
+				...n || {},
 				id: t,
-				parentAssetId: n.parentAssetId ? z(n.parentAssetId) : null,
-				url: typeof e == "object" && e.url && !e.url.startsWith("blob:") ? e.url : n.url,
-				originalUrl: typeof e == "object" && e.originalUrl && !e.originalUrl.startsWith("blob:") ? e.originalUrl : n.originalUrl,
-				cropCoordinates: i || n.cropCoordinates || null,
-				variants: r || n.variants || void 0,
+				parentAssetId: n?.parentAssetId ? z(n.parentAssetId) : null,
+				url: o,
+				originalUrl: s,
+				cropCoordinates: i || n?.cropCoordinates || null,
+				variants: c,
 				metadataOverrides: a
 			};
 		}
@@ -6258,8 +6273,8 @@ async function he(e, t, n) {
 async function ge(e, t, n) {
 	let r = {}, i = null;
 	if (t) {
-		let n = await e.prepare("\n      WITH RECURSIVE ancestor_path(id, parentId, draftDataJson, dataJson, level) AS (\n        SELECT t.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.id = ?\n        UNION ALL\n        SELECT t.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.id = ap.parentId\n      )\n      SELECT draftDataJson, dataJson FROM ancestor_path ORDER BY level ASC\n    ").all(t), a = Array.isArray(n) ? n : n?.results || [];
-		for (let e of a) {
+		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 || [];
+		for (let e of o) {
 			let t = e.draftDataJson || e.dataJson;
 			if (t) try {
 				let e = typeof t == "string" ? JSON.parse(t) : t;
@@ -6271,7 +6286,7 @@ async function ge(e, t, n) {
 	if (!i) {
 		let t = await e.prepare("SELECT dataJson FROM trees WHERE id = ? OR key = ? LIMIT 1").get(Number(n) || -1, String(n));
 		if (t && t.dataJson) try {
-			let e = typeof t.dataJson == "string" ? JSON.parse(t.dataJson) : t.dataJson;
+			let e = typeof t.dataJson == "string" ? JSON.parse(t.dataJson) : e.dataJson;
 			e.subpageLayoutId && e.subpageLayoutId !== "inherit" && (i = e.subpageLayoutId);
 		} catch {}
 	}
@@ -6305,7 +6320,7 @@ 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 id 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 = se(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);
 				(l === "inherit" || !l) && (l = e);
@@ -6455,8 +6470,8 @@ H.get("/", async (e) => {
 		}
 	}
 	C && E && C === E && (C = null);
-	let D = a, O = /* @__PURE__ */ new Set(), k = !1, A = s === void 0 ? null : U(s);
-	if (A) {
+	let D = a, O = /* @__PURE__ */ new Set(), k = !1, A = "draft", j = 0, M = s === void 0 ? null : U(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),
@@ -6470,26 +6485,26 @@ H.get("/", async (e) => {
 			});
 		}
 		for (let r of n) {
-			let n = r.parentId === null ? "tn.parentId IS NULL" : "tn.parentId = ?", i = r.parentId === null ? [r.treeId, A] : [
+			let n = r.parentId === null ? "tn.parentId IS NULL" : "tn.parentId = ?", i = r.parentId === null ? [r.treeId, M] : [
 				r.treeId,
 				r.parentId,
-				A
+				M
 			], o = `
         SELECT cn.id FROM tree_nodes tn
         INNER JOIN content_nodes cn ON tn.contentId = cn.id
         WHERE tn.treeId = ? AND ${n} AND cn.slug = ? AND (cn.deletedAt IS NULL OR cn.deletedAt = '')
       `;
 			if (a && (o += " AND cn.id != ?", i.push(a)), o += " LIMIT 1", await t.prepare(o).get(...i)) return e.json({
-				error: `The slug '${A}' is already in use by another page in this section.`,
+				error: `The slug '${M}' is already in use by another page in this section.`,
 				field: "slug"
 			}, 409);
 		}
 	}
 	if (a) {
-		let e = await t.prepare("SELECT title, slug, language, contentType, isHidden, draftDataJson, dataJson, publishedAt, status FROM content_nodes WHERE id = ?").get(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, {
 			title: o,
-			slug: A,
+			slug: M,
 			isHidden: b,
 			sanitizedFields: v
 		});
@@ -6497,26 +6512,43 @@ H.get("/", async (e) => {
 		try {
 			pe(typeof n == "string" ? JSON.parse(n) : n, O);
 		} catch {}
-		if (m !== void 0) {
-			let e = await t.prepare("SELECT dataJson FROM content_blocks WHERE contentId = ? AND isDraft = 1").all(a);
-			(Array.isArray(e) ? e : e?.results || []).forEach((e) => {
-				try {
-					pe(typeof e.dataJson == "string" ? JSON.parse(e.dataJson) : e.dataJson, O);
-				} catch {}
-			});
-		}
-		let r = o === void 0 ? e?.title || "Untitled" : o, i = A ?? e?.slug ?? null, s = x || e?.contentType || "page", l = c === void 0 ? e?.language : C, u = e?.draftDataJson || e?.dataJson || "{}", d = {};
+		let r = {};
 		try {
-			d = JSON.parse(u);
+			r = JSON.parse(n);
 		} catch {}
-		let f = JSON.stringify({
-			...d,
+		let i = JSON.stringify({
+			...r,
 			...v
-		}), p = e?.status === "published" || e?.publishedAt ? "published" : "draft", h = +(p === "published");
-		await t.prepare("\n      UPDATE content_nodes \n      SET title = ?, slug = ?, language = ?, contentType = ?, isHidden = ?, status = ?, draftDataJson = ?, hasUnpublishedChanges = ?, updatedById = ?, updatedAt = CURRENT_TIMESTAMP\n      WHERE id = ?\n    ").run(r, i, l, s, b, p, f, h, S, a);
+		}), l = !1;
+		if (o !== void 0 && o.trim() !== (e?.title || "Untitled") && (l = !0), s !== void 0 && M !== e?.slug && (l = !0), c !== void 0 && C !== e?.language && (l = !0), !l && Object.keys(v).length > 0) {
+			for (let e of Object.keys(v)) if (JSON.stringify(v[e]) !== JSON.stringify(r[e])) {
+				l = !0;
+				break;
+			}
+		}
+		if (!l && m !== void 0) {
+			let e = await t.prepare("SELECT region, elementType, dataJson FROM content_blocks WHERE contentId = ? AND isDraft = 1 ORDER BY sortOrder ASC").all(a), n = Array.isArray(e) ? e : e?.results || [];
+			if (m.length !== n.length) l = !0;
+			else for (let e = 0; e < m.length; e++) {
+				let t = m[e], r = n[e], i = t.componentId || t.elementType || "text-block", a = t.region || "content", o = { ...t.data || {} };
+				delete o._instanceId, delete o.blockId;
+				let s = {};
+				try {
+					s = JSON.parse(r.dataJson);
+				} catch {}
+				if (delete s._instanceId, delete s.blockId, i !== r.elementType || a !== r.region || JSON.stringify(o) !== JSON.stringify(s)) {
+					l = !0;
+					break;
+				}
+			}
+		}
+		let u = o === void 0 ? e?.title || "Untitled" : o, d = M ?? e?.slug ?? null, f = x || e?.contentType || "page", p = c === void 0 ? e?.language : C;
+		A = e?.status === "published" || e?.publishedAt ? "published" : "draft";
+		let h = e?.hasUnpublishedChanges === 1 || e?.hasUnpublishedChanges === !0;
+		j = l ? 1 : +!!h, await t.prepare("\n      UPDATE content_nodes \n      SET title = ?, slug = ?, language = ?, contentType = ?, isHidden = ?, status = ?, draftDataJson = ?, hasUnpublishedChanges = ?, updatedById = ?, updatedAt = CURRENT_TIMESTAMP\n      WHERE id = ?\n    ").run(u, d, p, f, b, A, i, j, S, a);
 	} else {
 		k = !0;
-		let e = await t.prepare("\n      INSERT INTO content_nodes (contentType, title, slug, language, isHidden, status, draftDataJson, dataJson, hasUnpublishedChanges, createdById, updatedById)\n      VALUES (?, ?, ?, ?, ?, 'draft', ?, NULL, 0, ?, ?)\n    ").run(x, o || "Untitled", A, C, b, JSON.stringify(v), S, S);
+		let e = await t.prepare("\n      INSERT INTO content_nodes (contentType, title, slug, language, isHidden, status, draftDataJson, dataJson, hasUnpublishedChanges, createdById, updatedById)\n      VALUES (?, ?, ?, ?, ?, 'draft', ?, NULL, 0, ?, ?)\n    ").run(x, o || "Untitled", M, C, b, JSON.stringify(v), S, S);
 		D = Number(e.lastInsertRowid);
 	}
 	if (h !== void 0 && Array.isArray(h) && D) {
@@ -6529,10 +6561,10 @@ 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 id, 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 id = ?").run(r, i, a.id)) : (k = !0, await t.prepare("INSERT INTO tree_nodes (treeId, contentId, parentId, sortOrder) VALUES (?, ?, ?, ?)").run(n, D, r, i));
+		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);
+		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 j = [];
+	let N = [];
 	if (m !== void 0 && Array.isArray(m) && D) {
 		await t.prepare("DELETE FROM content_blocks WHERE contentId = ? AND isDraft = 1").run(D);
 		let e = [], n = [];
@@ -6542,7 +6574,7 @@ H.get("/", async (e) => {
 				blockId: o,
 				_instanceId: o
 			});
-			c.forEach((e) => j.push({
+			c.forEach((e) => N.push({
 				...e,
 				fieldKey: `blocks[${t}].${e.fieldKey}`
 			}));
@@ -6552,7 +6584,7 @@ H.get("/", async (e) => {
 		e.length > 0 && await t.prepare(`INSERT INTO content_blocks (contentId, sortOrder, elementType, dataJson, region, isDraft) VALUES ${e.join(", ")}`).run(...n);
 	}
 	if (D) {
-		let n = [...y, ...j];
+		let n = [...y, ...N];
 		await oe(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) {
@@ -6563,7 +6595,8 @@ H.get("/", async (e) => {
 	return await I(e).clear(), e.json({
 		success: !0,
 		id: D,
-		status: "draft",
+		status: A,
+		hasUnpublishedChanges: j === 1 || A === "draft",
 		isStructuralChange: k
 	});
 }), H.post("/publish", async (e) => {
@@ -6681,7 +6714,7 @@ function _e(e, t = null) {
 	for (let r = 0; r < e.length; r++) {
 		let i = e[r];
 		if (!i) continue;
-		let a = i.treeNodeId || i.id || i.contentId;
+		let a = i.id || i.contentId;
 		if (!a || typeof a == "string" && a.startsWith("draft-")) continue;
 		let o = Number(a);
 		isNaN(o) || (n.push({
@@ -6711,7 +6744,7 @@ W.get("/tree.json", async (e) => {
 				e && e.id && (i = Number(e.id));
 			}
 		} else i = Number(n);
-		let a = await t.prepare("\n      SELECT \n        t.id as treeNodeId,\n        t.treeId,\n        t.contentId,\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.status,\n        c.publishedAt,\n        c.hasUnpublishedChanges,\n        c.dataJson,\n        c.draftDataJson,\n        (SELECT COUNT(*) FROM node_assets WHERE nodeId = t.contentId) as assetCount\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(i), o = Array.isArray(a) ? a : a?.results || [], s = [], c = /* @__PURE__ */ new Set();
+		let a = await t.prepare("\n      SELECT \n        t.contentId as treeNodeId, \n        t.treeId,\n        t.contentId,\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.status,\n        c.publishedAt,\n        c.hasUnpublishedChanges,\n        c.dataJson,\n        c.draftDataJson,\n        (SELECT COUNT(*) FROM node_assets WHERE nodeId = t.contentId) as assetCount\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(i), o = Array.isArray(a) ? a : a?.results || [], s = [], c = /* @__PURE__ */ new Set();
 		for (let e of o) {
 			let t = e.contentId;
 			c.has(t) || (c.add(t), s.push(e));
@@ -6733,16 +6766,19 @@ W.get("/tree.json", async (e) => {
 				return {
 					...o,
 					id: e.contentId,
-					treeNodeId: e.treeNodeId,
+					treeNodeId: e.contentId,
 					parentId: e.parentId || null,
 					language: e.language?.trim() || null,
 					hidden: +!!s,
 					isHidden: s,
 					status: e.status || "draft",
+					isDraft: e.status === "draft",
 					publishedAt: e.publishedAt || null,
 					hasUnpublishedChanges: c,
 					assetCount: e.assetCount || 0,
-					children: l(e.treeNodeId)
+					dataJson: e.dataJson ? typeof e.dataJson == "string" ? JSON.parse(e.dataJson) : e.dataJson : null,
+					draftDataJson: e.draftDataJson ? typeof e.draftDataJson == "string" ? JSON.parse(e.draftDataJson) : e.draftDataJson : null,
+					children: l(e.contentId)
 				};
 			}).filter((e) => r || !e.hidden);
 		}
@@ -6765,11 +6801,11 @@ W.get("/tree.json", async (e) => {
 			let r = _e(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 id \n", n.forEach(() => {
+				s += "parentId = CASE contentId \n", n.forEach(() => {
 					s += "WHEN ? THEN ? \n";
-				}), s += "ELSE parentId END, \n", s += "sortOrder = CASE id \n", n.forEach(() => {
+				}), s += "ELSE parentId END, \n", s += "sortOrder = CASE contentId \n", n.forEach(() => {
 					s += "WHEN ? THEN ? \n";
-				}), s += "ELSE sortOrder END \n", s += `WHERE id IN (${a}) AND treeId = ?`;
+				}), s += "ELSE sortOrder END \n", s += `WHERE contentId IN (${a}) AND treeId = ?`;
 				let c = [];
 				n.forEach((e) => {
 					c.push(e.id, e.parentId);
@@ -6830,18 +6866,21 @@ W.get("/tree.json", async (e) => {
         SELECT COALESCE(MAX(sortOrder), -1) + 1 as nextSort
         FROM tree_nodes
         WHERE treeId = ? AND ${p}
-      `).get(...v))?.nextSort ?? 0, b = await t.prepare("\n        INSERT INTO tree_nodes (treeId, contentId, parentId, sortOrder)\n        VALUES (?, ?, ?, ?)\n      ").run(o, f, g, y), x = Number(b.lastInsertRowid), S = [];
-			n.channels && Array.isArray(n.channels) ? S = n.channels : n.channelId && n.channelId !== "all" && (S = [n.channelId]);
-			let C = [...new Set(S)].filter((e) => e && e !== "all").map((e) => Number(e));
-			if (C.length > 0) {
-				let e = C.map(() => "(?, ?)").join(", "), n = C.flatMap((e) => [f, e]);
+      `).get(...v))?.nextSort ?? 0;
+			await t.prepare("\n        INSERT INTO tree_nodes (treeId, contentId, parentId, sortOrder)\n        VALUES (?, ?, ?, ?)\n      ").run(o, f, g, y);
+			let b = [];
+			n.channels && Array.isArray(n.channels) ? b = n.channels : n.channelId && n.channelId !== "all" && (b = [n.channelId]);
+			let x = [...new Set(b)].filter((e) => e && e !== "all").map((e) => Number(e));
+			if (x.length > 0) {
+				let e = x.map(() => "(?, ?)").join(", "), n = x.flatMap((e) => [f, e]);
 				await t.prepare(`INSERT OR IGNORE INTO node_channels (nodeId, channelId) VALUES ${e}`).run(...n);
 			}
 			return await i.clear(), e.json({
 				success: !0,
 				id: f,
-				treeNodeId: x,
-				status: "draft"
+				treeNodeId: f,
+				status: "draft",
+				isDraft: !0
 			}, 201);
 		}
 		if (s === "attach") {
@@ -6873,16 +6912,14 @@ W.get("/tree.json", async (e) => {
 					field: "slug"
 				}, 409);
 			}
-			await t.prepare("DELETE FROM tree_nodes WHERE treeId = ? AND contentId = ?").run(o, d);
-			let r = await t.prepare("\n        INSERT INTO tree_nodes (treeId, contentId, parentId, sortOrder)\n        VALUES (?, ?, ?, 0)\n      ").run(o, d, g), s = Number(r.lastInsertRowid);
-			return await i.clear(), a.purgeNode(e, t, d, !0), e.json({
+			return await t.prepare("DELETE FROM tree_nodes WHERE treeId = ? AND contentId = ?").run(o, d), await t.prepare("\n        INSERT INTO tree_nodes (treeId, contentId, parentId, sortOrder)\n        VALUES (?, ?, ?, 0)\n      ").run(o, d, g), await i.clear(), a.purgeNode(e, t, d, !0), e.json({
 				success: !0,
-				treeNodeId: s
+				treeNodeId: d
 			});
 		}
 		if (s === "detach") {
-			let r = n.treeNodeId || n.contentId;
-			return r ? (await t.prepare("\n        UPDATE tree_nodes \n        SET parentId = (SELECT parentId FROM tree_nodes WHERE (id = ? OR contentId = ?) AND treeId = ?) \n        WHERE parentId = ? AND treeId = ?\n      ").run(r, r, o, r, o), await t.prepare("DELETE FROM tree_nodes WHERE (id = ? OR contentId = ?) AND treeId = ?").run(r, r, o), await i.clear(), a.purgeNode(e, t, r, !0), e.json({ success: !0 })) : e.json({ error: "treeNodeId or contentId required for detach" }, 400);
+			let r = n.contentId || n.id || n.treeNodeId;
+			return r ? (await t.prepare("\n        UPDATE tree_nodes \n        SET parentId = (SELECT parentId FROM tree_nodes WHERE contentId = ? AND treeId = ?) \n        WHERE parentId = ? AND treeId = ?\n      ").run(r, o, r, o), await t.prepare("DELETE FROM tree_nodes WHERE contentId = ? AND treeId = ?").run(r, o), await i.clear(), a.purgeNode(e, t, r, !0), e.json({ success: !0 })) : e.json({ error: "contentId required for detach" }, 400);
 		}
 		return e.json({ error: "Invalid payload or action" }, 400);
 	} catch (t) {
@@ -7759,7 +7796,7 @@ X.get("/", async (e) => {
 			let e = await Z(t, "SELECT a.id, a.filename, a.isSystemVariant FROM node_assets na JOIN assets a ON na.assetId = a.id WHERE na.nodeId = ?", [Number(c)]);
 			if (e.length === 0) v.push("1 = 0");
 			else {
-				let t = e.map((e) => e.isSystemVariant ? `(a.id = '${e.id}' OR '${e.filename}' LIKE '%' || a.id || '%' OR '${e.filename}' LIKE 'crop_%' || REPLACE(REPLACE(REPLACE(a.filename, '.jpg', ''), '.png', ''), '.jpeg', '') || '%')` : `a.id = '${e.id}'`).join(" OR ");
+				let t = e.map((e) => e.isSystemVariant ? `(a.id = '${e.id}' OR a.id IN (SELECT parentAssetId FROM assets WHERE id = '${e.id}'))` : `a.id = '${e.id}'`).join(" OR ");
 				v.push(`(${t})`);
 			}
 		}
@@ -7770,9 +7807,24 @@ X.get("/", async (e) => {
 		n && n.trim() !== "" && (v.push("a.filename LIKE ?"), _.push(`%${n.trim()}%`)), r && r !== "all" && (r === "image" ? (v.push("a.mimeType LIKE ?"), _.push("image/%")) : r === "document" ? (v.push("(a.mimeType LIKE ? OR a.mimeType LIKE ? OR a.mimeType LIKE ?)"), _.push("application/pdf%", "application/msword%", "application/vnd%")) : r === "video" && (v.push("(a.mimeType LIKE ? OR a.mimeType LIKE ?)"), _.push("video/%", "audio/%")));
 		let y = `SELECT a.id, a.filename, a.mimeType, a.sizeBytes, a.cdnUrl, a.storageKeyPrivate, a.createdAt, a.updatedAt, a.deletedAt, a.dataJson FROM assets a ${` WHERE ${v.join(" AND ")}`} ORDER BY ${h} ${g} LIMIT ? OFFSET ?`;
 		_.push(p, m);
-		let b = await Z(t, y, _), x = b.map((e) => e.id), S = /* @__PURE__ */ new Map();
-		x.length > 0 && (await Z(t, `SELECT master.id AS assetId, COUNT(DISTINCT na.nodeId) AS count FROM assets master INNER JOIN node_assets na ON (na.assetId = master.id OR EXISTS (SELECT 1 FROM assets crop WHERE crop.id = na.assetId AND crop.isSystemVariant = 1 AND (crop.filename LIKE 'crop_%' || REPLACE(REPLACE(REPLACE(master.filename, '.jpg', ''), '.png', ''), '.jpeg', '') || '%' OR crop.filename LIKE '%' || master.id || '%'))) WHERE master.id IN (${x.map(() => "?").join(",")}) GROUP BY master.id`, x)).forEach((e) => S.set(String(e.assetId), e.count || 0));
-		let C = b.map((t) => {
+		let b = await Z(t, y, _), x = b.map((e) => e.id), S = /* @__PURE__ */ new Map(), C = /* @__PURE__ */ new Map();
+		if (x.length > 0) {
+			let e = x.map(() => "?").join(",");
+			(await Z(t, `
+        SELECT master.id AS assetId, COUNT(DISTINCT na.nodeId) AS count 
+        FROM assets master 
+        INNER JOIN node_assets na ON (
+          na.assetId = master.id OR 
+          EXISTS (SELECT 1 FROM assets crop WHERE crop.id = na.assetId AND crop.isSystemVariant = 1 AND crop.parentAssetId = master.id)
+        ) 
+        WHERE master.id IN (${e}) 
+        GROUP BY master.id`, x)).forEach((e) => S.set(String(e.assetId), e.count || 0)), (await Z(t, `
+        SELECT parentAssetId, COUNT(id) AS count 
+        FROM assets 
+        WHERE isSystemVariant = 1 AND parentAssetId IN (${e}) 
+        GROUP BY parentAssetId`, x)).forEach((e) => C.set(String(e.parentAssetId), e.count || 0));
+		}
+		let w = b.map((t) => {
 			let n = {
 				title: "",
 				alt: "",
@@ -7797,11 +7849,12 @@ X.get("/", async (e) => {
 				updatedAt: t.updatedAt,
 				deletedAt: t.deletedAt || null,
 				usageCount: S.get(String(t.id)) || 0,
+				variantCount: C.get(String(t.id)) || 0,
 				url: r,
 				originalUrl: r
 			};
 		});
-		return e.json(C);
+		return e.json(w);
 	} catch (t) {
 		return e.json({
 			error: "Failed to fetch assets",
@@ -7810,50 +7863,82 @@ 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.parentAssetId || r.parentAsset, s = typeof o == "string" && o.trim().length > 0 ? o.trim() : null;
-		s && (await Z(t, "SELECT id FROM assets WHERE id = ?", [s])).length === 0 && (s = null);
-		let c = r.cropCoordinates, u = null, d = null;
-		if (c) {
-			if (typeof c == "string") {
-				u = c;
+		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;
+		if (!i || !(i instanceof File)) return e.json({ error: "No file uploaded" }, 400);
+		let d = r.cropCoordinates, f = null, p = null;
+		if (d) {
+			if (typeof d == "string") {
+				f = d;
 				try {
-					d = JSON.parse(c);
+					p = JSON.parse(d);
 				} catch {}
-			} else u = JSON.stringify(c), d = c;
+			} else f = JSON.stringify(d), p = d;
 		}
-		if (!i || !(i instanceof File)) return e.json({ error: "No file uploaded" }, 400);
-		let f = crypto.randomUUID().replace(/-/g, "").slice(0, 12), p = `ast_${f}`, m = (/* @__PURE__ */ new Date()).toISOString().slice(0, 7).replace("-", "/"), h = a || i.name.startsWith("crop_"), g = h ? `kama/cache/${m}` : `kama/uploads/${m}`, _ = await n.upload(i, g), v = typeof _ == "string" ? _ : _?.key || _?.storageKeyPrivate || _?.storageKey || `${g}/${f}_${i.name}`;
-		if (!v) throw Error("Storage provider failed to return a valid storage key");
-		let y = e.env.CDN_DOMAIN, b = v.replace(/^\//, ""), x = y ? `https://${y}/media/${b}` : `/media/${b}`, S = i.type || "application/octet-stream", C = i.size || 0, w = e.get("userId"), T = typeof w == "string" && w.trim().length > 0 ? w : null;
-		T && (await Z(t, "SELECT id FROM users WHERE id = ?", [T])).length === 0 && (T = null);
-		let E = +!!h;
+		let m = crypto.randomUUID().replace(/-/g, "").slice(0, 12), h = (/* @__PURE__ */ new Date()).toISOString().slice(0, 7).replace("-", "/"), g = a || i.name.startsWith("crop_"), _ = g ? `kama/cache/${h}/${m}` : `kama/uploads/${h}/${m}`, v = await n.upload(i, _), y = typeof v == "string" ? v : v?.key || v?.storageKeyPrivate || v?.storageKey || `${_}/${m}_${i.name}`;
+		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);
+		if (s) {
+			let r = await Z(t, "SELECT storageKeyPrivate, isSystemVariant, parentAssetId FROM assets WHERE id = ?", [s]);
+			if (r.length > 0) {
+				let a = r[0];
+				if (await Q(t, "UPDATE assets SET filename = ?, mimeType = ?, sizeBytes = ?, storageKeyPrivate = ?, cdnUrl = ?, updatedAt = CURRENT_TIMESTAMP WHERE id = ?", [
+					i.name,
+					C,
+					w,
+					y,
+					S,
+					s
+				]), a.storageKeyPrivate) try {
+					await n.delete(a.storageKeyPrivate);
+				} catch (e) {
+					console.warn("Failed to cleanup old asset", e);
+				}
+				D.purgeAsset(e, t, s);
+				let o = `${S}?v=${Date.now()}`;
+				return e.json({
+					id: s,
+					url: o,
+					originalUrl: o,
+					parentAssetId: a.parentAssetId,
+					cropCoordinates: p,
+					filename: i.name,
+					mimeType: C,
+					usageCount: 0,
+					isSystemVariant: !!a.isSystemVariant,
+					replaced: !0
+				}, 200);
+			}
+		}
+		let O = `ast_${m}`, k = +!!g;
 		await Q(t, "INSERT INTO assets (id, filename, mimeType, sizeBytes, storageKeyPrivate, cdnUrl, createdById, isSystemVariant, parentAssetId, cropCoordinatesJson) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", [
-			p,
+			O,
 			i.name,
-			S,
 			C,
-			v,
-			x,
-			T,
+			w,
+			y,
+			S,
 			E,
-			s,
-			u
+			k,
+			u,
+			f
 		]);
-		let D = x;
-		if (s) {
-			let n = await Z(t, "SELECT cdnUrl, storageKeyPrivate FROM assets WHERE id = ?", [s]);
-			n.length > 0 && (D = Re(n[0].cdnUrl, n[0].storageKeyPrivate, y)), new V(e.env).purgeAsset(e, t, s);
+		let A = S;
+		if (u) {
+			let n = await Z(t, "SELECT cdnUrl, storageKeyPrivate FROM assets WHERE id = ?", [u]);
+			n.length > 0 && (A = Re(n[0].cdnUrl, n[0].storageKeyPrivate, b)), D.purgeAsset(e, t, u);
 		}
 		return e.json({
-			id: p,
-			url: x,
-			originalUrl: D,
-			parentAssetId: s,
-			cropCoordinates: d,
+			id: O,
+			url: S,
+			originalUrl: A,
+			parentAssetId: u,
+			cropCoordinates: p,
 			filename: i.name,
-			mimeType: S,
+			mimeType: C,
 			usageCount: 0,
-			isSystemVariant: !!E
+			isSystemVariant: !!k
 		}, 201);
 	} catch (t) {
 		return console.error("❌ [Asset Upload Crash Details]:", t), e.json({
@@ -7865,26 +7950,18 @@ X.get("/", async (e) => {
 	try {
 		let t = l(e), n = e.req.param("id"), r = await Z(t, "SELECT * FROM assets WHERE id = ?", [n]);
 		if (!r || r.length === 0) return e.json({ error: "Asset not found" }, 404);
-		let i = r[0], a = i.filename ? i.filename.replace(/\.[^/.]+$/, "") : "", o = await Z(t, "SELECT DISTINCT cn.id, cn.title, cn.contentType, cn.slug, na.fieldKey, na.assetId FROM node_assets na INNER JOIN content_nodes cn ON na.nodeId = cn.id LEFT JOIN assets crop ON na.assetId = crop.id WHERE na.assetId = ? OR (crop.isSystemVariant = 1 AND (crop.filename LIKE ? OR crop.filename LIKE ?))", [
-			n,
-			`crop_%${a}%`,
-			`%${n}%`
-		]), s = await Z(t, "SELECT id, filename, mimeType, sizeBytes, cdnUrl, storageKeyPrivate, parentAssetId, cropCoordinatesJson, createdAt FROM assets WHERE isSystemVariant = 1 AND (parentAssetId = ? OR filename LIKE ? OR filename LIKE ?) ORDER BY createdAt DESC", [
-			n,
-			`crop_%${a}%`,
-			`%${n}%`
-		]), c = {
+		let i = r[0], a = await Z(t, "\n      SELECT DISTINCT cn.id, cn.title, cn.contentType, cn.slug, na.fieldKey, na.assetId \n      FROM node_assets na \n      INNER JOIN content_nodes cn ON na.nodeId = cn.id \n      LEFT JOIN assets crop ON na.assetId = crop.id \n      WHERE na.assetId = ? OR (crop.isSystemVariant = 1 AND crop.parentAssetId = ?)\n    ", [n, n]), o = await Z(t, "\n      SELECT id, filename, mimeType, sizeBytes, cdnUrl, storageKeyPrivate, parentAssetId, cropCoordinatesJson, createdAt, updatedAt \n      FROM assets \n      WHERE isSystemVariant = 1 AND parentAssetId = ? \n      ORDER BY createdAt DESC\n    ", [n]), s = {
 			title: "",
 			alt: "",
 			description: ""
 		};
 		try {
-			c = {
-				...c,
+			s = {
+				...s,
 				...JSON.parse(i.dataJson || "{}")
 			};
 		} catch {}
-		let u = Re(i.cdnUrl, i.storageKeyPrivate, e.env?.CDN_DOMAIN);
+		let c = i.updatedAt ? new Date(i.updatedAt).getTime() : Date.now(), u = `${Re(i.cdnUrl, i.storageKeyPrivate, e.env?.CDN_DOMAIN)}?v=${c}`;
 		return e.json({
 			id: i.id,
 			filename: i.filename,
@@ -7892,17 +7969,18 @@ X.get("/", async (e) => {
 			sizeBytes: i.sizeBytes,
 			createdAt: i.createdAt,
 			updatedAt: i.updatedAt,
-			title: c.title || "",
-			alt: c.alt || "",
-			description: c.description || "",
+			title: s.title || "",
+			alt: s.alt || "",
+			description: s.description || "",
 			url: u,
 			originalUrl: u,
-			connectedNodes: o,
-			variants: s.map((t) => {
+			connectedNodes: a,
+			variants: o.map((t) => {
 				let n = null;
 				if (t.cropCoordinatesJson) try {
 					n = JSON.parse(t.cropCoordinatesJson);
 				} catch {}
+				let r = t.updatedAt ? new Date(t.updatedAt).getTime() : c, a = Re(t.cdnUrl, t.storageKeyPrivate, e.env?.CDN_DOMAIN);
 				return {
 					id: t.id,
 					filename: t.filename,
@@ -7911,7 +7989,7 @@ X.get("/", async (e) => {
 					createdAt: t.createdAt,
 					parentAssetId: t.parentAssetId || i.id,
 					cropCoordinates: n,
-					url: Re(t.cdnUrl, t.storageKeyPrivate, e.env?.CDN_DOMAIN),
+					url: `${a}?v=${r}`,
 					originalUrl: u
 				};
 			})
@@ -7938,12 +8016,7 @@ X.get("/", async (e) => {
 }), 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 parentAssetId = ? OR (isSystemVariant = 1 AND (filename LIKE ? OR filename LIKE ?))", [
-			n,
-			n,
-			`crop_%${r.filename ? r.filename.replace(/\.[^/.]+$/, "") : ""}%`,
-			`%${n}%`
-		]), e.json({
+		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({
 			success: !0,
 			id: n,
 			trashed: !0
@@ -7957,18 +8030,11 @@ X.get("/", async (e) => {
 }), X.post("/restore", async (e) => {
 	try {
 		let t = l(e), n = await e.req.json(), r = n.id || n.assetId;
-		if (!r) return e.json({ error: "Asset ID required" }, 400);
-		let i = (await Z(t, "SELECT id, filename FROM assets WHERE id = ?", [r]))[0];
-		return i ? (await Q(t, "UPDATE assets SET deletedAt = NULL WHERE id = ? OR parentAssetId = ? OR (isSystemVariant = 1 AND (filename LIKE ? OR filename LIKE ?))", [
-			r,
-			r,
-			`crop_%${i.filename ? i.filename.replace(/\.[^/.]+$/, "") : ""}%`,
-			`%${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 V(e.env).purgeAsset(e, t, r), e.json({
 			success: !0,
 			id: r,
 			restored: !0
-		})) : e.json({ error: "Asset not found" }, 404);
+		})) : e.json({ error: "Asset not found" }, 404) : e.json({ error: "Asset ID required" }, 400);
 	} catch (t) {
 		return e.json({
 			error: "Failed to restore asset",
@@ -7981,11 +8047,7 @@ X.get("/", async (e) => {
 		if (!i) return e.json({ error: "Asset not found" }, 404);
 		new V(e.env).purgeAsset(e, t, r);
 		let a = [i];
-		i.isSystemVariant || (a = [i, ...await Z(t, "SELECT id, storageKeyPrivate FROM assets WHERE parentAssetId = ? OR (isSystemVariant = 1 AND (filename LIKE ? OR filename LIKE ?))", [
-			r,
-			`crop_%${i.filename ? i.filename.replace(/\.[^/.]+$/, "") : ""}%`,
-			`%${r}%`
-		])]);
+		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);
 		if (typeof n.delete == "function") {
 			for (let e of a) if (e.storageKeyPrivate) try {
@@ -8066,47 +8128,47 @@ async function Ue(e, t, n, r) {
 		}
 	}));
 }
-async function We(e, t, n, r, i = !1, a) {
+async function We(e, t, n, r, i, a = !1, o) {
 	if (!t) return { blocks: [] };
-	let o = await e.prepare("\n    WITH RECURSIVE ancestor_path(id, contentId, title, slug, parentId, level) AS (\n      SELECT t.id, t.contentId, c.title, c.slug, t.parentId, 0 FROM tree_nodes t INNER JOIN content_nodes c ON t.contentId = c.id WHERE t.id = ? OR c.id = ?\n      UNION ALL\n      SELECT t.id, 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.id = ap.parentId\n    )\n    SELECT * FROM ancestor_path ORDER BY level ASC\n  ").all(t, t), s = Array.isArray(o) ? o : o?.results || [];
-	if (!s || s.length === 0) return { blocks: [] };
-	let c = s.map((e) => e.contentId).filter((e) => e != null);
-	if (c.length === 0) return { blocks: [] };
-	let l = c.map(() => "?").join(","), u = +!!i, d = await e.prepare(`SELECT * FROM content_blocks WHERE contentId IN (${l}) AND isDraft = ? ORDER BY contentId ASC, sortOrder ASC`).all(...c, u), f = Array.isArray(d) ? d : d?.results || [], p = /* @__PURE__ */ new Map();
-	f.forEach((e) => {
+	let s = 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), c = Array.isArray(s) ? s : s?.results || [];
+	if (!c || c.length === 0) return { blocks: [] };
+	let l = c.map((e) => e.contentId).filter((e) => e != null);
+	if (l.length === 0) return { blocks: [] };
+	let u = l.map(() => "?").join(","), d = +!!a, f = await e.prepare(`SELECT * FROM content_blocks WHERE contentId IN (${u}) AND isDraft = ? ORDER BY contentId ASC, sortOrder ASC`).all(...l, d), p = Array.isArray(f) ? f : f?.results || [], m = /* @__PURE__ */ new Map();
+	p.forEach((e) => {
 		let t = String(e.contentId);
-		p.has(t) || p.set(t, []), p.get(t).push(e);
+		m.has(t) || m.set(t, []), m.get(t).push(e);
 	});
-	for (let t of s) {
-		let a = p.get(String(t.contentId)) || [];
-		if (a.filter((e) => e.region === n).length === 0) continue;
-		let o = /* @__PURE__ */ new Set([n]), s = !0;
+	for (let t of c) {
+		let n = m.get(String(t.contentId)) || [];
+		if (n.filter((e) => e.region === r).length === 0) continue;
+		let o = /* @__PURE__ */ new Set([r]), s = !0;
 		for (; s;) {
 			s = !1;
-			for (let e of a) {
+			for (let e of n) {
 				if (!o.has(e.region)) continue;
 				let t = {};
 				try {
 					t = (typeof e.dataJson == "string" ? JSON.parse(e.dataJson) : e.dataJson) || {};
 				} catch {}
-				let n = String(e.id), r = String(t.blockId || t._instanceId || t.id || e.blockId);
-				for (let e of a) {
+				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;
 					let t = e.region;
-					(t.startsWith(`${n}-`) || t.startsWith(`${n}_`) || r && r !== "undefined" && r !== "null" && (t.startsWith(`${r}-`) || t.startsWith(`${r}_`) || t.startsWith(r))) && (o.add(t), s = !0);
+					(t.startsWith(`${r}-`) || t.startsWith(`${r}_`) || i && i !== "undefined" && i !== "null" && (t.startsWith(`${i}-`) || t.startsWith(`${i}_`) || t.startsWith(i))) && (o.add(t), s = !0);
 				}
 			}
 		}
-		let c = await Promise.all(a.filter((e) => o.has(e.region)).map(async (t) => {
-			let a = {};
+		let c = await Promise.all(n.filter((e) => o.has(e.region)).map(async (t) => {
+			let n = {};
 			try {
-				a = (typeof t.dataJson == "string" ? JSON.parse(t.dataJson) : t.dataJson) || {};
+				n = (typeof t.dataJson == "string" ? JSON.parse(t.dataJson) : t.dataJson) || {};
 			} catch {}
-			let o = a.hidden === !0 || a.hidden === 1 || a.hidden === "1" || a.hidden === "true", s = He(a.startShowingAt, a.stopShowingAt);
-			if (!i && (o || !s)) return null;
-			let c = t.elementType || t.componentId || "text-block", l = r.blocks?.[c]?.fields || r.elements?.[c]?.fields || r.components?.[c]?.fields || {}, u = String(a.blockId || a._instanceId || a.id || t.blockId || t.id), d = Ge(a, l);
+			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, {
-				region: t.region || n,
+				region: t.region || r,
 				block: {
 					instanceId: t.id,
 					blockId: u,
@@ -8116,8 +8178,8 @@ async function We(e, t, n, r, i = !1, a) {
 			};
 		})), l = {};
 		for (let e of c) e && (l[e.region] || (l[e.region] = []), l[e.region].push(e.block));
-		if (l[n] && l[n].length > 0) return {
-			blocks: l[n],
+		if (l[r] && l[r].length > 0) return {
+			blocks: l[r],
 			subRegions: l,
 			inheritedFromId: String(t.contentId),
 			inheritedFromTitle: t.title || t.slug
@@ -8233,7 +8295,7 @@ async function Je(e, t, n) {
 async function Ye(e, t, n, r) {
 	let i = Ve(t, n), a = r.treeEdges.get(i);
 	if (a) return a;
-	let o = e.prepare("SELECT id as treeNodeId FROM tree_nodes WHERE contentId = ? AND treeId = ? LIMIT 1").get(t, n);
+	let o = e.prepare("SELECT contentId as treeNodeId FROM tree_nodes WHERE contentId = ? AND treeId = ? LIMIT 1").get(t, n);
 	return r.treeEdges.set(i, Promise.resolve(o)), o;
 }
 async function Xe(e, t, n) {
@@ -8293,7 +8355,7 @@ async function $e(e, t, n, r) {
 		if (e) return e;
 	}
 	let a = (async () => {
-		let r = await e.prepare("\n      WITH RECURSIVE ancestor_path(id, parentId, slug, level) AS (\n        SELECT t.id, t.parentId, c.slug, 0 FROM tree_nodes t INNER JOIN content_nodes c ON t.contentId = c.id WHERE t.id = ? AND t.treeId = ?\n        UNION ALL\n        SELECT t.id, t.parentId, c.slug, ap.level + 1 FROM tree_nodes t INNER JOIN content_nodes c ON t.contentId = c.id INNER JOIN ancestor_path ap ON t.id = ap.parentId WHERE t.treeId = ?\n      )\n      SELECT slug FROM ancestor_path ORDER BY level DESC\n    ").all(t, n, n), i = Array.isArray(r) ? r : r?.results || [], a = [];
+		let r = await e.prepare("\n      WITH RECURSIVE ancestor_path(contentId, parentId, slug, level) AS (\n        SELECT t.contentId, t.parentId, c.slug, 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, t.parentId, c.slug, 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 slug FROM ancestor_path ORDER BY level DESC\n    ").all(t, n, n), i = Array.isArray(r) ? r : r?.results || [], a = [];
 		for (let e of i) {
 			let t = (e.slug || "").replace(/^\/+|\/+$/g, "");
 			t === "home" || t === "homee" ? i.length === 1 && (a.length = 0) : t && a.push(t);
@@ -8305,7 +8367,7 @@ async function $e(e, t, n, r) {
 async function et(e, t, n, r, i) {
 	let a = {}, o = null;
 	if (t) {
-		let n = await e.prepare("\n      WITH RECURSIVE ancestor_path(id, contentId, title, slug, parentId, level) AS (\n        SELECT t.id, t.contentId, c.title, c.slug, t.parentId, 0 FROM tree_nodes t INNER JOIN content_nodes c ON t.contentId = c.id WHERE t.id = ? OR c.id = ?\n        UNION ALL\n        SELECT t.id, 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.id = ap.parentId\n      )\n      SELECT c.dataJson, c.draftDataJson FROM ancestor_path ap INNER JOIN content_nodes c ON ap.contentId = c.id ORDER BY ap.level ASC\n    ").all(t, t), i = Array.isArray(n) ? n : n?.results || [], s = /* @__PURE__ */ new Set([
+		let i = 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 c.dataJson, c.draftDataJson FROM ancestor_path ap INNER JOIN content_nodes c ON ap.contentId = c.id ORDER BY ap.level ASC\n    ").all(t, n, n), s = Array.isArray(i) ? i : i?.results || [], c = /* @__PURE__ */ new Set([
 			"subpageLayoutId",
 			"layoutId",
 			"slug",
@@ -8319,12 +8381,12 @@ async function et(e, t, n, r, i) {
 			"hidden",
 			"status"
 		]);
-		for (let e of i) {
+		for (let e of s) {
 			let t = r && e.draftDataJson || e.dataJson;
 			if (t) try {
 				let e = typeof t == "string" ? JSON.parse(t) : t;
 				!o && e.subpageLayoutId && e.subpageLayoutId !== "inherit" && (o = e.subpageLayoutId);
-				for (let [t, n] of Object.entries(e)) n != null && n !== "" && n !== "inherit" && !s.has(t) && !t.startsWith("_") && a[t] === void 0 && (a[t] = n);
+				for (let [t, n] of Object.entries(e)) n != null && n !== "" && n !== "inherit" && !c.has(t) && !t.startsWith("_") && a[t] === void 0 && (a[t] = n);
 			} catch {}
 		}
 	}
@@ -8358,7 +8420,7 @@ ze.get("/*", async (e) => {
 		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 = `
-      SELECT cn.*, tn.id as treeNodeId, tn.parentId, tn.treeId FROM content_nodes cn
+      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 = ?"}
@@ -8379,7 +8441,7 @@ ze.get("/*", async (e) => {
 		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 id as treeNodeId, treeId, parentId FROM tree_nodes WHERE contentId = ? ${_ ? "AND treeId = ?" : ""} LIMIT 1`).get(...e);
+			g = await t.prepare(`SELECT contentId as treeNodeId, treeId, parentId FROM tree_nodes WHERE contentId = ? ${_ ? "AND treeId = ?" : ""} LIMIT 1`).get(...e);
 		}
 		let T = g?.treeId || _ || "main-nav", E = null;
 		if (T) {
@@ -8430,7 +8492,7 @@ ze.get("/*", async (e) => {
 		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.id 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;
+			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) => {
 				let t = {}, n = s && e.draftDataJson || e.dataJson;
 				if (!n) return null;
@@ -8483,7 +8545,7 @@ ze.get("/*", async (e) => {
 		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, e, p, s, n);
+				let r = await We(t, N, String(T), e, p, s, n);
 				if (r.blocks.length > 0 && (G[e] = r.blocks, ve[e] = {
 					isInherited: !0,
 					inheritedFromId: r.inheritedFromId,
@@ -8567,7 +8629,7 @@ rt.get("/:treeParam", async (e) => {
 		}
 		let g = [];
 		if (m !== null) {
-			let e = await t.prepare("\n          SELECT \n            t.id 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.status,\n            c.dataJson,\n            c.draftDataJson\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(m);
+			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.status,\n            c.dataJson,\n            c.draftDataJson\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(m);
 			g = Array.isArray(e) ? e : e?.results || [];
 		}
 		if ((!g || g.length === 0) && !c) return e.json({ error: `Tree '${n}' not found` }, 404);
@@ -8578,7 +8640,7 @@ rt.get("/:treeParam", async (e) => {
 		}
 		let v = /* @__PURE__ */ new Map();
 		for (let e of g) {
-			let t = String(e.treeNodeId), n = a && e.draftDataJson ? e.draftDataJson : e.dataJson;
+			let t = String(e.id), n = a && e.draftDataJson ? e.draftDataJson : e.dataJson;
 			if (!n) {
 				v.set(t, {});
 				continue;
@@ -8593,11 +8655,11 @@ rt.get("/:treeParam", async (e) => {
 		function y(e = null, t = "") {
 			let n = e == null || e === "" || e === "null" ? "__ROOT__" : String(e);
 			return (_.get(n) || []).map((e) => {
-				let n = v.get(String(e.treeNodeId)) || {}, r = {};
+				let n = v.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 = !a && (e.status === "draft" || e.status === "new"), o = Number(e.isHidden) === 1 || i || n.hidden === !0 || n.hidden === 1 || n.hidden === "1" || n.hidden === "true", s = it(n.startShowingAt, n.stopShowingAt), c = (e.slug || "").replace(/^\/+|\/+$/g, ""), l = (!e.parentId || e.parentId === "null" || e.parentId === "") && (c === "home" || c === "homee") ? "/" : `${t}/${c}`.replace(/\/+/g, "/"), d = e.language && String(e.language).trim() !== "" ? e.language.trim() : u, f = {
 					id: e.id,
-					treeNodeId: e.treeNodeId,
+					treeNodeId: e.id,
 					parentId: e.parentId || null,
 					title: e.title,
 					slug: c,
@@ -8609,7 +8671,7 @@ rt.get("/:treeParam", async (e) => {
 				};
 				e.nodeType === "external-link" && (r.url && (f.url = r.url), r.target && (f.target = r.target));
 				let p = l === "/" ? "" : l;
-				return f.children = y(e.treeNodeId, p), f;
+				return f.children = y(e.id, p), f;
 			}).filter((e) => a || !e.hidden);
 		}
 		let b = {