msgpackr 1.7.0-alpha3 → 1.7.0-alpha4

package/dist/test.js

@@ -141,6 +141,8 @@
 			if (onLoadedStructures)
 				loadedStructures = onLoadedStructures.call(this, loadedStructures);
 			loadedStructures = loadedStructures || [];
+			if (Object.isFrozen(loadedStructures))
+				loadedStructures = loadedStructures.map(structure => structure.slice(0));
 			for (let i = 0, l = loadedStructures.length; i < l; i++) {
 				let structure = loadedStructures[i];
 				if (structure) {
@@ -1045,7 +1047,7 @@
 	let position$1 = 0;
 	let safeEnd;
 	let bundledStrings$1 = null;
-	let writeStructSlots, prepareStructures;
+	let writeStructSlots;
 	const MAX_BUNDLE_SIZE = 0xf000;
 	const hasNonLatin = /[\u0080-\uFFFF]/;
 	const RECORD_SYMBOL = Symbol('record-id');
@@ -1178,7 +1180,7 @@
 					if (structures) {
 						if (serializationsSinceTransitionRebuild < 10)
 							serializationsSinceTransitionRebuild++;
-						let sharedLength = structures.sharedLength || maxSharedStructures;
+						let sharedLength = structures.sharedLength || 0;
 						if (structures.length > sharedLength)
 							structures.length = sharedLength;
 						if (transitionsCount > 10000) {
@@ -1197,10 +1199,9 @@
 						if (hasSharedUpdate && packr.saveStructures) {
 							// we can't rely on start/end with REUSE_BUFFER_MODE since they will (probably) change when we save
 							let returnBuffer = target.subarray(start, position$1);
-							let newSharedData = prepareStructures ? prepareStructures(structures, packr) : structures;
-							if (packr.saveStructures(newSharedData, newSharedData.isCompatible || packr.lastNamedStructuresLength || 0) === false) {
+							let newSharedData = prepareStructures(structures, packr);
+							if (packr.saveStructures(newSharedData, newSharedData.isCompatible) === false) {
 								// get updated structures and try again if the update failed
-								packr._mergeStructures(packr.getStructures());
 								return packr.pack(value)
 							}
 							packr.lastNamedStructuresLength = sharedLength;
@@ -1723,7 +1724,7 @@
 			const writeStruct = (object, safePrototype) => {
 				let newPosition = writeStructSlots(object, target, position$1, structures, makeRoom, (value, newPosition, notifySharedUpdate) => {
 					if (notifySharedUpdate)
-						hasSharedUpdate = true;
+						return hasSharedUpdate = true;
 					position$1 = newPosition;
 					if (start > 0) {
 						pack(value);
@@ -1956,6 +1957,15 @@
 			pack(writeStrings[1]);
 		}
 	}
+	function prepareStructures(structures, packr) {
+		structures.isCompatible = (existingStructures) => {
+			let compatible = !existingStructures || ((packr.lastNamedStructuresLength || 0) === existingStructures.length);
+			if (!compatible) // we want to merge these existing structures immediately since we already have it and we are in the right transaction
+				packr._mergeStructures(existingStructures);
+			return compatible;
+		};
+		return structures
+	}
 	function setWriteStructSlots(writeSlots, makeStructures) {
 		writeStructSlots = writeSlots;
 		prepareStructures = makeStructures;
@@ -1987,7 +1997,6 @@
 	function writeStruct(object, target, position, structures, makeRoom, pack, packr) {
 		let typedStructs = packr.typedStructs || (packr.typedStructs = []);
 		// note that we rely on pack.js to load stored structures before we get to this point
-		packr.lastTypedStructuresLength = typedStructs.length;
 		let targetView = target.dataView;
 		let refsStartPosition = (typedStructs.lastStringStart || 100) + position;
 		let safeEnd = target.length - 10;
@@ -2339,6 +2348,8 @@
 		if (!(sharedData instanceof Map))
 			return sharedData;
 		let typed = sharedData.get('typed') || [];
+		if (Object.isFrozen(typed))
+			typed = typed.map(structure => structure.slice(0));
 		let named = sharedData.get('named');
 		let transitions = Object.create(null);
 		for (let i = 0, l = typed.length; i < l; i++) {
@@ -2366,6 +2377,7 @@
 		}
 		typed.transitions = transitions;
 		this.typedStructs = typed;
+		this.lastTypedStructuresLength = typed.length;
 		return named;
 	}
 	var sourceSymbol = Symbol('source');
@@ -2397,7 +2409,7 @@
 		}
 		var construct = structure.construct;
 		if (!construct) {
-			construct = structure.construct = function() {
+			construct = structure.construct = function LazyObject() {
 			};
 			var prototype = construct.prototype;
 			Object.defineProperty(prototype, 'toJSON', {
@@ -2479,7 +2491,7 @@
 								next = next.next;
 							}
 							if (end == null)
-								end = srcEnd - refStart;
+								end = source.srcEnd - refStart;
 							if (source.srcString) {
 								return source.srcString.slice(ref, end);
 							}
@@ -2495,7 +2507,7 @@
 										asciiEnd = null;
 								} while((next = next.next));
 								if (asciiEnd == null)
-									asciiEnd = srcEnd - refStart
+									asciiEnd = source.srcEnd - refStart
 								source.srcString = src.toString('latin1', refStart, refStart + asciiEnd);
 								return source.srcString.slice(ref, end);
 							}
@@ -2530,7 +2542,7 @@
 								next = next.next;
 							}
 							if (end == null)
-								end = srcEnd - refStart;
+								end = source.srcEnd - refStart;
 							if (type === UTF8) {
 								return src.toString('utf8', ref + refStart, end + refStart);
 							} else {
@@ -2614,18 +2626,21 @@
 		structMap.set('typed', packr.typedStructs);
 		let lastTypedStructuresLength = packr.lastTypedStructuresLength || 0;
 		structMap.isCompatible = existing => {
+			let compatible = true;
 			if (existing instanceof Map) {
 				let named = existing.get('named') || [];
 				if (named.length !== (packr.lastNamedStructuresLength || 0))
-					return false;
+					compatible = false;
 				let typed = existing.get('typed') || [];
 				if (typed.length !== lastTypedStructuresLength)
-					return false;
+					compatible = false;
 			} else if (existing instanceof Array) {
 				if (existing.length !== (packr.lastNamedStructuresLength || 0))
-					return false;
+					compatible = false;
 			}
-			return true;
+			if (!compatible)
+				packr._mergeStructures(existing);
+			return compatible;
 		};
 		packr.lastTypedStructuresLength = packr.typedStructs?.length;
 		return structMap;