@cbortech/cbor 0.26.4 → 0.26.6

package/dist/index.js

@@ -1,14 +1,15 @@
 import { o as e } from "./tokenizer-CeuixxXi.js";
-import { E as t, F as n, I as r, L as i, M as a, N as o, P as s, _ as c, a as l, c as u, d, f, h as p, i as m, l as h, m as g, n as _, o as v, p as y, r as b, s as x, t as S, u as C } from "./mapEntries-hyNVtz5Z.js";
+import { n as t, s as n } from "./schema-BxkgvUY6.js";
+import { B as r, H as i, L as a, R as o, V as s, _ as c, a as l, c as u, d, f, h as p, i as m, k 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, z as T } from "./mapEntries-Czxt-cmd.js";
 //#region src/extensions/b32.ts
-var w = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567", T = "0123456789ABCDEFGHIJKLMNOPQRSTUV";
-function E(e) {
+var E = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567", D = "0123456789ABCDEFGHIJKLMNOPQRSTUV";
+function O(e) {
 	let t = e.length;
 	for (; t > 0 && e.charCodeAt(t - 1) === 61;) t--;
 	return e.slice(0, t);
 }
-function D(e, t, n) {
-	let r = E(e).toUpperCase(), i = r.length % 8;
+function k(e, t, n) {
+	let r = O(e).toUpperCase(), i = r.length % 8;
 	if (i === 1 || i === 3 || i === 6) throw SyntaxError(`invalid base32 length: ${r.length} characters`);
 	let a = (/* @__PURE__ */ new Uint8Array(128)).fill(255);
 	for (let e = 0; e < t.length; e++) a[t.charCodeAt(e)] = e;
@@ -25,43 +26,59 @@ function D(e, t, n) {
 	}
 	return o;
 }
-var O = {
+var A = {
 	appStringPrefixes: ["b32"],
-	parseAppString(e, n, r) {
-		return new t(D(v(n), w, r), { ednEncoding: "base32" });
+	parseAppString(e, t, n) {
+		return new h(k(y(t), E, n), { ednEncoding: "base32" });
 	}
-}, k = {
+}, j = {
 	appStringPrefixes: ["h32"],
-	parseAppString(e, n, r) {
-		return new t(D(v(n), T, r), { ednEncoding: "base32hex" });
+	parseAppString(e, t, n) {
+		return new h(k(y(t), D, n), { ednEncoding: "base32hex" });
 	}
 };
 //#endregion
 //#region src/extensions/same.ts
-function A(e, t) {
+function M(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 j = {
+var N = {
 	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 (!A(i, t[e].toCBOR())) {
+		for (let e = 1; e < t.length; e++) if (!M(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;
 	}
-}, M = class t {
+}, P = /* @__PURE__ */ new Map(), F = 64;
+function I(e) {
+	if (typeof e != "string") return e;
+	let n = P.get(e);
+	return n || (n = t(e), P.size >= F && P.delete(P.keys().next().value), P.set(e, n)), n;
+}
+function L(e, t, r) {
+	if (t) {
+		let i = t.validate(e, r);
+		if (!i.valid) throw new n(i.errors, i.warnings);
+	}
+	return e;
+}
+function R(e, t) {
+	return L(e, I(t?.cddl), t?.cddlValidationOptions);
+}
+var z = class t {
 	static OMIT = o;
-	static TAG = s;
-	static Tag = r;
+	static TAG = T;
+	static Tag = s;
 	static Simple = a;
-	static MapEntries = S;
+	static MapEntries = C;
 	static dt_as_Date = p;
 	#e;
 	constructor(e) {
@@ -153,7 +170,7 @@ var j = {
 	stringify(e, n, r) {
 		if (typeof n == "function" || Array.isArray(n) || n === null || n === void 0 && r !== void 0) {
 			let i = { ...this.#e };
-			return n === null ? i.replacer = void 0 : (typeof n == "function" || Array.isArray(n)) && (i.replacer = n), r !== void 0 && (i.indent = z(r)), t.stringify(e, i);
+			return n === null ? i.replacer = void 0 : (typeof n == "function" || Array.isArray(n)) && (i.replacer = n), r !== void 0 && (i.indent = K(r)), t.stringify(e, i);
 		}
 		return t.stringify(e, this.#t(n ?? void 0));
 	}
@@ -161,73 +178,73 @@ var j = {
 		return t.format(e, this.#t(n));
 	}
 	static fromCBOR(e, t) {
-		return d(e, t);
+		return R(d(e, t), t);
 	}
 	static fromCDN(e, t) {
-		return c(e, t);
+		return R(c(e, t), t);
 	}
 	static fromEDN(e, n) {
 		return t.fromCDN(e, n);
 	}
 	static *fromHexDumpSeq(e, n) {
-		let r = [], i = N(e).trim().split(/\s+/).filter(Boolean);
+		let r = [], i = B(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* t.fromCBORSeq(new Uint8Array(r), n);
 	}
 	static *fromCBORSeq(e, t) {
-		let n = e instanceof ArrayBuffer || typeof SharedArrayBuffer < "u" && e instanceof SharedArrayBuffer ? new Uint8Array(e) : new Uint8Array(e.buffer, e.byteOffset, e.byteLength), r = 0;
-		for (; r < n.byteLength;) {
-			let e = d(n, {
+		let n = I(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 = d(r, {
 				...t,
-				offset: r,
+				offset: i,
 				allowTrailing: !0
 			});
-			yield e, r = e.end;
+			yield L(e, n, t?.cddlValidationOptions), i = e.end;
 		}
 	}
 	static *fromCDNSeq(t, n) {
-		let r = !!n?.preserveComments, i = 0, a = !0;
+		let r = I(n?.cddl), i = !!n?.preserveComments, a = 0, o = !0;
 		for (;;) {
-			let { offset: o, hadSeparator: s, commaOffset: l } = R(t, i, n, r ? a ? "all" : "after-newline" : "none");
-			if (a && l >= 0) {
+			let { offset: s, hadSeparator: l, commaOffset: u } = G(t, a, n, i ? o ? "all" : "after-newline" : "none");
+			if (o && u >= 0) {
 				let e = "leading comma in CDN sequence";
 				if (n?.strict !== !1) throw SyntaxError(e);
-				I(e, l, n);
+				U(e, u, n);
 			}
-			if (o >= t.length || r && L(t, o) && R(t, o, n).offset >= t.length) break;
-			if (!a && !s) {
+			if (s >= t.length || i && W(t, s) && G(t, s, n).offset >= t.length) break;
+			if (!o && !l) {
 				let e = "CDN sequence items must be separated by whitespace, comma, or comment";
 				if (n?.strict !== !1) throw SyntaxError(e);
-				I(e, o, n);
+				U(e, s, n);
 			}
-			i = o;
-			let u;
+			a = s;
+			let d;
 			try {
-				u = c(t, {
+				d = c(t, {
 					...n,
-					offset: i,
+					offset: a,
 					allowTrailing: !0,
 					_skipRS: !0
 				});
 			} catch (t) {
 				if (n?.strict !== !1) throw t;
-				I(t instanceof Error ? t.message : String(t), i, n, !0, t instanceof e ? t : void 0);
+				U(t instanceof Error ? t.message : String(t), a, n, !0, t instanceof e ? t : void 0);
 				break;
 			}
-			yield u, i = u.end, a = !1;
+			yield L(d, r, n?.cddlValidationOptions), a = d.end, o = !1;
 		}
 	}
 	static fromJS(e, t) {
-		return b(e, t);
+		return R(x(e, t), t);
 	}
 	static fromHexDump(e, t) {
-		let n = [], r = N(e).trim().split(/\s+/).filter(Boolean);
+		let n = [], r = B(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 d(new Uint8Array(n), t);
+		return R(d(new Uint8Array(n), t), t);
 	}
 	static decode(e, n) {
 		return t.fromCBOR(e, n).toJS(n);
@@ -273,7 +290,14 @@ var j = {
 				}
 				i.push(e);
 			}
-		}, c = 0;
+		}, c = I(r?.cddl), l = [], u = [], d = (e) => {
+			if (!c) return;
+			let t = c.validate(e, r?.cddlValidationOptions);
+			l.push(...t.errors), t.warnings && u.push(...t.warnings);
+		}, f = c ? {
+			cddlErrors: l,
+			cddlWarnings: u
+		} : {}, p = 0;
 		try {
 			let e = r?.type ?? "cbor";
 			if (e === "cdn") {
@@ -281,33 +305,36 @@ var j = {
 					...s,
 					unresolvedExtension: r?.unresolvedExtension
 				};
-				for (let r of t.fromCDNSeq(n, e)) c++;
-			} else if (e === "hex") for (let e of t.fromHexDumpSeq(n, s)) c++;
-			else for (let e of t.fromCBORSeq(n, s)) c++;
+				for (let r of t.fromCDNSeq(n, e)) p++, d(r);
+			} else if (e === "hex") for (let e of t.fromHexDumpSeq(n, s)) p++, d(e);
+			else for (let e of t.fromCBORSeq(n, s)) p++, d(e);
 		} catch (e) {
 			return {
 				valid: !1,
-				count: c,
+				count: p,
 				warnings: i,
 				hints: a,
-				error: e instanceof Error ? e : Error(String(e))
+				error: e instanceof Error ? e : Error(String(e)),
+				...f
 			};
 		}
 		if (o) {
 			let t = o.cause instanceof Error ? o.cause : new e(o.message, { offset: o.offset });
 			return {
 				valid: !1,
-				count: c,
+				count: p,
 				warnings: i,
 				hints: a,
-				error: t
+				error: t,
+				...f
 			};
 		}
 		return {
-			valid: i.length === 0,
-			count: c,
+			valid: i.length === 0 && l.length === 0,
+			count: p,
 			warnings: i,
-			hints: a
+			hints: a,
+			...f
 		};
 	}
 	static cborToCdn(e, n) {
@@ -327,81 +354,81 @@ var j = {
 	}
 	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 = z(n);
+			let r = typeof t == "function" || Array.isArray(t) ? t : void 0, i = K(n);
 			if (r) {
-				let t = _(e, r);
-				return t === void 0 || t === o ? void 0 : b(t).toCDN(i === void 0 ? void 0 : { indent: i });
+				let t = v(e, r);
+				return t === void 0 || t === o ? void 0 : x(t).toCDN(i === void 0 ? void 0 : { indent: i });
 			}
-			return b(e).toCDN(i === void 0 ? void 0 : { indent: i });
+			return x(e).toCDN(i === void 0 ? void 0 : { indent: i });
 		}
 		let r = t;
 		if (r?.replacer) {
-			let t = _(e, r.replacer, r.extensions, r.undefinedOmits, r.builtinExtensions);
+			let t = v(e, r.replacer, r.extensions, r.undefinedOmits, r.builtinExtensions);
 			if (t === void 0 || t === o) return;
 			let { replacer: n, ...i } = r;
-			return b(t, Object.keys(i).length > 0 ? i : void 0).toCDN(r);
+			return R(x(t, Object.keys(i).length > 0 ? i : void 0), r).toCDN(r);
 		}
-		return b(e, r).toCDN(r);
+		return R(x(e, r), r).toCDN(r);
 	}
 	static format(e, n) {
 		return t.fromCDN(e, n).toCDN(n);
 	}
 };
-function N(e) {
+function B(e) {
 	let t = "", n = 0;
 	for (; n < e.length;) {
 		let r = e[n], i = e[n + 1] ?? "";
 		if (r === "-" && i === "-") {
-			n = P(e, n + 2), t += " ";
+			n = V(e, n + 2), t += " ";
 			continue;
 		}
 		if (r === "—") {
-			n = P(e, n + 1), t += " ";
+			n = V(e, n + 1), t += " ";
 			continue;
 		}
 		if (r === "#") {
-			n = P(e, n + 1), t += " ";
+			n = V(e, n + 1), t += " ";
 			continue;
 		}
 		if (r === "/" && i === "/") {
-			n = P(e, n + 2), t += " ";
+			n = V(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 += F(e.slice(n, r + 2)), n = r + 2;
+			t += H(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 += F(e.slice(n, r + 1)), n = r + 1;
+			t += H(e.slice(n, r + 1)), n = r + 1;
 			continue;
 		}
 		t += r, n++;
 	}
 	return t;
 }
-function P(e, t) {
+function V(e, t) {
 	let n = e.indexOf("\n", t);
 	return n < 0 ? e.length : n;
 }
-function F(e) {
+function H(e) {
 	return e.replace(/[^\r\n]/g, " ");
 }
-function I(e, t, n, r, i) {
+function U(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 L(e, t) {
+function W(e, t) {
 	let n = e[t];
 	return n === "#" || n === "/";
 }
-function R(e, t, n, r = "none") {
+function G(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];
@@ -431,7 +458,7 @@ function R(e, t, n, r = "none") {
 			if (t < 0) {
 				let t = "unterminated /* comment in CDN sequence";
 				if (n?.strict !== !1) throw SyntaxError(t);
-				I(t, i, n, !0), i = e.length;
+				U(t, i, n, !0), i = e.length;
 			} else e.slice(i, t).includes("\n") && (s = !0), i = t + 2;
 			continue;
 		}
@@ -441,7 +468,7 @@ function R(e, t, n, r = "none") {
 			if (t < 0) {
 				let t = "unterminated / comment in CDN sequence";
 				if (n?.strict !== !1) throw SyntaxError(t);
-				I(t, i, n, !0), i = e.length;
+				U(t, i, n, !0), i = e.length;
 			} else e.slice(i, t).includes("\n") && (s = !0), i = t + 1;
 			continue;
 		}
@@ -457,7 +484,7 @@ function R(e, t, n, r = "none") {
 		commaOffset: c
 	};
 }
-function z(e) {
+function K(e) {
 	if (typeof e == "number") {
 		let t = Math.floor(Math.min(10, Math.max(0, e)));
 		return t === 0 ? void 0 : t;
@@ -465,6 +492,6 @@ function z(e) {
 	if (typeof e == "string") return e.slice(0, 10) || void 0;
 }
 //#endregion
-export { m as BUILTIN_EXTENSIONS, M as CBOR, M as default, o as CBOR_OMIT, s as CBOR_TAG, e as CdnSyntaxError, S as MapEntries, n as Null, a as Simple, r as Tag, i as Undefined, h as b1, O as b32, f as cri, g as dt, p as dt_as_Date, l as float, k as h32, x as ilbs, u as ilts, y as ip, j as same, C as t1 };
+export { m as BUILTIN_EXTENSIONS, z as CBOR, z as default, o as CBOR_OMIT, T as CBOR_TAG, n as CddlMismatchError, e as CdnSyntaxError, C as MapEntries, r as Null, a as Simple, s as Tag, i as Undefined, g as b1, A as b32, f as cri, _ as dt, p as dt_as_Date, l as float, j as h32, S as ilbs, u as ilts, b as ip, N as same, w as t1 };
 
 //# sourceMappingURL=index.js.map