msgpackr 1.7.0 → 1.7.2

package/pack.js

@@ -125,19 +125,45 @@ 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
+				let lastBundle = bundledStrings;
+				if (bundledStrings)
+					writeBundles(start, pack, 0)
 				if (referenceMap && referenceMap.idsToInsert) {
-					position += referenceMap.idsToInsert.length * 6
+					let idsToInsert = referenceMap.idsToInsert.sort((a, b) => a.offset > b.offset ? 1 : -1);
+					let i = idsToInsert.length;
+					let incrementPosition = -1;
+					while (lastBundle && i > 0) {
+						let insertionPoint = idsToInsert[--i].offset + start;
+						if (insertionPoint < (lastBundle.stringsPosition + start) && incrementPosition === -1)
+							incrementPosition = 0;
+						if (insertionPoint > (lastBundle.position + start)) {
+							if (incrementPosition >= 0)
+								incrementPosition += 6;
+						} else {
+							if (incrementPosition >= 0) {
+								// update the bundle reference now
+								targetView.setUint32(lastBundle.position + start,
+									targetView.getUint32(lastBundle.position + start) + incrementPosition)
+								incrementPosition = -1; // reset
+							}
+							lastBundle = lastBundle.previous;
+							i++;
+						}
+					}
+					if (incrementPosition >= 0 && lastBundle) {
+						// update the bundle reference now
+						targetView.setUint32(lastBundle.position + start,
+							targetView.getUint32(lastBundle.position + start) + incrementPosition)
+					}
+					position += idsToInsert.length * 6;
 					if (position > safeEnd)
 						makeRoom(position)
 					packr.offset = position
-					let serialized = insertIds(target.subarray(start, position), referenceMap.idsToInsert)
+					let serialized = insertIds(target.subarray(start, position), idsToInsert)
 					referenceMap = null
 					return serialized
 				}
+				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
@@ -194,13 +220,15 @@ export class Packr extends Unpackr {
 						let maxBytes = (bundledStrings[0] ? bundledStrings[0].length * 3 + bundledStrings[1].length : 0) + 10
 						if (position + maxBytes > safeEnd)
 							target = makeRoom(position + maxBytes)
-						if (bundledStrings.position) { // here we use the 0x62 extension to write the last bundle and reserve sapce for the reference pointer to the next/current bundle
+						let lastBundle
+						if (bundledStrings.position) { // here we use the 0x62 extension to write the last bundle and reserve space for the reference pointer to the next/current bundle
+							lastBundle = bundledStrings
 							target[position] = 0xc8 // ext 16
 							position += 3 // reserve for the writing bundle size
 							target[position++] = 0x62 // 'b'
 							extStart = position - start
 							position += 4 // reserve for writing bundle reference
-							writeBundles(start, pack) // write the last bundles
+							writeBundles(start, pack, 0) // write the last bundles
 							targetView.setUint16(extStart + start - 3, position - start - extStart)
 						} else { // here we use the 0x62 extension just to reserve the space for the reference pointer to the bundle (will be updated once the bundle is written)
 							target[position++] = 0xd6 // fixext 4
@@ -209,6 +237,7 @@ export class Packr extends Unpackr {
 							position += 4 // reserve for writing bundle reference
 						}
 						bundledStrings = ['', ''] // create new ones
+						bundledStrings.previous = lastBundle;
 						bundledStrings.size = 0
 						bundledStrings.position = extStart
 					}
@@ -904,7 +933,6 @@ function insertIds(serialized, idsToInsert) {
 	let nextId
 	let distanceToMove = idsToInsert.length * 6
 	let lastEnd = serialized.length - distanceToMove
-	idsToInsert.sort((a, b) => a.offset > b.offset ? 1 : -1)
 	while (nextId = idsToInsert.pop()) {
 		let offset = nextId.offset
 		let id = nextId.id
@@ -922,12 +950,12 @@ 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)
+		bundledStrings.stringsPosition = 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.2",
   "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) {
@@ -869,7 +869,7 @@ function readExt(length) {
 		})
 	}
 	else
-		throw new Error('Unknown extension type ' + type)
+		throw new Error('Unknown extension type ' + type)``
 }
 
 var keyCache = new Array(4096)
@@ -884,7 +884,7 @@ function readKey() {
 			return readFixedString(length)
 	} else { // not cacheable, go back and do a standard read
 		position--
-		return read()
+		return read().toString()
 	}
 	let key = ((length << 5) ^ (length > 1 ? dataView.getUint16(position) : length > 0 ? src[position] : 0)) & 0xfff
 	let entry = keyCache[key]
@@ -938,16 +938,7 @@ function readKey() {
 
 // the registration of the record definition extension (as "r")
 const recordDefinition = (id, highByte) => {
-	let structure
-	if (currentUnpackr.freezeData) {
-		currentUnpackr.freezeData = false;
-		try {
-			structure = read()
-		} finally {
-			currentUnpackr.freezeData = true;
-		}
-	} else
-		structure = read()
+	let structure = read().map(property => property.toString()) // ensure that all keys are strings and that the array is mutable
 	let firstByte = id
 	if (highByte !== undefined) {
 		id = id < 32 ? -((highByte << 5) + id) : ((highByte << 5) + id)