msgpackr 1.7.0-alpha3 → 1.7.0-alpha6

package/dist/index.js

@@ -94,7 +94,7 @@
 				currentUnpackr = this;
 				if (this.structures) {
 					currentStructures = this.structures;
-					return checkedRead()
+					return checkedRead(options)
 				} else if (!currentStructures || currentStructures.length > 0) {
 					currentStructures = [];
 				}
@@ -103,7 +103,7 @@
 				if (!currentStructures || currentStructures.length > 0)
 					currentStructures = [];
 			}
-			return checkedRead()
+			return checkedRead(options)
 		}
 		unpackMultiple(source, forEach) {
 			let values, lastPosition = 0;
@@ -139,6 +139,8 @@
 		}
 		_mergeStructures(loadedStructures, existingStructures) {
 			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) {
@@ -165,7 +167,7 @@
 			return this.unpack(source, end)
 		}
 	}
-	function checkedRead() {
+	function checkedRead(options) {
 		try {
 			if (!currentUnpackr.trusted && !sequentialMode) {
 				let sharedLength = currentStructures.sharedLength || 0;
@@ -175,6 +177,8 @@
 			let result;
 			if (currentUnpackr.randomAccessStructure && src[position] < 0x40 && src[position] >= 0x20 && readStruct) {
 				result = readStruct(src, position, srcEnd, currentUnpackr);
+				if (!(options && options.lazy) && result)
+					result = result.toJSON();
 				position = srcEnd;
 			} else
 				result = read();
@@ -1187,7 +1191,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) {
@@ -1206,10 +1210,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 =  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;
@@ -1966,6 +1969,15 @@
 		}
 		addExtension(extension);
 	}
+	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
+	}
 
 	let defaultPackr = new Packr({ useRecords: false });
 	const pack = defaultPackr.pack;