cbor-x 0.9.1 → 1.0.0

package/encode.js

@@ -1,4 +1,3 @@
-import { write } from 'fs'
 import { Decoder, mult10, Tag, typedArrays, addExtension as decodeAddExtension } from './decode.js'
 let textEncoder
 try {
@@ -8,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
@@ -16,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) {
@@ -28,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) ?
@@ -37,12 +38,14 @@ export class Encoder extends Decoder {
 			} : false
 
 		let encoder = this
-		let maxSharedStructures = 64
+		let maxSharedStructures = options.maxSharedStructures || 128
 		let isSequential = options.sequential
 		if (isSequential) {
 			maxSharedStructures = 0
 			this.structures = []
 		}
+		if (this.saveStructures)
+			this.saveShared = this.saveStructures
 		let samplingPackedValues, packedObjectMap, sharedValues = options.sharedValues
 		let sharedPackedObjectMap
 		if (sharedValues) {
@@ -50,13 +53,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)
@@ -73,10 +92,25 @@ export class Encoder extends Decoder {
 				position = (position + 7) & 0x7ffffff8 // Word align to make any future copying of this buffer faster
 			start = position
 			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
@@ -85,6 +119,7 @@ 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
@@ -98,7 +133,6 @@ export class Encoder extends Decoder {
 						}
 						transition[RECORD_SYMBOL] = i
 					}
-					lastSharedStructuresLength = sharedStructures.length
 				}
 				if (!isSequential)
 					sharedStructures.nextId = sharedStructuresLength
@@ -131,9 +165,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
@@ -141,12 +178,12 @@ 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 pack again in saveShared, so we get the buffer now
 			} finally {
 				if (sharedStructures) {
 					if (serializationsSinceTransitionRebuild < 10)
@@ -164,34 +201,27 @@ export class Encoder extends Decoder {
 						}
 						recordIdsToRemove = []
 					}
-					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 = []
@@ -202,6 +232,7 @@ export class Encoder extends Decoder {
 						hasSharedUpdate = true
 					}
 				}
+				while (this.saveShared && this.updateSharedData() === false) {}
 				samplingPackedValues = null
 			}
 		}
@@ -250,6 +281,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) {
@@ -376,16 +434,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 })
@@ -425,16 +483,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) {
@@ -496,6 +561,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
@@ -512,9 +578,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) => {
@@ -522,12 +595,18 @@ 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
@@ -575,11 +654,16 @@ export class Encoder extends Decoder {
 		}*/
 		(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)
@@ -589,9 +673,9 @@ export class Encoder extends Decoder {
 			}
 			let recordId = transition[RECORD_SYMBOL]
 			if (recordId !== undefined) {
-				target[position++] = 0xd9 // tag two byte
-				target[position++] = RECORD_STARTING_ID_PREFIX
-				target[position++] = recordId
+				target[position++] = 0xd9
+				target[position++] = (recordId >> 8) | 0xe0
+				target[position++] = recordId & 0xff
 			} else {
 				recordId = structures.nextId++
 				if (!recordId) {
@@ -604,13 +688,13 @@ export class Encoder extends Decoder {
 				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
+					target[position++] = 0xd9
+					target[position++] = (recordId >> 8) | 0xe0
+					target[position++] = recordId & 0xff
 					hasSharedUpdate = true
 				} else {
-					target[position++] = 0xd8
-					target[position++] = RECORD_STARTING_ID_PREFIX
+					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
@@ -618,13 +702,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
 				}
 			}
@@ -633,8 +713,7 @@ export class Encoder extends Decoder {
 			} else {
 				writeArrayHeader(length)
 			}
-			for (let i =0; i < length; i++)
-				encode(object[keys[i]])
+			for (let i =0; i < length; i++) encode(vals[i])
 		}
 		const makeRoom = (end) => {
 			let newSize
@@ -643,7 +722,7 @@ export class Encoder extends Decoder {
 				if ((end - start) > MAX_BUFFER_SIZE)
 					throw new Error('Encoded buffer would be larger than maximum buffer size')
 				newSize = Math.min(MAX_BUFFER_SIZE,
-					Math.round(Math.max((end - start) * (end > 0x4000000 ? 1.25 : 2), 0x1000000) / 0x1000) * 0x1000)
+					Math.round(Math.max((end - start) * (end > 0x4000000 ? 1.25 : 2), 0x400000) / 0x1000) * 0x1000)
 			} else // faster handling for smaller buffers
 				newSize = ((Math.max((end - start) << 2, target.length - 1) >> 12) + 1) << 12
 			let newBuffer = new ByteArrayAllocate(newSize)
@@ -664,11 +743,32 @@ 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 saveResults = this.saveShared(new SharedData(this.structures, this.sharedValues, this.sharedVersion),
+				existingShared => (existingShared && existingShared.version || 0) == lastVersion)
+		if (saveResults === false) {
+			// get updated structures and try again if the update failed
+			let sharedData = this.getShared() || {}
+			this.structures = sharedData.structures || []
+			this.sharedValues = sharedData.packedValues
+			this.sharedVersion = sharedData.version
+		}
+		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
 	}
 }
 
@@ -739,9 +839,11 @@ function findRepetitiveStrings(value, packedValues) {
 	}
 }
 
-extensionClasses = [ Date, Set, Error, RegExp, ArrayBuffer, ByteArray,
-	Uint8Array, Uint8ClampedArray, Uint16Array, Uint32Array, BigUint64Array, Int8Array, Int16Array, Int32Array, BigInt64Array,
-	Float32Array, Float64Array]
+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, SharedData]
 
 //Object.getPrototypeOf(Uint8Array.prototype).constructor /*TypedArray*/
 extensions = [{
@@ -776,6 +878,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)
@@ -794,7 +903,35 @@ extensions = [{
 	typedArrayEncoder(78),
 	typedArrayEncoder(79),
 	typedArrayEncoder(81),
-	typedArrayEncoder(82)]
+	typedArrayEncoder(82),
+{
+	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) {
 	return {
@@ -834,27 +971,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) {
@@ -870,4 +1015,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
+

package/index.d.ts

@@ -1,4 +1,4 @@
-export { Decoder, decode, addExtension, FLOAT32_OPTIONS, clearSource, roundFloat32 } from './decode.js'
+export { Decoder, decode, addExtension, FLOAT32_OPTIONS, clearSource, roundFloat32, isNativeAccelerationEnabled } from './decode.js'
 export { Encoder, encode } from './encode.js'
 import { Transform, Readable } from 'stream'
 

package/index.js

@@ -1,5 +1,3 @@
-export { Encoder, addExtension, encode, NEVER, ALWAYS, DECIMAL_ROUND, DECIMAL_FIT } from './encode.js'
-export { Tag, Decoder, decodeMultiple, decode, FLOAT32_OPTIONS, clearSource, roundFloat32 } from './decode.js'
+export { Encoder, addExtension, encode, NEVER, ALWAYS, DECIMAL_ROUND, DECIMAL_FIT, REUSE_BUFFER_MODE } from './encode.js'
+export { Tag, Decoder, decodeMultiple, decode, FLOAT32_OPTIONS, clearSource, roundFloat32, isNativeAccelerationEnabled } from './decode.js'
 export { decodeIter, encodeIter } from './iterators.js'
-export const useRecords = false
-export const mapsAsObjects = true

package/node-index.js

@@ -1,5 +1,5 @@
 export { Encoder, addExtension, encode, NEVER, ALWAYS, DECIMAL_ROUND, DECIMAL_FIT, REUSE_BUFFER_MODE } from './encode.js'
-export { Tag, Decoder, decodeMultiple, decode, FLOAT32_OPTIONS, clearSource, roundFloat32 } from './decode.js'
+export { Tag, Decoder, decodeMultiple, decode, FLOAT32_OPTIONS, clearSource, roundFloat32, isNativeAccelerationEnabled } from './decode.js'
 export { EncoderStream, DecoderStream } from './stream.js'
 export { decodeIter, encodeIter } from './iterators.js'
 export const useRecords = false
@@ -16,9 +16,7 @@ function tryRequire(moduleId) {
 		let require = createRequire(import.meta.url)
 		return require(moduleId)
 	} catch (error) {
-		if (typeof window == 'undefined')
-			console.warn('Native extraction module not loaded, cbor-x will still run, but with decreased performance. ' + error.message.split('\n')[0])
-		else
+		if (typeof window != 'undefined')
 			console.warn('For browser usage, directly use cbor-x/decode or cbor-x/encode modules. ' + error.message.split('\n')[0])
 	}
 }

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "cbor-x",
   "author": "Kris Zyp",
-  "version": "0.9.1",
-  "description": "Ultra-fast CBOR implementation with tag extensions for records and structured cloning",
+  "version": "1.0.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",
   "main": "./dist/node.cjs",
@@ -52,10 +52,17 @@
       }
     }
   },
+  "files": [
+    "/dist",
+    "*.md",
+    "/*.js",
+    "/*.ts"
+  ],
   "optionalDependencies": {
-    "cbor-extract": "^0.3.2"
+    "cbor-extract": "^1.0.0"
   },
   "devDependencies": {
+    "@rollup/plugin-json": "^4.1.0",
     "@types/node": "latest",
     "async": "^3",
     "cbor": "^5",
@@ -64,7 +71,9 @@
     "esm": "^3.2.25",
     "mocha": "^8.1.3",
     "rollup": "^1.20.3",
-    "@rollup/plugin-json": "^4.1.0",
     "rollup-plugin-babel-minify": "^9.0.0"
+  },
+  "dependencies": {
+    "esbuild": "^0.13.15"
   }
 }

package/.vscode/launch.json

@@ -1,22 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "pwa-node",
-            "request": "launch",
-            "name": "Run cbor-x tests",
-            "runtimeArgs": [
-                "test"
-            ],
-            "runtimeExecutable": "npm",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "console": "internalConsole", 
-            "outputCapture": "std"
-        }
-    ]
-}