msgpackr 1.9.9 → 1.10.1

package/dist/test.js

@@ -910,7 +910,7 @@
 				return readFixedString(length)
 		} else { // not cacheable, go back and do a standard read
 			position$1--;
-			return read().toString()
+			return asSafeString(read())
 		}
 		let key = ((length << 5) ^ (length > 1 ? dataView.getUint16(position$1) : length > 0 ? src[position$1] : 0)) & 0xfff;
 		let entry = keyCache[key];
@@ -962,9 +962,15 @@
 		return entry.string = readFixedString(length)
 	}
 
+	function asSafeString(property) {
+		if (typeof property === 'string') return property;
+		if (typeof property === 'number') return property.toString();
+		throw new Error('Invalid property type for record', typeof property);
+	}
 	// the registration of the record definition extension (as "r")
 	const recordDefinition = (id, highByte) => {
-		let structure = read().map(property => property.toString()); // ensure that all keys are strings and that the array is mutable
+		let structure = read().map(asSafeString); // 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);
@@ -984,6 +990,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();
@@ -992,6 +1009,7 @@
 
 	currentExtensions[0x69] = (data) => {
 		// id extension (for structured clones)
+		if (currentUnpackr.structuredClone === false) throw new Error('Structured clone extension is disabled')
 		let id = dataView.getUint32(position$1 - 4);
 		if (!referenceMap)
 			referenceMap = new Map();
@@ -1015,6 +1033,7 @@
 
 	currentExtensions[0x70] = (data) => {
 		// pointer extension (for structured clones)
+		if (currentUnpackr.structuredClone === false) throw new Error('Structured clone extension is disabled')
 		let id = dataView.getUint32(position$1 - 4);
 		let refEntry = referenceMap.get(id);
 		refEntry.used = true;
@@ -1268,6 +1287,7 @@
 				}
 				if (hasSharedUpdate)
 					hasSharedUpdate = false;
+				let encodingError;
 				try {
 					if (packr.randomAccessStructure && value && value.constructor && value.constructor === Object)
 						writeStruct(value);
@@ -1318,6 +1338,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();
@@ -1326,12 +1349,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$1(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)
@@ -1673,8 +1698,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;
@@ -2427,6 +2470,8 @@
 						position = updatedPosition;
 					} else queuedReferences.push(key, value, keyIndex);
 					break;
+				default:
+					queuedReferences.push(key, value, keyIndex);
 			}
 			keyIndex++;
 		}
@@ -3341,6 +3386,22 @@
 			assert.equal(pack(123).length, 1);
 		});
 
+		test('BigInt', function() {
+			let packr = new Packr({useBigIntExtension: true});
+			let data = {
+				a: 3333333333333333333333333333n,
+				b: 1234567890123456789012345678901234567890n,
+				c: -3333333333333333333333333333n,
+				d: -352523523642364364364264264264264264262642642n,
+				e: 0xffffffffffffffffffffffffffn,
+				f: -0xffffffffffffffffffffffffffn,
+			};
+			let serialized = packr.pack(data);
+			let deserialized = packr.unpack(serialized);
+			assert.deepEqual(data, deserialized);
+		});
+
+
 		test('extended class pack/unpack', function(){
 			function Extended() {
 
@@ -3610,6 +3671,19 @@
 			var deserialized = unpack(serialized);
 			assert.equal(deserialized.aDate, data.aDate.toString());
 		});
+		test('standard pack fails on circular reference with shared structures', function () {
+			var data = {};
+			data.self = data;
+			let structures = [];
+			let packr = new Packr({
+				structures,
+				saveStructures(structures) {
+				}
+			});
+			assert.throws(function () {
+				packr.pack(data);
+			});
+		});
 
 		test('proto handling', function() {
 			var objectWithProto = JSON.parse('{"__proto__":{"foo":3}}');