seroval 1.6.11 → 1.6.12

package/dist/dev/index.cjs

@@ -1003,11 +1003,18 @@ function parseAsyncIteratorFactory(ctx) {
 function createObjectNode(id, current, empty, record) {
 	return createSerovalNode(empty ? 11 : 10, id, void 0, void 0, void 0, record, void 0, void 0, void 0, void 0, getObjectFlag(current), void 0);
 }
-function createMapNode(ctx, id, k, v) {
+/**
+* Gets the sentinel node for a Map. Call it before parsing the entries, so
+* that an outer Map declares the sentinel before any Map inside it uses it.
+*/
+function parseMapSentinel(ctx) {
+	return parseSpecialReference(ctx, 0);
+}
+function createMapNode(id, sentinel, k, v) {
 	return createSerovalNode(8, id, void 0, void 0, void 0, void 0, {
 		k,
 		v
-	}, void 0, parseSpecialReference(ctx, 0), void 0, void 0, void 0);
+	}, void 0, sentinel, void 0, void 0, void 0);
 }
 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);
@@ -1110,13 +1117,14 @@ async function parseAggregateError$1(ctx, depth, id, current) {
 	return createAggregateErrorNode(id, current, options ? await parseProperties$1(ctx, depth, options) : void 0);
 }
 async function parseMap$1(ctx, depth, id, current) {
+	const sentinel = parseMapSentinel(ctx.base);
 	const keyNodes = [];
 	const valueNodes = [];
 	for (const [key, value] of current.entries()) {
 		keyNodes.push(await parseAsync(ctx, depth, key));
 		valueNodes.push(await parseAsync(ctx, depth, value));
 	}
-	return createMapNode(ctx.base, id, keyNodes, valueNodes);
+	return createMapNode(id, sentinel, keyNodes, valueNodes);
 }
 async function parseSet$1(ctx, depth, id, current) {
 	const items = [];
@@ -1770,30 +1778,36 @@ function getAssignmentExpression(assignment) {
 		case 4: return "Object.defineProperty(" + assignment.s + ",\"__proto__\",{value:" + assignment.k + ",configurable:!0,enumerable:!0,writable:!0})";
 	}
 }
+const MAX_ASSIGNMENT_CHAIN_LENGTH = 100;
 function mergeAssignments(assignments) {
 	const newAssignments = [];
 	let current = assignments[0];
+	let chainLength = 1;
 	for (let i = 1, len = assignments.length, item, prev = current; i < len; i++) {
 		item = assignments[i];
-		if (item.t === 0 && item.v === prev.v) current = {
+		if (chainLength === MAX_ASSIGNMENT_CHAIN_LENGTH) {
+			newAssignments.push(current);
+			current = item;
+			chainLength = 0;
+		} else if (item.t === 0 && prev.t === 0 && item.v === prev.v) current = {
 			t: 0,
 			s: item.s,
 			k: void 0,
 			v: getAssignmentExpression(current)
 		};
-		else if (item.t === 2 && item.s === prev.s) current = {
+		else if (item.t === 2 && prev.t === 2 && item.s === prev.s) current = {
 			t: 2,
 			s: getAssignmentExpression(current),
 			k: item.k,
 			v: item.v
 		};
-		else if (item.t === 1 && item.s === prev.s) current = {
+		else if (item.t === 1 && prev.t === 1 && item.s === prev.s) current = {
 			t: 1,
 			s: getAssignmentExpression(current),
 			k: void 0,
 			v: item.v
 		};
-		else if (item.t === 3 && item.s === prev.s) current = {
+		else if (item.t === 3 && prev.t === 2 && item.s === prev.s) current = {
 			t: 3,
 			s: getAssignmentExpression(current),
 			k: item.k,
@@ -1802,7 +1816,9 @@ function mergeAssignments(assignments) {
 		else {
 			newAssignments.push(current);
 			current = item;
+			chainLength = 0;
 		}
+		chainLength++;
 		prev = item;
 	}
 	newAssignments.push(current);
@@ -1997,6 +2013,22 @@ function isIndexedValueInStack(ctx, node) {
 	return node.t === 4 && ctx.stack.includes(node.i);
 }
 /**
+* Checks if the node, or any node inside it, is read from more than one
+* place. Such a node must not be created inside a deferred assignment,
+* because the places that read it may run before the assignment does.
+*/
+function hasMarkedNode(ctx, node) {
+	if (Array.isArray(node)) {
+		for (let i = 0, len = node.length; i < len; i++) if (hasMarkedNode(ctx, node[i])) return true;
+		return false;
+	}
+	if (node == null || typeof node !== "object") return false;
+	const current = node;
+	if (current.t !== 4 && typeof current.i === "number" && isSerializerRefMarked(ctx, current.i)) return true;
+	for (const key in current) if (hasMarkedNode(ctx, current[key])) return true;
+	return false;
+}
+/**
 * Produces an assignment expression. `id` generates a reference
 * parameter (through `getRefParam`) and has the option to
 * return the reference parameter directly or assign a value to
@@ -2206,7 +2238,8 @@ function serializeMapEntry(ctx, id, key, val, sentinel) {
 			createSetAssignment(ctx, id, keyRef, getRefParam(ctx, val.i));
 			return "";
 		}
-		if (val.t !== 4 && val.i != null && isSerializerRefMarked(base, val.i)) {
+		if (val.t !== 4 && val.i != null && hasMarkedNode(base, val)) {
+			markSerializerRef(base, val.i);
 			const serialized = "(" + serialize$1(ctx, val) + ",[" + sentinel + "," + sentinel + "])";
 			createSetAssignment(ctx, id, keyRef, getRefParam(ctx, val.i));
 			createDeleteAssignment(ctx, id, sentinel);
@@ -2221,7 +2254,8 @@ function serializeMapEntry(ctx, id, key, val, sentinel) {
 	if (isIndexedValueInStack(base, val)) {
 		const valueRef = getRefParam(ctx, val.i);
 		markSerializerRef(base, id);
-		if (key.t !== 4 && key.i != null && isSerializerRefMarked(base, key.i)) {
+		if (key.t !== 4 && key.i != null && hasMarkedNode(base, key)) {
+			markSerializerRef(base, key.i);
 			const serialized = "(" + serialize$1(ctx, key) + ",[" + sentinel + "," + sentinel + "])";
 			createSetAssignment(ctx, id, getRefParam(ctx, key.i), valueRef);
 			createDeleteAssignment(ctx, id, sentinel);
@@ -2617,13 +2651,14 @@ function parseAggregateError(ctx, depth, id, current) {
 	return createAggregateErrorNode(id, current, options ? parseProperties(ctx, depth, options) : void 0);
 }
 function parseMap(ctx, depth, id, current) {
+	const sentinel = parseMapSentinel(ctx.base);
 	const keyNodes = [];
 	const valueNodes = [];
 	for (const [key, value] of current.entries()) {
 		keyNodes.push(parseSOS(ctx, depth, key));
 		valueNodes.push(parseSOS(ctx, depth, value));
 	}
-	return createMapNode(ctx.base, id, keyNodes, valueNodes);
+	return createMapNode(id, sentinel, keyNodes, valueNodes);
 }
 function parseSet(ctx, depth, id, current) {
 	const items = [];

package/dist/dev/index.js

@@ -1002,11 +1002,18 @@ function parseAsyncIteratorFactory(ctx) {
 function createObjectNode(id, current, empty, record) {
 	return createSerovalNode(empty ? 11 : 10, id, void 0, void 0, void 0, record, void 0, void 0, void 0, void 0, getObjectFlag(current), void 0);
 }
-function createMapNode(ctx, id, k, v) {
+/**
+* Gets the sentinel node for a Map. Call it before parsing the entries, so
+* that an outer Map declares the sentinel before any Map inside it uses it.
+*/
+function parseMapSentinel(ctx) {
+	return parseSpecialReference(ctx, 0);
+}
+function createMapNode(id, sentinel, k, v) {
 	return createSerovalNode(8, id, void 0, void 0, void 0, void 0, {
 		k,
 		v
-	}, void 0, parseSpecialReference(ctx, 0), void 0, void 0, void 0);
+	}, void 0, sentinel, void 0, void 0, void 0);
 }
 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);
@@ -1109,13 +1116,14 @@ async function parseAggregateError$1(ctx, depth, id, current) {
 	return createAggregateErrorNode(id, current, options ? await parseProperties$1(ctx, depth, options) : void 0);
 }
 async function parseMap$1(ctx, depth, id, current) {
+	const sentinel = parseMapSentinel(ctx.base);
 	const keyNodes = [];
 	const valueNodes = [];
 	for (const [key, value] of current.entries()) {
 		keyNodes.push(await parseAsync(ctx, depth, key));
 		valueNodes.push(await parseAsync(ctx, depth, value));
 	}
-	return createMapNode(ctx.base, id, keyNodes, valueNodes);
+	return createMapNode(id, sentinel, keyNodes, valueNodes);
 }
 async function parseSet$1(ctx, depth, id, current) {
 	const items = [];
@@ -1769,30 +1777,36 @@ function getAssignmentExpression(assignment) {
 		case 4: return "Object.defineProperty(" + assignment.s + ",\"__proto__\",{value:" + assignment.k + ",configurable:!0,enumerable:!0,writable:!0})";
 	}
 }
+const MAX_ASSIGNMENT_CHAIN_LENGTH = 100;
 function mergeAssignments(assignments) {
 	const newAssignments = [];
 	let current = assignments[0];
+	let chainLength = 1;
 	for (let i = 1, len = assignments.length, item, prev = current; i < len; i++) {
 		item = assignments[i];
-		if (item.t === 0 && item.v === prev.v) current = {
+		if (chainLength === MAX_ASSIGNMENT_CHAIN_LENGTH) {
+			newAssignments.push(current);
+			current = item;
+			chainLength = 0;
+		} else if (item.t === 0 && prev.t === 0 && item.v === prev.v) current = {
 			t: 0,
 			s: item.s,
 			k: void 0,
 			v: getAssignmentExpression(current)
 		};
-		else if (item.t === 2 && item.s === prev.s) current = {
+		else if (item.t === 2 && prev.t === 2 && item.s === prev.s) current = {
 			t: 2,
 			s: getAssignmentExpression(current),
 			k: item.k,
 			v: item.v
 		};
-		else if (item.t === 1 && item.s === prev.s) current = {
+		else if (item.t === 1 && prev.t === 1 && item.s === prev.s) current = {
 			t: 1,
 			s: getAssignmentExpression(current),
 			k: void 0,
 			v: item.v
 		};
-		else if (item.t === 3 && item.s === prev.s) current = {
+		else if (item.t === 3 && prev.t === 2 && item.s === prev.s) current = {
 			t: 3,
 			s: getAssignmentExpression(current),
 			k: item.k,
@@ -1801,7 +1815,9 @@ function mergeAssignments(assignments) {
 		else {
 			newAssignments.push(current);
 			current = item;
+			chainLength = 0;
 		}
+		chainLength++;
 		prev = item;
 	}
 	newAssignments.push(current);
@@ -1996,6 +2012,22 @@ function isIndexedValueInStack(ctx, node) {
 	return node.t === 4 && ctx.stack.includes(node.i);
 }
 /**
+* Checks if the node, or any node inside it, is read from more than one
+* place. Such a node must not be created inside a deferred assignment,
+* because the places that read it may run before the assignment does.
+*/
+function hasMarkedNode(ctx, node) {
+	if (Array.isArray(node)) {
+		for (let i = 0, len = node.length; i < len; i++) if (hasMarkedNode(ctx, node[i])) return true;
+		return false;
+	}
+	if (node == null || typeof node !== "object") return false;
+	const current = node;
+	if (current.t !== 4 && typeof current.i === "number" && isSerializerRefMarked(ctx, current.i)) return true;
+	for (const key in current) if (hasMarkedNode(ctx, current[key])) return true;
+	return false;
+}
+/**
 * Produces an assignment expression. `id` generates a reference
 * parameter (through `getRefParam`) and has the option to
 * return the reference parameter directly or assign a value to
@@ -2205,7 +2237,8 @@ function serializeMapEntry(ctx, id, key, val, sentinel) {
 			createSetAssignment(ctx, id, keyRef, getRefParam(ctx, val.i));
 			return "";
 		}
-		if (val.t !== 4 && val.i != null && isSerializerRefMarked(base, val.i)) {
+		if (val.t !== 4 && val.i != null && hasMarkedNode(base, val)) {
+			markSerializerRef(base, val.i);
 			const serialized = "(" + serialize$1(ctx, val) + ",[" + sentinel + "," + sentinel + "])";
 			createSetAssignment(ctx, id, keyRef, getRefParam(ctx, val.i));
 			createDeleteAssignment(ctx, id, sentinel);
@@ -2220,7 +2253,8 @@ function serializeMapEntry(ctx, id, key, val, sentinel) {
 	if (isIndexedValueInStack(base, val)) {
 		const valueRef = getRefParam(ctx, val.i);
 		markSerializerRef(base, id);
-		if (key.t !== 4 && key.i != null && isSerializerRefMarked(base, key.i)) {
+		if (key.t !== 4 && key.i != null && hasMarkedNode(base, key)) {
+			markSerializerRef(base, key.i);
 			const serialized = "(" + serialize$1(ctx, key) + ",[" + sentinel + "," + sentinel + "])";
 			createSetAssignment(ctx, id, getRefParam(ctx, key.i), valueRef);
 			createDeleteAssignment(ctx, id, sentinel);
@@ -2616,13 +2650,14 @@ function parseAggregateError(ctx, depth, id, current) {
 	return createAggregateErrorNode(id, current, options ? parseProperties(ctx, depth, options) : void 0);
 }
 function parseMap(ctx, depth, id, current) {
+	const sentinel = parseMapSentinel(ctx.base);
 	const keyNodes = [];
 	const valueNodes = [];
 	for (const [key, value] of current.entries()) {
 		keyNodes.push(parseSOS(ctx, depth, key));
 		valueNodes.push(parseSOS(ctx, depth, value));
 	}
-	return createMapNode(ctx.base, id, keyNodes, valueNodes);
+	return createMapNode(id, sentinel, keyNodes, valueNodes);
 }
 function parseSet(ctx, depth, id, current) {
 	const items = [];

package/dist/index.cjs

@@ -996,11 +996,18 @@ function parseAsyncIteratorFactory(ctx) {
 function createObjectNode(id, current, empty, record) {
 	return createSerovalNode(empty ? 11 : 10, id, void 0, void 0, void 0, record, void 0, void 0, void 0, void 0, getObjectFlag(current), void 0);
 }
-function createMapNode(ctx, id, k, v) {
+/**
+* Gets the sentinel node for a Map. Call it before parsing the entries, so
+* that an outer Map declares the sentinel before any Map inside it uses it.
+*/
+function parseMapSentinel(ctx) {
+	return parseSpecialReference(ctx, 0);
+}
+function createMapNode(id, sentinel, k, v) {
 	return createSerovalNode(8, id, void 0, void 0, void 0, void 0, {
 		k,
 		v
-	}, void 0, parseSpecialReference(ctx, 0), void 0, void 0, void 0);
+	}, void 0, sentinel, void 0, void 0, void 0);
 }
 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);
@@ -1103,13 +1110,14 @@ async function parseAggregateError$1(ctx, depth, id, current) {
 	return createAggregateErrorNode(id, current, options ? await parseProperties$1(ctx, depth, options) : void 0);
 }
 async function parseMap$1(ctx, depth, id, current) {
+	const sentinel = parseMapSentinel(ctx.base);
 	const keyNodes = [];
 	const valueNodes = [];
 	for (const [key, value] of current.entries()) {
 		keyNodes.push(await parseAsync(ctx, depth, key));
 		valueNodes.push(await parseAsync(ctx, depth, value));
 	}
-	return createMapNode(ctx.base, id, keyNodes, valueNodes);
+	return createMapNode(id, sentinel, keyNodes, valueNodes);
 }
 async function parseSet$1(ctx, depth, id, current) {
 	const items = [];
@@ -1763,30 +1771,36 @@ function getAssignmentExpression(assignment) {
 		case 4: return "Object.defineProperty(" + assignment.s + ",\"__proto__\",{value:" + assignment.k + ",configurable:!0,enumerable:!0,writable:!0})";
 	}
 }
+const MAX_ASSIGNMENT_CHAIN_LENGTH = 100;
 function mergeAssignments(assignments) {
 	const newAssignments = [];
 	let current = assignments[0];
+	let chainLength = 1;
 	for (let i = 1, len = assignments.length, item, prev = current; i < len; i++) {
 		item = assignments[i];
-		if (item.t === 0 && item.v === prev.v) current = {
+		if (chainLength === MAX_ASSIGNMENT_CHAIN_LENGTH) {
+			newAssignments.push(current);
+			current = item;
+			chainLength = 0;
+		} else if (item.t === 0 && prev.t === 0 && item.v === prev.v) current = {
 			t: 0,
 			s: item.s,
 			k: void 0,
 			v: getAssignmentExpression(current)
 		};
-		else if (item.t === 2 && item.s === prev.s) current = {
+		else if (item.t === 2 && prev.t === 2 && item.s === prev.s) current = {
 			t: 2,
 			s: getAssignmentExpression(current),
 			k: item.k,
 			v: item.v
 		};
-		else if (item.t === 1 && item.s === prev.s) current = {
+		else if (item.t === 1 && prev.t === 1 && item.s === prev.s) current = {
 			t: 1,
 			s: getAssignmentExpression(current),
 			k: void 0,
 			v: item.v
 		};
-		else if (item.t === 3 && item.s === prev.s) current = {
+		else if (item.t === 3 && prev.t === 2 && item.s === prev.s) current = {
 			t: 3,
 			s: getAssignmentExpression(current),
 			k: item.k,
@@ -1795,7 +1809,9 @@ function mergeAssignments(assignments) {
 		else {
 			newAssignments.push(current);
 			current = item;
+			chainLength = 0;
 		}
+		chainLength++;
 		prev = item;
 	}
 	newAssignments.push(current);
@@ -1990,6 +2006,22 @@ function isIndexedValueInStack(ctx, node) {
 	return node.t === 4 && ctx.stack.includes(node.i);
 }
 /**
+* Checks if the node, or any node inside it, is read from more than one
+* place. Such a node must not be created inside a deferred assignment,
+* because the places that read it may run before the assignment does.
+*/
+function hasMarkedNode(ctx, node) {
+	if (Array.isArray(node)) {
+		for (let i = 0, len = node.length; i < len; i++) if (hasMarkedNode(ctx, node[i])) return true;
+		return false;
+	}
+	if (node == null || typeof node !== "object") return false;
+	const current = node;
+	if (current.t !== 4 && typeof current.i === "number" && isSerializerRefMarked(ctx, current.i)) return true;
+	for (const key in current) if (hasMarkedNode(ctx, current[key])) return true;
+	return false;
+}
+/**
 * Produces an assignment expression. `id` generates a reference
 * parameter (through `getRefParam`) and has the option to
 * return the reference parameter directly or assign a value to
@@ -2199,7 +2231,8 @@ function serializeMapEntry(ctx, id, key, val, sentinel) {
 			createSetAssignment(ctx, id, keyRef, getRefParam(ctx, val.i));
 			return "";
 		}
-		if (val.t !== 4 && val.i != null && isSerializerRefMarked(base, val.i)) {
+		if (val.t !== 4 && val.i != null && hasMarkedNode(base, val)) {
+			markSerializerRef(base, val.i);
 			const serialized = "(" + serialize$1(ctx, val) + ",[" + sentinel + "," + sentinel + "])";
 			createSetAssignment(ctx, id, keyRef, getRefParam(ctx, val.i));
 			createDeleteAssignment(ctx, id, sentinel);
@@ -2214,7 +2247,8 @@ function serializeMapEntry(ctx, id, key, val, sentinel) {
 	if (isIndexedValueInStack(base, val)) {
 		const valueRef = getRefParam(ctx, val.i);
 		markSerializerRef(base, id);
-		if (key.t !== 4 && key.i != null && isSerializerRefMarked(base, key.i)) {
+		if (key.t !== 4 && key.i != null && hasMarkedNode(base, key)) {
+			markSerializerRef(base, key.i);
 			const serialized = "(" + serialize$1(ctx, key) + ",[" + sentinel + "," + sentinel + "])";
 			createSetAssignment(ctx, id, getRefParam(ctx, key.i), valueRef);
 			createDeleteAssignment(ctx, id, sentinel);
@@ -2610,13 +2644,14 @@ function parseAggregateError(ctx, depth, id, current) {
 	return createAggregateErrorNode(id, current, options ? parseProperties(ctx, depth, options) : void 0);
 }
 function parseMap(ctx, depth, id, current) {
+	const sentinel = parseMapSentinel(ctx.base);
 	const keyNodes = [];
 	const valueNodes = [];
 	for (const [key, value] of current.entries()) {
 		keyNodes.push(parseSOS(ctx, depth, key));
 		valueNodes.push(parseSOS(ctx, depth, value));
 	}
-	return createMapNode(ctx.base, id, keyNodes, valueNodes);
+	return createMapNode(id, sentinel, keyNodes, valueNodes);
 }
 function parseSet(ctx, depth, id, current) {
 	const items = [];

package/dist/index.js

@@ -995,11 +995,18 @@ function parseAsyncIteratorFactory(ctx) {
 function createObjectNode(id, current, empty, record) {
 	return createSerovalNode(empty ? 11 : 10, id, void 0, void 0, void 0, record, void 0, void 0, void 0, void 0, getObjectFlag(current), void 0);
 }
-function createMapNode(ctx, id, k, v) {
+/**
+* Gets the sentinel node for a Map. Call it before parsing the entries, so
+* that an outer Map declares the sentinel before any Map inside it uses it.
+*/
+function parseMapSentinel(ctx) {
+	return parseSpecialReference(ctx, 0);
+}
+function createMapNode(id, sentinel, k, v) {
 	return createSerovalNode(8, id, void 0, void 0, void 0, void 0, {
 		k,
 		v
-	}, void 0, parseSpecialReference(ctx, 0), void 0, void 0, void 0);
+	}, void 0, sentinel, void 0, void 0, void 0);
 }
 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);
@@ -1102,13 +1109,14 @@ async function parseAggregateError$1(ctx, depth, id, current) {
 	return createAggregateErrorNode(id, current, options ? await parseProperties$1(ctx, depth, options) : void 0);
 }
 async function parseMap$1(ctx, depth, id, current) {
+	const sentinel = parseMapSentinel(ctx.base);
 	const keyNodes = [];
 	const valueNodes = [];
 	for (const [key, value] of current.entries()) {
 		keyNodes.push(await parseAsync(ctx, depth, key));
 		valueNodes.push(await parseAsync(ctx, depth, value));
 	}
-	return createMapNode(ctx.base, id, keyNodes, valueNodes);
+	return createMapNode(id, sentinel, keyNodes, valueNodes);
 }
 async function parseSet$1(ctx, depth, id, current) {
 	const items = [];
@@ -1762,30 +1770,36 @@ function getAssignmentExpression(assignment) {
 		case 4: return "Object.defineProperty(" + assignment.s + ",\"__proto__\",{value:" + assignment.k + ",configurable:!0,enumerable:!0,writable:!0})";
 	}
 }
+const MAX_ASSIGNMENT_CHAIN_LENGTH = 100;
 function mergeAssignments(assignments) {
 	const newAssignments = [];
 	let current = assignments[0];
+	let chainLength = 1;
 	for (let i = 1, len = assignments.length, item, prev = current; i < len; i++) {
 		item = assignments[i];
-		if (item.t === 0 && item.v === prev.v) current = {
+		if (chainLength === MAX_ASSIGNMENT_CHAIN_LENGTH) {
+			newAssignments.push(current);
+			current = item;
+			chainLength = 0;
+		} else if (item.t === 0 && prev.t === 0 && item.v === prev.v) current = {
 			t: 0,
 			s: item.s,
 			k: void 0,
 			v: getAssignmentExpression(current)
 		};
-		else if (item.t === 2 && item.s === prev.s) current = {
+		else if (item.t === 2 && prev.t === 2 && item.s === prev.s) current = {
 			t: 2,
 			s: getAssignmentExpression(current),
 			k: item.k,
 			v: item.v
 		};
-		else if (item.t === 1 && item.s === prev.s) current = {
+		else if (item.t === 1 && prev.t === 1 && item.s === prev.s) current = {
 			t: 1,
 			s: getAssignmentExpression(current),
 			k: void 0,
 			v: item.v
 		};
-		else if (item.t === 3 && item.s === prev.s) current = {
+		else if (item.t === 3 && prev.t === 2 && item.s === prev.s) current = {
 			t: 3,
 			s: getAssignmentExpression(current),
 			k: item.k,
@@ -1794,7 +1808,9 @@ function mergeAssignments(assignments) {
 		else {
 			newAssignments.push(current);
 			current = item;
+			chainLength = 0;
 		}
+		chainLength++;
 		prev = item;
 	}
 	newAssignments.push(current);
@@ -1989,6 +2005,22 @@ function isIndexedValueInStack(ctx, node) {
 	return node.t === 4 && ctx.stack.includes(node.i);
 }
 /**
+* Checks if the node, or any node inside it, is read from more than one
+* place. Such a node must not be created inside a deferred assignment,
+* because the places that read it may run before the assignment does.
+*/
+function hasMarkedNode(ctx, node) {
+	if (Array.isArray(node)) {
+		for (let i = 0, len = node.length; i < len; i++) if (hasMarkedNode(ctx, node[i])) return true;
+		return false;
+	}
+	if (node == null || typeof node !== "object") return false;
+	const current = node;
+	if (current.t !== 4 && typeof current.i === "number" && isSerializerRefMarked(ctx, current.i)) return true;
+	for (const key in current) if (hasMarkedNode(ctx, current[key])) return true;
+	return false;
+}
+/**
 * Produces an assignment expression. `id` generates a reference
 * parameter (through `getRefParam`) and has the option to
 * return the reference parameter directly or assign a value to
@@ -2198,7 +2230,8 @@ function serializeMapEntry(ctx, id, key, val, sentinel) {
 			createSetAssignment(ctx, id, keyRef, getRefParam(ctx, val.i));
 			return "";
 		}
-		if (val.t !== 4 && val.i != null && isSerializerRefMarked(base, val.i)) {
+		if (val.t !== 4 && val.i != null && hasMarkedNode(base, val)) {
+			markSerializerRef(base, val.i);
 			const serialized = "(" + serialize$1(ctx, val) + ",[" + sentinel + "," + sentinel + "])";
 			createSetAssignment(ctx, id, keyRef, getRefParam(ctx, val.i));
 			createDeleteAssignment(ctx, id, sentinel);
@@ -2213,7 +2246,8 @@ function serializeMapEntry(ctx, id, key, val, sentinel) {
 	if (isIndexedValueInStack(base, val)) {
 		const valueRef = getRefParam(ctx, val.i);
 		markSerializerRef(base, id);
-		if (key.t !== 4 && key.i != null && isSerializerRefMarked(base, key.i)) {
+		if (key.t !== 4 && key.i != null && hasMarkedNode(base, key)) {
+			markSerializerRef(base, key.i);
 			const serialized = "(" + serialize$1(ctx, key) + ",[" + sentinel + "," + sentinel + "])";
 			createSetAssignment(ctx, id, getRefParam(ctx, key.i), valueRef);
 			createDeleteAssignment(ctx, id, sentinel);
@@ -2609,13 +2643,14 @@ function parseAggregateError(ctx, depth, id, current) {
 	return createAggregateErrorNode(id, current, options ? parseProperties(ctx, depth, options) : void 0);
 }
 function parseMap(ctx, depth, id, current) {
+	const sentinel = parseMapSentinel(ctx.base);
 	const keyNodes = [];
 	const valueNodes = [];
 	for (const [key, value] of current.entries()) {
 		keyNodes.push(parseSOS(ctx, depth, key));
 		valueNodes.push(parseSOS(ctx, depth, value));
 	}
-	return createMapNode(ctx.base, id, keyNodes, valueNodes);
+	return createMapNode(id, sentinel, keyNodes, valueNodes);
 }
 function parseSet(ctx, depth, id, current) {
 	const items = [];

package/package.json

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