@brightsideoy/kama 0.1.0-alpha.149 → 0.1.0-alpha.151

package/dist/{dist-a3ACJkRE.js → dist-DvbQty0F.js}

@@ -3801,6 +3801,7 @@ var u = /* @__PURE__ */ o({
 				label: "HTML",
 				type: "textarea",
 				public: !0,
+				editor: !1,
 				rules: {}
 			} },
 			tabs: { access: {
@@ -4815,7 +4816,7 @@ var u = /* @__PURE__ */ o({
 	channels: "\n    id INTEGER PRIMARY KEY AUTOINCREMENT,\n    key TEXT UNIQUE NOT NULL,\n    label TEXT NOT NULL,\n    channelType TEXT,\n    domain TEXT,\n    baseUrl TEXT,\n    defaultLanguage TEXT DEFAULT 'en',\n    isHidden INTEGER NOT NULL DEFAULT 0,\n    dataJson TEXT,\n    createdById TEXT,\n    updatedById TEXT,\n    createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n    updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n    FOREIGN KEY (createdById) REFERENCES users(id) ON DELETE SET NULL,\n    FOREIGN KEY (updatedById) REFERENCES users(id) ON DELETE SET NULL\n  ",
 	trees: "\n    id INTEGER PRIMARY KEY AUTOINCREMENT,\n    key TEXT UNIQUE NOT NULL,\n    label TEXT NOT NULL,\n    treeType TEXT,\n    channelId INTEGER,\n    isHidden INTEGER NOT NULL DEFAULT 0,\n    dataJson TEXT,\n    createdById TEXT,\n    updatedById TEXT,\n    createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n    updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n    FOREIGN KEY (channelId) REFERENCES channels(id) ON DELETE SET NULL,\n    FOREIGN KEY (createdById) REFERENCES users(id) ON DELETE SET NULL,\n    FOREIGN KEY (updatedById) REFERENCES users(id) ON DELETE SET NULL\n  ",
 	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 DEFAULT 'en',\n    isHidden INTEGER NOT NULL DEFAULT 0,\n    status TEXT DEFAULT 'draft',\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  ",
+	content_nodes: "\n    id INTEGER PRIMARY KEY AUTOINCREMENT,\n    contentType TEXT NOT NULL,\n    title TEXT NOT NULL,\n    slug TEXT,\n    language TEXT DEFAULT 'en',\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  ",
 	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  ",
@@ -4846,9 +4847,14 @@ async function _(e, t) {
 	for (let [t] of Object.entries(p)) {
 		let n = await g(e, t);
 		if (n.size > 0) {
-			if (t === "content_nodes" && !n.has("disabledRegionsJson")) try {
-				await e.prepare("ALTER TABLE \"content_nodes\" ADD COLUMN disabledRegionsJson TEXT DEFAULT '{}';").run();
-			} catch {}
+			if (t === "content_nodes") {
+				if (!n.has("disabledRegionsJson")) try {
+					await e.prepare("ALTER TABLE \"content_nodes\" ADD COLUMN disabledRegionsJson TEXT DEFAULT '{}';").run();
+				} catch {}
+				if (!n.has("hasUnpublishedChanges")) try {
+					await e.prepare("ALTER TABLE \"content_nodes\" ADD COLUMN hasUnpublishedChanges INTEGER DEFAULT 0;").run();
+				} catch {}
+			}
 			if (t === "assets") {
 				if (!n.has("parentAssetId")) try {
 					await e.prepare("ALTER TABLE \"assets\" ADD COLUMN parentAssetId TEXT REFERENCES assets(id) ON DELETE SET NULL;").run();
@@ -6252,7 +6258,7 @@ V.get("/", async (e) => {
 		if (isNaN(r)) return e.json({ error: "Invalid Node ID" }, 400);
 		let i = await t.prepare("SELECT * FROM content_nodes WHERE id = ?").get(r);
 		if (!i) return e.json({ error: "Node not found" }, 404);
-		let a = (i.status === "draft" || !i.status) && !!i.publishedAt, o = {
+		let a = i.status === "draft" || !!i.hasUnpublishedChanges, o = {
 			id: i.id,
 			title: i.title,
 			slug: i.slug,
@@ -6364,7 +6370,7 @@ V.get("/", async (e) => {
 		});
 	}
 	let O = await Promise.all(w.map(async (e) => {
-		let n = (e.status === "draft" || !e.status) && !!e.publishedAt, r = {
+		let n = e.status === "draft" || !!e.hasUnpublishedChanges, r = {
 			id: e.id,
 			title: e.title,
 			slug: e.slug,
@@ -6400,37 +6406,33 @@ V.get("/", async (e) => {
 }), V.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 } = ae(H(_)), b = fe(d === void 0 ? f === void 0 ? p : f : d), x = c || "en", S = l || u || "page", C = e.get("user")?.id || null, w = a, T = /* @__PURE__ */ new Set(), E = s === void 0 ? null : de(s);
 	if (E) {
-		let n = !1, r = [];
-		if (g !== void 0 && Array.isArray(g) && g.length > 0) for (let e of g) r.push({
+		let n = [];
+		if (g !== void 0 && Array.isArray(g) && g.length > 0) for (let e of g) n.push({
 			treeId: Number(e.treeId),
 			parentId: pe(e.parentId ?? e._draftParentId ?? null)
 		});
 		else if (a) {
-			let e = await t.prepare("SELECT treeId, parentId FROM tree_nodes WHERE contentId = ?").all(a), n = Array.isArray(e) ? e : e?.results || [];
-			for (let e of n) r.push({
+			let e = await t.prepare("SELECT treeId, parentId FROM tree_nodes WHERE contentId = ?").all(a), r = Array.isArray(e) ? e : e?.results || [];
+			for (let e of r) n.push({
 				treeId: Number(e.treeId),
 				parentId: e.parentId === null ? null : Number(e.parentId)
 			});
 		}
-		for (let e of r) {
-			let r = e.parentId === null ? "tn.parentId IS NULL" : "tn.parentId = ?", i = e.parentId === null ? [e.treeId, E] : [
-				e.treeId,
-				e.parentId,
+		for (let r of n) {
+			let n = r.parentId === null ? "tn.parentId IS NULL" : "tn.parentId = ?", i = r.parentId === null ? [r.treeId, E] : [
+				r.treeId,
+				r.parentId,
 				E
 			], o = `
         SELECT cn.id FROM tree_nodes tn
         INNER JOIN content_nodes cn ON tn.contentId = cn.id
-        WHERE tn.treeId = ? AND ${r} AND cn.slug = ? AND (cn.deletedAt IS NULL OR cn.deletedAt = '')
+        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)) {
-				n = !0;
-				break;
-			}
+			if (a && (o += " AND cn.id != ?", i.push(a)), o += " LIMIT 1", await t.prepare(o).get(...i)) return e.json({
+				error: `The slug '${E}' is already in use by another page in this section.`,
+				field: "slug"
+			}, 409);
 		}
-		if (n) return e.json({
-			error: `The slug '${E}' 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, draftDataJson, dataJson, publishedAt, status FROM content_nodes WHERE id = ?").get(a), n = e?.draftDataJson || e?.dataJson || "{}";
@@ -6452,10 +6454,10 @@ V.get("/", async (e) => {
 		let d = JSON.stringify({
 			...u,
 			...v
-		}), f = e?.status === "published" || e?.publishedAt ? "published" : "draft";
-		await t.prepare("\n      UPDATE content_nodes \n      SET title = ?, slug = ?, language = ?, contentType = ?, isHidden = ?, status = ?, draftDataJson = ?, updatedById = ?, updatedAt = CURRENT_TIMESTAMP\n      WHERE id = ?\n    ").run(r, i, c, s, b, f, d, C, a);
+		}), f = e?.status === "published" || e?.publishedAt ? "published" : "draft", p = +(f === "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, c, s, b, f, d, p, C, a);
 	} else {
-		let e = await t.prepare("\n      INSERT INTO content_nodes (contentType, title, slug, language, isHidden, status, draftDataJson, dataJson, createdById, updatedById)\n      VALUES (?, ?, ?, ?, ?, 'draft', ?, NULL, ?, ?)\n    ").run(S, o || "Untitled", E, x, b, JSON.stringify(v), C, C);
+		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(S, o || "Untitled", E, x, b, JSON.stringify(v), C, C);
 		w = Number(e.lastInsertRowid);
 	}
 	if (h !== void 0 && Array.isArray(h) && w) {
@@ -6518,7 +6520,7 @@ V.get("/", async (e) => {
 		c = typeof o.draftDataJson == "string" ? JSON.parse(o.draftDataJson) : o.draftDataJson || {};
 	} catch {}
 	let l = (s.title ?? o.title ?? "").trim(), u = (c.title ?? n.title ?? o.title ?? "").trim(), d = (s.slug ?? o.slug ?? "").trim(), f = (c.slug ?? n.slug ?? o.slug ?? "").trim(), p = l !== "" && u !== "" && l !== u || d !== "" && f !== "" && d !== f, m = o.draftDataJson || o.dataJson || "{}";
-	await t.prepare("\n    UPDATE content_nodes\n    SET publishedDataJson = ?, dataJson = ?, publishedAt = CURRENT_TIMESTAMP, status = 'published', updatedById = ?, updatedAt = CURRENT_TIMESTAMP\n    WHERE id = ?\n  ").run(m, m, a, i), await t.prepare("DELETE FROM content_blocks WHERE contentId = ? AND isDraft = 0").run(i);
+	await t.prepare("\n    UPDATE content_nodes\n    SET publishedDataJson = ?, dataJson = ?, publishedAt = CURRENT_TIMESTAMP, status = 'published', hasUnpublishedChanges = 0, updatedById = ?, updatedAt = CURRENT_TIMESTAMP\n    WHERE id = ?\n  ").run(m, m, a, i), await t.prepare("DELETE FROM content_blocks WHERE contentId = ? AND isDraft = 0").run(i);
 	let h = await t.prepare("SELECT * FROM content_blocks WHERE contentId = ? AND isDraft = 1 ORDER BY sortOrder ASC").all(i), g = Array.isArray(h) ? h : h?.results || [];
 	if (g.length > 0) {
 		let e = [], n = [];
@@ -6542,7 +6544,8 @@ V.get("/", async (e) => {
 		id: i,
 		status: "published",
 		version: _,
-		publishedAt: v.publishedAt
+		publishedAt: v.publishedAt,
+		hasUnpublishedChanges: !1
 	});
 }), V.delete("/", async (e) => {
 	let t = e.get("db"), n = e.req.query("id");
@@ -6601,7 +6604,7 @@ V.get("/", async (e) => {
 	} catch {
 		return e.json({ error: "Corrupt snapshot data" }, 500);
 	}
-	if (await t.prepare("\n    UPDATE content_nodes\n    SET draftDataJson = ?, title = ?, slug = ?, updatedById = ?, updatedAt = CURRENT_TIMESTAMP, status = 'draft'\n    WHERE id = ?\n  ").run(o.node?.dataJson || "{}", o.node?.title || "Restored Document", o.node?.slug || null, i, n), await t.prepare("DELETE FROM content_blocks WHERE contentId = ? AND isDraft = 1").run(n), o.blocks && Array.isArray(o.blocks) && o.blocks.length > 0) {
+	if (await t.prepare("\n    UPDATE content_nodes\n    SET draftDataJson = ?, title = ?, slug = ?, updatedById = ?, updatedAt = CURRENT_TIMESTAMP, status = 'draft', hasUnpublishedChanges = 1\n    WHERE id = ?\n  ").run(o.node?.dataJson || "{}", o.node?.title || "Restored Document", o.node?.slug || null, i, n), await t.prepare("DELETE FROM content_blocks WHERE contentId = ? AND isDraft = 1").run(n), o.blocks && Array.isArray(o.blocks) && o.blocks.length > 0) {
 		let e = [], r = [];
 		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);
@@ -6647,7 +6650,7 @@ G.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.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.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();
 		for (let e of o) {
 			let t = e.contentId;
 			c.has(t) || (c.add(t), s.push(e));
@@ -6665,7 +6668,7 @@ G.get("/tree.json", async (e) => {
 				let { dataJson: r, draftDataJson: i, ...a } = e, o = {
 					...a,
 					...t
-				}, s = Number(e.isHidden) === 1 || o.hidden === !0 || o.hidden === 1 || o.hidden === "true", c = (e.status === "draft" || !e.status) && !!e.publishedAt;
+				}, s = Number(e.isHidden) === 1 || o.hidden === !0 || o.hidden === 1 || o.hidden === "true", c = e.status === "draft" || !!e.hasUnpublishedChanges;
 				return {
 					...o,
 					id: e.contentId,

package/dist/index.html

@@ -4,8 +4,10 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>KAMA</title>
-    <script type="module" crossorigin src="/assets/index-ckG1oyv-.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-BSBvGvQz.css">
+    <link rel="icon" href="/favicon.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="/favicon.png">
+    <script type="module" crossorigin src="/assets/index-DknACOqv.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-BJ80E0Sz.css">
   </head>
   <body>
     <div id="app"></div>

package/dist/index.js

@@ -3803,6 +3803,7 @@ var u = /* @__PURE__ */ o({
 				label: "HTML",
 				type: "textarea",
 				public: !0,
+				editor: !1,
 				rules: {}
 			} },
 			tabs: { access: {
@@ -4817,7 +4818,7 @@ var u = /* @__PURE__ */ o({
 	channels: "\n    id INTEGER PRIMARY KEY AUTOINCREMENT,\n    key TEXT UNIQUE NOT NULL,\n    label TEXT NOT NULL,\n    channelType TEXT,\n    domain TEXT,\n    baseUrl TEXT,\n    defaultLanguage TEXT DEFAULT 'en',\n    isHidden INTEGER NOT NULL DEFAULT 0,\n    dataJson TEXT,\n    createdById TEXT,\n    updatedById TEXT,\n    createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n    updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n    FOREIGN KEY (createdById) REFERENCES users(id) ON DELETE SET NULL,\n    FOREIGN KEY (updatedById) REFERENCES users(id) ON DELETE SET NULL\n  ",
 	trees: "\n    id INTEGER PRIMARY KEY AUTOINCREMENT,\n    key TEXT UNIQUE NOT NULL,\n    label TEXT NOT NULL,\n    treeType TEXT,\n    channelId INTEGER,\n    isHidden INTEGER NOT NULL DEFAULT 0,\n    dataJson TEXT,\n    createdById TEXT,\n    updatedById TEXT,\n    createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n    updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n    FOREIGN KEY (channelId) REFERENCES channels(id) ON DELETE SET NULL,\n    FOREIGN KEY (createdById) REFERENCES users(id) ON DELETE SET NULL,\n    FOREIGN KEY (updatedById) REFERENCES users(id) ON DELETE SET NULL\n  ",
 	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 DEFAULT 'en',\n    isHidden INTEGER NOT NULL DEFAULT 0,\n    status TEXT DEFAULT 'draft',\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  ",
+	content_nodes: "\n    id INTEGER PRIMARY KEY AUTOINCREMENT,\n    contentType TEXT NOT NULL,\n    title TEXT NOT NULL,\n    slug TEXT,\n    language TEXT DEFAULT 'en',\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  ",
 	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  ",
@@ -4848,9 +4849,14 @@ async function _(e, t) {
 	for (let [t] of Object.entries(p)) {
 		let n = await g(e, t);
 		if (n.size > 0) {
-			if (t === "content_nodes" && !n.has("disabledRegionsJson")) try {
-				await e.prepare("ALTER TABLE \"content_nodes\" ADD COLUMN disabledRegionsJson TEXT DEFAULT '{}';").run();
-			} catch {}
+			if (t === "content_nodes") {
+				if (!n.has("disabledRegionsJson")) try {
+					await e.prepare("ALTER TABLE \"content_nodes\" ADD COLUMN disabledRegionsJson TEXT DEFAULT '{}';").run();
+				} catch {}
+				if (!n.has("hasUnpublishedChanges")) try {
+					await e.prepare("ALTER TABLE \"content_nodes\" ADD COLUMN hasUnpublishedChanges INTEGER DEFAULT 0;").run();
+				} catch {}
+			}
 			if (t === "assets") {
 				if (!n.has("parentAssetId")) try {
 					await e.prepare("ALTER TABLE \"assets\" ADD COLUMN parentAssetId TEXT REFERENCES assets(id) ON DELETE SET NULL;").run();
@@ -6270,7 +6276,7 @@ V.get("/", async (e) => {
 		if (isNaN(r)) return e.json({ error: "Invalid Node ID" }, 400);
 		let i = await t.prepare("SELECT * FROM content_nodes WHERE id = ?").get(r);
 		if (!i) return e.json({ error: "Node not found" }, 404);
-		let a = (i.status === "draft" || !i.status) && !!i.publishedAt, o = {
+		let a = i.status === "draft" || !!i.hasUnpublishedChanges, o = {
 			id: i.id,
 			title: i.title,
 			slug: i.slug,
@@ -6382,7 +6388,7 @@ V.get("/", async (e) => {
 		});
 	}
 	let O = await Promise.all(w.map(async (e) => {
-		let n = (e.status === "draft" || !e.status) && !!e.publishedAt, r = {
+		let n = e.status === "draft" || !!e.hasUnpublishedChanges, r = {
 			id: e.id,
 			title: e.title,
 			slug: e.slug,
@@ -6418,37 +6424,33 @@ V.get("/", async (e) => {
 }), V.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 } = ae(H(_)), b = fe(d === void 0 ? f === void 0 ? p : f : d), x = c || "en", S = l || u || "page", C = e.get("user")?.id || null, w = a, T = /* @__PURE__ */ new Set(), E = s === void 0 ? null : de(s);
 	if (E) {
-		let n = !1, r = [];
-		if (g !== void 0 && Array.isArray(g) && g.length > 0) for (let e of g) r.push({
+		let n = [];
+		if (g !== void 0 && Array.isArray(g) && g.length > 0) for (let e of g) n.push({
 			treeId: Number(e.treeId),
 			parentId: pe(e.parentId ?? e._draftParentId ?? null)
 		});
 		else if (a) {
-			let e = await t.prepare("SELECT treeId, parentId FROM tree_nodes WHERE contentId = ?").all(a), n = Array.isArray(e) ? e : e?.results || [];
-			for (let e of n) r.push({
+			let e = await t.prepare("SELECT treeId, parentId FROM tree_nodes WHERE contentId = ?").all(a), r = Array.isArray(e) ? e : e?.results || [];
+			for (let e of r) n.push({
 				treeId: Number(e.treeId),
 				parentId: e.parentId === null ? null : Number(e.parentId)
 			});
 		}
-		for (let e of r) {
-			let r = e.parentId === null ? "tn.parentId IS NULL" : "tn.parentId = ?", i = e.parentId === null ? [e.treeId, E] : [
-				e.treeId,
-				e.parentId,
+		for (let r of n) {
+			let n = r.parentId === null ? "tn.parentId IS NULL" : "tn.parentId = ?", i = r.parentId === null ? [r.treeId, E] : [
+				r.treeId,
+				r.parentId,
 				E
 			], o = `
         SELECT cn.id FROM tree_nodes tn
         INNER JOIN content_nodes cn ON tn.contentId = cn.id
-        WHERE tn.treeId = ? AND ${r} AND cn.slug = ? AND (cn.deletedAt IS NULL OR cn.deletedAt = '')
+        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)) {
-				n = !0;
-				break;
-			}
+			if (a && (o += " AND cn.id != ?", i.push(a)), o += " LIMIT 1", await t.prepare(o).get(...i)) return e.json({
+				error: `The slug '${E}' is already in use by another page in this section.`,
+				field: "slug"
+			}, 409);
 		}
-		if (n) return e.json({
-			error: `The slug '${E}' 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, draftDataJson, dataJson, publishedAt, status FROM content_nodes WHERE id = ?").get(a), n = e?.draftDataJson || e?.dataJson || "{}";
@@ -6470,10 +6472,10 @@ V.get("/", async (e) => {
 		let d = JSON.stringify({
 			...u,
 			...v
-		}), f = e?.status === "published" || e?.publishedAt ? "published" : "draft";
-		await t.prepare("\n      UPDATE content_nodes \n      SET title = ?, slug = ?, language = ?, contentType = ?, isHidden = ?, status = ?, draftDataJson = ?, updatedById = ?, updatedAt = CURRENT_TIMESTAMP\n      WHERE id = ?\n    ").run(r, i, c, s, b, f, d, C, a);
+		}), f = e?.status === "published" || e?.publishedAt ? "published" : "draft", p = +(f === "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, c, s, b, f, d, p, C, a);
 	} else {
-		let e = await t.prepare("\n      INSERT INTO content_nodes (contentType, title, slug, language, isHidden, status, draftDataJson, dataJson, createdById, updatedById)\n      VALUES (?, ?, ?, ?, ?, 'draft', ?, NULL, ?, ?)\n    ").run(S, o || "Untitled", E, x, b, JSON.stringify(v), C, C);
+		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(S, o || "Untitled", E, x, b, JSON.stringify(v), C, C);
 		w = Number(e.lastInsertRowid);
 	}
 	if (h !== void 0 && Array.isArray(h) && w) {
@@ -6536,7 +6538,7 @@ V.get("/", async (e) => {
 		c = typeof o.draftDataJson == "string" ? JSON.parse(o.draftDataJson) : o.draftDataJson || {};
 	} catch {}
 	let l = (s.title ?? o.title ?? "").trim(), u = (c.title ?? n.title ?? o.title ?? "").trim(), d = (s.slug ?? o.slug ?? "").trim(), f = (c.slug ?? n.slug ?? o.slug ?? "").trim(), p = l !== "" && u !== "" && l !== u || d !== "" && f !== "" && d !== f, m = o.draftDataJson || o.dataJson || "{}";
-	await t.prepare("\n    UPDATE content_nodes\n    SET publishedDataJson = ?, dataJson = ?, publishedAt = CURRENT_TIMESTAMP, status = 'published', updatedById = ?, updatedAt = CURRENT_TIMESTAMP\n    WHERE id = ?\n  ").run(m, m, a, i), await t.prepare("DELETE FROM content_blocks WHERE contentId = ? AND isDraft = 0").run(i);
+	await t.prepare("\n    UPDATE content_nodes\n    SET publishedDataJson = ?, dataJson = ?, publishedAt = CURRENT_TIMESTAMP, status = 'published', hasUnpublishedChanges = 0, updatedById = ?, updatedAt = CURRENT_TIMESTAMP\n    WHERE id = ?\n  ").run(m, m, a, i), await t.prepare("DELETE FROM content_blocks WHERE contentId = ? AND isDraft = 0").run(i);
 	let h = await t.prepare("SELECT * FROM content_blocks WHERE contentId = ? AND isDraft = 1 ORDER BY sortOrder ASC").all(i), g = Array.isArray(h) ? h : h?.results || [];
 	if (g.length > 0) {
 		let e = [], n = [];
@@ -6560,7 +6562,8 @@ V.get("/", async (e) => {
 		id: i,
 		status: "published",
 		version: _,
-		publishedAt: v.publishedAt
+		publishedAt: v.publishedAt,
+		hasUnpublishedChanges: !1
 	});
 }), V.delete("/", async (e) => {
 	let t = e.get("db"), n = e.req.query("id");
@@ -6619,7 +6622,7 @@ V.get("/", async (e) => {
 	} catch {
 		return e.json({ error: "Corrupt snapshot data" }, 500);
 	}
-	if (await t.prepare("\n    UPDATE content_nodes\n    SET draftDataJson = ?, title = ?, slug = ?, updatedById = ?, updatedAt = CURRENT_TIMESTAMP, status = 'draft'\n    WHERE id = ?\n  ").run(o.node?.dataJson || "{}", o.node?.title || "Restored Document", o.node?.slug || null, i, n), await t.prepare("DELETE FROM content_blocks WHERE contentId = ? AND isDraft = 1").run(n), o.blocks && Array.isArray(o.blocks) && o.blocks.length > 0) {
+	if (await t.prepare("\n    UPDATE content_nodes\n    SET draftDataJson = ?, title = ?, slug = ?, updatedById = ?, updatedAt = CURRENT_TIMESTAMP, status = 'draft', hasUnpublishedChanges = 1\n    WHERE id = ?\n  ").run(o.node?.dataJson || "{}", o.node?.title || "Restored Document", o.node?.slug || null, i, n), await t.prepare("DELETE FROM content_blocks WHERE contentId = ? AND isDraft = 1").run(n), o.blocks && Array.isArray(o.blocks) && o.blocks.length > 0) {
 		let e = [], r = [];
 		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);
@@ -6667,7 +6670,7 @@ G.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.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.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();
 		for (let e of o) {
 			let t = e.contentId;
 			c.has(t) || (c.add(t), s.push(e));
@@ -6685,7 +6688,7 @@ G.get("/tree.json", async (e) => {
 				let { dataJson: r, draftDataJson: i, ...a } = e, o = {
 					...a,
 					...t
-				}, s = Number(e.isHidden) === 1 || o.hidden === !0 || o.hidden === 1 || o.hidden === "true", c = (e.status === "draft" || !e.status) && !!e.publishedAt;
+				}, s = Number(e.isHidden) === 1 || o.hidden === !0 || o.hidden === 1 || o.hidden === "true", c = e.status === "draft" || !!e.hasUnpublishedChanges;
 				return {
 					...o,
 					id: e.contentId,

package/dist/schema-compiler.js

@@ -20,7 +20,7 @@ async function u() {
 	if (n(d)) u = (await import(t(d).href)).compileDefinitions;
 	else if (n(f)) u = (await import(t(f).href)).compileDefinitions;
 	else try {
-		u = (await import("./dist-a3ACJkRE.js")).compileDefinitions;
+		u = (await import("./dist-DvbQty0F.js")).compileDefinitions;
 	} catch (e) {
 		console.error("❌ Could not resolve Kama Schema Engine:", e), process.exit(1);
 	}

package/package.json

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

package/schema.sql

@@ -92,6 +92,7 @@ CREATE TABLE IF NOT EXISTS "content_nodes" (
     language TEXT DEFAULT 'en',
     isHidden INTEGER NOT NULL DEFAULT 0,
     status TEXT DEFAULT 'draft',
+    hasUnpublishedChanges INTEGER DEFAULT 0,
     disabledRegionsJson TEXT DEFAULT '{}',
     dataJson TEXT,
     draftDataJson TEXT,