@cbortech/cbor 0.26.6 → 0.26.8

package/dist/{schema-BxkgvUY6.js → schema-y8G5mDIS.js}

@@ -1,5 +1,5 @@
-import { a as e } from "./tokenizer-CeuixxXi.js";
-import { A as t, C as n, D as r, E as i, F as a, I as o, M as s, N as c, O as l, P as u, S as d, T as f, _ as p, b as m, d as h, g, j as _, k as ee, v as te, w as ne, x as re, y as ie } from "./mapEntries-Czxt-cmd.js";
+import { E as e } from "./tokenizer-N-vAvRdj.js";
+import { A as t, D as n, E as r, F as i, I as a, L as o, M as s, N as c, O as l, P as u, T as d, _ as f, b as p, g as m, h, j as g, k as ee, u as te, v as ne, w as re, x as ie, y as _ } from "./mapEntries-Ci_dppP6.js";
 //#region src/cddl/errors.ts
 var v = class extends SyntaxError {
 	offset;
@@ -206,7 +206,7 @@ var v = class extends SyntaxError {
 		else {
 			let s = ue(a);
 			try {
-				o = t === "h" ? e(s) : d(s);
+				o = t === "h" ? e(s) : ie(s);
 			} catch (e) {
 				throw !(e instanceof SyntaxError) || e instanceof v ? e : new v(e.message, {
 					offset: n,
@@ -316,21 +316,21 @@ function ue(e) {
 }
 //#endregion
 //#region src/cddl/parser.ts
-function de(e) {
+function S(e) {
 	let t = new le(e);
 	return {
-		rules: new pe(t).parse(),
+		rules: new fe(t).parse(),
 		comments: t.comments
 	};
 }
-var fe = /* @__PURE__ */ new Set([
+var de = /* @__PURE__ */ new Set([
 	"SLASH",
 	"RANGE_INCL",
 	"RANGE_EXCL",
 	"CTLOP",
 	"ARROW",
 	"CARET"
-]), pe = class {
+]), fe = class {
 	t;
 	buf = [];
 	constructor(e) {
@@ -412,7 +412,7 @@ var fe = /* @__PURE__ */ new Set([
 		let e = this.peek().offset, t = this.tryParseOccur();
 		if (this.peek().type === "LPAREN") {
 			let n = this.consume(), r = this.parseGroup("RPAREN"), i = this.consume();
-			if (fe.has(this.peek().type)) {
+			if (de.has(this.peek().type)) {
 				let a = this.groupAsParenType(r, n, i), o = this.continueType1(a);
 				return this.finishEntryFromType1(e, t, o);
 			}
@@ -706,7 +706,7 @@ var fe = /* @__PURE__ */ new Set([
 			case "FLOAT": return {
 				kind: "value",
 				type: "float",
-				value: /^-?0[xX]/.test(e.value) ? s(e.value) : parseFloat(e.value),
+				value: /^-?0[xX]/.test(e.value) ? c(e.value) : parseFloat(e.value),
 				...t
 			};
 			case "TSTR": return {
@@ -734,21 +734,21 @@ var fe = /* @__PURE__ */ new Set([
 			end: n.endOffset
 		};
 	}
-}, me = "any = #\n\nuint = #0\nnint = #1\nint = uint / nint\n\nbstr = #2\nbytes = bstr\ntstr = #3\ntext = tstr\n\ntdate = #6.0(tstr)\ntime = #6.1(number)\nnumber = int / float\nbiguint = #6.2(bstr)\nbignint = #6.3(bstr)\nbigint = biguint / bignint\ninteger = int / bigint\nunsigned = uint / biguint\ndecfrac = #6.4([e10: int, m: integer])\nbigfloat = #6.5([e2: int, m: integer])\neb64url = #6.21(any)\neb64legacy = #6.22(any)\neb16 = #6.23(any)\nencoded-cbor = #6.24(bstr)\nuri = #6.32(tstr)\nb64url = #6.33(tstr)\nb64legacy = #6.34(tstr)\nregexp = #6.35(tstr)\nmime-message = #6.36(tstr)\ncbor-any = #6.55799(any)\n\nfloat16 = #7.25\nfloat32 = #7.26\nfloat64 = #7.27\nfloat16-32 = float16 / float32\nfloat32-64 = float32 / float64\nfloat = float16-32 / float64\n\nfalse = #7.20\ntrue = #7.21\nbool = false / true\nnil = #7.22\nnull = nil\nundefined = #7.23\n", S;
-function he() {
-	if (!S) {
-		S = /* @__PURE__ */ new Map();
-		for (let e of de(me).rules) S.set(e.name, e);
+}, pe = "any = #\n\nuint = #0\nnint = #1\nint = uint / nint\n\nbstr = #2\nbytes = bstr\ntstr = #3\ntext = tstr\n\ntdate = #6.0(tstr)\ntime = #6.1(number)\nnumber = int / float\nbiguint = #6.2(bstr)\nbignint = #6.3(bstr)\nbigint = biguint / bignint\ninteger = int / bigint\nunsigned = uint / biguint\ndecfrac = #6.4([e10: int, m: integer])\nbigfloat = #6.5([e2: int, m: integer])\neb64url = #6.21(any)\neb64legacy = #6.22(any)\neb16 = #6.23(any)\nencoded-cbor = #6.24(bstr)\nuri = #6.32(tstr)\nb64url = #6.33(tstr)\nb64legacy = #6.34(tstr)\nregexp = #6.35(tstr)\nmime-message = #6.36(tstr)\ncbor-any = #6.55799(any)\n\nfloat16 = #7.25\nfloat32 = #7.26\nfloat64 = #7.27\nfloat16-32 = float16 / float32\nfloat32-64 = float32 / float64\nfloat = float16-32 / float64\n\nfalse = #7.20\ntrue = #7.21\nbool = false / true\nnil = #7.22\nnull = nil\nundefined = #7.23\n", C;
+function w() {
+	if (!C) {
+		C = /* @__PURE__ */ new Map();
+		for (let e of S(pe).rules) C.set(e.name, e);
 	}
-	return S;
+	return C;
 }
 //#endregion
 //#region src/cddl/writer.ts
-var ge = {
+var me = {
 	leading: [],
 	trailing: []
 };
-function _e(e, t) {
+function he(e, t) {
 	let n = {
 		unit: t?.indent === void 0 ? null : typeof t.indent == "string" ? t.indent : " ".repeat(t.indent),
 		notes: null,
@@ -756,18 +756,18 @@ function _e(e, t) {
 		tail: []
 	};
 	if (t?.preserveComments && t.comments !== void 0 && t.comments.length > 0 && t.source !== void 0) {
-		let r = ve(e, t.comments, t.source);
+		let r = ge(e, t.comments, t.source);
 		n.notes = r.notes, n.endNotes = r.endNotes, n.tail = r.tail;
 	}
 	let r = [], i = !1;
 	e.forEach((e, t) => {
-		let { text: a, multiline: o } = be(e, n);
+		let { text: a, multiline: o } = ve(e, n);
 		t > 0 && n.unit !== null && (o || i) && r.push(""), r.push(a), i = o;
 	});
 	for (let e of n.tail) r.push(`;${e}`);
 	return r.length === 0 ? "" : r.join("\n") + "\n";
 }
-function ve(e, t, n) {
+function ge(e, t, n) {
 	let r = [0];
 	for (let e = 0; e < n.length; e++) n.charCodeAt(e) === 10 && r.push(e + 1);
 	let i = (e) => {
@@ -857,9 +857,9 @@ function ve(e, t, n) {
 		tail: h
 	};
 }
-var C = (e, t) => e.notes?.get(t) ?? ge, ye = (e) => e.trailing.length === 0 ? "" : " " + e.trailing.map((e) => `;${e}`).join(" ");
-function be(e, t) {
-	let n = C(t, e), r = C(t, e.body), i = e.generics ? `<${e.generics.join(", ")}>` : "", a = `${e.name}${i} ${e.assign}`, o = ye({
+var T = (e, t) => e.notes?.get(t) ?? me, _e = (e) => e.trailing.length === 0 ? "" : " " + e.trailing.map((e) => `;${e}`).join(" ");
+function ve(e, t) {
+	let n = T(t, e), r = T(t, e.body), i = e.generics ? `<${e.generics.join(", ")}>` : "", a = `${e.name}${i} ${e.assign}`, o = _e({
 		leading: [],
 		trailing: [...r.trailing, ...n.trailing]
 	}), s, c = n.leading;
@@ -868,9 +868,9 @@ function be(e, t) {
 		s = [
 			a,
 			...r.leading.map((e) => `${n};${e}`),
-			`${n}${w(e.body, t, 1)}${o}`
+			`${n}${E(e.body, t, 1)}${o}`
 		].join("\n");
-	} else r.leading.length > 0 && (c = [...c, ...r.leading]), s = `${a} ${w(e.body, t, 0)}${o}`;
+	} else r.leading.length > 0 && (c = [...c, ...r.leading]), s = `${a} ${E(e.body, t, 0)}${o}`;
 	let l = s.includes("\n");
 	return c.length === 0 ? {
 		text: s,
@@ -880,80 +880,80 @@ function be(e, t) {
 		multiline: l
 	};
 }
-function w(e, t, n) {
-	let r = e.occur ? `${xe(e.occur)} ` : "";
-	return e.kind === "entry-group" ? `${r}${T(e.group, t, n, "(", ")")}` : `${r}${e.memberKey ? `${Se(e.memberKey, t, n)} ` : ""}${E(e.value, t, n)}`;
+function E(e, t, n) {
+	let r = e.occur ? `${ye(e.occur)} ` : "";
+	return e.kind === "entry-group" ? `${r}${D(e.group, t, n, "(", ")")}` : `${r}${e.memberKey ? `${be(e.memberKey, t, n)} ` : ""}${O(e.value, t, n)}`;
 }
-function xe(e) {
+function ye(e) {
 	return e.marker === "*" ? `${e.min ?? ""}*${e.max ?? ""}` : e.marker;
 }
-function Se(e, t, n) {
+function be(e, t, n) {
 	switch (e.kind) {
 		case "bareword": return `${e.key}:`;
 		case "value": return `${e.key.raw}:`;
-		case "type1": return `${D(e.key, t, n)} ${e.cut ? "^ " : ""}=>`;
+		case "type1": return `${xe(e.key, t, n)} ${e.cut ? "^ " : ""}=>`;
 	}
 }
-function T(e, t, n, r, i) {
+function D(e, t, n, r, i) {
 	let a = e.choices.reduce((e, t) => e + t.length, 0), o = t.endNotes?.get(e) ?? [], s = o.length > 0 || t.notes !== null && e.choices.some((e) => e.some((e) => t.notes.has(e)));
-	if (!(t.unit !== null && (a > 1 || e.choices.length > 1 || s))) return `${r}${e.choices.map((e) => e.map((e) => w(e, t, n)).join(", ")).join(" // ") + (e.trailingComma ? "," : "")}${i}`;
+	if (!(t.unit !== null && (a > 1 || e.choices.length > 1 || s))) return `${r}${e.choices.map((e) => e.map((e) => E(e, t, n)).join(", ")).join(" // ") + (e.trailingComma ? "," : "")}${i}`;
 	let c = t.unit, l = c.repeat(n + 1), u = [r];
 	e.choices.forEach((r, i) => {
 		i > 0 && u.push(`${l}//`), r.forEach((a, o) => {
-			let s = C(t, a);
+			let s = T(t, a);
 			for (let e of s.leading) u.push(`${l};${e}`);
 			let c = !(i === e.choices.length - 1 && o === r.length - 1) || e.trailingComma ? "," : "";
-			u.push(`${l}${w(a, t, n + 1)}${c}${ye(s)}`);
+			u.push(`${l}${E(a, t, n + 1)}${c}${_e(s)}`);
 		});
 	});
 	for (let e of o) u.push(`${l};${e}`);
 	return u.push(`${c.repeat(n)}${i}`), u.join("\n");
 }
-function E(e, t, n) {
-	return e.alternatives.map((e) => D(e, t, n)).join(" / ");
+function O(e, t, n) {
+	return e.alternatives.map((e) => xe(e, t, n)).join(" / ");
 }
-function D(e, t, n) {
+function xe(e, t, n) {
 	let r = Ce(e.target, t, n);
 	if (!e.op || !e.controller) return r;
 	let i = Ce(e.controller, t, n);
 	return e.op.kind === "range" ? `${r}${e.op.inclusive ? ".." : "..."}${i}` : `${r} .${e.op.name} ${i}`;
 }
-function O(e, t, n) {
-	let r = e.genericArgs ? `<${e.genericArgs.map((e) => D(e, t, n)).join(", ")}>` : "";
+function Se(e, t, n) {
+	let r = e.genericArgs ? `<${e.genericArgs.map((e) => xe(e, t, n)).join(", ")}>` : "";
 	return `${e.name}${r}`;
 }
 function Ce(e, t, n) {
 	switch (e.kind) {
 		case "value": return e.raw;
-		case "ref": return O(e, t, n);
-		case "paren": return `(${E(e.type, t, n)})`;
-		case "map": return T(e.group, t, n, "{", "}");
-		case "array": return T(e.group, t, n, "[", "]");
-		case "unwrap": return `~${O(e.ref, t, n)}`;
-		case "enum": return e.group.kind === "ref" ? `&${O(e.group, t, n)}` : `&${T(e.group, t, n, "(", ")")}`;
-		case "tagged": return `${e.raw ?? (typeof e.tag == "object" ? `#6.<${E(e.tag, t, n)}>` : `#6${e.tag === void 0 ? "" : `.${e.tag}`}`)}(${E(e.item, t, n)})`;
-		case "major": return e.raw === void 0 ? typeof e.ai == "object" ? `#${e.major}.<${E(e.ai, t, n)}>` : `#${e.major}${e.ai === void 0 ? "" : `.${e.ai}`}` : e.raw;
+		case "ref": return Se(e, t, n);
+		case "paren": return `(${O(e.type, t, n)})`;
+		case "map": return D(e.group, t, n, "{", "}");
+		case "array": return D(e.group, t, n, "[", "]");
+		case "unwrap": return `~${Se(e.ref, t, n)}`;
+		case "enum": return e.group.kind === "ref" ? `&${Se(e.group, t, n)}` : `&${D(e.group, t, n, "(", ")")}`;
+		case "tagged": return `${e.raw ?? (typeof e.tag == "object" ? `#6.<${O(e.tag, t, n)}>` : `#6${e.tag === void 0 ? "" : `.${e.tag}`}`)}(${O(e.item, t, n)})`;
+		case "major": return e.raw === void 0 ? typeof e.ai == "object" ? `#${e.major}.<${O(e.ai, t, n)}>` : `#${e.major}${e.ai === void 0 ? "" : `.${e.ai}`}` : e.raw;
 		case "any": return "#";
 	}
 }
 //#endregion
 //#region src/cddl/equal.ts
 function k(e) {
-	if (e instanceof u || e instanceof c) return e.value;
-	if (e instanceof ie || e instanceof te) return e.bigValue;
+	if (e instanceof i || e instanceof u) return e.value;
+	if (e instanceof ne || e instanceof f) return e.bigValue;
 }
 function A(e) {
-	if (e instanceof g) return e.value;
-	if (e instanceof r) return e.chunks.map((e) => e.value).join("");
+	if (e instanceof h) return e.value;
+	if (e instanceof l) return e.chunks.map((e) => e.value).join("");
 }
 function j(e) {
-	if (e instanceof ee) return e.value;
-	if (e instanceof l) {
+	if (e instanceof t) return e.value;
+	if (e instanceof ee) {
 		let t = e.chunks.map((e) => e.value), n = t.reduce((e, t) => e + t.length, 0), r = new Uint8Array(n), i = 0;
 		for (let e of t) r.set(e, i), i += e.length;
 		return r;
 	}
-	if (e instanceof n) {
+	if (e instanceof re) {
 		let t = e.items.map((e) => e.toCBOR()), n = t.reduce((e, t) => e + t.length, 0), r = new Uint8Array(n), i = 0;
 		for (let e of t) r.set(e, i), i += e.length;
 		return r;
@@ -975,36 +975,36 @@ var Te = new TextEncoder(), Ee = new TextDecoder("utf-8", { fatal: !0 }), M = (e
 }), De = (e) => {
 	let t = k(e);
 	if (t !== void 0) return t;
-	if (e instanceof _) return e.value;
+	if (e instanceof s) return e.value;
 }, N = (e) => e.type === "int" || e.type === "float" ? e.value : void 0, Oe = (e, t) => {
 	if (typeof e == "bigint" && typeof t == "bigint") return e < t ? -1 : +(e > t);
 	let n = Number(e), r = Number(t);
 	return n < r ? -1 : n > r ? 1 : n === r ? 0 : NaN;
-}, ke = (e, t, n, r, i, a) => {
-	if (!e.matchType2(t, n, i)) return !1;
-	let o = (n) => e.matchType2(e.uint(n), r, i) ? !0 : e.fail(i, t, a, `size ${n} does not match the .size constraint`), s = A(t);
-	if (s !== void 0) return o(Te.encode(s).length);
-	let c = j(t);
-	if (c !== void 0) return o(c.length);
-	if (t instanceof u) {
+}, ke = (e, t, n, r, a, o) => {
+	if (!e.matchType2(t, n, a)) return !1;
+	let s = (n) => e.matchType2(e.uint(n), r, a) ? !0 : e.fail(a, t, o, `size ${n} does not match the .size constraint`), c = A(t);
+	if (c !== void 0) return s(Te.encode(c).length);
+	let l = j(t);
+	if (l !== void 0) return s(l.length);
+	if (t instanceof i) {
 		let n = 0;
 		for (let e = t.value; e > 0n; e >>= 8n) n++;
-		let o = e.existsIntGE(r, BigInt(n));
-		if (o !== void 0) return o ? !0 : e.fail(i, t, a, `${t.value} does not fit the .size constraint`);
-		e.warnOnce(".size controller could not be analyzed; searching a bounded window of byte counts", a);
-		for (let t = n; t <= n + 64; t++) if (e.matchType2(e.uint(t), r, i)) return !0;
-		return e.fail(i, t, a, `${t.value} does not fit the .size constraint`);
-	}
-	return e.fail(i, t, a, ".size applies to strings and unsigned integers");
-}, Ae = (e, t, n, r, i, a) => {
-	if (!e.matchType2(t, n, i)) return !1;
-	let o = [], s = j(t);
-	if (s !== void 0) for (let e = 0; e < s.length; e++) for (let t = 0; t < 8; t++) s[e] & 1 << t && o.push(e * 8 + t);
-	else if (t instanceof u) {
+		let i = e.existsIntGE(r, BigInt(n));
+		if (i !== void 0) return i ? !0 : e.fail(a, t, o, `${t.value} does not fit the .size constraint`);
+		e.warnOnce(".size controller could not be analyzed; searching a bounded window of byte counts", o);
+		for (let t = n; t <= n + 64; t++) if (e.matchType2(e.uint(t), r, a)) return !0;
+		return e.fail(a, t, o, `${t.value} does not fit the .size constraint`);
+	}
+	return e.fail(a, t, o, ".size applies to strings and unsigned integers");
+}, Ae = (e, t, n, r, a, o) => {
+	if (!e.matchType2(t, n, a)) return !1;
+	let s = [], c = j(t);
+	if (c !== void 0) for (let e = 0; e < c.length; e++) for (let t = 0; t < 8; t++) c[e] & 1 << t && s.push(e * 8 + t);
+	else if (t instanceof i) {
 		let e = t.value;
-		for (let t = 0; e > 0n; t++, e >>= 1n) e & 1n && o.push(t);
-	} else return e.fail(i, t, a, ".bits applies to byte strings and unsigned integers");
-	for (let n of o) if (!e.matchType2(e.uint(n), r, i)) return e.fail(i, t, a, `bit ${n} is set but not allowed by .bits`);
+		for (let t = 0; e > 0n; t++, e >>= 1n) e & 1n && s.push(t);
+	} else return e.fail(a, t, o, ".bits applies to byte strings and unsigned integers");
+	for (let n of s) if (!e.matchType2(e.uint(n), r, a)) return e.fail(a, t, o, `bit ${n} is set but not allowed by .bits`);
 	return !0;
 }, je = /* @__PURE__ */ new Map(), Me = (e, t, n, r, i, a) => {
 	if (!e.matchType2(t, n, i)) return !1;
@@ -1030,8 +1030,8 @@ var Te = new TextEncoder(), Ee = new TextDecoder("utf-8", { fatal: !0 }), M = (e
 	try {
 		if (e) {
 			let e = new Uint8Array(s.length + 2);
-			e[0] = 159, e.set(s, 1), e[e.length - 1] = 255, c = h(e);
-		} else c = h(s);
+			e[0] = 159, e.set(s, 1), e[e.length - 1] = 255, c = te(e);
+		} else c = te(s);
 	} catch (e) {
 		return t.fail(a, n, o, `byte string does not contain valid CBOR: ${e instanceof Error ? e.message : String(e)}`);
 	}
@@ -1132,7 +1132,7 @@ function Ue(e) {
 }
 //#endregion
 //#region src/cddl/validator.ts
-var F = class extends Error {}, We = class {
+var We = class extends Error {}, Ge = class {
 	schema;
 	maxDepth;
 	maxSteps;
@@ -1149,10 +1149,10 @@ var F = class extends Error {}, We = class {
 		this.schema = e, this.maxDepth = t, this.maxSteps = n, this.features = r;
 	}
 	step() {
-		if (++this.steps > this.maxSteps) throw new F(`validation aborted: step budget of ${this.maxSteps} exceeded (pathological backtracking?)`);
+		if (++this.steps > this.maxSteps) throw new We(`validation aborted: step budget of ${this.maxSteps} exceeded (pathological backtracking?)`);
 	}
 	checkDepth(e) {
-		if (e > this.maxDepth) throw new F(`validation aborted: recursion depth ${this.maxDepth} exceeded (cyclic rules without progress?)`);
+		if (e > this.maxDepth) throw new We(`validation aborted: recursion depth ${this.maxDepth} exceeded (cyclic rules without progress?)`);
 	}
 	warnOnce(e, t) {
 		let n = `${e}@${t?.start ?? -1}`;
@@ -1187,7 +1187,7 @@ var F = class extends Error {}, We = class {
 		return !1;
 	}
 };
-function Ge(e, t, n) {
+function Ke(e, t, n) {
 	let r = n?.rule ?? e.root?.name;
 	if (r === void 0) return {
 		valid: !1,
@@ -1196,7 +1196,7 @@ function Ge(e, t, n) {
 			path: "/"
 		}]
 	};
-	let i = new We(e, n?.maxDepth ?? 256, n?.maxSteps ?? 1e6, new Set(n?.features ?? [])), a = I(i, r)?.[0]?.generics?.length ?? 0;
+	let i = new Ge(e, n?.maxDepth ?? 256, n?.maxSteps ?? 1e6, new Set(n?.features ?? [])), a = F(i, r)?.[0]?.generics?.length ?? 0;
 	if (a > 0) return {
 		valid: !1,
 		errors: [{
@@ -1206,9 +1206,9 @@ function Ge(e, t, n) {
 	};
 	let o;
 	try {
-		o = qe(t, r, void 0, [], i, 0);
+		o = Ye(t, r, void 0, [], i, 0);
 	} catch (e) {
-		if (!(e instanceof F)) throw e;
+		if (!(e instanceof We)) throw e;
 		return {
 			valid: !1,
 			errors: [{
@@ -1235,22 +1235,22 @@ function Ge(e, t, n) {
 		...i.warnings.length ? { warnings: i.warnings } : {}
 	};
 }
-function I(e, t) {
+function F(e, t) {
 	let n = e.schema.rules.get(t);
 	if (n) return n;
-	let r = he().get(t);
+	let r = w().get(t);
 	return r ? [r] : void 0;
 }
-function L(e) {
+function I(e) {
 	return e.kind === "entry" && !e.occur && !e.memberKey;
 }
-function R(e) {
+function qe(e) {
 	return e.kind === "entry-group" && !e.occur ? e.group.choices : [[e]];
 }
-function Ke(e) {
-	return e.some((e) => !L(e.body));
+function Je(e) {
+	return e.some((e) => !I(e.body));
 }
-function z(e, t, n) {
+function L(e, t, n) {
 	let r = e.generics;
 	if (!r || !t) return;
 	let i = /* @__PURE__ */ new Map();
@@ -1260,8 +1260,8 @@ function z(e, t, n) {
 	});
 	return i;
 }
-function qe(e, t, n, r, i, a, o, s) {
-	let c = I(i, t);
+function Ye(e, t, n, r, i, a, o, s) {
+	let c = F(i, t);
 	if (!c) return i.fail(r, e, o, t.startsWith("$") ? `socket '${t}' has no definitions, so nothing matches it` : `'${t}' is not defined`);
 	i.checkDepth(a);
 	let l = i.ruleName;
@@ -1270,13 +1270,13 @@ function qe(e, t, n, r, i, a, o, s) {
 	u && ++i.preludeDepth === 1 && (i.preludeRef = o);
 	try {
 		for (let o of c) {
-			let c = z(o, s, n);
-			if (L(o.body)) {
-				if (B(e, o.body.value, c, r, i, a + 1)) return !0;
+			let c = L(o, s, n);
+			if (I(o.body)) {
+				if (R(e, o.body.value, c, r, i, a + 1)) return !0;
 				continue;
 			}
-			let l = R(o.body), u = !0;
-			for (let e of l) if (!(e.length === 1 && L(e[0]))) {
+			let l = qe(o.body), u = !0;
+			for (let e of l) if (!(e.length === 1 && I(e[0]))) {
 				u = !1;
 				break;
 			}
@@ -1286,7 +1286,7 @@ function qe(e, t, n, r, i, a, o, s) {
 			}
 			for (let t of l) {
 				let n = t[0];
-				if (B(e, n.value, c, r, i, a + 1)) return !0;
+				if (R(e, n.value, c, r, i, a + 1)) return !0;
 			}
 		}
 		return !1;
@@ -1294,68 +1294,68 @@ function qe(e, t, n, r, i, a, o, s) {
 		i.ruleName = l, u && --i.preludeDepth === 0 && (i.preludeRef = void 0);
 	}
 }
-function Je(e) {
-	for (; e instanceof re;) e = e.inner;
+function Xe(e) {
+	for (; e instanceof p;) e = e.inner;
 	return e;
 }
-function B(e, t, n, r, i, a) {
-	for (let o of t.alternatives) if (Ye(e, o, n, r, i, a)) return !0;
+function R(e, t, n, r, i, a) {
+	for (let o of t.alternatives) if (z(e, o, n, r, i, a)) return !0;
 	return !1;
 }
-function Ye(e, t, n, r, i, a) {
-	if (i.step(), e = Je(e), !t.op || !t.controller) return V(e, t.target, n, r, i, a);
-	if (t.op.kind === "range") return rt(e, t, n, r, i, a);
+function z(e, t, n, r, i, a) {
+	if (i.step(), e = Xe(e), !t.op || !t.controller) return B(e, t.target, n, r, i, a);
+	if (t.op.kind === "range") return it(e, t, n, r, i, a);
 	let o = Ue(t.op.name), s = Ct(n, i, a);
-	return o ? o(s, e, t.target, t.controller, r, t) : (i.warnOnce(`control operator .${t.op.name} is not supported; matching the target only`, t), V(e, t.target, n, r, i, a));
+	return o ? o(s, e, t.target, t.controller, r, t) : (i.warnOnce(`control operator .${t.op.name} is not supported; matching the target only`, t), B(e, t.target, n, r, i, a));
 }
-function V(e, n, r, a, o, s) {
-	if (e = Je(e), e instanceof m) return !0;
-	switch (n.kind) {
+function B(e, t, a, o, s, c) {
+	if (e = Xe(e), e instanceof _) return !0;
+	switch (t.kind) {
 		case "any": return !0;
-		case "value": return U(e, n) ? !0 : o.fail(a, e, n, `expected the value ${n.raw}`);
+		case "value": return H(e, t) ? !0 : s.fail(o, e, t, `expected the value ${t.raw}`);
 		case "ref": {
-			let t = r?.get(n.name);
-			return t && !n.genericArgs ? Ye(e, t.type1, t.env, a, o, s + 1) : qe(e, n.name, r, a, o, s + 1, n, n.genericArgs);
+			let n = a?.get(t.name);
+			return n && !t.genericArgs ? z(e, n.type1, n.env, o, s, c + 1) : Ye(e, t.name, a, o, s, c + 1, t, t.genericArgs);
 		}
-		case "paren": return B(e, n.type, r, a, o, s);
-		case "map": return e instanceof f ? _t(e, n.group, r, a, o, s + 1) : o.fail(a, e, n, "expected a map");
-		case "array": return e instanceof i ? pt(e, n.group, r, a, o, s + 1) : o.fail(a, e, n, "expected an array");
+		case "paren": return R(e, t.type, a, o, s, c);
+		case "map": return e instanceof r ? _t(e, t.group, a, o, s, c + 1) : s.fail(o, e, t, "expected a map");
+		case "array": return e instanceof n ? pt(e, t.group, a, o, s, c + 1) : s.fail(o, e, t, "expected an array");
 		case "tagged":
-			if (!(e instanceof t)) return o.fail(a, e, n, "expected a tagged item");
-			if (typeof n.tag == "bigint") {
-				if (e.tag !== n.tag) return o.fail(a, e, n, `expected tag ${n.tag}, got ${e.tag}`);
-			} else if (n.tag !== void 0 && !B(new u(e.tag), n.tag, r, a, o, s + 1)) return o.fail(a, e, n, `tag number ${e.tag} does not match the head type`);
-			return B(e.content, n.item, r, a, o, s + 1);
-		case "major": return at(e, n, r, a, o, s);
+			if (!(e instanceof g)) return s.fail(o, e, t, "expected a tagged item");
+			if (typeof t.tag == "bigint") {
+				if (e.tag !== t.tag) return s.fail(o, e, t, `expected tag ${t.tag}, got ${e.tag}`);
+			} else if (t.tag !== void 0 && !R(new i(e.tag), t.tag, a, o, s, c + 1)) return s.fail(o, e, t, `tag number ${e.tag} does not match the head type`);
+			return R(e.content, t.item, a, o, s, c + 1);
+		case "major": return ot(e, t, a, o, s, c);
 		case "unwrap": {
-			let t = dt(n.ref, r, o, 0);
-			return t ? B(e, t.type, t.env, a, o, s + 1) : (o.warnOnce(`~${n.ref.name} is used outside of an array/map group context`, n), o.fail(a, e, n, `~${n.ref.name} cannot match here`));
+			let n = dt(t.ref, a, s, 0);
+			return n ? R(e, n.type, n.env, o, s, c + 1) : (s.warnOnce(`~${t.ref.name} is used outside of an array/map group context`, t), s.fail(o, e, t, `~${t.ref.name} cannot match here`));
 		}
 		case "enum": {
-			let t = n.group.kind === "ref" ? ct(n.group, r, o) : X(n.group, r);
-			return t ? (o.checkDepth(s), H(e, t, a, o, s + 1) ? !0 : o.fail(a, e, n, "no enumeration value matches")) : o.fail(a, e, n, "'&' target does not resolve to a group");
+			let n = t.group.kind === "ref" ? X(t.group, a, s) : Y(t.group, a);
+			return n ? (s.checkDepth(c), V(e, n, o, s, c + 1) ? !0 : s.fail(o, e, t, "no enumeration value matches")) : s.fail(o, e, t, "'&' target does not resolve to a group");
 		}
 	}
 }
-function H(e, t, n, r, i) {
+function V(e, t, n, r, i) {
 	for (let { entries: a, env: o } of t) for (let t of a) {
 		if (r.step(), t.kind === "entry-group") {
-			if (H(e, X(t.group, o), n, r, i + 1)) return !0;
+			if (V(e, Y(t.group, o), n, r, i + 1)) return !0;
 			continue;
 		}
 		let a = lt(t, o, r);
 		if (a) {
-			if (r.checkDepth(i), H(e, a, n, r, i + 1)) return !0;
+			if (r.checkDepth(i), V(e, a, n, r, i + 1)) return !0;
 			continue;
 		}
-		if (B(e, t.value, o, n, r, i + 1)) return !0;
+		if (R(e, t.value, o, n, r, i + 1)) return !0;
 	}
 	return !1;
 }
-function U(e, t) {
+function H(e, t) {
 	switch (t.type) {
 		case "int": return k(e) === BigInt(t.value);
-		case "float": return e instanceof _ && (e.value === t.value || Number.isNaN(e.value) && Number.isNaN(t.value));
+		case "float": return e instanceof s && (e.value === t.value || Number.isNaN(e.value) && Number.isNaN(t.value));
 		case "text": return A(e) === t.value;
 		case "bytes": {
 			let n = j(e);
@@ -1363,33 +1363,33 @@ function U(e, t) {
 		}
 	}
 }
-function W(e, t, n, r = 0) {
+function U(e, t, n, r = 0) {
 	if (r > 32) return;
 	if (e.kind === "value") return e;
 	if (e.kind === "paren") {
 		let i = e.type.alternatives.length === 1 ? e.type.alternatives[0] : void 0;
-		return !i || i.op ? void 0 : W(i.target, t, n, r + 1);
+		return !i || i.op ? void 0 : U(i.target, t, n, r + 1);
 	}
 	if (e.kind !== "ref") return;
 	let i = t?.get(e.name);
-	if (i && !e.genericArgs) return i.type1.op ? void 0 : W(i.type1.target, i.env, n, r + 1);
-	let a = I(n, e.name);
+	if (i && !e.genericArgs) return i.type1.op ? void 0 : U(i.type1.target, i.env, n, r + 1);
+	let a = F(n, e.name);
 	if (!a || a.length !== 1) return;
 	let o = a[0].body;
-	if (!L(o) || o.value.alternatives.length !== 1) return;
+	if (!I(o) || o.value.alternatives.length !== 1) return;
 	let s = o.value.alternatives[0];
 	if (s.op) return;
-	let c = z(a[0], e.genericArgs, t);
-	return W(s.target, c, n, r + 1);
+	let c = L(a[0], e.genericArgs, t);
+	return U(s.target, c, n, r + 1);
 }
-function Xe(e, t, n, r, i = 0) {
-	return Ze(e, t, void 0, n, r, i);
+function Ze(e, t, n, r, i = 0) {
+	return Qe(e, t, void 0, n, r, i);
 }
-function Ze(e, t, n, r, i, a = 0) {
-	let o = G(e, t, n, r, i, a);
+function Qe(e, t, n, r, i, a = 0) {
+	let o = W(e, t, n, r, i, a);
 	return o === void 0 ? void 0 : o !== null;
 }
-function G(e, t, n, r, i, a = 0) {
+function W(e, t, n, r, i, a = 0) {
 	if (n !== void 0 && t > n) return null;
 	if (!(a > 32)) switch (e.kind) {
 		case "value":
@@ -1413,25 +1413,25 @@ function G(e, t, n, r, i, a = 0) {
 				return e <= -1n && (n === void 0 || e <= n) ? e : null;
 			}
 			return null;
-		case "paren": return K(e.type, t, n, r, i, a + 1);
+		case "paren": return G(e.type, t, n, r, i, a + 1);
 		case "ref": {
 			let o = r?.get(e.name);
-			if (o && !e.genericArgs) return Qe(o.type1, t, n, o.env, i, a + 1);
-			let s = I(i, e.name);
+			if (o && !e.genericArgs) return $e(o.type1, t, n, o.env, i, a + 1);
+			let s = F(i, e.name);
 			if (!s) return;
 			let c = !1, l = null;
 			for (let o of s) {
-				if (!L(o.body)) {
+				if (!I(o.body)) {
 					c = !0;
 					continue;
 				}
-				let s = z(o, e.genericArgs, r), u = K(o.body.value, t, n, s, i, a + 1);
+				let s = L(o, e.genericArgs, r), u = G(o.body.value, t, n, s, i, a + 1);
 				typeof u == "bigint" && (l === null || u < l) && (l = u), u === void 0 && (c = !0);
 			}
 			return l ?? (c ? void 0 : null);
 		}
 		case "enum": {
-			let o = e.group.kind === "ref" ? ct(e.group, r, i) : X(e.group, r);
+			let o = e.group.kind === "ref" ? X(e.group, r, i) : Y(e.group, r);
 			if (!o) return;
 			let s = !1, c = null;
 			for (let { entries: e, env: r } of o) for (let o of e) {
@@ -1439,7 +1439,7 @@ function G(e, t, n, r, i, a = 0) {
 					s = !0;
 					continue;
 				}
-				let e = K(o.value, t, n, r, i, a + 1);
+				let e = G(o.value, t, n, r, i, a + 1);
 				typeof e == "bigint" && (c === null || e < c) && (c = e), e === void 0 && (s = !0);
 			}
 			return c ?? (s ? void 0 : null);
@@ -1447,93 +1447,93 @@ function G(e, t, n, r, i, a = 0) {
 		default: return;
 	}
 }
-function K(e, t, n, r, i, a) {
+function G(e, t, n, r, i, a) {
 	let o = !1, s = null;
 	for (let c of e.alternatives) {
-		let e = Qe(c, t, n, r, i, a);
+		let e = $e(c, t, n, r, i, a);
 		typeof e == "bigint" && (s === null || e < s) && (s = e), e === void 0 && (o = !0);
 	}
 	return s ?? (o ? void 0 : null);
 }
-function Qe(e, t, n, r, i, a) {
-	if (!e.op) return G(e.target, t, n, r, i, a);
+function $e(e, t, n, r, i, a) {
+	if (!e.op) return W(e.target, t, n, r, i, a);
 	if (e.op.kind === "ctl") {
-		if (e.op.name === "bits") return et(e.target, e.controller, t, n, r, i, a + 1);
+		if (e.op.name === "bits") return tt(e.target, e.controller, t, n, r, i, a + 1);
 		if (e.op.name === "size") {
-			let o = G(e.target, t > 0n ? t : 0n, n, r, i, a + 1);
+			let o = W(e.target, t > 0n ? t : 0n, n, r, i, a + 1);
 			if (o == null) return o;
-			let s = Xe(e.controller, BigInt(nt(o)), r, i, a + 1);
+			let s = Ze(e.controller, BigInt(rt(o)), r, i, a + 1);
 			return s === void 0 ? void 0 : s ? o : null;
 		}
 		if (e.op.name === "feature") {
 			let o = Ve(Ct(r, i, a), e.controller);
-			return o === void 0 ? void 0 : i.features.has(o) ? G(e.target, t, n, r, i, a + 1) : (i.warnOnce(`feature "${o}" is not enabled (pass it in options.features to accept it)`, e), null);
+			return o === void 0 ? void 0 : i.features.has(o) ? W(e.target, t, n, r, i, a + 1) : (i.warnOnce(`feature "${o}" is not enabled (pass it in options.features to accept it)`, e), null);
 		}
-		if (e.op.name === "and" || e.op.name === "within") return $e(e.target, e.controller, t, n, r, i, a + 1);
+		if (e.op.name === "and" || e.op.name === "within") return et(e.target, e.controller, t, n, r, i, a + 1);
 		if (e.op.name === "plus") {
-			let a = W(e.target, r, i), o = W(e.controller, r, i);
+			let a = U(e.target, r, i), o = U(e.controller, r, i);
 			if (!a || !o || a.type === "text" || a.type === "bytes" || o.type === "text" || o.type === "bytes") return;
 			if (a.type === "float") return null;
 			let s = o.type === "int" ? BigInt(a.value) + BigInt(o.value) : BigInt(Math.floor(Number(a.value) + o.value));
 			return s >= t && (n === void 0 || s <= n) ? s : null;
 		}
-		let o = W(e.controller, r, i);
+		let o = U(e.controller, r, i);
 		if (!o || o.type !== "int") return;
 		let s = BigInt(o.value);
 		switch (e.op.name) {
-			case "eq": return G(e.target, s > t ? s : t, n === void 0 || s < n ? s : n, r, i, a + 1);
+			case "eq": return W(e.target, s > t ? s : t, n === void 0 || s < n ? s : n, r, i, a + 1);
 			case "ne":
 			case "default": {
-				let o = G(e.target, t, n === void 0 || s - 1n < n ? s - 1n : n, r, i, a + 1);
+				let o = W(e.target, t, n === void 0 || s - 1n < n ? s - 1n : n, r, i, a + 1);
 				if (typeof o == "bigint") return o;
-				let c = G(e.target, s + 1n > t ? s + 1n : t, n, r, i, a + 1);
+				let c = W(e.target, s + 1n > t ? s + 1n : t, n, r, i, a + 1);
 				return typeof c == "bigint" ? c : o === void 0 || c === void 0 ? void 0 : null;
 			}
 			case "lt":
 			case "le": {
 				let o = s - (e.op.name === "lt" ? 1n : 0n);
-				return G(e.target, t, n === void 0 || o < n ? o : n, r, i, a + 1);
+				return W(e.target, t, n === void 0 || o < n ? o : n, r, i, a + 1);
 			}
 			case "gt":
 			case "ge": {
 				let o = s + (e.op.name === "gt" ? 1n : 0n);
-				return G(e.target, o > t ? o : t, n, r, i, a + 1);
+				return W(e.target, o > t ? o : t, n, r, i, a + 1);
 			}
 			default: return;
 		}
 	}
-	let o = W(e.target, r, i), s = W(e.controller, r, i);
+	let o = U(e.target, r, i), s = U(e.controller, r, i);
 	if (!o || !s || o.type !== "int" || s.type !== "int") return;
 	let c = BigInt(o.value), l = BigInt(s.value) - (e.op.inclusive ? 0n : 1n), u = c > t ? c : t;
 	return u <= (n === void 0 || l < n ? l : n) ? u : null;
 }
-function $e(e, t, n, r, i, a, o) {
+function et(e, t, n, r, i, a, o) {
 	let s = n;
 	for (let n = 0; n < 256; n++) {
-		let n = G(e, s, r, i, a, o + 1), c = G(t, s, r, i, a, o + 1);
+		let n = W(e, s, r, i, a, o + 1), c = W(t, s, r, i, a, o + 1);
 		if (n === null || c === null) return null;
 		if (n === void 0 || c === void 0) return;
 		if (n === c) return n;
 		s = n > c ? n : c;
 	}
 }
-function et(e, t, n, r, i, a, o) {
+function tt(e, t, n, r, i, a, o) {
 	let s = 0n;
 	for (let e = 0; e < 64; e++) {
-		let n = G(t, BigInt(e), BigInt(e), i, a, o + 1);
+		let n = W(t, BigInt(e), BigInt(e), i, a, o + 1);
 		if (n === void 0) return;
 		n !== null && (s |= 1n << BigInt(e));
 	}
 	let c = n > 0n ? n : 0n, l = r === void 0 || r > 18446744073709551615n ? 18446744073709551615n : r;
 	for (let t = 0; t < 256; t++) {
-		let t = G(e, c, l, i, a, o + 1), n = tt(c, l, s);
+		let t = W(e, c, l, i, a, o + 1), n = nt(c, l, s);
 		if (t === void 0) return;
 		if (t === null || n === null) return null;
 		if (t === n) return t;
 		c = t > n ? t : n;
 	}
 }
-function tt(e, t, n) {
+function nt(e, t, n) {
 	if (e < 0n && (e = 0n), e > t) return null;
 	let r = (i, a, o) => {
 		if (i < 0) return o <= t ? o : null;
@@ -1547,77 +1547,77 @@ function tt(e, t, n) {
 	};
 	return r(63, !1, 0n);
 }
-function nt(e) {
+function rt(e) {
 	let t = 0;
 	for (let n = e; n > 0n; n >>= 8n) t++;
 	return t;
 }
-function rt(e, t, n, r, i, a) {
-	let o = t.op, s = W(t.target, n, i), c = W(t.controller, n, i);
-	if (!s || !c) return i.warnOnce("range endpoints do not resolve to literal values", t), i.fail(r, e, t, "unresolvable range");
-	if (s.type === "int" && c.type === "int") {
+function it(e, t, n, r, i, a) {
+	let o = t.op, c = U(t.target, n, i), l = U(t.controller, n, i);
+	if (!c || !l) return i.warnOnce("range endpoints do not resolve to literal values", t), i.fail(r, e, t, "unresolvable range");
+	if (c.type === "int" && l.type === "int") {
 		let n = k(e);
-		if (n === void 0) return i.fail(r, e, t, `expected an integer in ${q(t)}`);
-		let a = BigInt(s.value), l = BigInt(c.value);
-		return n >= a && (o.inclusive ? n <= l : n < l) || i.fail(r, e, t, `${n} is outside ${q(t)}`);
+		if (n === void 0) return i.fail(r, e, t, `expected an integer in ${K(t)}`);
+		let a = BigInt(c.value), s = BigInt(l.value);
+		return n >= a && (o.inclusive ? n <= s : n < s) || i.fail(r, e, t, `${n} is outside ${K(t)}`);
 	}
-	if (s.type === "float" && c.type === "float") {
-		if (!(e instanceof _)) return i.fail(r, e, t, `expected a float in ${q(t)}`);
+	if (c.type === "float" && l.type === "float") {
+		if (!(e instanceof s)) return i.fail(r, e, t, `expected a float in ${K(t)}`);
 		let n = e.value;
-		return n >= s.value && (o.inclusive ? n <= c.value : n < c.value) || i.fail(r, e, t, `${n} is outside ${q(t)}`);
+		return n >= c.value && (o.inclusive ? n <= l.value : n < l.value) || i.fail(r, e, t, `${n} is outside ${K(t)}`);
 	}
 	return i.warnOnce("range endpoints mix integer and float types", t), i.fail(r, e, t, "invalid range");
 }
-function q(e) {
+function K(e) {
 	let t = e.op;
-	return `${J(e.target)}${t.inclusive ? ".." : "..."}${J(e.controller)}`;
+	return `${q(e.target)}${t.inclusive ? ".." : "..."}${q(e.controller)}`;
 }
-function J(e) {
+function q(e) {
 	return e.kind === "value" ? e.raw : e.kind === "ref" ? e.name : "…";
 }
-var it = {
+var at = {
 	half: 25n,
 	single: 26n,
 	double: 27n
 };
-function at(e, n, r, a, s, l) {
-	let d = (e) => n.ai === void 0 ? !0 : typeof n.ai == "bigint" ? n.ai === e : B(new u(e), n.ai, r, a, s, l + 1), p = (t) => s.fail(a, e, n, `expected ${t} (#${n.major})`);
-	switch (n.major) {
+function ot(e, t, a, c, l, f) {
+	let p = (e) => t.ai === void 0 ? !0 : typeof t.ai == "bigint" ? t.ai === e : R(new i(e), t.ai, a, c, l, f + 1), m = (n) => l.fail(c, e, t, `expected ${n} (#${t.major})`);
+	switch (t.major) {
 		case 0:
-			if (!(e instanceof u)) return p("an unsigned integer");
+			if (!(e instanceof i)) return m("an unsigned integer");
 			break;
 		case 1:
-			if (!(e instanceof c)) return p("a negative integer");
+			if (!(e instanceof u)) return m("a negative integer");
 			break;
 		case 2:
-			if (j(e) === void 0) return p("a byte string");
+			if (j(e) === void 0) return m("a byte string");
 			break;
 		case 3:
-			if (A(e) === void 0) return p("a text string");
+			if (A(e) === void 0) return m("a text string");
 			break;
 		case 4:
-			if (!(e instanceof i)) return p("an array");
+			if (!(e instanceof n)) return m("an array");
 			break;
 		case 5:
-			if (!(e instanceof f)) return p("a map");
+			if (!(e instanceof r)) return m("a map");
 			break;
-		case 6: return e instanceof t ? d(e.tag) ? !0 : s.fail(a, e, n, `tag ${e.tag} does not match ${Y(n)}`) : p("a tagged item");
-		case 7: return e instanceof ne ? d(BigInt(e.value)) ? !0 : s.fail(a, e, n, `simple(${e.value}) does not match ${Y(n)}`) : e instanceof _ ? n.ai === void 0 || d(it[e.precision ?? o(e.value)]) ? !0 : s.fail(a, e, n, `float does not match ${Y(n)}`) : p("a simple value or float");
-		default: return s.fail(a, e, n, `#${n.major} is not a valid major type`);
+		case 6: return e instanceof g ? p(e.tag) ? !0 : l.fail(c, e, t, `tag ${e.tag} does not match ${J(t)}`) : m("a tagged item");
+		case 7: return e instanceof d ? p(BigInt(e.value)) ? !0 : l.fail(c, e, t, `simple(${e.value}) does not match ${J(t)}`) : e instanceof s ? t.ai === void 0 || p(at[e.precision ?? o(e.value)]) ? !0 : l.fail(c, e, t, `float does not match ${J(t)}`) : m("a simple value or float");
+		default: return l.fail(c, e, t, `#${t.major} is not a valid major type`);
 	}
-	return n.ai !== void 0 && n.major <= 5 && s.warnOnce(`the additional-information constraint ${Y(n)} is not checked (encoding-level)`, n), !0;
+	return t.ai !== void 0 && t.major <= 5 && l.warnOnce(`the additional-information constraint ${J(t)} is not checked (encoding-level)`, t), !0;
 }
-function Y(e) {
+function J(e) {
 	return e.raw ?? `#${e.major}`;
 }
-var X = (e, t) => e.choices.map((e) => ({
+var Y = (e, t) => e.choices.map((e) => ({
 	entries: e,
 	env: t
-})), ot = {
+})), st = {
 	min: 1,
 	max: 1
 };
-function st(e) {
+function ct(e) {
 	let t = e.occur;
 	return t ? t.marker === "?" ? {
 		min: 0,
@@ -1628,15 +1628,15 @@ function st(e) {
 	} : {
 		min: t.min ?? 0,
 		max: t.max ?? Infinity
-	} : ot;
+	} : st;
 }
-function ct(e, t, n) {
-	let r = I(n, e.name);
-	if (!r || !Ke(r)) return;
+function X(e, t, n) {
+	let r = F(n, e.name);
+	if (!r || !Je(r)) return;
 	let i = [];
 	for (let n of r) {
-		let r = z(n, e.genericArgs, t);
-		for (let e of R(n.body)) i.push({
+		let r = L(n, e.genericArgs, t);
+		for (let e of qe(n.body)) i.push({
 			entries: e,
 			env: r
 		});
@@ -1648,34 +1648,34 @@ function lt(e, t, n) {
 	let r = e.value.alternatives[0];
 	if (r.op) return;
 	let i = r.target;
-	if (i.kind === "ref") return t?.has(i.name) && !i.genericArgs ? void 0 : ct(i, t, n) || (i.name.startsWith("$$") && !I(n, i.name) ? [] : void 0);
+	if (i.kind === "ref") return t?.has(i.name) && !i.genericArgs ? void 0 : X(i, t, n) || (i.name.startsWith("$$") && !F(n, i.name) ? [] : void 0);
 	if (i.kind === "unwrap") return ut(i.ref, t, n, 0);
 }
 function ut(e, t, n, r) {
 	if (r > 32) return;
-	let i = I(n, e.name);
+	let i = F(n, e.name);
 	if (!i || i.length !== 1) return;
-	let a = i[0].body, o = z(i[0], e.genericArgs, t);
-	if (!L(a)) return R(a).map((e) => ({
+	let a = i[0].body, o = L(i[0], e.genericArgs, t);
+	if (!I(a)) return qe(a).map((e) => ({
 		entries: e,
 		env: o
 	}));
 	if (a.value.alternatives.length !== 1) return;
 	let s = a.value.alternatives[0];
 	if (!s.op) {
-		if (s.target.kind === "map" || s.target.kind === "array") return X(s.target.group, o);
+		if (s.target.kind === "map" || s.target.kind === "array") return Y(s.target.group, o);
 		if (s.target.kind === "ref") return ut(s.target, o, n, r + 1);
 	}
 }
 function dt(e, t, n, r) {
 	if (r > 32) return;
-	let i = I(n, e.name);
+	let i = F(n, e.name);
 	if (!i || i.length !== 1) return;
 	let a = i[0].body;
-	if (!L(a) || a.value.alternatives.length !== 1) return;
+	if (!I(a) || a.value.alternatives.length !== 1) return;
 	let o = a.value.alternatives[0];
 	if (o.op) return;
-	let s = z(i[0], e.genericArgs, t);
+	let s = L(i[0], e.genericArgs, t);
 	if (o.target.kind === "tagged") return {
 		type: o.target.item,
 		env: s
@@ -1683,11 +1683,11 @@ function dt(e, t, n, r) {
 	if (o.target.kind === "ref") return dt(o.target, s, n, r + 1);
 }
 function ft(e, t, n) {
-	let r = st(e);
+	let r = ct(e);
 	if (e.kind === "entry-group") return {
 		kind: "group",
 		occur: r,
-		choices: X(e.group, t),
+		choices: Y(e.group, t),
 		node: e
 	};
 	let i = lt(e, t, n);
@@ -1706,7 +1706,7 @@ function ft(e, t, n) {
 	};
 }
 function pt(e, t, n, r, i, a) {
-	return i.checkDepth(a), mt(e.items, 0, X(t, n), r, i, a).has(e.items.length) ? !0 : i.fail(r, e, t, `array of ${e.items.length} item(s) does not match the group`);
+	return i.checkDepth(a), mt(e.items, 0, Y(t, n), r, i, a).has(e.items.length) ? !0 : i.fail(r, e, t, `array of ${e.items.length} item(s) does not match the group`);
 }
 function mt(e, t, n, r, i, a) {
 	let o = /* @__PURE__ */ new Set();
@@ -1724,19 +1724,19 @@ function ht(e, t, n, r, i, a, o, s) {
 	l(0, t);
 }
 function gt(e, t, n, r, i, a) {
-	return n.kind === "type" ? B(e[t], n.type, n.env, [...r, t], i, a) ? [t + 1] : [] : (i.checkDepth(a), [...mt(e, t, n.choices, r, i, a + 1)].sort((e, t) => t - e));
+	return n.kind === "type" ? R(e[t], n.type, n.env, [...r, t], i, a) ? [t + 1] : [] : (i.checkDepth(a), [...mt(e, t, n.choices, r, i, a + 1)].sort((e, t) => t - e));
 }
 function _t(e, t, n, r, i, a) {
 	i.checkDepth(a);
 	let o = Array(e.entries.length).fill(!1);
-	for (let s of X(t, n)) if (o.fill(!1), Z(e, s.entries, 0, o, s.env, r, i, a, () => vt(e, o, r, i, t))) return !0;
+	for (let s of Y(t, n)) if (o.fill(!1), Z(e, s.entries, 0, o, s.env, r, i, a, () => vt(e, o, r, i, t))) return !0;
 	return !1;
 }
 function vt(e, t, n, r, i) {
 	for (let a = 0; a < t.length; a++) {
 		if (t[a]) continue;
 		let [o, s] = e.entries[a];
-		if (!(o instanceof m)) return r.fail([...n, xt(o, a)], s, i, `entry ${St(o)} is not allowed by the group`), !1;
+		if (!(o instanceof _)) return r.fail([...n, xt(o, a)], s, i, `entry ${St(o)} is not allowed by the group`), !1;
 	}
 	return !0;
 }
@@ -1751,7 +1751,7 @@ function Z(e, t, n, r, i, a, o, s, c) {
 			let [n, i] = e.entries[t];
 			if (!yt(l.memberKey, n, l.env, a, o, s)) continue;
 			let c = [...a, xt(n, t)];
-			if (B(i, l.type, l.env, c, o, s + 1)) {
+			if (R(i, l.type, l.env, c, o, s + 1)) {
 				r[t] = !0, u++;
 				continue;
 			}
@@ -1777,24 +1777,24 @@ function Z(e, t, n, r, i, a, o, s, c) {
 	return d(0);
 }
 function yt(e, t, n, r, i, a) {
-	if (t = Je(t), t instanceof m) return !0;
+	if (t = Xe(t), t instanceof _) return !0;
 	switch (e.kind) {
 		case "bareword": return A(t) === e.key;
-		case "value": return U(t, e.key);
-		case "type1": return Ye(t, e.key, n, r, i, a + 1);
+		case "value": return H(t, e.key);
+		case "type1": return z(t, e.key, n, r, i, a + 1);
 	}
 }
 function bt(e) {
 	switch (e.kind) {
 		case "bareword": return `'${e.key}'`;
 		case "value": return e.key.raw;
-		case "type1": return J(e.key.target);
+		case "type1": return q(e.key.target);
 	}
 }
 function xt(e, t) {
 	let n = A(e);
 	if (n !== void 0) return n;
-	if (e instanceof u || e instanceof c) {
+	if (e instanceof i || e instanceof u) {
 		let t = e.value;
 		if (t >= BigInt(-(2 ** 53 - 1)) && t <= BigInt(2 ** 53 - 1)) return Number(t);
 	}
@@ -1802,26 +1802,26 @@ function xt(e, t) {
 }
 function St(e) {
 	let t = A(e);
-	return t === void 0 ? e instanceof u || e instanceof c ? e.value.toString() : e.constructor.name.replace(/^Cbor/, "").toLowerCase() : JSON.stringify(t);
+	return t === void 0 ? e instanceof i || e instanceof u ? e.value.toString() : e.constructor.name.replace(/^Cbor/, "").toLowerCase() : JSON.stringify(t);
 }
 function Ct(e, t, n) {
 	return {
-		matchType2: (r, i, a) => V(r, i, e, a, t, n + 1),
+		matchType2: (r, i, a) => B(r, i, e, a, t, n + 1),
 		matchEmbedded: (r, i, a) => {
 			t.embeddedDepth++;
 			try {
-				return V(r, i, e, a, t, n + 1);
+				return B(r, i, e, a, t, n + 1);
 			} finally {
 				t.embeddedDepth--;
 			}
 		},
-		resolveValue: (n) => W(n, e, t),
-		existsIntGE: (n, r) => Xe(n, r, e, t),
-		matchesLiteral: U,
+		resolveValue: (n) => U(n, e, t),
+		existsIntGE: (n, r) => Ze(n, r, e, t),
+		matchesLiteral: H,
 		fail: (e, n, r, i) => t.fail(e, n, r, i),
 		warnOnce: (e, n) => t.warnOnce(e, n),
 		features: t.features,
-		uint: (e) => new u(e)
+		uint: (e) => new i(e)
 	};
 }
 //#endregion
@@ -1837,19 +1837,19 @@ var wt = class {
 		this.source = e, this.comments = t, this.ast = n, this.rules = r, i && (this.root = i), a.length > 0 && (this.warnings = a);
 	}
 	format(e) {
-		return _e(this.ast, {
+		return he(this.ast, {
 			...e,
 			source: this.source,
 			comments: this.comments
 		});
 	}
 	validate(e, t) {
-		let n = e instanceof a ? e : typeof e == "string" ? p(e) : h(e);
-		return Ge(this, n, t);
+		let n = e instanceof a ? e : typeof e == "string" ? m(e) : te(e);
+		return Ke(this, n, t);
 	}
 };
 function Tt(e, t) {
-	let { rules: n, comments: r } = de(e), i = [], a = he();
+	let { rules: n, comments: r } = S(e), i = [], a = w();
 	n.length === 0 && i.push({
 		code: "no-rules",
 		message: "a CDDL data model needs at least one rule to provide the root of the definition"
@@ -1972,6 +1972,6 @@ function kt(e, t) {
 	}
 }
 //#endregion
-export { de as a, oe as c, he as i, v as l, Tt as n, le as o, me as r, ae as s, wt as t };
+export { S as a, oe as c, w as i, v as l, Tt as n, le as o, pe as r, ae as s, wt as t };
 
-//# sourceMappingURL=schema-BxkgvUY6.js.map
+//# sourceMappingURL=schema-y8G5mDIS.js.map