msgpackr 1.9.3 → 1.9.5-debug.1

package/dist/node.cjs

@@ -1640,8 +1640,13 @@ class Packr extends Unpackr {
 						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')
@@ -1686,7 +1691,7 @@ class Packr extends Unpackr {
 			}
 		};
 
-		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;
@@ -1702,9 +1707,19 @@ class Packr extends Unpackr {
 				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) => {
@@ -2855,11 +2870,16 @@ function readStruct(src, position, srcEnd, unpackr) {
 				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) {