msgpackr 2.0.0 → 2.0.2

package/unpack.js

@@ -137,6 +137,8 @@ export class Unpackr {
 		}
 	}
 	_mergeStructures(loadedStructures, existingStructures) {
+		if (this._onLoadedStructures)
+			loadedStructures = this._onLoadedStructures(loadedStructures);
 		loadedStructures = loadedStructures || [];
 		if (Object.isFrozen(loadedStructures))
 			loadedStructures = loadedStructures.map(structure => structure.slice(0));
@@ -176,7 +178,15 @@ export function checkedRead(options) {
 			if (sharedLength < currentStructures.length)
 				currentStructures.length = sharedLength;
 		}
-		let result = read();
+		let result;
+		if (currentUnpackr._readStruct && src[position] < 0x40 && src[position] >= 0x20) {
+			result = currentUnpackr._readStruct(src, position, srcEnd);
+			src = null; // dispose of this so that recursive unpack calls don't save state
+			if (!(options && options.lazy) && result)
+				result = result.toJSON();
+			position = srcEnd;
+		} else
+			result = read();
 		if (bundledStrings) { // bundled strings to skip past
 			position = bundledStrings.postBundlePosition;
 			bundledStrings = null;
@@ -1151,6 +1161,8 @@ currentExtensions[0xff] = (data) => {
 // currentExtensions[0x52] = () =>
 
 function saveState(callback) {
+	if (currentUnpackr && currentUnpackr._onSaveState)
+		currentUnpackr._onSaveState();
 	let savedSrcEnd = srcEnd;
 	let savedPosition = position;
 	let savedStringPosition = stringPosition;
@@ -1220,3 +1232,7 @@ export function roundFloat32(float32Number) {
 	let multiplier = mult10[((u8Array[3] & 0x7f) << 1) | (u8Array[2] >> 7)];
 	return ((multiplier * float32Number + (float32Number > 0 ? 0.5 : -0.5)) >> 0) / multiplier;
 }
+// Marker for downstream libraries (e.g. structon) to detect per-instance
+// struct-decoding hooks (this._readStruct, this._onLoadedStructures,
+// this._onSaveState).  See `checkedRead` for the dispatch.
+Unpackr.SUPPORTS_STRUCT_HOOKS = true;