msgpackr 1.8.0 → 1.8.2

package/dist/index.js

@@ -116,7 +116,7 @@
 				let size = source.length;
 				let value = this ? this.unpack(source, size) : defaultUnpackr.unpack(source, size);
 				if (forEach) {
-					forEach(value);
+					if (forEach(value) === false) return;
 					while(position$1 < size) {
 						lastPosition = position$1;
 						if (forEach(checkedRead()) === false) {
@@ -1107,7 +1107,7 @@
 			if (maxSharedStructures > 8160)
 				throw new Error('Maximum maxSharedStructure is 8160')
 			if (options.structuredClone && options.moreTypes == undefined) {
-				options.moreTypes = true;
+				this.moreTypes = true;
 			}
 			let maxOwnStructures = options.maxOwnStructures;
 			if (maxOwnStructures == null)
@@ -1268,6 +1268,23 @@
 						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);
@@ -1450,22 +1467,8 @@
 						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) {
@@ -1494,7 +1497,16 @@
 											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;
@@ -1531,8 +1543,13 @@
 									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') {
@@ -1785,12 +1802,11 @@
 					if (notifySharedUpdate)
 						return hasSharedUpdate = true;
 					position = newPosition;
-					if (start > 0) {
-						pack(value);
-						if (start == 0)
-							return { position, targetView, target }; // indicate the buffer was re-allocated
-					} else
-						pack(value);
+					let startTarget = target;
+					pack(value);
+					if (startTarget !== target) {
+						return { position, targetView, target }; // indicate the buffer was re-allocated
+					}
 					return position;
 				}, this);
 				if (newPosition === 0) // bail and go to a msgpack object