msgpackr 1.10.2 → 1.11.1

package/dist/node.cjs

@@ -1001,7 +1001,7 @@ currentExtensions[0x42] = (data) => {
 	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(8);
 		value += BigInt(data[i]);
 	}
 	return value;
@@ -1208,7 +1208,7 @@ class Packr extends Unpackr {
 		let structures;
 		let referenceMap;
 		let encodeUtf8 = ByteArray.prototype.utf8Write ? function(string, position) {
-			return target.utf8Write(string, position, 0xffffffff)
+			return target.utf8Write(string, position, target.byteLength - position)
 		} : (textEncoder$1 && textEncoder$1.encodeInto) ?
 			function(string, position) {
 				return textEncoder$1.encodeInto(string, target.subarray(position)).written
@@ -1233,7 +1233,7 @@ class Packr extends Unpackr {
 		if (!this.structures && options.useRecords != false)
 			this.structures = [];
 		// two byte record ids for shared structures
-		let useTwoByteRecords = maxSharedStructures > 32 || (maxOwnStructures + maxSharedStructures > 64);		
+		let useTwoByteRecords = maxSharedStructures > 32 || (maxOwnStructures + maxSharedStructures > 64);
 		let sharedLimitId = maxSharedStructures + 0x40;
 		let maxStructureId = maxSharedStructures + maxOwnStructures + 0x40;
 		if (maxStructureId > 8256) {
@@ -1251,7 +1251,7 @@ class Packr extends Unpackr {
 			}
 			safeEnd = target.length - 10;
 			if (safeEnd - position < 0x800) {
-				// don't start too close to the end, 
+				// don't start too close to the end,
 				target = new ByteArrayAllocate(target.length);
 				targetView = target.dataView || (target.dataView = new DataView(target.buffer, 0, target.length));
 				safeEnd = target.length - 10;
@@ -1594,7 +1594,7 @@ class Packr extends Unpackr {
 							targetView.setUint32(position, referee.id);
 							position += 4;
 							return
-						} else 
+						} else
 							referenceMap.set(value, { offset: position - start });
 					}
 					let constructor = value.constructor;
@@ -1622,7 +1622,7 @@ class Packr extends Unpackr {
 								pack(entryValue);
 							}
 						}
-					} else {	
+					} else {
 						for (let i = 0, l = extensions.length; i < l; i++) {
 							let extensionClass = extensionClasses[i];
 							if (value instanceof extensionClass) {
@@ -1690,11 +1690,11 @@ class Packr extends Unpackr {
 								if (json !== value)
 									return pack(json)
 							}
-							
+
 							// if there is a writeFunction, use it, otherwise just encode as undefined
 							if (type === 'function')
 								return pack(this.writeFunction && this.writeFunction(value));
-							
+
 							// no extension found, write as plain object
 							writeObject(value);
 						}
@@ -1716,18 +1716,20 @@ 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))) {
+					} else if (this.largeBigIntToString) {
+						return pack(value.toString());
+					} else if (this.useBigIntExtension && value < BigInt(2)**BigInt(1023) && value > -(BigInt(2)**BigInt(1023))) {
 						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);
+							let byte = value & BigInt(0xff);
+							alignedSign = (byte & BigInt(0x80)) === (value < BigInt(0) ? BigInt(0x80) : BigInt(0));
 							bytes.push(byte);
-							value >>= 8n;
-						} while (!((value === 0n || value === -1n) && alignedSign));
+							value >>= BigInt(8);
+						} while (!((value === BigInt(0) || value === BigInt(-1)) && alignedSign));
 						target[position-2] = bytes.length;
 						for (let i = bytes.length; i > 0;) {
 							target[position++] = Number(bytes[--i]);
@@ -1735,7 +1737,8 @@ class Packr extends Unpackr {
 						return
 					} else {
 						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')
+							' useBigIntExtension, or set largeBigIntToFloat to convert to float-64, or set' +
+							' largeBigIntToString to convert to string')
 					}
 				}
 				position += 8;
@@ -1752,9 +1755,19 @@ class Packr extends Unpackr {
 			}
 		};
 
-		const writePlainObject = (this.variableMapSize || this.coercibleKeyAsNumber) ? (object) => {
+		const writePlainObject = (this.variableMapSize || this.coercibleKeyAsNumber || this.skipValues) ? (object) => {
 			// this method is slightly slower, but generates "preferred serialization" (optimally small for smaller objects)
-			let keys = Object.keys(object);
+			let keys;
+			if (this.skipValues) {
+				keys = [];
+				for (let key in object) {
+					if ((typeof object.hasOwnProperty !== 'function' || object.hasOwnProperty(key)) &&
+						!this.skipValues.includes(object[key]))
+						keys.push(key);
+				}
+			} else {
+				keys = Object.keys(object);
+			}
 			let length = keys.length;
 			if (length < 0x10) {
 				target[position++] = 0x80 | length;
@@ -1795,6 +1808,10 @@ class Packr extends Unpackr {
 					size++;
 				}
 			}
+			if (size > 0xffff) {
+				throw new Error('Object is too large to serialize with fast 16-bit map size,' +
+				' use the "variableMapSize" option to serialize this object');
+			}
 			target[objectOffset++ + start] = size >> 8;
 			target[objectOffset + start] = size & 0xff;
 		};
@@ -1873,9 +1890,9 @@ class Packr extends Unpackr {
 				}
 		};
 
-		// craete reference to useRecords if useRecords is a function
+		// create reference to useRecords if useRecords is a function
 		const checkUseRecords = typeof this.useRecords == 'function' && this.useRecords;
-		
+
 		const writeObject = checkUseRecords ? (object) => {
 			checkUseRecords(object) ? writeRecord(object) : writePlainObject(object);
 		} : writeRecord;
@@ -2003,9 +2020,15 @@ class Packr extends Unpackr {
 	useBuffer(buffer) {
 		// this means we are finished using our own buffer and we can write over it safely
 		target = buffer;
-		targetView = new DataView(target.buffer, target.byteOffset, target.byteLength);
+		target.dataView || (target.dataView = new DataView(target.buffer, target.byteOffset, target.byteLength));
 		position = 0;
 	}
+	set position (value) {
+		position = value;
+	}
+	get position() {
+		return position;
+	}
 	clearSharedData() {
 		if (this.structures)
 			this.structures = [];
@@ -2143,7 +2166,7 @@ function writeBuffer(buffer, allocateForWrite) {
 		target[position++] = length >> 8;
 		target[position++] = length & 0xff;
 	} else {
-		var { target, position, targetView } = allocateForWrite(length + 5);
+		let { target, position, targetView } = allocateForWrite(length + 5);
 		target[position++] = 0xc6;
 		targetView.setUint32(position, length);
 		position += 4;
@@ -2281,7 +2304,7 @@ try {
 	textEncoder = new TextEncoder();
 } catch (error) {}
 const encodeUtf8 = hasNodeBuffer ? function(target, string, position) {
-	return target.utf8Write(string, position, 0xffffffff)
+	return target.utf8Write(string, position, target.byteLength - position)
 } : (textEncoder && textEncoder.encodeInto) ?
 	function(target, string, position) {
 		return textEncoder.encodeInto(string, target.subarray(position)).written
@@ -2722,6 +2745,8 @@ function readStruct(src, position, srcEnd, unpackr) {
 		src = Uint8Array.prototype.slice.call(src, position, srcEnd);
 		srcEnd -= position;
 		position = 0;
+		if (!unpackr.getStructures)
+			throw new Error(`Reference to shared structure ${recordId} without getStructures method`);
 		unpackr._mergeStructures(unpackr.getStructures());
 		if (!unpackr.typedStructs)
 			throw new Error('Could not find any shared typed structures');