@cbortech/cbor 0.26.1 → 0.26.3

package/dist/{mapEntries-ClxYqDPp.js → mapEntries-BZCOgqIt.js}

@@ -96,23 +96,23 @@ var m = class {
 };
 //#endregion
 //#region src/cdn/serialize-utils.ts
-function ee(e) {
+function _(e) {
 	let t = e?.indent;
 	return t === void 0 ? null : typeof t == "number" ? " ".repeat(t) : t;
 }
-function _(e, t) {
+function v(e, t) {
 	return e.repeat(t);
 }
-function te(e, t, n) {
-	return t === null ? e.join(" + ") : e.join(` +\n${_(t, n + 1)}`);
+function ee(e, t, n) {
+	return t === null ? e.join(" + ") : e.join(` +\n${v(t, n + 1)}`);
 }
-function ne(e) {
+function y(e) {
 	return !!(e.comments?.leading?.length || e.comments?.trailing?.length || e.comments?.dangling?.length);
 }
-function re(e) {
+function te(e) {
 	return !!(e.comments?.trailing?.length || e.comments?.dangling?.length);
 }
-function v(e, t) {
+function b(e, t) {
 	if (!t) return e.text;
 	let { marker: n, text: r } = e;
 	if (t === "c-style") return n === "#" ? "//" + r.slice(1) : n === "/" ? "/*" + r.slice(1, -1) + "*/" : r;
@@ -123,17 +123,17 @@ function v(e, t) {
 	}
 	return r;
 }
-function ie(e, t, n) {
-	return (e.comments?.leading ?? []).map((e) => t + v(e, n));
+function ne(e, t, n) {
+	return (e.comments?.leading ?? []).map((e) => t + b(e, n));
 }
-function y(e, t) {
+function re(e, t) {
 	let n = e.comments?.trailing ?? [];
-	return n.length === 0 ? "" : " " + n.map((e) => v(e, t)).join(" ");
+	return n.length === 0 ? "" : " " + n.map((e) => b(e, t)).join(" ");
 }
-function ae(e, t, n) {
-	return (e.comments?.dangling ?? []).map((e) => t + v(e, n));
+function ie(e, t, n) {
+	return (e.comments?.dangling ?? []).map((e) => t + b(e, n));
 }
-function oe(e, t = !1) {
+function ae(e, t = !1) {
 	let n = e?.commas ?? "comma", r = n !== "none";
 	return {
 		inlineSep: r ? t ? "," : ", " : " ",
@@ -142,32 +142,49 @@ function oe(e, t = !1) {
 		colSep: t ? ":" : ": "
 	};
 }
-function se(e) {
-	let { options: t, depth: n, openChar: r, closeChar: i, count: a } = e, o = ee(t), s = t?.preserveComments, c = typeof s == "string" ? s : void 0, l = s && (re(e.node) || e.hasEntryComments());
+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 = s && (te(e.node) || e.hasEntryComments());
 	o === null && l && (o = "  ");
-	let { inlineSep: u, multilineSep: d, trailSep: f, colSep: p } = oe(t, o === null), m = e.indefiniteLength ? "" : x(t, e.encodingWidth, () => b(BigInt(a))), h = m ? m + " " : "", g = e.indefiniteLength && (t?.encodingIndicators ?? "auto") !== "never";
+	let { 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}`;
 	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 e.indefiniteLength ? g ? a === 0 ? `${r}_ ${i}` : `${r}_ ${t}${i}` : `${r}${t}${i}` : `${r}${h}${t}${i}`;
+		return ee(t);
+	}
+	let y = null;
+	if (t?.inlineLeafContainers && a > 0 && !l) {
+		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);
+			if (t.push(i), i.includes("\n")) {
+				n = !1;
+				break;
+			}
+		}
+		if (n) return ee(t.join(u));
+		y = t;
 	}
-	let te = _(o, n + 1), ne = _(o, n), v = e.indefiniteLength ? g ? `${r}_ ` : r : `${r}${h}`, y = [];
+	let b = v(o, n + 1), re = v(o, n), x = e.indefiniteLength ? g ? `${r}_ ` : r : `${r}${h}`, S = [];
 	for (let t = 0; t < a; t++) {
-		s && y.push(...ie(e.entryLeadingNode(t), te, c));
-		let n = t < a - 1 ? d : f;
-		y.push(`${te}${e.renderEntry(t, p)}${n}${s ? e.entryTrailing(t, c) : ""}`);
+		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 && y.push(...ae(e.node, te, c)), `${v}\n${y.join("\n")}\n${ne}${i}`;
+	return s && S.push(...ie(e.node, b, c)), `${x}\n${S.join("\n")}\n${re}${i}`;
 }
-var ce = typeof (/* @__PURE__ */ new Uint8Array()).toBase64 == "function";
-function le(e) {
-	if (ce) return e.toBase64({ omitPadding: !0 });
+var S = typeof (/* @__PURE__ */ new Uint8Array()).toBase64 == "function";
+function oe(e) {
+	if (S) return e.toBase64({ omitPadding: !0 });
 	let t = "";
 	for (let n of e) t += String.fromCharCode(n);
 	return btoa(t).replace(/=/g, "");
 }
-function ue(e) {
-	if (ce) return e.toBase64({
+function se(e) {
+	if (S) return e.toBase64({
 		alphabet: "base64url",
 		omitPadding: !0
 	});
@@ -175,54 +192,54 @@ function ue(e) {
 	for (let n of e) t += String.fromCharCode(n);
 	return btoa(t).replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
 }
-var de = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567", fe = "0123456789ABCDEFGHIJKLMNOPQRSTUV";
-function pe(e, t) {
+var ce = "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];
 	return i > 0 && (n += t[r << 5 - i & 31]), n;
 }
-function me(e) {
+function de(e) {
 	for (let t of e) {
 		let e = t.codePointAt(0);
 		if (e < 32 || e === 127) return !0;
 	}
 	return !1;
 }
-function he(e, t, n) {
+function fe(e, t, n) {
 	if (n === "string") {
-		let t = _e(e);
-		if (t != null) return be(t);
+		let t = me(e);
+		if (t != null) return _e(t);
 	}
 	if (n === "printable-string" || n === void 0) {
-		let t = _e(e);
-		if (t != null && !me(t)) return be(t);
+		let t = me(e);
+		if (t != null && !de(t)) return _e(t);
 	}
 	switch (t) {
-		case "base64": return `b64'${le(e)}'`;
-		case "base64url": return `b64'${ue(e)}'`;
-		case "base32": return `b32'${pe(e, de)}'`;
-		case "base32hex": return `h32'${pe(e, fe)}'`;
+		case "base64": return `b64'${oe(e)}'`;
+		case "base64url": return `b64'${se(e)}'`;
+		case "base32": return `b32'${ue(e, ce)}'`;
+		case "base32hex": return `h32'${ue(e, le)}'`;
 		default: return `h'${i(e)}'`;
 	}
 }
-var ge = new TextDecoder("utf-8", { fatal: !0 });
-function _e(e) {
+var pe = new TextDecoder("utf-8", { fatal: !0 });
+function me(e) {
 	try {
-		return ge.decode(e);
+		return pe.decode(e);
 	} catch {
 		return null;
 	}
 }
-function ve(e, t) {
+function he(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 ye(e, t) {
+function ge(e, t) {
 	let n = t.codePointAt(0);
-	if (!ve(e, n)) return t + e + t;
+	if (!he(e, n)) return t + e + t;
 	let r = t;
 	for (let i of e) {
 		let e = i.codePointAt(0);
@@ -247,40 +264,40 @@ function ye(e, t) {
 	}
 	return r + t;
 }
-function be(e) {
-	return ye(e, "'");
+function _e(e) {
+	return ge(e, "'");
 }
-function xe(e) {
-	return ye(e, "'");
+function ve(e) {
+	return ge(e, "'");
 }
-function Se(e) {
-	return ye(e, "\"");
+function ye(e) {
+	return ge(e, "\"");
 }
-function Ce(e) {
+function be(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 we(e, t, n, r) {
+function xe(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 b(e) {
+function C(e) {
 	return e <= 23n ? "i" : e <= 255n ? 0 : e <= 65535n ? 1 : e <= 4294967295n ? 2 : 3;
 }
-function x(e, t, n) {
+function w(e, t, n) {
 	let r = e?.encodingIndicators ?? "auto";
 	return r === "never" ? "" : r === "always" ? `_${t ?? n()}` : t === void 0 ? "" : `_${t}`;
 }
 //#endregion
 //#region src/utils/float16.ts
-var Te = "getFloat16" in DataView.prototype && "setFloat16" in DataView.prototype, Ee = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(8));
-function S(e) {
-	Ee.setFloat64(0, e, !1);
-	let t = Ee.getUint32(0, !1), n = Ee.getUint32(4, !1), r = t >>> 31 & 1, i = t >>> 20 & 2047, a = t & 1048575;
+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;
 	if (i === 2047) {
 		if (a === 0 && n === 0) return r << 15 | 31744;
 		let e = a >> 10 | (n === 0 ? 0 : 1) || 1;
@@ -301,19 +318,19 @@ function S(e) {
 	let u = o <= 0 ? 0 : o;
 	return r << 15 | u << 10 | s;
 }
-function C(e) {
+function E(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 De = Te ? (e, t, n, r) => {
+var we = Se ? (e, t, n, r) => {
 	e.setFloat16(t, n, r);
 } : (e, t, n, r) => {
-	e.setUint16(t, S(n), r);
-}, w = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(8)), T = new Uint8Array(w.buffer), Oe = new TextEncoder(), ke = typeof Oe.encodeInto == "function";
-function Ae(e) {
+	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) {
 	return e <= 23 ? 1 : e <= 255 ? 2 : e <= 65535 ? 3 : e <= 4294967295 ? 5 : 9;
 }
-function je(e) {
+function ke(e) {
 	return e === "i" ? 1 : [
 		2,
 		3,
@@ -321,7 +338,7 @@ function je(e) {
 		9
 	][e];
 }
-var Me = class {
+var Ae = class {
 	buf;
 	len = 0;
 	constructor(e = 256) {
@@ -352,45 +369,45 @@ var Me = 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) {
-		w.setBigUint64(0, e, !1), this._ensure(8), this.buf.set(T, this.len), this.len += 8;
+		Te.setBigUint64(0, e, !1), this._ensure(8), this.buf.set(D, this.len), this.len += 8;
 	}
 	writeFloat16(e) {
-		De(w, 0, e, !1), this._ensure(2);
+		we(Te, 0, e, !1), this._ensure(2);
 		let t = this.buf;
-		t[this.len++] = T[0], t[this.len++] = T[1];
+		t[this.len++] = D[0], t[this.len++] = D[1];
 	}
 	writeFloat32(e) {
-		w.setFloat32(0, e, !1), this._ensure(4);
+		Te.setFloat32(0, e, !1), this._ensure(4);
 		let t = this.buf;
-		t[this.len++] = T[0], t[this.len++] = T[1], t[this.len++] = T[2], t[this.len++] = T[3];
+		t[this.len++] = D[0], t[this.len++] = D[1], t[this.len++] = D[2], t[this.len++] = D[3];
 	}
 	writeFloat64(e) {
-		w.setFloat64(0, e, !1), this._ensure(8), this.buf.set(T, this.len), this.len += 8;
+		Te.setFloat64(0, e, !1), this._ensure(8), this.buf.set(D, this.len), this.len += 8;
 	}
 	writeTextString(e, t, n) {
-		if (!ke) {
-			let r = Oe.encode(t);
-			E(this, e, r.length, n), this.writeBytes(r);
+		if (!De) {
+			let r = Ee.encode(t);
+			O(this, e, r.length, n), this.writeBytes(r);
 			return;
 		}
-		let r = n === void 0 ? Ae(t.length) : je(n);
+		let r = n === void 0 ? Oe(t.length) : ke(n);
 		this._ensure(9 + 3 * t.length);
-		let { written: i } = Oe.encodeInto(t, this.buf.subarray(this.len + r)), a = n === void 0 ? Ae(i) : r;
-		a !== r && this.buf.copyWithin(this.len + a, this.len + r, this.len + r + i), E(this, e, i, n), this.len += i;
+		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;
 	}
 	finish() {
 		return this.buf.slice(0, this.len);
 	}
-}, Ne = [
+}, je = [
 	255n,
 	65535n,
 	4294967295n,
 	18446744073709551615n
 ];
-function Pe(e) {
-	return e === "i" ? 23n : Ne[e];
+function Me(e) {
+	return e === "i" ? 23n : je[e];
 }
-function E(e, t, n, r) {
+function O(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;
@@ -402,40 +419,43 @@ function E(e, t, n, r) {
 			e.writeByte(t << 5 | Number(i));
 			return;
 		}
-		if (i > Ne[r]) throw RangeError(`value ${i} does not fit in encodingWidth _${r} (max ${Ne[r]})`);
+		if (i > je[r]) throw RangeError(`value ${i} does not fit in encodingWidth _${r} (max ${je[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 Fe(e, t, n) {
-	let r = new Me(9);
-	return E(r, e, t, n), r.finish();
+function Ne(e, t, n) {
+	let r = new Ae(9);
+	return O(r, e, t, n), r.finish();
 }
-var Ie = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(4));
-function Le(e) {
-	return Object.is(C(S(e)), e);
+var Pe = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(4));
+function Fe(e) {
+	return Object.is(E(T(e)), e);
 }
-function Re(e) {
-	return Ie.setFloat32(0, e, !1), Object.is(Ie.getFloat32(0, !1), e);
+function Ie(e) {
+	return Pe.setFloat32(0, e, !1), Object.is(Pe.getFloat32(0, !1), e);
 }
-function D(e) {
-	return Le(e) ? "half" : Re(e) ? "single" : "double";
+function Le(e) {
+	return Fe(e) ? "half" : Ie(e) ? "single" : "double";
 }
 //#endregion
 //#region src/ast/CborItem.ts
-var O = class e {
+var k = class e {
 	start;
 	end;
 	comments;
 	warnings;
 	_defaults;
+	get _containsCdnContainer() {
+		return !1;
+	}
 	toCBOR(e) {
 		let t = this._defaults ? {
 			...this._defaults,
 			...e
-		} : e, n = new Me();
+		} : e, n = new Ae();
 		return this._encode(n, t), n.finish();
 	}
 	toCDN(e) {
@@ -444,7 +464,7 @@ var O = class e {
 			...e
 		} : e, n = this._toCDN(t, 0), r = t?.preserveComments;
 		if (!r) return n;
-		let i = typeof r == "string" ? r : void 0, a = this.comments?.leading?.map((e) => v(e, i)) ?? [], o = this.comments?.trailing ?? [], s = o.length === 0 ? n : `${n} ${o.map((e) => v(e, i).trimEnd()).join(" ")}`;
+		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");
 	}
 	toEDN(e) {
@@ -483,7 +503,7 @@ var O = class e {
 		t.writeBytes(this._toCBOR(n));
 	}
 	_toCBOR(e) {
-		let t = new Me();
+		let t = new Ae();
 		return this._encodeTo(t, e), t.finish();
 	}
 	_toHexDump(e, n) {
@@ -493,7 +513,7 @@ var O = class e {
 			comment: this._toCDN(n, 0)
 		}];
 	}
-}, k = class extends O {
+}, A = class extends k {
 	value;
 	encodingWidth;
 	constructor(e, t) {
@@ -502,10 +522,10 @@ var O = class e {
 		this.encodingWidth = t?.encodingWidth;
 	}
 	_encodeTo(e, t) {
-		E(e, 0, this.value, this.encodingWidth);
+		O(e, 0, this.value, this.encodingWidth);
 	}
 	_toCDN(e, t) {
-		let n = x(e, this.encodingWidth, () => b(this.value)), r = this.value;
+		let n = w(e, this.encodingWidth, () => C(this.value)), r = this.value;
 		switch (e?.intFormat) {
 			case "hex": return `0x${r.toString(16)}${n}`;
 			case "octal": return `0o${r.toString(8)}${n}`;
@@ -517,7 +537,7 @@ var O = 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;
 	}
-}, A = class extends O {
+}, j = class extends k {
 	argument;
 	encodingWidth;
 	constructor(e, t) {
@@ -531,10 +551,10 @@ var O = class e {
 		return -1n - this.argument;
 	}
 	_encodeTo(e, t) {
-		E(e, 1, this.argument, this.encodingWidth);
+		O(e, 1, this.argument, this.encodingWidth);
 	}
 	_toCDN(e, t) {
-		let n = x(e, this.encodingWidth, () => b(this.argument)), r = this.argument + 1n;
+		let n = w(e, this.encodingWidth, () => C(this.argument)), r = this.argument + 1n;
 		switch (e?.intFormat) {
 			case "hex": return `-0x${r.toString(16)}${n}`;
 			case "octal": return `-0o${r.toString(8)}${n}`;
@@ -546,8 +566,8 @@ var O = class e {
 		let t = this.value, n = e?.integerAs ?? "auto";
 		return n === "bigint" ? t : n === "number" || t >= BigInt(-(2 ** 53 - 1)) ? Number(t) : t;
 	}
-}, ze = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(8));
-function Be(e) {
+}, Re = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(8));
+function ze(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);
@@ -565,20 +585,20 @@ function Be(e) {
 	let l = c * 2 ** o;
 	return t ? -l : l;
 }
-function Ve(e) {
+function Be(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";
-	ze.setFloat64(0, n, !1);
-	let r = ze.getUint32(0, !1), i = ze.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;
+	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;
 	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 j = class extends O {
+var M = class extends k {
 	value;
 	precision;
 	ednSource;
@@ -587,7 +607,7 @@ var j = class extends O {
 		super(), this.value = e, this.precision = t?.precision, this.rawBits = t?.rawBits;
 	}
 	_encodeTo(e, t) {
-		let n = this.precision ?? D(this.value), r = Number.isNaN(this.value) ? this.rawBits : void 0;
+		let n = this.precision ?? Le(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) {
@@ -596,18 +616,18 @@ var j = class extends O {
 			if (n === "never") return this.ednSource.replace(/_[0-3i]$/, "");
 			if (n === "always") {
 				if (/_[0-3i]$/.test(this.ednSource)) return this.ednSource;
-				let e = this.precision ?? D(this.value), t = e === "half" ? "_1" : e === "single" ? "_2" : "_3";
+				let e = this.precision ?? Le(this.value), t = e === "half" ? "_1" : e === "single" ? "_2" : "_3";
 				return this.ednSource + t;
 			}
 			return this.ednSource;
 		}
-		let r = D(this.value);
-		return (e?.floatFormat === "hex" ? Ve(this.value) : Ce(this.value)) + we(this.value, this.precision, r, n);
+		let r = Le(this.value);
+		return (e?.floatFormat === "hex" ? Be(this.value) : be(this.value)) + xe(this.value, this.precision, r, n);
 	}
 	_toJS(e) {
 		return this.value;
 	}
-}, M = class extends O {
+}, N = class extends k {
 	tag;
 	content;
 	encodingWidth;
@@ -615,17 +635,20 @@ var j = class extends O {
 		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;
 	}
+	get _containsCdnContainer() {
+		return this.content._containsCdnContainer;
+	}
 	_encodeTo(e, t) {
-		E(e, 6, this.tag, this.encodingWidth), this.content._encode(e, t);
+		O(e, 6, this.tag, this.encodingWidth), this.content._encode(e, t);
 	}
 	_toCDN(e, t) {
-		let n = x(e, this.encodingWidth, () => b(this.tag));
+		let n = w(e, this.encodingWidth, () => C(this.tag));
 		return `${this.tag}${n}(${this.content._toCDN(e, t)})`;
 	}
 	_toHexDump(e, n) {
 		let r = [{
 			depth: e,
-			hex: t(Fe(6, this.tag, this.encodingWidth)),
+			hex: t(Ne(6, this.tag, this.encodingWidth)),
 			comment: `Tag ${this.tag}`
 		}];
 		return r.push(...this.content._toHexDump(e + 1, {
@@ -637,7 +660,7 @@ var j = class extends O {
 		let t = this.content._toJS(e);
 		return e?.stripTags ? t : m.set(t, this.tag);
 	}
-}, N = class extends O {
+}, P = class extends k {
 	indefiniteLength = !1;
 	value;
 	ednEncoding;
@@ -648,27 +671,27 @@ var j = class extends O {
 		super(), this.value = e, this.ednEncoding = t?.ednEncoding ?? "hex", this.encodingWidth = t?.encodingWidth, this.ednSource = t?.ednSource, this.ednParts = t?.ednParts;
 	}
 	_encodeTo(e, t) {
-		E(e, 2, this.value.length, this.encodingWidth), e.writeBytes(this.value);
+		O(e, 2, this.value.length, this.encodingWidth), e.writeBytes(this.value);
 	}
 	_toCDN(e, t) {
 		if (e?.preserveConcatenation && this.ednParts !== void 0 && this.ednParts.length > 1) {
-			let n = x(e, this.encodingWidth, () => b(BigInt(this.value.length))), r = e?.bstrEncoding ?? this.ednEncoding;
+			let n = w(e, this.encodingWidth, () => C(BigInt(this.value.length))), r = e?.bstrEncoding ?? this.ednEncoding;
 			e?.appStrings === !1 && r !== "hex" && (r = "hex");
-			let i = this.ednParts.map((t) => e?.preserveByteString && t.source !== void 0 ? t.source : he(t.bytes, r, e?.sqstr));
-			return i[i.length - 1] += n, te(i, ee(e), t);
+			let i = this.ednParts.map((t) => e?.preserveByteString && t.source !== void 0 ? t.source : fe(t.bytes, r, e?.sqstr));
+			return i[i.length - 1] += n, ee(i, _(e), t);
 		}
 		if (e?.preserveByteString && this.ednSource !== void 0) {
 			if (/_[0-3i]$/.test(this.ednSource)) return (e?.encodingIndicators ?? "auto") === "never" ? this.ednSource.replace(/_[0-3i]$/, "") : this.ednSource;
-			let t = x(e, this.encodingWidth, () => b(BigInt(this.value.length)));
+			let t = w(e, this.encodingWidth, () => C(BigInt(this.value.length)));
 			return this.ednSource + t;
 		}
-		let n = x(e, this.encodingWidth, () => b(BigInt(this.value.length))), r = e?.bstrEncoding ?? this.ednEncoding;
-		return e?.appStrings === !1 && r !== "hex" && (r = "hex"), he(this.value, r, e?.sqstr) + n;
+		let n = w(e, this.encodingWidth, () => C(BigInt(this.value.length))), r = e?.bstrEncoding ?? this.ednEncoding;
+		return e?.appStrings === !1 && r !== "hex" && (r = "hex"), fe(this.value, r, e?.sqstr) + n;
 	}
 	_toJS(e) {
 		return this.value;
 	}
-}, P = class extends O {
+}, F = class extends k {
 	indefiniteLength = !0;
 	chunks;
 	constructor(e) {
@@ -681,11 +704,24 @@ var j = class extends O {
 	}
 	_toCDN(e, t) {
 		if ((e?.encodingIndicators ?? "auto") === "never") {
-			let t = this.chunks.reduce((e, t) => e + t.value.length, 0), n = new Uint8Array(t), r = 0;
-			for (let e of this.chunks) n.set(e.value, r), r += e.value.length;
-			return new N(n)._toCDN(e, 0);
+			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 this.chunks.length === 0 ? "''_" : `(_ ${this.chunks.map((t) => t._toCDN(e, 0)).join(", ")})`;
+		return this.chunks.length === 0 ? "''_" : x({
+			node: this,
+			options: e,
+			depth: t,
+			openChar: "(",
+			closeChar: ")",
+			count: this.chunks.length,
+			indefiniteLength: !0,
+			encodingWidth: void 0,
+			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)
+		});
 	}
 	_toHexDump(e, t) {
 		let r = [{
@@ -705,7 +741,7 @@ var j = class extends O {
 		for (let e of this.chunks) n.set(e.value, r), r += e.value.length;
 		return n;
 	}
-}, F = class extends O {
+}, I = class extends k {
 	indefiniteLength = !0;
 	chunks;
 	constructor(e) {
@@ -717,7 +753,20 @@ var j = class extends O {
 		e.writeByte(255);
 	}
 	_toCDN(e, t) {
-		return (e?.encodingIndicators ?? "auto") === "never" ? new V(this.chunks.map((e) => e.value).join(""))._toCDN(e, t) : this.chunks.length === 0 ? "\"\"_" : `(_ ${this.chunks.map((t) => t._toCDN(e, 0)).join(", ")})`;
+		return (e?.encodingIndicators ?? "auto") === "never" ? new H(this.chunks.map((e) => e.value).join(""))._toCDN(e, t) : this.chunks.length === 0 ? "\"\"_" : x({
+			node: this,
+			options: e,
+			depth: t,
+			openChar: "(",
+			closeChar: ")",
+			count: this.chunks.length,
+			indefiniteLength: !0,
+			encodingWidth: void 0,
+			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)
+		});
 	}
 	_toHexDump(e, t) {
 		let r = [{
@@ -735,13 +784,16 @@ var j = class extends O {
 	_toJS(e) {
 		return this.chunks.map((e) => e.value).join("");
 	}
-}, I = class extends O {
+}, L = class extends k {
 	items;
 	indefiniteLength;
 	encodingWidth;
 	constructor(e, t) {
 		super(), this.items = e, this.indefiniteLength = t?.indefiniteLength ?? !1, this.encodingWidth = t?.encodingWidth;
 	}
+	get _containsCdnContainer() {
+		return !0;
+	}
 	_encodeTo(e, t) {
 		if (this.indefiniteLength) {
 			e.writeByte(159);
@@ -749,11 +801,11 @@ var j = class extends O {
 			e.writeByte(255);
 			return;
 		}
-		E(e, 4, this.items.length, this.encodingWidth);
+		O(e, 4, this.items.length, this.encodingWidth);
 		for (let n of this.items) n._encode(e, t);
 	}
 	_toCDN(e, t) {
-		return se({
+		return x({
 			node: this,
 			options: e,
 			depth: t,
@@ -762,10 +814,11 @@ var j = class extends O {
 			count: this.items.length,
 			indefiniteLength: this.indefiniteLength,
 			encodingWidth: this.encodingWidth,
-			hasEntryComments: () => this.items.some(ne),
+			hasEntryComments: () => this.items.some(y),
 			renderEntry: (n) => this.items[n]._toCDN(e, t + 1),
+			entryIsLeaf: (e) => !this.items[e]._containsCdnContainer,
 			entryLeadingNode: (e) => this.items[e],
-			entryTrailing: (e, t) => y(this.items[e], t)
+			entryTrailing: (e, t) => re(this.items[e], t)
 		});
 	}
 	_toHexDump(e, r) {
@@ -784,7 +837,7 @@ var j = class extends O {
 		}
 		let i = [{
 			depth: e,
-			hex: t(Fe(4, BigInt(this.items.length), this.encodingWidth)),
+			hex: t(Ne(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));
@@ -803,13 +856,16 @@ var j = class extends O {
 		}
 		return r;
 	}
-}, L = class extends O {
+}, R = class extends k {
 	entries;
 	indefiniteLength;
 	encodingWidth;
 	constructor(e, t) {
 		super(), this.entries = e, this.indefiniteLength = t?.indefiniteLength ?? !1, this.encodingWidth = t?.encodingWidth;
 	}
+	get _containsCdnContainer() {
+		return !0;
+	}
 	_encodeTo(e, t) {
 		if (this.indefiniteLength) {
 			e.writeByte(191);
@@ -817,11 +873,11 @@ var j = class extends O {
 			e.writeByte(255);
 			return;
 		}
-		E(e, 5, this.entries.length, this.encodingWidth);
+		O(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 se({
+		return x({
 			node: this,
 			options: e,
 			depth: t,
@@ -830,15 +886,19 @@ var j = class extends O {
 			count: this.entries.length,
 			indefiniteLength: this.indefiniteLength,
 			encodingWidth: this.encodingWidth,
-			hasEntryComments: () => this.entries.some(([e, t]) => ne(e) || ne(t)),
+			hasEntryComments: () => this.entries.some(([e, t]) => y(e) || y(t)),
 			renderEntry: (n, r) => {
 				let [i, a] = this.entries[n];
 				return `${i._toCDN(e, t + 1)}${r}${a._toCDN(e, t + 1)}`;
 			},
+			entryIsLeaf: (e) => {
+				let [t, n] = this.entries[e];
+				return !t._containsCdnContainer && !n._containsCdnContainer;
+			},
 			entryLeadingNode: (e) => this.entries[e][0],
 			entryTrailing: (e, t) => {
 				let [n, r] = this.entries[e];
-				return He([
+				return Ve([
 					...n.comments?.trailing ?? [],
 					...r.comments?.leading ?? [],
 					...r.comments?.trailing ?? []
@@ -862,7 +922,7 @@ var j = class extends O {
 		}
 		let i = [{
 			depth: e,
-			hex: t(Fe(5, BigInt(this.entries.length), this.encodingWidth)),
+			hex: t(Ne(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));
@@ -879,13 +939,13 @@ var j = class extends O {
 			}
 			return n;
 		};
-		return e?.mapAs === "entries" ? n() : e?.mapAs === "object" || this.entries.every(([e]) => e instanceof V) ? (() => {
+		return e?.mapAs === "entries" ? n() : e?.mapAs === "object" || this.entries.every(([e]) => e instanceof H) ? (() => {
 			let n = e ? {
 				...e,
 				reviver: void 0
 			} : void 0, r = {};
 			for (let [e, t] of this.entries) {
-				let i = e instanceof V ? e.value : e.toCDN(), a = t._toJS(n);
+				let i = e instanceof H ? e.value : e.toCDN(), a = t._toJS(n);
 				i === "__proto__" ? Object.defineProperty(r, i, {
 					value: a,
 					writable: !0,
@@ -897,10 +957,10 @@ var j = class extends O {
 			let i = /* @__PURE__ */ new Map();
 			for (let e = 0; e < this.entries.length; e++) {
 				let [t] = this.entries[e];
-				i.set(t instanceof V ? t.value : t.toCDN(), e);
+				i.set(t instanceof H ? t.value : t.toCDN(), e);
 			}
 			for (let n = 0; n < this.entries.length; n++) {
-				let [a, o] = this.entries[n], s = a instanceof V ? a.value : a.toCDN();
+				let [a, o] = this.entries[n], s = a instanceof H ? 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, {
@@ -914,12 +974,12 @@ var j = class extends O {
 		})() : n();
 	}
 };
-function He(e, t) {
-	return e.length === 0 ? "" : " " + e.map((e) => v(e, t).trimEnd()).join(" ");
+function Ve(e, t) {
+	return e.length === 0 ? "" : " " + e.map((e) => b(e, t).trimEnd()).join(" ");
 }
 //#endregion
 //#region src/ast/CborSimple.ts
-var R = class e extends O {
+var z = class e extends k {
 	value;
 	constructor(e) {
 		if (super(), !Number.isInteger(e) || e < 0 || e > 255) throw RangeError("CborSimple value must be an integer in 0–255");
@@ -954,33 +1014,36 @@ var R = class e extends O {
 			default: return new g(this.value);
 		}
 	}
-}, Ue = class extends O {
+}, He = class extends k {
 	items;
 	encodingWidth;
 	constructor(e, t) {
 		super(), this.items = e, this.encodingWidth = t?.encodingWidth;
 	}
+	get _containsCdnContainer() {
+		return this.items.some((e) => e._containsCdnContainer);
+	}
 	_content(e) {
-		let t = new Me();
+		let t = new Ae();
 		for (let n of this.items) n._encode(t, e);
 		return t.finish();
 	}
 	_encodeTo(e, t) {
 		let n = this._content(t);
-		E(e, 2, n.length, this.encodingWidth), e.writeBytes(n);
+		O(e, 2, n.length, this.encodingWidth), e.writeBytes(n);
 	}
 	_toCDN(e, t) {
-		let n = x(e, this.encodingWidth, () => b(BigInt(this._content(e).length)));
+		let n = w(e, this.encodingWidth, () => C(BigInt(this._content(e).length)));
 		if (this.items.length === 0) return `<<>>${n}`;
-		let r = ee(e), { inlineSep: i, multilineSep: a, trailSep: o } = oe(e, r === null);
+		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 = _(r, t + 1), c = _(r, t), l = this.items.map((n) => `${s}${n._toCDN(e, t + 1)}`), u = l.length - 1;
+		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}`;
 	}
 	_toHexDump(e, n) {
 		let r = this._content().length, i = [{
 			depth: e,
-			hex: t(Fe(2, BigInt(r), this.encodingWidth)),
+			hex: t(Ne(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));
@@ -989,22 +1052,25 @@ var R = class e extends O {
 	_toJS(e) {
 		return this._content();
 	}
-}, We = 999n, Ge = class extends M {
+}, Ue = 999n, We = class extends N {
 	constructor(e, t) {
-		let n = t.length === 1 && t[0] instanceof V ? t[0] : new I(t);
-		super(We, new I([new V(e), n]));
+		let n = t.length === 1 && t[0] instanceof H ? t[0] : new L(t);
+		super(Ue, new L([new H(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 V ? `${r}${xe(i.value)}` : `${r}<<${i.items.map((n) => n._toCDN(e, t)).join(", ")}>>`;
+		return i instanceof H ? `${r}${ve(i.value)}` : `${r}<<${i.items.map((n) => n._toCDN(e, t)).join(", ")}>>`;
 	}
-}, Ke = class extends O {
+}, Ge = class extends k {
 	inner;
 	ednSource;
 	constructor(e, t) {
 		super(), this.inner = e, this.ednSource = t;
 	}
+	get _containsCdnContainer() {
+		return this.inner._containsCdnContainer;
+	}
 	_encodeTo(e, t) {
 		this.inner._encode(e, t);
 	}
@@ -1015,15 +1081,21 @@ var R = class e extends O {
 	_toJS(e) {
 		return this.inner._toJS(e);
 	}
-}, qe = 888n, z = class extends M {
+}, Ke = 888n, B = class extends N {
 	constructor(e) {
-		e === void 0 ? super(qe, R.NULL) : super(qe, new I(e));
+		e === void 0 ? super(Ke, z.NULL) : super(Ke, new L(e));
 	}
 	_toCDN(e, t) {
-		return this.content instanceof R ? "..." : this.content instanceof I ? this.content.items.map((n) => n._toCDN(e, t)).join(" + ") : super._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);
+		}
+		return super._toCDN(e, t);
 	}
-}, Je = 2n, Ye = 3n, Xe = 18446744073709551615n, Ze = -18446744073709551616n;
-function Qe(e) {
+}, qe = 2n, Je = 3n, Ye = 18446744073709551615n, Xe = -18446744073709551616n;
+function Ze(e) {
 	if (e < 0n) throw RangeError("bigintToBytes requires a non-negative value");
 	if (e === 0n) return /* @__PURE__ */ new Uint8Array();
 	let t = e.toString(16);
@@ -1032,16 +1104,16 @@ function Qe(e) {
 	for (let e = 0; e < n.length; e++) n[e] = parseInt(t.slice(e * 2, e * 2 + 2), 16);
 	return n;
 }
-function $e(e) {
+function Qe(e) {
 	let t = 0n;
 	for (let n of e) t = t << 8n | BigInt(n);
 	return t;
 }
-var et = class extends M {
+var $e = class extends N {
 	bigValue;
 	constructor(e) {
-		if (e <= Xe) throw RangeError(`CborBigUint value ${e} fits in CborUint; use CborUint instead`);
-		super(Je, new N(Qe(e))), this.bigValue = e;
+		if (e <= Ye) throw RangeError(`CborBigUint value ${e} fits in CborUint; use CborUint instead`);
+		super(qe, new P(Ze(e))), this.bigValue = e;
 	}
 	_toCDN(e, t) {
 		return this.bigValue.toString();
@@ -1049,11 +1121,11 @@ var et = class extends M {
 	_toJS(e) {
 		return this.bigValue;
 	}
-}, tt = class extends M {
+}, et = class extends N {
 	bigValue;
 	constructor(e) {
-		if (e >= Ze) throw RangeError(`CborBigNint value ${e} fits in CborNint; use CborNint instead`);
-		super(Ye, new N(Qe(-1n - e))), this.bigValue = 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;
 	}
 	_toCDN(e, t) {
 		return this.bigValue.toString();
@@ -1061,25 +1133,25 @@ var et = class extends M {
 	_toJS(e) {
 		return this.bigValue;
 	}
-}, nt = new TextEncoder(), rt = new TextDecoder("utf-8", { fatal: !0 }), it = new TextDecoder("utf-8", { fatal: !1 });
-function at(e, t) {
+}, tt = new TextEncoder(), nt = new TextDecoder("utf-8", { fatal: !0 }), rt = new TextDecoder("utf-8", { fatal: !1 });
+function it(e, t) {
 	let n = new a(e, {
 		offset: t?.offset,
 		skipRS: t?._skipRS
-	}), r = new _t(n, t ?? {}).parse();
-	return t?.preserveComments && ut(r, n.comments, e), r;
+	}), r = new gt(n, t ?? {}).parse();
+	return t?.preserveComments && lt(r, n.comments, e), r;
 }
-function ot(e) {
+function at(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 st(e) {
+function ot(e) {
 	return e.startsWith("-") ? -BigInt(e.slice(1)) : BigInt(e);
 }
-function ct(e, t) {
+function st(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);
@@ -1103,14 +1175,14 @@ function ct(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: Be(n),
+		value: ze(n),
 		precision: r
 	} : {
 		value: parseFloat(n),
 		precision: r
 	};
 }
-function lt(e, t) {
+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)) ?? "";
@@ -1147,9 +1219,9 @@ function lt(e, t) {
 	for (let e = 0; e < c.length; e++) l[e] = c.charCodeAt(e);
 	return l;
 }
-function ut(e, t, n) {
+function lt(e, t, n) {
 	if (t.length === 0) return;
-	let r = dt(e), i = pt(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;
+	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;) {
@@ -1158,7 +1230,7 @@ function ut(e, t, n) {
 		}
 		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(":")) {
-			ft(d.node, "trailing", r);
+			dt(d.node, "trailing", r);
 			continue;
 		}
 		for (; l < a.length && a[l].start < t.start;) {
@@ -1174,38 +1246,38 @@ function ut(e, t, n) {
 		}
 		let m = s < a.length ? a[s] : void 0;
 		if ((!p || m && m.end <= p.end) && m) {
-			ft(m.node, "leading", r);
+			dt(m.node, "leading", r);
 			continue;
 		}
-		ft(p?.node ?? e, "dangling", r);
+		dt(p?.node ?? e, "dangling", r);
 	}
 }
-function dt(e) {
+function ut(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 I || e instanceof Ue) {
+		}), e instanceof L || e instanceof He) {
 			for (let t of e.items) n(t);
 			return;
 		}
-		if (e instanceof L) {
+		if (e instanceof R) {
 			for (let [t, r] of e.entries) n(t), n(r);
 			return;
 		}
-		if (e instanceof P || e instanceof F) {
+		if (e instanceof F || e instanceof I) {
 			for (let t of e.chunks) n(t);
 			return;
 		}
-		e instanceof M && n(e.content);
+		e instanceof N && n(e.content);
 	};
 	return n(e), t;
 }
-function ft(e, t, n) {
+function dt(e, t, n) {
 	e.comments ??= {}, e.comments[t] ??= [], e.comments[t].push(n);
 }
-function pt(e) {
+function ft(e) {
 	let t = [0];
 	for (let n = 0; n < e.length; n++) e[n] === "\n" && t.push(n + 1);
 	return (n) => {
@@ -1219,25 +1291,25 @@ function pt(e) {
 		return a + 1;
 	};
 }
-var mt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'extensions' option (extensions: [${e}])`, ht = (e, t) => `install ${t}, import { ${e} } from '${t}', and pass it via the 'extensions' option (extensions: [${e}])`, B = (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)`, gt = /* @__PURE__ */ new Map([
-	["b32", mt("b32")],
-	["h32", mt("h32")],
-	["same", mt("same")],
-	["hash", ht("hash", "@cbortech/hash-extension")],
-	["uuid", ht("uuid", "@cbortech/uuid-extension")],
-	["UUID", ht("uuid", "@cbortech/uuid-extension")],
-	["dt", B("dt")],
-	["DT", B("dt")],
-	["ip", B("ip")],
-	["IP", B("ip")],
-	["cri", B("cri")],
-	["CRI", B("cri")],
-	["t1", B("t1")],
-	["b1", B("b1")],
-	["ilbs", B("ilbs")],
-	["ilts", B("ilts")],
-	["float", B("float")]
-]), _t = class {
+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 {
 	t;
 	_options;
 	extByPrefix;
@@ -1298,12 +1370,12 @@ var mt = (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 P([]);
-			case "EMPTY_INDEF_TEXT": return this.t.consume(), new F([]);
-			case "TRUE": return this.t.consume(), new R(21);
-			case "FALSE": return this.t.consume(), new R(20);
-			case "NULL": return this.t.consume(), new R(22);
-			case "UNDEFINED": return this.t.consume(), new R(23);
+			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 "SIMPLE": return this.parseSimple();
 			case "LBRACKET": return this.parseArray();
 			case "LBRACE": return this.parseMap();
@@ -1318,21 +1390,21 @@ var mt = (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 Ge(e.appPrefix, [new V(e.value)]);
+					if (r || this._hintMissingExtension(e.appPrefix, e), this.unresolvedExtension === "cpa999") return new We(e.appPrefix, [new H(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 N && Object.getPrototypeOf(i) === N.prototype && i.ednSource === void 0 ? new N(i.value, {
+						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, {
 							ednEncoding: i.ednEncoding,
 							encodingWidth: i.encodingWidth,
 							ednSource: e.raw + n
-						}) : (i instanceof j && i.ednSource === void 0 && (i.ednSource = e.raw + n), i);
+						}) : (i instanceof M && 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 Ge(e.appPrefix, [new V(e.value)]);
+						return this._pendingWarnings.length === i && this._warn(t instanceof Error ? t.message : String(t), e), new We(e.appPrefix, [new H(e.value)]);
 					}
 				}
 			}
@@ -1350,7 +1422,7 @@ var mt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 				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 Ge(e.appPrefix, t);
+					if (this._hintMissingExtension(e.appPrefix, e), this.unresolvedExtension === "cpa999") return new We(e.appPrefix, t);
 					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);
@@ -1360,78 +1432,98 @@ var mt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 						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 j) a.ednSource === void 0 && (a.ednSource = o);
-						else if (i.preserveAppSeqSource) return new Ke(a, o);
+						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 Ge(e.appPrefix, t);
+						return this._pendingWarnings.length === a && this._warn(n instanceof Error ? n.message : String(n), e), new We(e.appPrefix, t);
 					}
 				}
 			}
 			case "ELLIPSIS": {
-				if (this.t.consume(), this.t.peek().type !== "PLUS") return new z();
-				let e = [new z()];
+				if (this.t.consume(), this.t.peek().type !== "PLUS") return new B();
+				let e = [new B()];
 				for (; this.t.peek().type === "PLUS";) this.t.consume(), e.push(this.parseValue());
-				return new z(e);
+				return new B(e);
 			}
 			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 } = ot(e.value), r = n === void 0 ? this.consumeEncodingIndicator() : this._resolveEncodingWidth(n, e), i = st(t);
-		if (i > 18446744073709551615n) return this.t.peek().type === "LPAREN" && this._fail("tag number exceeds maximum uint64", e), new et(i);
-		if (i < -18446744073709551616n) return new tt(i);
+		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 k(i, r === void 0 ? void 0 : { encodingWidth: r }) : new A(i, r === void 0 ? void 0 : { encodingWidth: r });
+		let a = i >= 0n ? new A(i, r === void 0 ? void 0 : { encodingWidth: r }) : new j(i, r === void 0 ? void 0 : { encodingWidth: r });
 		if (this.t.peek().type === "LPAREN") {
-			a instanceof k || this._fail("tag number must be non-negative", e), this.t.consume();
+			a instanceof A || this._fail("tag number must be non-negative", e), this.t.consume();
 			let t = this._pendingWarnings.splice(0), n = 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 M && r !== void 0 && e.encodingWidth === void 0 && (e.encodingWidth = r), t.length > 0 && (e.warnings ??= [], e.warnings.push(...t)), e;
+				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 = new M(i, n, r === void 0 ? void 0 : { encodingWidth: r });
+			let s = new N(i, n, r === void 0 ? void 0 : { encodingWidth: r });
 			return t.length > 0 && (s.warnings ??= [], s.warnings.push(...t)), s;
 		}
 		return a;
 	}
 	parseFloat() {
-		let e = this.t.consume(), t = (t) => this._warnOrFail(t, e), { value: n, precision: r } = ct(e.value, t);
+		let e = this.t.consume(), t = (t) => this._warnOrFail(t, e), { value: n, precision: r } = st(e.value, t);
 		if (r === "half" || r === "single") {
-			let e = r === "half" ? C(S(n)) : Math.fround(n);
+			let e = r === "half" ? E(T(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 j(n, r === void 0 ? void 0 : { precision: r });
+		return new M(n, r === void 0 ? void 0 : { precision: r });
 	}
 	parseString() {
 		let e = this.t.consume();
 		if (this.t.peek().type !== "PLUS") {
-			let t = this.consumeEncodingIndicator(() => BigInt(nt.encode(e.value).length));
-			return new V(e.value, t === void 0 ? void 0 : { encodingWidth: t });
-		}
-		let t = !1, n = [{ text: e.value }];
+			let t = this.consumeEncodingIndicator(() => BigInt(tt.encode(e.value).length));
+			return e.type === "RAWSTRING" ? new H(e.value, {
+				ednSource: e.raw,
+				...t === void 0 ? {} : { encodingWidth: t }
+			}) : new H(e.value, t === void 0 ? void 0 : { encodingWidth: t });
+		}
+		let t = !1, n = [e.type === "RAWSTRING" ? {
+			text: e.value,
+			source: e.raw
+		} : { text: e.value }];
 		for (; this.t.peek().type === "PLUS";) {
 			this.t.consume();
 			let e = this.t.peek();
-			e.type === "ELLIPSIS" ? (this.t.consume(), n.push({ ellipsis: !0 }), t = !0) : e.type === "TSTR" || e.type === "RAWSTRING" ? (this.t.consume(), n.push({ 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);
+			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);
 		}
 		if (!t) {
-			let e = n.map((e) => "text" in e ? e.text : ""), t = e.join(""), r = this.consumeEncodingIndicator(() => BigInt(nt.encode(t).length));
-			return new V(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, {
 				ednParts: e,
-				...r === void 0 ? {} : { encodingWidth: r }
+				...t.some((e) => e !== void 0) ? { ednPartSources: t } : {},
+				...i === void 0 ? {} : { encodingWidth: i }
 			});
 		}
-		let r = [], i = "";
-		for (let e of n) "ellipsis" in e ? (i !== "" && (r.push(new V(i)), i = ""), r.push(new z())) : i += e.text;
-		return i !== "" && r.push(new V(i)), new z(r);
+		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, {
+					ednParts: e,
+					...n.some((e) => e !== void 0) ? { ednPartSources: n } : {}
+				}));
+			}
+			i.length = 0;
+		};
+		for (let e of n) "ellipsis" in e ? (a(), r.push(new B())) : i.push(e);
+		return a(), new B(r);
 	}
 	_isBytesToken(e) {
 		return e === "BYTES_HEX" || e === "SQSTR" || e === "BYTES_B64";
@@ -1453,7 +1545,7 @@ var mt = (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 lt(e.value, t);
+				return ct(e.value, t);
 			} catch (t) {
 				if (t instanceof r || !(t instanceof SyntaxError)) throw t;
 				this._fail(t.message, e);
@@ -1462,11 +1554,11 @@ var mt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 		}
 	}
 	_decodeUtf8(e, t) {
-		if (this._options.allowInvalidUtf8) return it.decode(e);
+		if (this._options.allowInvalidUtf8) return rt.decode(e);
 		try {
-			return rt.decode(e);
+			return nt.decode(e);
 		} catch {
-			return this._warnOrFail("byte string in text concatenation is not valid UTF-8", t), it.decode(e);
+			return this._warnOrFail("byte string in text concatenation is not valid UTF-8", t), rt.decode(e);
 		}
 	}
 	_tokenTypeToCdnEncoding(e) {
@@ -1475,7 +1567,7 @@ var mt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 	_parseBytesConcat(e, t, n) {
 		if (this.t.peek().type !== "PLUS") {
 			let r = this.consumeEncodingIndicator(() => BigInt(e.length));
-			return new N(e, {
+			return new P(e, {
 				ednEncoding: this._tokenTypeToCdnEncoding(t),
 				ednSource: n,
 				...r === void 0 ? {} : { encodingWidth: r }
@@ -1492,32 +1584,32 @@ var mt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 			else if (e.type === "BYTES_HEX_ELIDED") {
 				this.t.consume();
 				let t = this._buildBytesElidedItems(e.value, e);
-				for (let e of t) e instanceof z ? (i.push({ ellipsis: !0 }), r = !0) : e instanceof N && i.push({ bytes: e.value });
+				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: nt.encode(e.value) })) : this._fail(`expected byte string after +, got ${JSON.stringify(e.value)}`, e);
+			})) : 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 N(n, {
+			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 N(this._concatBytes([...o]))), o.length = 0);
+			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 z())) : o.push(e.bytes);
-		return s(), new z(a);
+		for (let e of i) "ellipsis" in e ? (s(), a.push(new B())) : o.push(e.bytes);
+		return s(), new B(a);
 	}
 	_parseHexElidedConcat(e) {
 		let t = this._buildBytesElidedItems(e.value, 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 z());
+			if (e.type === "ELLIPSIS") this.t.consume(), t.push(new B());
 			else if (e.type === "BYTES_HEX_ELIDED") {
 				this.t.consume();
 				let n = this._buildBytesElidedItems(e.value, e);
@@ -1525,20 +1617,20 @@ var mt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 			} else if (this._isBytesToken(e.type)) {
 				this.t.consume();
 				let n = this._decodeBytesToken(e), r = t[t.length - 1];
-				r instanceof N ? t[t.length - 1] = new N(this._concatBytes([r.value, n])) : t.push(new N(n));
+				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);
 		}
-		return new z(t);
+		return new B(t);
 	}
 	_buildBytesElidedItems(e, t) {
 		let n = e.split("..."), r = [];
-		for (let e = 0; e < n.length; e++) e > 0 && r.push(new z()), n[e].length > 0 && r.push(new N(this._hexToBytes(n[e], t)));
+		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)));
 		return r;
 	}
 	_mergeFirstBytesItem(e, t) {
 		if (t.length === 0) return;
 		let n = e[e.length - 1], r = t[0];
-		n instanceof N && r instanceof N ? (e[e.length - 1] = new N(this._concatBytes([n.value, r.value])), e.push(...t.slice(1))) : e.push(...t);
+		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);
 	}
 	_concatBytes(e) {
 		let t = e.reduce((e, t) => e + t.byteLength, 0), n = new Uint8Array(t), r = 0;
@@ -1549,8 +1641,8 @@ var mt = (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 } = ot(e.value), n = Number(st(t));
-		return this.expect("RPAREN"), new R(n);
+		let { numStr: t } = at(e.value), n = Number(ot(t));
+		return this.expect("RPAREN"), new z(n);
 	}
 	parseEmbeddedCBOR() {
 		this.t.consume();
@@ -1567,7 +1659,7 @@ var mt = (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 Ue(e, { encodingWidth: t });
+		return new He(e, { encodingWidth: t });
 	}
 	parseArray() {
 		this.t.consume();
@@ -1581,7 +1673,7 @@ var mt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 			i.push(this.parseValue());
 		}
 		this.expect("RBRACKET"), t !== void 0 && n !== void 0 && (t = this._validateEncodingFit(BigInt(i.length), t, n));
-		let a = new I(i, {
+		let a = new L(i, {
 			indefiniteLength: e,
 			encodingWidth: t
 		});
@@ -1602,7 +1694,7 @@ var mt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 			i.push([e, t]);
 		}
 		this.expect("RBRACE"), t !== void 0 && n !== void 0 && (t = this._validateEncodingFit(BigInt(i.length), t, n));
-		let a = new L(i, {
+		let a = new R(i, {
 			indefiniteLength: e,
 			encodingWidth: t
 		});
@@ -1626,16 +1718,16 @@ var mt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 		}
 		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 N) {
-			let e = new P(n.map((e, t) => {
-				if (e instanceof N) return e;
+		if (r instanceof P) {
+			let e = new F(n.map((e, t) => {
+				if (e instanceof P) 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 V) {
-			let e = new F(n.map((e, t) => {
-				if (e instanceof V) return e;
+		if (r instanceof H) {
+			let e = new I(n.map((e, t) => {
+				if (e instanceof H) 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;
@@ -1653,47 +1745,47 @@ var mt = (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 j) {
+		if (e instanceof M) {
 			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" ? C(S(e.value)) : Math.fround(e.value);
+					let t = r === "half" ? E(T(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 k) {
+		} else if (e instanceof A) {
 			if (e.encodingWidth === void 0) {
 				let r = this._validateEncodingFit(e.value, t, n);
 				r !== void 0 && (e.encodingWidth = r);
 			}
-		} else if (e instanceof A) {
+		} else if (e instanceof j) {
 			if (e.encodingWidth === void 0) {
 				let r = this._validateEncodingFit(e.argument, t, n);
 				r !== void 0 && (e.encodingWidth = r);
 			}
-		} else if (e instanceof N) {
+		} else if (e instanceof P) {
 			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 V) {
+		} else if (e instanceof H) {
 			if (e.encodingWidth === void 0) {
-				let r = this._validateEncodingFit(BigInt(nt.encode(e.value).length), t, n);
+				let r = this._validateEncodingFit(BigInt(tt.encode(e.value).length), t, n);
 				r !== void 0 && (e.encodingWidth = r);
 			}
-		} else if (e instanceof I) {
+		} else if (e instanceof L) {
 			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 L) {
+		} else if (e instanceof R) {
 			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 M) {
+		} else if (e instanceof N) {
 			if (e.encodingWidth === void 0) {
 				let r = this._validateEncodingFit(e.tag, t, n);
 				r !== void 0 && (e.encodingWidth = r);
@@ -1701,7 +1793,7 @@ var mt = (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 = Pe(t);
+		let r = Me(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);
@@ -1725,28 +1817,28 @@ var mt = (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 = gt.get(e);
+		let n = ht.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,
-			...vt(t)
+			..._t(t)
 		}) : this._options.silent || console.warn(`CDN: ${r}`);
 	}
 	_warn(e, t) {
 		let n = { message: e };
-		if (t !== void 0 && Object.assign(n, vt(t)), this._pendingWarnings.push(n), this._options.onWarning) this._options.onWarning(n);
+		if (t !== void 0 && Object.assign(n, _t(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 ? vt(t) : void 0);
+		throw new r(e, t ? _t(t) : void 0);
 	}
 };
-function vt(e) {
+function _t(e) {
 	return {
 		offset: e.offset,
 		line: e.line,
@@ -1756,78 +1848,90 @@ function vt(e) {
 }
 //#endregion
 //#region src/ast/CborTextString.ts
-var yt = new TextEncoder(), bt = !1, V = class extends O {
+var vt = new TextEncoder(), yt = !1, H = class extends k {
 	indefiniteLength = !1;
 	value;
 	encodingWidth;
 	ednParts;
+	ednSource;
+	ednPartSources;
 	constructor(e, t) {
-		super(), this.value = e, this.encodingWidth = t?.encodingWidth, this.ednParts = t?.ednParts;
+		super(), this.value = e, this.encodingWidth = t?.encodingWidth, this.ednParts = t?.ednParts, this.ednSource = t?.ednSource, this.ednPartSources = t?.ednPartSources;
 	}
 	_encodeTo(e, t) {
 		e.writeTextString(3, this.value, this.encodingWidth);
 	}
 	_toCDN(e, t) {
-		let n = x(e, this.encodingWidth, () => b(BigInt(yt.encode(this.value).length)));
-		return xt(this.value, n, e, t, this.ednParts);
+		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);
 	}
 	_toJS(e) {
 		return this.value;
 	}
 };
-function xt(e, t, n, r, i) {
-	let { cdn: a, newline: o } = Ct(n), s = ee(n), c = n?.preserveConcatenation && i !== void 0 && i.length > 1 ? i : void 0;
-	if (s === null) return c === void 0 ? Se(e) + t : St(c.map((e) => ({
+function bt(e, t, n, r, i, a, o) {
+	if (n?.preserveRawString && a !== void 0) return a + t;
+	let s = n?.preserveRawString ? o : void 0, c = s?.some((e) => e !== void 0) ?? !1, { cdn: l, newline: u } = St(n), d = _(n), f = n?.preserveConcatenation && i !== void 0 && (i.length > 1 || c) ? i : void 0;
+	if (d === null) return f === void 0 ? ye(e) + t : xt(f.map((e, t) => ({
 		text: e,
-		contentDepth: 0
+		contentDepth: 0,
+		source: s?.[t]
 	})), t, null, r);
-	if (!a && !o && c === void 0) return Se(e) + t;
-	let l = a ? Et(e) : null;
-	if (l === null && c !== void 0) {
+	if (!l && !u && f === void 0) return ye(e) + t;
+	let p = l ? Tt(e) : null;
+	if (f !== void 0 && (p === null || c)) {
 		let e = [];
-		for (let t of c) if (o) {
-			let n = /* @__PURE__ */ new Map();
-			for (let { point: e, contentDepth: r } of Tt(t, 0)) n.set(e, r);
-			e.push(...Pt(t, n));
-		} else e.push({
-			text: t,
-			contentDepth: 0
-		});
-		return St(e, t, s, r);
+		for (let [t, n] of f.entries()) {
+			let r = s?.[t];
+			if (r !== void 0) e.push({
+				text: n,
+				contentDepth: 0,
+				source: r
+			});
+			else if (u) {
+				let t = /* @__PURE__ */ new Map();
+				for (let { point: e, contentDepth: r } of wt(n, 0)) t.set(e, r);
+				e.push(...Nt(n, t));
+			} else e.push({
+				text: n,
+				contentDepth: 0
+			});
+		}
+		return xt(e, t, d, r);
 	}
-	let u = /* @__PURE__ */ new Map();
-	if (l !== null) for (let { point: e, contentDepth: t } of l) u.set(e, t);
-	if (o) {
-		let t = l === null ? Tt(e, 0) : Dt(e);
-		for (let { point: e, contentDepth: n } of t) u.has(e) || u.set(e, n);
+	let m = /* @__PURE__ */ new Map();
+	if (p !== null) for (let { point: e, contentDepth: t } of p) m.set(e, t);
+	if (u) {
+		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 d = Pt(e, u);
-	return d.length <= 1 ? Se(e) + t : St(d, t, s, r);
+	let h = Nt(e, m);
+	return h.length <= 1 ? ye(e) + t : xt(h, t, d, r);
 }
-function St(e, t, n, r) {
-	let i = e.map(({ text: n }, r) => {
-		let i = Se(n);
-		return r === e.length - 1 ? i + t : i;
+function xt(e, t, n, r) {
+	let i = e.map(({ text: n, source: r }, i) => {
+		let a = r ?? ye(n);
+		return i === e.length - 1 ? a + t : a;
 	});
 	if (n === null) return i.join(" + ");
 	let a = i[0];
 	for (let t = 1; t < i.length; t++) {
-		let o = _(n, r + 1 + e[t].contentDepth);
+		let o = v(n, r + 1 + e[t].contentDepth);
 		a += ` +\n${o}${i[t]}`;
 	}
 	return a;
 }
-function Ct(e) {
-	let t = e?.splitCdn === void 0 || e?.splitNewline === void 0 ? wt(e?.textStringFormat ?? []) : [];
+function St(e) {
+	let t = e?.splitCdn === void 0 || e?.splitNewline === void 0 ? Ct(e?.textStringFormat ?? []) : [];
 	return {
 		cdn: e?.splitCdn ?? t.includes("cdn"),
 		newline: e?.splitNewline ?? t.includes("newline")
 	};
 }
-function wt(e) {
-	return e.map((e) => e === "cboredn" ? (bt || (bt = !0, console.warn("`textStringFormat: ['cboredn']` is deprecated; use `textStringFormat: ['cdn']` instead.")), "cdn") : e);
+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 Tt(e, t) {
+function wt(e, t) {
 	let n = [];
 	for (let r = 0; r < e.length; r++) {
 		let i = e[r];
@@ -1844,9 +1948,9 @@ function Tt(e, t) {
 	}
 	return n;
 }
-function Et(e) {
+function Tt(e) {
 	try {
-		at(e);
+		it(e);
 	} catch {
 		return null;
 	}
@@ -1855,24 +1959,24 @@ function Et(e) {
 		let a = n.consume();
 		if (a.type === "EOF") break;
 		let c = !1;
-		if (o || (o = !0, a.offset > 0 && Mt(n.comments, 0, a.offset) && t.push({
+		if (o || (o = !0, a.offset > 0 && jt(n.comments, 0, a.offset) && t.push({
 			point: a.offset,
 			contentDepth: r
 		})), i !== null) {
-			if (i.kind === "opener" && kt.has(a.type)) {
+			if (i.kind === "opener" && Ot.has(a.type)) {
 				i.point = a.endOffset, s = a.endOffset;
 				continue;
-			} else i.kind === "opener" && jt.has(a.type) && Nt(e, i.point, a.offset) ? c = !0 : t.push({
+			} else i.kind === "opener" && At.has(a.type) && Mt(e, i.point, a.offset) ? c = !0 : t.push({
 				point: a.offset,
 				contentDepth: i.contentDepth
 			});
 			i = null;
 		}
-		At.has(a.type) ? (r++, i = {
+		kt.has(a.type) ? (r++, i = {
 			point: a.endOffset,
 			contentDepth: r,
 			kind: "opener"
-		}) : jt.has(a.type) ? (r = Math.max(0, r - 1), c || t.push({
+		}) : At.has(a.type) ? (r = Math.max(0, r - 1), c || t.push({
 			point: a.offset,
 			contentDepth: r
 		})) : a.type === "COMMA" && (i = {
@@ -1887,23 +1991,23 @@ function Et(e) {
 		contentDepth: r
 	}), t;
 }
-function Dt(e) {
+function Et(e) {
 	let t = [], n = new a(e), r = 0;
 	for (;;) {
 		let i = n.consume();
 		if (i.type === "EOF") break;
-		if (At.has(i.type)) r++;
-		else if (jt.has(i.type)) r = Math.max(0, r - 1);
+		if (kt.has(i.type)) r++;
+		else if (At.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 Ot(n)) t.push({
+				for (let e of Dt(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 Tt(n, 0)) t.push({
+				for (let { point: e } of wt(n, 0)) t.push({
 					point: i.offset + e,
 					contentDepth: r + 1
 				});
@@ -1912,7 +2016,7 @@ function Dt(e) {
 	}
 	return t;
 }
-function Ot(e) {
+function Dt(e) {
 	let t = [], n = 1, r = e.length - 1;
 	for (; n < r;) {
 		let r = e[n];
@@ -1928,24 +2032,24 @@ function Ot(e) {
 	}
 	return t;
 }
-var kt = /* @__PURE__ */ new Set(["ENCODING_INDICATOR", "UNDERSCORE"]), At = /* @__PURE__ */ new Set([
+var Ot = /* @__PURE__ */ new Set(["ENCODING_INDICATOR", "UNDERSCORE"]), kt = /* @__PURE__ */ new Set([
 	"LBRACKET",
 	"LBRACE",
 	"LPAREN",
 	"LT_LT"
-]), jt = /* @__PURE__ */ new Set([
+]), At = /* @__PURE__ */ new Set([
 	"RBRACKET",
 	"RBRACE",
 	"RPAREN",
 	"GT_GT"
 ]);
-function Mt(e, t, n) {
+function jt(e, t, n) {
 	return e.some((e) => e.start >= t && e.end <= n);
 }
-function Nt(e, t, n) {
+function Mt(e, t, n) {
 	return /^[\t\n\r ]*$/.test(e.slice(t, n));
 }
-function Pt(e, t) {
+function Nt(e, t) {
 	let n = [...t].filter(([t]) => t > 0 && t < e.length).sort(([e], [t]) => e - t);
 	if (n.length === 0) return [{
 		text: e,
@@ -1963,7 +2067,7 @@ function Pt(e, t) {
 }
 //#endregion
 //#region src/extensions/dt.ts
-function H(e) {
+function U(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");
@@ -1971,17 +2075,17 @@ function H(e) {
 	for (; s.length < 3;) s += "0";
 	return `${i}.${s}Z`;
 }
-var Ft = new TextDecoder("utf-8", { fatal: !0 });
-function It(e) {
+var Pt = new TextDecoder("utf-8", { fatal: !0 });
+function Ft(e) {
 	if (e.length !== 1) throw SyntaxError("dt<<...>>: expected exactly one item");
 	let t = e[0];
-	if (t instanceof V) return t.value;
-	if (t instanceof N) return Ft.decode(t.value);
+	if (t instanceof H) return t.value;
+	if (t instanceof P) return Pt.decode(t.value);
 	throw SyntaxError("dt<<...>>: expected a text string or byte string");
 }
-var Lt = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?(Z|[+-]\d{2}:\d{2})$/i;
-function Rt(e, t) {
-	if (!Lt.test(e)) {
+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)) {
 		let n = `dt: invalid RFC 3339 date-time: ${JSON.stringify(e)}`;
 		if (t) t(n);
 		else throw SyntaxError(n);
@@ -1992,93 +2096,93 @@ function Rt(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 Bt(BigInt(e)) : new Vt(BigInt(e));
+		return e >= 0 ? new zt(BigInt(e)) : new Bt(BigInt(e));
 	}
-	return new Ht(a / 1e3 + i);
+	return new Vt(a / 1e3 + i);
 }
-var zt = 1n, Bt = class extends k {
+var Rt = 1n, zt = class extends A {
 	constructor(e, t) {
 		super(e, t);
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
-		let n = x(e, this.encodingWidth, () => b(this.value));
-		return `dt'${H(Number(this.value))}'${n}`;
+		let n = w(e, this.encodingWidth, () => C(this.value));
+		return `dt'${U(Number(this.value))}'${n}`;
 	}
-}, Vt = class extends A {
+}, Bt = class extends j {
 	constructor(e, t) {
 		super(e, t);
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
-		let n = x(e, this.encodingWidth, () => b(this.argument));
-		return `dt'${H(Number(this.value))}'${n}`;
+		let n = w(e, this.encodingWidth, () => C(this.argument));
+		return `dt'${U(Number(this.value))}'${n}`;
 	}
-}, Ht = class extends j {
+}, Vt = class extends M {
 	constructor(e, t) {
 		super(e, t);
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
-		let n = D(this.value), r = we(this.value, this.precision, n, e?.encodingIndicators ?? "auto");
-		return `dt'${H(this.value)}'${r}`;
+		let n = Le(this.value), r = xe(this.value, this.precision, n, e?.encodingIndicators ?? "auto");
+		return `dt'${U(this.value)}'${r}`;
 	}
-}, Ut = class extends M {
+}, Ht = class extends N {
 	constructor(e, t) {
-		super(zt, typeof e == "string" ? Rt(e) : e, t);
+		super(Rt, typeof e == "string" ? Lt(e) : e, t);
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
 		let n = this.content;
-		if (n instanceof j ? n.precision !== void 0 && n.precision !== D(n.value) : n.encodingWidth !== void 0) return super._toCDN({
+		if (n instanceof M ? n.precision !== void 0 && n.precision !== Le(n.value) : n.encodingWidth !== void 0) return super._toCDN({
 			...e,
 			appStrings: !1
 		}, t);
-		let r = n instanceof j ? n.value : Number(n.value), i = x(e, this.encodingWidth, () => b(zt));
-		return `DT'${H(r)}'${i}`;
+		let r = n instanceof M ? n.value : Number(n.value), i = w(e, this.encodingWidth, () => C(Rt));
+		return `DT'${U(r)}'${i}`;
 	}
-}, Wt = class extends Ut {
+}, Ut = class extends Ht {
 	constructor(e, t) {
 		super(e, t);
 	}
 	_toJS(e) {
-		let t = this.content, n = t instanceof j ? t.value * 1e3 : Number(t.value) * 1e3;
+		let t = this.content, n = t instanceof M ? t.value * 1e3 : Number(t.value) * 1e3;
 		return new Date(n);
 	}
 };
-function Gt(e) {
+function Wt(e) {
 	let t = e?.jsDate ?? !1;
 	function n(e) {
-		return t ? new Wt(e) : new Ut(e);
+		return t ? new Ut(e) : new Ht(e);
 	}
 	let r = {
 		appStringPrefixes: ["dt", "DT"],
-		tagNumbers: [zt],
+		tagNumbers: [Rt],
 		parseAppString(e, t, r) {
-			return e === "DT" ? n(t) : Rt(t, r);
+			return e === "DT" ? n(t) : Lt(t, r);
 		},
 		parseAppSequence(e, t, r) {
-			let i = It(t);
-			return e === "DT" ? n(i) : Rt(i, r);
+			let i = Ft(t);
+			return e === "DT" ? n(i) : Lt(i, r);
 		},
 		parseTag(e, n) {
 			if (e !== 1n) return;
 			let r;
-			if (n instanceof k) r = new Bt(n.value, { encodingWidth: n.encodingWidth });
-			else if (n instanceof A) r = new Vt(n.value, { encodingWidth: n.encodingWidth });
-			else if (n instanceof j) r = new Ht(n.value), n.precision !== void 0 && (r.precision = n.precision);
+			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);
 			else return;
-			return r.start = n.start, r.end = n.end, t ? new Wt(r) : new Ut(r);
+			return r.start = n.start, r.end = n.end, t ? new Ut(r) : new Ht(r);
 		}
 	};
 	return t && (r.fromJS = (e, t) => {
-		if (e instanceof Date) return new Wt(H(e.getTime() / 1e3));
+		if (e instanceof Date) return new Ut(U(e.getTime() / 1e3));
 	}, r.isJSType = (e) => e instanceof Date), r;
 }
-var Kt = Gt(), qt = Gt({ jsDate: !0 });
+var Gt = Wt(), Kt = Wt({ jsDate: !0 });
 //#endregion
 //#region src/utils/ip.ts
-function Jt(e) {
+function qt(e) {
 	let t = e.split(".");
 	if (t.length !== 4) throw SyntaxError(`ip: invalid IPv4 address: ${JSON.stringify(e)}`);
 	let n = /* @__PURE__ */ new Uint8Array(4);
@@ -2091,11 +2195,11 @@ function Jt(e) {
 	}
 	return n;
 }
-function Yt(e) {
+function Jt(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 = Jt(i[2]));
+	i && (n = i[1], n.endsWith(":") && (n += ":"), r = qt(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;
@@ -2112,11 +2216,11 @@ function Yt(e) {
 	}
 	return r && t.set(r, 12), t;
 }
-function Xt(e) {
+function Yt(e) {
 	return Array.from(e).join(".");
 }
-function Zt(e) {
-	let t = e.slice(0, 10).every((e) => e === 0) && e[10] === 255 && e[11] === 255 ? Xt(e.slice(12)) : null, n = t ? 6 : 8, r = [];
+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 = [];
 	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) {
@@ -2130,29 +2234,29 @@ function Zt(e) {
 }
 //#endregion
 //#region src/extensions/ip.ts
-var Qt = "ip", U = "IP", W = 52n, $t = 54n, en = new TextDecoder("utf-8", { fatal: !0 });
-function tn(e) {
+var Zt = "ip", W = "IP", G = 52n, Qt = 54n, $t = new TextDecoder("utf-8", { fatal: !0 });
+function en(e) {
 	if (e.length !== 1) throw SyntaxError("ip<<...>>: expected exactly one item");
 	let t = e[0];
-	if (t instanceof V) return t.value;
-	if (t instanceof N) return en.decode(t.value);
+	if (t instanceof H) return t.value;
+	if (t instanceof P) return $t.decode(t.value);
 	throw SyntaxError("ip<<...>>: expected a text string or byte string");
 }
-function nn(e) {
+function tn(e) {
 	return /^\d/.test(e) && e.includes(".") && !e.includes(":") ? {
-		bytes: Jt(e),
+		bytes: qt(e),
 		isV4: !0
 	} : {
-		bytes: Yt(e),
+		bytes: Jt(e),
 		isV4: !1
 	};
 }
-function rn(e) {
-	if (e.length === 4) return Xt(e);
-	if (e.length === 16) return Zt(e);
+function nn(e) {
+	if (e.length === 4) return Yt(e);
+	if (e.length === 16) return Xt(e);
 	throw SyntaxError(`ip: unexpected byte length: ${e.length}`);
 }
-function an(e, t) {
+function rn(e, t) {
 	let n = new Uint8Array(e.length);
 	n.set(e);
 	let r = Math.floor(t / 8), i = t % 8;
@@ -2162,72 +2266,72 @@ function an(e, t) {
 	for (; a > 0 && n[a - 1] === 0;) a--;
 	return n.slice(0, a);
 }
-function on(e, t) {
+function an(e, t) {
 	let n = new Uint8Array(t);
 	return n.set(e), n;
 }
-var sn = class extends N {
+var on = class extends P {
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
-		let n = x(e, this.encodingWidth, () => b(BigInt(this.value.length)));
-		return `${Qt}'${rn(this.value)}'${n}`;
+		let n = w(e, this.encodingWidth, () => C(BigInt(this.value.length)));
+		return `${Zt}'${nn(this.value)}'${n}`;
 	}
-}, cn = class extends I {
+}, sn = class extends L {
 	_isV4;
 	constructor(e, t, n) {
-		super([new k(BigInt(e)), new N(t)]), this._isV4 = n;
+		super([new A(BigInt(e)), new P(t)]), this._isV4 = n;
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
 		let n = Number(this.items[0].value), r = this.items[1].value;
-		return `${Qt}'${rn(on(r, this._isV4 ? 4 : 16))}/${n}'`;
+		return `${Zt}'${nn(an(r, this._isV4 ? 4 : 16))}/${n}'`;
 	}
-}, ln = class extends M {
+}, cn = class extends N {
 	constructor(e, t) {
 		super(e, t);
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
-		let n = this.tag === W ? 4 : 16, r = this.content;
-		if (r instanceof N) {
+		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 = x(e, this.encodingWidth, () => b(this.tag));
-			return `${U}'${rn(r.value)}'${n}`;
+			let n = w(e, this.encodingWidth, () => C(this.tag));
+			return `${W}'${nn(r.value)}'${n}`;
 		}
-		if (r instanceof I && r.items.length === 2 && r.items[0] instanceof k && r.items[1] instanceof 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 = on(r.items[1].value, n), o = x(e, this.encodingWidth, () => b(this.tag));
-			return `${U}'${rn(a)}/${i}'${o}`;
+			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}`;
 		}
 		return super._toCDN(e, t);
 	}
 };
-function un(e, t) {
+function ln(e, t) {
 	let n = t.indexOf("/");
 	if (n === -1) {
-		let { bytes: n, isV4: r } = nn(t);
-		return e === U ? new ln(r ? W : $t, new N(n)) : new sn(n);
+		let { bytes: n, isV4: r } = tn(t);
+		return e === W ? new cn(r ? G : Qt, new P(n)) : new on(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 } = nn(r), c = s ? 32 : 128;
+	let a = parseInt(i, 10), { bytes: o, isV4: s } = tn(r), c = s ? 32 : 128;
 	if (a > c) throw SyntaxError(`ip: prefix length ${a} exceeds maximum ${c} for ${s ? "IPv4" : "IPv6"}`);
-	let l = an(o, a);
-	return e === U ? new ln(s ? W : $t, new I([new k(BigInt(a)), new N(l)])) : new cn(a, l, s);
+	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);
 }
-var dn = {
-	appStringPrefixes: [Qt, U],
-	tagNumbers: [W, $t],
+var un = {
+	appStringPrefixes: [Zt, W],
+	tagNumbers: [G, Qt],
 	parseAppString(e, t) {
-		return un(e, t);
+		return ln(e, t);
 	},
 	parseAppSequence(e, t) {
-		return un(e, tn(t));
+		return ln(e, en(t));
 	},
 	parseTag(e, t) {
-		if (!(e !== W && e !== $t) && (t instanceof N || t instanceof I)) return new ln(e, t);
+		if (!(e !== G && e !== Qt) && (t instanceof P || t instanceof L)) return new cn(e, t);
 	}
-}, fn = "cri", pn = "CRI", mn = 99n, hn = /* @__PURE__ */ new Map([
+}, dn = "cri", fn = "CRI", pn = 99n, mn = /* @__PURE__ */ new Map([
 	["coap", -1n],
 	["coaps", -2n],
 	["http", -3n],
@@ -2238,47 +2342,47 @@ var dn = {
 	["coaps+tcp", -8n],
 	["coap+ws", -25n],
 	["coaps+ws", -26n]
-]), gn = new Map([...hn.entries()].map(([e, t]) => [t, e]));
-function G(e) {
+]), hn = new Map([...mn.entries()].map(([e, t]) => [t, e]));
+function K(e) {
 	try {
 		return decodeURIComponent(e);
 	} catch {
 		return e;
 	}
 }
-var _n = new TextEncoder(), vn = new TextDecoder("utf-8", { fatal: !0 });
-function yn(e) {
-	return Array.from(_n.encode(e), (e) => `%${e.toString(16).toUpperCase().padStart(2, "0")}`).join("");
+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("");
 }
-function K(e, t) {
+function q(e, t) {
 	let n = "";
-	for (let r of e) n += t(r) ? r : yn(r);
+	for (let r of e) n += t(r) ? r : vn(r);
 	return n;
 }
-function bn(e) {
+function yn(e) {
 	return /[A-Za-z0-9\-._~]/.test(e);
 }
-function xn(e) {
+function bn(e) {
 	return /[!$&'()*+,;=]/.test(e);
 }
+function xn(e) {
+	return yn(e) || bn(e) || e === ":" || e === "@";
+}
 function Sn(e) {
-	return bn(e) || xn(e) || e === ":" || e === "@";
+	return (xn(e) || e === "/" || e === "?") && e !== "&";
 }
 function Cn(e) {
-	return (Sn(e) || e === "/" || e === "?") && e !== "&";
+	return xn(e) || e === "/" || e === "?";
 }
 function wn(e) {
-	return Sn(e) || e === "/" || e === "?";
+	return yn(e) || bn(e) || e === ":";
 }
 function Tn(e) {
-	return bn(e) || xn(e) || e === ":";
+	return yn(e) || bn(e);
 }
 function En(e) {
-	return bn(e) || xn(e);
-}
-function Dn(e) {
 	let t = [], n = e, r = n.indexOf("@");
-	r >= 0 && (t.push(R.FALSE), t.push(new V(G(n.slice(0, r)))), n = n.slice(r + 1));
+	r >= 0 && (t.push(z.FALSE), t.push(new H(K(n.slice(0, r)))), n = n.slice(r + 1));
 	let i, a = null;
 	if (n.startsWith("[")) {
 		let e = n.indexOf("]");
@@ -2287,190 +2391,190 @@ function Dn(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 N(Yt(i)));
+		t.push(new P(Jt(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 N(Jt(i)));
-		else for (let e of i.toLowerCase().split(".")) t.push(new V(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 P(qt(i)));
+		else for (let e of i.toLowerCase().split(".")) t.push(new H(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 k(BigInt(e)));
+		t.push(new A(BigInt(e)));
 	}
-	return new I(t);
+	return new L(t);
 }
-function On(e) {
+function Dn(e) {
 	let t = e.items, n = 0, r = "";
-	if (n < t.length && t[n] instanceof R && t[n].value === 20) {
+	if (n < t.length && t[n] instanceof z && t[n].value === 20) {
 		n++;
 		let e = t[n++];
-		r += K(e.value, Tn) + "@";
+		r += q(e.value, wn) + "@";
 	}
 	if (n >= t.length) return r;
 	let i = t[n];
-	if (i instanceof N) {
+	if (i instanceof P) {
 		n++;
 		let { length: e } = i.value;
-		if (e === 4) r += Xt(i.value);
-		else if (e === 16) r += "[" + Zt(i.value) + "]";
+		if (e === 4) r += Yt(i.value);
+		else if (e === 16) r += "[" + Xt(i.value) + "]";
 		else throw Error(`cri: unexpected host-ip byte length: ${e}`);
-		n < t.length && t[n] instanceof V && (r += `%25${K(t[n++].value, En)}`);
+		n < t.length && t[n] instanceof H && (r += `%25${q(t[n++].value, Tn)}`);
 	} else {
 		let e = [];
-		for (; n < t.length && t[n] instanceof V;) e.push(K(t[n++].value, En));
+		for (; n < t.length && t[n] instanceof H;) e.push(q(t[n++].value, Tn));
 		r += e.join(".");
 	}
-	return n < t.length && t[n] instanceof k && (r += ":" + t[n].value.toString()), r;
+	return n < t.length && t[n] instanceof A && (r += ":" + t[n].value.toString()), r;
 }
-function kn(e) {
+function On(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 V(G(e)))) : (r = t, i = []), {
-		authority: Dn(r),
+	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),
 		pathSegments: i
 	};
 }
-function An(e) {
+function kn(e) {
 	let t = e, n = null, r = t.indexOf("#");
-	r >= 0 && (n = G(t.slice(r + 1)), t = t.slice(0, r));
+	r >= 0 && (n = K(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 V(G(e)));
+		t = t.slice(0, a), i = e.split("&").map((e) => new H(K(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 = hn.get(e);
-		if (o.push(n === void 0 ? new V(e) : new A(n)), t.startsWith("//")) {
-			let { authority: e, pathSegments: n } = kn(t);
-			o.push(e, new I(n));
+		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));
 		} else if (t.startsWith("/")) {
-			let e = t.slice(1).split("/").map((e) => new V(G(e)));
-			o.push(R.NULL, new I(e));
+			let e = t.slice(1).split("/").map((e) => new H(K(e)));
+			o.push(z.NULL, new L(e));
 		} else {
-			let e = t.split("/").map((e) => new V(G(e)));
-			o.push(R.TRUE, new I(e));
+			let e = t.split("/").map((e) => new H(K(e)));
+			o.push(z.TRUE, new L(e));
 		}
 	} else if (t.startsWith("//")) {
-		let { authority: e, pathSegments: n } = kn(t);
-		o.push(R.FALSE, e, new I(n));
+		let { authority: e, pathSegments: n } = On(t);
+		o.push(z.FALSE, e, new L(n));
 	} else if (t.startsWith("/")) {
-		let e = t.slice(1).split("/").map((e) => new V(G(e)));
-		o.push(R.TRUE, new I(e));
-	} else if (t === "") o.push(new k(0n));
+		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));
 	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 V(G(e)));
-		o.push(new k(n), new I(a));
+		let a = r === "" ? [] : r.split("/").map((e) => new H(K(e)));
+		o.push(new A(n), new L(a));
 	}
-	if (i !== null && o.push(new I(i)), n !== null && (i === null && o.push(R.NULL), o.push(new V(n))), n !== null && i === null && o.splice(o.length - 2, 1), i === null && n === null) {
+	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) {
 		let e = o[o.length - 1];
-		e instanceof I && e.items.length === 0 && o.pop();
+		e instanceof L && e.items.length === 0 && o.pop();
 	}
-	return o.length === 1 && o[0] instanceof k && o[0].value === 0n ? [] : o;
+	return o.length === 1 && o[0] instanceof A && o[0].value === 0n ? [] : o;
 }
-function q(e, t) {
+function An(e, t) {
 	let n = t, r = "";
 	if (n < e.length) {
 		let t = e[n];
-		if (t instanceof I) {
+		if (t instanceof L) {
 			if (n++, t.items.length > 0) {
 				let e = t.items.map((e) => {
-					if (!(e instanceof V)) throw Error("cri: query item must be a text string");
-					return K(e.value, Cn);
+					if (!(e instanceof H)) throw Error("cri: query item must be a text string");
+					return q(e.value, Sn);
 				});
 				r += "?" + e.join("&");
 			}
-		} else t instanceof R && t.value === 22 && n++;
+		} else t instanceof z && t.value === 22 && n++;
 	}
-	return n < e.length && e[n] instanceof V && (r += "#" + K(e[n].value, wn)), r;
+	return n < e.length && e[n] instanceof H && (r += "#" + q(e[n].value, Cn)), r;
 }
 function jn(e) {
 	return e.items.map((e) => {
-		if (!(e instanceof V)) throw Error("cri: path segment must be a text string");
-		return K(e.value, Sn);
+		if (!(e instanceof H)) throw Error("cri: path segment must be a text string");
+		return q(e.value, xn);
 	});
 }
 function Mn(e) {
 	if (e.length === 0) return "";
 	let t = 0, n = e[t++];
-	if (n instanceof A || n instanceof V) {
+	if (n instanceof j || n instanceof H) {
 		let r;
-		if (n instanceof A) {
-			let e = gn.get(n.value);
+		if (n instanceof j) {
+			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 I) a = "//" + On(i), o = !0;
-		else if (i instanceof R) if (i.value === 22) o = !0;
+		if (i instanceof L) a = "//" + Dn(i), o = !0;
+		else if (i instanceof z) 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 I) {
+		if (t < e.length && e[t] instanceof L) {
 			let n = e[t++];
 			n.items.length > 0 && (s = (o ? "/" : "") + jn(n).join("/"));
 		}
-		return r + a + s + q(e, t);
+		return r + a + s + An(e, t);
 	}
-	if (n instanceof R && n.value === 20) {
-		if (t >= e.length || !(e[t] instanceof I)) throw Error("cri: network-path reference requires an authority array");
-		let n = On(e[t++]), r = "";
-		if (t < e.length && e[t] instanceof I) {
+	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) {
 			let n = e[t++];
 			n.items.length > 0 && (r = "/" + jn(n).join("/"));
 		}
-		return "//" + n + r + q(e, t);
+		return "//" + n + r + An(e, t);
 	}
-	if (n instanceof R && n.value === 21) {
+	if (n instanceof z && n.value === 21) {
 		let n = "/";
-		if (t < e.length && e[t] instanceof I) {
+		if (t < e.length && e[t] instanceof L) {
 			let r = e[t++];
 			n = "/" + jn(r).join("/");
 		}
-		return n + q(e, t);
+		return n + An(e, t);
 	}
-	if (n instanceof k) {
+	if (n instanceof A) {
 		let r = n.value;
-		if (r === 0n) return q(e, t);
+		if (r === 0n) return An(e, t);
 		let i = r === 1n ? "" : "../".repeat(Number(r) - 1), a;
-		if (t < e.length && e[t] instanceof I) {
+		if (t < e.length && e[t] instanceof L) {
 			let n = e[t++];
 			if (n.items.length > 0) {
 				let e = jn(n);
 				a = (r === 1n && e[0].includes(":") ? "./" : i) + e.join("/");
 			} else a = i === "" ? "./" : i;
 		} else a = i === "" ? "./" : i;
-		return a + q(e, t);
+		return a + An(e, t);
 	}
 	throw Error("cri: unrecognised first element type in CRI array");
 }
-var Nn = class extends I {
+var Nn = class extends L {
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
 		try {
-			let t = x(e, this.encodingWidth, () => b(BigInt(this.items.length)));
-			return `${fn}'${Mn(this.items)}'${t}`;
+			let t = w(e, this.encodingWidth, () => C(BigInt(this.items.length)));
+			return `${dn}'${Mn(this.items)}'${t}`;
 		} catch {
 			return super._toCDN(e, t);
 		}
 	}
-}, Pn = class extends M {
+}, Pn = class extends N {
 	constructor(e) {
-		super(mn, e);
+		super(pn, 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 = x(e, this.encodingWidth, () => b(mn));
-			return `${pn}'${Mn(n.items)}'${r}`;
+			let r = w(e, this.encodingWidth, () => C(pn));
+			return `${fn}'${Mn(n.items)}'${r}`;
 		} catch {
 			return super._toCDN(e, t);
 		}
@@ -2479,17 +2583,17 @@ var Nn = class extends I {
 function Fn(e) {
 	if (e.length !== 1) throw SyntaxError("cri<<...>>: expected exactly one item");
 	let t = e[0];
-	if (t instanceof V) return t.value;
-	if (t instanceof N) return vn.decode(t.value);
+	if (t instanceof H) return t.value;
+	if (t instanceof P) return _n.decode(t.value);
 	throw SyntaxError("cri<<...>>: expected a text string or byte string");
 }
 function In(e, t) {
-	let n = new Nn(An(t));
-	return e === pn ? new Pn(n) : n;
+	let n = new Nn(kn(t));
+	return e === fn ? new Pn(n) : n;
 }
 var Ln = {
-	appStringPrefixes: [fn, pn],
-	tagNumbers: [mn],
+	appStringPrefixes: [dn, fn],
+	tagNumbers: [pn],
 	parseAppString(e, t) {
 		return In(e, t);
 	},
@@ -2497,7 +2601,7 @@ var Ln = {
 		return In(e, Fn(t));
 	},
 	parseTag(e, t) {
-		if (e !== 99n || !(t instanceof I)) return;
+		if (e !== 99n || !(t instanceof L)) return;
 		let n = new Nn(t.items, {
 			indefiniteLength: t.indefiniteLength,
 			encodingWidth: t.encodingWidth
@@ -2505,16 +2609,16 @@ var Ln = {
 		return n.start = t.start, n.end = t.end, new Pn(n);
 	}
 }, Rn = 18446744073709551615n, zn = -18446744073709551616n, Bn = {
-	tagNumbers: [Je, Ye],
+	tagNumbers: [qe, Je],
 	parseTag(e, t) {
-		if (t instanceof N) {
+		if (t instanceof P) {
 			if (e === 2n) {
-				let e = $e(t.value);
-				return e > Rn ? new et(e) : void 0;
+				let e = Qe(t.value);
+				return e > Rn ? new $e(e) : void 0;
 			}
 			if (e === 3n) {
-				let e = -1n - $e(t.value);
-				return e < zn ? new tt(e) : void 0;
+				let e = -1n - Qe(t.value);
+				return e < zn ? new et(e) : void 0;
 			}
 		}
 	}
@@ -2555,47 +2659,47 @@ function Y(e, t) {
 	e.warnings ??= [], e.warnings.push(t);
 }
 function Kn(e) {
-	if (e instanceof k) return ["u", String(e.value)];
-	if (e instanceof A) return ["n", String(e.value)];
-	if (e instanceof V) return ["t", e.value];
-	if (e instanceof F) return ["t", e.chunks.map((e) => e.value).join("")];
-	if (e instanceof N) return ["b", i(e.value)];
-	if (e instanceof P) {
+	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) {
 		let t = "";
 		for (let n of e.chunks) t += i(n.value);
 		return ["b", t];
 	}
-	if (e instanceof j) return isNaN(e.value) ? ["f", "NaN"] : Object.is(e.value, -0) ? ["f", "-0"] : ["f", String(e.value)];
-	if (e instanceof R) return ["s", e.value];
-	if (e instanceof I) return ["A", e.items.map(Kn)];
-	if (e instanceof L) {
+	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 (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 M ? [
+	return e instanceof N ? [
 		"G",
 		String(e.tag),
 		Kn(e.content)
 	] : ["c", i(e.toCBOR())];
 }
 function qn(e) {
-	if (e instanceof k) return "u" + e.value;
-	if (e instanceof A) return "n" + e.value;
-	if (e instanceof V) return "t" + e.value;
-	if (e instanceof F) {
+	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) {
 		let t = "t";
 		for (let n of e.chunks) t += n.value;
 		return t;
 	}
-	if (e instanceof N) return "b" + i(e.value);
-	if (e instanceof P) {
+	if (e instanceof P) return "b" + i(e.value);
+	if (e instanceof F) {
 		let t = "b";
 		for (let n of e.chunks) t += i(n.value);
 		return t;
 	}
-	return e instanceof j ? isNaN(e.value) ? "fNaN" : Object.is(e.value, -0) ? "f-0" : "f" + e.value : e instanceof R ? "s" + e.value : JSON.stringify(Kn(e));
+	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));
 }
 var Jn = Array.from({ length: 24 }, (e, t) => BigInt(t)), Yn;
 function Xn(e) {
@@ -2692,36 +2796,36 @@ function rr(e, t, n, r) {
 		case 0: {
 			let { value: n, nextOffset: r } = Qn(e, t, o);
 			return {
-				value: new k(n, { encodingWidth: Vn(o, n) }),
+				value: new A(n, { encodingWidth: Vn(o, n) }),
 				nextOffset: r
 			};
 		}
 		case 1: {
 			let { value: n, nextOffset: r } = Qn(e, t, o), i = Vn(o, n);
 			return {
-				value: new A(-1n - n, { encodingWidth: i }),
+				value: new j(-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 N);
+				let { chunks: i, nextOffset: a } = er(e, t, n, r, "byte string", (e) => e instanceof P);
 				return {
-					value: new P(i),
+					value: new F(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 N(new Uint8Array(e.buffer, e.byteOffset + a, i).slice(), { encodingWidth: s }),
+				value: new P(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 V);
+				let { chunks: i, nextOffset: a } = er(e, t, n, r, "text string", (e) => e instanceof H);
 				return {
-					value: new F(i),
+					value: new I(i),
 					nextOffset: a
 				};
 			}
@@ -2734,7 +2838,7 @@ function rr(e, t, n, r) {
 			} catch {
 				u = Gn("invalid UTF-8 sequence in text string", a, n), l = Wn.decode(c);
 			}
-			let f = new V(l, { encodingWidth: s });
+			let f = new H(l, { encodingWidth: s });
 			return u && Y(f, u), {
 				value: f,
 				nextOffset: a + i
@@ -2752,7 +2856,7 @@ function rr(e, t, n, r) {
 					i.push(t.value), a = t.nextOffset;
 				}
 				return {
-					value: new I(i, { indefiniteLength: !0 }),
+					value: new L(i, { indefiniteLength: !0 }),
 					nextOffset: a
 				};
 			}
@@ -2762,7 +2866,7 @@ function rr(e, t, n, r) {
 				c.push(t.value), l = t.nextOffset;
 			}
 			return {
-				value: new I(c, { encodingWidth: s }),
+				value: new L(c, { encodingWidth: s }),
 				nextOffset: l
 			};
 		}
@@ -2779,7 +2883,7 @@ function rr(e, t, n, r) {
 					let c = X(e, s, n, r);
 					s = c.nextOffset, i.push([t.value, c.value]);
 				}
-				let c = new L(i, { indefiniteLength: !0 });
+				let c = new R(i, { indefiniteLength: !0 });
 				for (let e of o) Y(c, e);
 				return {
 					value: c,
@@ -2793,7 +2897,7 @@ function rr(e, t, n, r) {
 				let i = X(e, d, n, r);
 				d = i.nextOffset, c.push([t.value, i.value]);
 			}
-			let f = new L(c, { encodingWidth: s });
+			let f = new R(c, { encodingWidth: s });
 			for (let e of u) Y(f, e);
 			return {
 				value: f,
@@ -2805,57 +2909,57 @@ function rr(e, t, n, r) {
 			let { value: i, nextOffset: a } = Qn(e, t, o), s = Vn(o, i), c = X(e, a, n, r);
 			for (let e of r) {
 				let t = e.parseTag(i, c.value, n);
-				if (t !== void 0) return t instanceof M && s !== void 0 && (t.encodingWidth = s), {
+				if (t !== void 0) return t instanceof N && s !== void 0 && (t.encodingWidth = s), {
 					value: t,
 					nextOffset: c.nextOffset
 				};
 			}
 			return {
-				value: new M(i, c.value, { encodingWidth: s }),
+				value: new N(i, c.value, { encodingWidth: s }),
 				nextOffset: c.nextOffset
 			};
 		}
 		case 7:
 			if (o <= 19) return {
-				value: new R(o),
+				value: new z(o),
 				nextOffset: t
 			};
 			if (o === 20) return {
-				value: new R(20),
+				value: new z(20),
 				nextOffset: t
 			};
 			if (o === 21) return {
-				value: new R(21),
+				value: new z(21),
 				nextOffset: t
 			};
 			if (o === 22) return {
-				value: new R(22),
+				value: new z(22),
 				nextOffset: t
 			};
 			if (o === 23) return {
-				value: new R(23),
+				value: new z(23),
 				nextOffset: t
 			};
 			if (o === 24) {
 				t + 1 > e.byteLength && J("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 R(r);
+					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), {
 						value: i,
 						nextOffset: t + 1
 					};
 				}
 				return {
-					value: new R(r),
+					value: new z(r),
 					nextOffset: t + 1
 				};
 			}
 			if (o === 25) {
 				t + 2 > e.byteLength && J("unexpected end of input");
-				let n = C(e.getUint16(t, !1));
+				let n = E(e.getUint16(t, !1));
 				return {
-					value: new j(n, {
+					value: new M(n, {
 						precision: "half",
 						rawBits: Number.isNaN(n) ? nr(e, t, 2) : void 0
 					}),
@@ -2866,7 +2970,7 @@ function rr(e, t, n, r) {
 				t + 4 > e.byteLength && J("unexpected end of input");
 				let n = e.getFloat32(t, !1);
 				return {
-					value: new j(n, {
+					value: new M(n, {
 						precision: "single",
 						rawBits: Number.isNaN(n) ? nr(e, t, 4) : void 0
 					}),
@@ -2877,7 +2981,7 @@ function rr(e, t, n, r) {
 				t + 8 > e.byteLength && J("unexpected end of input");
 				let n = e.getFloat64(t, !1);
 				return {
-					value: new j(n, {
+					value: new M(n, {
 						precision: "double",
 						rawBits: Number.isNaN(n) ? nr(e, t, 8) : void 0
 					}),
@@ -2912,7 +3016,7 @@ function ar(e, t) {
 var or = 24n, sr = {
 	tagNumbers: [or],
 	parseTag(e, t, n) {
-		if (e !== 24n || !(t instanceof N)) return;
+		if (e !== 24n || !(t instanceof P)) return;
 		let r = n ? {
 			extensions: n.extensions,
 			builtinExtensions: n.builtinExtensions,
@@ -2921,138 +3025,165 @@ var or = 24n, sr = {
 			silent: n.silent
 		} : void 0;
 		try {
-			return new M(or, new Ue([ar(t.value, r)], { encodingWidth: t.encodingWidth }));
+			return new N(or, new He([ar(t.value, r)], { encodingWidth: t.encodingWidth }));
 		} catch (e) {
 			if (r?.strict !== !1) throw e;
 			return;
 		}
 	}
-}, cr = new TextEncoder(), lr = new TextDecoder("utf-8", { fatal: !0 }), ur = new TextDecoder("utf-8", { fatal: !1 }), dr = Symbol("ellipsis");
-function fr(e) {
+};
+//#endregion
+//#region src/extensions/ellipsis.ts
+function cr(e) {
+	return e instanceof B && !(e.content instanceof L);
+}
+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;
+		else return !1;
+		if (e === i) return !1;
+		i = e;
+	}
+	return r && !(t && n);
+}
+var ur = {
+	tagNumbers: [Ke],
+	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);
+		}
+	}
+}, dr = new TextEncoder(), fr = new TextDecoder("utf-8", { fatal: !0 }), pr = new TextDecoder("utf-8", { fatal: !1 }), mr = Symbol("ellipsis");
+function hr(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 pr(e, t, n) {
-	if (t instanceof Ke) {
-		pr(e, t.inner, n);
+function gr(e, t, n) {
+	if (t instanceof Ge) {
+		gr(e, t.inner, n);
 		return;
 	}
-	if (t instanceof z) {
-		if (t.content instanceof I) for (let r of t.content.items) pr(e, r, n);
-		else n.push(dr);
+	if (t instanceof B) {
+		if (t.content instanceof L) for (let r of t.content.items) gr(e, r, n);
+		else n.push(mr);
 		return;
 	}
-	if (t instanceof V) {
-		n.push(cr.encode(t.value));
+	if (t instanceof H) {
+		n.push(dr.encode(t.value));
 		return;
 	}
-	if (t instanceof N) {
+	if (t instanceof P) {
 		n.push(t.value);
 		return;
 	}
-	if (t instanceof F) {
-		n.push(cr.encode(t.chunks.map((e) => e.value).join("")));
+	if (t instanceof I) {
+		n.push(dr.encode(t.chunks.map((e) => e.value).join("")));
 		return;
 	}
-	if (t instanceof P) {
-		n.push(fr(t.chunks.map((e) => e.value)));
+	if (t instanceof F) {
+		n.push(hr(t.chunks.map((e) => e.value)));
 		return;
 	}
 	throw SyntaxError(`${e}<<...>> arguments must be (text or byte) strings or ellipses`);
 }
-function mr(e, t) {
+function _r(e, t) {
 	try {
-		return lr.decode(e);
+		return fr.decode(e);
 	} catch {
 		let n = "t1 concatenation result is not valid UTF-8";
 		if (t) t(n);
 		else throw SyntaxError(n);
-		return ur.decode(e);
+		return pr.decode(e);
 	}
 }
-function hr(e, t, n) {
+function vr(e, t, n) {
 	let r = [];
-	for (let n of t) pr(e, n, r);
+	for (let n of t) gr(e, n, r);
 	let i = e === "t1", a = [], o = !1, s = [], c = () => {
 		if (s.length === 0) return;
-		let e = fr(s);
-		s.length = 0, e.length !== 0 && a.push(i ? new V(mr(e, n)) : new N(e));
+		let e = hr(s);
+		s.length = 0, e.length !== 0 && a.push(i ? new H(_r(e, n)) : new P(e));
 	};
-	for (let e of r) e === dr ? (c(), a[a.length - 1] instanceof z || (a.push(new z()), o = !0)) : s.push(e);
+	for (let e of r) e === mr ? (c(), a[a.length - 1] instanceof B || (a.push(new B()), o = !0)) : s.push(e);
 	if (!o) {
-		let e = fr(s);
-		return i ? new V(mr(e, n)) : new N(e);
+		let e = hr(s);
+		return i ? new H(_r(e, n)) : new P(e);
 	}
-	return c(), a.length === 1 ? new z() : new z(a);
+	return c(), a.length === 1 ? new B() : new B(a);
 }
-function gr(e) {
+function yr(e) {
 	return {
 		appStringPrefixes: [e],
 		preserveAppSeqSource: !0,
 		parseAppString(t, n, r) {
-			return hr(e, [new V(n)], r);
+			return vr(e, [new H(n)], r);
 		},
 		parseAppSequence(t, n, r) {
-			return hr(e, n, r);
+			return vr(e, n, r);
 		}
 	};
 }
-var _r = gr("t1"), vr = gr("b1"), yr = new TextEncoder(), br = new TextDecoder("utf-8", { fatal: !0 }), xr = new TextDecoder("utf-8", { fatal: !1 });
-function Sr(e) {
+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) {
 	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 Cr(e, t, n) {
+function Er(e, t, n) {
 	let r = e === "ilts", i = [], a = [];
 	for (let o of t) {
-		if (o instanceof Ke && (o = o.inner), o instanceof z) throw SyntaxError(`${e}<<...>> cannot contain ellipses; there is no way to include an elision in an indefinite-length string`);
+		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`);
 		let t, s, c;
-		if (o instanceof V) t = o.value, c = o.encodingWidth;
-		else if (o instanceof N) s = o.value, c = o.encodingWidth;
-		else if (o instanceof F) t = o.chunks.map((e) => e.value).join("");
-		else if (o instanceof P) s = Sr(o.chunks.map((e) => e.value));
+		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));
 		else throw SyntaxError(`${e}<<...>> arguments must be (text or byte) strings`);
 		if (r) {
 			let e;
 			if (t !== void 0) e = t;
 			else try {
-				e = br.decode(s);
+				e = Cr.decode(s);
 			} catch {
 				let t = "ilts chunk is not valid UTF-8";
 				if (n) n(t);
 				else throw SyntaxError(t);
-				e = xr.decode(s);
+				e = wr.decode(s);
 			}
-			a.push(new V(e, c === void 0 ? void 0 : { encodingWidth: c }));
+			a.push(new H(e, c === void 0 ? void 0 : { encodingWidth: c }));
 		} else {
-			let e = s ?? yr.encode(t);
-			i.push(new N(e, c === void 0 ? void 0 : { encodingWidth: c }));
+			let e = s ?? Sr.encode(t);
+			i.push(new P(e, c === void 0 ? void 0 : { encodingWidth: c }));
 		}
 	}
-	return r ? new F(a) : new P(i);
+	return r ? new I(a) : new F(i);
 }
-function wr(e) {
+function Dr(e) {
 	return {
 		appStringPrefixes: [e],
 		preserveAppSeqSource: !0,
 		parseAppString(t, n, r) {
-			return new Ke(Cr(e, [new V(n)], r), `${e}${xe(n)}`);
+			return new Ge(Er(e, [new H(n)], r), `${e}${ve(n)}`);
 		},
 		parseAppSequence(t, n, r) {
-			return Cr(e, n, r);
+			return Er(e, n, r);
 		}
 	};
 }
-var Tr = wr("ilbs"), Er = wr("ilts");
+var Or = Dr("ilbs"), kr = Dr("ilts");
 //#endregion
 //#region src/utils/strip-comments.ts
-function Dr(e) {
+function Ar(e) {
 	let t = "", n = 0;
 	for (; n < e.length;) {
 		let r = e[n];
@@ -3087,10 +3218,10 @@ function Dr(e) {
 }
 //#endregion
 //#region src/extensions/float.ts
-var Or = class extends j {
+var jr = class extends M {
 	_bits;
 	constructor(e) {
-		super(C(e), { precision: "half" }), this._bits = e & 65535;
+		super(E(e), { precision: "half" }), this._bits = e & 65535;
 	}
 	_toCBOR() {
 		return new Uint8Array([
@@ -3099,7 +3230,7 @@ var Or = class extends j {
 			this._bits & 255
 		]);
 	}
-}, kr = class extends j {
+}, Mr = class extends M {
 	_raw;
 	constructor(e) {
 		super(new DataView(e.buffer, e.byteOffset).getFloat32(0, !1), { precision: "single" }), this._raw = e.slice();
@@ -3108,7 +3239,7 @@ var Or = class extends j {
 		let e = /* @__PURE__ */ new Uint8Array(5);
 		return e[0] = 250, e.set(this._raw, 1), e;
 	}
-}, Ar = class extends j {
+}, Nr = class extends M {
 	_raw;
 	constructor(e) {
 		super(new DataView(e.buffer, e.byteOffset).getFloat64(0, !1), { precision: "double" }), this._raw = e.slice();
@@ -3118,13 +3249,13 @@ var Or = class extends j {
 		return e[0] = 251, e.set(this._raw, 1), e;
 	}
 };
-function jr(e) {
-	if (e.length === 2) return new Or(e[0] << 8 | e[1]);
-	if (e.length === 4) return new kr(e);
-	if (e.length === 8) return new Ar(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);
 	throw SyntaxError(`float'...' requires 4, 8, or 16 hex digits (2, 4, or 8 bytes); got ${e.length} bytes`);
 }
-function Mr(e) {
+function Fr(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;
@@ -3136,7 +3267,7 @@ function Mr(e) {
 	let a = /* @__PURE__ */ new Uint8Array(4);
 	return new DataView(a.buffer).setUint32(0, i >>> 0, !1), a;
 }
-function Nr(e) {
+function Ir(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);
@@ -3147,7 +3278,7 @@ function Nr(e) {
 	} else a.setUint32(0, (t << 31 | n + 1008 << 20 | r << 10) >>> 0, !1), a.setUint32(4, 0, !1);
 	return i;
 }
-function Pr(e) {
+function Lr(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);
@@ -3157,49 +3288,49 @@ function Pr(e) {
 	}
 	return a;
 }
-function Fr(e, t, n) {
+function Rr(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 kr(Mr(n));
-		if (t === 3) return new Ar(Nr(n));
+		if (t === 2) return new Mr(Fr(n));
+		if (t === 3) return new Nr(Ir(n));
 	}
 	if (r === 2) {
-		if (t === 3) return new Ar(Pr(e));
+		if (t === 3) return new Nr(Lr(e));
 		if (t === 1) {
-			let t = new DataView(e.buffer, e.byteOffset).getFloat32(0, !1), r = S(t);
-			return !Object.is(C(r), t) && !isNaN(t) && n("float'...' value cannot be exactly represented as float16 (_1)"), new Or(r);
+			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);
 		}
 	}
 	if (r === 3) {
 		let r = new DataView(e.buffer, e.byteOffset).getFloat64(0, !1);
 		if (t === 1) {
-			let e = S(r);
-			return !Object.is(C(e), r) && !isNaN(r) && n("float'...' value cannot be exactly represented as float16 (_1)"), new Or(e);
+			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);
 		}
 		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 kr(t);
+			return new DataView(t.buffer).setFloat32(0, e, !1), new Mr(t);
 		}
 	}
-	return jr(e);
+	return Pr(e);
 }
-var Ir = {
+var zr = {
 	appStringPrefixes: ["float"],
 	parseAppString(t, n, r, i) {
-		let a = Dr(n);
+		let a = Ar(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 jr(o);
+		if (s === void 0) return Pr(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), jr(o);
+			if (r) return r(e), Pr(o);
 			throw SyntaxError(e);
 		}
-		return s === (o.length === 2 ? 1 : o.length === 4 ? 2 : 3) ? jr(o) : Fr(o, s, r ?? ((e) => {
+		return s === (o.length === 2 ? 1 : o.length === 4 ? 2 : 3) ? Pr(o) : Rr(o, s, r ?? ((e) => {
 			throw SyntaxError(e);
 		}));
 	},
@@ -3210,30 +3341,34 @@ var Ir = {
 			if (n) n(e);
 			else throw SyntaxError(e);
 		}
-		if (!(t[0] instanceof N)) throw SyntaxError("float<<...>> item must be a byte string");
-		return jr(t[0].value);
+		if (!(t[0] instanceof P)) throw SyntaxError("float<<...>> item must be a byte string");
+		return Pr(t[0].value);
 	}
-}, Lr = [Bn, sr], Rr = [
-	Kt,
-	dn,
+}, Br = [
+	Bn,
+	sr,
+	ur
+], Vr = [
+	Gt,
+	un,
 	Ln,
-	_r,
-	vr,
-	Tr,
-	Er,
-	Ir
-], zr;
+	br,
+	xr,
+	Or,
+	kr,
+	zr
+], Hr;
 function Z(e) {
-	return e === void 0 ? zr ??= [...Lr, ...Rr] : e === !1 ? Lr : [...Lr, ...e];
+	return e === void 0 ? Hr ??= [...Br, ...Vr] : e === !1 ? Br : [...Br, ...e];
 }
 //#endregion
 //#region src/js/fromJS.ts
-var Br;
-function Vr(e) {
+var Ur;
+function Wr(e) {
 	if (e === void 0) {
-		if (Br) return Br;
+		if (Ur) return Ur;
 		let e = Z(void 0);
-		return Br = {
+		return Ur = {
 			fromJS: e.filter((e) => e.fromJS !== void 0),
 			parseTag: e.filter((e) => e.parseTag !== void 0)
 		};
@@ -3244,19 +3379,19 @@ function Vr(e) {
 		parseTag: t.filter((e) => e.parseTag !== void 0)
 	};
 }
-function Hr(e) {
-	let t = e?.extensions, n = Vr(e?.builtinExtensions);
+function Gr(e) {
+	let t = e?.extensions, n = Wr(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 Ur(e, t) {
+function Kr(e, t) {
 	if (t?.replacer) {
-		let { replacer: n, ...r } = t, i = Gr(e, n, r.extensions, r.undefinedOmits, r.builtinExtensions);
-		return i === h ? R.UNDEFINED : Ur(i, Object.keys(r).length > 0 ? r : void 0);
+		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);
 	}
-	return Q(e, t, !0, Hr(t));
+	return Q(e, t, !0, Gr(t));
 }
 function Q(e, t, n, r) {
 	for (let n of r.fromJS) {
@@ -3269,34 +3404,34 @@ function Q(e, t, n, r) {
 			let t = e.parseTag(n, i);
 			if (t !== void 0) return t;
 		}
-		return new M(n, i);
-	}
-	if (e instanceof m.Null) return R.NULL;
-	if (e instanceof m.Undefined) return R.UNDEFINED;
-	if (e instanceof g) return new R(e.value);
-	if (e === null) return R.NULL;
-	if (e === void 0) return R.UNDEFINED;
-	if (e === !0) return R.TRUE;
-	if (e === !1) return R.FALSE;
-	if (typeof e == "bigint") return e > 18446744073709551615n ? new et(e) : e < -18446744073709551616n ? new tt(e) : e >= 0n ? new k(e) : new A(e);
-	if (typeof e == "number") return (t?.encodeIntegerAs ?? "int") === "int" && Number.isInteger(e) && !Object.is(e, -0) ? e >= 0 ? new k(BigInt(e)) : new A(BigInt(e)) : new j(e);
-	if (typeof e == "string") return new V(e);
+		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);
 	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 N(new Uint8Array(e));
-	if (ArrayBuffer.isView(e)) return e instanceof Uint8Array && t?.uint8ArrayAs === "array" ? new I(Array.from(e, (e) => new k(BigInt(e)))) : new N(new Uint8Array(e.buffer, e.byteOffset, e.byteLength));
-	if (e instanceof $) return new L([...e].map(([e, n]) => [Q(e, t, !0, r), Q(n, t, !0, r)]));
-	if (Array.isArray(e)) return new I(e.map((e) => Q(e, t, !0, 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 (typeof e == "object") {
 		let n = [];
-		for (let [i, a] of Object.entries(e)) n.push([new V(i), Q(a, t, !0, r)]);
-		return new L(n);
+		for (let [i, a] of Object.entries(e)) n.push([new H(i), Q(a, t, !0, r)]);
+		return new R(n);
 	}
 	throw TypeError(`fromJS: unsupported value type: ${typeof e}`);
 }
-function Wr(e) {
+function qr(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 Gr(e, t, n, r, i) {
+function Jr(e, t, n, r, i) {
 	let a = [...n ?? [], ...Z(i)].filter((e) => e.isJSType !== void 0);
 	function o(e) {
 		return e === h || r === !0 && e === void 0;
@@ -3307,7 +3442,7 @@ function Gr(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 || Wr(e) || a.some((t) => t.isJSType(e))) return e;
+			if (m.symbol in e || qr(e) || a.some((t) => t.isJSType(e))) return e;
 			let t = Object.getPrototypeOf(e);
 			if (t === Object.prototype || t === null) {
 				let t = e.toJSON;
@@ -3342,7 +3477,7 @@ function Gr(e, t, n, r, i) {
 				let r = c(t, String(n), e);
 				return o(r) ? null : r;
 			});
-			if (Wr(e) || a.some((t) => t.isJSType(e))) return e;
+			if (qr(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);
@@ -3360,7 +3495,7 @@ var $ = class extends Array {
 	toJSON() {
 		let e = {};
 		for (let [t, n] of this) {
-			let r = typeof t == "string" ? t : Ur(t).toCDN();
+			let r = typeof t == "string" ? t : Kr(t).toCDN();
 			r === "__proto__" ? Object.defineProperty(e, r, {
 				value: n,
 				writable: !0,
@@ -3372,6 +3507,6 @@ var $ = class extends Array {
 	}
 };
 //#endregion
-export { k as A, I as C, M as D, N as E, s as F, m as I, c as L, g as M, h as N, j as O, o as P, L as S, P as T, at as _, Ir as a, Ue as b, Er as c, ar as d, Ln as f, V as g, qt as h, Rr as i, O as j, A as k, vr as l, Kt as m, Gr as n, Dr as o, dn as p, Ur as r, Tr as s, $ as t, _r as u, tt as v, F as w, R as x, et as y };
+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 };
 
-//# sourceMappingURL=mapEntries-ClxYqDPp.js.map
+//# sourceMappingURL=mapEntries-BZCOgqIt.js.map