msgpackr 1.7.0-alpha4 → 1.7.0-alpha5

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;
@@ -169,7 +169,7 @@
 			return this.unpack(source, end)
 		}
 	}
-	function checkedRead() {
+	function checkedRead(options) {
 		try {
 			if (!currentUnpackr.trusted && !sequentialMode) {
 				let sharedLength = currentStructures.sharedLength || 0;
@@ -179,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();
@@ -2412,12 +2414,13 @@
 			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;
@@ -2426,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;
@@ -2619,13 +2621,14 @@
 		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') || [];
@@ -2643,7 +2646,7 @@
 			return compatible;
 		};
 		packr.lastTypedStructuresLength = packr.typedStructs?.length;
-		return structMap;
+		return structures;
 	}
 
 	setReadStruct(readStruct$1, onLoadedStructures$1);
@@ -2815,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];