msgpackr 1.6.2 → 1.7.0-alpha3

package/unpack.js

@@ -28,6 +28,7 @@ export const C1 = new C1Type()
 C1.name = 'MessagePack 0xC1'
 var sequentialMode = false
 var inlineObjectReadThreshold = 2
+var readStruct, onLoadedStructures
 try {
 	new Function('')
 } catch(error) {
@@ -57,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
@@ -133,6 +139,8 @@ export class Unpackr {
 		}
 	}
 	_mergeStructures(loadedStructures, existingStructures) {
+		if (onLoadedStructures)
+			loadedStructures = onLoadedStructures.call(this, loadedStructures);
 		loadedStructures = loadedStructures || []
 		for (let i = 0, l = loadedStructures.length; i < l; i++) {
 			let structure = loadedStructures[i]
@@ -170,7 +178,12 @@ export function checkedRead() {
 			if (sharedLength < currentStructures.length)
 				currentStructures.length = sharedLength
 		}
-		let result = read()
+		let result
+		if (currentUnpackr.randomAccessStructure && src[position] < 0x40 && src[position] >= 0x20 && readStruct) {
+			result = readStruct(src, position, srcEnd, currentUnpackr)
+			position = srcEnd
+		} else
+			result = read()
 		if (bundledStrings) // bundled strings to skip past
 			position = bundledStrings.postBundlePosition
 
@@ -247,6 +260,8 @@ export function read() {
 			for (let i = 0; i < token; i++) {
 				array[i] = read()
 			}
+			if (currentUnpackr.freezeData)
+				return Object.freeze(array)
 			return array
 		}
 	} else if (token < 0xc0) {
@@ -457,7 +472,8 @@ 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++ > 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)
+			let readObject = structure.read = (new Function('r', 'return function(){return ' + (currentUnpackr.freezeData ? 'Object.freeze' : '') +
+				'({' + structure.map(key => validName.test(key) ? key + ':r()' : ('[' + JSON.stringify(key) + ']:r()')).join(',') + '})}'))(read)
 			if (structure.highByte === 0)
 				structure.read = createSecondByteReader(firstId, structure.read)
 			return readObject() // second byte is already read, if there is one so immediately read object
@@ -467,6 +483,8 @@ function createStructureReader(structure, firstId) {
 			let key = structure[i]
 			object[key] = read()
 		}
+		if (currentUnpackr.freezeData)
+			return Object.freeze(object);
 		return object
 	}
 	readObject.count = 0
@@ -492,7 +510,7 @@ const createSecondByteReader = (firstId, read0) => {
 	}
 }
 
-function loadStructures() {
+export function loadStructures() {
 	let loadedStructures = saveState(() => {
 		// save the state in case getStructures modifies our buffer
 		src = null
@@ -598,12 +616,24 @@ 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)
 	for (let i = 0; i < length; i++) {
 		array[i] = read()
 	}
+	if (currentUnpackr.freezeData)
+		return Object.freeze(array)
 	return array
 }
 
@@ -816,7 +846,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)
@@ -1059,3 +1097,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(updatedReadStruct, loadedStructs) {
+	readStruct = updatedReadStruct;
+	onLoadedStructures = loadedStructs;
+}