seroval 1.6.5 → 1.6.7

package/dist/index.js

@@ -147,6 +147,8 @@ const NEG_INFINITY_NODE = /* @__PURE__ */ createConstantNode(6);
 const NAN_NODE = /* @__PURE__ */ createConstantNode(7);
 //#endregion
 //#region src/core/string.ts
+const MIN_JSON_STRINGIFY_LENGTH = 64;
+const JSON_ESCAPE_DIFFERENCES = /[\x00-\x07\x0b\x0e-\x1f<\u2028\u2029\ud800-\udfff]/;
 function serializeChar(str) {
 	switch (str) {
 		case "\"": return "\\\"";
@@ -163,6 +165,7 @@ function serializeChar(str) {
 	}
 }
 function serializeString(str) {
+	if (str.length >= MIN_JSON_STRINGIFY_LENGTH && !JSON_ESCAPE_DIFFERENCES.test(str)) return JSON.stringify(str).slice(1, -1);
 	let result = "";
 	let lastPos = 0;
 	let replacement;
@@ -193,6 +196,7 @@ function deserializeReplacer(str) {
 	}
 }
 function deserializeString(str) {
+	if (typeof str === "string" && !str.includes("\\")) return str;
 	return str.replace(/(\\\\|\\"|\\n|\\r|\\b|\\t|\\f|\\u2028|\\u2029|\\x3C)/g, deserializeReplacer);
 }
 //#endregion
@@ -516,7 +520,10 @@ const STREAM_CONSTRUCTOR = () => {
 	let count = 0;
 	const internal = {
 		flush(value, mode, x) {
-			for (x = 0; x < count; x++) if (listeners[x]) listeners[x][mode](value);
+			for (x = 0; x < count; x++) {
+				const listener = listeners[x];
+				if (listener) listener[mode](value);
+			}
 		},
 		up(listener, x, z, current) {
 			for (x = 0, z = buffer.length; x < z; x++) {
@@ -525,16 +532,20 @@ const STREAM_CONSTRUCTOR = () => {
 				else listener.next(current);
 			}
 		},
-		on(listener, temp) {
+		on(listener, temp = 0) {
+			let subscribed = alive;
 			if (alive) {
-				temp = count++;
+				for (temp = 0; temp < count; temp++) if (!listeners[temp]) break;
+				if (temp === count) count++;
 				listeners[temp] = listener;
 			}
 			internal.up(listener);
 			return () => {
-				if (alive) {
-					listeners[temp] = listeners[count];
-					listeners[count--] = void 0;
+				if (alive && subscribed) {
+					subscribed = false;
+					listeners[temp] = void 0;
+					while (count > 0 && !listeners[count - 1]) count--;
+					listeners.length = count;
 				}
 			};
 		}
@@ -745,19 +756,35 @@ function isStream(value) {
 function createStream() {
 	return STREAM_CONSTRUCTOR();
 }
-function createStreamFromAsyncIterable(iterable) {
+function createStreamFromAsyncIterable(iterable, cleanups) {
 	const stream = createStream();
 	const iterator = iterable[SYM_ASYNC_ITERATOR]();
+	let cancelled = false;
+	let done = false;
+	cleanups === null || cleanups === void 0 || cleanups.push(() => {
+		if (!(done || cancelled)) {
+			cancelled = true;
+			Promise.resolve().then(() => {
+				var _iterator$return;
+				return (_iterator$return = iterator.return) === null || _iterator$return === void 0 ? void 0 : _iterator$return.call(iterator);
+			}).catch(() => {});
+		}
+	});
 	async function push() {
 		try {
-			const value = await iterator.next();
-			if (value.done) stream.return(value.value);
-			else {
+			while (!cancelled) {
+				const value = await iterator.next();
+				if (cancelled) return;
+				if (value.done) {
+					done = true;
+					stream.return(value.value);
+					break;
+				}
 				stream.next(value.value);
-				await push();
 			}
 		} catch (error) {
-			stream.throw(error);
+			done = true;
+			if (!cancelled) stream.throw(error);
 		}
 	}
 	push().catch(() => {});
@@ -779,13 +806,15 @@ async function promiseToResult(current) {
 //#endregion
 //#region src/core/context/parser.ts
 function createBaseParserContext(mode, options) {
+	var _options$compactArray;
 	return {
 		plugins: options.plugins,
 		mode,
 		marked: /* @__PURE__ */ new Set(),
 		features: 127 ^ (options.disabledFeatures || 0),
 		refs: options.refs || /* @__PURE__ */ new Map(),
-		depthLimit: options.depthLimit || 1e3
+		depthLimit: options.depthLimit || 1e3,
+		compactArrayBufferViews: (_options$compactArray = options.compactArrayBufferViews) !== null && _options$compactArray !== void 0 ? _options$compactArray : false
 	};
 }
 /**
@@ -865,11 +894,22 @@ function createMapNode(ctx, id, k, v) {
 function createPromiseConstructorNode(ctx, id, resolver) {
 	return createSerovalNode(22, id, resolver, void 0, void 0, void 0, void 0, void 0, parseSpecialReference(ctx, 1), void 0, void 0, void 0);
 }
-function createArrayBufferNode(ctx, id, current) {
+function getArrayBufferView(ctx, current) {
+	if (!ctx.compactArrayBufferViews) return current;
+	const buffer = new Uint8Array(current.buffer, current.byteOffset, current.byteLength).slice().buffer;
+	const Constructor = current.constructor;
+	return new Constructor(buffer);
+}
+function encodeArrayBuffer(current) {
+	if (typeof Buffer !== "undefined") return Buffer.from(current).toString("base64");
 	const bytes = new Uint8Array(current);
+	if (typeof bytes.toBase64 === "function") return bytes.toBase64();
 	let result = "";
 	for (let i = 0, len = bytes.length; i < len; i++) result += String.fromCharCode(bytes[i]);
-	return createSerovalNode(19, id, serializeString(btoa(result)), void 0, void 0, void 0, void 0, void 0, parseSpecialReference(ctx, 5), void 0, void 0, void 0);
+	return btoa(result);
+}
+function createArrayBufferNode(ctx, id, current) {
+	return createSerovalNode(19, id, encodeArrayBuffer(current), void 0, void 0, void 0, void 0, void 0, parseSpecialReference(ctx, 5), void 0, void 0, void 0);
 }
 //#endregion
 //#region src/core/context/async-parser.ts
@@ -933,12 +973,15 @@ async function parseBoxed$1(ctx, depth, id, current) {
 	return createBoxedNode(id, await parseAsync(ctx, depth, current.valueOf()));
 }
 async function parseTypedArray$1(ctx, depth, id, current) {
+	current = getArrayBufferView(ctx.base, current);
 	return createTypedArrayNode(id, current, await parseAsync(ctx, depth, current.buffer));
 }
 async function parseBigIntTypedArray$1(ctx, depth, id, current) {
+	current = getArrayBufferView(ctx.base, current);
 	return createBigIntTypedArrayNode(id, current, await parseAsync(ctx, depth, current.buffer));
 }
 async function parseDataView$1(ctx, depth, id, current) {
+	current = getArrayBufferView(ctx.base, current);
 	return createDataViewNode(id, current, await parseAsync(ctx, depth, current.buffer));
 }
 async function parseError$1(ctx, depth, id, current) {
@@ -1183,7 +1226,8 @@ function isValidSymbol(symbol) {
 }
 //#endregion
 //#region src/core/context/deserializer.ts
-const MAX_BASE64_LENGTH = 1e6;
+const DEFAULT_MAX_BASE64_LENGTH = 1e6;
+const MIN_NATIVE_BASE64_LENGTH = 512;
 const MAX_BIGINT_LENGTH = 1e4;
 const MAX_REGEXP_SOURCE_LENGTH = 2e4;
 function applyObjectFlag(obj, flag) {
@@ -1196,7 +1240,9 @@ function applyObjectFlag(obj, flag) {
 }
 const DEFAULT_DEPTH_LIMIT = 1e3;
 function createBaseDeserializerContext(mode, options) {
-	var _options$features;
+	var _options$maxBase64Len, _options$features;
+	const maxBase64Length = (_options$maxBase64Len = options.maxBase64Length) !== null && _options$maxBase64Len !== void 0 ? _options$maxBase64Len : DEFAULT_MAX_BASE64_LENGTH;
+	if (!Number.isSafeInteger(maxBase64Length) || maxBase64Length < 0) throw new RangeError("maxBase64Length must be a non-negative safe integer");
 	const refs = options.refs || /* @__PURE__ */ new Map();
 	if (!("types" in refs)) Object.assign(refs, { types: /* @__PURE__ */ new Map() });
 	return {
@@ -1204,7 +1250,8 @@ function createBaseDeserializerContext(mode, options) {
 		plugins: options.plugins,
 		refs,
 		features: (_options$features = options.features) !== null && _options$features !== void 0 ? _options$features : 127 ^ (options.disabledFeatures || 0),
-		depthLimit: options.depthLimit || DEFAULT_DEPTH_LIMIT
+		depthLimit: options.depthLimit || DEFAULT_DEPTH_LIMIT,
+		maxBase64Length
 	};
 }
 function createVanillaDeserializerContext(options) {
@@ -1367,8 +1414,17 @@ function deserializeMap(ctx, depth, node) {
 	return result;
 }
 function deserializeArrayBuffer(ctx, node) {
-	if (node.s.length > MAX_BASE64_LENGTH) throw new SerovalMalformedNodeError(node);
-	return assignIndexedValue$1(ctx, node.i, ARRAY_BUFFER_CONSTRUCTOR(deserializeString(node.s)));
+	if (typeof node.s !== "string") throw new SerovalMalformedNodeError(node);
+	if (node.s.length > ctx.base.maxBase64Length) throw new RangeError("ArrayBuffer exceeds maxBase64Length (" + ctx.base.maxBase64Length + ")");
+	const source = deserializeString(node.s);
+	let buffer;
+	if (source.length < MIN_NATIVE_BASE64_LENGTH || typeof Buffer === "undefined") buffer = ARRAY_BUFFER_CONSTRUCTOR(source);
+	else {
+		const decoded = atob(source);
+		buffer = new ArrayBuffer(decoded.length);
+		Buffer.from(buffer).write(decoded, "latin1");
+	}
+	return assignIndexedValue$1(ctx, node.i, buffer);
 }
 function deserializeTypedArray(ctx, depth, node) {
 	var _node$b;
@@ -1376,7 +1432,7 @@ function deserializeTypedArray(ctx, depth, node) {
 	const source = deserialize$1(ctx, depth, node.f);
 	if (!(source instanceof ArrayBuffer)) throw new SerovalMalformedNodeError(node);
 	const offset = (_node$b = node.b) !== null && _node$b !== void 0 ? _node$b : 0;
-	if (offset < 0 || offset > source.byteLength || node.l > MAX_BASE64_LENGTH) throw new SerovalMalformedNodeError(node);
+	if (offset < 0 || offset > source.byteLength) throw new SerovalMalformedNodeError(node);
 	return assignIndexedValue$1(ctx, node.i, new construct(source, offset, node.l));
 }
 function deserializeDataView(ctx, depth, node) {
@@ -1384,7 +1440,7 @@ function deserializeDataView(ctx, depth, node) {
 	const source = deserialize$1(ctx, depth, node.f);
 	if (!(source instanceof ArrayBuffer)) throw new SerovalMalformedNodeError(node);
 	const offset = (_node$b2 = node.b) !== null && _node$b2 !== void 0 ? _node$b2 : 0;
-	if (offset < 0 || offset > source.byteLength || node.l > MAX_BASE64_LENGTH) throw new SerovalMalformedNodeError(node);
+	if (offset < 0 || offset > source.byteLength) throw new SerovalMalformedNodeError(node);
 	return assignIndexedValue$1(ctx, node.i, new DataView(source, offset, node.l));
 }
 function deserializeDictionary(ctx, depth, node, result) {
@@ -2404,7 +2460,7 @@ function parseProperties(ctx, depth, properties) {
 	}
 	if (SYM_ASYNC_ITERATOR in properties) {
 		keyNodes.push(parseWellKnownSymbol(ctx.base, SYM_ASYNC_ITERATOR));
-		valueNodes.push(createAsyncIteratorFactoryInstanceNode(parseAsyncIteratorFactory(ctx.base), parseSOS(ctx, depth, ctx.type === 1 ? createStream() : createStreamFromAsyncIterable(properties))));
+		valueNodes.push(createAsyncIteratorFactoryInstanceNode(parseAsyncIteratorFactory(ctx.base), parseSOS(ctx, depth, ctx.type === 1 ? createStream() : createStreamFromAsyncIterable(properties, ctx.state.cleanups))));
 	}
 	if (SYM_TO_STRING_TAG in properties) {
 		keyNodes.push(parseWellKnownSymbol(ctx.base, SYM_TO_STRING_TAG));
@@ -2426,12 +2482,15 @@ function parseBoxed(ctx, depth, id, current) {
 	return createBoxedNode(id, parseSOS(ctx, depth, current.valueOf()));
 }
 function parseTypedArray(ctx, depth, id, current) {
+	current = getArrayBufferView(ctx.base, current);
 	return createTypedArrayNode(id, current, parseSOS(ctx, depth, current.buffer));
 }
 function parseBigIntTypedArray(ctx, depth, id, current) {
+	current = getArrayBufferView(ctx.base, current);
 	return createBigIntTypedArrayNode(id, current, parseSOS(ctx, depth, current.buffer));
 }
 function parseDataView(ctx, depth, id, current) {
+	current = getArrayBufferView(ctx.base, current);
 	return createDataViewNode(id, current, parseSOS(ctx, depth, current.buffer));
 }
 function parseError(ctx, depth, id, current) {
@@ -2682,6 +2741,7 @@ function destroyStreamParse(ctx) {
 function crossSerialize(source, options = {}) {
 	const plugins = resolvePlugins(options.plugins);
 	const ctx = createSyncParserContext(2, {
+		compactArrayBufferViews: options.compactArrayBufferViews,
 		plugins,
 		disabledFeatures: options.disabledFeatures,
 		refs: options.refs
@@ -2697,6 +2757,7 @@ function crossSerialize(source, options = {}) {
 async function crossSerializeAsync(source, options = {}) {
 	const plugins = resolvePlugins(options.plugins);
 	const ctx = createAsyncParserContext(2, {
+		compactArrayBufferViews: options.compactArrayBufferViews,
 		plugins,
 		disabledFeatures: options.disabledFeatures,
 		refs: options.refs
@@ -2710,15 +2771,19 @@ async function crossSerializeAsync(source, options = {}) {
 	}), tree);
 }
 function toCrossJSON(source, options = {}) {
+	const plugins = resolvePlugins(options.plugins);
 	return parseTop(createSyncParserContext(2, {
-		plugins: resolvePlugins(options.plugins),
+		compactArrayBufferViews: options.compactArrayBufferViews,
+		plugins,
 		disabledFeatures: options.disabledFeatures,
 		refs: options.refs
 	}), source);
 }
 async function toCrossJSONAsync(source, options = {}) {
+	const plugins = resolvePlugins(options.plugins);
 	return await parseTopAsync(createAsyncParserContext(2, {
-		plugins: resolvePlugins(options.plugins),
+		compactArrayBufferViews: options.compactArrayBufferViews,
+		plugins,
 		disabledFeatures: options.disabledFeatures,
 		refs: options.refs
 	}), source);
@@ -2726,6 +2791,7 @@ async function toCrossJSONAsync(source, options = {}) {
 function crossSerializeStream(source, options) {
 	const plugins = resolvePlugins(options.plugins);
 	const ctx = createStreamParserContext({
+		compactArrayBufferViews: options.compactArrayBufferViews,
 		plugins,
 		refs: options.refs,
 		disabledFeatures: options.disabledFeatures,
@@ -2752,8 +2818,10 @@ function crossSerializeStream(source, options) {
 	return destroyStreamParse.bind(null, ctx);
 }
 function toCrossJSONStream(source, options) {
+	const plugins = resolvePlugins(options.plugins);
 	const ctx = createStreamParserContext({
-		plugins: resolvePlugins(options.plugins),
+		compactArrayBufferViews: options.compactArrayBufferViews,
+		plugins,
 		refs: options.refs,
 		disabledFeatures: options.disabledFeatures,
 		depthLimit: options.depthLimit,
@@ -2765,8 +2833,10 @@ function toCrossJSONStream(source, options) {
 	return destroyStreamParse.bind(null, ctx);
 }
 function fromCrossJSON(source, options) {
+	const plugins = resolvePlugins(options.plugins);
 	return deserializeTop(createCrossDeserializerContext({
-		plugins: resolvePlugins(options.plugins),
+		maxBase64Length: options.maxBase64Length,
+		plugins,
 		refs: options.refs,
 		features: options.features,
 		disabledFeatures: options.disabledFeatures,
@@ -2797,6 +2867,7 @@ var Serializer = class {
 				scopeId: this.options.scopeId,
 				refs: this.refs,
 				disabledFeatures: this.options.disabledFeatures,
+				compactArrayBufferViews: this.options.compactArrayBufferViews,
 				onError: this.options.onError,
 				onSerialize: (data, initial) => {
 					if (this.alive) this.options.onData(initial ? this.options.globalIdentifier + "[\"" + serializeString(key) + "\"]=" + data : data);
@@ -2847,6 +2918,7 @@ var Serializer = class {
 function serialize(source, options = {}) {
 	const plugins = resolvePlugins(options.plugins);
 	const ctx = createSyncParserContext(1, {
+		compactArrayBufferViews: options.compactArrayBufferViews,
 		plugins,
 		disabledFeatures: options.disabledFeatures
 	});
@@ -2860,6 +2932,7 @@ function serialize(source, options = {}) {
 async function serializeAsync(source, options = {}) {
 	const plugins = resolvePlugins(options.plugins);
 	const ctx = createAsyncParserContext(1, {
+		compactArrayBufferViews: options.compactArrayBufferViews,
 		plugins,
 		disabledFeatures: options.disabledFeatures
 	});
@@ -2874,8 +2947,10 @@ function deserialize(source) {
 	return (0, eval)(source);
 }
 function toJSON(source, options = {}) {
+	const plugins = resolvePlugins(options.plugins);
 	const ctx = createSyncParserContext(1, {
-		plugins: resolvePlugins(options.plugins),
+		compactArrayBufferViews: options.compactArrayBufferViews,
+		plugins,
 		disabledFeatures: options.disabledFeatures
 	});
 	return {
@@ -2885,8 +2960,10 @@ function toJSON(source, options = {}) {
 	};
 }
 async function toJSONAsync(source, options = {}) {
+	const plugins = resolvePlugins(options.plugins);
 	const ctx = createAsyncParserContext(1, {
-		plugins: resolvePlugins(options.plugins),
+		compactArrayBufferViews: options.compactArrayBufferViews,
+		plugins,
 		disabledFeatures: options.disabledFeatures
 	});
 	return {
@@ -2908,6 +2985,7 @@ function fromJSON(source, options = {}) {
 	const disabledFeatures = options.disabledFeatures || 0;
 	const sourceFeatures = (_source$f = source.f) !== null && _source$f !== void 0 ? _source$f : 127;
 	return deserializeTop(createVanillaDeserializerContext({
+		maxBase64Length: options.maxBase64Length,
 		plugins,
 		markedRefs: source.m,
 		features: sourceFeatures & ~disabledFeatures,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "seroval",
   "type": "module",
-  "version": "1.6.5",
+  "version": "1.6.7",
   "files": [
     "dist"
   ],