msgpackr 1.7.0 → 1.7.1

package/dist/node.cjs

@@ -196,7 +196,7 @@ function checkedRead(options) {
 
 		if (position == srcEnd) {
 			// finished reading this source, cleanup references
-			if (currentStructures?.restoreStructures)
+			if (currentStructures && currentStructures.restoreStructures)
 				restoreStructures();
 			currentStructures = null;
 			src = null;
@@ -211,7 +211,7 @@ function checkedRead(options) {
 		// 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) {
@@ -1254,12 +1254,11 @@ class Packr extends Unpackr {
 					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;
@@ -1267,6 +1266,9 @@ class Packr extends Unpackr {
 					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;
@@ -2045,9 +2047,9 @@ function insertIds(serialized, idsToInsert) {
 	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]);
@@ -2540,7 +2542,7 @@ function readStruct$1(src, position, srcEnd, unpackr) {
 			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);
@@ -2832,7 +2834,7 @@ function prepareStructures$1(structures, packr) {
 			packr._mergeStructures(existing);
 		return compatible;
 	};
-	packr.lastTypedStructuresLength = packr.typedStructs?.length;
+	packr.lastTypedStructuresLength = packr.typedStructs && packr.typedStructs.length;
 	return structures;
 }