@cbortech/cbor 0.26.8 → 0.27.1

package/dist/{mapEntries-Ci_dppP6.js → mapEntries-CCLaJSaJ.js}

@@ -1,4 +1,4 @@
-import { C as e, D as t, E as n, S as r, T as i, _ as a, a as o, b as s, c, d as l, f as u, g as d, h as f, i as p, l as ee, m as te, n as m, o as ne, p as h, r as g, s as _, t as re, u as ie, v, w as y, x as ae, y as oe } from "./tokenizer-N-vAvRdj.js";
+import { A as e, C as t, D as n, E as r, F as i, I as a, M as o, N as s, O as c, P as l, S as u, T as d, _ as f, a as p, b as m, c as h, d as g, f as _, g as v, h as y, i as b, j as ee, k as x, l as S, m as C, n as w, o as T, p as te, r as E, s as ne, t as D, u as re, v as ie, w as O, x as ae, y as oe } from "./serialize-utils-h-CVB9rg.js";
 //#region src/tag.ts
 var se = Symbol.for("cbor.tag"), ce = class {
 	valueOf() {
@@ -58,7 +58,7 @@ function pe(e) {
 function me(e) {
 	return typeof e == "object" && !!e;
 }
-var b = class {
+var k = class {
 	constructor() {}
 	static symbol = se;
 	static Null = ce;
@@ -75,7 +75,7 @@ var b = class {
 	static getValue(e) {
 		return pe(e);
 	}
-}, x = Symbol("cbor.omit"), he = class e {
+}, A = Symbol("cbor.omit"), he = class e {
 	value;
 	constructor(e) {
 		if (!Number.isInteger(e) || e < 0 || e > 255) throw RangeError("Simple value must be an integer in 0–255");
@@ -94,7 +94,7 @@ var b = class {
 		return t instanceof e ? t.value : void 0;
 	}
 }, ge = "getFloat16" in DataView.prototype && "setFloat16" in DataView.prototype, _e = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(8));
-function S(e) {
+function ve(e) {
 	_e.setFloat64(0, e, !1);
 	let t = _e.getUint32(0, !1), n = _e.getUint32(4, !1), r = t >>> 31 & 1, i = t >>> 20 & 2047, a = t & 1048575;
 	if (i === 2047) {
@@ -108,8 +108,8 @@ function S(e) {
 	if (o <= 0) {
 		if (o < -10) return r << 15;
 		let e = 1 << 20 | a, t = 11 - o;
-		t <= 20 ? (s = e >> t & 1023, c = e >> t - 1 & 1, l = (e & (1 << t - 1) - 1) != 0 || n !== 0) : (s = 0, c = 1, l = a !== 0 || n !== 0);
-	} else s = a >> 10, c = a >> 9 & 1, l = (a & 511) != 0 || n !== 0;
+		t <= 20 ? (s = e >> t & 1023, c = e >> t - 1 & 1, l = !!(e & (1 << t - 1) - 1) || n !== 0) : (s = 0, c = 1, l = a !== 0 || n !== 0);
+	} else s = a >> 10, c = a >> 9 & 1, l = !!(a & 511) || n !== 0;
 	if (c !== 0 && (l || s & 1) && s++, s >= 1024) {
 		let e = o <= 0 ? 1 : o + 1;
 		return e >= 31 ? r << 15 | 31744 : r << 15 | e << 10;
@@ -117,19 +117,19 @@ function S(e) {
 	let u = o <= 0 ? 0 : o;
 	return r << 15 | u << 10 | s;
 }
-function C(e) {
+function j(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 ve = ge ? (e, t, n, r) => {
+var ye = ge ? (e, t, n, r) => {
 	e.setFloat16(t, n, r);
 } : (e, t, n, r) => {
-	e.setUint16(t, S(n), r);
-}, w = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(8)), T = new Uint8Array(w.buffer), ye = new TextEncoder(), be = typeof ye.encodeInto == "function";
-function xe(e) {
+	e.setUint16(t, ve(n), r);
+}, be = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(8)), M = new Uint8Array(be.buffer), xe = new TextEncoder(), Se = typeof xe.encodeInto == "function";
+function Ce(e) {
 	return e <= 23 ? 1 : e <= 255 ? 2 : e <= 65535 ? 3 : e <= 4294967295 ? 5 : 9;
 }
-function Se(e) {
+function we(e) {
 	return e === "i" ? 1 : [
 		2,
 		3,
@@ -137,7 +137,7 @@ function Se(e) {
 		9
 	][e];
 }
-var Ce = class {
+var Te = class {
 	buf;
 	len = 0;
 	constructor(e = 256) {
@@ -168,45 +168,45 @@ var Ce = class {
 		t[this.len++] = e >>> 24 & 255, t[this.len++] = e >>> 16 & 255, t[this.len++] = e >>> 8 & 255, t[this.len++] = e & 255;
 	}
 	writeBigUint64(e) {
-		w.setBigUint64(0, e, !1), this._ensure(8), this.buf.set(T, this.len), this.len += 8;
+		be.setBigUint64(0, e, !1), this._ensure(8), this.buf.set(M, this.len), this.len += 8;
 	}
 	writeFloat16(e) {
-		ve(w, 0, e, !1), this._ensure(2);
+		ye(be, 0, e, !1), this._ensure(2);
 		let t = this.buf;
-		t[this.len++] = T[0], t[this.len++] = T[1];
+		t[this.len++] = M[0], t[this.len++] = M[1];
 	}
 	writeFloat32(e) {
-		w.setFloat32(0, e, !1), this._ensure(4);
+		be.setFloat32(0, e, !1), this._ensure(4);
 		let t = this.buf;
-		t[this.len++] = T[0], t[this.len++] = T[1], t[this.len++] = T[2], t[this.len++] = T[3];
+		t[this.len++] = M[0], t[this.len++] = M[1], t[this.len++] = M[2], t[this.len++] = M[3];
 	}
 	writeFloat64(e) {
-		w.setFloat64(0, e, !1), this._ensure(8), this.buf.set(T, this.len), this.len += 8;
+		be.setFloat64(0, e, !1), this._ensure(8), this.buf.set(M, this.len), this.len += 8;
 	}
 	writeTextString(e, t, n) {
-		if (!be) {
-			let r = ye.encode(t);
-			E(this, e, r.length, n), this.writeBytes(r);
+		if (!Se) {
+			let r = xe.encode(t);
+			N(this, e, r.length, n), this.writeBytes(r);
 			return;
 		}
-		let r = n === void 0 ? xe(t.length) : Se(n);
+		let r = n === void 0 ? Ce(t.length) : we(n);
 		this._ensure(9 + 3 * t.length);
-		let { written: i } = ye.encodeInto(t, this.buf.subarray(this.len + r)), a = n === void 0 ? xe(i) : r;
-		a !== r && this.buf.copyWithin(this.len + a, this.len + r, this.len + r + i), E(this, e, i, n), this.len += i;
+		let { written: i } = xe.encodeInto(t, this.buf.subarray(this.len + r)), a = n === void 0 ? Ce(i) : r;
+		a !== r && this.buf.copyWithin(this.len + a, this.len + r, this.len + r + i), N(this, e, i, n), this.len += i;
 	}
 	finish() {
 		return this.buf.slice(0, this.len);
 	}
-}, we = [
+}, Ee = [
 	255n,
 	65535n,
 	4294967295n,
 	18446744073709551615n
 ];
-function Te(e) {
-	return e === "i" ? 23n : we[e];
+function De(e) {
+	return e === "i" ? 23n : Ee[e];
 }
-function E(e, t, n, r) {
+function N(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;
@@ -218,42 +218,101 @@ function E(e, t, n, r) {
 			e.writeByte(t << 5 | Number(i));
 			return;
 		}
-		if (i > we[r]) throw RangeError(`value ${i} does not fit in encodingWidth _${r} (max ${we[r]})`);
+		if (i > Ee[r]) throw RangeError(`value ${i} does not fit in encodingWidth _${r} (max ${Ee[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 Ee(e, t, n) {
-	let r = new Ce(9);
-	return E(r, e, t, n), r.finish();
+function Oe(e, t, n) {
+	let r = new Te(9);
+	return N(r, e, t, n), r.finish();
 }
-var De = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(4));
-function Oe(e) {
-	return Object.is(C(S(e)), e);
+var ke = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(4));
+function Ae(e) {
+	return Object.is(j(ve(e)), e);
 }
-function ke(e) {
-	return De.setFloat32(0, e, !1), Object.is(De.getFloat32(0, !1), e);
+function je(e) {
+	return ke.setFloat32(0, e, !1), Object.is(ke.getFloat32(0, !1), e);
 }
-function D(e) {
-	return Oe(e) ? "half" : ke(e) ? "single" : "double";
+function P(e) {
+	return Ae(e) ? "half" : je(e) ? "single" : "double";
 }
 //#endregion
 //#region src/ast/CborItem.ts
-function Ae(e) {
+function Me(e) {
 	return {
 		...e,
-		preserveComments: e.preserveComments ?? !0,
+		preserveComments: e.comments === void 0 ? e.preserveComments ?? !0 : e.preserveComments,
 		preserveByteString: e.preserveByteString ?? !0,
 		preserveRawString: e.preserveRawString ?? !0,
 		preserveConcatenation: e.preserveConcatenation ?? !0,
 		preserveNumberFormat: e.preserveNumberFormat ?? !0,
-		preserveAppSequence: e.preserveAppSequence ?? !0,
+		preserveAppPrefix: e.preserveAppPrefix ?? !0,
 		preserveBlankLines: e.preserveBlankLines ?? !0
 	};
 }
-var O = class e {
+function Ne(e) {
+	return e.preserveAppSequence === void 0 && e.appStrings === void 0 ? e : {
+		...e,
+		preserveAppPrefix: e.preserveAppPrefix ?? e.preserveAppSequence,
+		appPrefix: e.appPrefix ?? e.appStrings
+	};
+}
+function Pe(e) {
+	if (e.preserveAppSequence === void 0 && e.appStrings === void 0) return e;
+	let t = Ne(e), n = { ...e };
+	return t.preserveAppPrefix !== void 0 && (n.preserveAppPrefix = t.preserveAppPrefix), t.appPrefix !== void 0 && (n.appPrefix = t.appPrefix), n;
+}
+var Fe = Object.freeze([]);
+function Ie(e) {
+	return !!(e?.itemOptions || e?.extensions?.length);
+}
+function Le(e) {
+	return e && {
+		...e,
+		reviver: void 0
+	};
+}
+function Re(e) {
+	let { reviver: t, extensions: n, ...r } = e;
+	return n ? {
+		...r,
+		extensions: [...n]
+	} : r;
+}
+var ze = Symbol("cbor.itemOptions.dispatchCache"), Be = Symbol("cbor.itemOptions.rawPass"), Ve = Object.freeze([]);
+function He(e) {
+	return e?.[ze];
+}
+function Ue(e) {
+	let t = /* @__PURE__ */ new WeakMap();
+	return Object.assign({}, e, { [ze]: t });
+}
+function We(e, t) {
+	if (e.length !== t.length) return !1;
+	for (let n = 0; n < e.length; n++) if (e[n] !== t[n]) return !1;
+	return !0;
+}
+function Ge(e, t) {
+	return e?.find((e) => We(e.occurrence, t));
+}
+function Ke(e, t, n) {
+	let r = e.get(t);
+	r ? r.push(n) : e.set(t, [n]);
+}
+function qe(e) {
+	return !!e?.itemOptions;
+}
+function Je(e) {
+	let { textStringFormat: t, ...n } = e;
+	return delete n[Ye], t ? {
+		...n,
+		textStringFormat: [...t]
+	} : n;
+}
+var Ye = Symbol("cdnOverrideTracker"), F = class e {
 	start;
 	end;
 	comments;
@@ -269,11 +328,14 @@ var O = class e {
 	get _containsCdnContainer() {
 		return !1;
 	}
+	_isMultiWordText(e, t = !0, n) {
+		return !1;
+	}
 	toCBOR(e) {
 		let t = this._defaults ? {
 			...this._defaults,
 			...e
-		} : e, n = new Ce();
+		} : e, n = new Te();
 		return this._encode(n, t), n.finish();
 	}
 	toCDN(e) {
@@ -281,11 +343,11 @@ var O = class e {
 			...this._defaults,
 			...e
 		} : e;
-		t?.preserveAll && (t = Ae(t));
-		let n = this._toCDN(t, 0), r = t?.preserveComments;
-		if (!r || v(t) === null) return n;
-		let i = typeof r == "string" ? r : void 0, { ownLines: a, inlinePrefix: s } = ae(this, "", i), c = this.comments?.trailing ?? [], l = c.length === 0 ? n : `${n} ${c.map((e) => o(e, i).trimEnd()).join(" ")}`;
-		return [...a, `${s}${l}`].join("\n");
+		t &&= Ne(t), t?.preserveAll && (t = Me(t));
+		let r = this._resolveCdnOptions(t, Fe, {}), i = this._toCDN(r, 0, Fe);
+		if (!n(r) || O(r) === null) return i;
+		let a = u(r), { ownLines: o, inlinePrefix: s } = c(this, "", a), l = this.comments?.trailing ?? [], d = l.length === 0 ? i : `${i} ${l.map((e) => b(e, a).trimEnd()).join(" ")}`;
+		return [...o, `${s}${d}`].join("\n");
 	}
 	toEDN(e) {
 		return this.toCDN(e);
@@ -294,16 +356,18 @@ var O = class e {
 		let t = this._defaults ? {
 			...this._defaults,
 			...e
-		} : e, n = this._toJS(t);
+		} : e, n = Ie(t) ? this._toJSChild(Ue(t), Fe, Ve, {}) : this._toJS(t);
 		if (!t?.reviver) return n;
 		let r = t.reviver.call({ "": n }, "", n);
-		return r === x ? void 0 : r;
+		return r === A ? 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 = 0;
+		} : e;
+		t &&= Ne(t);
+		let 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);
@@ -323,17 +387,71 @@ var O = class e {
 		t.writeBytes(this._toCBOR(n));
 	}
 	_toCBOR(e) {
-		let t = new Ce();
+		let t = new Te();
 		return this._encodeTo(t, e), t.finish();
 	}
+	_resolveCdnOptions(e, t, n) {
+		if (!qe(e)) return e;
+		let r = n.isMapKey || t.length === 0 ? void 0 : t[t.length - 1], i = e.itemOptions(this, {
+			...n,
+			key: r,
+			path: t,
+			options: Je(e)
+		});
+		if (!i) return e;
+		let a = e[Ye];
+		a && (a.applied = !0);
+		let o = {
+			...e,
+			...Pe(i)
+		};
+		return o.preserveAll && (o = Me(o)), o;
+	}
+	_toJSChild(e, t, n, r) {
+		let i = He(e), a = Ge(i?.get(this), n);
+		if (a) {
+			if (a.outcome.kind === "value") return a.outcome.value;
+			let r = a.outcome.override ? {
+				...e,
+				...a.outcome.override
+			} : e;
+			return this._toJS(r, t, n);
+		}
+		let o = r.isMapKey || t.length === 0 ? void 0 : t[t.length - 1], s = e, c;
+		if (e?.itemOptions && (c = e.itemOptions(this, {
+			...r,
+			key: o,
+			path: t,
+			options: Re(e)
+		}), c && (s = {
+			...e,
+			...c
+		})), s?.extensions?.length) for (let e of s.extensions) {
+			let t = e.toJS?.(this, Re(s));
+			if (t) return i && Ke(i, this, {
+				occurrence: n,
+				outcome: {
+					kind: "value",
+					value: t.value
+				}
+			}), t.value;
+		}
+		return i && Ke(i, this, {
+			occurrence: n,
+			outcome: {
+				kind: "override",
+				override: c
+			}
+		}), this._toJS(s, t, n);
+	}
 	_toHexDump(e, t) {
 		return [{
 			depth: e,
-			hex: i(this._toCBOR()),
+			hex: l(this._toCBOR()),
 			comment: this._toCDN(t, 0)
 		}];
 	}
-}, k = class extends O {
+}, I = class extends F {
 	value;
 	encodingWidth;
 	ednSource;
@@ -343,24 +461,24 @@ var O = class e {
 		this.encodingWidth = t?.encodingWidth, this.ednSource = t?.ednSource;
 	}
 	_encodeTo(e, t) {
-		E(e, 0, this.value, this.encodingWidth);
+		N(e, 0, this.value, this.encodingWidth);
 	}
-	_toCDN(e, t) {
-		let n = a(e, this.encodingWidth, () => p(this.value));
-		if (e?.preserveNumberFormat && this.ednSource !== void 0) return this.ednSource + n;
-		let r = this.value;
+	_toCDN(e, n, r) {
+		let i = t(e, this.encodingWidth, () => E(this.value));
+		if (e?.preserveNumberFormat && this.ednSource !== void 0) return this.ednSource + i;
+		let a = this.value;
 		switch (e?.intFormat) {
-			case "hex": return `0x${r.toString(16)}${n}`;
-			case "octal": return `0o${r.toString(8)}${n}`;
-			case "binary": return `0b${r.toString(2)}${n}`;
-			default: return r.toString() + n;
+			case "hex": return `0x${a.toString(16)}${i}`;
+			case "octal": return `0o${a.toString(8)}${i}`;
+			case "binary": return `0b${a.toString(2)}${i}`;
+			default: return a.toString() + i;
 		}
 	}
 	_toJS(e) {
 		let t = e?.integerAs ?? "auto";
 		return t === "bigint" ? this.value : t === "number" || this.value <= BigInt(2 ** 53 - 1) ? Number(this.value) : this.value;
 	}
-}, A = class extends O {
+}, L = class extends F {
 	argument;
 	encodingWidth;
 	ednSource;
@@ -375,25 +493,25 @@ var O = class e {
 		return -1n - this.argument;
 	}
 	_encodeTo(e, t) {
-		E(e, 1, this.argument, this.encodingWidth);
+		N(e, 1, this.argument, this.encodingWidth);
 	}
-	_toCDN(e, t) {
-		let n = a(e, this.encodingWidth, () => p(this.argument));
-		if (e?.preserveNumberFormat && this.ednSource !== void 0) return this.ednSource + n;
-		let r = this.argument + 1n;
+	_toCDN(e, n, r) {
+		let i = t(e, this.encodingWidth, () => E(this.argument));
+		if (e?.preserveNumberFormat && this.ednSource !== void 0) return this.ednSource + i;
+		let a = this.argument + 1n;
 		switch (e?.intFormat) {
-			case "hex": return `-0x${r.toString(16)}${n}`;
-			case "octal": return `-0o${r.toString(8)}${n}`;
-			case "binary": return `-0b${r.toString(2)}${n}`;
-			default: return this.value.toString() + n;
+			case "hex": return `-0x${a.toString(16)}${i}`;
+			case "octal": return `-0o${a.toString(8)}${i}`;
+			case "binary": return `-0b${a.toString(2)}${i}`;
+			default: return this.value.toString() + i;
 		}
 	}
 	_toJS(e) {
 		let t = this.value, n = e?.integerAs ?? "auto";
 		return n === "bigint" ? t : n === "number" || t >= BigInt(-(2 ** 53 - 1)) ? Number(t) : t;
 	}
-}, je = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(8));
-function Me(e) {
+}, Xe = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(8));
+function Ze(e) {
 	let t = e.startsWith("-"), n = e.slice(t ? 3 : 2), r = n.search(/[pP]/);
 	if (r === -1) throw SyntaxError(`EDN parse error: hex float missing 'p' exponent: ${e}`);
 	let i = n.slice(0, r), a = n.slice(r + 1);
@@ -411,20 +529,23 @@ function Me(e) {
 	let l = c * 2 ** o;
 	return t ? -l : l;
 }
-function Ne(e) {
+function Qe(e) {
 	if (isNaN(e)) return "NaN";
 	if (!isFinite(e)) return e > 0 ? "Infinity" : "-Infinity";
 	let t = Object.is(e, -0) || e < 0, n = Math.abs(e);
 	if (n === 0) return t ? "-0x0p+0" : "0x0p+0";
-	je.setFloat64(0, n, !1);
-	let r = je.getUint32(0, !1), i = je.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;
+	Xe.setFloat64(0, n, !1);
+	let r = Xe.getUint32(0, !1), i = Xe.getUint32(4, !1), a = r >>> 20 & 2047, o = r & 1048575, s = i, c, l;
+	if (a === 0) {
+		let e = BigInt(o) << 32n | BigInt(s), t = e.toString(2).length;
+		c = e - (1n << BigInt(t - 1)) << BigInt(52 - (t - 1)), l = t - 1075;
+	} else c = BigInt(o) << 32n | BigInt(s), l = a - 1023;
+	let u = c.toString(16).padStart(13, "0").replace(/0+$/, ""), d = `0x1${u === "" ? "" : `.${u}`}p${l >= 0 ? `+${l}` : `${l}`}`;
+	return t ? `-${d}` : d;
 }
 //#endregion
 //#region src/ast/CborFloat.ts
-var j = class extends O {
+var R = class extends F {
 	value;
 	precision;
 	ednSource;
@@ -434,38 +555,42 @@ var j = class extends O {
 		super(), this.value = e, this.precision = t?.precision, this.rawBits = t?.rawBits, this.literalSource = t?.literalSource;
 	}
 	_encodeTo(e, t) {
-		let n = this.precision ?? D(this.value), r = Number.isNaN(this.value) ? this.rawBits : void 0;
+		let n = this.precision ?? P(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";
-		if (e?.appStrings !== !1 && this.ednSource !== void 0 && (v(e) !== null || !/[\r\n]/.test(this.ednSource))) {
+	_toCDN(e, t, n) {
+		let r = e?.encodingIndicators ?? "auto";
+		if (e?.appPrefix !== !1 && (e?.floatFormat === void 0 || e?.floatFormat === "app-extension") && this.ednSource !== void 0 && (O(e) !== null || !/[\r\n]/.test(this.ednSource))) {
 			let e = this.ednSource;
-			if (n === "never") return e.replace(/_[0-3i]$/, "");
-			if (n === "always") {
+			if (r === "never") return e.replace(/_[0-3i]$/, "");
+			if (r === "always") {
 				if (/_[0-3i]$/.test(e)) return e;
-				let t = this.precision ?? D(this.value);
+				let t = this.precision ?? P(this.value);
 				return e + (t === "half" ? "_1" : t === "single" ? "_2" : "_3");
 			}
 			return e;
 		}
 		if (e?.preserveNumberFormat && this.literalSource !== void 0) {
 			let e = this.literalSource;
-			if (n === "never") return e.replace(/_[0-7i]$/, "");
-			if (n === "always") {
+			if (r === "never") return e.replace(/_[0-7i]$/, "");
+			if (r === "always") {
 				if (/_[0-7i]$/.test(e)) return e;
-				let t = D(this.value);
-				return e + ie(this.value, this.precision, t, "always");
+				let t = P(this.value);
+				return e + S(this.value, this.precision, t, "always");
 			}
 			return e;
 		}
-		let r = D(this.value);
-		return (e?.floatFormat === "hex" ? Ne(this.value) : l(this.value)) + ie(this.value, this.precision, r, n);
+		let i = P(this.value);
+		if (e?.floatFormat === "app-extension" && e?.appPrefix !== !1) {
+			let e = this.toCBOR();
+			return `float'${s(e.subarray(1))}'` + S(this.value, this.precision, i, r);
+		}
+		return (e?.floatFormat === "hex" ? Qe(this.value) : re(this.value)) + S(this.value, this.precision, i, r);
 	}
 	_toJS(e) {
 		return this.value;
 	}
-}, M = class extends O {
+}, z = class extends F {
 	tag;
 	content;
 	encodingWidth;
@@ -477,35 +602,38 @@ var j = class extends O {
 	get _containsCdnContainer() {
 		return this.content._containsCdnContainer;
 	}
+	_isMultiWordText(e, t = !0, n) {
+		return y(this._toCDN(e, 0, n), t);
+	}
 	_encodeTo(e, t) {
-		E(e, 6, this.tag, this.encodingWidth), this.content._encode(e, t);
+		N(e, 6, this.tag, this.encodingWidth), this.content._encode(e, t);
 	}
-	_toCDN(e, t) {
-		let n = a(e, this.encodingWidth, () => p(this.tag));
-		return `${e?.preserveNumberFormat && this.ednSource !== void 0 ? this.ednSource : this.tag.toString()}${n}${d(this.content, this, e, t, (t) => this.content._toCDN(e, t), "(", ")")}`;
+	_toCDN(e, n, r) {
+		let i = t(e, this.encodingWidth, () => E(this.tag)), a = e?.preserveNumberFormat && this.ednSource !== void 0 ? this.ednSource : this.tag.toString(), o = this.content._resolveCdnOptions(e, r ?? [], { parent: this });
+		return `${a}${i}${ae(this.content, this, e, o, n, (e) => this.content._toCDN(o, e, r), "(", ")")}`;
 	}
 	_toHexDump(e, t) {
 		let n = [{
 			depth: e,
-			hex: i(Ee(6, this.tag, this.encodingWidth)),
+			hex: l(Oe(6, this.tag, this.encodingWidth)),
 			comment: `Tag ${this.tag}`
 		}];
-		return n.push(...this.content._toHexDump(e + 1, {
+		return m(n, this.content._toHexDump(e + 1, {
 			...t,
-			appStrings: !1
+			appPrefix: !1
 		})), n;
 	}
-	_toJS(e) {
-		let t = this.content._toJS(e);
-		return e?.stripTags ? t : b.set(t, this.tag);
+	_toJS(e, t, n) {
+		let r = Ie(e) ? this.content._toJSChild(e, t ?? [], n ?? Ve, { parent: this }) : this.content._toJS(e);
+		return e?.stripTags ? r : k.set(r, this.tag);
 	}
 };
 //#endregion
 //#region src/ast/CborByteString.ts
-function Pe(e, t, n) {
-	if (e !== void 0) return t?.preserveComments || n === void 0 ? e : r(e, n);
+function $e(e, t, r) {
+	if (e !== void 0) return n(t) || r === void 0 ? e : x(e, r);
 }
-var N = class extends O {
+var B = class extends F {
 	indefiniteLength = !1;
 	value;
 	ednEncoding;
@@ -516,29 +644,32 @@ var N = class extends O {
 	constructor(e, t) {
 		super(), this.value = e, this.ednEncoding = t?.ednEncoding ?? "hex", this.encodingWidth = t?.encodingWidth, this.ednSource = t?.ednSource, this.ednCommentSyntax = t?.ednCommentSyntax, this.ednParts = t?.ednParts;
 	}
-	_encodeTo(e, t) {
-		E(e, 2, this.value.length, this.encodingWidth), e.writeBytes(this.value);
+	_isMultiWordText(e, t = !0, n) {
+		return C(this.value, e?.sqstr);
 	}
-	_toCDN(e, t) {
-		let n = v(e);
-		if (e?.preserveConcatenation && n !== null && this.ednParts !== void 0 && this.ednParts.length > 1) {
-			let r = a(e, this.encodingWidth, () => p(BigInt(this.value.length))), i = e?.bstrEncoding ?? this.ednEncoding;
-			e?.appStrings === !1 && i !== "hex" && (i = "hex");
-			let o = this.ednParts.map((t) => {
-				let n = e?.preserveByteString ? Pe(t.source, e, t.commentSyntax) : void 0;
-				return n === void 0 ? oe(t.bytes, i, e?.sqstr) : n;
-			});
-			return o[o.length - 1] += r, f(o, n, t, e?.preserveComments ? ne(this.comments?.dangling, this.ednParts, typeof e.preserveComments == "string" ? e.preserveComments : void 0) : void 0);
+	_encodeTo(e, t) {
+		N(e, 2, this.value.length, this.encodingWidth), e.writeBytes(this.value);
+	}
+	_toCDN(e, r, i) {
+		let a = O(e);
+		if (e?.preserveConcatenation && a !== null && this.ednParts !== void 0 && this.ednParts.length > 1) {
+			let i = t(e, this.encodingWidth, () => E(BigInt(this.value.length))), o = e?.bstrEncoding ?? this.ednEncoding;
+			e?.appPrefix === !1 && o !== "hex" && (o = "hex");
+			let s = this.ednParts.map((t) => {
+				let n = e?.preserveByteString ? $e(t.source, e, t.commentSyntax) : void 0;
+				return n === void 0 ? d(t.bytes, o, e?.sqstr) : n;
+			}), c = n(e) ? p(this.comments?.dangling, this.ednParts, u(e)) : void 0;
+			return e?.modernConcat && e?.appPrefix !== !1 ? ie("b1", s, i, a, r, c) : (s[s.length - 1] += i, oe(s, a, r, c));
 		}
-		let r = e?.preserveByteString ? Pe(this.ednSource, e, this.ednCommentSyntax) : void 0;
-		if (r !== void 0 && (n !== null || !/[\r\n]/.test(r))) return /_[0-3i]$/.test(r) ? (e?.encodingIndicators ?? "auto") === "never" ? r.replace(/_[0-3i]$/, "") : r : r + a(e, this.encodingWidth, () => p(BigInt(this.value.length)));
-		let i = a(e, this.encodingWidth, () => p(BigInt(this.value.length))), o = e?.bstrEncoding ?? this.ednEncoding;
-		return e?.appStrings === !1 && o !== "hex" && (o = "hex"), oe(this.value, o, e?.sqstr) + i;
+		let o = e?.preserveByteString ? $e(this.ednSource, e, this.ednCommentSyntax) : void 0;
+		if (o !== void 0 && (a !== null || !/[\r\n]/.test(o))) return /_[0-3i]$/.test(o) ? (e?.encodingIndicators ?? "auto") === "never" ? o.replace(/_[0-3i]$/, "") : o : o + t(e, this.encodingWidth, () => E(BigInt(this.value.length)));
+		let s = t(e, this.encodingWidth, () => E(BigInt(this.value.length))), c = e?.bstrEncoding ?? this.ednEncoding;
+		return e?.appPrefix === !1 && c !== "hex" && (c = "hex"), d(this.value, c, e?.sqstr) + s;
 	}
 	_toJS(e) {
 		return this.value;
 	}
-}, P = class extends O {
+}, V = class extends F {
 	indefiniteLength = !0;
 	chunks;
 	constructor(e) {
@@ -549,46 +680,55 @@ var N = class extends O {
 		for (let n of this.chunks) n._encode(e, t);
 		e.writeByte(255);
 	}
-	_toCDN(e, t) {
+	_isMultiWordText(e, t = !0) {
+		return this.chunks.some((t) => t._isMultiWordText(e));
+	}
+	_toCDN(e, t, n) {
 		if ((e?.encodingIndicators ?? "auto") === "never") {
 			let n = this.chunks.reduce((e, t) => e + t.value.length, 0), r = new Uint8Array(n), i = 0;
 			for (let e of this.chunks) r.set(e.value, i), i += e.value.length;
-			return new N(r)._toCDN(e, t);
+			return new B(r)._toCDN(e, t);
 		}
-		return this.chunks.length === 0 ? "''_" : s({
+		let i = n ?? [], a = qe(e), o = (t) => a ? this.chunks[t]._resolveCdnOptions(e, [...i, t], { parent: this }) : e, s = !!e?.modernStreamSyntax && e?.appPrefix !== !1;
+		return !s && this.chunks.length === 0 ? "''_" : r({
 			node: this,
 			options: e,
 			depth: t,
-			openChar: "(",
-			closeChar: ")",
+			openChar: s ? "ilbs<<" : "(",
+			closeChar: s ? ">>" : ")",
 			count: this.chunks.length,
 			indefiniteLength: !0,
+			indefiniteMarker: !s,
 			encodingWidth: void 0,
-			hasEntryComments: () => this.chunks.some(h),
-			renderEntry: (n) => this.chunks[n]._toCDN(e, t + 1),
+			hasEntryComments: (e) => _(this.chunks[e]),
+			renderEntry: (e) => this.chunks[e]._toCDN(o(e), t + 1, a ? [...i, e] : void 0),
+			entryIsLeaf: s ? void 0 : () => !0,
+			alwaysInlineLeaf: s,
+			entryIsMultiWordText: (e) => this.chunks[e]._isMultiWordText(o(e), !s, a ? [...i, e] : void 0),
 			entryLeadingNode: (e) => this.chunks[e],
-			entryTrailing: (e, t) => u(this.chunks[e], t)
+			entryTrailing: (e, t) => g(this.chunks[e], t),
+			entryOptions: a ? o : void 0
 		});
 	}
-	_toHexDump(t, n) {
-		let r = [{
-			depth: t,
-			hex: e(95),
+	_toHexDump(e, t) {
+		let n = [{
+			depth: e,
+			hex: o(95),
 			comment: "Start indefinite-length byte string"
 		}];
-		for (let e of this.chunks) r.push(...e._toHexDump(t + 1, n));
-		return r.push({
-			depth: t,
-			hex: e(255),
+		for (let r of this.chunks) m(n, r._toHexDump(e + 1, t));
+		return n.push({
+			depth: e,
+			hex: o(255),
 			comment: "\"break\""
-		}), r;
+		}), n;
 	}
 	_toJS(e) {
 		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 n;
 	}
-}, F = class extends O {
+}, H = class extends F {
 	indefiniteLength = !0;
 	chunks;
 	constructor(e) {
@@ -599,39 +739,49 @@ var N = class extends O {
 		for (let n of this.chunks) n._encode(e, t);
 		e.writeByte(255);
 	}
-	_toCDN(e, t) {
-		return (e?.encodingIndicators ?? "auto") === "never" ? new G(this.chunks.map((e) => e.value).join(""))._toCDN(e, t) : this.chunks.length === 0 ? "\"\"_" : s({
+	_isMultiWordText(e, t = !0) {
+		return this.chunks.some((t) => t._isMultiWordText(e));
+	}
+	_toCDN(e, t, n) {
+		if ((e?.encodingIndicators ?? "auto") === "never") return new Y(this.chunks.map((e) => e.value).join(""))._toCDN(e, t);
+		let i = n ?? [], a = qe(e), o = (t) => a ? this.chunks[t]._resolveCdnOptions(e, [...i, t], { parent: this }) : e, s = !!e?.modernStreamSyntax && e?.appPrefix !== !1;
+		return !s && this.chunks.length === 0 ? "\"\"_" : r({
 			node: this,
 			options: e,
 			depth: t,
-			openChar: "(",
-			closeChar: ")",
+			openChar: s ? "ilts<<" : "(",
+			closeChar: s ? ">>" : ")",
 			count: this.chunks.length,
 			indefiniteLength: !0,
+			indefiniteMarker: !s,
 			encodingWidth: void 0,
-			hasEntryComments: () => this.chunks.some(h),
-			renderEntry: (n) => this.chunks[n]._toCDN(e, t + 1),
+			hasEntryComments: (e) => _(this.chunks[e]),
+			renderEntry: (e) => this.chunks[e]._toCDN(o(e), t + 1, a ? [...i, e] : void 0),
+			entryIsLeaf: s ? void 0 : () => !0,
+			alwaysInlineLeaf: s,
+			entryIsMultiWordText: (e) => this.chunks[e]._isMultiWordText(o(e), !s, a ? [...i, e] : void 0),
 			entryLeadingNode: (e) => this.chunks[e],
-			entryTrailing: (e, t) => u(this.chunks[e], t)
+			entryTrailing: (e, t) => g(this.chunks[e], t),
+			entryOptions: a ? o : void 0
 		});
 	}
-	_toHexDump(t, n) {
-		let r = [{
-			depth: t,
-			hex: e(127),
+	_toHexDump(e, t) {
+		let n = [{
+			depth: e,
+			hex: o(127),
 			comment: "Start indefinite-length text string"
 		}];
-		for (let e of this.chunks) r.push(...e._toHexDump(t + 1, n));
-		return r.push({
-			depth: t,
-			hex: e(255),
+		for (let r of this.chunks) m(n, r._toHexDump(e + 1, t));
+		return n.push({
+			depth: e,
+			hex: o(255),
 			comment: "\"break\""
-		}), r;
+		}), n;
 	}
 	_toJS(e) {
 		return this.chunks.map((e) => e.value).join("");
 	}
-}, I = class extends O {
+}, U = class extends F {
 	items;
 	indefiniteLength;
 	encodingWidth;
@@ -648,11 +798,12 @@ var N = class extends O {
 			e.writeByte(255);
 			return;
 		}
-		E(e, 4, this.items.length, this.encodingWidth);
+		N(e, 4, this.items.length, this.encodingWidth);
 		for (let n of this.items) n._encode(e, t);
 	}
-	_toCDN(e, t) {
-		return s({
+	_toCDN(e, t, n) {
+		let i = n ?? [], a = qe(e), o = (t) => a ? this.items[t]._resolveCdnOptions(e, [...i, t], { parent: this }) : e;
+		return r({
 			node: this,
 			options: e,
 			depth: t,
@@ -661,49 +812,52 @@ var N = class extends O {
 			count: this.items.length,
 			indefiniteLength: this.indefiniteLength,
 			encodingWidth: this.encodingWidth,
-			hasEntryComments: () => this.items.some(h),
-			renderEntry: (n) => this.items[n]._toCDN(e, t + 1),
+			hasEntryComments: (e) => _(this.items[e]),
+			renderEntry: (e) => this.items[e]._toCDN(o(e), t + 1, a ? [...i, e] : void 0),
 			entryIsLeaf: (e) => !this.items[e]._containsCdnContainer,
+			entryIsMultiWordText: (e) => this.items[e]._isMultiWordText(o(e), !0, a ? [...i, e] : void 0),
 			entryLeadingNode: (e) => this.items[e],
-			entryTrailing: (e, t) => u(this.items[e], t)
+			entryTrailing: (e, t) => g(this.items[e], t),
+			entryOptions: a ? o : void 0
 		});
 	}
-	_toHexDump(t, n) {
+	_toHexDump(e, t) {
 		if (this.indefiniteLength) {
-			let r = [{
-				depth: t,
-				hex: e(159),
+			let n = [{
+				depth: e,
+				hex: o(159),
 				comment: "Start indefinite-length array"
 			}];
-			for (let e of this.items) r.push(...e._toHexDump(t + 1, n));
-			return r.push({
-				depth: t,
-				hex: e(255),
+			for (let r of this.items) m(n, r._toHexDump(e + 1, t));
+			return n.push({
+				depth: e,
+				hex: o(255),
 				comment: "\"break\""
-			}), r;
+			}), n;
 		}
-		let r = [{
-			depth: t,
-			hex: i(Ee(4, BigInt(this.items.length), this.encodingWidth)),
+		let n = [{
+			depth: e,
+			hex: l(Oe(4, BigInt(this.items.length), this.encodingWidth)),
 			comment: `Array of length ${this.items.length}`
 		}];
-		for (let e of this.items) r.push(...e._toHexDump(t + 1, n));
-		return r;
+		for (let r of this.items) m(n, r._toHexDump(e + 1, t));
+		return n;
 	}
-	_toJS(e) {
-		let t = e?.reviver;
-		if (!t) return this.items.map((t) => t._toJS(e));
-		let n = e ? {
-			...e,
-			reviver: void 0
-		} : 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 === x || e?.undefinedOmits && s === void 0 ? (r.splice(a, 1), i++) : r[a] = s;
+	_toJS(e, t, n) {
+		let r = e?.reviver, i = Ie(e), a = n ?? Ve, o = (e, n, r, o) => i ? e._toJSChild(r, [...t ?? [], n], o ? [
+			...a,
+			Be,
+			n
+		] : [...a, n], { parent: this }) : e._toJS(r);
+		if (!r) return this.items.map((t, n) => o(t, n, e, !1));
+		let s = Le(e), c = this.items.map((e, t) => o(e, t, s, !0)), l = 0;
+		for (let t = 0; t < this.items.length; t++) {
+			let n = t - l, i = o(this.items[t], t, e, !1), a = r.call(c, String(t), i);
+			a === A || e?.undefinedOmits && a === void 0 ? (c.splice(n, 1), l++) : c[n] = a;
 		}
-		return r;
+		return c;
 	}
-}, L = class extends O {
+}, W = class extends F {
 	entries;
 	indefiniteLength;
 	encodingWidth;
@@ -720,11 +874,46 @@ var N = class extends O {
 			e.writeByte(255);
 			return;
 		}
-		E(e, 5, this.entries.length, this.encodingWidth);
+		N(e, 5, this.entries.length, this.encodingWidth);
 		for (let [n, r] of this.entries) n._encode(e, t), r._encode(e, t);
 	}
-	_toCDN(e, t) {
-		return s({
+	_toCDN(e, t, n) {
+		let i = n ?? [], a = qe(e), o = [], s = (t) => {
+			let n = o[t];
+			if (!n) {
+				let [r, s] = this.entries[t];
+				if (!a) n = [
+					void 0,
+					e,
+					e
+				];
+				else {
+					let t = r instanceof Y ? r.value : r.toCDN();
+					n = [
+						t,
+						r._resolveCdnOptions(e, i, {
+							parent: this,
+							isMapKey: !0,
+							keyNode: r
+						}),
+						s._resolveCdnOptions(e, [...i, t], {
+							parent: this,
+							keyNode: r
+						})
+					];
+				}
+				o[t] = n;
+			}
+			return n;
+		}, c = [], l = (e) => {
+			let n = c[e];
+			if (!n) {
+				let [r, o] = this.entries[e], [l, u, d] = s(e);
+				n = [r._toCDN(u, t + 1, a ? i : void 0), o._toCDN(d, t + 1, a ? [...i, l] : void 0)], c[e] = n;
+			}
+			return n;
+		};
+		return r({
 			node: this,
 			options: e,
 			depth: t,
@@ -733,100 +922,125 @@ var N = class extends O {
 			count: this.entries.length,
 			indefiniteLength: this.indefiniteLength,
 			encodingWidth: this.encodingWidth,
-			hasEntryComments: () => this.entries.some(([e, t]) => h(e) || h(t)),
-			renderEntry: (n, r) => {
-				let [i, a] = this.entries[n];
-				return `${i._toCDN(e, t + 1)}${r}${a._toCDN(e, t + 1)}`;
+			hasEntryComments: (e) => {
+				let [t, n] = this.entries[e];
+				return _(t) || _(n);
+			},
+			renderEntry: (e, t) => {
+				let [n, r] = l(e);
+				return `${n}${t}${r}`;
 			},
 			entryIsLeaf: (e) => {
 				let [t, n] = this.entries[e];
 				return !t._containsCdnContainer && !n._containsCdnContainer;
 			},
+			entryIsMultiWordText: (e) => {
+				let [t, n] = this.entries[e], [r, o, c] = s(e), u = a ? i : void 0, d = a ? [...i, r] : void 0;
+				if (t._isMultiWordText(o, !0, u) || n._isMultiWordText(c, !0, d)) return !0;
+				let [p, m] = l(e);
+				return f(p) || f(m);
+			},
 			entryLeadingNode: (e) => this.entries[e][0],
 			entryTrailing: (e, t) => {
 				let [n, r] = this.entries[e];
-				return Fe([
+				return et([
 					...n.comments?.trailing ?? [],
 					...r.comments?.leading ?? [],
 					...r.comments?.trailing ?? []
 				], t);
-			}
+			},
+			entryOptions: a ? (e) => s(e)[1] : void 0
 		});
 	}
-	_toHexDump(t, n) {
+	_toHexDump(e, t) {
 		if (this.indefiniteLength) {
-			let r = [{
-				depth: t,
-				hex: e(191),
+			let n = [{
+				depth: e,
+				hex: o(191),
 				comment: "Start indefinite-length map"
 			}];
-			for (let [e, i] of this.entries) r.push(...e._toHexDump(t + 1, n)), r.push(...i._toHexDump(t + 1, n));
-			return r.push({
-				depth: t,
-				hex: e(255),
+			for (let [r, i] of this.entries) m(n, r._toHexDump(e + 1, t)), m(n, i._toHexDump(e + 1, t));
+			return n.push({
+				depth: e,
+				hex: o(255),
 				comment: "\"break\""
-			}), r;
+			}), n;
 		}
-		let r = [{
-			depth: t,
-			hex: i(Ee(5, BigInt(this.entries.length), this.encodingWidth)),
+		let n = [{
+			depth: e,
+			hex: l(Oe(5, BigInt(this.entries.length), this.encodingWidth)),
 			comment: `Map of length ${this.entries.length}`
 		}];
-		for (let [e, i] of this.entries) r.push(...e._toHexDump(t + 1, n)), r.push(...i._toHexDump(t + 1, n));
-		return r;
+		for (let [r, i] of this.entries) m(n, r._toHexDump(e + 1, t)), m(n, i._toHexDump(e + 1, t));
+		return n;
 	}
-	_toJS(e) {
-		let t = e?.reviver, n = () => {
-			let n = $.from(this.entries, ([t, n]) => [t._toJS(e), n._toJS(e)]);
-			if (!t) return n;
-			let r = e?.undefinedOmits;
+	_toJS(e, t, n) {
+		let r = e?.reviver, i = Ie(e), a = t ?? [], o = n ?? Ve, s = () => {
+			let t = (e, t, n, r) => {
+				if (!i) return [e._toJS(r), t._toJS(r)];
+				let s = e._toJSChild(r, a, [...o, `k${n}`], {
+					parent: this,
+					isMapKey: !0,
+					keyNode: e
+				});
+				return [s, t._toJSChild(r, [...a, s], [...o, `v${n}`], {
+					parent: this,
+					keyNode: e
+				})];
+			}, n = $.from(this.entries, ([n, r], i) => t(n, r, i, e));
+			if (!r) return n;
+			let s = e?.undefinedOmits;
 			for (let e = 0; e < n.length; e++) {
-				let [i, a] = n[e], o = t.call(n, i, a);
-				o === x || r && o === void 0 ? n.splice(e--, 1) : n[e] = [i, o];
+				let [t, i] = n[e], a = r.call(n, t, i);
+				a === A || s && a === void 0 ? n.splice(e--, 1) : n[e] = [t, a];
 			}
 			return n;
 		};
-		return e?.mapAs === "entries" ? n() : e?.mapAs === "object" || this.entries.every(([e]) => e instanceof G) ? (() => {
-			let n = e ? {
-				...e,
-				reviver: void 0
-			} : void 0, r = {};
-			for (let [e, t] of this.entries) {
-				let i = e instanceof G ? e.value : e.toCDN(), a = t._toJS(n);
-				i === "__proto__" ? Object.defineProperty(r, i, {
-					value: a,
+		return e?.mapAs === "entries" ? s() : e?.mapAs === "object" || this.entries.every(([e]) => e instanceof Y) ? (() => {
+			let t = (e, t, n, r, s, c) => i ? t._toJSChild(s, [...a, n], c ? [
+				...o,
+				Be,
+				`v${r}`
+			] : [...o, `v${r}`], {
+				parent: this,
+				keyNode: e
+			}) : t._toJS(s), n = Le(e), s = {};
+			for (let e = 0; e < this.entries.length; e++) {
+				let [i, a] = this.entries[e], o = i instanceof Y ? i.value : i.toCDN(), c = t(i, a, o, e, n, !!r);
+				o === "__proto__" ? Object.defineProperty(s, o, {
+					value: c,
 					writable: !0,
 					enumerable: !0,
 					configurable: !0
-				}) : r[i] = a;
+				}) : s[o] = c;
 			}
-			if (!t) return r;
-			let i = /* @__PURE__ */ new Map();
+			if (!r) return s;
+			let c = /* @__PURE__ */ new Map();
 			for (let e = 0; e < this.entries.length; e++) {
 				let [t] = this.entries[e];
-				i.set(t instanceof G ? t.value : t.toCDN(), e);
+				c.set(t instanceof Y ? t.value : t.toCDN(), e);
 			}
 			for (let n = 0; n < this.entries.length; n++) {
-				let [a, o] = this.entries[n], s = a instanceof G ? a.value : a.toCDN();
-				if (i.get(s) !== n) continue;
-				let c = o._toJS(e), l = t.call(r, s, c);
-				l === x || e?.undefinedOmits && l === void 0 ? delete r[s] : s === "__proto__" ? Object.defineProperty(r, s, {
-					value: l,
+				let [i, a] = this.entries[n], o = i instanceof Y ? i.value : i.toCDN();
+				if (c.get(o) !== n) continue;
+				let l = t(i, a, o, n, e, !1), u = r.call(s, o, l);
+				u === A || e?.undefinedOmits && u === void 0 ? delete s[o] : o === "__proto__" ? Object.defineProperty(s, o, {
+					value: u,
 					writable: !0,
 					enumerable: !0,
 					configurable: !0
-				}) : r[s] = l;
+				}) : s[o] = u;
 			}
-			return r;
-		})() : n();
+			return s;
+		})() : s();
 	}
 };
-function Fe(e, t) {
-	return e.length === 0 ? "" : " " + e.map((e) => o(e, t).trimEnd()).join(" ");
+function et(e, t) {
+	return e.length === 0 ? "" : " " + e.map((e) => b(e, t).trimEnd()).join(" ");
 }
 //#endregion
 //#region src/ast/CborSimple.ts
-var R = class e extends O {
+var G = class e extends F {
 	value;
 	ednSource;
 	constructor(e, t) {
@@ -863,7 +1077,7 @@ var R = class e extends O {
 			default: return new he(this.value);
 		}
 	}
-}, z = class extends O {
+}, K = class extends F {
 	items;
 	encodingWidth;
 	constructor(e, t) {
@@ -873,16 +1087,17 @@ var R = class e extends O {
 		return this.items.some((e) => e._containsCdnContainer);
 	}
 	_content(e) {
-		let t = new Ce();
+		let t = new Te();
 		for (let n of this.items) n._encode(t, e);
 		return t.finish();
 	}
 	_encodeTo(e, t) {
 		let n = this._content(t);
-		E(e, 2, n.length, this.encodingWidth), e.writeBytes(n);
+		N(e, 2, n.length, this.encodingWidth), e.writeBytes(n);
 	}
-	_toCDN(e, t) {
-		return s({
+	_toCDN(e, t, n) {
+		let i = n ?? [], a = qe(e), o = (t) => a ? this.items[t]._resolveCdnOptions(e, [...i, t], { parent: this }) : e;
+		return r({
 			node: this,
 			options: e,
 			depth: t,
@@ -893,19 +1108,22 @@ var R = class e extends O {
 			encodingWidth: this.encodingWidth,
 			eiPosition: "close",
 			canonicalCount: () => BigInt(this._content(e).length),
-			hasEntryComments: () => this.items.some(h),
-			renderEntry: (n) => this.items[n]._toCDN(e, t + 1),
+			hasEntryComments: (e) => _(this.items[e]),
+			renderEntry: (e) => this.items[e]._toCDN(o(e), t + 1, a ? [...i, e] : void 0),
+			alwaysInlineLeaf: !0,
+			entryIsMultiWordText: (e) => this.items[e]._isMultiWordText(o(e), !1, a ? [...i, e] : void 0),
 			entryLeadingNode: (e) => this.items[e],
-			entryTrailing: (e, t) => u(this.items[e], t)
+			entryTrailing: (e, t) => g(this.items[e], t),
+			entryOptions: a ? o : void 0
 		});
 	}
 	_toHexDump(e, t) {
 		let n = this._content().length, r = [{
 			depth: e,
-			hex: i(Ee(2, BigInt(n), this.encodingWidth)),
+			hex: l(Oe(2, BigInt(n), this.encodingWidth)),
 			comment: `Embedded CBOR sequence, ${n} byte${n === 1 ? "" : "s"}`
 		}];
-		for (let n of this.items) r.push(...n._toHexDump(e + 1, t));
+		for (let n of this.items) m(r, n._toHexDump(e + 1, t));
 		return r;
 	}
 	_toJS(e) {
@@ -914,7 +1132,7 @@ var R = class e extends O {
 };
 //#endregion
 //#region src/utils/strip-comments.ts
-function Ie(e) {
+function tt(e) {
 	let t = "", n = 0;
 	for (; n < e.length;) {
 		let r = e[n];
@@ -933,7 +1151,7 @@ function Ie(e) {
 				continue;
 			}
 			if (t === "*") {
-				for (n += 2; n < e.length && !(e[n] === "*" && (e[n + 1] ?? "") === "/");) n++;
+				for (n += 2; n < e.length && (e[n] !== "*" || (e[n + 1] ?? "") !== "/");) n++;
 				if (n >= e.length) throw SyntaxError("unterminated block comment");
 				n += 2;
 				continue;
@@ -949,14 +1167,14 @@ function Ie(e) {
 }
 //#endregion
 //#region src/extensions/b32.ts
-var Le = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567", Re = "0123456789ABCDEFGHIJKLMNOPQRSTUV";
-function ze(e) {
+var nt = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567", rt = "0123456789ABCDEFGHIJKLMNOPQRSTUV";
+function it(e) {
 	let t = e.length;
 	for (; t > 0 && e.charCodeAt(t - 1) === 61;) t--;
 	return e.slice(0, t);
 }
-function Be(e, t, n) {
-	let r = ze(e).toUpperCase(), i = r.length % 8;
+function at(e, t, n) {
+	let r = it(e).toUpperCase(), i = r.length % 8;
 	if (i === 1 || i === 3 || i === 6) throw SyntaxError(`invalid base32 length: ${r.length} characters`);
 	let a = (/* @__PURE__ */ new Uint8Array(128)).fill(255);
 	for (let e = 0; e < t.length; e++) a[t.charCodeAt(e)] = e;
@@ -973,69 +1191,27 @@ function Be(e, t, n) {
 	}
 	return o;
 }
-var Ve = {
+var ot = {
 	appStringPrefixes: ["b32"],
 	parseAppString(e, t, n) {
-		return new N(Be(Ie(t), Le, n), { ednEncoding: "base32" });
+		return new B(at(tt(t), nt, n), { ednEncoding: "base32" });
 	}
-}, He = {
+}, st = {
 	appStringPrefixes: ["h32"],
 	parseAppString(e, t, n) {
-		return new N(Be(Ie(t), Re, n), { ednEncoding: "base32hex" });
-	}
-};
-//#endregion
-//#region src/utils/base64.ts
-function Ue(e, t) {
-	let n = e.indexOf("="), r = n >= 0 ? e.slice(0, n) : e, i = n >= 0 ? e.slice(n) : "";
-	if (/[^A-Za-z0-9+/\-_]/.test(r)) {
-		let e = [...r].find((e) => !/[A-Za-z0-9+/\-_]/.test(e)) ?? "";
-		throw SyntaxError(`invalid character ${JSON.stringify(e)} in base64 data`);
-	}
-	if (i && !/^=+$/.test(i)) throw SyntaxError("invalid character after base64 '=' padding");
-	let a = r.length % 4;
-	if (a === 1) throw SyntaxError(`invalid base64 length: ${r.length} data characters (length mod 4 = 1 is never valid)`);
-	let o = a === 0 ? 0 : 4 - a;
-	if (i.length > o) {
-		let e = `base64 has ${i.length} '=' character${i.length > 1 ? "s" : ""} but the data length (${r.length}) requires at most ${o}`;
-		if (t) t(e);
-		else throw SyntaxError(e);
-	}
-	if (i.length > 0 && i.length < o) {
-		let e = `base64 has ${i.length} '=' character${i.length > 1 ? "s" : ""} but needs exactly ${o} — use full padding or no padding at all`;
-		if (t) t(e);
-		else throw SyntaxError(e);
-	}
-	if (a !== 0 && r.length > 0) {
-		let e = r[r.length - 1].replace("-", "+").replace("_", "/"), n = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".indexOf(e);
-		if (n >= 0 && n & (a === 2 ? 15 : 3)) {
-			let e = "base64 has non-zero trailing bits in the final quantum (RFC 4648 §3.5)";
-			if (t) t(e);
-			else throw SyntaxError(e);
-		}
+		return new B(at(tt(t), rt, n), { ednEncoding: "base32hex" });
 	}
-	let s = r.replace(/-/g, "+").replace(/_/g, "/") + "=".repeat(o);
-	if (typeof Uint8Array.fromBase64 == "function") return Uint8Array.fromBase64(s, {
-		alphabet: "base64",
-		lastChunkHandling: "loose"
-	});
-	let c = atob(s), l = new Uint8Array(c.length);
-	for (let e = 0; e < c.length; e++) l[e] = c.charCodeAt(e);
-	return l;
-}
-//#endregion
-//#region src/ast/CborUnresolvedAppExt.ts
-var We = 999n, Ge = class extends M {
+}, ct = 999n, lt = class extends z {
 	constructor(e, t) {
-		let n = t.length === 1 && t[0] instanceof G ? t[0] : new I(t);
-		super(We, new I([new G(e), n]));
+		let n = t.length === 1 && t[0] instanceof Y ? t[0] : new U(t);
+		super(ct, new U([new Y(e), n]));
 	}
 	_toCDN(e, t) {
-		if (e?.appStrings === !1) return super._toCDN(e, t);
+		if (e?.appPrefix === !1) return super._toCDN(e, t);
 		let n = this.content, r = n.items[0].value, i = n.items[1];
-		return i instanceof G ? `${r}${c(i.value)}` : `${r}<<${i.items.map((n) => n._toCDN(e, t)).join(", ")}>>`;
+		return i instanceof Y ? `${r}${ne(i.value)}` : `${r}<<${i.items.map((n) => n._toCDN(e, t)).join(", ")}>>`;
 	}
-}, B = class extends O {
+}, ut = class extends F {
 	inner;
 	ednSource;
 	constructor(e, t) {
@@ -1044,140 +1220,154 @@ var We = 999n, Ge = class extends M {
 	get _containsCdnContainer() {
 		return this.inner._containsCdnContainer;
 	}
+	_isMultiWordText(e, t = !0, n) {
+		return y(this._toCDN(e, 0, n), t);
+	}
 	_encodeTo(e, t) {
 		this.inner._encode(e, t);
 	}
-	_toCDN(e, t) {
-		let n = e?.encodingIndicators ?? "auto";
-		return e?.appStrings !== !1 && n === "auto" && (v(e) !== null || !/[\r\n]/.test(this.ednSource)) ? this.ednSource : this.inner._toCDN(e, t);
+	_toCDN(e, t, n) {
+		let r = e?.encodingIndicators ?? "auto";
+		if (!(e?.appPrefix !== !1 && r === "auto" && (O(e) !== null || !/[\r\n]/.test(this.ednSource)))) return this.inner._toCDN(this.inner._resolveCdnOptions(e, n ?? [], { parent: this }), t, n);
+		if (!qe(e)) return this.ednSource;
+		let i = e[Ye], a = { applied: !1 }, o = {
+			...e,
+			[Ye]: a
+		}, s = this.inner._toCDN(this.inner._resolveCdnOptions(o, n ?? [], { parent: this }), t, n);
+		return a.applied && i && (i.applied = !0), a.applied ? s : this.ednSource;
 	}
-	_toJS(e) {
-		return this.inner._toJS(e);
+	_toJS(e, t, n) {
+		return Ie(e) ? this.inner._toJSChild(e, t ?? [], n ?? Ve, { parent: this }) : this.inner._toJS(e);
 	}
-}, Ke = 888n;
-function qe(e, t, n, r) {
-	return n ? [...(e.comments?.trailing ?? []).map((e) => o(e, r)), ...(t.comments?.leading ?? []).map((e) => o(e, r))] : [];
+}, dt = 888n;
+function ft(e, t, n, r) {
+	return n ? [...(e.comments?.trailing ?? []).map((e) => b(e, r)), ...(t.comments?.leading ?? []).map((e) => b(e, r))] : [];
 }
-function Je(e, t, n, r) {
-	return n === null || !t.some((e) => e.length > 0) ? e.join(" + ") : f(e, n, r, t);
+function pt(e, t, n, r) {
+	return n === null || !t.some((e) => e.length > 0) ? e.join(" + ") : oe(e, n, r, t);
 }
-function Ye(e, t, n, i) {
+function mt(e, t, r, i) {
 	if (e === void 0) return;
-	let a = t?.preserveComments || i === void 0 ? e : r(e, i);
-	return Ze(a, n) ? a : void 0;
+	let a = n(t) || i === void 0 ? e : x(e, i);
+	return gt(a, r) ? a : void 0;
 }
-function Xe(e, t) {
-	return e !== void 0 && Ze(e, t);
+function ht(e, t) {
+	return e !== void 0 && gt(e, t);
 }
-function Ze(e, t) {
+function gt(e, t) {
 	return t !== null || !/[\r\n]/.test(e);
 }
-var V = class e extends M {
+var q = class e extends z {
 	realBoundary;
 	fromByteLiteral;
 	literalSource;
 	constructor(e, t) {
-		Array.isArray(e) ? (super(Ke, new I(e)), this.fromByteLiteral = !1, this.literalSource = void 0, this.realBoundary = t) : (super(Ke, R.NULL), this.fromByteLiteral = e ?? !1, this.literalSource = t, this.realBoundary = void 0);
-	}
-	_toCDN(e, t) {
-		if (e?.appStrings === !1) return super._toCDN(e, t);
-		if (this.content instanceof R) return "...";
-		if (this.content instanceof I) {
-			let n = !!e?.preserveConcatenation;
-			if (n || e?.preserveByteString && !this._hasRealConcatenation()) {
-				let n = this._renderPreservedBytesElision(e, t);
-				if (n !== void 0) return n;
+		Array.isArray(e) ? (super(dt, new U(e)), this.fromByteLiteral = !1, this.literalSource = void 0, this.realBoundary = t) : (super(dt, G.NULL), this.fromByteLiteral = e ?? !1, this.literalSource = t, this.realBoundary = void 0);
+	}
+	_toCDN(t, r) {
+		if (t?.appPrefix === !1) return super._toCDN(t, r);
+		if (this.content instanceof G) return "...";
+		if (this.content instanceof U) {
+			let i = !!t?.preserveConcatenation;
+			if (i || t?.preserveByteString && !this._hasRealConcatenation()) {
+				let e = this._renderPreservedBytesElision(t, r);
+				if (e !== void 0) return e;
 			}
-			if (!n || this.realBoundary === void 0) {
+			if (!i || this.realBoundary === void 0) {
 				let e = this._compactHexElided();
 				if (e !== void 0) return e;
 			}
-			let r = this.content.items, i = r.map((r) => n ? this._renderFragment(r, e, t) : r._toCDN(e, t)), a = !!e?.preserveComments, o = typeof e?.preserveComments == "string" ? e.preserveComments : void 0;
-			return Je(i, r.slice(1).map((e, t) => qe(r[t], e, a, o)), v(e), t);
+			let a = this.content.items, o = a.map((e) => i ? this._renderFragment(e, t, r) : e._toCDN(t, r)), s = n(t), c = u(t), l = a.slice(1).map((e, t) => ft(a[t], e, s, c));
+			if (t?.modernConcat) {
+				let n = a.every((t) => t instanceof B || t instanceof e && t.content instanceof G);
+				return ie(n ? "b1" : "t1", o, "", O(t), r, l);
+			}
+			return pt(o, l, O(t), r);
 		}
-		return super._toCDN(e, t);
+		return super._toCDN(t, r);
 	}
 	_hasRealConcatenation() {
-		return this.realBoundary?.some((e, t) => t > 0 && e) ? !0 : this.content.items.some((e) => e instanceof N && e.ednParts !== void 0 && e.ednParts.length > 1);
-	}
-	_renderFragment(e, t, n) {
-		let r = v(t), i = !!t?.preserveComments, a = typeof t?.preserveComments == "string" ? t.preserveComments : void 0;
-		if (e instanceof N && e.ednParts !== void 0 && e.ednParts.length > 1) {
-			let o = t?.appStrings === !1 ? "hex" : t?.bstrEncoding ?? e.ednEncoding;
-			return Je(e.ednParts.map((e) => {
-				let n = t?.preserveByteString ? Ye(e.source, t, r, e.commentSyntax) : void 0;
-				return n === void 0 ? oe(e.bytes, o, t?.sqstr) : n;
-			}), i ? ne(e.comments?.dangling, e.ednParts, a) ?? [] : [], r, n);
-		}
-		if (e instanceof G && e.ednParts !== void 0 && e.ednParts.length > 1) {
-			let o = t?.preserveRawString ? e.ednPartSources : void 0;
-			return Je(e.ednParts.map((e, t) => {
-				let n = o?.[t];
-				return Xe(n, r) ? n : ee(e);
-			}), i ? ne(e.comments?.dangling, e.ednPartSpans, a) ?? [] : [], r, n);
-		}
-		return e._toCDN(t, n);
+		return this.realBoundary?.some((e, t) => t > 0 && e) ? !0 : this.content.items.some((e) => e instanceof B && e.ednParts !== void 0 && e.ednParts.length > 1);
+	}
+	_renderFragment(e, t, r) {
+		let i = O(t), a = n(t), o = u(t), s = !!t?.modernConcat;
+		if (e instanceof B && e.ednParts !== void 0 && e.ednParts.length > 1) {
+			let n = t?.appPrefix === !1 ? "hex" : t?.bstrEncoding ?? e.ednEncoding, c = e.ednParts.map((e) => {
+				let r = t?.preserveByteString ? mt(e.source, t, i, e.commentSyntax) : void 0;
+				return r === void 0 ? d(e.bytes, n, t?.sqstr) : r;
+			}), l = a ? p(e.comments?.dangling, e.ednParts, o) ?? [] : [];
+			return s ? ie("b1", c, "", i, r, l) : pt(c, l, i, r);
+		}
+		if (e instanceof Y && e.ednParts !== void 0 && e.ednParts.length > 1) {
+			let n = t?.preserveRawString ? e.ednPartSources : void 0, c = e.ednParts.map((e, t) => {
+				let r = n?.[t];
+				return ht(r, i) ? r : h(e);
+			}), l = a ? p(e.comments?.dangling, e.ednPartSpans, o) ?? [] : [];
+			return s ? ie("t1", c, "", i, r, l) : pt(c, l, i, r);
+		}
+		return e._toCDN(t, r);
 	}
 	_compactHexElided() {
 		let t = this.content.items, n = "", r = !1;
-		for (let i of t) if (i instanceof N) n += y(i.value), r = !0;
-		else if (i instanceof e && i.content instanceof R) n += "...";
+		for (let i of t) if (i instanceof B) n += s(i.value), r = !0;
+		else if (i instanceof e && i.content instanceof G) n += "...";
 		else return;
 		if (r) return `h'${n}'`;
 	}
-	_renderPreservedBytesElision(t, n) {
+	_renderPreservedBytesElision(t, r) {
 		if (this.realBoundary === void 0) return;
-		let r = this.realBoundary, i = this.content.items, a = [], o = [], s = [], c = (e) => {
-			s.length > 0 && (a.push(s), o.push(e ?? []), s = []);
-		}, l = !!t?.preserveComments, u = typeof t?.preserveComments == "string" ? t.preserveComments : void 0;
-		for (let t = 0; t < i.length; t++) {
-			let n = i[t];
-			if (t > 0 && r[t] && c(qe(i[t - 1], n, l, u)), n instanceof e && n.content instanceof R) s.push({
+		let i = this.realBoundary, a = this.content.items, o = [], c = [], l = [], f = (e) => {
+			l.length > 0 && (o.push(l), c.push(e ?? []), l = []);
+		}, m = n(t), h = u(t);
+		for (let t = 0; t < a.length; t++) {
+			let n = a[t];
+			if (t > 0 && i[t] && f(ft(a[t - 1], n, m, h)), n instanceof e && n.content instanceof G) l.push({
 				ellipsis: !0,
 				fromByteLiteral: n.fromByteLiteral,
 				literalSource: n.literalSource
 			});
-			else if (n instanceof N) if (n.ednParts !== void 0 && n.ednParts.length > 1) {
-				let [e, ...t] = n.ednParts;
-				s.push({
-					bytes: e.bytes,
-					source: e.source,
-					commentSyntax: e.commentSyntax
-				});
-				let r = l ? ne(n.comments?.dangling, n.ednParts, u) : void 0;
-				t.forEach((e, t) => {
-					c(r?.[t]), s.push({
+			else if (n instanceof B) {
+				if (n.ednParts !== void 0 && n.ednParts.length > 1) {
+					let [e, ...t] = n.ednParts;
+					l.push({
 						bytes: e.bytes,
 						source: e.source,
 						commentSyntax: e.commentSyntax
 					});
+					let r = m ? p(n.comments?.dangling, n.ednParts, h) : void 0;
+					t.forEach((e, t) => {
+						f(r?.[t]), l.push({
+							bytes: e.bytes,
+							source: e.source,
+							commentSyntax: e.commentSyntax
+						});
+					});
+				} else l.push({
+					bytes: n.value,
+					source: n.ednSource,
+					commentSyntax: n.ednCommentSyntax
 				});
-			} else s.push({
-				bytes: n.value,
-				source: n.ednSource,
-				commentSyntax: n.ednCommentSyntax
-			});
-			else return;
+			} else return;
 		}
-		if (s.length > 0 && a.push(s), a.length === 0) return;
-		let d = t?.appStrings === !1 ? "hex" : t?.bstrEncoding ?? "hex", f = v(t);
-		return Je(a.map((e) => {
+		if (l.length > 0 && o.push(l), o.length === 0) return;
+		let g = t?.appPrefix === !1 ? "hex" : t?.bstrEncoding ?? "hex", _ = O(t), v = o.map((e) => {
 			if (t?.preserveByteString) for (let n of e) {
 				if (!("ellipsis" in n)) continue;
-				let e = Ye(n.literalSource, t, f, "full");
+				let e = mt(n.literalSource, t, _, "full");
 				if (e !== void 0) return e;
 			}
 			let n = e.filter((e) => !("ellipsis" in e));
 			if (n.length === 0) return e.some((e) => "ellipsis" in e && e.fromByteLiteral) ? "h'...'" : "...";
 			if (e.length === 1) {
-				let e = n[0], r = t?.preserveByteString ? Ye(e.source, t, f, e.commentSyntax) : void 0;
-				return r === void 0 ? oe(e.bytes, d, t?.sqstr) : r;
+				let e = n[0], r = t?.preserveByteString ? mt(e.source, t, _, e.commentSyntax) : void 0;
+				return r === void 0 ? d(e.bytes, g, t?.sqstr) : r;
 			}
-			return `h'${e.map((e) => "ellipsis" in e ? "..." : y(e.bytes)).join("")}'`;
-		}), o, f, n);
+			return `h'${e.map((e) => "ellipsis" in e ? "..." : s(e.bytes)).join("")}'`;
+		});
+		return t?.preserveConcatenation && t?.modernConcat && v.length > 1 ? ie("b1", v, "", _, r, c) : pt(v, c, _, r);
 	}
-}, Qe = 2n, $e = 3n, et = 18446744073709551615n, tt = -18446744073709551616n;
-function nt(e) {
+}, _t = 2n, vt = 3n, yt = 18446744073709551615n, bt = -18446744073709551616n;
+function xt(e) {
 	if (e < 0n) throw RangeError("bigintToBytes requires a non-negative value");
 	if (e === 0n) return /* @__PURE__ */ new Uint8Array();
 	let t = e.toString(16);
@@ -1186,16 +1376,16 @@ function nt(e) {
 	for (let e = 0; e < n.length; e++) n[e] = parseInt(t.slice(e * 2, e * 2 + 2), 16);
 	return n;
 }
-function rt(e) {
+function St(e) {
 	let t = 0n;
 	for (let n of e) t = t << 8n | BigInt(n);
 	return t;
 }
-var it = class extends M {
+var Ct = class extends z {
 	bigValue;
 	constructor(e) {
-		if (e <= et) throw RangeError(`CborBigUint value ${e} fits in CborUint; use CborUint instead`);
-		super(Qe, new N(nt(e))), this.bigValue = e;
+		if (e <= yt) throw RangeError(`CborBigUint value ${e} fits in CborUint; use CborUint instead`);
+		super(_t, new B(xt(e))), this.bigValue = e;
 	}
 	_toCDN(e, t) {
 		return this.bigValue.toString();
@@ -1203,11 +1393,11 @@ var it = class extends M {
 	_toJS(e) {
 		return this.bigValue;
 	}
-}, at = class extends M {
+}, wt = class extends z {
 	bigValue;
 	constructor(e) {
-		if (e >= tt) throw RangeError(`CborBigNint value ${e} fits in CborNint; use CborNint instead`);
-		super($e, new N(nt(-1n - e))), this.bigValue = e;
+		if (e >= bt) throw RangeError(`CborBigNint value ${e} fits in CborNint; use CborNint instead`);
+		super(vt, new B(xt(-1n - e))), this.bigValue = e;
 	}
 	_toCDN(e, t) {
 		return this.bigValue.toString();
@@ -1215,33 +1405,33 @@ var it = class extends M {
 	_toJS(e) {
 		return this.bigValue;
 	}
-}, ot = new TextEncoder(), st = new TextDecoder("utf-8", { fatal: !0 }), ct = new TextDecoder("utf-8", { fatal: !1 });
-function lt(e, t) {
-	let n = new re(e, {
-		offset: t?.offset,
-		skipRS: t?._skipRS
-	}), r = new Dt(n, t ?? {}).parse();
-	return (t?.preserveComments || t?.preserveAll) && (bt(r, n.comments, e), U(r)), r;
+}, Tt = new TextEncoder(), Et = new TextDecoder("utf-8", { fatal: !0 }), Dt = new TextDecoder("utf-8", { fatal: !1 });
+function Ot(t, r) {
+	let i = new e(t, {
+		offset: r?.offset,
+		skipRS: r?._skipRS
+	}), a = new Jt(i, r ?? {}).parse();
+	return (n(r) || r?.preserveAll) && (Bt(a, i.comments, t), Ut(a)), a;
 }
-function ut(e) {
+function kt(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 dt(e) {
+function At(e) {
 	return e.startsWith("-") ? -BigInt(e.slice(1)) : BigInt(e);
 }
-function H(e) {
-	if (e !== void 0) return pt([e.appSeqSourceFeatures, ft(e)]);
+function jt(e) {
+	if (e !== void 0) return Nt([e.appSeqSourceFeatures, Mt(e)]);
 }
-function ft(e) {
-	if (e instanceof N) return {
+function Mt(e) {
+	if (e instanceof B) return {
 		byteString: !0,
 		concatenation: e.ednParts !== void 0 && e.ednParts.length > 1
 	};
-	if (e instanceof G) {
+	if (e instanceof Y) {
 		let t = e.ednParts !== void 0, n = e.ednPartSources?.filter((e) => e !== void 0).length ?? 0, r = t ? e.ednParts.reduce((t, n, r) => {
 			let i = e.ednPartSources?.[r] !== void 0, a = e.ednPartIsByteString?.[r] ?? !1;
 			return i || !a ? t : t + 1;
@@ -1253,12 +1443,12 @@ function ft(e) {
 			concatenation: t && e.ednParts.length > 1
 		};
 	}
-	if (e instanceof I) return pt(e.items.map(H));
-	if (e instanceof L) return pt(e.entries.flatMap(([e, t]) => [H(e), H(t)]));
-	if (e instanceof M) return H(e.content);
-	if (e instanceof P || e instanceof F || e instanceof z) return pt((e instanceof z ? e.items : e.chunks).map(H));
+	if (e instanceof U) return Nt(e.items.map(jt));
+	if (e instanceof W) return Nt(e.entries.flatMap(([e, t]) => [jt(e), jt(t)]));
+	if (e instanceof z) return jt(e.content);
+	if (e instanceof V || e instanceof H || e instanceof K) return Nt((e instanceof K ? e.items : e.chunks).map(jt));
 }
-function pt(e) {
+function Nt(e) {
 	let t = e.filter((e) => e !== void 0);
 	if (t.length !== 0) return {
 		byteString: t.some((e) => e.byteString),
@@ -1267,7 +1457,7 @@ function pt(e) {
 		concatenation: t.some((e) => e.concatenation)
 	};
 }
-function mt(e, t) {
+function Pt(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);
@@ -1291,18 +1481,18 @@ function mt(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: Me(n),
+		value: Ze(n),
 		precision: r
 	} : {
 		value: parseFloat(n),
 		precision: r
 	};
 }
-var ht = /\r?\n[ \t]*\r?\n/;
-function gt(e, t, n) {
-	return ht.test(e.slice(t, n));
+var Ft = /\r?\n[ \t]*\r?\n/;
+function It(e, t, n) {
+	return Ft.test(e.slice(t, n));
 }
-function _t(e, t, n, r) {
+function Lt(e, t, n, r) {
 	let i = [];
 	for (let a = t; a < e.length; a++) {
 		let t = e[a];
@@ -1315,7 +1505,7 @@ function _t(e, t, n, r) {
 	}
 	return i;
 }
-function vt(e, t, n, r) {
+function Rt(e, t, n, r) {
 	if (n.end !== void 0) return {
 		start: (/_[0-7i]$/.test(e.slice(Math.max(0, n.end - 2), n.end)) ? n.end - 2 : n.end) - t,
 		end: n.end - t,
@@ -1323,50 +1513,50 @@ function vt(e, t, n, r) {
 		never: ""
 	};
 }
-function yt(e, t, n) {
-	if (n instanceof k) {
-		let r = vt(e, t, n, `_${n.encodingWidth ?? p(n.value)}`);
-		return r ? [r] : [];
+function zt(t, n, r) {
+	if (r instanceof I) {
+		let e = Rt(t, n, r, `_${r.encodingWidth ?? E(r.value)}`);
+		return e ? [e] : [];
 	}
-	if (n instanceof A) {
-		let r = vt(e, t, n, `_${n.encodingWidth ?? p(n.argument)}`);
-		return r ? [r] : [];
+	if (r instanceof L) {
+		let e = Rt(t, n, r, `_${r.encodingWidth ?? E(r.argument)}`);
+		return e ? [e] : [];
 	}
-	if (n instanceof j) {
-		let r = n.precision ?? D(n.value), i = vt(e, t, n, r === "half" ? "_1" : r === "single" ? "_2" : "_3");
+	if (r instanceof R) {
+		let e = r.precision ?? P(r.value), i = Rt(t, n, r, e === "half" ? "_1" : e === "single" ? "_2" : "_3");
 		return i ? [i] : [];
 	}
-	if (n instanceof N) {
-		let r = vt(e, t, n, `_${n.encodingWidth ?? p(BigInt(n.value.length))}`);
-		return r ? [r] : [];
-	}
-	if (n instanceof G) {
-		let r = vt(e, t, n, `_${n.encodingWidth ?? p(BigInt(ot.encode(n.value).length))}`);
-		return r ? [r] : [];
-	}
-	if (n instanceof I) {
-		let r = [];
-		if (n.indefiniteLength) return;
-		if (n.start !== void 0) {
-			let i = new re(e, { offset: n.start }), a = i.consume(), o = i.peek(), s = o.type === "ENCODING_INDICATOR", c = `_${n.encodingWidth ?? p(BigInt(n.items.length))}`, l = e[a.endOffset] ?? "", u = !s && /[+\-.0-9A-Z_a-z]/.test(l) ? " " : "";
-			r.push({
-				start: (s ? o.offset : a.endOffset) - t,
-				end: (s ? o.endOffset : a.endOffset) - t,
-				always: c + u,
+	if (r instanceof B) {
+		let e = Rt(t, n, r, `_${r.encodingWidth ?? E(BigInt(r.value.length))}`);
+		return e ? [e] : [];
+	}
+	if (r instanceof Y) {
+		let e = Rt(t, n, r, `_${r.encodingWidth ?? E(BigInt(Tt.encode(r.value).length))}`);
+		return e ? [e] : [];
+	}
+	if (r instanceof U) {
+		let i = [];
+		if (r.indefiniteLength) return;
+		if (r.start !== void 0) {
+			let a = new e(t, { offset: r.start }), o = a.consume(), s = a.peek(), c = s.type === "ENCODING_INDICATOR", l = `_${r.encodingWidth ?? E(BigInt(r.items.length))}`, u = t[o.endOffset] ?? "", d = !c && /[+\-.0-9A-Z_a-z]/.test(u) ? " " : "";
+			i.push({
+				start: (c ? s.offset : o.endOffset) - n,
+				end: (c ? s.endOffset : o.endOffset) - n,
+				always: l + d,
 				never: ""
 			});
 		}
-		for (let i of n.items) {
-			let n = yt(e, t, i);
-			if (n === void 0) return;
-			r.push(...n);
+		for (let e of r.items) {
+			let r = zt(t, n, e);
+			if (r === void 0) return;
+			m(i, r);
 		}
-		return r;
+		return i;
 	}
 }
-function bt(e, t, n) {
+function Bt(e, t, n) {
 	if (t.length === 0) return;
-	let r = xt(e), i = Ct(n), a = [...r].sort((e, t) => e.start - t.start || t.end - e.end), o = [...r].sort((e, t) => e.end - t.end || e.start - t.start), s = [...t].sort((e, t) => e.start - t.start), c = [], l = 0;
+	let r = Vt(e), i = Wt(n), a = [...r].sort((e, t) => e.start - t.start || t.end - e.end), o = [...r].sort((e, t) => e.end - t.end || e.start - t.start), s = [...t].sort((e, t) => e.start - t.start), c = [], l = 0;
 	for (let e of s) {
 		let t = { ...e }, r = 0, s = o.length;
 		for (; r < s;) {
@@ -1375,7 +1565,7 @@ function bt(e, t, n) {
 		}
 		let u = r > 0 ? o[r - 1] : void 0, d = u ? n.slice(u.end, e.start) : "";
 		if (u && i(u.end) === e.line && !d.includes(":")) {
-			St(u.node, "trailing", t);
+			Ht(u.node, "trailing", t);
 			continue;
 		}
 		for (; l < a.length && a[l].start < e.start;) {
@@ -1391,62 +1581,62 @@ function bt(e, t, n) {
 		}
 		let p = r < a.length ? a[r] : void 0;
 		if ((!f || p && p.end <= f.end) && p) {
-			t.sameLine = i(e.end) === i(p.start), St(p.node, "leading", t);
+			t.sameLine = i(e.end) === i(p.start), Ht(p.node, "leading", t);
 			continue;
 		}
-		f && St(f.node, "dangling", t);
+		f && Ht(f.node, "dangling", t);
 	}
 }
-function xt(e) {
+function Vt(e) {
 	let t = [], n = (e) => {
 		if (e.start !== void 0 && e.end !== void 0 && t.push({
 			node: e,
 			start: e.start,
 			end: e.end
-		}), e instanceof I || e instanceof z) {
+		}), e instanceof U || e instanceof K) {
 			for (let t of e.items) n(t);
 			return;
 		}
-		if (e instanceof L) {
+		if (e instanceof W) {
 			for (let [t, r] of e.entries) n(t), n(r);
 			return;
 		}
-		if (e instanceof P || e instanceof F) {
+		if (e instanceof V || e instanceof H) {
 			for (let t of e.chunks) n(t);
 			return;
 		}
-		e instanceof M && n(e.content);
+		e instanceof z && n(e.content);
 	};
 	return n(e), t;
 }
-function St(e, t, n) {
+function Ht(e, t, n) {
 	e.comments ??= {}, e.comments[t] ??= [], e.comments[t].push(n);
 }
-function U(e) {
-	if (e instanceof V) {
-		if (e.content instanceof I) {
+function Ut(e) {
+	if (e instanceof q) {
+		if (e.content instanceof U) {
 			let t = e.content.items;
-			for (let e of t) U(e);
+			for (let e of t) Ut(e);
 			let n = t[t.length - 1], r = n?.comments?.trailing;
 			r !== void 0 && r.length > 0 && !e.comments?.trailing?.length && (e.comments ??= {}, e.comments.trailing = r, n.comments.trailing = void 0);
 		}
 		return;
 	}
-	if (e instanceof I || e instanceof z) {
-		for (let t of e.items) U(t);
+	if (e instanceof U || e instanceof K) {
+		for (let t of e.items) Ut(t);
 		return;
 	}
-	if (e instanceof L) {
-		for (let [t, n] of e.entries) U(t), U(n);
+	if (e instanceof W) {
+		for (let [t, n] of e.entries) Ut(t), Ut(n);
 		return;
 	}
-	if (e instanceof P || e instanceof F) {
-		for (let t of e.chunks) U(t);
+	if (e instanceof V || e instanceof H) {
+		for (let t of e.chunks) Ut(t);
 		return;
 	}
-	e instanceof M && U(e.content);
+	e instanceof z && Ut(e.content);
 }
-function Ct(e) {
+function Wt(e) {
 	let t = [0];
 	for (let n = 0; n < e.length; n++) e[n] === "\n" && t.push(n + 1);
 	return (n) => {
@@ -1460,25 +1650,25 @@ function Ct(e) {
 		return a + 1;
 	};
 }
-var wt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'extensions' option (extensions: [${e}])`, Tt = (e, t) => `install ${t}, import { ${e} } from '${t}', and pass it via the 'extensions' option (extensions: [${e}])`, W = (e) => `'${e}' is a default built-in extension that was excluded via the 'builtinExtensions' option; add it back to that array (or omit 'builtinExtensions' to use the default set)`, Et = /* @__PURE__ */ new Map([
-	["b32", wt("b32")],
-	["h32", wt("h32")],
-	["same", wt("same")],
-	["hash", Tt("hash", "@cbortech/hash-extension")],
-	["uuid", Tt("uuid", "@cbortech/uuid-extension")],
-	["UUID", Tt("uuid", "@cbortech/uuid-extension")],
-	["dt", W("dt")],
-	["DT", W("dt")],
-	["ip", W("ip")],
-	["IP", W("ip")],
-	["cri", W("cri")],
-	["CRI", W("cri")],
-	["t1", W("t1")],
-	["b1", W("b1")],
-	["ilbs", W("ilbs")],
-	["ilts", W("ilts")],
-	["float", W("float")]
-]), Dt = class {
+var Gt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'extensions' option (extensions: [${e}])`, Kt = (e, t) => `install ${t}, import { ${e} } from '${t}', and pass it via the 'extensions' option (extensions: [${e}])`, J = (e) => `'${e}' is a default built-in extension that was excluded via the 'builtinExtensions' option; add it back to that array (or omit 'builtinExtensions' to use the default set)`, qt = /* @__PURE__ */ new Map([
+	["b32", Gt("b32")],
+	["h32", Gt("h32")],
+	["same", Gt("same")],
+	["hash", Kt("hash", "@cbortech/hash-extension")],
+	["uuid", Kt("uuid", "@cbortech/uuid-extension")],
+	["UUID", Kt("uuid", "@cbortech/uuid-extension")],
+	["dt", J("dt")],
+	["DT", J("dt")],
+	["ip", J("ip")],
+	["IP", J("ip")],
+	["cri", J("cri")],
+	["CRI", J("cri")],
+	["t1", J("t1")],
+	["b1", J("b1")],
+	["ilbs", J("ilbs")],
+	["ilts", J("ilts")],
+	["float", J("float")]
+]), Jt = class {
 	t;
 	_options;
 	extByPrefix;
@@ -1486,26 +1676,26 @@ var wt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 	unresolvedExtension;
 	_pendingWarnings = [];
 	_hintedPrefixes = /* @__PURE__ */ new Set();
-	constructor(e, n) {
-		this.t = e, this._options = n, this.extByPrefix = /* @__PURE__ */ new Map(), this.extByTag = /* @__PURE__ */ new Map(), this.unresolvedExtension = n.unresolvedExtension ?? "cpa999";
-		let r = Z(n.builtinExtensions);
-		for (let e of [...r, ...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";
+		let n = Oi(t.builtinExtensions);
+		for (let e of [...n, ...t.extensions ?? []]) {
 			for (let t of e.appStringPrefixes ?? []) this.extByPrefix.set(t, e);
 			for (let t of e.tagNumbers ?? []) this.extByTag.set(t, e);
 		}
-		this.t.onEscapeWarning = (e, n, r, i, a) => {
+		this.t.onEscapeWarning = (e, t, n, r, i) => {
 			let o = {
 				message: e,
-				offset: n,
-				line: r,
-				column: i,
-				endOffset: a
+				offset: t,
+				line: n,
+				column: r,
+				endOffset: i
 			};
-			if (this._pendingWarnings.push(o), this._options.onWarning ? this._options.onWarning(o) : this._options.silent || console.warn(`CDN strict violation at line ${r}, column ${i}: ${e}`), this._options.strict !== !1) throw new t(e, {
-				offset: n,
-				line: r,
-				column: i,
-				endOffset: a
+			if (this._pendingWarnings.push(o), this._options.onWarning ? this._options.onWarning(o) : this._options.silent || console.warn(`CDN strict violation at line ${n}, column ${r}: ${e}`), this._options.strict !== !1) throw new a(e, {
+				offset: t,
+				line: n,
+				column: r,
+				endOffset: i
 			});
 		};
 	}
@@ -1539,12 +1729,12 @@ var wt = (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, e.offset, e.endOffset);
-			case "EMPTY_INDEF_BYTES": return this.t.consume(), new P([]);
-			case "EMPTY_INDEF_TEXT": return this.t.consume(), new F([]);
-			case "TRUE": return this.t.consume(), new R(21);
-			case "FALSE": return this.t.consume(), new R(20);
-			case "NULL": return this.t.consume(), new R(22);
-			case "UNDEFINED": return this.t.consume(), new R(23);
+			case "EMPTY_INDEF_BYTES": return this.t.consume(), new V([]);
+			case "EMPTY_INDEF_TEXT": return this.t.consume(), new H([]);
+			case "TRUE": return this.t.consume(), new G(21);
+			case "FALSE": return this.t.consume(), new G(20);
+			case "NULL": return this.t.consume(), new G(22);
+			case "UNDEFINED": return this.t.consume(), new G(23);
 			case "SIMPLE": return this.parseSimple();
 			case "LBRACKET": return this.parseArray();
 			case "LBRACE": return this.parseMap();
@@ -1559,22 +1749,22 @@ var wt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 				}
 				let r = this.extByPrefix.get(e.appPrefix);
 				if (!r?.parseAppString) {
-					if (r || this._hintMissingExtension(e.appPrefix, e), this.unresolvedExtension === "cpa999") return new Ge(e.appPrefix, [new G(e.value)]);
+					if (r || this._hintMissingExtension(e.appPrefix, e), this.unresolvedExtension === "cpa999") return new lt(e.appPrefix, [new Y(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), r.preserveAppSeqSource === "optional" ? (i.appSeqSource = e.raw + n, i) : i instanceof N && Object.getPrototypeOf(i) === N.prototype && i.ednSource === void 0 ? new N(i.value, {
+						return t !== void 0 && this._applyEiToResult(i, t, e), r.preserveAppSeqSource === "optional" ? (i.appSeqSource = e.raw + n, i) : i instanceof B && Object.getPrototypeOf(i) === B.prototype && i.ednSource === void 0 ? new B(i.value, {
 							ednEncoding: i.ednEncoding,
 							encodingWidth: i.encodingWidth,
 							ednSource: e.raw + n,
-							ednCommentSyntax: r === Ve || r === He ? "full" : void 0
-						}) : (i instanceof j && i.ednSource === void 0 && (i.ednSource = e.raw + n), i);
+							ednCommentSyntax: r === ot || r === st ? "full" : void 0
+						}) : (i instanceof R && i.ednSource === void 0 && (i.ednSource = e.raw + n), i);
 					} catch (t) {
 						if (this._options.strict !== !1) throw t;
-						return this._pendingWarnings.length === i && this._warn(t instanceof Error ? t.message : String(t), e), new Ge(e.appPrefix, [new G(e.value)]);
+						return this._pendingWarnings.length === i && this._warn(t instanceof Error ? t.message : String(t), e), new lt(e.appPrefix, [new Y(e.value)]);
 					}
 				}
 			}
@@ -1583,9 +1773,11 @@ var wt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 				this.t.consume();
 				let n = [];
 				for (; this.t.peek().type !== "GT_GT";) {
-					if (this.t.peek().type === "EOF" && this._fail(`unterminated ${e.appPrefix}<<...>>`, e), n.length > 0) if (this.t.peek().type === "COMMA") {
-						if (this.t.consume(), this.t.peek().type === "GT_GT") break;
-					} else this.t.peek().offset === this.t.lastEndOffset && this._warnOrFail("<<...>> items must be separated by \",\" or whitespace", this.t.peek());
+					if (this.t.peek().type === "EOF" && this._fail(`unterminated ${e.appPrefix}<<...>>`, e), n.length > 0) {
+						if (this.t.peek().type === "COMMA") {
+							if (this.t.consume(), this.t.peek().type === "GT_GT") break;
+						} else this.t.peek().offset === this.t.lastEndOffset && this._warnOrFail("<<...>> items must be separated by \",\" or whitespace", this.t.peek());
+					}
 					n.push(this.parseValue());
 				}
 				this.expect("GT_GT");
@@ -1593,7 +1785,7 @@ var wt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 				this.t.peek().type === "ENCODING_INDICATOR" && (i = this.t.consume(), r = this._resolveEncodingWidth(i.value, i));
 				let a = this.extByPrefix.get(e.appPrefix);
 				if (!a) {
-					if (this._hintMissingExtension(e.appPrefix, e), this.unresolvedExtension === "cpa999") return new Ge(e.appPrefix, n);
+					if (this._hintMissingExtension(e.appPrefix, e), this.unresolvedExtension === "cpa999") return new lt(e.appPrefix, n);
 					this._fail(`unknown app-string extension: ${JSON.stringify(e.appPrefix)}`, e);
 				}
 				a.parseAppSequence || this._fail(`app-string extension ${JSON.stringify(e.appPrefix)} does not support <<...>> form`, e);
@@ -1603,65 +1795,65 @@ var wt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 						let o = a.parseAppSequence(e.appPrefix, n, this._extOnError(e));
 						r !== void 0 && this._applyEiToResult(o, r, i ?? e);
 						let s = this.t.source.slice(e.offset, this.t.lastEndOffset);
-						if (a.preserveAppSeqSource === "optional") o.appSeqSource = s, o.appSeqComments = _t(this.t.comments, t, e.offset, this.t.lastEndOffset), n.length === 1 && (n[0].end !== void 0 && (o.appSeqInnerEnd = n[0].end - e.offset), o.appSeqSourceFeatures = H(n[0]));
-						else if (o instanceof j) o.ednSource === void 0 && (o.ednSource = s);
-						else if (a.preserveAppSeqSource) return new B(o, s);
+						if (a.preserveAppSeqSource === "optional") o.appSeqSource = s, o.appSeqComments = Lt(this.t.comments, t, e.offset, this.t.lastEndOffset), n.length === 1 && (n[0].end !== void 0 && (o.appSeqInnerEnd = n[0].end - e.offset), o.appSeqSourceFeatures = jt(n[0]));
+						else if (o instanceof R) o.ednSource === void 0 && (o.ednSource = s);
+						else if (a.preserveAppSeqSource) return new ut(o, s);
 						return o;
 					} catch (t) {
 						if (this._options.strict !== !1) throw t;
-						return this._pendingWarnings.length === o && this._warn(t instanceof Error ? t.message : String(t), e), new Ge(e.appPrefix, n);
+						return this._pendingWarnings.length === o && this._warn(t instanceof Error ? t.message : String(t), e), new lt(e.appPrefix, n);
 					}
 				}
 			}
 			case "ELLIPSIS": {
-				if (this.t.consume(), this.t.peek().type !== "PLUS") return new V();
-				let e = [new V()];
+				if (this.t.consume(), this.t.peek().type !== "PLUS") return new q();
+				let e = [new q()];
 				for (; this.t.peek().type === "PLUS";) this.t.consume(), e.push(this.parseValue());
-				return new V(e, e.map(() => !0));
+				return new q(e, e.map(() => !0));
 			}
 			case "BYTES_HEX_ELIDED": return this.t.consume(), this._parseHexElidedConcat(e);
 			default: this._fail(`unexpected token: ${JSON.stringify(e.value)}`, e);
 		}
 	}
 	parseIntegerOrTag() {
-		let e = this.t.comments.length, t = this.t.consume(), { numStr: n, rawSuffix: r } = ut(t.value), i = r === void 0 ? t.endOffset : t.endOffset - 2, a = t.endOffset, o = r === void 0 ? this.consumeEncodingIndicator(void 0, (e) => {
+		let e = this.t.comments.length, t = this.t.consume(), { numStr: n, rawSuffix: r } = kt(t.value), i = r === void 0 ? t.endOffset : t.endOffset - 2, a = t.endOffset, o = r === void 0 ? this.consumeEncodingIndicator(void 0, (e) => {
 			i = e.offset, a = e.endOffset;
-		}) : this._resolveEncodingWidth(r, t), s = dt(n), c = r === void 0 ? t.raw : t.raw.slice(0, -2);
-		if (s > 18446744073709551615n) return this.t.peek().type === "LPAREN" && this._fail("tag number exceeds maximum uint64", t), new it(s);
-		if (s < -18446744073709551616n) return new at(s);
+		}) : this._resolveEncodingWidth(r, t), s = At(n), c = r === void 0 ? t.raw : t.raw.slice(0, -2);
+		if (s > 18446744073709551615n) return this.t.peek().type === "LPAREN" && this._fail("tag number exceeds maximum uint64", t), new Ct(s);
+		if (s < -18446744073709551616n) return new wt(s);
 		if (o !== void 0) {
 			let e = s >= 0n ? s : -(s + 1n);
 			o = this._validateEncodingFit(e, o, t);
 		}
-		let l = s >= 0n ? new k(s, {
+		let l = s >= 0n ? new I(s, {
 			encodingWidth: o,
 			ednSource: c
-		}) : new A(s, {
+		}) : new L(s, {
 			encodingWidth: o,
 			ednSource: c
 		});
 		if (this.t.peek().type === "LPAREN") {
-			l instanceof k || this._fail("tag number must be non-negative", t), this.t.consume();
+			l instanceof I || this._fail("tag number must be non-negative", t), this.t.consume();
 			let n = this._pendingWarnings.splice(0), r = this.parseValue();
 			this.expect("RPAREN");
 			let s = l.value, u = this.extByTag.get(s);
 			if (u?.parseTag) {
 				let l = u.parseTag(s, r);
 				if (l !== void 0) {
-					if (l instanceof M && (o !== void 0 && l.encodingWidth === void 0 && (l.encodingWidth = o), l.ednSource === void 0 && (l.ednSource = c), u.preserveAppSeqSource === "optional" && l.appSeqSource === void 0)) {
-						l.appSeqSource = this.t.source.slice(t.offset, this.t.lastEndOffset), l.appSeqComments = _t(this.t.comments, e, t.offset, this.t.lastEndOffset);
-						let n = l.encodingWidth ?? p(l.tag), o = yt(this.t.source, t.offset, l.content);
+					if (l instanceof z && (o !== void 0 && l.encodingWidth === void 0 && (l.encodingWidth = o), l.ednSource === void 0 && (l.ednSource = c), u.preserveAppSeqSource === "optional" && l.appSeqSource === void 0)) {
+						l.appSeqSource = this.t.source.slice(t.offset, this.t.lastEndOffset), l.appSeqComments = Lt(this.t.comments, e, t.offset, this.t.lastEndOffset);
+						let n = l.encodingWidth ?? E(l.tag), o = zt(this.t.source, t.offset, l.content);
 						l.appSeqEncodingEdits = [{
 							start: i - t.offset,
 							end: a - t.offset,
 							always: `_${n}`,
 							never: ""
-						}, ...o ?? []], o === void 0 && (l.appSeqEncodingEditsComplete = !1), l.appSeqSourceFeatures = H(r);
+						}, ...o ?? []], o === void 0 && (l.appSeqEncodingEditsComplete = !1), l.appSeqSourceFeatures = jt(r);
 					}
 					return n.length > 0 && (l.warnings ??= [], l.warnings.push(...n)), l;
 				}
 			}
-			let d = new M(s, r, {
+			let d = new z(s, r, {
 				encodingWidth: o,
 				ednSource: c
 			});
@@ -1670,12 +1862,12 @@ var wt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 		return l;
 	}
 	parseFloat() {
-		let e = this.t.consume(), t = (t) => this._warnOrFail(t, e), { value: n, precision: r } = mt(e.value, t);
+		let e = this.t.consume(), t = (t) => this._warnOrFail(t, e), { value: n, precision: r } = Pt(e.value, t);
 		if (r === "half" || r === "single") {
-			let e = r === "half" ? C(S(n)) : Math.fround(n);
+			let e = r === "half" ? j(ve(n)) : Math.fround(n);
 			Object.is(n, e) || isNaN(n) && isNaN(e) || t(`${n} cannot be exactly represented as ${r === "half" ? "f16 (_1)" : "f32 (_2)"}; use _3 or remove the indicator`);
 		}
-		return new j(n, {
+		return new R(n, {
 			precision: r,
 			literalSource: e.raw
 		});
@@ -1683,11 +1875,11 @@ var wt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 	parseString() {
 		let e = this.t.consume();
 		if (this.t.peek().type !== "PLUS") {
-			let t = this.consumeEncodingIndicator(() => BigInt(ot.encode(e.value).length));
-			return e.type === "RAWSTRING" ? new G(e.value, {
+			let t = this.consumeEncodingIndicator(() => BigInt(Tt.encode(e.value).length));
+			return e.type === "RAWSTRING" ? new Y(e.value, {
 				ednSource: e.raw,
 				...t === void 0 ? {} : { encodingWidth: t }
-			}) : new G(e.value, {
+			}) : new Y(e.value, {
 				quotedEdnSource: e.raw,
 				...t === void 0 ? {} : { encodingWidth: t }
 			});
@@ -1729,8 +1921,8 @@ var wt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 			let e = n.map((e) => "text" in e ? e.text : ""), t = n.map((e) => "text" in e ? e.source : void 0), r = n.map((e) => "text" in e ? e.isByteString ?? !1 : !1), i = n.map((e) => ({
 				start: e.start,
 				end: e.end
-			})), a = e.join(""), o = this.consumeEncodingIndicator(() => BigInt(ot.encode(a).length));
-			return new G(a, {
+			})), a = e.join(""), o = this.consumeEncodingIndicator(() => BigInt(Tt.encode(a).length));
+			return new Y(a, {
 				ednParts: e,
 				ednPartSpans: i,
 				...t.some((e) => e !== void 0) ? { ednPartSources: t } : {},
@@ -1741,7 +1933,7 @@ var wt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 		let r = [], i = [], a = () => {
 			let e = i.map((e) => e.text), t = e.join("");
 			if (t !== "") {
-				let n = i.map((e) => e.source), a = i.map((e) => e.isByteString ?? !1), o = new G(t, {
+				let n = i.map((e) => e.source), a = i.map((e) => e.isByteString ?? !1), o = new Y(t, {
 					ednParts: e,
 					ednPartSpans: i.map((e) => ({
 						start: e.start,
@@ -1756,24 +1948,24 @@ var wt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 		};
 		for (let e of n) if ("ellipsis" in e) {
 			a();
-			let t = new V();
+			let t = new q();
 			t.start = e.start, t.end = e.end, r.push(t);
 		} else i.push(e);
-		return a(), new V(r);
+		return a(), new q(r);
 	}
 	_isBytesToken(e) {
 		return e === "BYTES_HEX" || e === "SQSTR" || e === "BYTES_B64";
 	}
-	_hexToBytes(e, r) {
+	_hexToBytes(e, t) {
 		try {
-			return n(e);
+			return i(e);
 		} catch (e) {
-			if (e instanceof t || !(e instanceof SyntaxError)) throw e;
-			this._fail(e.message, r);
+			if (e instanceof a || !(e instanceof SyntaxError)) throw e;
+			this._fail(e.message, t);
 		}
 	}
 	_decodeBytesToken(e) {
-		let n = (t) => this._warnOrFail(t, e);
+		let t = (t) => this._warnOrFail(t, e);
 		switch (e.type) {
 			case "SQSTR": {
 				let t = e._sqstrBytes;
@@ -1781,20 +1973,20 @@ var wt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 			}
 			case "BYTES_HEX": return this._hexToBytes(e.value, e);
 			case "BYTES_B64": try {
-				return Ue(e.value, n);
-			} catch (n) {
-				if (n instanceof t || !(n instanceof SyntaxError)) throw n;
-				this._fail(n.message, e);
+				return ee(e.value, t);
+			} catch (t) {
+				if (t instanceof a || !(t instanceof SyntaxError)) throw t;
+				this._fail(t.message, e);
 			}
 			default: this._fail("expected byte string token", e);
 		}
 	}
 	_decodeUtf8(e, t) {
-		if (this._options.allowInvalidUtf8) return ct.decode(e);
+		if (this._options.allowInvalidUtf8) return Dt.decode(e);
 		try {
-			return st.decode(e);
+			return Et.decode(e);
 		} catch {
-			return this._warnOrFail("byte string in text concatenation is not valid UTF-8", t), ct.decode(e);
+			return this._warnOrFail("byte string in text concatenation is not valid UTF-8", t), Dt.decode(e);
 		}
 	}
 	_tokenTypeToCdnEncoding(e) {
@@ -1807,7 +1999,7 @@ var wt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 	_parseBytesConcat(e, t, n, r, i) {
 		if (this.t.peek().type !== "PLUS") {
 			let r = this.consumeEncodingIndicator(() => BigInt(e.length));
-			return new N(e, {
+			return new B(e, {
 				ednEncoding: this._tokenTypeToCdnEncoding(t),
 				ednSource: n,
 				ednCommentSyntax: this._tokenTypeToCommentSyntax(t),
@@ -1843,7 +2035,7 @@ var wt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 			else if (e.type === "BYTES_HEX_ELIDED") {
 				this.t.consume();
 				let n = this._elidedHexAtoms(e.value, e);
-				n.length > 0 && (n[0].real = !0), t.push(...n);
+				n.length > 0 && (n[0].real = !0), m(t, n);
 			} else this._isBytesToken(e.type) ? (this.t.consume(), t.push({
 				bytes: this._decodeBytesToken(e),
 				source: e.raw,
@@ -1852,7 +2044,7 @@ var wt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 				start: e.offset,
 				end: e.endOffset
 			})) : e.type === "TSTR" || e.type === "RAWSTRING" ? (this.t.consume(), this._warnOrFail("text string in a byte-string concatenation is not allowed; use a byte string literal (h'...', b64'...', or '...') instead", e), t.push({
-				bytes: ot.encode(e.value),
+				bytes: Tt.encode(e.value),
 				real: !0,
 				start: e.offset,
 				end: e.endOffset
@@ -1881,7 +2073,7 @@ var wt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 	_buildFromByteAtoms(e, t) {
 		if (!e.some((e) => "ellipsis" in e)) {
 			let n = e, r = this._concatBytes(n.map((e) => e.bytes)), i = this.consumeEncodingIndicator(() => BigInt(r.length));
-			return new N(r, {
+			return new B(r, {
 				ednEncoding: t,
 				ednParts: n,
 				...i === void 0 ? {} : { encodingWidth: i }
@@ -1889,7 +2081,7 @@ var wt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 		}
 		let n = [], r = [], i = [], a = () => {
 			if (i.length > 0) {
-				let e = new N(this._concatBytes(i.map((e) => e.bytes)), { ...i.length > 1 ? { ednParts: i.map(({ bytes: e, source: t, commentSyntax: n, start: r, end: i }) => ({
+				let e = new B(this._concatBytes(i.map((e) => e.bytes)), { ...i.length > 1 ? { ednParts: i.map(({ bytes: e, source: t, commentSyntax: n, start: r, end: i }) => ({
 					bytes: e,
 					source: t,
 					commentSyntax: n,
@@ -1904,10 +2096,10 @@ var wt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 		};
 		for (let t of e) if ("ellipsis" in t) {
 			a();
-			let e = new V(t.fromByteLiteral, t.literalSource);
+			let e = new q(t.fromByteLiteral, t.literalSource);
 			e.start = t.start, e.end = t.end, n.push(e), r.push(t.real);
 		} else i.push(t);
-		return a(), new V(n, r);
+		return a(), new q(n, r);
 	}
 	_concatBytes(e) {
 		let t = e.reduce((e, t) => e + t.byteLength, 0), n = new Uint8Array(t), r = 0;
@@ -1918,16 +2110,18 @@ var wt = (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 } = ut(e.value), n = Number(dt(t));
-		return this.expect("RPAREN"), new R(n, { ednSource: e.raw });
+		let { numStr: t } = kt(e.value), n = Number(At(t));
+		return this.expect("RPAREN"), new G(n, { ednSource: e.raw });
 	}
 	parseEmbeddedCBOR() {
 		this.t.consume();
 		let e = [];
 		for (; this.t.peek().type !== "GT_GT";) {
-			if (e.length > 0) if (this.t.peek().type === "COMMA") {
-				if (this.t.consume(), this.t.peek().type === "GT_GT") break;
-			} else this.t.peek().offset === this.t.lastEndOffset && this._warnOrFail("<<...>> items must be separated by \",\" or whitespace", this.t.peek());
+			if (e.length > 0) {
+				if (this.t.peek().type === "COMMA") {
+					if (this.t.consume(), this.t.peek().type === "GT_GT") break;
+				} else this.t.peek().offset === this.t.lastEndOffset && this._warnOrFail("<<...>> items must be separated by \",\" or whitespace", this.t.peek());
+			}
 			e.push(this.parseValue());
 		}
 		this.expect("GT_GT");
@@ -1936,7 +2130,7 @@ var wt = (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 z(e, { encodingWidth: t });
+		return new K(e, { encodingWidth: t });
 	}
 	parseArray() {
 		this.t.consume();
@@ -1944,14 +2138,16 @@ var wt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 		this.t.peek().type === "UNDERSCORE" ? (this.t.consume(), e = !0) : this.t.peek().type === "ENCODING_INDICATOR" && (n = this.t.consume(), n.value === "7" ? (e = !0, this._warnOrFail("encoding indicator _7 is non-standard; use _ to indicate indefinite length", n), n = void 0) : t = this._resolveEncodingWidth(n.value, n));
 		let r = this._pendingWarnings.splice(0), i = [], a = this.t.lastEndOffset;
 		for (; this.t.peek().type !== "RBRACKET";) {
-			if (i.length > 0) if (this.t.peek().type === "COMMA") {
-				if (this.t.consume(), this.t.peek().type === "RBRACKET") break;
-			} else this.t.peek().offset === this.t.lastEndOffset && this._warnOrFail("array items must be separated by \",\" or whitespace", this.t.peek());
+			if (i.length > 0) {
+				if (this.t.peek().type === "COMMA") {
+					if (this.t.consume(), this.t.peek().type === "RBRACKET") break;
+				} else this.t.peek().offset === this.t.lastEndOffset && this._warnOrFail("array items must be separated by \",\" or whitespace", this.t.peek());
+			}
 			let e = this.parseValue();
-			gt(this.t.source, a, e.start) && (e.blankLineBefore = !0), a = e.end, i.push(e);
+			It(this.t.source, a, e.start) && (e.blankLineBefore = !0), a = e.end, i.push(e);
 		}
 		this.expect("RBRACKET"), t !== void 0 && n !== void 0 && (t = this._validateEncodingFit(BigInt(i.length), t, n));
-		let o = new I(i, {
+		let o = new U(i, {
 			indefiniteLength: e,
 			encodingWidth: t
 		});
@@ -1963,16 +2159,18 @@ var wt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 		this.t.peek().type === "UNDERSCORE" ? (this.t.consume(), e = !0) : this.t.peek().type === "ENCODING_INDICATOR" && (n = this.t.consume(), n.value === "7" ? (e = !0, this._warnOrFail("encoding indicator _7 is non-standard; use _ to indicate indefinite length", n), n = void 0) : t = this._resolveEncodingWidth(n.value, n));
 		let r = this._pendingWarnings.splice(0), i = [], a = this.t.lastEndOffset;
 		for (; this.t.peek().type !== "RBRACE";) {
-			if (i.length > 0) if (this.t.peek().type === "COMMA") {
-				if (this.t.consume(), this.t.peek().type === "RBRACE") break;
-			} else this.t.peek().offset === this.t.lastEndOffset && this._warnOrFail("map entries must be separated by \",\" or whitespace", this.t.peek());
+			if (i.length > 0) {
+				if (this.t.peek().type === "COMMA") {
+					if (this.t.consume(), this.t.peek().type === "RBRACE") break;
+				} else this.t.peek().offset === this.t.lastEndOffset && this._warnOrFail("map entries must be separated by \",\" or whitespace", this.t.peek());
+			}
 			let e = this.parseValue();
-			gt(this.t.source, a, e.start) && (e.blankLineBefore = !0), this.expect("COLON");
+			It(this.t.source, a, e.start) && (e.blankLineBefore = !0), this.expect("COLON");
 			let t = this.parseValue();
 			a = t.end, i.push([e, t]);
 		}
 		this.expect("RBRACE"), t !== void 0 && n !== void 0 && (t = this._validateEncodingFit(BigInt(i.length), t, n));
-		let o = new L(i, {
+		let o = new W(i, {
 			indefiniteLength: e,
 			encodingWidth: t
 		});
@@ -1989,24 +2187,26 @@ var wt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 		} else e.type !== "RPAREN" && this._warnOrFail("indefinite string group is missing _ after (; interpreting as (_ ...)", e);
 		let t = this._pendingWarnings.splice(0), n = [], r = this.t.lastEndOffset;
 		for (; this.t.peek().type !== "RPAREN";) {
-			if (n.length > 0) if (this.t.peek().type === "COMMA") {
-				if (this.t.consume(), this.t.peek().type === "RPAREN") break;
-			} else this.t.peek().offset === this.t.lastEndOffset && this._warnOrFail("indefinite string chunks must be separated by \",\" or whitespace", this.t.peek());
+			if (n.length > 0) {
+				if (this.t.peek().type === "COMMA") {
+					if (this.t.consume(), this.t.peek().type === "RPAREN") break;
+				} else this.t.peek().offset === this.t.lastEndOffset && this._warnOrFail("indefinite string chunks must be separated by \",\" or whitespace", this.t.peek());
+			}
 			let e = this.parseValue();
-			gt(this.t.source, r, e.start) && (e.blankLineBefore = !0), r = e.end, n.push(e);
+			It(this.t.source, r, e.start) && (e.blankLineBefore = !0), r = e.end, n.push(e);
 		}
 		this.expect("RPAREN"), n.length === 0 && this._fail("empty indefinite group (_ ) is ambiguous; use ''_ for bytes or \"\"_ for text");
 		let i = n[0];
-		if (i instanceof N) {
-			let e = new P(n.map((e, t) => {
-				if (e instanceof N) return e;
+		if (i instanceof B) {
+			let e = new V(n.map((e, t) => {
+				if (e instanceof B) 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 (i instanceof G) {
-			let e = new F(n.map((e, t) => {
-				if (e instanceof G) return e;
+		if (i instanceof Y) {
+			let e = new H(n.map((e, t) => {
+				if (e instanceof Y) 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;
@@ -2026,47 +2226,47 @@ var wt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 		return t.type !== e && this._fail(`expected ${e}, got ${t.type} (${JSON.stringify(t.value)})`, t), t;
 	}
 	_applyEiToResult(e, t, n) {
-		if (e instanceof j) {
+		if (e instanceof R) {
 			let r = t === 1 ? "half" : t === 2 ? "single" : t === 3 ? "double" : void 0;
 			if (r === void 0) this._warnOrFail(`encoding indicator _${t} is not valid for a float; use _1, _2, or _3`, n);
 			else if (e.precision !== r) {
 				if (r !== "double") {
-					let t = r === "half" ? C(S(e.value)) : Math.fround(e.value);
+					let t = r === "half" ? j(ve(e.value)) : Math.fround(e.value);
 					!Object.is(t, e.value) && !isNaN(e.value) && this._warnOrFail(`${e.value} cannot be exactly represented as ${r === "half" ? "float16 (_1)" : "float32 (_2)"}`, n);
 				}
 				e.precision = r;
 			}
-		} else if (e instanceof k) {
+		} else if (e instanceof I) {
 			if (e.encodingWidth === void 0) {
 				let r = this._validateEncodingFit(e.value, t, n);
 				r !== void 0 && (e.encodingWidth = r);
 			}
-		} else if (e instanceof A) {
+		} else if (e instanceof L) {
 			if (e.encodingWidth === void 0) {
 				let r = this._validateEncodingFit(e.argument, t, n);
 				r !== void 0 && (e.encodingWidth = r);
 			}
-		} else if (e instanceof N) {
+		} else if (e instanceof B) {
 			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 G) {
+		} else if (e instanceof Y) {
 			if (e.encodingWidth === void 0) {
-				let r = this._validateEncodingFit(BigInt(ot.encode(e.value).length), t, n);
+				let r = this._validateEncodingFit(BigInt(Tt.encode(e.value).length), t, n);
 				r !== void 0 && (e.encodingWidth = r);
 			}
-		} else if (e instanceof I) {
+		} else if (e instanceof U) {
 			if (e.encodingWidth === void 0) {
 				let r = this._validateEncodingFit(BigInt(e.items.length), t, n);
 				r !== void 0 && (e.encodingWidth = r);
 			}
-		} else if (e instanceof L) {
+		} else if (e instanceof W) {
 			if (e.encodingWidth === void 0) {
 				let r = this._validateEncodingFit(BigInt(e.entries.length), t, n);
 				r !== void 0 && (e.encodingWidth = r);
 			}
-		} else if (e instanceof M) {
+		} else if (e instanceof z) {
 			if (e.encodingWidth === void 0) {
 				let r = this._validateEncodingFit(e.tag, t, n);
 				r !== void 0 && (e.encodingWidth = r);
@@ -2074,7 +2274,7 @@ var wt = (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 = Te(t);
+		let r = De(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);
@@ -2098,29 +2298,29 @@ var wt = (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 = Et.get(e);
+		let n = qt.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,
-			...Ot(t),
+			...Yt(t),
 			hint: !0
 		}) : this._options.silent || console.warn(`CDN: ${r}`);
 	}
 	_warn(e, t) {
 		let n = { message: e };
-		if (t !== void 0 && Object.assign(n, Ot(t)), this._pendingWarnings.push(n), this._options.onWarning) this._options.onWarning(n);
+		if (t !== void 0 && Object.assign(n, Yt(t)), this._pendingWarnings.push(n), this._options.onWarning) this._options.onWarning(n);
 		else if (!this._options.silent) {
 			let n = t ? ` at line ${t.line}, column ${t.col}` : "";
 			console.warn(`CDN strict violation${n}: ${e}`);
 		}
 	}
-	_fail(e, n) {
-		throw new t(e, n ? Ot(n) : void 0);
+	_fail(e, t) {
+		throw new a(e, t ? Yt(t) : void 0);
 	}
 };
-function Ot(e) {
+function Yt(e) {
 	return {
 		offset: e.offset,
 		line: e.line,
@@ -2130,7 +2330,7 @@ function Ot(e) {
 }
 //#endregion
 //#region src/ast/CborTextString.ts
-var kt = new TextEncoder(), At = !1, G = class extends O {
+var Xt = new TextEncoder(), Zt = new TextDecoder(), Qt = !1, Y = class extends F {
 	indefiniteLength = !1;
 	value;
 	encodingWidth;
@@ -2143,59 +2343,66 @@ var kt = new TextEncoder(), At = !1, G = class extends O {
 	constructor(e, t) {
 		super(), this.value = e, this.encodingWidth = t?.encodingWidth, this.ednParts = t?.ednParts, this.ednSource = t?.ednSource, this.quotedEdnSource = t?.quotedEdnSource, this.ednPartSources = t?.ednPartSources, this.ednPartIsByteString = t?.ednPartIsByteString, this.ednPartSpans = t?.ednPartSpans;
 	}
+	_isMultiWordText(e, t = !0, n) {
+		return v(this.value);
+	}
 	_encodeTo(e, t) {
 		e.writeTextString(3, this.value, this.encodingWidth);
 	}
-	_toCDN(e, t) {
-		let n = a(e, this.encodingWidth, () => p(BigInt(kt.encode(this.value).length)));
-		return jt(this.value, n, e, t, this.ednParts, this.ednSource, this.quotedEdnSource, this.ednPartSources, this.ednPartSpans, this.comments?.dangling);
+	_toCDN(e, n, r) {
+		let i = t(e, this.encodingWidth, () => E(BigInt(Xt.encode(this.value).length)));
+		return $t(this.value, i, e, n, this.ednParts, this.ednSource, this.quotedEdnSource, this.ednPartSources, this.ednPartSpans, this.comments?.dangling);
 	}
 	_toJS(e) {
 		return this.value;
 	}
 };
-function jt(e, t, n, r, i, a, o, s, c, l) {
-	let u = v(n);
-	if (n?.preserveRawString && a !== void 0 && (u !== null || !/[\r\n]/.test(a))) return a + t;
-	if (n?.preserveTextString && o !== void 0 && (u !== null || !/[\r\n]/.test(o))) return o + t;
-	if (u === null) return ee(e) + t;
-	let d = n?.preserveRawString ? s : void 0, f = d?.some((e) => e !== void 0) ?? !1, { cdn: p, newline: te } = Nt(n), m = n?.preserveConcatenation && i !== void 0 && (i.length > 1 || f) ? i : void 0;
-	if (!p && !te && m === void 0) return ee(e) + t;
-	let h = p ? It(e) : null;
-	if (m !== void 0 && (h === null || f)) {
-		let e = n?.preserveComments ? ne(l, c, typeof n.preserveComments == "string" ? n.preserveComments : void 0) : void 0, i = [];
-		for (let [t, n] of m.entries()) {
-			let r = d?.[t];
-			if (r !== void 0) i.push({
+function $t(e, t, r, i, a, o, s, c, l, d) {
+	let f = O(r);
+	if (r?.preserveRawString && o !== void 0 && (f !== null || !/[\r\n]/.test(o))) return o + t;
+	if (r?.preserveTextString && s !== void 0 && (f !== null || !/[\r\n]/.test(s))) return s + t;
+	if (f === null) return h(e) + t;
+	let g = r?.preserveRawString ? c : void 0, _ = g?.some((e) => e !== void 0) ?? !1, { cdn: v, newline: y } = tn(r), b = r?.preserveConcatenation && a !== void 0 && (a.length > 1 || _) ? a : void 0;
+	if (!v && !y && b === void 0) return h(e) + t;
+	let ee = v ? an(e, !!r?.inlineLeafContainers, y) : null;
+	if (b !== void 0 && (ee === null || _)) {
+		let e = n(r) ? p(d, l, u(r)) : void 0, a = [];
+		for (let [t, n] of b.entries()) {
+			let r = g?.[t];
+			if (r !== void 0) a.push({
 				text: n,
 				contentDepth: 0,
 				source: r
 			});
-			else if (te) {
+			else if (y) {
 				let e = /* @__PURE__ */ new Map();
-				for (let { point: t, contentDepth: r } of Ft(n, 0)) e.set(t, r);
-				i.push(...Wt(n, e));
-			} else i.push({
+				for (let { point: t, contentDepth: r } of rn(n, 0)) e.set(t, r);
+				m(a, mn(n, e));
+			} else a.push({
 				text: n,
 				contentDepth: 0
 			});
-			let a = e?.[t];
-			a && a.length > 0 && (i[i.length - 1].commentsAfter = a);
+			let i = e?.[t];
+			i && i.length > 0 && (a[a.length - 1].commentsAfter = i);
+		}
+		if (r?.modernConcat && r?.appPrefix !== !1) {
+			let e = a.map(({ text: e, source: t }) => t ?? h(e)), n = a.map((e) => e.commentsAfter ?? []);
+			return ie("t1", e, t, f, i, n);
 		}
-		return Mt(i, t, u, r);
+		return en(a, t, f, i);
 	}
-	let g = /* @__PURE__ */ new Map();
-	if (h !== null) for (let { point: e, contentDepth: t } of h) g.set(e, t);
-	if (te) {
-		let t = h === null ? Ft(e, 0) : Lt(e);
-		for (let { point: e, contentDepth: n } of t) g.has(e) || g.set(e, n);
+	let x = /* @__PURE__ */ new Map();
+	if (ee !== null) for (let { point: e, contentDepth: t } of ee) x.set(e, t);
+	if (y) {
+		let t = ee === null ? rn(e, 0) : on(e);
+		for (let { point: e, contentDepth: n } of t) x.has(e) || x.set(e, n);
 	}
-	let _ = Wt(e, g);
-	return _.length <= 1 ? ee(e) + t : Mt(_, t, u, r);
+	let S = mn(e, x);
+	return S.length <= 1 ? h(e) + t : en(S, t, f, i);
 }
-function Mt(e, t, n, r) {
+function en(e, t, n, r) {
 	let i = e.map(({ text: n, source: r }, i) => {
-		let a = r ?? ee(n);
+		let a = r ?? h(n);
 		return i === e.length - 1 ? a + t : a;
 	}), a = i[0];
 	for (let t = 1; t < i.length; t++) {
@@ -2206,17 +2413,17 @@ function Mt(e, t, n, r) {
 	}
 	return a;
 }
-function Nt(e) {
-	let t = e?.splitCdn === void 0 || e?.splitNewline === void 0 ? Pt(e?.textStringFormat ?? []) : [];
+function tn(e) {
+	let t = e?.splitCdn === void 0 || e?.splitNewline === void 0 ? nn(e?.textStringFormat ?? []) : [];
 	return {
 		cdn: e?.splitCdn ?? t.includes("cdn"),
 		newline: e?.splitNewline ?? t.includes("newline")
 	};
 }
-function Pt(e) {
-	return e.map((e) => e === "cboredn" ? (At || (At = !0, console.warn("`textStringFormat: ['cboredn']` is deprecated; use `textStringFormat: ['cdn']` instead.")), "cdn") : e);
+function nn(e) {
+	return e.map((e) => e === "cboredn" ? (Qt || (Qt = !0, console.warn("`textStringFormat: ['cboredn']` is deprecated; use `textStringFormat: ['cdn']` instead.")), "cdn") : e);
 }
-function Ft(e, t) {
+function rn(e, t) {
 	let n = [];
 	for (let r = 0; r < e.length; r++) {
 		let i = e[r];
@@ -2233,108 +2440,209 @@ function Ft(e, t) {
 	}
 	return n;
 }
-function It(e) {
+function an(t, n, r) {
 	try {
-		lt(e);
+		Ot(t);
 	} catch {
 		return null;
 	}
-	let t = [], n = new re(e), r = 0, i = null, a = !1, o = 0;
+	let a = [], o = new e(t), s = 0, c = null, l = !1, u = 0, d = null, f = [], p = (e, t) => {
+		let n = f[f.length - 1];
+		n ? n.ownCandidates.push({
+			point: e,
+			contentDepth: t
+		}) : a.push({
+			point: e,
+			contentDepth: t
+		});
+	}, m = (e) => e.kind === "LT_LT" || e.kind === "APP_SEQUENCE", h = () => {
+		for (let e = f.length - 1; e >= 0; e--) {
+			let t = f[e];
+			if (!(t.kind === "LPAREN" && t.isTagParen)) return t;
+		}
+	}, g = (e) => {
+		let t = (m(e) || !e.entryHasContainer) && !e.entryForcedBreak;
+		e.allOk = e.allOk && t, e.anyForcedBreak = e.anyForcedBreak || e.entryForcedBreak, e.anyForcedBreakStructural = e.anyForcedBreakStructural || e.entryForcedBreakStructural, e.entryHasContainer = !1, e.entryForcedBreak = !1, e.entryForcedBreakStructural = !1;
+	}, _ = "none", y = [], b = !1, x = !1, S = !1, C = !1, w = [], T = !1, te = (e) => {
+		w.push({
+			depth: e,
+			kind: _,
+			texts: y,
+			broken: b,
+			hasEllipsis: x,
+			sawPlus: S,
+			awaitingTagCheck: C
+		}), _ = "none", y = [], b = !1, x = !1, S = !1, C = !1, T = !0;
+	}, E = () => {
+		let e = w[w.length - 1];
+		e !== void 0 && s === e.depth && (w.pop(), _ = e.kind, y = e.texts, b = e.broken, x = e.hasEllipsis, S = e.sawPlus, C = e.awaitingTagCheck);
+	}, ne = () => {
+		if (x && S) for (let e of f) e.entryHasContainer = !0;
+		if (_ === "text" && !b && y.length > 0 && v(y.join(""))) {
+			let e = f[f.length - 1];
+			e && (e.entryForcedBreak = !0);
+		}
+		_ = "none", y = [], b = !1, x = !1, S = !1, C = !1;
+	};
 	for (;;) {
-		let s = n.consume();
-		if (s.type === "EOF") break;
-		let c = !1;
-		if (a || (a = !0, s.offset > 0 && Ht(n.comments, 0, s.offset) && t.push({
-			point: s.offset,
-			contentDepth: r
-		})), i !== null) {
-			if (i.kind === "opener" && zt.has(s.type)) {
-				i.point = s.endOffset, o = s.endOffset;
+		let e = o.consume();
+		if (e.type === "EOF") {
+			ne();
+			break;
+		}
+		let v = !1, w = !1;
+		if (C && (e.type === "ENCODING_INDICATOR" ? w = !0 : e.type === "LPAREN" ? (C = !1, te(s), w = !0) : C = !1), !w) {
+			let t = e.type === "PLUS" || e.type === "ENCODING_INDICATOR" || d === "PLUS" && (dn.has(e.type) || e.type === "ELLIPSIS");
+			_ !== "none" && !t && (d === "PLUS" && x ? ln.has(e.type) ? te(s) : e.type === "INTEGER" && (C = !0) : ne()), e.type === "PLUS" && _ !== "none" && (S = !0);
+		}
+		if (l || (l = !0, e.offset > 0 && fn(o.comments, 0, e.offset) && p(e.offset, s)), c !== null) {
+			if (c.kind === "opener" && cn.has(e.type)) {
+				c.point = e.endOffset, d = e.type, u = e.endOffset;
 				continue;
-			} else i.kind === "opener" && Vt.has(s.type) && Ut(e, i.point, s.offset) ? c = !0 : t.push({
-				point: s.offset,
-				contentDepth: i.contentDepth
-			});
-			i = null;
-		}
-		Bt.has(s.type) ? (r++, i = {
-			point: s.endOffset,
-			contentDepth: r,
-			kind: "opener"
-		}) : Vt.has(s.type) ? (r = Math.max(0, r - 1), c || t.push({
-			point: s.offset,
-			contentDepth: r
-		})) : s.type === "COMMA" && (i = {
-			point: s.endOffset,
-			contentDepth: r,
-			kind: "comma"
-		}), o = s.endOffset;
-	}
-	let s = n.comments.find((e) => e.start >= o);
-	return s !== void 0 && t.push({
-		point: s.start,
-		contentDepth: r
-	}), t;
-}
-function Lt(e) {
-	let t = [], n = new re(e), r = 0;
+			}
+			c.kind === "opener" && un.has(e.type) && pn(t, c.point, e.offset) ? v = !0 : p(e.offset, c.contentDepth), c = null;
+		}
+		if (ln.has(e.type)) {
+			if (e.type === "LBRACKET" || e.type === "LBRACE") for (let e of f) e.entryHasContainer = !0;
+			s++, c = {
+				point: e.endOffset,
+				contentDepth: s,
+				kind: "opener"
+			}, f.push({
+				kind: e.type,
+				isTagParen: e.type === "LPAREN" && d === "INTEGER",
+				isChainContinuationRoot: T,
+				openOffset: e.offset,
+				ownCandidates: [],
+				childCandidates: [],
+				entryHasContainer: !1,
+				entryForcedBreak: !1,
+				anyForcedBreak: !1,
+				entryForcedBreakStructural: !1,
+				anyForcedBreakStructural: !1,
+				allOk: !0
+			}), T = !1;
+		} else if (un.has(e.type)) {
+			s = Math.max(0, s - 1), E(), v || p(e.offset, s);
+			let t = f.pop();
+			if (t) {
+				g(t);
+				let r = t.kind === "LPAREN" && t.isTagParen, i = (m(t) || n && (t.kind === "LBRACKET" || t.kind === "LBRACE" || t.kind === "LPAREN")) && t.ownCandidates.length > 0 && (r || t.allOk) && !fn(o.comments, t.openOffset, e.endOffset) ? t.childCandidates : [...t.ownCandidates, ...t.childCandidates], s = f[f.length - 1];
+				if (s) {
+					for (let e of i) s.childCandidates.push(e);
+					let e = i.length > 0 || t.anyForcedBreakStructural;
+					(t.isChainContinuationRoot && t.isTagParen ? e : i.length > 0 || t.anyForcedBreak) && (s.entryForcedBreak = !0), e && (s.entryForcedBreakStructural = !0);
+				} else for (let e of i) a.push(e);
+			}
+		} else if (e.type === "COMMA") {
+			let t = f[f.length - 1];
+			t && g(t), c = {
+				point: e.endOffset,
+				contentDepth: s,
+				kind: "comma"
+			};
+		} else if (e.type === "TSTR" || e.type === "RAWSTRING") {
+			let n = t.slice(e.offset, e.endOffset);
+			if (r && (e.type === "TSTR" ? sn(n).length > 0 : rn(n, 0).length > 0)) {
+				let e = f[f.length - 1];
+				e && (e.entryForcedBreak = !0, e.entryForcedBreakStructural = !0);
+			}
+			d === "PLUS" && _ === "text" ? y.push(e.value) : (_ = "text", y = [e.value], b = !1);
+		} else if (e.type === "SQSTR") {
+			if (d !== "PLUS" || _ !== "byte") {
+				let t = e._sqstrBytes, n = t ? Zt.decode(t) : null;
+				d === "PLUS" && _ === "text" ? n === null ? b = !0 : y.push(n) : (_ = "text", y = n === null ? [] : [n], b = n === null);
+			}
+		} else if (e.type === "BYTES_HEX" || e.type === "BYTES_HEX_ELIDED" || e.type === "BYTES_B64" || e.type === "APP_STRING") {
+			if (d === "PLUS" && _ === "text") {
+				let t = null;
+				try {
+					e.type === "BYTES_HEX" ? t = Zt.decode(i(e.value)) : e.type === "BYTES_B64" && (t = Zt.decode(ee(e.value)));
+				} catch {
+					t = null;
+				}
+				t === null ? b = !0 : y.push(t);
+			} else {
+				let e = f[f.length - 1], t = h();
+				e && (!t || !m(t)) && (e.entryForcedBreak = !0), (d !== "PLUS" || _ === "none") && (_ = "byte");
+			}
+		} else e.type === "ELLIPSIS" && (x = !0, d === "PLUS" && _ === "text" ? b = !0 : (d !== "PLUS" || _ === "none") && (_ = "text", y = [], b = !0));
+		d = e.type, u = e.endOffset;
+	}
+	let D = o.comments.find((e) => e.start >= u);
+	return D !== void 0 && a.push({
+		point: D.start,
+		contentDepth: s
+	}), a;
+}
+function on(t) {
+	let n = [], r = new e(t), i = 0;
 	for (;;) {
-		let i = n.consume();
-		if (i.type === "EOF") break;
-		if (Bt.has(i.type)) r++;
-		else if (Vt.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 Rt(n)) t.push({
-					point: i.offset + e,
-					contentDepth: r + 1
+		let e = r.consume();
+		if (e.type === "EOF") break;
+		if (ln.has(e.type)) i++;
+		else if (un.has(e.type)) i = Math.max(0, i - 1);
+		else if (e.type !== "COMMA") {
+			if (e.type === "TSTR") {
+				let r = t.slice(e.offset, e.endOffset);
+				for (let t of sn(r)) n.push({
+					point: e.offset + t,
+					contentDepth: i + 1
 				});
-			} else if (i.type === "RAWSTRING") {
-				let n = e.slice(i.offset, i.endOffset);
-				for (let { point: e } of Ft(n, 0)) t.push({
-					point: i.offset + e,
-					contentDepth: r + 1
+			} else if (e.type === "RAWSTRING") {
+				let r = t.slice(e.offset, e.endOffset);
+				for (let { point: t } of rn(r, 0)) n.push({
+					point: e.offset + t,
+					contentDepth: i + 1
 				});
 			}
 		}
 	}
-	return t;
+	return n;
 }
-function Rt(e) {
+function sn(e) {
 	let t = [], n = 1, r = e.length - 1;
 	for (; n < r;) {
 		let r = e[n];
 		if (r === "\\") {
 			let r = e[n + 1];
 			if (r === "n" || r === "r") t.push(n + 2), n += 2;
-			else if (r === "u") if (e[n + 2] === "{") {
-				let t = e.indexOf("}", n + 3);
-				n = t >= 0 ? t + 1 : n + 2;
-			} else n += 6;
-			else n += 2;
+			else if (r === "u") {
+				if (e[n + 2] === "{") {
+					let t = e.indexOf("}", n + 3);
+					n = t >= 0 ? t + 1 : n + 2;
+				} else n += 6;
+			} else n += 2;
 		} else r === "\r" ? e[n + 1] === "\n" ? (t.push(n + 2), n += 2) : (t.push(n + 1), n++) : (r === "\n" && t.push(n + 1), n++);
 	}
 	return t;
 }
-var zt = /* @__PURE__ */ new Set(["ENCODING_INDICATOR", "UNDERSCORE"]), Bt = /* @__PURE__ */ new Set([
+var cn = /* @__PURE__ */ new Set(["ENCODING_INDICATOR", "UNDERSCORE"]), ln = /* @__PURE__ */ new Set([
 	"LBRACKET",
 	"LBRACE",
 	"LPAREN",
-	"LT_LT"
-]), Vt = /* @__PURE__ */ new Set([
+	"LT_LT",
+	"APP_SEQUENCE"
+]), un = /* @__PURE__ */ new Set([
 	"RBRACKET",
 	"RBRACE",
 	"RPAREN",
 	"GT_GT"
+]), dn = /* @__PURE__ */ new Set([
+	"TSTR",
+	"RAWSTRING",
+	"SQSTR",
+	"BYTES_HEX",
+	"BYTES_HEX_ELIDED",
+	"BYTES_B64"
 ]);
-function Ht(e, t, n) {
+function fn(e, t, n) {
 	return e.some((e) => e.start >= t && e.end <= n);
 }
-function Ut(e, t, n) {
+function pn(e, t, n) {
 	return /^[\t\n\r ]*$/.test(e.slice(t, n));
 }
-function Wt(e, t) {
+function mn(e, t) {
 	let n = [...t].filter(([t]) => t > 0 && t < e.length).sort(([e], [t]) => e - t);
 	if (n.length === 0) return [{
 		text: e,
@@ -2352,7 +2660,7 @@ function Wt(e, t) {
 }
 //#endregion
 //#region src/extensions/dt.ts
-function Gt(e) {
+function hn(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");
@@ -2360,17 +2668,17 @@ function Gt(e) {
 	for (; s.length < 3;) s += "0";
 	return `${i}.${s}Z`;
 }
-var Kt = new TextDecoder("utf-8", { fatal: !0 });
-function qt(e) {
+var gn = new TextDecoder("utf-8", { fatal: !0 });
+function _n(e) {
 	if (e.length !== 1) throw SyntaxError("dt<<...>>: expected exactly one item");
 	let t = e[0];
-	if (t instanceof G) return t.value;
-	if (t instanceof N) return Kt.decode(t.value);
+	if (t instanceof Y) return t.value;
+	if (t instanceof B) return gn.decode(t.value);
 	throw SyntaxError("dt<<...>>: expected a text string or byte string");
 }
-var Jt = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?(Z|[+-]\d{2}:\d{2})$/i;
-function Yt(e, t) {
-	if (!Jt.test(e)) {
+var vn = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?(Z|[+-]\d{2}:\d{2})$/i;
+function yn(e, t) {
+	if (!vn.test(e)) {
 		let n = `dt: invalid RFC 3339 date-time: ${JSON.stringify(e)}`;
 		if (t) t(n);
 		else throw SyntaxError(n);
@@ -2381,110 +2689,123 @@ function Yt(e, t) {
 	if (isNaN(a)) throw SyntaxError(`dt: invalid RFC 3339 date-time: ${JSON.stringify(e)}`);
 	if (i === void 0) {
 		let e = a / 1e3;
-		return e >= 0 ? new Zt(BigInt(e)) : new Qt(BigInt(e));
+		return e >= 0 ? new xn(BigInt(e)) : new Sn(BigInt(e));
 	}
-	return new $t(a / 1e3 + i);
+	return new Cn(a / 1e3 + i);
 }
-var Xt = 1n, Zt = class extends k {
+var bn = 1n, xn = class extends I {
 	constructor(e, t) {
 		super(e, t);
 	}
-	_toCDN(e, t) {
-		if (e?.appStrings === !1) return super._toCDN(e, t);
-		let n = a(e, this.encodingWidth, () => p(this.value));
-		return _(e, this.appSeqSource, void 0, this.appSeqSourceFeatures) === "adjusted" ? m(this.appSeqSource, n, e, this.appSeqInnerEnd, this.appSeqComments) : `dt'${Gt(Number(this.value))}'${n}`;
+	_toCDN(e, n, r) {
+		if (e?.appPrefix === !1) return super._toCDN(e, n, r);
+		let i = t(e, this.encodingWidth, () => E(this.value));
+		return T(e, this.appSeqSource, void 0, this.appSeqSourceFeatures) === "adjusted" ? D(this.appSeqSource, i, e, this.appSeqInnerEnd, this.appSeqComments) : `dt'${hn(Number(this.value))}'${i}`;
 	}
-}, Qt = class extends A {
+}, Sn = class extends L {
 	constructor(e, t) {
 		super(e, t);
 	}
-	_toCDN(e, t) {
-		if (e?.appStrings === !1) return super._toCDN(e, t);
-		let n = a(e, this.encodingWidth, () => p(this.argument));
-		return _(e, this.appSeqSource, void 0, this.appSeqSourceFeatures) === "adjusted" ? m(this.appSeqSource, n, e, this.appSeqInnerEnd, this.appSeqComments) : `dt'${Gt(Number(this.value))}'${n}`;
+	_toCDN(e, n, r) {
+		if (e?.appPrefix === !1) return super._toCDN(e, n, r);
+		let i = t(e, this.encodingWidth, () => E(this.argument));
+		return T(e, this.appSeqSource, void 0, this.appSeqSourceFeatures) === "adjusted" ? D(this.appSeqSource, i, e, this.appSeqInnerEnd, this.appSeqComments) : `dt'${hn(Number(this.value))}'${i}`;
 	}
-}, $t = class extends j {
+}, Cn = class extends R {
 	constructor(e, t) {
 		super(e, t);
 	}
-	_toCDN(e, t) {
-		if (e?.appStrings === !1) return super._toCDN(e, t);
-		let n = D(this.value), r = ie(this.value, this.precision, n, e?.encodingIndicators ?? "auto");
-		return _(e, this.appSeqSource, void 0, this.appSeqSourceFeatures) === "adjusted" ? m(this.appSeqSource, r, e, this.appSeqInnerEnd, this.appSeqComments) : `dt'${Gt(this.value)}'${r}`;
+	_toCDN(e, t, n) {
+		if (e?.appPrefix === !1) return super._toCDN(e, t, n);
+		let r = P(this.value), i = S(this.value, this.precision, r, e?.encodingIndicators ?? "auto");
+		return T(e, this.appSeqSource, void 0, this.appSeqSourceFeatures) === "adjusted" ? D(this.appSeqSource, i, e, this.appSeqInnerEnd, this.appSeqComments) : `dt'${hn(this.value)}'${i}`;
 	}
-}, en = class extends M {
+}, wn = class extends z {
 	constructor(e, t) {
-		super(Xt, typeof e == "string" ? Yt(e) : e, t);
-	}
-	_toCDN(e, t) {
-		if (e?.appStrings === !1) return super._toCDN(e, t);
-		let n = _(e, this.appSeqSource, this.ednSource, this.appSeqSourceFeatures, this.appSeqEncodingEditsComplete);
-		if (n === "verbatim") return this.appSeqSource;
-		if (n === "source") return g(this.appSeqSource, e, this.appSeqComments, this.appSeqEncodingEdits);
-		if (n === "structural") return super._toCDN({
+		super(bn, typeof e == "string" ? yn(e) : e, t);
+	}
+	_toCDN(e, n, r) {
+		if (e?.appPrefix === !1) return super._toCDN(e, n, r);
+		let i = T(e, this.appSeqSource, this.ednSource, this.appSeqSourceFeatures, this.appSeqEncodingEditsComplete);
+		if (i === "verbatim") return this.appSeqSource;
+		if (i === "source") return w(this.appSeqSource, e, this.appSeqComments, this.appSeqEncodingEdits);
+		if (i === "structural") return super._toCDN({
 			...e,
-			appStrings: !1
-		}, t);
-		let r = a(e, this.encodingWidth, () => p(Xt));
-		if (n === "adjusted") return m(this.appSeqSource, r, e, this.appSeqInnerEnd, this.appSeqComments);
-		let i = this.content;
-		return (i instanceof j ? i.precision !== void 0 && i.precision !== D(i.value) : i.encodingWidth !== void 0) ? super._toCDN({
+			appPrefix: !1
+		}, n, r);
+		let a = t(e, this.encodingWidth, () => E(bn));
+		if (i === "adjusted") return D(this.appSeqSource, a, e, this.appSeqInnerEnd, this.appSeqComments);
+		let o = this.content;
+		return (o instanceof R ? o.precision !== void 0 && o.precision !== P(o.value) : o.encodingWidth !== void 0) ? super._toCDN({
 			...e,
-			appStrings: !1
-		}, t) : `DT'${Gt(i instanceof j ? i.value : Number(i.value))}'${r}`;
+			appPrefix: !1
+		}, n, r) : `DT'${hn(o instanceof R ? o.value : Number(o.value))}'${a}`;
 	}
-}, tn = class extends en {
+}, Tn = class extends wn {
 	constructor(e, t) {
 		super(e, t);
 	}
 	_toJS(e) {
-		let t = this.content, n = t instanceof j ? t.value * 1e3 : Number(t.value) * 1e3;
+		let t = this.content, n = t instanceof R ? t.value * 1e3 : Number(t.value) * 1e3;
 		return new Date(n);
 	}
 };
-function nn(e) {
+function En(e) {
+	return (t, n) => {
+		if (!(t instanceof wn)) return;
+		let r = t.content;
+		if (e) {
+			let e = r instanceof R ? r.value * 1e3 : Number(r.value) * 1e3;
+			return { value: new Date(e) };
+		}
+		let i = r._toJS(n);
+		return { value: n.stripTags ? i : k.set(i, t.tag) };
+	};
+}
+function Dn(e) {
 	let t = e?.jsDate ?? !1;
 	function n(e) {
-		return t ? new tn(e) : new en(e);
+		return t ? new Tn(e) : new wn(e);
 	}
 	let r = {
 		appStringPrefixes: ["dt", "DT"],
-		tagNumbers: [Xt],
+		tagNumbers: [bn],
 		preserveAppSeqSource: "optional",
+		toJS: En(t),
 		parseAppString(e, t, r) {
-			return e === "DT" ? n(t) : Yt(t, r);
+			return e === "DT" ? n(t) : yn(t, r);
 		},
 		parseAppSequence(e, t, r) {
-			let i = qt(t);
-			return e === "DT" ? n(i) : Yt(i, r);
+			let i = _n(t);
+			return e === "DT" ? n(i) : yn(i, r);
 		},
 		parseTag(e, n) {
 			if (e !== 1n) return;
 			let r;
-			if (n instanceof k) r = new Zt(n.value, {
+			if (n instanceof I) r = new xn(n.value, {
 				encodingWidth: n.encodingWidth,
 				ednSource: n.ednSource
 			});
-			else if (n instanceof A) r = new Qt(n.value, {
+			else if (n instanceof L) r = new Sn(n.value, {
 				encodingWidth: n.encodingWidth,
 				ednSource: n.ednSource
 			});
-			else if (n instanceof j) r = new $t(n.value, {
+			else if (n instanceof R) r = new Cn(n.value, {
 				precision: n.precision,
 				literalSource: n.literalSource
 			});
 			else return;
-			return r.start = n.start, r.end = n.end, t ? new tn(r) : new en(r);
+			return r.start = n.start, r.end = n.end, t ? new Tn(r) : new wn(r);
 		}
 	};
 	return t && (r.fromJS = (e, t) => {
-		if (e instanceof Date) return new tn(Gt(e.getTime() / 1e3));
+		if (e instanceof Date) return new Tn(hn(e.getTime() / 1e3));
 	}, r.isJSType = (e) => e instanceof Date), r;
 }
-var rn = nn(), an = nn({ jsDate: !0 });
+var On = Dn(), kn = Dn({ jsDate: !0 });
 //#endregion
 //#region src/utils/ip.ts
-function on(e) {
+function An(e) {
 	let t = e.split(".");
 	if (t.length !== 4) throw SyntaxError(`ip: invalid IPv4 address: ${JSON.stringify(e)}`);
 	let n = /* @__PURE__ */ new Uint8Array(4);
@@ -2497,11 +2818,11 @@ function on(e) {
 	}
 	return n;
 }
-function sn(e) {
+function jn(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 = on(i[2]));
+	i && (n = i[1], n.endsWith(":") && (n += ":"), r = An(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;
@@ -2518,11 +2839,11 @@ function sn(e) {
 	}
 	return r && t.set(r, 12), t;
 }
-function cn(e) {
+function Mn(e) {
 	return Array.from(e).join(".");
 }
-function ln(e) {
-	let t = e.slice(0, 10).every((e) => e === 0) && e[10] === 255 && e[11] === 255 ? cn(e.slice(12)) : null, n = t ? 6 : 8, r = [];
+function Nn(e) {
+	let t = e.slice(0, 10).every((e) => e === 0) && e[10] === 255 && e[11] === 255 ? Mn(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) {
@@ -2536,29 +2857,29 @@ function ln(e) {
 }
 //#endregion
 //#region src/extensions/ip.ts
-var un = "ip", dn = "IP", fn = 52n, pn = 54n, mn = new TextDecoder("utf-8", { fatal: !0 });
-function hn(e) {
+var Pn = "ip", Fn = "IP", In = 52n, Ln = 54n, Rn = new TextDecoder("utf-8", { fatal: !0 });
+function zn(e) {
 	if (e.length !== 1) throw SyntaxError("ip<<...>>: expected exactly one item");
 	let t = e[0];
-	if (t instanceof G) return t.value;
-	if (t instanceof N) return mn.decode(t.value);
+	if (t instanceof Y) return t.value;
+	if (t instanceof B) return Rn.decode(t.value);
 	throw SyntaxError("ip<<...>>: expected a text string or byte string");
 }
-function gn(e) {
+function Bn(e) {
 	return /^\d/.test(e) && e.includes(".") && !e.includes(":") ? {
-		bytes: on(e),
+		bytes: An(e),
 		isV4: !0
 	} : {
-		bytes: sn(e),
+		bytes: jn(e),
 		isV4: !1
 	};
 }
-function _n(e) {
-	if (e.length === 4) return cn(e);
-	if (e.length === 16) return ln(e);
+function Vn(e) {
+	if (e.length === 4) return Mn(e);
+	if (e.length === 16) return Nn(e);
 	throw SyntaxError(`ip: unexpected byte length: ${e.length}`);
 }
-function vn(e, t) {
+function Hn(e, t) {
 	let n = new Uint8Array(e.length);
 	n.set(e);
 	let r = Math.floor(t / 8), i = t % 8;
@@ -2568,82 +2889,82 @@ function vn(e, t) {
 	for (; a > 0 && n[a - 1] === 0;) a--;
 	return n.slice(0, a);
 }
-function yn(e, t) {
+function Un(e, t) {
 	let n = new Uint8Array(t);
 	return n.set(e), n;
 }
-var bn = class extends N {
-	_toCDN(e, t) {
-		if (e?.appStrings === !1) return super._toCDN(e, t);
-		let n = a(e, this.encodingWidth, () => p(BigInt(this.value.length)));
-		return _(e, this.appSeqSource, void 0, this.appSeqSourceFeatures) === "adjusted" ? m(this.appSeqSource, n, e, this.appSeqInnerEnd, this.appSeqComments) : `${un}'${_n(this.value)}'${n}`;
+var Wn = class extends B {
+	_toCDN(e, n, r) {
+		if (e?.appPrefix === !1) return super._toCDN(e, n, r);
+		let i = t(e, this.encodingWidth, () => E(BigInt(this.value.length)));
+		return T(e, this.appSeqSource, void 0, this.appSeqSourceFeatures) === "adjusted" ? D(this.appSeqSource, i, e, this.appSeqInnerEnd, this.appSeqComments) : `${Pn}'${Vn(this.value)}'${i}`;
 	}
-}, xn = class extends I {
+}, Gn = class extends U {
 	_isV4;
 	constructor(e, t, n) {
-		super([new k(BigInt(e)), new N(t)]), this._isV4 = n;
+		super([new I(BigInt(e)), new B(t)]), this._isV4 = n;
 	}
-	_toCDN(e, t) {
-		if (e?.appStrings === !1) return super._toCDN(e, t);
-		if (_(e, this.appSeqSource, void 0, this.appSeqSourceFeatures) === "adjusted") return m(this.appSeqSource, "", e, this.appSeqInnerEnd, this.appSeqComments);
-		let n = Number(this.items[0].value), r = this.items[1].value;
-		return `${un}'${_n(yn(r, this._isV4 ? 4 : 16))}/${n}'`;
+	_toCDN(e, t, n) {
+		if (e?.appPrefix === !1) return super._toCDN(e, t, n);
+		if (T(e, this.appSeqSource, void 0, this.appSeqSourceFeatures) === "adjusted") return D(this.appSeqSource, "", e, this.appSeqInnerEnd, this.appSeqComments);
+		let r = Number(this.items[0].value), i = this.items[1].value;
+		return `${Pn}'${Vn(Un(i, this._isV4 ? 4 : 16))}/${r}'`;
 	}
-}, Sn = class extends M {
+}, Kn = class extends z {
 	constructor(e, t) {
 		super(e, t);
 	}
-	_toCDN(e, t) {
-		if (e?.appStrings === !1) return super._toCDN(e, t);
-		let n = _(e, this.appSeqSource, this.ednSource, this.appSeqSourceFeatures, this.appSeqEncodingEditsComplete);
-		if (n === "verbatim") return this.appSeqSource;
-		if (n === "source") return g(this.appSeqSource, e, this.appSeqComments, this.appSeqEncodingEdits);
-		if (n === "structural") return super._toCDN(e, t);
-		if (n === "adjusted") {
-			let t = a(e, this.encodingWidth, () => p(this.tag));
-			return m(this.appSeqSource, t, e, this.appSeqInnerEnd, this.appSeqComments);
-		}
-		let r = this.tag === fn ? 4 : 16, i = this.content;
-		if (i instanceof N) {
-			if (i.encodingWidth !== void 0) return super._toCDN(e, t);
-			let n = a(e, this.encodingWidth, () => p(this.tag));
-			return `${dn}'${_n(i.value)}'${n}`;
-		}
-		if (i instanceof I && i.items.length === 2 && i.items[0] instanceof k && i.items[1] instanceof N) {
-			if (i.encodingWidth !== void 0 || i.items[0].encodingWidth !== void 0 || i.items[1].encodingWidth !== void 0) return super._toCDN(e, t);
-			let n = Number(i.items[0].value), o = yn(i.items[1].value, r), s = a(e, this.encodingWidth, () => p(this.tag));
-			return `${dn}'${_n(o)}/${n}'${s}`;
-		}
-		return super._toCDN(e, t);
+	_toCDN(e, n, r) {
+		if (e?.appPrefix === !1) return super._toCDN(e, n, r);
+		let i = T(e, this.appSeqSource, this.ednSource, this.appSeqSourceFeatures, this.appSeqEncodingEditsComplete);
+		if (i === "verbatim") return this.appSeqSource;
+		if (i === "source") return w(this.appSeqSource, e, this.appSeqComments, this.appSeqEncodingEdits);
+		if (i === "structural") return super._toCDN(e, n, r);
+		if (i === "adjusted") {
+			let n = t(e, this.encodingWidth, () => E(this.tag));
+			return D(this.appSeqSource, n, e, this.appSeqInnerEnd, this.appSeqComments);
+		}
+		let a = this.tag === In ? 4 : 16, o = this.content;
+		if (o instanceof B) {
+			if (o.encodingWidth !== void 0) return super._toCDN(e, n, r);
+			let i = t(e, this.encodingWidth, () => E(this.tag));
+			return `${Fn}'${Vn(o.value)}'${i}`;
+		}
+		if (o instanceof U && o.items.length === 2 && o.items[0] instanceof I && o.items[1] instanceof B) {
+			if (o.encodingWidth !== void 0 || o.items[0].encodingWidth !== void 0 || o.items[1].encodingWidth !== void 0) return super._toCDN(e, n, r);
+			let i = Number(o.items[0].value), s = Un(o.items[1].value, a), c = t(e, this.encodingWidth, () => E(this.tag));
+			return `${Fn}'${Vn(s)}/${i}'${c}`;
+		}
+		return super._toCDN(e, n, r);
 	}
 };
-function Cn(e, t) {
+function qn(e, t) {
 	let n = t.indexOf("/");
 	if (n === -1) {
-		let { bytes: n, isV4: r } = gn(t);
-		return e === dn ? new Sn(r ? fn : pn, new N(n)) : new bn(n);
+		let { bytes: n, isV4: r } = Bn(t);
+		return e === Fn ? new Kn(r ? In : Ln, new B(n)) : new Wn(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 } = gn(r), c = s ? 32 : 128;
+	let a = parseInt(i, 10), { bytes: o, isV4: s } = Bn(r), c = s ? 32 : 128;
 	if (a > c) throw SyntaxError(`ip: prefix length ${a} exceeds maximum ${c} for ${s ? "IPv4" : "IPv6"}`);
-	let l = vn(o, a);
-	return e === dn ? new Sn(s ? fn : pn, new I([new k(BigInt(a)), new N(l)])) : new xn(a, l, s);
+	let l = Hn(o, a);
+	return e === Fn ? new Kn(s ? In : Ln, new U([new I(BigInt(a)), new B(l)])) : new Gn(a, l, s);
 }
-var wn = {
-	appStringPrefixes: [un, dn],
-	tagNumbers: [fn, pn],
+var Jn = {
+	appStringPrefixes: [Pn, Fn],
+	tagNumbers: [In, Ln],
 	preserveAppSeqSource: "optional",
 	parseAppString(e, t) {
-		return Cn(e, t);
+		return qn(e, t);
 	},
 	parseAppSequence(e, t) {
-		return Cn(e, hn(t));
+		return qn(e, zn(t));
 	},
 	parseTag(e, t) {
-		if (!(e !== fn && e !== pn) && (t instanceof N || t instanceof I)) return new Sn(e, t);
+		if ((e === In || e === Ln) && (t instanceof B || t instanceof U)) return new Kn(e, t);
 	}
-}, Tn = "cri", En = "CRI", Dn = 99n, On = /* @__PURE__ */ new Map([
+}, Yn = "cri", Xn = "CRI", Zn = 99n, Qn = /* @__PURE__ */ new Map([
 	["coap", -1n],
 	["coaps", -2n],
 	["http", -3n],
@@ -2654,47 +2975,47 @@ var wn = {
 	["coaps+tcp", -8n],
 	["coap+ws", -25n],
 	["coaps+ws", -26n]
-]), kn = new Map([...On.entries()].map(([e, t]) => [t, e]));
-function K(e) {
+]), $n = new Map([...Qn.entries()].map(([e, t]) => [t, e]));
+function X(e) {
 	try {
 		return decodeURIComponent(e);
 	} catch {
 		return e;
 	}
 }
-var An = new TextEncoder(), jn = new TextDecoder("utf-8", { fatal: !0 });
-function Mn(e) {
-	return Array.from(An.encode(e), (e) => `%${e.toString(16).toUpperCase().padStart(2, "0")}`).join("");
+var er = new TextEncoder(), tr = new TextDecoder("utf-8", { fatal: !0 });
+function nr(e) {
+	return Array.from(er.encode(e), (e) => `%${e.toString(16).toUpperCase().padStart(2, "0")}`).join("");
 }
-function q(e, t) {
+function rr(e, t) {
 	let n = "";
-	for (let r of e) n += t(r) ? r : Mn(r);
+	for (let r of e) n += t(r) ? r : nr(r);
 	return n;
 }
-function Nn(e) {
+function ir(e) {
 	return /[A-Za-z0-9\-._~]/.test(e);
 }
-function Pn(e) {
+function ar(e) {
 	return /[!$&'()*+,;=]/.test(e);
 }
-function Fn(e) {
-	return Nn(e) || Pn(e) || e === ":" || e === "@";
+function or(e) {
+	return ir(e) || ar(e) || e === ":" || e === "@";
 }
-function In(e) {
-	return (Fn(e) || e === "/" || e === "?") && e !== "&";
+function sr(e) {
+	return (or(e) || e === "/" || e === "?") && e !== "&";
 }
-function Ln(e) {
-	return Fn(e) || e === "/" || e === "?";
+function cr(e) {
+	return or(e) || e === "/" || e === "?";
 }
-function Rn(e) {
-	return Nn(e) || Pn(e) || e === ":";
+function lr(e) {
+	return ir(e) || ar(e) || e === ":";
 }
-function zn(e) {
-	return Nn(e) || Pn(e);
+function ur(e) {
+	return ir(e) || ar(e);
 }
-function Bn(e) {
+function dr(e) {
 	let t = [], n = e, r = n.indexOf("@");
-	r >= 0 && (t.push(R.FALSE), t.push(new G(K(n.slice(0, r)))), n = n.slice(r + 1));
+	r >= 0 && (t.push(G.FALSE), t.push(new Y(X(n.slice(0, r)))), n = n.slice(r + 1));
 	let i, a = null;
 	if (n.startsWith("[")) {
 		let e = n.indexOf("]");
@@ -2703,272 +3024,275 @@ function Bn(e) {
 		let r = n.slice(e + 1);
 		if (r.startsWith(":")) a = r.slice(1);
 		else if (r.length > 0) throw SyntaxError("cri: unexpected characters after ']' in authority");
-		t.push(new N(sn(i)));
+		t.push(new B(jn(i)));
 	} else {
 		let e = n.lastIndexOf(":");
-		if (e >= 0 ? (i = n.slice(0, e), a = n.slice(e + 1)) : i = n, i !== "") if (/^\d{1,3}(\.\d{1,3}){3}$/.test(i)) t.push(new N(on(i)));
-		else for (let e of i.toLowerCase().split(".")) t.push(new G(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 B(An(i)));
+			else for (let e of i.toLowerCase().split(".")) t.push(new Y(e));
+		}
 	}
 	if (a !== null && a !== "") {
 		if (!/^\d+$/.test(a)) throw SyntaxError(`cri: invalid port: ${JSON.stringify(a)}`);
 		let e = parseInt(a, 10);
 		if (e > 65535) throw SyntaxError(`cri: port ${e} out of range`);
-		t.push(new k(BigInt(e)));
+		t.push(new I(BigInt(e)));
 	}
-	return new I(t);
+	return new U(t);
 }
-function Vn(e) {
+function fr(e) {
 	let t = e.items, n = 0, r = "";
-	if (n < t.length && t[n] instanceof R && t[n].value === 20) {
+	if (n < t.length && t[n] instanceof G && t[n].value === 20) {
 		n++;
 		let e = t[n++];
-		r += q(e.value, Rn) + "@";
+		r += rr(e.value, lr) + "@";
 	}
 	if (n >= t.length) return r;
 	let i = t[n];
-	if (i instanceof N) {
+	if (i instanceof B) {
 		n++;
 		let { length: e } = i.value;
-		if (e === 4) r += cn(i.value);
-		else if (e === 16) r += "[" + ln(i.value) + "]";
+		if (e === 4) r += Mn(i.value);
+		else if (e === 16) r += "[" + Nn(i.value) + "]";
 		else throw Error(`cri: unexpected host-ip byte length: ${e}`);
-		n < t.length && t[n] instanceof G && (r += `%25${q(t[n++].value, zn)}`);
+		n < t.length && t[n] instanceof Y && (r += `%25${rr(t[n++].value, ur)}`);
 	} else {
 		let e = [];
-		for (; n < t.length && t[n] instanceof G;) e.push(q(t[n++].value, zn));
+		for (; n < t.length && t[n] instanceof Y;) e.push(rr(t[n++].value, ur));
 		r += e.join(".");
 	}
-	return n < t.length && t[n] instanceof k && (r += ":" + t[n].value.toString()), r;
+	return n < t.length && t[n] instanceof I && (r += ":" + t[n].value.toString()), r;
 }
-function Hn(e) {
+function pr(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 G(K(e)))) : (r = t, i = []), {
-		authority: Bn(r),
+	return n >= 0 ? (r = t.slice(0, n), i = t.slice(n + 1).split("/").map((e) => new Y(X(e)))) : (r = t, i = []), {
+		authority: dr(r),
 		pathSegments: i
 	};
 }
-function Un(e) {
+function mr(e) {
 	let t = e, n = null, r = t.indexOf("#");
-	r >= 0 && (n = K(t.slice(r + 1)), t = t.slice(0, r));
+	r >= 0 && (n = X(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 G(K(e)));
+		t = t.slice(0, a), i = e.split("&").map((e) => new Y(X(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 = On.get(e);
-		if (o.push(n === void 0 ? new G(e) : new A(n)), t.startsWith("//")) {
-			let { authority: e, pathSegments: n } = Hn(t);
-			o.push(e, new I(n));
+		let e = s[1].toLowerCase(), t = s[2], n = Qn.get(e);
+		if (o.push(n === void 0 ? new Y(e) : new L(n)), t.startsWith("//")) {
+			let { authority: e, pathSegments: n } = pr(t);
+			o.push(e, new U(n));
 		} else if (t.startsWith("/")) {
-			let e = t.slice(1).split("/").map((e) => new G(K(e)));
-			o.push(R.NULL, new I(e));
+			let e = t.slice(1).split("/").map((e) => new Y(X(e)));
+			o.push(G.NULL, new U(e));
 		} else {
-			let e = t.split("/").map((e) => new G(K(e)));
-			o.push(R.TRUE, new I(e));
+			let e = t.split("/").map((e) => new Y(X(e)));
+			o.push(G.TRUE, new U(e));
 		}
 	} else if (t.startsWith("//")) {
-		let { authority: e, pathSegments: n } = Hn(t);
-		o.push(R.FALSE, e, new I(n));
+		let { authority: e, pathSegments: n } = pr(t);
+		o.push(G.FALSE, e, new U(n));
 	} else if (t.startsWith("/")) {
-		let e = t.slice(1).split("/").map((e) => new G(K(e)));
-		o.push(R.TRUE, new I(e));
-	} else if (t === "") o.push(new k(0n));
+		let e = t.slice(1).split("/").map((e) => new Y(X(e)));
+		o.push(G.TRUE, new U(e));
+	} else if (t === "") o.push(new I(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 G(K(e)));
-		o.push(new k(n), new I(a));
+		let a = r === "" ? [] : r.split("/").map((e) => new Y(X(e)));
+		o.push(new I(n), new U(a));
 	}
-	if (i !== null && o.push(new I(i)), n !== null && (i === null && o.push(R.NULL), o.push(new G(n))), n !== null && i === null && o.splice(o.length - 2, 1), i === null && n === null) {
+	if (i !== null && o.push(new U(i)), n !== null && (i === null && o.push(G.NULL), o.push(new Y(n))), n !== null && i === null && o.splice(o.length - 2, 1), i === null && n === null) {
 		let e = o[o.length - 1];
-		e instanceof I && e.items.length === 0 && o.pop();
+		e instanceof U && e.items.length === 0 && o.pop();
 	}
-	return o.length === 1 && o[0] instanceof k && o[0].value === 0n ? [] : o;
+	return o.length === 1 && o[0] instanceof I && o[0].value === 0n ? [] : o;
 }
-function Wn(e, t) {
+function hr(e, t) {
 	let n = t, r = "";
 	if (n < e.length) {
 		let t = e[n];
-		if (t instanceof I) {
+		if (t instanceof U) {
 			if (n++, t.items.length > 0) {
 				let e = t.items.map((e) => {
-					if (!(e instanceof G)) throw Error("cri: query item must be a text string");
-					return q(e.value, In);
+					if (!(e instanceof Y)) throw Error("cri: query item must be a text string");
+					return rr(e.value, sr);
 				});
 				r += "?" + e.join("&");
 			}
-		} else t instanceof R && t.value === 22 && n++;
+		} else t instanceof G && t.value === 22 && n++;
 	}
-	return n < e.length && e[n] instanceof G && (r += "#" + q(e[n].value, Ln)), r;
+	return n < e.length && e[n] instanceof Y && (r += "#" + rr(e[n].value, cr)), r;
 }
-function Gn(e) {
+function gr(e) {
 	return e.items.map((e) => {
-		if (!(e instanceof G)) throw Error("cri: path segment must be a text string");
-		return q(e.value, Fn);
+		if (!(e instanceof Y)) throw Error("cri: path segment must be a text string");
+		return rr(e.value, or);
 	});
 }
-function Kn(e) {
+function _r(e) {
 	if (e.length === 0) return "";
 	let t = 0, n = e[t++];
-	if (n instanceof A || n instanceof G) {
+	if (n instanceof L || n instanceof Y) {
 		let r;
-		if (n instanceof A) {
-			let e = kn.get(n.value);
+		if (n instanceof L) {
+			let e = $n.get(n.value);
 			if (e === void 0) throw Error(`cri: unrecognised scheme-id ${n.value}`);
 			r = e + ":";
 		} else r = n.value + ":";
 		if (t >= e.length) return r;
 		let i = e[t++], a = "", o = !1;
-		if (i instanceof I) a = "//" + Vn(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");
+		if (i instanceof U) a = "//" + fr(i), o = !0;
+		else if (i instanceof G) {
+			if (i.value === 22) o = !0;
+			else if (i.value === 21) o = !1;
+			else throw Error(`cri: unexpected no-authority value: simple(${i.value})`);
+		} else throw Error("cri: unexpected type for authority element");
 		let s = "";
-		if (t < e.length && e[t] instanceof I) {
+		if (t < e.length && e[t] instanceof U) {
 			let n = e[t++];
-			n.items.length > 0 && (s = (o ? "/" : "") + Gn(n).join("/"));
+			n.items.length > 0 && (s = (o ? "/" : "") + gr(n).join("/"));
 		}
-		return r + a + s + Wn(e, t);
+		return r + a + s + hr(e, t);
 	}
-	if (n instanceof R && n.value === 20) {
-		if (t >= e.length || !(e[t] instanceof I)) throw Error("cri: network-path reference requires an authority array");
-		let n = Vn(e[t++]), r = "";
-		if (t < e.length && e[t] instanceof I) {
+	if (n instanceof G && n.value === 20) {
+		if (t >= e.length || !(e[t] instanceof U)) throw Error("cri: network-path reference requires an authority array");
+		let n = fr(e[t++]), r = "";
+		if (t < e.length && e[t] instanceof U) {
 			let n = e[t++];
-			n.items.length > 0 && (r = "/" + Gn(n).join("/"));
+			n.items.length > 0 && (r = "/" + gr(n).join("/"));
 		}
-		return "//" + n + r + Wn(e, t);
+		return "//" + n + r + hr(e, t);
 	}
-	if (n instanceof R && n.value === 21) {
+	if (n instanceof G && n.value === 21) {
 		let n = "/";
-		if (t < e.length && e[t] instanceof I) {
+		if (t < e.length && e[t] instanceof U) {
 			let r = e[t++];
-			n = "/" + Gn(r).join("/");
+			n = "/" + gr(r).join("/");
 		}
-		return n + Wn(e, t);
+		return n + hr(e, t);
 	}
-	if (n instanceof k) {
+	if (n instanceof I) {
 		let r = n.value;
-		if (r === 0n) return Wn(e, t);
+		if (r === 0n) return hr(e, t);
 		let i = r === 1n ? "" : "../".repeat(Number(r) - 1), a;
-		if (t < e.length && e[t] instanceof I) {
+		if (t < e.length && e[t] instanceof U) {
 			let n = e[t++];
 			if (n.items.length > 0) {
-				let e = Gn(n);
+				let e = gr(n);
 				a = (r === 1n && e[0].includes(":") ? "./" : i) + e.join("/");
 			} else a = i === "" ? "./" : i;
 		} else a = i === "" ? "./" : i;
-		return a + Wn(e, t);
+		return a + hr(e, t);
 	}
 	throw Error("cri: unrecognised first element type in CRI array");
 }
-var qn = class extends I {
-	_toCDN(e, t) {
-		if (e?.appStrings === !1) return super._toCDN(e, t);
-		let n = a(e, this.encodingWidth, () => p(BigInt(this.items.length)));
-		if (_(e, this.appSeqSource, void 0, this.appSeqSourceFeatures) === "adjusted") return m(this.appSeqSource, n, e, this.appSeqInnerEnd, this.appSeqComments);
+var vr = class extends U {
+	_toCDN(e, n, r) {
+		if (e?.appPrefix === !1) return super._toCDN(e, n, r);
+		let i = t(e, this.encodingWidth, () => E(BigInt(this.items.length)));
+		if (T(e, this.appSeqSource, void 0, this.appSeqSourceFeatures) === "adjusted") return D(this.appSeqSource, i, e, this.appSeqInnerEnd, this.appSeqComments);
 		try {
-			return `${Tn}'${Kn(this.items)}'${n}`;
+			return `${Yn}'${_r(this.items)}'${i}`;
 		} catch {
-			return super._toCDN(e, t);
+			return super._toCDN(e, n, r);
 		}
 	}
-}, Jn = class extends M {
+}, yr = class extends z {
 	constructor(e) {
-		super(Dn, e);
-	}
-	_toCDN(e, t) {
-		if (e?.appStrings === !1) return super._toCDN(e, t);
-		let n = _(e, this.appSeqSource, this.ednSource, this.appSeqSourceFeatures, this.appSeqEncodingEditsComplete);
-		if (n === "verbatim") return this.appSeqSource;
-		if (n === "source") return g(this.appSeqSource, e, this.appSeqComments, this.appSeqEncodingEdits);
-		if (n === "structural") return super._toCDN({
+		super(Zn, e);
+	}
+	_toCDN(e, n, r) {
+		if (e?.appPrefix === !1) return super._toCDN(e, n, r);
+		let i = T(e, this.appSeqSource, this.ednSource, this.appSeqSourceFeatures, this.appSeqEncodingEditsComplete);
+		if (i === "verbatim") return this.appSeqSource;
+		if (i === "source") return w(this.appSeqSource, e, this.appSeqComments, this.appSeqEncodingEdits);
+		if (i === "structural") return super._toCDN({
 			...e,
-			appStrings: !1
-		}, t);
+			appPrefix: !1
+		}, n, r);
 		try {
-			let r = this.content;
-			if (r.encodingWidth !== void 0) return super._toCDN(e, t);
-			let i = a(e, this.encodingWidth, () => p(Dn));
-			return n === "adjusted" ? m(this.appSeqSource, i, e, this.appSeqInnerEnd, this.appSeqComments) : `${En}'${Kn(r.items)}'${i}`;
+			let a = this.content;
+			if (a.encodingWidth !== void 0) return super._toCDN(e, n, r);
+			let o = t(e, this.encodingWidth, () => E(Zn));
+			return i === "adjusted" ? D(this.appSeqSource, o, e, this.appSeqInnerEnd, this.appSeqComments) : `${Xn}'${_r(a.items)}'${o}`;
 		} catch {
-			return super._toCDN(e, t);
+			return super._toCDN(e, n, r);
 		}
 	}
 };
-function Yn(e) {
+function br(e) {
 	if (e.length !== 1) throw SyntaxError("cri<<...>>: expected exactly one item");
 	let t = e[0];
-	if (t instanceof G) return t.value;
-	if (t instanceof N) return jn.decode(t.value);
+	if (t instanceof Y) return t.value;
+	if (t instanceof B) return tr.decode(t.value);
 	throw SyntaxError("cri<<...>>: expected a text string or byte string");
 }
-function Xn(e, t) {
-	let n = new qn(Un(t));
-	return e === En ? new Jn(n) : n;
+function xr(e, t) {
+	let n = new vr(mr(t));
+	return e === Xn ? new yr(n) : n;
 }
-var Zn = {
-	appStringPrefixes: [Tn, En],
-	tagNumbers: [Dn],
+var Sr = {
+	appStringPrefixes: [Yn, Xn],
+	tagNumbers: [Zn],
 	preserveAppSeqSource: "optional",
 	parseAppString(e, t) {
-		return Xn(e, t);
+		return xr(e, t);
 	},
 	parseAppSequence(e, t) {
-		return Xn(e, Yn(t));
+		return xr(e, br(t));
 	},
 	parseTag(e, t) {
-		if (e !== 99n || !(t instanceof I)) return;
-		let n = new qn(t.items, {
+		if (e !== 99n || !(t instanceof U)) return;
+		let n = new vr(t.items, {
 			indefiniteLength: t.indefiniteLength,
 			encodingWidth: t.encodingWidth
 		});
-		return n.start = t.start, n.end = t.end, new Jn(n);
+		return n.start = t.start, n.end = t.end, new yr(n);
 	}
-}, Qn = 18446744073709551615n, $n = -18446744073709551616n, er = {
-	tagNumbers: [Qe, $e],
+}, Cr = 18446744073709551615n, wr = -18446744073709551616n, Tr = {
+	tagNumbers: [_t, vt],
 	parseTag(e, t) {
-		if (t instanceof N) {
+		if (t instanceof B) {
 			if (e === 2n) {
-				let e = rt(t.value);
-				return e > Qn ? new it(e) : void 0;
+				let e = St(t.value);
+				return e > Cr ? new Ct(e) : void 0;
 			}
 			if (e === 3n) {
-				let e = -1n - rt(t.value);
-				return e < $n ? new at(e) : void 0;
+				let e = -1n - St(t.value);
+				return e < wr ? new wt(e) : void 0;
 			}
 		}
 	}
 };
 //#endregion
 //#region src/cbor/decoder.ts
-function tr(e, t) {
+function Er(e, t) {
 	if (e === 24 && t <= 23n) return 0;
 	if (e === 25 && t <= 255n) return 1;
 	if (e === 26 && t <= 65535n) return 2;
 	if (e === 27 && t <= 4294967295n) return 3;
 }
-function nr(e, t) {
+function Dr(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 rr = new TextDecoder("utf-8", {
+var Or = new TextDecoder("utf-8", {
 	fatal: !0,
 	ignoreBOM: !0
-}), ir = new TextDecoder("utf-8", {
+}), kr = new TextDecoder("utf-8", {
 	fatal: !1,
 	ignoreBOM: !0
 });
-function J(e) {
+function Z(e) {
 	throw Error(`CBOR decode error: ${e}`);
 }
-function ar(e, t, n) {
+function Ar(e, t, n) {
 	let r = {
 		message: e,
 		offset: t
@@ -2976,191 +3300,191 @@ function ar(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 or(e, t) {
+function jr(e, t) {
 	e.warnings ??= [], e.warnings.push(t);
 }
-function Y(e) {
-	if (e instanceof k) return ["u", String(e.value)];
-	if (e instanceof A) return ["n", String(e.value)];
-	if (e instanceof G) return ["t", e.value];
-	if (e instanceof F) return ["t", e.chunks.map((e) => e.value).join("")];
-	if (e instanceof N) return ["b", y(e.value)];
-	if (e instanceof P) {
+function Mr(e) {
+	if (e instanceof I) return ["u", String(e.value)];
+	if (e instanceof L) return ["n", String(e.value)];
+	if (e instanceof Y) return ["t", e.value];
+	if (e instanceof H) return ["t", e.chunks.map((e) => e.value).join("")];
+	if (e instanceof B) return ["b", s(e.value)];
+	if (e instanceof V) {
 		let t = "";
-		for (let n of e.chunks) t += y(n.value);
+		for (let n of e.chunks) t += s(n.value);
 		return ["b", t];
 	}
-	if (e instanceof j) return isNaN(e.value) ? ["f", "NaN"] : Object.is(e.value, -0) ? ["f", "-0"] : ["f", String(e.value)];
-	if (e instanceof R) return ["s", e.value];
-	if (e instanceof I) return ["A", e.items.map(Y)];
-	if (e instanceof L) {
-		let t = e.entries.map(([e, t]) => [Y(e), Y(t)]);
+	if (e instanceof R) return isNaN(e.value) ? ["f", "NaN"] : Object.is(e.value, -0) ? ["f", "-0"] : ["f", String(e.value)];
+	if (e instanceof G) return ["s", e.value];
+	if (e instanceof U) return ["A", e.items.map(Mr)];
+	if (e instanceof W) {
+		let t = e.entries.map(([e, t]) => [Mr(e), Mr(t)]);
 		if (t.length <= 1) return ["M", t];
 		let n = t.map((e) => [JSON.stringify(e[0]), e]);
 		return n.sort((e, t) => e[0] < t[0] ? -1 : +(e[0] > t[0])), ["M", n.map((e) => e[1])];
 	}
-	return e instanceof M ? [
+	return e instanceof z ? [
 		"G",
 		String(e.tag),
-		Y(e.content)
-	] : ["c", y(e.toCBOR())];
+		Mr(e.content)
+	] : ["c", s(e.toCBOR())];
 }
-function sr(e) {
-	if (e instanceof k) return "u" + e.value;
-	if (e instanceof A) return "n" + e.value;
-	if (e instanceof G) return "t" + e.value;
-	if (e instanceof F) {
+function Nr(e) {
+	if (e instanceof I) return "u" + e.value;
+	if (e instanceof L) return "n" + e.value;
+	if (e instanceof Y) return "t" + e.value;
+	if (e instanceof H) {
 		let t = "t";
 		for (let n of e.chunks) t += n.value;
 		return t;
 	}
-	if (e instanceof N) return "b" + y(e.value);
-	if (e instanceof P) {
+	if (e instanceof B) return "b" + s(e.value);
+	if (e instanceof V) {
 		let t = "b";
-		for (let n of e.chunks) t += y(n.value);
+		for (let n of e.chunks) t += s(n.value);
 		return t;
 	}
-	return e instanceof j ? isNaN(e.value) ? "fNaN" : Object.is(e.value, -0) ? "f-0" : "f" + e.value : e instanceof R ? "s" + e.value : JSON.stringify(Y(e));
+	return e instanceof R ? isNaN(e.value) ? "fNaN" : Object.is(e.value, -0) ? "f-0" : "f" + e.value : e instanceof G ? "s" + e.value : JSON.stringify(Mr(e));
 }
-var cr = Array.from({ length: 24 }, (e, t) => BigInt(t)), lr;
-function ur(e) {
-	return e === void 0 ? lr ??= Z(void 0).filter((e) => e.parseTag !== void 0) : Z(e).filter((e) => e.parseTag !== void 0);
+var Pr = Array.from({ length: 24 }, (e, t) => BigInt(t)), Fr;
+function Ir(e) {
+	return e === void 0 ? Fr ??= Oi(void 0).filter((e) => e.parseTag !== void 0) : Oi(e).filter((e) => e.parseTag !== void 0);
 }
-function dr(e, t) {
+function Lr(e, t) {
 	for (let n = 0; n < t; n++) if (e[n] >= 128) return;
 	return String.fromCharCode.apply(null, e);
 }
-function fr(e, t, n) {
+function Rr(e, t, n) {
 	if (n <= 23) return {
-		value: cr[n],
+		value: Pr[n],
 		nextOffset: t
 	};
 	switch (n) {
-		case 24: return t + 1 > e.byteLength && J("unexpected end of input"), {
+		case 24: return t + 1 > e.byteLength && Z("unexpected end of input"), {
 			value: BigInt(e.getUint8(t)),
 			nextOffset: t + 1
 		};
-		case 25: return t + 2 > e.byteLength && J("unexpected end of input"), {
+		case 25: return t + 2 > e.byteLength && Z("unexpected end of input"), {
 			value: BigInt(e.getUint16(t, !1)),
 			nextOffset: t + 2
 		};
-		case 26: return t + 4 > e.byteLength && J("unexpected end of input"), {
+		case 26: return t + 4 > e.byteLength && Z("unexpected end of input"), {
 			value: BigInt(e.getUint32(t, !1)),
 			nextOffset: t + 4
 		};
-		case 27: return t + 8 > e.byteLength && J("unexpected end of input"), {
+		case 27: return t + 8 > e.byteLength && Z("unexpected end of input"), {
 			value: e.getBigUint64(t, !1),
 			nextOffset: t + 8
 		};
-		default: J(`reserved additional info value: ${n}`);
+		default: Z(`reserved additional info value: ${n}`);
 	}
 }
-function pr(e, t, n) {
+function zr(e, t, n) {
 	if (n <= 23) return {
 		value: n,
 		nextOffset: t
 	};
 	switch (n) {
-		case 24: return t + 1 > e.byteLength && J("unexpected end of input"), {
+		case 24: return t + 1 > e.byteLength && Z("unexpected end of input"), {
 			value: e.getUint8(t),
 			nextOffset: t + 1
 		};
-		case 25: return t + 2 > e.byteLength && J("unexpected end of input"), {
+		case 25: return t + 2 > e.byteLength && Z("unexpected end of input"), {
 			value: e.getUint16(t, !1),
 			nextOffset: t + 2
 		};
-		case 26: return t + 4 > e.byteLength && J("unexpected end of input"), {
+		case 26: return t + 4 > e.byteLength && Z("unexpected end of input"), {
 			value: e.getUint32(t, !1),
 			nextOffset: t + 4
 		};
 		case 27: {
-			t + 8 > e.byteLength && J("unexpected end of input");
+			t + 8 > e.byteLength && Z("unexpected end of input");
 			let n = e.getUint32(t, !1), r = e.getUint32(t + 4, !1);
 			return {
 				value: n * 4294967296 + r,
 				nextOffset: t + 8
 			};
 		}
-		default: J(`reserved additional info value: ${n}`);
+		default: Z(`reserved additional info value: ${n}`);
 	}
 }
-function mr(e, t, n, r, i, a) {
+function Br(e, t, n, r, i, a) {
 	let o = [], s = t;
 	for (;;) {
-		if (s >= e.byteLength && J(`unexpected end of indefinite ${i}`), e.getUint8(s) === 255) {
+		if (s >= e.byteLength && Z(`unexpected end of indefinite ${i}`), e.getUint8(s) === 255) {
 			s++;
 			break;
 		}
-		let t = X(e, s, n, r);
-		a(t.value) || J(`indefinite-length ${i} chunk must be a definite ${i}`), o.push(t.value), s = t.nextOffset;
+		let t = Q(e, s, n, r);
+		a(t.value) || Z(`indefinite-length ${i} chunk must be a definite ${i}`), o.push(t.value), s = t.nextOffset;
 	}
 	return {
 		chunks: o,
 		nextOffset: s
 	};
 }
-function hr(e, t, n, r) {
-	let i = sr(e);
-	t.has(i) && n.push(ar(`duplicate map key at offset ${e.start}`, e.start, r)), t.add(i);
+function Vr(e, t, n, r) {
+	let i = Nr(e);
+	t.has(i) && n.push(Ar(`duplicate map key at offset ${e.start}`, e.start, r)), t.add(i);
 }
-function X(e, t, n, r) {
-	let i = t, a = _r(e, t, n, r);
+function Q(e, t, n, r) {
+	let i = t, a = Ur(e, t, n, r);
 	return a.value.start = i, a.value.end = a.nextOffset, a;
 }
-function gr(e, t, n) {
+function Hr(e, t, n) {
 	return new Uint8Array(e.buffer, e.byteOffset + t, n).slice();
 }
-function _r(e, t, n, r) {
-	t >= e.byteLength && J("unexpected end of input");
+function Ur(e, t, n, r) {
+	t >= e.byteLength && Z("unexpected end of input");
 	let i = e.getUint8(t++), a = i >> 5, o = i & 31;
 	switch (a) {
 		case 0: {
-			let { value: n, nextOffset: r } = fr(e, t, o);
+			let { value: n, nextOffset: r } = Rr(e, t, o);
 			return {
-				value: new k(n, { encodingWidth: tr(o, n) }),
+				value: new I(n, { encodingWidth: Er(o, n) }),
 				nextOffset: r
 			};
 		}
 		case 1: {
-			let { value: n, nextOffset: r } = fr(e, t, o), i = tr(o, n);
+			let { value: n, nextOffset: r } = Rr(e, t, o), i = Er(o, n);
 			return {
-				value: new A(-1n - n, { encodingWidth: i }),
+				value: new L(-1n - n, { encodingWidth: i }),
 				nextOffset: r
 			};
 		}
 		case 2: {
 			if (o === 31) {
-				let { chunks: i, nextOffset: a } = mr(e, t, n, r, "byte string", (e) => e instanceof N);
+				let { chunks: i, nextOffset: a } = Br(e, t, n, r, "byte string", (e) => e instanceof B);
 				return {
-					value: new P(i),
+					value: new V(i),
 					nextOffset: a
 				};
 			}
-			let { value: i, nextOffset: a } = pr(e, t, o), s = nr(o, i);
-			return a + i > e.byteLength && J("byte string extends beyond input"), {
-				value: new N(new Uint8Array(e.buffer, e.byteOffset + a, i).slice(), { encodingWidth: s }),
+			let { value: i, nextOffset: a } = zr(e, t, o), s = Dr(o, i);
+			return a + i > e.byteLength && Z("byte string extends beyond input"), {
+				value: new B(new Uint8Array(e.buffer, e.byteOffset + a, i).slice(), { encodingWidth: s }),
 				nextOffset: a + i
 			};
 		}
 		case 3: {
 			if (o === 31) {
-				let { chunks: i, nextOffset: a } = mr(e, t, n, r, "text string", (e) => e instanceof G);
+				let { chunks: i, nextOffset: a } = Br(e, t, n, r, "text string", (e) => e instanceof Y);
 				return {
-					value: new F(i),
+					value: new H(i),
 					nextOffset: a
 				};
 			}
-			let { value: i, nextOffset: a } = pr(e, t, o), s = nr(o, i);
-			a + i > e.byteLength && J("text string extends beyond input");
-			let c = new Uint8Array(e.buffer, e.byteOffset + a, i), l, u, d = i < 64 ? dr(c, i) : void 0;
+			let { value: i, nextOffset: a } = zr(e, t, o), s = Dr(o, i);
+			a + i > e.byteLength && Z("text string extends beyond input");
+			let c = new Uint8Array(e.buffer, e.byteOffset + a, i), l, u, d = i < 64 ? Lr(c, i) : void 0;
 			if (d !== void 0) l = d;
 			else try {
-				l = rr.decode(c);
+				l = Or.decode(c);
 			} catch {
-				u = ar("invalid UTF-8 sequence in text string", a, n), l = ir.decode(c);
+				u = Ar("invalid UTF-8 sequence in text string", a, n), l = kr.decode(c);
 			}
-			let f = new G(l, { encodingWidth: s });
-			return u && or(f, u), {
+			let f = new Y(l, { encodingWidth: s });
+			return u && jr(f, u), {
 				value: f,
 				nextOffset: a + i
 			};
@@ -3169,25 +3493,25 @@ function _r(e, t, n, r) {
 			if (o === 31) {
 				let i = [], a = t;
 				for (;;) {
-					if (a >= e.byteLength && J("unexpected end of indefinite array"), e.getUint8(a) === 255) {
+					if (a >= e.byteLength && Z("unexpected end of indefinite array"), e.getUint8(a) === 255) {
 						a++;
 						break;
 					}
-					let t = X(e, a, n, r);
+					let t = Q(e, a, n, r);
 					i.push(t.value), a = t.nextOffset;
 				}
 				return {
-					value: new I(i, { indefiniteLength: !0 }),
+					value: new U(i, { indefiniteLength: !0 }),
 					nextOffset: a
 				};
 			}
-			let { value: i, nextOffset: a } = pr(e, t, o), s = nr(o, i), c = [], l = a;
+			let { value: i, nextOffset: a } = zr(e, t, o), s = Dr(o, i), c = [], l = a;
 			for (let t = 0; t < i; t++) {
-				let t = X(e, l, n, r);
+				let t = Q(e, l, n, r);
 				c.push(t.value), l = t.nextOffset;
 			}
 			return {
-				value: new I(c, { encodingWidth: s }),
+				value: new U(c, { encodingWidth: s }),
 				nextOffset: l
 			};
 		}
@@ -3195,149 +3519,149 @@ function _r(e, t, n, r) {
 			if (o === 31) {
 				let i = [], a = /* @__PURE__ */ new Set(), o = [], s = t;
 				for (;;) {
-					if (s >= e.byteLength && J("unexpected end of indefinite map"), e.getUint8(s) === 255) {
+					if (s >= e.byteLength && Z("unexpected end of indefinite map"), e.getUint8(s) === 255) {
 						s++;
 						break;
 					}
-					let t = X(e, s, n, r);
-					hr(t.value, a, o, n), s = t.nextOffset;
-					let c = X(e, s, n, r);
+					let t = Q(e, s, n, r);
+					Vr(t.value, a, o, n), s = t.nextOffset;
+					let c = Q(e, s, n, r);
 					s = c.nextOffset, i.push([t.value, c.value]);
 				}
-				let c = new L(i, { indefiniteLength: !0 });
-				for (let e of o) or(c, e);
+				let c = new W(i, { indefiniteLength: !0 });
+				for (let e of o) jr(c, e);
 				return {
 					value: c,
 					nextOffset: s
 				};
 			}
-			let { value: i, nextOffset: a } = pr(e, t, o), s = nr(o, i), c = [], l = /* @__PURE__ */ new Set(), u = [], d = a;
+			let { value: i, nextOffset: a } = zr(e, t, o), s = Dr(o, i), c = [], l = /* @__PURE__ */ new Set(), u = [], d = a;
 			for (let t = 0; t < i; t++) {
-				let t = X(e, d, n, r);
-				hr(t.value, l, u, n), d = t.nextOffset;
-				let i = X(e, d, n, r);
+				let t = Q(e, d, n, r);
+				Vr(t.value, l, u, n), d = t.nextOffset;
+				let i = Q(e, d, n, r);
 				d = i.nextOffset, c.push([t.value, i.value]);
 			}
-			let f = new L(c, { encodingWidth: s });
-			for (let e of u) or(f, e);
+			let f = new W(c, { encodingWidth: s });
+			for (let e of u) jr(f, e);
 			return {
 				value: f,
 				nextOffset: d
 			};
 		}
 		case 6: {
-			o === 31 && J("tags cannot use indefinite-length encoding");
-			let { value: i, nextOffset: a } = fr(e, t, o), s = tr(o, i), c = X(e, a, n, r);
+			o === 31 && Z("tags cannot use indefinite-length encoding");
+			let { value: i, nextOffset: a } = Rr(e, t, o), s = Er(o, i), c = Q(e, a, n, r);
 			for (let e of r) {
 				let t = e.parseTag(i, c.value, n);
-				if (t !== void 0) return t instanceof M && s !== void 0 && (t.encodingWidth = s), {
+				if (t !== void 0) return t instanceof z && s !== void 0 && (t.encodingWidth = s), {
 					value: t,
 					nextOffset: c.nextOffset
 				};
 			}
 			return {
-				value: new M(i, c.value, { encodingWidth: s }),
+				value: new z(i, c.value, { encodingWidth: s }),
 				nextOffset: c.nextOffset
 			};
 		}
 		case 7:
 			if (o <= 19) return {
-				value: new R(o),
+				value: new G(o),
 				nextOffset: t
 			};
 			if (o === 20) return {
-				value: new R(20),
+				value: new G(20),
 				nextOffset: t
 			};
 			if (o === 21) return {
-				value: new R(21),
+				value: new G(21),
 				nextOffset: t
 			};
 			if (o === 22) return {
-				value: new R(22),
+				value: new G(22),
 				nextOffset: t
 			};
 			if (o === 23) return {
-				value: new R(23),
+				value: new G(23),
 				nextOffset: t
 			};
 			if (o === 24) {
-				t + 1 > e.byteLength && J("unexpected end of input");
+				t + 1 > e.byteLength && Z("unexpected end of input");
 				let r = e.getUint8(t);
 				if (r < 32) {
-					let e = ar(`simple value ${r} must be encoded in initial byte (0–31 reserved for extended encoding)`, t - 1, n), i = new R(r);
-					return or(i, e), {
+					let e = Ar(`simple value ${r} must be encoded in initial byte (0–31 reserved for extended encoding)`, t - 1, n), i = new G(r);
+					return jr(i, e), {
 						value: i,
 						nextOffset: t + 1
 					};
 				}
 				return {
-					value: new R(r),
+					value: new G(r),
 					nextOffset: t + 1
 				};
 			}
 			if (o === 25) {
-				t + 2 > e.byteLength && J("unexpected end of input");
-				let n = C(e.getUint16(t, !1));
+				t + 2 > e.byteLength && Z("unexpected end of input");
+				let n = j(e.getUint16(t, !1));
 				return {
-					value: new j(n, {
+					value: new R(n, {
 						precision: "half",
-						rawBits: Number.isNaN(n) ? gr(e, t, 2) : void 0
+						rawBits: Number.isNaN(n) ? Hr(e, t, 2) : void 0
 					}),
 					nextOffset: t + 2
 				};
 			}
 			if (o === 26) {
-				t + 4 > e.byteLength && J("unexpected end of input");
+				t + 4 > e.byteLength && Z("unexpected end of input");
 				let n = e.getFloat32(t, !1);
 				return {
-					value: new j(n, {
+					value: new R(n, {
 						precision: "single",
-						rawBits: Number.isNaN(n) ? gr(e, t, 4) : void 0
+						rawBits: Number.isNaN(n) ? Hr(e, t, 4) : void 0
 					}),
 					nextOffset: t + 4
 				};
 			}
 			if (o === 27) {
-				t + 8 > e.byteLength && J("unexpected end of input");
+				t + 8 > e.byteLength && Z("unexpected end of input");
 				let n = e.getFloat64(t, !1);
 				return {
-					value: new j(n, {
+					value: new R(n, {
 						precision: "double",
-						rawBits: Number.isNaN(n) ? gr(e, t, 8) : void 0
+						rawBits: Number.isNaN(n) ? Hr(e, t, 8) : void 0
 					}),
 					nextOffset: t + 8
 				};
 			}
-			return o < 31 && J(`reserved additional info value in major type 7: ${o}`), J("unexpected break code outside indefinite-length item");
+			return o < 31 && Z(`reserved additional info value in major type 7: ${o}`), Z("unexpected break code outside indefinite-length item");
 	}
-	return J(`unknown major type: ${a}`);
+	return Z(`unknown major type: ${a}`);
 }
-function vr(e) {
+function Wr(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 yr(e, t) {
-	let n = vr(e), r = new DataView(n.buffer, n.byteOffset, n.byteLength), i = t?.offset ?? 0;
+function Gr(e, t) {
+	let n = Wr(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 = ur(t?.builtinExtensions), o = t?.extensions?.length ? [...t.extensions.filter((e) => e.parseTag !== void 0), ...a] : a, { value: s, nextOffset: c } = X(r, i, t, o);
+	let a = Ir(t?.builtinExtensions), o = t?.extensions?.length ? [...t.extensions.filter((e) => e.parseTag !== void 0), ...a] : a, { value: s, nextOffset: c } = Q(r, i, t, o);
 	if (!t?.allowTrailing && c !== r.byteLength) {
-		or(s, ar(`${r.byteLength - c} trailing byte(s) after end of CBOR item`, c, t));
+		jr(s, Ar(`${r.byteLength - c} trailing byte(s) after end of CBOR item`, c, t));
 		let e = {
 			strict: !1,
 			silent: !0
 		}, n = c;
-		for (; n < r.byteLength;) ({nextOffset: n} = X(r, n, e, o));
+		for (; n < r.byteLength;) ({nextOffset: n} = Q(r, n, e, o));
 	}
 	return s;
 }
 //#endregion
 //#region src/extensions/cbordata.ts
-var br = 24n, xr = {
-	tagNumbers: [br],
+var Kr = 24n, qr = {
+	tagNumbers: [Kr],
 	parseTag(e, t, n) {
-		if (e !== 24n || !(t instanceof N)) return;
+		if (e !== 24n || !(t instanceof B)) return;
 		let r = (t.end ?? t.value.length) - t.value.length, i = n ? {
 			extensions: n.extensions,
 			builtinExtensions: n.builtinExtensions,
@@ -3349,7 +3673,7 @@ var br = 24n, xr = {
 			silent: n.silent
 		} : void 0;
 		try {
-			return new M(br, new z([yr(t.value, i)], { encodingWidth: t.encodingWidth }));
+			return new z(Kr, new K([Gr(t.value, i)], { encodingWidth: t.encodingWidth }));
 		} catch (e) {
 			if (i?.strict !== !1) throw e;
 			let t = `tag 24 content is not valid CBOR: ${e instanceof Error ? e.message : String(e)}`, a = {
@@ -3363,156 +3687,156 @@ var br = 24n, xr = {
 };
 //#endregion
 //#region src/extensions/ellipsis.ts
-function Sr(e) {
-	return e instanceof V && !(e.content instanceof I);
+function Jr(e) {
+	return e instanceof q && !(e.content instanceof U);
 }
-function Cr(e) {
+function Yr(e) {
 	let t = !1, n = !1, r = !1, i;
 	for (let a of e) {
 		let e;
-		if (Sr(a)) e = !0, r = !0;
-		else if (a instanceof G) e = !1, t = !0;
-		else if (a instanceof N) e = !1, n = !0;
+		if (Jr(a)) e = !0, r = !0;
+		else if (a instanceof Y) e = !1, t = !0;
+		else if (a instanceof B) e = !1, n = !0;
 		else return !1;
 		if (e === i) return !1;
 		i = e;
 	}
 	return r && !(t && n);
 }
-var wr = {
-	tagNumbers: [Ke],
+var Xr = {
+	tagNumbers: [dt],
 	parseTag(e, t) {
 		if (e === 888n) {
-			if (t instanceof R && t.value === 22) return new V();
-			if (t instanceof I && Cr(t.items)) return new V(t.items);
+			if (t instanceof G && t.value === 22) return new q();
+			if (t instanceof U && Yr(t.items)) return new q(t.items);
 		}
 	}
-}, Tr = new TextEncoder(), Er = new TextDecoder("utf-8", { fatal: !0 }), Dr = new TextDecoder("utf-8", { fatal: !1 }), Or = Symbol("ellipsis");
-function kr(e) {
+}, Zr = new TextEncoder(), Qr = new TextDecoder("utf-8", { fatal: !0 }), $r = new TextDecoder("utf-8", { fatal: !1 }), ei = Symbol("ellipsis");
+function ti(e) {
 	let t = 0;
 	for (let n of e) t += n.length;
 	let n = new Uint8Array(t), r = 0;
 	for (let t of e) n.set(t, r), r += t.length;
 	return n;
 }
-function Ar(e, t, n) {
-	if (t instanceof B) {
-		Ar(e, t.inner, n);
+function ni(e, t, n) {
+	if (t instanceof ut) {
+		ni(e, t.inner, n);
 		return;
 	}
-	if (t instanceof V) {
-		if (t.content instanceof I) for (let r of t.content.items) Ar(e, r, n);
-		else n.push(Or);
+	if (t instanceof q) {
+		if (t.content instanceof U) for (let r of t.content.items) ni(e, r, n);
+		else n.push(ei);
 		return;
 	}
-	if (t instanceof G) {
-		n.push(Tr.encode(t.value));
+	if (t instanceof Y) {
+		n.push(Zr.encode(t.value));
 		return;
 	}
-	if (t instanceof N) {
+	if (t instanceof B) {
 		n.push(t.value);
 		return;
 	}
-	if (t instanceof F) {
-		n.push(Tr.encode(t.chunks.map((e) => e.value).join("")));
+	if (t instanceof H) {
+		n.push(Zr.encode(t.chunks.map((e) => e.value).join("")));
 		return;
 	}
-	if (t instanceof P) {
-		n.push(kr(t.chunks.map((e) => e.value)));
+	if (t instanceof V) {
+		n.push(ti(t.chunks.map((e) => e.value)));
 		return;
 	}
 	throw SyntaxError(`${e}<<...>> arguments must be (text or byte) strings or ellipses`);
 }
-function jr(e, t) {
+function ri(e, t) {
 	try {
-		return Er.decode(e);
+		return Qr.decode(e);
 	} catch {
 		let n = "t1 concatenation result is not valid UTF-8";
 		if (t) t(n);
 		else throw SyntaxError(n);
-		return Dr.decode(e);
+		return $r.decode(e);
 	}
 }
-function Mr(e, t, n) {
+function ii(e, t, n) {
 	let r = [];
-	for (let n of t) Ar(e, n, r);
+	for (let n of t) ni(e, n, r);
 	let i = e === "t1", a = [], o = !1, s = [], c = () => {
 		if (s.length === 0) return;
-		let e = kr(s);
-		s.length = 0, e.length !== 0 && a.push(i ? new G(jr(e, n)) : new N(e));
+		let e = ti(s);
+		s.length = 0, e.length !== 0 && a.push(i ? new Y(ri(e, n)) : new B(e));
 	};
-	for (let e of r) e === Or ? (c(), a[a.length - 1] instanceof V || (a.push(new V()), o = !0)) : s.push(e);
+	for (let e of r) e === ei ? (c(), a[a.length - 1] instanceof q || (a.push(new q()), o = !0)) : s.push(e);
 	if (!o) {
-		let e = kr(s);
-		return i ? new G(jr(e, n)) : new N(e);
+		let e = ti(s);
+		return i ? new Y(ri(e, n)) : new B(e);
 	}
-	return c(), a.length === 1 ? new V() : new V(a);
+	return c(), a.length === 1 ? new q() : new q(a);
 }
-function Nr(e) {
+function ai(e) {
 	return {
 		appStringPrefixes: [e],
 		preserveAppSeqSource: !0,
 		parseAppString(t, n, r) {
-			return Mr(e, [new G(n)], r);
+			return ii(e, [new Y(n)], r);
 		},
 		parseAppSequence(t, n, r) {
-			return Mr(e, n, r);
+			return ii(e, n, r);
 		}
 	};
 }
-var Pr = Nr("t1"), Fr = Nr("b1"), Ir = new TextEncoder(), Lr = new TextDecoder("utf-8", { fatal: !0 }), Rr = new TextDecoder("utf-8", { fatal: !1 });
-function zr(e) {
+var oi = ai("t1"), si = ai("b1"), ci = new TextEncoder(), li = new TextDecoder("utf-8", { fatal: !0 }), ui = new TextDecoder("utf-8", { fatal: !1 });
+function di(e) {
 	let t = 0;
 	for (let n of e) t += n.length;
 	let n = new Uint8Array(t), r = 0;
 	for (let t of e) n.set(t, r), r += t.length;
 	return n;
 }
-function Br(e, t, n) {
+function fi(e, t, n) {
 	let r = e === "ilts", i = [], a = [];
 	for (let o of t) {
-		if (o instanceof B && (o = o.inner), o instanceof V) throw SyntaxError(`${e}<<...>> cannot contain ellipses; there is no way to include an elision in an indefinite-length string`);
+		if (o instanceof ut && (o = o.inner), o instanceof q) throw SyntaxError(`${e}<<...>> cannot contain ellipses; there is no way to include an elision in an indefinite-length string`);
 		let t, s, c;
-		if (o instanceof G) t = o.value, c = o.encodingWidth;
-		else if (o instanceof N) s = o.value, c = o.encodingWidth;
-		else if (o instanceof F) t = o.chunks.map((e) => e.value).join("");
-		else if (o instanceof P) s = zr(o.chunks.map((e) => e.value));
+		if (o instanceof Y) t = o.value, c = o.encodingWidth;
+		else if (o instanceof B) s = o.value, c = o.encodingWidth;
+		else if (o instanceof H) t = o.chunks.map((e) => e.value).join("");
+		else if (o instanceof V) s = di(o.chunks.map((e) => e.value));
 		else throw SyntaxError(`${e}<<...>> arguments must be (text or byte) strings`);
 		if (r) {
 			let e;
 			if (t !== void 0) e = t;
 			else try {
-				e = Lr.decode(s);
+				e = li.decode(s);
 			} catch {
 				let t = "ilts chunk is not valid UTF-8";
 				if (n) n(t);
 				else throw SyntaxError(t);
-				e = Rr.decode(s);
+				e = ui.decode(s);
 			}
-			a.push(new G(e, c === void 0 ? void 0 : { encodingWidth: c }));
+			a.push(new Y(e, c === void 0 ? void 0 : { encodingWidth: c }));
 		} else {
-			let e = s ?? Ir.encode(t);
-			i.push(new N(e, c === void 0 ? void 0 : { encodingWidth: c }));
+			let e = s ?? ci.encode(t);
+			i.push(new B(e, c === void 0 ? void 0 : { encodingWidth: c }));
 		}
 	}
-	return r ? new F(a) : new P(i);
+	return r ? new H(a) : new V(i);
 }
-function Vr(e) {
+function pi(e) {
 	return {
 		appStringPrefixes: [e],
 		preserveAppSeqSource: !0,
 		parseAppString(t, n, r) {
-			return new B(Br(e, [new G(n)], r), `${e}${c(n)}`);
+			return new ut(fi(e, [new Y(n)], r), `${e}${ne(n)}`);
 		},
 		parseAppSequence(t, n, r) {
-			return Br(e, n, r);
+			return fi(e, n, r);
 		}
 	};
 }
-var Hr = Vr("ilbs"), Ur = Vr("ilts"), Wr = class extends j {
+var mi = pi("ilbs"), hi = pi("ilts"), gi = class extends R {
 	_bits;
 	constructor(e) {
-		super(C(e), { precision: "half" }), this._bits = e & 65535;
+		super(j(e), { precision: "half" }), this._bits = e & 65535;
 	}
 	_toCBOR() {
 		return new Uint8Array([
@@ -3521,7 +3845,7 @@ var Hr = Vr("ilbs"), Ur = Vr("ilts"), Wr = class extends j {
 			this._bits & 255
 		]);
 	}
-}, Gr = class extends j {
+}, _i = class extends R {
 	_raw;
 	constructor(e) {
 		super(new DataView(e.buffer, e.byteOffset).getFloat32(0, !1), { precision: "single" }), this._raw = e.slice();
@@ -3530,7 +3854,7 @@ var Hr = Vr("ilbs"), Ur = Vr("ilts"), Wr = class extends j {
 		let e = /* @__PURE__ */ new Uint8Array(5);
 		return e[0] = 250, e.set(this._raw, 1), e;
 	}
-}, Kr = class extends j {
+}, vi = class extends R {
 	_raw;
 	constructor(e) {
 		super(new DataView(e.buffer, e.byteOffset).getFloat64(0, !1), { precision: "double" }), this._raw = e.slice();
@@ -3540,13 +3864,13 @@ var Hr = Vr("ilbs"), Ur = Vr("ilts"), Wr = class extends j {
 		return e[0] = 251, e.set(this._raw, 1), e;
 	}
 };
-function qr(e) {
-	if (e.length === 2) return new Wr(e[0] << 8 | e[1]);
-	if (e.length === 4) return new Gr(e);
-	if (e.length === 8) return new Kr(e);
+function yi(e) {
+	if (e.length === 2) return new gi(e[0] << 8 | e[1]);
+	if (e.length === 4) return new _i(e);
+	if (e.length === 8) return new vi(e);
 	throw SyntaxError(`float'...' requires 4, 8, or 16 hex digits (2, 4, or 8 bytes); got ${e.length} bytes`);
 }
-function Jr(e) {
+function bi(e) {
 	let t = e >>> 15 & 1, n = e >>> 10 & 31, r = e & 1023, i;
 	if (n === 31) i = t << 31 | 2139095040 | r << 13;
 	else if (n === 0 && r === 0) i = t << 31;
@@ -3558,7 +3882,7 @@ function Jr(e) {
 	let a = /* @__PURE__ */ new Uint8Array(4);
 	return new DataView(a.buffer).setUint32(0, i >>> 0, !1), a;
 }
-function Yr(e) {
+function xi(e) {
 	let t = e >>> 15 & 1, n = e >>> 10 & 31, r = e & 1023, i = /* @__PURE__ */ new Uint8Array(8), a = new DataView(i.buffer);
 	if (n === 31) a.setUint32(0, (t << 31 | 2146435072 | r << 10) >>> 0, !1), a.setUint32(4, 0, !1);
 	else if (n === 0 && r === 0) a.setUint32(0, t << 31 >>> 0, !1), a.setUint32(4, 0, !1);
@@ -3569,7 +3893,7 @@ function Yr(e) {
 	} else a.setUint32(0, (t << 31 | n + 1008 << 20 | r << 10) >>> 0, !1), a.setUint32(4, 0, !1);
 	return i;
 }
-function Xr(e) {
+function Si(e) {
 	let t = new DataView(e.buffer, e.byteOffset).getUint32(0, !1), n = t >>> 31 & 1, r = t >>> 23 & 255, i = t & 8388607, a = /* @__PURE__ */ new Uint8Array(8), o = new DataView(a.buffer);
 	if (r === 255) o.setUint32(0, (n << 31 | 2146435072 | i >>> 3) >>> 0, !1), o.setUint32(4, (i & 7) << 29, !1);
 	else if (r === 0 && i === 0) o.setUint32(0, n << 31 >>> 0, !1), o.setUint32(4, 0, !1);
@@ -3579,49 +3903,49 @@ function Xr(e) {
 	}
 	return a;
 }
-function Zr(e, t, n) {
+function Ci(e, t, n) {
 	let r = e.length === 2 ? 1 : e.length === 4 ? 2 : 3;
 	if (r === 1) {
 		let n = e[0] << 8 | e[1];
-		if (t === 2) return new Gr(Jr(n));
-		if (t === 3) return new Kr(Yr(n));
+		if (t === 2) return new _i(bi(n));
+		if (t === 3) return new vi(xi(n));
 	}
 	if (r === 2) {
-		if (t === 3) return new Kr(Xr(e));
+		if (t === 3) return new vi(Si(e));
 		if (t === 1) {
-			let t = new DataView(e.buffer, e.byteOffset).getFloat32(0, !1), r = S(t);
-			return !Object.is(C(r), t) && !isNaN(t) && n("float'...' value cannot be exactly represented as float16 (_1)"), new Wr(r);
+			let t = new DataView(e.buffer, e.byteOffset).getFloat32(0, !1), r = ve(t);
+			return !Object.is(j(r), t) && !isNaN(t) && n("float'...' value cannot be exactly represented as float16 (_1)"), new gi(r);
 		}
 	}
 	if (r === 3) {
 		let r = new DataView(e.buffer, e.byteOffset).getFloat64(0, !1);
 		if (t === 1) {
-			let e = S(r);
-			return !Object.is(C(e), r) && !isNaN(r) && n("float'...' value cannot be exactly represented as float16 (_1)"), new Wr(e);
+			let e = ve(r);
+			return !Object.is(j(e), r) && !isNaN(r) && n("float'...' value cannot be exactly represented as float16 (_1)"), new gi(e);
 		}
 		if (t === 2) {
 			let e = Math.fround(r);
 			!Object.is(e, r) && !isNaN(r) && n("float'...' value cannot be exactly represented as float32 (_2)");
 			let t = /* @__PURE__ */ new Uint8Array(4);
-			return new DataView(t.buffer).setFloat32(0, e, !1), new Gr(t);
+			return new DataView(t.buffer).setFloat32(0, e, !1), new _i(t);
 		}
 	}
-	return qr(e);
+	return yi(e);
 }
-var Qr = {
+var wi = {
 	appStringPrefixes: ["float"],
-	parseAppString(e, t, r, i) {
-		let a = Ie(t);
+	parseAppString(e, t, n, r) {
+		let a = tt(t);
 		if (!/^[0-9a-fA-F]*$/.test(a)) throw SyntaxError("float'...' contains non-hex characters");
 		if (a.length % 2 != 0) throw SyntaxError(`float'...' hex content has odd length (${a.length} digits)`);
-		let o = n(a), s = i?.encodingWidth;
-		if (s === void 0) return qr(o);
+		let o = i(a), s = r?.encodingWidth;
+		if (s === void 0) return yi(o);
 		if (s !== 1 && s !== 2 && s !== 3) {
 			let e = `float'...' encoding indicator _${s} is not valid; use _1, _2, or _3`;
-			if (r) return r(e), qr(o);
+			if (n) return n(e), yi(o);
 			throw SyntaxError(e);
 		}
-		return s === (o.length === 2 ? 1 : o.length === 4 ? 2 : 3) ? qr(o) : Zr(o, s, r ?? ((e) => {
+		return s === (o.length === 2 ? 1 : o.length === 4 ? 2 : 3) ? yi(o) : Ci(o, s, n ?? ((e) => {
 			throw SyntaxError(e);
 		}));
 	},
@@ -3632,100 +3956,100 @@ var Qr = {
 			if (n) n(e);
 			else throw SyntaxError(e);
 		}
-		if (!(t[0] instanceof N)) throw SyntaxError("float<<...>> item must be a byte string");
-		return qr(t[0].value);
-	}
-}, $r = [
-	er,
-	xr,
-	wr
-], ei = [
-	rn,
-	wn,
-	Zn,
-	Pr,
-	Fr,
-	Hr,
-	Ur,
-	Qr
-], ti;
-function Z(e) {
-	return e === void 0 ? ti ??= [...$r, ...ei] : e === !1 ? $r : [...$r, ...e];
+		if (!(t[0] instanceof B)) throw SyntaxError("float<<...>> item must be a byte string");
+		return yi(t[0].value);
+	}
+}, Ti = [
+	Tr,
+	qr,
+	Xr
+], Ei = [
+	On,
+	Jn,
+	Sr,
+	oi,
+	si,
+	mi,
+	hi,
+	wi
+], Di;
+function Oi(e) {
+	return e === void 0 ? Di ??= [...Ti, ...Ei] : e === !1 ? Ti : [...Ti, ...e];
 }
 //#endregion
 //#region src/js/fromJS.ts
-var ni;
-function ri(e) {
+var ki;
+function Ai(e) {
 	if (e === void 0) {
-		if (ni) return ni;
-		let e = Z(void 0);
-		return ni = {
+		if (ki) return ki;
+		let e = Oi(void 0);
+		return ki = {
 			fromJS: e.filter((e) => e.fromJS !== void 0),
 			parseTag: e.filter((e) => e.parseTag !== void 0)
 		};
 	}
-	let t = Z(e);
+	let t = Oi(e);
 	return {
 		fromJS: t.filter((e) => e.fromJS !== void 0),
 		parseTag: t.filter((e) => e.parseTag !== void 0)
 	};
 }
-function ii(e) {
-	let t = e?.extensions, n = ri(e?.builtinExtensions);
+function ji(e) {
+	let t = e?.extensions, n = Ai(e?.builtinExtensions);
 	return t?.length ? {
 		fromJS: [...t.filter((e) => e.fromJS !== void 0), ...n.fromJS],
 		parseTag: [...t.filter((e) => e.parseTag !== void 0), ...n.parseTag]
 	} : n;
 }
-function ai(e, t) {
+function Mi(e, t) {
 	if (t?.replacer) {
-		let { replacer: n, ...r } = t, i = si(e, n, r.extensions, r.undefinedOmits, r.builtinExtensions);
-		return i === x ? R.UNDEFINED : ai(i, Object.keys(r).length > 0 ? r : void 0);
+		let { replacer: n, ...r } = t, i = Fi(e, n, r.extensions, r.undefinedOmits, r.builtinExtensions);
+		return i === A ? G.UNDEFINED : Mi(i, Object.keys(r).length > 0 ? r : void 0);
 	}
-	return Q(e, t, !0, ii(t));
+	return Ni(e, t, !0, ji(t));
 }
-function Q(e, t, n, r) {
+function Ni(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 && b.symbol in e) {
-		let n = e[b.symbol], i = Q(e, t, !1, r);
+	if (n && typeof e == "object" && e && k.symbol in e) {
+		let n = e[k.symbol], i = Ni(e, t, !1, r);
 		for (let e of r.parseTag) {
 			let t = e.parseTag(n, i);
 			if (t !== void 0) return t;
 		}
-		return new M(n, i);
-	}
-	if (e instanceof b.Null) return R.NULL;
-	if (e instanceof b.Undefined) return R.UNDEFINED;
-	if (e instanceof he) 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 it(e) : e < -18446744073709551616n ? new at(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 G(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)));
+		return new z(n, i);
+	}
+	if (e instanceof k.Null) return G.NULL;
+	if (e instanceof k.Undefined) return G.UNDEFINED;
+	if (e instanceof he) return new G(e.value);
+	if (e === null) return G.NULL;
+	if (e === void 0) return G.UNDEFINED;
+	if (e === !0) return G.TRUE;
+	if (e === !1) return G.FALSE;
+	if (typeof e == "bigint") return e > 18446744073709551615n ? new Ct(e) : e < -18446744073709551616n ? new wt(e) : e >= 0n ? new I(e) : new L(e);
+	if (typeof e == "number") return (t?.encodeIntegerAs ?? "int") === "int" && Number.isInteger(e) && !Object.is(e, -0) ? e >= 0 ? new I(BigInt(e)) : new L(BigInt(e)) : new R(e);
+	if (typeof e == "string") return new Y(e);
+	if (e instanceof Number || e instanceof Boolean || e instanceof String || Object.prototype.toString.call(e) === "[object BigInt]") return Ni(e.valueOf(), t, !1, r);
+	if (e instanceof ArrayBuffer || typeof SharedArrayBuffer < "u" && e instanceof SharedArrayBuffer) return new B(new Uint8Array(e));
+	if (ArrayBuffer.isView(e)) return e instanceof Uint8Array && t?.uint8ArrayAs === "array" ? new U(Array.from(e, (e) => new I(BigInt(e)))) : new B(new Uint8Array(e.buffer, e.byteOffset, e.byteLength));
+	if (e instanceof $) return new W([...e].map(([e, n]) => [Ni(e, t, !0, r), Ni(n, t, !0, r)]));
+	if (Array.isArray(e)) return new U(e.map((e) => Ni(e, t, !0, r)));
 	if (typeof e == "object") {
 		let n = [];
-		for (let [i, a] of Object.entries(e)) n.push([new G(i), Q(a, t, !0, r)]);
-		return new L(n);
+		for (let [i, a] of Object.entries(e)) n.push([new Y(i), Ni(a, t, !0, r)]);
+		return new W(n);
 	}
 	throw TypeError(`fromJS: unsupported value type: ${typeof e}`);
 }
-function oi(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 b.Null || e instanceof b.Undefined || e instanceof he;
+function Pi(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 k.Null || e instanceof k.Undefined || e instanceof he;
 }
-function si(e, t, n, r, i) {
-	let a = [...n ?? [], ...Z(i)].filter((e) => e.isJSType !== void 0);
+function Fi(e, t, n, r, i) {
+	let a = [...n ?? [], ...Oi(i)].filter((e) => e.isJSType !== void 0);
 	function o(e) {
-		return e === x || r === !0 && e === void 0;
+		return e === A || r === !0 && e === void 0;
 	}
 	if (Array.isArray(t)) {
 		let n = t.map(String);
@@ -3733,7 +4057,7 @@ function si(e, t, n, r, i) {
 			if (typeof e != "object" || !e) return e;
 			if (e instanceof $) return $.from(e, ([e, t]) => [e, r(t)]);
 			if (Array.isArray(e)) return e.map(r);
-			if (b.symbol in e || oi(e) || a.some((t) => t.isJSType(e))) return e;
+			if (k.symbol in e || Pi(e) || a.some((t) => t.isJSType(e))) return e;
 			let t = Object.getPrototypeOf(e);
 			if (t === Object.prototype || t === null) {
 				let t = e.toJSON;
@@ -3755,7 +4079,7 @@ function si(e, t, n, r, i) {
 			}
 		}
 		if (e = s.call(n, t, e), typeof e == "object" && e) {
-			if (b.symbol in e) return e;
+			if (k.symbol in e) return e;
 			if (e instanceof $) {
 				let t = new $();
 				for (let [n, r] of e) {
@@ -3768,7 +4092,7 @@ function si(e, t, n, r, i) {
 				let r = c(t, String(n), e);
 				return o(r) ? null : r;
 			});
-			if (oi(e) || a.some((t) => t.isJSType(e))) return e;
+			if (Pi(e) || a.some((t) => t.isJSType(e))) return e;
 			let t = {};
 			for (let n of Object.keys(e)) {
 				let r = c(e[n], n, e);
@@ -3786,7 +4110,7 @@ var $ = class extends Array {
 	toJSON() {
 		let e = {};
 		for (let [t, n] of this) {
-			let r = typeof t == "string" ? t : ai(t).toCDN();
+			let r = typeof t == "string" ? t : Mi(t).toCDN();
 			r === "__proto__" ? Object.defineProperty(e, r, {
 				value: n,
 				writable: !0,
@@ -3798,6 +4122,6 @@ var $ = class extends Array {
 	}
 };
 //#endregion
-export { N as A, se as B, He as C, I as D, L as E, k as F, b as H, O as I, D as L, j as M, Me as N, F as O, A as P, he as R, Ve as S, R as T, le as U, ce as V, at as _, Qr as a, B as b, Fr as c, Zn as d, wn as f, lt as g, G as h, ei as i, M as j, P as k, Pr as l, an as m, si as n, Hr as o, rn as p, ai as r, Ur as s, $ as t, yr as u, it as v, z as w, Ue as x, V as y, x as z };
+export { z as A, ce as B, K as C, H as D, U as E, F, le as H, P as I, he as L, Ze as M, L as N, V as O, I as P, A as R, st as S, W as T, k as V, wt as _, wi as a, ut as b, si as c, Sr as d, Jn as f, Ot as g, Y as h, Ei as i, R as j, B as k, oi as l, kn as m, Fi as n, mi as o, On as p, Mi as r, hi as s, $ as t, Gr as u, Ct as v, G as w, ot as x, q as y, se as z };
 
-//# sourceMappingURL=mapEntries-Ci_dppP6.js.map
+//# sourceMappingURL=mapEntries-CCLaJSaJ.js.map