cbor-x 1.5.2 → 1.5.4

package/encode.js

@@ -4,7 +4,7 @@ try {
 	textEncoder = new TextEncoder()
 } catch (error) {}
 let extensions, extensionClasses
-const Buffer = globalThis.Buffer
+const Buffer = typeof globalThis === 'object' && globalThis.Buffer;
 const hasNodeBuffer = typeof Buffer !== 'undefined'
 const ByteArrayAllocate = hasNodeBuffer ? Buffer.allocUnsafeSlow : Uint8Array
 const ByteArray = hasNodeBuffer ? Buffer : Uint8Array
@@ -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?(): {}[]

package/package.json

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