msgpackr 1.9.0 → 1.9.2

package/dist/test.js

@@ -120,10 +120,10 @@
 				let size = source.length;
 				let value = this ? this.unpack(source, size) : defaultUnpackr.unpack(source, size);
 				if (forEach) {
-					if (forEach(value) === false) return;
+					if (forEach(value, lastPosition, position$1) === false) return;
 					while(position$1 < size) {
 						lastPosition = position$1;
-						if (forEach(checkedRead()) === false) {
+						if (forEach(checkedRead(), lastPosition, position$1) === false) {
 							return
 						}
 					}
@@ -197,6 +197,10 @@
 				position$1 = bundledStrings$1.postBundlePosition;
 				bundledStrings$1 = null;
 			}
+			if (sequentialMode)
+				// we only need to restore the structures if there was an error, but if we completed a read,
+				// we can clear this out and keep the structures we read
+				currentStructures.restoreStructures = null;
 
 			if (position$1 == srcEnd) {
 				// finished reading this source, cleanup references
@@ -967,7 +971,10 @@
 			structure.highByte = highByte;
 		}
 		let existingStructure = currentStructures[id];
-		if (existingStructure && existingStructure.isShared) {
+		// If it is a shared structure, we need to restore any changes after reading.
+		// Also in sequential mode, we may get incomplete reads and thus errors, and we need to restore
+		// to the state prior to an incomplete read in order to properly resume.
+		if (existingStructure && (existingStructure.isShared || sequentialMode)) {
 			(currentStructures.restoreStructures || (currentStructures.restoreStructures = []))[id] = existingStructure;
 		}
 		currentStructures[id] = structure;
@@ -977,10 +984,10 @@
 	currentExtensions[0] = () => {}; // notepack defines extension 0 to mean undefined, so use that as the default here
 	currentExtensions[0].noBuffer = true;
 
-	let global = typeof globalThis === 'object' ? globalThis : window;
+	let glbl = typeof globalThis === 'object' ? globalThis : window;
 	currentExtensions[0x65] = () => {
 		let data = read();
-		return (global[data[0]] || Error)(data[1])
+		return (glbl[data[0]] || Error)(data[1])
 	};
 
 	currentExtensions[0x69] = (data) => {
@@ -1024,7 +1031,7 @@
 		if (!typedArrayName)
 			throw new Error('Could not find typed array for code ' + typeCode)
 		// we have to always slice/copy here to get a new ArrayBuffer that is word/byte aligned
-		return new global[typedArrayName](Uint8Array.prototype.slice.call(data, 1).buffer)
+		return new glbl[typedArrayName](Uint8Array.prototype.slice.call(data, 1).buffer)
 	};
 	currentExtensions[0x78] = () => {
 		let data = read();
@@ -1314,7 +1321,7 @@
 						if (serializationsSinceTransitionRebuild < 10)
 							serializationsSinceTransitionRebuild++;
 						let sharedLength = structures.sharedLength || 0;
-						if (structures.length > sharedLength)
+						if (structures.length > sharedLength && !isSequential)
 							structures.length = sharedLength;
 						if (transitionsCount > 10000) {
 							// force a rebuild occasionally after a lot of transitions so it can get cleaned up
@@ -1949,7 +1956,10 @@
 		}
 	}, {
 		pack(set, allocateForWrite, pack) {
-			if (this.setAsEmptyObject) return pack({})
+			if (this.setAsEmptyObject) {
+				allocateForWrite(0);
+				return pack({})
+			}
 			let array = Array.from(set);
 			let { target, position} = allocateForWrite(this.moreTypes ? 3 : 0);
 			if (this.moreTypes) {
@@ -3053,7 +3063,6 @@
 			var deserialized = packr.unpack(serialized);
 			assert.deepEqual(deserialized, data);
 		});
-
 		test('255 chars', function () {
 			const data = 'RRZG9A6I7xupPeOZhxcOcioFsuhszGOdyDUcbRf4Zef2kdPIfC9RaLO4jTM5JhuZvTsF09fbRHMGtqk7YAgu3vespeTe9l61ziZ6VrMnYu2CamK96wCkmz0VUXyqaiUoTPgzk414LS9yYrd5uh7w18ksJF5SlC2e91rukWvNqAZJjYN3jpkqHNOFchCwFrhbxq2Lrv1kSJPYCx9blRg2hGmYqTbElLTZHv20iNqwZeQbRMgSBPT6vnbCBPnOh1W';
 			var serialized = pack(data);
@@ -3150,8 +3159,24 @@
 				var deserialized = packr.unpack(serialized);
 				assert.deepEqual(deserialized, data);
 			});
+
 		}
+		test('mapAsEmptyObject combination', function () {
+			const msgpackr = new Packr({ useRecords: false, encodeUndefinedAsNil: true, variableMapSize: true, mapAsEmptyObject: true, setAsEmptyObject: true  });
 
+			const map = new Map();
+			map.set('a', 1);
+			map.set('b', 2);
+			const set = new Set();
+			set.add('a');
+			set.add('b');
+			const input = { map, set };
+
+			const packed = msgpackr.pack(input);
+			const unpacked = msgpackr.unpack(packed);
+			assert.deepEqual(unpacked.map, {});
+			assert.deepEqual(unpacked.set, {});
+		});
 		test('pack/unpack empty data with bundled strings', function () {
 			var data = {};
 			let packr = new Packr({bundleStrings: true});
@@ -3961,6 +3986,14 @@
 			assert.deepEqual(values, [1, 2, 3, 4]);
 		});
 
+		test('unpackMultiple with positions', () => {
+			let values = unpackMultiple(new Uint8Array([1, 2, 3, 4]));
+			assert.deepEqual(values, [1, 2, 3, 4]);
+			values = [];
+			unpackMultiple(new Uint8Array([1, 2, 3, 4]), (value,start,end) => values.push([value,start,end]));
+			assert.deepEqual(values, [[1,0,1], [2,1,2], [3,2,3], [4,3,4]]);
+		});
+
 	});
 	suite('msgpackr performance tests', function(){
 		test('performance JSON.parse', function() {