@brightsideoy/kama 0.1.0-alpha.133 → 0.1.0-alpha.135

package/dist/index.js

@@ -28,12 +28,12 @@ function b(e) {
 }
 var x = (e) => (_(e) || y(e)) && !!e.anchor, S = Symbol("break visit"), C = Symbol("skip children"), w = Symbol("remove node");
 function T(e, t) {
-	let n = ee(t);
+	let n = k(t);
 	m(e) ? E(null, e.contents, n, Object.freeze([e])) === w && (e.contents = null) : E(null, e, n, Object.freeze([]));
 }
 T.BREAK = S, T.SKIP = C, T.REMOVE = w;
 function E(e, t, n, r) {
-	let i = k(e, t, n, r);
+	let i = ee(e, t, n, r);
 	if (b(i) || g(i)) return te(e, r, i), E(e, i, n, r);
 	if (typeof i != "symbol") {
 		if (y(t)) {
@@ -57,12 +57,12 @@ function E(e, t, n, r) {
 	return i;
 }
 async function D(e, t) {
-	let n = ee(t);
+	let n = k(t);
 	m(e) ? await O(null, e.contents, n, Object.freeze([e])) === w && (e.contents = null) : await O(null, e, n, Object.freeze([]));
 }
 D.BREAK = S, D.SKIP = C, D.REMOVE = w;
 async function O(e, t, n, r) {
-	let i = await k(e, t, n, r);
+	let i = await ee(e, t, n, r);
 	if (b(i) || g(i)) return te(e, r, i), O(e, i, n, r);
 	if (typeof i != "symbol") {
 		if (y(t)) {
@@ -85,7 +85,7 @@ async function O(e, t, n, r) {
 	}
 	return i;
 }
-function ee(e) {
+function k(e) {
 	return typeof e == "object" && (e.Collection || e.Node || e.Value) ? Object.assign({
 		Alias: e.Node,
 		Map: e.Node,
@@ -100,7 +100,7 @@ function ee(e) {
 		Seq: e.Collection
 	}, e) : e;
 }
-function k(e, t, n, r) {
+function ee(e, t, n, r) {
 	if (typeof n == "function") return n(e, t, r);
 	if (h(t)) return n.Map?.(e, t, r);
 	if (v(t)) return n.Seq?.(e, t, r);
@@ -211,31 +211,31 @@ A.defaultYaml = {
 }, A.defaultTags = { "!!": "tag:yaml.org,2002:" };
 //#endregion
 //#region node_modules/yaml/browser/dist/doc/anchors.js
-function j(e) {
+function ie(e) {
 	if (/[\x00-\x19\s,[\]{}]/.test(e)) {
 		let t = `Anchor must not contain whitespace or control characters: ${JSON.stringify(e)}`;
 		throw Error(t);
 	}
 	return !0;
 }
-function ie(e) {
+function ae(e) {
 	let t = /* @__PURE__ */ new Set();
 	return T(e, { Value(e, n) {
 		n.anchor && t.add(n.anchor);
 	} }), t;
 }
-function ae(e, t) {
+function oe(e, t) {
 	for (let n = 1;; ++n) {
 		let r = `${e}${n}`;
 		if (!t.has(r)) return r;
 	}
 }
-function oe(e, t) {
+function se(e, t) {
 	let n = [], r = /* @__PURE__ */ new Map(), i = null;
 	return {
 		onAnchor: (r) => {
-			n.push(r), i ??= ie(e);
-			let a = ae(t, i);
+			n.push(r), i ??= ae(e);
+			let a = oe(t, i);
 			return i.add(a), a;
 		},
 		setAnchors: () => {
@@ -253,22 +253,22 @@ function oe(e, t) {
 }
 //#endregion
 //#region node_modules/yaml/browser/dist/doc/applyReviver.js
-function se(e, t, n, r) {
+function ce(e, t, n, r) {
 	if (r && typeof r == "object") {
 		if (Array.isArray(r)) for (let t = 0, n = r.length; t < n; ++t) {
-			let n = r[t], i = se(e, r, String(t), n);
+			let n = r[t], i = ce(e, r, String(t), n);
 			i === void 0 ? delete r[t] : i !== n && (r[t] = i);
 		}
 		else if (r instanceof Map) for (let t of Array.from(r.keys())) {
-			let n = r.get(t), i = se(e, r, t, n);
+			let n = r.get(t), i = ce(e, r, t, n);
 			i === void 0 ? r.delete(t) : i !== n && r.set(t, i);
 		}
 		else if (r instanceof Set) for (let t of Array.from(r)) {
-			let n = se(e, r, t, t);
+			let n = ce(e, r, t, t);
 			n === void 0 ? r.delete(t) : n !== t && (r.delete(t), r.add(n));
 		}
 		else for (let [t, n] of Object.entries(r)) {
-			let i = se(e, r, t, n);
+			let i = ce(e, r, t, n);
 			i === void 0 ? delete r[t] : i !== n && (r[t] = i);
 		}
 	}
@@ -276,8 +276,8 @@ function se(e, t, n, r) {
 }
 //#endregion
 //#region node_modules/yaml/browser/dist/nodes/toJS.js
-function M(e, t, n) {
-	if (Array.isArray(e)) return e.map((e, t) => M(e, String(t), n));
+function j(e, t, n) {
+	if (Array.isArray(e)) return e.map((e, t) => j(e, String(t), n));
 	if (e && typeof e.toJSON == "function") {
 		if (!n || !x(e)) return e.toJSON(t, n);
 		let r = {
@@ -295,7 +295,7 @@ function M(e, t, n) {
 }
 //#endregion
 //#region node_modules/yaml/browser/dist/nodes/Node.js
-var ce = class {
+var le = class {
 	constructor(e) {
 		Object.defineProperty(this, f, { value: e });
 	}
@@ -312,11 +312,11 @@ var ce = class {
 			mapAsMap: t === !0,
 			mapKeyWarned: !1,
 			maxAliasCount: typeof n == "number" ? n : 100
-		}, o = M(this, "", a);
+		}, o = j(this, "", a);
 		if (typeof r == "function") for (let { count: e, res: t } of a.anchors.values()) r(t, e);
-		return typeof i == "function" ? se(i, { "": o }, "", o) : o;
+		return typeof i == "function" ? ce(i, { "": o }, "", o) : o;
 	}
-}, N = class extends ce {
+}, ue = class extends le {
 	constructor(e) {
 		super(o), this.source = e, Object.defineProperty(this, "tag", { set() {
 			throw Error("Alias nodes cannot have tags");
@@ -344,14 +344,14 @@ var ce = class {
 		}
 		let o = n.get(a);
 		/* istanbul ignore if */
-		if (o ||= (M(a, null, t), n.get(a)), o?.res === void 0) throw ReferenceError("This should not happen: Alias anchor was not resolved?");
-		if (i >= 0 && (o.count += 1, o.aliasCount === 0 && (o.aliasCount = le(r, a, n)), o.count * o.aliasCount > i)) throw ReferenceError("Excessive alias count indicates a resource exhaustion attack");
+		if (o ||= (j(a, null, t), n.get(a)), o?.res === void 0) throw ReferenceError("This should not happen: Alias anchor was not resolved?");
+		if (i >= 0 && (o.count += 1, o.aliasCount === 0 && (o.aliasCount = M(r, a, n)), o.count * o.aliasCount > i)) throw ReferenceError("Excessive alias count indicates a resource exhaustion attack");
 		return o.res;
 	}
 	toString(e, t, n) {
 		let r = `*${this.source}`;
 		if (e) {
-			if (j(this.source), e.options.verifyAliasOrder && !e.anchors.has(this.source)) {
+			if (ie(this.source), e.options.verifyAliasOrder && !e.anchors.has(this.source)) {
 				let e = `Unresolved alias (the anchor must be set before the alias): ${this.source}`;
 				throw Error(e);
 			}
@@ -360,7 +360,7 @@ var ce = class {
 		return r;
 	}
 };
-function le(e, t, n) {
+function M(e, t, n) {
 	if (p(t)) {
 		let r = t.resolve(e), i = n && r && n.get(r);
 		return i ? i.count * i.aliasCount : 0;
@@ -368,35 +368,35 @@ function le(e, t, n) {
 	if (y(t)) {
 		let r = 0;
 		for (let i of t.items) {
-			let t = le(e, i, n);
+			let t = M(e, i, n);
 			t > r && (r = t);
 		}
 		return r;
 	}
 	if (g(t)) {
-		let r = le(e, t.key, n), i = le(e, t.value, n);
+		let r = M(e, t.key, n), i = M(e, t.value, n);
 		return Math.max(r, i);
 	}
 	return 1;
 }
 //#endregion
 //#region node_modules/yaml/browser/dist/nodes/Scalar.js
-var ue = (e) => !e || typeof e != "function" && typeof e != "object", P = class extends ce {
+var de = (e) => !e || typeof e != "function" && typeof e != "object", N = class extends le {
 	constructor(e) {
 		super(u), this.value = e;
 	}
 	toJSON(e, t) {
-		return t?.keep ? this.value : M(this.value, e, t);
+		return t?.keep ? this.value : j(this.value, e, t);
 	}
 	toString() {
 		return String(this.value);
 	}
 };
-P.BLOCK_FOLDED = "BLOCK_FOLDED", P.BLOCK_LITERAL = "BLOCK_LITERAL", P.PLAIN = "PLAIN", P.QUOTE_DOUBLE = "QUOTE_DOUBLE", P.QUOTE_SINGLE = "QUOTE_SINGLE";
+N.BLOCK_FOLDED = "BLOCK_FOLDED", N.BLOCK_LITERAL = "BLOCK_LITERAL", N.PLAIN = "PLAIN", N.QUOTE_DOUBLE = "QUOTE_DOUBLE", N.QUOTE_SINGLE = "QUOTE_SINGLE";
 //#endregion
 //#region node_modules/yaml/browser/dist/doc/createNode.js
-var de = "tag:yaml.org,2002:";
-function fe(e, t, n) {
+var fe = "tag:yaml.org,2002:";
+function pe(e, t, n) {
 	if (t) {
 		let e = n.filter((e) => e.tag === t), r = e.find((e) => !e.format) ?? e[0];
 		if (!r) throw Error(`Tag ${t} not found`);
@@ -404,7 +404,7 @@ function fe(e, t, n) {
 	}
 	return n.find((t) => t.identify?.(e) && !t.format);
 }
-function pe(e, t, n) {
+function P(e, t, n) {
 	if (m(e) && (e = e.contents), b(e)) return e;
 	if (g(e)) {
 		let t = n.schema[c].createNode?.(n.schema, null, n);
@@ -413,23 +413,23 @@ function pe(e, t, n) {
 	(e instanceof String || e instanceof Number || e instanceof Boolean || typeof BigInt < "u" && e instanceof BigInt) && (e = e.valueOf());
 	let { aliasDuplicateObjects: r, onAnchor: i, onTagObj: a, schema: o, sourceObjects: s } = n, l;
 	if (r && e && typeof e == "object") {
-		if (l = s.get(e), l) return l.anchor ?? (l.anchor = i(e)), new N(l.anchor);
+		if (l = s.get(e), l) return l.anchor ?? (l.anchor = i(e)), new ue(l.anchor);
 		l = {
 			anchor: null,
 			node: null
 		}, s.set(e, l);
 	}
-	t?.startsWith("!!") && (t = de + t.slice(2));
-	let u = fe(e, t, o.tags);
+	t?.startsWith("!!") && (t = fe + t.slice(2));
+	let u = pe(e, t, o.tags);
 	if (!u) {
 		if (e && typeof e.toJSON == "function" && (e = e.toJSON()), !e || typeof e != "object") {
-			let t = new P(e);
+			let t = new N(e);
 			return l && (l.node = t), t;
 		}
 		u = e instanceof Map ? o[c] : Symbol.iterator in Object(e) ? o[d] : o[c];
 	}
 	a && (a(u), delete n.onTagObj);
-	let f = u?.createNode ? u.createNode(n.schema, e, n) : typeof u?.nodeClass?.from == "function" ? u.nodeClass.from(n.schema, e, n) : new P(e);
+	let f = u?.createNode ? u.createNode(n.schema, e, n) : typeof u?.nodeClass?.from == "function" ? u.nodeClass.from(n.schema, e, n) : new N(e);
 	return t ? f.tag = t : u.default || (f.tag = u.tag), l && (l.node = f), f;
 }
 //#endregion
@@ -443,7 +443,7 @@ function me(e, t, n) {
 			e[n] = r, r = e;
 		} else r = /* @__PURE__ */ new Map([[n, r]]);
 	}
-	return pe(r, void 0, {
+	return P(r, void 0, {
 		aliasDuplicateObjects: !1,
 		keepUndefined: !1,
 		onAnchor: () => {
@@ -453,7 +453,7 @@ function me(e, t, n) {
 		sourceObjects: /* @__PURE__ */ new Map()
 	});
 }
-var he = (e) => e == null || typeof e == "object" && !!e[Symbol.iterator]().next().done, F = class extends ce {
+var he = (e) => e == null || typeof e == "object" && !!e[Symbol.iterator]().next().done, ge = class extends le {
 	constructor(e, t) {
 		super(e), Object.defineProperty(this, "schema", {
 			value: t,
@@ -509,12 +509,12 @@ var he = (e) => e == null || typeof e == "object" && !!e[Symbol.iterator]().next
 			else throw Error(`Expected YAML collection at ${n}. Remaining path: ${r}`);
 		}
 	}
-}, ge = (e) => e.replace(/^(?!$)(?: $)?/gm, "#");
-function I(e, t) {
+}, _e = (e) => e.replace(/^(?!$)(?: $)?/gm, "#");
+function F(e, t) {
 	return /^\n+$/.test(e) ? e.substring(1) : t ? e.replace(/^(?! *$)/gm, t) : e;
 }
-var _e = (e, t, n) => e.endsWith("\n") ? I(n, t) : n.includes("\n") ? "\n" + I(n, t) : (e.endsWith(" ") ? "" : " ") + n, ve = "flow", ye = "block", be = "quoted";
-function xe(e, t, n = "flow", { indentAtStart: r, lineWidth: i = 80, minContentWidth: a = 20, onFold: o, onOverflow: s } = {}) {
+var ve = (e, t, n) => e.endsWith("\n") ? F(n, t) : n.includes("\n") ? "\n" + F(n, t) : (e.endsWith(" ") ? "" : " ") + n, ye = "flow", be = "block", xe = "quoted";
+function I(e, t, n = "flow", { indentAtStart: r, lineWidth: i = 80, minContentWidth: a = 20, onFold: o, onOverflow: s } = {}) {
 	if (!i || i < 0) return e;
 	i < a && (a = 0);
 	let c = Math.max(1 + a, 1 + i - t.length);
@@ -522,7 +522,7 @@ function xe(e, t, n = "flow", { indentAtStart: r, lineWidth: i = 80, minContentW
 	let l = [], u = {}, d = i - t.length;
 	typeof r == "number" && (r > i - Math.max(2, a) ? l.push(0) : d = i - r);
 	let f, p, m = !1, h = -1, g = -1, _ = -1;
-	n === "block" && (h = L(e, h, t.length), h !== -1 && (d = h + c));
+	n === "block" && (h = Se(e, h, t.length), h !== -1 && (d = h + c));
 	for (let r; r = e[h += 1];) {
 		if (n === "quoted" && r === "\\") {
 			switch (g = h, e[h + 1]) {
@@ -539,7 +539,7 @@ function xe(e, t, n = "flow", { indentAtStart: r, lineWidth: i = 80, minContentW
 			}
 			_ = h;
 		}
-		if (r === "\n") n === "block" && (h = L(e, h, t.length)), d = h + t.length + c, f = void 0;
+		if (r === "\n") n === "block" && (h = Se(e, h, t.length)), d = h + t.length + c, f = void 0;
 		else {
 			if (r === " " && p && p !== " " && p !== "\n" && p !== "	") {
 				let t = e[h + 1];
@@ -566,7 +566,7 @@ function xe(e, t, n = "flow", { indentAtStart: r, lineWidth: i = 80, minContentW
 	}
 	return v;
 }
-function L(e, t, n) {
+function Se(e, t, n) {
 	let r = t, i = t + 1, a = e[i];
 	for (; a === " " || a === "	";) if (t < i + n) a = e[++t];
 	else {
@@ -579,12 +579,12 @@ function L(e, t, n) {
 }
 //#endregion
 //#region node_modules/yaml/browser/dist/stringify/stringifyString.js
-var R = (e, t) => ({
+var Ce = (e, t) => ({
 	indentAtStart: t ? e.indent.length : e.indentAtStart,
 	lineWidth: e.options.lineWidth,
 	minContentWidth: e.options.minContentWidth
-}), Se = (e) => /^(%|---|\.\.\.)/m.test(e);
-function Ce(e, t, n) {
+}), L = (e) => /^(%|---|\.\.\.)/m.test(e);
+function R(e, t, n) {
 	if (!t || t < 0) return !1;
 	let r = t - n, i = e.length;
 	if (i <= r) return !1;
@@ -597,7 +597,7 @@ function Ce(e, t, n) {
 function we(e, t) {
 	let n = JSON.stringify(e);
 	if (t.options.doubleQuotedAsJSON) return n;
-	let { implicitKey: r } = t, i = t.options.doubleQuotedMinMultiLineLength, a = t.indent || (Se(e) ? "  " : ""), o = "", s = 0;
+	let { implicitKey: r } = t, i = t.options.doubleQuotedMinMultiLineLength, a = t.indent || (L(e) ? "  " : ""), o = "", s = 0;
 	for (let e = 0, t = n[e]; t; t = n[++e]) if (t === " " && n[e + 1] === "\\" && n[e + 2] === "n" && (o += n.slice(s, e) + "\\ ", e += 1, s = e, t = "\\"), t === "\\") switch (n[e + 1]) {
 		case "u":
 			{
@@ -642,12 +642,12 @@ function we(e, t) {
 			break;
 		default: e += 1;
 	}
-	return o = s ? o + n.slice(s) : n, r ? o : xe(o, a, be, R(t, !1));
+	return o = s ? o + n.slice(s) : n, r ? o : I(o, a, xe, Ce(t, !1));
 }
 function Te(e, t) {
 	if (t.options.singleQuote === !1 || t.implicitKey && e.includes("\n") || /[ \t]\n|\n[ \t]/.test(e)) return we(e, t);
-	let n = t.indent || (Se(e) ? "  " : ""), r = "'" + e.replace(/'/g, "''").replace(/\n+/g, `$&\n${n}`) + "'";
-	return t.implicitKey ? r : xe(r, n, ve, R(t, !1));
+	let n = t.indent || (L(e) ? "  " : ""), r = "'" + e.replace(/'/g, "''").replace(/\n+/g, `$&\n${n}`) + "'";
+	return t.implicitKey ? r : I(r, n, ye, Ce(t, !1));
 }
 function Ee(e, t) {
 	let { singleQuote: n } = t.options, r;
@@ -667,7 +667,7 @@ try {
 function Oe({ comment: e, type: t, value: n }, r, i, a) {
 	let { blockQuote: o, commentString: s, lineWidth: c } = r.options;
 	if (!o || /\n[\t ]+$/.test(n)) return Ee(n, r);
-	let l = r.indent || (r.forceBlockIndent || Se(n) ? "  " : ""), u = o === "literal" ? !0 : o === "folded" || t === P.BLOCK_FOLDED ? !1 : t === P.BLOCK_LITERAL || !Ce(n, c, l.length);
+	let l = r.indent || (r.forceBlockIndent || L(n) ? "  " : ""), u = o === "literal" ? !0 : o === "folded" || t === N.BLOCK_FOLDED ? !1 : t === N.BLOCK_LITERAL || !R(n, c, l.length);
 	if (!n) return u ? "|\n" : ">\n";
 	let d, f;
 	for (f = n.length; f > 0; --f) {
@@ -687,11 +687,11 @@ function Oe({ comment: e, type: t, value: n }, r, i, a) {
 	v &&= (n = n.substring(v.length), v.replace(/\n+/g, `$&${l}`));
 	let y = (h ? l ? "2" : "1" : "") + d;
 	if (e && (y += " " + s(e.replace(/ ?[\r\n]+/g, " ")), i && i()), !u) {
-		let e = n.replace(/\n+/g, "\n$&").replace(/(?:^|\n)([\t ].*)(?:([\n\t ]*)\n(?![\n\t ]))?/g, "$1$2").replace(/\n+/g, `$&${l}`), i = !1, a = R(r, !0);
-		o !== "folded" && t !== P.BLOCK_FOLDED && (a.onOverflow = () => {
+		let e = n.replace(/\n+/g, "\n$&").replace(/(?:^|\n)([\t ].*)(?:([\n\t ]*)\n(?![\n\t ]))?/g, "$1$2").replace(/\n+/g, `$&${l}`), i = !1, a = Ce(r, !0);
+		o !== "folded" && t !== N.BLOCK_FOLDED && (a.onOverflow = () => {
 			i = !0;
 		});
-		let s = xe(`${v}${e}${p}`, l, ye, a);
+		let s = I(`${v}${e}${p}`, l, be, a);
 		if (!i) return `>${y}\n${l}${s}`;
 	}
 	return n = n.replace(/\n+/g, `$&${l}`), `|${y}\n${l}${v}${n}${p}`;
@@ -700,8 +700,8 @@ function ke(e, t, n, r) {
 	let { type: i, value: a } = e, { actualString: o, implicitKey: s, indent: c, indentStep: l, inFlow: u } = t;
 	if (s && a.includes("\n") || u && /[[\]{},]/.test(a)) return Ee(a, t);
 	if (/^[\n\t ,[\]{}#&*!|>'"%@`]|^[?-]$|^[?-][ \t]|[\n:][ \t]|[ \t]\n|[\n\t ]#|[\n\t :]$/.test(a)) return s || u || !a.includes("\n") ? Ee(a, t) : Oe(e, t, n, r);
-	if (!s && !u && i !== P.PLAIN && a.includes("\n")) return Oe(e, t, n, r);
-	if (Se(a)) {
+	if (!s && !u && i !== N.PLAIN && a.includes("\n")) return Oe(e, t, n, r);
+	if (L(a)) {
 		if (c === "") return t.forceBlockIndent = !0, Oe(e, t, n, r);
 		if (s && c === l) return Ee(a, t);
 	}
@@ -710,18 +710,18 @@ function ke(e, t, n, r) {
 		let e = (e) => e.default && e.tag !== "tag:yaml.org,2002:str" && e.test?.test(d), { compat: n, tags: r } = t.doc.schema;
 		if (r.some(e) || n?.some(e)) return Ee(a, t);
 	}
-	return s ? d : xe(d, c, ve, R(t, !1));
+	return s ? d : I(d, c, ye, Ce(t, !1));
 }
 function Ae(e, t, n, r) {
 	let { implicitKey: i, inFlow: a } = t, o = typeof e.value == "string" ? e : Object.assign({}, e, { value: String(e.value) }), { type: s } = e;
-	s !== P.QUOTE_DOUBLE && /[\x00-\x08\x0b-\x1f\x7f-\x9f\u{D800}-\u{DFFF}]/u.test(o.value) && (s = P.QUOTE_DOUBLE);
+	s !== N.QUOTE_DOUBLE && /[\x00-\x08\x0b-\x1f\x7f-\x9f\u{D800}-\u{DFFF}]/u.test(o.value) && (s = N.QUOTE_DOUBLE);
 	let c = (e) => {
 		switch (e) {
-			case P.BLOCK_FOLDED:
-			case P.BLOCK_LITERAL: return i || a ? Ee(o.value, t) : Oe(o, t, n, r);
-			case P.QUOTE_DOUBLE: return we(o.value, t);
-			case P.QUOTE_SINGLE: return Te(o.value, t);
-			case P.PLAIN: return ke(o, t, n, r);
+			case N.BLOCK_FOLDED:
+			case N.BLOCK_LITERAL: return i || a ? Ee(o.value, t) : Oe(o, t, n, r);
+			case N.QUOTE_DOUBLE: return we(o.value, t);
+			case N.QUOTE_SINGLE: return Te(o.value, t);
+			case N.PLAIN: return ke(o, t, n, r);
 			default: return null;
 		}
 	}, l = c(s);
@@ -736,7 +736,7 @@ function Ae(e, t, n, r) {
 function je(e, t) {
 	let n = Object.assign({
 		blockQuote: !0,
-		commentString: ge,
+		commentString: _e,
 		defaultKeyType: null,
 		defaultStringType: "PLAIN",
 		directives: null,
@@ -797,7 +797,7 @@ function Me(e, t) {
 function Ne(e, t, { anchors: n, doc: r }) {
 	if (!r.directives) return "";
 	let i = [], a = (_(e) || y(e)) && e.anchor;
-	a && j(a) && (n.add(a), i.push(`&${a}`));
+	a && ie(a) && (n.add(a), i.push(`&${a}`));
 	let o = e.tag ?? (t.default ? null : t.tag);
 	return o && i.push(r.directives.tagString(o)), i.join(" ");
 }
@@ -823,7 +823,7 @@ function Fe({ key: e, value: t }, n, r, i) {
 		if (f) throw Error("With simple keys, key nodes cannot have comments");
 		if (y(e) || !b(e) && typeof e == "object") throw Error("With simple keys, collection cannot be used as a key value");
 	}
-	let p = !d && (!e || f && t == null && !n.inFlow || y(e) || (_(e) ? e.type === P.BLOCK_FOLDED || e.type === P.BLOCK_LITERAL : typeof e == "object"));
+	let p = !d && (!e || f && t == null && !n.inFlow || y(e) || (_(e) ? e.type === N.BLOCK_FOLDED || e.type === N.BLOCK_LITERAL : typeof e == "object"));
 	n = Object.assign({}, n, {
 		allNullValues: !1,
 		implicitKey: !p && (d || !a),
@@ -836,15 +836,15 @@ function Fe({ key: e, value: t }, n, r, i) {
 	}
 	if (n.inFlow) {
 		if (a || t == null) return m && r && r(), g === "" ? "?" : p ? `? ${g}` : g;
-	} else if (a && !d || t == null && p) return g = `? ${g}`, f && !m ? g += _e(g, n.indent, l(f)) : h && i && i(), g;
-	m && (f = null), p ? (f && (g += _e(g, n.indent, l(f))), g = `? ${g}\n${s}:`) : (g = `${g}:`, f && (g += _e(g, n.indent, l(f))));
+	} else if (a && !d || t == null && p) return g = `? ${g}`, f && !m ? g += ve(g, n.indent, l(f)) : h && i && i(), g;
+	m && (f = null), p ? (f && (g += ve(g, n.indent, l(f))), g = `? ${g}\n${s}:`) : (g = `${g}:`, f && (g += ve(g, n.indent, l(f))));
 	let x, S, C;
 	b(t) ? (x = !!t.spaceBefore, S = t.commentBefore, C = t.comment) : (x = !1, S = null, C = null, t && typeof t == "object" && (t = o.createNode(t))), n.implicitKey = !1, !p && !f && _(t) && (n.indentAtStart = g.length + 1), h = !1, !u && c.length >= 2 && !n.inFlow && !p && v(t) && !t.flow && !t.tag && !t.anchor && (n.indent = n.indent.substring(2));
 	let w = !1, T = Pe(t, n, () => w = !0, () => h = !0), E = " ";
 	if (f || x || S) {
 		if (E = x ? "\n" : "", S) {
 			let e = l(S);
-			E += `\n${I(e, n.indent)}`;
+			E += `\n${F(e, n.indent)}`;
 		}
 		T === "" && !n.inFlow ? E === "\n" && C && (E = "\n\n") : E += `\n${n.indent}`;
 	} else if (!p && y(t)) {
@@ -858,7 +858,7 @@ function Fe({ key: e, value: t }, n, r, i) {
 			t || (E = `\n${n.indent}`);
 		}
 	} else (T === "" || T[0] === "\n") && (E = "");
-	return g += E + T, n.inFlow ? w && r && r() : C && !w ? g += _e(g, n.indent, l(C)) : h && i && i(), g;
+	return g += E + T, n.inFlow ? w && r && r() : C && !w ? g += ve(g, n.indent, l(C)) : h && i && i(), g;
 }
 //#endregion
 //#region node_modules/yaml/browser/dist/log.js
@@ -872,9 +872,9 @@ var Le = "<<", Re = {
 	default: "key",
 	tag: "tag:yaml.org,2002:merge",
 	test: /^<<$/,
-	resolve: () => Object.assign(new P(Symbol(Le)), { addToJSMap: Be }),
+	resolve: () => Object.assign(new N(Symbol(Le)), { addToJSMap: Be }),
 	stringify: () => Le
-}, ze = (e, t) => (Re.identify(t) || _(t) && (!t.type || t.type === P.PLAIN) && Re.identify(t.value)) && e?.doc.schema.tags.some((e) => e.tag === Re.tag && e.default);
+}, ze = (e, t) => (Re.identify(t) || _(t) && (!t.type || t.type === N.PLAIN) && Re.identify(t.value)) && e?.doc.schema.tags.some((e) => e.tag === Re.tag && e.default);
 function Be(e, t, n) {
 	let r = He(e, n);
 	if (v(r)) for (let n of r.items) Ve(e, t, n);
@@ -902,11 +902,11 @@ function Ue(e, t, { key: n, value: r }) {
 	if (b(n) && n.addToJSMap) n.addToJSMap(e, t, r);
 	else if (ze(e, n)) Be(e, t, r);
 	else {
-		let i = M(n, "", e);
-		if (t instanceof Map) t.set(i, M(r, i, e));
+		let i = j(n, "", e);
+		if (t instanceof Map) t.set(i, j(r, i, e));
 		else if (t instanceof Set) t.add(i);
 		else {
-			let a = We(n, i, e), o = M(r, a, e);
+			let a = We(n, i, e), o = j(r, a, e);
 			a in t ? Object.defineProperty(t, a, {
 				value: o,
 				writable: !0,
@@ -937,7 +937,7 @@ function We(e, t, n) {
 //#endregion
 //#region node_modules/yaml/browser/dist/nodes/Pair.js
 function Ge(e, t, n) {
-	return new z(pe(e, void 0, n), pe(t, void 0, n));
+	return new z(P(e, void 0, n), P(t, void 0, n));
 }
 var z = class e {
 	constructor(e, t = null) {
@@ -973,7 +973,7 @@ function qe({ comment: e, items: t }, n, { blockItemPrefix: r, flowChars: i, ite
 		}
 		d = !1;
 		let s = Pe(i, u, () => o = null, () => d = !0);
-		o && (s += _e(s, a, l(o))), d && o && (d = !1), f.push(r + s);
+		o && (s += ve(s, a, l(o))), d && o && (d = !1), f.push(r + s);
 	}
 	let p;
 	if (f.length === 0) p = i.start + i.end;
@@ -984,7 +984,7 @@ function qe({ comment: e, items: t }, n, { blockItemPrefix: r, flowChars: i, ite
 			p += t ? `\n${c}${t}` : "\n";
 		}
 	}
-	return e ? (p += "\n" + I(l(e), c), s && s()) : d && o && o(), p;
+	return e ? (p += "\n" + F(l(e), c), s && s()) : d && o && o(), p;
 }
 function Je({ items: e }, t, { flowChars: n, itemIndent: r }) {
 	let { indent: i, indentStep: a, flowCollectionPadding: o, options: { commentString: s } } = t;
@@ -1005,7 +1005,7 @@ function Je({ items: e }, t, { flowChars: n, itemIndent: r }) {
 		}
 		a && (l = !0);
 		let o = Pe(i, c, () => a = null);
-		l ||= d.length > u || o.includes("\n"), n < e.length - 1 ? o += "," : t.options.trailingComma && (t.options.lineWidth > 0 && (l ||= d.reduce((e, t) => e + t.length + 2, 2) + (o.length + 2) > t.options.lineWidth), l && (o += ",")), a && (o += _e(o, r, s(a))), d.push(o), u = d.length;
+		l ||= d.length > u || o.includes("\n"), n < e.length - 1 ? o += "," : t.options.trailingComma && (t.options.lineWidth > 0 && (l ||= d.reduce((e, t) => e + t.length + 2, 2) + (o.length + 2) > t.options.lineWidth), l && (o += ",")), a && (o += ve(o, r, s(a))), d.push(o), u = d.length;
 	}
 	let { start: f, end: p } = n;
 	if (d.length === 0) return f + p;
@@ -1022,7 +1022,7 @@ function Je({ items: e }, t, { flowChars: n, itemIndent: r }) {
 }
 function Ye({ indent: e, options: { commentString: t } }, n, r, i) {
 	if (r && i && (r = r.replace(/^\n+/, "")), r) {
-		let i = I(t(r), e);
+		let i = F(t(r), e);
 		n.push(i.trimStart());
 	}
 }
@@ -1032,7 +1032,7 @@ function Xe(e, t) {
 	let n = _(t) ? t.value : t;
 	for (let r of e) if (g(r) && (r.key === t || r.key === n || _(r.key) && r.key.value === n)) return r;
 }
-var B = class extends F {
+var B = class extends ge {
 	static get tagName() {
 		return "tag:yaml.org,2002:map";
 	}
@@ -1055,7 +1055,7 @@ var B = class extends F {
 		let r = Xe(this.items, n.key), i = this.schema?.sortMapEntries;
 		if (r) {
 			if (!t) throw Error(`Key ${n.key} already set`);
-			_(r.value) && ue(n.value) ? r.value.value = n.value : r.value = n.value;
+			_(r.value) && de(n.value) ? r.value.value = n.value : r.value = n.value;
 		} else if (i) {
 			let e = this.items.findIndex((e) => i(n, e) < 0);
 			e === -1 ? this.items.push(n) : this.items.splice(e, 0, n);
@@ -1104,7 +1104,7 @@ var B = class extends F {
 		return h(e) || t("Expected a mapping for this tag"), e;
 	},
 	createNode: (e, t, n) => B.from(e, t, n)
-}, Qe = class extends F {
+}, Qe = class extends ge {
 	static get tagName() {
 		return "tag:yaml.org,2002:seq";
 	}
@@ -1132,13 +1132,13 @@ var B = class extends F {
 		let n = $e(e);
 		if (typeof n != "number") throw Error(`Expected a valid index, not ${e}.`);
 		let r = this.items[n];
-		_(r) && ue(t) ? r.value = t : this.items[n] = t;
+		_(r) && de(t) ? r.value = t : this.items[n] = t;
 	}
 	toJSON(e, t) {
 		let n = [];
 		t?.onCreate && t.onCreate(n);
 		let r = 0;
-		for (let e of this.items) n.push(M(e, String(r++), t));
+		for (let e of this.items) n.push(j(e, String(r++), t));
 		return n;
 	}
 	toString(e, t, n) {
@@ -1162,7 +1162,7 @@ var B = class extends F {
 					let n = t instanceof Set ? a : String(e++);
 					a = r.call(t, n, a);
 				}
-				i.items.push(pe(a, void 0, n));
+				i.items.push(P(a, void 0, n));
 			}
 		}
 		return i;
@@ -1193,18 +1193,18 @@ var et = {
 	}
 }, nt = {
 	identify: (e) => e == null,
-	createNode: () => new P(null),
+	createNode: () => new N(null),
 	default: !0,
 	tag: "tag:yaml.org,2002:null",
 	test: /^(?:~|[Nn]ull|NULL)?$/,
-	resolve: () => new P(null),
+	resolve: () => new N(null),
 	stringify: ({ source: e }, t) => typeof e == "string" && nt.test.test(e) ? e : t.options.nullStr
 }, rt = {
 	identify: (e) => typeof e == "boolean",
 	default: !0,
 	tag: "tag:yaml.org,2002:bool",
 	test: /^(?:[Tt]rue|TRUE|[Ff]alse|FALSE)$/,
-	resolve: (e) => new P(e[0] === "t" || e[0] === "T"),
+	resolve: (e) => new N(e[0] === "t" || e[0] === "T"),
 	stringify({ source: e, value: t }, n) {
 		return e && rt.test.test(e) && t === (e[0] === "t" || e[0] === "T") ? e : t ? n.options.trueStr : n.options.falseStr;
 	}
@@ -1250,7 +1250,7 @@ var it = {
 	tag: "tag:yaml.org,2002:float",
 	test: /^[-+]?(?:\.[0-9]+|[0-9]+\.[0-9]*)$/,
 	resolve(e) {
-		let t = new P(parseFloat(e)), n = e.indexOf(".");
+		let t = new N(parseFloat(e)), n = e.indexOf(".");
 		return n !== -1 && e[e.length - 1] === "0" && (t.minFractionDigits = e.length - n - 1), t;
 	},
 	stringify: V
@@ -1310,7 +1310,7 @@ var ht = ({ value: e }) => JSON.stringify(e), gt = [
 	},
 	{
 		identify: (e) => e == null,
-		createNode: () => new P(null),
+		createNode: () => new N(null),
 		default: !0,
 		tag: "tag:yaml.org,2002:null",
 		test: /^null$/,
@@ -1368,10 +1368,10 @@ var ht = ({ value: e }) => JSON.stringify(e), gt = [
 			for (let t = 0; t < o.length; ++t) e += String.fromCharCode(o[t]);
 			s = btoa(e);
 		} else throw Error("This environment does not support writing binary tags; either Buffer or btoa is required");
-		if (t ??= P.BLOCK_LITERAL, t !== P.QUOTE_DOUBLE) {
+		if (t ??= N.BLOCK_LITERAL, t !== N.QUOTE_DOUBLE) {
 			let e = Math.max(r.options.lineWidth - r.indent.length, r.options.minContentWidth), n = Math.ceil(s.length / e), i = Array(n);
 			for (let t = 0, r = 0; t < n; ++t, r += e) i[t] = s.substr(r, e);
-			s = i.join(t === P.BLOCK_LITERAL ? "\n" : " ");
+			s = i.join(t === N.BLOCK_LITERAL ? "\n" : " ");
 		}
 		return Ae({
 			comment: e,
@@ -1388,7 +1388,7 @@ function yt(e, t) {
 		if (!g(r)) {
 			if (h(r)) {
 				r.items.length > 1 && t("Each pair must have its own sequence indicator");
-				let e = r.items[0] || new z(new P(null));
+				let e = r.items[0] || new z(new N(null));
 				if (r.commentBefore && (e.key.commentBefore = e.key.commentBefore ? `${r.commentBefore}\n${e.key.commentBefore}` : r.commentBefore), r.comment) {
 					let t = e.value ?? e.key;
 					t.comment = t.comment ? `${r.comment}\n${t.comment}` : r.comment;
@@ -1436,7 +1436,7 @@ var xt = {
 		t?.onCreate && t.onCreate(n);
 		for (let e of this.items) {
 			let r, i;
-			if (g(e) ? (r = M(e.key, "", t), i = M(e.value, r, t)) : r = M(e, "", t), n.has(r)) throw Error("Ordered maps must not include duplicate keys");
+			if (g(e) ? (r = j(e.key, "", t), i = j(e.value, r, t)) : r = j(e, "", t), n.has(r)) throw Error("Ordered maps must not include duplicate keys");
 			n.set(r, i);
 		}
 		return n;
@@ -1470,14 +1470,14 @@ var Tt = {
 	default: !0,
 	tag: "tag:yaml.org,2002:bool",
 	test: /^(?:Y|y|[Yy]es|YES|[Tt]rue|TRUE|[Oo]n|ON)$/,
-	resolve: () => new P(!0),
+	resolve: () => new N(!0),
 	stringify: wt
 }, Et = {
 	identify: (e) => e === !1,
 	default: !0,
 	tag: "tag:yaml.org,2002:bool",
 	test: /^(?:N|n|[Nn]o|NO|[Ff]alse|FALSE|[Oo]ff|OFF)$/,
-	resolve: () => new P(!1),
+	resolve: () => new N(!1),
 	stringify: wt
 }, Dt = {
 	identify: (e) => typeof e == "number",
@@ -1503,7 +1503,7 @@ var Tt = {
 	tag: "tag:yaml.org,2002:float",
 	test: /^[-+]?(?:[0-9][0-9_]*)?\.[0-9_]*$/,
 	resolve(e) {
-		let t = new P(parseFloat(e.replace(/_/g, ""))), n = e.indexOf(".");
+		let t = new N(parseFloat(e.replace(/_/g, ""))), n = e.indexOf(".");
 		if (n !== -1) {
 			let r = e.substring(n + 1).replace(/_/g, "");
 			r[r.length - 1] === "0" && (t.minFractionDigits = r.length);
@@ -1768,28 +1768,28 @@ function Zt(e, t) {
 	if (e.commentBefore) {
 		n.length !== 1 && n.unshift("");
 		let t = a(e.commentBefore);
-		n.unshift(I(t, ""));
+		n.unshift(F(t, ""));
 	}
 	let o = !1, s = null;
 	if (e.contents) {
 		if (b(e.contents)) {
 			if (e.contents.spaceBefore && r && n.push(""), e.contents.commentBefore) {
 				let t = a(e.contents.commentBefore);
-				n.push(I(t, ""));
+				n.push(F(t, ""));
 			}
 			i.forceBlockIndent = !!e.comment, s = e.contents.comment;
 		}
 		let t = s ? void 0 : () => o = !0, c = Pe(e.contents, i, () => s = null, t);
-		s && (c += _e(c, "", a(s))), (c[0] === "|" || c[0] === ">") && n[n.length - 1] === "---" ? n[n.length - 1] = `--- ${c}` : n.push(c);
+		s && (c += ve(c, "", a(s))), (c[0] === "|" || c[0] === ">") && n[n.length - 1] === "---" ? n[n.length - 1] = `--- ${c}` : n.push(c);
 	} else n.push(Pe(e.contents, i));
 	if (e.directives?.docEnd) {
 		if (e.comment) {
 			let t = a(e.comment);
-			t.includes("\n") ? (n.push("..."), n.push(I(t, ""))) : n.push(`... ${t}`);
+			t.includes("\n") ? (n.push("..."), n.push(F(t, ""))) : n.push(`... ${t}`);
 		} else n.push("...");
 	} else {
 		let t = e.comment;
-		t && o && (t = t.replace(/^\n+/, "")), t && ((!o || s) && n[n.length - 1] !== "" && n.push(""), n.push(I(a(t), "")));
+		t && o && (t = t.replace(/^\n+/, "")), t && ((!o || s) && n[n.length - 1] !== "" && n.push(""), n.push(F(a(t), "")));
 	}
 	return n.join("\n") + "\n";
 }
@@ -1826,10 +1826,10 @@ var Qt = class e {
 	}
 	createAlias(e, t) {
 		if (!e.anchor) {
-			let n = ie(this);
-			e.anchor = !t || n.has(t) ? ae(t || "a", n) : t;
+			let n = ae(this);
+			e.anchor = !t || n.has(t) ? oe(t || "a", n) : t;
 		}
-		return new N(e.anchor);
+		return new ue(e.anchor);
 	}
 	createNode(e, t, n) {
 		let r;
@@ -1838,7 +1838,7 @@ var Qt = class e {
 			let e = t.filter((e) => typeof e == "number" || e instanceof String || e instanceof Number).map(String);
 			e.length > 0 && (t = t.concat(e)), r = t;
 		} else n === void 0 && t && (n = t, t = void 0);
-		let { aliasDuplicateObjects: i, anchorPrefix: a, flow: o, keepUndefined: s, onTagObj: c, tag: l } = n ?? {}, { onAnchor: u, setAnchors: d, sourceObjects: f } = oe(this, a || "a"), p = {
+		let { aliasDuplicateObjects: i, anchorPrefix: a, flow: o, keepUndefined: s, onTagObj: c, tag: l } = n ?? {}, { onAnchor: u, setAnchors: d, sourceObjects: f } = se(this, a || "a"), p = {
 			aliasDuplicateObjects: i ?? !0,
 			keepUndefined: s ?? !1,
 			onAnchor: u,
@@ -1846,7 +1846,7 @@ var Qt = class e {
 			replacer: r,
 			schema: this.schema,
 			sourceObjects: f
-		}, m = pe(e, l, p);
+		}, m = P(e, l, p);
 		return o && y(m) && (m.flow = !0), d(), m;
 	}
 	createPair(e, t, n = {}) {
@@ -1913,9 +1913,9 @@ var Qt = class e {
 			mapAsMap: n === !0,
 			mapKeyWarned: !1,
 			maxAliasCount: typeof r == "number" ? r : 100
-		}, s = M(this.contents, t ?? "", o);
+		}, s = j(this.contents, t ?? "", o);
 		if (typeof i == "function") for (let { count: e, res: t } of o.anchors.values()) i(t, e);
-		return typeof a == "function" ? se(a, { "": s }, "", s) : s;
+		return typeof a == "function" ? ce(a, { "": s }, "", s) : s;
 	}
 	toJSON(e, t) {
 		return this.toJS({
@@ -2304,7 +2304,7 @@ function _n(e, t, n, r, i) {
 		if (r?.collection === s) t.schema.tags.push(Object.assign({}, r, { default: !1 })), c = r;
 		else return r ? i(a, "BAD_COLLECTION_TYPE", `${r.tag} used for ${s} collection, but expects ${r.collection ?? "scalar"}`, !0) : i(a, "TAG_RESOLVE_FAILED", `Unresolved tag: ${o}`, !0), gn(e, t, n, i, o);
 	}
-	let l = gn(e, t, n, i, o, c), u = c.resolve?.(l, (e) => i(a, "TAG_RESOLVE_FAILED", e), t.options) ?? l, d = b(u) ? u : new P(u);
+	let l = gn(e, t, n, i, o, c), u = c.resolve?.(l, (e) => i(a, "TAG_RESOLVE_FAILED", e), t.options) ?? l, d = b(u) ? u : new N(u);
 	return d.range = l.range, d.tag = o, c?.format && (d.format = c.format), d;
 }
 //#endregion
@@ -2321,7 +2321,7 @@ function vn(e, t, n) {
 			r
 		]
 	};
-	let a = i.mode === ">" ? P.BLOCK_FOLDED : P.BLOCK_LITERAL, o = t.source ? bn(t.source) : [], s = o.length;
+	let a = i.mode === ">" ? N.BLOCK_FOLDED : N.BLOCK_LITERAL, o = t.source ? bn(t.source) : [], s = o.length;
 	for (let e = o.length - 1; e >= 0; --e) {
 		let t = o[e][1];
 		if (t === "" || t === "\r") s = e;
@@ -2362,7 +2362,7 @@ function vn(e, t, n) {
 			let e = `Block scalar lines must not be less indented than their ${i.indent ? "explicit indentation indicator" : "first line"}`;
 			n(l - r.length - (s ? 2 : 1), "BAD_INDENT", e), t = "";
 		}
-		a === P.BLOCK_LITERAL ? (d += f + t.slice(c) + r, f = "\n") : t.length > c || r[0] === "	" ? (f === " " ? f = "\n" : !p && f === "\n" && (f = "\n\n"), d += f + t.slice(c) + r, f = "\n", p = !0) : r === "" ? f === "\n" ? d += "\n" : f = "\n" : (d += f + r, f = " ", p = !1);
+		a === N.BLOCK_LITERAL ? (d += f + t.slice(c) + r, f = "\n") : t.length > c || r[0] === "	" ? (f === " " ? f = "\n" : !p && f === "\n" && (f = "\n\n"), d += f + t.slice(c) + r, f = "\n", p = !0) : r === "" ? f === "\n" ? d += "\n" : f = "\n" : (d += f + r, f = " ", p = !1);
 	}
 	switch (i.chomp) {
 		case "-": break;
@@ -2438,13 +2438,13 @@ function xn(e, t, n) {
 	let { offset: r, type: i, source: a, end: o } = e, s, c, l = (e, t, i) => n(r + e, t, i);
 	switch (i) {
 		case "scalar":
-			s = P.PLAIN, c = Sn(a, l);
+			s = N.PLAIN, c = Sn(a, l);
 			break;
 		case "single-quoted-scalar":
-			s = P.QUOTE_SINGLE, c = Cn(a, l);
+			s = N.QUOTE_SINGLE, c = Cn(a, l);
 			break;
 		case "double-quoted-scalar":
-			s = P.QUOTE_DOUBLE, c = Tn(a, l);
+			s = N.QUOTE_DOUBLE, c = Tn(a, l);
 			break;
 		/* istanbul ignore next should not happen */
 		default: return n(e, "UNEXPECTED_TOKEN", `Expected a flow scalar value, but found: ${i}`), {
@@ -2583,10 +2583,10 @@ function kn(e, t, n, r) {
 	let d;
 	try {
 		let a = l.resolve(i, (e) => r(n ?? t, "TAG_RESOLVE_FAILED", e), e.options);
-		d = _(a) ? a : new P(a);
+		d = _(a) ? a : new N(a);
 	} catch (e) {
 		let a = e instanceof Error ? e.message : String(e);
-		r(n ?? t, "TAG_RESOLVE_FAILED", a), d = new P(i);
+		r(n ?? t, "TAG_RESOLVE_FAILED", a), d = new N(i);
 	}
 	return d.range = s, d.source = i, a && (d.type = a), c && (d.tag = c), l.format && (d.format = l.format), o && (d.comment = o), d;
 }
@@ -2673,7 +2673,7 @@ function Fn(e, t, n, r, { spaceBefore: i, comment: a, anchor: o, tag: s, end: c
 	return o && (u.anchor = o.source.substring(1), u.anchor === "" && l(o, "BAD_ALIAS", "Anchor cannot be an empty string")), i && (u.spaceBefore = !0), a && (u.comment = a, u.range[2] = c), u;
 }
 function In({ options: e }, { offset: t, source: n, end: r }, i) {
-	let a = new N(n.substring(1));
+	let a = new ue(n.substring(1));
 	a.source === "" && i(t, "BAD_ALIAS", "Alias cannot be an empty string"), a.source.endsWith(":") && i(t + n.length - 1, "BAD_ALIAS", "Alias ending in : is ambiguous", !0);
 	let o = t + n.length, s = fn(r, o, e.strict, i);
 	return a.range = [
@@ -4253,7 +4253,7 @@ function Tr(e, t, n) {
 //#endregion
 //#region node_modules/yaml/browser/index.js
 var Er = /* @__PURE__ */ a({
-	Alias: () => N,
+	Alias: () => ue,
 	CST: () => tr,
 	Composer: () => Bn,
 	Document: () => Qt,
@@ -4261,7 +4261,7 @@ var Er = /* @__PURE__ */ a({
 	LineCounter: () => fr,
 	Pair: () => z,
 	Parser: () => br,
-	Scalar: () => P,
+	Scalar: () => N,
 	Schema: () => Xt,
 	YAMLError: () => en,
 	YAMLMap: () => B,
@@ -4720,19 +4720,19 @@ function Lr(e) {
 			O[e] = W(O[e] || {}, t);
 		});
 	});
-	let ee = m ? {
+	let k = m ? {
 		...m,
 		fields: O
-	} : null, k = h?.fields || {};
+	} : null, ee = h?.fields || {};
 	Array.isArray(h?.fieldSets) && h?.fieldSets.forEach((e) => {
 		let t = _[e] || {}, n = t.fields || t, r = v(n);
 		Object.entries(r).forEach(([e, t]) => {
-			k[e] = W(k[e] || {}, t);
+			ee[e] = W(ee[e] || {}, t);
 		});
 	});
 	let te = h ? {
 		...h,
-		fields: k
+		fields: ee
 	} : null;
 	return {
 		nodes: b,
@@ -4744,7 +4744,7 @@ function Lr(e) {
 		fieldSets: _,
 		nodeTemplate: f || null,
 		treeTemplate: p || null,
-		channelTemplate: ee,
+		channelTemplate: k,
 		userTemplate: te
 	};
 }
@@ -6458,7 +6458,7 @@ function Ci(e, t = null) {
 	return n;
 }
 function wi(e) {
-	if (e == null || e === "null" || e === "" || typeof e == "string" && e.startsWith("draft-")) return null;
+	if (e == null || e === "null" || e === "" || e === 0 || e === "0" || typeof e == "string" && e.startsWith("draft-")) return null;
 	let t = Number(e);
 	return isNaN(t) ? null : t;
 }
@@ -6549,31 +6549,27 @@ xi.get("/tree.json", async (e) => {
 		if (a === "create") {
 			let r = f.slug || n.slug || o, a = r ? String(r).toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/(^-|-$)/g, "") : null;
 			if (a) {
-				let r = m === null ? "tn.parentId IS NULL" : "tn.parentId = ?", o = n.contentId || n.id ? Number(n.contentId || n.id) : null, s = `
-          SELECT 1 
-          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 = '')
-        `, c = m === null ? [i, a] : [
+				let r = "", o = [];
+				m === null ? (r = "\n            SELECT 1 \n            FROM tree_nodes tn\n            INNER JOIN content_nodes cn ON tn.contentId = cn.id\n            WHERE tn.treeId = ? \n              AND tn.parentId IS NULL\n              AND cn.slug = ?\n              AND (cn.deletedAt IS NULL OR cn.deletedAt = '')\n          ", o = [i, a]) : (r = "\n            SELECT 1 \n            FROM tree_nodes tn\n            INNER JOIN content_nodes cn ON tn.contentId = cn.id\n            WHERE tn.treeId = ? \n              AND tn.parentId = ?\n              AND cn.slug = ?\n              AND (cn.deletedAt IS NULL OR cn.deletedAt = '')\n          ", o = [
 					i,
 					m,
 					a
-				];
-				if (o && !isNaN(o) && (s += " AND cn.id != ?", c.push(o)), s += " LIMIT 1", (await X(t, s, c)).length > 0) return e.json({
+				]);
+				let s = n.contentId || n.id ? Number(n.contentId || n.id) : null;
+				if (s && !isNaN(s) && (r += " AND cn.id != ?", o.push(s)), r += " LIMIT 1", (await X(t, r, o)).length > 0) return e.json({
 					error: `The slug '${a}' is already in use by another page in this section.`,
 					field: "slug"
 				}, 409);
 			}
 			let c = JSON.stringify(f), l = 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 || "page", o || "Untitled", a, f.language || n.language || "en", p, c, h, h), u = Number(l.lastInsertRowid);
 			await Z(t, "DELETE FROM tree_nodes WHERE treeId = ? AND contentId = ?", [i, u]);
-			let d = m === null ? "parentId IS NULL" : "parentId = ?", g = m === null ? [i] : [i, m], _ = (await X(t, `SELECT COALESCE(MAX(sortOrder), -1) + 1 as nextSort FROM tree_nodes WHERE treeId = ? AND ${d}`, g))[0]?.nextSort ?? 0, v = await t.prepare("\n        INSERT INTO tree_nodes (treeId, contentId, parentId, sortOrder)\n        VALUES (?, ?, ?, ?)\n      ").run(i, u, m, _), y = Number(v.lastInsertRowid), 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) => [u, e]);
+			let d = [];
+			d = m === null ? await X(t, "SELECT COALESCE(MAX(sortOrder), -1) + 1 as nextSort FROM tree_nodes WHERE treeId = ? AND parentId IS NULL", [i]) : await X(t, "SELECT COALESCE(MAX(sortOrder), -1) + 1 as nextSort FROM tree_nodes WHERE treeId = ? AND parentId = ?", [i, m]);
+			let g = d[0]?.nextSort ?? 0, _ = await t.prepare("\n        INSERT INTO tree_nodes (treeId, contentId, parentId, sortOrder)\n        VALUES (?, ?, ?, ?)\n      ").run(i, u, m, g), v = Number(_.lastInsertRowid), y = [];
+			n.channels && Array.isArray(n.channels) ? y = n.channels : n.channelId && n.channelId !== "all" && (y = [n.channelId]);
+			let b = [...new Set(y)].filter((e) => e && e !== "all").map((e) => Number(e));
+			if (b.length > 0) {
+				let e = b.map(() => "(?, ?)").join(", "), n = b.flatMap((e) => [u, e]);
 				await Z(t, `INSERT OR IGNORE INTO node_channels (nodeId, channelId) VALUES ${e}`, n);
 			}
 			return Si(e, async () => {
@@ -6581,7 +6577,7 @@ xi.get("/tree.json", async (e) => {
 			}), e.json({
 				success: !0,
 				id: u,
-				treeNodeId: y,
+				treeNodeId: v,
 				status: "draft"
 			}, 201);
 		}
@@ -6589,27 +6585,17 @@ xi.get("/tree.json", async (e) => {
 			if (!l) return e.json({ error: "contentId is required for attach" }, 400);
 			let n = (await X(t, "SELECT slug FROM content_nodes WHERE id = ?", [l]))[0];
 			if (n && n.slug) {
-				let r = m === null ? "tn.parentId IS NULL" : "tn.parentId = ?", a = m === null ? [
+				let r = "", a = [];
+				if (m === null ? (r = "\n            SELECT 1 \n            FROM tree_nodes tn\n            INNER JOIN content_nodes cn ON tn.contentId = cn.id\n            WHERE tn.treeId = ? \n              AND tn.parentId IS NULL\n              AND cn.slug = ?\n              AND cn.id != ?\n              AND (cn.deletedAt IS NULL OR cn.deletedAt = '')\n            LIMIT 1\n          ", a = [
 					i,
 					n.slug,
 					l
-				] : [
+				]) : (r = "\n            SELECT 1 \n            FROM tree_nodes tn\n            INNER JOIN content_nodes cn ON tn.contentId = cn.id\n            WHERE tn.treeId = ? \n              AND tn.parentId = ?\n              AND cn.slug = ?\n              AND cn.id != ?\n              AND (cn.deletedAt IS NULL OR cn.deletedAt = '')\n            LIMIT 1\n          ", a = [
 					i,
 					m,
 					n.slug,
 					l
-				];
-				if ((await X(t, `
-          SELECT 1 
-          FROM tree_nodes tn
-          INNER JOIN content_nodes cn ON tn.contentId = cn.id
-          WHERE tn.treeId = ? 
-            AND ${r}
-            AND cn.slug = ?
-            AND cn.id != ?
-            AND (cn.deletedAt IS NULL OR cn.deletedAt = '')
-          LIMIT 1
-        `, a)).length > 0) return e.json({
+				]), (await X(t, r, a)).length > 0) return e.json({
 					error: `Cannot attach. The slug '${n.slug}' is already in use by another page in this section.`,
 					field: "slug"
 				}, 409);
@@ -6826,9 +6812,9 @@ Ei.get("/", async (e) => {
 			O = Number(e.lastInsertRowid);
 		}
 		await t.prepare("DELETE FROM channel_trees WHERE channelId = ?").run(O);
-		let ee = (Array.isArray(f) ? f : []).filter((e) => e && (e.treeId !== void 0 || e.id !== void 0) && e.key);
-		if (ee.length > 0) for (let e = 0; e < ee.length; e += 20) {
-			let n = ee.slice(e, e + 20), r = n.map(() => "(?, ?, ?, ?)").join(", "), i = n.flatMap((e) => {
+		let k = (Array.isArray(f) ? f : []).filter((e) => e && (e.treeId !== void 0 || e.id !== void 0) && e.key);
+		if (k.length > 0) for (let e = 0; e < k.length; e += 20) {
+			let n = k.slice(e, e + 20), r = n.map(() => "(?, ?, ?, ?)").join(", "), i = n.flatMap((e) => {
 				let t = e.treeId === void 0 ? e.id : e.treeId;
 				return [
 					O,
@@ -7035,17 +7021,8 @@ var Di = {
 			inTree: !1,
 			hasCanvas: !0,
 			directLinking: !0,
-			regions: { content: { label: "Content" } },
-			allowedBlocks: [
-				"header",
-				"hero",
-				"text",
-				"image_card",
-				"header_image",
-				"two-column",
-				"three-column",
-				"single_image"
-			],
+			defaultLayout: "content",
+			allowedBlocks: "*",
 			tabs: {
 				settings: {
 					label: "Article",
@@ -12243,8 +12220,8 @@ async function Ji(e, t, n) {
 		let l = "ORDER BY updatedAt DESC";
 		o === "published_desc" || o === "createdAt" ? l = "ORDER BY createdAt DESC" : o === "title_asc" && (l = "ORDER BY LOWER(title) ASC");
 		try {
-			let n = await e.prepare(`SELECT id, title, slug, language, dataJson, createdAt, updatedAt ${s} ${l} LIMIT ?`).all(...c, a), r = Array.isArray(n) ? n : n?.results || [];
-			t.data.initialItems = r.map((e) => {
+			let n = await Promise.resolve(e.prepare(`SELECT id, title, slug, language, dataJson, createdAt, updatedAt ${s} ${l} LIMIT ?`).all(...c, a));
+			t.data.initialItems = (n || []).map((e) => {
 				let t = {};
 				if (e.dataJson) try {
 					t = typeof e.dataJson == "string" ? JSON.parse(e.dataJson) : e.dataJson;
@@ -12267,66 +12244,78 @@ async function Ji(e, t, n) {
 	}));
 }
 async function Yi(e, t, n, r, i = !1, a) {
-	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    ) 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 = [];
-	if (!i) {
-		let t = await e.prepare(`SELECT * FROM content_blocks WHERE contentId IN (${l}) ORDER BY contentId ASC, sortOrder ASC`).all(...c);
-		p = Array.isArray(t) ? t : t?.results || [];
-	}
-	let m = /* @__PURE__ */ new Map(), h = /* @__PURE__ */ new Map();
-	for (let e of f) {
-		let t = String(e.contentId);
-		m.has(t) || m.set(t, []), m.get(t).push(e);
-	}
-	for (let e of p) {
-		let t = String(e.contentId);
-		h.has(t) || h.set(t, []), h.get(t).push(e);
-	}
-	for (let t of s) {
-		let a = m.get(String(t.contentId)) || [];
-		if (a.length === 0 && !i && (a = h.get(String(t.contentId)) || []), a.filter((e) => e.region === n).length === 0) continue;
-		let o = /* @__PURE__ */ new Set([n]), s = !0;
-		for (; s;) {
-			s = !1;
-			for (let e of a) {
-				if (!o.has(e.region)) continue;
+	if (!t || t === "0" || t === 0 || t === "null") return { blocks: [] };
+	try {
+		let o = await Promise.resolve(e.prepare("\n      WITH RECURSIVE ancestor_path(id, contentId, title, slug, parentId, level) AS (\n        SELECT t.id, t.contentId, c.title, c.slug, t.parentId, 0 \n        FROM tree_nodes t \n        INNER JOIN content_nodes c ON t.contentId = c.id \n        WHERE t.id = ? OR c.id = ?\n        \n        UNION ALL\n        \n        SELECT t.id, t.contentId, c.title, c.slug, t.parentId, ap.level + 1 \n        FROM tree_nodes t \n        INNER JOIN content_nodes c ON t.contentId = c.id \n        INNER JOIN ancestor_path ap ON t.id = ap.parentId\n        WHERE ap.parentId IS NOT NULL AND ap.parentId != 0 AND ap.parentId != '0' AND ap.parentId != 'null' AND ap.level < 20\n      ) SELECT * FROM ancestor_path ORDER BY level ASC\n    ").all(t, t));
+		if (!o || o.length === 0) return { blocks: [] };
+		let s = o.map((e) => e.contentId).filter((e) => e != null);
+		if (s.length === 0) return { blocks: [] };
+		let c = s.map(() => "?").join(","), l = +!!i, u = await Promise.resolve(e.prepare(`SELECT * FROM content_blocks WHERE contentId IN (${c}) AND isDraft = ? ORDER BY contentId ASC, sortOrder ASC`).all(...s, l)), d = [];
+		i || (d = await Promise.resolve(e.prepare(`SELECT * FROM content_blocks WHERE contentId IN (${c}) ORDER BY contentId ASC, sortOrder ASC`).all(...s)));
+		let f = /* @__PURE__ */ new Map(), p = /* @__PURE__ */ new Map();
+		for (let e of u) {
+			let t = String(e.contentId);
+			f.has(t) || f.set(t, []), f.get(t).push(e);
+		}
+		for (let e of d) {
+			let t = String(e.contentId);
+			p.has(t) || p.set(t, []), p.get(t).push(e);
+		}
+		for (let t of o) {
+			let o = f.get(String(t.contentId)) || [];
+			if (o.length === 0 && !i && (o = p.get(String(t.contentId)) || []), o.filter((e) => e.region === n).length === 0) continue;
+			let s = /* @__PURE__ */ new Set([n]), c = !0;
+			for (; c;) {
+				c = !1;
+				for (let e of o) {
+					if (!s.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 o) !e.region || s.has(e.region) || (e.region.startsWith(`${n}-`) || e.region.startsWith(`${n}_`) || r && r !== "undefined" && r !== "null" && (e.region.startsWith(`${r}-`) || e.region.startsWith(`${r}_`) || e.region.startsWith(r))) && (s.add(e.region), c = !0);
+				}
+			}
+			let l = o.filter((e) => s.has(e.region)), u = [];
+			for (let e of l) {
 				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) !e.region || o.has(e.region) || (e.region.startsWith(`${n}-`) || e.region.startsWith(`${n}_`) || r && r !== "undefined" && r !== "null" && (e.region.startsWith(`${r}-`) || e.region.startsWith(`${r}_`) || e.region.startsWith(r))) && (o.add(e.region), s = !0);
+				let n = t.hidden === !0 || t.hidden === 1 || t.hidden === "1" || t.hidden === "true", a = qi(t.startShowingAt, t.stopShowingAt);
+				if (!i && (n || !a)) continue;
+				let o = e.elementType || e.componentId || "text-block", s = r.blocks?.[o]?.fields || r.elements?.[o]?.fields || r.components?.[o]?.fields || {}, c = String(t.blockId || t._instanceId || (t.id && !String(t.id).startsWith("ast_") ? t.id : null) || e.blockId || e.id), l = Xi(t, s);
+				u.push({
+					original: e,
+					data: l,
+					compId: o,
+					resolvedBlockId: c
+				});
 			}
-		}
-		let c = await Promise.all(a.filter((e) => o.has(e.region)).map(async (t) => {
-			let a = {};
-			try {
-				a = (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 = qi(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 && !String(a.id).startsWith("ast_") ? a.id : null) || t.blockId || t.id), d = Xi(a, l);
-			return d = await Xr(e, d), d = Zi(d), d.blockId = u, {
-				region: t.region || n,
-				block: {
-					instanceId: t.id,
-					blockId: u,
-					componentId: c,
-					data: d
-				}
+			let d = u.map((e) => e.data);
+			d.length > 0 && (d = await Xr(e, d), d = Zi(d), a && (d = await Qi(e, d, a)));
+			let m = {};
+			for (let e = 0; e < u.length; e++) {
+				let t = u[e], r = d[e];
+				r.blockId = t.resolvedBlockId;
+				let i = t.original.region || n;
+				m[i] || (m[i] = []), m[i].push({
+					instanceId: t.original.id,
+					blockId: t.resolvedBlockId,
+					componentId: t.compId,
+					data: r
+				});
+			}
+			if (m[n] && m[n].length > 0) return {
+				blocks: m[n],
+				subRegions: m,
+				inheritedFromId: String(t.contentId),
+				inheritedFromTitle: t.title || t.slug
 			};
-		})), 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],
-			subRegions: l,
-			inheritedFromId: String(t.contentId),
-			inheritedFromTitle: t.title || t.slug
-		};
+		}
+	} catch (e) {
+		console.error("[CMS Public API] resolveParentBlocks error:", e);
 	}
 	return { blocks: [] };
 }
@@ -12375,9 +12364,9 @@ async function Qi(e, t, n) {
 		for (let e of t.matchAll(/(?:#node:|data-node-id\s*=\s*["'])([^"'\s>]+)/gi)) i.add(e[1]);
 		for (let e of t.matchAll(/(?:#asset:|data-asset-id\s*=\s*["'])([^"'\s>]+)/gi)) a.add(e[1]);
 		if (i.size === 0 && a.size === 0) return t;
-		let o = i.size > 0 ? Array.isArray(await e.prepare(`SELECT id, slug FROM content_nodes WHERE id IN (${Array.from(i).map(() => "?").join(",")})`).all(...i)) ? await e.prepare(`SELECT id, slug FROM content_nodes WHERE id IN (${Array.from(i).map(() => "?").join(",")})`).all(...i) : (await e.prepare(`SELECT id, slug FROM content_nodes WHERE id IN (${Array.from(i).map(() => "?").join(",")})`).all(...i)).results || [] : [], s = /* @__PURE__ */ new Map();
+		let o = i.size > 0 ? await Promise.resolve(e.prepare(`SELECT id, slug FROM content_nodes WHERE id IN (${Array.from(i).map(() => "?").join(",")})`).all(...Array.from(i))) : [], s = /* @__PURE__ */ new Map();
 		for (let e of o) s.set(String(e.id), String(e.slug || "").replace(/^\/+|\/+$/g, ""));
-		let c = a.size > 0 ? Array.isArray(await e.prepare(`SELECT id, cdnUrl, storageKeyPrivate FROM assets WHERE id IN (${Array.from(a).map(() => "?").join(",")})`).all(...a)) ? await e.prepare(`SELECT id, cdnUrl, storageKeyPrivate FROM assets WHERE id IN (${Array.from(a).map(() => "?").join(",")})`).all(...a) : (await e.prepare(`SELECT id, cdnUrl, storageKeyPrivate FROM assets WHERE id IN (${Array.from(a).map(() => "?").join(",")})`).all(...a)).results || [] : [], l = /* @__PURE__ */ new Map();
+		let c = a.size > 0 ? await Promise.resolve(e.prepare(`SELECT id, cdnUrl, storageKeyPrivate FROM assets WHERE id IN (${Array.from(a).map(() => "?").join(",")})`).all(...Array.from(a))) : [], l = /* @__PURE__ */ new Map();
 		for (let e of c) l.set(String(e.id), e.cdnUrl || (e.storageKeyPrivate ? `/media/${e.storageKeyPrivate}` : ""));
 		let u = /* @__PURE__ */ new Map(), d = /<a\s+([^>]+)>/gi;
 		return await Promise.all(Array.from(t.matchAll(d)).map(async (t) => {
@@ -12436,14 +12425,14 @@ async function $i(e, t, n) {
 async function ea(e, t, n, r) {
 	let i = Gi(t, n);
 	if (r.treeEdges.has(i)) return r.treeEdges.get(i);
-	let a = e.prepare("SELECT id as treeNodeId FROM tree_nodes WHERE contentId = ? AND treeId = ? LIMIT 1").get(t, n);
-	return r.treeEdges.set(i, Promise.resolve(a)), a;
+	let a = Promise.resolve(e.prepare("SELECT id as treeNodeId FROM tree_nodes WHERE contentId = ? AND treeId = ? LIMIT 1").get(t, n));
+	return r.treeEdges.set(i, a), a;
 }
 async function ta(e, t, n) {
 	let r = String(t);
 	if (n.nodeSlugs.has(r)) return n.nodeSlugs.get(r);
 	let i = (async () => {
-		let n = await e.prepare("SELECT slug FROM content_nodes WHERE id = ?").get(t);
+		let n = await Promise.resolve(e.prepare("SELECT slug FROM content_nodes WHERE id = ?").get(t));
 		return n?.slug ? String(n.slug).replace(/^\/+|\/+$/g, "") : void 0;
 	})();
 	return n.nodeSlugs.set(r, i), i;
@@ -12452,7 +12441,7 @@ async function na(e, t, n) {
 	let r = String(t);
 	if (n.assetUrls.has(r)) return n.assetUrls.get(r);
 	let i = (async () => {
-		let n = await e.prepare("SELECT cdnUrl, storageKeyPrivate FROM assets WHERE id = ?").get(t);
+		let n = await Promise.resolve(e.prepare("SELECT cdnUrl, storageKeyPrivate FROM assets WHERE id = ?").get(t));
 		return n?.cdnUrl || (n?.storageKeyPrivate ? `/media/${n.storageKeyPrivate}` : "#");
 	})();
 	return n.assetUrls.set(r, i), i;
@@ -12489,23 +12478,29 @@ function ra(e) {
 	};
 }
 async function ia(e, t, n, r) {
-	if (!t) return "";
+	if (!t || t === "0" || t === "null") return "/home";
 	let i = Gi(t, n);
 	if (r && r.fullPath.has(i)) return r.fullPath.get(i);
 	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      ) 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);
+		try {
+			let r = await Promise.resolve(e.prepare("\n        WITH RECURSIVE ancestor_path(id, parentId, slug, level) AS (\n          SELECT t.id, t.parentId, c.slug, 0 \n          FROM tree_nodes t \n          INNER JOIN content_nodes c ON t.contentId = c.id \n          WHERE t.id = ? AND t.treeId = ?\n          \n          UNION ALL\n          \n          SELECT t.id, t.parentId, c.slug, ap.level + 1 \n          FROM tree_nodes t \n          INNER JOIN content_nodes c ON t.contentId = c.id \n          INNER JOIN ancestor_path ap ON t.id = ap.parentId \n          WHERE t.treeId = ? \n            AND ap.parentId IS NOT NULL \n            AND ap.parentId != 0 \n            AND ap.parentId != '0'\n            AND ap.parentId != 'null' \n            AND ap.level < 20\n        ) SELECT slug FROM ancestor_path ORDER BY level DESC\n      ").all(t, n, n));
+			if (!r || r.length === 0) return "/home";
+			let i = [];
+			for (let e of r) {
+				let t = (e.slug || "").replace(/^\/+|\/+$/g, "");
+				t && i.push(t);
+			}
+			return "/" + i.join("/");
+		} catch (e) {
+			return console.error("[CMS Public API] resolveNodeFullPath error:", e), "/home";
 		}
-		return "/" + a.join("/");
 	})();
 	return r && r.fullPath.set(i, a), a;
 }
 async function aa(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      ) 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([
+	if (t && t !== "0" && t !== 0 && t !== "null") try {
+		let n = await Promise.resolve(e.prepare("\n        WITH RECURSIVE ancestor_path(id, contentId, title, slug, parentId, level) AS (\n          SELECT t.id, t.contentId, c.title, c.slug, t.parentId, 0 \n          FROM tree_nodes t \n          INNER JOIN content_nodes c ON t.contentId = c.id \n          WHERE t.id = ? OR c.id = ?\n          \n          UNION ALL\n          \n          SELECT t.id, t.contentId, c.title, c.slug, t.parentId, ap.level + 1 \n          FROM tree_nodes t \n          INNER JOIN content_nodes c ON t.contentId = c.id \n          INNER JOIN ancestor_path ap ON t.id = ap.parentId\n          WHERE ap.parentId IS NOT NULL AND ap.parentId != 0 AND ap.parentId != '0' AND ap.parentId != 'null' AND ap.level < 20\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 = /* @__PURE__ */ new Set([
 			"subpageLayoutId",
 			"layoutId",
 			"slug",
@@ -12519,22 +12514,24 @@ async function aa(e, t, n, r, i) {
 			"hidden",
 			"status"
 		]);
-		for (let e of i) {
+		for (let e of n) {
 			let t = r && e.draftDataJson ? e.draftDataJson : e.dataJson || e.draftDataJson;
 			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" && !i.has(t) && !t.startsWith("_") && a[t] === void 0 && (a[t] = n);
 			} catch {}
 		}
+	} catch (e) {
+		console.error("[CMS Public API] resolveInheritedNodeData error:", e);
 	}
-	if (!o) {
-		let t = await e.prepare("SELECT dataJson FROM trees WHERE id = ?").get(n);
+	if (!o) try {
+		let t = await Promise.resolve(e.prepare("SELECT dataJson FROM trees WHERE id = ?").get(n));
 		if (t?.dataJson) try {
 			let e = typeof t.dataJson == "string" ? JSON.parse(t.dataJson) : t.dataJson;
 			e.subpageLayoutId && e.subpageLayoutId !== "inherit" && (o = e.subpageLayoutId);
 		} catch {}
-	}
+	} catch {}
 	return {
 		resolvedLayoutId: o,
 		inheritedFields: a
@@ -12546,7 +12543,7 @@ function oa(e) {
 }
 Hi.get("/*", async (e) => {
 	try {
-		let t = e.get("db"), n = Wi(), r = new URL(e.req.url).pathname.match(/\/node\/(.+)$/), i = (r ? r[1] : "home").replace(/^\/+|\/+$/g, ""), a = e.req.query("channelId") || e.req.query("channel") || "1", o = e.req.query("lang") || "en", s = e.req.query("preview") === "true", c = isNaN(Number(a)) ? await t.prepare("SELECT * FROM channels WHERE key = ?").get(a) : await t.prepare("SELECT * FROM channels WHERE id = ?").get(Number(a));
+		let t = e.get("db"), n = Wi(), r = new URL(e.req.url).pathname.match(/\/node\/(.+)$/), i = (r ? r[1] : "home").replace(/^\/+|\/+$/g, ""), a = e.req.query("channelId") || e.req.query("channel") || "1", o = e.req.query("lang") || "en", s = e.req.query("preview") === "true", c = isNaN(Number(a)) ? await Promise.resolve(t.prepare("SELECT * FROM channels WHERE key = ?").get(a)) : await Promise.resolve(t.prepare("SELECT * FROM channels WHERE id = ?").get(Number(a)));
 		if (!c) return e.json({ error: `Channel '${a}' not found` }, 404);
 		let l = c.status === "disabled" || c.status === "inactive" || c.isEnabled === 0 || c.isEnabled === !1;
 		if (!s && l) return e.json({ error: `Channel '${c.key || a}' is currently inactive` }, 404);
@@ -12561,108 +12558,120 @@ Hi.get("/*", async (e) => {
       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 = ?"}
-    `, w = u === null ? [x] : [x, u], T = await t.prepare(C).all(...w), E = Array.isArray(T) ? T : T?.results || [];
-		if (E.length > 0) {
-			let e = await Promise.all(E.map(async (e) => ({
+    `, w = u === null ? [x] : [x, u], T = await Promise.resolve(t.prepare(C).all(...w));
+		if (T.length > 0) {
+			let e = await Promise.all(T.map(async (e) => ({
 				candidate: e,
 				calculatedPath: await ia(t, String(e.treeNodeId), String(e.treeId), n)
 			}))), r = S.replace(/^\/+|\/+$/g, "");
 			for (let { candidate: t, calculatedPath: n } of e) {
 				let e = n.replace(/^\/+|\/+$/g, "");
-				if (e === r || r === "home" && (e === "" || e === "home")) {
+				if (e === r || (r === "home" || r === "") && (e === "home" || e === "" || e === "/")) {
 					_ = t, v = t;
 					break;
 				}
 			}
 		}
-		if (!_ && b.length === 1 && (_ = u === null ? await t.prepare("SELECT * FROM content_nodes WHERE slug = ?").get(x) : 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(x, u)), !_ && g && (_ = 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)), !_) return e.json({ error: `Node '${i}' not found for Channel '${a}'` }, 404);
+		if (!_ && b.length === 1 && (_ = u === null ? await Promise.resolve(t.prepare("SELECT * FROM content_nodes WHERE slug = ?").get(x)) : await Promise.resolve(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(x, u))), !_ && g && (_ = u === null ? await Promise.resolve(t.prepare("SELECT * FROM content_nodes WHERE id = ?").get(Number(i))) : await Promise.resolve(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))), !_) return e.json({ error: `Node '${i}' not found for Channel '${a}'` }, 404);
 		if (!v) {
-			let e = y ? [_.id, y] : [_.id];
-			v = await t.prepare(`SELECT id as treeNodeId, treeId, parentId FROM tree_nodes WHERE contentId = ? ${y ? "AND treeId = ?" : ""} LIMIT 1`).get(...e);
+			let e = `SELECT id as treeNodeId, treeId, parentId FROM tree_nodes WHERE contentId = ? ${y ? "AND treeId = ?" : ""} LIMIT 1`, n = y ? [_.id, y] : [_.id];
+			v = await Promise.resolve(t.prepare(e).get(...n));
 		}
-		let D = v?.treeId || y || "main-nav", O = v?.parentId || null, ee = v?.treeNodeId ? await ia(t, String(v.treeNodeId), String(D), n) : `/${(_.slug || "").replace(/^\/+|\/+$/g, "")}`, k = {}, te = s && _.draftDataJson ? _.draftDataJson : _.dataJson || _.draftDataJson;
-		if (te) try {
-			k = typeof te == "string" ? JSON.parse(te) : te;
+		let E = v?.treeId || y || "main-nav", D = v?.parentId || null, O = v?.treeNodeId ? await ia(t, String(v.treeNodeId), String(E), n) : `/${(_.slug || "").replace(/^\/+|\/+$/g, "")}`, k = {}, ee = s && _.draftDataJson ? _.draftDataJson : _.dataJson || _.draftDataJson;
+		if (ee) try {
+			k = typeof ee == "string" ? JSON.parse(ee) : ee;
 		} catch {}
-		let ne = k.nodeType || k.contentType || _.contentType || "page", re = _.contentType || "node", A = h.nodes?.[re] || Object.values(h.nodes || {})[0] || {}, j = { ...A.fields || {} };
-		A.tabs && Object.values(A.tabs).forEach((e) => {
-			Object.assign(j, e.fields || {});
+		let te = k.nodeType || k.contentType || _.contentType || "page", ne = _.contentType || "node", re = h.nodes?.[ne] || Object.values(h.nodes || {})[0] || {}, A = { ...re.fields || {} };
+		re.tabs && Object.values(re.tabs).forEach((e) => {
+			Object.assign(A, e.fields || {});
 		});
-		let ie = +!!s, [ae, oe, se] = await Promise.all([
-			aa(t, O, D, s, j),
-			v?.treeNodeId ? t.prepare("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 FROM tree_nodes t INNER JOIN content_nodes c ON t.contentId = c.id WHERE t.parentId = ? AND t.treeId = ? ORDER BY t.sortOrder ASC").all(v.treeNodeId, D) : Promise.resolve([]),
-			t.prepare("SELECT * FROM content_blocks WHERE contentId = ? AND isDraft = ? ORDER BY sortOrder ASC").all(_.id, ie)
-		]), { resolvedLayoutId: M, inheritedFields: ce } = ae, N = {
+		let ie = +!!s, ae = s ? "COALESCE(c.draftDataJson, c.dataJson, '{}')" : "COALESCE(c.dataJson, c.draftDataJson, '{}')", oe = `
+      SELECT t.id as treeNodeId, t.contentId as id, c.title, c.slug, c.language, c.contentType as nodeType, c.isHidden,
+        json_extract(${ae}, '$.hidden') as extHidden,
+        json_extract(${ae}, '$.startShowingAt') as extStart,
+        json_extract(${ae}, '$.stopShowingAt') as extStop
+      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
+    `, [se, ce, j] = await Promise.all([
+			aa(t, D, E, s, A),
+			v?.treeNodeId ? Promise.resolve(t.prepare(oe).all(v.treeNodeId, E)) : Promise.resolve([]),
+			Promise.resolve(t.prepare("SELECT * FROM content_blocks WHERE contentId = ? AND isDraft = ? ORDER BY sortOrder ASC").all(_.id, ie))
+		]), { resolvedLayoutId: le, inheritedFields: ue } = se, M = {
 			id: _.id,
 			title: _.title,
 			slug: _.slug,
-			path: ee === "" ? "/" : ee,
-			nodeType: ne,
+			path: O === "" ? "/" : O,
+			nodeType: te,
 			createdAt: Ki(_.createdAt),
 			updatedAt: Ki(_.updatedAt),
 			publishedAt: Ki(k.publishedAt || _.createdAt)
-		}, le = k.disabledRegions || {}, ue = k.hidden === !0 || k.hidden === 1 || k.hidden === "1" || k.hidden === "true", P = k.startShowingAt || null, de = k.stopShowingAt || null, fe = Xi(k, j), pe = fe.layoutId || null, me = pe && pe !== "inherit", he = !1, F = null;
-		j.layoutId && (he = !0, j.layoutId.options && Array.isArray(j.layoutId.options) && (F = j.layoutId.options.map((e) => typeof e == "object" ? e.value || e.id : e)));
-		let ge = null;
-		if (he && F && F.length === 1 && F[0] !== "inherit") ge = F[0];
-		else if (!he && A.defaultLayout) ge = A.defaultLayout;
+		}, de = k.disabledRegions || {}, N = k.hidden === !0 || k.hidden === 1 || k.hidden === "1" || k.hidden === "true", fe = k.startShowingAt || null, pe = k.stopShowingAt || null, P = Xi(k, A), me = P.layoutId || null, he = me && me !== "inherit", ge = !1, _e = null;
+		A.layoutId && (ge = !0, A.layoutId.options && Array.isArray(A.layoutId.options) && (_e = A.layoutId.options.map((e) => typeof e == "object" ? e.value || e.id : e)));
+		let F = null;
+		if (ge && _e && _e.length === 1 && _e[0] !== "inherit") F = _e[0];
+		else if (!ge && re.defaultLayout) F = re.defaultLayout;
 		else {
-			let e = me ? pe : M;
-			ge = e && e !== "inherit" && (!F || F.includes(e) || F.includes("inherit")) ? e : A.defaultLayout || null;
-		}
-		for (let [e, t] of Object.entries(ce)) j[e] && (fe[e] === void 0 || fe[e] === null || fe[e] === "" || fe[e] === "inherit") && t !== void 0 && (fe[e] = t);
-		let I = await Xr(t, fe);
-		I = Zi(I), I = await Qi(t, I, n);
-		let _e = ra(I);
-		delete I.socialImage, delete I.fbImage, delete I.xImage, delete I.whatsappImage, _e && (I.socialImages = _e), delete I.id, delete I.title, delete I.slug, delete I.language, delete I.contentType, delete I.nodeType, delete I.createdAt, delete I.updatedAt, delete I.publishedAt, delete I.channelId, delete I.treeId, delete I.path, I.iconName === "" && (I.iconName = null), Object.assign(N, I), A.hasCanvas && (N.layoutId = ge);
-		let ve = Number(_.isHidden) === 1 || ue, ye = !qi(P, de);
+			let e = he ? me : le;
+			F = e && e !== "inherit" && (!_e || _e.includes(e) || _e.includes("inherit")) ? e : re.defaultLayout || null;
+		}
+		for (let [e, t] of Object.entries(ue)) A[e] && (P[e] === void 0 || P[e] === null || P[e] === "" || P[e] === "inherit") && t !== void 0 && (P[e] = t);
+		let ve = Number(_.isHidden) === 1 || N, ye = !qi(fe, pe);
 		if (!s && (ve || ye)) return e.json({ error: "Node is hidden or outside its scheduled publishing window" }, 404);
 		let be = [];
 		if (v?.treeNodeId) {
-			let e = Array.isArray(oe) ? oe : oe?.results || [], t = N.path === "/" ? "" : N.path;
-			be = e.map((e) => {
-				let n = {}, r = s && e.draftDataJson ? e.draftDataJson : e.dataJson;
-				try {
-					n = (typeof r == "string" ? JSON.parse(r) : r) || {};
-				} catch {}
-				let i = Number(e.isHidden) === 1 || n.hidden === !0 || n.hidden === 1 || n.hidden === "1", a = qi(n.startShowingAt, n.stopShowingAt), o = (e.slug || "").replace(/^\/+|\/+$/g, "");
-				return !s && (i || !a) ? null : {
-					treeNodeId: e.treeNodeId,
-					id: e.id,
-					title: e.title,
-					slug: o,
-					language: e.language || "en",
-					path: `${t}/${o}`.replace(/\/+/g, "/"),
-					nodeType: e.nodeType
+			let e = M.path === "/" ? "" : M.path;
+			be = (ce || []).map((t) => {
+				let n = Number(t.isHidden) === 1 || t.extHidden === 1 || t.extHidden === "1" || t.extHidden === "true" || t.extHidden === !0, r = qi(t.extStart, t.extStop), i = (t.slug || "").replace(/^\/+|\/+$/g, "");
+				return !s && (n || !r) ? null : {
+					treeNodeId: t.treeNodeId,
+					id: t.id,
+					title: t.title,
+					slug: i,
+					language: t.language || "en",
+					path: `${e}/${i}`.replace(/\/+/g, "/"),
+					nodeType: t.nodeType
 				};
 			}).filter(Boolean);
 		}
-		N.children = be;
-		let xe = Array.isArray(se) ? se : se?.results || [];
-		if (xe.length === 0 && !s) {
-			let e = await t.prepare("SELECT * FROM content_blocks WHERE contentId = ? ORDER BY sortOrder ASC").all(_.id);
-			xe = Array.isArray(e) ? e : e?.results || [];
-		}
-		let L = {}, R = {}, Se = await Promise.all(xe.map(async (e) => {
-			let r = e.region || "main", i = {};
+		M.children = be;
+		let xe = j || [];
+		xe.length === 0 && !s && (xe = await Promise.resolve(t.prepare("SELECT * FROM content_blocks WHERE contentId = ? ORDER BY sortOrder ASC").all(_.id)));
+		let I = {}, Se = {}, Ce = [];
+		for (let e of xe) {
+			let t = e.region || "main", n = {};
 			try {
-				i = (typeof e.dataJson == "string" ? JSON.parse(e.dataJson) : e.dataJson) || {};
+				n = (typeof e.dataJson == "string" ? JSON.parse(e.dataJson) : e.dataJson) || {};
 			} catch {}
-			let a = i.hidden === !0 || i.hidden === 1 || i.hidden === "1" || i.hidden === "true", o = qi(i.startShowingAt, i.stopShowingAt);
-			if (!s && (a || !o)) return null;
-			let c = e.elementType || e.componentId || "text-block", l = h.blocks?.[c]?.fields || h.elements?.[c]?.fields || h.components?.[c]?.fields || {}, u = String(i.blockId || i._instanceId || (i.id && !String(i.id).startsWith("ast_") ? i.id : null) || e.blockId || e.id), d = Xi(i, l);
-			return d = await Xr(t, d), d = Zi(d), d = await Qi(t, d, n), d.blockId = u, {
-				region: r,
-				block: {
-					instanceId: e.id,
-					blockId: u,
-					componentId: c,
-					data: d
-				}
-			};
-		}));
-		for (let e of Se) e && (L[e.region] || (L[e.region] = [], R[e.region] = { isInherited: !1 }), L[e.region].push(e.block));
-		let Ce = {
+			let r = n.hidden === !0 || n.hidden === 1 || n.hidden === "1" || n.hidden === "true", i = qi(n.startShowingAt, n.stopShowingAt);
+			if (!s && (r || !i)) continue;
+			let a = e.elementType || e.componentId || "text-block", o = h.blocks?.[a]?.fields || h.elements?.[a]?.fields || h.components?.[a]?.fields || {}, c = String(n.blockId || n._instanceId || (n.id && !String(n.id).startsWith("ast_") ? n.id : null) || e.blockId || e.id), l = Xi(n, o);
+			Ce.push({
+				original: e,
+				region: t,
+				data: l,
+				compId: a,
+				resolvedBlockId: c
+			});
+		}
+		let L = await Xr(t, {
+			node: P,
+			blocks: Ce.map((e) => e.data)
+		});
+		L = Zi(L), L = await Qi(t, L, n);
+		let R = L.node, we = ra(R);
+		delete R.socialImage, delete R.fbImage, delete R.xImage, delete R.whatsappImage, we && (R.socialImages = we), delete R.id, delete R.title, delete R.slug, delete R.language, delete R.contentType, delete R.nodeType, delete R.createdAt, delete R.updatedAt, delete R.publishedAt, delete R.channelId, delete R.treeId, delete R.path, R.iconName === "" && (R.iconName = null), Object.assign(M, R), re.hasCanvas && (M.layoutId = F);
+		for (let e = 0; e < Ce.length; e++) {
+			let t = Ce[e], n = L.blocks[e];
+			n.blockId = t.resolvedBlockId, I[t.region] || (I[t.region] = [], Se[t.region] = { isInherited: !1 }), I[t.region].push({
+				instanceId: t.original.id,
+				blockId: t.resolvedBlockId,
+				componentId: t.compId,
+				data: n
+			});
+		}
+		let Te = {
 			header: {
 				label: "Header",
 				inherit: "parent"
@@ -12671,33 +12680,33 @@ Hi.get("/*", async (e) => {
 				label: "Footer",
 				inherit: "parent"
 			},
-			...(ge ? h.nodeLayouts?.[ge] || h.layouts?.[ge] : null)?.regions || { main: { label: "Content" } }
+			...(F ? h.nodeLayouts?.[F] || h.layouts?.[F] : null)?.regions || { main: { label: "Content" } }
 		};
-		for (let [e, r] of Object.entries(Ce)) {
-			let i = L[e] && L[e].length > 0, a = !!le[e];
-			if (L[e] || (L[e] = [], R[e] = { isInherited: !1 }), (r?.inherit === "parent" || r?.inherit === !0 || r?.inherit === "true" || e === "header" || e === "footer") && !i && !a && O) {
-				let r = await Yi(t, O, e, h, s, n);
-				if (r.blocks.length > 0 && (L[e] = r.blocks, R[e] = {
+		for (let [e, r] of Object.entries(Te)) {
+			let i = I[e] && I[e].length > 0, a = !!de[e];
+			if (I[e] || (I[e] = [], Se[e] = { isInherited: !1 }), (r?.inherit === "parent" || r?.inherit === !0 || r?.inherit === "true" || e === "header" || e === "footer") && !i && !a && D) {
+				let r = await Yi(t, D, e, h, s, n);
+				if (r.blocks.length > 0 && (I[e] = r.blocks, Se[e] = {
 					isInherited: !0,
 					inheritedFromId: r.inheritedFromId,
 					inheritedFromTitle: r.inheritedFromTitle
-				}, r.subRegions)) for (let [t, n] of Object.entries(r.subRegions)) t !== e && (L[t] = n, R[t] = {
+				}, r.subRegions)) for (let [t, n] of Object.entries(r.subRegions)) t !== e && (I[t] = n, Se[t] = {
 					isInherited: !0,
 					inheritedFromId: r.inheritedFromId,
 					inheritedFromTitle: r.inheritedFromTitle
 				});
 			}
 		}
-		await Promise.all(Object.keys(L).map((e) => Ji(t, L[e], u)));
-		let we = {
+		await Promise.all(Object.keys(I).map((e) => Ji(t, I[e], u)));
+		let Ee = {
 			channelId: u || d,
-			treeId: D,
+			treeId: E,
 			language: _.language || o || "en",
-			node: N,
-			content: L,
-			regionMeta: R
+			node: M,
+			content: I,
+			regionMeta: Se
 		};
-		return !s && !m ? (e.header("X-Cache", "MISS"), Ui(e, f.set(p, we, oa(e)))) : e.header("Cache-Control", "no-store, no-cache, must-revalidate"), e.json(we);
+		return !s && !m ? (e.header("X-Cache", "MISS"), Ui(e, f.set(p, Ee, oa(e)))) : e.header("Cache-Control", "no-store, no-cache, must-revalidate"), e.json(Ee);
 	} catch (t) {
 		console.error("[CMS Public API] Error fetching node by path:", t);
 		let n = e.env?.ENVIRONMENT === "development";