@cbortech/cbor 0.26.4 → 0.26.6

package/dist/{mapEntries-hyNVtz5Z.js → mapEntries-Czxt-cmd.js}

@@ -98,7 +98,9 @@ var m = class {
 //#region src/cdn/serialize-utils.ts
 function _(e) {
 	let t = e?.indent;
-	return t === void 0 ? null : typeof t == "number" ? " ".repeat(t) : t;
+	if (t === void 0) return null;
+	let n = typeof t == "number" ? " ".repeat(t) : t;
+	return n === "" ? null : n;
 }
 function v(e, t) {
 	return e.repeat(t);
@@ -143,9 +145,7 @@ function ae(e, t = !1) {
 	};
 }
 function x(e) {
-	let { options: t, depth: n, openChar: r, closeChar: i, count: a } = e, o = _(t), s = t?.preserveComments, c = typeof s == "string" ? s : void 0, l = s && (te(e.node) || e.hasEntryComments());
-	o === null && l && (o = "  ");
-	let { inlineSep: u, multilineSep: d, trailSep: f, colSep: p } = ae(t, o === null), m = e.indefiniteLength ? "" : w(t, e.encodingWidth, () => C(BigInt(a))), h = m ? m + " " : "", g = e.indefiniteLength && (t?.encodingIndicators ?? "auto") !== "never", ee = (t) => e.indefiniteLength ? g ? a === 0 ? `${r}_ ${i}` : `${r}_ ${t}${i}` : `${r}${t}${i}` : `${r}${h}${t}${i}`;
+	let { options: t, depth: n, openChar: r, closeChar: i, count: a } = e, o = _(t), s = t?.preserveComments, c = typeof s == "string" ? s : void 0, l = o !== null && s && (te(e.node) || e.hasEntryComments()), { inlineSep: u, multilineSep: d, trailSep: f, colSep: p } = ae(t, o === null), m = e.indefiniteLength ? "" : w(t, e.encodingWidth, () => C(BigInt(a))), h = m ? m + " " : "", g = e.indefiniteLength && (t?.encodingIndicators ?? "auto") !== "never", ee = (t) => e.indefiniteLength ? g ? a === 0 ? `${r}_ ${i}` : `${r}_ ${t}${i}` : `${r}${t}${i}` : `${r}${h}${t}${i}`;
 	if (o === null || a === 0 && !l) {
 		let t = "";
 		for (let n = 0; n < a; n++) n > 0 && (t += u), t += e.renderEntry(n, p);
@@ -437,12 +437,12 @@ function Fe(e) {
 function Ie(e) {
 	return Pe.setFloat32(0, e, !1), Object.is(Pe.getFloat32(0, !1), e);
 }
-function Le(e) {
+function k(e) {
 	return Fe(e) ? "half" : Ie(e) ? "single" : "double";
 }
 //#endregion
 //#region src/ast/CborItem.ts
-var k = class e {
+var A = class e {
 	start;
 	end;
 	comments;
@@ -463,7 +463,7 @@ var k = class e {
 			...this._defaults,
 			...e
 		} : e, n = this._toCDN(t, 0), r = t?.preserveComments;
-		if (!r) return n;
+		if (!r || _(t) === null) return n;
 		let i = typeof r == "string" ? r : void 0, a = this.comments?.leading?.map((e) => b(e, i)) ?? [], o = this.comments?.trailing ?? [], s = o.length === 0 ? n : `${n} ${o.map((e) => b(e, i).trimEnd()).join(" ")}`;
 		return [...a, s].join("\n");
 	}
@@ -513,7 +513,7 @@ var k = class e {
 			comment: this._toCDN(n, 0)
 		}];
 	}
-}, A = class extends k {
+}, j = class extends A {
 	value;
 	encodingWidth;
 	constructor(e, t) {
@@ -537,7 +537,7 @@ var k = class e {
 		let t = e?.integerAs ?? "auto";
 		return t === "bigint" ? this.value : t === "number" || this.value <= BigInt(2 ** 53 - 1) ? Number(this.value) : this.value;
 	}
-}, j = class extends k {
+}, M = class extends A {
 	argument;
 	encodingWidth;
 	constructor(e, t) {
@@ -566,8 +566,8 @@ var k = class e {
 		let t = this.value, n = e?.integerAs ?? "auto";
 		return n === "bigint" ? t : n === "number" || t >= BigInt(-(2 ** 53 - 1)) ? Number(t) : t;
 	}
-}, Re = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(8));
-function ze(e) {
+}, Le = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(8));
+function Re(e) {
 	let t = e.startsWith("-"), n = e.slice(t ? 3 : 2), r = n.search(/[pP]/);
 	if (r === -1) throw SyntaxError(`EDN parse error: hex float missing 'p' exponent: ${e}`);
 	let i = n.slice(0, r), a = n.slice(r + 1);
@@ -585,20 +585,20 @@ function ze(e) {
 	let l = c * 2 ** o;
 	return t ? -l : l;
 }
-function Be(e) {
+function ze(e) {
 	if (isNaN(e)) return "NaN";
 	if (!isFinite(e)) return e > 0 ? "Infinity" : "-Infinity";
 	let t = Object.is(e, -0) || e < 0, n = Math.abs(e);
 	if (n === 0) return t ? "-0x0p+0" : "0x0p+0";
-	Re.setFloat64(0, n, !1);
-	let r = Re.getUint32(0, !1), i = Re.getUint32(4, !1), a = r >>> 20 & 2047, o = r & 1048575, s = i, c = (o.toString(16).padStart(5, "0") + s.toString(16).padStart(8, "0")).replace(/0+$/, ""), l = c === "" ? "" : `.${c}`, u, d;
+	Le.setFloat64(0, n, !1);
+	let r = Le.getUint32(0, !1), i = Le.getUint32(4, !1), a = r >>> 20 & 2047, o = r & 1048575, s = i, c = (o.toString(16).padStart(5, "0") + s.toString(16).padStart(8, "0")).replace(/0+$/, ""), l = c === "" ? "" : `.${c}`, u, d;
 	a === 0 ? (u = "0", d = -1022) : (u = "1", d = a - 1023);
 	let f = d >= 0 ? `+${d}` : `${d}`, p = `0x${u}${l}p${f}`;
 	return t ? `-${p}` : p;
 }
 //#endregion
 //#region src/ast/CborFloat.ts
-var M = class extends k {
+var N = class extends A {
 	value;
 	precision;
 	ednSource;
@@ -607,27 +607,28 @@ var M = class extends k {
 		super(), this.value = e, this.precision = t?.precision, this.rawBits = t?.rawBits;
 	}
 	_encodeTo(e, t) {
-		let n = this.precision ?? Le(this.value), r = Number.isNaN(this.value) ? this.rawBits : void 0;
+		let n = this.precision ?? k(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) {
-			if (n === "never") return this.ednSource.replace(/_[0-3i]$/, "");
+		if (e?.appStrings !== !1 && this.ednSource !== void 0 && (_(e) !== null || !/[\r\n]/.test(this.ednSource))) {
+			let e = this.ednSource;
+			if (n === "never") return e.replace(/_[0-3i]$/, "");
 			if (n === "always") {
-				if (/_[0-3i]$/.test(this.ednSource)) return this.ednSource;
-				let e = this.precision ?? Le(this.value), t = e === "half" ? "_1" : e === "single" ? "_2" : "_3";
-				return this.ednSource + t;
+				if (/_[0-3i]$/.test(e)) return e;
+				let t = this.precision ?? k(this.value);
+				return e + (t === "half" ? "_1" : t === "single" ? "_2" : "_3");
 			}
-			return this.ednSource;
+			return e;
 		}
-		let r = Le(this.value);
-		return (e?.floatFormat === "hex" ? Be(this.value) : be(this.value)) + xe(this.value, this.precision, r, n);
+		let r = k(this.value);
+		return (e?.floatFormat === "hex" ? ze(this.value) : be(this.value)) + xe(this.value, this.precision, r, n);
 	}
 	_toJS(e) {
 		return this.value;
 	}
-}, N = class extends k {
+}, P = class extends A {
 	tag;
 	content;
 	encodingWidth;
@@ -660,7 +661,7 @@ var M = class extends k {
 		let t = this.content._toJS(e);
 		return e?.stripTags ? t : m.set(t, this.tag);
 	}
-}, P = class extends k {
+}, F = class extends A {
 	indefiniteLength = !1;
 	value;
 	ednEncoding;
@@ -674,24 +675,25 @@ var M = class extends k {
 		O(e, 2, this.value.length, this.encodingWidth), e.writeBytes(this.value);
 	}
 	_toCDN(e, t) {
-		if (e?.preserveConcatenation && this.ednParts !== void 0 && this.ednParts.length > 1) {
-			let n = w(e, this.encodingWidth, () => C(BigInt(this.value.length))), r = e?.bstrEncoding ?? this.ednEncoding;
-			e?.appStrings === !1 && r !== "hex" && (r = "hex");
-			let i = this.ednParts.map((t) => e?.preserveByteString && t.source !== void 0 ? t.source : fe(t.bytes, r, e?.sqstr));
-			return i[i.length - 1] += n, ee(i, _(e), t);
-		}
-		if (e?.preserveByteString && this.ednSource !== void 0) {
+		let n = _(e);
+		if (e?.preserveConcatenation && n !== null && this.ednParts !== void 0 && this.ednParts.length > 1) {
+			let r = w(e, this.encodingWidth, () => C(BigInt(this.value.length))), i = e?.bstrEncoding ?? this.ednEncoding;
+			e?.appStrings === !1 && i !== "hex" && (i = "hex");
+			let a = this.ednParts.map((t) => e?.preserveByteString && t.source !== void 0 ? t.source : fe(t.bytes, i, e?.sqstr));
+			return a[a.length - 1] += r, ee(a, n, t);
+		}
+		if (e?.preserveByteString && this.ednSource !== void 0 && (n !== null || !/[\r\n]/.test(this.ednSource))) {
 			if (/_[0-3i]$/.test(this.ednSource)) return (e?.encodingIndicators ?? "auto") === "never" ? this.ednSource.replace(/_[0-3i]$/, "") : this.ednSource;
 			let t = w(e, this.encodingWidth, () => C(BigInt(this.value.length)));
 			return this.ednSource + t;
 		}
-		let n = w(e, this.encodingWidth, () => C(BigInt(this.value.length))), r = e?.bstrEncoding ?? this.ednEncoding;
-		return e?.appStrings === !1 && r !== "hex" && (r = "hex"), fe(this.value, r, e?.sqstr) + n;
+		let r = w(e, this.encodingWidth, () => C(BigInt(this.value.length))), i = e?.bstrEncoding ?? this.ednEncoding;
+		return e?.appStrings === !1 && i !== "hex" && (i = "hex"), fe(this.value, i, e?.sqstr) + r;
 	}
 	_toJS(e) {
 		return this.value;
 	}
-}, F = class extends k {
+}, I = class extends A {
 	indefiniteLength = !0;
 	chunks;
 	constructor(e) {
@@ -706,7 +708,7 @@ var M = class extends k {
 		if ((e?.encodingIndicators ?? "auto") === "never") {
 			let n = this.chunks.reduce((e, t) => e + t.value.length, 0), r = new Uint8Array(n), i = 0;
 			for (let e of this.chunks) r.set(e.value, i), i += e.value.length;
-			return new P(r)._toCDN(e, t);
+			return new F(r)._toCDN(e, t);
 		}
 		return this.chunks.length === 0 ? "''_" : x({
 			node: this,
@@ -741,7 +743,7 @@ var M = class extends k {
 		for (let e of this.chunks) n.set(e.value, r), r += e.value.length;
 		return n;
 	}
-}, I = class extends k {
+}, L = class extends A {
 	indefiniteLength = !0;
 	chunks;
 	constructor(e) {
@@ -753,7 +755,7 @@ var M = class extends k {
 		e.writeByte(255);
 	}
 	_toCDN(e, t) {
-		return (e?.encodingIndicators ?? "auto") === "never" ? new H(this.chunks.map((e) => e.value).join(""))._toCDN(e, t) : this.chunks.length === 0 ? "\"\"_" : x({
+		return (e?.encodingIndicators ?? "auto") === "never" ? new U(this.chunks.map((e) => e.value).join(""))._toCDN(e, t) : this.chunks.length === 0 ? "\"\"_" : x({
 			node: this,
 			options: e,
 			depth: t,
@@ -784,7 +786,7 @@ var M = class extends k {
 	_toJS(e) {
 		return this.chunks.map((e) => e.value).join("");
 	}
-}, L = class extends k {
+}, R = class extends A {
 	items;
 	indefiniteLength;
 	encodingWidth;
@@ -856,7 +858,7 @@ var M = class extends k {
 		}
 		return r;
 	}
-}, R = class extends k {
+}, z = class extends A {
 	entries;
 	indefiniteLength;
 	encodingWidth;
@@ -898,7 +900,7 @@ var M = class extends k {
 			entryLeadingNode: (e) => this.entries[e][0],
 			entryTrailing: (e, t) => {
 				let [n, r] = this.entries[e];
-				return Ve([
+				return Be([
 					...n.comments?.trailing ?? [],
 					...r.comments?.leading ?? [],
 					...r.comments?.trailing ?? []
@@ -939,13 +941,13 @@ var M = class extends k {
 			}
 			return n;
 		};
-		return e?.mapAs === "entries" ? n() : e?.mapAs === "object" || this.entries.every(([e]) => e instanceof H) ? (() => {
+		return e?.mapAs === "entries" ? n() : e?.mapAs === "object" || this.entries.every(([e]) => e instanceof U) ? (() => {
 			let n = e ? {
 				...e,
 				reviver: void 0
 			} : void 0, r = {};
 			for (let [e, t] of this.entries) {
-				let i = e instanceof H ? e.value : e.toCDN(), a = t._toJS(n);
+				let i = e instanceof U ? e.value : e.toCDN(), a = t._toJS(n);
 				i === "__proto__" ? Object.defineProperty(r, i, {
 					value: a,
 					writable: !0,
@@ -957,10 +959,10 @@ var M = class extends k {
 			let i = /* @__PURE__ */ new Map();
 			for (let e = 0; e < this.entries.length; e++) {
 				let [t] = this.entries[e];
-				i.set(t instanceof H ? t.value : t.toCDN(), e);
+				i.set(t instanceof U ? t.value : t.toCDN(), e);
 			}
 			for (let n = 0; n < this.entries.length; n++) {
-				let [a, o] = this.entries[n], s = a instanceof H ? a.value : a.toCDN();
+				let [a, o] = this.entries[n], s = a instanceof U ? a.value : a.toCDN();
 				if (i.get(s) !== n) continue;
 				let c = o._toJS(e), l = t.call(r, s, c);
 				l === h || e?.undefinedOmits && l === void 0 ? delete r[s] : s === "__proto__" ? Object.defineProperty(r, s, {
@@ -974,12 +976,12 @@ var M = class extends k {
 		})() : n();
 	}
 };
-function Ve(e, t) {
+function Be(e, t) {
 	return e.length === 0 ? "" : " " + e.map((e) => b(e, t).trimEnd()).join(" ");
 }
 //#endregion
 //#region src/ast/CborSimple.ts
-var z = class e extends k {
+var B = class e extends A {
 	value;
 	constructor(e) {
 		if (super(), !Number.isInteger(e) || e < 0 || e > 255) throw RangeError("CborSimple value must be an integer in 0–255");
@@ -1014,7 +1016,7 @@ var z = class e extends k {
 			default: return new g(this.value);
 		}
 	}
-}, He = class extends k {
+}, Ve = class extends A {
 	items;
 	encodingWidth;
 	constructor(e, t) {
@@ -1052,17 +1054,59 @@ var z = class e extends k {
 	_toJS(e) {
 		return this._content();
 	}
-}, Ue = 999n, We = class extends N {
+};
+//#endregion
+//#region src/utils/base64.ts
+function He(e, t) {
+	let n = e.indexOf("="), r = n >= 0 ? e.slice(0, n) : e, i = n >= 0 ? e.slice(n) : "";
+	if (/[^A-Za-z0-9+/\-_]/.test(r)) {
+		let e = [...r].find((e) => !/[A-Za-z0-9+/\-_]/.test(e)) ?? "";
+		throw SyntaxError(`invalid character ${JSON.stringify(e)} in base64 data`);
+	}
+	if (i && !/^=+$/.test(i)) throw SyntaxError("invalid character after base64 '=' padding");
+	let a = r.length % 4;
+	if (a === 1) throw SyntaxError(`invalid base64 length: ${r.length} data characters (length mod 4 = 1 is never valid)`);
+	let o = a === 0 ? 0 : 4 - a;
+	if (i.length > o) {
+		let e = `base64 has ${i.length} '=' character${i.length > 1 ? "s" : ""} but the data length (${r.length}) requires at most ${o}`;
+		if (t) t(e);
+		else throw SyntaxError(e);
+	}
+	if (i.length > 0 && i.length < o) {
+		let e = `base64 has ${i.length} '=' character${i.length > 1 ? "s" : ""} but needs exactly ${o} — use full padding or no padding at all`;
+		if (t) t(e);
+		else throw SyntaxError(e);
+	}
+	if (a !== 0 && r.length > 0) {
+		let e = r[r.length - 1].replace("-", "+").replace("_", "/"), n = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".indexOf(e);
+		if (n >= 0 && n & (a === 2 ? 15 : 3)) {
+			let e = "base64 has non-zero trailing bits in the final quantum (RFC 4648 §3.5)";
+			if (t) t(e);
+			else throw SyntaxError(e);
+		}
+	}
+	let s = r.replace(/-/g, "+").replace(/_/g, "/") + "=".repeat(o);
+	if (typeof Uint8Array.fromBase64 == "function") return Uint8Array.fromBase64(s, {
+		alphabet: "base64",
+		lastChunkHandling: "loose"
+	});
+	let c = atob(s), l = new Uint8Array(c.length);
+	for (let e = 0; e < c.length; e++) l[e] = c.charCodeAt(e);
+	return l;
+}
+//#endregion
+//#region src/ast/CborUnresolvedAppExt.ts
+var Ue = 999n, We = class extends P {
 	constructor(e, t) {
-		let n = t.length === 1 && t[0] instanceof H ? t[0] : new L(t);
-		super(Ue, new L([new H(e), n]));
+		let n = t.length === 1 && t[0] instanceof U ? t[0] : new R(t);
+		super(Ue, new R([new U(e), n]));
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
 		let n = this.content, r = n.items[0].value, i = n.items[1];
-		return i instanceof H ? `${r}${ve(i.value)}` : `${r}<<${i.items.map((n) => n._toCDN(e, t)).join(", ")}>>`;
+		return i instanceof U ? `${r}${ve(i.value)}` : `${r}<<${i.items.map((n) => n._toCDN(e, t)).join(", ")}>>`;
 	}
-}, Ge = class extends k {
+}, Ge = class extends A {
 	inner;
 	ednSource;
 	constructor(e, t) {
@@ -1076,19 +1120,19 @@ var z = class e extends k {
 	}
 	_toCDN(e, t) {
 		let n = e?.encodingIndicators ?? "auto";
-		return e?.appStrings !== !1 && n === "auto" ? this.ednSource : this.inner._toCDN(e, t);
+		return e?.appStrings !== !1 && n === "auto" && (_(e) !== null || !/[\r\n]/.test(this.ednSource)) ? this.ednSource : this.inner._toCDN(e, t);
 	}
 	_toJS(e) {
 		return this.inner._toJS(e);
 	}
-}, Ke = 888n, B = class extends N {
+}, Ke = 888n, V = class extends P {
 	constructor(e) {
-		e === void 0 ? super(Ke, z.NULL) : super(Ke, new L(e));
+		e === void 0 ? super(Ke, B.NULL) : super(Ke, new R(e));
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
-		if (this.content instanceof z) return "...";
-		if (this.content instanceof L) {
+		if (this.content instanceof B) return "...";
+		if (this.content instanceof R) {
 			let n = this.content.items.map((n) => n._toCDN(e, t));
 			return n.length === 0 ? "" : ee(n, _(e), t);
 		}
@@ -1109,11 +1153,11 @@ function Qe(e) {
 	for (let n of e) t = t << 8n | BigInt(n);
 	return t;
 }
-var $e = class extends N {
+var $e = class extends P {
 	bigValue;
 	constructor(e) {
 		if (e <= Ye) throw RangeError(`CborBigUint value ${e} fits in CborUint; use CborUint instead`);
-		super(qe, new P(Ze(e))), this.bigValue = e;
+		super(qe, new F(Ze(e))), this.bigValue = e;
 	}
 	_toCDN(e, t) {
 		return this.bigValue.toString();
@@ -1121,11 +1165,11 @@ var $e = class extends N {
 	_toJS(e) {
 		return this.bigValue;
 	}
-}, et = class extends N {
+}, et = class extends P {
 	bigValue;
 	constructor(e) {
 		if (e >= Xe) throw RangeError(`CborBigNint value ${e} fits in CborNint; use CborNint instead`);
-		super(Je, new P(Ze(-1n - e))), this.bigValue = e;
+		super(Je, new F(Ze(-1n - e))), this.bigValue = e;
 	}
 	_toCDN(e, t) {
 		return this.bigValue.toString();
@@ -1138,8 +1182,8 @@ function it(e, t) {
 	let n = new a(e, {
 		offset: t?.offset,
 		skipRS: t?._skipRS
-	}), r = new gt(n, t ?? {}).parse();
-	return t?.preserveComments && lt(r, n.comments, e), r;
+	}), r = new ht(n, t ?? {}).parse();
+	return t?.preserveComments && ct(r, n.comments, e), r;
 }
 function at(e) {
 	let t = e, n;
@@ -1175,53 +1219,16 @@ function st(e, t) {
 	};
 	let n = e, r;
 	return e.endsWith("_1") ? (r = "half", n = e.slice(0, -2)) : e.endsWith("_2") ? (r = "single", n = e.slice(0, -2)) : e.endsWith("_3") && (r = "double", n = e.slice(0, -2)), /^-?0[xX]/.test(n) ? {
-		value: ze(n),
+		value: Re(n),
 		precision: r
 	} : {
 		value: parseFloat(n),
 		precision: r
 	};
 }
-function ct(e, t) {
-	let n = e.indexOf("="), r = n >= 0 ? e.slice(0, n) : e, i = n >= 0 ? e.slice(n) : "";
-	if (/[^A-Za-z0-9+/\-_]/.test(r)) {
-		let e = [...r].find((e) => !/[A-Za-z0-9+/\-_]/.test(e)) ?? "";
-		throw SyntaxError(`invalid character ${JSON.stringify(e)} in base64 data`);
-	}
-	if (i && !/^=+$/.test(i)) throw SyntaxError("invalid character after base64 '=' padding");
-	let a = r.length % 4;
-	if (a === 1) throw SyntaxError(`invalid base64 length: ${r.length} data characters (length mod 4 = 1 is never valid)`);
-	let o = a === 0 ? 0 : 4 - a;
-	if (i.length > o) {
-		let e = `base64 has ${i.length} '=' character${i.length > 1 ? "s" : ""} but the data length (${r.length}) requires at most ${o}`;
-		if (t) t(e);
-		else throw SyntaxError(e);
-	}
-	if (i.length > 0 && i.length < o) {
-		let e = `base64 has ${i.length} '=' character${i.length > 1 ? "s" : ""} but needs exactly ${o} — use full padding or no padding at all`;
-		if (t) t(e);
-		else throw SyntaxError(e);
-	}
-	if (a !== 0 && r.length > 0) {
-		let e = r[r.length - 1].replace("-", "+").replace("_", "/"), n = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".indexOf(e);
-		if (n >= 0 && n & (a === 2 ? 15 : 3)) {
-			let e = "base64 has non-zero trailing bits in the final quantum (RFC 4648 §3.5)";
-			if (t) t(e);
-			else throw SyntaxError(e);
-		}
-	}
-	let s = r.replace(/-/g, "+").replace(/_/g, "/") + "=".repeat(o);
-	if (typeof Uint8Array.fromBase64 == "function") return Uint8Array.fromBase64(s, {
-		alphabet: "base64",
-		lastChunkHandling: "loose"
-	});
-	let c = atob(s), l = new Uint8Array(c.length);
-	for (let e = 0; e < c.length; e++) l[e] = c.charCodeAt(e);
-	return l;
-}
-function lt(e, t, n) {
+function ct(e, t, n) {
 	if (t.length === 0) return;
-	let r = ut(e), i = ft(n), a = [...r].sort((e, t) => e.start - t.start || t.end - e.end), o = [...r].sort((e, t) => e.end - t.end || e.start - t.start), s = [...t].sort((e, t) => e.start - t.start), c = [], l = 0;
+	let r = lt(e), i = dt(n), a = [...r].sort((e, t) => e.start - t.start || t.end - e.end), o = [...r].sort((e, t) => e.end - t.end || e.start - t.start), s = [...t].sort((e, t) => e.start - t.start), c = [], l = 0;
 	for (let t of s) {
 		let r = { ...t }, s = 0, u = o.length;
 		for (; s < u;) {
@@ -1230,7 +1237,7 @@ function lt(e, t, n) {
 		}
 		let d = s > 0 ? o[s - 1] : void 0, f = d ? n.slice(d.end, t.start) : "";
 		if (d && i(d.end) === t.line && !f.includes(":")) {
-			dt(d.node, "trailing", r);
+			ut(d.node, "trailing", r);
 			continue;
 		}
 		for (; l < a.length && a[l].start < t.start;) {
@@ -1246,38 +1253,38 @@ function lt(e, t, n) {
 		}
 		let m = s < a.length ? a[s] : void 0;
 		if ((!p || m && m.end <= p.end) && m) {
-			dt(m.node, "leading", r);
+			ut(m.node, "leading", r);
 			continue;
 		}
-		dt(p?.node ?? e, "dangling", r);
+		ut(p?.node ?? e, "dangling", r);
 	}
 }
-function ut(e) {
+function lt(e) {
 	let t = [], n = (e) => {
 		if (e.start !== void 0 && e.end !== void 0 && t.push({
 			node: e,
 			start: e.start,
 			end: e.end
-		}), e instanceof L || e instanceof He) {
+		}), e instanceof R || e instanceof Ve) {
 			for (let t of e.items) n(t);
 			return;
 		}
-		if (e instanceof R) {
+		if (e instanceof z) {
 			for (let [t, r] of e.entries) n(t), n(r);
 			return;
 		}
-		if (e instanceof F || e instanceof I) {
+		if (e instanceof I || e instanceof L) {
 			for (let t of e.chunks) n(t);
 			return;
 		}
-		e instanceof N && n(e.content);
+		e instanceof P && n(e.content);
 	};
 	return n(e), t;
 }
-function dt(e, t, n) {
+function ut(e, t, n) {
 	e.comments ??= {}, e.comments[t] ??= [], e.comments[t].push(n);
 }
-function ft(e) {
+function dt(e) {
 	let t = [0];
 	for (let n = 0; n < e.length; n++) e[n] === "\n" && t.push(n + 1);
 	return (n) => {
@@ -1291,25 +1298,25 @@ function ft(e) {
 		return a + 1;
 	};
 }
-var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'extensions' option (extensions: [${e}])`, mt = (e, t) => `install ${t}, import { ${e} } from '${t}', and pass it via the 'extensions' option (extensions: [${e}])`, V = (e) => `'${e}' is a default built-in extension that was excluded via the 'builtinExtensions' option; add it back to that array (or omit 'builtinExtensions' to use the default set)`, ht = /* @__PURE__ */ new Map([
-	["b32", pt("b32")],
-	["h32", pt("h32")],
-	["same", pt("same")],
-	["hash", mt("hash", "@cbortech/hash-extension")],
-	["uuid", mt("uuid", "@cbortech/uuid-extension")],
-	["UUID", mt("uuid", "@cbortech/uuid-extension")],
-	["dt", V("dt")],
-	["DT", V("dt")],
-	["ip", V("ip")],
-	["IP", V("ip")],
-	["cri", V("cri")],
-	["CRI", V("cri")],
-	["t1", V("t1")],
-	["b1", V("b1")],
-	["ilbs", V("ilbs")],
-	["ilts", V("ilts")],
-	["float", V("float")]
-]), gt = class {
+var ft = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'extensions' option (extensions: [${e}])`, pt = (e, t) => `install ${t}, import { ${e} } from '${t}', and pass it via the 'extensions' option (extensions: [${e}])`, H = (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)`, mt = /* @__PURE__ */ new Map([
+	["b32", ft("b32")],
+	["h32", ft("h32")],
+	["same", ft("same")],
+	["hash", pt("hash", "@cbortech/hash-extension")],
+	["uuid", pt("uuid", "@cbortech/uuid-extension")],
+	["UUID", pt("uuid", "@cbortech/uuid-extension")],
+	["dt", H("dt")],
+	["DT", H("dt")],
+	["ip", H("ip")],
+	["IP", H("ip")],
+	["cri", H("cri")],
+	["CRI", H("cri")],
+	["t1", H("t1")],
+	["b1", H("b1")],
+	["ilbs", H("ilbs")],
+	["ilts", H("ilts")],
+	["float", H("float")]
+]), ht = class {
 	t;
 	_options;
 	extByPrefix;
@@ -1370,12 +1377,12 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 			case "BYTES_HEX":
 			case "SQSTR":
 			case "BYTES_B64": return this.t.consume(), this._parseBytesConcat(this._decodeBytesToken(e), e.type, e.raw);
-			case "EMPTY_INDEF_BYTES": return this.t.consume(), new F([]);
-			case "EMPTY_INDEF_TEXT": return this.t.consume(), new I([]);
-			case "TRUE": return this.t.consume(), new z(21);
-			case "FALSE": return this.t.consume(), new z(20);
-			case "NULL": return this.t.consume(), new z(22);
-			case "UNDEFINED": return this.t.consume(), new z(23);
+			case "EMPTY_INDEF_BYTES": return this.t.consume(), new I([]);
+			case "EMPTY_INDEF_TEXT": return this.t.consume(), new L([]);
+			case "TRUE": return this.t.consume(), new B(21);
+			case "FALSE": return this.t.consume(), new B(20);
+			case "NULL": return this.t.consume(), new B(22);
+			case "UNDEFINED": return this.t.consume(), new B(23);
 			case "SIMPLE": return this.parseSimple();
 			case "LBRACKET": return this.parseArray();
 			case "LBRACE": return this.parseMap();
@@ -1390,21 +1397,21 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 				}
 				let r = this.extByPrefix.get(e.appPrefix);
 				if (!r?.parseAppString) {
-					if (r || this._hintMissingExtension(e.appPrefix, e), this.unresolvedExtension === "cpa999") return new We(e.appPrefix, [new H(e.value)]);
+					if (r || this._hintMissingExtension(e.appPrefix, e), this.unresolvedExtension === "cpa999") return new We(e.appPrefix, [new U(e.value)]);
 					this._fail(`unknown app-string extension: ${JSON.stringify(e.appPrefix)}`, e);
 				}
 				{
 					let i = this._pendingWarnings.length;
 					try {
 						let i = r.parseAppString(e.appPrefix, e.value, this._extOnError(e), t === void 0 ? void 0 : { encodingWidth: t });
-						return t !== void 0 && this._applyEiToResult(i, t, e), i instanceof P && Object.getPrototypeOf(i) === P.prototype && i.ednSource === void 0 ? new P(i.value, {
+						return t !== void 0 && this._applyEiToResult(i, t, e), i instanceof F && Object.getPrototypeOf(i) === F.prototype && i.ednSource === void 0 ? new F(i.value, {
 							ednEncoding: i.ednEncoding,
 							encodingWidth: i.encodingWidth,
 							ednSource: e.raw + n
-						}) : (i instanceof M && i.ednSource === void 0 && (i.ednSource = e.raw + n), i);
+						}) : (i instanceof N && i.ednSource === void 0 && (i.ednSource = e.raw + n), i);
 					} catch (t) {
 						if (this._options.strict !== !1) throw t;
-						return this._pendingWarnings.length === i && this._warn(t instanceof Error ? t.message : String(t), e), new We(e.appPrefix, [new H(e.value)]);
+						return this._pendingWarnings.length === i && this._warn(t instanceof Error ? t.message : String(t), e), new We(e.appPrefix, [new U(e.value)]);
 					}
 				}
 			}
@@ -1432,7 +1439,7 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 						let a = i.parseAppSequence(e.appPrefix, t, this._extOnError(e));
 						n !== void 0 && this._applyEiToResult(a, n, r ?? e);
 						let o = this.t.source.slice(e.offset, this.t.lastEndOffset);
-						if (a instanceof M) a.ednSource === void 0 && (a.ednSource = o);
+						if (a instanceof N) a.ednSource === void 0 && (a.ednSource = o);
 						else if (i.preserveAppSeqSource) return new Ge(a, o);
 						return a;
 					} catch (n) {
@@ -1442,10 +1449,10 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 				}
 			}
 			case "ELLIPSIS": {
-				if (this.t.consume(), this.t.peek().type !== "PLUS") return new B();
-				let e = [new B()];
+				if (this.t.consume(), this.t.peek().type !== "PLUS") return new V();
+				let e = [new V()];
 				for (; this.t.peek().type === "PLUS";) this.t.consume(), e.push(this.parseValue());
-				return new B(e);
+				return new V(e);
 			}
 			case "BYTES_HEX_ELIDED": return this.t.consume(), this._parseHexElidedConcat(e);
 			default: this._fail(`unexpected token: ${JSON.stringify(e.value)}`, e);
@@ -1459,17 +1466,17 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 			let t = i >= 0n ? i : -(i + 1n);
 			r = this._validateEncodingFit(t, r, e);
 		}
-		let a = i >= 0n ? new A(i, r === void 0 ? void 0 : { encodingWidth: r }) : new j(i, r === void 0 ? void 0 : { encodingWidth: r });
+		let a = i >= 0n ? new j(i, r === void 0 ? void 0 : { encodingWidth: r }) : new M(i, r === void 0 ? void 0 : { encodingWidth: r });
 		if (this.t.peek().type === "LPAREN") {
-			a instanceof A || this._fail("tag number must be non-negative", e), this.t.consume();
+			a instanceof j || this._fail("tag number must be non-negative", e), this.t.consume();
 			let t = this._pendingWarnings.splice(0), n = this.parseValue();
 			this.expect("RPAREN");
 			let i = a.value, o = this.extByTag.get(i);
 			if (o?.parseTag) {
 				let e = o.parseTag(i, n);
-				if (e !== void 0) return e instanceof N && r !== void 0 && e.encodingWidth === void 0 && (e.encodingWidth = r), t.length > 0 && (e.warnings ??= [], e.warnings.push(...t)), e;
+				if (e !== void 0) return e instanceof P && r !== void 0 && e.encodingWidth === void 0 && (e.encodingWidth = r), t.length > 0 && (e.warnings ??= [], e.warnings.push(...t)), e;
 			}
-			let s = new N(i, n, r === void 0 ? void 0 : { encodingWidth: r });
+			let s = new P(i, n, r === void 0 ? void 0 : { encodingWidth: r });
 			return t.length > 0 && (s.warnings ??= [], s.warnings.push(...t)), s;
 		}
 		return a;
@@ -1480,16 +1487,16 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 			let e = r === "half" ? E(T(n)) : Math.fround(n);
 			Object.is(n, e) || isNaN(n) && isNaN(e) || t(`${n} cannot be exactly represented as ${r === "half" ? "f16 (_1)" : "f32 (_2)"}; use _3 or remove the indicator`);
 		}
-		return new M(n, r === void 0 ? void 0 : { precision: r });
+		return new N(n, r === void 0 ? void 0 : { precision: r });
 	}
 	parseString() {
 		let e = this.t.consume();
 		if (this.t.peek().type !== "PLUS") {
 			let t = this.consumeEncodingIndicator(() => BigInt(tt.encode(e.value).length));
-			return e.type === "RAWSTRING" ? new H(e.value, {
+			return e.type === "RAWSTRING" ? new U(e.value, {
 				ednSource: e.raw,
 				...t === void 0 ? {} : { encodingWidth: t }
-			}) : new H(e.value, t === void 0 ? void 0 : { encodingWidth: t });
+			}) : new U(e.value, t === void 0 ? void 0 : { encodingWidth: t });
 		}
 		let t = !1, n = [e.type === "RAWSTRING" ? {
 			text: e.value,
@@ -1505,7 +1512,7 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 		}
 		if (!t) {
 			let e = n.map((e) => "text" in e ? e.text : ""), t = n.map((e) => "text" in e ? e.source : void 0), r = e.join(""), i = this.consumeEncodingIndicator(() => BigInt(tt.encode(r).length));
-			return new H(r, {
+			return new U(r, {
 				ednParts: e,
 				...t.some((e) => e !== void 0) ? { ednPartSources: t } : {},
 				...i === void 0 ? {} : { encodingWidth: i }
@@ -1515,15 +1522,15 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 			let e = i.map((e) => e.text), t = e.join("");
 			if (t !== "") {
 				let n = i.map((e) => e.source);
-				r.push(new H(t, {
+				r.push(new U(t, {
 					ednParts: e,
 					...n.some((e) => e !== void 0) ? { ednPartSources: n } : {}
 				}));
 			}
 			i.length = 0;
 		};
-		for (let e of n) "ellipsis" in e ? (a(), r.push(new B())) : i.push(e);
-		return a(), new B(r);
+		for (let e of n) "ellipsis" in e ? (a(), r.push(new V())) : i.push(e);
+		return a(), new V(r);
 	}
 	_isBytesToken(e) {
 		return e === "BYTES_HEX" || e === "SQSTR" || e === "BYTES_B64";
@@ -1545,7 +1552,7 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 			}
 			case "BYTES_HEX": return this._hexToBytes(e.value, e);
 			case "BYTES_B64": try {
-				return ct(e.value, t);
+				return He(e.value, t);
 			} catch (t) {
 				if (t instanceof r || !(t instanceof SyntaxError)) throw t;
 				this._fail(t.message, e);
@@ -1567,7 +1574,7 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 	_parseBytesConcat(e, t, n) {
 		if (this.t.peek().type !== "PLUS") {
 			let r = this.consumeEncodingIndicator(() => BigInt(e.length));
-			return new P(e, {
+			return new F(e, {
 				ednEncoding: this._tokenTypeToCdnEncoding(t),
 				ednSource: n,
 				...r === void 0 ? {} : { encodingWidth: r }
@@ -1584,7 +1591,7 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 			else if (e.type === "BYTES_HEX_ELIDED") {
 				this.t.consume();
 				let t = this._buildBytesElidedItems(e.value, e);
-				for (let e of t) e instanceof B ? (i.push({ ellipsis: !0 }), r = !0) : e instanceof P && i.push({ bytes: e.value });
+				for (let e of t) e instanceof V ? (i.push({ ellipsis: !0 }), r = !0) : e instanceof F && i.push({ bytes: e.value });
 			} else this._isBytesToken(e.type) ? (this.t.consume(), i.push({
 				bytes: this._decodeBytesToken(e),
 				source: e.raw
@@ -1592,24 +1599,24 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 		}
 		if (!r) {
 			let e = i.map((e) => "bytes" in e ? e : { bytes: /* @__PURE__ */ new Uint8Array() }), n = this._concatBytes(e.map((e) => e.bytes)), r = this.consumeEncodingIndicator(() => BigInt(n.length));
-			return new P(n, {
+			return new F(n, {
 				ednEncoding: this._tokenTypeToCdnEncoding(t),
 				ednParts: e,
 				...r === void 0 ? {} : { encodingWidth: r }
 			});
 		}
 		let a = [], o = [], s = () => {
-			o.length > 0 && (a.push(new P(this._concatBytes([...o]))), o.length = 0);
+			o.length > 0 && (a.push(new F(this._concatBytes([...o]))), o.length = 0);
 		};
-		for (let e of i) "ellipsis" in e ? (s(), a.push(new B())) : o.push(e.bytes);
-		return s(), new B(a);
+		for (let e of i) "ellipsis" in e ? (s(), a.push(new V())) : o.push(e.bytes);
+		return s(), new V(a);
 	}
 	_parseHexElidedConcat(e) {
 		let t = this._buildBytesElidedItems(e.value, e);
 		for (; this.t.peek().type === "PLUS";) {
 			this.t.consume();
 			let e = this.t.peek();
-			if (e.type === "ELLIPSIS") this.t.consume(), t.push(new B());
+			if (e.type === "ELLIPSIS") this.t.consume(), t.push(new V());
 			else if (e.type === "BYTES_HEX_ELIDED") {
 				this.t.consume();
 				let n = this._buildBytesElidedItems(e.value, e);
@@ -1617,20 +1624,20 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 			} else if (this._isBytesToken(e.type)) {
 				this.t.consume();
 				let n = this._decodeBytesToken(e), r = t[t.length - 1];
-				r instanceof P ? t[t.length - 1] = new P(this._concatBytes([r.value, n])) : t.push(new P(n));
+				r instanceof F ? t[t.length - 1] = new F(this._concatBytes([r.value, n])) : t.push(new F(n));
 			} else this._fail(`expected byte string after +, got ${JSON.stringify(e.value)}`, e);
 		}
-		return new B(t);
+		return new V(t);
 	}
 	_buildBytesElidedItems(e, t) {
 		let n = e.split("..."), r = [];
-		for (let e = 0; e < n.length; e++) e > 0 && r.push(new B()), n[e].length > 0 && r.push(new P(this._hexToBytes(n[e], t)));
+		for (let e = 0; e < n.length; e++) e > 0 && r.push(new V()), n[e].length > 0 && r.push(new F(this._hexToBytes(n[e], t)));
 		return r;
 	}
 	_mergeFirstBytesItem(e, t) {
 		if (t.length === 0) return;
 		let n = e[e.length - 1], r = t[0];
-		n instanceof P && r instanceof P ? (e[e.length - 1] = new P(this._concatBytes([n.value, r.value])), e.push(...t.slice(1))) : e.push(...t);
+		n instanceof F && r instanceof F ? (e[e.length - 1] = new F(this._concatBytes([n.value, r.value])), e.push(...t.slice(1))) : e.push(...t);
 	}
 	_concatBytes(e) {
 		let t = e.reduce((e, t) => e + t.byteLength, 0), n = new Uint8Array(t), r = 0;
@@ -1642,7 +1649,7 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 		let e = this.t.peek();
 		e.type !== "INTEGER" && this._fail(`expected integer inside simple(), got ${JSON.stringify(e.value)}`, e), this.t.consume();
 		let { numStr: t } = at(e.value), n = Number(ot(t));
-		return this.expect("RPAREN"), new z(n);
+		return this.expect("RPAREN"), new B(n);
 	}
 	parseEmbeddedCBOR() {
 		this.t.consume();
@@ -1659,7 +1666,7 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 			let e = this.t.consume();
 			t = this._resolveEncodingWidth(e.value, e);
 		}
-		return new He(e, { encodingWidth: t });
+		return new Ve(e, { encodingWidth: t });
 	}
 	parseArray() {
 		this.t.consume();
@@ -1673,7 +1680,7 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 			i.push(this.parseValue());
 		}
 		this.expect("RBRACKET"), t !== void 0 && n !== void 0 && (t = this._validateEncodingFit(BigInt(i.length), t, n));
-		let a = new L(i, {
+		let a = new R(i, {
 			indefiniteLength: e,
 			encodingWidth: t
 		});
@@ -1694,7 +1701,7 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 			i.push([e, t]);
 		}
 		this.expect("RBRACE"), t !== void 0 && n !== void 0 && (t = this._validateEncodingFit(BigInt(i.length), t, n));
-		let a = new R(i, {
+		let a = new z(i, {
 			indefiniteLength: e,
 			encodingWidth: t
 		});
@@ -1718,16 +1725,16 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 		}
 		this.expect("RPAREN"), n.length === 0 && this._fail("empty indefinite group (_ ) is ambiguous; use ''_ for bytes or \"\"_ for text");
 		let r = n[0];
-		if (r instanceof P) {
-			let e = new F(n.map((e, t) => {
-				if (e instanceof P) return e;
+		if (r instanceof F) {
+			let e = new I(n.map((e, t) => {
+				if (e instanceof F) return e;
 				this._fail(`indefinite byte string chunk ${t} must be a byte string, not a text string`);
 			}));
 			return t.length > 0 && (e.warnings = t), e;
 		}
-		if (r instanceof H) {
-			let e = new I(n.map((e, t) => {
-				if (e instanceof H) return e;
+		if (r instanceof U) {
+			let e = new L(n.map((e, t) => {
+				if (e instanceof U) 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;
@@ -1745,7 +1752,7 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 		return t.type !== e && this._fail(`expected ${e}, got ${t.type} (${JSON.stringify(t.value)})`, t), t;
 	}
 	_applyEiToResult(e, t, n) {
-		if (e instanceof M) {
+		if (e instanceof N) {
 			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) {
@@ -1755,37 +1762,37 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 				}
 				e.precision = r;
 			}
-		} else if (e instanceof A) {
+		} else if (e instanceof j) {
 			if (e.encodingWidth === void 0) {
 				let r = this._validateEncodingFit(e.value, t, n);
 				r !== void 0 && (e.encodingWidth = r);
 			}
-		} else if (e instanceof j) {
+		} else if (e instanceof M) {
 			if (e.encodingWidth === void 0) {
 				let r = this._validateEncodingFit(e.argument, t, n);
 				r !== void 0 && (e.encodingWidth = r);
 			}
-		} else if (e instanceof P) {
+		} else if (e instanceof F) {
 			if (e.encodingWidth === void 0) {
 				let r = this._validateEncodingFit(BigInt(e.value.length), t, n);
 				r !== void 0 && (e.encodingWidth = r);
 			}
-		} else if (e instanceof H) {
+		} else if (e instanceof U) {
 			if (e.encodingWidth === void 0) {
 				let r = this._validateEncodingFit(BigInt(tt.encode(e.value).length), t, n);
 				r !== void 0 && (e.encodingWidth = r);
 			}
-		} else if (e instanceof L) {
+		} else if (e instanceof R) {
 			if (e.encodingWidth === void 0) {
 				let r = this._validateEncodingFit(BigInt(e.items.length), t, n);
 				r !== void 0 && (e.encodingWidth = r);
 			}
-		} else if (e instanceof R) {
+		} else if (e instanceof z) {
 			if (e.encodingWidth === void 0) {
 				let r = this._validateEncodingFit(BigInt(e.entries.length), t, n);
 				r !== void 0 && (e.encodingWidth = r);
 			}
-		} else if (e instanceof N) {
+		} else if (e instanceof P) {
 			if (e.encodingWidth === void 0) {
 				let r = this._validateEncodingFit(e.tag, t, n);
 				r !== void 0 && (e.encodingWidth = r);
@@ -1817,29 +1824,29 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 		this._warn(e, t), this._options.strict !== !1 && this._fail(e, t);
 	}
 	_hintMissingExtension(e, t) {
-		let n = ht.get(e);
+		let n = mt.get(e);
 		if (n === void 0 || this._hintedPrefixes.has(e)) return;
 		this._hintedPrefixes.add(e);
 		let r = `app-string prefix '${e}' requires an extension that is not enabled; ${n}`;
 		this._options.onWarning ? this._options.onWarning({
 			message: r,
-			..._t(t),
+			...gt(t),
 			hint: !0
 		}) : this._options.silent || console.warn(`CDN: ${r}`);
 	}
 	_warn(e, t) {
 		let n = { message: e };
-		if (t !== void 0 && Object.assign(n, _t(t)), this._pendingWarnings.push(n), this._options.onWarning) this._options.onWarning(n);
+		if (t !== void 0 && Object.assign(n, gt(t)), this._pendingWarnings.push(n), this._options.onWarning) this._options.onWarning(n);
 		else if (!this._options.silent) {
 			let n = t ? ` at line ${t.line}, column ${t.col}` : "";
 			console.warn(`CDN strict violation${n}: ${e}`);
 		}
 	}
 	_fail(e, t) {
-		throw new r(e, t ? _t(t) : void 0);
+		throw new r(e, t ? gt(t) : void 0);
 	}
 };
-function _t(e) {
+function gt(e) {
 	return {
 		offset: e.offset,
 		line: e.line,
@@ -1849,7 +1856,7 @@ function _t(e) {
 }
 //#endregion
 //#region src/ast/CborTextString.ts
-var vt = new TextEncoder(), yt = !1, H = class extends k {
+var _t = new TextEncoder(), vt = !1, U = class extends A {
 	indefiniteLength = !1;
 	value;
 	encodingWidth;
@@ -1863,76 +1870,71 @@ var vt = new TextEncoder(), yt = !1, H = class extends k {
 		e.writeTextString(3, this.value, this.encodingWidth);
 	}
 	_toCDN(e, t) {
-		let n = w(e, this.encodingWidth, () => C(BigInt(vt.encode(this.value).length)));
-		return bt(this.value, n, e, t, this.ednParts, this.ednSource, this.ednPartSources);
+		let n = w(e, this.encodingWidth, () => C(BigInt(_t.encode(this.value).length)));
+		return yt(this.value, n, e, t, this.ednParts, this.ednSource, this.ednPartSources);
 	}
 	_toJS(e) {
 		return this.value;
 	}
 };
-function bt(e, t, n, r, i, a, o) {
-	if (n?.preserveRawString && a !== void 0) return a + t;
-	let s = n?.preserveRawString ? o : void 0, c = s?.some((e) => e !== void 0) ?? !1, { cdn: l, newline: u } = St(n), d = _(n), f = n?.preserveConcatenation && i !== void 0 && (i.length > 1 || c) ? i : void 0;
-	if (d === null) return f === void 0 ? ye(e) + t : xt(f.map((e, t) => ({
-		text: e,
-		contentDepth: 0,
-		source: s?.[t]
-	})), t, null, r);
-	if (!l && !u && f === void 0) return ye(e) + t;
-	let p = l ? Tt(e) : null;
-	if (f !== void 0 && (p === null || c)) {
+function yt(e, t, n, r, i, a, o) {
+	let s = _(n);
+	if (n?.preserveRawString && a !== void 0 && (s !== null || !/[\r\n]/.test(a))) return a + t;
+	if (s === null) return ye(e) + t;
+	let c = n?.preserveRawString ? o : void 0, l = c?.some((e) => e !== void 0) ?? !1, { cdn: u, newline: d } = xt(n), f = n?.preserveConcatenation && i !== void 0 && (i.length > 1 || l) ? i : void 0;
+	if (!u && !d && f === void 0) return ye(e) + t;
+	let p = u ? wt(e) : null;
+	if (f !== void 0 && (p === null || l)) {
 		let e = [];
 		for (let [t, n] of f.entries()) {
-			let r = s?.[t];
+			let r = c?.[t];
 			if (r !== void 0) e.push({
 				text: n,
 				contentDepth: 0,
 				source: r
 			});
-			else if (u) {
+			else if (d) {
 				let t = /* @__PURE__ */ new Map();
-				for (let { point: e, contentDepth: r } of wt(n, 0)) t.set(e, r);
-				e.push(...Nt(n, t));
+				for (let { point: e, contentDepth: r } of Ct(n, 0)) t.set(e, r);
+				e.push(...Mt(n, t));
 			} else e.push({
 				text: n,
 				contentDepth: 0
 			});
 		}
-		return xt(e, t, d, r);
+		return bt(e, t, s, r);
 	}
 	let m = /* @__PURE__ */ new Map();
 	if (p !== null) for (let { point: e, contentDepth: t } of p) m.set(e, t);
-	if (u) {
-		let t = p === null ? wt(e, 0) : Et(e);
+	if (d) {
+		let t = p === null ? Ct(e, 0) : Tt(e);
 		for (let { point: e, contentDepth: n } of t) m.has(e) || m.set(e, n);
 	}
-	let h = Nt(e, m);
-	return h.length <= 1 ? ye(e) + t : xt(h, t, d, r);
+	let h = Mt(e, m);
+	return h.length <= 1 ? ye(e) + t : bt(h, t, s, r);
 }
-function xt(e, t, n, r) {
+function bt(e, t, n, r) {
 	let i = e.map(({ text: n, source: r }, i) => {
 		let a = r ?? ye(n);
 		return i === e.length - 1 ? a + t : a;
-	});
-	if (n === null) return i.join(" + ");
-	let a = i[0];
+	}), a = i[0];
 	for (let t = 1; t < i.length; t++) {
 		let o = v(n, r + 1 + e[t].contentDepth);
 		a += ` +\n${o}${i[t]}`;
 	}
 	return a;
 }
-function St(e) {
-	let t = e?.splitCdn === void 0 || e?.splitNewline === void 0 ? Ct(e?.textStringFormat ?? []) : [];
+function xt(e) {
+	let t = e?.splitCdn === void 0 || e?.splitNewline === void 0 ? St(e?.textStringFormat ?? []) : [];
 	return {
 		cdn: e?.splitCdn ?? t.includes("cdn"),
 		newline: e?.splitNewline ?? t.includes("newline")
 	};
 }
-function Ct(e) {
-	return e.map((e) => e === "cboredn" ? (yt || (yt = !0, console.warn("`textStringFormat: ['cboredn']` is deprecated; use `textStringFormat: ['cdn']` instead.")), "cdn") : e);
+function St(e) {
+	return e.map((e) => e === "cboredn" ? (vt || (vt = !0, console.warn("`textStringFormat: ['cboredn']` is deprecated; use `textStringFormat: ['cdn']` instead.")), "cdn") : e);
 }
-function wt(e, t) {
+function Ct(e, t) {
 	let n = [];
 	for (let r = 0; r < e.length; r++) {
 		let i = e[r];
@@ -1949,7 +1951,7 @@ function wt(e, t) {
 	}
 	return n;
 }
-function Tt(e) {
+function wt(e) {
 	try {
 		it(e);
 	} catch {
@@ -1960,24 +1962,24 @@ function Tt(e) {
 		let a = n.consume();
 		if (a.type === "EOF") break;
 		let c = !1;
-		if (o || (o = !0, a.offset > 0 && jt(n.comments, 0, a.offset) && t.push({
+		if (o || (o = !0, a.offset > 0 && At(n.comments, 0, a.offset) && t.push({
 			point: a.offset,
 			contentDepth: r
 		})), i !== null) {
-			if (i.kind === "opener" && Ot.has(a.type)) {
+			if (i.kind === "opener" && Dt.has(a.type)) {
 				i.point = a.endOffset, s = a.endOffset;
 				continue;
-			} else i.kind === "opener" && At.has(a.type) && Mt(e, i.point, a.offset) ? c = !0 : t.push({
+			} else i.kind === "opener" && kt.has(a.type) && jt(e, i.point, a.offset) ? c = !0 : t.push({
 				point: a.offset,
 				contentDepth: i.contentDepth
 			});
 			i = null;
 		}
-		kt.has(a.type) ? (r++, i = {
+		Ot.has(a.type) ? (r++, i = {
 			point: a.endOffset,
 			contentDepth: r,
 			kind: "opener"
-		}) : At.has(a.type) ? (r = Math.max(0, r - 1), c || t.push({
+		}) : kt.has(a.type) ? (r = Math.max(0, r - 1), c || t.push({
 			point: a.offset,
 			contentDepth: r
 		})) : a.type === "COMMA" && (i = {
@@ -1992,23 +1994,23 @@ function Tt(e) {
 		contentDepth: r
 	}), t;
 }
-function Et(e) {
+function Tt(e) {
 	let t = [], n = new a(e), r = 0;
 	for (;;) {
 		let i = n.consume();
 		if (i.type === "EOF") break;
-		if (kt.has(i.type)) r++;
-		else if (At.has(i.type)) r = Math.max(0, r - 1);
+		if (Ot.has(i.type)) r++;
+		else if (kt.has(i.type)) r = Math.max(0, r - 1);
 		else if (i.type !== "COMMA") {
 			if (i.type === "TSTR") {
 				let n = e.slice(i.offset, i.endOffset);
-				for (let e of Dt(n)) t.push({
+				for (let e of Et(n)) t.push({
 					point: i.offset + e,
 					contentDepth: r + 1
 				});
 			} else if (i.type === "RAWSTRING") {
 				let n = e.slice(i.offset, i.endOffset);
-				for (let { point: e } of wt(n, 0)) t.push({
+				for (let { point: e } of Ct(n, 0)) t.push({
 					point: i.offset + e,
 					contentDepth: r + 1
 				});
@@ -2017,7 +2019,7 @@ function Et(e) {
 	}
 	return t;
 }
-function Dt(e) {
+function Et(e) {
 	let t = [], n = 1, r = e.length - 1;
 	for (; n < r;) {
 		let r = e[n];
@@ -2033,24 +2035,24 @@ function Dt(e) {
 	}
 	return t;
 }
-var Ot = /* @__PURE__ */ new Set(["ENCODING_INDICATOR", "UNDERSCORE"]), kt = /* @__PURE__ */ new Set([
+var Dt = /* @__PURE__ */ new Set(["ENCODING_INDICATOR", "UNDERSCORE"]), Ot = /* @__PURE__ */ new Set([
 	"LBRACKET",
 	"LBRACE",
 	"LPAREN",
 	"LT_LT"
-]), At = /* @__PURE__ */ new Set([
+]), kt = /* @__PURE__ */ new Set([
 	"RBRACKET",
 	"RBRACE",
 	"RPAREN",
 	"GT_GT"
 ]);
-function jt(e, t, n) {
+function At(e, t, n) {
 	return e.some((e) => e.start >= t && e.end <= n);
 }
-function Mt(e, t, n) {
+function jt(e, t, n) {
 	return /^[\t\n\r ]*$/.test(e.slice(t, n));
 }
-function Nt(e, t) {
+function Mt(e, t) {
 	let n = [...t].filter(([t]) => t > 0 && t < e.length).sort(([e], [t]) => e - t);
 	if (n.length === 0) return [{
 		text: e,
@@ -2068,7 +2070,7 @@ function Nt(e, t) {
 }
 //#endregion
 //#region src/extensions/dt.ts
-function U(e) {
+function W(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");
@@ -2076,17 +2078,17 @@ function U(e) {
 	for (; s.length < 3;) s += "0";
 	return `${i}.${s}Z`;
 }
-var Pt = new TextDecoder("utf-8", { fatal: !0 });
-function Ft(e) {
+var Nt = new TextDecoder("utf-8", { fatal: !0 });
+function Pt(e) {
 	if (e.length !== 1) throw SyntaxError("dt<<...>>: expected exactly one item");
 	let t = e[0];
-	if (t instanceof H) return t.value;
-	if (t instanceof P) return Pt.decode(t.value);
+	if (t instanceof U) return t.value;
+	if (t instanceof F) return Nt.decode(t.value);
 	throw SyntaxError("dt<<...>>: expected a text string or byte string");
 }
-var It = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?(Z|[+-]\d{2}:\d{2})$/i;
-function Lt(e, t) {
-	if (!It.test(e)) {
+var Ft = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?(Z|[+-]\d{2}:\d{2})$/i;
+function It(e, t) {
+	if (!Ft.test(e)) {
 		let n = `dt: invalid RFC 3339 date-time: ${JSON.stringify(e)}`;
 		if (t) t(n);
 		else throw SyntaxError(n);
@@ -2097,93 +2099,93 @@ function Lt(e, t) {
 	if (isNaN(a)) throw SyntaxError(`dt: invalid RFC 3339 date-time: ${JSON.stringify(e)}`);
 	if (i === void 0) {
 		let e = a / 1e3;
-		return e >= 0 ? new zt(BigInt(e)) : new Bt(BigInt(e));
+		return e >= 0 ? new Rt(BigInt(e)) : new zt(BigInt(e));
 	}
-	return new Vt(a / 1e3 + i);
+	return new Bt(a / 1e3 + i);
 }
-var Rt = 1n, zt = class extends A {
+var Lt = 1n, Rt = class extends j {
 	constructor(e, t) {
 		super(e, t);
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
 		let n = w(e, this.encodingWidth, () => C(this.value));
-		return `dt'${U(Number(this.value))}'${n}`;
+		return `dt'${W(Number(this.value))}'${n}`;
 	}
-}, Bt = class extends j {
+}, zt = class extends M {
 	constructor(e, t) {
 		super(e, t);
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
 		let n = w(e, this.encodingWidth, () => C(this.argument));
-		return `dt'${U(Number(this.value))}'${n}`;
+		return `dt'${W(Number(this.value))}'${n}`;
 	}
-}, Vt = class extends M {
+}, Bt = class extends N {
 	constructor(e, t) {
 		super(e, t);
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
-		let n = Le(this.value), r = xe(this.value, this.precision, n, e?.encodingIndicators ?? "auto");
-		return `dt'${U(this.value)}'${r}`;
+		let n = k(this.value), r = xe(this.value, this.precision, n, e?.encodingIndicators ?? "auto");
+		return `dt'${W(this.value)}'${r}`;
 	}
-}, Ht = class extends N {
+}, Vt = class extends P {
 	constructor(e, t) {
-		super(Rt, typeof e == "string" ? Lt(e) : e, t);
+		super(Lt, typeof e == "string" ? It(e) : e, t);
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
 		let n = this.content;
-		if (n instanceof M ? n.precision !== void 0 && n.precision !== Le(n.value) : n.encodingWidth !== void 0) return super._toCDN({
+		if (n instanceof N ? n.precision !== void 0 && n.precision !== k(n.value) : n.encodingWidth !== void 0) return super._toCDN({
 			...e,
 			appStrings: !1
 		}, t);
-		let r = n instanceof M ? n.value : Number(n.value), i = w(e, this.encodingWidth, () => C(Rt));
-		return `DT'${U(r)}'${i}`;
+		let r = n instanceof N ? n.value : Number(n.value), i = w(e, this.encodingWidth, () => C(Lt));
+		return `DT'${W(r)}'${i}`;
 	}
-}, Ut = class extends Ht {
+}, Ht = class extends Vt {
 	constructor(e, t) {
 		super(e, t);
 	}
 	_toJS(e) {
-		let t = this.content, n = t instanceof M ? t.value * 1e3 : Number(t.value) * 1e3;
+		let t = this.content, n = t instanceof N ? t.value * 1e3 : Number(t.value) * 1e3;
 		return new Date(n);
 	}
 };
-function Wt(e) {
+function Ut(e) {
 	let t = e?.jsDate ?? !1;
 	function n(e) {
-		return t ? new Ut(e) : new Ht(e);
+		return t ? new Ht(e) : new Vt(e);
 	}
 	let r = {
 		appStringPrefixes: ["dt", "DT"],
-		tagNumbers: [Rt],
+		tagNumbers: [Lt],
 		parseAppString(e, t, r) {
-			return e === "DT" ? n(t) : Lt(t, r);
+			return e === "DT" ? n(t) : It(t, r);
 		},
 		parseAppSequence(e, t, r) {
-			let i = Ft(t);
-			return e === "DT" ? n(i) : Lt(i, r);
+			let i = Pt(t);
+			return e === "DT" ? n(i) : It(i, r);
 		},
 		parseTag(e, n) {
 			if (e !== 1n) return;
 			let r;
-			if (n instanceof A) r = new zt(n.value, { encodingWidth: n.encodingWidth });
-			else if (n instanceof j) r = new Bt(n.value, { encodingWidth: n.encodingWidth });
-			else if (n instanceof M) r = new Vt(n.value), n.precision !== void 0 && (r.precision = n.precision);
+			if (n instanceof j) r = new Rt(n.value, { encodingWidth: n.encodingWidth });
+			else if (n instanceof M) r = new zt(n.value, { encodingWidth: n.encodingWidth });
+			else if (n instanceof N) r = new Bt(n.value), n.precision !== void 0 && (r.precision = n.precision);
 			else return;
-			return r.start = n.start, r.end = n.end, t ? new Ut(r) : new Ht(r);
+			return r.start = n.start, r.end = n.end, t ? new Ht(r) : new Vt(r);
 		}
 	};
 	return t && (r.fromJS = (e, t) => {
-		if (e instanceof Date) return new Ut(U(e.getTime() / 1e3));
+		if (e instanceof Date) return new Ht(W(e.getTime() / 1e3));
 	}, r.isJSType = (e) => e instanceof Date), r;
 }
-var Gt = Wt(), Kt = Wt({ jsDate: !0 });
+var Wt = Ut(), Gt = Ut({ jsDate: !0 });
 //#endregion
 //#region src/utils/ip.ts
-function qt(e) {
+function Kt(e) {
 	let t = e.split(".");
 	if (t.length !== 4) throw SyntaxError(`ip: invalid IPv4 address: ${JSON.stringify(e)}`);
 	let n = /* @__PURE__ */ new Uint8Array(4);
@@ -2196,11 +2198,11 @@ function qt(e) {
 	}
 	return n;
 }
-function Jt(e) {
+function qt(e) {
 	let t = /* @__PURE__ */ new Uint8Array(16);
 	if (e === "::") return t;
 	let n = e, r = null, i = e.match(/^(.*):(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/);
-	i && (n = i[1], n.endsWith(":") && (n += ":"), r = qt(i[2]));
+	i && (n = i[1], n.endsWith(":") && (n += ":"), r = Kt(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;
@@ -2217,11 +2219,11 @@ function Jt(e) {
 	}
 	return r && t.set(r, 12), t;
 }
-function Yt(e) {
+function Jt(e) {
 	return Array.from(e).join(".");
 }
-function Xt(e) {
-	let t = e.slice(0, 10).every((e) => e === 0) && e[10] === 255 && e[11] === 255 ? Yt(e.slice(12)) : null, n = t ? 6 : 8, r = [];
+function Yt(e) {
+	let t = e.slice(0, 10).every((e) => e === 0) && e[10] === 255 && e[11] === 255 ? Jt(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) {
@@ -2235,26 +2237,26 @@ function Xt(e) {
 }
 //#endregion
 //#region src/extensions/ip.ts
-var Zt = "ip", W = "IP", G = 52n, Qt = 54n, $t = new TextDecoder("utf-8", { fatal: !0 });
+var Xt = "ip", G = "IP", Zt = 52n, Qt = 54n, $t = new TextDecoder("utf-8", { fatal: !0 });
 function en(e) {
 	if (e.length !== 1) throw SyntaxError("ip<<...>>: expected exactly one item");
 	let t = e[0];
-	if (t instanceof H) return t.value;
-	if (t instanceof P) return $t.decode(t.value);
+	if (t instanceof U) return t.value;
+	if (t instanceof F) return $t.decode(t.value);
 	throw SyntaxError("ip<<...>>: expected a text string or byte string");
 }
 function tn(e) {
 	return /^\d/.test(e) && e.includes(".") && !e.includes(":") ? {
-		bytes: qt(e),
+		bytes: Kt(e),
 		isV4: !0
 	} : {
-		bytes: Jt(e),
+		bytes: qt(e),
 		isV4: !1
 	};
 }
 function nn(e) {
-	if (e.length === 4) return Yt(e);
-	if (e.length === 16) return Xt(e);
+	if (e.length === 4) return Jt(e);
+	if (e.length === 16) return Yt(e);
 	throw SyntaxError(`ip: unexpected byte length: ${e.length}`);
 }
 function rn(e, t) {
@@ -2271,38 +2273,38 @@ function an(e, t) {
 	let n = new Uint8Array(t);
 	return n.set(e), n;
 }
-var on = class extends P {
+var on = class extends F {
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
 		let n = w(e, this.encodingWidth, () => C(BigInt(this.value.length)));
-		return `${Zt}'${nn(this.value)}'${n}`;
+		return `${Xt}'${nn(this.value)}'${n}`;
 	}
-}, sn = class extends L {
+}, sn = class extends R {
 	_isV4;
 	constructor(e, t, n) {
-		super([new A(BigInt(e)), new P(t)]), this._isV4 = n;
+		super([new j(BigInt(e)), new F(t)]), this._isV4 = n;
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
 		let n = Number(this.items[0].value), r = this.items[1].value;
-		return `${Zt}'${nn(an(r, this._isV4 ? 4 : 16))}/${n}'`;
+		return `${Xt}'${nn(an(r, this._isV4 ? 4 : 16))}/${n}'`;
 	}
-}, cn = class extends N {
+}, cn = class extends P {
 	constructor(e, t) {
 		super(e, t);
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
-		let n = this.tag === G ? 4 : 16, r = this.content;
-		if (r instanceof P) {
+		let n = this.tag === Zt ? 4 : 16, r = this.content;
+		if (r instanceof F) {
 			if (r.encodingWidth !== void 0) return super._toCDN(e, t);
 			let n = w(e, this.encodingWidth, () => C(this.tag));
-			return `${W}'${nn(r.value)}'${n}`;
+			return `${G}'${nn(r.value)}'${n}`;
 		}
-		if (r instanceof L && r.items.length === 2 && r.items[0] instanceof A && r.items[1] instanceof P) {
+		if (r instanceof R && r.items.length === 2 && r.items[0] instanceof j && r.items[1] instanceof F) {
 			if (r.encodingWidth !== void 0 || r.items[0].encodingWidth !== void 0 || r.items[1].encodingWidth !== void 0) return super._toCDN(e, t);
 			let i = Number(r.items[0].value), a = an(r.items[1].value, n), o = w(e, this.encodingWidth, () => C(this.tag));
-			return `${W}'${nn(a)}/${i}'${o}`;
+			return `${G}'${nn(a)}/${i}'${o}`;
 		}
 		return super._toCDN(e, t);
 	}
@@ -2311,18 +2313,18 @@ function ln(e, t) {
 	let n = t.indexOf("/");
 	if (n === -1) {
 		let { bytes: n, isV4: r } = tn(t);
-		return e === W ? new cn(r ? G : Qt, new P(n)) : new on(n);
+		return e === G ? new cn(r ? Zt : Qt, new F(n)) : new on(n);
 	}
 	let r = t.slice(0, n), i = t.slice(n + 1);
 	if (!/^\d+$/.test(i)) throw SyntaxError(`ip: invalid prefix length: ${JSON.stringify(i)}`);
 	let a = parseInt(i, 10), { bytes: o, isV4: s } = tn(r), c = s ? 32 : 128;
 	if (a > c) throw SyntaxError(`ip: prefix length ${a} exceeds maximum ${c} for ${s ? "IPv4" : "IPv6"}`);
 	let l = rn(o, a);
-	return e === W ? new cn(s ? G : Qt, new L([new A(BigInt(a)), new P(l)])) : new sn(a, l, s);
+	return e === G ? new cn(s ? Zt : Qt, new R([new j(BigInt(a)), new F(l)])) : new sn(a, l, s);
 }
 var un = {
-	appStringPrefixes: [Zt, W],
-	tagNumbers: [G, Qt],
+	appStringPrefixes: [Xt, G],
+	tagNumbers: [Zt, Qt],
 	parseAppString(e, t) {
 		return ln(e, t);
 	},
@@ -2330,7 +2332,7 @@ var un = {
 		return ln(e, en(t));
 	},
 	parseTag(e, t) {
-		if (!(e !== G && e !== Qt) && (t instanceof P || t instanceof L)) return new cn(e, t);
+		if (!(e !== Zt && e !== Qt) && (t instanceof F || t instanceof R)) return new cn(e, t);
 	}
 }, dn = "cri", fn = "CRI", pn = 99n, mn = /* @__PURE__ */ new Map([
 	["coap", -1n],
@@ -2383,7 +2385,7 @@ function Tn(e) {
 }
 function En(e) {
 	let t = [], n = e, r = n.indexOf("@");
-	r >= 0 && (t.push(z.FALSE), t.push(new H(K(n.slice(0, r)))), n = n.slice(r + 1));
+	r >= 0 && (t.push(B.FALSE), t.push(new U(K(n.slice(0, r)))), n = n.slice(r + 1));
 	let i, a = null;
 	if (n.startsWith("[")) {
 		let e = n.indexOf("]");
@@ -2392,46 +2394,46 @@ function En(e) {
 		let r = n.slice(e + 1);
 		if (r.startsWith(":")) a = r.slice(1);
 		else if (r.length > 0) throw SyntaxError("cri: unexpected characters after ']' in authority");
-		t.push(new P(Jt(i)));
+		t.push(new F(qt(i)));
 	} else {
 		let e = n.lastIndexOf(":");
-		if (e >= 0 ? (i = n.slice(0, e), a = n.slice(e + 1)) : i = n, i !== "") if (/^\d{1,3}(\.\d{1,3}){3}$/.test(i)) t.push(new P(qt(i)));
-		else for (let e of i.toLowerCase().split(".")) t.push(new H(e));
+		if (e >= 0 ? (i = n.slice(0, e), a = n.slice(e + 1)) : i = n, i !== "") if (/^\d{1,3}(\.\d{1,3}){3}$/.test(i)) t.push(new F(Kt(i)));
+		else for (let e of i.toLowerCase().split(".")) t.push(new U(e));
 	}
 	if (a !== null && a !== "") {
 		if (!/^\d+$/.test(a)) throw SyntaxError(`cri: invalid port: ${JSON.stringify(a)}`);
 		let e = parseInt(a, 10);
 		if (e > 65535) throw SyntaxError(`cri: port ${e} out of range`);
-		t.push(new A(BigInt(e)));
+		t.push(new j(BigInt(e)));
 	}
-	return new L(t);
+	return new R(t);
 }
 function Dn(e) {
 	let t = e.items, n = 0, r = "";
-	if (n < t.length && t[n] instanceof z && t[n].value === 20) {
+	if (n < t.length && t[n] instanceof B && t[n].value === 20) {
 		n++;
 		let e = t[n++];
 		r += q(e.value, wn) + "@";
 	}
 	if (n >= t.length) return r;
 	let i = t[n];
-	if (i instanceof P) {
+	if (i instanceof F) {
 		n++;
 		let { length: e } = i.value;
-		if (e === 4) r += Yt(i.value);
-		else if (e === 16) r += "[" + Xt(i.value) + "]";
+		if (e === 4) r += Jt(i.value);
+		else if (e === 16) r += "[" + Yt(i.value) + "]";
 		else throw Error(`cri: unexpected host-ip byte length: ${e}`);
-		n < t.length && t[n] instanceof H && (r += `%25${q(t[n++].value, Tn)}`);
+		n < t.length && t[n] instanceof U && (r += `%25${q(t[n++].value, Tn)}`);
 	} else {
 		let e = [];
-		for (; n < t.length && t[n] instanceof H;) e.push(q(t[n++].value, Tn));
+		for (; n < t.length && t[n] instanceof U;) e.push(q(t[n++].value, Tn));
 		r += e.join(".");
 	}
-	return n < t.length && t[n] instanceof A && (r += ":" + t[n].value.toString()), r;
+	return n < t.length && t[n] instanceof j && (r += ":" + t[n].value.toString()), r;
 }
 function On(e) {
 	let t = e.slice(2), n = t.indexOf("/"), r, i;
-	return n >= 0 ? (r = t.slice(0, n), i = t.slice(n + 1).split("/").map((e) => new H(K(e)))) : (r = t, i = []), {
+	return n >= 0 ? (r = t.slice(0, n), i = t.slice(n + 1).split("/").map((e) => new U(K(e)))) : (r = t, i = []), {
 		authority: En(r),
 		pathSegments: i
 	};
@@ -2442,109 +2444,109 @@ function kn(e) {
 	let i = null, a = t.indexOf("?");
 	if (a >= 0) {
 		let e = t.slice(a + 1);
-		t = t.slice(0, a), i = e.split("&").map((e) => new H(K(e)));
+		t = t.slice(0, a), i = e.split("&").map((e) => new U(K(e)));
 	}
 	let o = [], s = /^([a-zA-Z][a-zA-Z0-9+.\-]*):([\s\S]*)$/.exec(t);
 	if (s) {
 		let e = s[1].toLowerCase(), t = s[2], n = mn.get(e);
-		if (o.push(n === void 0 ? new H(e) : new j(n)), t.startsWith("//")) {
+		if (o.push(n === void 0 ? new U(e) : new M(n)), t.startsWith("//")) {
 			let { authority: e, pathSegments: n } = On(t);
-			o.push(e, new L(n));
+			o.push(e, new R(n));
 		} else if (t.startsWith("/")) {
-			let e = t.slice(1).split("/").map((e) => new H(K(e)));
-			o.push(z.NULL, new L(e));
+			let e = t.slice(1).split("/").map((e) => new U(K(e)));
+			o.push(B.NULL, new R(e));
 		} else {
-			let e = t.split("/").map((e) => new H(K(e)));
-			o.push(z.TRUE, new L(e));
+			let e = t.split("/").map((e) => new U(K(e)));
+			o.push(B.TRUE, new R(e));
 		}
 	} else if (t.startsWith("//")) {
 		let { authority: e, pathSegments: n } = On(t);
-		o.push(z.FALSE, e, new L(n));
+		o.push(B.FALSE, e, new R(n));
 	} else if (t.startsWith("/")) {
-		let e = t.slice(1).split("/").map((e) => new H(K(e)));
-		o.push(z.TRUE, new L(e));
-	} else if (t === "") o.push(new A(0n));
+		let e = t.slice(1).split("/").map((e) => new U(K(e)));
+		o.push(B.TRUE, new R(e));
+	} else if (t === "") o.push(new j(0n));
 	else {
 		let n = 1n, r = t, i = !1;
 		for (r.startsWith("./") && (i = !0, r = r.slice(2)); r.startsWith("../");) n++, r = r.slice(3);
 		if (r === ".." ? (n++, r = "") : r === "." && (r = ""), n === 1n && !i && r !== "" && r.split("/")[0].includes(":")) throw SyntaxError(`cri: invalid relative-path reference — first segment must not contain ':' without a './' prefix (RFC 3986 §3.3): ${JSON.stringify(e)}`);
-		let a = r === "" ? [] : r.split("/").map((e) => new H(K(e)));
-		o.push(new A(n), new L(a));
+		let a = r === "" ? [] : r.split("/").map((e) => new U(K(e)));
+		o.push(new j(n), new R(a));
 	}
-	if (i !== null && o.push(new L(i)), n !== null && (i === null && o.push(z.NULL), o.push(new H(n))), n !== null && i === null && o.splice(o.length - 2, 1), i === null && n === null) {
+	if (i !== null && o.push(new R(i)), n !== null && (i === null && o.push(B.NULL), o.push(new U(n))), n !== null && i === null && o.splice(o.length - 2, 1), i === null && n === null) {
 		let e = o[o.length - 1];
-		e instanceof L && e.items.length === 0 && o.pop();
+		e instanceof R && e.items.length === 0 && o.pop();
 	}
-	return o.length === 1 && o[0] instanceof A && o[0].value === 0n ? [] : o;
+	return o.length === 1 && o[0] instanceof j && o[0].value === 0n ? [] : o;
 }
 function An(e, t) {
 	let n = t, r = "";
 	if (n < e.length) {
 		let t = e[n];
-		if (t instanceof L) {
+		if (t instanceof R) {
 			if (n++, t.items.length > 0) {
 				let e = t.items.map((e) => {
-					if (!(e instanceof H)) throw Error("cri: query item must be a text string");
+					if (!(e instanceof U)) throw Error("cri: query item must be a text string");
 					return q(e.value, Sn);
 				});
 				r += "?" + e.join("&");
 			}
-		} else t instanceof z && t.value === 22 && n++;
+		} else t instanceof B && t.value === 22 && n++;
 	}
-	return n < e.length && e[n] instanceof H && (r += "#" + q(e[n].value, Cn)), r;
+	return n < e.length && e[n] instanceof U && (r += "#" + q(e[n].value, Cn)), r;
 }
 function jn(e) {
 	return e.items.map((e) => {
-		if (!(e instanceof H)) throw Error("cri: path segment must be a text string");
+		if (!(e instanceof U)) throw Error("cri: path segment must be a text string");
 		return q(e.value, xn);
 	});
 }
 function Mn(e) {
 	if (e.length === 0) return "";
 	let t = 0, n = e[t++];
-	if (n instanceof j || n instanceof H) {
+	if (n instanceof M || n instanceof U) {
 		let r;
-		if (n instanceof j) {
+		if (n instanceof M) {
 			let e = hn.get(n.value);
 			if (e === void 0) throw Error(`cri: unrecognised scheme-id ${n.value}`);
 			r = e + ":";
 		} else r = n.value + ":";
 		if (t >= e.length) return r;
 		let i = e[t++], a = "", o = !1;
-		if (i instanceof L) a = "//" + Dn(i), o = !0;
-		else if (i instanceof z) if (i.value === 22) o = !0;
+		if (i instanceof R) a = "//" + Dn(i), o = !0;
+		else if (i instanceof B) if (i.value === 22) o = !0;
 		else if (i.value === 21) o = !1;
 		else throw Error(`cri: unexpected no-authority value: simple(${i.value})`);
 		else throw Error("cri: unexpected type for authority element");
 		let s = "";
-		if (t < e.length && e[t] instanceof L) {
+		if (t < e.length && e[t] instanceof R) {
 			let n = e[t++];
 			n.items.length > 0 && (s = (o ? "/" : "") + jn(n).join("/"));
 		}
 		return r + a + s + An(e, t);
 	}
-	if (n instanceof z && n.value === 20) {
-		if (t >= e.length || !(e[t] instanceof L)) throw Error("cri: network-path reference requires an authority array");
+	if (n instanceof B && n.value === 20) {
+		if (t >= e.length || !(e[t] instanceof R)) throw Error("cri: network-path reference requires an authority array");
 		let n = Dn(e[t++]), r = "";
-		if (t < e.length && e[t] instanceof L) {
+		if (t < e.length && e[t] instanceof R) {
 			let n = e[t++];
 			n.items.length > 0 && (r = "/" + jn(n).join("/"));
 		}
 		return "//" + n + r + An(e, t);
 	}
-	if (n instanceof z && n.value === 21) {
+	if (n instanceof B && n.value === 21) {
 		let n = "/";
-		if (t < e.length && e[t] instanceof L) {
+		if (t < e.length && e[t] instanceof R) {
 			let r = e[t++];
 			n = "/" + jn(r).join("/");
 		}
 		return n + An(e, t);
 	}
-	if (n instanceof A) {
+	if (n instanceof j) {
 		let r = n.value;
 		if (r === 0n) return An(e, t);
 		let i = r === 1n ? "" : "../".repeat(Number(r) - 1), a;
-		if (t < e.length && e[t] instanceof L) {
+		if (t < e.length && e[t] instanceof R) {
 			let n = e[t++];
 			if (n.items.length > 0) {
 				let e = jn(n);
@@ -2555,7 +2557,7 @@ function Mn(e) {
 	}
 	throw Error("cri: unrecognised first element type in CRI array");
 }
-var Nn = class extends L {
+var Nn = class extends R {
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
 		try {
@@ -2565,7 +2567,7 @@ var Nn = class extends L {
 			return super._toCDN(e, t);
 		}
 	}
-}, Pn = class extends N {
+}, Pn = class extends P {
 	constructor(e) {
 		super(pn, e);
 	}
@@ -2584,8 +2586,8 @@ var Nn = class extends L {
 function Fn(e) {
 	if (e.length !== 1) throw SyntaxError("cri<<...>>: expected exactly one item");
 	let t = e[0];
-	if (t instanceof H) return t.value;
-	if (t instanceof P) return _n.decode(t.value);
+	if (t instanceof U) return t.value;
+	if (t instanceof F) return _n.decode(t.value);
 	throw SyntaxError("cri<<...>>: expected a text string or byte string");
 }
 function In(e, t) {
@@ -2602,7 +2604,7 @@ var Ln = {
 		return In(e, Fn(t));
 	},
 	parseTag(e, t) {
-		if (e !== 99n || !(t instanceof L)) return;
+		if (e !== 99n || !(t instanceof R)) return;
 		let n = new Nn(t.items, {
 			indefiniteLength: t.indefiniteLength,
 			encodingWidth: t.encodingWidth
@@ -2612,7 +2614,7 @@ var Ln = {
 }, Rn = 18446744073709551615n, zn = -18446744073709551616n, Bn = {
 	tagNumbers: [qe, Je],
 	parseTag(e, t) {
-		if (t instanceof P) {
+		if (t instanceof F) {
 			if (e === 2n) {
 				let e = Qe(t.value);
 				return e > Rn ? new $e(e) : void 0;
@@ -2660,47 +2662,47 @@ function Y(e, t) {
 	e.warnings ??= [], e.warnings.push(t);
 }
 function Kn(e) {
-	if (e instanceof A) return ["u", String(e.value)];
-	if (e instanceof j) return ["n", String(e.value)];
-	if (e instanceof H) return ["t", e.value];
-	if (e instanceof I) return ["t", e.chunks.map((e) => e.value).join("")];
-	if (e instanceof P) return ["b", i(e.value)];
-	if (e instanceof F) {
+	if (e instanceof j) return ["u", String(e.value)];
+	if (e instanceof M) return ["n", String(e.value)];
+	if (e instanceof U) return ["t", e.value];
+	if (e instanceof L) return ["t", e.chunks.map((e) => e.value).join("")];
+	if (e instanceof F) return ["b", i(e.value)];
+	if (e instanceof I) {
 		let t = "";
 		for (let n of e.chunks) t += i(n.value);
 		return ["b", t];
 	}
-	if (e instanceof M) return isNaN(e.value) ? ["f", "NaN"] : Object.is(e.value, -0) ? ["f", "-0"] : ["f", String(e.value)];
-	if (e instanceof z) return ["s", e.value];
-	if (e instanceof L) return ["A", e.items.map(Kn)];
-	if (e instanceof R) {
+	if (e instanceof N) return isNaN(e.value) ? ["f", "NaN"] : Object.is(e.value, -0) ? ["f", "-0"] : ["f", String(e.value)];
+	if (e instanceof B) return ["s", e.value];
+	if (e instanceof R) return ["A", e.items.map(Kn)];
+	if (e instanceof z) {
 		let t = e.entries.map(([e, t]) => [Kn(e), Kn(t)]);
 		if (t.length <= 1) return ["M", t];
 		let n = t.map((e) => [JSON.stringify(e[0]), e]);
 		return n.sort((e, t) => e[0] < t[0] ? -1 : +(e[0] > t[0])), ["M", n.map((e) => e[1])];
 	}
-	return e instanceof N ? [
+	return e instanceof P ? [
 		"G",
 		String(e.tag),
 		Kn(e.content)
 	] : ["c", i(e.toCBOR())];
 }
 function qn(e) {
-	if (e instanceof A) return "u" + e.value;
-	if (e instanceof j) return "n" + e.value;
-	if (e instanceof H) return "t" + e.value;
-	if (e instanceof I) {
+	if (e instanceof j) return "u" + e.value;
+	if (e instanceof M) return "n" + e.value;
+	if (e instanceof U) return "t" + e.value;
+	if (e instanceof L) {
 		let t = "t";
 		for (let n of e.chunks) t += n.value;
 		return t;
 	}
-	if (e instanceof P) return "b" + i(e.value);
-	if (e instanceof F) {
+	if (e instanceof F) return "b" + i(e.value);
+	if (e instanceof I) {
 		let t = "b";
 		for (let n of e.chunks) t += i(n.value);
 		return t;
 	}
-	return e instanceof M ? isNaN(e.value) ? "fNaN" : Object.is(e.value, -0) ? "f-0" : "f" + e.value : e instanceof z ? "s" + e.value : JSON.stringify(Kn(e));
+	return e instanceof N ? isNaN(e.value) ? "fNaN" : Object.is(e.value, -0) ? "f-0" : "f" + e.value : e instanceof B ? "s" + e.value : JSON.stringify(Kn(e));
 }
 var Jn = Array.from({ length: 24 }, (e, t) => BigInt(t)), Yn;
 function Xn(e) {
@@ -2797,36 +2799,36 @@ function rr(e, t, n, r) {
 		case 0: {
 			let { value: n, nextOffset: r } = Qn(e, t, o);
 			return {
-				value: new A(n, { encodingWidth: Vn(o, n) }),
+				value: new j(n, { encodingWidth: Vn(o, n) }),
 				nextOffset: r
 			};
 		}
 		case 1: {
 			let { value: n, nextOffset: r } = Qn(e, t, o), i = Vn(o, n);
 			return {
-				value: new j(-1n - n, { encodingWidth: i }),
+				value: new M(-1n - n, { encodingWidth: i }),
 				nextOffset: r
 			};
 		}
 		case 2: {
 			if (o === 31) {
-				let { chunks: i, nextOffset: a } = er(e, t, n, r, "byte string", (e) => e instanceof P);
+				let { chunks: i, nextOffset: a } = er(e, t, n, r, "byte string", (e) => e instanceof F);
 				return {
-					value: new F(i),
+					value: new I(i),
 					nextOffset: a
 				};
 			}
 			let { value: i, nextOffset: a } = $n(e, t, o), s = Hn(o, i);
 			return a + i > e.byteLength && J("byte string extends beyond input"), {
-				value: new P(new Uint8Array(e.buffer, e.byteOffset + a, i).slice(), { encodingWidth: s }),
+				value: new F(new Uint8Array(e.buffer, e.byteOffset + a, i).slice(), { encodingWidth: s }),
 				nextOffset: a + i
 			};
 		}
 		case 3: {
 			if (o === 31) {
-				let { chunks: i, nextOffset: a } = er(e, t, n, r, "text string", (e) => e instanceof H);
+				let { chunks: i, nextOffset: a } = er(e, t, n, r, "text string", (e) => e instanceof U);
 				return {
-					value: new I(i),
+					value: new L(i),
 					nextOffset: a
 				};
 			}
@@ -2839,7 +2841,7 @@ function rr(e, t, n, r) {
 			} catch {
 				u = Gn("invalid UTF-8 sequence in text string", a, n), l = Wn.decode(c);
 			}
-			let f = new H(l, { encodingWidth: s });
+			let f = new U(l, { encodingWidth: s });
 			return u && Y(f, u), {
 				value: f,
 				nextOffset: a + i
@@ -2857,7 +2859,7 @@ function rr(e, t, n, r) {
 					i.push(t.value), a = t.nextOffset;
 				}
 				return {
-					value: new L(i, { indefiniteLength: !0 }),
+					value: new R(i, { indefiniteLength: !0 }),
 					nextOffset: a
 				};
 			}
@@ -2867,7 +2869,7 @@ function rr(e, t, n, r) {
 				c.push(t.value), l = t.nextOffset;
 			}
 			return {
-				value: new L(c, { encodingWidth: s }),
+				value: new R(c, { encodingWidth: s }),
 				nextOffset: l
 			};
 		}
@@ -2884,7 +2886,7 @@ function rr(e, t, n, r) {
 					let c = X(e, s, n, r);
 					s = c.nextOffset, i.push([t.value, c.value]);
 				}
-				let c = new R(i, { indefiniteLength: !0 });
+				let c = new z(i, { indefiniteLength: !0 });
 				for (let e of o) Y(c, e);
 				return {
 					value: c,
@@ -2898,7 +2900,7 @@ function rr(e, t, n, r) {
 				let i = X(e, d, n, r);
 				d = i.nextOffset, c.push([t.value, i.value]);
 			}
-			let f = new R(c, { encodingWidth: s });
+			let f = new z(c, { encodingWidth: s });
 			for (let e of u) Y(f, e);
 			return {
 				value: f,
@@ -2910,49 +2912,49 @@ function rr(e, t, n, r) {
 			let { value: i, nextOffset: a } = Qn(e, t, o), s = Vn(o, i), c = X(e, a, n, r);
 			for (let e of r) {
 				let t = e.parseTag(i, c.value, n);
-				if (t !== void 0) return t instanceof N && s !== void 0 && (t.encodingWidth = s), {
+				if (t !== void 0) return t instanceof P && s !== void 0 && (t.encodingWidth = s), {
 					value: t,
 					nextOffset: c.nextOffset
 				};
 			}
 			return {
-				value: new N(i, c.value, { encodingWidth: s }),
+				value: new P(i, c.value, { encodingWidth: s }),
 				nextOffset: c.nextOffset
 			};
 		}
 		case 7:
 			if (o <= 19) return {
-				value: new z(o),
+				value: new B(o),
 				nextOffset: t
 			};
 			if (o === 20) return {
-				value: new z(20),
+				value: new B(20),
 				nextOffset: t
 			};
 			if (o === 21) return {
-				value: new z(21),
+				value: new B(21),
 				nextOffset: t
 			};
 			if (o === 22) return {
-				value: new z(22),
+				value: new B(22),
 				nextOffset: t
 			};
 			if (o === 23) return {
-				value: new z(23),
+				value: new B(23),
 				nextOffset: t
 			};
 			if (o === 24) {
 				t + 1 > e.byteLength && J("unexpected end of input");
 				let r = e.getUint8(t);
 				if (r < 32) {
-					let e = Gn(`simple value ${r} must be encoded in initial byte (0–31 reserved for extended encoding)`, t - 1, n), i = new z(r);
+					let e = Gn(`simple value ${r} must be encoded in initial byte (0–31 reserved for extended encoding)`, t - 1, n), i = new B(r);
 					return Y(i, e), {
 						value: i,
 						nextOffset: t + 1
 					};
 				}
 				return {
-					value: new z(r),
+					value: new B(r),
 					nextOffset: t + 1
 				};
 			}
@@ -2960,7 +2962,7 @@ function rr(e, t, n, r) {
 				t + 2 > e.byteLength && J("unexpected end of input");
 				let n = E(e.getUint16(t, !1));
 				return {
-					value: new M(n, {
+					value: new N(n, {
 						precision: "half",
 						rawBits: Number.isNaN(n) ? nr(e, t, 2) : void 0
 					}),
@@ -2971,7 +2973,7 @@ function rr(e, t, n, r) {
 				t + 4 > e.byteLength && J("unexpected end of input");
 				let n = e.getFloat32(t, !1);
 				return {
-					value: new M(n, {
+					value: new N(n, {
 						precision: "single",
 						rawBits: Number.isNaN(n) ? nr(e, t, 4) : void 0
 					}),
@@ -2982,7 +2984,7 @@ function rr(e, t, n, r) {
 				t + 8 > e.byteLength && J("unexpected end of input");
 				let n = e.getFloat64(t, !1);
 				return {
-					value: new M(n, {
+					value: new N(n, {
 						precision: "double",
 						rawBits: Number.isNaN(n) ? nr(e, t, 8) : void 0
 					}),
@@ -3017,7 +3019,7 @@ function ar(e, t) {
 var or = 24n, sr = {
 	tagNumbers: [or],
 	parseTag(e, t, n) {
-		if (e !== 24n || !(t instanceof P)) return;
+		if (e !== 24n || !(t instanceof F)) return;
 		let r = (t.end ?? t.value.length) - t.value.length, i = n ? {
 			extensions: n.extensions,
 			builtinExtensions: n.builtinExtensions,
@@ -3029,7 +3031,7 @@ var or = 24n, sr = {
 			silent: n.silent
 		} : void 0;
 		try {
-			return new N(or, new He([ar(t.value, i)], { encodingWidth: t.encodingWidth }));
+			return new P(or, new Ve([ar(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 = {
@@ -3044,15 +3046,15 @@ var or = 24n, sr = {
 //#endregion
 //#region src/extensions/ellipsis.ts
 function cr(e) {
-	return e instanceof B && !(e.content instanceof L);
+	return e instanceof V && !(e.content instanceof R);
 }
 function lr(e) {
 	let t = !1, n = !1, r = !1, i;
 	for (let a of e) {
 		let e;
 		if (cr(a)) e = !0, r = !0;
-		else if (a instanceof H) e = !1, t = !0;
-		else if (a instanceof P) e = !1, n = !0;
+		else if (a instanceof U) e = !1, t = !0;
+		else if (a instanceof F) e = !1, n = !0;
 		else return !1;
 		if (e === i) return !1;
 		i = e;
@@ -3063,8 +3065,8 @@ var ur = {
 	tagNumbers: [Ke],
 	parseTag(e, t) {
 		if (e === 888n) {
-			if (t instanceof z && t.value === 22) return new B();
-			if (t instanceof L && lr(t.items)) return new B(t.items);
+			if (t instanceof B && t.value === 22) return new V();
+			if (t instanceof R && lr(t.items)) return new V(t.items);
 		}
 	}
 }, dr = new TextEncoder(), fr = new TextDecoder("utf-8", { fatal: !0 }), pr = new TextDecoder("utf-8", { fatal: !1 }), mr = Symbol("ellipsis");
@@ -3080,24 +3082,24 @@ function gr(e, t, n) {
 		gr(e, t.inner, n);
 		return;
 	}
-	if (t instanceof B) {
-		if (t.content instanceof L) for (let r of t.content.items) gr(e, r, n);
+	if (t instanceof V) {
+		if (t.content instanceof R) for (let r of t.content.items) gr(e, r, n);
 		else n.push(mr);
 		return;
 	}
-	if (t instanceof H) {
+	if (t instanceof U) {
 		n.push(dr.encode(t.value));
 		return;
 	}
-	if (t instanceof P) {
+	if (t instanceof F) {
 		n.push(t.value);
 		return;
 	}
-	if (t instanceof I) {
+	if (t instanceof L) {
 		n.push(dr.encode(t.chunks.map((e) => e.value).join("")));
 		return;
 	}
-	if (t instanceof F) {
+	if (t instanceof I) {
 		n.push(hr(t.chunks.map((e) => e.value)));
 		return;
 	}
@@ -3119,21 +3121,21 @@ function vr(e, t, n) {
 	let i = e === "t1", a = [], o = !1, s = [], c = () => {
 		if (s.length === 0) return;
 		let e = hr(s);
-		s.length = 0, e.length !== 0 && a.push(i ? new H(_r(e, n)) : new P(e));
+		s.length = 0, e.length !== 0 && a.push(i ? new U(_r(e, n)) : new F(e));
 	};
-	for (let e of r) e === mr ? (c(), a[a.length - 1] instanceof B || (a.push(new B()), o = !0)) : s.push(e);
+	for (let e of r) e === mr ? (c(), a[a.length - 1] instanceof V || (a.push(new V()), o = !0)) : s.push(e);
 	if (!o) {
 		let e = hr(s);
-		return i ? new H(_r(e, n)) : new P(e);
+		return i ? new U(_r(e, n)) : new F(e);
 	}
-	return c(), a.length === 1 ? new B() : new B(a);
+	return c(), a.length === 1 ? new V() : new V(a);
 }
 function yr(e) {
 	return {
 		appStringPrefixes: [e],
 		preserveAppSeqSource: !0,
 		parseAppString(t, n, r) {
-			return vr(e, [new H(n)], r);
+			return vr(e, [new U(n)], r);
 		},
 		parseAppSequence(t, n, r) {
 			return vr(e, n, r);
@@ -3151,12 +3153,12 @@ function Tr(e) {
 function Er(e, t, n) {
 	let r = e === "ilts", i = [], a = [];
 	for (let o of t) {
-		if (o instanceof Ge && (o = o.inner), o instanceof B) throw SyntaxError(`${e}<<...>> cannot contain ellipses; there is no way to include an elision in an indefinite-length string`);
+		if (o instanceof Ge && (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`);
 		let t, s, c;
-		if (o instanceof H) t = o.value, c = o.encodingWidth;
-		else if (o instanceof P) s = o.value, c = o.encodingWidth;
-		else if (o instanceof I) t = o.chunks.map((e) => e.value).join("");
-		else if (o instanceof F) s = Tr(o.chunks.map((e) => e.value));
+		if (o instanceof U) t = o.value, c = o.encodingWidth;
+		else if (o instanceof F) s = o.value, c = o.encodingWidth;
+		else if (o instanceof L) t = o.chunks.map((e) => e.value).join("");
+		else if (o instanceof I) s = Tr(o.chunks.map((e) => e.value));
 		else throw SyntaxError(`${e}<<...>> arguments must be (text or byte) strings`);
 		if (r) {
 			let e;
@@ -3169,20 +3171,20 @@ function Er(e, t, n) {
 				else throw SyntaxError(t);
 				e = wr.decode(s);
 			}
-			a.push(new H(e, c === void 0 ? void 0 : { encodingWidth: c }));
+			a.push(new U(e, c === void 0 ? void 0 : { encodingWidth: c }));
 		} else {
 			let e = s ?? Sr.encode(t);
-			i.push(new P(e, c === void 0 ? void 0 : { encodingWidth: c }));
+			i.push(new F(e, c === void 0 ? void 0 : { encodingWidth: c }));
 		}
 	}
-	return r ? new I(a) : new F(i);
+	return r ? new L(a) : new I(i);
 }
 function Dr(e) {
 	return {
 		appStringPrefixes: [e],
 		preserveAppSeqSource: !0,
 		parseAppString(t, n, r) {
-			return new Ge(Er(e, [new H(n)], r), `${e}${ve(n)}`);
+			return new Ge(Er(e, [new U(n)], r), `${e}${ve(n)}`);
 		},
 		parseAppSequence(t, n, r) {
 			return Er(e, n, r);
@@ -3227,7 +3229,7 @@ function Ar(e) {
 }
 //#endregion
 //#region src/extensions/float.ts
-var jr = class extends M {
+var jr = class extends N {
 	_bits;
 	constructor(e) {
 		super(E(e), { precision: "half" }), this._bits = e & 65535;
@@ -3239,7 +3241,7 @@ var jr = class extends M {
 			this._bits & 255
 		]);
 	}
-}, Mr = class extends M {
+}, Mr = class extends N {
 	_raw;
 	constructor(e) {
 		super(new DataView(e.buffer, e.byteOffset).getFloat32(0, !1), { precision: "single" }), this._raw = e.slice();
@@ -3248,7 +3250,7 @@ var jr = class extends M {
 		let e = /* @__PURE__ */ new Uint8Array(5);
 		return e[0] = 250, e.set(this._raw, 1), e;
 	}
-}, Nr = class extends M {
+}, Nr = class extends N {
 	_raw;
 	constructor(e) {
 		super(new DataView(e.buffer, e.byteOffset).getFloat64(0, !1), { precision: "double" }), this._raw = e.slice();
@@ -3350,7 +3352,7 @@ var zr = {
 			if (n) n(e);
 			else throw SyntaxError(e);
 		}
-		if (!(t[0] instanceof P)) throw SyntaxError("float<<...>> item must be a byte string");
+		if (!(t[0] instanceof F)) throw SyntaxError("float<<...>> item must be a byte string");
 		return Pr(t[0].value);
 	}
 }, Br = [
@@ -3358,7 +3360,7 @@ var zr = {
 	sr,
 	ur
 ], Vr = [
-	Gt,
+	Wt,
 	un,
 	Ln,
 	br,
@@ -3398,7 +3400,7 @@ function Gr(e) {
 function Kr(e, t) {
 	if (t?.replacer) {
 		let { replacer: n, ...r } = t, i = Jr(e, n, r.extensions, r.undefinedOmits, r.builtinExtensions);
-		return i === h ? z.UNDEFINED : Kr(i, Object.keys(r).length > 0 ? r : void 0);
+		return i === h ? B.UNDEFINED : Kr(i, Object.keys(r).length > 0 ? r : void 0);
 	}
 	return Q(e, t, !0, Gr(t));
 }
@@ -3413,27 +3415,27 @@ function Q(e, t, n, r) {
 			let t = e.parseTag(n, i);
 			if (t !== void 0) return t;
 		}
-		return new N(n, i);
-	}
-	if (e instanceof m.Null) return z.NULL;
-	if (e instanceof m.Undefined) return z.UNDEFINED;
-	if (e instanceof g) return new z(e.value);
-	if (e === null) return z.NULL;
-	if (e === void 0) return z.UNDEFINED;
-	if (e === !0) return z.TRUE;
-	if (e === !1) return z.FALSE;
-	if (typeof e == "bigint") return e > 18446744073709551615n ? new $e(e) : e < -18446744073709551616n ? new et(e) : e >= 0n ? new A(e) : new j(e);
-	if (typeof e == "number") return (t?.encodeIntegerAs ?? "int") === "int" && Number.isInteger(e) && !Object.is(e, -0) ? e >= 0 ? new A(BigInt(e)) : new j(BigInt(e)) : new M(e);
-	if (typeof e == "string") return new H(e);
+		return new P(n, i);
+	}
+	if (e instanceof m.Null) return B.NULL;
+	if (e instanceof m.Undefined) return B.UNDEFINED;
+	if (e instanceof g) return new B(e.value);
+	if (e === null) return B.NULL;
+	if (e === void 0) return B.UNDEFINED;
+	if (e === !0) return B.TRUE;
+	if (e === !1) return B.FALSE;
+	if (typeof e == "bigint") return e > 18446744073709551615n ? new $e(e) : e < -18446744073709551616n ? new et(e) : e >= 0n ? new j(e) : new M(e);
+	if (typeof e == "number") return (t?.encodeIntegerAs ?? "int") === "int" && Number.isInteger(e) && !Object.is(e, -0) ? e >= 0 ? new j(BigInt(e)) : new M(BigInt(e)) : new N(e);
+	if (typeof e == "string") return new U(e);
 	if (e instanceof Number || e instanceof Boolean || e instanceof String || Object.prototype.toString.call(e) === "[object BigInt]") return Q(e.valueOf(), t, !1, r);
-	if (e instanceof ArrayBuffer || typeof SharedArrayBuffer < "u" && e instanceof SharedArrayBuffer) return new P(new Uint8Array(e));
-	if (ArrayBuffer.isView(e)) return e instanceof Uint8Array && t?.uint8ArrayAs === "array" ? new L(Array.from(e, (e) => new A(BigInt(e)))) : new P(new Uint8Array(e.buffer, e.byteOffset, e.byteLength));
-	if (e instanceof $) return new R([...e].map(([e, n]) => [Q(e, t, !0, r), Q(n, t, !0, r)]));
-	if (Array.isArray(e)) return new L(e.map((e) => Q(e, t, !0, r)));
+	if (e instanceof ArrayBuffer || typeof SharedArrayBuffer < "u" && e instanceof SharedArrayBuffer) return new F(new Uint8Array(e));
+	if (ArrayBuffer.isView(e)) return e instanceof Uint8Array && t?.uint8ArrayAs === "array" ? new R(Array.from(e, (e) => new j(BigInt(e)))) : new F(new Uint8Array(e.buffer, e.byteOffset, e.byteLength));
+	if (e instanceof $) return new z([...e].map(([e, n]) => [Q(e, t, !0, r), Q(n, t, !0, r)]));
+	if (Array.isArray(e)) return new R(e.map((e) => Q(e, t, !0, r)));
 	if (typeof e == "object") {
 		let n = [];
-		for (let [i, a] of Object.entries(e)) n.push([new H(i), Q(a, t, !0, r)]);
-		return new R(n);
+		for (let [i, a] of Object.entries(e)) n.push([new U(i), Q(a, t, !0, r)]);
+		return new z(n);
 	}
 	throw TypeError(`fromJS: unsupported value type: ${typeof e}`);
 }
@@ -3516,6 +3518,6 @@ var $ = class extends Array {
 	}
 };
 //#endregion
-export { A, L as C, N as D, P as E, s as F, m as I, c as L, g as M, h as N, M as O, o as P, R as S, F as T, it as _, zr as a, He as b, kr as c, ar as d, Ln as f, H as g, Kt as h, Vr as i, k as j, j as k, xr as l, Gt as m, Jr as n, Ar as o, un as p, Kr as r, Or as s, $ as t, br as u, et as v, I as w, z as x, $e as y };
+export { P as A, s as B, Ve as C, L as D, R as E, A as F, c as H, k as I, g as L, Re as M, M as N, I as O, j as P, h as R, He as S, z as T, m as V, it as _, zr as a, V as b, kr as c, ar as d, Ln as f, U as g, Gt as h, Vr as i, N as j, F as k, xr as l, Wt as m, Jr as n, Ar as o, un as p, Kr as r, Or as s, $ as t, br as u, et as v, B as w, Ge as x, $e as y, o as z };
 
-//# sourceMappingURL=mapEntries-hyNVtz5Z.js.map
+//# sourceMappingURL=mapEntries-Czxt-cmd.js.map