msgpackr 1.8.5 → 1.9.0

package/dist/test.js

@@ -71,6 +71,8 @@
 					return this ? this.unpack(source, options) : Unpackr$1.prototype.unpack.call(defaultOptions, source, options)
 				})
 			}
+			if (!source.buffer && source.constructor === ArrayBuffer)
+				source = typeof Buffer !== 'undefined' ? Buffer.from(source) : new Uint8Array(source);
 			if (typeof options === 'object') {
 				srcEnd = options.end || source.length;
 				position$1 = options.start || 0;
@@ -208,7 +210,13 @@
 				// over read
 				throw new Error('Unexpected end of MessagePack data')
 			} else if (!sequentialMode) {
-				throw new Error('Data read, but end of buffer not reached ' + JSON.stringify(result).slice(0, 100))
+				let jsonView;
+				try {
+					jsonView = JSON.stringify(result, (_, value) => typeof value === "bigint" ? `${value}n` : value).slice(0, 100);
+				} catch(error) {
+					jsonView = '(JSON view not available ' + error + ')';
+				}
+				throw new Error('Data read, but end of buffer not reached ' + jsonView)
 			}
 			// else more to read, but we are reading sequentially, so don't clear source yet
 			return result
@@ -364,6 +372,9 @@
 						value += dataView.getUint32(position$1 + 4);
 					} else if (currentUnpackr.int64AsType === 'string') {
 						value = dataView.getBigUint64(position$1).toString();
+					} else if (currentUnpackr.int64AsType === 'auto') {
+						value = dataView.getBigUint64(position$1);
+						if (value<=BigInt(2)<<BigInt(52)) value=Number(value);
 					} else
 						value = dataView.getBigUint64(position$1);
 					position$1 += 8;
@@ -386,6 +397,9 @@
 						value += dataView.getUint32(position$1 + 4);
 					} else if (currentUnpackr.int64AsType === 'string') {
 						value = dataView.getBigInt64(position$1).toString();
+					} else if (currentUnpackr.int64AsType === 'auto') {
+						value = dataView.getBigInt64(position$1);
+						if (value>=BigInt(-2)<<BigInt(52)&&value<=BigInt(2)<<BigInt(52)) value=Number(value);
 					} else
 						value = dataView.getBigInt64(position$1);
 					position$1 += 8;
@@ -963,9 +977,10 @@
 	currentExtensions[0] = () => {}; // notepack defines extension 0 to mean undefined, so use that as the default here
 	currentExtensions[0].noBuffer = true;
 
+	let global = typeof globalThis === 'object' ? globalThis : window;
 	currentExtensions[0x65] = () => {
 		let data = read();
-		return (globalThis[data[0]] || Error)(data[1])
+		return (global[data[0]] || Error)(data[1])
 	};
 
 	currentExtensions[0x69] = (data) => {
@@ -1009,7 +1024,7 @@
 		if (!typedArrayName)
 			throw new Error('Could not find typed array for code ' + typeCode)
 		// we have to always slice/copy here to get a new ArrayBuffer that is word/byte aligned
-		return new globalThis[typedArrayName](Uint8Array.prototype.slice.call(data, 1).buffer)
+		return new global[typedArrayName](Uint8Array.prototype.slice.call(data, 1).buffer)
 	};
 	currentExtensions[0x78] = () => {
 		let data = read();
@@ -1245,7 +1260,7 @@
 				if (hasSharedUpdate)
 					hasSharedUpdate = false;
 				try {
-					if (packr.randomAccessStructure && value.constructor && value.constructor === Object)
+					if (packr.randomAccessStructure && value && value.constructor && value.constructor === Object)
 						writeStruct(value);
 					else
 						pack(value);
@@ -1532,21 +1547,24 @@
 						} else if (constructor === Array) {
 							packArray(value);
 						} else if (constructor === Map) {
-							length = value.size;
-							if (length < 0x10) {
-								target[position++] = 0x80 | length;
-							} else if (length < 0x10000) {
-								target[position++] = 0xde;
-								target[position++] = length >> 8;
-								target[position++] = length & 0xff;
-							} else {
-								target[position++] = 0xdf;
-								targetView.setUint32(position, length);
-								position += 4;
-							}
-							for (let [ key, entryValue ] of value) {
-								pack(key);
-								pack(entryValue);
+							if (this.mapAsEmptyObject) target[position++] = 0x80;
+							else {
+								length = value.size;
+								if (length < 0x10) {
+									target[position++] = 0x80 | length;
+								} else if (length < 0x10000) {
+									target[position++] = 0xde;
+									target[position++] = length >> 8;
+									target[position++] = length & 0xff;
+								} else {
+									target[position++] = 0xdf;
+									targetView.setUint32(position, length);
+									position += 4;
+								}
+								for (let [key, entryValue] of value) {
+									pack(key);
+									pack(entryValue);
+								}
 							}
 						} else {	
 							for (let i = 0, l = extensions.length; i < l; i++) {
@@ -1609,6 +1627,8 @@
 							if (Array.isArray(value)) {
 								packArray(value);
 							} else {
+								if (value.toJSON) // use this as an alternate mechanism for expressing how to serialize
+									return pack(value.toJSON());
 								// no extension found, write as object
 								writeObject(value, !value.hasOwnProperty); // if it doesn't have hasOwnProperty, don't do hasOwnProperty checks
 							}
@@ -1929,6 +1949,7 @@
 		}
 	}, {
 		pack(set, allocateForWrite, pack) {
+			if (this.setAsEmptyObject) return pack({})
 			let array = Array.from(set);
 			let { target, position} = allocateForWrite(this.moreTypes ? 3 : 0);
 			if (this.moreTypes) {
@@ -3039,6 +3060,15 @@
 			var deserialized = unpack(serialized);
 			assert.equal(deserialized, data);
 		});
+		test('use ArrayBuffer', function () {
+			const data = {prop: 'a test'};
+			var serialized = pack(data);
+			let ab = new ArrayBuffer(serialized.length);
+			let u8 = new Uint8Array(ab);
+			u8.set(serialized);
+			var deserialized = unpack(ab);
+			assert.deepEqual(deserialized, data);
+		});
 		test('pack/unpack varying data with random access structures', function () {
 			let structures = [];
 			let packr = new Packr({
@@ -3806,6 +3836,25 @@
 			var deserialized = packr.unpack(serialized);
 			assert.deepEqual(deserialized.a, 325283295382932843);
 		});
+		test('bigint to auto (float or bigint)', function() {
+			var data = {
+				a: -9007199254740993n,
+				b: -9007199254740992n,
+				c: 0n,
+				d: 9007199254740992n,
+				e: 9007199254740993n,
+			};
+			let packr = new Packr({
+				int64AsType: 'auto'
+			});
+			var serialized = packr.pack(data);
+			var deserialized = packr.unpack(serialized);
+			assert.deepEqual(deserialized.a, -9007199254740993n);
+			assert.deepEqual(deserialized.b, -9007199254740992);
+			assert.deepEqual(deserialized.c, 0);
+			assert.deepEqual(deserialized.d, 9007199254740992);
+			assert.deepEqual(deserialized.e, 9007199254740993n);
+		});
 		test('bigint to string', function() {
 			var data = {
 				a: 325283295382932843n,