msgpackr 1.9.2 → 1.9.4

package/dist/test.js

@@ -984,10 +984,10 @@
 	currentExtensions[0] = () => {}; // notepack defines extension 0 to mean undefined, so use that as the default here
 	currentExtensions[0].noBuffer = true;
 
-	let glbl = typeof globalThis === 'object' ? globalThis : window;
+	let errors = { Error, TypeError, ReferenceError };
 	currentExtensions[0x65] = () => {
 		let data = read();
-		return (glbl[data[0]] || Error)(data[1])
+		return (errors[data[0]] || Error)(data[1])
 	};
 
 	currentExtensions[0x69] = (data) => {
@@ -1025,6 +1025,7 @@
 
 	const typedArrays = ['Int8','Uint8','Uint8Clamped','Int16','Uint16','Int32','Uint32','Float32','Float64','BigInt64','BigUint64'].map(type => type + 'Array');
 
+	let glbl = typeof globalThis === 'object' ? globalThis : window;
 	currentExtensions[0x74] = (data) => {
 		let typeCode = data[0];
 		let typedArrayName = typedArrays[typeCode];
@@ -1529,7 +1530,7 @@
 						targetView.setFloat64(position, value);
 						position += 8;
 					}
-				} else if (type === 'object') {
+				} else if (type === 'object' || type === 'function') {
 					if (!value)
 						target[position++] = 0xc0;
 					else {
@@ -1636,6 +1637,11 @@
 							} else {
 								if (value.toJSON) // use this as an alternate mechanism for expressing how to serialize
 									return pack(value.toJSON());
+								
+								// if there is a writeFunction, use it, otherwise just encode as undefined
+								if (type === 'function')
+									return pack(this.writeFunction && this.writeFunction(value));
+								
 								// no extension found, write as object
 								writeObject(value, !value.hasOwnProperty); // if it doesn't have hasOwnProperty, don't do hasOwnProperty checks
 							}
@@ -1670,14 +1676,12 @@
 						target[position++] = 0;
 						target[position++] = 0;
 					}
-				} else if (type === 'function') {
-					pack(this.writeFunction && this.writeFunction()); // if there is a writeFunction, use it, otherwise just encode as undefined
 				} else {
 					throw new Error('Unknown type: ' + type)
 				}
 			};
 
-			const writeObject = this.useRecords === false ? this.variableMapSize ? (object) => {
+			const writePlainObject = (this.variableMapSize || this.coercibleKeyAsNumber) ? (object) => {
 				// this method is slightly slower, but generates "preferred serialization" (optimally small for smaller objects)
 				let keys = Object.keys(object);
 				let length = keys.length;
@@ -1693,9 +1697,19 @@
 					position += 4;
 				}
 				let key;
-				for (let i = 0; i < length; i++) {
-					pack(key = keys[i]);
-					pack(object[key]);
+				if (this.coercibleKeyAsNumber) {
+					for (let i = 0; i < length; i++) {
+						key = keys[i];
+						let num = Number(key);
+						pack(isNaN(num) ? key : num);
+						pack(object[key]);
+					}
+
+				} else {
+					for (let i = 0; i < length; i++) {
+						pack(key = keys[i]);
+						pack(object[key]);
+					}
 				}
 			} :
 			(object, safePrototype) => {
@@ -1712,7 +1726,9 @@
 				}
 				target[objectOffset++ + start] = size >> 8;
 				target[objectOffset + start] = size & 0xff;
-			} :
+			};
+
+			const writeRecord = this.useRecords === false ? writePlainObject :
 			(options.progressiveRecords && !useTwoByteRecords) ?  // this is about 2% faster for highly stable structures, since it only requires one for-in loop (but much more expensive when new structure needs to be written)
 			(object, safePrototype) => {
 				let nextTransition, transition = structures.transitions || (structures.transitions = Object.create(null));
@@ -1784,6 +1800,14 @@
 					if (safePrototype || object.hasOwnProperty(key))
 						pack(object[key]);
 			};
+
+			// craete reference to useRecords if useRecords is a function
+			const checkUseRecords = typeof this.useRecords == 'function' && this.useRecords;
+			
+			const writeObject = checkUseRecords ? (object, safePrototype) => {
+				checkUseRecords(object) ? writeRecord(object,safePrototype) : writePlainObject(object,safePrototype);
+			} : writeRecord;
+
 			const makeRoom = (end) => {
 				let newSize;
 				if (end > 0x1000000) {
@@ -3159,8 +3183,30 @@
 				var deserialized = packr.unpack(serialized);
 				assert.deepEqual(deserialized, data);
 			});
-
 		}
+
+		test('pack/unpack sample data with useRecords function', function () {
+			var data = [
+				{id: 1, type: 1, labels: {a: 1, b: 2}},
+				{id: 2, type: 1, labels: {b: 1, c: 2}},
+				{id: 3, type: 1, labels: {d: 1, e: 2}}
+			];
+			
+			var alternatives = [
+				{useRecords: false}, // 88 bytes
+				{useRecords: true}, // 58 bytes
+				{mapsAsObjects: true, useRecords: (v)=>!!v.id}, // 55 bytes
+				{mapsAsObjects: true, variableMapSize: true, useRecords: (v)=>!!v.id} // 49 bytes
+			];
+
+			for(let o of alternatives) {
+				let packr = new Packr(o);
+				var serialized = packr.pack(data);
+				var deserialized = packr.unpack(serialized);
+				assert.deepEqual(deserialized, data);	
+			}
+		});
+
 		test('mapAsEmptyObject combination', function () {
 			const msgpackr = new Packr({ useRecords: false, encodeUndefinedAsNil: true, variableMapSize: true, mapAsEmptyObject: true, setAsEmptyObject: true  });
 
@@ -3177,6 +3223,13 @@
 			assert.deepEqual(unpacked.map, {});
 			assert.deepEqual(unpacked.set, {});
 		});
+		test('pack/unpack numeric coercible keys', function () {
+			var data = { a: 1, 2: 'test', '-3.45': 'test2'};
+			let packr = new Packr({variableMapSize: true, coercibleKeyAsNumber: true, useRecords: false});
+			var serialized = packr.pack(data);
+			var deserialized = packr.unpack(serialized);
+			assert.deepEqual(deserialized, data);
+		});
 		test('pack/unpack empty data with bundled strings', function () {
 			var data = {};
 			let packr = new Packr({bundleStrings: true});
@@ -3337,7 +3390,6 @@
 			assert.deepEqual(data, deserialized);
 		});
 
-
 		test('unregistered extended Array class read/write', function(){
 			var instance = new ExtendArray2();
 			instance.push(0);
@@ -3490,6 +3542,58 @@
 			assert.equal(deserialized.extendedInstance[0], 0);
 		});
 
+		test('extended class pack/unpack proxied', function(){
+			function Extended() {
+				
+			}
+			Extended.prototype.__call__ = function(){
+				return this.value * 4
+			};
+			Extended.prototype.getDouble = function() {
+				return this.value * 2
+			};
+
+			var instance = function() { instance.__call__();/* callable stuff */ };
+			Object.setPrototypeOf(instance,Extended.prototype);
+			
+			instance.value = 4;
+			var data = instance;
+
+			let packr = new Packr();
+			addExtension({
+				Class: Extended,
+				type: 15,
+				unpack: function(buffer) {
+					var e = function() { e.__call__(); };
+					Object.setPrototypeOf(e,Extended.prototype);
+					e.value = packr.unpack(buffer);
+					return e
+				},
+				pack: function(instance) {
+					return packr.pack(instance.value)
+				}
+			});
+			var serialized = pack(data);
+			var deserialized = unpack(serialized);
+			assert.equal(deserialized.getDouble(), 8);
+		});
+
+		test.skip('convert Date to string', function(){
+			var data = {
+				aDate: new Date(),
+			};
+			new Packr();
+			addExtension({
+				Class: Date,
+				write(date) {
+					return date.toString()
+				}
+			});
+			var serialized = pack(data);
+			var deserialized = unpack(serialized);
+			assert.equal(deserialized.aDate, data.aDate.toString());
+		});
+
 		test('proto handling', function() {
 			var objectWithProto = JSON.parse('{"__proto__":{"foo":3}}');
 			var decoded = unpack(pack(objectWithProto));