cbor-x 1.5.8 → 1.6.0

package/encode.js

@@ -469,7 +469,7 @@ export class Encoder extends Decoder {
 					}
 					let constructor = value.constructor
 					if (constructor === Object) {
-						writeObject(value, true)
+						writeObject(value)
 					} else if (constructor === Array) {
 						length = value.length
 						if (length < 0x18) {
@@ -564,8 +564,8 @@ export class Encoder extends Decoder {
 								return encode(json)
 						}
 
-						// no extension found, write as object
-						writeObject(value, !value.hasOwnProperty) // if it doesn't have hasOwnProperty, don't do hasOwnProperty checks
+						// no extension found, write as a plain object
+						writeObject(value)
 					}
 				}
 			} else if (type === 'boolean') {
@@ -585,7 +585,19 @@ export class Encoder extends Decoder {
 						target[position++] = 0xfb
 						targetView.setFloat64(position, Number(value))
 					} else {
-						throw new RangeError(value + ' was too large to fit in CBOR 64-bit integer format, set largeBigIntToFloat to convert to float-64')
+						if (value >= BigInt(0))
+							target[position++] = 0xc2 // tag 2
+						else {
+							target[position++] = 0xc3 // tag 2
+							value = BigInt(-1) - value;
+						}
+						let bytes = [];
+						while (value) {
+							bytes.push(Number(value & BigInt(0xff)));
+							value >>= BigInt(8);
+						}
+						writeBuffer(new Uint8Array(bytes.reverse()), makeRoom);
+						return;
 					}
 				}
 				position += 8
@@ -628,19 +640,19 @@ export class Encoder extends Decoder {
 				}
 			}
 		} :
-		(object, safePrototype) => {
+		(object) => {
 			target[position++] = 0xb9 // always use map 16, so we can preallocate and set the length afterwards
 			let objectOffset = position - start
 			position += 2
 			let size = 0
-			if (encoder.keyMap) { 
-				for (let key in object) if (safePrototype || object.hasOwnProperty(key)) {
+			if (encoder.keyMap) {
+				for (let key in object) if (typeof object.hasOwnProperty !== 'function' || object.hasOwnProperty(key)) {
 					encode(encoder.encodeKey(key))
 					encode(object[key])
 					size++
 				}
 			} else { 
-				for (let key in object) if (safePrototype || object.hasOwnProperty(key)) {
+				for (let key in object) if (typeof object.hasOwnProperty !== 'function' || object.hasOwnProperty(key)) {
 						encode(key)
 						encode(object[key])
 					size++
@@ -649,7 +661,7 @@ export class Encoder extends Decoder {
 			target[objectOffset++ + start] = size >> 8
 			target[objectOffset + start] = size & 0xff
 		} :
-		(object, safePrototype) => {
+		(object, skipValues) => {
 			let nextTransition, transition = structures.transitions || (structures.transitions = Object.create(null))
 			let newTransitions = 0
 			let length = 0
@@ -668,7 +680,7 @@ export class Encoder extends Decoder {
 					transition = nextTransition
 				}				
 			} else {
-				for (let key in object) if (safePrototype || object.hasOwnProperty(key)) {
+				for (let key in object) if (typeof object.hasOwnProperty !== 'function' || 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
@@ -728,9 +740,9 @@ export class Encoder extends Decoder {
 					writeArrayHeader(length + 2)
 					encode(0xe000 + recordId)
 					encode(keys)
-					if (safePrototype === null) return; // special exit for iterator
+					if (skipValues) return; // special exit for iterator
 					for (let key in object)
-						if (safePrototype || object.hasOwnProperty(key))
+						if (typeof object.hasOwnProperty !== 'function' || object.hasOwnProperty(key))
 							encode(object[key])
 					return
 				}
@@ -740,9 +752,9 @@ export class Encoder extends Decoder {
 			} else {
 				writeArrayHeader(length)
 			}
-			if (safePrototype === null) return; // special exit for iterator
+			if (skipValues) return; // special exit for iterator
 			for (let key in object)
-				if (safePrototype || object.hasOwnProperty(key))
+				if (typeof object.hasOwnProperty !== 'function' || object.hasOwnProperty(key))
 					encode(object[key])
 		}
 		const makeRoom = (end) => {
@@ -780,7 +792,7 @@ export class Encoder extends Decoder {
 			if (constructor === Object) {
 				let useRecords = encoder.useRecords !== false;
 				if (useRecords)
-					writeObject(object, null); // write the record identifier
+					writeObject(object, true); // write the record identifier
 				else
 					writeEntityLength(Object.keys(object).length, 0xa0);
 				for (let key in object) {
@@ -805,7 +817,7 @@ export class Encoder extends Decoder {
 							yield* tryEncode(value, iterateProperties, 'element');
 					} else encode(value);
 				}
-			} else if (object[Symbol.iterator]) {
+			} else if (object[Symbol.iterator] && !object.buffer) { // iterator, but exclude typed arrays
 				target[position++] = 0x9f; // start indefinite array
 				for (let value of object) {
 					if (value && (typeof value === 'object' || position - start > chunkThreshold)) {

package/index.d.ts

@@ -4,7 +4,11 @@ export enum FLOAT32_OPTIONS {
 	DECIMAL_ROUND = 3,
 	DECIMAL_FIT = 4
 }
-
+export interface SizeLimitOptions {
+	maxArraySize: number;
+	maxMapSize: number;
+	maxObjectSize: number;
+}
 export interface Options {
 	alwaysUseFloat?: boolean
 	useFloat32?: FLOAT32_OPTIONS
@@ -43,6 +47,7 @@ export class Decoder {
 	decode(messagePack: Buffer | Uint8Array): any
 	decodeMultiple(messagePack: Buffer | Uint8Array, forEach?: (value: any) => any): [] | void
 }
+export function setMaxLimits(options: SizeLimitOptions): void
 export function decode(messagePack: Buffer | Uint8Array): any
 export function decodeMultiple(messagePack: Buffer | Uint8Array, forEach?: (value: any) => any): [] | void
 export function addExtension<T, R>(extension: Extension<T, R>): void

package/index.js

@@ -1,3 +1,3 @@
 export { Encoder, addExtension, encode, encodeAsIterable, encodeAsAsyncIterable, 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 { Tag, Decoder, decodeMultiple, decode, FLOAT32_OPTIONS, clearSource, roundFloat32, isNativeAccelerationEnabled, setSizeLimits } from './decode.js'
 export { decodeIter, encodeIter } from './iterators.js'

package/node-index.js

@@ -1,5 +1,5 @@
 export { Encoder, addExtension, encode, encodeAsIterable, encodeAsAsyncIterable, 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 { Tag, Decoder, decodeMultiple, decode, FLOAT32_OPTIONS, clearSource, roundFloat32, isNativeAccelerationEnabled, setSizeLimits } from './decode.js'
 export { EncoderStream, DecoderStream } from './stream.js'
 export { decodeIter, encodeIter } from './iterators.js'
 export const useRecords = false

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cbor-x",
   "author": "Kris Zyp",
-  "version": "1.5.8",
+  "version": "1.6.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",
@@ -55,8 +55,14 @@
         "import": "./decode.js"
       }
     },
-    "./decode-no-eval": "./dist/decode-no-eval.cjs",
-    "./index-no-eval": "./dist/index-no-eval.cjs",
+    "./decode-no-eval": {
+      "types": "./decode.d.ts",
+      "default": "./dist/decode-no-eval.cjs"
+    },
+    "./index-no-eval": {
+      "types": "./index.d.ts",
+      "default": "./dist/index-no-eval.cjs"
+    },
     "./package.json": "./package.json"
   },
   "files": [