msgpackr 1.7.0 → 1.7.1

package/dist/index.js

@@ -188,7 +188,7 @@
 
 			if (position == srcEnd) {
 				// finished reading this source, cleanup references
-				if (currentStructures?.restoreStructures)
+				if (currentStructures && currentStructures.restoreStructures)
 					restoreStructures();
 				currentStructures = null;
 				src = null;
@@ -203,7 +203,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) {
@@ -1186,12 +1186,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;
@@ -1199,6 +1198,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;
@@ -1966,9 +1968,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]);