msgpackr 1.9.3 → 1.9.5-debug.1

package/dist/test.js

@@ -1635,8 +1635,13 @@
 							if (Array.isArray(value)) {
 								packArray(value);
 							} else {
-								if (value.toJSON) // use this as an alternate mechanism for expressing how to serialize
-									return pack(value.toJSON());
+								// use this as an alternate mechanism for expressing how to serialize
+								if (value.toJSON) {
+									const json = value.toJSON();
+									// if for some reason value.toJSON returns itself it'll loop forever
+									if (json !== value)
+										return pack(json)
+								}
 								
 								// if there is a writeFunction, use it, otherwise just encode as undefined
 								if (type === 'function')
@@ -1681,7 +1686,7 @@
 				}
 			};
 
-			const writePlainObject = 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;
@@ -1697,9 +1702,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) => {
@@ -2848,11 +2863,16 @@
 					objectLiteralProperties.push('__proto__:this');
 				}
 				let toObject = (new Function(...args, 'return function(s){return{' + objectLiteralProperties.join(',') + '}}')).apply(null, properties.map(prop => prop.get));
-				Object.defineProperty(prototype, 'toJSON', {
-					value(omitUnderscoredProperties) {
-						return toObject.call(this, this[sourceSymbol]);
-					}
-				});
+				try {
+					Object.defineProperty(prototype, 'toJSON', {
+						value(omitUnderscoredProperties) {
+							return toObject.call(this, this[sourceSymbol]);
+						}
+					});
+				} catch(error) {
+					error.message += ' setting properties ' + JSON.stringify(properties);
+					throw error;
+				}
 			} else {
 				Object.defineProperty(prototype, 'toJSON', {
 					value(omitUnderscoredProperties) {
@@ -3213,6 +3233,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});
@@ -4081,6 +4108,17 @@
 			assert.deepEqual(values, [[1,0,1], [2,1,2], [3,2,3], [4,3,4]]);
 		});
 
+		test('pack toJSON returning this', () => {
+			class Serializable {
+				someData = [1, 2, 3, 4]
+				toJSON() {
+					return this
+				}
+			}
+			const serialized = pack(new Serializable);
+			const deserialized = unpack(serialized);
+			assert.deepStrictEqual(deserialized, { someData: [1, 2, 3, 4] });
+		});
 	});
 	suite('msgpackr performance tests', function(){
 		test('performance JSON.parse', function() {