msgpackr 1.7.0-beta1 → 1.7.1

package/dist/node.cjs

@@ -185,6 +185,7 @@ function checkedRead(options) {
 		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;
@@ -195,7 +196,7 @@ function checkedRead(options) {
 
 		if (position == srcEnd) {
 			// finished reading this source, cleanup references
-			if (currentStructures.restoreStructures)
+			if (currentStructures && currentStructures.restoreStructures)
 				restoreStructures();
 			currentStructures = null;
 			src = null;
@@ -210,7 +211,7 @@ function checkedRead(options) {
 		// else more to read, but we are reading sequentially, so don't clear source yet
 		return result
 	} catch(error) {
-		if (currentStructures?.restoreStructures)
+		if (currentStructures && currentStructures.restoreStructures)
 			restoreStructures();
 		clearSource();
 		if (error instanceof RangeError || error.message.startsWith('Unexpected end of buffer') || position > srcEnd) {
@@ -250,7 +251,10 @@ function read() {
 			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 {
@@ -479,7 +483,7 @@ function createStructureReader(structure, firstId) {
 		// 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
@@ -487,6 +491,8 @@ function createStructureReader(structure, firstId) {
 		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)
@@ -647,7 +653,10 @@ function readMap(length) {
 	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 {
@@ -1245,12 +1254,11 @@ class Packr extends Unpackr {
 					writeStruct(value);
 				else
 					pack(value);
-				if (bundledStrings$1) {
-					writeBundles(start, pack);
-				}
-				packr.offset = position$1; // update the offset so next serialization doesn't write over our buffer, but can continue writing to same buffer sequentially
 				if (referenceMap && referenceMap.idsToInsert) {
-					position$1 += referenceMap.idsToInsert.length * 6;
+					let incrementPosition = referenceMap.idsToInsert.length * 6;
+					if (bundledStrings$1)
+						writeBundles(start, pack, incrementPosition);
+					position$1 += incrementPosition;
 					if (position$1 > safeEnd)
 						makeRoom(position$1);
 					packr.offset = position$1;
@@ -1258,6 +1266,9 @@ class Packr extends Unpackr {
 					referenceMap = null;
 					return serialized
 				}
+				if (bundledStrings$1)
+					writeBundles(start, pack, 0);
+				packr.offset = position$1; // update the offset so next serialization doesn't write over our buffer, but can continue writing to same buffer sequentially
 				if (encodeOptions & REUSE_BUFFER_MODE) {
 					target.start = start;
 					target.end = position$1;
@@ -2036,9 +2047,9 @@ function insertIds(serialized, idsToInsert) {
 	return serialized
 }
 
-function writeBundles(start, pack) {
+function writeBundles(start, pack, incrementPosition) {
 	if (bundledStrings$1.length > 0) {
-		targetView.setUint32(bundledStrings$1.position + start, position$1 - bundledStrings$1.position - start);
+		targetView.setUint32(bundledStrings$1.position + start, position$1 + incrementPosition - bundledStrings$1.position - start);
 		let writeStrings = bundledStrings$1;
 		bundledStrings$1 = null;
 		pack(writeStrings[0]);
@@ -2087,6 +2098,14 @@ const DATE = 16;
 const TYPE_NAMES = ['num', 'object', 'string', 'ascii'];
 TYPE_NAMES[DATE] = 'date';
 const float32Headers = [false, true, true, false, false, true, true, false];
+let evalSupported;
+try {
+	new Function('');
+	evalSupported = true;
+} catch(error) {
+	// if eval variants are not supported, do not create inline object readers ever
+}
+
 let updatedPosition;
 const hasNodeBuffer$1 = typeof Buffer !== 'undefined';
 let textEncoder$1, currentSource;
@@ -2523,7 +2542,7 @@ function readStruct$1(src, position, srcEnd, unpackr) {
 			case 27: recordId = src[position++] + (src[position++] << 8) + (src[position++] << 16) + (src[position++] << 24); break;
 		}
 	}
-	let structure = unpackr.typedStructs?.[recordId];
+	let structure = unpackr.typedStructs && unpackr.typedStructs[recordId];
 	if (!structure) {
 		// copy src buffer because getStructures will override it
 		src = Uint8Array.prototype.slice.call(src, position, srcEnd);
@@ -2543,23 +2562,13 @@ function readStruct$1(src, position, srcEnd, unpackr) {
 		};
 		var prototype = construct.prototype;
 		let properties = [];
-		Object.defineProperty(prototype, 'toJSON', {
-			value() {
-				// return an enumerable object with own properties to JSON stringify
-				let resolved = {};
-				for (let i = 0, l = properties.length; i < l; i++) {
-					let key = properties[i].key;
-					resolved[key] = this[key];
-				}
-				return resolved;
-			},
-			// not enumerable or anything 
-		});
 		let currentOffset = 0;
 		let lastRefProperty;
 		for (let i = 0, l = structure.length; i < l; i++) {
 			let definition = structure[i];
 			let [ type, size, key, enumerationOffset ] = definition;
+			if (key === '__proto__')
+				key = '__proto_';
 			let property = {
 				key,
 				offset: currentOffset,
@@ -2603,8 +2612,7 @@ function readStruct$1(src, position, srcEnd, unpackr) {
 						lastRefProperty.next = property;
 					lastRefProperty = property;
 					property.multiGetCount = 0;
-					get = function() {
-						let source = this[sourceSymbol];
+					get = function(source) {
 						let src = source.bytes;
 						let position = source.position;
 						let refStart = currentOffset + position;
@@ -2655,8 +2663,7 @@ function readStruct$1(src, position, srcEnd, unpackr) {
 					if (lastRefProperty && !lastRefProperty.next)
 						lastRefProperty.next = property;
 					lastRefProperty = property;
-					get = function() {
-						let source = this[sourceSymbol];
+					get = function(source) {
 						let position = source.position;
 						let refStart = currentOffset + position;
 						let ref = getRef(source, position);
@@ -2688,8 +2695,7 @@ function readStruct$1(src, position, srcEnd, unpackr) {
 				case NUMBER:
 					switch(size) {
 						case 4:
-							get = function () {
-								let source = this[sourceSymbol];
+							get = function (source) {
 								let src = source.bytes;
 								let dataView = src.dataView || (src.dataView = new DataView(src.buffer, src.byteOffset, src.byteLength));
 								let position = source.position + property.offset;
@@ -2707,8 +2713,7 @@ function readStruct$1(src, position, srcEnd, unpackr) {
 							};
 							break;
 						case 8:
-							get = function () {
-								let source = this[sourceSymbol];
+							get = function (source) {
 								let src = source.bytes;
 								let dataView = src.dataView || (src.dataView = new DataView(src.buffer, src.byteOffset, src.byteLength));
 								let value = dataView.getFloat64(source.position + property.offset, true);
@@ -2721,8 +2726,7 @@ function readStruct$1(src, position, srcEnd, unpackr) {
 							};
 							break;
 						case 1:
-							get = function () {
-								let source = this[sourceSymbol];
+							get = function (source) {
 								let src = source.bytes;
 								let value = src[source.position + property.offset];
 								return value < 0xf6 ? value : toConstant(value);
@@ -2731,8 +2735,7 @@ function readStruct$1(src, position, srcEnd, unpackr) {
 					}
 					break;
 				case DATE:
-					get = function () {
-						let source = this[sourceSymbol];
+					get = function (source) {
 						let src = source.bytes;
 						let dataView = src.dataView || (src.dataView = new DataView(src.buffer, src.byteOffset, src.byteLength));
 						return new Date(dataView.getFloat64(source.position + property.offset, true));
@@ -2742,8 +2745,38 @@ function readStruct$1(src, position, srcEnd, unpackr) {
 			}
 			property.get = get;
 		}
-		for (let property of properties) // assign in enumeration order
-			Object.defineProperty(prototype, property.key, { get: property.get, enumerable: true });
+		// TODO: load the srcString for faster string decoding on toJSON
+		if (evalSupported) {
+			let objectLiteralProperties = [];
+			let args = [];
+			let i = 0;
+			for (let property of properties) { // assign in enumeration order
+				Object.defineProperty(prototype, property.key, { get: withSource(property.get), enumerable: true });
+				let valueFunction = 'v' + i++;
+				args.push(valueFunction);
+				objectLiteralProperties.push('[' + JSON.stringify(property.key) + ']:' + valueFunction + '(s)');
+			}
+			let toObject = (new Function(...args, 'return function(s){return{' + objectLiteralProperties.join(',') + '}}')).apply(null, properties.map(prop => prop.get));
+			Object.defineProperty(prototype, 'toJSON', {
+				value() {
+					return toObject(this[sourceSymbol]);
+				}
+			});
+		} else {
+			Object.defineProperty(prototype, 'toJSON', {
+				value() {
+					// return an enumerable object with own properties to JSON stringify
+					let resolved = {};
+					for (let i = 0, l = properties.length; i < l; i++) {
+						let key = properties[i].key;
+
+						resolved[key] = this[key];
+					}
+					return resolved;
+				},
+				// not enumerable or anything
+			});
+		}
 	}
 	var instance = new construct();
 	instance[sourceSymbol] = {
@@ -2763,6 +2796,11 @@ function toConstant(code) {
 	}
 	throw new Error('Unknown constant');
 }
+function withSource(get) {
+	return function() {
+		return get(this[sourceSymbol]);
+	}
+}
 
 function saveState$1() {
 	if (currentSource) {
@@ -2796,7 +2834,7 @@ function prepareStructures$1(structures, packr) {
 			packr._mergeStructures(existing);
 		return compatible;
 	};
-	packr.lastTypedStructuresLength = packr.typedStructs?.length;
+	packr.lastTypedStructuresLength = packr.typedStructs && packr.typedStructs.length;
 	return structures;
 }