msgpackr 1.7.0-alpha7 → 1.7.0

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?.restoreStructures)
 				restoreStructures();
 			currentStructures = null;
 			src = null;
@@ -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 {
@@ -932,7 +941,16 @@ function readKey() {
 
 // 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);
@@ -2078,6 +2096,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;
@@ -2502,9 +2528,8 @@ function onLoadedStructures$1(sharedData) {
 	this.lastTypedStructuresLength = typed.length;
 	return named;
 }
-var sourceSymbol = Symbol('source');
+var sourceSymbol = Symbol.for('source');
 function readStruct$1(src, position, srcEnd, unpackr) {
-//	var stringLength = (src[position++] << 8) | src[position++];
 	let recordId = src[position++] - 0x20;
 	if (recordId >= 24) {
 		switch(recordId) {
@@ -2535,23 +2560,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,
@@ -2565,13 +2580,13 @@ function readStruct$1(src, position, srcEnd, unpackr) {
 				case 0: getRef = () => 0; break;
 				case 1:
 					getRef = (source, position) => {
-						let ref = source.src[position + property.offset];
+						let ref = source.bytes[position + property.offset];
 						return ref >= 0xf6 ? toConstant(ref) : ref;
 					};
 					break;
 				case 2:
 					getRef = (source, position) => {
-						let src = source.src;
+						let src = source.bytes;
 						let dataView = src.dataView || (src.dataView = new DataView(src.buffer, src.byteOffset, src.byteLength));
 						let ref = dataView.getUint16(position + property.offset, true);
 						return ref >= 0xff00 ? toConstant(ref & 0xff) : ref;
@@ -2579,7 +2594,7 @@ function readStruct$1(src, position, srcEnd, unpackr) {
 					break;
 				case 4:
 					getRef = (source, position) => {
-						let src = source.src;
+						let src = source.bytes;
 						let dataView = src.dataView || (src.dataView = new DataView(src.buffer, src.byteOffset, src.byteLength));
 						let ref = dataView.getUint32(position + property.offset, true);
 						return ref >= 0xffffff00 ? toConstant(ref & 0xff) : ref;
@@ -2595,9 +2610,8 @@ function readStruct$1(src, position, srcEnd, unpackr) {
 						lastRefProperty.next = property;
 					lastRefProperty = property;
 					property.multiGetCount = 0;
-					get = function() {
-						let source = this[sourceSymbol];
-						let src = source.src;
+					get = function(source) {
+						let src = source.bytes;
 						let position = source.position;
 						let refStart = currentOffset + position;
 						let ref = getRef(source, position);
@@ -2613,7 +2627,7 @@ function readStruct$1(src, position, srcEnd, unpackr) {
 							next = next.next;
 						}
 						if (end == null)
-							end = source.srcEnd - refStart;
+							end = source.bytesEnd - refStart;
 						if (source.srcString) {
 							return source.srcString.slice(ref, end);
 						}
@@ -2629,7 +2643,7 @@ function readStruct$1(src, position, srcEnd, unpackr) {
 									asciiEnd = null;
 							} while((next = next.next));
 							if (asciiEnd == null)
-								asciiEnd = source.srcEnd - refStart
+								asciiEnd = source.bytesEnd - refStart
 							source.srcString = src.toString('latin1', refStart, refStart + asciiEnd);
 							return source.srcString.slice(ref, end);
 						}
@@ -2647,13 +2661,12 @@ 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);
 						if (typeof ref !== 'number') return ref;
-						let src = source.src;
+						let src = source.bytes;
 						let end, next = property.next;
 						while(next) {
 							end = next.getRef(source, position);
@@ -2664,7 +2677,7 @@ function readStruct$1(src, position, srcEnd, unpackr) {
 							next = next.next;
 						}
 						if (end == null)
-							end = source.srcEnd - refStart;
+							end = source.bytesEnd - refStart;
 						if (type === UTF8) {
 							return src.toString('utf8', ref + refStart, end + refStart);
 						} else {
@@ -2680,9 +2693,8 @@ function readStruct$1(src, position, srcEnd, unpackr) {
 				case NUMBER:
 					switch(size) {
 						case 4:
-							get = function () {
-								let source = this[sourceSymbol];
-								let src = source.src;
+							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;
 								let value = dataView.getInt32(position, true);
@@ -2699,9 +2711,8 @@ function readStruct$1(src, position, srcEnd, unpackr) {
 							};
 							break;
 						case 8:
-							get = function () {
-								let source = this[sourceSymbol];
-								let src = source.src;
+							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);
 								if (isNaN(value)) {
@@ -2713,9 +2724,8 @@ function readStruct$1(src, position, srcEnd, unpackr) {
 							};
 							break;
 						case 1:
-							get = function () {
-								let source = this[sourceSymbol];
-								let src = source.src;
+							get = function (source) {
+								let src = source.bytes;
 								let value = src[source.position + property.offset];
 								return value < 0xf6 ? value : toConstant(value);
 							};
@@ -2723,9 +2733,8 @@ function readStruct$1(src, position, srcEnd, unpackr) {
 					}
 					break;
 				case DATE:
-					get = function () {
-						let source = this[sourceSymbol];
-						let src = source.src;
+					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));
 					};
@@ -2734,15 +2743,45 @@ 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] = {
-		src,
+		bytes: src,
 		position,
 		srcString: '',
-		srcEnd
+		bytesEnd: srcEnd
 	};
 	return instance;
 }
@@ -2755,12 +2794,17 @@ function toConstant(code) {
 	}
 	throw new Error('Unknown constant');
 }
+function withSource(get) {
+	return function() {
+		return get(this[sourceSymbol]);
+	}
+}
 
 function saveState$1() {
 	if (currentSource) {
-		currentSource.src = Uint8Array.prototype.slice.call(currentSource.src, currentSource.position, currentSource.srcEnd);
+		currentSource.bytes = Uint8Array.prototype.slice.call(currentSource.bytes, currentSource.position, currentSource.bytesEnd);
 		currentSource.position = 0;
-		currentSource.srcEnd = currentSource.src.length;
+		currentSource.bytesEnd = currentSource.bytes.length;
 	}
 }
 function prepareStructures$1(structures, packr) {