msgpackr 1.7.0-alpha4 → 1.7.0-alpha5

package/dist/node.cjs

@@ -100,7 +100,7 @@ class Unpackr {
 			currentUnpackr = this;
 			if (this.structures) {
 				currentStructures = this.structures;
-				return checkedRead()
+				return checkedRead(options)
 			} else if (!currentStructures || currentStructures.length > 0) {
 				currentStructures = [];
 			}
@@ -109,7 +109,7 @@ class Unpackr {
 			if (!currentStructures || currentStructures.length > 0)
 				currentStructures = [];
 		}
-		return checkedRead()
+		return checkedRead(options)
 	}
 	unpackMultiple(source, forEach) {
 		let values, lastPosition = 0;
@@ -175,7 +175,7 @@ class Unpackr {
 		return this.unpack(source, end)
 	}
 }
-function checkedRead() {
+function checkedRead(options) {
 	try {
 		if (!currentUnpackr.trusted && !sequentialMode) {
 			let sharedLength = currentStructures.sharedLength || 0;
@@ -185,6 +185,8 @@ function checkedRead() {
 		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();
@@ -2502,12 +2504,13 @@ function readStruct$1(src, position, srcEnd, unpackr) {
 		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;
@@ -2516,7 +2519,6 @@ function readStruct$1(src, position, srcEnd, unpackr) {
 		});
 		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;
@@ -2709,13 +2711,14 @@ function toConstant(code) {
 	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') || [];
@@ -2733,7 +2736,7 @@ function prepareStructures$1(structures, packr) {
 		return compatible;
 	};
 	packr.lastTypedStructuresLength = packr.typedStructs?.length;
-	return structMap;
+	return structures;
 }
 
 setReadStruct(readStruct$1, onLoadedStructures$1);