msgpackr 1.7.0-alpha7 → 1.7.0

package/dist/test.js

@@ -179,6 +179,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;
@@ -189,7 +190,7 @@
 
 			if (position == srcEnd) {
 				// finished reading this source, cleanup references
-				if (currentStructures.restoreStructures)
+				if (currentStructures?.restoreStructures)
 					restoreStructures();
 				currentStructures = null;
 				src = null;
@@ -244,7 +245,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 {
@@ -473,7 +477,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
@@ -481,6 +485,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)
@@ -601,7 +607,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 {
@@ -886,7 +895,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);
@@ -1988,6 +2006,14 @@
 	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;
@@ -2412,9 +2438,8 @@
 		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) {
@@ -2445,23 +2470,13 @@
 			};
 			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,
@@ -2475,13 +2490,13 @@
 					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;
@@ -2489,7 +2504,7 @@
 						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;
@@ -2505,9 +2520,8 @@
 							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);
@@ -2523,7 +2537,7 @@
 								next = next.next;
 							}
 							if (end == null)
-								end = source.srcEnd - refStart;
+								end = source.bytesEnd - refStart;
 							if (source.srcString) {
 								return source.srcString.slice(ref, end);
 							}
@@ -2539,7 +2553,7 @@
 										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);
 							}
@@ -2557,13 +2571,12 @@
 						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);
@@ -2574,7 +2587,7 @@
 								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 {
@@ -2590,9 +2603,8 @@
 					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);
@@ -2609,9 +2621,8 @@
 								};
 								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)) {
@@ -2623,9 +2634,8 @@
 								};
 								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);
 								};
@@ -2633,9 +2643,8 @@
 						}
 						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));
 						};
@@ -2644,15 +2653,45 @@
 				}
 				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;
 	}
@@ -2665,12 +2704,17 @@
 		}
 		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) {
@@ -3037,6 +3081,17 @@
 			assert.deepEqual(data, deserialized);
 			assert.equal(deserialized.extendedInstance.getDouble(), 8);
 		});
+		test('proto handling', function() {
+			var objectWithProto = JSON.parse('{"__proto__":{"foo":3}}');
+			var decoded = unpack(pack(objectWithProto));
+			assert(!decoded.foo);
+			var objectsWithProto = [objectWithProto, objectWithProto, objectWithProto, objectWithProto, objectWithProto, objectWithProto];
+			let packr = new Packr$1();
+			var decoded = packr.unpack(packr.pack(objectsWithProto));
+			for (let object of decoded) {
+				assert(!decoded.foo);
+			}
+		});
 
 		test.skip('text decoder', function() {
 				let td = new TextDecoder('ISO-8859-15');