@cbortech/cbor 0.27.0 → 0.27.2

package/dist/index.js

@@ -1,48 +1,155 @@
-import { D as e, I as t } from "./serialize-utils-BuIZPaUc.js";
-import { n, s as r } from "./schema-CNfrVRYp.js";
-import { B as i, H as a, L as o, R as s, S as c, V as l, a as u, c as d, d as f, f as p, g as m, i as h, l as g, m as _, n as v, o as y, p as b, r as x, s as S, t as C, u as w, x as T, z as E } from "./mapEntries-CvLdiN0h.js";
+import { D as e, I as t } from "./serialize-utils-BQtutOo6.js";
+import { A as n, B as r, C as i, D as a, F as o, G as s, I as c, J as l, K as u, M as d, S as f, T as p, X as m, Y as h, Z as g, _ as ee, a as _, b as v, c as y, g as te, h as ne, i as re, j as b, l as x, n as S, o as C, q as w, r as T, s as E, t as D, v as O, w as ie, x as k, y as ae } from "./mapEntries-8zshEr-t.js";
+import { n as oe } from "./schema-7r2xjpMK.js";
 //#region src/extensions/same.ts
-function D(e, t) {
+function se(e, t) {
 	if (e.length !== t.length) return !1;
 	for (let n = 0; n < e.length; n++) if (e[n] !== t[n]) return !1;
 	return !0;
 }
-var O = {
+var ce = {
 	appStringPrefixes: ["same"],
 	preserveAppSeqSource: !0,
 	parseAppSequence(e, t, n) {
 		if (t.length === 0) throw SyntaxError("same<<...>> requires at least one item");
 		let r = t[0], i = r.toCBOR();
-		for (let e = 1; e < t.length; e++) if (!D(i, t[e].toCBOR())) {
+		for (let e = 1; e < t.length; e++) if (!se(i, t[e].toCBOR())) {
 			let t = `same<<...>>: item ${e} produces different CBOR bytes than item 0`;
 			if (n) n(t);
 			else throw SyntaxError(t);
 		}
 		return r;
 	}
-}, k = /* @__PURE__ */ new Map(), A = 64;
-function j(e) {
+}, A = 8;
+function j(e, t, n, r) {
+	if (x(e, t, n).valid) return t;
+	let i = [];
+	if (!x(e, t, n, {
+		infer: !0,
+		trail: i
+	}).valid) return t;
+	let a = F(i);
+	return !a || a.size === 0 ? t : B(t, a, r);
+}
+function M(e, t, n, r) {
+	R(t);
+	let i = /* @__PURE__ */ new Set();
+	for (let e of r) !e.inferred && I(e.item) && i.add(e.item);
+	for (let r = 0; i.size > 0 && r < A; r++) {
+		let r = N(e, t, n, i);
+		if (!r) return;
+		if (r.size === i.size) {
+			for (let e of i) e._implicit = !0;
+			return;
+		}
+		i = r;
+	}
+}
+function N(e, t, n, r) {
+	if (x(e, t, n, {
+		stripped: r,
+		trail: []
+	}).valid) return /* @__PURE__ */ new Set();
+	let i = [];
+	if (!x(e, t, n, {
+		infer: !0,
+		stripped: r,
+		trail: i
+	}).valid) return /* @__PURE__ */ new Set();
+	let a = /* @__PURE__ */ new Map();
+	for (let e of r) {
+		let t = P(e, r), n = L(t[t.length - 1].content);
+		(a.get(n)?.length ?? 0) < t.length && a.set(n, t);
+	}
+	let o = F(i);
+	if (!o) return;
+	let s = /* @__PURE__ */ new Set();
+	for (let [e, t] of o) {
+		let n = a.get(e);
+		if (!n) return;
+		if (n.length === t.length && n.every((e, n) => e.tag === t[n])) for (let e of n) s.add(e);
+	}
+	return s;
+}
+function P(e, t) {
+	let n = [], i = e;
+	for (; i instanceof r && t.has(i);) n.push(i), i = L(i.content);
+	return n;
+}
+function F(e) {
+	let t = /* @__PURE__ */ new Map();
+	for (let n of e) {
+		if (!n.inferred) continue;
+		let e = t.get(n.item);
+		e || t.set(n.item, e = []);
+		let r = e[n.layer];
+		if (r === void 0) e[n.layer] = n.tag;
+		else if (r !== n.tag) return;
+	}
+	for (let e of t.values()) for (let t = 0; t < e.length; t++) if (e[t] === void 0) return;
+	return t;
+}
+function I(e) {
+	return e instanceof r && e._toJS === r.prototype._toJS;
+}
+function L(e) {
+	for (; e instanceof n;) e = e.inner;
+	return e;
+}
+function R(e) {
+	z(e, R), e instanceof r && (e._implicit = !1);
+}
+function z(e, t) {
+	if (e instanceof c) e.items.forEach(t);
+	else if (e instanceof o) for (let [n, r] of e.entries) t(n), t(r);
+	else e instanceof r ? t(e.content) : e instanceof n && t(e.inner);
+}
+function B(e, t, n) {
+	let i = (e) => {
+		if (e instanceof c) {
+			let { items: t } = e;
+			for (let e = 0; e < t.length; e++) t[e] = i(t[e]);
+		} else if (e instanceof o) for (let t of e.entries) t[0] = i(t[0]), t[1] = i(t[1]);
+		else e instanceof r && (e.content = i(e.content));
+		let a = e, s = t.get(e) ?? [];
+		for (let e = s.length - 1; e >= 0; e--) a = n(s[e], a);
+		return a;
+	};
+	return i(e);
+}
+//#endregion
+//#region src/cbor.ts
+var V = /* @__PURE__ */ new Map(), H = 64;
+function U(e) {
 	if (typeof e != "string") return e;
-	let t = k.get(e);
-	return t || (t = n(e), k.size >= A && k.delete(k.keys().next().value), k.set(e, t)), t;
+	let t = V.get(e);
+	return t || (t = oe(e), V.size >= H && V.delete(V.keys().next().value), V.set(e, t)), t;
 }
-function M(e, t, n) {
+function W(e, t, n, r, i) {
 	if (t) {
-		let i = t.validate(e, n);
-		if (!i.valid) throw new r(i.errors, i.warnings);
+		i && i.implicitTags !== !1 && (e = j(t, e, n, (e, t) => re(e, t, i)));
+		let a = [], o = x(t, e, n, { trail: a });
+		if (!o.valid) throw new g(o.errors, o.warnings);
+		M(t, e, n, a), E(e, t, n, r);
 	}
 	return e;
 }
-function N(e, t) {
-	return M(e, j(t?.cddl), t?.cddlValidationOptions);
+function G(e, t) {
+	return t ? {
+		...e,
+		extensions: [y(t), ...e?.extensions ?? []]
+	} : e;
+}
+function K(e, t) {
+	return W(e, U(t?.cddl), t?.cddlValidationOptions, t);
 }
-var P = class n {
-	static OMIT = s;
-	static TAG = E;
-	static Tag = l;
-	static Simple = o;
-	static MapEntries = C;
-	static dt_as_Date = _;
+var q = class n {
+	static OMIT = u;
+	static TAG = w;
+	static Tag = h;
+	static Simple = s;
+	static MapEntries = D;
+	static dt_as_Date = p;
 	#e;
 	constructor(e) {
 		this.#e = e ?? {};
@@ -133,7 +240,7 @@ var P = class n {
 	stringify(e, t, r) {
 		if (typeof t == "function" || Array.isArray(t) || t === null || t === void 0 && r !== void 0) {
 			let i = { ...this.#e };
-			return t === null ? i.replacer = void 0 : (typeof t == "function" || Array.isArray(t)) && (i.replacer = t), r !== void 0 && (i.indent = V(r)), n.stringify(e, i);
+			return t === null ? i.replacer = void 0 : (typeof t == "function" || Array.isArray(t)) && (i.replacer = t), r !== void 0 && (i.indent = $(r)), n.stringify(e, i);
 		}
 		return n.stringify(e, this.#t(t ?? void 0));
 	}
@@ -141,73 +248,75 @@ var P = class n {
 		return n.format(e, this.#t(t));
 	}
 	static fromCBOR(e, t) {
-		return N(w(e, t), t);
+		return K(k(e, t), t);
 	}
 	static fromCDN(e, t) {
-		return N(m(e, t), t);
+		let n = U(t?.cddl);
+		return W(a(e, G(t, n)), n, t?.cddlValidationOptions, t);
 	}
 	static fromEDN(e, t) {
 		return n.fromCDN(e, t);
 	}
 	static *fromHexDumpSeq(e, t) {
-		let r = [], i = F(e).trim().split(/\s+/).filter(Boolean);
+		let r = [], i = J(e).trim().split(/\s+/).filter(Boolean);
 		for (let e of i) if (/^[0-9A-Fa-f]{2}$/.test(e)) r.push(parseInt(e, 16));
 		else if (/^[0-9A-Fa-f]+$/.test(e) && e.length % 2 == 0) for (let t = 0; t < e.length; t += 2) r.push(parseInt(e.slice(t, t + 2), 16));
 		else throw SyntaxError(`Invalid hex token in dump: ${JSON.stringify(e)}`);
 		yield* n.fromCBORSeq(new Uint8Array(r), t);
 	}
 	static *fromCBORSeq(e, t) {
-		let n = j(t?.cddl), r = e instanceof ArrayBuffer || typeof SharedArrayBuffer < "u" && e instanceof SharedArrayBuffer ? new Uint8Array(e) : new Uint8Array(e.buffer, e.byteOffset, e.byteLength), i = 0;
+		let n = U(t?.cddl), r = e instanceof ArrayBuffer || typeof SharedArrayBuffer < "u" && e instanceof SharedArrayBuffer ? new Uint8Array(e) : new Uint8Array(e.buffer, e.byteOffset, e.byteLength), i = 0;
 		for (; i < r.byteLength;) {
-			let e = w(r, {
+			let e = k(r, {
 				...t,
 				offset: i,
 				allowTrailing: !0
 			});
-			yield M(e, n, t?.cddlValidationOptions), i = e.end;
+			yield W(e, n, t?.cddlValidationOptions, t), i = e.end;
 		}
 	}
 	static *fromCDNSeq(n, r) {
-		let i = j(r?.cddl), a = e(r) || !!r?.preserveAll, o = 0, s = !0;
+		let i = U(r?.cddl), o = e(r) || !!r?.preserveAll, s = 0, c = !0;
 		for (;;) {
-			let { offset: e, hadSeparator: c, commaOffset: l } = B(n, o, r, a ? s ? "all" : "after-newline" : "none");
-			if (s && l >= 0) {
+			let { offset: e, hadSeparator: l, commaOffset: u } = Q(n, s, r, o ? c ? "all" : "after-newline" : "none");
+			if (c && u >= 0) {
 				let e = "leading comma in CDN sequence";
 				if (r?.strict !== !1) throw SyntaxError(e);
-				R(e, l, r);
+				Z(e, u, r);
 			}
-			if (e >= n.length || a && z(n, e) && B(n, e, r).offset >= n.length) break;
-			if (!s && !c) {
+			if (e >= n.length || o && le(n, e) && Q(n, e, r).offset >= n.length) break;
+			if (!c && !l) {
 				let t = "CDN sequence items must be separated by whitespace, comma, or comment";
 				if (r?.strict !== !1) throw SyntaxError(t);
-				R(t, e, r);
+				Z(t, e, r);
 			}
-			o = e;
-			let u;
+			s = e;
+			let d;
 			try {
-				u = m(n, {
+				d = a(n, G({
 					...r,
-					offset: o,
+					offset: s,
 					allowTrailing: !0,
 					_skipRS: !0
-				});
+				}, i));
 			} catch (e) {
 				if (r?.strict !== !1) throw e;
-				R(e instanceof Error ? e.message : String(e), o, r, !0, e instanceof t ? e : void 0);
+				Z(e instanceof Error ? e.message : String(e), s, r, !0, e instanceof t ? e : void 0);
 				break;
 			}
-			yield M(u, i, r?.cddlValidationOptions), o = u.end, s = !1;
+			yield W(d, i, r?.cddlValidationOptions, r), s = d.end, c = !1;
 		}
 	}
 	static fromJS(e, t) {
-		return N(x(e, t), t);
+		let n = U(t?.cddl);
+		return W(T(e, t, n), n, t?.cddlValidationOptions, t, t ?? {});
 	}
 	static fromHexDump(e, t) {
-		let n = [], r = F(e).trim().split(/\s+/).filter(Boolean);
+		let n = [], r = J(e).trim().split(/\s+/).filter(Boolean);
 		for (let e of r) if (/^[0-9A-Fa-f]{2}$/.test(e)) n.push(parseInt(e, 16));
 		else if (/^[0-9A-Fa-f]+$/.test(e) && e.length % 2 == 0) for (let t = 0; t < e.length; t += 2) n.push(parseInt(e.slice(t, t + 2), 16));
 		else throw SyntaxError(`Invalid hex token in dump: ${JSON.stringify(e)}`);
-		return N(w(new Uint8Array(n), t), t);
+		return K(k(new Uint8Array(n), t), t);
 	}
 	static decode(e, t) {
 		return n.fromCBOR(e, t).toJS(t);
@@ -238,9 +347,9 @@ var P = class n {
 		return a;
 	}
 	static validate(e, r) {
-		let i = [], a = [], o, s = {
+		let i = [], a = [], o, s = U(r?.cddl), c = {
 			strict: !1,
-			extensions: r?.extensions,
+			extensions: s ? [y(s), ...r?.extensions ?? []] : r?.extensions,
 			builtinExtensions: r?.builtinExtensions,
 			onWarning: (e) => {
 				if ("hint" in e && e.hint) {
@@ -253,11 +362,11 @@ var P = class n {
 				}
 				i.push(e);
 			}
-		}, c = j(r?.cddl), l = [], u = [], d = (e) => {
-			if (!c) return;
-			let t = c.validate(e, r?.cddlValidationOptions);
+		}, l = [], u = [], d = (e) => {
+			if (!s) return;
+			let t = s.validate(e, r?.cddlValidationOptions);
 			l.push(...t.errors), t.warnings && u.push(...t.warnings);
-		}, f = c ? {
+		}, f = s ? {
 			cddlErrors: l,
 			cddlWarnings: u
 		} : {}, p = 0;
@@ -265,12 +374,12 @@ var P = class n {
 			let t = r?.type ?? "cbor";
 			if (t === "cdn") {
 				let t = {
-					...s,
+					...c,
 					unresolvedExtension: r?.unresolvedExtension
 				};
 				for (let r of n.fromCDNSeq(e, t)) p++, d(r);
-			} else if (t === "hex") for (let t of n.fromHexDumpSeq(e, s)) p++, d(t);
-			else for (let t of n.fromCBORSeq(e, s)) p++, d(t);
+			} else if (t === "hex") for (let t of n.fromHexDumpSeq(e, c)) p++, d(t);
+			else for (let t of n.fromCBORSeq(e, c)) p++, d(t);
 		} catch (e) {
 			return {
 				valid: !1,
@@ -317,81 +426,81 @@ var P = class n {
 	}
 	static stringify(e, t, n) {
 		if (typeof t == "function" || Array.isArray(t) || t === null || t === void 0 && n !== void 0) {
-			let r = typeof t == "function" || Array.isArray(t) ? t : void 0, i = V(n);
+			let r = typeof t == "function" || Array.isArray(t) ? t : void 0, i = $(n);
 			if (r) {
-				let t = v(e, r);
-				return t === void 0 || t === s ? void 0 : x(t).toCDN(i === void 0 ? void 0 : { indent: i });
+				let t = S(e, r);
+				return t === void 0 || t === u ? void 0 : T(t).toCDN(i === void 0 ? void 0 : { indent: i });
 			}
-			return x(e).toCDN(i === void 0 ? void 0 : { indent: i });
+			return T(e).toCDN(i === void 0 ? void 0 : { indent: i });
 		}
-		let r = t;
+		let r = t, i = U(r?.cddl);
 		if (r?.replacer) {
-			let t = v(e, r.replacer, r.extensions, r.undefinedOmits, r.builtinExtensions);
-			if (t === void 0 || t === s) return;
-			let { replacer: n, ...i } = r;
-			return N(x(t, Object.keys(i).length > 0 ? i : void 0), r).toCDN(r);
+			let t = S(e, r.replacer, r.extensions, r.undefinedOmits, r.builtinExtensions);
+			if (t === void 0 || t === u) return;
+			let { replacer: n, ...a } = r;
+			return W(T(t, Object.keys(a).length > 0 ? a : void 0, i), i, r.cddlValidationOptions, r, a).toCDN(r);
 		}
-		return N(x(e, r), r).toCDN(r);
+		return W(T(e, r, i), i, r?.cddlValidationOptions, r, r ?? {}).toCDN(r);
 	}
 	static format(e, t) {
 		return n.fromCDN(e, t).toCDN(t);
 	}
 };
-function F(e) {
+function J(e) {
 	let t = "", n = 0;
 	for (; n < e.length;) {
 		let r = e[n], i = e[n + 1] ?? "";
 		if (r === "-" && i === "-") {
-			n = I(e, n + 2), t += " ";
+			n = Y(e, n + 2), t += " ";
 			continue;
 		}
 		if (r === "—") {
-			n = I(e, n + 1), t += " ";
+			n = Y(e, n + 1), t += " ";
 			continue;
 		}
 		if (r === "#") {
-			n = I(e, n + 1), t += " ";
+			n = Y(e, n + 1), t += " ";
 			continue;
 		}
 		if (r === "/" && i === "/") {
-			n = I(e, n + 2), t += " ";
+			n = Y(e, n + 2), t += " ";
 			continue;
 		}
 		if (r === "/" && i === "*") {
 			let r = e.indexOf("*/", n + 2);
 			if (r < 0) throw SyntaxError("Unterminated comment in hex dump");
-			t += L(e.slice(n, r + 2)), n = r + 2;
+			t += X(e.slice(n, r + 2)), n = r + 2;
 			continue;
 		}
 		if (r === "/") {
 			let r = e.indexOf("/", n + 1);
 			if (r < 0) throw SyntaxError("Unterminated comment in hex dump");
-			t += L(e.slice(n, r + 1)), n = r + 1;
+			t += X(e.slice(n, r + 1)), n = r + 1;
 			continue;
 		}
 		t += r, n++;
 	}
 	return t;
 }
-function I(e, t) {
+function Y(e, t) {
 	let n = e.indexOf("\n", t);
 	return n < 0 ? e.length : n;
 }
-function L(e) {
+function X(e) {
 	return e.replace(/[^\r\n]/g, " ");
 }
-function R(e, t, n, r, i) {
+function Z(e, t, n, r, i) {
 	let a = i?.offset ?? t, o = {
 		message: e,
 		offset: a
 	};
 	r && (o.fatal = !0), i && (o.cause = i), i?.offset !== void 0 && (o.line = i.line, o.column = i.column, o.endOffset = i.endOffset), n?.onWarning ? n.onWarning(o) : n?.silent || console.warn(`CDN sequence warning at offset ${a}: ${e}`);
 }
-function z(e, t) {
+function le(e, t) {
 	let n = e[t];
 	return n === "#" || n === "/";
 }
-function B(e, t, n, r = "none") {
+function Q(e, t, n, r = "none") {
 	let i = t, a = !1, o = !1, s = !1, c = -1, l = () => r === "all" || r === "after-newline" && s;
 	for (; i < e.length;) {
 		let t = e[i];
@@ -421,7 +530,7 @@ function B(e, t, n, r = "none") {
 			if (t < 0) {
 				let t = "unterminated /* comment in CDN sequence";
 				if (n?.strict !== !1) throw SyntaxError(t);
-				R(t, i, n, !0), i = e.length;
+				Z(t, i, n, !0), i = e.length;
 			} else e.slice(i, t).includes("\n") && (s = !0), i = t + 2;
 			continue;
 		}
@@ -431,7 +540,7 @@ function B(e, t, n, r = "none") {
 			if (t < 0) {
 				let t = "unterminated / comment in CDN sequence";
 				if (n?.strict !== !1) throw SyntaxError(t);
-				R(t, i, n, !0), i = e.length;
+				Z(t, i, n, !0), i = e.length;
 			} else e.slice(i, t).includes("\n") && (s = !0), i = t + 1;
 			continue;
 		}
@@ -447,7 +556,7 @@ function B(e, t, n, r = "none") {
 		commaOffset: c
 	};
 }
-function V(e) {
+function $(e) {
 	if (typeof e == "number") {
 		let t = Math.floor(Math.min(10, Math.max(0, e)));
 		return t === 0 ? void 0 : t;
@@ -455,6 +564,6 @@ function V(e) {
 	if (typeof e == "string") return e.slice(0, 10) || void 0;
 }
 //#endregion
-export { h as BUILTIN_EXTENSIONS, P as CBOR, P as default, s as CBOR_OMIT, E as CBOR_TAG, r as CddlMismatchError, t as CdnSyntaxError, C as MapEntries, i as Null, o as Simple, l as Tag, a as Undefined, d as b1, T as b32, f as cri, b as dt, _ as dt_as_Date, u as float, c as h32, y as ilbs, S as ilts, p as ip, O as same, g as t1 };
+export { ne as BUILTIN_EXTENSIONS, q as CBOR, q as default, u as CBOR_OMIT, w as CBOR_TAG, _ as CborERefNint, C as CborERefUint, g as CddlMismatchError, t as CdnSyntaxError, D as MapEntries, l as Null, s as Simple, h as Tag, m as Undefined, E as annotateERefKeys, ae as b1, b as b32, y as createERefExtension, f as cri, ie as dt, p as dt_as_Date, te as float, d as h32, ee as ilbs, O as ilts, i as ip, ce as same, v as t1 };
 
 //# sourceMappingURL=index.js.map