cbor-x 1.0.0 → 1.1.0

package/dist/node.cjs

@@ -256,7 +256,11 @@ function read() {
 					position += 8;
 					return value
 				}
-				if (currentDecoder.int64AsNumber) {
+				if (majorType > 1) {
+					if (dataView.getUint32(position) > 0)
+						throw new Error('JavaScript does not support arrays, maps, or strings with length over 4294967295')
+					token = dataView.getUint32(position + 4);
+				} else if (currentDecoder.int64AsNumber) {
 					token = dataView.getUint32(position) * 0x100000000;
 					token += dataView.getUint32(position + 4);
 				} else
@@ -436,21 +440,30 @@ function createStructureReader(structure) {
 			}
 		}
 		// This initial function is quick to instantiate, but runs slower. After several iterations pay the cost to build the faster function
-		if (this.objectLiteralSize === length) // we have a fast object literal reader, use it (assuming it is the right length)
-			return this.objectLiteral(read)
-		if (this.count++ == 3) { // create a fast reader
-			this.objectLiteralSize = length;
-			this.objectLiteral = currentDecoder.keyMap 
-				? new Function('r', 'return {' + this.map(k => currentDecoder.decodeKey(k)).map(k => validName.test(k) ? k + ':r()' : ('[' + JSON.stringify(k) + ']:r()')).join(',') + '}')
-				: new Function('r', 'return {' + this.map(key => validName.test(key) ? key + ':r()' : ('[' + JSON.stringify(key) + ']:r()')).join(',') + '}');
-			return this.objectLiteral(read)
+		let compiledReader = this.compiledReader; // first look to see if we have the fast compiled function
+		while(compiledReader) {
+			// we have a fast compiled object literal reader
+			if (compiledReader.propertyCount === length)
+				return compiledReader(read) // with the right length, so we use it
+			compiledReader = compiledReader.next; // see if there is another reader with the right length
+		}
+		if (this.slowReads++ >= 3) { // create a fast compiled reader
+			let array = this.length == length ? this : this.slice(0, length);
+			compiledReader = currentDecoder.keyMap 
+			? new Function('r', 'return {' + array.map(k => currentDecoder.decodeKey(k)).map(k => validName.test(k) ? k + ':r()' : ('[' + JSON.stringify(k) + ']:r()')).join(',') + '}')
+			: new Function('r', 'return {' + array.map(key => validName.test(key) ? key + ':r()' : ('[' + JSON.stringify(key) + ']:r()')).join(',') + '}');
+			if (this.compiledReader)
+				compiledReader.next = this.compiledReader; // if there is an existing one, we store multiple readers as a linked list because it is usually pretty rare to have multiple readers (of different length) for the same structure
+			compiledReader.propertyCount = length;
+			this.compiledReader = compiledReader;
+			return compiledReader(read)
 		}
 		let object = {};
 		if (currentDecoder.keyMap) for (let i = 0; i < length; i++) object[currentDecoder.decodeKey(this[i])] = read();
 		else for (let i = 0; i < length; i++) object[this[i]] = read();
 		return object
 	}
-	structure.count = 0;
+	structure.slowReads = 0;
 	return readObject
 }
 
@@ -763,11 +776,16 @@ currentExtensions[5] = (fraction) => {
 	return fraction[1] * Math.exp(fraction[0] * Math.log(2))
 };
 
-// the registration of the record definition extension (tag 105)
+// the registration of the record definition extension
 const recordDefinition = (definition) => {
 	let id = definition[0] - 0xe000;
 	let structure = definition[1];
+	let existingStructure = currentStructures[id];
+	if (existingStructure && existingStructure.isShared) {
+		(currentStructures.restoreStructures || (currentStructures.restoreStructures = []))[id] = existingStructure;
+	}
 	currentStructures[id] = structure;
+
 	structure.read = createStructureReader(structure);
 	let object = {};
 	if (currentDecoder.keyMap) for (let i = 2,l = definition.length; i < l; i++) {
@@ -911,6 +929,8 @@ currentExtensionRanges.push((tag, input) => {
 			version: input,
 		}
 	}
+	if (tag == 55799) // self-descriptive CBOR tag, just return input value
+		return input
 });
 
 const typedArrays = ['Uint8', 'Uint8Clamped', 'Uint16', 'Uint32', 'BigUint64','Int8', 'Int16', 'Int32', 'BigInt64', 'Float32', 'Float64'].map(type => type + 'Array');
@@ -1082,12 +1102,18 @@ class Encoder extends Decoder {
 			} : false;
 
 		let encoder = this;
-		let maxSharedStructures = options.maxSharedStructures || 128;
+		let hasSharedStructures = options.structures || options.saveStructures;
+		let maxSharedStructures = options.maxSharedStructures;
+		if (maxSharedStructures == null)
+			maxSharedStructures = hasSharedStructures ? 128 : 0;
+		if (maxSharedStructures > 8190)
+			throw new Error('Maximum maxSharedStructure is 8190')
 		let isSequential = options.sequential;
 		if (isSequential) {
 			maxSharedStructures = 0;
-			this.structures = [];
 		}
+		if (!this.structures)
+			this.structures = [];
 		if (this.saveStructures)
 			this.saveShared = this.saveStructures;
 		let samplingPackedValues, packedObjectMap, sharedValues = options.sharedValues;
@@ -1135,6 +1161,10 @@ class Encoder extends Decoder {
 			} else if (encodeOptions === REUSE_BUFFER_MODE)
 				position$1 = (position$1 + 7) & 0x7ffffff8; // Word align to make any future copying of this buffer faster
 			start = position$1;
+			if (encoder.useSelfDescribedHeader) {
+				targetView.setUint32(position$1, 0xd9d9f700); // tag two byte, then self-descriptive tag
+				position$1 += 3;
+			}
 			referenceMap = encoder.structuredClone ? new Map() : null;
 			if (encoder.bundleStrings && typeof value !== 'string') {
 				bundledStrings$1 = [];
@@ -1168,6 +1198,8 @@ class Encoder extends Decoder {
 							continue
 						let nextTransition, transition = sharedStructures.transitions;
 						for (let j = 0, l = keys.length; j < l; j++) {
+							if (transition[RECORD_SYMBOL] === undefined)
+								transition[RECORD_SYMBOL] = i;
 							let key = keys[j];
 							nextTransition = transition[key];
 							if (!nextTransition) {
@@ -1175,7 +1207,7 @@ class Encoder extends Decoder {
 							}
 							transition = nextTransition;
 						}
-						transition[RECORD_SYMBOL] = i;
+						transition[RECORD_SYMBOL] = i | 0x100000;
 					}
 				}
 				if (!isSequential)
@@ -1227,11 +1259,13 @@ class Encoder extends Decoder {
 					target.end = position$1;
 					return target
 				}
-				return target.subarray(start, position$1) // position can change if we call pack again in saveShared, so we get the buffer now
+				return target.subarray(start, position$1) // position can change if we call encode again in saveShared, so we get the buffer now
 			} finally {
 				if (sharedStructures) {
 					if (serializationsSinceTransitionRebuild < 10)
 						serializationsSinceTransitionRebuild++;
+					if (sharedStructures.length > maxSharedStructures)
+						sharedStructures.length = maxSharedStructures;
 					if (transitionsCount > 10000) {
 						// force a rebuild occasionally after a lot of transitions so it can get cleaned up
 						sharedStructures.transitions = null;
@@ -1244,6 +1278,7 @@ class Encoder extends Decoder {
 							recordIdsToRemove[i][RECORD_SYMBOL] = undefined;
 						}
 						recordIdsToRemove = [];
+						//sharedStructures.nextId = maxSharedStructures
 					}
 				}
 				if (hasSharedUpdate && encoder.saveShared) {
@@ -1654,88 +1689,74 @@ class Encoder extends Decoder {
 			target[objectOffset++ + start] = size >> 8;
 			target[objectOffset + start] = size & 0xff;
 		} :
-
-	/*	sharedStructures ?  // For highly stable structures, using for-in can a little bit faster
 		(object, safePrototype) => {
-			let nextTransition, transition = structures.transitions || (structures.transitions = Object.create(null))
-			let objectOffset = position++ - start
-			let wroteKeys
-			for (let key in object) {
-				if (safePrototype || object.hasOwnProperty(key)) {
-					nextTransition = transition[key]
+			let nextTransition, transition = structures.transitions || (structures.transitions = Object.create(null));
+			let newTransitions = 0;
+			let length = 0;
+			let parentRecordId;
+			let keys;
+			if (this.keyMap) {
+				keys = Object.keys(object).map(k => this.encodeKey(k));
+				length = keys.length;
+				for (let i = 0; i < length; i++) {
+					let key = keys[i];
+					nextTransition = transition[key];
 					if (!nextTransition) {
-						nextTransition = transition[key] = Object.create(null)
-						nextTransition.__keys__ = (transition.__keys__ || []).concat([key])
-						/*let keys = Object.keys(object)
-						if 
-						let size = 0
-						let startBranch = transition.__keys__ ? transition.__keys__.length : 0
-						for (let i = 0, l = keys.length; i++) {
-							let key = keys[i]
-							size += key.length << 2
-							if (i >= startBranch) {
-								nextTransition = nextTransition[key] = Object.create(null)
-								nextTransition.__keys__ = keys.slice(0, i + 1)
-							}
+						nextTransition = transition[key] = Object.create(null);
+						newTransitions++;
+					}
+					transition = nextTransition;
+				}				
+			} else {
+				for (let key in object) if (safePrototype || object.hasOwnProperty(key)) {
+					nextTransition = transition[key];
+					if (!nextTransition) {
+						if (transition[RECORD_SYMBOL] & 0x100000) {// this indicates it is a brancheable/extendable terminal node, so we will use this record id and extend it
+							parentRecordId = transition[RECORD_SYMBOL] & 0xffff;
 						}
-						makeRoom(position + size)
-						nextTransition = transition[key]
-						target.copy(target, )
-						objectOffset
+						nextTransition = transition[key] = Object.create(null);
+						newTransitions++;
 					}
-					transition = nextTransition
-					encode(object[key])
+					transition = nextTransition;
+					length++;
 				}
 			}
-			let id = transition.id
-			if (!id) {
-				id = transition.id = structures.push(transition.__keys__) + 63
-				if (sharedStructures.onUpdate)
-					sharedStructures.onUpdate(id, transition.__keys__)
-			}
-			target[objectOffset + start] = id
-		}*/
-		(object) => {
-			let keys = Object.keys(object);
-			let vals = Object.values(object);
-			if (this.keyMap) keys = keys.map(k => this.encodeKey(k));
-			let nextTransition, transition = structures.transitions || (structures.transitions = Object.create(null));
-			let newTransitions = 0;
-			let length = keys.length;
-			//let parentRecordId
-			for (let i = 0; i < length; i++) {
-				//if (!parentRecordId)
-				let key = keys[i];
-				//	parentRecordId = transition[RECORD_SYMBOL]
-				nextTransition = transition[key];
-				if (!nextTransition) {
-					nextTransition = transition[key] = Object.create(null);
-					newTransitions++;
-				}
-				transition = nextTransition;
-			}
 			let recordId = transition[RECORD_SYMBOL];
 			if (recordId !== undefined) {
+				recordId &= 0xffff;
 				target[position$1++] = 0xd9;
 				target[position$1++] = (recordId >> 8) | 0xe0;
 				target[position$1++] = recordId & 0xff;
 			} else {
-				recordId = structures.nextId++;
-				if (!recordId) {
-					recordId = 0;
-					structures.nextId = 1;
-				}
-				if (recordId >= MAX_STRUCTURES) {// cycle back around
-					structures.nextId = (recordId = maxSharedStructures) + 1;
+				if (!keys)
+					keys = transition.__keys__ || (transition.__keys__ = Object.keys(object));
+				if (parentRecordId === undefined) {
+					recordId = structures.nextId++;
+					if (!recordId) {
+						recordId = 0;
+						structures.nextId = 1;
+					}
+					if (recordId >= MAX_STRUCTURES) {// cycle back around
+						structures.nextId = (recordId = maxSharedStructures) + 1;
+					}
+				} else {
+					recordId = parentRecordId;
 				}
-				transition[RECORD_SYMBOL] = recordId;
 				structures[recordId] = keys;
-				if (sharedStructures && sharedStructures.length <= maxSharedStructures) {
+				if (recordId < maxSharedStructures) {
 					target[position$1++] = 0xd9;
 					target[position$1++] = (recordId >> 8) | 0xe0;
 					target[position$1++] = recordId & 0xff;
+					transition = structures.transitions;
+					for (let i = 0; i < length; i++) {
+						if (transition[RECORD_SYMBOL] === undefined || (transition[RECORD_SYMBOL] & 0x100000))
+							transition[RECORD_SYMBOL] = recordId;
+						transition = transition[keys[i]];
+					}
+					transition[RECORD_SYMBOL] = recordId | 0x100000; // indicates it is a extendable terminal
 					hasSharedUpdate = true;
 				} else {
+					transition[RECORD_SYMBOL] = recordId;
 					targetView.setUint32(position$1, 0xd9dfff00); // tag two byte, then record definition id
 					position$1 += 3;
 					if (newTransitions)
@@ -1756,7 +1777,9 @@ class Encoder extends Decoder {
 			} else {
 				writeArrayHeader(length);
 			}
-			for (let i =0; i < length; i++) encode(vals[i]);
+			for (let key in object)
+				if (safePrototype || object.hasOwnProperty(key))
+					encode(object[key]);
 		};
 		const makeRoom = (end) => {
 			let newSize;
@@ -1795,15 +1818,22 @@ class Encoder extends Decoder {
 	updateSharedData() {
 		let lastVersion = this.sharedVersion || 0;
 		this.sharedVersion = lastVersion + 1;
-		let saveResults = this.saveShared(new SharedData(this.structures, this.sharedValues, this.sharedVersion),
+		let structuresCopy = this.structures.slice(0);
+		let sharedData = new SharedData(structuresCopy, this.sharedValues, this.sharedVersion);
+		let saveResults = this.saveShared(sharedData,
 				existingShared => (existingShared && existingShared.version || 0) == lastVersion);
 		if (saveResults === false) {
 			// get updated structures and try again if the update failed
-			let sharedData = this.getShared() || {};
+			sharedData = this.getShared() || {};
 			this.structures = sharedData.structures || [];
 			this.sharedValues = sharedData.packedValues;
 			this.sharedVersion = sharedData.version;
+			this.structures.nextId = this.structures.length;
+		} else {
+			// restore structures
+			structuresCopy.forEach((structure, i) => this.structures[i] = structure);
 		}
+		// saveShared may fail to write and reload, or may have reloaded to check compatibility and overwrite saved data, either way load the correct shared data
 		return saveResults
 	}
 }

package/dist/test.js

@@ -592,7 +592,6 @@
 
 	const senmlKeys = { bs: -6, bv: -5, bu: -4, bt: -3, bn: -2, n: 0, u: 1, v: 2, vs: 3, t: 6, ut: 7, vd: 8 };
 
-
 	//import inspector from 'inspector'; inspector.open(9229, null, true); debugger
 	function tryRequire(module) {
 		try {
@@ -666,8 +665,40 @@
 			let structures = [];
 			let encoder = new Encoder({ structures });
 			var serialized = encoder.encode(data);
+			serialized = encoder.encode(data);
+			var deserialized = encoder.decode(serialized);
+			assert.deepEqual(deserialized, data);
+		});
+
+		test('mixed structures, shared', function(){
+			let data1 = { a: 1, b: 2, c: 3 };
+			let data2 = { a: 1, b: 2, d: 4 };
+			let data3 = { a: 1, b: 2, e: 5 };
+			let structures = [];
+			let encoder = new Encoder({ structures });
+			var serialized = encoder.encode(data1);
+			var deserialized = encoder.decode(serialized);
+			assert.deepEqual(deserialized, data1);
+			var serialized = encoder.encode(data2);
+			var deserialized = encoder.decode(serialized);
+			assert.deepEqual(deserialized, data2);
+			var serialized = encoder.encode(data3);
+			var deserialized = encoder.decode(serialized);
+			assert.deepEqual(deserialized, data3);
+		});
+
+		test('mixed structures, unshared', function(){
+			let data = [];
+			let encoder = new Encoder({ });
+			for (let i = 0; i< 1000; i++) {
+				data.push({a: 1, ['test' + i]: i});
+			}
+			var serialized = encoder.encode(data);
 			var deserialized = encoder.decode(serialized);
 			assert.deepEqual(deserialized, data);
+			serialized = encoder.encode(data);
+			deserialized = encoder.decode(serialized);
+			assert.deepEqual(deserialized, data);
 		});
 
 		test('mixed array', function(){
@@ -772,6 +803,16 @@
 			var deserialized = encoder.decode(serialized);
 			assert.deepEqual(deserialized, data);
 		});
+		test('pack/unpack sample data with self-descriptive header', function(){
+			var data = sampleData;
+			let encoder = new Encoder({ useSelfDescribedHeader: true });
+			var serialized = encoder.encode(data);
+			var deserialized = encoder.decode(serialized);
+			assert.deepEqual(deserialized, data);
+			assert.equal(serialized[0], 0xd9);
+			assert.equal(serialized[1], 0xd9);
+			assert.equal(serialized[2], 0xf7);
+		});
 		if (typeof Buffer != 'undefined')
 		test('replace data', function(){
 			var data1 = {
@@ -1162,7 +1203,10 @@
 			CBOR.decodeMultiple(new Uint8Array([1, 2, 3, 4]), value => values.push(value));
 			assert.deepEqual(values, [1, 2, 3, 4]);
 		});
-
+		test('bad input', function() {
+			let badInput = Buffer.from('7b2273657269616c6e6f223a2265343a30222c226970223a223139322e3136382e312e3335222c226b6579223a226770735f736563726574227d', 'hex');
+			assert.throws(function(){ decode(badInput); }); // should throw, not crash
+		});
 	});
 	suite('CBOR performance tests', function(){
 		test('performance JSON.parse', function() {

package/encode.js

@@ -38,12 +38,18 @@ export class Encoder extends Decoder {
 			} : false
 
 		let encoder = this
-		let maxSharedStructures = options.maxSharedStructures || 128
+		let hasSharedStructures = options.structures || options.saveStructures
+		let maxSharedStructures = options.maxSharedStructures
+		if (maxSharedStructures == null)
+			maxSharedStructures = hasSharedStructures ? 128 : 0
+		if (maxSharedStructures > 8190)
+			throw new Error('Maximum maxSharedStructure is 8190')
 		let isSequential = options.sequential
 		if (isSequential) {
 			maxSharedStructures = 0
-			this.structures = []
 		}
+		if (!this.structures)
+			this.structures = []
 		if (this.saveStructures)
 			this.saveShared = this.saveStructures
 		let samplingPackedValues, packedObjectMap, sharedValues = options.sharedValues
@@ -91,6 +97,10 @@ export class Encoder extends Decoder {
 			} else if (encodeOptions === REUSE_BUFFER_MODE)
 				position = (position + 7) & 0x7ffffff8 // Word align to make any future copying of this buffer faster
 			start = position
+			if (encoder.useSelfDescribedHeader) {
+				targetView.setUint32(position, 0xd9d9f700) // tag two byte, then self-descriptive tag
+				position += 3
+			}
 			referenceMap = encoder.structuredClone ? new Map() : null
 			if (encoder.bundleStrings && typeof value !== 'string') {
 				bundledStrings = []
@@ -124,6 +134,8 @@ export class Encoder extends Decoder {
 							continue
 						let nextTransition, transition = sharedStructures.transitions
 						for (let j = 0, l = keys.length; j < l; j++) {
+							if (transition[RECORD_SYMBOL] === undefined)
+								transition[RECORD_SYMBOL] = i
 							let key = keys[j]
 							nextTransition = transition[key]
 							if (!nextTransition) {
@@ -131,7 +143,7 @@ export class Encoder extends Decoder {
 							}
 							transition = nextTransition
 						}
-						transition[RECORD_SYMBOL] = i
+						transition[RECORD_SYMBOL] = i | 0x100000
 					}
 				}
 				if (!isSequential)
@@ -183,11 +195,13 @@ export class Encoder extends Decoder {
 					target.end = position
 					return target
 				}
-				return target.subarray(start, position) // position can change if we call pack again in saveShared, so we get the buffer now
+				return target.subarray(start, position) // position can change if we call encode again in saveShared, so we get the buffer now
 			} finally {
 				if (sharedStructures) {
 					if (serializationsSinceTransitionRebuild < 10)
 						serializationsSinceTransitionRebuild++
+					if (sharedStructures.length > maxSharedStructures)
+						sharedStructures.length = maxSharedStructures
 					if (transitionsCount > 10000) {
 						// force a rebuild occasionally after a lot of transitions so it can get cleaned up
 						sharedStructures.transitions = null
@@ -200,6 +214,7 @@ export class Encoder extends Decoder {
 							recordIdsToRemove[i][RECORD_SYMBOL] = undefined
 						}
 						recordIdsToRemove = []
+						//sharedStructures.nextId = maxSharedStructures
 					}
 				}
 				if (hasSharedUpdate && encoder.saveShared) {
@@ -611,88 +626,74 @@ export class Encoder extends Decoder {
 			target[objectOffset++ + start] = size >> 8
 			target[objectOffset + start] = size & 0xff
 		} :
-
-	/*	sharedStructures ?  // For highly stable structures, using for-in can a little bit faster
 		(object, safePrototype) => {
 			let nextTransition, transition = structures.transitions || (structures.transitions = Object.create(null))
-			let objectOffset = position++ - start
-			let wroteKeys
-			for (let key in object) {
-				if (safePrototype || object.hasOwnProperty(key)) {
+			let newTransitions = 0
+			let length = 0
+			let parentRecordId
+			let keys
+			if (this.keyMap) {
+				keys = Object.keys(object).map(k => this.encodeKey(k))
+				length = keys.length
+				for (let i = 0; i < length; i++) {
+					let key = keys[i]
 					nextTransition = transition[key]
 					if (!nextTransition) {
 						nextTransition = transition[key] = Object.create(null)
-						nextTransition.__keys__ = (transition.__keys__ || []).concat([key])
-						/*let keys = Object.keys(object)
-						if 
-						let size = 0
-						let startBranch = transition.__keys__ ? transition.__keys__.length : 0
-						for (let i = 0, l = keys.length; i++) {
-							let key = keys[i]
-							size += key.length << 2
-							if (i >= startBranch) {
-								nextTransition = nextTransition[key] = Object.create(null)
-								nextTransition.__keys__ = keys.slice(0, i + 1)
-							}
+						newTransitions++
+					}
+					transition = nextTransition
+				}				
+			} else {
+				for (let key in object) if (safePrototype || object.hasOwnProperty(key)) {
+					nextTransition = transition[key]
+					if (!nextTransition) {
+						if (transition[RECORD_SYMBOL] & 0x100000) {// this indicates it is a brancheable/extendable terminal node, so we will use this record id and extend it
+							parentRecordId = transition[RECORD_SYMBOL] & 0xffff
 						}
-						makeRoom(position + size)
-						nextTransition = transition[key]
-						target.copy(target, )
-						objectOffset
+						nextTransition = transition[key] = Object.create(null)
+						newTransitions++
 					}
 					transition = nextTransition
-					encode(object[key])
+					length++
 				}
 			}
-			let id = transition.id
-			if (!id) {
-				id = transition.id = structures.push(transition.__keys__) + 63
-				if (sharedStructures.onUpdate)
-					sharedStructures.onUpdate(id, transition.__keys__)
-			}
-			target[objectOffset + start] = id
-		}*/
-		(object) => {
-			let keys = Object.keys(object)
-			let vals = Object.values(object)
-			if (this.keyMap) keys = keys.map(k => this.encodeKey(k))
-			let nextTransition, transition = structures.transitions || (structures.transitions = Object.create(null))
-			let newTransitions = 0
-			let length = keys.length
-			//let parentRecordId
-			for (let i = 0; i < length; i++) {
-				//if (!parentRecordId)
-				let key = keys[i]
-				//	parentRecordId = transition[RECORD_SYMBOL]
-				nextTransition = transition[key]
-				if (!nextTransition) {
-					nextTransition = transition[key] = Object.create(null)
-					newTransitions++
-				}
-				transition = nextTransition
-			}
 			let recordId = transition[RECORD_SYMBOL]
 			if (recordId !== undefined) {
+				recordId &= 0xffff
 				target[position++] = 0xd9
 				target[position++] = (recordId >> 8) | 0xe0
 				target[position++] = recordId & 0xff
 			} else {
-				recordId = structures.nextId++
-				if (!recordId) {
-					recordId = 0
-					structures.nextId = 1
-				}
-				if (recordId >= MAX_STRUCTURES) {// cycle back around
-					structures.nextId = (recordId = maxSharedStructures) + 1
+				if (!keys)
+					keys = transition.__keys__ || (transition.__keys__ = Object.keys(object))
+				if (parentRecordId === undefined) {
+					recordId = structures.nextId++
+					if (!recordId) {
+						recordId = 0
+						structures.nextId = 1
+					}
+					if (recordId >= MAX_STRUCTURES) {// cycle back around
+						structures.nextId = (recordId = maxSharedStructures) + 1
+					}
+				} else {
+					recordId = parentRecordId
 				}
-				transition[RECORD_SYMBOL] = recordId
 				structures[recordId] = keys
-				if (sharedStructures && sharedStructures.length <= maxSharedStructures) {
+				if (recordId < maxSharedStructures) {
 					target[position++] = 0xd9
 					target[position++] = (recordId >> 8) | 0xe0
 					target[position++] = recordId & 0xff
+					transition = structures.transitions
+					for (let i = 0; i < length; i++) {
+						if (transition[RECORD_SYMBOL] === undefined || (transition[RECORD_SYMBOL] & 0x100000))
+							transition[RECORD_SYMBOL] = recordId
+						transition = transition[keys[i]]
+					}
+					transition[RECORD_SYMBOL] = recordId | 0x100000 // indicates it is a extendable terminal
 					hasSharedUpdate = true
 				} else {
+					transition[RECORD_SYMBOL] = recordId
 					targetView.setUint32(position, 0xd9dfff00) // tag two byte, then record definition id
 					position += 3
 					if (newTransitions)
@@ -713,7 +714,9 @@ export class Encoder extends Decoder {
 			} else {
 				writeArrayHeader(length)
 			}
-			for (let i =0; i < length; i++) encode(vals[i])
+			for (let key in object)
+				if (safePrototype || object.hasOwnProperty(key))
+					encode(object[key])
 		}
 		const makeRoom = (end) => {
 			let newSize
@@ -752,15 +755,22 @@ export class Encoder extends Decoder {
 	updateSharedData() {
 		let lastVersion = this.sharedVersion || 0
 		this.sharedVersion = lastVersion + 1
-		let saveResults = this.saveShared(new SharedData(this.structures, this.sharedValues, this.sharedVersion),
+		let structuresCopy = this.structures.slice(0)
+		let sharedData = new SharedData(structuresCopy, this.sharedValues, this.sharedVersion)
+		let saveResults = this.saveShared(sharedData,
 				existingShared => (existingShared && existingShared.version || 0) == lastVersion)
 		if (saveResults === false) {
 			// get updated structures and try again if the update failed
-			let sharedData = this.getShared() || {}
+			sharedData = this.getShared() || {}
 			this.structures = sharedData.structures || []
 			this.sharedValues = sharedData.packedValues
 			this.sharedVersion = sharedData.version
+			this.structures.nextId = this.structures.length
+		} else {
+			// restore structures
+			structuresCopy.forEach((structure, i) => this.structures[i] = structure)
 		}
+		// saveShared may fail to write and reload, or may have reloaded to check compatibility and overwrite saved data, either way load the correct shared data
 		return saveResults
 	}
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cbor-x",
   "author": "Kris Zyp",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Ultra-fast and conformant CBOR (RFC 8949) implementation with support for numerous tag extensions including records and structured cloning",
   "license": "MIT",
   "types": "./index.d.ts",