@cbortech/cbor 0.27.0 → 0.27.2

package/dist/{serialize-utils-BuIZPaUc.js → serialize-utils-BQtutOo6.js}

@@ -267,13 +267,13 @@ var h = new TextEncoder(), g = class {
 			return;
 		}
 		let n = "";
-		for (let e = 0; e < 4 && !(this._eof() || this._ch() === "\n" || !/[0-9a-fA-F]/.test(this._ch())); e++) n += this._advance();
+		for (let e = 0; e < 4 && !this._eof() && this._ch() !== "\n" && /[0-9a-fA-F]/.test(this._ch()); e++) n += this._advance();
 		if (n.length < 4) return;
 		let r = parseInt(n, 16);
 		if (r >= 55296 && r <= 56319) {
 			(this._ch() !== "\\" || (this.input[this.pos + 1] ?? "") !== "u") && this._fail(`lone high surrogate \\u${n} in hex string comment`, e, t), this._advance(), this._advance();
 			let r = "";
-			for (let e = 0; e < 4 && !(this._eof() || this._ch() === "\n" || !/[0-9a-fA-F]/.test(this._ch())); e++) r += this._advance();
+			for (let e = 0; e < 4 && !this._eof() && this._ch() !== "\n" && /[0-9a-fA-F]/.test(this._ch()); e++) r += this._advance();
 			let i = parseInt(r || "0", 16);
 			(i < 56320 || i > 57343) && this._fail(`\\u${n} (high surrogate) not followed by valid low surrogate in hex string comment`, e, t);
 			return;
@@ -940,21 +940,28 @@ function ee(e, t = !1) {
 	};
 }
 function j(e) {
-	let { options: t, depth: n, openChar: r, closeChar: i, count: a } = e, o = v(t), s = w(t), c = T(t), l = o !== null && s && (C(e.node) || e.hasEntryComments()), u = o !== null && !!t?.preserveBlankLines, d = !1;
-	if (u) {
+	let { options: t, depth: n, openChar: r, closeChar: i, count: a } = e, o = v(t), s = w(t), c = T(t), l = !1;
+	if (o !== null) {
+		for (let n = 0; n < a; n++) if (e.hasEntryComments(n) && w(e.entryOptions ? e.entryOptions(n) : t)) {
+			l = !0;
+			break;
+		}
+	}
+	let u = o !== null && (s && C(e.node) || l), d = o !== null && !!t?.preserveBlankLines, f = !1;
+	if (d) {
 		for (let t = 0; t < a; t++) if (e.entryLeadingNode(t).blankLineBefore) {
-			d = !0;
+			f = !0;
 			break;
 		}
 	}
-	let { inlineSep: f, multilineSep: p, trailSep: m, colSep: h } = ee(t, o === null), g = e.eiPosition ?? "open", b = e.indefiniteLength ? "" : Y(t, e.encodingWidth, () => J(e.canonicalCount ? e.canonicalCount() : BigInt(a))), x = g === "open" && b ? b + " " : "", S = g === "close" ? b : "", E = e.indefiniteLength && (e.indefiniteMarker ?? !0) && (t?.encodingIndicators ?? "auto") !== "never", D = (t) => e.indefiniteLength ? E ? a === 0 ? `${r}_ ${i}` : `${r}_ ${t}${i}` : `${r}${t}${i}` : `${r}${x}${t}${i}${S}`;
-	if (o === null || a === 0 && !l) {
+	let { inlineSep: p, multilineSep: m, trailSep: h, colSep: g } = ee(t, o === null), b = e.eiPosition ?? "open", x = e.indefiniteLength ? "" : Y(t, e.encodingWidth, () => J(e.canonicalCount ? e.canonicalCount() : BigInt(a))), S = b === "open" && x ? x + " " : "", E = b === "close" ? x : "", D = e.indefiniteLength && (e.indefiniteMarker ?? !0) && (t?.encodingIndicators ?? "auto") !== "never", k = (t) => e.indefiniteLength ? D ? a === 0 ? `${r}_ ${i}` : `${r}_ ${t}${i}` : `${r}${t}${i}` : `${r}${S}${t}${i}${E}`;
+	if (o === null || a === 0 && !u) {
 		let t = "";
-		for (let n = 0; n < a; n++) n > 0 && (t += f), t += e.renderEntry(n, h);
-		return D(t);
+		for (let n = 0; n < a; n++) n > 0 && (t += p), t += e.renderEntry(n, g);
+		return k(t);
 	}
-	let k = null;
-	if ((t?.inlineLeafContainers || e.alwaysInlineLeaf) && a > 0 && !l && !d) {
+	let j = null;
+	if ((t?.inlineLeafContainers || e.alwaysInlineLeaf) && a > 0 && !u && !f) {
 		let t = !!e.entryIsLeaf, n = [], r = !0;
 		for (let i = 0; i < a; i++) {
 			if (e.entryIsLeaf && !e.entryIsLeaf(i)) {
@@ -965,7 +972,7 @@ function j(e) {
 				r = !1;
 				break;
 			}
-			let a = e.renderEntry(i, h);
+			let a = e.renderEntry(i, g);
 			if (n.push(a), a.includes("\n")) {
 				r = !1;
 				break;
@@ -975,31 +982,34 @@ function j(e) {
 				break;
 			}
 		}
-		if (r) return D(n.join(f));
-		k = n;
-	}
-	let j = y(o, n + 1), M = y(o, n), N = e.indefiniteLength ? E ? `${r}_ ` : r : `${r}${x}`, P = [];
-	for (let t = 0; t < a; t++) {
-		u && e.entryLeadingNode(t).blankLineBefore && P.push("");
-		let n = "";
-		if (s) {
-			let { ownLines: r, inlinePrefix: i } = O(e.entryLeadingNode(t), j, c);
-			_(P, r), n = i;
+		if (r) return k(n.join(p));
+		j = n;
+	}
+	let M = y(o, n + 1), N = y(o, n), P = e.indefiniteLength ? D ? `${r}_ ` : r : `${r}${S}`, F = [];
+	for (let n = 0; n < a; n++) {
+		d && e.entryLeadingNode(n).blankLineBefore && F.push("");
+		let r = w(e.entryOptions ? e.entryOptions(n) : t), i = T(e.entryOptions ? e.entryOptions(n) : t), o = "";
+		if (r) {
+			let { ownLines: t, inlinePrefix: r } = O(e.entryLeadingNode(n), M, i);
+			_(F, t), o = r;
 		}
-		let r = t < a - 1 ? p : m, i = k?.[t] ?? e.renderEntry(t, h);
-		P.push(`${j}${n}${i}${r}${s ? e.entryTrailing(t, c) : ""}`);
+		let s = n < a - 1 ? m : h, c = j?.[n] ?? e.renderEntry(n, g);
+		F.push(`${M}${o}${c}${s}${r ? e.entryTrailing(n, i) : ""}`);
 	}
-	return s && _(P, A(e.node, j, c)), `${N}\n${P.join("\n")}\n${M}${i}${S}`;
+	return s && _(F, A(e.node, M, c)), `${P}\n${F.join("\n")}\n${N}${i}${E}`;
 }
-function M(e, t, n, r, i, a, o) {
-	let s = v(n);
-	if (!(s !== null && w(n) && (S(e) || C(t)))) return `${a}${i(r)}${o}`;
-	let c = T(n), l = y(s, r + 1), u = y(s, r), { ownLines: d, inlinePrefix: f } = O(e, l, c);
-	return `${a}\n${[
-		...d,
-		`${l}${f}${i(r + 1)}${k(e, c)}`,
-		...A(t, l, c)
-	].join("\n")}\n${u}${o}`;
+function M(e, t, n, r, i, a, o, s) {
+	let c = v(n), l = w(n), u = w(r);
+	if (!(c !== null && (u && S(e) || l && C(t)))) return `${o}${a(i)}${s}`;
+	let d = T(n), f = T(r), p = y(c, i + 1), m = y(c, i), { ownLines: h, inlinePrefix: g } = u ? O(e, p, f) : {
+		ownLines: [],
+		inlinePrefix: ""
+	};
+	return `${o}\n${[
+		...h,
+		`${p}${g}${a(i + 1)}${u ? k(e, f) : ""}`,
+		...l ? A(t, p, d) : []
+	].join("\n")}\n${m}${s}`;
 }
 var N = typeof (/* @__PURE__ */ new Uint8Array()).toBase64 == "function";
 function P(e) {
@@ -1008,7 +1018,7 @@ function P(e) {
 	for (let n of e) t += String.fromCharCode(n);
 	return btoa(t).replace(/=/g, "");
 }
-function te(e) {
+function F(e) {
 	if (N) return e.toBase64({
 		alphabet: "base64url",
 		omitPadding: !0
@@ -1017,48 +1027,55 @@ function te(e) {
 	for (let n of e) t += String.fromCharCode(n);
 	return btoa(t).replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
 }
-var ne = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567", re = "0123456789ABCDEFGHIJKLMNOPQRSTUV";
-function F(e, t) {
+var te = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567", ne = "0123456789ABCDEFGHIJKLMNOPQRSTUV";
+function I(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 ie(e) {
+function re(e) {
 	for (let t of e) {
 		let e = t.codePointAt(0);
 		if (e < 32 || e === 127) return !0;
 	}
 	return !1;
 }
-function I(e, t) {
+function L(e, t) {
 	if (t === "string") {
 		let t = G(e);
 		if (t != null) return t;
 	}
 	if (t === "printable-string" || t === void 0) {
 		let t = G(e);
-		if (t != null && !ie(t)) return t;
+		if (t != null && !re(t)) return t;
 	}
 	return null;
 }
-function ae(e, t, n) {
-	let r = I(e, n);
+function ie(e, t, n) {
+	let r = L(e, n);
 	if (r !== null) return ye(r);
 	switch (t) {
 		case "base64": return `b64'${P(e)}'`;
-		case "base64url": return `b64'${te(e)}'`;
-		case "base32": return `b32'${F(e, ne)}'`;
-		case "base32hex": return `h32'${F(e, re)}'`;
+		case "base64url": return `b64'${F(e)}'`;
+		case "base32": return `b32'${I(e, te)}'`;
+		case "base32hex": return `h32'${I(e, ne)}'`;
 		default: return `h'${o(e)}'`;
 	}
 }
-function L(e, t) {
-	let n = I(e, t);
+function ae(e, t) {
+	let n = L(e, t);
 	return n !== null && q(n);
 }
 var oe = /^[A-Za-z][A-Za-z0-9-]*['`]/;
 function R(e) {
-	return oe.test(e);
+	if (!oe.test(e)) return !1;
+	let t;
+	try {
+		t = new g(e).consume();
+	} catch {
+		return !0;
+	}
+	return t.type !== "APP_STRING" || q(t.value);
 }
 var z = new TextDecoder();
 function se(e, t) {
@@ -1159,6 +1176,7 @@ function W(e, t, n, r) {
 			if (t !== null && t + 1 === i) return W(e, n + 1, t, r);
 		}
 	}
+	if (r && (e[t].type === "LBRACKET" || e[t].type === "LBRACE") && H(e, t, i) === i - 1) return !0;
 	if (e[t].type === "APP_SEQUENCE") {
 		let n = H(e, t, i);
 		if (n !== null && n + 1 === i) {
@@ -1184,8 +1202,8 @@ function W(e, t, n, r) {
 		}
 		case "BYTES_HEX":
 		case "BYTES_HEX_ELIDED":
-		case "BYTES_B64":
-		case "APP_STRING": return r;
+		case "BYTES_B64": return r;
+		case "APP_STRING": return r && q(a.value);
 		default: return !1;
 	}
 }
@@ -1408,6 +1426,6 @@ function Oe(e, t, n, r, i) {
 	return a = Ee(a, n, i, o), a.replace(/_[0-3i]$/, "") + t;
 }
 //#endregion
-export { g as A, Y as C, w as D, j as E, u as F, e as I, c as M, o as N, O, l as P, T as S, ae as T, R as _, D as a, _ as b, xe as c, k as d, S as f, q as g, se as h, E as i, d as j, me as k, we as l, L as m, De as n, Te as o, y as p, J as r, be as s, Oe as t, Ce as u, x as v, v as w, M as x, b as y };
+export { g as A, Y as C, w as D, j as E, u as F, e as I, c as M, o as N, O, l as P, T as S, ie as T, R as _, D as a, _ as b, xe as c, k as d, S as f, q as g, se as h, E as i, d as j, me as k, we as l, ae as m, De as n, Te as o, y as p, J as r, be as s, Oe as t, Ce as u, x as v, v as w, M as x, b as y };
 
-//# sourceMappingURL=serialize-utils-BuIZPaUc.js.map
+//# sourceMappingURL=serialize-utils-BQtutOo6.js.map