msgpackr 1.7.0 → 1.7.1

package/dist/test.js

@@ -190,7 +190,7 @@
 
 			if (position == srcEnd) {
 				// finished reading this source, cleanup references
-				if (currentStructures?.restoreStructures)
+				if (currentStructures && currentStructures.restoreStructures)
 					restoreStructures();
 				currentStructures = null;
 				src = null;
@@ -205,7 +205,7 @@
 			// else more to read, but we are reading sequentially, so don't clear source yet
 			return result
 		} catch(error) {
-			if (currentStructures?.restoreStructures)
+			if (currentStructures && currentStructures.restoreStructures)
 				restoreStructures();
 			clearSource();
 			if (error instanceof RangeError || error.message.startsWith('Unexpected end of buffer') || position > srcEnd) {
@@ -1180,12 +1180,11 @@
 						writeStruct(value);
 					else
 						pack(value);
-					if (bundledStrings$1) {
-						writeBundles(start, pack);
-					}
-					packr.offset = position$1; // update the offset so next serialization doesn't write over our buffer, but can continue writing to same buffer sequentially
 					if (referenceMap && referenceMap.idsToInsert) {
-						position$1 += referenceMap.idsToInsert.length * 6;
+						let incrementPosition = referenceMap.idsToInsert.length * 6;
+						if (bundledStrings$1)
+							writeBundles(start, pack, incrementPosition);
+						position$1 += incrementPosition;
 						if (position$1 > safeEnd)
 							makeRoom(position$1);
 						packr.offset = position$1;
@@ -1193,6 +1192,9 @@
 						referenceMap = null;
 						return serialized
 					}
+					if (bundledStrings$1)
+						writeBundles(start, pack, 0);
+					packr.offset = position$1; // update the offset so next serialization doesn't write over our buffer, but can continue writing to same buffer sequentially
 					if (encodeOptions & REUSE_BUFFER_MODE) {
 						target.start = start;
 						target.end = position$1;
@@ -1971,9 +1973,9 @@
 		return serialized
 	}
 
-	function writeBundles(start, pack) {
+	function writeBundles(start, pack, incrementPosition) {
 		if (bundledStrings$1.length > 0) {
-			targetView.setUint32(bundledStrings$1.position + start, position$1 - bundledStrings$1.position - start);
+			targetView.setUint32(bundledStrings$1.position + start, position$1 + incrementPosition - bundledStrings$1.position - start);
 			let writeStrings = bundledStrings$1;
 			bundledStrings$1 = null;
 			pack(writeStrings[0]);
@@ -2450,7 +2452,7 @@
 				case 27: recordId = src[position++] + (src[position++] << 8) + (src[position++] << 16) + (src[position++] << 24); break;
 			}
 		}
-		let structure = unpackr.typedStructs?.[recordId];
+		let structure = unpackr.typedStructs && unpackr.typedStructs[recordId];
 		if (!structure) {
 			// copy src buffer because getStructures will override it
 			src = Uint8Array.prototype.slice.call(src, position, srcEnd);
@@ -2742,7 +2744,7 @@
 				packr._mergeStructures(existing);
 			return compatible;
 		};
-		packr.lastTypedStructuresLength = packr.typedStructs?.length;
+		packr.lastTypedStructuresLength = packr.typedStructs && packr.typedStructs.length;
 		return structures;
 	}
 
@@ -3160,6 +3162,23 @@
 			assert.equal(deserialized.uint16Array[1], 4);
 		});
 
+		test('structured clone with bundled strings', function() {
+			const packer = new Packr$1({
+				structuredClone: true, // both options must be enabled
+				bundleStrings: true,
+			});
+
+			const v = {};
+
+			const shared = {
+				name1: v,
+				name2: v, // one key has to be named `data`
+			};
+
+			let deserialized = packer.unpack(packer.pack(shared));
+			assert.equal(deserialized.name1, deserialized.name2);
+		});
+
 		test('object without prototype', function(){
 			var data = Object.create(null);
 			data.test = 3;