msgpackr 1.7.0-alpha3 → 1.7.0-alpha6

package/pack.js

@@ -15,7 +15,7 @@ let targetView
 let position = 0
 let safeEnd
 let bundledStrings = null
-let writeStructSlots, prepareStructures
+let writeStructSlots
 const MAX_BUNDLE_SIZE = 0xf000
 const hasNonLatin = /[\u0080-\uFFFF]/
 export const RECORD_SYMBOL = Symbol('record-id')
@@ -149,7 +149,7 @@ export class Packr extends Unpackr {
 				if (structures) {
 					if (serializationsSinceTransitionRebuild < 10)
 						serializationsSinceTransitionRebuild++
-					let sharedLength = structures.sharedLength || maxSharedStructures
+					let sharedLength = structures.sharedLength || 0
 					if (structures.length > sharedLength)
 						structures.length = sharedLength
 					if (transitionsCount > 10000) {
@@ -168,10 +168,9 @@ export class Packr extends Unpackr {
 					if (hasSharedUpdate && packr.saveStructures) {
 						// we can't rely on start/end with REUSE_BUFFER_MODE since they will (probably) change when we save
 						let returnBuffer = target.subarray(start, position)
-						let newSharedData = prepareStructures ? prepareStructures(structures, packr) : structures;
-						if (packr.saveStructures(newSharedData, newSharedData.isCompatible || packr.lastNamedStructuresLength || 0) === false) {
+						let newSharedData = prepareStructures(structures, packr);
+						if (packr.saveStructures(newSharedData, newSharedData.isCompatible) === false) {
 							// get updated structures and try again if the update failed
-							packr._mergeStructures(packr.getStructures())
 							return packr.pack(value)
 						}
 						packr.lastNamedStructuresLength = sharedLength
@@ -694,7 +693,7 @@ export class Packr extends Unpackr {
 		const writeStruct = (object, safePrototype) => {
 			let newPosition = writeStructSlots(object, target, position, structures, makeRoom, (value, newPosition, notifySharedUpdate) => {
 				if (notifySharedUpdate)
-					hasSharedUpdate = true;
+					return hasSharedUpdate = true;
 				position = newPosition;
 				if (start > 0) {
 					pack(value);
@@ -946,6 +945,15 @@ export function addExtension(extension) {
 	}
 	unpackAddExtension(extension)
 }
+function prepareStructures(structures, packr) {
+	structures.isCompatible = (existingStructures) => {
+		let compatible = !existingStructures || ((packr.lastNamedStructuresLength || 0) === existingStructures.length)
+		if (!compatible) // we want to merge these existing structures immediately since we already have it and we are in the right transaction
+			packr._mergeStructures(existingStructures);
+		return compatible;
+	}
+	return structures
+}
 export function setWriteStructSlots(writeSlots, makeStructures) {
 	writeStructSlots = writeSlots;
 	prepareStructures = makeStructures;

package/package.json

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

package/struct.js

@@ -62,7 +62,6 @@ setWriteStructSlots(writeStruct, prepareStructures);
 function writeStruct(object, target, position, structures, makeRoom, pack, packr) {
 	let typedStructs = packr.typedStructs || (packr.typedStructs = []);
 	// note that we rely on pack.js to load stored structures before we get to this point
-	packr.lastTypedStructuresLength = typedStructs.length;
 	let targetView = target.dataView;
 	let refsStartPosition = (typedStructs.lastStringStart || 100) + position;
 	let safeEnd = target.length - 10;
@@ -199,7 +198,7 @@ function writeStruct(object, target, position, structures, makeRoom, pack, packr
 					refPosition += encodeUtf8(target, value, refPosition);
 					isNotAscii = refPosition - strStart > strLength;
 				}
-				if (refOffset < 0x100) {
+				if (refOffset < 0xf6) {
 					if (isNotAscii)
 						transition = nextTransition.string8 || createTypeTransition(nextTransition, UTF8, 1);
 					else
@@ -307,7 +306,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;
@@ -415,6 +414,8 @@ function onLoadedStructures(sharedData) {
 	if (!(sharedData instanceof Map))
 		return sharedData;
 	let typed = sharedData.get('typed') || [];
+	if (Object.isFrozen(typed))
+		typed = typed.map(structure => structure.slice(0));
 	let named = sharedData.get('named');
 	let transitions = Object.create(null);
 	for (let i = 0, l = typed.length; i < l; i++) {
@@ -442,6 +443,7 @@ function onLoadedStructures(sharedData) {
 	}
 	typed.transitions = transitions;
 	this.typedStructs = typed;
+	this.lastTypedStructuresLength = typed.length;
 	return named;
 }
 var sourceSymbol = Symbol('source')
@@ -473,15 +475,16 @@ function readStruct(src, position, srcEnd, unpackr) {
 	}
 	var construct = structure.construct;
 	if (!construct) {
-		construct = structure.construct = function() {
+		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;
@@ -490,7 +493,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;
@@ -555,7 +557,7 @@ function readStruct(src, position, srcEnd, unpackr) {
 							next = next.next;
 						}
 						if (end == null)
-							end = srcEnd - refStart;
+							end = source.srcEnd - refStart;
 						if (source.srcString) {
 							return source.srcString.slice(ref, end);
 						}
@@ -571,7 +573,7 @@ function readStruct(src, position, srcEnd, unpackr) {
 									asciiEnd = null;
 							} while((next = next.next));
 							if (asciiEnd == null)
-								asciiEnd = srcEnd - refStart
+								asciiEnd = source.srcEnd - refStart
 							source.srcString = src.toString('latin1', refStart, refStart + asciiEnd);
 							return source.srcString.slice(ref, end);
 						}
@@ -606,7 +608,7 @@ function readStruct(src, position, srcEnd, unpackr) {
 							next = next.next;
 						}
 						if (end == null)
-							end = srcEnd - refStart;
+							end = source.srcEnd - refStart;
 						if (type === UTF8) {
 							return src.toString('utf8', ref + refStart, end + refStart);
 						} else {
@@ -683,28 +685,32 @@ function toConstant(code) {
 	throw new Error('Unknown constant');
 }
 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') || [];
 			if (named.length !== (packr.lastNamedStructuresLength || 0))
-				return false;
+				compatible = false;
 			let typed = existing.get('typed') || [];
 			if (typed.length !== lastTypedStructuresLength)
-				return false;
+				compatible = false;
 		} else if (existing instanceof Array) {
 			if (existing.length !== (packr.lastNamedStructuresLength || 0))
-				return false;
+				compatible = false;
 		}
-		return true;
+		if (!compatible)
+			packr._mergeStructures(existing);
+		return compatible;
 	};
 	packr.lastTypedStructuresLength = packr.typedStructs?.length;
-	return structMap;
+	return structures;
 }
 
 setReadStruct(readStruct, onLoadedStructures);

package/unpack.js

@@ -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
@@ -142,6 +142,8 @@ export class Unpackr {
 		if (onLoadedStructures)
 			loadedStructures = onLoadedStructures.call(this, loadedStructures);
 		loadedStructures = loadedStructures || []
+		if (Object.isFrozen(loadedStructures))
+			loadedStructures = loadedStructures.map(structure => structure.slice(0))
 		for (let i = 0, l = loadedStructures.length; i < l; i++) {
 			let structure = loadedStructures[i]
 			if (structure) {
@@ -171,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
@@ -181,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()