msgpackr 1.7.0-alpha1 → 1.7.0-alpha4

package/unpack.js

@@ -28,7 +28,7 @@ export const C1 = new C1Type()
 C1.name = 'MessagePack 0xC1'
 var sequentialMode = false
 var inlineObjectReadThreshold = 2
-var readStruct
+var readStruct, onLoadedStructures
 try {
 	new Function('')
 } catch(error) {
@@ -58,16 +58,21 @@ export class Unpackr {
 		}
 		Object.assign(this, options)
 	}
-	unpack(source, end) {
+	unpack(source, options) {
 		if (src) {
 			// re-entrant execution, save the state and restore it after we do this unpack
 			return saveState(() => {
 				clearSource()
-				return this ? this.unpack(source, end) : Unpackr.prototype.unpack.call(defaultOptions, source, end)
+				return this ? this.unpack(source, options) : Unpackr.prototype.unpack.call(defaultOptions, source, options)
 			})
 		}
-		srcEnd = end > -1 ? end : source.length
-		position = 0
+		if (typeof options === 'object') {
+			srcEnd = options.end || source.length
+			position = options.start || 0
+		} else {
+			position = 0
+			srcEnd = options > -1 ? options : source.length
+		}
 		stringPosition = 0
 		srcStringEnd = 0
 		srcString = null
@@ -134,7 +139,11 @@ export class Unpackr {
 		}
 	}
 	_mergeStructures(loadedStructures, existingStructures) {
+		if (onLoadedStructures)
+			loadedStructures = onLoadedStructures.call(this, loadedStructures);
 		loadedStructures = loadedStructures || []
+		if (Object.isFrozen(loadedStructures))
+			loadedStructures = loadedStructures.map(structure => structure.slice(0))
 		for (let i = 0, l = loadedStructures.length; i < l; i++) {
 			let structure = loadedStructures[i]
 			if (structure) {
@@ -172,9 +181,8 @@ export function checkedRead() {
 				currentStructures.length = sharedLength
 		}
 		let result
-		if (currentUnpackr.randomAccessStructure && src[position] < 0x40 && readStruct) {
-			let id = (src[position++] << 8) + src[position++];
-			result = readStruct(src, position, srcEnd, currentStructures[id - 0x40] || loadStructures()[id - 0x40], currentUnpackr)
+		if (currentUnpackr.randomAccessStructure && src[position] < 0x40 && src[position] >= 0x20 && readStruct) {
+			result = readStruct(src, position, srcEnd, currentUnpackr)
 			position = srcEnd
 		} else
 			result = read()
@@ -504,7 +512,7 @@ const createSecondByteReader = (firstId, read0) => {
 	}
 }
 
-function loadStructures() {
+export function loadStructures() {
 	let loadedStructures = saveState(() => {
 		// save the state in case getStructures modifies our buffer
 		src = null
@@ -610,6 +618,16 @@ function readStringJS(length) {
 
 	return result
 }
+export function readString(source, start, length) {
+	let existingSrc = src;
+	src = source;
+	position = start;
+	try {
+		return readStringJS(length);
+	} finally {
+		src = existingSrc;
+	}
+}
 
 function readArray(length) {
 	let array = new Array(length)
@@ -830,7 +848,15 @@ function readBin(length) {
 function readExt(length) {
 	let type = src[position++]
 	if (currentExtensions[type]) {
-		return currentExtensions[type](src.subarray(position, position += length))
+		let end
+		return currentExtensions[type](src.subarray(position, end = (position += length)), (readPosition) => {
+			position = readPosition;
+			try {
+				return read();
+			} finally {
+				position = end;
+			}
+		})
 	}
 	else
 		throw new Error('Unknown extension type ' + type)
@@ -1073,6 +1099,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
 }
-export function setReadStruct(func) {
-	readStruct = func;
+export function setReadStruct(updatedReadStruct, loadedStructs) {
+	readStruct = updatedReadStruct;
+	onLoadedStructures = loadedStructs;
 }