msgpackr 1.8.0 → 1.8.1

package/dist/node.cjs

@@ -1334,6 +1334,23 @@ class Packr extends Unpackr {
 					position = start;
 			}
 		};
+		const packArray = (value) => {
+			var length = value.length;
+			if (length < 0x10) {
+				target[position++] = 0x90 | length;
+			} else if (length < 0x10000) {
+				target[position++] = 0xdc;
+				target[position++] = length >> 8;
+				target[position++] = length & 0xff;
+			} else {
+				target[position++] = 0xdd;
+				targetView.setUint32(position, length);
+				position += 4;
+			}
+			for (let i = 0; i < length; i++) {
+				pack(value[i]);
+			}
+		};
 		const pack = (value) => {
 			if (position > safeEnd)
 				target = makeRoom(position);
@@ -1516,22 +1533,8 @@ class Packr extends Unpackr {
 					let constructor = value.constructor;
 					if (constructor === Object) {
 						writeObject(value, true);
-					} else if (constructor === Array || Array.isArray(value)) {
-						length = value.length;
-						if (length < 0x10) {
-							target[position++] = 0x90 | length;
-						} else if (length < 0x10000) {
-							target[position++] = 0xdc;
-							target[position++] = length >> 8;
-							target[position++] = length & 0xff;
-						} else {
-							target[position++] = 0xdd;
-							targetView.setUint32(position, length);
-							position += 4;
-						}
-						for (let i = 0; i < length; i++) {
-							pack(value[i]);
-						}
+					} else if (constructor === Array) {
+						packArray(value);
 					} else if (constructor === Map) {
 						length = value.size;
 						if (length < 0x10) {
@@ -1560,7 +1563,16 @@ class Packr extends Unpackr {
 										target[position++] = extension.type;
 										target[position++] = 0;
 									}
-									pack(extension.write.call(this, value));
+									let writeResult = extension.write.call(this, value);
+									if (writeResult === value) { // avoid infinite recursion
+										if (Array.isArray(value)) {
+											packArray(value);
+										} else {
+											writeObject(value);
+										}
+									} else {
+										pack(writeResult);
+									}
 									return
 								}
 								let currentTarget = target;
@@ -1597,8 +1609,13 @@ class Packr extends Unpackr {
 								return
 							}
 						}
-						// no extension found, write as object
-						writeObject(value, !value.hasOwnProperty); // if it doesn't have hasOwnProperty, don't do hasOwnProperty checks
+						// check isArray after extensions, because extensions can extend Array
+						if (Array.isArray(value)) {
+							packArray(value);
+						} else {
+							// no extension found, write as object
+							writeObject(value, !value.hasOwnProperty); // if it doesn't have hasOwnProperty, don't do hasOwnProperty checks
+						}
 					}
 				}
 			} else if (type === 'boolean') {