bson 6.5.0 → 6.6.0

package/lib/bson.mjs

@@ -128,8 +128,8 @@ class BSONOffsetError extends BSONError {
     get name() {
         return 'BSONOffsetError';
     }
-    constructor(message, offset) {
-        super(`${message}. offset: ${offset}`);
+    constructor(message, offset, options) {
+        super(`${message}. offset: ${offset}`, options);
         this.offset = offset;
     }
 }
@@ -531,16 +531,16 @@ class Binary extends BSONValue {
         return this.position;
     }
     toJSON() {
-        return ByteUtils.toBase64(this.buffer);
+        return ByteUtils.toBase64(this.buffer.subarray(0, this.position));
     }
     toString(encoding) {
         if (encoding === 'hex')
-            return ByteUtils.toHex(this.buffer);
+            return ByteUtils.toHex(this.buffer.subarray(0, this.position));
         if (encoding === 'base64')
-            return ByteUtils.toBase64(this.buffer);
+            return ByteUtils.toBase64(this.buffer.subarray(0, this.position));
         if (encoding === 'utf8' || encoding === 'utf-8')
-            return ByteUtils.toUTF8(this.buffer, 0, this.buffer.byteLength, false);
-        return ByteUtils.toUTF8(this.buffer, 0, this.buffer.byteLength, false);
+            return ByteUtils.toUTF8(this.buffer, 0, this.position, false);
+        return ByteUtils.toUTF8(this.buffer, 0, this.position, false);
     }
     toExtendedJSON(options) {
         options = options || {};
@@ -2136,6 +2136,15 @@ const FLOAT_BYTES = new Uint8Array(FLOAT.buffer, 0, 8);
 FLOAT[0] = -1;
 const isBigEndian = FLOAT_BYTES[7] === 0;
 const NumberUtils = {
+    getNonnegativeInt32LE(source, offset) {
+        if (source[offset + 3] > 127) {
+            throw new RangeError(`Size cannot be negative at offset: ${offset}`);
+        }
+        return (source[offset] |
+            (source[offset + 1] << 8) |
+            (source[offset + 2] << 16) |
+            (source[offset + 3] << 24));
+    },
     getInt32LE(source, offset) {
         return (source[offset] |
             (source[offset + 1] << 8) |
@@ -4125,13 +4134,12 @@ EJSON.deserialize = EJSONdeserialize;
 Object.freeze(EJSON);
 
 function getSize(source, offset) {
-    if (source[offset + 3] > 127) {
-        throw new BSONOffsetError('BSON size cannot be negative', offset);
+    try {
+        return NumberUtils.getNonnegativeInt32LE(source, offset);
+    }
+    catch (cause) {
+        throw new BSONOffsetError('BSON size cannot be negative', offset, { cause });
     }
-    return (source[offset] |
-        (source[offset + 1] << 8) |
-        (source[offset + 2] << 16) |
-        (source[offset + 3] << 24));
 }
 function findNull(bytes, offset) {
     let nullTerminatorOffset = offset;
@@ -4143,6 +4151,7 @@ function findNull(bytes, offset) {
     return nullTerminatorOffset;
 }
 function parseToElements(bytes, startOffset = 0) {
+    startOffset ??= 0;
     if (bytes.length < 5) {
         throw new BSONOffsetError(`Input must be at least 5 bytes, got ${bytes.length} bytes`, startOffset);
     }
@@ -4168,7 +4177,10 @@ function parseToElements(bytes, startOffset = 0) {
         const nameLength = findNull(bytes, offset) - nameOffset;
         offset += nameLength + 1;
         let length;
-        if (type === 1 || type === 18 || type === 9 || type === 17) {
+        if (type === 1 ||
+            type === 18 ||
+            type === 9 ||
+            type === 17) {
             length = 8;
         }
         else if (type === 16) {
@@ -4183,13 +4195,18 @@ function parseToElements(bytes, startOffset = 0) {
         else if (type === 8) {
             length = 1;
         }
-        else if (type === 10 || type === 6 || type === 127 || type === 255) {
+        else if (type === 10 ||
+            type === 6 ||
+            type === 127 ||
+            type === 255) {
             length = 0;
         }
         else if (type === 11) {
             length = findNull(bytes, findNull(bytes, offset) + 1) + 1 - offset;
         }
-        else if (type === 3 || type === 4 || type === 15) {
+        else if (type === 3 ||
+            type === 4 ||
+            type === 15) {
             length = getSize(bytes, offset);
         }
         else if (type === 2 ||
@@ -4219,7 +4236,8 @@ function parseToElements(bytes, startOffset = 0) {
 
 const onDemand = Object.create(null);
 onDemand.parseToElements = parseToElements;
-onDemand.BSONOffsetError = BSONOffsetError;
+onDemand.ByteUtils = ByteUtils;
+onDemand.NumberUtils = NumberUtils;
 Object.freeze(onDemand);
 
 const MAXSIZE = 1024 * 1024 * 17;
@@ -4276,6 +4294,7 @@ function deserializeStream(data, startIndex, numberOfDocuments, documents, docSt
 var bson = /*#__PURE__*/Object.freeze({
     __proto__: null,
     BSONError: BSONError,
+    BSONOffsetError: BSONOffsetError,
     BSONRegExp: BSONRegExp,
     BSONRuntimeError: BSONRuntimeError,
     BSONSymbol: BSONSymbol,
@@ -4304,5 +4323,5 @@ var bson = /*#__PURE__*/Object.freeze({
     setInternalBufferSize: setInternalBufferSize
 });
 
-export { bson as BSON, BSONError, BSONRegExp, BSONRuntimeError, BSONSymbol, BSONType, BSONValue, BSONVersionError, Binary, Code, DBRef, Decimal128, Double, EJSON, Int32, Long, MaxKey, MinKey, ObjectId, Timestamp, UUID, calculateObjectSize, deserialize, deserializeStream, onDemand, serialize, serializeWithBufferAndIndex, setInternalBufferSize };
+export { bson as BSON, BSONError, BSONOffsetError, BSONRegExp, BSONRuntimeError, BSONSymbol, BSONType, BSONValue, BSONVersionError, Binary, Code, DBRef, Decimal128, Double, EJSON, Int32, Long, MaxKey, MinKey, ObjectId, Timestamp, UUID, calculateObjectSize, deserialize, deserializeStream, onDemand, serialize, serializeWithBufferAndIndex, setInternalBufferSize };
 //# sourceMappingURL=bson.mjs.map