msgpackr 1.7.0-alpha5 → 1.7.0-beta1

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) {
@@ -204,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) {
@@ -886,7 +886,16 @@
 
 	// the registration of the record definition extension (as "r")
 	const recordDefinition = (id, highByte) => {
-		var structure = read();
+		let structure;
+		if (currentUnpackr.freezeData) {
+			currentUnpackr.freezeData = false;
+			try {
+				structure = read();
+			} finally {
+				currentUnpackr.freezeData = true;
+			}
+		} else
+			structure = read();
 		let firstByte = id;
 		if (highByte !== undefined) {
 			id = id < 32 ? -((highByte << 5) + id) : ((highByte << 5) + id);
@@ -988,6 +997,8 @@
 	// currentExtensions[0x52] = () =>
 
 	function saveState(callback) {
+		if (onSaveState)
+			onSaveState();
 		let savedSrcEnd = srcEnd;
 		let savedPosition = position;
 		let savedSrcStringStart = srcStringStart;
@@ -1029,9 +1040,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;
@@ -1981,11 +1993,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) {}
@@ -2026,6 +2040,7 @@
 			return 0;
 		position += headerSize;
 		let queuedReferences = [];
+		let usedAscii0;
 		let keyIndex = 0;
 		for (let key in object) {
 			let value = object[key];
@@ -2041,7 +2056,8 @@
 					string16: null,
 					object16: null,
 					num32: null,
-					float64: null
+					float64: null,
+					date64: null
 				};
 			}
 			if (position > safeEnd) {
@@ -2134,25 +2150,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
@@ -2242,7 +2280,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;
@@ -2370,7 +2408,8 @@
 						string16: null,
 						object16: null,
 						num32: null,
-						float64: null
+						float64: null,
+						date64: null,
 					};
 				}
 				transition = createTypeTransition(nextTransition, type, size);
@@ -2382,9 +2421,8 @@
 		this.lastTypedStructuresLength = typed.length;
 		return named;
 	}
-	var sourceSymbol = Symbol('source');
+	var sourceSymbol = Symbol.for('source');
 	function readStruct$1(src, position, srcEnd, unpackr) {
-	//	var stringLength = (src[position++] << 8) | src[position++];
 		let recordId = src[position++] - 0x20;
 		if (recordId >= 24) {
 			switch(recordId) {
@@ -2445,13 +2483,13 @@
 					case 0: getRef = () => 0; break;
 					case 1:
 						getRef = (source, position) => {
-							let ref = source.src[position + property.offset];
+							let ref = source.bytes[position + property.offset];
 							return ref >= 0xf6 ? toConstant(ref) : ref;
 						};
 						break;
 					case 2:
 						getRef = (source, position) => {
-							let src = source.src;
+							let src = source.bytes;
 							let dataView = src.dataView || (src.dataView = new DataView(src.buffer, src.byteOffset, src.byteLength));
 							let ref = dataView.getUint16(position + property.offset, true);
 							return ref >= 0xff00 ? toConstant(ref & 0xff) : ref;
@@ -2459,7 +2497,7 @@
 						break;
 					case 4:
 						getRef = (source, position) => {
-							let src = source.src;
+							let src = source.bytes;
 							let dataView = src.dataView || (src.dataView = new DataView(src.buffer, src.byteOffset, src.byteLength));
 							let ref = dataView.getUint32(position + property.offset, true);
 							return ref >= 0xffffff00 ? toConstant(ref & 0xff) : ref;
@@ -2477,7 +2515,7 @@
 						property.multiGetCount = 0;
 						get = function() {
 							let source = this[sourceSymbol];
-							let src = source.src;
+							let src = source.bytes;
 							let position = source.position;
 							let refStart = currentOffset + position;
 							let ref = getRef(source, position);
@@ -2493,7 +2531,7 @@
 								next = next.next;
 							}
 							if (end == null)
-								end = source.srcEnd - refStart;
+								end = source.bytesEnd - refStart;
 							if (source.srcString) {
 								return source.srcString.slice(ref, end);
 							}
@@ -2509,7 +2547,7 @@
 										asciiEnd = null;
 								} while((next = next.next));
 								if (asciiEnd == null)
-									asciiEnd = source.srcEnd - refStart
+									asciiEnd = source.bytesEnd - refStart
 								source.srcString = src.toString('latin1', refStart, refStart + asciiEnd);
 								return source.srcString.slice(ref, end);
 							}
@@ -2533,7 +2571,7 @@
 							let refStart = currentOffset + position;
 							let ref = getRef(source, position);
 							if (typeof ref !== 'number') return ref;
-							let src = source.src;
+							let src = source.bytes;
 							let end, next = property.next;
 							while(next) {
 								end = next.getRef(source, position);
@@ -2544,11 +2582,16 @@
 								next = next.next;
 							}
 							if (end == null)
-								end = source.srcEnd - refStart;
+								end = source.bytesEnd - refStart;
 							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;
@@ -2557,7 +2600,7 @@
 							case 4:
 								get = function () {
 									let source = this[sourceSymbol];
-									let src = source.src;
+									let src = source.bytes;
 									let dataView = src.dataView || (src.dataView = new DataView(src.buffer, src.byteOffset, src.byteLength));
 									let position = source.position + property.offset;
 									let value = dataView.getInt32(position, true);
@@ -2576,7 +2619,7 @@
 							case 8:
 								get = function () {
 									let source = this[sourceSymbol];
-									let src = source.src;
+									let src = source.bytes;
 									let dataView = src.dataView || (src.dataView = new DataView(src.buffer, src.byteOffset, src.byteLength));
 									let value = dataView.getFloat64(source.position + property.offset, true);
 									if (isNaN(value)) {
@@ -2590,12 +2633,22 @@
 							case 1:
 								get = function () {
 									let source = this[sourceSymbol];
-									let src = source.src;
+									let src = source.bytes;
 									let value = src[source.position + property.offset];
 									return value < 0xf6 ? value : toConstant(value);
 								};
 								break;
 						}
+						break;
+					case DATE:
+						get = function () {
+							let source = this[sourceSymbol];
+							let src = source.bytes;
+							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;
 			}
@@ -2604,10 +2657,10 @@
 		}
 		var instance = new construct();
 		instance[sourceSymbol] = {
-			src,
+			bytes: src,
 			position,
 			srcString: '',
-			srcEnd
+			bytesEnd: srcEnd
 		};
 		return instance;
 	}
@@ -2620,6 +2673,14 @@
 		}
 		throw new Error('Unknown constant');
 	}
+
+	function saveState$1() {
+		if (currentSource) {
+			currentSource.bytes = Uint8Array.prototype.slice.call(currentSource.bytes, currentSource.position, currentSource.bytesEnd);
+			currentSource.position = 0;
+			currentSource.bytesEnd = currentSource.bytes.length;
+		}
+	}
 	function prepareStructures$1(structures, packr) {
 		if (packr.typedStructs) {
 			let structMap = new Map();
@@ -2649,12 +2710,17 @@
 		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 {
@@ -2833,7 +2899,6 @@
 				var deserialized = packr.unpack(serialized);
 				assert.deepEqual(deserialized, data);
 			});
-			break;
 		}
 
 		test('pack/unpack empty data with bundled strings', function(){