bson 5.3.0 → 5.4.0

package/lib/bson.cjs

@@ -165,8 +165,8 @@ const nodeJsByteUtils = {
     fromUTF8(text) {
         return Buffer.from(text, 'utf8');
     },
-    toUTF8(buffer) {
-        return nodeJsByteUtils.toLocalBufferType(buffer).toString('utf8');
+    toUTF8(buffer, start, end) {
+        return nodeJsByteUtils.toLocalBufferType(buffer).toString('utf8', start, end);
     },
     utf8ByteLength(input) {
         return Buffer.byteLength(input, 'utf8');
@@ -276,8 +276,8 @@ const webByteUtils = {
     fromUTF8(text) {
         return new TextEncoder().encode(text);
     },
-    toUTF8(uint8array) {
-        return new TextDecoder('utf8', { fatal: false }).decode(uint8array);
+    toUTF8(uint8array, start, end) {
+        return new TextDecoder('utf8', { fatal: false }).decode(uint8array.slice(start, end));
     },
     utf8ByteLength(input) {
         return webByteUtils.fromUTF8(input).byteLength;
@@ -409,8 +409,8 @@ class Binary extends BSONValue {
         if (encoding === 'base64')
             return ByteUtils.toBase64(this.buffer);
         if (encoding === 'utf8' || encoding === 'utf-8')
-            return ByteUtils.toUTF8(this.buffer);
-        return ByteUtils.toUTF8(this.buffer);
+            return ByteUtils.toUTF8(this.buffer, 0, this.buffer.byteLength);
+        return ByteUtils.toUTF8(this.buffer, 0, this.buffer.byteLength);
     }
     toExtendedJSON(options) {
         options = options || {};
@@ -2416,19 +2416,21 @@ class Timestamp extends LongWithoutOverridesClass {
             if (typeof low.i !== 'number' && (typeof low.i !== 'object' || low.i._bsontype !== 'Int32')) {
                 throw new BSONError('Timestamp constructed from { t, i } must provide i as a number');
             }
-            if (low.t < 0) {
+            const t = Number(low.t);
+            const i = Number(low.i);
+            if (t < 0 || Number.isNaN(t)) {
                 throw new BSONError('Timestamp constructed from { t, i } must provide a positive t');
             }
-            if (low.i < 0) {
+            if (i < 0 || Number.isNaN(i)) {
                 throw new BSONError('Timestamp constructed from { t, i } must provide a positive i');
             }
-            if (low.t > 4294967295) {
+            if (t > 4294967295) {
                 throw new BSONError('Timestamp constructed from { t, i } must provide t equal or less than uint32 max');
             }
-            if (low.i > 4294967295) {
+            if (i > 4294967295) {
                 throw new BSONError('Timestamp constructed from { t, i } must provide i equal or less than uint32 max');
             }
-            super(low.i.valueOf(), low.t.valueOf(), true);
+            super(i, t, true);
         }
         else {
             throw new BSONError('A Timestamp can only be constructed with: bigint, Long, or { t: number; i: number }');
@@ -2600,7 +2602,7 @@ function deserializeObject(buffer, index, options, isArray = false) {
         }
         if (i >= buffer.byteLength)
             throw new BSONError('Bad BSON Document: illegal CString');
-        const name = isArray ? arrayIndex++ : ByteUtils.toUTF8(buffer.subarray(index, i));
+        const name = isArray ? arrayIndex++ : ByteUtils.toUTF8(buffer, index, i);
         let shouldValidateKey = true;
         if (globalUTFValidation || utf8KeysSet.has(name)) {
             shouldValidateKey = validationSetting;
@@ -2815,7 +2817,7 @@ function deserializeObject(buffer, index, options, isArray = false) {
             }
             if (i >= buffer.length)
                 throw new BSONError('Bad BSON Document: illegal CString');
-            const source = ByteUtils.toUTF8(buffer.subarray(index, i));
+            const source = ByteUtils.toUTF8(buffer, index, i);
             index = i + 1;
             i = index;
             while (buffer[i] !== 0x00 && i < buffer.length) {
@@ -2823,7 +2825,7 @@ function deserializeObject(buffer, index, options, isArray = false) {
             }
             if (i >= buffer.length)
                 throw new BSONError('Bad BSON Document: illegal CString');
-            const regExpOptions = ByteUtils.toUTF8(buffer.subarray(index, i));
+            const regExpOptions = ByteUtils.toUTF8(buffer, index, i);
             index = i + 1;
             const optionsArray = new Array(regExpOptions.length);
             for (i = 0; i < regExpOptions.length; i++) {
@@ -2848,7 +2850,7 @@ function deserializeObject(buffer, index, options, isArray = false) {
             }
             if (i >= buffer.length)
                 throw new BSONError('Bad BSON Document: illegal CString');
-            const source = ByteUtils.toUTF8(buffer.subarray(index, i));
+            const source = ByteUtils.toUTF8(buffer, index, i);
             index = i + 1;
             i = index;
             while (buffer[i] !== 0x00 && i < buffer.length) {
@@ -2856,7 +2858,7 @@ function deserializeObject(buffer, index, options, isArray = false) {
             }
             if (i >= buffer.length)
                 throw new BSONError('Bad BSON Document: illegal CString');
-            const regExpOptions = ByteUtils.toUTF8(buffer.subarray(index, i));
+            const regExpOptions = ByteUtils.toUTF8(buffer, index, i);
             index = i + 1;
             value = new BSONRegExp(source, regExpOptions);
         }
@@ -2953,7 +2955,7 @@ function deserializeObject(buffer, index, options, isArray = false) {
                     throw new BSONError('Invalid UTF-8 string in BSON document');
                 }
             }
-            const namespace = ByteUtils.toUTF8(buffer.subarray(index, index + stringSize - 1));
+            const namespace = ByteUtils.toUTF8(buffer, index, index + stringSize - 1);
             index = index + stringSize;
             const oidBuffer = ByteUtils.allocate(12);
             oidBuffer.set(buffer.subarray(index, index + 12), 0);
@@ -2993,7 +2995,7 @@ function deserializeObject(buffer, index, options, isArray = false) {
     return object;
 }
 function getValidatedString(buffer, start, end, shouldValidateUtf8) {
-    const value = ByteUtils.toUTF8(buffer.subarray(start, end));
+    const value = ByteUtils.toUTF8(buffer, start, end);
     if (shouldValidateUtf8) {
         for (let i = 0; i < value.length; i++) {
             if (value.charCodeAt(i) === 0xfffd) {