@cbortech/cbor 0.25.9 → 0.25.11

package/dist/{mapEntries-I8f0WuwK.js → mapEntries-CYvdsAfP.js}

@@ -1,81 +1,81 @@
-import { n as e, t } from "./tokenizer-CETZf2NR.js";
+import { a as e, i as t, n, o as r, r as i, t as a } from "./tokenizer-DkLlZ1gc.js";
 //#region src/tag.ts
-var n = Symbol.for("cbor.tag"), r = class {
+var o = Symbol.for("cbor.tag"), s = class {
 	valueOf() {
 		return null;
 	}
 	toJSON() {
 		return null;
 	}
-}, i = class {
+}, c = class {
 	valueOf() {}
 	toJSON() {}
 };
-function a(e) {
-	if (!l(e)) return;
-	let t = e[n];
+function l(e) {
+	if (!p(e)) return;
+	let t = e[o];
 	return typeof t == "bigint" ? t : void 0;
 }
-function o(e, t) {
-	let a;
+function u(e, t) {
+	let n;
 	switch (typeof e) {
 		case "number":
-			a = new Number(e);
+			n = new Number(e);
 			break;
 		case "string":
-			a = new String(e);
+			n = new String(e);
 			break;
 		case "boolean":
-			a = new Boolean(e);
+			n = new Boolean(e);
 			break;
 		case "bigint":
-			a = Object(e);
+			n = Object(e);
 			break;
 		case "undefined":
-			a = new i();
+			n = new c();
 			break;
 		case "object":
 			if (e === null) {
-				a = new r();
+				n = new s();
 				break;
 			}
-			a = e;
+			n = e;
 			break;
 		default: throw TypeError(`setCborTag: cannot tag value of type ${typeof e}`);
 	}
-	return a[n] = t, a;
+	return n[o] = t, n;
 }
-function s(e) {
+function d(e) {
 	if (e instanceof Number || e instanceof String || e instanceof Boolean || Object.prototype.toString.call(e) === "[object BigInt]") return e.valueOf();
-	if (e instanceof r) return null;
-	if (!(e instanceof i)) return typeof e == "object" && e && delete e[n], e;
+	if (e instanceof s) return null;
+	if (!(e instanceof c)) return typeof e == "object" && e && delete e[o], e;
 }
-function c(e) {
+function f(e) {
 	if (e instanceof Number || e instanceof String || e instanceof Boolean || Object.prototype.toString.call(e) === "[object BigInt]") return e.valueOf();
-	if (e instanceof r) return null;
-	if (!(e instanceof i)) return e;
+	if (e instanceof s) return null;
+	if (!(e instanceof c)) return e;
 }
-function l(e) {
+function p(e) {
 	return typeof e == "object" && !!e;
 }
-var u = class {
+var m = class {
 	constructor() {}
-	static symbol = n;
-	static Null = r;
-	static Undefined = i;
+	static symbol = o;
+	static Null = s;
+	static Undefined = c;
 	static get(e) {
-		return a(e);
+		return l(e);
 	}
 	static set(e, t) {
-		return o(e, t);
+		return u(e, t);
 	}
 	static remove(e) {
-		return s(e);
+		return d(e);
 	}
 	static getValue(e) {
-		return c(e);
+		return f(e);
 	}
-}, d = Symbol("cbor.omit"), f = class e {
+}, h = Symbol("cbor.omit"), g = class e {
 	value;
 	constructor(e) {
 		if (!Number.isInteger(e) || e < 0 || e > 255) throw RangeError("Simple value must be an integer in 0–255");
@@ -93,42 +93,23 @@ var u = class {
 	static get(t) {
 		return t instanceof e ? t.value : void 0;
 	}
-}, p = Array.from({ length: 256 }, (e, t) => t.toString(16).padStart(2, "0")), m = (/* @__PURE__ */ new Int8Array(128)).fill(-1);
-for (let e = 0; e < 16; e++) m["0123456789abcdef".charCodeAt(e)] = e, m["0123456789ABCDEF".charCodeAt(e)] = e;
-var h = typeof Uint8Array.prototype.toHex == "function", g = typeof Uint8Array.fromHex == "function", ee = 256;
-function te(e) {
-	if (h) return e.toHex();
-	let t = "";
-	for (let n = 0; n < e.length; n++) t += p[e[n]];
-	return t;
-}
-function ne(e) {
-	if (e.length % 2 != 0) throw SyntaxError(`hex string has odd length: ${e.length}`);
-	if (g && e.length >= ee) return Uint8Array.fromHex(e);
-	let t = new Uint8Array(e.length / 2);
-	for (let n = 0, r = 0; n < e.length; n += 2, r++) {
-		let i = e.charCodeAt(n), a = e.charCodeAt(n + 1), o = i < 128 ? m[i] : -1, s = a < 128 ? m[a] : -1;
-		if ((o | s) < 0) {
-			let t = o < 0 ? e[n] : e[n + 1];
-			throw SyntaxError(`invalid character ${JSON.stringify(t)} in hex string`);
-		}
-		t[r] = o << 4 | s;
-	}
-	return t;
-}
+};
 //#endregion
 //#region src/cdn/serialize-utils.ts
-function re(e) {
+function ee(e) {
 	let t = e?.indent;
 	return t === void 0 ? null : typeof t == "number" ? " ".repeat(t) : t;
 }
 function _(e, t) {
 	return e.repeat(t);
 }
-function ie(e) {
+function te(e, t, n) {
+	return t === null ? e.join(" + ") : e.join(` +\n${_(t, n + 1)}`);
+}
+function ne(e) {
 	return !!(e.comments?.leading?.length || e.comments?.trailing?.length || e.comments?.dangling?.length);
 }
-function ae(e) {
+function re(e) {
 	return !!(e.comments?.trailing?.length || e.comments?.dangling?.length);
 }
 function v(e, t) {
@@ -142,17 +123,17 @@ function v(e, t) {
 	}
 	return r;
 }
-function oe(e, t, n) {
+function ie(e, t, n) {
 	return (e.comments?.leading ?? []).map((e) => t + v(e, n));
 }
-function se(e, t) {
+function y(e, t) {
 	let n = e.comments?.trailing ?? [];
 	return n.length === 0 ? "" : " " + n.map((e) => v(e, t)).join(" ");
 }
-function ce(e, t, n) {
+function ae(e, t, n) {
 	return (e.comments?.dangling ?? []).map((e) => t + v(e, n));
 }
-function le(e, t = !1) {
+function oe(e, t = !1) {
 	let n = e?.commas ?? "comma", r = n !== "none";
 	return {
 		inlineSep: r ? t ? "," : ", " : " ",
@@ -161,15 +142,32 @@ function le(e, t = !1) {
 		colSep: t ? ":" : ": "
 	};
 }
-var ue = typeof (/* @__PURE__ */ new Uint8Array()).toBase64 == "function";
-function de(e) {
-	if (ue) return e.toBase64({ omitPadding: !0 });
+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());
+	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";
+	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}`;
+	}
+	let te = _(o, n + 1), ne = _(o, n), v = e.indefiniteLength ? g ? `${r}_ ` : r : `${r}${h}`, y = [];
+	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) : ""}`);
+	}
+	return s && y.push(...ae(e.node, te, c)), `${v}\n${y.join("\n")}\n${ne}${i}`;
+}
+var ce = typeof (/* @__PURE__ */ new Uint8Array()).toBase64 == "function";
+function le(e) {
+	if (ce) return e.toBase64({ omitPadding: !0 });
 	let t = "";
 	for (let n of e) t += String.fromCharCode(n);
 	return btoa(t).replace(/=/g, "");
 }
-function fe(e) {
-	if (ue) return e.toBase64({
+function ue(e) {
+	if (ce) return e.toBase64({
 		alphabet: "base64url",
 		omitPadding: !0
 	});
@@ -177,54 +175,54 @@ function fe(e) {
 	for (let n of e) t += String.fromCharCode(n);
 	return btoa(t).replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
 }
-var pe = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567", me = "0123456789ABCDEFGHIJKLMNOPQRSTUV";
-function he(e, t) {
+var de = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567", fe = "0123456789ABCDEFGHIJKLMNOPQRSTUV";
+function pe(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 ge(e) {
+function me(e) {
 	for (let t of e) {
 		let e = t.codePointAt(0);
 		if (e < 32 || e === 127) return !0;
 	}
 	return !1;
 }
-function _e(e, t, n) {
+function he(e, t, n) {
 	if (n === "string") {
-		let t = ye(e);
-		if (t != null) return Se(t);
+		let t = _e(e);
+		if (t != null) return be(t);
 	}
 	if (n === "printable-string" || n === void 0) {
-		let t = ye(e);
-		if (t != null && !ge(t)) return Se(t);
+		let t = _e(e);
+		if (t != null && !me(t)) return be(t);
 	}
 	switch (t) {
-		case "base64": return `b64'${de(e)}'`;
-		case "base64url": return `b64'${fe(e)}'`;
-		case "base32": return `b32'${he(e, pe)}'`;
-		case "base32hex": return `h32'${he(e, me)}'`;
-		default: return `h'${te(e)}'`;
+		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)}'`;
+		default: return `h'${i(e)}'`;
 	}
 }
-var ve = new TextDecoder("utf-8", { fatal: !0 });
-function ye(e) {
+var ge = new TextDecoder("utf-8", { fatal: !0 });
+function _e(e) {
 	try {
-		return ve.decode(e);
+		return ge.decode(e);
 	} catch {
 		return null;
 	}
 }
-function be(e, t) {
+function ve(e, t) {
 	for (let n = 0; n < e.length; n++) {
 		let r = e.charCodeAt(n);
 		if (r === t || r === 92 || r < 32 || r === 127 || r >= 8192 && (r === 8232 || r === 8233 || r >= 8203 && r <= 8205 || r === 65279)) return !0;
 	}
 	return !1;
 }
-function xe(e, t) {
+function ye(e, t) {
 	let n = t.codePointAt(0);
-	if (!be(e, n)) return t + e + t;
+	if (!ve(e, n)) return t + e + t;
 	let r = t;
 	for (let i of e) {
 		let e = i.codePointAt(0);
@@ -249,40 +247,40 @@ function xe(e, t) {
 	}
 	return r + t;
 }
-function Se(e) {
-	return xe(e, "'");
+function be(e) {
+	return ye(e, "'");
 }
-function Ce(e) {
-	return xe(e, "'");
+function xe(e) {
+	return ye(e, "'");
 }
-function we(e) {
-	return xe(e, "\"");
+function Se(e) {
+	return ye(e, "\"");
 }
-function Te(e) {
+function Ce(e) {
 	if (isNaN(e)) return "NaN";
 	if (!isFinite(e)) return e > 0 ? "Infinity" : "-Infinity";
 	if (Object.is(e, -0)) return "-0.0";
 	let t = e.toString();
 	return t.includes(".") || t.includes("e") ? t : t + ".0";
 }
-function Ee(e, t, n, r) {
+function we(e, t, n, r) {
 	if (r === "never") return "";
 	let i = t ?? n;
 	return r === "always" ? i === "half" ? "_1" : i === "single" ? "_2" : "_3" : t === void 0 || t === n ? "" : t === "half" ? "_1" : t === "single" ? "_2" : "_3";
 }
-function y(e) {
+function b(e) {
 	return e <= 23n ? "i" : e <= 255n ? 0 : e <= 65535n ? 1 : e <= 4294967295n ? 2 : 3;
 }
-function b(e, t, n) {
+function x(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 De = "getFloat16" in DataView.prototype && "setFloat16" in DataView.prototype, Oe = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(8));
-function x(e) {
-	Oe.setFloat64(0, e, !1);
-	let t = Oe.getUint32(0, !1), n = Oe.getUint32(4, !1), r = t >>> 31 & 1, i = t >>> 20 & 2047, a = t & 1048575;
+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;
 	if (i === 2047) {
 		if (a === 0 && n === 0) return r << 15 | 31744;
 		let e = a >> 10 | (n === 0 ? 0 : 1) || 1;
@@ -303,15 +301,27 @@ function x(e) {
 	let u = o <= 0 ? 0 : o;
 	return r << 15 | u << 10 | s;
 }
-function S(e) {
+function C(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 ke = De ? (e, t, n, r) => {
+var De = Te ? (e, t, n, r) => {
 	e.setFloat16(t, n, r);
 } : (e, t, n, r) => {
-	e.setUint16(t, x(n), r);
-}, C = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(8)), w = new Uint8Array(C.buffer), Ae = class {
+	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) {
+	return e <= 23 ? 1 : e <= 255 ? 2 : e <= 65535 ? 3 : e <= 4294967295 ? 5 : 9;
+}
+function je(e) {
+	return e === "i" ? 1 : [
+		2,
+		3,
+		5,
+		9
+	][e];
+}
+var Me = class {
 	buf;
 	len = 0;
 	constructor(e = 256) {
@@ -342,34 +352,45 @@ var ke = De ? (e, t, n, r) => {
 		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) {
-		C.setBigUint64(0, e, !1), this._ensure(8), this.buf.set(w, this.len), this.len += 8;
+		w.setBigUint64(0, e, !1), this._ensure(8), this.buf.set(T, this.len), this.len += 8;
 	}
 	writeFloat16(e) {
-		ke(C, 0, e, !1), this._ensure(2);
+		De(w, 0, e, !1), this._ensure(2);
 		let t = this.buf;
-		t[this.len++] = w[0], t[this.len++] = w[1];
+		t[this.len++] = T[0], t[this.len++] = T[1];
 	}
 	writeFloat32(e) {
-		C.setFloat32(0, e, !1), this._ensure(4);
+		w.setFloat32(0, e, !1), this._ensure(4);
 		let t = this.buf;
-		t[this.len++] = w[0], t[this.len++] = w[1], t[this.len++] = w[2], t[this.len++] = w[3];
+		t[this.len++] = T[0], t[this.len++] = T[1], t[this.len++] = T[2], t[this.len++] = T[3];
 	}
 	writeFloat64(e) {
-		C.setFloat64(0, e, !1), this._ensure(8), this.buf.set(w, this.len), this.len += 8;
+		w.setFloat64(0, e, !1), this._ensure(8), this.buf.set(T, 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);
+			return;
+		}
+		let r = n === void 0 ? Ae(t.length) : je(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;
 	}
 	finish() {
 		return this.buf.slice(0, this.len);
 	}
-}, je = [
+}, Ne = [
 	255n,
 	65535n,
 	4294967295n,
 	18446744073709551615n
 ];
-function Me(e) {
-	return e === "i" ? 23n : je[e];
+function Pe(e) {
+	return e === "i" ? 23n : Ne[e];
 }
-function T(e, t, n, r) {
+function E(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;
@@ -381,30 +402,30 @@ function T(e, t, n, r) {
 			e.writeByte(t << 5 | Number(i));
 			return;
 		}
-		if (i > je[r]) throw RangeError(`value ${i} does not fit in encodingWidth _${r} (max ${je[r]})`);
+		if (i > Ne[r]) throw RangeError(`value ${i} does not fit in encodingWidth _${r} (max ${Ne[r]})`);
 		let n = 24 + r;
 		e.writeByte(t << 5 | n), n === 24 ? e.writeByte(Number(i)) : n === 25 ? e.writeUint16(Number(i)) : n === 26 ? e.writeUint32(Number(i)) : e.writeBigUint64(i);
 		return;
 	}
 	i <= 23n ? e.writeByte(t << 5 | Number(i)) : i <= 255n ? (e.writeByte(t << 5 | 24), e.writeByte(Number(i))) : i <= 65535n ? (e.writeByte(t << 5 | 25), e.writeUint16(Number(i))) : i <= 4294967295n ? (e.writeByte(t << 5 | 26), e.writeUint32(Number(i))) : (e.writeByte(t << 5 | 27), e.writeBigUint64(i));
 }
-function Ne(e, t, n) {
-	let r = new Ae(9);
-	return T(r, e, t, n), r.finish();
+function Fe(e, t, n) {
+	let r = new Me(9);
+	return E(r, e, t, n), r.finish();
 }
-var Pe = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(4));
-function Fe(e) {
-	return Object.is(S(x(e)), e);
+var Ie = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(4));
+function Le(e) {
+	return Object.is(C(S(e)), e);
 }
-function Ie(e) {
-	return Pe.setFloat32(0, e, !1), Object.is(Pe.getFloat32(0, !1), e);
+function Re(e) {
+	return Ie.setFloat32(0, e, !1), Object.is(Ie.getFloat32(0, !1), e);
 }
-function E(e) {
-	return Fe(e) ? "half" : Ie(e) ? "single" : "double";
+function D(e) {
+	return Le(e) ? "half" : Re(e) ? "single" : "double";
 }
 //#endregion
 //#region src/ast/CborItem.ts
-var D = class e {
+var O = class e {
 	start;
 	end;
 	comments;
@@ -414,7 +435,7 @@ var D = class e {
 		let t = this._defaults ? {
 			...this._defaults,
 			...e
-		} : e, n = new Ae();
+		} : e, n = new Me();
 		return this._encode(n, t), n.finish();
 	}
 	toCDN(e) {
@@ -436,14 +457,19 @@ var D = class e {
 		} : e, n = this._toJS(t);
 		if (!t?.reviver) return n;
 		let r = t.reviver.call({ "": n }, "", n);
-		return r === d ? void 0 : r;
+		return r === h ? void 0 : r;
 	}
 	toHexDump(e) {
 		let t = this._defaults ? {
 			...this._defaults,
 			...e
-		} : e, n = t?.indent ?? 3, r = typeof n == "string" ? n : " ".repeat(n), i = (t?.commentStyle ?? "--") + " ", a = this._toHexDump(0, t), o = Math.max(...a.map((e) => e.depth * r.length + e.hex.length)) + 2;
-		return a.map((e) => (r.repeat(e.depth) + e.hex).padEnd(o) + i + e.comment).join("\n");
+		} : e, n = t?.indent ?? 3, r = typeof n == "string" ? n : " ".repeat(n), i = (t?.commentStyle ?? "--") + " ", a = this._toHexDump(0, t), o = 0;
+		for (let e of a) {
+			let t = e.depth * r.length + e.hex.length;
+			t > o && (o = t);
+		}
+		let s = o + 2;
+		return a.map((e) => (r.repeat(e.depth) + e.hex).padEnd(s) + i + e.comment).join("\n");
 	}
 	_encode(t, n) {
 		if (this._toCBOR !== e.prototype._toCBOR) {
@@ -457,17 +483,17 @@ var D = class e {
 		t.writeBytes(this._toCBOR(n));
 	}
 	_toCBOR(e) {
-		let t = new Ae();
+		let t = new Me();
 		return this._encodeTo(t, e), t.finish();
 	}
-	_toHexDump(e, t) {
+	_toHexDump(e, n) {
 		return [{
 			depth: e,
-			hex: Array.from(this._toCBOR(), (e) => e.toString(16).toUpperCase().padStart(2, "0")).join(" "),
-			comment: this._toCDN(t, 0)
+			hex: t(this._toCBOR()),
+			comment: this._toCDN(n, 0)
 		}];
 	}
-}, O = class extends D {
+}, k = class extends O {
 	value;
 	encodingWidth;
 	constructor(e, t) {
@@ -476,10 +502,10 @@ var D = class e {
 		this.encodingWidth = t?.encodingWidth;
 	}
 	_encodeTo(e, t) {
-		T(e, 0, this.value, this.encodingWidth);
+		E(e, 0, this.value, this.encodingWidth);
 	}
 	_toCDN(e, t) {
-		let n = b(e, this.encodingWidth, () => y(this.value)), r = this.value;
+		let n = x(e, this.encodingWidth, () => b(this.value)), r = this.value;
 		switch (e?.intFormat) {
 			case "hex": return `0x${r.toString(16)}${n}`;
 			case "octal": return `0o${r.toString(8)}${n}`;
@@ -491,7 +517,7 @@ var D = 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;
 	}
-}, k = class extends D {
+}, A = class extends O {
 	argument;
 	encodingWidth;
 	constructor(e, t) {
@@ -505,10 +531,10 @@ var D = class e {
 		return -1n - this.argument;
 	}
 	_encodeTo(e, t) {
-		T(e, 1, this.argument, this.encodingWidth);
+		E(e, 1, this.argument, this.encodingWidth);
 	}
 	_toCDN(e, t) {
-		let n = b(e, this.encodingWidth, () => y(this.argument)), r = this.argument + 1n;
+		let n = x(e, this.encodingWidth, () => b(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}`;
@@ -520,8 +546,8 @@ var D = class e {
 		let t = this.value, n = e?.integerAs ?? "auto";
 		return n === "bigint" ? t : n === "number" || t >= BigInt(-(2 ** 53 - 1)) ? Number(t) : t;
 	}
-}, Le = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(8));
-function Re(e) {
+}, ze = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(8));
+function Be(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);
@@ -539,29 +565,30 @@ function Re(e) {
 	let l = c * 2 ** o;
 	return t ? -l : l;
 }
-function ze(e) {
+function Ve(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";
-	Le.setFloat64(0, n, !1);
-	let r = Le.getUint32(0, !1), i = Le.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;
+	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;
 	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 A = class extends D {
+var j = class extends O {
 	value;
 	precision;
 	ednSource;
+	rawBits;
 	constructor(e, t) {
-		super(), this.value = e, this.precision = t?.precision;
+		super(), this.value = e, this.precision = t?.precision, this.rawBits = t?.rawBits;
 	}
 	_encodeTo(e, t) {
-		let n = this.precision ?? E(this.value);
-		n === "half" ? (e.writeByte(249), e.writeFloat16(this.value)) : n === "single" ? (e.writeByte(250), e.writeFloat32(this.value)) : (e.writeByte(251), e.writeFloat64(this.value));
+		let n = this.precision ?? D(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) {
 		let n = e?.encodingIndicators ?? "auto";
@@ -569,18 +596,18 @@ var A = class extends D {
 			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 ?? E(this.value), t = e === "half" ? "_1" : e === "single" ? "_2" : "_3";
+				let e = this.precision ?? D(this.value), t = e === "half" ? "_1" : e === "single" ? "_2" : "_3";
 				return this.ednSource + t;
 			}
 			return this.ednSource;
 		}
-		let r = E(this.value);
-		return (e?.floatFormat === "hex" ? ze(this.value) : Te(this.value)) + Ee(this.value, this.precision, r, n);
+		let r = D(this.value);
+		return (e?.floatFormat === "hex" ? Ve(this.value) : Ce(this.value)) + we(this.value, this.precision, r, n);
 	}
 	_toJS(e) {
 		return this.value;
 	}
-}, j = class extends D {
+}, M = class extends O {
 	tag;
 	content;
 	encodingWidth;
@@ -589,52 +616,59 @@ var A = class extends D {
 		this.content = t, this.encodingWidth = n?.encodingWidth;
 	}
 	_encodeTo(e, t) {
-		T(e, 6, this.tag, this.encodingWidth), this.content._encode(e, t);
+		E(e, 6, this.tag, this.encodingWidth), this.content._encode(e, t);
 	}
 	_toCDN(e, t) {
-		let n = b(e, this.encodingWidth, () => y(this.tag));
+		let n = x(e, this.encodingWidth, () => b(this.tag));
 		return `${this.tag}${n}(${this.content._toCDN(e, t)})`;
 	}
-	_toHexDump(e, t) {
-		let n = [{
+	_toHexDump(e, n) {
+		let r = [{
 			depth: e,
-			hex: ((e) => Array.from(e, (e) => e.toString(16).toUpperCase().padStart(2, "0")).join(" "))(Ne(6, this.tag, this.encodingWidth)),
+			hex: t(Fe(6, this.tag, this.encodingWidth)),
 			comment: `Tag ${this.tag}`
 		}];
-		return n.push(...this.content._toHexDump(e + 1, {
-			...t,
+		return r.push(...this.content._toHexDump(e + 1, {
+			...n,
 			appStrings: !1
-		})), n;
+		})), r;
 	}
 	_toJS(e) {
 		let t = this.content._toJS(e);
-		return e?.stripTags ? t : u.set(t, this.tag);
+		return e?.stripTags ? t : m.set(t, this.tag);
 	}
-}, M = class extends D {
+}, N = class extends O {
 	indefiniteLength = !1;
 	value;
 	ednEncoding;
 	encodingWidth;
 	ednSource;
+	ednParts;
 	constructor(e, t) {
-		super(), this.value = e, this.ednEncoding = t?.ednEncoding ?? "hex", this.encodingWidth = t?.encodingWidth, this.ednSource = t?.ednSource;
+		super(), this.value = e, this.ednEncoding = t?.ednEncoding ?? "hex", this.encodingWidth = t?.encodingWidth, this.ednSource = t?.ednSource, this.ednParts = t?.ednParts;
 	}
 	_encodeTo(e, t) {
-		T(e, 2, this.value.length, this.encodingWidth), e.writeBytes(this.value);
+		E(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;
+			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);
+		}
 		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 = b(e, this.encodingWidth, () => y(BigInt(this.value.length)));
+			let t = x(e, this.encodingWidth, () => b(BigInt(this.value.length)));
 			return this.ednSource + t;
 		}
-		let n = b(e, this.encodingWidth, () => y(BigInt(this.value.length))), r = e?.bstrEncoding ?? this.ednEncoding;
-		return e?.appStrings === !1 && r !== "hex" && (r = "hex"), _e(this.value, r, e?.sqstr) + n;
+		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;
 	}
 	_toJS(e) {
 		return this.value;
 	}
-}, N = class extends D {
+}, P = class extends O {
 	indefiniteLength = !0;
 	chunks;
 	constructor(e) {
@@ -649,12 +683,12 @@ var A = class extends D {
 		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 M(n)._toCDN(e, 0);
+			return new N(n)._toCDN(e, 0);
 		}
 		return this.chunks.length === 0 ? "''_" : `(_ ${this.chunks.map((t) => t._toCDN(e, 0)).join(", ")})`;
 	}
 	_toHexDump(e, t) {
-		let n = (e) => e.toString(16).toUpperCase().padStart(2, "0"), r = [{
+		let r = [{
 			depth: e,
 			hex: n(95),
 			comment: "Start indefinite-length byte string"
@@ -671,7 +705,7 @@ var A = class extends D {
 		for (let e of this.chunks) n.set(e.value, r), r += e.value.length;
 		return n;
 	}
-}, P = class extends D {
+}, F = class extends O {
 	indefiniteLength = !0;
 	chunks;
 	constructor(e) {
@@ -683,10 +717,10 @@ var A = class extends D {
 		e.writeByte(255);
 	}
 	_toCDN(e, t) {
-		return (e?.encodingIndicators ?? "auto") === "never" ? new z(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 B(this.chunks.map((e) => e.value).join(""))._toCDN(e, t) : this.chunks.length === 0 ? "\"\"_" : `(_ ${this.chunks.map((t) => t._toCDN(e, 0)).join(", ")})`;
 	}
 	_toHexDump(e, t) {
-		let n = (e) => e.toString(16).toUpperCase().padStart(2, "0"), r = [{
+		let r = [{
 			depth: e,
 			hex: n(127),
 			comment: "Start indefinite-length text string"
@@ -701,7 +735,7 @@ var A = class extends D {
 	_toJS(e) {
 		return this.chunks.map((e) => e.value).join("");
 	}
-}, F = class extends D {
+}, I = class extends O {
 	items;
 	indefiniteLength;
 	encodingWidth;
@@ -715,47 +749,45 @@ var A = class extends D {
 			e.writeByte(255);
 			return;
 		}
-		T(e, 4, this.items.length, this.encodingWidth);
+		E(e, 4, this.items.length, this.encodingWidth);
 		for (let n of this.items) n._encode(e, t);
 	}
 	_toCDN(e, t) {
-		let n = re(e), r = e?.preserveComments, i = typeof r == "string" ? r : void 0, a = r && (ae(this) || this.items.some(ie));
-		n === null && a && (n = "  ");
-		let { inlineSep: o, multilineSep: s, trailSep: c } = le(e, n === null), l = this.indefiniteLength ? "" : b(e, this.encodingWidth, () => y(BigInt(this.items.length))), u = l ? l + " " : "", d = this.indefiniteLength && (e?.encodingIndicators ?? "auto") !== "never";
-		if (n === null || this.items.length === 0 && !a) {
-			let n = this.items.map((n) => n._toCDN(e, t + 1)).join(o);
-			return this.indefiniteLength ? d ? this.items.length === 0 ? "[_ ]" : `[_ ${n}]` : `[${n}]` : `[${u}${n}]`;
-		}
-		let f = _(n, t + 1), p = _(n, t), m = this.indefiniteLength ? d ? "[_ " : "[" : `[${u}`, h = [];
-		for (let n = 0; n < this.items.length; n++) {
-			let a = this.items[n];
-			r && h.push(...oe(a, f, i));
-			let o = n < this.items.length - 1 ? s : c;
-			h.push(`${f}${a._toCDN(e, t + 1)}${o}${r ? se(a, i) : ""}`);
-		}
-		return r && h.push(...ce(this, f, i)), `${m}\n${h.join("\n")}\n${p}]`;
+		return se({
+			node: this,
+			options: e,
+			depth: t,
+			openChar: "[",
+			closeChar: "]",
+			count: this.items.length,
+			indefiniteLength: this.indefiniteLength,
+			encodingWidth: this.encodingWidth,
+			hasEntryComments: () => this.items.some(ne),
+			renderEntry: (n) => this.items[n]._toCDN(e, t + 1),
+			entryLeadingNode: (e) => this.items[e],
+			entryTrailing: (e, t) => y(this.items[e], t)
+		});
 	}
-	_toHexDump(e, t) {
-		let n = (e) => e.toString(16).toUpperCase().padStart(2, "0"), r = (e) => Array.from(e, (e) => e.toString(16).toUpperCase().padStart(2, "0")).join(" ");
+	_toHexDump(e, r) {
 		if (this.indefiniteLength) {
-			let r = [{
+			let t = [{
 				depth: e,
 				hex: n(159),
 				comment: "Start indefinite-length array"
 			}];
-			for (let n of this.items) r.push(...n._toHexDump(e + 1, t));
-			return r.push({
+			for (let n of this.items) t.push(...n._toHexDump(e + 1, r));
+			return t.push({
 				depth: e,
 				hex: n(255),
 				comment: "\"break\""
-			}), r;
+			}), t;
 		}
 		let i = [{
 			depth: e,
-			hex: r(Ne(4, BigInt(this.items.length), this.encodingWidth)),
+			hex: t(Fe(4, BigInt(this.items.length), this.encodingWidth)),
 			comment: `Array of length ${this.items.length}`
 		}];
-		for (let n of this.items) i.push(...n._toHexDump(e + 1, t));
+		for (let t of this.items) i.push(...t._toHexDump(e + 1, r));
 		return i;
 	}
 	_toJS(e) {
@@ -767,11 +799,11 @@ var A = class extends D {
 		} : void 0, r = this.items.map((e) => e._toJS(n)), i = 0;
 		for (let n = 0; n < this.items.length; n++) {
 			let a = n - i, o = this.items[n]._toJS(e), s = t.call(r, String(n), o);
-			s === d || e?.undefinedOmits && s === void 0 ? (r.splice(a, 1), i++) : r[a] = s;
+			s === h || e?.undefinedOmits && s === void 0 ? (r.splice(a, 1), i++) : r[a] = s;
 		}
 		return r;
 	}
-}, I = class extends D {
+}, L = class extends O {
 	entries;
 	indefiniteLength;
 	encodingWidth;
@@ -785,51 +817,55 @@ var A = class extends D {
 			e.writeByte(255);
 			return;
 		}
-		T(e, 5, this.entries.length, this.encodingWidth);
+		E(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) {
-		let n = re(e), r = e?.preserveComments, i = typeof r == "string" ? r : void 0, a = r && (ae(this) || this.entries.some(([e, t]) => ie(e) || ie(t)));
-		n === null && a && (n = "  ");
-		let { inlineSep: o, multilineSep: s, trailSep: c, colSep: l } = le(e, n === null), u = this.indefiniteLength ? "" : b(e, this.encodingWidth, () => y(BigInt(this.entries.length))), d = u ? u + " " : "", f = this.indefiniteLength && (e?.encodingIndicators ?? "auto") !== "never", p = this.indefiniteLength ? f ? "{_ " : "{" : `{${d}`;
-		if (n === null || this.entries.length === 0 && !a) {
-			let n = this.entries.map(([n, r]) => `${n._toCDN(e, t + 1)}${l}${r._toCDN(e, t + 1)}`).join(o);
-			return this.indefiniteLength ? f ? this.entries.length === 0 ? "{_ }" : `{_ ${n}}` : `{${n}}` : `{${d}${n}}`;
-		}
-		let m = _(n, t + 1), h = _(n, t), g = [];
-		for (let n = 0; n < this.entries.length; n++) {
-			let [a, o] = this.entries[n];
-			r && g.push(...oe(a, m, i));
-			let u = n < this.entries.length - 1 ? s : c, d = r ? Be([
-				...a.comments?.trailing ?? [],
-				...o.comments?.leading ?? [],
-				...o.comments?.trailing ?? []
-			], i) : "";
-			g.push(`${m}${a._toCDN(e, t + 1)}${l}${o._toCDN(e, t + 1)}${u}${d}`);
-		}
-		return r && g.push(...ce(this, m, i)), `${p}\n${g.join("\n")}\n${h}}`;
+		return se({
+			node: this,
+			options: e,
+			depth: t,
+			openChar: "{",
+			closeChar: "}",
+			count: this.entries.length,
+			indefiniteLength: this.indefiniteLength,
+			encodingWidth: this.encodingWidth,
+			hasEntryComments: () => this.entries.some(([e, t]) => ne(e) || ne(t)),
+			renderEntry: (n, r) => {
+				let [i, a] = this.entries[n];
+				return `${i._toCDN(e, t + 1)}${r}${a._toCDN(e, t + 1)}`;
+			},
+			entryLeadingNode: (e) => this.entries[e][0],
+			entryTrailing: (e, t) => {
+				let [n, r] = this.entries[e];
+				return He([
+					...n.comments?.trailing ?? [],
+					...r.comments?.leading ?? [],
+					...r.comments?.trailing ?? []
+				], t);
+			}
+		});
 	}
-	_toHexDump(e, t) {
-		let n = (e) => e.toString(16).toUpperCase().padStart(2, "0"), r = (e) => Array.from(e, (e) => e.toString(16).toUpperCase().padStart(2, "0")).join(" ");
+	_toHexDump(e, r) {
 		if (this.indefiniteLength) {
-			let r = [{
+			let t = [{
 				depth: e,
 				hex: n(191),
 				comment: "Start indefinite-length map"
 			}];
-			for (let [n, i] of this.entries) r.push(...n._toHexDump(e + 1, t)), r.push(...i._toHexDump(e + 1, t));
-			return r.push({
+			for (let [n, i] of this.entries) t.push(...n._toHexDump(e + 1, r)), t.push(...i._toHexDump(e + 1, r));
+			return t.push({
 				depth: e,
 				hex: n(255),
 				comment: "\"break\""
-			}), r;
+			}), t;
 		}
 		let i = [{
 			depth: e,
-			hex: r(Ne(5, BigInt(this.entries.length), this.encodingWidth)),
+			hex: t(Fe(5, BigInt(this.entries.length), this.encodingWidth)),
 			comment: `Map of length ${this.entries.length}`
 		}];
-		for (let [n, r] of this.entries) i.push(...n._toHexDump(e + 1, t)), i.push(...r._toHexDump(e + 1, t));
+		for (let [t, n] of this.entries) i.push(...t._toHexDump(e + 1, r)), i.push(...n._toHexDump(e + 1, r));
 		return i;
 	}
 	_toJS(e) {
@@ -839,17 +875,17 @@ var A = class extends D {
 			let r = e?.undefinedOmits;
 			for (let e = 0; e < n.length; e++) {
 				let [i, a] = n[e], o = t.call(n, i, a);
-				o === d || r && o === void 0 ? n.splice(e--, 1) : n[e] = [i, o];
+				o === h || r && o === void 0 ? n.splice(e--, 1) : n[e] = [i, o];
 			}
 			return n;
 		};
-		return e?.mapAs === "entries" ? n() : e?.mapAs === "object" || this.entries.every(([e]) => e instanceof z) ? (() => {
+		return e?.mapAs === "entries" ? n() : e?.mapAs === "object" || this.entries.every(([e]) => e instanceof B) ? (() => {
 			let n = e ? {
 				...e,
 				reviver: void 0
 			} : void 0, r = {};
 			for (let [e, t] of this.entries) {
-				let i = e instanceof z ? e.value : e.toCDN(), a = t._toJS(n);
+				let i = e instanceof B ? e.value : e.toCDN(), a = t._toJS(n);
 				i === "__proto__" ? Object.defineProperty(r, i, {
 					value: a,
 					writable: !0,
@@ -861,13 +897,13 @@ var A = class extends D {
 			let i = /* @__PURE__ */ new Map();
 			for (let e = 0; e < this.entries.length; e++) {
 				let [t] = this.entries[e];
-				i.set(t instanceof z ? t.value : t.toCDN(), e);
+				i.set(t instanceof B ? t.value : t.toCDN(), e);
 			}
 			for (let n = 0; n < this.entries.length; n++) {
-				let [a, o] = this.entries[n], s = a instanceof z ? a.value : a.toCDN();
+				let [a, o] = this.entries[n], s = a instanceof B ? a.value : a.toCDN();
 				if (i.get(s) !== n) continue;
 				let c = o._toJS(e), l = t.call(r, s, c);
-				l === d || e?.undefinedOmits && l === void 0 ? delete r[s] : s === "__proto__" ? Object.defineProperty(r, s, {
+				l === h || e?.undefinedOmits && l === void 0 ? delete r[s] : s === "__proto__" ? Object.defineProperty(r, s, {
 					value: l,
 					writable: !0,
 					enumerable: !0,
@@ -878,12 +914,12 @@ var A = class extends D {
 		})() : n();
 	}
 };
-function Be(e, t) {
+function He(e, t) {
 	return e.length === 0 ? "" : " " + e.map((e) => v(e, t).trimEnd()).join(" ");
 }
 //#endregion
 //#region src/ast/CborSimple.ts
-var L = class e extends D {
+var R = class e extends O {
 	value;
 	constructor(e) {
 		if (super(), !Number.isInteger(e) || e < 0 || e > 255) throw RangeError("CborSimple value must be an integer in 0–255");
@@ -915,55 +951,55 @@ var L = class e extends D {
 			case 21: return !0;
 			case 22: return null;
 			case 23: return;
-			default: return new f(this.value);
+			default: return new g(this.value);
 		}
 	}
-}, Ve = class extends D {
+}, Ue = class extends O {
 	items;
 	encodingWidth;
 	constructor(e, t) {
 		super(), this.items = e, this.encodingWidth = t?.encodingWidth;
 	}
 	_content(e) {
-		let t = new Ae();
+		let t = new Me();
 		for (let n of this.items) n._encode(t, e);
 		return t.finish();
 	}
 	_encodeTo(e, t) {
 		let n = this._content(t);
-		T(e, 2, n.length, this.encodingWidth), e.writeBytes(n);
+		E(e, 2, n.length, this.encodingWidth), e.writeBytes(n);
 	}
 	_toCDN(e, t) {
-		let n = b(e, this.encodingWidth, () => y(BigInt(this._content(e).length)));
+		let n = x(e, this.encodingWidth, () => b(BigInt(this._content(e).length)));
 		if (this.items.length === 0) return `<<>>${n}`;
-		let r = re(e), { inlineSep: i, multilineSep: a, trailSep: o } = le(e, r === null);
+		let r = ee(e), { inlineSep: i, multilineSep: a, trailSep: o } = oe(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;
 		return `<<\n${l.map((e, t) => t < u ? `${e}${a}` : `${e}${o}`).join("\n")}\n${c}>>${n}`;
 	}
-	_toHexDump(e, t) {
-		let n = (e) => Array.from(e, (e) => e.toString(16).toUpperCase().padStart(2, "0")).join(" "), r = this._content().length, i = [{
+	_toHexDump(e, n) {
+		let r = this._content().length, i = [{
 			depth: e,
-			hex: n(Ne(2, BigInt(r), this.encodingWidth)),
+			hex: t(Fe(2, BigInt(r), this.encodingWidth)),
 			comment: `Embedded CBOR sequence, ${r} byte${r === 1 ? "" : "s"}`
 		}];
-		for (let n of this.items) i.push(...n._toHexDump(e + 1, t));
+		for (let t of this.items) i.push(...t._toHexDump(e + 1, n));
 		return i;
 	}
 	_toJS(e) {
 		return this._content();
 	}
-}, He = 999n, Ue = class extends j {
+}, We = 999n, Ge = class extends M {
 	constructor(e, t) {
-		let n = t.length === 1 && t[0] instanceof z ? t[0] : new F(t);
-		super(He, new F([new z(e), n]));
+		let n = t.length === 1 && t[0] instanceof B ? t[0] : new I(t);
+		super(We, new I([new B(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 z ? `${r}${Ce(i.value)}` : `${r}<<${i.items.map((n) => n._toCDN(e, t)).join(", ")}>>`;
+		return i instanceof B ? `${r}${xe(i.value)}` : `${r}<<${i.items.map((n) => n._toCDN(e, t)).join(", ")}>>`;
 	}
-}, We = class extends D {
+}, Ke = class extends O {
 	inner;
 	ednSource;
 	constructor(e, t) {
@@ -979,15 +1015,15 @@ var L = class e extends D {
 	_toJS(e) {
 		return this.inner._toJS(e);
 	}
-}, Ge = 888n, R = class extends j {
+}, qe = 888n, z = class extends M {
 	constructor(e) {
-		e === void 0 ? super(Ge, L.NULL) : super(Ge, new F(e));
+		e === void 0 ? super(qe, R.NULL) : super(qe, new I(e));
 	}
 	_toCDN(e, t) {
-		return this.content instanceof L ? "..." : this.content instanceof F ? this.content.items.map((n) => n._toCDN(e, t)).join(" + ") : super._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);
 	}
-}, Ke = 2n, qe = 3n, Je = 18446744073709551615n, Ye = -18446744073709551616n;
-function Xe(e) {
+}, Je = 2n, Ye = 3n, Xe = 18446744073709551615n, Ze = -18446744073709551616n;
+function Qe(e) {
 	if (e < 0n) throw RangeError("bigintToBytes requires a non-negative value");
 	if (e === 0n) return /* @__PURE__ */ new Uint8Array();
 	let t = e.toString(16);
@@ -996,16 +1032,16 @@ function Xe(e) {
 	for (let e = 0; e < n.length; e++) n[e] = parseInt(t.slice(e * 2, e * 2 + 2), 16);
 	return n;
 }
-function Ze(e) {
+function $e(e) {
 	let t = 0n;
 	for (let n of e) t = t << 8n | BigInt(n);
 	return t;
 }
-var Qe = class extends j {
+var et = class extends M {
 	bigValue;
 	constructor(e) {
-		if (e <= Je) throw RangeError(`CborBigUint value ${e} fits in CborUint; use CborUint instead`);
-		super(Ke, new M(Xe(e))), this.bigValue = e;
+		if (e <= Xe) throw RangeError(`CborBigUint value ${e} fits in CborUint; use CborUint instead`);
+		super(Je, new N(Qe(e))), this.bigValue = e;
 	}
 	_toCDN(e, t) {
 		return this.bigValue.toString();
@@ -1013,11 +1049,11 @@ var Qe = class extends j {
 	_toJS(e) {
 		return this.bigValue;
 	}
-}, $e = class extends j {
+}, tt = class extends M {
 	bigValue;
 	constructor(e) {
-		if (e >= Ye) throw RangeError(`CborBigNint value ${e} fits in CborNint; use CborNint instead`);
-		super(qe, new M(Xe(-1n - e))), this.bigValue = 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;
 	}
 	_toCDN(e, t) {
 		return this.bigValue.toString();
@@ -1025,25 +1061,25 @@ var Qe = class extends j {
 	_toJS(e) {
 		return this.bigValue;
 	}
-}, et = new TextEncoder(), tt = new TextDecoder("utf-8", { fatal: !0 }), nt = new TextDecoder("utf-8", { fatal: !1 });
-function rt(e, n) {
-	let r = new t(e, {
-		offset: n?.offset,
-		skipRS: n?._skipRS
-	}), i = new ht(r, n ?? {}).parse();
-	return n?.preserveComments && ct(i, r.comments, e), i;
+}, nt = new TextEncoder(), rt = new TextDecoder("utf-8", { fatal: !0 }), it = new TextDecoder("utf-8", { fatal: !1 });
+function at(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;
 }
-function it(e) {
+function ot(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 at(e) {
+function st(e) {
 	return e.startsWith("-") ? -BigInt(e.slice(1)) : BigInt(e);
 }
-function ot(e, t) {
+function ct(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);
@@ -1067,14 +1103,14 @@ function ot(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: Re(n),
+		value: Be(n),
 		precision: r
 	} : {
 		value: parseFloat(n),
 		precision: r
 	};
 }
-function st(e, t) {
+function lt(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)) ?? "";
@@ -1111,49 +1147,65 @@ function st(e, t) {
 	for (let e = 0; e < c.length; e++) l[e] = c.charCodeAt(e);
 	return l;
 }
-function ct(e, t, n) {
+function ut(e, t, n) {
 	if (t.length === 0) return;
-	let r = lt(e), i = dt(n);
-	for (let a of t) {
-		let t = { ...a }, o = [...r].filter((e) => e.end <= a.start).sort((e, t) => t.end - e.end || t.start - e.start)[0], s = o ? n.slice(o.end, a.start) : "";
-		if (o && i(o.end) === a.line && !s.includes(":")) {
-			ut(o.node, "trailing", t);
+	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;
+	for (let t of s) {
+		let r = { ...t }, s = 0, u = o.length;
+		for (; s < u;) {
+			let e = s + u >> 1;
+			o[e].end <= t.start ? s = e + 1 : u = e;
+		}
+		let d = s > 0 ? o[s - 1] : void 0, f = d ? n.slice(d.end, t.start) : "";
+		if (d && i(d.end) === t.line && !f.includes(":")) {
+			ft(d.node, "trailing", r);
 			continue;
 		}
-		let c = [...r].filter((e) => e.start < a.start && a.end < e.end).sort((e, t) => t.start - e.start || e.end - t.end)[0], l = [...r].filter((e) => e.start >= a.end).sort((e, t) => e.start - t.start || t.end - e.end)[0];
-		if ((!c || l && l.end <= c.end) && l) {
-			ut(l.node, "leading", t);
+		for (; l < a.length && a[l].start < t.start;) {
+			let e = a[l++];
+			for (; c.length > 0 && c[c.length - 1].end <= e.start;) c.pop();
+			c.push(e);
+		}
+		for (; c.length > 0 && c[c.length - 1].end <= t.start;) c.pop();
+		let p = c.length > 0 ? c[c.length - 1] : void 0;
+		for (s = 0, u = a.length; s < u;) {
+			let e = s + u >> 1;
+			a[e].start < t.end ? s = e + 1 : u = e;
+		}
+		let m = s < a.length ? a[s] : void 0;
+		if ((!p || m && m.end <= p.end) && m) {
+			ft(m.node, "leading", r);
 			continue;
 		}
-		ut(c?.node ?? e, "dangling", t);
+		ft(p?.node ?? e, "dangling", r);
 	}
 }
-function lt(e) {
+function dt(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 F || e instanceof Ve) {
+		}), e instanceof I || e instanceof Ue) {
 			for (let t of e.items) n(t);
 			return;
 		}
-		if (e instanceof I) {
+		if (e instanceof L) {
 			for (let [t, r] of e.entries) n(t), n(r);
 			return;
 		}
-		if (e instanceof N || e instanceof P) {
+		if (e instanceof P || e instanceof F) {
 			for (let t of e.chunks) n(t);
 			return;
 		}
-		e instanceof j && n(e.content);
+		e instanceof M && n(e.content);
 	};
 	return n(e), t;
 }
-function ut(e, t, n) {
+function ft(e, t, n) {
 	e.comments ??= {}, e.comments[t] ??= [], e.comments[t].push(n);
 }
-function dt(e) {
+function pt(e) {
 	let t = [0];
 	for (let n = 0; n < e.length; n++) e[n] === "\n" && t.push(n + 1);
 	return (n) => {
@@ -1167,15 +1219,15 @@ function dt(e) {
 		return a + 1;
 	};
 }
-var ft = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'extensions' option (extensions: [${e}])`, pt = (e, t) => `install ${t}, import { ${e} } from '${t}', and pass it via the 'extensions' option (extensions: [${e}])`, mt = /* @__PURE__ */ new Map([
-	["b32", ft("b32")],
-	["h32", ft("h32")],
-	["float", ft("float")],
-	["same", ft("same")],
-	["hash", pt("hash", "@cbortech/hash-extension")],
-	["uuid", pt("uuid", "@cbortech/uuid-extension")],
-	["UUID", pt("uuid", "@cbortech/uuid-extension")]
-]), ht = class {
+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}])`, gt = /* @__PURE__ */ new Map([
+	["b32", mt("b32")],
+	["h32", mt("h32")],
+	["float", mt("float")],
+	["same", mt("same")],
+	["hash", ht("hash", "@cbortech/hash-extension")],
+	["uuid", ht("uuid", "@cbortech/uuid-extension")],
+	["UUID", ht("uuid", "@cbortech/uuid-extension")]
+]), _t = class {
 	t;
 	_options;
 	extByPrefix;
@@ -1183,23 +1235,25 @@ var ft = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 	unresolvedExtension;
 	_pendingWarnings = [];
 	_hintedPrefixes = /* @__PURE__ */ new Set();
-	constructor(t, n) {
-		this.t = t, this._options = n, this.extByPrefix = /* @__PURE__ */ new Map(), this.extByTag = /* @__PURE__ */ new Map(), this.unresolvedExtension = n.unresolvedExtension ?? "cpa999";
-		for (let e of [...Z, ...n.extensions ?? []]) {
+	constructor(e, t) {
+		this.t = e, this._options = t, this.extByPrefix = /* @__PURE__ */ new Map(), this.extByTag = /* @__PURE__ */ new Map(), this.unresolvedExtension = t.unresolvedExtension ?? "cpa999";
+		for (let e of [...Z, ...t.extensions ?? []]) {
 			for (let t of e.appStringPrefixes ?? []) this.extByPrefix.set(t, e);
 			for (let t of e.tagNumbers ?? []) this.extByTag.set(t, e);
 		}
-		this.t.onEscapeWarning = (t, n, r, i) => {
-			let a = {
-				message: t,
-				offset: n,
-				line: r,
-				column: i
+		this.t.onEscapeWarning = (e, t, n, i, a) => {
+			let o = {
+				message: e,
+				offset: t,
+				line: n,
+				column: i,
+				endOffset: a
 			};
-			if (this._pendingWarnings.push(a), this._options.onWarning ? this._options.onWarning(a) : this._options.silent || console.warn(`CDN strict violation at line ${r}, column ${i}: ${t}`), this._options.strict !== !1) throw new e(t, {
-				offset: n,
-				line: r,
-				column: i
+			if (this._pendingWarnings.push(o), this._options.onWarning ? this._options.onWarning(o) : this._options.silent || console.warn(`CDN strict violation at line ${n}, column ${i}: ${e}`), this._options.strict !== !1) throw new r(e, {
+				offset: t,
+				line: n,
+				column: i,
+				endOffset: a
 			});
 		};
 	}
@@ -1233,12 +1287,12 @@ var ft = (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 N([]);
-			case "EMPTY_INDEF_TEXT": return this.t.consume(), new P([]);
-			case "TRUE": return this.t.consume(), new L(21);
-			case "FALSE": return this.t.consume(), new L(20);
-			case "NULL": return this.t.consume(), new L(22);
-			case "UNDEFINED": return this.t.consume(), new L(23);
+			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 "SIMPLE": return this.parseSimple();
 			case "LBRACKET": return this.parseArray();
 			case "LBRACE": return this.parseMap();
@@ -1253,21 +1307,21 @@ var ft = (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 Ue(e.appPrefix, [new z(e.value)]);
+					if (r || this._hintMissingExtension(e.appPrefix, e), this.unresolvedExtension === "cpa999") return new Ge(e.appPrefix, [new B(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 M && Object.getPrototypeOf(i) === M.prototype && i.ednSource === void 0 ? new M(i.value, {
+						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, {
 							ednEncoding: i.ednEncoding,
 							encodingWidth: i.encodingWidth,
 							ednSource: e.raw + n
-						}) : (i instanceof A && i.ednSource === void 0 && (i.ednSource = e.raw + n), i);
+						}) : (i instanceof j && 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 Ue(e.appPrefix, [new z(e.value)]);
+						return this._pendingWarnings.length === i && this._warn(t instanceof Error ? t.message : String(t), e), new Ge(e.appPrefix, [new B(e.value)]);
 					}
 				}
 			}
@@ -1285,7 +1339,7 @@ var ft = (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 Ue(e.appPrefix, t);
+					if (this._hintMissingExtension(e.appPrefix, e), this.unresolvedExtension === "cpa999") return new Ge(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);
@@ -1295,61 +1349,61 @@ var ft = (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 A) a.ednSource === void 0 && (a.ednSource = o);
-						else if (i.preserveAppSeqSource) return new We(a, o);
+						if (a instanceof j) a.ednSource === void 0 && (a.ednSource = o);
+						else if (i.preserveAppSeqSource) return new Ke(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 Ue(e.appPrefix, t);
+						return this._pendingWarnings.length === a && this._warn(n instanceof Error ? n.message : String(n), e), new Ge(e.appPrefix, t);
 					}
 				}
 			}
 			case "ELLIPSIS": {
-				if (this.t.consume(), this.t.peek().type !== "PLUS") return new R();
-				let e = [new R()];
+				if (this.t.consume(), this.t.peek().type !== "PLUS") return new z();
+				let e = [new z()];
 				for (; this.t.peek().type === "PLUS";) this.t.consume(), e.push(this.parseValue());
-				return new R(e);
+				return new z(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 } = it(e.value), r = n === void 0 ? this.consumeEncodingIndicator() : this._resolveEncodingWidth(n, e), i = at(t);
-		if (i > 18446744073709551615n) return this.t.peek().type === "LPAREN" && this._fail("tag number exceeds maximum uint64", e), new Qe(i);
-		if (i < -18446744073709551616n) return new $e(i);
+		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);
 		if (r !== void 0) {
 			let t = i >= 0n ? i : -(i + 1n);
 			r = this._validateEncodingFit(t, r, e);
 		}
-		let a = i >= 0n ? new O(i, r === void 0 ? void 0 : { encodingWidth: r }) : new k(i, r === void 0 ? void 0 : { encodingWidth: r });
+		let a = i >= 0n ? new k(i, r === void 0 ? void 0 : { encodingWidth: r }) : new A(i, r === void 0 ? void 0 : { encodingWidth: r });
 		if (this.t.peek().type === "LPAREN") {
-			a instanceof O || this._fail("tag number must be non-negative", e), this.t.consume();
+			a instanceof k || 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 j && 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 M && r !== void 0 && e.encodingWidth === void 0 && (e.encodingWidth = r), t.length > 0 && (e.warnings ??= [], e.warnings.push(...t)), e;
 			}
-			let s = new j(i, n, r === void 0 ? void 0 : { encodingWidth: r });
+			let s = new M(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 } = ot(e.value, t);
+		let e = this.t.consume(), t = (t) => this._warnOrFail(t, e), { value: n, precision: r } = ct(e.value, t);
 		if (r === "half" || r === "single") {
-			let e = r === "half" ? S(x(n)) : Math.fround(n);
+			let e = r === "half" ? C(S(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 A(n, r === void 0 ? void 0 : { precision: r });
+		return new j(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(et.encode(e.value).length));
-			return new z(e.value, t === void 0 ? void 0 : { encodingWidth: t });
+			let t = this.consumeEncodingIndicator(() => BigInt(nt.encode(e.value).length));
+			return new B(e.value, t === void 0 ? void 0 : { encodingWidth: t });
 		}
 		let t = !1, n = [{ text: e.value }];
 		for (; this.t.peek().type === "PLUS";) {
@@ -1358,36 +1412,50 @@ var ft = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 			e.type === "ELLIPSIS" ? (this.t.consume(), n.push({ ellipsis: !0 }), t = !0) : e.type === "TSTR" || e.type === "RAWSTRING" ? (this.t.consume(), n.push({ 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 : "").join(""), t = this.consumeEncodingIndicator(() => BigInt(et.encode(e).length));
-			return new z(e, t === void 0 ? void 0 : { encodingWidth: t });
+			let e = n.map((e) => "text" in e ? e.text : ""), t = e.join(""), r = this.consumeEncodingIndicator(() => BigInt(nt.encode(t).length));
+			return new B(t, {
+				ednParts: e,
+				...r === void 0 ? {} : { encodingWidth: r }
+			});
 		}
 		let r = [], i = "";
-		for (let e of n) "ellipsis" in e ? (i !== "" && (r.push(new z(i)), i = ""), r.push(new R())) : i += e.text;
-		return i !== "" && r.push(new z(i)), new R(r);
+		for (let e of n) "ellipsis" in e ? (i !== "" && (r.push(new B(i)), i = ""), r.push(new z())) : i += e.text;
+		return i !== "" && r.push(new B(i)), new z(r);
 	}
 	_isBytesToken(e) {
 		return e === "BYTES_HEX" || e === "SQSTR" || e === "BYTES_B64";
 	}
-	_decodeBytesToken(t) {
-		let n = (e) => this._warnOrFail(e, t);
-		switch (t.type) {
-			case "BYTES_HEX":
-			case "SQSTR": return ne(t.value);
+	_hexToBytes(t, n) {
+		try {
+			return e(t);
+		} catch (e) {
+			if (e instanceof r || !(e instanceof SyntaxError)) throw e;
+			this._fail(e.message, n);
+		}
+	}
+	_decodeBytesToken(e) {
+		let t = (t) => this._warnOrFail(t, e);
+		switch (e.type) {
+			case "SQSTR": {
+				let t = e._sqstrBytes;
+				return t === void 0 ? this._hexToBytes(e.value, e) : t;
+			}
+			case "BYTES_HEX": return this._hexToBytes(e.value, e);
 			case "BYTES_B64": try {
-				return st(t.value, n);
-			} catch (n) {
-				if (n instanceof e || !(n instanceof SyntaxError)) throw n;
-				this._fail(n.message, t);
+				return lt(e.value, t);
+			} catch (t) {
+				if (t instanceof r || !(t instanceof SyntaxError)) throw t;
+				this._fail(t.message, e);
 			}
-			default: this._fail("expected byte string token", t);
+			default: this._fail("expected byte string token", e);
 		}
 	}
 	_decodeUtf8(e, t) {
-		if (this._options.allowInvalidUtf8) return nt.decode(e);
+		if (this._options.allowInvalidUtf8) return it.decode(e);
 		try {
-			return tt.decode(e);
+			return rt.decode(e);
 		} catch {
-			return this._warnOrFail("byte string in text concatenation is not valid UTF-8", t), nt.decode(e);
+			return this._warnOrFail("byte string in text concatenation is not valid UTF-8", t), it.decode(e);
 		}
 	}
 	_tokenTypeToCdnEncoding(e) {
@@ -1396,60 +1464,70 @@ var ft = (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 M(e, {
+			return new N(e, {
 				ednEncoding: this._tokenTypeToCdnEncoding(t),
 				ednSource: n,
 				...r === void 0 ? {} : { encodingWidth: r }
 			});
 		}
-		let r = !1, i = [{ bytes: e }];
+		let r = !1, i = [{
+			bytes: e,
+			source: n
+		}];
 		for (; this.t.peek().type === "PLUS";) {
 			this.t.consume();
 			let e = this.t.peek();
 			if (e.type === "ELLIPSIS") this.t.consume(), i.push({ ellipsis: !0 }), r = !0;
 			else if (e.type === "BYTES_HEX_ELIDED") {
 				this.t.consume();
-				let t = this._buildBytesElidedItems(e.value);
-				for (let e of t) e instanceof R ? (i.push({ ellipsis: !0 }), r = !0) : e instanceof M && i.push({ bytes: e.value });
-			} else this._isBytesToken(e.type) ? (this.t.consume(), i.push({ bytes: this._decodeBytesToken(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: et.encode(e.value) })) : this._fail(`expected byte string after +, got ${JSON.stringify(e.value)}`, e);
+				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 });
+			} 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);
 		}
 		if (!r) {
-			let e = i.map((e) => "bytes" in e ? e.bytes : /* @__PURE__ */ new Uint8Array()), t = this._concatBytes(e), n = this.consumeEncodingIndicator(() => BigInt(t.length));
-			return new M(t, n === void 0 ? void 0 : { encodingWidth: n });
+			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, {
+				ednEncoding: this._tokenTypeToCdnEncoding(t),
+				ednParts: e,
+				...r === void 0 ? {} : { encodingWidth: r }
+			});
 		}
 		let a = [], o = [], s = () => {
-			o.length > 0 && (a.push(new M(this._concatBytes([...o]))), o.length = 0);
+			o.length > 0 && (a.push(new N(this._concatBytes([...o]))), o.length = 0);
 		};
-		for (let e of i) "ellipsis" in e ? (s(), a.push(new R())) : o.push(e.bytes);
-		return s(), new R(a);
+		for (let e of i) "ellipsis" in e ? (s(), a.push(new z())) : o.push(e.bytes);
+		return s(), new z(a);
 	}
 	_parseHexElidedConcat(e) {
-		let t = this._buildBytesElidedItems(e.value);
+		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 R());
+			if (e.type === "ELLIPSIS") this.t.consume(), t.push(new z());
 			else if (e.type === "BYTES_HEX_ELIDED") {
 				this.t.consume();
-				let n = this._buildBytesElidedItems(e.value);
+				let n = this._buildBytesElidedItems(e.value, e);
 				this._mergeFirstBytesItem(t, n);
 			} else if (this._isBytesToken(e.type)) {
 				this.t.consume();
 				let n = this._decodeBytesToken(e), r = t[t.length - 1];
-				r instanceof M ? t[t.length - 1] = new M(this._concatBytes([r.value, n])) : t.push(new M(n));
+				r instanceof N ? t[t.length - 1] = new N(this._concatBytes([r.value, n])) : t.push(new N(n));
 			} else this._fail(`expected byte string after +, got ${JSON.stringify(e.value)}`, e);
 		}
-		return new R(t);
+		return new z(t);
 	}
-	_buildBytesElidedItems(e) {
-		let t = e.split("..."), n = [];
-		for (let e = 0; e < t.length; e++) e > 0 && n.push(new R()), t[e].length > 0 && n.push(new M(ne(t[e])));
-		return n;
+	_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)));
+		return r;
 	}
 	_mergeFirstBytesItem(e, t) {
 		if (t.length === 0) return;
 		let n = e[e.length - 1], r = t[0];
-		n instanceof M && r instanceof M ? (e[e.length - 1] = new M(this._concatBytes([n.value, r.value])), e.push(...t.slice(1))) : e.push(...t);
+		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);
 	}
 	_concatBytes(e) {
 		let t = e.reduce((e, t) => e + t.byteLength, 0), n = new Uint8Array(t), r = 0;
@@ -1460,8 +1538,8 @@ var ft = (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 } = it(e.value), n = Number(at(t));
-		return this.expect("RPAREN"), new L(n);
+		let { numStr: t } = ot(e.value), n = Number(st(t));
+		return this.expect("RPAREN"), new R(n);
 	}
 	parseEmbeddedCBOR() {
 		this.t.consume();
@@ -1478,7 +1556,7 @@ var ft = (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 Ve(e, { encodingWidth: t });
+		return new Ue(e, { encodingWidth: t });
 	}
 	parseArray() {
 		this.t.consume();
@@ -1492,7 +1570,7 @@ var ft = (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 F(i, {
+		let a = new I(i, {
 			indefiniteLength: e,
 			encodingWidth: t
 		});
@@ -1513,7 +1591,7 @@ var ft = (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 I(i, {
+		let a = new L(i, {
 			indefiniteLength: e,
 			encodingWidth: t
 		});
@@ -1537,16 +1615,16 @@ var ft = (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 M) {
-			let e = new N(n.map((e, t) => {
-				if (e instanceof M) return e;
+		if (r instanceof N) {
+			let e = new P(n.map((e, t) => {
+				if (e instanceof N) 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 z) {
-			let e = new P(n.map((e, t) => {
-				if (e instanceof z) return e;
+		if (r instanceof B) {
+			let e = new F(n.map((e, t) => {
+				if (e instanceof B) 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;
@@ -1564,47 +1642,47 @@ var ft = (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 A) {
+		if (e instanceof j) {
 			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" ? S(x(e.value)) : Math.fround(e.value);
+					let t = r === "half" ? C(S(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 O) {
+		} else if (e instanceof k) {
 			if (e.encodingWidth === void 0) {
 				let r = this._validateEncodingFit(e.value, t, n);
 				r !== void 0 && (e.encodingWidth = r);
 			}
-		} else if (e instanceof k) {
+		} else if (e instanceof A) {
 			if (e.encodingWidth === void 0) {
 				let r = this._validateEncodingFit(e.argument, 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(BigInt(e.value.length), t, n);
 				r !== void 0 && (e.encodingWidth = r);
 			}
-		} else if (e instanceof z) {
+		} else if (e instanceof B) {
 			if (e.encodingWidth === void 0) {
-				let r = this._validateEncodingFit(BigInt(et.encode(e.value).length), t, n);
+				let r = this._validateEncodingFit(BigInt(nt.encode(e.value).length), t, n);
 				r !== void 0 && (e.encodingWidth = r);
 			}
-		} else if (e instanceof F) {
+		} else if (e instanceof I) {
 			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 I) {
+		} else if (e instanceof L) {
 			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 j) {
+		} else if (e instanceof M) {
 			if (e.encodingWidth === void 0) {
 				let r = this._validateEncodingFit(e.tag, t, n);
 				r !== void 0 && (e.encodingWidth = r);
@@ -1612,7 +1690,7 @@ var ft = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 		} else this._warnOrFail(`encoding indicator _${t} is not applicable to this app-string result type`, n);
 	}
 	_validateEncodingFit(e, t, n) {
-		let r = Me(t);
+		let r = Pe(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);
@@ -1636,77 +1714,109 @@ var ft = (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 = mt.get(e);
+		let n = gt.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,
-			offset: t.offset,
-			line: t.line,
-			column: t.col
+			...vt(t)
 		}) : this._options.silent || console.warn(`CDN: ${r}`);
 	}
 	_warn(e, t) {
 		let n = { message: e };
-		if (t !== void 0 && (n.offset = t.offset, n.line = t.line, n.column = t.col), this._pendingWarnings.push(n), this._options.onWarning) this._options.onWarning(n);
+		if (t !== void 0 && Object.assign(n, vt(t)), this._pendingWarnings.push(n), this._options.onWarning) this._options.onWarning(n);
 		else if (!this._options.silent) {
 			let n = t ? ` at line ${t.line}, column ${t.col}` : "";
 			console.warn(`CDN strict violation${n}: ${e}`);
 		}
 	}
-	_fail(t, n) {
-		throw new e(t, n ? {
-			offset: n.offset,
-			line: n.line,
-			column: n.col,
-			endOffset: n.endOffset
-		} : void 0);
+	_fail(e, t) {
+		throw new r(e, t ? vt(t) : void 0);
 	}
-}, gt = new TextEncoder(), _t = !1, z = class extends D {
+};
+function vt(e) {
+	return {
+		offset: e.offset,
+		line: e.line,
+		column: e.col,
+		endOffset: e.endOffset
+	};
+}
+//#endregion
+//#region src/ast/CborTextString.ts
+var yt = new TextEncoder(), bt = !1, B = class extends O {
 	indefiniteLength = !1;
 	value;
 	encodingWidth;
+	ednParts;
 	constructor(e, t) {
-		super(), this.value = e, this.encodingWidth = t?.encodingWidth;
+		super(), this.value = e, this.encodingWidth = t?.encodingWidth, this.ednParts = t?.ednParts;
 	}
 	_encodeTo(e, t) {
-		let n = gt.encode(this.value);
-		T(e, 3, n.length, this.encodingWidth), e.writeBytes(n);
+		e.writeTextString(3, this.value, this.encodingWidth);
 	}
 	_toCDN(e, t) {
-		let n = b(e, this.encodingWidth, () => y(BigInt(gt.encode(this.value).length)));
-		return vt(this.value, n, e, t);
+		let n = x(e, this.encodingWidth, () => b(BigInt(yt.encode(this.value).length)));
+		return xt(this.value, n, e, t, this.ednParts);
 	}
 	_toJS(e) {
 		return this.value;
 	}
 };
-function vt(e, t, n, r) {
-	let i = yt(n?.textStringFormat ?? []), a = re(n);
-	if (i.length === 0 || a === null) return we(e) + t;
-	let o = /* @__PURE__ */ new Map(), s = null;
-	if (i.includes("cdn") && (s = xt(e), s !== null)) for (let { point: e, contentDepth: t } of s) o.set(e, t);
-	if (i.includes("newline")) {
-		let t = s === null ? bt(e, 0) : St(e);
-		for (let { point: e, contentDepth: n } of t) o.has(e) || o.set(e, n);
-	}
-	let c = kt(e, o);
-	if (c.length <= 1) return we(e) + t;
-	let l = c.map(({ text: e }, n) => {
-		let r = we(e);
-		return n === c.length - 1 ? r + t : r;
-	}), u = l[0];
-	for (let e = 1; e < l.length; e++) {
-		let t = _(a, r + 1 + c[e].contentDepth);
-		u += ` +\n${t}${l[e]}`;
-	}
-	return u;
-}
-function yt(e) {
-	return e.map((e) => e === "cboredn" ? (_t || (_t = !0, console.warn("`textStringFormat: ['cboredn']` is deprecated; use `textStringFormat: ['cdn']` instead.")), "cdn") : e);
-}
-function bt(e, t) {
+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) => ({
+		text: e,
+		contentDepth: 0
+	})), 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) {
+		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);
+	}
+	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 d = Pt(e, u);
+	return d.length <= 1 ? Se(e) + t : St(d, t, s, 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;
+	});
+	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);
+		a += ` +\n${o}${i[t]}`;
+	}
+	return a;
+}
+function Ct(e) {
+	let t = e?.splitCdn === void 0 || e?.splitNewline === void 0 ? wt(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 Tt(e, t) {
 	let n = [];
 	for (let r = 0; r < e.length; r++) {
 		let i = e[r];
@@ -1723,75 +1833,75 @@ function bt(e, t) {
 	}
 	return n;
 }
-function xt(e) {
+function Et(e) {
 	try {
-		rt(e);
+		at(e);
 	} catch {
 		return null;
 	}
-	let n = [], r = new t(e), i = 0, a = null, o = !1, s = 0;
+	let t = [], n = new a(e), r = 0, i = null, o = !1, s = 0;
 	for (;;) {
-		let t = r.consume();
-		if (t.type === "EOF") break;
+		let a = n.consume();
+		if (a.type === "EOF") break;
 		let c = !1;
-		if (o || (o = !0, t.offset > 0 && Dt(r.comments, 0, t.offset) && n.push({
-			point: t.offset,
-			contentDepth: i
-		})), a !== null) {
-			if (a.kind === "opener" && wt.has(t.type)) {
-				a.point = t.endOffset, s = t.endOffset;
+		if (o || (o = !0, a.offset > 0 && Mt(n.comments, 0, a.offset) && t.push({
+			point: a.offset,
+			contentDepth: r
+		})), i !== null) {
+			if (i.kind === "opener" && kt.has(a.type)) {
+				i.point = a.endOffset, s = a.endOffset;
 				continue;
-			} else a.kind === "opener" && Et.has(t.type) && Ot(e, a.point, t.offset) ? c = !0 : n.push({
-				point: t.offset,
-				contentDepth: a.contentDepth
+			} else i.kind === "opener" && jt.has(a.type) && Nt(e, i.point, a.offset) ? c = !0 : t.push({
+				point: a.offset,
+				contentDepth: i.contentDepth
 			});
-			a = null;
+			i = null;
 		}
-		Tt.has(t.type) ? (i++, a = {
-			point: t.endOffset,
-			contentDepth: i,
+		At.has(a.type) ? (r++, i = {
+			point: a.endOffset,
+			contentDepth: r,
 			kind: "opener"
-		}) : Et.has(t.type) ? (i = Math.max(0, i - 1), c || n.push({
-			point: t.offset,
-			contentDepth: i
-		})) : t.type === "COMMA" && (a = {
-			point: t.endOffset,
-			contentDepth: i,
+		}) : jt.has(a.type) ? (r = Math.max(0, r - 1), c || t.push({
+			point: a.offset,
+			contentDepth: r
+		})) : a.type === "COMMA" && (i = {
+			point: a.endOffset,
+			contentDepth: r,
 			kind: "comma"
-		}), s = t.endOffset;
+		}), s = a.endOffset;
 	}
-	let c = r.comments.find((e) => e.start >= s);
-	return c !== void 0 && n.push({
+	let c = n.comments.find((e) => e.start >= s);
+	return c !== void 0 && t.push({
 		point: c.start,
-		contentDepth: i
-	}), n;
+		contentDepth: r
+	}), t;
 }
-function St(e) {
-	let n = [], r = new t(e), i = 0;
+function Dt(e) {
+	let t = [], n = new a(e), r = 0;
 	for (;;) {
-		let t = r.consume();
-		if (t.type === "EOF") break;
-		if (Tt.has(t.type)) i++;
-		else if (Et.has(t.type)) i = Math.max(0, i - 1);
-		else if (t.type !== "COMMA") {
-			if (t.type === "TSTR") {
-				let r = e.slice(t.offset, t.endOffset);
-				for (let e of Ct(r)) n.push({
-					point: t.offset + e,
-					contentDepth: i + 1
+		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);
+		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({
+					point: i.offset + e,
+					contentDepth: r + 1
 				});
-			} else if (t.type === "RAWSTRING") {
-				let r = e.slice(t.offset, t.endOffset);
-				for (let { point: e } of bt(r, 0)) n.push({
-					point: t.offset + e,
-					contentDepth: i + 1
+			} else if (i.type === "RAWSTRING") {
+				let n = e.slice(i.offset, i.endOffset);
+				for (let { point: e } of Tt(n, 0)) t.push({
+					point: i.offset + e,
+					contentDepth: r + 1
 				});
 			}
 		}
 	}
-	return n;
+	return t;
 }
-function Ct(e) {
+function Ot(e) {
 	let t = [], n = 1, r = e.length - 1;
 	for (; n < r;) {
 		let r = e[n];
@@ -1807,24 +1917,24 @@ function Ct(e) {
 	}
 	return t;
 }
-var wt = /* @__PURE__ */ new Set(["ENCODING_INDICATOR", "UNDERSCORE"]), Tt = /* @__PURE__ */ new Set([
+var kt = /* @__PURE__ */ new Set(["ENCODING_INDICATOR", "UNDERSCORE"]), At = /* @__PURE__ */ new Set([
 	"LBRACKET",
 	"LBRACE",
 	"LPAREN",
 	"LT_LT"
-]), Et = /* @__PURE__ */ new Set([
+]), jt = /* @__PURE__ */ new Set([
 	"RBRACKET",
 	"RBRACE",
 	"RPAREN",
 	"GT_GT"
 ]);
-function Dt(e, t, n) {
+function Mt(e, t, n) {
 	return e.some((e) => e.start >= t && e.end <= n);
 }
-function Ot(e, t, n) {
+function Nt(e, t, n) {
 	return /^[\t\n\r ]*$/.test(e.slice(t, n));
 }
-function kt(e, t) {
+function Pt(e, t) {
 	let n = [...t].filter(([t]) => t > 0 && t < e.length).sort(([e], [t]) => e - t);
 	if (n.length === 0) return [{
 		text: e,
@@ -1842,7 +1952,7 @@ function kt(e, t) {
 }
 //#endregion
 //#region src/extensions/dt.ts
-function B(e) {
+function V(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");
@@ -1850,17 +1960,17 @@ function B(e) {
 	for (; s.length < 3;) s += "0";
 	return `${i}.${s}Z`;
 }
-var At = new TextDecoder("utf-8", { fatal: !0 });
-function jt(e) {
+var Ft = new TextDecoder("utf-8", { fatal: !0 });
+function It(e) {
 	if (e.length !== 1) throw SyntaxError("dt<<...>>: expected exactly one item");
 	let t = e[0];
-	if (t instanceof z) return t.value;
-	if (t instanceof M) return At.decode(t.value);
+	if (t instanceof B) return t.value;
+	if (t instanceof N) return Ft.decode(t.value);
 	throw SyntaxError("dt<<...>>: expected a text string or byte string");
 }
-var Mt = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?(Z|[+-]\d{2}:\d{2})$/i;
-function Nt(e, t) {
-	if (!Mt.test(e)) {
+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)) {
 		let n = `dt: invalid RFC 3339 date-time: ${JSON.stringify(e)}`;
 		if (t) t(n);
 		else throw SyntaxError(n);
@@ -1871,93 +1981,93 @@ function Nt(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 Ft(BigInt(e)) : new It(BigInt(e));
+		return e >= 0 ? new Bt(BigInt(e)) : new Vt(BigInt(e));
 	}
-	return new Lt(a / 1e3 + i);
+	return new Ht(a / 1e3 + i);
 }
-var Pt = 1n, Ft = class extends O {
+var zt = 1n, Bt = class extends k {
 	constructor(e, t) {
 		super(e, t);
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
-		let n = b(e, this.encodingWidth, () => y(this.value));
-		return `dt'${B(Number(this.value))}'${n}`;
+		let n = x(e, this.encodingWidth, () => b(this.value));
+		return `dt'${V(Number(this.value))}'${n}`;
 	}
-}, It = class extends k {
+}, Vt = class extends A {
 	constructor(e, t) {
 		super(e, t);
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
-		let n = b(e, this.encodingWidth, () => y(this.argument));
-		return `dt'${B(Number(this.value))}'${n}`;
+		let n = x(e, this.encodingWidth, () => b(this.argument));
+		return `dt'${V(Number(this.value))}'${n}`;
 	}
-}, Lt = class extends A {
+}, Ht = class extends j {
 	constructor(e, t) {
 		super(e, t);
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
-		let n = E(this.value), r = Ee(this.value, this.precision, n, e?.encodingIndicators ?? "auto");
-		return `dt'${B(this.value)}'${r}`;
+		let n = D(this.value), r = we(this.value, this.precision, n, e?.encodingIndicators ?? "auto");
+		return `dt'${V(this.value)}'${r}`;
 	}
-}, Rt = class extends j {
+}, Ut = class extends M {
 	constructor(e, t) {
-		super(Pt, typeof e == "string" ? Nt(e) : e, t);
+		super(zt, typeof e == "string" ? Rt(e) : e, t);
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
 		let n = this.content;
-		if (n instanceof A ? n.precision !== void 0 && n.precision !== E(n.value) : n.encodingWidth !== void 0) return super._toCDN({
+		if (n instanceof j ? n.precision !== void 0 && n.precision !== D(n.value) : n.encodingWidth !== void 0) return super._toCDN({
 			...e,
 			appStrings: !1
 		}, t);
-		let r = n instanceof A ? n.value : Number(n.value), i = b(e, this.encodingWidth, () => y(Pt));
-		return `DT'${B(r)}'${i}`;
+		let r = n instanceof j ? n.value : Number(n.value), i = x(e, this.encodingWidth, () => b(zt));
+		return `DT'${V(r)}'${i}`;
 	}
-}, zt = class extends Rt {
+}, Wt = class extends Ut {
 	constructor(e, t) {
 		super(e, t);
 	}
 	_toJS(e) {
-		let t = this.content, n = t instanceof A ? t.value * 1e3 : Number(t.value) * 1e3;
+		let t = this.content, n = t instanceof j ? t.value * 1e3 : Number(t.value) * 1e3;
 		return new Date(n);
 	}
 };
-function Bt(e) {
+function Gt(e) {
 	let t = e?.jsDate ?? !1;
 	function n(e) {
-		return t ? new zt(e) : new Rt(e);
+		return t ? new Wt(e) : new Ut(e);
 	}
 	let r = {
 		appStringPrefixes: ["dt", "DT"],
-		tagNumbers: [Pt],
+		tagNumbers: [zt],
 		parseAppString(e, t, r) {
-			return e === "DT" ? n(t) : Nt(t, r);
+			return e === "DT" ? n(t) : Rt(t, r);
 		},
 		parseAppSequence(e, t, r) {
-			let i = jt(t);
-			return e === "DT" ? n(i) : Nt(i, r);
+			let i = It(t);
+			return e === "DT" ? n(i) : Rt(i, r);
 		},
 		parseTag(e, n) {
 			if (e !== 1n) return;
 			let r;
-			if (n instanceof O) r = new Ft(n.value, { encodingWidth: n.encodingWidth });
-			else if (n instanceof k) r = new It(n.value, { encodingWidth: n.encodingWidth });
-			else if (n instanceof A) r = new Lt(n.value), n.precision !== void 0 && (r.precision = n.precision);
+			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);
 			else return;
-			return r.start = n.start, r.end = n.end, t ? new zt(r) : new Rt(r);
+			return r.start = n.start, r.end = n.end, t ? new Wt(r) : new Ut(r);
 		}
 	};
 	return t && (r.fromJS = (e, t) => {
-		if (e instanceof Date) return new zt(B(e.getTime() / 1e3));
+		if (e instanceof Date) return new Wt(V(e.getTime() / 1e3));
 	}, r.isJSType = (e) => e instanceof Date), r;
 }
-var Vt = Bt(), Ht = Bt({ jsDate: !0 });
+var Kt = Gt(), qt = Gt({ jsDate: !0 });
 //#endregion
 //#region src/utils/ip.ts
-function Ut(e) {
+function Jt(e) {
 	let t = e.split(".");
 	if (t.length !== 4) throw SyntaxError(`ip: invalid IPv4 address: ${JSON.stringify(e)}`);
 	let n = /* @__PURE__ */ new Uint8Array(4);
@@ -1970,11 +2080,11 @@ function Ut(e) {
 	}
 	return n;
 }
-function Wt(e) {
+function Yt(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 = Ut(i[2]));
+	i && (n = i[1], n.endsWith(":") && (n += ":"), r = Jt(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;
@@ -1991,11 +2101,11 @@ function Wt(e) {
 	}
 	return r && t.set(r, 12), t;
 }
-function Gt(e) {
+function Xt(e) {
 	return Array.from(e).join(".");
 }
-function Kt(e) {
-	let t = e.slice(0, 10).every((e) => e === 0) && e[10] === 255 && e[11] === 255 ? Gt(e.slice(12)) : null, n = t ? 6 : 8, r = [];
+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 = [];
 	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) {
@@ -2009,29 +2119,29 @@ function Kt(e) {
 }
 //#endregion
 //#region src/extensions/ip.ts
-var qt = "ip", V = "IP", H = 52n, Jt = 54n, Yt = new TextDecoder("utf-8", { fatal: !0 });
-function Xt(e) {
+var Qt = "ip", H = "IP", U = 52n, $t = 54n, en = new TextDecoder("utf-8", { fatal: !0 });
+function tn(e) {
 	if (e.length !== 1) throw SyntaxError("ip<<...>>: expected exactly one item");
 	let t = e[0];
-	if (t instanceof z) return t.value;
-	if (t instanceof M) return Yt.decode(t.value);
+	if (t instanceof B) return t.value;
+	if (t instanceof N) return en.decode(t.value);
 	throw SyntaxError("ip<<...>>: expected a text string or byte string");
 }
-function Zt(e) {
+function nn(e) {
 	return /^\d/.test(e) && e.includes(".") && !e.includes(":") ? {
-		bytes: Ut(e),
+		bytes: Jt(e),
 		isV4: !0
 	} : {
-		bytes: Wt(e),
+		bytes: Yt(e),
 		isV4: !1
 	};
 }
-function Qt(e) {
-	if (e.length === 4) return Gt(e);
-	if (e.length === 16) return Kt(e);
+function rn(e) {
+	if (e.length === 4) return Xt(e);
+	if (e.length === 16) return Zt(e);
 	throw SyntaxError(`ip: unexpected byte length: ${e.length}`);
 }
-function $t(e, t) {
+function an(e, t) {
 	let n = new Uint8Array(e.length);
 	n.set(e);
 	let r = Math.floor(t / 8), i = t % 8;
@@ -2041,86 +2151,86 @@ function $t(e, t) {
 	for (; a > 0 && n[a - 1] === 0;) a--;
 	return n.slice(0, a);
 }
-function en(e, t) {
+function on(e, t) {
 	let n = new Uint8Array(t);
 	return n.set(e), n;
 }
-var tn = class extends M {
+var sn = class extends N {
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
-		let n = b(e, this.encodingWidth, () => y(BigInt(this.value.length)));
-		return `${qt}'${Qt(this.value)}'${n}`;
+		let n = x(e, this.encodingWidth, () => b(BigInt(this.value.length)));
+		return `${Qt}'${rn(this.value)}'${n}`;
 	}
-}, nn = class extends F {
+}, cn = class extends I {
 	_isV4;
 	constructor(e, t, n) {
-		super([new O(BigInt(e)), new M(t)]), this._isV4 = n;
+		super([new k(BigInt(e)), new N(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}'${Qt(en(r, this._isV4 ? 4 : 16))}/${n}'`;
+		return `${Qt}'${rn(on(r, this._isV4 ? 4 : 16))}/${n}'`;
 	}
-}, rn = class extends j {
+}, ln = class extends M {
 	constructor(e, t) {
 		super(e, t);
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
-		let n = this.tag === H ? 4 : 16, r = this.content;
-		if (r instanceof M) {
+		let n = this.tag === U ? 4 : 16, r = this.content;
+		if (r instanceof N) {
 			if (r.encodingWidth !== void 0) return super._toCDN(e, t);
-			let n = b(e, this.encodingWidth, () => y(this.tag));
-			return `${V}'${Qt(r.value)}'${n}`;
+			let n = x(e, this.encodingWidth, () => b(this.tag));
+			return `${H}'${rn(r.value)}'${n}`;
 		}
-		if (r instanceof F && r.items.length === 2 && r.items[0] instanceof O && r.items[1] instanceof M) {
+		if (r instanceof I && r.items.length === 2 && r.items[0] instanceof k && r.items[1] instanceof N) {
 			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 = en(r.items[1].value, n), o = b(e, this.encodingWidth, () => y(this.tag));
-			return `${V}'${Qt(a)}/${i}'${o}`;
+			let i = Number(r.items[0].value), a = on(r.items[1].value, n), o = x(e, this.encodingWidth, () => b(this.tag));
+			return `${H}'${rn(a)}/${i}'${o}`;
 		}
 		return super._toCDN(e, t);
 	}
 };
-function an(e, t) {
+function un(e, t) {
 	let n = t.indexOf("/");
 	if (n === -1) {
-		let { bytes: n, isV4: r } = Zt(t);
-		return e === V ? new rn(r ? H : Jt, new M(n)) : new tn(n);
+		let { bytes: n, isV4: r } = nn(t);
+		return e === H ? new ln(r ? U : $t, new N(n)) : new sn(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 } = Zt(r), c = s ? 32 : 128;
+	let a = parseInt(i, 10), { bytes: o, isV4: s } = nn(r), c = s ? 32 : 128;
 	if (a > c) throw SyntaxError(`ip: prefix length ${a} exceeds maximum ${c} for ${s ? "IPv4" : "IPv6"}`);
-	let l = $t(o, a);
-	return e === V ? new rn(s ? H : Jt, new F([new O(BigInt(a)), new M(l)])) : new nn(a, l, s);
+	let l = an(o, a);
+	return e === H ? new ln(s ? U : $t, new I([new k(BigInt(a)), new N(l)])) : new cn(a, l, s);
 }
-var on = {
-	appStringPrefixes: [qt, V],
-	tagNumbers: [H, Jt],
+var dn = {
+	appStringPrefixes: [Qt, H],
+	tagNumbers: [U, $t],
 	parseAppString(e, t) {
-		return an(e, t);
+		return un(e, t);
 	},
 	parseAppSequence(e, t) {
-		return an(e, Xt(t));
+		return un(e, tn(t));
 	},
 	parseTag(e, t) {
-		if (!(e !== H && e !== Jt) && (t instanceof M || t instanceof F)) return new rn(e, t);
+		if (!(e !== U && e !== $t) && (t instanceof N || t instanceof I)) return new ln(e, t);
 	}
-}, sn = 18446744073709551615n, cn = -18446744073709551616n, ln = {
-	tagNumbers: [Ke, qe],
+}, fn = 18446744073709551615n, pn = -18446744073709551616n, mn = {
+	tagNumbers: [Je, Ye],
 	parseTag(e, t) {
-		if (t instanceof M) {
+		if (t instanceof N) {
 			if (e === 2n) {
-				let e = Ze(t.value);
-				return e > sn ? new Qe(e) : void 0;
+				let e = $e(t.value);
+				return e > fn ? new et(e) : void 0;
 			}
 			if (e === 3n) {
-				let e = -1n - Ze(t.value);
-				return e < cn ? new $e(e) : void 0;
+				let e = -1n - $e(t.value);
+				return e < pn ? new tt(e) : void 0;
 			}
 		}
 	}
-}, un = "cri", dn = "CRI", fn = 99n, pn = /* @__PURE__ */ new Map([
+}, hn = "cri", gn = "CRI", _n = 99n, vn = /* @__PURE__ */ new Map([
 	["coap", -1n],
 	["coaps", -2n],
 	["http", -3n],
@@ -2131,47 +2241,47 @@ var on = {
 	["coaps+tcp", -8n],
 	["coap+ws", -25n],
 	["coaps+ws", -26n]
-]), mn = new Map([...pn.entries()].map(([e, t]) => [t, e]));
-function U(e) {
+]), yn = new Map([...vn.entries()].map(([e, t]) => [t, e]));
+function W(e) {
 	try {
 		return decodeURIComponent(e);
 	} catch {
 		return e;
 	}
 }
-var hn = new TextEncoder(), gn = new TextDecoder("utf-8", { fatal: !0 });
-function _n(e) {
-	return Array.from(hn.encode(e), (e) => `%${e.toString(16).toUpperCase().padStart(2, "0")}`).join("");
+var bn = new TextEncoder(), xn = new TextDecoder("utf-8", { fatal: !0 });
+function Sn(e) {
+	return Array.from(bn.encode(e), (e) => `%${e.toString(16).toUpperCase().padStart(2, "0")}`).join("");
 }
-function W(e, t) {
+function G(e, t) {
 	let n = "";
-	for (let r of e) n += t(r) ? r : _n(r);
+	for (let r of e) n += t(r) ? r : Sn(r);
 	return n;
 }
-function vn(e) {
+function Cn(e) {
 	return /[A-Za-z0-9\-._~]/.test(e);
 }
-function yn(e) {
+function wn(e) {
 	return /[!$&'()*+,;=]/.test(e);
 }
-function bn(e) {
-	return vn(e) || yn(e) || e === ":" || e === "@";
+function Tn(e) {
+	return Cn(e) || wn(e) || e === ":" || e === "@";
 }
-function xn(e) {
-	return (bn(e) || e === "/" || e === "?") && e !== "&";
+function En(e) {
+	return (Tn(e) || e === "/" || e === "?") && e !== "&";
 }
-function Sn(e) {
-	return bn(e) || e === "/" || e === "?";
+function Dn(e) {
+	return Tn(e) || e === "/" || e === "?";
 }
-function Cn(e) {
-	return vn(e) || yn(e) || e === ":";
+function On(e) {
+	return Cn(e) || wn(e) || e === ":";
 }
-function wn(e) {
-	return vn(e) || yn(e);
+function kn(e) {
+	return Cn(e) || wn(e);
 }
-function Tn(e) {
+function An(e) {
 	let t = [], n = e, r = n.indexOf("@");
-	r >= 0 && (t.push(L.FALSE), t.push(new z(U(n.slice(0, r)))), n = n.slice(r + 1));
+	r >= 0 && (t.push(R.FALSE), t.push(new B(W(n.slice(0, r)))), n = n.slice(r + 1));
 	let i, a = null;
 	if (n.startsWith("[")) {
 		let e = n.indexOf("]");
@@ -2180,243 +2290,249 @@ function Tn(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 M(Wt(i)));
+		t.push(new N(Yt(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 M(Ut(i)));
-		else for (let e of i.toLowerCase().split(".")) t.push(new z(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 N(Jt(i)));
+		else for (let e of i.toLowerCase().split(".")) t.push(new B(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 O(BigInt(e)));
+		t.push(new k(BigInt(e)));
 	}
-	return new F(t);
+	return new I(t);
 }
-function En(e) {
+function jn(e) {
 	let t = e.items, n = 0, r = "";
-	if (n < t.length && t[n] instanceof L && t[n].value === 20) {
+	if (n < t.length && t[n] instanceof R && t[n].value === 20) {
 		n++;
 		let e = t[n++];
-		r += W(e.value, Cn) + "@";
+		r += G(e.value, On) + "@";
 	}
 	if (n >= t.length) return r;
 	let i = t[n];
-	if (i instanceof M) {
+	if (i instanceof N) {
 		n++;
 		let { length: e } = i.value;
-		if (e === 4) r += Gt(i.value);
-		else if (e === 16) r += "[" + Kt(i.value) + "]";
+		if (e === 4) r += Xt(i.value);
+		else if (e === 16) r += "[" + Zt(i.value) + "]";
 		else throw Error(`cri: unexpected host-ip byte length: ${e}`);
-		n < t.length && t[n] instanceof z && (r += `%25${W(t[n++].value, wn)}`);
+		n < t.length && t[n] instanceof B && (r += `%25${G(t[n++].value, kn)}`);
 	} else {
 		let e = [];
-		for (; n < t.length && t[n] instanceof z;) e.push(W(t[n++].value, wn));
+		for (; n < t.length && t[n] instanceof B;) e.push(G(t[n++].value, kn));
 		r += e.join(".");
 	}
-	return n < t.length && t[n] instanceof O && (r += ":" + t[n].value.toString()), r;
+	return n < t.length && t[n] instanceof k && (r += ":" + t[n].value.toString()), r;
 }
-function Dn(e) {
+function Mn(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 z(U(e)))) : (r = t, i = []), {
-		authority: Tn(r),
+	return n >= 0 ? (r = t.slice(0, n), i = t.slice(n + 1).split("/").map((e) => new B(W(e)))) : (r = t, i = []), {
+		authority: An(r),
 		pathSegments: i
 	};
 }
-function On(e) {
+function Nn(e) {
 	let t = e, n = null, r = t.indexOf("#");
-	r >= 0 && (n = U(t.slice(r + 1)), t = t.slice(0, r));
+	r >= 0 && (n = W(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 z(U(e)));
+		t = t.slice(0, a), i = e.split("&").map((e) => new B(W(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 = pn.get(e);
-		if (o.push(n === void 0 ? new z(e) : new k(n)), t.startsWith("//")) {
-			let { authority: e, pathSegments: n } = Dn(t);
-			o.push(e, new F(n));
+		let e = s[1].toLowerCase(), t = s[2], n = vn.get(e);
+		if (o.push(n === void 0 ? new B(e) : new A(n)), t.startsWith("//")) {
+			let { authority: e, pathSegments: n } = Mn(t);
+			o.push(e, new I(n));
 		} else if (t.startsWith("/")) {
-			let e = t.slice(1).split("/").map((e) => new z(U(e)));
-			o.push(L.NULL, new F(e));
+			let e = t.slice(1).split("/").map((e) => new B(W(e)));
+			o.push(R.NULL, new I(e));
 		} else {
-			let e = t.split("/").map((e) => new z(U(e)));
-			o.push(L.TRUE, new F(e));
+			let e = t.split("/").map((e) => new B(W(e)));
+			o.push(R.TRUE, new I(e));
 		}
 	} else if (t.startsWith("//")) {
-		let { authority: e, pathSegments: n } = Dn(t);
-		o.push(L.FALSE, e, new F(n));
+		let { authority: e, pathSegments: n } = Mn(t);
+		o.push(R.FALSE, e, new I(n));
 	} else if (t.startsWith("/")) {
-		let e = t.slice(1).split("/").map((e) => new z(U(e)));
-		o.push(L.TRUE, new F(e));
-	} else if (t === "") o.push(new O(0n));
+		let e = t.slice(1).split("/").map((e) => new B(W(e)));
+		o.push(R.TRUE, new I(e));
+	} else if (t === "") o.push(new k(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 z(U(e)));
-		o.push(new O(n), new F(a));
+		let a = r === "" ? [] : r.split("/").map((e) => new B(W(e)));
+		o.push(new k(n), new I(a));
 	}
-	if (i !== null && o.push(new F(i)), n !== null && (i === null && o.push(L.NULL), o.push(new z(n))), n !== null && i === null && o.splice(o.length - 2, 1), i === null && n === null) {
+	if (i !== null && o.push(new I(i)), n !== null && (i === null && o.push(R.NULL), o.push(new B(n))), n !== null && i === null && o.splice(o.length - 2, 1), i === null && n === null) {
 		let e = o[o.length - 1];
-		e instanceof F && e.items.length === 0 && o.pop();
+		e instanceof I && e.items.length === 0 && o.pop();
 	}
-	return o.length === 1 && o[0] instanceof O && o[0].value === 0n ? [] : o;
+	return o.length === 1 && o[0] instanceof k && o[0].value === 0n ? [] : o;
 }
-function G(e, t) {
+function K(e, t) {
 	let n = t, r = "";
 	if (n < e.length) {
 		let t = e[n];
-		if (t instanceof F) {
+		if (t instanceof I) {
 			if (n++, t.items.length > 0) {
 				let e = t.items.map((e) => {
-					if (!(e instanceof z)) throw Error("cri: query item must be a text string");
-					return W(e.value, xn);
+					if (!(e instanceof B)) throw Error("cri: query item must be a text string");
+					return G(e.value, En);
 				});
 				r += "?" + e.join("&");
 			}
-		} else t instanceof L && t.value === 22 && n++;
+		} else t instanceof R && t.value === 22 && n++;
 	}
-	return n < e.length && e[n] instanceof z && (r += "#" + W(e[n].value, Sn)), r;
+	return n < e.length && e[n] instanceof B && (r += "#" + G(e[n].value, Dn)), r;
 }
-function kn(e) {
+function Pn(e) {
 	return e.items.map((e) => {
-		if (!(e instanceof z)) throw Error("cri: path segment must be a text string");
-		return W(e.value, bn);
+		if (!(e instanceof B)) throw Error("cri: path segment must be a text string");
+		return G(e.value, Tn);
 	});
 }
-function An(e) {
+function Fn(e) {
 	if (e.length === 0) return "";
 	let t = 0, n = e[t++];
-	if (n instanceof k || n instanceof z) {
+	if (n instanceof A || n instanceof B) {
 		let r;
-		if (n instanceof k) {
-			let e = mn.get(n.value);
+		if (n instanceof A) {
+			let e = yn.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 F) a = "//" + En(i), o = !0;
-		else if (i instanceof L) if (i.value === 22) o = !0;
+		if (i instanceof I) a = "//" + jn(i), o = !0;
+		else if (i instanceof R) 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 F) {
+		if (t < e.length && e[t] instanceof I) {
 			let n = e[t++];
-			n.items.length > 0 && (s = (o ? "/" : "") + kn(n).join("/"));
+			n.items.length > 0 && (s = (o ? "/" : "") + Pn(n).join("/"));
 		}
-		return r + a + s + G(e, t);
+		return r + a + s + K(e, t);
 	}
-	if (n instanceof L && n.value === 20) {
-		if (t >= e.length || !(e[t] instanceof F)) throw Error("cri: network-path reference requires an authority array");
-		let n = En(e[t++]), r = "";
-		if (t < e.length && e[t] instanceof F) {
+	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 = jn(e[t++]), r = "";
+		if (t < e.length && e[t] instanceof I) {
 			let n = e[t++];
-			n.items.length > 0 && (r = "/" + kn(n).join("/"));
+			n.items.length > 0 && (r = "/" + Pn(n).join("/"));
 		}
-		return "//" + n + r + G(e, t);
+		return "//" + n + r + K(e, t);
 	}
-	if (n instanceof L && n.value === 21) {
+	if (n instanceof R && n.value === 21) {
 		let n = "/";
-		if (t < e.length && e[t] instanceof F) {
+		if (t < e.length && e[t] instanceof I) {
 			let r = e[t++];
-			n = "/" + kn(r).join("/");
+			n = "/" + Pn(r).join("/");
 		}
-		return n + G(e, t);
+		return n + K(e, t);
 	}
-	if (n instanceof O) {
+	if (n instanceof k) {
 		let r = n.value;
-		if (r === 0n) return G(e, t);
+		if (r === 0n) return K(e, t);
 		let i = r === 1n ? "" : "../".repeat(Number(r) - 1), a;
-		if (t < e.length && e[t] instanceof F) {
+		if (t < e.length && e[t] instanceof I) {
 			let n = e[t++];
 			if (n.items.length > 0) {
-				let e = kn(n);
+				let e = Pn(n);
 				a = (r === 1n && e[0].includes(":") ? "./" : i) + e.join("/");
 			} else a = i === "" ? "./" : i;
 		} else a = i === "" ? "./" : i;
-		return a + G(e, t);
+		return a + K(e, t);
 	}
 	throw Error("cri: unrecognised first element type in CRI array");
 }
-var jn = class extends F {
+var In = class extends I {
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
 		try {
-			let t = b(e, this.encodingWidth, () => y(BigInt(this.items.length)));
-			return `${un}'${An(this.items)}'${t}`;
+			let t = x(e, this.encodingWidth, () => b(BigInt(this.items.length)));
+			return `${hn}'${Fn(this.items)}'${t}`;
 		} catch {
 			return super._toCDN(e, t);
 		}
 	}
-}, Mn = class extends j {
+}, Ln = class extends M {
 	constructor(e) {
-		super(fn, e);
+		super(_n, 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 = b(e, this.encodingWidth, () => y(fn));
-			return `${dn}'${An(n.items)}'${r}`;
+			let r = x(e, this.encodingWidth, () => b(_n));
+			return `${gn}'${Fn(n.items)}'${r}`;
 		} catch {
 			return super._toCDN(e, t);
 		}
 	}
 };
-function Nn(e) {
+function Rn(e) {
 	if (e.length !== 1) throw SyntaxError("cri<<...>>: expected exactly one item");
 	let t = e[0];
-	if (t instanceof z) return t.value;
-	if (t instanceof M) return gn.decode(t.value);
+	if (t instanceof B) return t.value;
+	if (t instanceof N) return xn.decode(t.value);
 	throw SyntaxError("cri<<...>>: expected a text string or byte string");
 }
-function Pn(e, t) {
-	let n = new jn(On(t));
-	return e === dn ? new Mn(n) : n;
+function zn(e, t) {
+	let n = new In(Nn(t));
+	return e === gn ? new Ln(n) : n;
 }
-var Fn = {
-	appStringPrefixes: [un, dn],
-	tagNumbers: [fn],
+var Bn = {
+	appStringPrefixes: [hn, gn],
+	tagNumbers: [_n],
 	parseAppString(e, t) {
-		return Pn(e, t);
+		return zn(e, t);
 	},
 	parseAppSequence(e, t) {
-		return Pn(e, Nn(t));
+		return zn(e, Rn(t));
 	},
 	parseTag(e, t) {
-		if (e !== 99n || !(t instanceof F)) return;
-		let n = new jn(t.items, {
+		if (e !== 99n || !(t instanceof I)) return;
+		let n = new In(t.items, {
 			indefiniteLength: t.indefiniteLength,
 			encodingWidth: t.encodingWidth
 		});
-		return n.start = t.start, n.end = t.end, new Mn(n);
+		return n.start = t.start, n.end = t.end, new Ln(n);
 	}
 };
 //#endregion
 //#region src/cbor/decoder.ts
-function K(e, t) {
+function Vn(e, t) {
 	if (e === 24 && t <= 23n) return 0;
 	if (e === 25 && t <= 255n) return 1;
 	if (e === 26 && t <= 65535n) return 2;
 	if (e === 27 && t <= 4294967295n) return 3;
 }
-var In = new TextDecoder("utf-8", {
+function Hn(e, t) {
+	if (e === 24 && t <= 23) return 0;
+	if (e === 25 && t <= 255) return 1;
+	if (e === 26 && t <= 65535) return 2;
+	if (e === 27 && t <= 4294967295) return 3;
+}
+var Un = new TextDecoder("utf-8", {
 	fatal: !0,
 	ignoreBOM: !0
-}), Ln = new TextDecoder("utf-8", {
+}), Wn = new TextDecoder("utf-8", {
 	fatal: !1,
 	ignoreBOM: !0
 });
 function q(e) {
 	throw Error(`CBOR decode error: ${e}`);
 }
-function Rn(e, t, n) {
+function Gn(e, t, n) {
 	let r = {
 		message: e,
 		offset: t
@@ -2424,71 +2540,63 @@ function Rn(e, t, n) {
 	if (n?.onWarning ? n.onWarning(r) : n?.silent || console.warn(`CBOR strict violation at offset ${t}: ${e}`), n?.strict !== !1) throw Error(`CBOR decode error: ${e}`);
 	return r;
 }
-function zn(e, t) {
+function J(e, t) {
 	e.warnings ??= [], e.warnings.push(t);
 }
-function Bn(e) {
-	let t = "";
-	for (let n of e) t += n.toString(16).padStart(2, "0");
-	return t;
-}
-function J(e) {
-	if (e instanceof O) return ["u", String(e.value)];
-	if (e instanceof k) return ["n", String(e.value)];
-	if (e instanceof z) return ["t", e.value];
-	if (e instanceof P) return ["t", e.chunks.map((e) => e.value).join("")];
-	if (e instanceof M) return ["b", Bn(e.value)];
-	if (e instanceof N) {
+function Y(e) {
+	if (e instanceof k) return ["u", String(e.value)];
+	if (e instanceof A) return ["n", String(e.value)];
+	if (e instanceof B) 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) {
 		let t = "";
-		for (let n of e.chunks) t += Bn(n.value);
+		for (let n of e.chunks) t += i(n.value);
 		return ["b", t];
 	}
-	if (e instanceof A) return isNaN(e.value) ? ["f", "NaN"] : Object.is(e.value, -0) ? ["f", "-0"] : ["f", String(e.value)];
-	if (e instanceof L) return ["s", e.value];
-	if (e instanceof F) return ["A", e.items.map(J)];
-	if (e instanceof I) {
-		let t = e.entries.map(([e, t]) => [J(e), J(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(Y)];
+	if (e instanceof L) {
+		let t = e.entries.map(([e, t]) => [Y(e), Y(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])];
 	}
-	if (e instanceof j) return [
+	return e instanceof M ? [
 		"G",
 		String(e.tag),
-		J(e.content)
-	];
-	let t = e.toCBOR(), n = "";
-	for (let e of t) n += e.toString(16).padStart(2, "0");
-	return ["c", n];
-}
-function Vn(e) {
-	if (e instanceof O) return "u" + e.value;
-	if (e instanceof k) return "n" + e.value;
-	if (e instanceof z) return "t" + e.value;
-	if (e instanceof P) {
+		Y(e.content)
+	] : ["c", i(e.toCBOR())];
+}
+function Kn(e) {
+	if (e instanceof k) return "u" + e.value;
+	if (e instanceof A) return "n" + e.value;
+	if (e instanceof B) return "t" + e.value;
+	if (e instanceof F) {
 		let t = "t";
 		for (let n of e.chunks) t += n.value;
 		return t;
 	}
-	if (e instanceof M) return "b" + Bn(e.value);
-	if (e instanceof N) {
+	if (e instanceof N) return "b" + i(e.value);
+	if (e instanceof P) {
 		let t = "b";
-		for (let n of e.chunks) t += Bn(n.value);
+		for (let n of e.chunks) t += i(n.value);
 		return t;
 	}
-	return e instanceof A ? isNaN(e.value) ? "fNaN" : Object.is(e.value, -0) ? "f-0" : "f" + e.value : e instanceof L ? "s" + e.value : JSON.stringify(J(e));
+	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(Y(e));
 }
-var Hn = Array.from({ length: 24 }, (e, t) => BigInt(t)), Un;
-function Wn() {
-	return Un ??= Z.filter((e) => e.parseTag !== void 0);
+var qn = Array.from({ length: 24 }, (e, t) => BigInt(t)), Jn;
+function Yn() {
+	return Jn ??= Z.filter((e) => e.parseTag !== void 0);
 }
-function Gn(e, t) {
+function Xn(e, t) {
 	for (let n = 0; n < t; n++) if (e[n] >= 128) return;
 	return String.fromCharCode.apply(null, e);
 }
-function Y(e, t, n) {
+function Zn(e, t, n) {
 	if (n <= 23) return {
-		value: Hn[n],
+		value: qn[n],
 		nextOffset: t
 	};
 	switch (n) {
@@ -2511,7 +2619,36 @@ function Y(e, t, n) {
 		default: q(`reserved additional info value: ${n}`);
 	}
 }
-function Kn(e, t, n, r, i, a) {
+function Qn(e, t, n) {
+	if (n <= 23) return {
+		value: n,
+		nextOffset: t
+	};
+	switch (n) {
+		case 24: return t + 1 > e.byteLength && q("unexpected end of input"), {
+			value: e.getUint8(t),
+			nextOffset: t + 1
+		};
+		case 25: return t + 2 > e.byteLength && q("unexpected end of input"), {
+			value: e.getUint16(t, !1),
+			nextOffset: t + 2
+		};
+		case 26: return t + 4 > e.byteLength && q("unexpected end of input"), {
+			value: e.getUint32(t, !1),
+			nextOffset: t + 4
+		};
+		case 27: {
+			t + 8 > e.byteLength && q("unexpected end of input");
+			let n = e.getUint32(t, !1), r = e.getUint32(t + 4, !1);
+			return {
+				value: n * 4294967296 + r,
+				nextOffset: t + 8
+			};
+		}
+		default: q(`reserved additional info value: ${n}`);
+	}
+}
+function $n(e, t, n, r, i, a) {
 	let o = [], s = t;
 	for (;;) {
 		if (s >= e.byteLength && q(`unexpected end of indefinite ${i}`), e.getUint8(s) === 255) {
@@ -2526,67 +2663,70 @@ function Kn(e, t, n, r, i, a) {
 		nextOffset: s
 	};
 }
-function qn(e, t, n, r) {
-	let i = Vn(e);
-	t.has(i) && n.push(Rn(`duplicate map key at offset ${e.start}`, e.start, r)), t.add(i);
+function er(e, t, n, r) {
+	let i = Kn(e);
+	t.has(i) && n.push(Gn(`duplicate map key at offset ${e.start}`, e.start, r)), t.add(i);
 }
 function X(e, t, n, r) {
-	let i = t, a = Jn(e, t, n, r);
+	let i = t, a = nr(e, t, n, r);
 	return a.value.start = i, a.value.end = a.nextOffset, a;
 }
-function Jn(e, t, n, r) {
+function tr(e, t, n) {
+	return new Uint8Array(e.buffer, e.byteOffset + t, n).slice();
+}
+function nr(e, t, n, r) {
 	t >= e.byteLength && q("unexpected end of input");
 	let i = e.getUint8(t++), a = i >> 5, o = i & 31;
 	switch (a) {
 		case 0: {
-			let { value: n, nextOffset: r } = Y(e, t, o);
+			let { value: n, nextOffset: r } = Zn(e, t, o);
 			return {
-				value: new O(n, { encodingWidth: K(o, n) }),
+				value: new k(n, { encodingWidth: Vn(o, n) }),
 				nextOffset: r
 			};
 		}
 		case 1: {
-			let { value: n, nextOffset: r } = Y(e, t, o), i = K(o, n);
+			let { value: n, nextOffset: r } = Zn(e, t, o), i = Vn(o, n);
 			return {
-				value: new k(-1n - n, { encodingWidth: i }),
+				value: new A(-1n - n, { encodingWidth: i }),
 				nextOffset: r
 			};
 		}
 		case 2: {
 			if (o === 31) {
-				let { chunks: i, nextOffset: a } = Kn(e, t, n, r, "byte string", (e) => e instanceof M);
+				let { chunks: i, nextOffset: a } = $n(e, t, n, r, "byte string", (e) => e instanceof N);
 				return {
-					value: new N(i),
+					value: new P(i),
 					nextOffset: a
 				};
 			}
-			let { value: i, nextOffset: a } = Y(e, t, o), s = Number(i), c = K(o, i);
-			return a + s > e.byteLength && q("byte string extends beyond input"), {
-				value: new M(new Uint8Array(e.buffer, e.byteOffset + a, s).slice(), { encodingWidth: c }),
-				nextOffset: a + s
+			let { value: i, nextOffset: a } = Qn(e, t, o), s = Hn(o, i);
+			return a + i > e.byteLength && q("byte string extends beyond input"), {
+				value: new N(new Uint8Array(e.buffer, e.byteOffset + a, i).slice(), { encodingWidth: s }),
+				nextOffset: a + i
 			};
 		}
 		case 3: {
 			if (o === 31) {
-				let { chunks: i, nextOffset: a } = Kn(e, t, n, r, "text string", (e) => e instanceof z);
+				let { chunks: i, nextOffset: a } = $n(e, t, n, r, "text string", (e) => e instanceof B);
 				return {
-					value: new P(i),
+					value: new F(i),
 					nextOffset: a
 				};
 			}
-			let { value: i, nextOffset: a } = Y(e, t, o), s = Number(i), c = K(o, i);
-			a + s > e.byteLength && q("text string extends beyond input");
-			let l = new Uint8Array(e.buffer, e.byteOffset + a, s), u, d, f = s < 64 ? Gn(l, s) : void 0;
-			if (f !== void 0) u = f;
+			let { value: i, nextOffset: a } = Qn(e, t, o), s = Hn(o, i);
+			a + i > e.byteLength && q("text string extends beyond input");
+			let c = new Uint8Array(e.buffer, e.byteOffset + a, i), l, u, d = i < 64 ? Xn(c, i) : void 0;
+			if (d !== void 0) l = d;
 			else try {
-				u = In.decode(l);
+				l = Un.decode(c);
 			} catch {
-				d = Rn("invalid UTF-8 sequence in text string", a, n), u = Ln.decode(l);
+				u = Gn("invalid UTF-8 sequence in text string", a, n), l = Wn.decode(c);
 			}
-			let p = new z(u, { encodingWidth: c });
-			return d && zn(p, d), {
-				value: p,
-				nextOffset: a + s
+			let f = new B(l, { encodingWidth: s });
+			return u && J(f, u), {
+				value: f,
+				nextOffset: a + i
 			};
 		}
 		case 4: {
@@ -2601,18 +2741,18 @@ function Jn(e, t, n, r) {
 					i.push(t.value), a = t.nextOffset;
 				}
 				return {
-					value: new F(i, { indefiniteLength: !0 }),
+					value: new I(i, { indefiniteLength: !0 }),
 					nextOffset: a
 				};
 			}
-			let { value: i, nextOffset: a } = Y(e, t, o), s = Number(i), c = K(o, i), l = [], u = a;
-			for (let t = 0; t < s; t++) {
-				let t = X(e, u, n, r);
-				l.push(t.value), u = t.nextOffset;
+			let { value: i, nextOffset: a } = Qn(e, t, o), s = Hn(o, i), c = [], l = a;
+			for (let t = 0; t < i; t++) {
+				let t = X(e, l, n, r);
+				c.push(t.value), l = t.nextOffset;
 			}
 			return {
-				value: new F(l, { encodingWidth: c }),
-				nextOffset: u
+				value: new I(c, { encodingWidth: s }),
+				nextOffset: l
 			};
 		}
 		case 5: {
@@ -2624,106 +2764,130 @@ function Jn(e, t, n, r) {
 						break;
 					}
 					let t = X(e, s, n, r);
-					qn(t.value, a, o, n), s = t.nextOffset;
+					er(t.value, a, o, n), s = t.nextOffset;
 					let c = X(e, s, n, r);
 					s = c.nextOffset, i.push([t.value, c.value]);
 				}
-				let c = new I(i, { indefiniteLength: !0 });
-				for (let e of o) zn(c, e);
+				let c = new L(i, { indefiniteLength: !0 });
+				for (let e of o) J(c, e);
 				return {
 					value: c,
 					nextOffset: s
 				};
 			}
-			let { value: i, nextOffset: a } = Y(e, t, o), s = Number(i), c = K(o, i), l = [], u = /* @__PURE__ */ new Set(), d = [], f = a;
-			for (let t = 0; t < s; t++) {
-				let t = X(e, f, n, r);
-				qn(t.value, u, d, n), f = t.nextOffset;
-				let i = X(e, f, n, r);
-				f = i.nextOffset, l.push([t.value, i.value]);
+			let { value: i, nextOffset: a } = Qn(e, t, o), s = Hn(o, i), c = [], l = /* @__PURE__ */ new Set(), u = [], d = a;
+			for (let t = 0; t < i; t++) {
+				let t = X(e, d, n, r);
+				er(t.value, l, u, n), d = t.nextOffset;
+				let i = X(e, d, n, r);
+				d = i.nextOffset, c.push([t.value, i.value]);
 			}
-			let p = new I(l, { encodingWidth: c });
-			for (let e of d) zn(p, e);
+			let f = new L(c, { encodingWidth: s });
+			for (let e of u) J(f, e);
 			return {
-				value: p,
-				nextOffset: f
+				value: f,
+				nextOffset: d
 			};
 		}
 		case 6: {
 			o === 31 && q("tags cannot use indefinite-length encoding");
-			let { value: i, nextOffset: a } = Y(e, t, o), s = K(o, i), c = X(e, a, n, r);
+			let { value: i, nextOffset: a } = Zn(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 j && s !== void 0 && (t.encodingWidth = s), {
+				if (t !== void 0) return t instanceof M && s !== void 0 && (t.encodingWidth = s), {
 					value: t,
 					nextOffset: c.nextOffset
 				};
 			}
 			return {
-				value: new j(i, c.value, { encodingWidth: s }),
+				value: new M(i, c.value, { encodingWidth: s }),
 				nextOffset: c.nextOffset
 			};
 		}
 		case 7:
 			if (o <= 19) return {
-				value: new L(o),
+				value: new R(o),
 				nextOffset: t
 			};
 			if (o === 20) return {
-				value: new L(20),
+				value: new R(20),
 				nextOffset: t
 			};
 			if (o === 21) return {
-				value: new L(21),
+				value: new R(21),
 				nextOffset: t
 			};
 			if (o === 22) return {
-				value: new L(22),
+				value: new R(22),
 				nextOffset: t
 			};
 			if (o === 23) return {
-				value: new L(23),
+				value: new R(23),
 				nextOffset: t
 			};
 			if (o === 24) {
 				t + 1 > e.byteLength && q("unexpected end of input");
 				let r = e.getUint8(t);
 				if (r < 32) {
-					let e = Rn(`simple value ${r} must be encoded in initial byte (0–31 reserved for extended encoding)`, t - 1, n), i = new L(r);
-					return zn(i, e), {
+					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);
+					return J(i, e), {
 						value: i,
 						nextOffset: t + 1
 					};
 				}
 				return {
-					value: new L(r),
+					value: new R(r),
 					nextOffset: t + 1
 				};
 			}
-			return o === 25 ? (t + 2 > e.byteLength && q("unexpected end of input"), {
-				value: new A(S(e.getUint16(t, !1)), { precision: "half" }),
-				nextOffset: t + 2
-			}) : o === 26 ? (t + 4 > e.byteLength && q("unexpected end of input"), {
-				value: new A(e.getFloat32(t, !1), { precision: "single" }),
-				nextOffset: t + 4
-			}) : o === 27 ? (t + 8 > e.byteLength && q("unexpected end of input"), {
-				value: new A(e.getFloat64(t, !1), { precision: "double" }),
-				nextOffset: t + 8
-			}) : (o < 31 && q(`reserved additional info value in major type 7: ${o}`), q("unexpected break code outside indefinite-length item"));
+			if (o === 25) {
+				t + 2 > e.byteLength && q("unexpected end of input");
+				let n = C(e.getUint16(t, !1));
+				return {
+					value: new j(n, {
+						precision: "half",
+						rawBits: Number.isNaN(n) ? tr(e, t, 2) : void 0
+					}),
+					nextOffset: t + 2
+				};
+			}
+			if (o === 26) {
+				t + 4 > e.byteLength && q("unexpected end of input");
+				let n = e.getFloat32(t, !1);
+				return {
+					value: new j(n, {
+						precision: "single",
+						rawBits: Number.isNaN(n) ? tr(e, t, 4) : void 0
+					}),
+					nextOffset: t + 4
+				};
+			}
+			if (o === 27) {
+				t + 8 > e.byteLength && q("unexpected end of input");
+				let n = e.getFloat64(t, !1);
+				return {
+					value: new j(n, {
+						precision: "double",
+						rawBits: Number.isNaN(n) ? tr(e, t, 8) : void 0
+					}),
+					nextOffset: t + 8
+				};
+			}
+			return o < 31 && q(`reserved additional info value in major type 7: ${o}`), q("unexpected break code outside indefinite-length item");
 	}
 	return q(`unknown major type: ${a}`);
 }
-function Yn(e) {
+function rr(e) {
 	if (e instanceof ArrayBuffer || typeof SharedArrayBuffer < "u" && e instanceof SharedArrayBuffer) return new Uint8Array(e);
 	if (ArrayBuffer.isView(e)) return new Uint8Array(e.buffer, e.byteOffset, e.byteLength);
 	throw TypeError("expected ArrayBufferView or ArrayBufferLike");
 }
-function Xn(e, t) {
-	let n = Yn(e), r = new DataView(n.buffer, n.byteOffset, n.byteLength), i = t?.offset ?? 0;
+function ir(e, t) {
+	let n = rr(e), r = new DataView(n.buffer, n.byteOffset, n.byteLength), i = t?.offset ?? 0;
 	if (!Number.isInteger(i) || i < 0 || i > r.byteLength) throw RangeError(`CBOR decode offset must be an integer between 0 and ${r.byteLength}`);
-	let a = t?.extensions?.length ? [...t.extensions.filter((e) => e.parseTag !== void 0), ...Wn()] : Wn(), { value: o, nextOffset: s } = X(r, i, t, a);
+	let a = t?.extensions?.length ? [...t.extensions.filter((e) => e.parseTag !== void 0), ...Yn()] : Yn(), { value: o, nextOffset: s } = X(r, i, t, a);
 	if (!t?.allowTrailing && s !== r.byteLength) {
-		zn(o, Rn(`${r.byteLength - s} trailing byte(s) after end of CBOR item`, s, t));
+		J(o, Gn(`${r.byteLength - s} trailing byte(s) after end of CBOR item`, s, t));
 		let e = {
 			strict: !1,
 			silent: !0
@@ -2734,15 +2898,15 @@ function Xn(e, t) {
 }
 //#endregion
 //#region src/extensions/cbordata.ts
-var Zn = 24n, Z = [
-	Vt,
-	on,
-	ln,
-	Fn,
+var ar = 24n, Z = [
+	Kt,
+	dn,
+	mn,
+	Bn,
 	{
-		tagNumbers: [Zn],
+		tagNumbers: [ar],
 		parseTag(e, t, n) {
-			if (e !== 24n || !(t instanceof M)) return;
+			if (e !== 24n || !(t instanceof N)) return;
 			let r = n ? {
 				extensions: n.extensions,
 				strict: n.strict,
@@ -2750,65 +2914,76 @@ var Zn = 24n, Z = [
 				silent: n.silent
 			} : void 0;
 			try {
-				return new j(Zn, new Ve([Xn(t.value, r)], { encodingWidth: t.encodingWidth }));
+				return new M(ar, new Ue([ir(t.value, r)], { encodingWidth: t.encodingWidth }));
 			} catch (e) {
 				if (r?.strict !== !1) throw e;
 				return;
 			}
 		}
 	}
-];
-//#endregion
-//#region src/js/fromJS.ts
-function Q(e, t) {
+], or;
+function sr() {
+	return or ??= {
+		fromJS: Z.filter((e) => e.fromJS !== void 0),
+		parseTag: Z.filter((e) => e.parseTag !== void 0)
+	};
+}
+function cr(e) {
+	let t = e?.extensions, n = sr();
+	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 lr(e, t) {
 	if (t?.replacer) {
-		let { replacer: n, ...r } = t, i = er(e, n, r.extensions, r.undefinedOmits);
-		return i === d ? L.UNDEFINED : Q(i, Object.keys(r).length > 0 ? r : void 0);
+		let { replacer: n, ...r } = t, i = dr(e, n, r.extensions, r.undefinedOmits);
+		return i === h ? R.UNDEFINED : lr(i, Object.keys(r).length > 0 ? r : void 0);
 	}
-	return Qn(e, t, !0);
+	return Q(e, t, !0, cr(t));
 }
-function Qn(e, t, n) {
-	for (let n of [...t?.extensions ?? [], ...Z]) if (n.fromJS) {
+function Q(e, t, n, r) {
+	for (let n of r.fromJS) {
 		let r = n.fromJS(e, t ?? {});
 		if (r !== void 0) return r;
 	}
-	if (n && typeof e == "object" && e && u.symbol in e) {
-		let n = e[u.symbol], r = Qn(e, t, !1);
-		for (let e of [...t?.extensions ?? [], ...Z]) if (e.parseTag) {
-			let t = e.parseTag(n, r);
+	if (n && typeof e == "object" && e && m.symbol in e) {
+		let n = e[m.symbol], i = Q(e, t, !1, r);
+		for (let e of r.parseTag) {
+			let t = e.parseTag(n, i);
 			if (t !== void 0) return t;
 		}
-		return new j(n, r);
-	}
-	if (e instanceof u.Null) return L.NULL;
-	if (e instanceof u.Undefined) return L.UNDEFINED;
-	if (e instanceof f) return new L(e.value);
-	if (e === null) return L.NULL;
-	if (e === void 0) return L.UNDEFINED;
-	if (e === !0) return L.TRUE;
-	if (e === !1) return L.FALSE;
-	if (typeof e == "bigint") return e > 18446744073709551615n ? new Qe(e) : e < -18446744073709551616n ? new $e(e) : e >= 0n ? new O(e) : new k(e);
-	if (typeof e == "number") return (t?.encodeIntegerAs ?? "int") === "int" && Number.isInteger(e) && !Object.is(e, -0) ? e >= 0 ? new O(BigInt(e)) : new k(BigInt(e)) : new A(e);
-	if (typeof e == "string") return new z(e);
-	if (e instanceof Number || e instanceof Boolean || e instanceof String || Object.prototype.toString.call(e) === "[object BigInt]") return Qn(e.valueOf(), t, !1);
-	if (e instanceof ArrayBuffer || typeof SharedArrayBuffer < "u" && e instanceof SharedArrayBuffer) return new M(new Uint8Array(e));
-	if (ArrayBuffer.isView(e)) return e instanceof Uint8Array && t?.uint8ArrayAs === "array" ? new F(Array.from(e, (e) => new O(BigInt(e)))) : new M(new Uint8Array(e.buffer, e.byteOffset, e.byteLength));
-	if (e instanceof $) return new I([...e].map(([e, n]) => [Q(e, t), Q(n, t)]));
-	if (Array.isArray(e)) return new F(e.map((e) => Q(e, 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 B(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 (typeof e == "object") {
 		let n = [];
-		for (let [r, i] of Object.entries(e)) n.push([new z(r), Q(i, t)]);
-		return new I(n);
+		for (let [i, a] of Object.entries(e)) n.push([new B(i), Q(a, t, !0, r)]);
+		return new L(n);
 	}
 	throw TypeError(`fromJS: unsupported value type: ${typeof e}`);
 }
-function $n(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 u.Null || e instanceof u.Undefined || e instanceof f;
+function ur(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 er(e, t, n, r) {
-	let i = [...n ?? [], ...Z];
+function dr(e, t, n, r) {
+	let i = [...n ?? [], ...Z].filter((e) => e.isJSType !== void 0);
 	function a(e) {
-		return e === d || r === !0 && e === void 0;
+		return e === h || r === !0 && e === void 0;
 	}
 	if (Array.isArray(t)) {
 		let n = t.map(String);
@@ -2816,7 +2991,7 @@ function er(e, t, n, r) {
 			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 (u.symbol in e || $n(e) || i.some((t) => t.isJSType?.(e))) return e;
+			if (m.symbol in e || ur(e) || i.some((t) => t.isJSType(e))) return e;
 			let t = Object.getPrototypeOf(e);
 			if (t === Object.prototype || t === null) {
 				let t = e.toJSON;
@@ -2838,7 +3013,7 @@ function er(e, t, n, r) {
 			}
 		}
 		if (e = o.call(n, t, e), typeof e == "object" && e) {
-			if (u.symbol in e) return e;
+			if (m.symbol in e) return e;
 			if (e instanceof $) {
 				let t = new $();
 				for (let [n, r] of e) {
@@ -2851,7 +3026,7 @@ function er(e, t, n, r) {
 				let r = s(t, String(n), e);
 				return a(r) ? null : r;
 			});
-			if ($n(e) || i.some((t) => t.isJSType?.(e))) return e;
+			if (ur(e) || i.some((t) => t.isJSType(e))) return e;
 			let t = {};
 			for (let n of Object.keys(e)) {
 				let r = s(e[n], n, e);
@@ -2869,7 +3044,7 @@ var $ = class extends Array {
 	toJSON() {
 		let e = {};
 		for (let [t, n] of this) {
-			let r = typeof t == "string" ? t : Q(t).toCDN();
+			let r = typeof t == "string" ? t : lr(t).toCDN();
 			r === "__proto__" ? Object.defineProperty(e, r, {
 				value: n,
 				writable: !0,
@@ -2881,6 +3056,6 @@ var $ = class extends Array {
 	}
 };
 //#endregion
-export { i as A, x as C, n as D, d as E, r as O, S, f as T, j as _, Ht as a, O as b, $e as c, L as d, I as f, M as g, N as h, Xn as i, u as k, Qe as l, P as m, er as n, z as o, F as p, Q as r, rt as s, $ as t, Ve as u, A as v, ne as w, D as x, k as y };
+export { S as C, s as D, o as E, m as O, C as S, h as T, M as _, qt as a, k as b, tt as c, R as d, L as f, N as g, P as h, ir as i, c as k, et as l, F as m, dr as n, B as o, I as p, lr as r, at as s, $ as t, Ue as u, j as v, g as w, O as x, A as y };
 
-//# sourceMappingURL=mapEntries-I8f0WuwK.js.map
+//# sourceMappingURL=mapEntries-CYvdsAfP.js.map