msgpackr 1.8.4 → 1.9.0

package/dist/node.cjs

@@ -73,6 +73,8 @@ class Unpackr {
 				return this ? this.unpack(source, options) : Unpackr.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;
@@ -210,7 +212,13 @@ function checkedRead(options) {
 			// 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
@@ -366,6 +374,9 @@ function read() {
 					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;
@@ -388,6 +399,9 @@ function read() {
 					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;
@@ -967,9 +981,10 @@ const recordDefinition = (id, highByte) => {
 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) => {
@@ -1013,7 +1028,7 @@ currentExtensions[0x74] = (data) => {
 	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();
@@ -1250,7 +1265,7 @@ class Packr extends Unpackr {
 			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);
@@ -1537,21 +1552,24 @@ class Packr extends Unpackr {
 					} 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++) {
@@ -1614,6 +1632,8 @@ class Packr extends Unpackr {
 						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
 						}
@@ -1934,6 +1954,7 @@ extensions = [{
 	}
 }, {
 	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) {
@@ -2477,11 +2498,11 @@ function writeStruct(object, target, position, structures, makeRoom, pack, packr
 		case 3:
 			if (recordId >= 0x10000) return 0;
 			target[start] = 0x39;
-			target.setUint16(start + 1, recordId, true);
+			targetView.setUint16(start + 1, recordId, true);
 			break;
 		case 4:
 			if (recordId >= 0x1000000) return 0;
-			target.setUint32(start, (recordId << 8) + 0x3a, true);
+			targetView.setUint32(start, (recordId << 8) + 0x3a, true);
 			break;
 	}