msgpackr 1.7.0-alpha4 → 1.7.0-alpha5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "msgpackr",
   "author": "Kris Zyp",
-  "version": "1.7.0-alpha4",
+  "version": "1.7.0-alpha5",
   "description": "Ultra-fast MessagePack implementation with extensions for records and structured cloning",
   "license": "MIT",
   "types": "./index.d.ts",

package/struct.js

@@ -478,12 +478,13 @@ function readStruct(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;
@@ -492,7 +493,6 @@ function readStruct(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;
@@ -685,13 +685,14 @@ function toConstant(code) {
 	throw new Error('Unknown constant');
 }
 function prepareStructures(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') || [];
@@ -709,7 +710,7 @@ function prepareStructures(structures, packr) {
 		return compatible;
 	};
 	packr.lastTypedStructuresLength = packr.typedStructs?.length;
-	return structMap;
+	return structures;
 }
 
 setReadStruct(readStruct, onLoadedStructures);

package/unpack.js

@@ -95,7 +95,7 @@ export class Unpackr {
 			currentUnpackr = this
 			if (this.structures) {
 				currentStructures = this.structures
-				return checkedRead()
+				return checkedRead(options)
 			} else if (!currentStructures || currentStructures.length > 0) {
 				currentStructures = []
 			}
@@ -104,7 +104,7 @@ export class Unpackr {
 			if (!currentStructures || currentStructures.length > 0)
 				currentStructures = []
 		}
-		return checkedRead()
+		return checkedRead(options)
 	}
 	unpackMultiple(source, forEach) {
 		let values, lastPosition = 0
@@ -173,7 +173,7 @@ export class Unpackr {
 export function getPosition() {
 	return position
 }
-export function checkedRead() {
+export function checkedRead(options) {
 	try {
 		if (!currentUnpackr.trusted && !sequentialMode) {
 			let sharedLength = currentStructures.sharedLength || 0
@@ -183,6 +183,8 @@ export 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()