@cbortech/cbor 0.26.5 → 0.26.7

package/dist/{mapEntries-Clr-oNtQ.js → mapEntries-DxrDre2P.js}

@@ -112,7 +112,7 @@ function y(e) {
 	return !!(e.comments?.leading?.length || e.comments?.trailing?.length || e.comments?.dangling?.length);
 }
 function te(e) {
-	return !!(e.comments?.trailing?.length || e.comments?.dangling?.length);
+	return !!e.comments?.dangling?.length;
 }
 function b(e, t) {
 	if (!t) return e.text;
@@ -126,16 +126,21 @@ function b(e, t) {
 	return r;
 }
 function ne(e, t, n) {
-	return (e.comments?.leading ?? []).map((e) => t + b(e, n));
+	let r = e.comments?.leading ?? [], i = r.length;
+	for (; i > 0 && r[i - 1].sameLine;) i--;
+	return {
+		ownLines: r.slice(0, i).map((e) => t + b(e, n)),
+		inlinePrefix: r.slice(i).map((e) => b(e, n) + " ").join("")
+	};
 }
-function re(e, t) {
+function x(e, t) {
 	let n = e.comments?.trailing ?? [];
 	return n.length === 0 ? "" : " " + n.map((e) => b(e, t)).join(" ");
 }
-function ie(e, t, n) {
+function re(e, t, n) {
 	return (e.comments?.dangling ?? []).map((e) => t + b(e, n));
 }
-function ae(e, t = !1) {
+function ie(e, t = !1) {
 	let n = e?.commas ?? "comma", r = n !== "none";
 	return {
 		inlineSep: r ? t ? "," : ", " : " ",
@@ -144,47 +149,69 @@ function ae(e, t = !1) {
 		colSep: t ? ":" : ": "
 	};
 }
-function x(e) {
-	let { options: t, depth: n, openChar: r, closeChar: i, count: a } = e, o = _(t), s = t?.preserveComments, c = typeof s == "string" ? s : void 0, l = o !== null && s && (te(e.node) || e.hasEntryComments()), { inlineSep: u, multilineSep: d, trailSep: f, colSep: p } = ae(t, o === null), m = e.indefiniteLength ? "" : w(t, e.encodingWidth, () => C(BigInt(a))), h = m ? m + " " : "", g = e.indefiniteLength && (t?.encodingIndicators ?? "auto") !== "never", ee = (t) => e.indefiniteLength ? g ? a === 0 ? `${r}_ ${i}` : `${r}_ ${t}${i}` : `${r}${t}${i}` : `${r}${h}${t}${i}`;
+function S(e) {
+	let { options: t, depth: n, openChar: r, closeChar: i, count: a } = e, o = _(t), s = t?.preserveComments, c = typeof s == "string" ? s : void 0, l = o !== null && s && (te(e.node) || e.hasEntryComments()), u = o !== null && !!t?.preserveBlankLines, d = !1;
+	if (u) {
+		for (let t = 0; t < a; t++) if (e.entryLeadingNode(t).blankLineBefore) {
+			d = !0;
+			break;
+		}
+	}
+	let { inlineSep: f, multilineSep: p, trailSep: m, colSep: h } = ie(t, o === null), g = e.eiPosition ?? "open", ee = e.indefiniteLength ? "" : T(t, e.encodingWidth, () => w(e.canonicalCount ? e.canonicalCount() : BigInt(a))), y = g === "open" && ee ? ee + " " : "", b = g === "close" ? ee : "", x = e.indefiniteLength && (t?.encodingIndicators ?? "auto") !== "never", S = (t) => e.indefiniteLength ? x ? a === 0 ? `${r}_ ${i}` : `${r}_ ${t}${i}` : `${r}${t}${i}` : `${r}${y}${t}${i}${b}`;
 	if (o === null || a === 0 && !l) {
 		let t = "";
-		for (let n = 0; n < a; n++) n > 0 && (t += u), t += e.renderEntry(n, p);
-		return ee(t);
+		for (let n = 0; n < a; n++) n > 0 && (t += f), t += e.renderEntry(n, h);
+		return S(t);
 	}
-	let y = null;
-	if (t?.inlineLeafContainers && a > 0 && !l) {
+	let ae = null;
+	if (t?.inlineLeafContainers && a > 0 && !l && !d) {
 		let t = [], n = !0;
 		for (let r = 0; r < a; r++) {
 			if (e.entryIsLeaf && !e.entryIsLeaf(r)) {
 				n = !1;
 				break;
 			}
-			let i = e.renderEntry(r, p);
+			let i = e.renderEntry(r, h);
 			if (t.push(i), i.includes("\n")) {
 				n = !1;
 				break;
 			}
 		}
-		if (n) return ee(t.join(u));
-		y = t;
+		if (n) return S(t.join(f));
+		ae = t;
 	}
-	let b = v(o, n + 1), re = v(o, n), x = e.indefiniteLength ? g ? `${r}_ ` : r : `${r}${h}`, S = [];
+	let oe = v(o, n + 1), se = v(o, n), ce = e.indefiniteLength ? x ? `${r}_ ` : r : `${r}${y}`, C = [];
 	for (let t = 0; t < a; t++) {
-		s && S.push(...ne(e.entryLeadingNode(t), b, c));
-		let n = t < a - 1 ? d : f, r = y?.[t] ?? e.renderEntry(t, p);
-		S.push(`${b}${r}${n}${s ? e.entryTrailing(t, c) : ""}`);
-	}
-	return s && S.push(...ie(e.node, b, c)), `${x}\n${S.join("\n")}\n${re}${i}`;
-}
-var S = typeof (/* @__PURE__ */ new Uint8Array()).toBase64 == "function";
-function oe(e) {
-	if (S) return e.toBase64({ omitPadding: !0 });
+		u && e.entryLeadingNode(t).blankLineBefore && C.push("");
+		let n = "";
+		if (s) {
+			let { ownLines: r, inlinePrefix: i } = ne(e.entryLeadingNode(t), oe, c);
+			C.push(...r), n = i;
+		}
+		let r = t < a - 1 ? p : m, i = ae?.[t] ?? e.renderEntry(t, h);
+		C.push(`${oe}${n}${i}${r}${s ? e.entryTrailing(t, c) : ""}`);
+	}
+	return s && C.push(...re(e.node, oe, c)), `${ce}\n${C.join("\n")}\n${se}${i}${b}`;
+}
+function ae(e, t, n, r, i, a, o) {
+	let s = _(n), c = n?.preserveComments;
+	if (!(s !== null && c && (y(e) || te(t)))) return `${a}${i(r)}${o}`;
+	let l = typeof c == "string" ? c : void 0, u = v(s, r + 1), d = v(s, r), { ownLines: f, inlinePrefix: p } = ne(e, u, l);
+	return `${a}\n${[
+		...f,
+		`${u}${p}${i(r + 1)}${x(e, l)}`,
+		...re(t, u, l)
+	].join("\n")}\n${d}${o}`;
+}
+var oe = typeof (/* @__PURE__ */ new Uint8Array()).toBase64 == "function";
+function se(e) {
+	if (oe) return e.toBase64({ omitPadding: !0 });
 	let t = "";
 	for (let n of e) t += String.fromCharCode(n);
 	return btoa(t).replace(/=/g, "");
 }
-function se(e) {
-	if (S) return e.toBase64({
+function ce(e) {
+	if (oe) return e.toBase64({
 		alphabet: "base64url",
 		omitPadding: !0
 	});
@@ -192,7 +219,7 @@ function se(e) {
 	for (let n of e) t += String.fromCharCode(n);
 	return btoa(t).replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
 }
-var ce = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567", le = "0123456789ABCDEFGHIJKLMNOPQRSTUV";
+var C = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567", le = "0123456789ABCDEFGHIJKLMNOPQRSTUV";
 function ue(e, t) {
 	let n = "", r = 0, i = 0;
 	for (let a of e) for (r = r << 8 | a, i += 8; i >= 5;) i -= 5, n += t[r >> i & 31];
@@ -207,39 +234,82 @@ function de(e) {
 }
 function fe(e, t, n) {
 	if (n === "string") {
-		let t = me(e);
-		if (t != null) return _e(t);
+		let t = _e(e);
+		if (t != null) return be(t);
 	}
 	if (n === "printable-string" || n === void 0) {
-		let t = me(e);
-		if (t != null && !de(t)) return _e(t);
+		let t = _e(e);
+		if (t != null && !de(t)) return be(t);
 	}
 	switch (t) {
-		case "base64": return `b64'${oe(e)}'`;
-		case "base64url": return `b64'${se(e)}'`;
-		case "base32": return `b32'${ue(e, ce)}'`;
+		case "base64": return `b64'${se(e)}'`;
+		case "base64url": return `b64'${ce(e)}'`;
+		case "base32": return `b32'${ue(e, C)}'`;
 		case "base32hex": return `h32'${ue(e, le)}'`;
 		default: return `h'${i(e)}'`;
 	}
 }
-var pe = new TextDecoder("utf-8", { fatal: !0 });
+function pe(e, t) {
+	let n = 0;
+	for (; n < e.length && e[n] !== "'" && e[n] !== "`";) n++;
+	if (n >= e.length) return e;
+	let r = e[n], i = e.lastIndexOf(r);
+	if (i <= n) return e;
+	let a = e.slice(n + 1, i), o = t === "hash-only" ? me(a) : he(a);
+	return e.slice(0, n + 1) + o + e.slice(i);
+}
 function me(e) {
+	let t = "", n = 0;
+	for (; n < e.length;) {
+		if (e[n] === "#") {
+			for (; n < e.length && e[n] !== "\n";) n += e[n] === "\\" && n + 1 < e.length ? 2 : 1;
+			continue;
+		}
+		t += e[n], n++;
+	}
+	return t;
+}
+function he(e) {
+	let t = "", n = 0;
+	for (; n < e.length;) {
+		let r = e[n], i = e[n + 1];
+		if (r === "#" || r === "/" && i === "/") {
+			for (n += r === "#" ? 1 : 2; n < e.length && e[n] !== "\n";) n += e[n] === "\\" && n + 1 < e.length ? 2 : 1;
+			continue;
+		}
+		if (r === "/" && i === "*") {
+			let t = e.indexOf("*/", n + 2);
+			n = t === -1 ? e.length : t + 2;
+			continue;
+		}
+		if (r === "/") {
+			let t = n + 1;
+			for (; t < e.length && e[t] !== "/";) t += e[t] === "\\" && t + 1 < e.length ? 2 : 1;
+			n = t < e.length ? t + 1 : e.length;
+			continue;
+		}
+		t += r, n++;
+	}
+	return t;
+}
+var ge = new TextDecoder("utf-8", { fatal: !0 });
+function _e(e) {
 	try {
-		return pe.decode(e);
+		return ge.decode(e);
 	} catch {
 		return null;
 	}
 }
-function he(e, t) {
+function ve(e, t) {
 	for (let n = 0; n < e.length; n++) {
 		let r = e.charCodeAt(n);
 		if (r === t || r === 92 || r < 32 || r === 127 || r >= 8192 && (r === 8232 || r === 8233 || r >= 8203 && r <= 8205 || r === 65279)) return !0;
 	}
 	return !1;
 }
-function ge(e, t) {
+function ye(e, t) {
 	let n = t.codePointAt(0);
-	if (!he(e, n)) return t + e + t;
+	if (!ve(e, n)) return t + e + t;
 	let r = t;
 	for (let i of e) {
 		let e = i.codePointAt(0);
@@ -264,40 +334,89 @@ function ge(e, t) {
 	}
 	return r + t;
 }
-function _e(e) {
-	return ge(e, "'");
+function be(e) {
+	return ye(e, "'");
 }
-function ve(e) {
-	return ge(e, "'");
+function xe(e) {
+	return ye(e, "'");
 }
-function ye(e) {
-	return ge(e, "\"");
+function Se(e) {
+	return ye(e, "\"");
 }
-function be(e) {
+function Ce(e) {
 	if (isNaN(e)) return "NaN";
 	if (!isFinite(e)) return e > 0 ? "Infinity" : "-Infinity";
 	if (Object.is(e, -0)) return "-0.0";
 	let t = e.toString();
 	return t.includes(".") || t.includes("e") ? t : t + ".0";
 }
-function xe(e, t, n, r) {
+function we(e, t, n, r) {
 	if (r === "never") return "";
 	let i = t ?? n;
 	return r === "always" ? i === "half" ? "_1" : i === "single" ? "_2" : "_3" : t === void 0 || t === n ? "" : t === "half" ? "_1" : t === "single" ? "_2" : "_3";
 }
-function C(e) {
+function w(e) {
 	return e <= 23n ? "i" : e <= 255n ? 0 : e <= 65535n ? 1 : e <= 4294967295n ? 2 : 3;
 }
-function w(e, t, n) {
+function T(e, t, n) {
 	let r = e?.encodingIndicators ?? "auto";
 	return r === "never" ? "" : r === "always" ? `_${t ?? n()}` : t === void 0 ? "" : `_${t}`;
 }
+function E(e, t, n, r, i) {
+	if (!e?.preserveAppSequence || t === void 0 || _(e) === null && /[\r\n]/.test(t)) return "normal";
+	if (n === void 0) return r?.byteString && e?.preserveByteString === !1 || r?.textString && e?.preserveTextString === !1 || r?.rawString && e?.preserveRawString === !1 || r?.concatenation && e?.preserveConcatenation === !1 ? "normal" : "adjusted";
+	let a = e?.preserveComments === !1 || typeof e?.preserveComments == "string" || e?.preserveComments === !0 && _(e) === null, o = e?.encodingIndicators ?? "auto";
+	return e?.preserveNumberFormat === !1 || r?.byteString && e?.preserveByteString === !1 || r?.textString && e?.preserveTextString === !1 || r?.rawString && e?.preserveRawString === !1 || r?.concatenation && e?.preserveConcatenation === !1 || o !== "auto" && i === !1 ? "structural" : o !== "auto" || a ? "source" : "verbatim";
+}
+function Te(e, t, n) {
+	let r = t > 0 ? e[t - 1] : "", i = n < e.length ? e[n] : "", a = (e) => e !== "" && !/[\s,]/.test(e);
+	return a(r) && a(i) ? " " : "";
+}
+function Ee(e, t, n, r) {
+	let i = t?.preserveComments;
+	if (i === void 0 || !n?.length) return e;
+	let a = i === !1 || _(t) === null, o = typeof i == "string" ? i : void 0, s = e, c = [...n].sort((e, t) => t.start - e.start);
+	for (let e of c) {
+		let t = r !== void 0 && e.start >= r ? -2 : 0, n = e.start + t, i = e.end + t, c = a ? Te(s, n, i) : b(e, o);
+		s = s.slice(0, n) + c + s.slice(i);
+	}
+	return s;
+}
+function De(e, t, n, r) {
+	let i = [], a = t?.preserveComments;
+	if (a !== void 0 && n?.length) {
+		let r = a === !1 || _(t) === null, o = typeof a == "string" ? a : void 0;
+		for (let t of n) i.push({
+			start: t.start,
+			end: t.end,
+			replacement: r ? Te(e, t.start, t.end) : b(t, o)
+		});
+	}
+	let o = t?.encodingIndicators ?? "auto";
+	if (o !== "auto" && r) for (let e of r) i.push({
+		start: e.start,
+		end: e.end,
+		replacement: o === "always" ? e.always : e.never
+	});
+	i.sort((e, t) => t.start - e.start || t.end - e.end);
+	let s = e;
+	for (let e of i) s = s.slice(0, e.start) + e.replacement + s.slice(e.end);
+	return s;
+}
+function D(e, t, n, r, i) {
+	let a = e, o;
+	if ((n?.encodingIndicators ?? "auto") === "never" && r !== void 0) {
+		let e = a.slice(0, r);
+		/_[0-3i]$/.test(e) && (o = r - 2, a = e.slice(0, -2) + a.slice(r));
+	}
+	return a = Ee(a, n, i, o), a.replace(/_[0-3i]$/, "") + t;
+}
 //#endregion
 //#region src/utils/float16.ts
-var Se = "getFloat16" in DataView.prototype && "setFloat16" in DataView.prototype, Ce = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(8));
-function T(e) {
-	Ce.setFloat64(0, e, !1);
-	let t = Ce.getUint32(0, !1), n = Ce.getUint32(4, !1), r = t >>> 31 & 1, i = t >>> 20 & 2047, a = t & 1048575;
+var Oe = "getFloat16" in DataView.prototype && "setFloat16" in DataView.prototype, ke = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(8));
+function Ae(e) {
+	ke.setFloat64(0, e, !1);
+	let t = ke.getUint32(0, !1), n = ke.getUint32(4, !1), r = t >>> 31 & 1, i = t >>> 20 & 2047, a = t & 1048575;
 	if (i === 2047) {
 		if (a === 0 && n === 0) return r << 15 | 31744;
 		let e = a >> 10 | (n === 0 ? 0 : 1) || 1;
@@ -318,19 +437,19 @@ function T(e) {
 	let u = o <= 0 ? 0 : o;
 	return r << 15 | u << 10 | s;
 }
-function E(e) {
+function O(e) {
 	let t = e >>> 15 & 1, n = e >>> 10 & 31, r = e & 1023;
 	return n === 31 ? r === 0 ? t ? -Infinity : Infinity : NaN : n === 0 ? r === 0 ? t ? -0 : 0 : (t ? -1 : 1) * 2 ** -14 * (r / 1024) : (t ? -1 : 1) * 2 ** (n - 15) * (1 + r / 1024);
 }
-var we = Se ? (e, t, n, r) => {
+var je = Oe ? (e, t, n, r) => {
 	e.setFloat16(t, n, r);
 } : (e, t, n, r) => {
-	e.setUint16(t, T(n), r);
-}, Te = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(8)), D = new Uint8Array(Te.buffer), Ee = new TextEncoder(), De = typeof Ee.encodeInto == "function";
-function Oe(e) {
+	e.setUint16(t, Ae(n), r);
+}, Me = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(8)), k = new Uint8Array(Me.buffer), Ne = new TextEncoder(), Pe = typeof Ne.encodeInto == "function";
+function Fe(e) {
 	return e <= 23 ? 1 : e <= 255 ? 2 : e <= 65535 ? 3 : e <= 4294967295 ? 5 : 9;
 }
-function ke(e) {
+function Ie(e) {
 	return e === "i" ? 1 : [
 		2,
 		3,
@@ -338,7 +457,7 @@ function ke(e) {
 		9
 	][e];
 }
-var Ae = class {
+var Le = class {
 	buf;
 	len = 0;
 	constructor(e = 256) {
@@ -369,45 +488,45 @@ var Ae = class {
 		t[this.len++] = e >>> 24 & 255, t[this.len++] = e >>> 16 & 255, t[this.len++] = e >>> 8 & 255, t[this.len++] = e & 255;
 	}
 	writeBigUint64(e) {
-		Te.setBigUint64(0, e, !1), this._ensure(8), this.buf.set(D, this.len), this.len += 8;
+		Me.setBigUint64(0, e, !1), this._ensure(8), this.buf.set(k, this.len), this.len += 8;
 	}
 	writeFloat16(e) {
-		we(Te, 0, e, !1), this._ensure(2);
+		je(Me, 0, e, !1), this._ensure(2);
 		let t = this.buf;
-		t[this.len++] = D[0], t[this.len++] = D[1];
+		t[this.len++] = k[0], t[this.len++] = k[1];
 	}
 	writeFloat32(e) {
-		Te.setFloat32(0, e, !1), this._ensure(4);
+		Me.setFloat32(0, e, !1), this._ensure(4);
 		let t = this.buf;
-		t[this.len++] = D[0], t[this.len++] = D[1], t[this.len++] = D[2], t[this.len++] = D[3];
+		t[this.len++] = k[0], t[this.len++] = k[1], t[this.len++] = k[2], t[this.len++] = k[3];
 	}
 	writeFloat64(e) {
-		Te.setFloat64(0, e, !1), this._ensure(8), this.buf.set(D, this.len), this.len += 8;
+		Me.setFloat64(0, e, !1), this._ensure(8), this.buf.set(k, this.len), this.len += 8;
 	}
 	writeTextString(e, t, n) {
-		if (!De) {
-			let r = Ee.encode(t);
-			O(this, e, r.length, n), this.writeBytes(r);
+		if (!Pe) {
+			let r = Ne.encode(t);
+			A(this, e, r.length, n), this.writeBytes(r);
 			return;
 		}
-		let r = n === void 0 ? Oe(t.length) : ke(n);
+		let r = n === void 0 ? Fe(t.length) : Ie(n);
 		this._ensure(9 + 3 * t.length);
-		let { written: i } = Ee.encodeInto(t, this.buf.subarray(this.len + r)), a = n === void 0 ? Oe(i) : r;
-		a !== r && this.buf.copyWithin(this.len + a, this.len + r, this.len + r + i), O(this, e, i, n), this.len += i;
+		let { written: i } = Ne.encodeInto(t, this.buf.subarray(this.len + r)), a = n === void 0 ? Fe(i) : r;
+		a !== r && this.buf.copyWithin(this.len + a, this.len + r, this.len + r + i), A(this, e, i, n), this.len += i;
 	}
 	finish() {
 		return this.buf.slice(0, this.len);
 	}
-}, je = [
+}, Re = [
 	255n,
 	65535n,
 	4294967295n,
 	18446744073709551615n
 ];
-function Me(e) {
-	return e === "i" ? 23n : je[e];
+function ze(e) {
+	return e === "i" ? 23n : Re[e];
 }
-function O(e, t, n, r) {
+function A(e, t, n, r) {
 	if (r === void 0 && typeof n == "number" && n < 4294967296) {
 		n <= 23 ? e.writeByte(t << 5 | n) : n <= 255 ? (e.writeByte(t << 5 | 24), e.writeByte(n)) : n <= 65535 ? (e.writeByte(t << 5 | 25), e.writeUint16(n)) : (e.writeByte(t << 5 | 26), e.writeUint32(n));
 		return;
@@ -419,33 +538,53 @@ function O(e, t, n, r) {
 			e.writeByte(t << 5 | Number(i));
 			return;
 		}
-		if (i > je[r]) throw RangeError(`value ${i} does not fit in encodingWidth _${r} (max ${je[r]})`);
+		if (i > Re[r]) throw RangeError(`value ${i} does not fit in encodingWidth _${r} (max ${Re[r]})`);
 		let n = 24 + r;
 		e.writeByte(t << 5 | n), n === 24 ? e.writeByte(Number(i)) : n === 25 ? e.writeUint16(Number(i)) : n === 26 ? e.writeUint32(Number(i)) : e.writeBigUint64(i);
 		return;
 	}
 	i <= 23n ? e.writeByte(t << 5 | Number(i)) : i <= 255n ? (e.writeByte(t << 5 | 24), e.writeByte(Number(i))) : i <= 65535n ? (e.writeByte(t << 5 | 25), e.writeUint16(Number(i))) : i <= 4294967295n ? (e.writeByte(t << 5 | 26), e.writeUint32(Number(i))) : (e.writeByte(t << 5 | 27), e.writeBigUint64(i));
 }
-function Ne(e, t, n) {
-	let r = new Ae(9);
-	return O(r, e, t, n), r.finish();
+function Be(e, t, n) {
+	let r = new Le(9);
+	return A(r, e, t, n), r.finish();
 }
-var Pe = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(4));
-function Fe(e) {
-	return Object.is(E(T(e)), e);
+var Ve = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(4));
+function He(e) {
+	return Object.is(O(Ae(e)), e);
 }
-function Ie(e) {
-	return Pe.setFloat32(0, e, !1), Object.is(Pe.getFloat32(0, !1), e);
+function Ue(e) {
+	return Ve.setFloat32(0, e, !1), Object.is(Ve.getFloat32(0, !1), e);
 }
-function Le(e) {
-	return Fe(e) ? "half" : Ie(e) ? "single" : "double";
+function j(e) {
+	return He(e) ? "half" : Ue(e) ? "single" : "double";
 }
 //#endregion
 //#region src/ast/CborItem.ts
-var k = class e {
+function We(e) {
+	return {
+		...e,
+		preserveComments: e.preserveComments ?? !0,
+		preserveByteString: e.preserveByteString ?? !0,
+		preserveRawString: e.preserveRawString ?? !0,
+		preserveTextString: e.preserveTextString ?? !0,
+		preserveConcatenation: e.preserveConcatenation ?? !0,
+		preserveNumberFormat: e.preserveNumberFormat ?? !0,
+		preserveAppSequence: e.preserveAppSequence ?? !0,
+		preserveBlankLines: e.preserveBlankLines ?? !0
+	};
+}
+var M = class e {
 	start;
 	end;
 	comments;
+	blankLineBefore;
+	appSeqSource;
+	appSeqComments;
+	appSeqEncodingEdits;
+	appSeqEncodingEditsComplete;
+	appSeqInnerEnd;
+	appSeqSourceFeatures;
 	warnings;
 	_defaults;
 	get _containsCdnContainer() {
@@ -455,17 +594,19 @@ var k = class e {
 		let t = this._defaults ? {
 			...this._defaults,
 			...e
-		} : e, n = new Ae();
+		} : e, n = new Le();
 		return this._encode(n, t), n.finish();
 	}
 	toCDN(e) {
 		let t = this._defaults ? {
 			...this._defaults,
 			...e
-		} : e, n = this._toCDN(t, 0), r = t?.preserveComments;
+		} : e;
+		t?.preserveAll && (t = We(t));
+		let n = this._toCDN(t, 0), r = t?.preserveComments;
 		if (!r || _(t) === null) return n;
-		let i = typeof r == "string" ? r : void 0, a = this.comments?.leading?.map((e) => b(e, i)) ?? [], o = this.comments?.trailing ?? [], s = o.length === 0 ? n : `${n} ${o.map((e) => b(e, i).trimEnd()).join(" ")}`;
-		return [...a, s].join("\n");
+		let i = typeof r == "string" ? r : void 0, { ownLines: a, inlinePrefix: o } = ne(this, "", i), s = this.comments?.trailing ?? [], c = s.length === 0 ? n : `${n} ${s.map((e) => b(e, i).trimEnd()).join(" ")}`;
+		return [...a, `${o}${c}`].join("\n");
 	}
 	toEDN(e) {
 		return this.toCDN(e);
@@ -503,7 +644,7 @@ var k = class e {
 		t.writeBytes(this._toCBOR(n));
 	}
 	_toCBOR(e) {
-		let t = new Ae();
+		let t = new Le();
 		return this._encodeTo(t, e), t.finish();
 	}
 	_toHexDump(e, n) {
@@ -513,19 +654,22 @@ var k = class e {
 			comment: this._toCDN(n, 0)
 		}];
 	}
-}, A = class extends k {
+}, N = class extends M {
 	value;
 	encodingWidth;
+	ednSource;
 	constructor(e, t) {
 		if (super(), this.value = BigInt(e), this.value < 0n) throw RangeError("CborUint value must be non-negative");
 		if (this.value > 18446744073709551615n) throw RangeError("CborUint value exceeds maximum uint64");
-		this.encodingWidth = t?.encodingWidth;
+		this.encodingWidth = t?.encodingWidth, this.ednSource = t?.ednSource;
 	}
 	_encodeTo(e, t) {
-		O(e, 0, this.value, this.encodingWidth);
+		A(e, 0, this.value, this.encodingWidth);
 	}
 	_toCDN(e, t) {
-		let n = w(e, this.encodingWidth, () => C(this.value)), r = this.value;
+		let n = T(e, this.encodingWidth, () => w(this.value));
+		if (e?.preserveNumberFormat && this.ednSource !== void 0) return this.ednSource + n;
+		let r = this.value;
 		switch (e?.intFormat) {
 			case "hex": return `0x${r.toString(16)}${n}`;
 			case "octal": return `0o${r.toString(8)}${n}`;
@@ -537,24 +681,27 @@ var k = class e {
 		let t = e?.integerAs ?? "auto";
 		return t === "bigint" ? this.value : t === "number" || this.value <= BigInt(2 ** 53 - 1) ? Number(this.value) : this.value;
 	}
-}, j = class extends k {
+}, P = class extends M {
 	argument;
 	encodingWidth;
+	ednSource;
 	constructor(e, t) {
 		super();
 		let n = BigInt(e);
 		if (n >= 0n) throw RangeError("CborNint value must be negative");
 		if (n < -18446744073709551616n) throw RangeError("CborNint value exceeds minimum int64");
-		this.argument = -1n - n, this.encodingWidth = t?.encodingWidth;
+		this.argument = -1n - n, this.encodingWidth = t?.encodingWidth, this.ednSource = t?.ednSource;
 	}
 	get value() {
 		return -1n - this.argument;
 	}
 	_encodeTo(e, t) {
-		O(e, 1, this.argument, this.encodingWidth);
+		A(e, 1, this.argument, this.encodingWidth);
 	}
 	_toCDN(e, t) {
-		let n = w(e, this.encodingWidth, () => C(this.argument)), r = this.argument + 1n;
+		let n = T(e, this.encodingWidth, () => w(this.argument));
+		if (e?.preserveNumberFormat && this.ednSource !== void 0) return this.ednSource + n;
+		let r = this.argument + 1n;
 		switch (e?.intFormat) {
 			case "hex": return `-0x${r.toString(16)}${n}`;
 			case "octal": return `-0o${r.toString(8)}${n}`;
@@ -566,8 +713,8 @@ var k = class e {
 		let t = this.value, n = e?.integerAs ?? "auto";
 		return n === "bigint" ? t : n === "number" || t >= BigInt(-(2 ** 53 - 1)) ? Number(t) : t;
 	}
-}, Re = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(8));
-function ze(e) {
+}, Ge = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(8));
+function Ke(e) {
 	let t = e.startsWith("-"), n = e.slice(t ? 3 : 2), r = n.search(/[pP]/);
 	if (r === -1) throw SyntaxError(`EDN parse error: hex float missing 'p' exponent: ${e}`);
 	let i = n.slice(0, r), a = n.slice(r + 1);
@@ -585,29 +732,30 @@ function ze(e) {
 	let l = c * 2 ** o;
 	return t ? -l : l;
 }
-function Be(e) {
+function qe(e) {
 	if (isNaN(e)) return "NaN";
 	if (!isFinite(e)) return e > 0 ? "Infinity" : "-Infinity";
 	let t = Object.is(e, -0) || e < 0, n = Math.abs(e);
 	if (n === 0) return t ? "-0x0p+0" : "0x0p+0";
-	Re.setFloat64(0, n, !1);
-	let r = Re.getUint32(0, !1), i = Re.getUint32(4, !1), a = r >>> 20 & 2047, o = r & 1048575, s = i, c = (o.toString(16).padStart(5, "0") + s.toString(16).padStart(8, "0")).replace(/0+$/, ""), l = c === "" ? "" : `.${c}`, u, d;
+	Ge.setFloat64(0, n, !1);
+	let r = Ge.getUint32(0, !1), i = Ge.getUint32(4, !1), a = r >>> 20 & 2047, o = r & 1048575, s = i, c = (o.toString(16).padStart(5, "0") + s.toString(16).padStart(8, "0")).replace(/0+$/, ""), l = c === "" ? "" : `.${c}`, u, d;
 	a === 0 ? (u = "0", d = -1022) : (u = "1", d = a - 1023);
 	let f = d >= 0 ? `+${d}` : `${d}`, p = `0x${u}${l}p${f}`;
 	return t ? `-${p}` : p;
 }
 //#endregion
 //#region src/ast/CborFloat.ts
-var M = class extends k {
+var F = class extends M {
 	value;
 	precision;
 	ednSource;
+	literalSource;
 	rawBits;
 	constructor(e, t) {
-		super(), this.value = e, this.precision = t?.precision, this.rawBits = t?.rawBits;
+		super(), this.value = e, this.precision = t?.precision, this.rawBits = t?.rawBits, this.literalSource = t?.literalSource;
 	}
 	_encodeTo(e, t) {
-		let n = this.precision ?? Le(this.value), r = Number.isNaN(this.value) ? this.rawBits : void 0;
+		let n = this.precision ?? j(this.value), r = Number.isNaN(this.value) ? this.rawBits : void 0;
 		n === "half" ? (e.writeByte(249), r?.length === 2 ? e.writeBytes(r) : e.writeFloat16(this.value)) : n === "single" ? (e.writeByte(250), r?.length === 4 ? e.writeBytes(r) : e.writeFloat32(this.value)) : (e.writeByte(251), r?.length === 8 ? e.writeBytes(r) : e.writeFloat64(this.value));
 	}
 	_toCDN(e, t) {
@@ -617,39 +765,50 @@ var M = class extends k {
 			if (n === "never") return e.replace(/_[0-3i]$/, "");
 			if (n === "always") {
 				if (/_[0-3i]$/.test(e)) return e;
-				let t = this.precision ?? Le(this.value);
+				let t = this.precision ?? j(this.value);
 				return e + (t === "half" ? "_1" : t === "single" ? "_2" : "_3");
 			}
 			return e;
 		}
-		let r = Le(this.value);
-		return (e?.floatFormat === "hex" ? Be(this.value) : be(this.value)) + xe(this.value, this.precision, r, n);
+		if (e?.preserveNumberFormat && this.literalSource !== void 0) {
+			let e = this.literalSource;
+			if (n === "never") return e.replace(/_[0-7i]$/, "");
+			if (n === "always") {
+				if (/_[0-7i]$/.test(e)) return e;
+				let t = j(this.value);
+				return e + we(this.value, this.precision, t, "always");
+			}
+			return e;
+		}
+		let r = j(this.value);
+		return (e?.floatFormat === "hex" ? qe(this.value) : Ce(this.value)) + we(this.value, this.precision, r, n);
 	}
 	_toJS(e) {
 		return this.value;
 	}
-}, N = class extends k {
+}, I = class extends M {
 	tag;
 	content;
 	encodingWidth;
+	ednSource;
 	constructor(e, t, n) {
 		if (super(), this.tag = BigInt(e), this.tag < 0n) throw RangeError("CborTag tag number must be non-negative");
-		this.content = t, this.encodingWidth = n?.encodingWidth;
+		this.content = t, this.encodingWidth = n?.encodingWidth, this.ednSource = n?.ednSource;
 	}
 	get _containsCdnContainer() {
 		return this.content._containsCdnContainer;
 	}
 	_encodeTo(e, t) {
-		O(e, 6, this.tag, this.encodingWidth), this.content._encode(e, t);
+		A(e, 6, this.tag, this.encodingWidth), this.content._encode(e, t);
 	}
 	_toCDN(e, t) {
-		let n = w(e, this.encodingWidth, () => C(this.tag));
-		return `${this.tag}${n}(${this.content._toCDN(e, t)})`;
+		let n = T(e, this.encodingWidth, () => w(this.tag));
+		return `${e?.preserveNumberFormat && this.ednSource !== void 0 ? this.ednSource : this.tag.toString()}${n}${ae(this.content, this, e, t, (t) => this.content._toCDN(e, t), "(", ")")}`;
 	}
 	_toHexDump(e, n) {
 		let r = [{
 			depth: e,
-			hex: t(Ne(6, this.tag, this.encodingWidth)),
+			hex: t(Be(6, this.tag, this.encodingWidth)),
 			comment: `Tag ${this.tag}`
 		}];
 		return r.push(...this.content._toHexDump(e + 1, {
@@ -661,39 +820,46 @@ var M = class extends k {
 		let t = this.content._toJS(e);
 		return e?.stripTags ? t : m.set(t, this.tag);
 	}
-}, P = class extends k {
+};
+//#endregion
+//#region src/ast/CborByteString.ts
+function Je(e, t, n) {
+	if (e !== void 0) return t?.preserveComments || n === void 0 ? e : pe(e, n);
+}
+var L = class extends M {
 	indefiniteLength = !1;
 	value;
 	ednEncoding;
 	encodingWidth;
 	ednSource;
+	ednCommentSyntax;
 	ednParts;
 	constructor(e, t) {
-		super(), this.value = e, this.ednEncoding = t?.ednEncoding ?? "hex", this.encodingWidth = t?.encodingWidth, this.ednSource = t?.ednSource, this.ednParts = t?.ednParts;
+		super(), this.value = e, this.ednEncoding = t?.ednEncoding ?? "hex", this.encodingWidth = t?.encodingWidth, this.ednSource = t?.ednSource, this.ednCommentSyntax = t?.ednCommentSyntax, this.ednParts = t?.ednParts;
 	}
 	_encodeTo(e, t) {
-		O(e, 2, this.value.length, this.encodingWidth), e.writeBytes(this.value);
+		A(e, 2, this.value.length, this.encodingWidth), e.writeBytes(this.value);
 	}
 	_toCDN(e, t) {
 		let n = _(e);
 		if (e?.preserveConcatenation && n !== null && this.ednParts !== void 0 && this.ednParts.length > 1) {
-			let r = w(e, this.encodingWidth, () => C(BigInt(this.value.length))), i = e?.bstrEncoding ?? this.ednEncoding;
+			let r = T(e, this.encodingWidth, () => w(BigInt(this.value.length))), i = e?.bstrEncoding ?? this.ednEncoding;
 			e?.appStrings === !1 && i !== "hex" && (i = "hex");
-			let a = this.ednParts.map((t) => e?.preserveByteString && t.source !== void 0 ? t.source : fe(t.bytes, i, e?.sqstr));
+			let a = this.ednParts.map((t) => {
+				let n = e?.preserveByteString ? Je(t.source, e, t.commentSyntax) : void 0;
+				return n === void 0 ? fe(t.bytes, i, e?.sqstr) : n;
+			});
 			return a[a.length - 1] += r, ee(a, n, t);
 		}
-		if (e?.preserveByteString && this.ednSource !== void 0 && (n !== null || !/[\r\n]/.test(this.ednSource))) {
-			if (/_[0-3i]$/.test(this.ednSource)) return (e?.encodingIndicators ?? "auto") === "never" ? this.ednSource.replace(/_[0-3i]$/, "") : this.ednSource;
-			let t = w(e, this.encodingWidth, () => C(BigInt(this.value.length)));
-			return this.ednSource + t;
-		}
-		let r = w(e, this.encodingWidth, () => C(BigInt(this.value.length))), i = e?.bstrEncoding ?? this.ednEncoding;
-		return e?.appStrings === !1 && i !== "hex" && (i = "hex"), fe(this.value, i, e?.sqstr) + r;
+		let r = e?.preserveByteString ? Je(this.ednSource, e, this.ednCommentSyntax) : void 0;
+		if (r !== void 0 && (n !== null || !/[\r\n]/.test(r))) return /_[0-3i]$/.test(r) ? (e?.encodingIndicators ?? "auto") === "never" ? r.replace(/_[0-3i]$/, "") : r : r + T(e, this.encodingWidth, () => w(BigInt(this.value.length)));
+		let i = T(e, this.encodingWidth, () => w(BigInt(this.value.length))), a = e?.bstrEncoding ?? this.ednEncoding;
+		return e?.appStrings === !1 && a !== "hex" && (a = "hex"), fe(this.value, a, e?.sqstr) + i;
 	}
 	_toJS(e) {
 		return this.value;
 	}
-}, F = class extends k {
+}, R = class extends M {
 	indefiniteLength = !0;
 	chunks;
 	constructor(e) {
@@ -708,9 +874,9 @@ var M = class extends k {
 		if ((e?.encodingIndicators ?? "auto") === "never") {
 			let n = this.chunks.reduce((e, t) => e + t.value.length, 0), r = new Uint8Array(n), i = 0;
 			for (let e of this.chunks) r.set(e.value, i), i += e.value.length;
-			return new P(r)._toCDN(e, t);
+			return new L(r)._toCDN(e, t);
 		}
-		return this.chunks.length === 0 ? "''_" : x({
+		return this.chunks.length === 0 ? "''_" : S({
 			node: this,
 			options: e,
 			depth: t,
@@ -722,7 +888,7 @@ var M = class extends k {
 			hasEntryComments: () => this.chunks.some(y),
 			renderEntry: (n) => this.chunks[n]._toCDN(e, t + 1),
 			entryLeadingNode: (e) => this.chunks[e],
-			entryTrailing: (e, t) => re(this.chunks[e], t)
+			entryTrailing: (e, t) => x(this.chunks[e], t)
 		});
 	}
 	_toHexDump(e, t) {
@@ -743,7 +909,7 @@ var M = class extends k {
 		for (let e of this.chunks) n.set(e.value, r), r += e.value.length;
 		return n;
 	}
-}, I = class extends k {
+}, z = class extends M {
 	indefiniteLength = !0;
 	chunks;
 	constructor(e) {
@@ -755,7 +921,7 @@ var M = class extends k {
 		e.writeByte(255);
 	}
 	_toCDN(e, t) {
-		return (e?.encodingIndicators ?? "auto") === "never" ? new H(this.chunks.map((e) => e.value).join(""))._toCDN(e, t) : this.chunks.length === 0 ? "\"\"_" : x({
+		return (e?.encodingIndicators ?? "auto") === "never" ? new q(this.chunks.map((e) => e.value).join(""))._toCDN(e, t) : this.chunks.length === 0 ? "\"\"_" : S({
 			node: this,
 			options: e,
 			depth: t,
@@ -767,7 +933,7 @@ var M = class extends k {
 			hasEntryComments: () => this.chunks.some(y),
 			renderEntry: (n) => this.chunks[n]._toCDN(e, t + 1),
 			entryLeadingNode: (e) => this.chunks[e],
-			entryTrailing: (e, t) => re(this.chunks[e], t)
+			entryTrailing: (e, t) => x(this.chunks[e], t)
 		});
 	}
 	_toHexDump(e, t) {
@@ -786,7 +952,7 @@ var M = class extends k {
 	_toJS(e) {
 		return this.chunks.map((e) => e.value).join("");
 	}
-}, L = class extends k {
+}, B = class extends M {
 	items;
 	indefiniteLength;
 	encodingWidth;
@@ -803,11 +969,11 @@ var M = class extends k {
 			e.writeByte(255);
 			return;
 		}
-		O(e, 4, this.items.length, this.encodingWidth);
+		A(e, 4, this.items.length, this.encodingWidth);
 		for (let n of this.items) n._encode(e, t);
 	}
 	_toCDN(e, t) {
-		return x({
+		return S({
 			node: this,
 			options: e,
 			depth: t,
@@ -820,7 +986,7 @@ var M = class extends k {
 			renderEntry: (n) => this.items[n]._toCDN(e, t + 1),
 			entryIsLeaf: (e) => !this.items[e]._containsCdnContainer,
 			entryLeadingNode: (e) => this.items[e],
-			entryTrailing: (e, t) => re(this.items[e], t)
+			entryTrailing: (e, t) => x(this.items[e], t)
 		});
 	}
 	_toHexDump(e, r) {
@@ -839,7 +1005,7 @@ var M = class extends k {
 		}
 		let i = [{
 			depth: e,
-			hex: t(Ne(4, BigInt(this.items.length), this.encodingWidth)),
+			hex: t(Be(4, BigInt(this.items.length), this.encodingWidth)),
 			comment: `Array of length ${this.items.length}`
 		}];
 		for (let t of this.items) i.push(...t._toHexDump(e + 1, r));
@@ -858,7 +1024,7 @@ var M = class extends k {
 		}
 		return r;
 	}
-}, R = class extends k {
+}, V = class extends M {
 	entries;
 	indefiniteLength;
 	encodingWidth;
@@ -875,11 +1041,11 @@ var M = class extends k {
 			e.writeByte(255);
 			return;
 		}
-		O(e, 5, this.entries.length, this.encodingWidth);
+		A(e, 5, this.entries.length, this.encodingWidth);
 		for (let [n, r] of this.entries) n._encode(e, t), r._encode(e, t);
 	}
 	_toCDN(e, t) {
-		return x({
+		return S({
 			node: this,
 			options: e,
 			depth: t,
@@ -900,7 +1066,7 @@ var M = class extends k {
 			entryLeadingNode: (e) => this.entries[e][0],
 			entryTrailing: (e, t) => {
 				let [n, r] = this.entries[e];
-				return Ve([
+				return Ye([
 					...n.comments?.trailing ?? [],
 					...r.comments?.leading ?? [],
 					...r.comments?.trailing ?? []
@@ -924,7 +1090,7 @@ var M = class extends k {
 		}
 		let i = [{
 			depth: e,
-			hex: t(Ne(5, BigInt(this.entries.length), this.encodingWidth)),
+			hex: t(Be(5, BigInt(this.entries.length), this.encodingWidth)),
 			comment: `Map of length ${this.entries.length}`
 		}];
 		for (let [t, n] of this.entries) i.push(...t._toHexDump(e + 1, r)), i.push(...n._toHexDump(e + 1, r));
@@ -941,13 +1107,13 @@ var M = class extends k {
 			}
 			return n;
 		};
-		return e?.mapAs === "entries" ? n() : e?.mapAs === "object" || this.entries.every(([e]) => e instanceof H) ? (() => {
+		return e?.mapAs === "entries" ? n() : e?.mapAs === "object" || this.entries.every(([e]) => e instanceof q) ? (() => {
 			let n = e ? {
 				...e,
 				reviver: void 0
 			} : void 0, r = {};
 			for (let [e, t] of this.entries) {
-				let i = e instanceof H ? e.value : e.toCDN(), a = t._toJS(n);
+				let i = e instanceof q ? e.value : e.toCDN(), a = t._toJS(n);
 				i === "__proto__" ? Object.defineProperty(r, i, {
 					value: a,
 					writable: !0,
@@ -959,10 +1125,10 @@ var M = class extends k {
 			let i = /* @__PURE__ */ new Map();
 			for (let e = 0; e < this.entries.length; e++) {
 				let [t] = this.entries[e];
-				i.set(t instanceof H ? t.value : t.toCDN(), e);
+				i.set(t instanceof q ? t.value : t.toCDN(), e);
 			}
 			for (let n = 0; n < this.entries.length; n++) {
-				let [a, o] = this.entries[n], s = a instanceof H ? a.value : a.toCDN();
+				let [a, o] = this.entries[n], s = a instanceof q ? a.value : a.toCDN();
 				if (i.get(s) !== n) continue;
 				let c = o._toJS(e), l = t.call(r, s, c);
 				l === h || e?.undefinedOmits && l === void 0 ? delete r[s] : s === "__proto__" ? Object.defineProperty(r, s, {
@@ -976,16 +1142,17 @@ var M = class extends k {
 		})() : n();
 	}
 };
-function Ve(e, t) {
+function Ye(e, t) {
 	return e.length === 0 ? "" : " " + e.map((e) => b(e, t).trimEnd()).join(" ");
 }
 //#endregion
 //#region src/ast/CborSimple.ts
-var z = class e extends k {
+var H = class e extends M {
 	value;
-	constructor(e) {
+	ednSource;
+	constructor(e, t) {
 		if (super(), !Number.isInteger(e) || e < 0 || e > 255) throw RangeError("CborSimple value must be an integer in 0–255");
-		this.value = e;
+		this.value = e, this.ednSource = t?.ednSource;
 	}
 	static FALSE = new e(20);
 	static TRUE = new e(21);
@@ -999,6 +1166,7 @@ var z = class e extends k {
 		e.writeByte(248), e.writeByte(this.value);
 	}
 	_toCDN(e, t) {
+		if (e?.preserveNumberFormat && this.ednSource !== void 0) return `simple(${this.ednSource})`;
 		switch (this.value) {
 			case 20: return "false";
 			case 21: return "true";
@@ -1016,7 +1184,7 @@ var z = class e extends k {
 			default: return new g(this.value);
 		}
 	}
-}, He = class extends k {
+}, U = class extends M {
 	items;
 	encodingWidth;
 	constructor(e, t) {
@@ -1026,26 +1194,36 @@ var z = class e extends k {
 		return this.items.some((e) => e._containsCdnContainer);
 	}
 	_content(e) {
-		let t = new Ae();
+		let t = new Le();
 		for (let n of this.items) n._encode(t, e);
 		return t.finish();
 	}
 	_encodeTo(e, t) {
 		let n = this._content(t);
-		O(e, 2, n.length, this.encodingWidth), e.writeBytes(n);
+		A(e, 2, n.length, this.encodingWidth), e.writeBytes(n);
 	}
 	_toCDN(e, t) {
-		let n = w(e, this.encodingWidth, () => C(BigInt(this._content(e).length)));
-		if (this.items.length === 0) return `<<>>${n}`;
-		let r = _(e), { inlineSep: i, multilineSep: a, trailSep: o } = ae(e, r === null);
-		if (r === null) return `<<${this.items.map((n) => n._toCDN(e, t + 1)).join(i)}>>${n}`;
-		let s = v(r, t + 1), c = v(r, t), l = this.items.map((n) => `${s}${n._toCDN(e, t + 1)}`), u = l.length - 1;
-		return `<<\n${l.map((e, t) => t < u ? `${e}${a}` : `${e}${o}`).join("\n")}\n${c}>>${n}`;
+		return S({
+			node: this,
+			options: e,
+			depth: t,
+			openChar: "<<",
+			closeChar: ">>",
+			count: this.items.length,
+			indefiniteLength: !1,
+			encodingWidth: this.encodingWidth,
+			eiPosition: "close",
+			canonicalCount: () => BigInt(this._content(e).length),
+			hasEntryComments: () => this.items.some(y),
+			renderEntry: (n) => this.items[n]._toCDN(e, t + 1),
+			entryLeadingNode: (e) => this.items[e],
+			entryTrailing: (e, t) => x(this.items[e], t)
+		});
 	}
 	_toHexDump(e, n) {
 		let r = this._content().length, i = [{
 			depth: e,
-			hex: t(Ne(2, BigInt(r), this.encodingWidth)),
+			hex: t(Be(2, BigInt(r), this.encodingWidth)),
 			comment: `Embedded CBOR sequence, ${r} byte${r === 1 ? "" : "s"}`
 		}];
 		for (let t of this.items) i.push(...t._toHexDump(e + 1, n));
@@ -1054,17 +1232,131 @@ var z = class e extends k {
 	_toJS(e) {
 		return this._content();
 	}
-}, Ue = 999n, We = class extends N {
+};
+//#endregion
+//#region src/utils/strip-comments.ts
+function Xe(e) {
+	let t = "", n = 0;
+	for (; n < e.length;) {
+		let r = e[n];
+		if (r === " " || r === "\n" || r === "\r") {
+			n++;
+			continue;
+		}
+		if (r === "#") {
+			for (; n < e.length && e[n] !== "\n";) n++;
+			continue;
+		}
+		if (r === "/") {
+			let t = e[n + 1] ?? "";
+			if (t === "/") {
+				for (; n < e.length && e[n] !== "\n";) n++;
+				continue;
+			}
+			if (t === "*") {
+				for (n += 2; n < e.length && !(e[n] === "*" && (e[n + 1] ?? "") === "/");) n++;
+				if (n >= e.length) throw SyntaxError("unterminated block comment");
+				n += 2;
+				continue;
+			}
+			for (n++; n < e.length && e[n] !== "/";) n++;
+			if (n >= e.length) throw SyntaxError("unterminated block comment");
+			n++;
+			continue;
+		}
+		t += r, n++;
+	}
+	return t;
+}
+//#endregion
+//#region src/extensions/b32.ts
+var Ze = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567", Qe = "0123456789ABCDEFGHIJKLMNOPQRSTUV";
+function $e(e) {
+	let t = e.length;
+	for (; t > 0 && e.charCodeAt(t - 1) === 61;) t--;
+	return e.slice(0, t);
+}
+function et(e, t, n) {
+	let r = $e(e).toUpperCase(), i = r.length % 8;
+	if (i === 1 || i === 3 || i === 6) throw SyntaxError(`invalid base32 length: ${r.length} characters`);
+	let a = (/* @__PURE__ */ new Uint8Array(128)).fill(255);
+	for (let e = 0; e < t.length; e++) a[t.charCodeAt(e)] = e;
+	let o = new Uint8Array(Math.floor(r.length * 5 / 8)), s = 0, c = 0, l = 0;
+	for (let e of r) {
+		let t = e.charCodeAt(0), n = t < 128 ? a[t] : 255;
+		if (n === 255) throw SyntaxError(`invalid character in byte string: ${JSON.stringify(e)}`);
+		s = s << 5 | n, c += 5, c >= 8 && (c -= 8, o[l++] = s >> c & 255);
+	}
+	if (c > 0 && s & (1 << c) - 1) {
+		let e = "non-zero trailing bits in base32 input";
+		if (n) n(e);
+		else throw SyntaxError(e);
+	}
+	return o;
+}
+var tt = {
+	appStringPrefixes: ["b32"],
+	parseAppString(e, t, n) {
+		return new L(et(Xe(t), Ze, n), { ednEncoding: "base32" });
+	}
+}, nt = {
+	appStringPrefixes: ["h32"],
+	parseAppString(e, t, n) {
+		return new L(et(Xe(t), Qe, n), { ednEncoding: "base32hex" });
+	}
+};
+//#endregion
+//#region src/utils/base64.ts
+function rt(e, t) {
+	let n = e.indexOf("="), r = n >= 0 ? e.slice(0, n) : e, i = n >= 0 ? e.slice(n) : "";
+	if (/[^A-Za-z0-9+/\-_]/.test(r)) {
+		let e = [...r].find((e) => !/[A-Za-z0-9+/\-_]/.test(e)) ?? "";
+		throw SyntaxError(`invalid character ${JSON.stringify(e)} in base64 data`);
+	}
+	if (i && !/^=+$/.test(i)) throw SyntaxError("invalid character after base64 '=' padding");
+	let a = r.length % 4;
+	if (a === 1) throw SyntaxError(`invalid base64 length: ${r.length} data characters (length mod 4 = 1 is never valid)`);
+	let o = a === 0 ? 0 : 4 - a;
+	if (i.length > o) {
+		let e = `base64 has ${i.length} '=' character${i.length > 1 ? "s" : ""} but the data length (${r.length}) requires at most ${o}`;
+		if (t) t(e);
+		else throw SyntaxError(e);
+	}
+	if (i.length > 0 && i.length < o) {
+		let e = `base64 has ${i.length} '=' character${i.length > 1 ? "s" : ""} but needs exactly ${o} — use full padding or no padding at all`;
+		if (t) t(e);
+		else throw SyntaxError(e);
+	}
+	if (a !== 0 && r.length > 0) {
+		let e = r[r.length - 1].replace("-", "+").replace("_", "/"), n = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".indexOf(e);
+		if (n >= 0 && n & (a === 2 ? 15 : 3)) {
+			let e = "base64 has non-zero trailing bits in the final quantum (RFC 4648 §3.5)";
+			if (t) t(e);
+			else throw SyntaxError(e);
+		}
+	}
+	let s = r.replace(/-/g, "+").replace(/_/g, "/") + "=".repeat(o);
+	if (typeof Uint8Array.fromBase64 == "function") return Uint8Array.fromBase64(s, {
+		alphabet: "base64",
+		lastChunkHandling: "loose"
+	});
+	let c = atob(s), l = new Uint8Array(c.length);
+	for (let e = 0; e < c.length; e++) l[e] = c.charCodeAt(e);
+	return l;
+}
+//#endregion
+//#region src/ast/CborUnresolvedAppExt.ts
+var it = 999n, at = class extends I {
 	constructor(e, t) {
-		let n = t.length === 1 && t[0] instanceof H ? t[0] : new L(t);
-		super(Ue, new L([new H(e), n]));
+		let n = t.length === 1 && t[0] instanceof q ? t[0] : new B(t);
+		super(it, new B([new q(e), n]));
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
 		let n = this.content, r = n.items[0].value, i = n.items[1];
-		return i instanceof H ? `${r}${ve(i.value)}` : `${r}<<${i.items.map((n) => n._toCDN(e, t)).join(", ")}>>`;
+		return i instanceof q ? `${r}${xe(i.value)}` : `${r}<<${i.items.map((n) => n._toCDN(e, t)).join(", ")}>>`;
 	}
-}, Ge = class extends k {
+}, ot = class extends M {
 	inner;
 	ednSource;
 	constructor(e, t) {
@@ -1083,21 +1375,120 @@ var z = class e extends k {
 	_toJS(e) {
 		return this.inner._toJS(e);
 	}
-}, Ke = 888n, B = class extends N {
-	constructor(e) {
-		e === void 0 ? super(Ke, z.NULL) : super(Ke, new L(e));
+}, st = 888n;
+function ct(e, t, n, r) {
+	if (e === void 0) return;
+	let i = t?.preserveComments || r === void 0 ? e : pe(e, r);
+	return ut(i, n) ? i : void 0;
+}
+function lt(e, t) {
+	return e !== void 0 && ut(e, t);
+}
+function ut(e, t) {
+	return t !== null || !/[\r\n]/.test(e);
+}
+var W = class e extends I {
+	realBoundary;
+	fromByteLiteral;
+	literalSource;
+	constructor(e, t) {
+		Array.isArray(e) ? (super(st, new B(e)), this.fromByteLiteral = !1, this.literalSource = void 0, this.realBoundary = t) : (super(st, H.NULL), this.fromByteLiteral = e ?? !1, this.literalSource = t, this.realBoundary = void 0);
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
-		if (this.content instanceof z) return "...";
-		if (this.content instanceof L) {
-			let n = this.content.items.map((n) => n._toCDN(e, t));
-			return n.length === 0 ? "" : ee(n, _(e), t);
+		if (this.content instanceof H) return "...";
+		if (this.content instanceof B) {
+			let n = !!e?.preserveConcatenation;
+			if (n || e?.preserveByteString && !this._hasRealConcatenation()) {
+				let t = this._renderPreservedBytesElision(e);
+				if (t !== void 0) return t;
+			}
+			if (!n || this.realBoundary === void 0) {
+				let e = this._compactHexElided();
+				if (e !== void 0) return e;
+			}
+			return this.content.items.map((r) => n ? this._renderFragment(r, e) : r._toCDN(e, t)).join(" + ");
 		}
 		return super._toCDN(e, t);
 	}
-}, qe = 2n, Je = 3n, Ye = 18446744073709551615n, Xe = -18446744073709551616n;
-function Ze(e) {
+	_hasRealConcatenation() {
+		return this.realBoundary?.some((e, t) => t > 0 && e) ? !0 : this.content.items.some((e) => e instanceof L && e.ednParts !== void 0 && e.ednParts.length > 1);
+	}
+	_renderFragment(e, t) {
+		let n = _(t);
+		if (e instanceof L && e.ednParts !== void 0 && e.ednParts.length > 1) {
+			let r = t?.appStrings === !1 ? "hex" : t?.bstrEncoding ?? e.ednEncoding;
+			return e.ednParts.map((e) => {
+				let i = t?.preserveByteString ? ct(e.source, t, n, e.commentSyntax) : void 0;
+				return i === void 0 ? fe(e.bytes, r, t?.sqstr) : i;
+			}).join(" + ");
+		}
+		if (e instanceof q && e.ednParts !== void 0 && e.ednParts.length > 1) {
+			let r = t?.preserveRawString ? e.ednPartSources : void 0;
+			return e.ednParts.map((e, t) => {
+				let i = r?.[t];
+				return lt(i, n) ? i : Se(e);
+			}).join(" + ");
+		}
+		return e._toCDN(t, 0);
+	}
+	_compactHexElided() {
+		let t = this.content.items, n = "", r = !1;
+		for (let a of t) if (a instanceof L) n += i(a.value), r = !0;
+		else if (a instanceof e && a.content instanceof H) n += "...";
+		else return;
+		if (r) return `h'${n}'`;
+	}
+	_renderPreservedBytesElision(t) {
+		if (this.realBoundary === void 0) return;
+		let n = this.realBoundary, r = this.content.items, a = [], o = [], s = () => {
+			o.length > 0 && (a.push(o), o = []);
+		};
+		for (let t = 0; t < r.length; t++) {
+			let i = r[t];
+			if (t > 0 && n[t] && s(), i instanceof e && i.content instanceof H) o.push({
+				ellipsis: !0,
+				fromByteLiteral: i.fromByteLiteral,
+				literalSource: i.literalSource
+			});
+			else if (i instanceof L) if (i.ednParts !== void 0 && i.ednParts.length > 1) {
+				let [e, ...t] = i.ednParts;
+				o.push({
+					bytes: e.bytes,
+					source: e.source,
+					commentSyntax: e.commentSyntax
+				});
+				for (let e of t) s(), o.push({
+					bytes: e.bytes,
+					source: e.source,
+					commentSyntax: e.commentSyntax
+				});
+			} else o.push({
+				bytes: i.value,
+				source: i.ednSource,
+				commentSyntax: i.ednCommentSyntax
+			});
+			else return;
+		}
+		if (s(), a.length === 0) return;
+		let c = t?.appStrings === !1 ? "hex" : t?.bstrEncoding ?? "hex", l = _(t);
+		return a.map((e) => {
+			if (t?.preserveByteString) for (let n of e) {
+				if (!("ellipsis" in n)) continue;
+				let e = ct(n.literalSource, t, l, "full");
+				if (e !== void 0) return e;
+			}
+			let n = e.filter((e) => !("ellipsis" in e));
+			if (n.length === 0) return e.some((e) => "ellipsis" in e && e.fromByteLiteral) ? "h'...'" : "...";
+			if (e.length === 1) {
+				let e = n[0], r = t?.preserveByteString ? ct(e.source, t, l, e.commentSyntax) : void 0;
+				return r === void 0 ? fe(e.bytes, c, t?.sqstr) : r;
+			}
+			return `h'${e.map((e) => "ellipsis" in e ? "..." : i(e.bytes)).join("")}'`;
+		}).join(" + ");
+	}
+}, dt = 2n, ft = 3n, pt = 18446744073709551615n, mt = -18446744073709551616n;
+function ht(e) {
 	if (e < 0n) throw RangeError("bigintToBytes requires a non-negative value");
 	if (e === 0n) return /* @__PURE__ */ new Uint8Array();
 	let t = e.toString(16);
@@ -1106,16 +1497,16 @@ function Ze(e) {
 	for (let e = 0; e < n.length; e++) n[e] = parseInt(t.slice(e * 2, e * 2 + 2), 16);
 	return n;
 }
-function Qe(e) {
+function gt(e) {
 	let t = 0n;
 	for (let n of e) t = t << 8n | BigInt(n);
 	return t;
 }
-var $e = class extends N {
+var _t = class extends I {
 	bigValue;
 	constructor(e) {
-		if (e <= Ye) throw RangeError(`CborBigUint value ${e} fits in CborUint; use CborUint instead`);
-		super(qe, new P(Ze(e))), this.bigValue = e;
+		if (e <= pt) throw RangeError(`CborBigUint value ${e} fits in CborUint; use CborUint instead`);
+		super(dt, new L(ht(e))), this.bigValue = e;
 	}
 	_toCDN(e, t) {
 		return this.bigValue.toString();
@@ -1123,11 +1514,11 @@ var $e = class extends N {
 	_toJS(e) {
 		return this.bigValue;
 	}
-}, et = class extends N {
+}, vt = class extends I {
 	bigValue;
 	constructor(e) {
-		if (e >= Xe) throw RangeError(`CborBigNint value ${e} fits in CborNint; use CborNint instead`);
-		super(Je, new P(Ze(-1n - e))), this.bigValue = e;
+		if (e >= mt) throw RangeError(`CborBigNint value ${e} fits in CborNint; use CborNint instead`);
+		super(ft, new L(ht(-1n - e))), this.bigValue = e;
 	}
 	_toCDN(e, t) {
 		return this.bigValue.toString();
@@ -1135,25 +1526,59 @@ var $e = class extends N {
 	_toJS(e) {
 		return this.bigValue;
 	}
-}, tt = new TextEncoder(), nt = new TextDecoder("utf-8", { fatal: !0 }), rt = new TextDecoder("utf-8", { fatal: !1 });
-function it(e, t) {
+}, yt = new TextEncoder(), bt = new TextDecoder("utf-8", { fatal: !0 }), xt = new TextDecoder("utf-8", { fatal: !1 });
+function St(e, t) {
 	let n = new a(e, {
 		offset: t?.offset,
 		skipRS: t?._skipRS
-	}), r = new gt(n, t ?? {}).parse();
-	return t?.preserveComments && lt(r, n.comments, e), r;
+	}), r = new Bt(n, t ?? {}).parse();
+	return (t?.preserveComments || t?.preserveAll) && Nt(r, n.comments, e), r;
 }
-function at(e) {
+function Ct(e) {
 	let t = e, n;
 	return /[_][0-7i]$/.test(e) && (n = e[e.length - 1], t = e.slice(0, -2)), {
 		numStr: t,
 		rawSuffix: n
 	};
 }
-function ot(e) {
+function wt(e) {
 	return e.startsWith("-") ? -BigInt(e.slice(1)) : BigInt(e);
 }
-function st(e, t) {
+function G(e) {
+	if (e !== void 0) return Et([e.appSeqSourceFeatures, Tt(e)]);
+}
+function Tt(e) {
+	if (e instanceof L) return {
+		byteString: !0,
+		concatenation: e.ednParts !== void 0 && e.ednParts.length > 1
+	};
+	if (e instanceof q) {
+		let t = e.ednParts !== void 0, n = e.ednPartSources?.filter((e) => e !== void 0).length ?? 0, r = t ? e.ednParts.reduce((t, n, r) => {
+			let i = e.ednPartSources?.[r] !== void 0, a = e.ednPartIsByteString?.[r] ?? !1;
+			return i || !a ? t : t + 1;
+		}, 0) : 0, i = (t ? e.ednParts.length : 0) - n - r;
+		return {
+			byteString: r > 0,
+			textString: e.quotedEdnSource !== void 0 || i > 0,
+			rawString: e.ednSource !== void 0 || n > 0,
+			concatenation: t && e.ednParts.length > 1
+		};
+	}
+	if (e instanceof B) return Et(e.items.map(G));
+	if (e instanceof V) return Et(e.entries.flatMap(([e, t]) => [G(e), G(t)]));
+	if (e instanceof I) return G(e.content);
+	if (e instanceof R || e instanceof z || e instanceof U) return Et((e instanceof U ? e.items : e.chunks).map(G));
+}
+function Et(e) {
+	let t = e.filter((e) => e !== void 0);
+	if (t.length !== 0) return {
+		byteString: t.some((e) => e.byteString),
+		textString: t.some((e) => e.textString),
+		rawString: t.some((e) => e.rawString),
+		concatenation: t.some((e) => e.concatenation)
+	};
+}
+function Dt(e, t) {
 	if (e.endsWith("_i") || e.endsWith("_0")) {
 		let n = "_0 and _i encoding indicators are not valid for floating-point values";
 		if (t) t(n), e = e.slice(0, -2);
@@ -1177,109 +1602,138 @@ function st(e, t) {
 	};
 	let n = e, r;
 	return e.endsWith("_1") ? (r = "half", n = e.slice(0, -2)) : e.endsWith("_2") ? (r = "single", n = e.slice(0, -2)) : e.endsWith("_3") && (r = "double", n = e.slice(0, -2)), /^-?0[xX]/.test(n) ? {
-		value: ze(n),
+		value: Ke(n),
 		precision: r
 	} : {
 		value: parseFloat(n),
 		precision: r
 	};
 }
-function ct(e, t) {
-	let n = e.indexOf("="), r = n >= 0 ? e.slice(0, n) : e, i = n >= 0 ? e.slice(n) : "";
-	if (/[^A-Za-z0-9+/\-_]/.test(r)) {
-		let e = [...r].find((e) => !/[A-Za-z0-9+/\-_]/.test(e)) ?? "";
-		throw SyntaxError(`invalid character ${JSON.stringify(e)} in base64 data`);
-	}
-	if (i && !/^=+$/.test(i)) throw SyntaxError("invalid character after base64 '=' padding");
-	let a = r.length % 4;
-	if (a === 1) throw SyntaxError(`invalid base64 length: ${r.length} data characters (length mod 4 = 1 is never valid)`);
-	let o = a === 0 ? 0 : 4 - a;
-	if (i.length > o) {
-		let e = `base64 has ${i.length} '=' character${i.length > 1 ? "s" : ""} but the data length (${r.length}) requires at most ${o}`;
-		if (t) t(e);
-		else throw SyntaxError(e);
-	}
-	if (i.length > 0 && i.length < o) {
-		let e = `base64 has ${i.length} '=' character${i.length > 1 ? "s" : ""} but needs exactly ${o} — use full padding or no padding at all`;
-		if (t) t(e);
-		else throw SyntaxError(e);
+var Ot = /\r?\n[ \t]*\r?\n/;
+function kt(e, t, n) {
+	return Ot.test(e.slice(t, n));
+}
+function At(e, t, n, r) {
+	let i = [];
+	for (let a = t; a < e.length; a++) {
+		let t = e[a];
+		if (t.start >= r) break;
+		t.start >= n && t.end <= r && i.push({
+			...t,
+			start: t.start - n,
+			end: t.end - n
+		});
 	}
-	if (a !== 0 && r.length > 0) {
-		let e = r[r.length - 1].replace("-", "+").replace("_", "/"), n = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".indexOf(e);
-		if (n >= 0 && n & (a === 2 ? 15 : 3)) {
-			let e = "base64 has non-zero trailing bits in the final quantum (RFC 4648 §3.5)";
-			if (t) t(e);
-			else throw SyntaxError(e);
+	return i;
+}
+function jt(e, t, n, r) {
+	if (n.end !== void 0) return {
+		start: (/_[0-7i]$/.test(e.slice(Math.max(0, n.end - 2), n.end)) ? n.end - 2 : n.end) - t,
+		end: n.end - t,
+		always: r,
+		never: ""
+	};
+}
+function Mt(e, t, n) {
+	if (n instanceof N) {
+		let r = jt(e, t, n, `_${n.encodingWidth ?? w(n.value)}`);
+		return r ? [r] : [];
+	}
+	if (n instanceof P) {
+		let r = jt(e, t, n, `_${n.encodingWidth ?? w(n.argument)}`);
+		return r ? [r] : [];
+	}
+	if (n instanceof F) {
+		let r = n.precision ?? j(n.value), i = jt(e, t, n, r === "half" ? "_1" : r === "single" ? "_2" : "_3");
+		return i ? [i] : [];
+	}
+	if (n instanceof L) {
+		let r = jt(e, t, n, `_${n.encodingWidth ?? w(BigInt(n.value.length))}`);
+		return r ? [r] : [];
+	}
+	if (n instanceof q) {
+		let r = jt(e, t, n, `_${n.encodingWidth ?? w(BigInt(yt.encode(n.value).length))}`);
+		return r ? [r] : [];
+	}
+	if (n instanceof B) {
+		let r = [];
+		if (n.indefiniteLength) return;
+		if (n.start !== void 0) {
+			let i = new a(e, { offset: n.start }), o = i.consume(), s = i.peek(), c = s.type === "ENCODING_INDICATOR", l = `_${n.encodingWidth ?? w(BigInt(n.items.length))}`, u = e[o.endOffset] ?? "", d = !c && /[+\-.0-9A-Z_a-z]/.test(u) ? " " : "";
+			r.push({
+				start: (c ? s.offset : o.endOffset) - t,
+				end: (c ? s.endOffset : o.endOffset) - t,
+				always: l + d,
+				never: ""
+			});
+		}
+		for (let i of n.items) {
+			let n = Mt(e, t, i);
+			if (n === void 0) return;
+			r.push(...n);
 		}
+		return r;
 	}
-	let s = r.replace(/-/g, "+").replace(/_/g, "/") + "=".repeat(o);
-	if (typeof Uint8Array.fromBase64 == "function") return Uint8Array.fromBase64(s, {
-		alphabet: "base64",
-		lastChunkHandling: "loose"
-	});
-	let c = atob(s), l = new Uint8Array(c.length);
-	for (let e = 0; e < c.length; e++) l[e] = c.charCodeAt(e);
-	return l;
 }
-function lt(e, t, n) {
+function Nt(e, t, n) {
 	if (t.length === 0) return;
-	let r = ut(e), i = ft(n), a = [...r].sort((e, t) => e.start - t.start || t.end - e.end), o = [...r].sort((e, t) => e.end - t.end || e.start - t.start), s = [...t].sort((e, t) => e.start - t.start), c = [], l = 0;
-	for (let t of s) {
-		let r = { ...t }, s = 0, u = o.length;
-		for (; s < u;) {
-			let e = s + u >> 1;
-			o[e].end <= t.start ? s = e + 1 : u = e;
-		}
-		let d = s > 0 ? o[s - 1] : void 0, f = d ? n.slice(d.end, t.start) : "";
-		if (d && i(d.end) === t.line && !f.includes(":")) {
-			dt(d.node, "trailing", r);
+	let r = Pt(e), i = It(n), a = [...r].sort((e, t) => e.start - t.start || t.end - e.end), o = [...r].sort((e, t) => e.end - t.end || e.start - t.start), s = [...t].sort((e, t) => e.start - t.start), c = [], l = 0;
+	for (let e of s) {
+		let t = { ...e }, r = 0, s = o.length;
+		for (; r < s;) {
+			let t = r + s >> 1;
+			o[t].end <= e.start ? r = t + 1 : s = t;
+		}
+		let u = r > 0 ? o[r - 1] : void 0, d = u ? n.slice(u.end, e.start) : "";
+		if (u && i(u.end) === e.line && !d.includes(":")) {
+			Ft(u.node, "trailing", t);
 			continue;
 		}
-		for (; l < a.length && a[l].start < t.start;) {
+		for (; l < a.length && a[l].start < e.start;) {
 			let e = a[l++];
 			for (; c.length > 0 && c[c.length - 1].end <= e.start;) c.pop();
 			c.push(e);
 		}
-		for (; c.length > 0 && c[c.length - 1].end <= t.start;) c.pop();
-		let p = c.length > 0 ? c[c.length - 1] : void 0;
-		for (s = 0, u = a.length; s < u;) {
-			let e = s + u >> 1;
-			a[e].start < t.end ? s = e + 1 : u = e;
+		for (; c.length > 0 && c[c.length - 1].end <= e.start;) c.pop();
+		let f = c.length > 0 ? c[c.length - 1] : void 0;
+		for (r = 0, s = a.length; r < s;) {
+			let t = r + s >> 1;
+			a[t].start < e.end ? r = t + 1 : s = t;
 		}
-		let m = s < a.length ? a[s] : void 0;
-		if ((!p || m && m.end <= p.end) && m) {
-			dt(m.node, "leading", r);
+		let p = r < a.length ? a[r] : void 0;
+		if ((!f || p && p.end <= f.end) && p) {
+			t.sameLine = i(e.end) === i(p.start), Ft(p.node, "leading", t);
 			continue;
 		}
-		dt(p?.node ?? e, "dangling", r);
+		f && Ft(f.node, "dangling", t);
 	}
 }
-function ut(e) {
+function Pt(e) {
 	let t = [], n = (e) => {
 		if (e.start !== void 0 && e.end !== void 0 && t.push({
 			node: e,
 			start: e.start,
 			end: e.end
-		}), e instanceof L || e instanceof He) {
+		}), e instanceof B || e instanceof U) {
 			for (let t of e.items) n(t);
 			return;
 		}
-		if (e instanceof R) {
+		if (e instanceof V) {
 			for (let [t, r] of e.entries) n(t), n(r);
 			return;
 		}
-		if (e instanceof F || e instanceof I) {
+		if (e instanceof R || e instanceof z) {
 			for (let t of e.chunks) n(t);
 			return;
 		}
-		e instanceof N && n(e.content);
+		e instanceof I && n(e.content);
 	};
 	return n(e), t;
 }
-function dt(e, t, n) {
+function Ft(e, t, n) {
 	e.comments ??= {}, e.comments[t] ??= [], e.comments[t].push(n);
 }
-function ft(e) {
+function It(e) {
 	let t = [0];
 	for (let n = 0; n < e.length; n++) e[n] === "\n" && t.push(n + 1);
 	return (n) => {
@@ -1293,25 +1747,25 @@ function ft(e) {
 		return a + 1;
 	};
 }
-var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'extensions' option (extensions: [${e}])`, mt = (e, t) => `install ${t}, import { ${e} } from '${t}', and pass it via the 'extensions' option (extensions: [${e}])`, V = (e) => `'${e}' is a default built-in extension that was excluded via the 'builtinExtensions' option; add it back to that array (or omit 'builtinExtensions' to use the default set)`, ht = /* @__PURE__ */ new Map([
-	["b32", pt("b32")],
-	["h32", pt("h32")],
-	["same", pt("same")],
-	["hash", mt("hash", "@cbortech/hash-extension")],
-	["uuid", mt("uuid", "@cbortech/uuid-extension")],
-	["UUID", mt("uuid", "@cbortech/uuid-extension")],
-	["dt", V("dt")],
-	["DT", V("dt")],
-	["ip", V("ip")],
-	["IP", V("ip")],
-	["cri", V("cri")],
-	["CRI", V("cri")],
-	["t1", V("t1")],
-	["b1", V("b1")],
-	["ilbs", V("ilbs")],
-	["ilts", V("ilts")],
-	["float", V("float")]
-]), gt = class {
+var Lt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'extensions' option (extensions: [${e}])`, Rt = (e, t) => `install ${t}, import { ${e} } from '${t}', and pass it via the 'extensions' option (extensions: [${e}])`, K = (e) => `'${e}' is a default built-in extension that was excluded via the 'builtinExtensions' option; add it back to that array (or omit 'builtinExtensions' to use the default set)`, zt = /* @__PURE__ */ new Map([
+	["b32", Lt("b32")],
+	["h32", Lt("h32")],
+	["same", Lt("same")],
+	["hash", Rt("hash", "@cbortech/hash-extension")],
+	["uuid", Rt("uuid", "@cbortech/uuid-extension")],
+	["UUID", Rt("uuid", "@cbortech/uuid-extension")],
+	["dt", K("dt")],
+	["DT", K("dt")],
+	["ip", K("ip")],
+	["IP", K("ip")],
+	["cri", K("cri")],
+	["CRI", K("cri")],
+	["t1", K("t1")],
+	["b1", K("b1")],
+	["ilbs", K("ilbs")],
+	["ilts", K("ilts")],
+	["float", K("float")]
+]), Bt = class {
 	t;
 	_options;
 	extByPrefix;
@@ -1321,7 +1775,7 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 	_hintedPrefixes = /* @__PURE__ */ new Set();
 	constructor(e, t) {
 		this.t = e, this._options = t, this.extByPrefix = /* @__PURE__ */ new Map(), this.extByTag = /* @__PURE__ */ new Map(), this.unresolvedExtension = t.unresolvedExtension ?? "cpa999";
-		let n = Z(t.builtinExtensions);
+		let n = gi(t.builtinExtensions);
 		for (let e of [...n, ...t.extensions ?? []]) {
 			for (let t of e.appStringPrefixes ?? []) this.extByPrefix.set(t, e);
 			for (let t of e.tagNumbers ?? []) this.extByTag.set(t, e);
@@ -1372,12 +1826,12 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 			case "BYTES_HEX":
 			case "SQSTR":
 			case "BYTES_B64": return this.t.consume(), this._parseBytesConcat(this._decodeBytesToken(e), e.type, e.raw);
-			case "EMPTY_INDEF_BYTES": return this.t.consume(), new F([]);
-			case "EMPTY_INDEF_TEXT": return this.t.consume(), new I([]);
-			case "TRUE": return this.t.consume(), new z(21);
-			case "FALSE": return this.t.consume(), new z(20);
-			case "NULL": return this.t.consume(), new z(22);
-			case "UNDEFINED": return this.t.consume(), new z(23);
+			case "EMPTY_INDEF_BYTES": return this.t.consume(), new R([]);
+			case "EMPTY_INDEF_TEXT": return this.t.consume(), new z([]);
+			case "TRUE": return this.t.consume(), new H(21);
+			case "FALSE": return this.t.consume(), new H(20);
+			case "NULL": return this.t.consume(), new H(22);
+			case "UNDEFINED": return this.t.consume(), new H(23);
 			case "SIMPLE": return this.parseSimple();
 			case "LBRACKET": return this.parseArray();
 			case "LBRACE": return this.parseMap();
@@ -1392,106 +1846,138 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 				}
 				let r = this.extByPrefix.get(e.appPrefix);
 				if (!r?.parseAppString) {
-					if (r || this._hintMissingExtension(e.appPrefix, e), this.unresolvedExtension === "cpa999") return new We(e.appPrefix, [new H(e.value)]);
+					if (r || this._hintMissingExtension(e.appPrefix, e), this.unresolvedExtension === "cpa999") return new at(e.appPrefix, [new q(e.value)]);
 					this._fail(`unknown app-string extension: ${JSON.stringify(e.appPrefix)}`, e);
 				}
 				{
 					let i = this._pendingWarnings.length;
 					try {
 						let i = r.parseAppString(e.appPrefix, e.value, this._extOnError(e), t === void 0 ? void 0 : { encodingWidth: t });
-						return t !== void 0 && this._applyEiToResult(i, t, e), i instanceof P && Object.getPrototypeOf(i) === P.prototype && i.ednSource === void 0 ? new P(i.value, {
+						return t !== void 0 && this._applyEiToResult(i, t, e), r.preserveAppSeqSource === "optional" ? (i.appSeqSource = e.raw + n, i) : i instanceof L && Object.getPrototypeOf(i) === L.prototype && i.ednSource === void 0 ? new L(i.value, {
 							ednEncoding: i.ednEncoding,
 							encodingWidth: i.encodingWidth,
-							ednSource: e.raw + n
-						}) : (i instanceof M && i.ednSource === void 0 && (i.ednSource = e.raw + n), i);
+							ednSource: e.raw + n,
+							ednCommentSyntax: r === tt || r === nt ? "full" : void 0
+						}) : (i instanceof F && i.ednSource === void 0 && (i.ednSource = e.raw + n), i);
 					} catch (t) {
 						if (this._options.strict !== !1) throw t;
-						return this._pendingWarnings.length === i && this._warn(t instanceof Error ? t.message : String(t), e), new We(e.appPrefix, [new H(e.value)]);
+						return this._pendingWarnings.length === i && this._warn(t instanceof Error ? t.message : String(t), e), new at(e.appPrefix, [new q(e.value)]);
 					}
 				}
 			}
 			case "APP_SEQUENCE": {
+				let t = this.t.comments.length;
 				this.t.consume();
-				let t = [];
+				let n = [];
 				for (; this.t.peek().type !== "GT_GT";) {
-					if (this.t.peek().type === "EOF" && this._fail(`unterminated ${e.appPrefix}<<...>>`, e), t.length > 0) if (this.t.peek().type === "COMMA") {
+					if (this.t.peek().type === "EOF" && this._fail(`unterminated ${e.appPrefix}<<...>>`, e), n.length > 0) if (this.t.peek().type === "COMMA") {
 						if (this.t.consume(), this.t.peek().type === "GT_GT") break;
 					} else this.t.peek().offset === this.t.lastEndOffset && this._warnOrFail("<<...>> items must be separated by \",\" or whitespace", this.t.peek());
-					t.push(this.parseValue());
+					n.push(this.parseValue());
 				}
 				this.expect("GT_GT");
-				let n, r;
-				this.t.peek().type === "ENCODING_INDICATOR" && (r = this.t.consume(), n = this._resolveEncodingWidth(r.value, r));
-				let i = this.extByPrefix.get(e.appPrefix);
-				if (!i) {
-					if (this._hintMissingExtension(e.appPrefix, e), this.unresolvedExtension === "cpa999") return new We(e.appPrefix, t);
+				let r, i;
+				this.t.peek().type === "ENCODING_INDICATOR" && (i = this.t.consume(), r = this._resolveEncodingWidth(i.value, i));
+				let a = this.extByPrefix.get(e.appPrefix);
+				if (!a) {
+					if (this._hintMissingExtension(e.appPrefix, e), this.unresolvedExtension === "cpa999") return new at(e.appPrefix, n);
 					this._fail(`unknown app-string extension: ${JSON.stringify(e.appPrefix)}`, e);
 				}
-				i.parseAppSequence || this._fail(`app-string extension ${JSON.stringify(e.appPrefix)} does not support <<...>> form`, e);
+				a.parseAppSequence || this._fail(`app-string extension ${JSON.stringify(e.appPrefix)} does not support <<...>> form`, e);
 				{
-					let a = this._pendingWarnings.length;
+					let o = this._pendingWarnings.length;
 					try {
-						let a = i.parseAppSequence(e.appPrefix, t, this._extOnError(e));
-						n !== void 0 && this._applyEiToResult(a, n, r ?? e);
-						let o = this.t.source.slice(e.offset, this.t.lastEndOffset);
-						if (a instanceof M) a.ednSource === void 0 && (a.ednSource = o);
-						else if (i.preserveAppSeqSource) return new Ge(a, o);
-						return a;
-					} catch (n) {
-						if (this._options.strict !== !1) throw n;
-						return this._pendingWarnings.length === a && this._warn(n instanceof Error ? n.message : String(n), e), new We(e.appPrefix, t);
+						let o = a.parseAppSequence(e.appPrefix, n, this._extOnError(e));
+						r !== void 0 && this._applyEiToResult(o, r, i ?? e);
+						let s = this.t.source.slice(e.offset, this.t.lastEndOffset);
+						if (a.preserveAppSeqSource === "optional") o.appSeqSource = s, o.appSeqComments = At(this.t.comments, t, e.offset, this.t.lastEndOffset), n.length === 1 && (n[0].end !== void 0 && (o.appSeqInnerEnd = n[0].end - e.offset), o.appSeqSourceFeatures = G(n[0]));
+						else if (o instanceof F) o.ednSource === void 0 && (o.ednSource = s);
+						else if (a.preserveAppSeqSource) return new ot(o, s);
+						return o;
+					} catch (t) {
+						if (this._options.strict !== !1) throw t;
+						return this._pendingWarnings.length === o && this._warn(t instanceof Error ? t.message : String(t), e), new at(e.appPrefix, n);
 					}
 				}
 			}
 			case "ELLIPSIS": {
-				if (this.t.consume(), this.t.peek().type !== "PLUS") return new B();
-				let e = [new B()];
+				if (this.t.consume(), this.t.peek().type !== "PLUS") return new W();
+				let e = [new W()];
 				for (; this.t.peek().type === "PLUS";) this.t.consume(), e.push(this.parseValue());
-				return new B(e);
+				return new W(e, e.map(() => !0));
 			}
 			case "BYTES_HEX_ELIDED": return this.t.consume(), this._parseHexElidedConcat(e);
 			default: this._fail(`unexpected token: ${JSON.stringify(e.value)}`, e);
 		}
 	}
 	parseIntegerOrTag() {
-		let e = this.t.consume(), { numStr: t, rawSuffix: n } = at(e.value), r = n === void 0 ? this.consumeEncodingIndicator() : this._resolveEncodingWidth(n, e), i = ot(t);
-		if (i > 18446744073709551615n) return this.t.peek().type === "LPAREN" && this._fail("tag number exceeds maximum uint64", e), new $e(i);
-		if (i < -18446744073709551616n) return new et(i);
-		if (r !== void 0) {
-			let t = i >= 0n ? i : -(i + 1n);
-			r = this._validateEncodingFit(t, r, e);
-		}
-		let a = i >= 0n ? new A(i, r === void 0 ? void 0 : { encodingWidth: r }) : new j(i, r === void 0 ? void 0 : { encodingWidth: r });
+		let e = this.t.comments.length, t = this.t.consume(), { numStr: n, rawSuffix: r } = Ct(t.value), i = r === void 0 ? t.endOffset : t.endOffset - 2, a = t.endOffset, o = r === void 0 ? this.consumeEncodingIndicator(void 0, (e) => {
+			i = e.offset, a = e.endOffset;
+		}) : this._resolveEncodingWidth(r, t), s = wt(n), c = r === void 0 ? t.raw : t.raw.slice(0, -2);
+		if (s > 18446744073709551615n) return this.t.peek().type === "LPAREN" && this._fail("tag number exceeds maximum uint64", t), new _t(s);
+		if (s < -18446744073709551616n) return new vt(s);
+		if (o !== void 0) {
+			let e = s >= 0n ? s : -(s + 1n);
+			o = this._validateEncodingFit(e, o, t);
+		}
+		let l = s >= 0n ? new N(s, {
+			encodingWidth: o,
+			ednSource: c
+		}) : new P(s, {
+			encodingWidth: o,
+			ednSource: c
+		});
 		if (this.t.peek().type === "LPAREN") {
-			a instanceof A || this._fail("tag number must be non-negative", e), this.t.consume();
-			let t = this._pendingWarnings.splice(0), n = this.parseValue();
+			l instanceof N || this._fail("tag number must be non-negative", t), this.t.consume();
+			let n = this._pendingWarnings.splice(0), r = this.parseValue();
 			this.expect("RPAREN");
-			let i = a.value, o = this.extByTag.get(i);
-			if (o?.parseTag) {
-				let e = o.parseTag(i, n);
-				if (e !== void 0) return e instanceof N && r !== void 0 && e.encodingWidth === void 0 && (e.encodingWidth = r), t.length > 0 && (e.warnings ??= [], e.warnings.push(...t)), e;
+			let s = l.value, u = this.extByTag.get(s);
+			if (u?.parseTag) {
+				let l = u.parseTag(s, r);
+				if (l !== void 0) {
+					if (l instanceof I && (o !== void 0 && l.encodingWidth === void 0 && (l.encodingWidth = o), l.ednSource === void 0 && (l.ednSource = c), u.preserveAppSeqSource === "optional" && l.appSeqSource === void 0)) {
+						l.appSeqSource = this.t.source.slice(t.offset, this.t.lastEndOffset), l.appSeqComments = At(this.t.comments, e, t.offset, this.t.lastEndOffset);
+						let n = l.encodingWidth ?? w(l.tag), o = Mt(this.t.source, t.offset, l.content);
+						l.appSeqEncodingEdits = [{
+							start: i - t.offset,
+							end: a - t.offset,
+							always: `_${n}`,
+							never: ""
+						}, ...o ?? []], o === void 0 && (l.appSeqEncodingEditsComplete = !1), l.appSeqSourceFeatures = G(r);
+					}
+					return n.length > 0 && (l.warnings ??= [], l.warnings.push(...n)), l;
+				}
 			}
-			let s = new N(i, n, r === void 0 ? void 0 : { encodingWidth: r });
-			return t.length > 0 && (s.warnings ??= [], s.warnings.push(...t)), s;
+			let d = new I(s, r, {
+				encodingWidth: o,
+				ednSource: c
+			});
+			return n.length > 0 && (d.warnings ??= [], d.warnings.push(...n)), d;
 		}
-		return a;
+		return l;
 	}
 	parseFloat() {
-		let e = this.t.consume(), t = (t) => this._warnOrFail(t, e), { value: n, precision: r } = st(e.value, t);
+		let e = this.t.consume(), t = (t) => this._warnOrFail(t, e), { value: n, precision: r } = Dt(e.value, t);
 		if (r === "half" || r === "single") {
-			let e = r === "half" ? E(T(n)) : Math.fround(n);
+			let e = r === "half" ? O(Ae(n)) : Math.fround(n);
 			Object.is(n, e) || isNaN(n) && isNaN(e) || t(`${n} cannot be exactly represented as ${r === "half" ? "f16 (_1)" : "f32 (_2)"}; use _3 or remove the indicator`);
 		}
-		return new M(n, r === void 0 ? void 0 : { precision: r });
+		return new F(n, {
+			precision: r,
+			literalSource: e.raw
+		});
 	}
 	parseString() {
 		let e = this.t.consume();
 		if (this.t.peek().type !== "PLUS") {
-			let t = this.consumeEncodingIndicator(() => BigInt(tt.encode(e.value).length));
-			return e.type === "RAWSTRING" ? new H(e.value, {
+			let t = this.consumeEncodingIndicator(() => BigInt(yt.encode(e.value).length));
+			return e.type === "RAWSTRING" ? new q(e.value, {
 				ednSource: e.raw,
 				...t === void 0 ? {} : { encodingWidth: t }
-			}) : new H(e.value, t === void 0 ? void 0 : { encodingWidth: t });
+			}) : new q(e.value, {
+				quotedEdnSource: e.raw,
+				...t === void 0 ? {} : { encodingWidth: t }
+			});
 		}
 		let t = !1, n = [e.type === "RAWSTRING" ? {
 			text: e.value,
@@ -1503,29 +1989,34 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 			e.type === "ELLIPSIS" ? (this.t.consume(), n.push({ ellipsis: !0 }), t = !0) : e.type === "TSTR" || e.type === "RAWSTRING" ? (this.t.consume(), n.push(e.type === "RAWSTRING" ? {
 				text: e.value,
 				source: e.raw
-			} : { text: e.value })) : this._isBytesToken(e.type) ? (this.t.consume(), n.push({ text: this._decodeUtf8(this._decodeBytesToken(e), e) })) : this._fail(`expected string or byte string after +, got ${JSON.stringify(e.value)}`, e);
+			} : { text: e.value })) : this._isBytesToken(e.type) ? (this.t.consume(), n.push({
+				text: this._decodeUtf8(this._decodeBytesToken(e), e),
+				isByteString: !0
+			})) : this._fail(`expected string or byte string after +, got ${JSON.stringify(e.value)}`, e);
 		}
 		if (!t) {
-			let e = n.map((e) => "text" in e ? e.text : ""), t = n.map((e) => "text" in e ? e.source : void 0), r = e.join(""), i = this.consumeEncodingIndicator(() => BigInt(tt.encode(r).length));
-			return new H(r, {
+			let e = n.map((e) => "text" in e ? e.text : ""), t = n.map((e) => "text" in e ? e.source : void 0), r = n.map((e) => "text" in e ? e.isByteString ?? !1 : !1), i = e.join(""), a = this.consumeEncodingIndicator(() => BigInt(yt.encode(i).length));
+			return new q(i, {
 				ednParts: e,
 				...t.some((e) => e !== void 0) ? { ednPartSources: t } : {},
-				...i === void 0 ? {} : { encodingWidth: i }
+				...r.some((e) => e) ? { ednPartIsByteString: r } : {},
+				...a === void 0 ? {} : { encodingWidth: a }
 			});
 		}
 		let r = [], i = [], a = () => {
 			let e = i.map((e) => e.text), t = e.join("");
 			if (t !== "") {
-				let n = i.map((e) => e.source);
-				r.push(new H(t, {
+				let n = i.map((e) => e.source), a = i.map((e) => e.isByteString ?? !1);
+				r.push(new q(t, {
 					ednParts: e,
-					...n.some((e) => e !== void 0) ? { ednPartSources: n } : {}
+					...n.some((e) => e !== void 0) ? { ednPartSources: n } : {},
+					...a.some((e) => e) ? { ednPartIsByteString: a } : {}
 				}));
 			}
 			i.length = 0;
 		};
-		for (let e of n) "ellipsis" in e ? (a(), r.push(new B())) : i.push(e);
-		return a(), new B(r);
+		for (let e of n) "ellipsis" in e ? (a(), r.push(new W())) : i.push(e);
+		return a(), new W(r);
 	}
 	_isBytesToken(e) {
 		return e === "BYTES_HEX" || e === "SQSTR" || e === "BYTES_B64";
@@ -1547,7 +2038,7 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 			}
 			case "BYTES_HEX": return this._hexToBytes(e.value, e);
 			case "BYTES_B64": try {
-				return ct(e.value, t);
+				return rt(e.value, t);
 			} catch (t) {
 				if (t instanceof r || !(t instanceof SyntaxError)) throw t;
 				this._fail(t.message, e);
@@ -1556,83 +2047,103 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 		}
 	}
 	_decodeUtf8(e, t) {
-		if (this._options.allowInvalidUtf8) return rt.decode(e);
+		if (this._options.allowInvalidUtf8) return xt.decode(e);
 		try {
-			return nt.decode(e);
+			return bt.decode(e);
 		} catch {
-			return this._warnOrFail("byte string in text concatenation is not valid UTF-8", t), rt.decode(e);
+			return this._warnOrFail("byte string in text concatenation is not valid UTF-8", t), xt.decode(e);
 		}
 	}
 	_tokenTypeToCdnEncoding(e) {
 		return e === "BYTES_B64" ? "base64" : "hex";
 	}
+	_tokenTypeToCommentSyntax(e) {
+		if (e === "BYTES_HEX") return "full";
+		if (e === "BYTES_B64") return "hash-only";
+	}
 	_parseBytesConcat(e, t, n) {
 		if (this.t.peek().type !== "PLUS") {
 			let r = this.consumeEncodingIndicator(() => BigInt(e.length));
-			return new P(e, {
+			return new L(e, {
 				ednEncoding: this._tokenTypeToCdnEncoding(t),
 				ednSource: n,
+				ednCommentSyntax: this._tokenTypeToCommentSyntax(t),
 				...r === void 0 ? {} : { encodingWidth: r }
 			});
 		}
-		let r = !1, i = [{
+		let r = [{
 			bytes: e,
-			source: n
-		}];
-		for (; this.t.peek().type === "PLUS";) {
-			this.t.consume();
-			let e = this.t.peek();
-			if (e.type === "ELLIPSIS") this.t.consume(), i.push({ ellipsis: !0 }), r = !0;
-			else if (e.type === "BYTES_HEX_ELIDED") {
-				this.t.consume();
-				let t = this._buildBytesElidedItems(e.value, e);
-				for (let e of t) e instanceof B ? (i.push({ ellipsis: !0 }), r = !0) : e instanceof P && i.push({ bytes: e.value });
-			} else this._isBytesToken(e.type) ? (this.t.consume(), i.push({
-				bytes: this._decodeBytesToken(e),
-				source: e.raw
-			})) : e.type === "TSTR" || e.type === "RAWSTRING" ? (this.t.consume(), this._warnOrFail("text string in a byte-string concatenation is not allowed; use a byte string literal (h'...', b64'...', or '...') instead", e), i.push({ bytes: tt.encode(e.value) })) : this._fail(`expected byte string after +, got ${JSON.stringify(e.value)}`, e);
-		}
-		if (!r) {
-			let e = i.map((e) => "bytes" in e ? e : { bytes: /* @__PURE__ */ new Uint8Array() }), n = this._concatBytes(e.map((e) => e.bytes)), r = this.consumeEncodingIndicator(() => BigInt(n.length));
-			return new P(n, {
-				ednEncoding: this._tokenTypeToCdnEncoding(t),
-				ednParts: e,
-				...r === void 0 ? {} : { encodingWidth: r }
-			});
-		}
-		let a = [], o = [], s = () => {
-			o.length > 0 && (a.push(new P(this._concatBytes([...o]))), o.length = 0);
-		};
-		for (let e of i) "ellipsis" in e ? (s(), a.push(new B())) : o.push(e.bytes);
-		return s(), new B(a);
+			source: n,
+			commentSyntax: this._tokenTypeToCommentSyntax(t),
+			real: !1
+		}], i = this._consumeByteEllipsisChain(r);
+		return this._buildFromByteAtoms(i, this._tokenTypeToCdnEncoding(t));
 	}
 	_parseHexElidedConcat(e) {
-		let t = this._buildBytesElidedItems(e.value, e);
+		let t = this._consumeByteEllipsisChain(this._elidedHexAtoms(e.value, e));
+		return this._buildFromByteAtoms(t, "hex");
+	}
+	_consumeByteEllipsisChain(e) {
+		let t = e;
 		for (; this.t.peek().type === "PLUS";) {
 			this.t.consume();
 			let e = this.t.peek();
-			if (e.type === "ELLIPSIS") this.t.consume(), t.push(new B());
+			if (e.type === "ELLIPSIS") this.t.consume(), t.push({
+				ellipsis: !0,
+				real: !0,
+				fromByteLiteral: !1
+			});
 			else if (e.type === "BYTES_HEX_ELIDED") {
 				this.t.consume();
-				let n = this._buildBytesElidedItems(e.value, e);
-				this._mergeFirstBytesItem(t, n);
-			} else if (this._isBytesToken(e.type)) {
-				this.t.consume();
-				let n = this._decodeBytesToken(e), r = t[t.length - 1];
-				r instanceof P ? t[t.length - 1] = new P(this._concatBytes([r.value, n])) : t.push(new P(n));
-			} else this._fail(`expected byte string after +, got ${JSON.stringify(e.value)}`, e);
+				let n = this._elidedHexAtoms(e.value, e);
+				n.length > 0 && (n[0].real = !0), t.push(...n);
+			} else this._isBytesToken(e.type) ? (this.t.consume(), t.push({
+				bytes: this._decodeBytesToken(e),
+				source: e.raw,
+				commentSyntax: this._tokenTypeToCommentSyntax(e.type),
+				real: !0
+			})) : e.type === "TSTR" || e.type === "RAWSTRING" ? (this.t.consume(), this._warnOrFail("text string in a byte-string concatenation is not allowed; use a byte string literal (h'...', b64'...', or '...') instead", e), t.push({
+				bytes: yt.encode(e.value),
+				real: !0
+			})) : this._fail(`expected byte string after +, got ${JSON.stringify(e.value)}`, e);
 		}
-		return new B(t);
+		return t;
 	}
-	_buildBytesElidedItems(e, t) {
+	_elidedHexAtoms(e, t) {
 		let n = e.split("..."), r = [];
-		for (let e = 0; e < n.length; e++) e > 0 && r.push(new B()), n[e].length > 0 && r.push(new P(this._hexToBytes(n[e], t)));
+		for (let e = 0; e < n.length; e++) e > 0 && r.push({
+			ellipsis: !0,
+			real: !1,
+			fromByteLiteral: !0,
+			literalSource: t.raw
+		}), n[e].length > 0 && r.push({
+			bytes: this._hexToBytes(n[e], t),
+			commentSyntax: "full",
+			real: !1
+		});
 		return r;
 	}
-	_mergeFirstBytesItem(e, t) {
-		if (t.length === 0) return;
-		let n = e[e.length - 1], r = t[0];
-		n instanceof P && r instanceof P ? (e[e.length - 1] = new P(this._concatBytes([n.value, r.value])), e.push(...t.slice(1))) : e.push(...t);
+	_buildFromByteAtoms(e, t) {
+		if (!e.some((e) => "ellipsis" in e)) {
+			let n = e, r = this._concatBytes(n.map((e) => e.bytes)), i = this.consumeEncodingIndicator(() => BigInt(r.length));
+			return new L(r, {
+				ednEncoding: t,
+				ednParts: n,
+				...i === void 0 ? {} : { encodingWidth: i }
+			});
+		}
+		let n = [], r = [], i = [], a = () => {
+			i.length > 0 && (n.push(new L(this._concatBytes(i.map((e) => e.bytes)), { ...i.length > 1 ? { ednParts: i.map(({ bytes: e, source: t, commentSyntax: n }) => ({
+				bytes: e,
+				source: t,
+				commentSyntax: n
+			})) } : {
+				ednSource: i[0].source,
+				ednCommentSyntax: i[0].commentSyntax
+			} })), r.push(i[0].real), i.length = 0);
+		};
+		for (let t of e) "ellipsis" in t ? (a(), n.push(new W(t.fromByteLiteral, t.literalSource)), r.push(t.real)) : i.push(t);
+		return a(), new W(n, r);
 	}
 	_concatBytes(e) {
 		let t = e.reduce((e, t) => e + t.byteLength, 0), n = new Uint8Array(t), r = 0;
@@ -1643,8 +2154,8 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 		this.t.consume(), this.expect("LPAREN");
 		let e = this.t.peek();
 		e.type !== "INTEGER" && this._fail(`expected integer inside simple(), got ${JSON.stringify(e.value)}`, e), this.t.consume();
-		let { numStr: t } = at(e.value), n = Number(ot(t));
-		return this.expect("RPAREN"), new z(n);
+		let { numStr: t } = Ct(e.value), n = Number(wt(t));
+		return this.expect("RPAREN"), new H(n, { ednSource: e.raw });
 	}
 	parseEmbeddedCBOR() {
 		this.t.consume();
@@ -1661,46 +2172,47 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 			let e = this.t.consume();
 			t = this._resolveEncodingWidth(e.value, e);
 		}
-		return new He(e, { encodingWidth: t });
+		return new U(e, { encodingWidth: t });
 	}
 	parseArray() {
 		this.t.consume();
 		let e = !1, t, n;
 		this.t.peek().type === "UNDERSCORE" ? (this.t.consume(), e = !0) : this.t.peek().type === "ENCODING_INDICATOR" && (n = this.t.consume(), n.value === "7" ? (e = !0, this._warnOrFail("encoding indicator _7 is non-standard; use _ to indicate indefinite length", n), n = void 0) : t = this._resolveEncodingWidth(n.value, n));
-		let r = this._pendingWarnings.splice(0), i = [];
+		let r = this._pendingWarnings.splice(0), i = [], a = this.t.lastEndOffset;
 		for (; this.t.peek().type !== "RBRACKET";) {
 			if (i.length > 0) if (this.t.peek().type === "COMMA") {
 				if (this.t.consume(), this.t.peek().type === "RBRACKET") break;
 			} else this.t.peek().offset === this.t.lastEndOffset && this._warnOrFail("array items must be separated by \",\" or whitespace", this.t.peek());
-			i.push(this.parseValue());
+			let e = this.parseValue();
+			kt(this.t.source, a, e.start) && (e.blankLineBefore = !0), a = e.end, i.push(e);
 		}
 		this.expect("RBRACKET"), t !== void 0 && n !== void 0 && (t = this._validateEncodingFit(BigInt(i.length), t, n));
-		let a = new L(i, {
+		let o = new B(i, {
 			indefiniteLength: e,
 			encodingWidth: t
 		});
-		return r.length > 0 && (a.warnings ??= [], a.warnings.push(...r)), a;
+		return r.length > 0 && (o.warnings ??= [], o.warnings.push(...r)), o;
 	}
 	parseMap() {
 		this.t.consume();
 		let e = !1, t, n;
 		this.t.peek().type === "UNDERSCORE" ? (this.t.consume(), e = !0) : this.t.peek().type === "ENCODING_INDICATOR" && (n = this.t.consume(), n.value === "7" ? (e = !0, this._warnOrFail("encoding indicator _7 is non-standard; use _ to indicate indefinite length", n), n = void 0) : t = this._resolveEncodingWidth(n.value, n));
-		let r = this._pendingWarnings.splice(0), i = [];
+		let r = this._pendingWarnings.splice(0), i = [], a = this.t.lastEndOffset;
 		for (; this.t.peek().type !== "RBRACE";) {
 			if (i.length > 0) if (this.t.peek().type === "COMMA") {
 				if (this.t.consume(), this.t.peek().type === "RBRACE") break;
 			} else this.t.peek().offset === this.t.lastEndOffset && this._warnOrFail("map entries must be separated by \",\" or whitespace", this.t.peek());
 			let e = this.parseValue();
-			this.expect("COLON");
+			kt(this.t.source, a, e.start) && (e.blankLineBefore = !0), this.expect("COLON");
 			let t = this.parseValue();
-			i.push([e, t]);
+			a = t.end, i.push([e, t]);
 		}
 		this.expect("RBRACE"), t !== void 0 && n !== void 0 && (t = this._validateEncodingFit(BigInt(i.length), t, n));
-		let a = new R(i, {
+		let o = new V(i, {
 			indefiniteLength: e,
 			encodingWidth: t
 		});
-		return r.length > 0 && (a.warnings ??= [], a.warnings.push(...r)), a;
+		return r.length > 0 && (o.warnings ??= [], o.warnings.push(...r)), o;
 	}
 	parseIndefGroup() {
 		this.t.consume();
@@ -1711,35 +2223,38 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 			let e = this.t.consume(), t = `encoding indicator _${e.value} is not valid in an indefinite string group; use _`;
 			this._warnOrFail(t, e);
 		} else e.type !== "RPAREN" && this._warnOrFail("indefinite string group is missing _ after (; interpreting as (_ ...)", e);
-		let t = this._pendingWarnings.splice(0), n = [];
+		let t = this._pendingWarnings.splice(0), n = [], r = this.t.lastEndOffset;
 		for (; this.t.peek().type !== "RPAREN";) {
 			if (n.length > 0) if (this.t.peek().type === "COMMA") {
 				if (this.t.consume(), this.t.peek().type === "RPAREN") break;
 			} else this.t.peek().offset === this.t.lastEndOffset && this._warnOrFail("indefinite string chunks must be separated by \",\" or whitespace", this.t.peek());
-			n.push(this.parseValue());
+			let e = this.parseValue();
+			kt(this.t.source, r, e.start) && (e.blankLineBefore = !0), r = e.end, n.push(e);
 		}
 		this.expect("RPAREN"), n.length === 0 && this._fail("empty indefinite group (_ ) is ambiguous; use ''_ for bytes or \"\"_ for text");
-		let r = n[0];
-		if (r instanceof P) {
-			let e = new F(n.map((e, t) => {
-				if (e instanceof P) return e;
+		let i = n[0];
+		if (i instanceof L) {
+			let e = new R(n.map((e, t) => {
+				if (e instanceof L) return e;
 				this._fail(`indefinite byte string chunk ${t} must be a byte string, not a text string`);
 			}));
 			return t.length > 0 && (e.warnings = t), e;
 		}
-		if (r instanceof H) {
-			let e = new I(n.map((e, t) => {
-				if (e instanceof H) return e;
+		if (i instanceof q) {
+			let e = new z(n.map((e, t) => {
+				if (e instanceof q) return e;
 				this._fail(`indefinite text string chunk ${t} must be a text string, not a byte string`);
 			}));
 			return t.length > 0 && (e.warnings = t), e;
 		}
 		this._fail("indefinite group chunks must be byte strings or text strings");
 	}
-	consumeEncodingIndicator(e) {
+	consumeEncodingIndicator(e, t) {
 		if (this.t.peek().type === "ENCODING_INDICATOR") {
-			let t = this.t.consume(), n = this._resolveEncodingWidth(t.value, t);
-			return n !== void 0 && e !== void 0 && (n = this._validateEncodingFit(e(), n, t)), n;
+			let n = this.t.consume();
+			t?.(n);
+			let r = this._resolveEncodingWidth(n.value, n);
+			return r !== void 0 && e !== void 0 && (r = this._validateEncodingFit(e(), r, n)), r;
 		}
 	}
 	expect(e) {
@@ -1747,47 +2262,47 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 		return t.type !== e && this._fail(`expected ${e}, got ${t.type} (${JSON.stringify(t.value)})`, t), t;
 	}
 	_applyEiToResult(e, t, n) {
-		if (e instanceof M) {
+		if (e instanceof F) {
 			let r = t === 1 ? "half" : t === 2 ? "single" : t === 3 ? "double" : void 0;
 			if (r === void 0) this._warnOrFail(`encoding indicator _${t} is not valid for a float; use _1, _2, or _3`, n);
 			else if (e.precision !== r) {
 				if (r !== "double") {
-					let t = r === "half" ? E(T(e.value)) : Math.fround(e.value);
+					let t = r === "half" ? O(Ae(e.value)) : Math.fround(e.value);
 					!Object.is(t, e.value) && !isNaN(e.value) && this._warnOrFail(`${e.value} cannot be exactly represented as ${r === "half" ? "float16 (_1)" : "float32 (_2)"}`, n);
 				}
 				e.precision = r;
 			}
-		} else if (e instanceof A) {
+		} else if (e instanceof N) {
 			if (e.encodingWidth === void 0) {
 				let r = this._validateEncodingFit(e.value, t, n);
 				r !== void 0 && (e.encodingWidth = r);
 			}
-		} else if (e instanceof j) {
+		} else if (e instanceof P) {
 			if (e.encodingWidth === void 0) {
 				let r = this._validateEncodingFit(e.argument, t, n);
 				r !== void 0 && (e.encodingWidth = r);
 			}
-		} else if (e instanceof P) {
+		} else if (e instanceof L) {
 			if (e.encodingWidth === void 0) {
 				let r = this._validateEncodingFit(BigInt(e.value.length), t, n);
 				r !== void 0 && (e.encodingWidth = r);
 			}
-		} else if (e instanceof H) {
+		} else if (e instanceof q) {
 			if (e.encodingWidth === void 0) {
-				let r = this._validateEncodingFit(BigInt(tt.encode(e.value).length), t, n);
+				let r = this._validateEncodingFit(BigInt(yt.encode(e.value).length), t, n);
 				r !== void 0 && (e.encodingWidth = r);
 			}
-		} else if (e instanceof L) {
+		} else if (e instanceof B) {
 			if (e.encodingWidth === void 0) {
 				let r = this._validateEncodingFit(BigInt(e.items.length), t, n);
 				r !== void 0 && (e.encodingWidth = r);
 			}
-		} else if (e instanceof R) {
+		} else if (e instanceof V) {
 			if (e.encodingWidth === void 0) {
 				let r = this._validateEncodingFit(BigInt(e.entries.length), t, n);
 				r !== void 0 && (e.encodingWidth = r);
 			}
-		} else if (e instanceof N) {
+		} else if (e instanceof I) {
 			if (e.encodingWidth === void 0) {
 				let r = this._validateEncodingFit(e.tag, t, n);
 				r !== void 0 && (e.encodingWidth = r);
@@ -1795,7 +2310,7 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 		} else this._warnOrFail(`encoding indicator _${t} is not applicable to this app-string result type`, n);
 	}
 	_validateEncodingFit(e, t, n) {
-		let r = Me(t);
+		let r = ze(t);
 		if (e <= r) return t;
 		let i = `value ${e} does not fit in encoding indicator ${t === "i" ? "_i (max 23)" : `_${t} (max ${r})`}`;
 		this._warnOrFail(i, n);
@@ -1819,29 +2334,29 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 		this._warn(e, t), this._options.strict !== !1 && this._fail(e, t);
 	}
 	_hintMissingExtension(e, t) {
-		let n = ht.get(e);
+		let n = zt.get(e);
 		if (n === void 0 || this._hintedPrefixes.has(e)) return;
 		this._hintedPrefixes.add(e);
 		let r = `app-string prefix '${e}' requires an extension that is not enabled; ${n}`;
 		this._options.onWarning ? this._options.onWarning({
 			message: r,
-			..._t(t),
+			...Vt(t),
 			hint: !0
 		}) : this._options.silent || console.warn(`CDN: ${r}`);
 	}
 	_warn(e, t) {
 		let n = { message: e };
-		if (t !== void 0 && Object.assign(n, _t(t)), this._pendingWarnings.push(n), this._options.onWarning) this._options.onWarning(n);
+		if (t !== void 0 && Object.assign(n, Vt(t)), this._pendingWarnings.push(n), this._options.onWarning) this._options.onWarning(n);
 		else if (!this._options.silent) {
 			let n = t ? ` at line ${t.line}, column ${t.col}` : "";
 			console.warn(`CDN strict violation${n}: ${e}`);
 		}
 	}
 	_fail(e, t) {
-		throw new r(e, t ? _t(t) : void 0);
+		throw new r(e, t ? Vt(t) : void 0);
 	}
 };
-function _t(e) {
+function Vt(e) {
 	return {
 		offset: e.offset,
 		line: e.line,
@@ -1851,66 +2366,69 @@ function _t(e) {
 }
 //#endregion
 //#region src/ast/CborTextString.ts
-var vt = new TextEncoder(), yt = !1, H = class extends k {
+var Ht = new TextEncoder(), Ut = !1, q = class extends M {
 	indefiniteLength = !1;
 	value;
 	encodingWidth;
 	ednParts;
 	ednSource;
+	quotedEdnSource;
 	ednPartSources;
+	ednPartIsByteString;
 	constructor(e, t) {
-		super(), this.value = e, this.encodingWidth = t?.encodingWidth, this.ednParts = t?.ednParts, this.ednSource = t?.ednSource, this.ednPartSources = t?.ednPartSources;
+		super(), this.value = e, this.encodingWidth = t?.encodingWidth, this.ednParts = t?.ednParts, this.ednSource = t?.ednSource, this.quotedEdnSource = t?.quotedEdnSource, this.ednPartSources = t?.ednPartSources, this.ednPartIsByteString = t?.ednPartIsByteString;
 	}
 	_encodeTo(e, t) {
 		e.writeTextString(3, this.value, this.encodingWidth);
 	}
 	_toCDN(e, t) {
-		let n = w(e, this.encodingWidth, () => C(BigInt(vt.encode(this.value).length)));
-		return bt(this.value, n, e, t, this.ednParts, this.ednSource, this.ednPartSources);
+		let n = T(e, this.encodingWidth, () => w(BigInt(Ht.encode(this.value).length)));
+		return Wt(this.value, n, e, t, this.ednParts, this.ednSource, this.quotedEdnSource, this.ednPartSources);
 	}
 	_toJS(e) {
 		return this.value;
 	}
 };
-function bt(e, t, n, r, i, a, o) {
-	let s = _(n);
-	if (n?.preserveRawString && a !== void 0 && (s !== null || !/[\r\n]/.test(a))) return a + t;
-	if (s === null) return ye(e) + t;
-	let c = n?.preserveRawString ? o : void 0, l = c?.some((e) => e !== void 0) ?? !1, { cdn: u, newline: d } = St(n), f = n?.preserveConcatenation && i !== void 0 && (i.length > 1 || l) ? i : void 0;
-	if (!u && !d && f === void 0) return ye(e) + t;
-	let p = u ? Tt(e) : null;
-	if (f !== void 0 && (p === null || l)) {
+function Wt(e, t, n, r, i, a, o, s) {
+	let c = _(n);
+	if (n?.preserveRawString && a !== void 0 && (c !== null || !/[\r\n]/.test(a))) return a + t;
+	if (n?.preserveTextString && o !== void 0 && (c !== null || !/[\r\n]/.test(o))) return o + t;
+	if (c === null) return Se(e) + t;
+	let l = n?.preserveRawString ? s : void 0, u = l?.some((e) => e !== void 0) ?? !1, { cdn: d, newline: f } = Kt(n), p = n?.preserveConcatenation && i !== void 0 && (i.length > 1 || u) ? i : void 0;
+	if (!d && !f && p === void 0) return Se(e) + t;
+	let m = d ? Yt(e) : null;
+	if (p !== void 0 && (m === null || u)) {
 		let e = [];
-		for (let [t, n] of f.entries()) {
-			let r = c?.[t];
+		for (let [t, n] of p.entries()) {
+			let r = l?.[t];
 			if (r !== void 0) e.push({
 				text: n,
 				contentDepth: 0,
 				source: r
 			});
-			else if (d) {
+			else if (f) {
 				let t = /* @__PURE__ */ new Map();
-				for (let { point: e, contentDepth: r } of wt(n, 0)) t.set(e, r);
-				e.push(...Nt(n, t));
+				for (let { point: e, contentDepth: r } of Jt(n, 0)) t.set(e, r);
+				e.push(...rn(n, t));
 			} else e.push({
 				text: n,
 				contentDepth: 0
 			});
 		}
-		return xt(e, t, s, r);
+		return Gt(e, t, c, r);
 	}
-	let m = /* @__PURE__ */ new Map();
-	if (p !== null) for (let { point: e, contentDepth: t } of p) m.set(e, t);
-	if (d) {
-		let t = p === null ? wt(e, 0) : Et(e);
-		for (let { point: e, contentDepth: n } of t) m.has(e) || m.set(e, n);
+	let h = /* @__PURE__ */ new Map();
+	if (m !== null) for (let { point: e, contentDepth: t } of m) h.set(e, t);
+	if (f) {
+		let t = m === null ? Jt(e, 0) : Xt(e);
+		for (let { point: e, contentDepth: n } of t) h.has(e) || h.set(e, n);
 	}
-	let h = Nt(e, m);
-	return h.length <= 1 ? ye(e) + t : xt(h, t, s, r);
+	let g = rn(e, h);
+	return g.length <= 1 ? Se(e) + t : Gt(g, t, c, r);
 }
-function xt(e, t, n, r) {
+function Gt(e, t, n, r) {
 	let i = e.map(({ text: n, source: r }, i) => {
-		let a = r ?? ye(n);
+		let a = r ?? Se(n);
 		return i === e.length - 1 ? a + t : a;
 	}), a = i[0];
 	for (let t = 1; t < i.length; t++) {
@@ -1919,17 +2437,17 @@ function xt(e, t, n, r) {
 	}
 	return a;
 }
-function St(e) {
-	let t = e?.splitCdn === void 0 || e?.splitNewline === void 0 ? Ct(e?.textStringFormat ?? []) : [];
+function Kt(e) {
+	let t = e?.splitCdn === void 0 || e?.splitNewline === void 0 ? qt(e?.textStringFormat ?? []) : [];
 	return {
 		cdn: e?.splitCdn ?? t.includes("cdn"),
 		newline: e?.splitNewline ?? t.includes("newline")
 	};
 }
-function Ct(e) {
-	return e.map((e) => e === "cboredn" ? (yt || (yt = !0, console.warn("`textStringFormat: ['cboredn']` is deprecated; use `textStringFormat: ['cdn']` instead.")), "cdn") : e);
+function qt(e) {
+	return e.map((e) => e === "cboredn" ? (Ut || (Ut = !0, console.warn("`textStringFormat: ['cboredn']` is deprecated; use `textStringFormat: ['cdn']` instead.")), "cdn") : e);
 }
-function wt(e, t) {
+function Jt(e, t) {
 	let n = [];
 	for (let r = 0; r < e.length; r++) {
 		let i = e[r];
@@ -1946,9 +2464,9 @@ function wt(e, t) {
 	}
 	return n;
 }
-function Tt(e) {
+function Yt(e) {
 	try {
-		it(e);
+		St(e);
 	} catch {
 		return null;
 	}
@@ -1957,24 +2475,24 @@ function Tt(e) {
 		let a = n.consume();
 		if (a.type === "EOF") break;
 		let c = !1;
-		if (o || (o = !0, a.offset > 0 && jt(n.comments, 0, a.offset) && t.push({
+		if (o || (o = !0, a.offset > 0 && tn(n.comments, 0, a.offset) && t.push({
 			point: a.offset,
 			contentDepth: r
 		})), i !== null) {
-			if (i.kind === "opener" && Ot.has(a.type)) {
+			if (i.kind === "opener" && Qt.has(a.type)) {
 				i.point = a.endOffset, s = a.endOffset;
 				continue;
-			} else i.kind === "opener" && At.has(a.type) && Mt(e, i.point, a.offset) ? c = !0 : t.push({
+			} else i.kind === "opener" && en.has(a.type) && nn(e, i.point, a.offset) ? c = !0 : t.push({
 				point: a.offset,
 				contentDepth: i.contentDepth
 			});
 			i = null;
 		}
-		kt.has(a.type) ? (r++, i = {
+		$t.has(a.type) ? (r++, i = {
 			point: a.endOffset,
 			contentDepth: r,
 			kind: "opener"
-		}) : At.has(a.type) ? (r = Math.max(0, r - 1), c || t.push({
+		}) : en.has(a.type) ? (r = Math.max(0, r - 1), c || t.push({
 			point: a.offset,
 			contentDepth: r
 		})) : a.type === "COMMA" && (i = {
@@ -1989,23 +2507,23 @@ function Tt(e) {
 		contentDepth: r
 	}), t;
 }
-function Et(e) {
+function Xt(e) {
 	let t = [], n = new a(e), r = 0;
 	for (;;) {
 		let i = n.consume();
 		if (i.type === "EOF") break;
-		if (kt.has(i.type)) r++;
-		else if (At.has(i.type)) r = Math.max(0, r - 1);
+		if ($t.has(i.type)) r++;
+		else if (en.has(i.type)) r = Math.max(0, r - 1);
 		else if (i.type !== "COMMA") {
 			if (i.type === "TSTR") {
 				let n = e.slice(i.offset, i.endOffset);
-				for (let e of Dt(n)) t.push({
+				for (let e of Zt(n)) t.push({
 					point: i.offset + e,
 					contentDepth: r + 1
 				});
 			} else if (i.type === "RAWSTRING") {
 				let n = e.slice(i.offset, i.endOffset);
-				for (let { point: e } of wt(n, 0)) t.push({
+				for (let { point: e } of Jt(n, 0)) t.push({
 					point: i.offset + e,
 					contentDepth: r + 1
 				});
@@ -2014,7 +2532,7 @@ function Et(e) {
 	}
 	return t;
 }
-function Dt(e) {
+function Zt(e) {
 	let t = [], n = 1, r = e.length - 1;
 	for (; n < r;) {
 		let r = e[n];
@@ -2030,24 +2548,24 @@ function Dt(e) {
 	}
 	return t;
 }
-var Ot = /* @__PURE__ */ new Set(["ENCODING_INDICATOR", "UNDERSCORE"]), kt = /* @__PURE__ */ new Set([
+var Qt = /* @__PURE__ */ new Set(["ENCODING_INDICATOR", "UNDERSCORE"]), $t = /* @__PURE__ */ new Set([
 	"LBRACKET",
 	"LBRACE",
 	"LPAREN",
 	"LT_LT"
-]), At = /* @__PURE__ */ new Set([
+]), en = /* @__PURE__ */ new Set([
 	"RBRACKET",
 	"RBRACE",
 	"RPAREN",
 	"GT_GT"
 ]);
-function jt(e, t, n) {
+function tn(e, t, n) {
 	return e.some((e) => e.start >= t && e.end <= n);
 }
-function Mt(e, t, n) {
+function nn(e, t, n) {
 	return /^[\t\n\r ]*$/.test(e.slice(t, n));
 }
-function Nt(e, t) {
+function rn(e, t) {
 	let n = [...t].filter(([t]) => t > 0 && t < e.length).sort(([e], [t]) => e - t);
 	if (n.length === 0) return [{
 		text: e,
@@ -2065,7 +2583,7 @@ function Nt(e, t) {
 }
 //#endregion
 //#region src/extensions/dt.ts
-function U(e) {
+function an(e) {
 	if (Number.isInteger(e)) return (/* @__PURE__ */ new Date(e * 1e3)).toISOString().replace(/\.000Z$/, "Z");
 	let t = Math.round(e * 1e3);
 	if (t / 1e3 === e) return new Date(t).toISOString().replace(/\.000Z$/, "Z");
@@ -2073,17 +2591,17 @@ function U(e) {
 	for (; s.length < 3;) s += "0";
 	return `${i}.${s}Z`;
 }
-var Pt = new TextDecoder("utf-8", { fatal: !0 });
-function Ft(e) {
+var on = new TextDecoder("utf-8", { fatal: !0 });
+function sn(e) {
 	if (e.length !== 1) throw SyntaxError("dt<<...>>: expected exactly one item");
 	let t = e[0];
-	if (t instanceof H) return t.value;
-	if (t instanceof P) return Pt.decode(t.value);
+	if (t instanceof q) return t.value;
+	if (t instanceof L) return on.decode(t.value);
 	throw SyntaxError("dt<<...>>: expected a text string or byte string");
 }
-var It = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?(Z|[+-]\d{2}:\d{2})$/i;
-function Lt(e, t) {
-	if (!It.test(e)) {
+var cn = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?(Z|[+-]\d{2}:\d{2})$/i;
+function ln(e, t) {
+	if (!cn.test(e)) {
 		let n = `dt: invalid RFC 3339 date-time: ${JSON.stringify(e)}`;
 		if (t) t(n);
 		else throw SyntaxError(n);
@@ -2094,93 +2612,110 @@ function Lt(e, t) {
 	if (isNaN(a)) throw SyntaxError(`dt: invalid RFC 3339 date-time: ${JSON.stringify(e)}`);
 	if (i === void 0) {
 		let e = a / 1e3;
-		return e >= 0 ? new zt(BigInt(e)) : new Bt(BigInt(e));
+		return e >= 0 ? new dn(BigInt(e)) : new fn(BigInt(e));
 	}
-	return new Vt(a / 1e3 + i);
+	return new pn(a / 1e3 + i);
 }
-var Rt = 1n, zt = class extends A {
+var un = 1n, dn = class extends N {
 	constructor(e, t) {
 		super(e, t);
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
-		let n = w(e, this.encodingWidth, () => C(this.value));
-		return `dt'${U(Number(this.value))}'${n}`;
+		let n = T(e, this.encodingWidth, () => w(this.value));
+		return E(e, this.appSeqSource, void 0, this.appSeqSourceFeatures) === "adjusted" ? D(this.appSeqSource, n, e, this.appSeqInnerEnd, this.appSeqComments) : `dt'${an(Number(this.value))}'${n}`;
 	}
-}, Bt = class extends j {
+}, fn = class extends P {
 	constructor(e, t) {
 		super(e, t);
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
-		let n = w(e, this.encodingWidth, () => C(this.argument));
-		return `dt'${U(Number(this.value))}'${n}`;
+		let n = T(e, this.encodingWidth, () => w(this.argument));
+		return E(e, this.appSeqSource, void 0, this.appSeqSourceFeatures) === "adjusted" ? D(this.appSeqSource, n, e, this.appSeqInnerEnd, this.appSeqComments) : `dt'${an(Number(this.value))}'${n}`;
 	}
-}, Vt = class extends M {
+}, pn = class extends F {
 	constructor(e, t) {
 		super(e, t);
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
-		let n = Le(this.value), r = xe(this.value, this.precision, n, e?.encodingIndicators ?? "auto");
-		return `dt'${U(this.value)}'${r}`;
+		let n = j(this.value), r = we(this.value, this.precision, n, e?.encodingIndicators ?? "auto");
+		return E(e, this.appSeqSource, void 0, this.appSeqSourceFeatures) === "adjusted" ? D(this.appSeqSource, r, e, this.appSeqInnerEnd, this.appSeqComments) : `dt'${an(this.value)}'${r}`;
 	}
-}, Ht = class extends N {
+}, mn = class extends I {
 	constructor(e, t) {
-		super(Rt, typeof e == "string" ? Lt(e) : e, t);
+		super(un, typeof e == "string" ? ln(e) : e, t);
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
-		let n = this.content;
-		if (n instanceof M ? n.precision !== void 0 && n.precision !== Le(n.value) : n.encodingWidth !== void 0) return super._toCDN({
+		let n = E(e, this.appSeqSource, this.ednSource, this.appSeqSourceFeatures, this.appSeqEncodingEditsComplete);
+		if (n === "verbatim") return this.appSeqSource;
+		if (n === "source") return De(this.appSeqSource, e, this.appSeqComments, this.appSeqEncodingEdits);
+		if (n === "structural") return super._toCDN({
 			...e,
 			appStrings: !1
 		}, t);
-		let r = n instanceof M ? n.value : Number(n.value), i = w(e, this.encodingWidth, () => C(Rt));
-		return `DT'${U(r)}'${i}`;
+		let r = T(e, this.encodingWidth, () => w(un));
+		if (n === "adjusted") return D(this.appSeqSource, r, e, this.appSeqInnerEnd, this.appSeqComments);
+		let i = this.content;
+		return (i instanceof F ? i.precision !== void 0 && i.precision !== j(i.value) : i.encodingWidth !== void 0) ? super._toCDN({
+			...e,
+			appStrings: !1
+		}, t) : `DT'${an(i instanceof F ? i.value : Number(i.value))}'${r}`;
 	}
-}, Ut = class extends Ht {
+}, hn = class extends mn {
 	constructor(e, t) {
 		super(e, t);
 	}
 	_toJS(e) {
-		let t = this.content, n = t instanceof M ? t.value * 1e3 : Number(t.value) * 1e3;
+		let t = this.content, n = t instanceof F ? t.value * 1e3 : Number(t.value) * 1e3;
 		return new Date(n);
 	}
 };
-function Wt(e) {
+function gn(e) {
 	let t = e?.jsDate ?? !1;
 	function n(e) {
-		return t ? new Ut(e) : new Ht(e);
+		return t ? new hn(e) : new mn(e);
 	}
 	let r = {
 		appStringPrefixes: ["dt", "DT"],
-		tagNumbers: [Rt],
+		tagNumbers: [un],
+		preserveAppSeqSource: "optional",
 		parseAppString(e, t, r) {
-			return e === "DT" ? n(t) : Lt(t, r);
+			return e === "DT" ? n(t) : ln(t, r);
 		},
 		parseAppSequence(e, t, r) {
-			let i = Ft(t);
-			return e === "DT" ? n(i) : Lt(i, r);
+			let i = sn(t);
+			return e === "DT" ? n(i) : ln(i, r);
 		},
 		parseTag(e, n) {
 			if (e !== 1n) return;
 			let r;
-			if (n instanceof A) r = new zt(n.value, { encodingWidth: n.encodingWidth });
-			else if (n instanceof j) r = new Bt(n.value, { encodingWidth: n.encodingWidth });
-			else if (n instanceof M) r = new Vt(n.value), n.precision !== void 0 && (r.precision = n.precision);
+			if (n instanceof N) r = new dn(n.value, {
+				encodingWidth: n.encodingWidth,
+				ednSource: n.ednSource
+			});
+			else if (n instanceof P) r = new fn(n.value, {
+				encodingWidth: n.encodingWidth,
+				ednSource: n.ednSource
+			});
+			else if (n instanceof F) r = new pn(n.value, {
+				precision: n.precision,
+				literalSource: n.literalSource
+			});
 			else return;
-			return r.start = n.start, r.end = n.end, t ? new Ut(r) : new Ht(r);
+			return r.start = n.start, r.end = n.end, t ? new hn(r) : new mn(r);
 		}
 	};
 	return t && (r.fromJS = (e, t) => {
-		if (e instanceof Date) return new Ut(U(e.getTime() / 1e3));
+		if (e instanceof Date) return new hn(an(e.getTime() / 1e3));
 	}, r.isJSType = (e) => e instanceof Date), r;
 }
-var Gt = Wt(), Kt = Wt({ jsDate: !0 });
+var _n = gn(), vn = gn({ jsDate: !0 });
 //#endregion
 //#region src/utils/ip.ts
-function qt(e) {
+function yn(e) {
 	let t = e.split(".");
 	if (t.length !== 4) throw SyntaxError(`ip: invalid IPv4 address: ${JSON.stringify(e)}`);
 	let n = /* @__PURE__ */ new Uint8Array(4);
@@ -2193,11 +2728,11 @@ function qt(e) {
 	}
 	return n;
 }
-function Jt(e) {
+function bn(e) {
 	let t = /* @__PURE__ */ new Uint8Array(16);
 	if (e === "::") return t;
 	let n = e, r = null, i = e.match(/^(.*):(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/);
-	i && (n = i[1], n.endsWith(":") && (n += ":"), r = qt(i[2]));
+	i && (n = i[1], n.endsWith(":") && (n += ":"), r = yn(i[2]));
 	let a = n.split("::");
 	if (a.length > 2) throw SyntaxError(`ip: invalid IPv6 address: ${JSON.stringify(e)}`);
 	let o = a.length === 2, s = a[0] ? a[0].split(":") : [], c = o && a[1] ? a[1].split(":") : [], l = r ? 6 : 8;
@@ -2214,11 +2749,11 @@ function Jt(e) {
 	}
 	return r && t.set(r, 12), t;
 }
-function Yt(e) {
+function xn(e) {
 	return Array.from(e).join(".");
 }
-function Xt(e) {
-	let t = e.slice(0, 10).every((e) => e === 0) && e[10] === 255 && e[11] === 255 ? Yt(e.slice(12)) : null, n = t ? 6 : 8, r = [];
+function Sn(e) {
+	let t = e.slice(0, 10).every((e) => e === 0) && e[10] === 255 && e[11] === 255 ? xn(e.slice(12)) : null, n = t ? 6 : 8, r = [];
 	for (let t = 0; t < n * 2; t += 2) r.push(e[t] << 8 | e[t + 1]);
 	let i = -1, a = 0, o = 0;
 	for (; o < n;) if (r[o] === 0) {
@@ -2232,29 +2767,29 @@ function Xt(e) {
 }
 //#endregion
 //#region src/extensions/ip.ts
-var Zt = "ip", W = "IP", G = 52n, Qt = 54n, $t = new TextDecoder("utf-8", { fatal: !0 });
-function en(e) {
+var Cn = "ip", wn = "IP", Tn = 52n, En = 54n, Dn = new TextDecoder("utf-8", { fatal: !0 });
+function On(e) {
 	if (e.length !== 1) throw SyntaxError("ip<<...>>: expected exactly one item");
 	let t = e[0];
-	if (t instanceof H) return t.value;
-	if (t instanceof P) return $t.decode(t.value);
+	if (t instanceof q) return t.value;
+	if (t instanceof L) return Dn.decode(t.value);
 	throw SyntaxError("ip<<...>>: expected a text string or byte string");
 }
-function tn(e) {
+function kn(e) {
 	return /^\d/.test(e) && e.includes(".") && !e.includes(":") ? {
-		bytes: qt(e),
+		bytes: yn(e),
 		isV4: !0
 	} : {
-		bytes: Jt(e),
+		bytes: bn(e),
 		isV4: !1
 	};
 }
-function nn(e) {
-	if (e.length === 4) return Yt(e);
-	if (e.length === 16) return Xt(e);
+function An(e) {
+	if (e.length === 4) return xn(e);
+	if (e.length === 16) return Sn(e);
 	throw SyntaxError(`ip: unexpected byte length: ${e.length}`);
 }
-function rn(e, t) {
+function jn(e, t) {
 	let n = new Uint8Array(e.length);
 	n.set(e);
 	let r = Math.floor(t / 8), i = t % 8;
@@ -2264,72 +2799,82 @@ function rn(e, t) {
 	for (; a > 0 && n[a - 1] === 0;) a--;
 	return n.slice(0, a);
 }
-function an(e, t) {
+function Mn(e, t) {
 	let n = new Uint8Array(t);
 	return n.set(e), n;
 }
-var on = class extends P {
+var Nn = class extends L {
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
-		let n = w(e, this.encodingWidth, () => C(BigInt(this.value.length)));
-		return `${Zt}'${nn(this.value)}'${n}`;
+		let n = T(e, this.encodingWidth, () => w(BigInt(this.value.length)));
+		return E(e, this.appSeqSource, void 0, this.appSeqSourceFeatures) === "adjusted" ? D(this.appSeqSource, n, e, this.appSeqInnerEnd, this.appSeqComments) : `${Cn}'${An(this.value)}'${n}`;
 	}
-}, sn = class extends L {
+}, Pn = class extends B {
 	_isV4;
 	constructor(e, t, n) {
-		super([new A(BigInt(e)), new P(t)]), this._isV4 = n;
+		super([new N(BigInt(e)), new L(t)]), this._isV4 = n;
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
+		if (E(e, this.appSeqSource, void 0, this.appSeqSourceFeatures) === "adjusted") return D(this.appSeqSource, "", e, this.appSeqInnerEnd, this.appSeqComments);
 		let n = Number(this.items[0].value), r = this.items[1].value;
-		return `${Zt}'${nn(an(r, this._isV4 ? 4 : 16))}/${n}'`;
+		return `${Cn}'${An(Mn(r, this._isV4 ? 4 : 16))}/${n}'`;
 	}
-}, cn = class extends N {
+}, Fn = class extends I {
 	constructor(e, t) {
 		super(e, t);
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
-		let n = this.tag === G ? 4 : 16, r = this.content;
-		if (r instanceof P) {
-			if (r.encodingWidth !== void 0) return super._toCDN(e, t);
-			let n = w(e, this.encodingWidth, () => C(this.tag));
-			return `${W}'${nn(r.value)}'${n}`;
-		}
-		if (r instanceof L && r.items.length === 2 && r.items[0] instanceof A && r.items[1] instanceof P) {
-			if (r.encodingWidth !== void 0 || r.items[0].encodingWidth !== void 0 || r.items[1].encodingWidth !== void 0) return super._toCDN(e, t);
-			let i = Number(r.items[0].value), a = an(r.items[1].value, n), o = w(e, this.encodingWidth, () => C(this.tag));
-			return `${W}'${nn(a)}/${i}'${o}`;
+		let n = E(e, this.appSeqSource, this.ednSource, this.appSeqSourceFeatures, this.appSeqEncodingEditsComplete);
+		if (n === "verbatim") return this.appSeqSource;
+		if (n === "source") return De(this.appSeqSource, e, this.appSeqComments, this.appSeqEncodingEdits);
+		if (n === "structural") return super._toCDN(e, t);
+		if (n === "adjusted") {
+			let t = T(e, this.encodingWidth, () => w(this.tag));
+			return D(this.appSeqSource, t, e, this.appSeqInnerEnd, this.appSeqComments);
+		}
+		let r = this.tag === Tn ? 4 : 16, i = this.content;
+		if (i instanceof L) {
+			if (i.encodingWidth !== void 0) return super._toCDN(e, t);
+			let n = T(e, this.encodingWidth, () => w(this.tag));
+			return `${wn}'${An(i.value)}'${n}`;
+		}
+		if (i instanceof B && i.items.length === 2 && i.items[0] instanceof N && i.items[1] instanceof L) {
+			if (i.encodingWidth !== void 0 || i.items[0].encodingWidth !== void 0 || i.items[1].encodingWidth !== void 0) return super._toCDN(e, t);
+			let n = Number(i.items[0].value), a = Mn(i.items[1].value, r), o = T(e, this.encodingWidth, () => w(this.tag));
+			return `${wn}'${An(a)}/${n}'${o}`;
 		}
 		return super._toCDN(e, t);
 	}
 };
-function ln(e, t) {
+function In(e, t) {
 	let n = t.indexOf("/");
 	if (n === -1) {
-		let { bytes: n, isV4: r } = tn(t);
-		return e === W ? new cn(r ? G : Qt, new P(n)) : new on(n);
+		let { bytes: n, isV4: r } = kn(t);
+		return e === wn ? new Fn(r ? Tn : En, new L(n)) : new Nn(n);
 	}
 	let r = t.slice(0, n), i = t.slice(n + 1);
 	if (!/^\d+$/.test(i)) throw SyntaxError(`ip: invalid prefix length: ${JSON.stringify(i)}`);
-	let a = parseInt(i, 10), { bytes: o, isV4: s } = tn(r), c = s ? 32 : 128;
+	let a = parseInt(i, 10), { bytes: o, isV4: s } = kn(r), c = s ? 32 : 128;
 	if (a > c) throw SyntaxError(`ip: prefix length ${a} exceeds maximum ${c} for ${s ? "IPv4" : "IPv6"}`);
-	let l = rn(o, a);
-	return e === W ? new cn(s ? G : Qt, new L([new A(BigInt(a)), new P(l)])) : new sn(a, l, s);
+	let l = jn(o, a);
+	return e === wn ? new Fn(s ? Tn : En, new B([new N(BigInt(a)), new L(l)])) : new Pn(a, l, s);
 }
-var un = {
-	appStringPrefixes: [Zt, W],
-	tagNumbers: [G, Qt],
+var Ln = {
+	appStringPrefixes: [Cn, wn],
+	tagNumbers: [Tn, En],
+	preserveAppSeqSource: "optional",
 	parseAppString(e, t) {
-		return ln(e, t);
+		return In(e, t);
 	},
 	parseAppSequence(e, t) {
-		return ln(e, en(t));
+		return In(e, On(t));
 	},
 	parseTag(e, t) {
-		if (!(e !== G && e !== Qt) && (t instanceof P || t instanceof L)) return new cn(e, t);
+		if (!(e !== Tn && e !== En) && (t instanceof L || t instanceof B)) return new Fn(e, t);
 	}
-}, dn = "cri", fn = "CRI", pn = 99n, mn = /* @__PURE__ */ new Map([
+}, Rn = "cri", zn = "CRI", Bn = 99n, Vn = /* @__PURE__ */ new Map([
 	["coap", -1n],
 	["coaps", -2n],
 	["http", -3n],
@@ -2340,47 +2885,47 @@ var un = {
 	["coaps+tcp", -8n],
 	["coap+ws", -25n],
 	["coaps+ws", -26n]
-]), hn = new Map([...mn.entries()].map(([e, t]) => [t, e]));
-function K(e) {
+]), Hn = new Map([...Vn.entries()].map(([e, t]) => [t, e]));
+function J(e) {
 	try {
 		return decodeURIComponent(e);
 	} catch {
 		return e;
 	}
 }
-var gn = new TextEncoder(), _n = new TextDecoder("utf-8", { fatal: !0 });
-function vn(e) {
-	return Array.from(gn.encode(e), (e) => `%${e.toString(16).toUpperCase().padStart(2, "0")}`).join("");
+var Un = new TextEncoder(), Wn = new TextDecoder("utf-8", { fatal: !0 });
+function Gn(e) {
+	return Array.from(Un.encode(e), (e) => `%${e.toString(16).toUpperCase().padStart(2, "0")}`).join("");
 }
-function q(e, t) {
+function Y(e, t) {
 	let n = "";
-	for (let r of e) n += t(r) ? r : vn(r);
+	for (let r of e) n += t(r) ? r : Gn(r);
 	return n;
 }
-function yn(e) {
+function Kn(e) {
 	return /[A-Za-z0-9\-._~]/.test(e);
 }
-function bn(e) {
+function qn(e) {
 	return /[!$&'()*+,;=]/.test(e);
 }
-function xn(e) {
-	return yn(e) || bn(e) || e === ":" || e === "@";
+function Jn(e) {
+	return Kn(e) || qn(e) || e === ":" || e === "@";
 }
-function Sn(e) {
-	return (xn(e) || e === "/" || e === "?") && e !== "&";
+function Yn(e) {
+	return (Jn(e) || e === "/" || e === "?") && e !== "&";
 }
-function Cn(e) {
-	return xn(e) || e === "/" || e === "?";
+function Xn(e) {
+	return Jn(e) || e === "/" || e === "?";
 }
-function wn(e) {
-	return yn(e) || bn(e) || e === ":";
+function Zn(e) {
+	return Kn(e) || qn(e) || e === ":";
 }
-function Tn(e) {
-	return yn(e) || bn(e);
+function Qn(e) {
+	return Kn(e) || qn(e);
 }
-function En(e) {
+function $n(e) {
 	let t = [], n = e, r = n.indexOf("@");
-	r >= 0 && (t.push(z.FALSE), t.push(new H(K(n.slice(0, r)))), n = n.slice(r + 1));
+	r >= 0 && (t.push(H.FALSE), t.push(new q(J(n.slice(0, r)))), n = n.slice(r + 1));
 	let i, a = null;
 	if (n.startsWith("[")) {
 		let e = n.indexOf("]");
@@ -2389,263 +2934,263 @@ function En(e) {
 		let r = n.slice(e + 1);
 		if (r.startsWith(":")) a = r.slice(1);
 		else if (r.length > 0) throw SyntaxError("cri: unexpected characters after ']' in authority");
-		t.push(new P(Jt(i)));
+		t.push(new L(bn(i)));
 	} else {
 		let e = n.lastIndexOf(":");
-		if (e >= 0 ? (i = n.slice(0, e), a = n.slice(e + 1)) : i = n, i !== "") if (/^\d{1,3}(\.\d{1,3}){3}$/.test(i)) t.push(new P(qt(i)));
-		else for (let e of i.toLowerCase().split(".")) t.push(new H(e));
+		if (e >= 0 ? (i = n.slice(0, e), a = n.slice(e + 1)) : i = n, i !== "") if (/^\d{1,3}(\.\d{1,3}){3}$/.test(i)) t.push(new L(yn(i)));
+		else for (let e of i.toLowerCase().split(".")) t.push(new q(e));
 	}
 	if (a !== null && a !== "") {
 		if (!/^\d+$/.test(a)) throw SyntaxError(`cri: invalid port: ${JSON.stringify(a)}`);
 		let e = parseInt(a, 10);
 		if (e > 65535) throw SyntaxError(`cri: port ${e} out of range`);
-		t.push(new A(BigInt(e)));
+		t.push(new N(BigInt(e)));
 	}
-	return new L(t);
+	return new B(t);
 }
-function Dn(e) {
+function er(e) {
 	let t = e.items, n = 0, r = "";
-	if (n < t.length && t[n] instanceof z && t[n].value === 20) {
+	if (n < t.length && t[n] instanceof H && t[n].value === 20) {
 		n++;
 		let e = t[n++];
-		r += q(e.value, wn) + "@";
+		r += Y(e.value, Zn) + "@";
 	}
 	if (n >= t.length) return r;
 	let i = t[n];
-	if (i instanceof P) {
+	if (i instanceof L) {
 		n++;
 		let { length: e } = i.value;
-		if (e === 4) r += Yt(i.value);
-		else if (e === 16) r += "[" + Xt(i.value) + "]";
+		if (e === 4) r += xn(i.value);
+		else if (e === 16) r += "[" + Sn(i.value) + "]";
 		else throw Error(`cri: unexpected host-ip byte length: ${e}`);
-		n < t.length && t[n] instanceof H && (r += `%25${q(t[n++].value, Tn)}`);
+		n < t.length && t[n] instanceof q && (r += `%25${Y(t[n++].value, Qn)}`);
 	} else {
 		let e = [];
-		for (; n < t.length && t[n] instanceof H;) e.push(q(t[n++].value, Tn));
+		for (; n < t.length && t[n] instanceof q;) e.push(Y(t[n++].value, Qn));
 		r += e.join(".");
 	}
-	return n < t.length && t[n] instanceof A && (r += ":" + t[n].value.toString()), r;
+	return n < t.length && t[n] instanceof N && (r += ":" + t[n].value.toString()), r;
 }
-function On(e) {
+function tr(e) {
 	let t = e.slice(2), n = t.indexOf("/"), r, i;
-	return n >= 0 ? (r = t.slice(0, n), i = t.slice(n + 1).split("/").map((e) => new H(K(e)))) : (r = t, i = []), {
-		authority: En(r),
+	return n >= 0 ? (r = t.slice(0, n), i = t.slice(n + 1).split("/").map((e) => new q(J(e)))) : (r = t, i = []), {
+		authority: $n(r),
 		pathSegments: i
 	};
 }
-function kn(e) {
+function nr(e) {
 	let t = e, n = null, r = t.indexOf("#");
-	r >= 0 && (n = K(t.slice(r + 1)), t = t.slice(0, r));
+	r >= 0 && (n = J(t.slice(r + 1)), t = t.slice(0, r));
 	let i = null, a = t.indexOf("?");
 	if (a >= 0) {
 		let e = t.slice(a + 1);
-		t = t.slice(0, a), i = e.split("&").map((e) => new H(K(e)));
+		t = t.slice(0, a), i = e.split("&").map((e) => new q(J(e)));
 	}
 	let o = [], s = /^([a-zA-Z][a-zA-Z0-9+.\-]*):([\s\S]*)$/.exec(t);
 	if (s) {
-		let e = s[1].toLowerCase(), t = s[2], n = mn.get(e);
-		if (o.push(n === void 0 ? new H(e) : new j(n)), t.startsWith("//")) {
-			let { authority: e, pathSegments: n } = On(t);
-			o.push(e, new L(n));
+		let e = s[1].toLowerCase(), t = s[2], n = Vn.get(e);
+		if (o.push(n === void 0 ? new q(e) : new P(n)), t.startsWith("//")) {
+			let { authority: e, pathSegments: n } = tr(t);
+			o.push(e, new B(n));
 		} else if (t.startsWith("/")) {
-			let e = t.slice(1).split("/").map((e) => new H(K(e)));
-			o.push(z.NULL, new L(e));
+			let e = t.slice(1).split("/").map((e) => new q(J(e)));
+			o.push(H.NULL, new B(e));
 		} else {
-			let e = t.split("/").map((e) => new H(K(e)));
-			o.push(z.TRUE, new L(e));
+			let e = t.split("/").map((e) => new q(J(e)));
+			o.push(H.TRUE, new B(e));
 		}
 	} else if (t.startsWith("//")) {
-		let { authority: e, pathSegments: n } = On(t);
-		o.push(z.FALSE, e, new L(n));
+		let { authority: e, pathSegments: n } = tr(t);
+		o.push(H.FALSE, e, new B(n));
 	} else if (t.startsWith("/")) {
-		let e = t.slice(1).split("/").map((e) => new H(K(e)));
-		o.push(z.TRUE, new L(e));
-	} else if (t === "") o.push(new A(0n));
+		let e = t.slice(1).split("/").map((e) => new q(J(e)));
+		o.push(H.TRUE, new B(e));
+	} else if (t === "") o.push(new N(0n));
 	else {
 		let n = 1n, r = t, i = !1;
 		for (r.startsWith("./") && (i = !0, r = r.slice(2)); r.startsWith("../");) n++, r = r.slice(3);
 		if (r === ".." ? (n++, r = "") : r === "." && (r = ""), n === 1n && !i && r !== "" && r.split("/")[0].includes(":")) throw SyntaxError(`cri: invalid relative-path reference — first segment must not contain ':' without a './' prefix (RFC 3986 §3.3): ${JSON.stringify(e)}`);
-		let a = r === "" ? [] : r.split("/").map((e) => new H(K(e)));
-		o.push(new A(n), new L(a));
+		let a = r === "" ? [] : r.split("/").map((e) => new q(J(e)));
+		o.push(new N(n), new B(a));
 	}
-	if (i !== null && o.push(new L(i)), n !== null && (i === null && o.push(z.NULL), o.push(new H(n))), n !== null && i === null && o.splice(o.length - 2, 1), i === null && n === null) {
+	if (i !== null && o.push(new B(i)), n !== null && (i === null && o.push(H.NULL), o.push(new q(n))), n !== null && i === null && o.splice(o.length - 2, 1), i === null && n === null) {
 		let e = o[o.length - 1];
-		e instanceof L && e.items.length === 0 && o.pop();
+		e instanceof B && e.items.length === 0 && o.pop();
 	}
-	return o.length === 1 && o[0] instanceof A && o[0].value === 0n ? [] : o;
+	return o.length === 1 && o[0] instanceof N && o[0].value === 0n ? [] : o;
 }
-function An(e, t) {
+function rr(e, t) {
 	let n = t, r = "";
 	if (n < e.length) {
 		let t = e[n];
-		if (t instanceof L) {
+		if (t instanceof B) {
 			if (n++, t.items.length > 0) {
 				let e = t.items.map((e) => {
-					if (!(e instanceof H)) throw Error("cri: query item must be a text string");
-					return q(e.value, Sn);
+					if (!(e instanceof q)) throw Error("cri: query item must be a text string");
+					return Y(e.value, Yn);
 				});
 				r += "?" + e.join("&");
 			}
-		} else t instanceof z && t.value === 22 && n++;
+		} else t instanceof H && t.value === 22 && n++;
 	}
-	return n < e.length && e[n] instanceof H && (r += "#" + q(e[n].value, Cn)), r;
+	return n < e.length && e[n] instanceof q && (r += "#" + Y(e[n].value, Xn)), r;
 }
-function jn(e) {
+function ir(e) {
 	return e.items.map((e) => {
-		if (!(e instanceof H)) throw Error("cri: path segment must be a text string");
-		return q(e.value, xn);
+		if (!(e instanceof q)) throw Error("cri: path segment must be a text string");
+		return Y(e.value, Jn);
 	});
 }
-function Mn(e) {
+function ar(e) {
 	if (e.length === 0) return "";
 	let t = 0, n = e[t++];
-	if (n instanceof j || n instanceof H) {
+	if (n instanceof P || n instanceof q) {
 		let r;
-		if (n instanceof j) {
-			let e = hn.get(n.value);
+		if (n instanceof P) {
+			let e = Hn.get(n.value);
 			if (e === void 0) throw Error(`cri: unrecognised scheme-id ${n.value}`);
 			r = e + ":";
 		} else r = n.value + ":";
 		if (t >= e.length) return r;
 		let i = e[t++], a = "", o = !1;
-		if (i instanceof L) a = "//" + Dn(i), o = !0;
-		else if (i instanceof z) if (i.value === 22) o = !0;
+		if (i instanceof B) a = "//" + er(i), o = !0;
+		else if (i instanceof H) if (i.value === 22) o = !0;
 		else if (i.value === 21) o = !1;
 		else throw Error(`cri: unexpected no-authority value: simple(${i.value})`);
 		else throw Error("cri: unexpected type for authority element");
 		let s = "";
-		if (t < e.length && e[t] instanceof L) {
+		if (t < e.length && e[t] instanceof B) {
 			let n = e[t++];
-			n.items.length > 0 && (s = (o ? "/" : "") + jn(n).join("/"));
+			n.items.length > 0 && (s = (o ? "/" : "") + ir(n).join("/"));
 		}
-		return r + a + s + An(e, t);
+		return r + a + s + rr(e, t);
 	}
-	if (n instanceof z && n.value === 20) {
-		if (t >= e.length || !(e[t] instanceof L)) throw Error("cri: network-path reference requires an authority array");
-		let n = Dn(e[t++]), r = "";
-		if (t < e.length && e[t] instanceof L) {
+	if (n instanceof H && n.value === 20) {
+		if (t >= e.length || !(e[t] instanceof B)) throw Error("cri: network-path reference requires an authority array");
+		let n = er(e[t++]), r = "";
+		if (t < e.length && e[t] instanceof B) {
 			let n = e[t++];
-			n.items.length > 0 && (r = "/" + jn(n).join("/"));
+			n.items.length > 0 && (r = "/" + ir(n).join("/"));
 		}
-		return "//" + n + r + An(e, t);
+		return "//" + n + r + rr(e, t);
 	}
-	if (n instanceof z && n.value === 21) {
+	if (n instanceof H && n.value === 21) {
 		let n = "/";
-		if (t < e.length && e[t] instanceof L) {
+		if (t < e.length && e[t] instanceof B) {
 			let r = e[t++];
-			n = "/" + jn(r).join("/");
+			n = "/" + ir(r).join("/");
 		}
-		return n + An(e, t);
+		return n + rr(e, t);
 	}
-	if (n instanceof A) {
+	if (n instanceof N) {
 		let r = n.value;
-		if (r === 0n) return An(e, t);
+		if (r === 0n) return rr(e, t);
 		let i = r === 1n ? "" : "../".repeat(Number(r) - 1), a;
-		if (t < e.length && e[t] instanceof L) {
+		if (t < e.length && e[t] instanceof B) {
 			let n = e[t++];
 			if (n.items.length > 0) {
-				let e = jn(n);
+				let e = ir(n);
 				a = (r === 1n && e[0].includes(":") ? "./" : i) + e.join("/");
 			} else a = i === "" ? "./" : i;
 		} else a = i === "" ? "./" : i;
-		return a + An(e, t);
+		return a + rr(e, t);
 	}
 	throw Error("cri: unrecognised first element type in CRI array");
 }
-var Nn = class extends L {
+var or = class extends B {
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
 		try {
-			let t = w(e, this.encodingWidth, () => C(BigInt(this.items.length)));
-			return `${dn}'${Mn(this.items)}'${t}`;
+			let t = T(e, this.encodingWidth, () => w(BigInt(this.items.length)));
+			return `${Rn}'${ar(this.items)}'${t}`;
 		} catch {
 			return super._toCDN(e, t);
 		}
 	}
-}, Pn = class extends N {
+}, sr = class extends I {
 	constructor(e) {
-		super(pn, e);
+		super(Bn, e);
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
 		try {
 			let n = this.content;
 			if (n.encodingWidth !== void 0) return super._toCDN(e, t);
-			let r = w(e, this.encodingWidth, () => C(pn));
-			return `${fn}'${Mn(n.items)}'${r}`;
+			let r = T(e, this.encodingWidth, () => w(Bn));
+			return `${zn}'${ar(n.items)}'${r}`;
 		} catch {
 			return super._toCDN(e, t);
 		}
 	}
 };
-function Fn(e) {
+function cr(e) {
 	if (e.length !== 1) throw SyntaxError("cri<<...>>: expected exactly one item");
 	let t = e[0];
-	if (t instanceof H) return t.value;
-	if (t instanceof P) return _n.decode(t.value);
+	if (t instanceof q) return t.value;
+	if (t instanceof L) return Wn.decode(t.value);
 	throw SyntaxError("cri<<...>>: expected a text string or byte string");
 }
-function In(e, t) {
-	let n = new Nn(kn(t));
-	return e === fn ? new Pn(n) : n;
+function lr(e, t) {
+	let n = new or(nr(t));
+	return e === zn ? new sr(n) : n;
 }
-var Ln = {
-	appStringPrefixes: [dn, fn],
-	tagNumbers: [pn],
+var ur = {
+	appStringPrefixes: [Rn, zn],
+	tagNumbers: [Bn],
 	parseAppString(e, t) {
-		return In(e, t);
+		return lr(e, t);
 	},
 	parseAppSequence(e, t) {
-		return In(e, Fn(t));
+		return lr(e, cr(t));
 	},
 	parseTag(e, t) {
-		if (e !== 99n || !(t instanceof L)) return;
-		let n = new Nn(t.items, {
+		if (e !== 99n || !(t instanceof B)) return;
+		let n = new or(t.items, {
 			indefiniteLength: t.indefiniteLength,
 			encodingWidth: t.encodingWidth
 		});
-		return n.start = t.start, n.end = t.end, new Pn(n);
+		return n.start = t.start, n.end = t.end, new sr(n);
 	}
-}, Rn = 18446744073709551615n, zn = -18446744073709551616n, Bn = {
-	tagNumbers: [qe, Je],
+}, dr = 18446744073709551615n, fr = -18446744073709551616n, pr = {
+	tagNumbers: [dt, ft],
 	parseTag(e, t) {
-		if (t instanceof P) {
+		if (t instanceof L) {
 			if (e === 2n) {
-				let e = Qe(t.value);
-				return e > Rn ? new $e(e) : void 0;
+				let e = gt(t.value);
+				return e > dr ? new _t(e) : void 0;
 			}
 			if (e === 3n) {
-				let e = -1n - Qe(t.value);
-				return e < zn ? new et(e) : void 0;
+				let e = -1n - gt(t.value);
+				return e < fr ? new vt(e) : void 0;
 			}
 		}
 	}
 };
 //#endregion
 //#region src/cbor/decoder.ts
-function Vn(e, t) {
+function mr(e, t) {
 	if (e === 24 && t <= 23n) return 0;
 	if (e === 25 && t <= 255n) return 1;
 	if (e === 26 && t <= 65535n) return 2;
 	if (e === 27 && t <= 4294967295n) return 3;
 }
-function Hn(e, t) {
+function hr(e, t) {
 	if (e === 24 && t <= 23) return 0;
 	if (e === 25 && t <= 255) return 1;
 	if (e === 26 && t <= 65535) return 2;
 	if (e === 27 && t <= 4294967295) return 3;
 }
-var Un = new TextDecoder("utf-8", {
+var gr = new TextDecoder("utf-8", {
 	fatal: !0,
 	ignoreBOM: !0
-}), Wn = new TextDecoder("utf-8", {
+}), _r = new TextDecoder("utf-8", {
 	fatal: !1,
 	ignoreBOM: !0
 });
-function J(e) {
+function X(e) {
 	throw Error(`CBOR decode error: ${e}`);
 }
-function Gn(e, t, n) {
+function vr(e, t, n) {
 	let r = {
 		message: e,
 		offset: t
@@ -2653,191 +3198,191 @@ function Gn(e, t, n) {
 	if (n?.onWarning ? n.onWarning(r) : n?.silent || console.warn(`CBOR strict violation at offset ${t}: ${e}`), n?.strict !== !1) throw Error(`CBOR decode error: ${e}`);
 	return r;
 }
-function Y(e, t) {
+function yr(e, t) {
 	e.warnings ??= [], e.warnings.push(t);
 }
-function Kn(e) {
-	if (e instanceof A) return ["u", String(e.value)];
-	if (e instanceof j) return ["n", String(e.value)];
-	if (e instanceof H) return ["t", e.value];
-	if (e instanceof I) return ["t", e.chunks.map((e) => e.value).join("")];
-	if (e instanceof P) return ["b", i(e.value)];
-	if (e instanceof F) {
+function br(e) {
+	if (e instanceof N) return ["u", String(e.value)];
+	if (e instanceof P) return ["n", String(e.value)];
+	if (e instanceof q) return ["t", e.value];
+	if (e instanceof z) return ["t", e.chunks.map((e) => e.value).join("")];
+	if (e instanceof L) return ["b", i(e.value)];
+	if (e instanceof R) {
 		let t = "";
 		for (let n of e.chunks) t += i(n.value);
 		return ["b", t];
 	}
-	if (e instanceof M) return isNaN(e.value) ? ["f", "NaN"] : Object.is(e.value, -0) ? ["f", "-0"] : ["f", String(e.value)];
-	if (e instanceof z) return ["s", e.value];
-	if (e instanceof L) return ["A", e.items.map(Kn)];
-	if (e instanceof R) {
-		let t = e.entries.map(([e, t]) => [Kn(e), Kn(t)]);
+	if (e instanceof F) return isNaN(e.value) ? ["f", "NaN"] : Object.is(e.value, -0) ? ["f", "-0"] : ["f", String(e.value)];
+	if (e instanceof H) return ["s", e.value];
+	if (e instanceof B) return ["A", e.items.map(br)];
+	if (e instanceof V) {
+		let t = e.entries.map(([e, t]) => [br(e), br(t)]);
 		if (t.length <= 1) return ["M", t];
 		let n = t.map((e) => [JSON.stringify(e[0]), e]);
 		return n.sort((e, t) => e[0] < t[0] ? -1 : +(e[0] > t[0])), ["M", n.map((e) => e[1])];
 	}
-	return e instanceof N ? [
+	return e instanceof I ? [
 		"G",
 		String(e.tag),
-		Kn(e.content)
+		br(e.content)
 	] : ["c", i(e.toCBOR())];
 }
-function qn(e) {
-	if (e instanceof A) return "u" + e.value;
-	if (e instanceof j) return "n" + e.value;
-	if (e instanceof H) return "t" + e.value;
-	if (e instanceof I) {
+function xr(e) {
+	if (e instanceof N) return "u" + e.value;
+	if (e instanceof P) return "n" + e.value;
+	if (e instanceof q) return "t" + e.value;
+	if (e instanceof z) {
 		let t = "t";
 		for (let n of e.chunks) t += n.value;
 		return t;
 	}
-	if (e instanceof P) return "b" + i(e.value);
-	if (e instanceof F) {
+	if (e instanceof L) return "b" + i(e.value);
+	if (e instanceof R) {
 		let t = "b";
 		for (let n of e.chunks) t += i(n.value);
 		return t;
 	}
-	return e instanceof M ? isNaN(e.value) ? "fNaN" : Object.is(e.value, -0) ? "f-0" : "f" + e.value : e instanceof z ? "s" + e.value : JSON.stringify(Kn(e));
+	return e instanceof F ? isNaN(e.value) ? "fNaN" : Object.is(e.value, -0) ? "f-0" : "f" + e.value : e instanceof H ? "s" + e.value : JSON.stringify(br(e));
 }
-var Jn = Array.from({ length: 24 }, (e, t) => BigInt(t)), Yn;
-function Xn(e) {
-	return e === void 0 ? Yn ??= Z(void 0).filter((e) => e.parseTag !== void 0) : Z(e).filter((e) => e.parseTag !== void 0);
+var Sr = Array.from({ length: 24 }, (e, t) => BigInt(t)), Cr;
+function wr(e) {
+	return e === void 0 ? Cr ??= gi(void 0).filter((e) => e.parseTag !== void 0) : gi(e).filter((e) => e.parseTag !== void 0);
 }
-function Zn(e, t) {
+function Tr(e, t) {
 	for (let n = 0; n < t; n++) if (e[n] >= 128) return;
 	return String.fromCharCode.apply(null, e);
 }
-function Qn(e, t, n) {
+function Er(e, t, n) {
 	if (n <= 23) return {
-		value: Jn[n],
+		value: Sr[n],
 		nextOffset: t
 	};
 	switch (n) {
-		case 24: return t + 1 > e.byteLength && J("unexpected end of input"), {
+		case 24: return t + 1 > e.byteLength && X("unexpected end of input"), {
 			value: BigInt(e.getUint8(t)),
 			nextOffset: t + 1
 		};
-		case 25: return t + 2 > e.byteLength && J("unexpected end of input"), {
+		case 25: return t + 2 > e.byteLength && X("unexpected end of input"), {
 			value: BigInt(e.getUint16(t, !1)),
 			nextOffset: t + 2
 		};
-		case 26: return t + 4 > e.byteLength && J("unexpected end of input"), {
+		case 26: return t + 4 > e.byteLength && X("unexpected end of input"), {
 			value: BigInt(e.getUint32(t, !1)),
 			nextOffset: t + 4
 		};
-		case 27: return t + 8 > e.byteLength && J("unexpected end of input"), {
+		case 27: return t + 8 > e.byteLength && X("unexpected end of input"), {
 			value: e.getBigUint64(t, !1),
 			nextOffset: t + 8
 		};
-		default: J(`reserved additional info value: ${n}`);
+		default: X(`reserved additional info value: ${n}`);
 	}
 }
-function $n(e, t, n) {
+function Dr(e, t, n) {
 	if (n <= 23) return {
 		value: n,
 		nextOffset: t
 	};
 	switch (n) {
-		case 24: return t + 1 > e.byteLength && J("unexpected end of input"), {
+		case 24: return t + 1 > e.byteLength && X("unexpected end of input"), {
 			value: e.getUint8(t),
 			nextOffset: t + 1
 		};
-		case 25: return t + 2 > e.byteLength && J("unexpected end of input"), {
+		case 25: return t + 2 > e.byteLength && X("unexpected end of input"), {
 			value: e.getUint16(t, !1),
 			nextOffset: t + 2
 		};
-		case 26: return t + 4 > e.byteLength && J("unexpected end of input"), {
+		case 26: return t + 4 > e.byteLength && X("unexpected end of input"), {
 			value: e.getUint32(t, !1),
 			nextOffset: t + 4
 		};
 		case 27: {
-			t + 8 > e.byteLength && J("unexpected end of input");
+			t + 8 > e.byteLength && X("unexpected end of input");
 			let n = e.getUint32(t, !1), r = e.getUint32(t + 4, !1);
 			return {
 				value: n * 4294967296 + r,
 				nextOffset: t + 8
 			};
 		}
-		default: J(`reserved additional info value: ${n}`);
+		default: X(`reserved additional info value: ${n}`);
 	}
 }
-function er(e, t, n, r, i, a) {
+function Or(e, t, n, r, i, a) {
 	let o = [], s = t;
 	for (;;) {
-		if (s >= e.byteLength && J(`unexpected end of indefinite ${i}`), e.getUint8(s) === 255) {
+		if (s >= e.byteLength && X(`unexpected end of indefinite ${i}`), e.getUint8(s) === 255) {
 			s++;
 			break;
 		}
-		let t = X(e, s, n, r);
-		a(t.value) || J(`indefinite-length ${i} chunk must be a definite ${i}`), o.push(t.value), s = t.nextOffset;
+		let t = Z(e, s, n, r);
+		a(t.value) || X(`indefinite-length ${i} chunk must be a definite ${i}`), o.push(t.value), s = t.nextOffset;
 	}
 	return {
 		chunks: o,
 		nextOffset: s
 	};
 }
-function tr(e, t, n, r) {
-	let i = qn(e);
-	t.has(i) && n.push(Gn(`duplicate map key at offset ${e.start}`, e.start, r)), t.add(i);
+function kr(e, t, n, r) {
+	let i = xr(e);
+	t.has(i) && n.push(vr(`duplicate map key at offset ${e.start}`, e.start, r)), t.add(i);
 }
-function X(e, t, n, r) {
-	let i = t, a = rr(e, t, n, r);
+function Z(e, t, n, r) {
+	let i = t, a = jr(e, t, n, r);
 	return a.value.start = i, a.value.end = a.nextOffset, a;
 }
-function nr(e, t, n) {
+function Ar(e, t, n) {
 	return new Uint8Array(e.buffer, e.byteOffset + t, n).slice();
 }
-function rr(e, t, n, r) {
-	t >= e.byteLength && J("unexpected end of input");
+function jr(e, t, n, r) {
+	t >= e.byteLength && X("unexpected end of input");
 	let i = e.getUint8(t++), a = i >> 5, o = i & 31;
 	switch (a) {
 		case 0: {
-			let { value: n, nextOffset: r } = Qn(e, t, o);
+			let { value: n, nextOffset: r } = Er(e, t, o);
 			return {
-				value: new A(n, { encodingWidth: Vn(o, n) }),
+				value: new N(n, { encodingWidth: mr(o, n) }),
 				nextOffset: r
 			};
 		}
 		case 1: {
-			let { value: n, nextOffset: r } = Qn(e, t, o), i = Vn(o, n);
+			let { value: n, nextOffset: r } = Er(e, t, o), i = mr(o, n);
 			return {
-				value: new j(-1n - n, { encodingWidth: i }),
+				value: new P(-1n - n, { encodingWidth: i }),
 				nextOffset: r
 			};
 		}
 		case 2: {
 			if (o === 31) {
-				let { chunks: i, nextOffset: a } = er(e, t, n, r, "byte string", (e) => e instanceof P);
+				let { chunks: i, nextOffset: a } = Or(e, t, n, r, "byte string", (e) => e instanceof L);
 				return {
-					value: new F(i),
+					value: new R(i),
 					nextOffset: a
 				};
 			}
-			let { value: i, nextOffset: a } = $n(e, t, o), s = Hn(o, i);
-			return a + i > e.byteLength && J("byte string extends beyond input"), {
-				value: new P(new Uint8Array(e.buffer, e.byteOffset + a, i).slice(), { encodingWidth: s }),
+			let { value: i, nextOffset: a } = Dr(e, t, o), s = hr(o, i);
+			return a + i > e.byteLength && X("byte string extends beyond input"), {
+				value: new L(new Uint8Array(e.buffer, e.byteOffset + a, i).slice(), { encodingWidth: s }),
 				nextOffset: a + i
 			};
 		}
 		case 3: {
 			if (o === 31) {
-				let { chunks: i, nextOffset: a } = er(e, t, n, r, "text string", (e) => e instanceof H);
+				let { chunks: i, nextOffset: a } = Or(e, t, n, r, "text string", (e) => e instanceof q);
 				return {
-					value: new I(i),
+					value: new z(i),
 					nextOffset: a
 				};
 			}
-			let { value: i, nextOffset: a } = $n(e, t, o), s = Hn(o, i);
-			a + i > e.byteLength && J("text string extends beyond input");
-			let c = new Uint8Array(e.buffer, e.byteOffset + a, i), l, u, d = i < 64 ? Zn(c, i) : void 0;
+			let { value: i, nextOffset: a } = Dr(e, t, o), s = hr(o, i);
+			a + i > e.byteLength && X("text string extends beyond input");
+			let c = new Uint8Array(e.buffer, e.byteOffset + a, i), l, u, d = i < 64 ? Tr(c, i) : void 0;
 			if (d !== void 0) l = d;
 			else try {
-				l = Un.decode(c);
+				l = gr.decode(c);
 			} catch {
-				u = Gn("invalid UTF-8 sequence in text string", a, n), l = Wn.decode(c);
+				u = vr("invalid UTF-8 sequence in text string", a, n), l = _r.decode(c);
 			}
-			let f = new H(l, { encodingWidth: s });
-			return u && Y(f, u), {
+			let f = new q(l, { encodingWidth: s });
+			return u && yr(f, u), {
 				value: f,
 				nextOffset: a + i
 			};
@@ -2846,25 +3391,25 @@ function rr(e, t, n, r) {
 			if (o === 31) {
 				let i = [], a = t;
 				for (;;) {
-					if (a >= e.byteLength && J("unexpected end of indefinite array"), e.getUint8(a) === 255) {
+					if (a >= e.byteLength && X("unexpected end of indefinite array"), e.getUint8(a) === 255) {
 						a++;
 						break;
 					}
-					let t = X(e, a, n, r);
+					let t = Z(e, a, n, r);
 					i.push(t.value), a = t.nextOffset;
 				}
 				return {
-					value: new L(i, { indefiniteLength: !0 }),
+					value: new B(i, { indefiniteLength: !0 }),
 					nextOffset: a
 				};
 			}
-			let { value: i, nextOffset: a } = $n(e, t, o), s = Hn(o, i), c = [], l = a;
+			let { value: i, nextOffset: a } = Dr(e, t, o), s = hr(o, i), c = [], l = a;
 			for (let t = 0; t < i; t++) {
-				let t = X(e, l, n, r);
+				let t = Z(e, l, n, r);
 				c.push(t.value), l = t.nextOffset;
 			}
 			return {
-				value: new L(c, { encodingWidth: s }),
+				value: new B(c, { encodingWidth: s }),
 				nextOffset: l
 			};
 		}
@@ -2872,149 +3417,149 @@ function rr(e, t, n, r) {
 			if (o === 31) {
 				let i = [], a = /* @__PURE__ */ new Set(), o = [], s = t;
 				for (;;) {
-					if (s >= e.byteLength && J("unexpected end of indefinite map"), e.getUint8(s) === 255) {
+					if (s >= e.byteLength && X("unexpected end of indefinite map"), e.getUint8(s) === 255) {
 						s++;
 						break;
 					}
-					let t = X(e, s, n, r);
-					tr(t.value, a, o, n), s = t.nextOffset;
-					let c = X(e, s, n, r);
+					let t = Z(e, s, n, r);
+					kr(t.value, a, o, n), s = t.nextOffset;
+					let c = Z(e, s, n, r);
 					s = c.nextOffset, i.push([t.value, c.value]);
 				}
-				let c = new R(i, { indefiniteLength: !0 });
-				for (let e of o) Y(c, e);
+				let c = new V(i, { indefiniteLength: !0 });
+				for (let e of o) yr(c, e);
 				return {
 					value: c,
 					nextOffset: s
 				};
 			}
-			let { value: i, nextOffset: a } = $n(e, t, o), s = Hn(o, i), c = [], l = /* @__PURE__ */ new Set(), u = [], d = a;
+			let { value: i, nextOffset: a } = Dr(e, t, o), s = hr(o, i), c = [], l = /* @__PURE__ */ new Set(), u = [], d = a;
 			for (let t = 0; t < i; t++) {
-				let t = X(e, d, n, r);
-				tr(t.value, l, u, n), d = t.nextOffset;
-				let i = X(e, d, n, r);
+				let t = Z(e, d, n, r);
+				kr(t.value, l, u, n), d = t.nextOffset;
+				let i = Z(e, d, n, r);
 				d = i.nextOffset, c.push([t.value, i.value]);
 			}
-			let f = new R(c, { encodingWidth: s });
-			for (let e of u) Y(f, e);
+			let f = new V(c, { encodingWidth: s });
+			for (let e of u) yr(f, e);
 			return {
 				value: f,
 				nextOffset: d
 			};
 		}
 		case 6: {
-			o === 31 && J("tags cannot use indefinite-length encoding");
-			let { value: i, nextOffset: a } = Qn(e, t, o), s = Vn(o, i), c = X(e, a, n, r);
+			o === 31 && X("tags cannot use indefinite-length encoding");
+			let { value: i, nextOffset: a } = Er(e, t, o), s = mr(o, i), c = Z(e, a, n, r);
 			for (let e of r) {
 				let t = e.parseTag(i, c.value, n);
-				if (t !== void 0) return t instanceof N && s !== void 0 && (t.encodingWidth = s), {
+				if (t !== void 0) return t instanceof I && s !== void 0 && (t.encodingWidth = s), {
 					value: t,
 					nextOffset: c.nextOffset
 				};
 			}
 			return {
-				value: new N(i, c.value, { encodingWidth: s }),
+				value: new I(i, c.value, { encodingWidth: s }),
 				nextOffset: c.nextOffset
 			};
 		}
 		case 7:
 			if (o <= 19) return {
-				value: new z(o),
+				value: new H(o),
 				nextOffset: t
 			};
 			if (o === 20) return {
-				value: new z(20),
+				value: new H(20),
 				nextOffset: t
 			};
 			if (o === 21) return {
-				value: new z(21),
+				value: new H(21),
 				nextOffset: t
 			};
 			if (o === 22) return {
-				value: new z(22),
+				value: new H(22),
 				nextOffset: t
 			};
 			if (o === 23) return {
-				value: new z(23),
+				value: new H(23),
 				nextOffset: t
 			};
 			if (o === 24) {
-				t + 1 > e.byteLength && J("unexpected end of input");
+				t + 1 > e.byteLength && X("unexpected end of input");
 				let r = e.getUint8(t);
 				if (r < 32) {
-					let e = Gn(`simple value ${r} must be encoded in initial byte (0–31 reserved for extended encoding)`, t - 1, n), i = new z(r);
-					return Y(i, e), {
+					let e = vr(`simple value ${r} must be encoded in initial byte (0–31 reserved for extended encoding)`, t - 1, n), i = new H(r);
+					return yr(i, e), {
 						value: i,
 						nextOffset: t + 1
 					};
 				}
 				return {
-					value: new z(r),
+					value: new H(r),
 					nextOffset: t + 1
 				};
 			}
 			if (o === 25) {
-				t + 2 > e.byteLength && J("unexpected end of input");
-				let n = E(e.getUint16(t, !1));
+				t + 2 > e.byteLength && X("unexpected end of input");
+				let n = O(e.getUint16(t, !1));
 				return {
-					value: new M(n, {
+					value: new F(n, {
 						precision: "half",
-						rawBits: Number.isNaN(n) ? nr(e, t, 2) : void 0
+						rawBits: Number.isNaN(n) ? Ar(e, t, 2) : void 0
 					}),
 					nextOffset: t + 2
 				};
 			}
 			if (o === 26) {
-				t + 4 > e.byteLength && J("unexpected end of input");
+				t + 4 > e.byteLength && X("unexpected end of input");
 				let n = e.getFloat32(t, !1);
 				return {
-					value: new M(n, {
+					value: new F(n, {
 						precision: "single",
-						rawBits: Number.isNaN(n) ? nr(e, t, 4) : void 0
+						rawBits: Number.isNaN(n) ? Ar(e, t, 4) : void 0
 					}),
 					nextOffset: t + 4
 				};
 			}
 			if (o === 27) {
-				t + 8 > e.byteLength && J("unexpected end of input");
+				t + 8 > e.byteLength && X("unexpected end of input");
 				let n = e.getFloat64(t, !1);
 				return {
-					value: new M(n, {
+					value: new F(n, {
 						precision: "double",
-						rawBits: Number.isNaN(n) ? nr(e, t, 8) : void 0
+						rawBits: Number.isNaN(n) ? Ar(e, t, 8) : void 0
 					}),
 					nextOffset: t + 8
 				};
 			}
-			return o < 31 && J(`reserved additional info value in major type 7: ${o}`), J("unexpected break code outside indefinite-length item");
+			return o < 31 && X(`reserved additional info value in major type 7: ${o}`), X("unexpected break code outside indefinite-length item");
 	}
-	return J(`unknown major type: ${a}`);
+	return X(`unknown major type: ${a}`);
 }
-function ir(e) {
+function Mr(e) {
 	if (e instanceof ArrayBuffer || typeof SharedArrayBuffer < "u" && e instanceof SharedArrayBuffer) return new Uint8Array(e);
 	if (ArrayBuffer.isView(e)) return new Uint8Array(e.buffer, e.byteOffset, e.byteLength);
 	throw TypeError("expected ArrayBufferView or ArrayBufferLike");
 }
-function ar(e, t) {
-	let n = ir(e), r = new DataView(n.buffer, n.byteOffset, n.byteLength), i = t?.offset ?? 0;
+function Nr(e, t) {
+	let n = Mr(e), r = new DataView(n.buffer, n.byteOffset, n.byteLength), i = t?.offset ?? 0;
 	if (!Number.isInteger(i) || i < 0 || i > r.byteLength) throw RangeError(`CBOR decode offset must be an integer between 0 and ${r.byteLength}`);
-	let a = Xn(t?.builtinExtensions), o = t?.extensions?.length ? [...t.extensions.filter((e) => e.parseTag !== void 0), ...a] : a, { value: s, nextOffset: c } = X(r, i, t, o);
+	let a = wr(t?.builtinExtensions), o = t?.extensions?.length ? [...t.extensions.filter((e) => e.parseTag !== void 0), ...a] : a, { value: s, nextOffset: c } = Z(r, i, t, o);
 	if (!t?.allowTrailing && c !== r.byteLength) {
-		Y(s, Gn(`${r.byteLength - c} trailing byte(s) after end of CBOR item`, c, t));
+		yr(s, vr(`${r.byteLength - c} trailing byte(s) after end of CBOR item`, c, t));
 		let e = {
 			strict: !1,
 			silent: !0
 		}, n = c;
-		for (; n < r.byteLength;) ({nextOffset: n} = X(r, n, e, o));
+		for (; n < r.byteLength;) ({nextOffset: n} = Z(r, n, e, o));
 	}
 	return s;
 }
 //#endregion
 //#region src/extensions/cbordata.ts
-var or = 24n, sr = {
-	tagNumbers: [or],
+var Pr = 24n, Fr = {
+	tagNumbers: [Pr],
 	parseTag(e, t, n) {
-		if (e !== 24n || !(t instanceof P)) return;
+		if (e !== 24n || !(t instanceof L)) return;
 		let r = (t.end ?? t.value.length) - t.value.length, i = n ? {
 			extensions: n.extensions,
 			builtinExtensions: n.builtinExtensions,
@@ -3026,7 +3571,7 @@ var or = 24n, sr = {
 			silent: n.silent
 		} : void 0;
 		try {
-			return new N(or, new He([ar(t.value, i)], { encodingWidth: t.encodingWidth }));
+			return new I(Pr, new U([Nr(t.value, i)], { encodingWidth: t.encodingWidth }));
 		} catch (e) {
 			if (i?.strict !== !1) throw e;
 			let t = `tag 24 content is not valid CBOR: ${e instanceof Error ? e.message : String(e)}`, a = {
@@ -3040,194 +3585,156 @@ var or = 24n, sr = {
 };
 //#endregion
 //#region src/extensions/ellipsis.ts
-function cr(e) {
-	return e instanceof B && !(e.content instanceof L);
+function Ir(e) {
+	return e instanceof W && !(e.content instanceof B);
 }
-function lr(e) {
+function Lr(e) {
 	let t = !1, n = !1, r = !1, i;
 	for (let a of e) {
 		let e;
-		if (cr(a)) e = !0, r = !0;
-		else if (a instanceof H) e = !1, t = !0;
-		else if (a instanceof P) e = !1, n = !0;
+		if (Ir(a)) e = !0, r = !0;
+		else if (a instanceof q) e = !1, t = !0;
+		else if (a instanceof L) e = !1, n = !0;
 		else return !1;
 		if (e === i) return !1;
 		i = e;
 	}
 	return r && !(t && n);
 }
-var ur = {
-	tagNumbers: [Ke],
+var Rr = {
+	tagNumbers: [st],
 	parseTag(e, t) {
 		if (e === 888n) {
-			if (t instanceof z && t.value === 22) return new B();
-			if (t instanceof L && lr(t.items)) return new B(t.items);
+			if (t instanceof H && t.value === 22) return new W();
+			if (t instanceof B && Lr(t.items)) return new W(t.items);
 		}
 	}
-}, dr = new TextEncoder(), fr = new TextDecoder("utf-8", { fatal: !0 }), pr = new TextDecoder("utf-8", { fatal: !1 }), mr = Symbol("ellipsis");
-function hr(e) {
+}, zr = new TextEncoder(), Br = new TextDecoder("utf-8", { fatal: !0 }), Vr = new TextDecoder("utf-8", { fatal: !1 }), Hr = Symbol("ellipsis");
+function Ur(e) {
 	let t = 0;
 	for (let n of e) t += n.length;
 	let n = new Uint8Array(t), r = 0;
 	for (let t of e) n.set(t, r), r += t.length;
 	return n;
 }
-function gr(e, t, n) {
-	if (t instanceof Ge) {
-		gr(e, t.inner, n);
+function Wr(e, t, n) {
+	if (t instanceof ot) {
+		Wr(e, t.inner, n);
 		return;
 	}
-	if (t instanceof B) {
-		if (t.content instanceof L) for (let r of t.content.items) gr(e, r, n);
-		else n.push(mr);
+	if (t instanceof W) {
+		if (t.content instanceof B) for (let r of t.content.items) Wr(e, r, n);
+		else n.push(Hr);
 		return;
 	}
-	if (t instanceof H) {
-		n.push(dr.encode(t.value));
+	if (t instanceof q) {
+		n.push(zr.encode(t.value));
 		return;
 	}
-	if (t instanceof P) {
+	if (t instanceof L) {
 		n.push(t.value);
 		return;
 	}
-	if (t instanceof I) {
-		n.push(dr.encode(t.chunks.map((e) => e.value).join("")));
+	if (t instanceof z) {
+		n.push(zr.encode(t.chunks.map((e) => e.value).join("")));
 		return;
 	}
-	if (t instanceof F) {
-		n.push(hr(t.chunks.map((e) => e.value)));
+	if (t instanceof R) {
+		n.push(Ur(t.chunks.map((e) => e.value)));
 		return;
 	}
 	throw SyntaxError(`${e}<<...>> arguments must be (text or byte) strings or ellipses`);
 }
-function _r(e, t) {
+function Gr(e, t) {
 	try {
-		return fr.decode(e);
+		return Br.decode(e);
 	} catch {
 		let n = "t1 concatenation result is not valid UTF-8";
 		if (t) t(n);
 		else throw SyntaxError(n);
-		return pr.decode(e);
+		return Vr.decode(e);
 	}
 }
-function vr(e, t, n) {
+function Kr(e, t, n) {
 	let r = [];
-	for (let n of t) gr(e, n, r);
+	for (let n of t) Wr(e, n, r);
 	let i = e === "t1", a = [], o = !1, s = [], c = () => {
 		if (s.length === 0) return;
-		let e = hr(s);
-		s.length = 0, e.length !== 0 && a.push(i ? new H(_r(e, n)) : new P(e));
+		let e = Ur(s);
+		s.length = 0, e.length !== 0 && a.push(i ? new q(Gr(e, n)) : new L(e));
 	};
-	for (let e of r) e === mr ? (c(), a[a.length - 1] instanceof B || (a.push(new B()), o = !0)) : s.push(e);
+	for (let e of r) e === Hr ? (c(), a[a.length - 1] instanceof W || (a.push(new W()), o = !0)) : s.push(e);
 	if (!o) {
-		let e = hr(s);
-		return i ? new H(_r(e, n)) : new P(e);
+		let e = Ur(s);
+		return i ? new q(Gr(e, n)) : new L(e);
 	}
-	return c(), a.length === 1 ? new B() : new B(a);
+	return c(), a.length === 1 ? new W() : new W(a);
 }
-function yr(e) {
+function qr(e) {
 	return {
 		appStringPrefixes: [e],
 		preserveAppSeqSource: !0,
 		parseAppString(t, n, r) {
-			return vr(e, [new H(n)], r);
+			return Kr(e, [new q(n)], r);
 		},
 		parseAppSequence(t, n, r) {
-			return vr(e, n, r);
+			return Kr(e, n, r);
 		}
 	};
 }
-var br = yr("t1"), xr = yr("b1"), Sr = new TextEncoder(), Cr = new TextDecoder("utf-8", { fatal: !0 }), wr = new TextDecoder("utf-8", { fatal: !1 });
-function Tr(e) {
+var Jr = qr("t1"), Yr = qr("b1"), Xr = new TextEncoder(), Zr = new TextDecoder("utf-8", { fatal: !0 }), Qr = new TextDecoder("utf-8", { fatal: !1 });
+function $r(e) {
 	let t = 0;
 	for (let n of e) t += n.length;
 	let n = new Uint8Array(t), r = 0;
 	for (let t of e) n.set(t, r), r += t.length;
 	return n;
 }
-function Er(e, t, n) {
+function ei(e, t, n) {
 	let r = e === "ilts", i = [], a = [];
 	for (let o of t) {
-		if (o instanceof Ge && (o = o.inner), o instanceof B) throw SyntaxError(`${e}<<...>> cannot contain ellipses; there is no way to include an elision in an indefinite-length string`);
+		if (o instanceof ot && (o = o.inner), o instanceof W) throw SyntaxError(`${e}<<...>> cannot contain ellipses; there is no way to include an elision in an indefinite-length string`);
 		let t, s, c;
-		if (o instanceof H) t = o.value, c = o.encodingWidth;
-		else if (o instanceof P) s = o.value, c = o.encodingWidth;
-		else if (o instanceof I) t = o.chunks.map((e) => e.value).join("");
-		else if (o instanceof F) s = Tr(o.chunks.map((e) => e.value));
+		if (o instanceof q) t = o.value, c = o.encodingWidth;
+		else if (o instanceof L) s = o.value, c = o.encodingWidth;
+		else if (o instanceof z) t = o.chunks.map((e) => e.value).join("");
+		else if (o instanceof R) s = $r(o.chunks.map((e) => e.value));
 		else throw SyntaxError(`${e}<<...>> arguments must be (text or byte) strings`);
 		if (r) {
 			let e;
 			if (t !== void 0) e = t;
 			else try {
-				e = Cr.decode(s);
+				e = Zr.decode(s);
 			} catch {
 				let t = "ilts chunk is not valid UTF-8";
 				if (n) n(t);
 				else throw SyntaxError(t);
-				e = wr.decode(s);
+				e = Qr.decode(s);
 			}
-			a.push(new H(e, c === void 0 ? void 0 : { encodingWidth: c }));
+			a.push(new q(e, c === void 0 ? void 0 : { encodingWidth: c }));
 		} else {
-			let e = s ?? Sr.encode(t);
-			i.push(new P(e, c === void 0 ? void 0 : { encodingWidth: c }));
+			let e = s ?? Xr.encode(t);
+			i.push(new L(e, c === void 0 ? void 0 : { encodingWidth: c }));
 		}
 	}
-	return r ? new I(a) : new F(i);
+	return r ? new z(a) : new R(i);
 }
-function Dr(e) {
+function ti(e) {
 	return {
 		appStringPrefixes: [e],
 		preserveAppSeqSource: !0,
 		parseAppString(t, n, r) {
-			return new Ge(Er(e, [new H(n)], r), `${e}${ve(n)}`);
+			return new ot(ei(e, [new q(n)], r), `${e}${xe(n)}`);
 		},
 		parseAppSequence(t, n, r) {
-			return Er(e, n, r);
+			return ei(e, n, r);
 		}
 	};
 }
-var Or = Dr("ilbs"), kr = Dr("ilts");
-//#endregion
-//#region src/utils/strip-comments.ts
-function Ar(e) {
-	let t = "", n = 0;
-	for (; n < e.length;) {
-		let r = e[n];
-		if (r === " " || r === "\n" || r === "\r") {
-			n++;
-			continue;
-		}
-		if (r === "#") {
-			for (; n < e.length && e[n] !== "\n";) n++;
-			continue;
-		}
-		if (r === "/") {
-			let t = e[n + 1] ?? "";
-			if (t === "/") {
-				for (; n < e.length && e[n] !== "\n";) n++;
-				continue;
-			}
-			if (t === "*") {
-				for (n += 2; n < e.length && !(e[n] === "*" && (e[n + 1] ?? "") === "/");) n++;
-				if (n >= e.length) throw SyntaxError("unterminated block comment");
-				n += 2;
-				continue;
-			}
-			for (n++; n < e.length && e[n] !== "/";) n++;
-			if (n >= e.length) throw SyntaxError("unterminated block comment");
-			n++;
-			continue;
-		}
-		t += r, n++;
-	}
-	return t;
-}
-//#endregion
-//#region src/extensions/float.ts
-var jr = class extends M {
+var ni = ti("ilbs"), ri = ti("ilts"), ii = class extends F {
 	_bits;
 	constructor(e) {
-		super(E(e), { precision: "half" }), this._bits = e & 65535;
+		super(O(e), { precision: "half" }), this._bits = e & 65535;
 	}
 	_toCBOR() {
 		return new Uint8Array([
@@ -3236,7 +3743,7 @@ var jr = class extends M {
 			this._bits & 255
 		]);
 	}
-}, Mr = class extends M {
+}, ai = class extends F {
 	_raw;
 	constructor(e) {
 		super(new DataView(e.buffer, e.byteOffset).getFloat32(0, !1), { precision: "single" }), this._raw = e.slice();
@@ -3245,7 +3752,7 @@ var jr = class extends M {
 		let e = /* @__PURE__ */ new Uint8Array(5);
 		return e[0] = 250, e.set(this._raw, 1), e;
 	}
-}, Nr = class extends M {
+}, oi = class extends F {
 	_raw;
 	constructor(e) {
 		super(new DataView(e.buffer, e.byteOffset).getFloat64(0, !1), { precision: "double" }), this._raw = e.slice();
@@ -3255,13 +3762,13 @@ var jr = class extends M {
 		return e[0] = 251, e.set(this._raw, 1), e;
 	}
 };
-function Pr(e) {
-	if (e.length === 2) return new jr(e[0] << 8 | e[1]);
-	if (e.length === 4) return new Mr(e);
-	if (e.length === 8) return new Nr(e);
+function si(e) {
+	if (e.length === 2) return new ii(e[0] << 8 | e[1]);
+	if (e.length === 4) return new ai(e);
+	if (e.length === 8) return new oi(e);
 	throw SyntaxError(`float'...' requires 4, 8, or 16 hex digits (2, 4, or 8 bytes); got ${e.length} bytes`);
 }
-function Fr(e) {
+function ci(e) {
 	let t = e >>> 15 & 1, n = e >>> 10 & 31, r = e & 1023, i;
 	if (n === 31) i = t << 31 | 2139095040 | r << 13;
 	else if (n === 0 && r === 0) i = t << 31;
@@ -3273,7 +3780,7 @@ function Fr(e) {
 	let a = /* @__PURE__ */ new Uint8Array(4);
 	return new DataView(a.buffer).setUint32(0, i >>> 0, !1), a;
 }
-function Ir(e) {
+function li(e) {
 	let t = e >>> 15 & 1, n = e >>> 10 & 31, r = e & 1023, i = /* @__PURE__ */ new Uint8Array(8), a = new DataView(i.buffer);
 	if (n === 31) a.setUint32(0, (t << 31 | 2146435072 | r << 10) >>> 0, !1), a.setUint32(4, 0, !1);
 	else if (n === 0 && r === 0) a.setUint32(0, t << 31 >>> 0, !1), a.setUint32(4, 0, !1);
@@ -3284,7 +3791,7 @@ function Ir(e) {
 	} else a.setUint32(0, (t << 31 | n + 1008 << 20 | r << 10) >>> 0, !1), a.setUint32(4, 0, !1);
 	return i;
 }
-function Lr(e) {
+function ui(e) {
 	let t = new DataView(e.buffer, e.byteOffset).getUint32(0, !1), n = t >>> 31 & 1, r = t >>> 23 & 255, i = t & 8388607, a = /* @__PURE__ */ new Uint8Array(8), o = new DataView(a.buffer);
 	if (r === 255) o.setUint32(0, (n << 31 | 2146435072 | i >>> 3) >>> 0, !1), o.setUint32(4, (i & 7) << 29, !1);
 	else if (r === 0 && i === 0) o.setUint32(0, n << 31 >>> 0, !1), o.setUint32(4, 0, !1);
@@ -3294,49 +3801,49 @@ function Lr(e) {
 	}
 	return a;
 }
-function Rr(e, t, n) {
+function di(e, t, n) {
 	let r = e.length === 2 ? 1 : e.length === 4 ? 2 : 3;
 	if (r === 1) {
 		let n = e[0] << 8 | e[1];
-		if (t === 2) return new Mr(Fr(n));
-		if (t === 3) return new Nr(Ir(n));
+		if (t === 2) return new ai(ci(n));
+		if (t === 3) return new oi(li(n));
 	}
 	if (r === 2) {
-		if (t === 3) return new Nr(Lr(e));
+		if (t === 3) return new oi(ui(e));
 		if (t === 1) {
-			let t = new DataView(e.buffer, e.byteOffset).getFloat32(0, !1), r = T(t);
-			return !Object.is(E(r), t) && !isNaN(t) && n("float'...' value cannot be exactly represented as float16 (_1)"), new jr(r);
+			let t = new DataView(e.buffer, e.byteOffset).getFloat32(0, !1), r = Ae(t);
+			return !Object.is(O(r), t) && !isNaN(t) && n("float'...' value cannot be exactly represented as float16 (_1)"), new ii(r);
 		}
 	}
 	if (r === 3) {
 		let r = new DataView(e.buffer, e.byteOffset).getFloat64(0, !1);
 		if (t === 1) {
-			let e = T(r);
-			return !Object.is(E(e), r) && !isNaN(r) && n("float'...' value cannot be exactly represented as float16 (_1)"), new jr(e);
+			let e = Ae(r);
+			return !Object.is(O(e), r) && !isNaN(r) && n("float'...' value cannot be exactly represented as float16 (_1)"), new ii(e);
 		}
 		if (t === 2) {
 			let e = Math.fround(r);
 			!Object.is(e, r) && !isNaN(r) && n("float'...' value cannot be exactly represented as float32 (_2)");
 			let t = /* @__PURE__ */ new Uint8Array(4);
-			return new DataView(t.buffer).setFloat32(0, e, !1), new Mr(t);
+			return new DataView(t.buffer).setFloat32(0, e, !1), new ai(t);
 		}
 	}
-	return Pr(e);
+	return si(e);
 }
-var zr = {
+var fi = {
 	appStringPrefixes: ["float"],
 	parseAppString(t, n, r, i) {
-		let a = Ar(n);
+		let a = Xe(n);
 		if (!/^[0-9a-fA-F]*$/.test(a)) throw SyntaxError("float'...' contains non-hex characters");
 		if (a.length % 2 != 0) throw SyntaxError(`float'...' hex content has odd length (${a.length} digits)`);
 		let o = e(a), s = i?.encodingWidth;
-		if (s === void 0) return Pr(o);
+		if (s === void 0) return si(o);
 		if (s !== 1 && s !== 2 && s !== 3) {
 			let e = `float'...' encoding indicator _${s} is not valid; use _1, _2, or _3`;
-			if (r) return r(e), Pr(o);
+			if (r) return r(e), si(o);
 			throw SyntaxError(e);
 		}
-		return s === (o.length === 2 ? 1 : o.length === 4 ? 2 : 3) ? Pr(o) : Rr(o, s, r ?? ((e) => {
+		return s === (o.length === 2 ? 1 : o.length === 4 ? 2 : 3) ? si(o) : di(o, s, r ?? ((e) => {
 			throw SyntaxError(e);
 		}));
 	},
@@ -3347,57 +3854,57 @@ var zr = {
 			if (n) n(e);
 			else throw SyntaxError(e);
 		}
-		if (!(t[0] instanceof P)) throw SyntaxError("float<<...>> item must be a byte string");
-		return Pr(t[0].value);
+		if (!(t[0] instanceof L)) throw SyntaxError("float<<...>> item must be a byte string");
+		return si(t[0].value);
 	}
-}, Br = [
-	Bn,
-	sr,
-	ur
-], Vr = [
-	Gt,
-	un,
+}, pi = [
+	pr,
+	Fr,
+	Rr
+], mi = [
+	_n,
 	Ln,
-	br,
-	xr,
-	Or,
-	kr,
-	zr
-], Hr;
-function Z(e) {
-	return e === void 0 ? Hr ??= [...Br, ...Vr] : e === !1 ? Br : [...Br, ...e];
+	ur,
+	Jr,
+	Yr,
+	ni,
+	ri,
+	fi
+], hi;
+function gi(e) {
+	return e === void 0 ? hi ??= [...pi, ...mi] : e === !1 ? pi : [...pi, ...e];
 }
 //#endregion
 //#region src/js/fromJS.ts
-var Ur;
-function Wr(e) {
+var _i;
+function vi(e) {
 	if (e === void 0) {
-		if (Ur) return Ur;
-		let e = Z(void 0);
-		return Ur = {
+		if (_i) return _i;
+		let e = gi(void 0);
+		return _i = {
 			fromJS: e.filter((e) => e.fromJS !== void 0),
 			parseTag: e.filter((e) => e.parseTag !== void 0)
 		};
 	}
-	let t = Z(e);
+	let t = gi(e);
 	return {
 		fromJS: t.filter((e) => e.fromJS !== void 0),
 		parseTag: t.filter((e) => e.parseTag !== void 0)
 	};
 }
-function Gr(e) {
-	let t = e?.extensions, n = Wr(e?.builtinExtensions);
+function yi(e) {
+	let t = e?.extensions, n = vi(e?.builtinExtensions);
 	return t?.length ? {
 		fromJS: [...t.filter((e) => e.fromJS !== void 0), ...n.fromJS],
 		parseTag: [...t.filter((e) => e.parseTag !== void 0), ...n.parseTag]
 	} : n;
 }
-function Kr(e, t) {
+function bi(e, t) {
 	if (t?.replacer) {
-		let { replacer: n, ...r } = t, i = Jr(e, n, r.extensions, r.undefinedOmits, r.builtinExtensions);
-		return i === h ? z.UNDEFINED : Kr(i, Object.keys(r).length > 0 ? r : void 0);
+		let { replacer: n, ...r } = t, i = Si(e, n, r.extensions, r.undefinedOmits, r.builtinExtensions);
+		return i === h ? H.UNDEFINED : bi(i, Object.keys(r).length > 0 ? r : void 0);
 	}
-	return Q(e, t, !0, Gr(t));
+	return Q(e, t, !0, yi(t));
 }
 function Q(e, t, n, r) {
 	for (let n of r.fromJS) {
@@ -3410,35 +3917,35 @@ function Q(e, t, n, r) {
 			let t = e.parseTag(n, i);
 			if (t !== void 0) return t;
 		}
-		return new N(n, i);
-	}
-	if (e instanceof m.Null) return z.NULL;
-	if (e instanceof m.Undefined) return z.UNDEFINED;
-	if (e instanceof g) return new z(e.value);
-	if (e === null) return z.NULL;
-	if (e === void 0) return z.UNDEFINED;
-	if (e === !0) return z.TRUE;
-	if (e === !1) return z.FALSE;
-	if (typeof e == "bigint") return e > 18446744073709551615n ? new $e(e) : e < -18446744073709551616n ? new et(e) : e >= 0n ? new A(e) : new j(e);
-	if (typeof e == "number") return (t?.encodeIntegerAs ?? "int") === "int" && Number.isInteger(e) && !Object.is(e, -0) ? e >= 0 ? new A(BigInt(e)) : new j(BigInt(e)) : new M(e);
-	if (typeof e == "string") return new H(e);
+		return new I(n, i);
+	}
+	if (e instanceof m.Null) return H.NULL;
+	if (e instanceof m.Undefined) return H.UNDEFINED;
+	if (e instanceof g) return new H(e.value);
+	if (e === null) return H.NULL;
+	if (e === void 0) return H.UNDEFINED;
+	if (e === !0) return H.TRUE;
+	if (e === !1) return H.FALSE;
+	if (typeof e == "bigint") return e > 18446744073709551615n ? new _t(e) : e < -18446744073709551616n ? new vt(e) : e >= 0n ? new N(e) : new P(e);
+	if (typeof e == "number") return (t?.encodeIntegerAs ?? "int") === "int" && Number.isInteger(e) && !Object.is(e, -0) ? e >= 0 ? new N(BigInt(e)) : new P(BigInt(e)) : new F(e);
+	if (typeof e == "string") return new q(e);
 	if (e instanceof Number || e instanceof Boolean || e instanceof String || Object.prototype.toString.call(e) === "[object BigInt]") return Q(e.valueOf(), t, !1, r);
-	if (e instanceof ArrayBuffer || typeof SharedArrayBuffer < "u" && e instanceof SharedArrayBuffer) return new P(new Uint8Array(e));
-	if (ArrayBuffer.isView(e)) return e instanceof Uint8Array && t?.uint8ArrayAs === "array" ? new L(Array.from(e, (e) => new A(BigInt(e)))) : new P(new Uint8Array(e.buffer, e.byteOffset, e.byteLength));
-	if (e instanceof $) return new R([...e].map(([e, n]) => [Q(e, t, !0, r), Q(n, t, !0, r)]));
-	if (Array.isArray(e)) return new L(e.map((e) => Q(e, t, !0, r)));
+	if (e instanceof ArrayBuffer || typeof SharedArrayBuffer < "u" && e instanceof SharedArrayBuffer) return new L(new Uint8Array(e));
+	if (ArrayBuffer.isView(e)) return e instanceof Uint8Array && t?.uint8ArrayAs === "array" ? new B(Array.from(e, (e) => new N(BigInt(e)))) : new L(new Uint8Array(e.buffer, e.byteOffset, e.byteLength));
+	if (e instanceof $) return new V([...e].map(([e, n]) => [Q(e, t, !0, r), Q(n, t, !0, r)]));
+	if (Array.isArray(e)) return new B(e.map((e) => Q(e, t, !0, r)));
 	if (typeof e == "object") {
 		let n = [];
-		for (let [i, a] of Object.entries(e)) n.push([new H(i), Q(a, t, !0, r)]);
-		return new R(n);
+		for (let [i, a] of Object.entries(e)) n.push([new q(i), Q(a, t, !0, r)]);
+		return new V(n);
 	}
 	throw TypeError(`fromJS: unsupported value type: ${typeof e}`);
 }
-function qr(e) {
+function xi(e) {
 	return ArrayBuffer.isView(e) || e instanceof ArrayBuffer || typeof SharedArrayBuffer < "u" && e instanceof SharedArrayBuffer || e instanceof Number || e instanceof Boolean || e instanceof String || Object.prototype.toString.call(e) === "[object BigInt]" || e instanceof m.Null || e instanceof m.Undefined || e instanceof g;
 }
-function Jr(e, t, n, r, i) {
-	let a = [...n ?? [], ...Z(i)].filter((e) => e.isJSType !== void 0);
+function Si(e, t, n, r, i) {
+	let a = [...n ?? [], ...gi(i)].filter((e) => e.isJSType !== void 0);
 	function o(e) {
 		return e === h || r === !0 && e === void 0;
 	}
@@ -3448,7 +3955,7 @@ function Jr(e, t, n, r, i) {
 			if (typeof e != "object" || !e) return e;
 			if (e instanceof $) return $.from(e, ([e, t]) => [e, r(t)]);
 			if (Array.isArray(e)) return e.map(r);
-			if (m.symbol in e || qr(e) || a.some((t) => t.isJSType(e))) return e;
+			if (m.symbol in e || xi(e) || a.some((t) => t.isJSType(e))) return e;
 			let t = Object.getPrototypeOf(e);
 			if (t === Object.prototype || t === null) {
 				let t = e.toJSON;
@@ -3483,7 +3990,7 @@ function Jr(e, t, n, r, i) {
 				let r = c(t, String(n), e);
 				return o(r) ? null : r;
 			});
-			if (qr(e) || a.some((t) => t.isJSType(e))) return e;
+			if (xi(e) || a.some((t) => t.isJSType(e))) return e;
 			let t = {};
 			for (let n of Object.keys(e)) {
 				let r = c(e[n], n, e);
@@ -3501,7 +4008,7 @@ var $ = class extends Array {
 	toJSON() {
 		let e = {};
 		for (let [t, n] of this) {
-			let r = typeof t == "string" ? t : Kr(t).toCDN();
+			let r = typeof t == "string" ? t : bi(t).toCDN();
 			r === "__proto__" ? Object.defineProperty(e, r, {
 				value: n,
 				writable: !0,
@@ -3513,6 +4020,6 @@ var $ = class extends Array {
 	}
 };
 //#endregion
-export { A, L as C, N as D, P as E, s as F, m as I, c as L, g as M, h as N, M as O, o as P, R as S, F as T, it as _, zr as a, He as b, kr as c, ar as d, Ln as f, H as g, Kt as h, Vr as i, k as j, j as k, xr as l, Gt as m, Jr as n, Ar as o, un as p, Kr as r, Or as s, $ as t, br as u, et as v, I as w, z as x, $e as y };
+export { L as A, o as B, nt as C, B as D, V as E, N as F, m as H, M as I, j as L, F as M, Ke as N, z as O, P, g as R, tt as S, H as T, c as U, s as V, vt as _, fi as a, ot as b, Yr as c, ur as d, Ln as f, St as g, q as h, mi as i, I as j, R as k, Jr as l, vn as m, Si as n, ni as o, _n as p, bi as r, ri as s, $ as t, Nr as u, _t as v, U as w, rt as x, W as y, h as z };
 
-//# sourceMappingURL=mapEntries-Clr-oNtQ.js.map
+//# sourceMappingURL=mapEntries-DxrDre2P.js.map