msgpackr 1.7.0-alpha7 → 1.7.0

package/README.md

@@ -40,7 +40,7 @@ stream.write(myData);
 ```
 Or for a full example of sending and receiving data on a stream:
 ```js
-import { PackrStream } from 'msgpackr';
+import { PackrStream, UnpackrStream } from 'msgpackr';
 let sendingStream = new PackrStream();
 let receivingStream = new UnpackrStream();
 // we are just piping to our own stream, but normally you would send and

package/dist/index.js

@@ -177,6 +177,7 @@
 			let result;
 			if (currentUnpackr.randomAccessStructure && src[position] < 0x40 && src[position] >= 0x20 && readStruct) {
 				result = readStruct(src, position, srcEnd, currentUnpackr);
+				src = null; // dispose of this so that recursive unpack calls don't save state
 				if (!(options && options.lazy) && result)
 					result = result.toJSON();
 				position = srcEnd;
@@ -187,7 +188,7 @@
 
 			if (position == srcEnd) {
 				// finished reading this source, cleanup references
-				if (currentStructures.restoreStructures)
+				if (currentStructures?.restoreStructures)
 					restoreStructures();
 				currentStructures = null;
 				src = null;
@@ -242,7 +243,10 @@
 				if (currentUnpackr.mapsAsObjects) {
 					let object = {};
 					for (let i = 0; i < token; i++) {
-						object[readKey()] = read();
+						let key = readKey();
+						if (key === '__proto__')
+							key = '__proto_';
+						object[key] = read();
 					}
 					return object
 				} else {
@@ -471,7 +475,7 @@
 			// This initial function is quick to instantiate, but runs slower. After several iterations pay the cost to build the faster function
 			if (readObject.count++ > inlineObjectReadThreshold) {
 				let readObject = structure.read = (new Function('r', 'return function(){return ' + (currentUnpackr.freezeData ? 'Object.freeze' : '') +
-					'({' + structure.map(key => validName.test(key) ? key + ':r()' : ('[' + JSON.stringify(key) + ']:r()')).join(',') + '})}'))(read);
+					'({' + structure.map(key => key === '__proto__' ? '__proto_:r()' : validName.test(key) ? key + ':r()' : ('[' + JSON.stringify(key) + ']:r()')).join(',') + '})}'))(read);
 				if (structure.highByte === 0)
 					structure.read = createSecondByteReader(firstId, structure.read);
 				return readObject() // second byte is already read, if there is one so immediately read object
@@ -479,6 +483,8 @@
 			let object = {};
 			for (let i = 0, l = structure.length; i < l; i++) {
 				let key = structure[i];
+				if (key === '__proto__')
+					key = '__proto_';
 				object[key] = read();
 			}
 			if (currentUnpackr.freezeData)
@@ -590,7 +596,10 @@
 		if (currentUnpackr.mapsAsObjects) {
 			let object = {};
 			for (let i = 0; i < length; i++) {
-				object[readKey()] = read();
+				let key = readKey();
+				if (key === '__proto__')
+					key = '__proto_';
+				object[key] = read();
 			}
 			return object
 		} else {
@@ -875,7 +884,16 @@
 
 	// the registration of the record definition extension (as "r")
 	const recordDefinition = (id, highByte) => {
-		var structure = read();
+		let structure;
+		if (currentUnpackr.freezeData) {
+			currentUnpackr.freezeData = false;
+			try {
+				structure = read();
+			} finally {
+				currentUnpackr.freezeData = true;
+			}
+		} else
+			structure = read();
 		let firstByte = id;
 		if (highByte !== undefined) {
 			id = id < 32 ? -((highByte << 5) + id) : ((highByte << 5) + id);