msgpackr 1.7.0-alpha3 → 1.7.0-alpha6

package/dist/test.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;
@@ -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) {
@@ -167,7 +169,7 @@
 			return this.unpack(source, end)
 		}
 	}
-	function checkedRead() {
+	function checkedRead(options) {
 		try {
 			if (!currentUnpackr.trusted && !sequentialMode) {
 				let sharedLength = currentStructures.sharedLength || 0;
@@ -177,6 +179,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();
@@ -1045,7 +1049,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 +1182,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 +1201,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 +1726,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 +1959,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 +1999,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;
@@ -2123,7 +2134,7 @@
 						refPosition += encodeUtf8(target, value, refPosition);
 						isNotAscii = refPosition - strStart > strLength;
 					}
-					if (refOffset < 0x100) {
+					if (refOffset < 0xf6) {
 						if (isNotAscii)
 							transition = nextTransition.string8 || createTypeTransition(nextTransition, UTF8, 1);
 						else
@@ -2231,7 +2242,7 @@
 					targetView.setUint32(position, refOffset, true);
 					position += 4;
 				}
-			} else {
+			} else { // null or undefined
 				transition = nextTransition.object16 || createTypeTransition(nextTransition, OBJECT_DATA, 2);
 				targetView.setInt16(position, value === null ? -10 : -9, true);
 				position += 2;
@@ -2339,6 +2350,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 +2379,7 @@
 		}
 		typed.transitions = transitions;
 		this.typedStructs = typed;
+		this.lastTypedStructuresLength = typed.length;
 		return named;
 	}
 	var sourceSymbol = Symbol('source');
@@ -2397,15 +2411,16 @@
 		}
 		var construct = structure.construct;
 		if (!construct) {
-			construct = structure.construct = function() {
+			construct = structure.construct = function LazyObject() {
 			};
 			var prototype = construct.prototype;
+			let properties = [];
 			Object.defineProperty(prototype, 'toJSON', {
-				get() {
+				value() {
 					// return an enumerable object with own properties to JSON stringify
 					let resolved = {};
-					for (let i = 0, l = structure.length; i < l; i++) {
-						let key = structure[i];
+					for (let i = 0, l = properties.length; i < l; i++) {
+						let key = properties[i].key;
 						resolved[key] = this[key];
 					}
 					return resolved;
@@ -2414,7 +2429,6 @@
 			});
 			let currentOffset = 0;
 			let lastRefProperty;
-			let properties = [];
 			for (let i = 0, l = structure.length; i < l; i++) {
 				let definition = structure[i];
 				let [ type, size, key, enumerationOffset ] = definition;
@@ -2479,7 +2493,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 +2509,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 +2544,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 {
@@ -2607,28 +2621,32 @@
 		throw new Error('Unknown constant');
 	}
 	function prepareStructures$1(structures, packr) {
-		if (!packr.typedStructs)
-			return structures;
-		let structMap = new Map();
-		structMap.set('named', structures);
-		structMap.set('typed', packr.typedStructs);
+		if (packr.typedStructs) {
+			let structMap = new Map();
+			structMap.set('named', structures);
+			structMap.set('typed', packr.typedStructs);
+			structures = structMap;
+		}
 		let lastTypedStructuresLength = packr.lastTypedStructuresLength || 0;
-		structMap.isCompatible = existing => {
+		structures.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;
+		return structures;
 	}
 
 	setReadStruct(readStruct$1, onLoadedStructures$1);
@@ -2800,7 +2818,7 @@
 				} });
 				for (let i = 0; i < 20; i++) {
 					var serialized = packr.pack(data);
-					var deserialized = packr.unpack(serialized);
+					var deserialized = packr.unpack(serialized, { lazy: true });
 					var copied = {};
 					for (let key in deserialized) {
 						copied[key] = deserialized[key];