msgpackr 1.8.0 → 1.8.2

package/dist/node.cjs

@@ -120,7 +120,7 @@ class Unpackr {
 			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) {
@@ -1173,7 +1173,7 @@ class Packr extends Unpackr {
 		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)
@@ -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') {
@@ -1851,12 +1868,11 @@ class Packr extends Unpackr {
 				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
@@ -2776,24 +2792,35 @@ function readStruct(src, position, srcEnd, unpackr) {
 			let objectLiteralProperties = [];
 			let args = [];
 			let i = 0;
+			let hasInheritedProperties;
 			for (let property of properties) { // assign in enumeration order
+				if (unpackr.alwaysLazyProperty && unpackr.alwaysLazyProperty(property.key)) {
+					// these properties are not eagerly evaluated and this can be used for creating properties
+					// that are not serialized as JSON
+					hasInheritedProperties = true;
+					continue;
+				}
 				Object.defineProperty(prototype, property.key, { get: withSource(property.get), enumerable: true });
 				let valueFunction = 'v' + i++;
 				args.push(valueFunction);
 				objectLiteralProperties.push('[' + JSON.stringify(property.key) + ']:' + valueFunction + '(s)');
 			}
+			if (hasInheritedProperties) {
+				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() {
-					return toObject(this[sourceSymbol]);
+				value(omitUnderscoredProperties) {
+					return toObject.call(this, this[sourceSymbol]);
 				}
 			});
 		} else {
 			Object.defineProperty(prototype, 'toJSON', {
-				value() {
+				value(omitUnderscoredProperties) {
 					// return an enumerable object with own properties to JSON stringify
 					let resolved = {};
 					for (let i = 0, l = properties.length; i < l; i++) {
+						// TODO: check alwaysLazyProperty
 						let key = properties[i].key;
 
 						resolved[key] = this[key];