msgpackr 1.9.8 → 1.10.0

package/dist/node.cjs

@@ -988,6 +988,17 @@ const recordDefinition = (id, highByte) => {
 currentExtensions[0] = () => {}; // notepack defines extension 0 to mean undefined, so use that as the default here
 currentExtensions[0].noBuffer = true;
 
+currentExtensions[0x42] = (data) => {
+	// decode bigint
+	let length = data.length;
+	let value = BigInt(data[0] & 0x80 ? data[0] - 0x100 : data[0]);
+	for (let i = 1; i < length; i++) {
+		value <<= 8n;
+		value += BigInt(data[i]);
+	}
+	return value;
+};
+
 let errors = { Error, TypeError, ReferenceError };
 currentExtensions[0x65] = () => {
 	let data = read();
@@ -1273,6 +1284,7 @@ class Packr extends Unpackr {
 			}
 			if (hasSharedUpdate)
 				hasSharedUpdate = false;
+			let encodingError;
 			try {
 				if (packr.randomAccessStructure && value && value.constructor && value.constructor === Object)
 					writeStruct(value);
@@ -1323,6 +1335,9 @@ class Packr extends Unpackr {
 					return target
 				}
 				return target.subarray(start, position) // position can change if we call pack again in saveStructures, so we get the buffer now
+			} catch(error) {
+				encodingError = error;
+				throw error;
 			} finally {
 				if (structures) {
 					resetStructures();
@@ -1331,12 +1346,14 @@ class Packr extends Unpackr {
 						// we can't rely on start/end with REUSE_BUFFER_MODE since they will (probably) change when we save
 						let returnBuffer = target.subarray(start, position);
 						let newSharedData = prepareStructures$1(structures, packr);
-						if (packr.saveStructures(newSharedData, newSharedData.isCompatible) === false) {
-							// get updated structures and try again if the update failed
-							return packr.pack(value)
+						if (!encodingError) { // TODO: If there is an encoding error, should make the structures as uninitialized so they get rebuilt next time
+							if (packr.saveStructures(newSharedData, newSharedData.isCompatible) === false) {
+								// get updated structures and try again if the update failed
+								return packr.pack(value, encodeOptions)
+							}
+							packr.lastNamedStructuresLength = sharedLength;
+							return returnBuffer
 						}
-						packr.lastNamedStructuresLength = sharedLength;
-						return returnBuffer
 					}
 				}
 				if (encodeOptions & RESET_BUFFER_MODE)
@@ -1678,8 +1695,26 @@ class Packr extends Unpackr {
 					if (this.largeBigIntToFloat) {
 						target[position++] = 0xcb;
 						targetView.setFloat64(position, Number(value));
+					} else if (this.useBigIntExtension && value < 2n**(1023n) && value > -(2n**(1023n))) {
+						target[position++] = 0xc7;
+						position++;
+						target[position++] = 0x42; // "B" for BigInt
+						let bytes = [];
+						let alignedSign;
+						do {
+							let byte = value & 0xffn;
+							alignedSign = (byte & 0x80n) === (value < 0n ? 0x80n : 0n);
+							bytes.push(byte);
+							value >>= 8n;
+						} while (!((value === 0n || value === -1n) && alignedSign));
+						target[position-2] = bytes.length;
+						for (let i = bytes.length; i > 0;) {
+							target[position++] = Number(bytes[--i]);
+						}
+						return
 					} else {
-						throw new RangeError(value + ' was too large to fit in MessagePack 64-bit integer format, set largeBigIntToFloat to convert to float-64')
+						throw new RangeError(value + ' was too large to fit in MessagePack 64-bit integer format, use' +
+							' useBigIntExtension or set largeBigIntToFloat to convert to float-64')
 					}
 				}
 				position += 8;
@@ -1927,7 +1962,7 @@ class Packr extends Unpackr {
 			}
 		};
 		const writeStruct = (object, safePrototype) => {
-			let newPosition = writeStructSlots(object, target, position, structures, makeRoom, (value, newPosition, notifySharedUpdate) => {
+			let newPosition = writeStructSlots(object, target, start, position, structures, makeRoom, (value, newPosition, notifySharedUpdate) => {
 				if (notifySharedUpdate)
 					return hasSharedUpdate = true;
 				position = newPosition;
@@ -2230,7 +2265,7 @@ const encodeUtf8 = hasNodeBuffer ? function(target, string, position) {
 		return textEncoder.encodeInto(string, target.subarray(position)).written
 	} : false;
 setWriteStructSlots(writeStruct, prepareStructures);
-function writeStruct(object, target, position, structures, makeRoom, pack, packr) {
+function writeStruct(object, target, encodingStart, position, structures, makeRoom, pack, packr) {
 	let typedStructs = packr.typedStructs || (packr.typedStructs = []);
 	// note that we rely on pack.js to load stored structures before we get to this point
 	let targetView = target.dataView;
@@ -2238,12 +2273,12 @@ function writeStruct(object, target, position, structures, makeRoom, pack, packr
 	let safeEnd = target.length - 10;
 	let start = position;
 	if (position > safeEnd) {
-		let lastStart = start;
 		target = makeRoom(position);
 		targetView = target.dataView;
-		position -= lastStart;
-		refsStartPosition -= lastStart;
-		start = 0;
+		position -= encodingStart;
+		start -= encodingStart;
+		refsStartPosition -= encodingStart;
+		encodingStart = 0;
 		safeEnd = target.length - 10;
 	}
 
@@ -2281,13 +2316,13 @@ function writeStruct(object, target, position, structures, makeRoom, pack, packr
 			};
 		}
 		if (position > safeEnd) {
-			let lastStart = start;
 			target = makeRoom(position);
 			targetView = target.dataView;
-			position -= lastStart;
-			refsStartPosition -= lastStart;
-			refPosition -= lastStart;
-			start = 0;
+			position -= encodingStart;
+			start -= encodingStart;
+			refsStartPosition -= encodingStart;
+			refPosition -= encodingStart;
+			encodingStart = 0;
 			safeEnd = target.length - 10;
 		}
 		switch (typeof value) {
@@ -2326,13 +2361,13 @@ function writeStruct(object, target, position, structures, makeRoom, pack, packr
 				let strLength = value.length;
 				refOffset = refPosition - refsStartPosition;
 				if ((strLength << 2) + refPosition > safeEnd) {
-					let lastStart = start;
 					target = makeRoom((strLength << 2) + refPosition);
 					targetView = target.dataView;
-					position -= lastStart;
-					refsStartPosition -= lastStart;
-					refPosition -= lastStart;
-					start = 0;
+					position -= encodingStart;
+					start -= encodingStart;
+					refsStartPosition -= encodingStart;
+					refPosition -= encodingStart;
+					encodingStart = 0;
 					safeEnd = target.length - 10;
 				}
 				if (strLength > ((0xff00 + refOffset) >> 2)) {
@@ -2434,6 +2469,8 @@ function writeStruct(object, target, position, structures, makeRoom, pack, packr
 					position = updatedPosition;
 				} else queuedReferences.push(key, value, keyIndex);
 				break;
+			default:
+				queuedReferences.push(key, value, keyIndex);
 		}
 		keyIndex++;
 	}
@@ -2491,9 +2528,10 @@ function writeStruct(object, target, position, structures, makeRoom, pack, packr
 				refPosition = newPosition.position;
 				targetView = newPosition.targetView;
 				target = newPosition.target;
-				refsStartPosition -= start;
-				position -= start;
-				start = 0;
+				refsStartPosition -= encodingStart;
+				position -= encodingStart;
+				start -= encodingStart;
+				encodingStart = 0;
 			} else
 				refPosition = newPosition;
 			if (size === 2) {
@@ -2567,7 +2605,7 @@ function writeStruct(object, target, position, structures, makeRoom, pack, packr
 		if (refsStartPosition === refPosition)
 			return position; // no refs
 		typedStructs.lastStringStart = position - start;
-		return writeStruct(object, target, start, structures, makeRoom, pack, packr);
+		return writeStruct(object, target, encodingStart, start, structures, makeRoom, pack, packr);
 	}
 	return refPosition;
 }