msgpackr 1.9.8 → 1.10.0

package/dist/test.js

@@ -984,6 +984,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();
@@ -1268,6 +1279,7 @@
 				}
 				if (hasSharedUpdate)
 					hasSharedUpdate = false;
+				let encodingError;
 				try {
 					if (packr.randomAccessStructure && value && value.constructor && value.constructor === Object)
 						writeStruct(value);
@@ -1318,6 +1330,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 +1341,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)
+							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 +1690,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;
@@ -1922,7 +1957,7 @@
 				}
 			};
 			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;
@@ -2223,7 +2258,7 @@
 			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;
@@ -2231,12 +2266,12 @@
 		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;
 		}
 
@@ -2274,13 +2309,13 @@
 				};
 			}
 			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) {
@@ -2319,13 +2354,13 @@
 					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)) {
@@ -2427,6 +2462,8 @@
 						position = updatedPosition;
 					} else queuedReferences.push(key, value, keyIndex);
 					break;
+				default:
+					queuedReferences.push(key, value, keyIndex);
 			}
 			keyIndex++;
 		}
@@ -2484,9 +2521,10 @@
 					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) {
@@ -2560,7 +2598,7 @@
 			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;
 	}
@@ -3340,6 +3378,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() {
 
@@ -3609,6 +3663,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}}');