@cbortech/cbor 0.26.3 → 0.26.5

package/dist/{mapEntries-BZCOgqIt.js → mapEntries-Clr-oNtQ.js}

@@ -98,7 +98,9 @@ var m = class {
 //#region src/cdn/serialize-utils.ts
 function _(e) {
 	let t = e?.indent;
-	return t === void 0 ? null : typeof t == "number" ? " ".repeat(t) : t;
+	if (t === void 0) return null;
+	let n = typeof t == "number" ? " ".repeat(t) : t;
+	return n === "" ? null : n;
 }
 function v(e, t) {
 	return e.repeat(t);
@@ -143,9 +145,7 @@ function ae(e, t = !1) {
 	};
 }
 function x(e) {
-	let { options: t, depth: n, openChar: r, closeChar: i, count: a } = e, o = _(t), s = t?.preserveComments, c = typeof s == "string" ? s : void 0, l = s && (te(e.node) || e.hasEntryComments());
-	o === null && l && (o = "  ");
-	let { inlineSep: u, multilineSep: d, trailSep: f, colSep: p } = ae(t, o === null), m = e.indefiniteLength ? "" : w(t, e.encodingWidth, () => C(BigInt(a))), h = m ? m + " " : "", g = e.indefiniteLength && (t?.encodingIndicators ?? "auto") !== "never", ee = (t) => e.indefiniteLength ? g ? a === 0 ? `${r}_ ${i}` : `${r}_ ${t}${i}` : `${r}${t}${i}` : `${r}${h}${t}${i}`;
+	let { options: t, depth: n, openChar: r, closeChar: i, count: a } = e, o = _(t), s = t?.preserveComments, c = typeof s == "string" ? s : void 0, l = o !== null && s && (te(e.node) || e.hasEntryComments()), { inlineSep: u, multilineSep: d, trailSep: f, colSep: p } = ae(t, o === null), m = e.indefiniteLength ? "" : w(t, e.encodingWidth, () => C(BigInt(a))), h = m ? m + " " : "", g = e.indefiniteLength && (t?.encodingIndicators ?? "auto") !== "never", ee = (t) => e.indefiniteLength ? g ? a === 0 ? `${r}_ ${i}` : `${r}_ ${t}${i}` : `${r}${t}${i}` : `${r}${h}${t}${i}`;
 	if (o === null || a === 0 && !l) {
 		let t = "";
 		for (let n = 0; n < a; n++) n > 0 && (t += u), t += e.renderEntry(n, p);
@@ -463,7 +463,7 @@ var k = class e {
 			...this._defaults,
 			...e
 		} : e, n = this._toCDN(t, 0), r = t?.preserveComments;
-		if (!r) return n;
+		if (!r || _(t) === null) return n;
 		let i = typeof r == "string" ? r : void 0, a = this.comments?.leading?.map((e) => b(e, i)) ?? [], o = this.comments?.trailing ?? [], s = o.length === 0 ? n : `${n} ${o.map((e) => b(e, i).trimEnd()).join(" ")}`;
 		return [...a, s].join("\n");
 	}
@@ -612,14 +612,15 @@ var M = class extends k {
 	}
 	_toCDN(e, t) {
 		let n = e?.encodingIndicators ?? "auto";
-		if (e?.appStrings !== !1 && this.ednSource !== void 0) {
-			if (n === "never") return this.ednSource.replace(/_[0-3i]$/, "");
+		if (e?.appStrings !== !1 && this.ednSource !== void 0 && (_(e) !== null || !/[\r\n]/.test(this.ednSource))) {
+			let e = this.ednSource;
+			if (n === "never") return e.replace(/_[0-3i]$/, "");
 			if (n === "always") {
-				if (/_[0-3i]$/.test(this.ednSource)) return this.ednSource;
-				let e = this.precision ?? Le(this.value), t = e === "half" ? "_1" : e === "single" ? "_2" : "_3";
-				return this.ednSource + t;
+				if (/_[0-3i]$/.test(e)) return e;
+				let t = this.precision ?? Le(this.value);
+				return e + (t === "half" ? "_1" : t === "single" ? "_2" : "_3");
 			}
-			return this.ednSource;
+			return e;
 		}
 		let r = Le(this.value);
 		return (e?.floatFormat === "hex" ? Be(this.value) : be(this.value)) + xe(this.value, this.precision, r, n);
@@ -674,19 +675,20 @@ var M = class extends k {
 		O(e, 2, this.value.length, this.encodingWidth), e.writeBytes(this.value);
 	}
 	_toCDN(e, t) {
-		if (e?.preserveConcatenation && this.ednParts !== void 0 && this.ednParts.length > 1) {
-			let n = w(e, this.encodingWidth, () => C(BigInt(this.value.length))), r = e?.bstrEncoding ?? this.ednEncoding;
-			e?.appStrings === !1 && r !== "hex" && (r = "hex");
-			let i = this.ednParts.map((t) => e?.preserveByteString && t.source !== void 0 ? t.source : fe(t.bytes, r, e?.sqstr));
-			return i[i.length - 1] += n, ee(i, _(e), t);
-		}
-		if (e?.preserveByteString && this.ednSource !== void 0) {
+		let n = _(e);
+		if (e?.preserveConcatenation && n !== null && this.ednParts !== void 0 && this.ednParts.length > 1) {
+			let r = w(e, this.encodingWidth, () => C(BigInt(this.value.length))), i = e?.bstrEncoding ?? this.ednEncoding;
+			e?.appStrings === !1 && i !== "hex" && (i = "hex");
+			let a = this.ednParts.map((t) => e?.preserveByteString && t.source !== void 0 ? t.source : fe(t.bytes, i, e?.sqstr));
+			return a[a.length - 1] += r, ee(a, n, t);
+		}
+		if (e?.preserveByteString && this.ednSource !== void 0 && (n !== null || !/[\r\n]/.test(this.ednSource))) {
 			if (/_[0-3i]$/.test(this.ednSource)) return (e?.encodingIndicators ?? "auto") === "never" ? this.ednSource.replace(/_[0-3i]$/, "") : this.ednSource;
 			let t = w(e, this.encodingWidth, () => C(BigInt(this.value.length)));
 			return this.ednSource + t;
 		}
-		let n = w(e, this.encodingWidth, () => C(BigInt(this.value.length))), r = e?.bstrEncoding ?? this.ednEncoding;
-		return e?.appStrings === !1 && r !== "hex" && (r = "hex"), fe(this.value, r, e?.sqstr) + n;
+		let r = w(e, this.encodingWidth, () => C(BigInt(this.value.length))), i = e?.bstrEncoding ?? this.ednEncoding;
+		return e?.appStrings === !1 && i !== "hex" && (i = "hex"), fe(this.value, i, e?.sqstr) + r;
 	}
 	_toJS(e) {
 		return this.value;
@@ -1076,7 +1078,7 @@ var z = class e extends k {
 	}
 	_toCDN(e, t) {
 		let n = e?.encodingIndicators ?? "auto";
-		return e?.appStrings !== !1 && n === "auto" ? this.ednSource : this.inner._toCDN(e, t);
+		return e?.appStrings !== !1 && n === "auto" && (_(e) !== null || !/[\r\n]/.test(this.ednSource)) ? this.ednSource : this.inner._toCDN(e, t);
 	}
 	_toJS(e) {
 		return this.inner._toJS(e);
@@ -1823,7 +1825,8 @@ var pt = (e) => `import { ${e} } from '@cbortech/cbor' and pass it via the 'exte
 		let r = `app-string prefix '${e}' requires an extension that is not enabled; ${n}`;
 		this._options.onWarning ? this._options.onWarning({
 			message: r,
-			..._t(t)
+			..._t(t),
+			hint: !0
 		}) : this._options.silent || console.warn(`CDN: ${r}`);
 	}
 	_warn(e, t) {
@@ -1870,25 +1873,22 @@ var vt = new TextEncoder(), yt = !1, H = class extends k {
 	}
 };
 function bt(e, t, n, r, i, a, o) {
-	if (n?.preserveRawString && a !== void 0) return a + t;
-	let s = n?.preserveRawString ? o : void 0, c = s?.some((e) => e !== void 0) ?? !1, { cdn: l, newline: u } = St(n), d = _(n), f = n?.preserveConcatenation && i !== void 0 && (i.length > 1 || c) ? i : void 0;
-	if (d === null) return f === void 0 ? ye(e) + t : xt(f.map((e, t) => ({
-		text: e,
-		contentDepth: 0,
-		source: s?.[t]
-	})), t, null, r);
-	if (!l && !u && f === void 0) return ye(e) + t;
-	let p = l ? Tt(e) : null;
-	if (f !== void 0 && (p === null || c)) {
+	let s = _(n);
+	if (n?.preserveRawString && a !== void 0 && (s !== null || !/[\r\n]/.test(a))) return a + t;
+	if (s === null) return ye(e) + t;
+	let c = n?.preserveRawString ? o : void 0, l = c?.some((e) => e !== void 0) ?? !1, { cdn: u, newline: d } = St(n), f = n?.preserveConcatenation && i !== void 0 && (i.length > 1 || l) ? i : void 0;
+	if (!u && !d && f === void 0) return ye(e) + t;
+	let p = u ? Tt(e) : null;
+	if (f !== void 0 && (p === null || l)) {
 		let e = [];
 		for (let [t, n] of f.entries()) {
-			let r = s?.[t];
+			let r = c?.[t];
 			if (r !== void 0) e.push({
 				text: n,
 				contentDepth: 0,
 				source: r
 			});
-			else if (u) {
+			else if (d) {
 				let t = /* @__PURE__ */ new Map();
 				for (let { point: e, contentDepth: r } of wt(n, 0)) t.set(e, r);
 				e.push(...Nt(n, t));
@@ -1897,24 +1897,22 @@ function bt(e, t, n, r, i, a, o) {
 				contentDepth: 0
 			});
 		}
-		return xt(e, t, d, r);
+		return xt(e, t, s, r);
 	}
 	let m = /* @__PURE__ */ new Map();
 	if (p !== null) for (let { point: e, contentDepth: t } of p) m.set(e, t);
-	if (u) {
+	if (d) {
 		let t = p === null ? wt(e, 0) : Et(e);
 		for (let { point: e, contentDepth: n } of t) m.has(e) || m.set(e, n);
 	}
 	let h = Nt(e, m);
-	return h.length <= 1 ? ye(e) + t : xt(h, t, d, r);
+	return h.length <= 1 ? ye(e) + t : xt(h, t, s, r);
 }
 function xt(e, t, n, r) {
 	let i = e.map(({ text: n, source: r }, i) => {
 		let a = r ?? ye(n);
 		return i === e.length - 1 ? a + t : a;
-	});
-	if (n === null) return i.join(" + ");
-	let a = i[0];
+	}), a = i[0];
 	for (let t = 1; t < i.length; t++) {
 		let o = v(n, r + 1 + e[t].contentDepth);
 		a += ` +\n${o}${i[t]}`;
@@ -3017,17 +3015,25 @@ var or = 24n, sr = {
 	tagNumbers: [or],
 	parseTag(e, t, n) {
 		if (e !== 24n || !(t instanceof P)) return;
-		let r = n ? {
+		let r = (t.end ?? t.value.length) - t.value.length, i = n ? {
 			extensions: n.extensions,
 			builtinExtensions: n.builtinExtensions,
 			strict: n.strict,
-			onWarning: n.onWarning,
+			onWarning: n.onWarning ? (e) => n.onWarning({
+				...e,
+				offset: e.offset + r
+			}) : void 0,
 			silent: n.silent
 		} : void 0;
 		try {
-			return new N(or, new He([ar(t.value, r)], { encodingWidth: t.encodingWidth }));
+			return new N(or, new He([ar(t.value, i)], { encodingWidth: t.encodingWidth }));
 		} catch (e) {
-			if (r?.strict !== !1) throw e;
+			if (i?.strict !== !1) throw e;
+			let t = `tag 24 content is not valid CBOR: ${e instanceof Error ? e.message : String(e)}`, a = {
+				message: t,
+				offset: r
+			};
+			n?.onWarning ? n.onWarning(a) : n?.silent || console.warn(`CBOR strict violation at offset ${a.offset}: ${t}`);
 			return;
 		}
 	}
@@ -3509,4 +3515,4 @@ var $ = class extends Array {
 //#endregion
 export { A, L as C, N as D, P as E, s as F, m as I, c as L, g as M, h as N, M as O, o as P, R as S, F as T, it as _, zr as a, He as b, kr as c, ar as d, Ln as f, H as g, Kt as h, Vr as i, k as j, j as k, xr as l, Gt as m, Jr as n, Ar as o, un as p, Kr as r, Or as s, $ as t, br as u, et as v, I as w, z as x, $e as y };
 
-//# sourceMappingURL=mapEntries-BZCOgqIt.js.map
+//# sourceMappingURL=mapEntries-Clr-oNtQ.js.map