cbor-x 1.5.9 → 1.6.3

package/encode.js

@@ -31,8 +31,8 @@ export class Encoder extends Decoder {
 		let structures
 		let referenceMap
 		options = options || {}
-		let encodeUtf8 = ByteArray.prototype.utf8Write ? function(string, position, maxBytes) {
-			return target.utf8Write(string, position, maxBytes)
+		let encodeUtf8 = ByteArray.prototype.utf8Write ? function(string, position) {
+			return target.utf8Write(string, position, target.byteLength - position)
 		} : (textEncoder && textEncoder.encodeInto) ?
 			function(string, position) {
 				return textEncoder.encodeInto(string, target.subarray(position)).written
@@ -413,7 +413,7 @@ export class Encoder extends Decoder {
 						targetView.setUint32(position, value)
 						position += 4
 					}
-				} else if (!this.alwaysUseFloat && value >> 0 === value) { // negative integer
+				} else if (!this.alwaysUseFloat && value >> 0 === value) { // negative integer, 31-bit or less
 					if (value >= -0x18) {
 						target[position++] = 0x1f - value
 					} else if (value >= -0x100) {
@@ -428,6 +428,11 @@ export class Encoder extends Decoder {
 						targetView.setUint32(position, ~value)
 						position += 4
 					}
+				} else if (!this.alwaysUseFloat && value < 0 && value >= -0x100000000 && Math.floor(value) === value) {
+					// negative integer, 32-bit or less
+					target[position++] = 0x3a
+					targetView.setUint32(position, -1 - value)
+					position += 4
 				} else {
 					let useFloat32
 					if ((useFloat32 = this.useFloat32) > 0 && value < 0x100000000 && value >= -0x80000000) {
@@ -469,6 +474,9 @@ export class Encoder extends Decoder {
 					}
 					let constructor = value.constructor
 					if (constructor === Object) {
+						if (this.skipFunction === true) {
+							value = Object.fromEntries([...Object.keys(value).filter(x => typeof value[x] !== "function").map(x => [x, value[x]])]);
+						}
 						writeObject(value)
 					} else if (constructor === Array) {
 						length = value.length
@@ -585,7 +593,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
@@ -633,7 +653,7 @@ export class Encoder extends Decoder {
 			let objectOffset = position - start
 			position += 2
 			let size = 0
-			if (encoder.keyMap) { 
+			if (encoder.keyMap) {
 				for (let key in object) if (typeof object.hasOwnProperty !== 'function' || object.hasOwnProperty(key)) {
 					encode(encoder.encodeKey(key))
 					encode(object[key])
@@ -805,7 +825,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.9",
+  "version": "1.6.3",
   "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",
@@ -75,7 +75,7 @@
     "node:buffer": false
   },
   "optionalDependencies": {
-    "cbor-extract": "^2.2.0"
+    "cbor-extract": "^2.2.1"
   },
   "devDependencies": {
     "@rollup/plugin-json": "^5.0.1",