msgpackr 1.8.1 → 1.8.3

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) {
@@ -557,7 +557,8 @@ function setExtractor(extractStrings) {
 			if (string == null) {
 				if (bundledStrings$1)
 					return readStringJS(length)
-				let extraction = extractStrings(position$1 - headerLength, srcEnd, src);
+				let byteOffset = src.byteOffset;
+				let extraction = extractStrings(position$1 - headerLength + byteOffset, srcEnd + byteOffset, src.buffer);
 				if (typeof extraction == 'string') {
 					string = extraction;
 					strings = EMPTY_ARRAY;
@@ -1173,7 +1174,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)
@@ -1868,12 +1869,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
@@ -2793,24 +2793,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];