msgpackr 1.9.9 → 1.10.0

package/dist/index.js

@@ -932,6 +932,17 @@
 	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();
@@ -1206,6 +1217,7 @@
 				}
 				if (hasSharedUpdate)
 					hasSharedUpdate = false;
+				let encodingError;
 				try {
 					if (packr.randomAccessStructure && value && value.constructor && value.constructor === Object)
 						writeStruct(value);
@@ -1256,6 +1268,9 @@
 						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();
@@ -1264,12 +1279,14 @@
 							// 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(structures, packr);
-							if (packr.saveStructures(newSharedData, newSharedData.isCompatible) === false) {
-								// get updated structures and try again if the update failed
-								return packr.pack(value, encodeOptions)
+							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)
@@ -1611,8 +1628,26 @@
 						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;