msgpackr 1.7.0-alpha4 → 1.7.0-alpha7

package/dist/test.js

@@ -29,7 +29,7 @@
 	C1.name = 'MessagePack 0xC1';
 	var sequentialMode = false;
 	var inlineObjectReadThreshold = 2;
-	var readStruct, onLoadedStructures;
+	var readStruct, onLoadedStructures, onSaveState;
 	try {
 		new Function('');
 	} catch(error) {
@@ -94,7 +94,7 @@
 				currentUnpackr = this;
 				if (this.structures) {
 					currentStructures = this.structures;
-					return checkedRead()
+					return checkedRead(options)
 				} else if (!currentStructures || currentStructures.length > 0) {
 					currentStructures = [];
 				}
@@ -103,7 +103,7 @@
 				if (!currentStructures || currentStructures.length > 0)
 					currentStructures = [];
 			}
-			return checkedRead()
+			return checkedRead(options)
 		}
 		unpackMultiple(source, forEach) {
 			let values, lastPosition = 0;
@@ -169,7 +169,7 @@
 			return this.unpack(source, end)
 		}
 	}
-	function checkedRead() {
+	function checkedRead(options) {
 		try {
 			if (!currentUnpackr.trusted && !sequentialMode) {
 				let sharedLength = currentStructures.sharedLength || 0;
@@ -179,6 +179,8 @@
 			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();
@@ -202,7 +204,7 @@
 			// 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) {
@@ -986,6 +988,8 @@
 	// currentExtensions[0x52] = () =>
 
 	function saveState(callback) {
+		if (onSaveState)
+			onSaveState();
 		let savedSrcEnd = srcEnd;
 		let savedPosition = position;
 		let savedSrcStringStart = srcStringStart;
@@ -1027,9 +1031,10 @@
 		mult10[i] = +('1e' + Math.floor(45.15 - i * 0.30103));
 	}
 	var defaultUnpackr = new Unpackr({ useRecords: false });
-	function setReadStruct(updatedReadStruct, loadedStructs) {
+	function setReadStruct(updatedReadStruct, loadedStructs, saveState) {
 		readStruct = updatedReadStruct;
 		onLoadedStructures = loadedStructs;
+		onSaveState = saveState;
 	}
 
 	let textEncoder;
@@ -1979,11 +1984,13 @@
 	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$1 = typeof Buffer !== 'undefined';
-	let textEncoder$1;
+	let textEncoder$1, currentSource;
 	try {
 		textEncoder$1 = new TextEncoder();
 	} catch (error) {}
@@ -2024,6 +2031,7 @@
 			return 0;
 		position += headerSize;
 		let queuedReferences = [];
+		let usedAscii0;
 		let keyIndex = 0;
 		for (let key in object) {
 			let value = object[key];
@@ -2039,7 +2047,8 @@
 					string16: null,
 					object16: null,
 					num32: null,
-					float64: null
+					float64: null,
+					date64: null
 				};
 			}
 			if (position > safeEnd) {
@@ -2132,25 +2141,47 @@
 						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
@@ -2240,7 +2271,7 @@
 					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;
@@ -2368,7 +2399,8 @@
 						string16: null,
 						object16: null,
 						num32: null,
-						float64: null
+						float64: null,
+						date64: null,
 					};
 				}
 				transition = createTypeTransition(nextTransition, type, size);
@@ -2412,12 +2444,13 @@
 			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;
@@ -2426,7 +2459,6 @@
 			});
 			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;
@@ -2546,7 +2578,12 @@
 							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;
@@ -2594,6 +2631,16 @@
 								};
 								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;
 			}
@@ -2618,14 +2665,23 @@
 		}
 		throw new Error('Unknown constant');
 	}
+
+	function saveState$1() {
+		if (currentSource) {
+			currentSource.src = Uint8Array.prototype.slice.call(currentSource.src, currentSource.position, currentSource.srcEnd);
+			currentSource.position = 0;
+			currentSource.srcEnd = currentSource.src.length;
+		}
+	}
 	function prepareStructures$1(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') || [];
@@ -2643,15 +2699,20 @@
 			return compatible;
 		};
 		packr.lastTypedStructuresLength = packr.typedStructs?.length;
-		return structMap;
+		return structures;
 	}
 
-	setReadStruct(readStruct$1, onLoadedStructures$1);
+	setReadStruct(readStruct$1, onLoadedStructures$1, saveState$1);
 
 	let allSampleData = [];
 	for (let i = 1; i < 6; i++) {
 		allSampleData.push(JSON.parse(fs.readFileSync(new URL(`./example${i > 1 ? i : ''}.json`, (document.currentScript && document.currentScript.src || new URL('test.js', document.baseURI).href)))));
 	}
+	allSampleData.push({
+		name: 'some other types',
+		date: new Date(),
+		empty: '',
+	});
 	const sampleData = allSampleData[3];
 	function tryRequire(module) {
 		try {
@@ -2815,7 +2876,7 @@
 				} });
 				for (let i = 0; i < 20; i++) {
 					var serialized = packr.pack(data);
-					var deserialized = packr.unpack(serialized);
+					var deserialized = packr.unpack(serialized, { lazy: true });
 					var copied = {};
 					for (let key in deserialized) {
 						copied[key] = deserialized[key];
@@ -2830,7 +2891,6 @@
 				var deserialized = packr.unpack(serialized);
 				assert.deepEqual(deserialized, data);
 			});
-			break;
 		}
 
 		test('pack/unpack empty data with bundled strings', function(){