msgpackr 1.7.0-alpha2 → 1.7.0-alpha3

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,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]
@@ -172,9 +179,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 +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
@@ -610,6 +616,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 +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)
@@ -1073,6 +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(func) {
-	readStruct = func;
+export function setReadStruct(updatedReadStruct, loadedStructs) {
+	readStruct = updatedReadStruct;
+	onLoadedStructures = loadedStructs;
 }

package/dist/str.cjs

@@ -1,100 +0,0 @@
-let utfz = require('../../msgpack-benchmark/node_modules/utfz-lib')
-
-var safeEnd = 1000000;
-var b = new Uint8Array(32768)
-function writeString(value, target, position) {
-			var length, strLength = value.length;
-			let headerSize;
-			// first we estimate the header size, so we can write to the correct location
-			if (strLength < 0x20) {
-				headerSize = 1;
-			} else if (strLength < 0x100) {
-				headerSize = 2;
-			} else if (strLength < 0x10000) {
-				headerSize = 3;
-			} else {
-				headerSize = 5;
-			}
-			let maxBytes = strLength * 3;
-			//if (position + maxBytes > safeEnd)
-			//	target = makeRoom(position + maxBytes);
-		for (let i = 0; i < 100; i++) {
-			length = pack(value, strLength, target, position + headerSize);
-		}
-			if (strLength < 0x40 || !encodeUtf8) {
-				var strPosition = position + headerSize;
-				var c2 = 0;
-				for (let i = 0; i < strLength; i++) {
-					const c1 = value.charCodeAt(i);
-					if (c1 < 0x80) {
-						target[strPosition++] = c1;
-					} else if (c1 < 0x800) {
-						target[strPosition++] = c1 >> 6 | 0xc0;
-						target[strPosition++] = c1 & 0x3f | 0x80;
-					} else if (
-						(c1 & 0xfc00) === 0xd800 &&
-						((c2 = value.charCodeAt(i + 1)) & 0xfc00) === 0xdc00
-					) {
-						c1 = 0x10000 + ((c1 & 0x03ff) << 10) + (c2 & 0x03ff);
-						i++;
-						target[strPosition++] = c1 >> 18 | 0xf0;
-						target[strPosition++] = c1 >> 12 & 0x3f | 0x80;
-						target[strPosition++] = c1 >> 6 & 0x3f | 0x80;
-						target[strPosition++] = c1 & 0x3f | 0x80;
-					} else {
-						target[strPosition++] = c1 >> 12 | 0xe0;
-						target[strPosition++] = c1 >> 6 & 0x3f | 0x80;
-						target[strPosition++] = c1 & 0x3f | 0x80;
-					}
-				}
-				length = strPosition - position - headerSize;
-			} else {
-				length = encodeUtf8(value, position + headerSize, maxBytes);
-			}
-		
-		
-			if (length < 0x20) {
-				target[position++] = 0xa0 | length;
-			} else if (length < 0x100) {
-				if (headerSize < 2) {
-					target.copyWithin(position + 2, position + 1, position + 1 + length);
-				}
-				target[position++] = 0xd9;
-				target[position++] = length;
-			} else if (length < 0x10000) {
-				if (headerSize < 3) {
-					target.copyWithin(position + 3, position + 2, position + 2 + length);
-				}
-				target[position++] = 0xda;
-				target[position++] = length >> 8;
-				target[position++] = length & 0xff;
-			} else {
-				if (headerSize < 5) {
-					target.copyWithin(position + 5, position + 3, position + 3 + length);
-				}
-				target[position++] = 0xdb;
-				targetView.setUint32(position, length);
-				position += 4;
-			}
-			return position + length
-		};
-const pack = (str, length, buf, offset) => {
-  const start = offset;
-  let currHigh = 0;
-  for (let i = 0; i < length; i++) {
-    const code = str.charCodeAt(i);
-    const high = code >> 8;
-    if (high !== currHigh) {
-      buf[i + offset++] = 0;
-      buf[i + offset++] = high;
-      currHigh = high;
-    }
-    const low = code & 0xff;
-    buf[i + offset] = low;
-    if (!low) {
-      buf[i + ++offset] = currHigh;
-    }
-  }
-  return length + offset - start;
-};
-module.exports = writeString;