msgpackr 1.7.0 → 1.7.1

package/pack.js

@@ -125,12 +125,11 @@ export class Packr extends Unpackr {
 					writeStruct(value);
 				else
 					pack(value)
-				if (bundledStrings) {
-					writeBundles(start, pack)
-				}
-				packr.offset = position // 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 += referenceMap.idsToInsert.length * 6
+					let incrementPosition = referenceMap.idsToInsert.length * 6;
+					if (bundledStrings)
+						writeBundles(start, pack, incrementPosition)
+					position += incrementPosition
 					if (position > safeEnd)
 						makeRoom(position)
 					packr.offset = position
@@ -138,6 +137,9 @@ export class Packr extends Unpackr {
 					referenceMap = null
 					return serialized
 				}
+				if (bundledStrings)
+					writeBundles(start, pack, 0)
+				packr.offset = position // 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
@@ -922,12 +924,11 @@ function insertIds(serialized, idsToInsert) {
 	return serialized
 }
 
-function writeBundles(start, pack) {
+function writeBundles(start, pack, incrementPosition) {
 	if (bundledStrings.length > 0) {
-		targetView.setUint32(bundledStrings.position + start, position - bundledStrings.position - start)
+		targetView.setUint32(bundledStrings.position + start, position + incrementPosition - bundledStrings.position - start)
 		let writeStrings = bundledStrings
 		bundledStrings = null
-		let startPosition = position
 		pack(writeStrings[0])
 		pack(writeStrings[1])
 	}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "msgpackr",
   "author": "Kris Zyp",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "Ultra-fast MessagePack implementation with extensions for records and structured cloning",
   "license": "MIT",
   "types": "./index.d.ts",

package/struct.js

@@ -492,7 +492,7 @@ function readStruct(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);
@@ -784,7 +784,7 @@ function prepareStructures(structures, packr) {
 			packr._mergeStructures(existing);
 		return compatible;
 	};
-	packr.lastTypedStructuresLength = packr.typedStructs?.length;
+	packr.lastTypedStructuresLength = packr.typedStructs && packr.typedStructs.length;
 	return structures;
 }
 

package/unpack.js

@@ -193,7 +193,7 @@ export function checkedRead(options) {
 
 		if (position == srcEnd) {
 			// finished reading this source, cleanup references
-			if (currentStructures?.restoreStructures)
+			if (currentStructures && currentStructures.restoreStructures)
 				restoreStructures()
 			currentStructures = null
 			src = null
@@ -208,7 +208,7 @@ export 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) {