@cbortech/cbor 0.25.5 → 0.25.7

package/dist/{mapEntries-D6BfG4-1.js → mapEntries-bvRWFfqX.js}

@@ -1,4 +1,4 @@
-import { n as e, t } from "./tokenizer-C597LW89.js";
+import { n as e, t } from "./tokenizer-BuRSmdyM.js";
 //#region src/tag.ts
 var n = Symbol.for("cbor.tag"), r = class {
 	valueOf() {
@@ -95,16 +95,16 @@ var u = class {
 	}
 }, p = Array.from({ length: 256 }, (e, t) => t.toString(16).padStart(2, "0")), m = new Int8Array(128).fill(-1);
 for (let e = 0; e < 16; e++) m["0123456789abcdef".charCodeAt(e)] = e, m["0123456789ABCDEF".charCodeAt(e)] = e;
-var ee = typeof Uint8Array.prototype.toHex == "function", te = typeof Uint8Array.fromHex == "function", ne = 256;
-function re(e) {
-	if (ee) return e.toHex();
+var h = typeof Uint8Array.prototype.toHex == "function", g = typeof Uint8Array.fromHex == "function", ee = 256;
+function te(e) {
+	if (h) return e.toHex();
 	let t = "";
 	for (let n = 0; n < e.length; n++) t += p[e[n]];
 	return t;
 }
-function ie(e) {
+function ne(e) {
 	if (e.length % 2 != 0) throw SyntaxError(`hex string has odd length: ${e.length}`);
-	if (te && e.length >= ne) return Uint8Array.fromHex(e);
+	if (g && e.length >= ee) return Uint8Array.fromHex(e);
 	let t = new Uint8Array(e.length / 2);
 	for (let n = 0, r = 0; n < e.length; n += 2, r++) {
 		let i = e.charCodeAt(n), a = e.charCodeAt(n + 1), o = i < 128 ? m[i] : -1, s = a < 128 ? m[a] : -1;
@@ -118,20 +118,20 @@ function ie(e) {
 }
 //#endregion
 //#region src/cdn/serialize-utils.ts
-function h(e) {
+function re(e) {
 	let t = e?.indent;
 	return t === void 0 ? null : typeof t == "number" ? " ".repeat(t) : t;
 }
-function g(e, t) {
+function _(e, t) {
 	return e.repeat(t);
 }
-function ae(e) {
+function ie(e) {
 	return !!(e.comments?.leading?.length || e.comments?.trailing?.length || e.comments?.dangling?.length);
 }
-function oe(e) {
+function ae(e) {
 	return !!(e.comments?.trailing?.length || e.comments?.dangling?.length);
 }
-function _(e, t) {
+function v(e, t) {
 	if (!t) return e.text;
 	let { marker: n, text: r } = e;
 	if (t === "c-style") return n === "#" ? "//" + r.slice(1) : n === "/" ? "/*" + r.slice(1, -1) + "*/" : r;
@@ -142,17 +142,17 @@ function _(e, t) {
 	}
 	return r;
 }
-function se(e, t, n) {
-	return (e.comments?.leading ?? []).map((e) => t + _(e, n));
+function oe(e, t, n) {
+	return (e.comments?.leading ?? []).map((e) => t + v(e, n));
 }
-function ce(e, t) {
+function se(e, t) {
 	let n = e.comments?.trailing ?? [];
-	return n.length === 0 ? "" : " " + n.map((e) => _(e, t)).join(" ");
+	return n.length === 0 ? "" : " " + n.map((e) => v(e, t)).join(" ");
 }
-function le(e, t, n) {
-	return (e.comments?.dangling ?? []).map((e) => t + _(e, n));
+function ce(e, t, n) {
+	return (e.comments?.dangling ?? []).map((e) => t + v(e, n));
 }
-function ue(e, t = !1) {
+function le(e, t = !1) {
 	let n = e?.commas ?? "comma", r = n !== "none";
 	return {
 		inlineSep: r ? t ? "," : ", " : " ",
@@ -161,15 +161,15 @@ function ue(e, t = !1) {
 		colSep: t ? ":" : ": "
 	};
 }
-var de = typeof new Uint8Array().toBase64 == "function";
-function fe(e) {
-	if (de) return e.toBase64({ omitPadding: !0 });
+var ue = typeof new Uint8Array().toBase64 == "function";
+function de(e) {
+	if (ue) return e.toBase64({ omitPadding: !0 });
 	let t = "";
 	for (let n of e) t += String.fromCharCode(n);
 	return btoa(t).replace(/=/g, "");
 }
-function pe(e) {
-	if (de) return e.toBase64({
+function fe(e) {
+	if (ue) return e.toBase64({
 		alphabet: "base64url",
 		omitPadding: !0
 	});
@@ -177,54 +177,54 @@ function pe(e) {
 	for (let n of e) t += String.fromCharCode(n);
 	return btoa(t).replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
 }
-var me = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567", he = "0123456789ABCDEFGHIJKLMNOPQRSTUV";
-function ge(e, t) {
+var pe = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567", me = "0123456789ABCDEFGHIJKLMNOPQRSTUV";
+function he(e, t) {
 	let n = "", r = 0, i = 0;
 	for (let a of e) for (r = r << 8 | a, i += 8; i >= 5;) i -= 5, n += t[r >> i & 31];
 	return i > 0 && (n += t[r << 5 - i & 31]), n;
 }
-function _e(e) {
+function ge(e) {
 	for (let t of e) {
 		let e = t.codePointAt(0);
 		if (e < 32 || e === 127) return !0;
 	}
 	return !1;
 }
-function ve(e, t, n) {
+function _e(e, t, n) {
 	if (n === "string") {
-		let t = be(e);
-		if (t != null) return Ce(t);
+		let t = ye(e);
+		if (t != null) return Se(t);
 	}
 	if (n === "printable-string" || n === void 0) {
-		let t = be(e);
-		if (t != null && !_e(t)) return Ce(t);
+		let t = ye(e);
+		if (t != null && !ge(t)) return Se(t);
 	}
 	switch (t) {
-		case "base64": return `b64'${fe(e)}'`;
-		case "base64url": return `b64'${pe(e)}'`;
-		case "base32": return `b32'${ge(e, me)}'`;
-		case "base32hex": return `h32'${ge(e, he)}'`;
-		default: return `h'${re(e)}'`;
+		case "base64": return `b64'${de(e)}'`;
+		case "base64url": return `b64'${fe(e)}'`;
+		case "base32": return `b32'${he(e, pe)}'`;
+		case "base32hex": return `h32'${he(e, me)}'`;
+		default: return `h'${te(e)}'`;
 	}
 }
-var ye = new TextDecoder("utf-8", { fatal: !0 });
-function be(e) {
+var ve = new TextDecoder("utf-8", { fatal: !0 });
+function ye(e) {
 	try {
-		return ye.decode(e);
+		return ve.decode(e);
 	} catch {
 		return null;
 	}
 }
-function xe(e, t) {
+function be(e, t) {
 	for (let n = 0; n < e.length; n++) {
 		let r = e.charCodeAt(n);
 		if (r === t || r === 92 || r < 32 || r === 127 || r >= 8192 && (r === 8232 || r === 8233 || r >= 8203 && r <= 8205 || r === 65279)) return !0;
 	}
 	return !1;
 }
-function Se(e, t) {
+function xe(e, t) {
 	let n = t.codePointAt(0);
-	if (!xe(e, n)) return t + e + t;
+	if (!be(e, n)) return t + e + t;
 	let r = t;
 	for (let i of e) {
 		let e = i.codePointAt(0);
@@ -249,31 +249,40 @@ function Se(e, t) {
 	}
 	return r + t;
 }
+function Se(e) {
+	return xe(e, "'");
+}
 function Ce(e) {
-	return Se(e, "'");
+	return xe(e, "'");
 }
 function we(e) {
-	return Se(e, "'");
+	return xe(e, "\"");
 }
 function Te(e) {
-	return Se(e, "\"");
-}
-function Ee(e) {
 	if (isNaN(e)) return "NaN";
 	if (!isFinite(e)) return e > 0 ? "Infinity" : "-Infinity";
 	if (Object.is(e, -0)) return "-0.0";
 	let t = e.toString();
 	return t.includes(".") || t.includes("e") ? t : t + ".0";
 }
-function De(e, t, n) {
-	return t === void 0 || t === n ? "" : t === "half" ? "_1" : t === "single" ? "_2" : "_3";
+function Ee(e, t, n, r) {
+	if (r === "never") return "";
+	let i = t ?? n;
+	return r === "always" ? i === "half" ? "_1" : i === "single" ? "_2" : "_3" : t === void 0 || t === n ? "" : t === "half" ? "_1" : t === "single" ? "_2" : "_3";
+}
+function y(e) {
+	return e <= 23n ? "i" : e <= 255n ? 0 : e <= 65535n ? 1 : e <= 4294967295n ? 2 : 3;
+}
+function b(e, t, n) {
+	let r = e?.encodingIndicators ?? "auto";
+	return r === "never" ? "" : r === "always" ? `_${t ?? n()}` : t === void 0 ? "" : `_${t}`;
 }
 //#endregion
 //#region src/utils/float16.ts
-var Oe = "getFloat16" in DataView.prototype && "setFloat16" in DataView.prototype, ke = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(8));
-function Ae(e) {
-	ke.setFloat64(0, e, !1);
-	let t = ke.getUint32(0, !1), n = ke.getUint32(4, !1), r = t >>> 31 & 1, i = t >>> 20 & 2047, a = t & 1048575;
+var De = "getFloat16" in DataView.prototype && "setFloat16" in DataView.prototype, Oe = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(8));
+function x(e) {
+	Oe.setFloat64(0, e, !1);
+	let t = Oe.getUint32(0, !1), n = Oe.getUint32(4, !1), r = t >>> 31 & 1, i = t >>> 20 & 2047, a = t & 1048575;
 	if (i === 2047) {
 		if (a === 0 && n === 0) return r << 15 | 31744;
 		let e = a >> 10 | (n === 0 ? 0 : 1) || 1;
@@ -294,15 +303,15 @@ function Ae(e) {
 	let u = o <= 0 ? 0 : o;
 	return r << 15 | u << 10 | s;
 }
-function je(e) {
+function S(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 Me = Oe ? (e, t, n, r) => {
+var ke = De ? (e, t, n, r) => {
 	e.setFloat16(t, n, r);
 } : (e, t, n, r) => {
-	e.setUint16(t, Ae(n), r);
-}, v = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(8)), y = new Uint8Array(v.buffer), b = class {
+	e.setUint16(t, x(n), r);
+}, C = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(8)), w = new Uint8Array(C.buffer), Ae = class {
 	buf;
 	len = 0;
 	constructor(e = 256) {
@@ -333,34 +342,34 @@ var Me = Oe ? (e, t, n, r) => {
 		t[this.len++] = e >>> 24 & 255, t[this.len++] = e >>> 16 & 255, t[this.len++] = e >>> 8 & 255, t[this.len++] = e & 255;
 	}
 	writeBigUint64(e) {
-		v.setBigUint64(0, e, !1), this._ensure(8), this.buf.set(y, this.len), this.len += 8;
+		C.setBigUint64(0, e, !1), this._ensure(8), this.buf.set(w, this.len), this.len += 8;
 	}
 	writeFloat16(e) {
-		Me(v, 0, e, !1), this._ensure(2);
+		ke(C, 0, e, !1), this._ensure(2);
 		let t = this.buf;
-		t[this.len++] = y[0], t[this.len++] = y[1];
+		t[this.len++] = w[0], t[this.len++] = w[1];
 	}
 	writeFloat32(e) {
-		v.setFloat32(0, e, !1), this._ensure(4);
+		C.setFloat32(0, e, !1), this._ensure(4);
 		let t = this.buf;
-		t[this.len++] = y[0], t[this.len++] = y[1], t[this.len++] = y[2], t[this.len++] = y[3];
+		t[this.len++] = w[0], t[this.len++] = w[1], t[this.len++] = w[2], t[this.len++] = w[3];
 	}
 	writeFloat64(e) {
-		v.setFloat64(0, e, !1), this._ensure(8), this.buf.set(y, this.len), this.len += 8;
+		C.setFloat64(0, e, !1), this._ensure(8), this.buf.set(w, this.len), this.len += 8;
 	}
 	finish() {
 		return this.buf.slice(0, this.len);
 	}
-}, Ne = [
+}, je = [
 	255n,
 	65535n,
 	4294967295n,
 	18446744073709551615n
 ];
-function Pe(e) {
-	return e === "i" ? 23n : Ne[e];
+function Me(e) {
+	return e === "i" ? 23n : je[e];
 }
-function x(e, t, n, r) {
+function T(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;
@@ -372,30 +381,30 @@ function x(e, t, n, r) {
 			e.writeByte(t << 5 | Number(i));
 			return;
 		}
-		if (i > Ne[r]) throw RangeError(`value ${i} does not fit in encodingWidth _${r} (max ${Ne[r]})`);
+		if (i > je[r]) throw RangeError(`value ${i} does not fit in encodingWidth _${r} (max ${je[r]})`);
 		let n = 24 + r;
 		e.writeByte(t << 5 | n), n === 24 ? e.writeByte(Number(i)) : n === 25 ? e.writeUint16(Number(i)) : n === 26 ? e.writeUint32(Number(i)) : e.writeBigUint64(i);
 		return;
 	}
 	i <= 23n ? e.writeByte(t << 5 | Number(i)) : i <= 255n ? (e.writeByte(t << 5 | 24), e.writeByte(Number(i))) : i <= 65535n ? (e.writeByte(t << 5 | 25), e.writeUint16(Number(i))) : i <= 4294967295n ? (e.writeByte(t << 5 | 26), e.writeUint32(Number(i))) : (e.writeByte(t << 5 | 27), e.writeBigUint64(i));
 }
-function S(e, t, n) {
-	let r = new b(9);
-	return x(r, e, t, n), r.finish();
+function Ne(e, t, n) {
+	let r = new Ae(9);
+	return T(r, e, t, n), r.finish();
 }
-var Fe = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(4));
-function Ie(e) {
-	return Object.is(je(Ae(e)), e);
+var Pe = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(4));
+function Fe(e) {
+	return Object.is(S(x(e)), e);
 }
-function Le(e) {
-	return Fe.setFloat32(0, e, !1), Object.is(Fe.getFloat32(0, !1), e);
+function Ie(e) {
+	return Pe.setFloat32(0, e, !1), Object.is(Pe.getFloat32(0, !1), e);
 }
-function Re(e) {
-	return Ie(e) ? "half" : Le(e) ? "single" : "double";
+function E(e) {
+	return Fe(e) ? "half" : Ie(e) ? "single" : "double";
 }
 //#endregion
 //#region src/ast/CborItem.ts
-var C = class e {
+var D = class e {
 	start;
 	end;
 	comments;
@@ -405,7 +414,7 @@ var C = class e {
 		let t = this._defaults ? {
 			...this._defaults,
 			...e
-		} : e, n = new b();
+		} : e, n = new Ae();
 		return this._encode(n, t), n.finish();
 	}
 	toCDN(e) {
@@ -414,7 +423,7 @@ var C = class e {
 			...e
 		} : e, n = this._toCDN(t, 0), r = t?.preserveComments;
 		if (!r) return n;
-		let i = typeof r == "string" ? r : void 0, a = this.comments?.leading?.map((e) => _(e, i)) ?? [], o = this.comments?.trailing ?? [], s = o.length === 0 ? n : `${n} ${o.map((e) => _(e, i).trimEnd()).join(" ")}`;
+		let i = typeof r == "string" ? r : void 0, a = this.comments?.leading?.map((e) => v(e, i)) ?? [], o = this.comments?.trailing ?? [], s = o.length === 0 ? n : `${n} ${o.map((e) => v(e, i).trimEnd()).join(" ")}`;
 		return [...a, s].join("\n");
 	}
 	toEDN(e) {
@@ -448,7 +457,7 @@ var C = class e {
 		t.writeBytes(this._toCBOR(n));
 	}
 	_toCBOR(e) {
-		let t = new b();
+		let t = new Ae();
 		return this._encodeTo(t, e), t.finish();
 	}
 	_toHexDump(e, t) {
@@ -458,7 +467,7 @@ var C = class e {
 			comment: this._toCDN(t, 0)
 		}];
 	}
-}, w = class extends C {
+}, O = class extends D {
 	value;
 	encodingWidth;
 	constructor(e, t) {
@@ -467,10 +476,10 @@ var C = class e {
 		this.encodingWidth = t?.encodingWidth;
 	}
 	_encodeTo(e, t) {
-		x(e, 0, this.value, this.encodingWidth);
+		T(e, 0, this.value, this.encodingWidth);
 	}
 	_toCDN(e, t) {
-		let n = this.encodingWidth === void 0 ? "" : `_${this.encodingWidth}`, r = this.value;
+		let n = b(e, this.encodingWidth, () => y(this.value)), r = this.value;
 		switch (e?.intFormat) {
 			case "hex": return `0x${r.toString(16)}${n}`;
 			case "octal": return `0o${r.toString(8)}${n}`;
@@ -482,7 +491,7 @@ var C = 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;
 	}
-}, T = class extends C {
+}, k = class extends D {
 	argument;
 	encodingWidth;
 	constructor(e, t) {
@@ -496,10 +505,10 @@ var C = class e {
 		return -1n - this.argument;
 	}
 	_encodeTo(e, t) {
-		x(e, 1, this.argument, this.encodingWidth);
+		T(e, 1, this.argument, this.encodingWidth);
 	}
 	_toCDN(e, t) {
-		let n = this.encodingWidth === void 0 ? "" : `_${this.encodingWidth}`, r = this.argument + 1n;
+		let n = b(e, this.encodingWidth, () => y(this.argument)), r = this.argument + 1n;
 		switch (e?.intFormat) {
 			case "hex": return `-0x${r.toString(16)}${n}`;
 			case "octal": return `-0o${r.toString(8)}${n}`;
@@ -511,8 +520,8 @@ var C = class e {
 		let t = this.value, n = e?.integerAs ?? "auto";
 		return n === "bigint" ? t : n === "number" || t >= BigInt(-(2 ** 53 - 1)) ? Number(t) : t;
 	}
-}, ze = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(8));
-function Be(e) {
+}, 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);
@@ -530,20 +539,20 @@ function Be(e) {
 	let l = c * 2 ** o;
 	return t ? -l : l;
 }
-function Ve(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";
-	ze.setFloat64(0, n, !1);
-	let r = ze.getUint32(0, !1), i = ze.getUint32(4, !1), a = r >>> 20 & 2047, o = r & 1048575, s = i, c = (o.toString(16).padStart(5, "0") + s.toString(16).padStart(8, "0")).replace(/0+$/, ""), l = c === "" ? "" : `.${c}`, u, d;
+	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 E = class extends C {
+var A = class extends D {
 	value;
 	precision;
 	ednSource;
@@ -551,18 +560,27 @@ var E = class extends C {
 		super(), this.value = e, this.precision = t?.precision;
 	}
 	_encodeTo(e, t) {
-		let n = this.precision ?? Re(this.value);
+		let n = this.precision ?? E(this.value);
 		n === "half" ? (e.writeByte(249), e.writeFloat16(this.value)) : n === "single" ? (e.writeByte(250), e.writeFloat32(this.value)) : (e.writeByte(251), e.writeFloat64(this.value));
 	}
 	_toCDN(e, t) {
-		if (e?.appStrings !== !1 && this.ednSource !== void 0) return this.ednSource;
-		let n = Re(this.value);
-		return (e?.floatFormat === "hex" ? Ve(this.value) : Ee(this.value)) + De(this.value, this.precision, n);
+		let n = e?.encodingIndicators ?? "auto";
+		if (e?.appStrings !== !1 && this.ednSource !== void 0) {
+			if (n === "never") return this.ednSource.replace(/_[0-3i]$/, "");
+			if (n === "always") {
+				if (/_[0-3i]$/.test(this.ednSource)) return this.ednSource;
+				let e = this.precision ?? E(this.value), t = e === "half" ? "_1" : e === "single" ? "_2" : "_3";
+				return this.ednSource + t;
+			}
+			return this.ednSource;
+		}
+		let r = E(this.value);
+		return (e?.floatFormat === "hex" ? ze(this.value) : Te(this.value)) + Ee(this.value, this.precision, r, n);
 	}
 	_toJS(e) {
 		return this.value;
 	}
-}, D = class extends C {
+}, j = class extends D {
 	tag;
 	content;
 	encodingWidth;
@@ -571,25 +589,28 @@ var E = class extends C {
 		this.content = t, this.encodingWidth = n?.encodingWidth;
 	}
 	_encodeTo(e, t) {
-		x(e, 6, this.tag, this.encodingWidth), this.content._encode(e, t);
+		T(e, 6, this.tag, this.encodingWidth), this.content._encode(e, t);
 	}
 	_toCDN(e, t) {
-		let n = this.encodingWidth === void 0 ? "" : `_${this.encodingWidth}`;
+		let n = b(e, this.encodingWidth, () => y(this.tag));
 		return `${this.tag}${n}(${this.content._toCDN(e, t)})`;
 	}
 	_toHexDump(e, t) {
 		let n = [{
 			depth: e,
-			hex: ((e) => Array.from(e, (e) => e.toString(16).toUpperCase().padStart(2, "0")).join(" "))(S(6, this.tag, this.encodingWidth)),
+			hex: ((e) => Array.from(e, (e) => e.toString(16).toUpperCase().padStart(2, "0")).join(" "))(Ne(6, this.tag, this.encodingWidth)),
 			comment: `Tag ${this.tag}`
 		}];
-		return n.push(...this.content._toHexDump(e + 1, t)), n;
+		return n.push(...this.content._toHexDump(e + 1, {
+			...t,
+			appStrings: !1
+		})), n;
 	}
 	_toJS(e) {
 		let t = this.content._toJS(e);
 		return e?.stripTags ? t : u.set(t, this.tag);
 	}
-}, O = class extends C {
+}, M = class extends D {
 	indefiniteLength = !1;
 	value;
 	ednEncoding;
@@ -599,18 +620,21 @@ var E = class extends C {
 		super(), this.value = e, this.ednEncoding = t?.ednEncoding ?? "hex", this.encodingWidth = t?.encodingWidth, this.ednSource = t?.ednSource;
 	}
 	_encodeTo(e, t) {
-		x(e, 2, this.value.length, this.encodingWidth), e.writeBytes(this.value);
+		T(e, 2, this.value.length, this.encodingWidth), e.writeBytes(this.value);
 	}
 	_toCDN(e, t) {
-		let n = this.encodingWidth === void 0 ? "" : `_${this.encodingWidth}`;
-		if (e?.preserveByteString && this.ednSource !== void 0) return this.ednSource + n;
-		let r = e?.bstrEncoding ?? this.ednEncoding;
-		return e?.appStrings === !1 && r !== "hex" && (r = "hex"), ve(this.value, r, e?.sqstr) + n;
+		if (e?.preserveByteString && this.ednSource !== void 0) {
+			if (/_[0-3i]$/.test(this.ednSource)) return (e?.encodingIndicators ?? "auto") === "never" ? this.ednSource.replace(/_[0-3i]$/, "") : this.ednSource;
+			let t = b(e, this.encodingWidth, () => y(BigInt(this.value.length)));
+			return this.ednSource + t;
+		}
+		let n = b(e, this.encodingWidth, () => y(BigInt(this.value.length))), r = e?.bstrEncoding ?? this.ednEncoding;
+		return e?.appStrings === !1 && r !== "hex" && (r = "hex"), _e(this.value, r, e?.sqstr) + n;
 	}
 	_toJS(e) {
 		return this.value;
 	}
-}, k = class extends C {
+}, N = class extends D {
 	indefiniteLength = !0;
 	chunks;
 	constructor(e) {
@@ -622,6 +646,11 @@ var E = class extends C {
 		e.writeByte(255);
 	}
 	_toCDN(e, t) {
+		if ((e?.encodingIndicators ?? "auto") === "never") {
+			let t = this.chunks.reduce((e, t) => e + t.value.length, 0), n = new Uint8Array(t), r = 0;
+			for (let e of this.chunks) n.set(e.value, r), r += e.value.length;
+			return new M(n)._toCDN(e, 0);
+		}
 		return this.chunks.length === 0 ? "''_" : `(_ ${this.chunks.map((t) => t._toCDN(e, 0)).join(", ")})`;
 	}
 	_toHexDump(e, t) {
@@ -642,7 +671,7 @@ var E = class extends C {
 		for (let e of this.chunks) n.set(e.value, r), r += e.value.length;
 		return n;
 	}
-}, A = class extends C {
+}, P = class extends D {
 	indefiniteLength = !0;
 	chunks;
 	constructor(e) {
@@ -654,7 +683,7 @@ var E = class extends C {
 		e.writeByte(255);
 	}
 	_toCDN(e, t) {
-		return this.chunks.length === 0 ? "\"\"_" : `(_ ${this.chunks.map((t) => t._toCDN(e, 0)).join(", ")})`;
+		return (e?.encodingIndicators ?? "auto") === "never" ? new z(this.chunks.map((e) => e.value).join(""))._toCDN(e, t) : this.chunks.length === 0 ? "\"\"_" : `(_ ${this.chunks.map((t) => t._toCDN(e, 0)).join(", ")})`;
 	}
 	_toHexDump(e, t) {
 		let n = (e) => e.toString(16).toUpperCase().padStart(2, "0"), r = [{
@@ -672,7 +701,7 @@ var E = class extends C {
 	_toJS(e) {
 		return this.chunks.map((e) => e.value).join("");
 	}
-}, j = class extends C {
+}, F = class extends D {
 	items;
 	indefiniteLength;
 	encodingWidth;
@@ -686,25 +715,25 @@ var E = class extends C {
 			e.writeByte(255);
 			return;
 		}
-		x(e, 4, this.items.length, this.encodingWidth);
+		T(e, 4, this.items.length, this.encodingWidth);
 		for (let n of this.items) n._encode(e, t);
 	}
 	_toCDN(e, t) {
-		let n = h(e), r = e?.preserveComments, i = typeof r == "string" ? r : void 0, a = r && (oe(this) || this.items.some(ae));
+		let n = re(e), r = e?.preserveComments, i = typeof r == "string" ? r : void 0, a = r && (ae(this) || this.items.some(ie));
 		n === null && a && (n = "  ");
-		let { inlineSep: o, multilineSep: s, trailSep: c } = ue(e, n === null), l = !this.indefiniteLength && this.encodingWidth !== void 0 ? `_${this.encodingWidth} ` : "";
+		let { inlineSep: o, multilineSep: s, trailSep: c } = le(e, n === null), l = this.indefiniteLength ? "" : b(e, this.encodingWidth, () => y(BigInt(this.items.length))), u = l ? l + " " : "", d = this.indefiniteLength && (e?.encodingIndicators ?? "auto") !== "never";
 		if (n === null || this.items.length === 0 && !a) {
 			let n = this.items.map((n) => n._toCDN(e, t + 1)).join(o);
-			return this.indefiniteLength ? this.items.length === 0 ? "[_ ]" : `[_ ${n}]` : `[${l}${n}]`;
+			return this.indefiniteLength ? d ? this.items.length === 0 ? "[_ ]" : `[_ ${n}]` : `[${n}]` : `[${u}${n}]`;
 		}
-		let u = g(n, t + 1), d = g(n, t), f = this.indefiniteLength ? "[_ " : `[${l}`, p = [];
+		let f = _(n, t + 1), p = _(n, t), m = this.indefiniteLength ? d ? "[_ " : "[" : `[${u}`, h = [];
 		for (let n = 0; n < this.items.length; n++) {
 			let a = this.items[n];
-			r && p.push(...se(a, u, i));
+			r && h.push(...oe(a, f, i));
 			let o = n < this.items.length - 1 ? s : c;
-			p.push(`${u}${a._toCDN(e, t + 1)}${o}${r ? ce(a, i) : ""}`);
+			h.push(`${f}${a._toCDN(e, t + 1)}${o}${r ? se(a, i) : ""}`);
 		}
-		return r && p.push(...le(this, u, i)), `${f}\n${p.join("\n")}\n${d}]`;
+		return r && h.push(...ce(this, f, i)), `${m}\n${h.join("\n")}\n${p}]`;
 	}
 	_toHexDump(e, t) {
 		let n = (e) => e.toString(16).toUpperCase().padStart(2, "0"), r = (e) => Array.from(e, (e) => e.toString(16).toUpperCase().padStart(2, "0")).join(" ");
@@ -723,7 +752,7 @@ var E = class extends C {
 		}
 		let i = [{
 			depth: e,
-			hex: r(S(4, BigInt(this.items.length), this.encodingWidth)),
+			hex: r(Ne(4, BigInt(this.items.length), this.encodingWidth)),
 			comment: `Array of length ${this.items.length}`
 		}];
 		for (let n of this.items) i.push(...n._toHexDump(e + 1, t));
@@ -742,7 +771,7 @@ var E = class extends C {
 		}
 		return r;
 	}
-}, M = class extends C {
+}, I = class extends D {
 	entries;
 	indefiniteLength;
 	encodingWidth;
@@ -756,29 +785,29 @@ var E = class extends C {
 			e.writeByte(255);
 			return;
 		}
-		x(e, 5, this.entries.length, this.encodingWidth);
+		T(e, 5, this.entries.length, this.encodingWidth);
 		for (let [n, r] of this.entries) n._encode(e, t), r._encode(e, t);
 	}
 	_toCDN(e, t) {
-		let n = h(e), r = e?.preserveComments, i = typeof r == "string" ? r : void 0, a = r && (oe(this) || this.entries.some(([e, t]) => ae(e) || ae(t)));
+		let n = re(e), r = e?.preserveComments, i = typeof r == "string" ? r : void 0, a = r && (ae(this) || this.entries.some(([e, t]) => ie(e) || ie(t)));
 		n === null && a && (n = "  ");
-		let { inlineSep: o, multilineSep: s, trailSep: c, colSep: l } = ue(e, n === null), u = !this.indefiniteLength && this.encodingWidth !== void 0 ? `_${this.encodingWidth} ` : "", d = this.indefiniteLength ? "{_ " : `{${u}`;
+		let { inlineSep: o, multilineSep: s, trailSep: c, colSep: l } = le(e, n === null), u = this.indefiniteLength ? "" : b(e, this.encodingWidth, () => y(BigInt(this.entries.length))), d = u ? u + " " : "", f = this.indefiniteLength && (e?.encodingIndicators ?? "auto") !== "never", p = this.indefiniteLength ? f ? "{_ " : "{" : `{${d}`;
 		if (n === null || this.entries.length === 0 && !a) {
 			let n = this.entries.map(([n, r]) => `${n._toCDN(e, t + 1)}${l}${r._toCDN(e, t + 1)}`).join(o);
-			return this.indefiniteLength ? this.entries.length === 0 ? "{_ }" : `{_ ${n}}` : `{${u}${n}}`;
+			return this.indefiniteLength ? f ? this.entries.length === 0 ? "{_ }" : `{_ ${n}}` : `{${n}}` : `{${d}${n}}`;
 		}
-		let f = g(n, t + 1), p = g(n, t), m = [];
+		let m = _(n, t + 1), h = _(n, t), g = [];
 		for (let n = 0; n < this.entries.length; n++) {
 			let [a, o] = this.entries[n];
-			r && m.push(...se(a, f, i));
-			let u = n < this.entries.length - 1 ? s : c, d = r ? He([
+			r && g.push(...oe(a, m, i));
+			let u = n < this.entries.length - 1 ? s : c, d = r ? Be([
 				...a.comments?.trailing ?? [],
 				...o.comments?.leading ?? [],
 				...o.comments?.trailing ?? []
 			], i) : "";
-			m.push(`${f}${a._toCDN(e, t + 1)}${l}${o._toCDN(e, t + 1)}${u}${d}`);
+			g.push(`${m}${a._toCDN(e, t + 1)}${l}${o._toCDN(e, t + 1)}${u}${d}`);
 		}
-		return r && m.push(...le(this, f, i)), `${d}\n${m.join("\n")}\n${p}}`;
+		return r && g.push(...ce(this, m, i)), `${p}\n${g.join("\n")}\n${h}}`;
 	}
 	_toHexDump(e, t) {
 		let n = (e) => e.toString(16).toUpperCase().padStart(2, "0"), r = (e) => Array.from(e, (e) => e.toString(16).toUpperCase().padStart(2, "0")).join(" ");
@@ -797,7 +826,7 @@ var E = class extends C {
 		}
 		let i = [{
 			depth: e,
-			hex: r(S(5, BigInt(this.entries.length), this.encodingWidth)),
+			hex: r(Ne(5, BigInt(this.entries.length), this.encodingWidth)),
 			comment: `Map of length ${this.entries.length}`
 		}];
 		for (let [n, r] of this.entries) i.push(...n._toHexDump(e + 1, t)), i.push(...r._toHexDump(e + 1, t));
@@ -849,12 +878,12 @@ var E = class extends C {
 		})() : n();
 	}
 };
-function He(e, t) {
-	return e.length === 0 ? "" : " " + e.map((e) => _(e, t).trimEnd()).join(" ");
+function Be(e, t) {
+	return e.length === 0 ? "" : " " + e.map((e) => v(e, t).trimEnd()).join(" ");
 }
 //#endregion
 //#region src/ast/CborSimple.ts
-var N = class e extends C {
+var L = class e extends D {
 	value;
 	constructor(e) {
 		if (super(), !Number.isInteger(e) || e < 0 || e > 255) throw RangeError("CborSimple value must be an integer in 0–255");
@@ -889,31 +918,33 @@ var N = class e extends C {
 			default: return new f(this.value);
 		}
 	}
-}, P = class extends C {
+}, Ve = class extends D {
 	items;
-	constructor(e) {
-		super(), this.items = e;
+	encodingWidth;
+	constructor(e, t) {
+		super(), this.items = e, this.encodingWidth = t?.encodingWidth;
 	}
 	_content(e) {
-		let t = new b();
+		let t = new Ae();
 		for (let n of this.items) n._encode(t, e);
 		return t.finish();
 	}
 	_encodeTo(e, t) {
 		let n = this._content(t);
-		x(e, 2, n.length), e.writeBytes(n);
+		T(e, 2, n.length, this.encodingWidth), e.writeBytes(n);
 	}
 	_toCDN(e, t) {
-		if (this.items.length === 0) return "<<>>";
-		let n = h(e), { inlineSep: r, multilineSep: i, trailSep: a } = ue(e, n === null);
-		if (n === null) return `<<${this.items.map((n) => n._toCDN(e, t + 1)).join(r)}>>`;
-		let o = g(n, t + 1), s = g(n, t), c = this.items.map((n) => `${o}${n._toCDN(e, t + 1)}`), l = c.length - 1;
-		return `<<\n${c.map((e, t) => t < l ? `${e}${i}` : `${e}${a}`).join("\n")}\n${s}>>`;
+		let n = b(e, this.encodingWidth, () => y(BigInt(this._content(e).length)));
+		if (this.items.length === 0) return `<<>>${n}`;
+		let r = re(e), { inlineSep: i, multilineSep: a, trailSep: o } = le(e, r === null);
+		if (r === null) return `<<${this.items.map((n) => n._toCDN(e, t + 1)).join(i)}>>${n}`;
+		let s = _(r, t + 1), c = _(r, t), l = this.items.map((n) => `${s}${n._toCDN(e, t + 1)}`), u = l.length - 1;
+		return `<<\n${l.map((e, t) => t < u ? `${e}${a}` : `${e}${o}`).join("\n")}\n${c}>>${n}`;
 	}
 	_toHexDump(e, t) {
 		let n = (e) => Array.from(e, (e) => e.toString(16).toUpperCase().padStart(2, "0")).join(" "), r = this._content().length, i = [{
 			depth: e,
-			hex: n(S(2, BigInt(r))),
+			hex: n(Ne(2, BigInt(r), this.encodingWidth)),
 			comment: `Embedded CBOR sequence, ${r} byte${r === 1 ? "" : "s"}`
 		}];
 		for (let n of this.items) i.push(...n._toHexDump(e + 1, t));
@@ -922,17 +953,17 @@ var N = class e extends C {
 	_toJS(e) {
 		return this._content();
 	}
-}, Ue = 999n, F = class extends D {
+}, He = 999n, Ue = class extends j {
 	constructor(e, t) {
-		let n = t.length === 1 && t[0] instanceof z ? t[0] : new j(t);
-		super(Ue, new j([new z(e), n]));
+		let n = t.length === 1 && t[0] instanceof z ? t[0] : new F(t);
+		super(He, new F([new z(e), n]));
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
 		let n = this.content, r = n.items[0].value, i = n.items[1];
-		return i instanceof z ? `${r}${we(i.value)}` : `${r}<<${i.items.map((n) => n._toCDN(e, t)).join(", ")}>>`;
+		return i instanceof z ? `${r}${Ce(i.value)}` : `${r}<<${i.items.map((n) => n._toCDN(e, t)).join(", ")}>>`;
 	}
-}, We = class extends C {
+}, We = class extends D {
 	inner;
 	ednSource;
 	constructor(e, t) {
@@ -942,17 +973,18 @@ var N = class e extends C {
 		this.inner._encode(e, t);
 	}
 	_toCDN(e, t) {
-		return e?.appStrings === !1 ? this.inner._toCDN(e, t) : this.ednSource;
+		let n = e?.encodingIndicators ?? "auto";
+		return e?.appStrings !== !1 && n === "auto" ? this.ednSource : this.inner._toCDN(e, t);
 	}
 	_toJS(e) {
 		return this.inner._toJS(e);
 	}
-}, Ge = 888n, I = class extends D {
+}, Ge = 888n, R = class extends j {
 	constructor(e) {
-		e === void 0 ? super(Ge, N.NULL) : super(Ge, new j(e));
+		e === void 0 ? super(Ge, L.NULL) : super(Ge, new F(e));
 	}
 	_toCDN(e, t) {
-		return this.content instanceof N ? "..." : this.content instanceof j ? this.content.items.map((n) => n._toCDN(e, t)).join(" + ") : super._toCDN(e, t);
+		return this.content instanceof L ? "..." : this.content instanceof F ? this.content.items.map((n) => n._toCDN(e, t)).join(" + ") : super._toCDN(e, t);
 	}
 }, Ke = 2n, qe = 3n, Je = 18446744073709551615n, Ye = -18446744073709551616n;
 function Xe(e) {
@@ -969,11 +1001,11 @@ function Ze(e) {
 	for (let n of e) t = t << 8n | BigInt(n);
 	return t;
 }
-var Qe = class extends D {
+var Qe = class extends j {
 	bigValue;
 	constructor(e) {
 		if (e <= Je) throw RangeError(`CborBigUint value ${e} fits in CborUint; use CborUint instead`);
-		super(Ke, new O(Xe(e))), this.bigValue = e;
+		super(Ke, new M(Xe(e))), this.bigValue = e;
 	}
 	_toCDN(e, t) {
 		return this.bigValue.toString();
@@ -981,11 +1013,11 @@ var Qe = class extends D {
 	_toJS(e) {
 		return this.bigValue;
 	}
-}, L = class extends D {
+}, $e = class extends j {
 	bigValue;
 	constructor(e) {
 		if (e >= Ye) throw RangeError(`CborBigNint value ${e} fits in CborNint; use CborNint instead`);
-		super(qe, new O(Xe(-1n - e))), this.bigValue = e;
+		super(qe, new M(Xe(-1n - e))), this.bigValue = e;
 	}
 	_toCDN(e, t) {
 		return this.bigValue.toString();
@@ -993,22 +1025,22 @@ var Qe = class extends D {
 	_toJS(e) {
 		return this.bigValue;
 	}
-}, $e = new TextEncoder(), et = new TextDecoder("utf-8", { fatal: !0 }), tt = new TextDecoder("utf-8", { fatal: !1 });
-function nt(e, n) {
-	let r = new t(e, { offset: n?.offset }), i = new pt(r, n ?? {}).parse();
-	return n?.preserveComments && st(i, r.comments, e), i;
+}, et = new TextEncoder(), tt = new TextDecoder("utf-8", { fatal: !0 }), nt = new TextDecoder("utf-8", { fatal: !1 });
+function rt(e, n) {
+	let r = new t(e, { offset: n?.offset }), i = new ht(r, n ?? {}).parse();
+	return n?.preserveComments && ct(i, r.comments, e), i;
 }
-function rt(e) {
+function it(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 it(e) {
+function at(e) {
 	return e.startsWith("-") ? -BigInt(e.slice(1)) : BigInt(e);
 }
-function at(e, t) {
+function ot(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);
@@ -1032,14 +1064,14 @@ function at(e, t) {
 	};
 	let n = e, r;
 	return e.endsWith("_1") ? (r = "half", n = e.slice(0, -2)) : e.endsWith("_2") ? (r = "single", n = e.slice(0, -2)) : e.endsWith("_3") && (r = "double", n = e.slice(0, -2)), /^-?0[xX]/.test(n) ? {
-		value: Be(n),
+		value: Re(n),
 		precision: r
 	} : {
 		value: parseFloat(n),
 		precision: r
 	};
 }
-function ot(e, t) {
+function st(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)) ?? "";
@@ -1076,49 +1108,49 @@ function ot(e, t) {
 	for (let e = 0; e < c.length; e++) l[e] = c.charCodeAt(e);
 	return l;
 }
-function st(e, t, n) {
+function ct(e, t, n) {
 	if (t.length === 0) return;
-	let r = ct(e), i = ut(n);
+	let r = lt(e), i = dt(n);
 	for (let a of t) {
 		let t = { ...a }, o = [...r].filter((e) => e.end <= a.start).sort((e, t) => t.end - e.end || t.start - e.start)[0], s = o ? n.slice(o.end, a.start) : "";
 		if (o && i(o.end) === a.line && !s.includes(":")) {
-			lt(o.node, "trailing", t);
+			ut(o.node, "trailing", t);
 			continue;
 		}
 		let c = [...r].filter((e) => e.start < a.start && a.end < e.end).sort((e, t) => t.start - e.start || e.end - t.end)[0], l = [...r].filter((e) => e.start >= a.end).sort((e, t) => e.start - t.start || t.end - e.end)[0];
 		if ((!c || l && l.end <= c.end) && l) {
-			lt(l.node, "leading", t);
+			ut(l.node, "leading", t);
 			continue;
 		}
-		lt(c?.node ?? e, "dangling", t);
+		ut(c?.node ?? e, "dangling", t);
 	}
 }
-function ct(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 j || e instanceof P) {
+		}), e instanceof F || e instanceof Ve) {
 			for (let t of e.items) n(t);
 			return;
 		}
-		if (e instanceof M) {
+		if (e instanceof I) {
 			for (let [t, r] of e.entries) n(t), n(r);
 			return;
 		}
-		if (e instanceof k || e instanceof A) {
+		if (e instanceof N || e instanceof P) {
 			for (let t of e.chunks) n(t);
 			return;
 		}
-		e instanceof D && n(e.content);
+		e instanceof j && n(e.content);
 	};
 	return n(e), t;
 }
-function lt(e, t, n) {
+function ut(e, t, n) {
 	e.comments ??= {}, e.comments[t] ??= [], e.comments[t].push(n);
 }
-function ut(e) {
+function dt(e) {
 	let t = [0];
 	for (let n = 0; n < e.length; n++) e[n] === "\n" && t.push(n + 1);
 	return (n) => {
@@ -1132,15 +1164,15 @@ function ut(e) {
 		return a + 1;
 	};
 }
-var R = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'extensions' option (extensions: [${e}])`, dt = (e, t) => `install ${t}, import { ${e} } from '${t}', and pass it via the 'extensions' option (extensions: [${e}])`, ft = new Map([
-	["b32", R("b32")],
-	["h32", R("h32")],
-	["float", R("float")],
-	["same", R("same")],
-	["hash", dt("hash", "@cbortech/hash-extension")],
-	["uuid", dt("uuid", "@cbortech/uuid-extension")],
-	["UUID", dt("uuid", "@cbortech/uuid-extension")]
-]), pt = 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}])`, mt = new Map([
+	["b32", ft("b32")],
+	["h32", ft("h32")],
+	["float", ft("float")],
+	["same", ft("same")],
+	["hash", pt("hash", "@cbortech/hash-extension")],
+	["uuid", pt("uuid", "@cbortech/uuid-extension")],
+	["UUID", pt("uuid", "@cbortech/uuid-extension")]
+]), ht = class {
 	t;
 	_options;
 	extByPrefix;
@@ -1150,7 +1182,7 @@ var R = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exten
 	_hintedPrefixes = /* @__PURE__ */ new Set();
 	constructor(t, n) {
 		this.t = t, this._options = n, this.extByPrefix = /* @__PURE__ */ new Map(), this.extByTag = /* @__PURE__ */ new Map(), this.unresolvedExtension = n.unresolvedExtension ?? "cpa999";
-		for (let e of [...Z, ...n.extensions ?? []]) {
+		for (let e of [...qn, ...n.extensions ?? []]) {
 			for (let t of e.appStringPrefixes ?? []) this.extByPrefix.set(t, e);
 			for (let t of e.tagNumbers ?? []) this.extByTag.set(t, e);
 		}
@@ -1172,10 +1204,15 @@ var R = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exten
 		let e = this.parseValue();
 		if (this._options.allowTrailing) return e;
 		let t = this.t.peek();
-		return t.type !== "EOF" && this._fail(`unexpected token after value: ${JSON.stringify(t.value)}`, t), e;
+		if (t.type !== "EOF") for (this._warnOrFail(`unexpected token after value: ${JSON.stringify(t.value)}`, t), this._pendingWarnings.length > 0 && (e.warnings ??= [], e.warnings.push(...this._pendingWarnings), this._pendingWarnings = []); this.t.peek().type !== "EOF";) this.t.consume();
+		return e;
 	}
 	parseValue() {
 		let e = this.t.peek().offset, t = this._parseValueNode();
+		if (this.t.peek().type === "UNDERSCORE") {
+			let e = this.t.consume();
+			this._warnOrFail("bare _ is not a valid encoding indicator; use _0, _1, _2, _3, or _i", e);
+		}
 		if (this._pendingWarnings.length > 0) {
 			t.warnings ??= [];
 			for (let e of this._pendingWarnings) t.warnings.push(e);
@@ -1193,12 +1230,12 @@ var R = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exten
 			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 k([]);
-			case "EMPTY_INDEF_TEXT": return this.t.consume(), new A([]);
-			case "TRUE": return this.t.consume(), new N(21);
-			case "FALSE": return this.t.consume(), new N(20);
-			case "NULL": return this.t.consume(), new N(22);
-			case "UNDEFINED": return this.t.consume(), new N(23);
+			case "EMPTY_INDEF_BYTES": return this.t.consume(), new N([]);
+			case "EMPTY_INDEF_TEXT": return this.t.consume(), new P([]);
+			case "TRUE": return this.t.consume(), new L(21);
+			case "FALSE": return this.t.consume(), new L(20);
+			case "NULL": return this.t.consume(), new L(22);
+			case "UNDEFINED": return this.t.consume(), new L(23);
 			case "SIMPLE": return this.parseSimple();
 			case "LBRACKET": return this.parseArray();
 			case "LBRACE": return this.parseMap();
@@ -1206,23 +1243,28 @@ var R = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exten
 			case "LT_LT": return this.parseEmbeddedCBOR();
 			case "APP_STRING": {
 				this.t.consume();
-				let t = this.extByPrefix.get(e.appPrefix);
-				if (!t?.parseAppString) {
-					if (t || this._hintMissingExtension(e.appPrefix, e), this.unresolvedExtension === "cpa999") return new F(e.appPrefix, [new z(e.value)]);
+				let t, n = "";
+				if (this.t.peek().type === "ENCODING_INDICATOR") {
+					let e = this.t.consume();
+					t = this._resolveEncodingWidth(e.value, e), n = e.raw;
+				}
+				let r = this.extByPrefix.get(e.appPrefix);
+				if (!r?.parseAppString) {
+					if (r || this._hintMissingExtension(e.appPrefix, e), this.unresolvedExtension === "cpa999") return new Ue(e.appPrefix, [new z(e.value)]);
 					this._fail(`unknown app-string extension: ${JSON.stringify(e.appPrefix)}`, e);
 				}
 				{
-					let n = this._pendingWarnings.length;
+					let i = this._pendingWarnings.length;
 					try {
-						let n = t.parseAppString(e.appPrefix, e.value, this._extOnError(e));
-						return n instanceof O && Object.getPrototypeOf(n) === O.prototype && n.ednSource === void 0 ? new O(n.value, {
-							ednEncoding: n.ednEncoding,
-							encodingWidth: n.encodingWidth,
-							ednSource: e.raw
-						}) : (n instanceof E && n.ednSource === void 0 && (n.ednSource = e.raw), n);
+						let i = r.parseAppString(e.appPrefix, e.value, this._extOnError(e), t === void 0 ? void 0 : { encodingWidth: t });
+						return t !== void 0 && this._applyEiToResult(i, t, e), i instanceof M && Object.getPrototypeOf(i) === M.prototype && i.ednSource === void 0 ? new M(i.value, {
+							ednEncoding: i.ednEncoding,
+							encodingWidth: i.encodingWidth,
+							ednSource: e.raw + n
+						}) : (i instanceof A && i.ednSource === void 0 && (i.ednSource = e.raw + n), i);
 					} catch (t) {
 						if (this._options.strict !== !1) throw t;
-						return this._pendingWarnings.length === n && this._warn(t instanceof Error ? t.message : String(t), e), new F(e.appPrefix, [new z(e.value)]);
+						return this._pendingWarnings.length === i && this._warn(t instanceof Error ? t.message : String(t), e), new Ue(e.appPrefix, [new z(e.value)]);
 					}
 				}
 			}
@@ -1231,70 +1273,74 @@ var R = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exten
 				let t = [];
 				for (; this.t.peek().type !== "GT_GT" && (this.t.peek().type === "EOF" && this._fail(`unterminated ${e.appPrefix}<<...>>`, e), !(t.length > 0 && this.t.peek().type === "COMMA" && (this.t.consume(), this.t.peek().type === "GT_GT")));) t.push(this.parseValue());
 				this.expect("GT_GT");
-				let n = this.extByPrefix.get(e.appPrefix);
-				if (!n) {
-					if (this._hintMissingExtension(e.appPrefix, e), this.unresolvedExtension === "cpa999") return new F(e.appPrefix, t);
+				let n, r;
+				this.t.peek().type === "ENCODING_INDICATOR" && (r = this.t.consume(), n = this._resolveEncodingWidth(r.value, r));
+				let i = this.extByPrefix.get(e.appPrefix);
+				if (!i) {
+					if (this._hintMissingExtension(e.appPrefix, e), this.unresolvedExtension === "cpa999") return new Ue(e.appPrefix, t);
 					this._fail(`unknown app-string extension: ${JSON.stringify(e.appPrefix)}`, e);
 				}
-				n.parseAppSequence || this._fail(`app-string extension ${JSON.stringify(e.appPrefix)} does not support <<...>> form`, e);
+				i.parseAppSequence || this._fail(`app-string extension ${JSON.stringify(e.appPrefix)} does not support <<...>> form`, e);
 				{
-					let r = this._pendingWarnings.length;
+					let a = this._pendingWarnings.length;
 					try {
-						let r = n.parseAppSequence(e.appPrefix, t, this._extOnError(e)), i = this.t.source.slice(e.offset, this.t.lastEndOffset);
-						if (r instanceof E) r.ednSource === void 0 && (r.ednSource = i);
-						else if (n.preserveAppSeqSource) return new We(r, i);
-						return r;
+						let a = i.parseAppSequence(e.appPrefix, t, this._extOnError(e));
+						n !== void 0 && this._applyEiToResult(a, n, r ?? e);
+						let o = this.t.source.slice(e.offset, this.t.lastEndOffset);
+						if (a instanceof A) a.ednSource === void 0 && (a.ednSource = o);
+						else if (i.preserveAppSeqSource) return new We(a, o);
+						return a;
 					} catch (n) {
 						if (this._options.strict !== !1) throw n;
-						return this._pendingWarnings.length === r && this._warn(n instanceof Error ? n.message : String(n), e), new F(e.appPrefix, t);
+						return this._pendingWarnings.length === a && this._warn(n instanceof Error ? n.message : String(n), e), new Ue(e.appPrefix, t);
 					}
 				}
 			}
 			case "ELLIPSIS": {
-				if (this.t.consume(), this.t.peek().type !== "PLUS") return new I();
-				let e = [new I()];
+				if (this.t.consume(), this.t.peek().type !== "PLUS") return new R();
+				let e = [new R()];
 				for (; this.t.peek().type === "PLUS";) this.t.consume(), e.push(this.parseValue());
-				return new I(e);
+				return new R(e);
 			}
 			case "BYTES_HEX_ELIDED": return this.t.consume(), this._parseHexElidedConcat(e);
 			default: this._fail(`unexpected token: ${JSON.stringify(e.value)}`, e);
 		}
 	}
 	parseIntegerOrTag() {
-		let e = this.t.consume(), { numStr: t, rawSuffix: n } = rt(e.value), r = n === void 0 ? this.consumeEncodingIndicator() : this._resolveEncodingWidth(n, e), i = it(t);
+		let e = this.t.consume(), { numStr: t, rawSuffix: n } = it(e.value), r = n === void 0 ? this.consumeEncodingIndicator() : this._resolveEncodingWidth(n, e), i = at(t);
 		if (i > 18446744073709551615n) return this.t.peek().type === "LPAREN" && this._fail("tag number exceeds maximum uint64", e), new Qe(i);
-		if (i < -18446744073709551616n) return new L(i);
+		if (i < -18446744073709551616n) return new $e(i);
 		if (r !== void 0) {
 			let t = i >= 0n ? i : -(i + 1n);
 			r = this._validateEncodingFit(t, r, e);
 		}
-		let a = i >= 0n ? new w(i, r === void 0 ? void 0 : { encodingWidth: r }) : new T(i, r === void 0 ? void 0 : { encodingWidth: r });
+		let a = i >= 0n ? new O(i, r === void 0 ? void 0 : { encodingWidth: r }) : new k(i, r === void 0 ? void 0 : { encodingWidth: r });
 		if (this.t.peek().type === "LPAREN") {
-			a instanceof w || this._fail("tag number must be non-negative", e), this.t.consume();
+			a instanceof O || 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 t.length > 0 && (e.warnings ??= [], e.warnings.push(...t)), e;
+				if (e !== void 0) return e instanceof j && r !== void 0 && e.encodingWidth === void 0 && (e.encodingWidth = r), t.length > 0 && (e.warnings ??= [], e.warnings.push(...t)), e;
 			}
-			let s = new D(i, n, r === void 0 ? void 0 : { encodingWidth: r });
+			let s = new j(i, n, r === void 0 ? void 0 : { encodingWidth: r });
 			return t.length > 0 && (s.warnings ??= [], s.warnings.push(...t)), s;
 		}
 		return a;
 	}
 	parseFloat() {
-		let e = this.t.consume(), t = (t) => this._warnOrFail(t, e), { value: n, precision: r } = at(e.value, t);
+		let e = this.t.consume(), t = (t) => this._warnOrFail(t, e), { value: n, precision: r } = ot(e.value, t);
 		if (r === "half" || r === "single") {
-			let e = r === "half" ? je(Ae(n)) : Math.fround(n);
+			let e = r === "half" ? S(x(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 E(n, r === void 0 ? void 0 : { precision: r });
+		return new A(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($e.encode(e.value).length));
+			let t = this.consumeEncodingIndicator(() => BigInt(et.encode(e.value).length));
 			return new z(e.value, t === void 0 ? void 0 : { encodingWidth: t });
 		}
 		let t = !1, n = [{ text: e.value }];
@@ -1304,12 +1350,12 @@ var R = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exten
 			e.type === "ELLIPSIS" ? (this.t.consume(), n.push({ ellipsis: !0 }), t = !0) : e.type === "TSTR" || e.type === "RAWSTRING" ? (this.t.consume(), n.push({ text: e.value })) : this._isBytesToken(e.type) ? (this.t.consume(), n.push({ text: this._decodeUtf8(this._decodeBytesToken(e), e) })) : this._fail(`expected string or byte string after +, got ${JSON.stringify(e.value)}`, e);
 		}
 		if (!t) {
-			let e = n.map((e) => "text" in e ? e.text : "").join(""), t = this.consumeEncodingIndicator(() => BigInt($e.encode(e).length));
+			let e = n.map((e) => "text" in e ? e.text : "").join(""), t = this.consumeEncodingIndicator(() => BigInt(et.encode(e).length));
 			return new z(e, t === void 0 ? void 0 : { encodingWidth: t });
 		}
 		let r = [], i = "";
-		for (let e of n) "ellipsis" in e ? (i !== "" && (r.push(new z(i)), i = ""), r.push(new I())) : i += e.text;
-		return i !== "" && r.push(new z(i)), new I(r);
+		for (let e of n) "ellipsis" in e ? (i !== "" && (r.push(new z(i)), i = ""), r.push(new R())) : i += e.text;
+		return i !== "" && r.push(new z(i)), new R(r);
 	}
 	_isBytesToken(e) {
 		return e === "BYTES_HEX" || e === "SQSTR" || e === "BYTES_B64";
@@ -1318,9 +1364,9 @@ var R = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exten
 		let n = (e) => this._warnOrFail(e, t);
 		switch (t.type) {
 			case "BYTES_HEX":
-			case "SQSTR": return ie(t.value);
+			case "SQSTR": return ne(t.value);
 			case "BYTES_B64": try {
-				return ot(t.value, n);
+				return st(t.value, n);
 			} catch (n) {
 				if (n instanceof e || !(n instanceof SyntaxError)) throw n;
 				this._fail(n.message, t);
@@ -1329,11 +1375,11 @@ var R = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exten
 		}
 	}
 	_decodeUtf8(e, t) {
-		if (this._options.allowInvalidUtf8) return tt.decode(e);
+		if (this._options.allowInvalidUtf8) return nt.decode(e);
 		try {
-			return et.decode(e);
+			return tt.decode(e);
 		} catch {
-			return this._warnOrFail("byte string in text concatenation is not valid UTF-8", t), tt.decode(e);
+			return this._warnOrFail("byte string in text concatenation is not valid UTF-8", t), nt.decode(e);
 		}
 	}
 	_tokenTypeToCdnEncoding(e) {
@@ -1342,7 +1388,7 @@ var R = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exten
 	_parseBytesConcat(e, t, n) {
 		if (this.t.peek().type !== "PLUS") {
 			let r = this.consumeEncodingIndicator(() => BigInt(e.length));
-			return new O(e, {
+			return new M(e, {
 				ednEncoding: this._tokenTypeToCdnEncoding(t),
 				ednSource: n,
 				...r === void 0 ? {} : { encodingWidth: r }
@@ -1356,25 +1402,25 @@ var R = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exten
 			else if (e.type === "BYTES_HEX_ELIDED") {
 				this.t.consume();
 				let t = this._buildBytesElidedItems(e.value);
-				for (let e of t) e instanceof I ? (i.push({ ellipsis: !0 }), r = !0) : e instanceof O && i.push({ bytes: e.value });
-			} else this._isBytesToken(e.type) ? (this.t.consume(), i.push({ bytes: this._decodeBytesToken(e) })) : e.type === "TSTR" || e.type === "RAWSTRING" ? (this.t.consume(), this._warnOrFail("text string in a byte-string concatenation is not allowed; use a byte string literal (h'...', b64'...', or '...') instead", e), i.push({ bytes: $e.encode(e.value) })) : this._fail(`expected byte string after +, got ${JSON.stringify(e.value)}`, e);
+				for (let e of t) e instanceof R ? (i.push({ ellipsis: !0 }), r = !0) : e instanceof M && i.push({ bytes: e.value });
+			} else this._isBytesToken(e.type) ? (this.t.consume(), i.push({ bytes: this._decodeBytesToken(e) })) : e.type === "TSTR" || e.type === "RAWSTRING" ? (this.t.consume(), this._warnOrFail("text string in a byte-string concatenation is not allowed; use a byte string literal (h'...', b64'...', or '...') instead", e), i.push({ bytes: et.encode(e.value) })) : this._fail(`expected byte string after +, got ${JSON.stringify(e.value)}`, e);
 		}
 		if (!r) {
 			let e = i.map((e) => "bytes" in e ? e.bytes : new Uint8Array()), t = this._concatBytes(e), n = this.consumeEncodingIndicator(() => BigInt(t.length));
-			return new O(t, n === void 0 ? void 0 : { encodingWidth: n });
+			return new M(t, n === void 0 ? void 0 : { encodingWidth: n });
 		}
 		let a = [], o = [], s = () => {
-			o.length > 0 && (a.push(new O(this._concatBytes([...o]))), o.length = 0);
+			o.length > 0 && (a.push(new M(this._concatBytes([...o]))), o.length = 0);
 		};
-		for (let e of i) "ellipsis" in e ? (s(), a.push(new I())) : o.push(e.bytes);
-		return s(), new I(a);
+		for (let e of i) "ellipsis" in e ? (s(), a.push(new R())) : o.push(e.bytes);
+		return s(), new R(a);
 	}
 	_parseHexElidedConcat(e) {
 		let t = this._buildBytesElidedItems(e.value);
 		for (; this.t.peek().type === "PLUS";) {
 			this.t.consume();
 			let e = this.t.peek();
-			if (e.type === "ELLIPSIS") this.t.consume(), t.push(new I());
+			if (e.type === "ELLIPSIS") this.t.consume(), t.push(new R());
 			else if (e.type === "BYTES_HEX_ELIDED") {
 				this.t.consume();
 				let n = this._buildBytesElidedItems(e.value);
@@ -1382,20 +1428,20 @@ var R = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exten
 			} else if (this._isBytesToken(e.type)) {
 				this.t.consume();
 				let n = this._decodeBytesToken(e), r = t[t.length - 1];
-				r instanceof O ? t[t.length - 1] = new O(this._concatBytes([r.value, n])) : t.push(new O(n));
+				r instanceof M ? t[t.length - 1] = new M(this._concatBytes([r.value, n])) : t.push(new M(n));
 			} else this._fail(`expected byte string after +, got ${JSON.stringify(e.value)}`, e);
 		}
-		return new I(t);
+		return new R(t);
 	}
 	_buildBytesElidedItems(e) {
 		let t = e.split("..."), n = [];
-		for (let e = 0; e < t.length; e++) e > 0 && n.push(new I()), t[e].length > 0 && n.push(new O(ie(t[e])));
+		for (let e = 0; e < t.length; e++) e > 0 && n.push(new R()), t[e].length > 0 && n.push(new M(ne(t[e])));
 		return n;
 	}
 	_mergeFirstBytesItem(e, t) {
 		if (t.length === 0) return;
 		let n = e[e.length - 1], r = t[0];
-		n instanceof O && r instanceof O ? (e[e.length - 1] = new O(this._concatBytes([n.value, r.value])), e.push(...t.slice(1))) : e.push(...t);
+		n instanceof M && r instanceof M ? (e[e.length - 1] = new M(this._concatBytes([n.value, r.value])), e.push(...t.slice(1))) : e.push(...t);
 	}
 	_concatBytes(e) {
 		let t = e.reduce((e, t) => e + t.byteLength, 0), n = new Uint8Array(t), r = 0;
@@ -1406,14 +1452,20 @@ var R = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exten
 		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 } = rt(e.value), n = Number(it(t));
-		return this.expect("RPAREN"), new N(n);
+		let { numStr: t } = it(e.value), n = Number(at(t));
+		return this.expect("RPAREN"), new L(n);
 	}
 	parseEmbeddedCBOR() {
 		this.t.consume();
 		let e = [];
 		for (; this.t.peek().type !== "GT_GT" && !(e.length > 0 && this.t.peek().type === "COMMA" && (this.t.consume(), this.t.peek().type === "GT_GT"));) e.push(this.parseValue());
-		return this.expect("GT_GT"), new P(e);
+		this.expect("GT_GT");
+		let t;
+		if (this.t.peek().type === "ENCODING_INDICATOR") {
+			let e = this.t.consume();
+			t = this._resolveEncodingWidth(e.value, e);
+		}
+		return new Ve(e, { encodingWidth: t });
 	}
 	parseArray() {
 		this.t.consume();
@@ -1422,7 +1474,7 @@ var R = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exten
 		let r = this._pendingWarnings.splice(0), i = [];
 		for (; this.t.peek().type !== "RBRACKET" && !(i.length > 0 && this.t.peek().type === "COMMA" && (this.t.consume(), this.t.peek().type === "RBRACKET"));) i.push(this.parseValue());
 		this.expect("RBRACKET"), t !== void 0 && n !== void 0 && (t = this._validateEncodingFit(BigInt(i.length), t, n));
-		let a = new j(i, {
+		let a = new F(i, {
 			indefiniteLength: e,
 			encodingWidth: t
 		});
@@ -1440,7 +1492,7 @@ var R = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exten
 			i.push([e, t]);
 		}
 		this.expect("RBRACE"), t !== void 0 && n !== void 0 && (t = this._validateEncodingFit(BigInt(i.length), t, n));
-		let a = new M(i, {
+		let a = new I(i, {
 			indefiniteLength: e,
 			encodingWidth: t
 		});
@@ -1459,15 +1511,15 @@ var R = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exten
 		for (; this.t.peek().type !== "RPAREN" && !(n.length > 0 && this.t.peek().type === "COMMA" && (this.t.consume(), this.t.peek().type === "RPAREN"));) n.push(this.parseValue());
 		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 O) {
-			let e = new k(n.map((e, t) => {
-				if (e instanceof O) return e;
+		if (r instanceof M) {
+			let e = new N(n.map((e, t) => {
+				if (e instanceof M) return e;
 				this._fail(`indefinite byte string chunk ${t} must be a byte string, not a text string`);
 			}));
 			return t.length > 0 && (e.warnings = t), e;
 		}
 		if (r instanceof z) {
-			let e = new A(n.map((e, t) => {
+			let e = new P(n.map((e, t) => {
 				if (e instanceof z) return e;
 				this._fail(`indefinite text string chunk ${t} must be a text string, not a byte string`);
 			}));
@@ -1485,8 +1537,56 @@ var R = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exten
 		let t = this.t.consume();
 		return t.type !== e && this._fail(`expected ${e}, got ${t.type} (${JSON.stringify(t.value)})`, t), t;
 	}
+	_applyEiToResult(e, t, n) {
+		if (e instanceof A) {
+			let r = t === 1 ? "half" : t === 2 ? "single" : t === 3 ? "double" : void 0;
+			if (r === void 0) this._warnOrFail(`encoding indicator _${t} is not valid for a float; use _1, _2, or _3`, n);
+			else if (e.precision !== r) {
+				if (r !== "double") {
+					let t = r === "half" ? S(x(e.value)) : Math.fround(e.value);
+					!Object.is(t, e.value) && !isNaN(e.value) && this._warnOrFail(`${e.value} cannot be exactly represented as ${r === "half" ? "float16 (_1)" : "float32 (_2)"}`, n);
+				}
+				e.precision = r;
+			}
+		} else if (e instanceof O) {
+			if (e.encodingWidth === void 0) {
+				let r = this._validateEncodingFit(e.value, t, n);
+				r !== void 0 && (e.encodingWidth = r);
+			}
+		} else if (e instanceof k) {
+			if (e.encodingWidth === void 0) {
+				let r = this._validateEncodingFit(e.argument, t, n);
+				r !== void 0 && (e.encodingWidth = r);
+			}
+		} else if (e instanceof M) {
+			if (e.encodingWidth === void 0) {
+				let r = this._validateEncodingFit(BigInt(e.value.length), t, n);
+				r !== void 0 && (e.encodingWidth = r);
+			}
+		} else if (e instanceof z) {
+			if (e.encodingWidth === void 0) {
+				let r = this._validateEncodingFit(BigInt(et.encode(e.value).length), t, n);
+				r !== void 0 && (e.encodingWidth = r);
+			}
+		} else if (e instanceof F) {
+			if (e.encodingWidth === void 0) {
+				let r = this._validateEncodingFit(BigInt(e.items.length), t, n);
+				r !== void 0 && (e.encodingWidth = r);
+			}
+		} else if (e instanceof I) {
+			if (e.encodingWidth === void 0) {
+				let r = this._validateEncodingFit(BigInt(e.entries.length), t, n);
+				r !== void 0 && (e.encodingWidth = r);
+			}
+		} else if (e instanceof j) {
+			if (e.encodingWidth === void 0) {
+				let r = this._validateEncodingFit(e.tag, t, n);
+				r !== void 0 && (e.encodingWidth = r);
+			}
+		} else this._warnOrFail(`encoding indicator _${t} is not applicable to this app-string result type`, n);
+	}
 	_validateEncodingFit(e, t, n) {
-		let r = Pe(t);
+		let r = Me(t);
 		if (e <= r) return t;
 		let i = `value ${e} does not fit in encoding indicator ${t === "i" ? "_i (max 23)" : `_${t} (max ${r})`}`;
 		this._warnOrFail(i, n);
@@ -1510,7 +1610,7 @@ var R = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exten
 		this._warn(e, t), this._options.strict !== !1 && this._fail(e, t);
 	}
 	_hintMissingExtension(e, t) {
-		let n = ft.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}`;
@@ -1537,7 +1637,7 @@ var R = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exten
 			endOffset: n.endOffset
 		} : void 0);
 	}
-}, mt = new TextEncoder(), ht = !1, z = class extends C {
+}, gt = new TextEncoder(), _t = !1, z = class extends D {
 	indefiniteLength = !1;
 	value;
 	encodingWidth;
@@ -1545,42 +1645,42 @@ var R = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exten
 		super(), this.value = e, this.encodingWidth = t?.encodingWidth;
 	}
 	_encodeTo(e, t) {
-		let n = mt.encode(this.value);
-		x(e, 3, n.length, this.encodingWidth), e.writeBytes(n);
+		let n = gt.encode(this.value);
+		T(e, 3, n.length, this.encodingWidth), e.writeBytes(n);
 	}
 	_toCDN(e, t) {
-		let n = this.encodingWidth === void 0 ? "" : `_${this.encodingWidth}`;
-		return gt(this.value, n, e, t);
+		let n = b(e, this.encodingWidth, () => y(BigInt(gt.encode(this.value).length)));
+		return vt(this.value, n, e, t);
 	}
 	_toJS(e) {
 		return this.value;
 	}
 };
-function gt(e, t, n, r) {
-	let i = _t(n?.textStringFormat ?? []), a = h(n);
-	if (i.length === 0 || a === null) return Te(e) + t;
+function vt(e, t, n, r) {
+	let i = yt(n?.textStringFormat ?? []), a = re(n);
+	if (i.length === 0 || a === null) return we(e) + t;
 	let o = /* @__PURE__ */ new Map(), s = null;
-	if (i.includes("cdn") && (s = yt(e), s !== null)) for (let { point: e, contentDepth: t } of s) o.set(e, t);
+	if (i.includes("cdn") && (s = xt(e), s !== null)) for (let { point: e, contentDepth: t } of s) o.set(e, t);
 	if (i.includes("newline")) {
-		let t = s === null ? vt(e, 0) : bt(e);
+		let t = s === null ? bt(e, 0) : St(e);
 		for (let { point: e, contentDepth: n } of t) o.has(e) || o.set(e, n);
 	}
-	let c = Dt(e, o);
-	if (c.length <= 1) return Te(e) + t;
+	let c = kt(e, o);
+	if (c.length <= 1) return we(e) + t;
 	let l = c.map(({ text: e }, n) => {
-		let r = Te(e);
+		let r = we(e);
 		return n === c.length - 1 ? r + t : r;
 	}), u = l[0];
 	for (let e = 1; e < l.length; e++) {
-		let t = g(a, r + 1 + c[e].contentDepth);
+		let t = _(a, r + 1 + c[e].contentDepth);
 		u += ` +\n${t}${l[e]}`;
 	}
 	return u;
 }
-function _t(e) {
-	return e.map((e) => e === "cboredn" ? (ht || (ht = !0, console.warn("`textStringFormat: ['cboredn']` is deprecated; use `textStringFormat: ['cdn']` instead.")), "cdn") : e);
+function yt(e) {
+	return e.map((e) => e === "cboredn" ? (_t || (_t = !0, console.warn("`textStringFormat: ['cboredn']` is deprecated; use `textStringFormat: ['cdn']` instead.")), "cdn") : e);
 }
-function vt(e, t) {
+function bt(e, t) {
 	let n = [];
 	for (let r = 0; r < e.length; r++) {
 		let i = e[r];
@@ -1597,9 +1697,9 @@ function vt(e, t) {
 	}
 	return n;
 }
-function yt(e) {
+function xt(e) {
 	try {
-		nt(e);
+		rt(e);
 	} catch {
 		return null;
 	}
@@ -1608,24 +1708,24 @@ function yt(e) {
 		let t = r.consume();
 		if (t.type === "EOF") break;
 		let c = !1;
-		if (o || (o = !0, t.offset > 0 && Tt(r.comments, 0, t.offset) && n.push({
+		if (o || (o = !0, t.offset > 0 && Dt(r.comments, 0, t.offset) && n.push({
 			point: t.offset,
 			contentDepth: i
 		})), a !== null) {
-			if (a.kind === "opener" && St.has(t.type)) {
+			if (a.kind === "opener" && wt.has(t.type)) {
 				a.point = t.endOffset, s = t.endOffset;
 				continue;
-			} else a.kind === "opener" && wt.has(t.type) && Et(e, a.point, t.offset) ? c = !0 : n.push({
+			} else a.kind === "opener" && Et.has(t.type) && Ot(e, a.point, t.offset) ? c = !0 : n.push({
 				point: t.offset,
 				contentDepth: a.contentDepth
 			});
 			a = null;
 		}
-		Ct.has(t.type) ? (i++, a = {
+		Tt.has(t.type) ? (i++, a = {
 			point: t.endOffset,
 			contentDepth: i,
 			kind: "opener"
-		}) : wt.has(t.type) ? (i = Math.max(0, i - 1), c || n.push({
+		}) : Et.has(t.type) ? (i = Math.max(0, i - 1), c || n.push({
 			point: t.offset,
 			contentDepth: i
 		})) : t.type === "COMMA" && (a = {
@@ -1640,23 +1740,23 @@ function yt(e) {
 		contentDepth: i
 	}), n;
 }
-function bt(e) {
+function St(e) {
 	let n = [], r = new t(e), i = 0;
 	for (;;) {
 		let t = r.consume();
 		if (t.type === "EOF") break;
-		if (Ct.has(t.type)) i++;
-		else if (wt.has(t.type)) i = Math.max(0, i - 1);
+		if (Tt.has(t.type)) i++;
+		else if (Et.has(t.type)) i = Math.max(0, i - 1);
 		else if (t.type !== "COMMA") {
 			if (t.type === "TSTR") {
 				let r = e.slice(t.offset, t.endOffset);
-				for (let e of xt(r)) n.push({
+				for (let e of Ct(r)) n.push({
 					point: t.offset + e,
 					contentDepth: i + 1
 				});
 			} else if (t.type === "RAWSTRING") {
 				let r = e.slice(t.offset, t.endOffset);
-				for (let { point: e } of vt(r, 0)) n.push({
+				for (let { point: e } of bt(r, 0)) n.push({
 					point: t.offset + e,
 					contentDepth: i + 1
 				});
@@ -1665,7 +1765,7 @@ function bt(e) {
 	}
 	return n;
 }
-function xt(e) {
+function Ct(e) {
 	let t = [], n = 1, r = e.length - 1;
 	for (; n < r;) {
 		let r = e[n];
@@ -1681,24 +1781,24 @@ function xt(e) {
 	}
 	return t;
 }
-var St = new Set(["ENCODING_INDICATOR", "UNDERSCORE"]), Ct = new Set([
+var wt = new Set(["ENCODING_INDICATOR", "UNDERSCORE"]), Tt = new Set([
 	"LBRACKET",
 	"LBRACE",
 	"LPAREN",
 	"LT_LT"
-]), wt = new Set([
+]), Et = new Set([
 	"RBRACKET",
 	"RBRACE",
 	"RPAREN",
 	"GT_GT"
 ]);
-function Tt(e, t, n) {
+function Dt(e, t, n) {
 	return e.some((e) => e.start >= t && e.end <= n);
 }
-function Et(e, t, n) {
+function Ot(e, t, n) {
 	return /^[\t\n\r ]*$/.test(e.slice(t, n));
 }
-function Dt(e, t) {
+function kt(e, t) {
 	let n = [...t].filter(([t]) => t > 0 && t < e.length).sort(([e], [t]) => e - t);
 	if (n.length === 0) return [{
 		text: e,
@@ -1724,17 +1824,17 @@ function B(e) {
 	for (; s.length < 3;) s += "0";
 	return `${i}.${s}Z`;
 }
-var Ot = new TextDecoder("utf-8", { fatal: !0 });
-function kt(e) {
+var At = new TextDecoder("utf-8", { fatal: !0 });
+function jt(e) {
 	if (e.length !== 1) throw SyntaxError("dt<<...>>: expected exactly one item");
 	let t = e[0];
 	if (t instanceof z) return t.value;
-	if (t instanceof O) return Ot.decode(t.value);
+	if (t instanceof M) return At.decode(t.value);
 	throw SyntaxError("dt<<...>>: expected a text string or byte string");
 }
-var At = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?(Z|[+-]\d{2}:\d{2})$/i;
-function jt(e, t) {
-	if (!At.test(e)) {
+var Mt = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?(Z|[+-]\d{2}:\d{2})$/i;
+function Nt(e, t) {
+	if (!Mt.test(e)) {
 		let n = `dt: invalid RFC 3339 date-time: ${JSON.stringify(e)}`;
 		if (t) t(n);
 		else throw SyntaxError(n);
@@ -1745,82 +1845,93 @@ function jt(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 Nt(BigInt(e)) : new Pt(BigInt(e));
+		return e >= 0 ? new Ft(BigInt(e)) : new It(BigInt(e));
 	}
-	return new Ft(a / 1e3 + i);
+	return new Lt(a / 1e3 + i);
 }
-var Mt = 1n, Nt = class extends w {
+var Pt = 1n, Ft = class extends O {
 	constructor(e, t) {
 		super(e, t);
 	}
 	_toCDN(e, t) {
-		return e?.appStrings === !1 ? super._toCDN(e, t) : `dt'${B(Number(this.value))}'`;
+		if (e?.appStrings === !1) return super._toCDN(e, t);
+		let n = b(e, this.encodingWidth, () => y(this.value));
+		return `dt'${B(Number(this.value))}'${n}`;
 	}
-}, Pt = class extends T {
+}, It = class extends k {
 	constructor(e, t) {
 		super(e, t);
 	}
 	_toCDN(e, t) {
-		return e?.appStrings === !1 ? super._toCDN(e, t) : `dt'${B(Number(this.value))}'`;
+		if (e?.appStrings === !1) return super._toCDN(e, t);
+		let n = b(e, this.encodingWidth, () => y(this.argument));
+		return `dt'${B(Number(this.value))}'${n}`;
 	}
-}, Ft = class extends E {
+}, Lt = class extends A {
 	constructor(e, t) {
 		super(e, t);
 	}
 	_toCDN(e, t) {
-		return e?.appStrings === !1 ? super._toCDN(e, t) : `dt'${B(this.value)}'`;
+		if (e?.appStrings === !1) return super._toCDN(e, t);
+		let n = E(this.value), r = Ee(this.value, this.precision, n, e?.encodingIndicators ?? "auto");
+		return `dt'${B(this.value)}'${r}`;
 	}
-}, It = class extends D {
+}, Rt = class extends j {
 	constructor(e, t) {
-		super(Mt, jt(e), t);
+		super(Pt, typeof e == "string" ? Nt(e) : e, t);
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
 		let n = this.content;
-		return `DT'${B(n instanceof E ? n.value : Number(n.value))}'`;
+		if (n instanceof A ? n.precision !== void 0 && n.precision !== E(n.value) : n.encodingWidth !== void 0) return super._toCDN({
+			...e,
+			appStrings: !1
+		}, t);
+		let r = n instanceof A ? n.value : Number(n.value), i = b(e, this.encodingWidth, () => y(Pt));
+		return `DT'${B(r)}'${i}`;
 	}
-}, Lt = class extends It {
+}, zt = class extends Rt {
 	constructor(e, t) {
 		super(e, t);
 	}
 	_toJS(e) {
-		let t = this.content, n = t instanceof E ? t.value * 1e3 : Number(t.value) * 1e3;
+		let t = this.content, n = t instanceof A ? t.value * 1e3 : Number(t.value) * 1e3;
 		return new Date(n);
 	}
 };
-function Rt(e) {
+function Bt(e) {
 	let t = e?.jsDate ?? !1;
 	function n(e) {
-		return t ? new Lt(e) : new It(e);
+		return t ? new zt(e) : new Rt(e);
 	}
 	let r = {
 		appStringPrefixes: ["dt", "DT"],
-		tagNumbers: [Mt],
+		tagNumbers: [Pt],
 		parseAppString(e, t, r) {
-			return e === "DT" ? n(t) : jt(t, r);
+			return e === "DT" ? n(t) : Nt(t, r);
 		},
 		parseAppSequence(e, t, r) {
-			let i = kt(t);
-			return e === "DT" ? n(i) : jt(i, r);
+			let i = jt(t);
+			return e === "DT" ? n(i) : Nt(i, r);
 		},
-		parseTag(e, t) {
+		parseTag(e, n) {
 			if (e !== 1n) return;
 			let r;
-			if (t instanceof w) r = Number(t.value);
-			else if (t instanceof T) r = Number(t.value);
-			else if (t instanceof E) r = t.value;
+			if (n instanceof O) r = new Ft(n.value, { encodingWidth: n.encodingWidth });
+			else if (n instanceof k) r = new It(n.value, { encodingWidth: n.encodingWidth });
+			else if (n instanceof A) r = new Lt(n.value), n.precision !== void 0 && (r.precision = n.precision);
 			else return;
-			return n(B(r));
+			return r.start = n.start, r.end = n.end, t ? new zt(r) : new Rt(r);
 		}
 	};
 	return t && (r.fromJS = (e, t) => {
-		if (e instanceof Date) return new Lt(B(e.getTime() / 1e3));
+		if (e instanceof Date) return new zt(B(e.getTime() / 1e3));
 	}, r.isJSType = (e) => e instanceof Date), r;
 }
-var zt = Rt(), Bt = Rt({ jsDate: !0 });
+var Vt = Bt(), Ht = Bt({ jsDate: !0 });
 //#endregion
 //#region src/utils/ip.ts
-function Vt(e) {
+function Ut(e) {
 	let t = e.split(".");
 	if (t.length !== 4) throw SyntaxError(`ip: invalid IPv4 address: ${JSON.stringify(e)}`);
 	let n = new Uint8Array(4);
@@ -1833,11 +1944,11 @@ function Vt(e) {
 	}
 	return n;
 }
-function Ht(e) {
+function Wt(e) {
 	let t = 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 = Vt(i[2]));
+	i && (n = i[1], n.endsWith(":") && (n += ":"), r = Ut(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;
@@ -1854,11 +1965,11 @@ function Ht(e) {
 	}
 	return r && t.set(r, 12), t;
 }
-function Ut(e) {
+function Gt(e) {
 	return Array.from(e).join(".");
 }
-function Wt(e) {
-	let t = e.slice(0, 10).every((e) => e === 0) && e[10] === 255 && e[11] === 255 ? Ut(e.slice(12)) : null, n = t ? 6 : 8, r = [];
+function Kt(e) {
+	let t = e.slice(0, 10).every((e) => e === 0) && e[10] === 255 && e[11] === 255 ? Gt(e.slice(12)) : null, n = t ? 6 : 8, r = [];
 	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) {
@@ -1872,29 +1983,29 @@ function Wt(e) {
 }
 //#endregion
 //#region src/extensions/ip.ts
-var Gt = "ip", V = "IP", H = 52n, U = 54n, Kt = new TextDecoder("utf-8", { fatal: !0 });
-function qt(e) {
+var qt = "ip", V = "IP", H = 52n, Jt = 54n, Yt = new TextDecoder("utf-8", { fatal: !0 });
+function Xt(e) {
 	if (e.length !== 1) throw SyntaxError("ip<<...>>: expected exactly one item");
 	let t = e[0];
 	if (t instanceof z) return t.value;
-	if (t instanceof O) return Kt.decode(t.value);
+	if (t instanceof M) return Yt.decode(t.value);
 	throw SyntaxError("ip<<...>>: expected a text string or byte string");
 }
-function Jt(e) {
+function Zt(e) {
 	return /^\d/.test(e) && e.includes(".") && !e.includes(":") ? {
-		bytes: Vt(e),
+		bytes: Ut(e),
 		isV4: !0
 	} : {
-		bytes: Ht(e),
+		bytes: Wt(e),
 		isV4: !1
 	};
 }
-function Yt(e) {
-	if (e.length === 4) return Ut(e);
-	if (e.length === 16) return Wt(e);
+function Qt(e) {
+	if (e.length === 4) return Gt(e);
+	if (e.length === 16) return Kt(e);
 	throw SyntaxError(`ip: unexpected byte length: ${e.length}`);
 }
-function Xt(e, t) {
+function $t(e, t) {
 	let n = new Uint8Array(e.length);
 	n.set(e);
 	let r = Math.floor(t / 8), i = t % 8;
@@ -1904,79 +2015,86 @@ function Xt(e, t) {
 	for (; a > 0 && n[a - 1] === 0;) a--;
 	return n.slice(0, a);
 }
-function Zt(e, t) {
+function en(e, t) {
 	let n = new Uint8Array(t);
 	return n.set(e), n;
 }
-var Qt = class extends O {
+var tn = class extends M {
 	_toCDN(e, t) {
-		return e?.appStrings === !1 ? super._toCDN(e, t) : `${Gt}'${Yt(this.value)}'`;
+		if (e?.appStrings === !1) return super._toCDN(e, t);
+		let n = b(e, this.encodingWidth, () => y(BigInt(this.value.length)));
+		return `${qt}'${Qt(this.value)}'${n}`;
 	}
-}, $t = class extends j {
+}, nn = class extends F {
 	_isV4;
 	constructor(e, t, n) {
-		super([new w(BigInt(e)), new O(t)]), this._isV4 = n;
+		super([new O(BigInt(e)), new M(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 `${Gt}'${Yt(Zt(r, this._isV4 ? 4 : 16))}/${n}'`;
+		return `${qt}'${Qt(en(r, this._isV4 ? 4 : 16))}/${n}'`;
 	}
-}, en = class extends D {
+}, rn = class extends j {
 	constructor(e, t) {
 		super(e, t);
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
 		let n = this.tag === H ? 4 : 16, r = this.content;
-		if (r instanceof O) return `${V}'${Yt(r.value)}'`;
-		if (r instanceof j && r.items.length === 2 && r.items[0] instanceof w && r.items[1] instanceof O) {
-			let e = Number(r.items[0].value);
-			return `${V}'${Yt(Zt(r.items[1].value, n))}/${e}'`;
+		if (r instanceof M) {
+			if (r.encodingWidth !== void 0) return super._toCDN(e, t);
+			let n = b(e, this.encodingWidth, () => y(this.tag));
+			return `${V}'${Qt(r.value)}'${n}`;
+		}
+		if (r instanceof F && r.items.length === 2 && r.items[0] instanceof O && r.items[1] instanceof M) {
+			if (r.encodingWidth !== void 0 || r.items[0].encodingWidth !== void 0 || r.items[1].encodingWidth !== void 0) return super._toCDN(e, t);
+			let i = Number(r.items[0].value), a = en(r.items[1].value, n), o = b(e, this.encodingWidth, () => y(this.tag));
+			return `${V}'${Qt(a)}/${i}'${o}`;
 		}
 		return super._toCDN(e, t);
 	}
 };
-function tn(e, t) {
+function an(e, t) {
 	let n = t.indexOf("/");
 	if (n === -1) {
-		let { bytes: n, isV4: r } = Jt(t);
-		return e === V ? new en(r ? H : U, new O(n)) : new Qt(n);
+		let { bytes: n, isV4: r } = Zt(t);
+		return e === V ? new rn(r ? H : Jt, new M(n)) : new tn(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 } = Jt(r), c = s ? 32 : 128;
+	let a = parseInt(i, 10), { bytes: o, isV4: s } = Zt(r), c = s ? 32 : 128;
 	if (a > c) throw SyntaxError(`ip: prefix length ${a} exceeds maximum ${c} for ${s ? "IPv4" : "IPv6"}`);
-	let l = Xt(o, a);
-	return e === V ? new en(s ? H : U, new j([new w(BigInt(a)), new O(l)])) : new $t(a, l, s);
+	let l = $t(o, a);
+	return e === V ? new rn(s ? H : Jt, new F([new O(BigInt(a)), new M(l)])) : new nn(a, l, s);
 }
-var nn = {
-	appStringPrefixes: [Gt, V],
-	tagNumbers: [H, U],
+var on = {
+	appStringPrefixes: [qt, V],
+	tagNumbers: [H, Jt],
 	parseAppString(e, t) {
-		return tn(e, t);
+		return an(e, t);
 	},
 	parseAppSequence(e, t) {
-		return tn(e, qt(t));
+		return an(e, Xt(t));
 	},
 	parseTag(e, t) {
-		if (!(e !== H && e !== U) && (t instanceof O || t instanceof j)) return new en(e, t);
+		if (!(e !== H && e !== Jt) && (t instanceof M || t instanceof F)) return new rn(e, t);
 	}
-}, rn = 18446744073709551615n, an = -18446744073709551616n, on = {
+}, sn = 18446744073709551615n, cn = -18446744073709551616n, ln = {
 	tagNumbers: [Ke, qe],
 	parseTag(e, t) {
-		if (t instanceof O) {
+		if (t instanceof M) {
 			if (e === 2n) {
 				let e = Ze(t.value);
-				return e > rn ? new Qe(e) : void 0;
+				return e > sn ? new Qe(e) : void 0;
 			}
 			if (e === 3n) {
 				let e = -1n - Ze(t.value);
-				return e < an ? new L(e) : void 0;
+				return e < cn ? new $e(e) : void 0;
 			}
 		}
 	}
-}, sn = "cri", cn = "CRI", ln = 99n, un = new Map([
+}, un = "cri", dn = "CRI", fn = 99n, pn = new Map([
 	["coap", -1n],
 	["coaps", -2n],
 	["http", -3n],
@@ -1987,47 +2105,47 @@ var nn = {
 	["coaps+tcp", -8n],
 	["coap+ws", -25n],
 	["coaps+ws", -26n]
-]), dn = new Map([...un.entries()].map(([e, t]) => [t, e]));
-function W(e) {
+]), mn = new Map([...pn.entries()].map(([e, t]) => [t, e]));
+function U(e) {
 	try {
 		return decodeURIComponent(e);
 	} catch {
 		return e;
 	}
 }
-var fn = new TextEncoder(), pn = new TextDecoder("utf-8", { fatal: !0 });
-function mn(e) {
-	return Array.from(fn.encode(e), (e) => `%${e.toString(16).toUpperCase().padStart(2, "0")}`).join("");
+var hn = new TextEncoder(), gn = new TextDecoder("utf-8", { fatal: !0 });
+function _n(e) {
+	return Array.from(hn.encode(e), (e) => `%${e.toString(16).toUpperCase().padStart(2, "0")}`).join("");
 }
-function G(e, t) {
+function W(e, t) {
 	let n = "";
-	for (let r of e) n += t(r) ? r : mn(r);
+	for (let r of e) n += t(r) ? r : _n(r);
 	return n;
 }
-function hn(e) {
-	return /[A-Za-z0-9\-._~]/.test(e);
-}
-function gn(e) {
-	return /[!$&'()*+,;=]/.test(e);
-}
-function _n(e) {
-	return hn(e) || gn(e) || e === ":" || e === "@";
-}
 function vn(e) {
-	return (_n(e) || e === "/" || e === "?") && e !== "&";
+	return /[A-Za-z0-9\-._~]/.test(e);
 }
 function yn(e) {
-	return _n(e) || e === "/" || e === "?";
+	return /[!$&'()*+,;=]/.test(e);
 }
 function bn(e) {
-	return hn(e) || gn(e) || e === ":";
+	return vn(e) || yn(e) || e === ":" || e === "@";
 }
 function xn(e) {
-	return hn(e) || gn(e);
+	return (bn(e) || e === "/" || e === "?") && e !== "&";
 }
 function Sn(e) {
+	return bn(e) || e === "/" || e === "?";
+}
+function Cn(e) {
+	return vn(e) || yn(e) || e === ":";
+}
+function wn(e) {
+	return vn(e) || yn(e);
+}
+function Tn(e) {
 	let t = [], n = e, r = n.indexOf("@");
-	r >= 0 && (t.push(N.FALSE), t.push(new z(W(n.slice(0, r)))), n = n.slice(r + 1));
+	r >= 0 && (t.push(L.FALSE), t.push(new z(U(n.slice(0, r)))), n = n.slice(r + 1));
 	let i, a = null;
 	if (n.startsWith("[")) {
 		let e = n.indexOf("]");
@@ -2036,228 +2154,243 @@ function Sn(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 O(Ht(i)));
+		t.push(new M(Wt(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 O(Vt(i)));
+		if (e >= 0 ? (i = n.slice(0, e), a = n.slice(e + 1)) : i = n, i !== "") if (/^\d{1,3}(\.\d{1,3}){3}$/.test(i)) t.push(new M(Ut(i)));
 		else for (let e of i.toLowerCase().split(".")) t.push(new z(e));
 	}
 	if (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 w(BigInt(e)));
+		t.push(new O(BigInt(e)));
 	}
-	return new j(t);
+	return new F(t);
 }
-function Cn(e) {
+function En(e) {
 	let t = e.items, n = 0, r = "";
-	if (n < t.length && t[n] instanceof N && t[n].value === 20) {
+	if (n < t.length && t[n] instanceof L && t[n].value === 20) {
 		n++;
 		let e = t[n++];
-		r += G(e.value, bn) + "@";
+		r += W(e.value, Cn) + "@";
 	}
 	if (n >= t.length) return r;
 	let i = t[n];
-	if (i instanceof O) {
+	if (i instanceof M) {
 		n++;
 		let { length: e } = i.value;
-		if (e === 4) r += Ut(i.value);
-		else if (e === 16) r += "[" + Wt(i.value) + "]";
+		if (e === 4) r += Gt(i.value);
+		else if (e === 16) r += "[" + Kt(i.value) + "]";
 		else throw Error(`cri: unexpected host-ip byte length: ${e}`);
-		n < t.length && t[n] instanceof z && (r += `%25${G(t[n++].value, xn)}`);
+		n < t.length && t[n] instanceof z && (r += `%25${W(t[n++].value, wn)}`);
 	} else {
 		let e = [];
-		for (; n < t.length && t[n] instanceof z;) e.push(G(t[n++].value, xn));
+		for (; n < t.length && t[n] instanceof z;) e.push(W(t[n++].value, wn));
 		r += e.join(".");
 	}
-	return n < t.length && t[n] instanceof w && (r += ":" + t[n].value.toString()), r;
+	return n < t.length && t[n] instanceof O && (r += ":" + t[n].value.toString()), r;
 }
-function wn(e) {
+function Dn(e) {
 	let t = e.slice(2), n = t.indexOf("/"), r, i;
-	return n >= 0 ? (r = t.slice(0, n), i = t.slice(n + 1).split("/").map((e) => new z(W(e)))) : (r = t, i = []), {
-		authority: Sn(r),
+	return n >= 0 ? (r = t.slice(0, n), i = t.slice(n + 1).split("/").map((e) => new z(U(e)))) : (r = t, i = []), {
+		authority: Tn(r),
 		pathSegments: i
 	};
 }
-function Tn(e) {
+function On(e) {
 	let t = e, n = null, r = t.indexOf("#");
-	r >= 0 && (n = W(t.slice(r + 1)), t = t.slice(0, r));
+	r >= 0 && (n = U(t.slice(r + 1)), t = t.slice(0, r));
 	let i = null, a = t.indexOf("?");
 	if (a >= 0) {
 		let e = t.slice(a + 1);
-		t = t.slice(0, a), i = e.split("&").map((e) => new z(W(e)));
+		t = t.slice(0, a), i = e.split("&").map((e) => new z(U(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 = un.get(e);
-		if (o.push(n === void 0 ? new z(e) : new T(n)), t.startsWith("//")) {
-			let { authority: e, pathSegments: n } = wn(t);
-			o.push(e, new j(n));
+		let e = s[1].toLowerCase(), t = s[2], n = pn.get(e);
+		if (o.push(n === void 0 ? new z(e) : new k(n)), t.startsWith("//")) {
+			let { authority: e, pathSegments: n } = Dn(t);
+			o.push(e, new F(n));
 		} else if (t.startsWith("/")) {
-			let e = t.slice(1).split("/").map((e) => new z(W(e)));
-			o.push(N.NULL, new j(e));
+			let e = t.slice(1).split("/").map((e) => new z(U(e)));
+			o.push(L.NULL, new F(e));
 		} else {
-			let e = t.split("/").map((e) => new z(W(e)));
-			o.push(N.TRUE, new j(e));
+			let e = t.split("/").map((e) => new z(U(e)));
+			o.push(L.TRUE, new F(e));
 		}
 	} else if (t.startsWith("//")) {
-		let { authority: e, pathSegments: n } = wn(t);
-		o.push(N.FALSE, e, new j(n));
+		let { authority: e, pathSegments: n } = Dn(t);
+		o.push(L.FALSE, e, new F(n));
 	} else if (t.startsWith("/")) {
-		let e = t.slice(1).split("/").map((e) => new z(W(e)));
-		o.push(N.TRUE, new j(e));
-	} else if (t === "") o.push(new w(0n));
+		let e = t.slice(1).split("/").map((e) => new z(U(e)));
+		o.push(L.TRUE, new F(e));
+	} else if (t === "") o.push(new O(0n));
 	else {
 		let n = 1n, r = t, i = !1;
 		for (r.startsWith("./") && (i = !0, r = r.slice(2)); r.startsWith("../");) n++, r = r.slice(3);
 		if (r === ".." ? (n++, r = "") : r === "." && (r = ""), n === 1n && !i && r !== "" && r.split("/")[0].includes(":")) throw SyntaxError(`cri: invalid relative-path reference — first segment must not contain ':' without a './' prefix (RFC 3986 §3.3): ${JSON.stringify(e)}`);
-		let a = r === "" ? [] : r.split("/").map((e) => new z(W(e)));
-		o.push(new w(n), new j(a));
+		let a = r === "" ? [] : r.split("/").map((e) => new z(U(e)));
+		o.push(new O(n), new F(a));
 	}
-	if (i !== null && o.push(new j(i)), n !== null && (i === null && o.push(N.NULL), o.push(new z(n))), n !== null && i === null && o.splice(o.length - 2, 1), i === null && n === null) {
+	if (i !== null && o.push(new F(i)), n !== null && (i === null && o.push(L.NULL), o.push(new z(n))), n !== null && i === null && o.splice(o.length - 2, 1), i === null && n === null) {
 		let e = o[o.length - 1];
-		e instanceof j && e.items.length === 0 && o.pop();
+		e instanceof F && e.items.length === 0 && o.pop();
 	}
-	return o.length === 1 && o[0] instanceof w && o[0].value === 0n ? [] : o;
+	return o.length === 1 && o[0] instanceof O && o[0].value === 0n ? [] : o;
 }
-function K(e, t) {
+function G(e, t) {
 	let n = t, r = "";
 	if (n < e.length) {
 		let t = e[n];
-		if (t instanceof j) {
+		if (t instanceof F) {
 			if (n++, t.items.length > 0) {
 				let e = t.items.map((e) => {
 					if (!(e instanceof z)) throw Error("cri: query item must be a text string");
-					return G(e.value, vn);
+					return W(e.value, xn);
 				});
 				r += "?" + e.join("&");
 			}
-		} else t instanceof N && t.value === 22 && n++;
+		} else t instanceof L && t.value === 22 && n++;
 	}
-	return n < e.length && e[n] instanceof z && (r += "#" + G(e[n].value, yn)), r;
+	return n < e.length && e[n] instanceof z && (r += "#" + W(e[n].value, Sn)), r;
 }
-function En(e) {
+function kn(e) {
 	return e.items.map((e) => {
 		if (!(e instanceof z)) throw Error("cri: path segment must be a text string");
-		return G(e.value, _n);
+		return W(e.value, bn);
 	});
 }
-function Dn(e) {
+function An(e) {
 	if (e.length === 0) return "";
 	let t = 0, n = e[t++];
-	if (n instanceof T || n instanceof z) {
+	if (n instanceof k || n instanceof z) {
 		let r;
-		if (n instanceof T) {
-			let e = dn.get(n.value);
+		if (n instanceof k) {
+			let e = mn.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 j) a = "//" + Cn(i), o = !0;
-		else if (i instanceof N) if (i.value === 22) o = !0;
+		if (i instanceof F) a = "//" + En(i), o = !0;
+		else if (i instanceof L) 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 j) {
+		if (t < e.length && e[t] instanceof F) {
 			let n = e[t++];
-			n.items.length > 0 && (s = (o ? "/" : "") + En(n).join("/"));
+			n.items.length > 0 && (s = (o ? "/" : "") + kn(n).join("/"));
 		}
-		return r + a + s + K(e, t);
+		return r + a + s + G(e, t);
 	}
-	if (n instanceof N && n.value === 20) {
-		if (t >= e.length || !(e[t] instanceof j)) throw Error("cri: network-path reference requires an authority array");
-		let n = Cn(e[t++]), r = "";
-		if (t < e.length && e[t] instanceof j) {
+	if (n instanceof L && n.value === 20) {
+		if (t >= e.length || !(e[t] instanceof F)) throw Error("cri: network-path reference requires an authority array");
+		let n = En(e[t++]), r = "";
+		if (t < e.length && e[t] instanceof F) {
 			let n = e[t++];
-			n.items.length > 0 && (r = "/" + En(n).join("/"));
+			n.items.length > 0 && (r = "/" + kn(n).join("/"));
 		}
-		return "//" + n + r + K(e, t);
+		return "//" + n + r + G(e, t);
 	}
-	if (n instanceof N && n.value === 21) {
+	if (n instanceof L && n.value === 21) {
 		let n = "/";
-		if (t < e.length && e[t] instanceof j) {
+		if (t < e.length && e[t] instanceof F) {
 			let r = e[t++];
-			n = "/" + En(r).join("/");
+			n = "/" + kn(r).join("/");
 		}
-		return n + K(e, t);
+		return n + G(e, t);
 	}
-	if (n instanceof w) {
+	if (n instanceof O) {
 		let r = n.value;
-		if (r === 0n) return K(e, t);
+		if (r === 0n) return G(e, t);
 		let i = r === 1n ? "" : "../".repeat(Number(r) - 1), a;
-		if (t < e.length && e[t] instanceof j) {
+		if (t < e.length && e[t] instanceof F) {
 			let n = e[t++];
 			if (n.items.length > 0) {
-				let e = En(n);
+				let e = kn(n);
 				a = (r === 1n && e[0].includes(":") ? "./" : i) + e.join("/");
 			} else a = i === "" ? "./" : i;
 		} else a = i === "" ? "./" : i;
-		return a + K(e, t);
+		return a + G(e, t);
 	}
 	throw Error("cri: unrecognised first element type in CRI array");
 }
-var On = class extends j {
+var jn = class extends F {
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
 		try {
-			return `${sn}'${Dn(this.items)}'`;
+			let t = b(e, this.encodingWidth, () => y(BigInt(this.items.length)));
+			return `${un}'${An(this.items)}'${t}`;
 		} catch {
 			return super._toCDN(e, t);
 		}
 	}
-}, kn = class extends D {
+}, Mn = class extends j {
 	constructor(e) {
-		super(ln, e);
+		super(fn, e);
 	}
 	_toCDN(e, t) {
 		if (e?.appStrings === !1) return super._toCDN(e, t);
 		try {
-			return `${cn}'${Dn(this.content.items)}'`;
+			let n = this.content;
+			if (n.encodingWidth !== void 0) return super._toCDN(e, t);
+			let r = b(e, this.encodingWidth, () => y(fn));
+			return `${dn}'${An(n.items)}'${r}`;
 		} catch {
 			return super._toCDN(e, t);
 		}
 	}
 };
-function An(e) {
+function Nn(e) {
 	if (e.length !== 1) throw SyntaxError("cri<<...>>: expected exactly one item");
 	let t = e[0];
 	if (t instanceof z) return t.value;
-	if (t instanceof O) return pn.decode(t.value);
+	if (t instanceof M) return gn.decode(t.value);
 	throw SyntaxError("cri<<...>>: expected a text string or byte string");
 }
-function jn(e, t) {
-	let n = new On(Tn(t));
-	return e === cn ? new kn(n) : n;
+function Pn(e, t) {
+	let n = new jn(On(t));
+	return e === dn ? new Mn(n) : n;
 }
-var Mn = {
-	appStringPrefixes: [sn, cn],
-	tagNumbers: [ln],
+var Fn = {
+	appStringPrefixes: [un, dn],
+	tagNumbers: [fn],
 	parseAppString(e, t) {
-		return jn(e, t);
+		return Pn(e, t);
 	},
 	parseAppSequence(e, t) {
-		return jn(e, An(t));
+		return Pn(e, Nn(t));
 	},
 	parseTag(e, t) {
-		if (e === 99n && t instanceof j) return new kn(new On(t.items, {
+		if (e !== 99n || !(t instanceof F)) return;
+		let n = new jn(t.items, {
 			indefiniteLength: t.indefiniteLength,
 			encodingWidth: t.encodingWidth
-		}));
+		});
+		return n.start = t.start, n.end = t.end, new Mn(n);
 	}
-}, Nn = new TextDecoder("utf-8", {
+};
+//#endregion
+//#region src/cbor/decoder.ts
+function K(e, t) {
+	if (e === 24 && t <= 23n) return 0;
+	if (e === 25 && t <= 255n) return 1;
+	if (e === 26 && t <= 65535n) return 2;
+	if (e === 27 && t <= 4294967295n) return 3;
+}
+var In = new TextDecoder("utf-8", {
 	fatal: !0,
 	ignoreBOM: !0
-}), Pn = new TextDecoder("utf-8", {
+}), Ln = new TextDecoder("utf-8", {
 	fatal: !1,
 	ignoreBOM: !0
 });
 function q(e) {
 	throw Error(`CBOR decode error: ${e}`);
 }
-function Fn(e, t, n) {
+function Rn(e, t, n) {
 	let r = {
 		message: e,
 		offset: t
@@ -2265,61 +2398,61 @@ function Fn(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 In(e, t) {
+function J(e, t) {
 	e.warnings ??= [], e.warnings.push(t);
 }
-function Ln(e) {
+function zn(e) {
 	let t = "";
 	for (let n of e) t += n.toString(16).padStart(2, "0");
 	return t;
 }
-function J(e) {
-	if (e instanceof w) return ["u", String(e.value)];
-	if (e instanceof T) return ["n", String(e.value)];
+function Y(e) {
+	if (e instanceof O) return ["u", String(e.value)];
+	if (e instanceof k) return ["n", String(e.value)];
 	if (e instanceof z) return ["t", e.value];
-	if (e instanceof A) return ["t", e.chunks.map((e) => e.value).join("")];
-	if (e instanceof O) return ["b", Ln(e.value)];
-	if (e instanceof k) {
+	if (e instanceof P) return ["t", e.chunks.map((e) => e.value).join("")];
+	if (e instanceof M) return ["b", zn(e.value)];
+	if (e instanceof N) {
 		let t = "";
-		for (let n of e.chunks) t += Ln(n.value);
+		for (let n of e.chunks) t += zn(n.value);
 		return ["b", t];
 	}
-	if (e instanceof E) return isNaN(e.value) ? ["f", "NaN"] : Object.is(e.value, -0) ? ["f", "-0"] : ["f", String(e.value)];
-	if (e instanceof N) return ["s", e.value];
-	if (e instanceof j) return ["A", e.items.map(J)];
-	if (e instanceof M) {
-		let t = e.entries.map(([e, t]) => [J(e), J(t)]);
+	if (e instanceof A) return isNaN(e.value) ? ["f", "NaN"] : Object.is(e.value, -0) ? ["f", "-0"] : ["f", String(e.value)];
+	if (e instanceof L) return ["s", e.value];
+	if (e instanceof F) return ["A", e.items.map(Y)];
+	if (e instanceof I) {
+		let t = e.entries.map(([e, t]) => [Y(e), Y(t)]);
 		if (t.length <= 1) return ["M", t];
 		let n = t.map((e) => [JSON.stringify(e[0]), e]);
 		return n.sort((e, t) => e[0] < t[0] ? -1 : +(e[0] > t[0])), ["M", n.map((e) => e[1])];
 	}
-	if (e instanceof D) return [
+	if (e instanceof j) return [
 		"G",
 		String(e.tag),
-		J(e.content)
+		Y(e.content)
 	];
 	let t = e.toCBOR(), n = "";
 	for (let e of t) n += e.toString(16).padStart(2, "0");
 	return ["c", n];
 }
-function Rn(e) {
-	if (e instanceof w) return "u" + e.value;
-	if (e instanceof T) return "n" + e.value;
+function Bn(e) {
+	if (e instanceof O) return "u" + e.value;
+	if (e instanceof k) return "n" + e.value;
 	if (e instanceof z) return "t" + e.value;
-	if (e instanceof A) {
+	if (e instanceof P) {
 		let t = "t";
 		for (let n of e.chunks) t += n.value;
 		return t;
 	}
-	if (e instanceof O) return "b" + Ln(e.value);
-	if (e instanceof k) {
+	if (e instanceof M) return "b" + zn(e.value);
+	if (e instanceof N) {
 		let t = "b";
-		for (let n of e.chunks) t += Ln(n.value);
+		for (let n of e.chunks) t += zn(n.value);
 		return t;
 	}
-	return e instanceof E ? isNaN(e.value) ? "fNaN" : Object.is(e.value, -0) ? "f-0" : "f" + e.value : e instanceof N ? "s" + e.value : JSON.stringify(J(e));
+	return e instanceof A ? isNaN(e.value) ? "fNaN" : Object.is(e.value, -0) ? "f-0" : "f" + e.value : e instanceof L ? "s" + e.value : JSON.stringify(Y(e));
 }
-function Y(e, t, n) {
+function X(e, t, n) {
 	if (n <= 23) return {
 		value: BigInt(n),
 		nextOffset: t
@@ -2344,14 +2477,14 @@ function Y(e, t, n) {
 		default: q(`reserved additional info value: ${n}`);
 	}
 }
-function zn(e, t, n, r, i, a) {
+function Vn(e, t, n, r, i, a) {
 	let o = [], s = t;
 	for (;;) {
 		if (s >= e.byteLength && q(`unexpected end of indefinite ${i}`), e.getUint8(s) === 255) {
 			s++;
 			break;
 		}
-		let t = X(e, s, n, r);
+		let t = Z(e, s, n, r);
 		a(t.value) || q(`indefinite-length ${i} chunk must be a definite ${i}`), o.push(t.value), s = t.nextOffset;
 	}
 	return {
@@ -2359,65 +2492,65 @@ function zn(e, t, n, r, i, a) {
 		nextOffset: s
 	};
 }
-function Bn(e, t, n, r) {
-	let i = Rn(e);
-	t.has(i) && n.push(Fn(`duplicate map key at offset ${e.start}`, e.start, r)), t.add(i);
+function Hn(e, t, n, r) {
+	let i = Bn(e);
+	t.has(i) && n.push(Rn(`duplicate map key at offset ${e.start}`, e.start, r)), t.add(i);
 }
-function X(e, t, n, r) {
-	let i = t, a = Vn(e, t, n, r);
+function Z(e, t, n, r) {
+	let i = t, a = Un(e, t, n, r);
 	return a.value.start = i, a.value.end = a.nextOffset, a;
 }
-function Vn(e, t, n, r) {
+function Un(e, t, n, r) {
 	t >= e.byteLength && q("unexpected end of input");
 	let i = e.getUint8(t++), a = i >> 5, o = i & 31;
 	switch (a) {
 		case 0: {
-			let { value: n, nextOffset: r } = Y(e, t, o);
+			let { value: n, nextOffset: r } = X(e, t, o);
 			return {
-				value: new w(n),
+				value: new O(n, { encodingWidth: K(o, n) }),
 				nextOffset: r
 			};
 		}
 		case 1: {
-			let { value: n, nextOffset: r } = Y(e, t, o);
+			let { value: n, nextOffset: r } = X(e, t, o), i = K(o, n);
 			return {
-				value: new T(-1n - n),
+				value: new k(-1n - n, { encodingWidth: i }),
 				nextOffset: r
 			};
 		}
 		case 2: {
 			if (o === 31) {
-				let { chunks: i, nextOffset: a } = zn(e, t, n, r, "byte string", (e) => e instanceof O);
+				let { chunks: i, nextOffset: a } = Vn(e, t, n, r, "byte string", (e) => e instanceof M);
 				return {
-					value: new k(i),
+					value: new N(i),
 					nextOffset: a
 				};
 			}
-			let { value: i, nextOffset: a } = Y(e, t, o), s = Number(i);
+			let { value: i, nextOffset: a } = X(e, t, o), s = Number(i), c = K(o, i);
 			return a + s > e.byteLength && q("byte string extends beyond input"), {
-				value: new O(new Uint8Array(e.buffer, e.byteOffset + a, s).slice()),
+				value: new M(new Uint8Array(e.buffer, e.byteOffset + a, s).slice(), { encodingWidth: c }),
 				nextOffset: a + s
 			};
 		}
 		case 3: {
 			if (o === 31) {
-				let { chunks: i, nextOffset: a } = zn(e, t, n, r, "text string", (e) => e instanceof z);
+				let { chunks: i, nextOffset: a } = Vn(e, t, n, r, "text string", (e) => e instanceof z);
 				return {
-					value: new A(i),
+					value: new P(i),
 					nextOffset: a
 				};
 			}
-			let { value: i, nextOffset: a } = Y(e, t, o), s = Number(i);
+			let { value: i, nextOffset: a } = X(e, t, o), s = Number(i), c = K(o, i);
 			a + s > e.byteLength && q("text string extends beyond input");
-			let c = new Uint8Array(e.buffer, e.byteOffset + a, s), l, u;
+			let l = new Uint8Array(e.buffer, e.byteOffset + a, s), u, d;
 			try {
-				l = Nn.decode(c);
+				u = In.decode(l);
 			} catch {
-				u = Fn("invalid UTF-8 sequence in text string", a, n), l = Pn.decode(c);
+				d = Rn("invalid UTF-8 sequence in text string", a, n), u = Ln.decode(l);
 			}
-			let d = new z(l);
-			return u && In(d, u), {
-				value: d,
+			let f = new z(u, { encodingWidth: c });
+			return d && J(f, d), {
+				value: f,
 				nextOffset: a + s
 			};
 		}
@@ -2429,22 +2562,22 @@ function Vn(e, t, n, r) {
 						a++;
 						break;
 					}
-					let t = X(e, a, n, r);
+					let t = Z(e, a, n, r);
 					i.push(t.value), a = t.nextOffset;
 				}
 				return {
-					value: new j(i, { indefiniteLength: !0 }),
+					value: new F(i, { indefiniteLength: !0 }),
 					nextOffset: a
 				};
 			}
-			let { value: i, nextOffset: a } = Y(e, t, o), s = Number(i), c = [], l = a;
+			let { value: i, nextOffset: a } = X(e, t, o), s = Number(i), c = K(o, i), l = [], u = a;
 			for (let t = 0; t < s; t++) {
-				let t = X(e, l, n, r);
-				c.push(t.value), l = t.nextOffset;
+				let t = Z(e, u, n, r);
+				l.push(t.value), u = t.nextOffset;
 			}
 			return {
-				value: new j(c),
-				nextOffset: l
+				value: new F(l, { encodingWidth: c }),
+				nextOffset: u
 			};
 		}
 		case 5: {
@@ -2455,118 +2588,126 @@ function Vn(e, t, n, r) {
 						s++;
 						break;
 					}
-					let t = X(e, s, n, r);
-					Bn(t.value, a, o, n), s = t.nextOffset;
-					let c = X(e, s, n, r);
+					let t = Z(e, s, n, r);
+					Hn(t.value, a, o, n), s = t.nextOffset;
+					let c = Z(e, s, n, r);
 					s = c.nextOffset, i.push([t.value, c.value]);
 				}
-				let c = new M(i, { indefiniteLength: !0 });
-				for (let e of o) In(c, e);
+				let c = new I(i, { indefiniteLength: !0 });
+				for (let e of o) J(c, e);
 				return {
 					value: c,
 					nextOffset: s
 				};
 			}
-			let { value: i, nextOffset: a } = Y(e, t, o), s = Number(i), c = [], l = /* @__PURE__ */ new Set(), u = [], d = a;
+			let { value: i, nextOffset: a } = X(e, t, o), s = Number(i), c = K(o, i), l = [], u = /* @__PURE__ */ new Set(), d = [], f = a;
 			for (let t = 0; t < s; t++) {
-				let t = X(e, d, n, r);
-				Bn(t.value, l, u, n), d = t.nextOffset;
-				let i = X(e, d, n, r);
-				d = i.nextOffset, c.push([t.value, i.value]);
+				let t = Z(e, f, n, r);
+				Hn(t.value, u, d, n), f = t.nextOffset;
+				let i = Z(e, f, n, r);
+				f = i.nextOffset, l.push([t.value, i.value]);
 			}
-			let f = new M(c);
-			for (let e of u) In(f, e);
+			let p = new I(l, { encodingWidth: c });
+			for (let e of d) J(p, e);
 			return {
-				value: f,
-				nextOffset: d
+				value: p,
+				nextOffset: f
 			};
 		}
 		case 6: {
 			o === 31 && q("tags cannot use indefinite-length encoding");
-			let { value: i, nextOffset: a } = Y(e, t, o), s = X(e, a, n, r);
+			let { value: i, nextOffset: a } = X(e, t, o), s = K(o, i), c = Z(e, a, n, r);
 			for (let e of r) {
-				let t = e.parseTag(i, s.value, n);
-				if (t !== void 0) return {
+				let t = e.parseTag(i, c.value, n);
+				if (t !== void 0) return t instanceof j && s !== void 0 && (t.encodingWidth = s), {
 					value: t,
-					nextOffset: s.nextOffset
+					nextOffset: c.nextOffset
 				};
 			}
 			return {
-				value: new D(i, s.value),
-				nextOffset: s.nextOffset
+				value: new j(i, c.value, { encodingWidth: s }),
+				nextOffset: c.nextOffset
 			};
 		}
 		case 7:
 			if (o <= 19) return {
-				value: new N(o),
+				value: new L(o),
 				nextOffset: t
 			};
 			if (o === 20) return {
-				value: new N(20),
+				value: new L(20),
 				nextOffset: t
 			};
 			if (o === 21) return {
-				value: new N(21),
+				value: new L(21),
 				nextOffset: t
 			};
 			if (o === 22) return {
-				value: new N(22),
+				value: new L(22),
 				nextOffset: t
 			};
 			if (o === 23) return {
-				value: new N(23),
+				value: new L(23),
 				nextOffset: t
 			};
 			if (o === 24) {
 				t + 1 > e.byteLength && q("unexpected end of input");
 				let r = e.getUint8(t);
 				if (r < 32) {
-					let e = Fn(`simple value ${r} must be encoded in initial byte (0–31 reserved for extended encoding)`, t - 1, n), i = new N(r);
-					return In(i, e), {
+					let e = Rn(`simple value ${r} must be encoded in initial byte (0–31 reserved for extended encoding)`, t - 1, n), i = new L(r);
+					return J(i, e), {
 						value: i,
 						nextOffset: t + 1
 					};
 				}
 				return {
-					value: new N(r),
+					value: new L(r),
 					nextOffset: t + 1
 				};
 			}
 			return o === 25 ? (t + 2 > e.byteLength && q("unexpected end of input"), {
-				value: new E(je(e.getUint16(t, !1)), { precision: "half" }),
+				value: new A(S(e.getUint16(t, !1)), { precision: "half" }),
 				nextOffset: t + 2
 			}) : o === 26 ? (t + 4 > e.byteLength && q("unexpected end of input"), {
-				value: new E(e.getFloat32(t, !1), { precision: "single" }),
+				value: new A(e.getFloat32(t, !1), { precision: "single" }),
 				nextOffset: t + 4
 			}) : o === 27 ? (t + 8 > e.byteLength && q("unexpected end of input"), {
-				value: new E(e.getFloat64(t, !1), { precision: "double" }),
+				value: new A(e.getFloat64(t, !1), { precision: "double" }),
 				nextOffset: t + 8
 			}) : (o < 31 && q(`reserved additional info value in major type 7: ${o}`), q("unexpected break code outside indefinite-length item"));
 	}
 	return q(`unknown major type: ${a}`);
 }
-function Hn(e) {
+function Wn(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 Un(e, t) {
-	let n = Hn(e), r = new DataView(n.buffer, n.byteOffset, n.byteLength), i = t?.offset ?? 0;
+function Gn(e, t) {
+	let n = Wn(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 { value: a, nextOffset: o } = X(r, i, t, [...t?.extensions ?? [], ...Z].filter((e) => e.parseTag !== void 0));
-	return !t?.allowTrailing && o !== r.byteLength && q(`${r.byteLength - o} trailing byte(s) after end of CBOR item`), a;
+	let a = [...t?.extensions ?? [], ...qn].filter((e) => e.parseTag !== void 0), { value: o, nextOffset: s } = Z(r, i, t, a);
+	if (!t?.allowTrailing && s !== r.byteLength) {
+		J(o, Rn(`${r.byteLength - s} trailing byte(s) after end of CBOR item`, s, t));
+		let e = {
+			strict: !1,
+			silent: !0
+		}, n = s;
+		for (; n < r.byteLength;) ({nextOffset: n} = Z(r, n, e, a));
+	}
+	return o;
 }
 //#endregion
 //#region src/extensions/cbordata.ts
-var Wn = 24n, Z = [
-	zt,
-	nn,
+var Kn = 24n, qn = [
+	Vt,
 	on,
-	Mn,
+	ln,
+	Fn,
 	{
-		tagNumbers: [Wn],
+		tagNumbers: [Kn],
 		parseTag(e, t, n) {
-			if (e !== 24n || !(t instanceof O)) return;
+			if (e !== 24n || !(t instanceof M)) return;
 			let r = n ? {
 				extensions: n.extensions,
 				strict: n.strict,
@@ -2574,7 +2715,7 @@ var Wn = 24n, Z = [
 				silent: n.silent
 			} : void 0;
 			try {
-				return new D(Wn, new P([Un(t.value, r)]));
+				return new j(Kn, new Ve([Gn(t.value, r)], { encodingWidth: t.encodingWidth }));
 			} catch (e) {
 				if (r?.strict !== !1) throw e;
 				return;
@@ -2586,51 +2727,51 @@ var Wn = 24n, Z = [
 //#region src/js/fromJS.ts
 function Q(e, t) {
 	if (t?.replacer) {
-		let { replacer: n, ...r } = t, i = qn(e, n, r.extensions, r.undefinedOmits);
-		return i === d ? N.UNDEFINED : Q(i, Object.keys(r).length > 0 ? r : void 0);
+		let { replacer: n, ...r } = t, i = Xn(e, n, r.extensions, r.undefinedOmits);
+		return i === d ? L.UNDEFINED : Q(i, Object.keys(r).length > 0 ? r : void 0);
 	}
-	return Gn(e, t, !0);
+	return Jn(e, t, !0);
 }
-function Gn(e, t, n) {
-	for (let n of [...t?.extensions ?? [], ...Z]) if (n.fromJS) {
+function Jn(e, t, n) {
+	for (let n of [...t?.extensions ?? [], ...qn]) if (n.fromJS) {
 		let r = n.fromJS(e, t ?? {});
 		if (r !== void 0) return r;
 	}
 	if (n && typeof e == "object" && e && u.symbol in e) {
-		let n = e[u.symbol], r = Gn(e, t, !1);
-		for (let e of [...t?.extensions ?? [], ...Z]) if (e.parseTag) {
+		let n = e[u.symbol], r = Jn(e, t, !1);
+		for (let e of [...t?.extensions ?? [], ...qn]) if (e.parseTag) {
 			let t = e.parseTag(n, r);
 			if (t !== void 0) return t;
 		}
-		return new D(n, r);
-	}
-	if (e instanceof u.Null) return N.NULL;
-	if (e instanceof u.Undefined) return N.UNDEFINED;
-	if (e instanceof f) return new N(e.value);
-	if (e === null) return N.NULL;
-	if (e === void 0) return N.UNDEFINED;
-	if (e === !0) return N.TRUE;
-	if (e === !1) return N.FALSE;
-	if (typeof e == "bigint") return e > 18446744073709551615n ? new Qe(e) : e < -18446744073709551616n ? new L(e) : e >= 0n ? new w(e) : new T(e);
-	if (typeof e == "number") return (t?.encodeIntegerAs ?? "int") === "int" && Number.isInteger(e) && !Object.is(e, -0) ? e >= 0 ? new w(BigInt(e)) : new T(BigInt(e)) : new E(e);
+		return new j(n, r);
+	}
+	if (e instanceof u.Null) return L.NULL;
+	if (e instanceof u.Undefined) return L.UNDEFINED;
+	if (e instanceof f) return new L(e.value);
+	if (e === null) return L.NULL;
+	if (e === void 0) return L.UNDEFINED;
+	if (e === !0) return L.TRUE;
+	if (e === !1) return L.FALSE;
+	if (typeof e == "bigint") return e > 18446744073709551615n ? new Qe(e) : e < -18446744073709551616n ? new $e(e) : e >= 0n ? new O(e) : new k(e);
+	if (typeof e == "number") return (t?.encodeIntegerAs ?? "int") === "int" && Number.isInteger(e) && !Object.is(e, -0) ? e >= 0 ? new O(BigInt(e)) : new k(BigInt(e)) : new A(e);
 	if (typeof e == "string") return new z(e);
-	if (e instanceof Number || e instanceof Boolean || e instanceof String || Object.prototype.toString.call(e) === "[object BigInt]") return Gn(e.valueOf(), t, !1);
-	if (e instanceof ArrayBuffer || typeof SharedArrayBuffer < "u" && e instanceof SharedArrayBuffer) return new O(new Uint8Array(e));
-	if (ArrayBuffer.isView(e)) return e instanceof Uint8Array && t?.uint8ArrayAs === "array" ? new j(Array.from(e, (e) => new w(BigInt(e)))) : new O(new Uint8Array(e.buffer, e.byteOffset, e.byteLength));
-	if (e instanceof $) return new M([...e].map(([e, n]) => [Q(e, t), Q(n, t)]));
-	if (Array.isArray(e)) return new j(e.map((e) => Q(e, t)));
+	if (e instanceof Number || e instanceof Boolean || e instanceof String || Object.prototype.toString.call(e) === "[object BigInt]") return Jn(e.valueOf(), t, !1);
+	if (e instanceof ArrayBuffer || typeof SharedArrayBuffer < "u" && e instanceof SharedArrayBuffer) return new M(new Uint8Array(e));
+	if (ArrayBuffer.isView(e)) return e instanceof Uint8Array && t?.uint8ArrayAs === "array" ? new F(Array.from(e, (e) => new O(BigInt(e)))) : new M(new Uint8Array(e.buffer, e.byteOffset, e.byteLength));
+	if (e instanceof $) return new I([...e].map(([e, n]) => [Q(e, t), Q(n, t)]));
+	if (Array.isArray(e)) return new F(e.map((e) => Q(e, t)));
 	if (typeof e == "object") {
 		let n = [];
 		for (let [r, i] of Object.entries(e)) n.push([new z(r), Q(i, t)]);
-		return new M(n);
+		return new I(n);
 	}
 	throw TypeError(`fromJS: unsupported value type: ${typeof e}`);
 }
-function Kn(e) {
+function Yn(e) {
 	return ArrayBuffer.isView(e) || e instanceof ArrayBuffer || typeof SharedArrayBuffer < "u" && e instanceof SharedArrayBuffer || e instanceof Number || e instanceof Boolean || e instanceof String || Object.prototype.toString.call(e) === "[object BigInt]" || e instanceof u.Null || e instanceof u.Undefined || e instanceof f;
 }
-function qn(e, t, n, r) {
-	let i = [...n ?? [], ...Z];
+function Xn(e, t, n, r) {
+	let i = [...n ?? [], ...qn];
 	function a(e) {
 		return e === d || r === !0 && e === void 0;
 	}
@@ -2640,7 +2781,7 @@ function qn(e, t, n, r) {
 			if (typeof e != "object" || !e) return e;
 			if (e instanceof $) return $.from(e, ([e, t]) => [e, r(t)]);
 			if (Array.isArray(e)) return e.map(r);
-			if (u.symbol in e || Kn(e) || i.some((t) => t.isJSType?.(e))) return e;
+			if (u.symbol in e || Yn(e) || i.some((t) => t.isJSType?.(e))) return e;
 			let t = Object.getPrototypeOf(e);
 			if (t === Object.prototype || t === null) {
 				let t = e.toJSON;
@@ -2675,7 +2816,7 @@ function qn(e, t, n, r) {
 				let r = s(t, String(n), e);
 				return a(r) ? null : r;
 			});
-			if (Kn(e) || i.some((t) => t.isJSType?.(e))) return e;
+			if (Yn(e) || i.some((t) => t.isJSType?.(e))) return e;
 			let t = {};
 			for (let n of Object.keys(e)) {
 				let r = s(e[n], n, e);
@@ -2705,6 +2846,6 @@ var $ = class extends Array {
 	}
 };
 //#endregion
-export { ie as C, r as D, n as E, u as O, je as S, d as T, D as _, Bt as a, w as b, L as c, N as d, M as f, O as g, k as h, Un as i, i as k, Qe as l, A as m, qn as n, z as o, j as p, Q as r, nt as s, $ as t, P as u, E as v, f as w, C as x, T as y };
+export { i as A, x as C, n as D, d as E, r as O, S, f as T, j as _, Ht as a, O as b, $e as c, L as d, I as f, M as g, N as h, Gn as i, u as k, Qe as l, P as m, Xn as n, z as o, F as p, Q as r, rt as s, $ as t, Ve as u, A as v, ne as w, D as x, k as y };
 
-//# sourceMappingURL=mapEntries-D6BfG4-1.js.map
+//# sourceMappingURL=mapEntries-bvRWFfqX.js.map