msgpackr 1.7.0-alpha4 → 1.7.0-alpha7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "msgpackr",
   "author": "Kris Zyp",
-  "version": "1.7.0-alpha4",
+  "version": "1.7.0-alpha7",
   "description": "Ultra-fast MessagePack implementation with extensions for records and structured cloning",
   "license": "MIT",
   "types": "./index.d.ts",

package/struct.js

@@ -41,11 +41,13 @@ const ASCII = 3; // the MIBenum from https://www.iana.org/assignments/character-
 const NUMBER = 0;
 const UTF8 = 2;
 const OBJECT_DATA = 1;
+const DATE = 16;
 const TYPE_NAMES = ['num', 'object', 'string', 'ascii'];
+TYPE_NAMES[DATE] = 'date';
 const float32Headers = [false, true, true, false, false, true, true, false];
 let updatedPosition;
 const hasNodeBuffer = typeof Buffer !== 'undefined'
-let textEncoder
+let textEncoder, currentSource;
 try {
 	textEncoder = new TextEncoder()
 } catch (error) {}
@@ -89,7 +91,7 @@ function writeStruct(object, target, position, structures, makeRoom, pack, packr
 		return 0;
 	position += headerSize;
 	let queuedReferences = [];
-	let usedLatin0;
+	let usedAscii0;
 	let keyIndex = 0;
 	for (let key in object) {
 		let value = object[key];
@@ -105,7 +107,8 @@ function writeStruct(object, target, position, structures, makeRoom, pack, packr
 				string16: null,
 				object16: null,
 				num32: null,
-				float64: null
+				float64: null,
+				date64: null
 			};
 		}
 		if (position > safeEnd) {
@@ -198,25 +201,47 @@ function writeStruct(object, target, position, structures, makeRoom, pack, packr
 					refPosition += encodeUtf8(target, value, refPosition);
 					isNotAscii = refPosition - strStart > strLength;
 				}
-				if (refOffset < 0x100) {
-					if (isNotAscii)
-						transition = nextTransition.string8 || createTypeTransition(nextTransition, UTF8, 1);
-					else
-						transition = nextTransition.ascii8 || createTypeTransition(nextTransition, ASCII, 1);
+				if (refOffset < 0xa0 || (refOffset < 0xf6 && (nextTransition.ascii8 || nextTransition.string8))) {
+					// short strings
+					if (isNotAscii) {
+						if (!(transition = nextTransition.string8)) {
+							if (typedStructs.length > 10 && (transition = nextTransition.ascii8)) {
+								// we can safely change ascii to utf8 in place since they are compatible
+								transition.__type = UTF8;
+								nextTransition.ascii8 = null;
+								nextTransition.string8 = transition;
+								pack(null, 0, true); // special call to notify that structures have been updated
+							} else {
+								transition = createTypeTransition(nextTransition, UTF8, 1);
+							}
+						}
+					} else if (refOffset === 0 && !usedAscii0) {
+						usedAscii0 = true;
+						transition = nextTransition.ascii0 || createTypeTransition(nextTransition, ASCII, 0);
+						break; // don't increment position
+					}// else ascii:
+					else if (!(transition = nextTransition.ascii8) && !(typedStructs.length > 10 && (transition = nextTransition.string8)))
+						transition = createTypeTransition(nextTransition, ASCII, 1);
 					target[position++] = refOffset;
 				} else {
-					if (isNotAscii)
+					// TODO: Enable ascii16 at some point, but get the logic right
+					//if (isNotAscii)
 						transition = nextTransition.string16 || createTypeTransition(nextTransition, UTF8, 2);
-					else
-						transition = nextTransition.ascii16 || createTypeTransition(nextTransition, ASCII, 2);
+					//else
+						//transition = nextTransition.ascii16 || createTypeTransition(nextTransition, ASCII, 2);
 					targetView.setUint16(position, refOffset, true);
 					position += 2;
 				}
 				break;
 			case 'object':
 				if (value) {
-					//transition = nextTransition.object16 || createTypeTransition(nextTransition, OBJECT_DATA, 2);
-					queuedReferences.push(key, value, keyIndex);
+					if (value.constructor === Date) {
+						transition = nextTransition.date64 || createTypeTransition(nextTransition, DATE, 8);
+						targetView.setFloat64(position, value.getTime(), true);
+						position += 8;
+					} else {
+						queuedReferences.push(key, value, keyIndex);
+					}
 					break;
 				} else { // null
 					nextTransition = anyType(nextTransition, position, targetView, -10); // match CBOR with this
@@ -306,7 +331,7 @@ function writeStruct(object, target, position, structures, makeRoom, pack, packr
 				targetView.setUint32(position, refOffset, true);
 				position += 4;
 			}
-		} else {
+		} else { // null or undefined
 			transition = nextTransition.object16 || createTypeTransition(nextTransition, OBJECT_DATA, 2);
 			targetView.setInt16(position, value === null ? -10 : -9, true);
 			position += 2;
@@ -434,7 +459,8 @@ function onLoadedStructures(sharedData) {
 					string16: null,
 					object16: null,
 					num32: null,
-					float64: null
+					float64: null,
+					date64: null,
 				};
 			}
 			transition = createTypeTransition(nextTransition, type, size);
@@ -478,12 +504,13 @@ function readStruct(src, position, srcEnd, unpackr) {
 		construct = structure.construct = function LazyObject() {
 		}
 		var prototype = construct.prototype;
+		let properties = [];
 		Object.defineProperty(prototype, 'toJSON', {
-			get() {
+			value() {
 				// return an enumerable object with own properties to JSON stringify
 				let resolved = {};
-				for (let i = 0, l = structure.length; i < l; i++) {
-					let key = structure[i];
+				for (let i = 0, l = properties.length; i < l; i++) {
+					let key = properties[i].key;
 					resolved[key] = this[key];
 				}
 				return resolved;
@@ -492,7 +519,6 @@ function readStruct(src, position, srcEnd, unpackr) {
 		});
 		let currentOffset = 0;
 		let lastRefProperty;
-		let properties = [];
 		for (let i = 0, l = structure.length; i < l; i++) {
 			let definition = structure[i];
 			let [ type, size, key, enumerationOffset ] = definition;
@@ -612,7 +638,12 @@ function readStruct(src, position, srcEnd, unpackr) {
 						if (type === UTF8) {
 							return src.toString('utf8', ref + refStart, end + refStart);
 						} else {
-							return unpackr.unpack(src, { start: ref + refStart, end: end  + refStart }); // could reuse this object
+							currentSource = source;
+							try {
+								return unpackr.unpack(src, { start: ref + refStart, end: end + refStart });
+							} finally {
+								currentSource = null;
+							}
 						}
 					};
 					break;
@@ -660,6 +691,16 @@ function readStruct(src, position, srcEnd, unpackr) {
 							};
 							break;
 					}
+					break;
+				case DATE:
+					get = function () {
+						let source = this[sourceSymbol];
+						let src = source.src;
+						let dataView = src.dataView || (src.dataView = new DataView(src.buffer, src.byteOffset, src.byteLength));
+						return new Date(dataView.getFloat64(source.position + property.offset, true));
+					};
+					break;
+
 			}
 			property.get = get;
 		}
@@ -684,14 +725,23 @@ function toConstant(code) {
 	}
 	throw new Error('Unknown constant');
 }
+
+function saveState() {
+	if (currentSource) {
+		currentSource.src = Uint8Array.prototype.slice.call(currentSource.src, currentSource.position, currentSource.srcEnd);
+		currentSource.position = 0;
+		currentSource.srcEnd = currentSource.src.length;
+	}
+}
 function prepareStructures(structures, packr) {
-	if (!packr.typedStructs)
-		return structures;
-	let structMap = new Map();
-	structMap.set('named', structures);
-	structMap.set('typed', packr.typedStructs);
+	if (packr.typedStructs) {
+		let structMap = new Map();
+		structMap.set('named', structures);
+		structMap.set('typed', packr.typedStructs);
+		structures = structMap;
+	}
 	let lastTypedStructuresLength = packr.lastTypedStructuresLength || 0;
-	structMap.isCompatible = existing => {
+	structures.isCompatible = existing => {
 		let compatible = true;
 		if (existing instanceof Map) {
 			let named = existing.get('named') || [];
@@ -709,8 +759,8 @@ function prepareStructures(structures, packr) {
 		return compatible;
 	};
 	packr.lastTypedStructuresLength = packr.typedStructs?.length;
-	return structMap;
+	return structures;
 }
 
-setReadStruct(readStruct, onLoadedStructures);
+setReadStruct(readStruct, onLoadedStructures, saveState);
 

package/unpack.js

@@ -28,7 +28,7 @@ export const C1 = new C1Type()
 C1.name = 'MessagePack 0xC1'
 var sequentialMode = false
 var inlineObjectReadThreshold = 2
-var readStruct, onLoadedStructures
+var readStruct, onLoadedStructures, onSaveState
 try {
 	new Function('')
 } catch(error) {
@@ -95,7 +95,7 @@ export class Unpackr {
 			currentUnpackr = this
 			if (this.structures) {
 				currentStructures = this.structures
-				return checkedRead()
+				return checkedRead(options)
 			} else if (!currentStructures || currentStructures.length > 0) {
 				currentStructures = []
 			}
@@ -104,7 +104,7 @@ export class Unpackr {
 			if (!currentStructures || currentStructures.length > 0)
 				currentStructures = []
 		}
-		return checkedRead()
+		return checkedRead(options)
 	}
 	unpackMultiple(source, forEach) {
 		let values, lastPosition = 0
@@ -173,7 +173,7 @@ export class Unpackr {
 export function getPosition() {
 	return position
 }
-export function checkedRead() {
+export function checkedRead(options) {
 	try {
 		if (!currentUnpackr.trusted && !sequentialMode) {
 			let sharedLength = currentStructures.sharedLength || 0
@@ -183,6 +183,8 @@ export function checkedRead() {
 		let result
 		if (currentUnpackr.randomAccessStructure && src[position] < 0x40 && src[position] >= 0x20 && readStruct) {
 			result = readStruct(src, position, srcEnd, currentUnpackr)
+			if (!(options && options.lazy) && result)
+				result = result.toJSON()
 			position = srcEnd
 		} else
 			result = read()
@@ -206,7 +208,7 @@ export function checkedRead() {
 		// else more to read, but we are reading sequentially, so don't clear source yet
 		return result
 	} catch(error) {
-		if (currentStructures.restoreStructures)
+		if (currentStructures?.restoreStructures)
 			restoreStructures()
 		clearSource()
 		if (error instanceof RangeError || error.message.startsWith('Unexpected end of buffer') || position > srcEnd) {
@@ -1030,6 +1032,8 @@ currentExtensions[0xff] = (data) => {
 // currentExtensions[0x52] = () =>
 
 function saveState(callback) {
+	if (onSaveState)
+		onSaveState();
 	let savedSrcEnd = srcEnd
 	let savedPosition = position
 	let savedStringPosition = stringPosition
@@ -1099,7 +1103,8 @@ 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) {
+export function setReadStruct(updatedReadStruct, loadedStructs, saveState) {
 	readStruct = updatedReadStruct;
 	onLoadedStructures = loadedStructs;
+	onSaveState = saveState;
 }