cbor-x 0.9.4 → 1.2.0

package/encode.js

@@ -7,7 +7,7 @@ let extensions, extensionClasses
 const hasNodeBuffer = typeof Buffer !== 'undefined'
 const ByteArrayAllocate = hasNodeBuffer ? Buffer.allocUnsafeSlow : Uint8Array
 const ByteArray = hasNodeBuffer ? Buffer : Uint8Array
-const RECORD_STARTING_ID_PREFIX = 0x69 // tag 105/0x69
+const RECORD_INLINE_ID = 0xdfff // temporary first-come first-serve tag // proposed tag: 0x7265 // 're'
 const MAX_STRUCTURES = 0x100
 const MAX_BUFFER_SIZE = hasNodeBuffer ? 0x100000000 : 0x7fd00000
 let serializationId = 1
@@ -15,6 +15,9 @@ let target
 let targetView
 let position = 0
 let safeEnd
+let bundledStrings = null
+const MAX_BUNDLE_SIZE = 0xf000
+const hasNonLatin = /[\u0080-\uFFFF]/
 const RECORD_SYMBOL = Symbol('record-id')
 export class Encoder extends Decoder {
 	constructor(options) {
@@ -27,7 +30,6 @@ export class Encoder extends Decoder {
 		let structures
 		let referenceMap
 		options = options || {}
-		let lastSharedStructuresLength = 0
 		let encodeUtf8 = ByteArray.prototype.utf8Write ? function(string, position, maxBytes) {
 			return target.utf8Write(string, position, maxBytes)
 		} : (textEncoder && textEncoder.encodeInto) ?
@@ -36,12 +38,20 @@ export class Encoder extends Decoder {
 			} : false
 
 		let encoder = this
-		let maxSharedStructures = 64
+		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
 		let sharedPackedObjectMap
 		if (sharedValues) {
@@ -49,13 +59,29 @@ export class Encoder extends Decoder {
 			for (let i = 0, l = sharedValues.length; i < l; i++) {
 				sharedPackedObjectMap[sharedValues[i]] = i
 			}
-
 		}
 		let recordIdsToRemove = []
 		let transitionsCount = 0
 		let serializationsSinceTransitionRebuild = 0
-
-		this.encode = function(value, encodeOptions) {
+		
+		this.mapEncode = function(value, encodeOptions) {
+			// Experimental support for premapping keys using _keyMap instad of keyMap - not optiimised yet)
+			if (this._keyMap && !this._mapped) {
+				//console.log('encoding ', value)
+				switch (value.constructor.name) {
+					case 'Array': 
+						value = value.map(r => this.encodeKeys(r))
+						break
+					//case 'Map': 
+					//	value = this.encodeKeys(value)
+					//	break
+				}
+				//this._mapped = true
+			}
+			return this.encode(value, encodeOptions)
+		}
+		
+		this.encode = function(value, encodeOptions)	{
 			if (!target) {
 				target = new ByteArrayAllocate(8192)
 				targetView = new DataView(target.buffer, 0, 8192)
@@ -71,11 +97,30 @@ 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 = []
+				bundledStrings.size = Infinity // force a new bundle start on first string
+			} else
+				bundledStrings = null
+
 			sharedStructures = encoder.structures
 			if (sharedStructures) {
-				if (sharedStructures.uninitialized)
-					encoder.structures = sharedStructures = encoder.getStructures()
+				if (sharedStructures.uninitialized) {
+					let sharedData = encoder.getShared() || {}
+					encoder.structures = sharedStructures = sharedData.structures || []
+					encoder.sharedVersion = sharedData.version
+					let sharedValues = encoder.sharedValues = sharedData.packedValues
+					if (sharedValues) {
+						sharedPackedObjectMap = {}
+						for (let i = 0, l = sharedValues.length; i < l; i++)
+							sharedPackedObjectMap[sharedValues[i]] = i
+					}
+				}
 				let sharedStructuresLength = sharedStructures.length
 				if (sharedStructuresLength > maxSharedStructures && !isSequential)
 					sharedStructuresLength = maxSharedStructures
@@ -84,10 +129,13 @@ export class Encoder extends Decoder {
 					sharedStructures.transitions = Object.create(null)
 					for (let i = 0; i < sharedStructuresLength; i++) {
 						let keys = sharedStructures[i]
+						//console.log('shared struct keys:', keys)
 						if (!keys)
 							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) {
@@ -95,9 +143,8 @@ export class Encoder extends Decoder {
 							}
 							transition = nextTransition
 						}
-						transition[RECORD_SYMBOL] = i
+						transition[RECORD_SYMBOL] = i | 0x100000
 					}
-					lastSharedStructuresLength = sharedStructures.length
 				}
 				if (!isSequential)
 					sharedStructures.nextId = sharedStructuresLength
@@ -130,9 +177,12 @@ export class Encoder extends Decoder {
 			}
 			try {
 				encode(value)
+				if (bundledStrings) {
+					writeBundles(start, encode)
+				}
 				encoder.offset = position // update the offset so next serialization doesn't write over our buffer, but can continue writing to same buffer sequentially
 				if (referenceMap && referenceMap.idsToInsert) {
-					position += referenceMap.idsToInsert.length * 8
+					position += referenceMap.idsToInsert.length * 2
 					if (position > safeEnd)
 						makeRoom(position)
 					encoder.offset = position
@@ -140,16 +190,18 @@ export class Encoder extends Decoder {
 					referenceMap = null
 					return serialized
 				}
-				if (encodeOptions === REUSE_BUFFER_MODE) {
+				if (encodeOptions & REUSE_BUFFER_MODE) {
 					target.start = start
 					target.end = position
 					return target
 				}
-				return target.subarray(start, position) // position can change if we call pack again in saveStructures, 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
@@ -162,35 +214,29 @@ export class Encoder extends Decoder {
 							recordIdsToRemove[i][RECORD_SYMBOL] = undefined
 						}
 						recordIdsToRemove = []
+						//sharedStructures.nextId = maxSharedStructures
 					}
-					if (hasSharedUpdate && encoder.saveStructures) {
-						if (encoder.structures.length > maxSharedStructures) {
-							encoder.structures = encoder.structures.slice(0, maxSharedStructures)
-						}
-						// 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 shared = encoder.structures || []
-						if (sharedValues) {
-							shared = shared.concat(sharedValues)
-						}
-
-						if (encoder.saveStructures(encoder.structures, lastSharedStructuresLength) === false) {
-							// get updated structures and try again if the update failed
-							encoder.structures = encoder.getStructures() || []
-							return encoder.encode(value)
-						}
-						lastSharedStructuresLength = shared.length
-						return returnBuffer
+				}
+				if (hasSharedUpdate && encoder.saveShared) {
+					if (encoder.structures.length > maxSharedStructures) {
+						encoder.structures = encoder.structures.slice(0, maxSharedStructures)
 					}
+					// 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)
+					if (encoder.updateSharedData() === false)
+						return encoder.encode(value) // re-encode if it fails
+					return returnBuffer
 				}
+				if (encodeOptions & RESET_BUFFER_MODE)
+					position = start
 			}
 		}
 		this.findCommonStringsToPack = () => {
 			samplingPackedValues = new Map()
 			if (!sharedPackedObjectMap)
 				sharedPackedObjectMap = Object.create(null)
-			return ({ threshold }) => {
-				threshold = threshold || 4
+			return (options) => {
+				let threshold = options && options.threshold || 4
 				let position = this.pack ? options.maxPrivatePackedValues || 16 : 0
 				if (!sharedValues)
 					sharedValues = this.sharedValues = []
@@ -201,6 +247,7 @@ export class Encoder extends Decoder {
 						hasSharedUpdate = true
 					}
 				}
+				while (this.saveShared && this.updateSharedData() === false) {}
 				samplingPackedValues = null
 			}
 		}
@@ -249,6 +296,33 @@ export class Encoder extends Decoder {
 					}
 				}
 				let strLength = value.length
+				if (bundledStrings && strLength >= 4 && strLength < 0x400) {
+					if ((bundledStrings.size += strLength) > MAX_BUNDLE_SIZE) {
+						let extStart
+						let maxBytes = (bundledStrings[0] ? bundledStrings[0].length * 3 + bundledStrings[1].length : 0) + 10
+						if (position + maxBytes > safeEnd)
+							target = makeRoom(position + maxBytes)
+						target[position++] = 0xd9 // tag 16-bit
+						target[position++] = 0xdf // tag 0xdff9
+						target[position++] = 0xf9
+						// TODO: If we only have one bundle with any string data, only write one string bundle
+						target[position++] = bundledStrings.position ? 0x84 : 0x82 // array of 4 or 2 elements depending on if we write bundles
+						target[position++] = 0x1a // 32-bit unsigned int
+						extStart = position - start
+						position += 4 // reserve for writing bundle reference
+						if (bundledStrings.position) {
+							writeBundles(start, encode) // write the last bundles
+						}
+						bundledStrings = ['', ''] // create new ones
+						bundledStrings.size = 0
+						bundledStrings.position = extStart
+					}
+					let twoByte = hasNonLatin.test(value)
+					bundledStrings[twoByte ? 0 : 1] += value
+					target[position++] = twoByte ? 0xce : 0xcf
+					encode(strLength);
+					return
+				}
 				let headerSize
 				// first we estimate the header size, so we can write to the correct location
 				if (strLength < 0x20) {
@@ -375,16 +449,16 @@ export class Encoder extends Decoder {
 					if (referenceMap) {
 						let referee = referenceMap.get(value)
 						if (referee) {
-							if (!referee.id) {
+							target[position++] = 0xd8
+							target[position++] = 29 // http://cbor.schmorp.de/value-sharing
+							target[position++] = 0x19 // 16-bit uint
+							if (!referee.references) {
 								let idsToInsert = referenceMap.idsToInsert || (referenceMap.idsToInsert = [])
-								referee.id = idsToInsert.push(referee)
+								referee.references = []
+								idsToInsert.push(referee)
 							}
-							target[position++] = 0xd9
-							target[position++] = 40010 >> 8
-							target[position++] = 40010 & 0xff
-							target[position++] = 0x1a // uint32
-							targetView.setUint32(position, referee.id)
-							position += 4
+							referee.references.push(position - start)
+							position += 2 // TODO: also support 32-bit
 							return
 						} else 
 							referenceMap.set(value, { offset: position - start })
@@ -424,16 +498,23 @@ export class Encoder extends Decoder {
 							targetView.setUint32(position, length)
 							position += 4
 						}
-						for (let [ key, entryValue ] of value) {
-							encode(key)
-							encode(entryValue)
+						if (encoder.keyMap) { 
+							for (let [ key, entryValue ] of value) {
+								encode(encoder.encodeKey(key))
+								encode(entryValue)
+							} 
+						} else { 
+							for (let [ key, entryValue ] of value) {
+								encode(key) 
+								encode(entryValue)
+							} 	
 						}
-					} else {	
+					} else {
 						for (let i = 0, l = extensions.length; i < l; i++) {
 							let extensionClass = extensionClasses[i]
 							if (value instanceof extensionClass) {
 								let extension = extensions[i]
-								let tag = extension.tag
+								let tag = extension.tag || extension.getTag && extension.getTag(value)
 								if (tag < 0x18) {
 									target[position++] = 0xc0 | tag
 								} else if (tag < 0x100) {
@@ -495,6 +576,7 @@ export class Encoder extends Decoder {
 		const writeObject = this.useRecords === false ? this.variableMapSize ? (object) => {
 			// this method is slightly slower, but generates "preferred serialization" (optimally small for smaller objects)
 			let keys = Object.keys(object)
+			let vals = Object.values(object)
 			let length = keys.length
 			if (length < 0x18) {
 				target[position++] = 0xa0 | length
@@ -511,9 +593,16 @@ export class Encoder extends Decoder {
 				position += 4
 			}
 			let key
-			for (let i = 0; i < length; i++) {
-				encode(key = keys[i])
-				encode(object[key])
+			if (encoder.keyMap) { 
+				for (let i = 0; i < length; i++) {
+					encode(encodeKey(keys[i]))
+					encode(vals[i])
+				}
+			} else {
+				for (let i = 0; i < length; i++) {
+					encode(keys[i])
+					encode(vals[i])
+				}
 			}
 		} :
 		(object, safePrototype) => {
@@ -521,95 +610,92 @@ export class Encoder extends Decoder {
 			let objectOffset = position - start
 			position += 2
 			let size = 0
-			for (let key in object) {
-				if (safePrototype || object.hasOwnProperty(key)) {
-					encode(key)
+			if (encoder.keyMap) { 
+				for (let key in object) if (safePrototype || object.hasOwnProperty(key)) {
+					encode(encoder.encodeKey(key))
 					encode(object[key])
 					size++
 				}
+			} else { 
+				for (let key in object) if (safePrototype || object.hasOwnProperty(key)) {
+						encode(key)
+						encode(object[key])
+					size++
+				}
 			}
 			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 nextTransition, transition = structures.transitions || (structures.transitions = Object.create(null))
-			let newTransitions = 0
-			let 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)
-					newTransitions++
-				}
-				transition = nextTransition
-			}
 			let recordId = transition[RECORD_SYMBOL]
 			if (recordId !== undefined) {
-				target[position++] = 0xd9 // tag two byte
-				target[position++] = RECORD_STARTING_ID_PREFIX
-				target[position++] = recordId
+				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) {
-					target[position++] = 0xd9 // tag two byte
-					target[position++] = RECORD_STARTING_ID_PREFIX
-					target[position++] = recordId // tag number
+				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 {
-					target[position++] = 0xd8
-					target[position++] = RECORD_STARTING_ID_PREFIX
+					transition[RECORD_SYMBOL] = recordId
+					targetView.setUint32(position, 0xd9dfff00) // tag two byte, then record definition id
+					position += 3
 					if (newTransitions)
 						transitionsCount += serializationsSinceTransitionRebuild * newTransitions
 					// record the removal of the id, we can maintain our shared structure
@@ -617,13 +703,9 @@ export class Encoder extends Decoder {
 						recordIdsToRemove.shift()[RECORD_SYMBOL] = undefined // we are cycling back through, and have to remove old ones
 					recordIdsToRemove.push(transition)
 					writeArrayHeader(length + 2)
+					encode(0xe000 + recordId)
 					encode(keys)
-					target[position++] = 0x19 // uint16
-					target[position++] = RECORD_STARTING_ID_PREFIX
-					target[position++] = recordId
-					// now write the values
-					for (let i =0; i < length; i++)
-						encode(object[keys[i]])
+					for (let v of Object.values(object)) encode(v)
 					return
 				}
 			}
@@ -632,8 +714,9 @@ export class Encoder extends Decoder {
 			} else {
 				writeArrayHeader(length)
 			}
-			for (let i =0; i < length; i++)
-				encode(object[keys[i]])
+			for (let key in object)
+				if (safePrototype || object.hasOwnProperty(key))
+					encode(object[key])
 		}
 		const makeRoom = (end) => {
 			let newSize
@@ -663,11 +746,39 @@ export class Encoder extends Decoder {
 		targetView = new DataView(target.buffer, target.byteOffset, target.byteLength)
 		position = 0
 	}
+	clearSharedData() {
+		if (this.structures)
+			this.structures = []
+		if (this.sharedValues)
+			this.sharedValues = undefined
+	}
+	updateSharedData() {
+		let lastVersion = this.sharedVersion || 0
+		this.sharedVersion = lastVersion + 1
+		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
+			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
+	}
 }
-
-function copyBinary(source, target, targetOffset, offset, endOffset) {
-	while (offset < endOffset) {
-		target[targetOffset++] = source[offset++]
+class SharedData {
+	constructor(structures, values, version) {
+		this.structures = structures
+		this.packedValues = values
+		this.version = version
 	}
 }
 
@@ -737,12 +848,12 @@ function findRepetitiveStrings(value, packedValues) {
 		case 'function': console.log(value)
 	}
 }
-
-extensionClasses = [ Date, Set, Error, RegExp, ArrayBuffer, ByteArray,
+const isLittleEndianMachine = new Uint8Array(new Uint16Array([1]).buffer)[0] == 1
+extensionClasses = [ Date, Set, Error, RegExp, Tag, ArrayBuffer, ByteArray,
 	Uint8Array, Uint8ClampedArray, Uint16Array, Uint32Array,
 	typeof BigUint64Array == 'undefined' ? function() {} : BigUint64Array, Int8Array, Int16Array, Int32Array,
 	typeof BigInt64Array == 'undefined' ? function() {} : BigInt64Array,
-	Float32Array, Float64Array]
+	Float32Array, Float64Array, SharedData]
 
 //Object.getPrototypeOf(Uint8Array.prototype).constructor /*TypedArray*/
 extensions = [{
@@ -777,6 +888,13 @@ extensions = [{
 	encode(regex, encode) {
 		encode([ 'RegExp', regex.source, regex.flags ])
 	}
+}, {
+	getTag(tag) {
+		return tag.tag
+	},
+	encode(tag, encode) {
+		encode(tag.value)
+	}
 }, {
 	encode(arrayBuffer, encode, makeRoom) {
 		writeBuffer(arrayBuffer, makeRoom)
@@ -785,19 +903,48 @@ extensions = [{
 	encode(arrayBuffer, encode, makeRoom) {
 		writeBuffer(arrayBuffer, makeRoom)
 	}
-}, typedArrayEncoder(64),
-	typedArrayEncoder(68),
-	typedArrayEncoder(69),
-	typedArrayEncoder(70),
-	typedArrayEncoder(71),
-	typedArrayEncoder(72),
-	typedArrayEncoder(77),
-	typedArrayEncoder(78),
-	typedArrayEncoder(79),
-	typedArrayEncoder(81),
-	typedArrayEncoder(82)]
-
-function typedArrayEncoder(tag) {
+}, typedArrayEncoder(64, 1),
+	typedArrayEncoder(68, 1),
+	typedArrayEncoder(69, 2),
+	typedArrayEncoder(70, 4),
+	typedArrayEncoder(71, 8),
+	typedArrayEncoder(72, 1),
+	typedArrayEncoder(77, 2),
+	typedArrayEncoder(78, 4),
+	typedArrayEncoder(79, 8),
+	typedArrayEncoder(85, 4),
+	typedArrayEncoder(86, 8),
+{
+	encode(sharedData, encode) { // write SharedData
+		let packedValues = sharedData.packedValues || []
+		let sharedStructures = sharedData.structures || []
+		if (packedValues.values.length > 0) {
+			target[position++] = 0xd8 // one-byte tag
+			target[position++] = 51 // tag 51 for packed shared structures https://www.potaroo.net/ietf/ids/draft-ietf-cbor-packed-03.txt
+			writeArrayHeader(4)
+			let valuesArray = packedValues.values
+			encode(valuesArray)
+			writeArrayHeader(0) // prefixes
+			writeArrayHeader(0) // suffixes
+			packedObjectMap = Object.create(sharedPackedObjectMap || null)
+			for (let i = 0, l = valuesArray.length; i < l; i++) {
+				packedObjectMap[valuesArray[i]] = i
+			}
+		}
+		if (sharedStructures) {
+			targetView.setUint32(position, 0xd9dffe00)
+			position += 3
+			let definitions = sharedStructures.slice(0)
+			definitions.unshift(0xe000)
+			definitions.push(new Tag(sharedData.version, 0x53687264))
+			encode(definitions)
+		} else
+			encode(new Tag(sharedData.version, 0x53687264))
+		}
+	}]
+function typedArrayEncoder(tag, size) {
+	if (!isLittleEndianMachine && size > 1)
+		tag -= 4 // the big endian equivalents are 4 less
 	return {
 		tag: tag,
 		encode: function writeExtBuffer(typedArray, encode) {
@@ -835,27 +982,35 @@ function writeBuffer(buffer, makeRoom) {
 function insertIds(serialized, idsToInsert) {
 	// insert the ids that need to be referenced for structured clones
 	let nextId
-	let distanceToMove = idsToInsert.length * 8
+	let distanceToMove = idsToInsert.length * 2
 	let lastEnd = serialized.length - distanceToMove
 	idsToInsert.sort((a, b) => a.offset > b.offset ? 1 : -1)
+	for (let id = 0; id < idsToInsert.length; id++) {
+		let referee = idsToInsert[id]
+		referee.id = id
+		for (let position of referee.references) {
+			serialized[position++] = id >> 8
+			serialized[position] = id & 0xff
+		}
+	}
 	while (nextId = idsToInsert.pop()) {
 		let offset = nextId.offset
-		let id = nextId.id
 		serialized.copyWithin(offset + distanceToMove, offset, lastEnd)
-		distanceToMove -= 8
+		distanceToMove -= 2
 		let position = offset + distanceToMove
-		serialized[position++] = 0xd9
-		serialized[position++] = 40009 >> 8
-		serialized[position++] = 40009 & 0xff
-		serialized[position++] = 0x1a // uint32
-		serialized[position++] = id >> 24
-		serialized[position++] = (id >> 16) & 0xff
-		serialized[position++] = (id >> 8) & 0xff
-		serialized[position++] = id & 0xff
+		serialized[position++] = 0xd8
+		serialized[position++] = 28 // http://cbor.schmorp.de/value-sharing
 		lastEnd = offset
 	}
 	return serialized
 }
+function writeBundles(start, encode) {
+	targetView.setUint32(bundledStrings.position + start, position - bundledStrings.position - start + 1) // the offset to bundle
+	let writeStrings = bundledStrings
+	bundledStrings = null
+	encode(writeStrings[0])
+	encode(writeStrings[1])
+}
 
 export function addExtension(extension) {
 	if (extension.Class) {
@@ -871,4 +1026,6 @@ export const encode = defaultEncoder.encode
 export { FLOAT32_OPTIONS } from './decode.js'
 import { FLOAT32_OPTIONS } from './decode.js'
 export const { NEVER, ALWAYS, DECIMAL_ROUND, DECIMAL_FIT } = FLOAT32_OPTIONS
-export const REUSE_BUFFER_MODE = 1000
+export const REUSE_BUFFER_MODE = 512
+export const RESET_BUFFER_MODE = 1024
+