msgpackr 1.5.3 → 1.5.6

package/dist/node.cjs

@@ -32,6 +32,13 @@ class C1Type {}
 const C1 = new C1Type();
 C1.name = 'MessagePack 0xC1';
 var sequentialMode = false;
+var inlineObjectReadThreshold = 2;
+try {
+	new Function('');
+} catch(error) {
+	// if eval variants are not supported, do not create inline object readers ever
+	inlineObjectReadThreshold = Infinity;
+}
 
 class Unpackr {
 	constructor(options) {
@@ -442,7 +449,7 @@ const validName = /^[a-zA-Z_$][a-zA-Z\d_$]*$/;
 function createStructureReader(structure, firstId) {
 	function readObject() {
 		// This initial function is quick to instantiate, but runs slower. After several iterations pay the cost to build the faster function
-		if (readObject.count++ > 2) {
+		if (readObject.count++ > inlineObjectReadThreshold) {
 			let readObject = structure.read = (new Function('r', 'return function(){return {' + structure.map(key => validName.test(key) ? key + ':r()' : ('[' + JSON.stringify(key) + ']:r()')).join(',') + '}}'))(read);
 			if (structure.highByte === 0)
 				structure.read = createSecondByteReader(firstId, structure.read);
@@ -1069,7 +1076,6 @@ class Packr extends Unpackr {
 		super(options);
 		this.offset = 0;
 		let start;
-		let sharedStructures;
 		let hasSharedUpdate;
 		let structures;
 		let referenceMap;
@@ -1091,10 +1097,13 @@ class Packr extends Unpackr {
 			maxSharedStructures = hasSharedStructures ? 32 : 0;
 		if (maxSharedStructures > 8160)
 			throw new Error('Maximum maxSharedStructure is 8160')
+		if (options.structuredClone && options.moreTypes == undefined) {
+			options.moreTypes = true;
+		}
 		let maxOwnStructures = options.maxOwnStructures;
 		if (maxOwnStructures == null)
 			maxOwnStructures = hasSharedStructures ? 32 : 64;
-		if (isSequential && !options.saveStructures)
+		if (!this.structures && options.useRecords != false)
 			this.structures = [];
 		// two byte record ids for shared structures
 		let useTwoByteRecords = maxSharedStructures > 32 || (maxOwnStructures + maxSharedStructures > 64);		
@@ -1129,23 +1138,23 @@ class Packr extends Unpackr {
 				bundledStrings$1.size = Infinity; // force a new bundle start on first string
 			} else
 				bundledStrings$1 = null;
-			sharedStructures = packr.structures;
-			if (sharedStructures) {
-				if (sharedStructures.uninitialized)
-					sharedStructures = packr._mergeStructures(packr.getStructures());
-				let sharedLength = sharedStructures.sharedLength || 0;
+			structures = packr.structures;
+			if (structures) {
+				if (structures.uninitialized)
+					structures = packr._mergeStructures(packr.getStructures());
+				let sharedLength = structures.sharedLength || 0;
 				if (sharedLength > maxSharedStructures) {
-					//if (maxSharedStructures <= 32 && sharedStructures.sharedLength > 32) // TODO: could support this, but would need to update the limit ids
-					throw new Error('Shared structures is larger than maximum shared structures, try increasing maxSharedStructures to ' + sharedStructures.sharedLength)
+					//if (maxSharedStructures <= 32 && structures.sharedLength > 32) // TODO: could support this, but would need to update the limit ids
+					throw new Error('Shared structures is larger than maximum shared structures, try increasing maxSharedStructures to ' + structures.sharedLength)
 				}
-				if (!sharedStructures.transitions) {
+				if (!structures.transitions) {
 					// rebuild our structure transitions
-					sharedStructures.transitions = Object.create(null);
+					structures.transitions = Object.create(null);
 					for (let i = 0; i < sharedLength; i++) {
-						let keys = sharedStructures[i];
+						let keys = structures[i];
 						if (!keys)
 							continue
-						let nextTransition, transition = sharedStructures.transitions;
+						let nextTransition, transition = structures.transitions;
 						for (let j = 0, l = keys.length; j < l; j++) {
 							let key = keys[j];
 							nextTransition = transition[key];
@@ -1159,12 +1168,11 @@ class Packr extends Unpackr {
 					lastSharedStructuresLength = sharedLength;
 				}
 				if (!isSequential) {
-					sharedStructures.nextId = sharedLength + 0x40;
+					structures.nextId = sharedLength + 0x40;
 				}
 			}
 			if (hasSharedUpdate)
 				hasSharedUpdate = false;
-			structures = sharedStructures || (packr.structures = []);
 			try {
 				pack(value);
 				if (bundledStrings$1) {
@@ -1187,14 +1195,15 @@ class Packr extends Unpackr {
 				}
 				return target.subarray(start, position$1) // position can change if we call pack again in saveStructures, so we get the buffer now
 			} finally {
-				if (sharedStructures) {
+				if (structures) {
 					if (serializationsSinceTransitionRebuild < 10)
 						serializationsSinceTransitionRebuild++;
-					if (sharedStructures.length > maxSharedStructures)
-						sharedStructures.length = maxSharedStructures;
+					let sharedLength = structures.sharedLength || maxSharedStructures;
+					if (structures.length > sharedLength)
+						structures.length = sharedLength;
 					if (transitionsCount > 10000) {
 						// force a rebuild occasionally after a lot of transitions so it can get cleaned up
-						sharedStructures.transitions = null;
+						structures.transitions = null;
 						serializationsSinceTransitionRebuild = 0;
 						transitionsCount = 0;
 						if (recordIdsToRemove.length > 0)
@@ -1206,13 +1215,9 @@ class Packr extends Unpackr {
 						recordIdsToRemove = [];
 					}
 					if (hasSharedUpdate && packr.saveStructures) {
-						let sharedLength = sharedStructures.sharedLength || maxSharedStructures;
-						if (sharedStructures.length > sharedLength) {
-							sharedStructures = sharedStructures.slice(0, sharedLength);
-						}
 						// 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$1);
-						if (packr.saveStructures(sharedStructures, lastSharedStructuresLength) === false) {
+						if (packr.saveStructures(structures, lastSharedStructuresLength) === false) {
 							// get updated structures and try again if the update failed
 							packr._mergeStructures(packr.getStructures());
 							return packr.pack(value)
@@ -1786,8 +1791,8 @@ extensions = [{
 }, {
 	pack(set, allocateForWrite, pack) {
 		let array = Array.from(set);
-		let { target, position} = allocateForWrite(this.structuredClone ? 3 : 0);
-		if (this.structuredClone) {
+		let { target, position} = allocateForWrite(this.moreTypes ? 3 : 0);
+		if (this.moreTypes) {
 			target[position++] = 0xd4;
 			target[position++] = 0x73; // 's' for Set
 			target[position++] = 0;
@@ -1796,8 +1801,8 @@ extensions = [{
 	}
 }, {
 	pack(error, allocateForWrite, pack) {
-		let { target, position} = allocateForWrite(this.structuredClone ? 3 : 0);
-		if (this.structuredClone) {
+		let { target, position} = allocateForWrite(this.moreTypes ? 3 : 0);
+		if (this.moreTypes) {
 			target[position++] = 0xd4;
 			target[position++] = 0x65; // 'e' for error
 			target[position++] = 0;
@@ -1806,8 +1811,8 @@ extensions = [{
 	}
 }, {
 	pack(regex, allocateForWrite, pack) {
-		let { target, position} = allocateForWrite(this.structuredClone ? 3 : 0);
-		if (this.structuredClone) {
+		let { target, position} = allocateForWrite(this.moreTypes ? 3 : 0);
+		if (this.moreTypes) {
 			target[position++] = 0xd4;
 			target[position++] = 0x78; // 'x' for regeXp
 			target[position++] = 0;
@@ -1816,7 +1821,7 @@ extensions = [{
 	}
 }, {
 	pack(arrayBuffer, allocateForWrite) {
-		if (this.structuredClone)
+		if (this.moreTypes)
 			writeExtBuffer(arrayBuffer, 0x10, allocateForWrite);
 		else
 			writeBuffer(hasNodeBuffer ? Buffer.from(arrayBuffer) : new Uint8Array(arrayBuffer), allocateForWrite);
@@ -1824,7 +1829,7 @@ extensions = [{
 }, {
 	pack(typedArray, allocateForWrite) {
 		let constructor = typedArray.constructor;
-		if (constructor !== ByteArray && this.structuredClone)
+		if (constructor !== ByteArray && this.moreTypes)
 			writeExtBuffer(typedArray, typedArrays.indexOf(constructor.name), allocateForWrite);
 		else
 			writeBuffer(typedArray, allocateForWrite);
@@ -2119,8 +2124,7 @@ function tryRequire(moduleId) {
 		let require$1 = module$1.createRequire((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('node.cjs', document.baseURI).href)));
 		return require$1(moduleId)
 	} catch (error) {
-		if (typeof window != 'undefined')
-			console.warn('For browser usage, directly use msgpackr/unpack or msgpackr/pack modules. ' + error.message.split('\n')[0]);
+		// native module is optional
 	}
 }