msgpackr 1.9.5 → 1.9.7

package/dist/test.js

@@ -1319,25 +1319,9 @@
 					return target.subarray(start, position) // position can change if we call pack again in saveStructures, so we get the buffer now
 				} finally {
 					if (structures) {
-						if (serializationsSinceTransitionRebuild < 10)
-							serializationsSinceTransitionRebuild++;
-						let sharedLength = structures.sharedLength || 0;
-						if (structures.length > sharedLength && !isSequential)
-							structures.length = sharedLength;
-						if (transitionsCount > 10000) {
-							// force a rebuild occasionally after a lot of transitions so it can get cleaned up
-							structures.transitions = null;
-							serializationsSinceTransitionRebuild = 0;
-							transitionsCount = 0;
-							if (recordIdsToRemove.length > 0)
-								recordIdsToRemove = [];
-						} else if (recordIdsToRemove.length > 0 && !isSequential) {
-							for (let i = 0, l = recordIdsToRemove.length; i < l; i++) {
-								recordIdsToRemove[i][RECORD_SYMBOL] = 0;
-							}
-							recordIdsToRemove = [];
-						}
+						resetStructures();
 						if (hasSharedUpdate && packr.saveStructures) {
+							let sharedLength = structures.sharedLength || 0;
 							// 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);
 							let newSharedData = prepareStructures$1(structures, packr);
@@ -1353,6 +1337,26 @@
 						position = start;
 				}
 			};
+			const resetStructures = () => {
+				if (serializationsSinceTransitionRebuild < 10)
+					serializationsSinceTransitionRebuild++;
+				let sharedLength = structures.sharedLength || 0;
+				if (structures.length > sharedLength && !isSequential)
+					structures.length = sharedLength;
+				if (transitionsCount > 10000) {
+					// force a rebuild occasionally after a lot of transitions so it can get cleaned up
+					structures.transitions = null;
+					serializationsSinceTransitionRebuild = 0;
+					transitionsCount = 0;
+					if (recordIdsToRemove.length > 0)
+						recordIdsToRemove = [];
+				} else if (recordIdsToRemove.length > 0 && !isSequential) {
+					for (let i = 0, l = recordIdsToRemove.length; i < l; i++) {
+						recordIdsToRemove[i][RECORD_SYMBOL] = 0;
+					}
+					recordIdsToRemove = [];
+				}
+			};
 			const packArray = (value) => {
 				var length = value.length;
 				if (length < 0x10) {
@@ -1802,8 +1806,9 @@
 				}
 				// now write the values
 				for (let key in object)
-					if (safePrototype || object.hasOwnProperty(key))
+					if (safePrototype || object.hasOwnProperty(key)) {
 						pack(object[key]);
+					}
 			};
 
 			// craete reference to useRecords if useRecords is a function
@@ -1922,6 +1927,7 @@
 					position = newPosition;
 					let startTarget = target;
 					pack(value);
+					resetStructures();
 					if (startTarget !== target) {
 						return { position, targetView, target }; // indicate the buffer was re-allocated
 					}
@@ -2278,25 +2284,28 @@
 			switch (typeof value) {
 				case 'number':
 					let number = value;
-					if (number >> 0 === number && number < 0x20000000 && number > -0x1f000000) {
-						if (number < 0xf6 && number >= 0 && (nextTransition.num8 || number < 0x20 && !nextTransition.num32)) {
-							transition = nextTransition.num8 || createTypeTransition(nextTransition, NUMBER, 1);
-							target[position++] = number;
-						} else {
-							transition = nextTransition.num32 || createTypeTransition(nextTransition, NUMBER, 4);
-							targetView.setUint32(position, number, true);
-							position += 4;
-						}
-						break;
-					} else if (number < 0x100000000 && number >= -0x80000000) {
-						targetView.setFloat32(position, number, true);
-						if (float32Headers[target[position + 3] >>> 5]) {
-							let xShifted;
-							// this checks for rounding of numbers that were encoded in 32-bit float to nearest significant decimal digit that could be preserved
-							if (((xShifted = number * mult10[((target[position + 3] & 0x7f) << 1) | (target[position + 2] >> 7)]) >> 0) === xShifted) {
+					// first check to see if we are using a lot of ids and should default to wide/common format
+					if (nextId < 200 || !nextTransition.num64) {
+						if (number >> 0 === number && number < 0x20000000 && number > -0x1f000000) {
+							if (number < 0xf6 && number >= 0 && (nextTransition.num8 && !(nextId > 200 && nextTransition.num32) || number < 0x20 && !nextTransition.num32)) {
+								transition = nextTransition.num8 || createTypeTransition(nextTransition, NUMBER, 1);
+								target[position++] = number;
+							} else {
 								transition = nextTransition.num32 || createTypeTransition(nextTransition, NUMBER, 4);
+								targetView.setUint32(position, number, true);
 								position += 4;
-								break;
+							}
+							break;
+						} else if (number < 0x100000000 && number >= -0x80000000) {
+							targetView.setFloat32(position, number, true);
+							if (float32Headers[target[position + 3] >>> 5]) {
+								let xShifted;
+								// this checks for rounding of numbers that were encoded in 32-bit float to nearest significant decimal digit that could be preserved
+								if (((xShifted = number * mult10[((target[position + 3] & 0x7f) << 1) | (target[position + 2] >> 7)]) >> 0) === xShifted) {
+									transition = nextTransition.num32 || createTypeTransition(nextTransition, NUMBER, 4);
+									position += 4;
+									break;
+								}
 							}
 						}
 					}