cbor-x 1.5.3 → 1.5.5

package/encode.js

@@ -557,6 +557,13 @@ export class Encoder extends Decoder {
 							error.iteratorNotHandled = true;
 							throw error;
 						}
+						if (this.useToJSON && value.toJSON) {
+							const json = value.toJSON()
+							// if for some reason value.toJSON returns itself it'll loop forever
+							if (json !== value)
+								return encode(json)
+						}
+
 						// no extension found, write as object
 						writeObject(value, !value.hasOwnProperty) // if it doesn't have hasOwnProperty, don't do hasOwnProperty checks
 					}
@@ -611,7 +618,7 @@ export class Encoder extends Decoder {
 			let key
 			if (encoder.keyMap) { 
 				for (let i = 0; i < length; i++) {
-					encode(encodeKey(keys[i]))
+					encode(encoder.encodeKey(keys[i]))
 					encode(vals[i])
 				}
 			} else {

package/index.d.ts

@@ -21,6 +21,7 @@ export interface Options {
 	maxSharedStructures?: number
 	maxOwnStructures?: number
 	useSelfDescribedHeader?: boolean
+	useToJSON?: boolean
 	keyMap?: {}
 	shouldShareStructure?: (keys: string[]) => boolean
 	getStructures?(): {}[]
@@ -28,6 +29,7 @@ export interface Options {
 	onInvalidDate?: () => any
 	tagUint8Array?: boolean
 	pack?: boolean
+	sequential?: boolean
 }
 type ClassOf<T> = new (...args: any[]) => T;
 interface Extension<T, R> {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cbor-x",
   "author": "Kris Zyp",
-  "version": "1.5.3",
+  "version": "1.5.5",
   "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",

package/stream.js

@@ -13,10 +13,12 @@ export class EncoderStream extends Transform {
 		this.encoder = options.encoder || new Encoder(options)
 	}
 	async _transform(value, encoding, callback) {
-		for await (let chunk of this.encoder.encodeAsAsyncIterable(value)) {
-			this.push(chunk)
-		}
-		callback()
+		try {
+			for await (let chunk of this.encoder.encodeAsAsyncIterable(value)) {
+				this.push(chunk)
+			}
+			callback()
+		} catch(error) { callback (error) }
 	}
 }
 
@@ -37,13 +39,14 @@ export class DecoderStream extends Transform {
 		let values
 		try {
 			values = this.decoder.decodeMultiple(chunk)
+			callback()
 		} catch(error) {
 			if (error.incomplete) {
 				this.incompleteBuffer = chunk.slice(error.lastPosition)
 				values = error.values
+			} else {
+				callback(error)
 			}
-			else
-				throw error
 		} finally {
 			for (let value of values || []) {
 				if (value === null)
@@ -51,7 +54,6 @@ export class DecoderStream extends Transform {
 				this.push(value)
 			}
 		}
-		if (callback) callback()
 	}
 	getNullValue() {
 		return Symbol.for(null)