msgpackr 1.10.2 → 1.11.1

package/pack.js

@@ -28,7 +28,7 @@ export 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 && textEncoder.encodeInto) ?
 			function(string, position) {
 				return textEncoder.encodeInto(string, target.subarray(position)).written
@@ -53,7 +53,7 @@ export 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) {
@@ -71,7 +71,7 @@ export 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
@@ -414,7 +414,7 @@ export class Packr extends Unpackr {
 							targetView.setUint32(position, referee.id)
 							position += 4
 							return
-						} else 
+						} else
 							referenceMap.set(value, { offset: position - start })
 					}
 					let constructor = value.constructor
@@ -442,7 +442,7 @@ export 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) {
@@ -510,11 +510,11 @@ export 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)
 						}
@@ -536,18 +536,20 @@ export 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]);
@@ -555,7 +557,8 @@ export 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
@@ -572,9 +575,19 @@ export 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
@@ -615,6 +628,10 @@ export 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
 		}
@@ -693,9 +710,9 @@ export 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
@@ -823,9 +840,15 @@ export 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 = []
@@ -834,12 +857,6 @@ export class Packr extends Unpackr {
 	}
 }
 
-function copyBinary(source, target, targetOffset, offset, endOffset) {
-	while (offset < endOffset) {
-		target[targetOffset++] = source[offset++]
-	}
-}
-
 extensionClasses = [ Date, Set, Error, RegExp, ArrayBuffer, Object.getPrototypeOf(Uint8Array.prototype).constructor /*TypedArray*/, C1Type ]
 extensions = [{
 	pack(date, allocateForWrite, pack) {
@@ -969,7 +986,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
@@ -1084,4 +1101,4 @@ import { FLOAT32_OPTIONS } from './unpack.js'
 export const { NEVER, ALWAYS, DECIMAL_ROUND, DECIMAL_FIT } = FLOAT32_OPTIONS
 export const REUSE_BUFFER_MODE = 512
 export const RESET_BUFFER_MODE = 1024
-export const RESERVE_START_SPACE = 2048
+export const RESERVE_START_SPACE = 2048

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "msgpackr",
   "author": "Kris Zyp",
-  "version": "1.10.2",
+  "version": "1.11.1",
   "description": "Ultra-fast MessagePack implementation with extensions for records and structured cloning",
   "license": "MIT",
   "types": "./index.d.ts",

package/struct.js

@@ -60,7 +60,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
@@ -504,6 +504,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');

package/unpack.js

@@ -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;