bson 5.4.0 → 6.0.0-alpha.0

package/lib/bson.rn.cjs

@@ -22,7 +22,7 @@ function isDate(d) {
     return Object.prototype.toString.call(d) === '[object Date]';
 }
 
-const BSON_MAJOR_VERSION = 5;
+const BSON_MAJOR_VERSION = 6;
 const BSON_INT32_MAX = 0x7fffffff;
 const BSON_INT32_MIN = -0x80000000;
 const BSON_INT64_MAX = Math.pow(2, 63) - 1;
@@ -326,11 +326,11 @@ class Binary extends BSONValue {
     constructor(buffer, subType) {
         super();
         if (!(buffer == null) &&
-            !(typeof buffer === 'string') &&
+            typeof buffer === 'string' &&
             !ArrayBuffer.isView(buffer) &&
-            !(buffer instanceof ArrayBuffer) &&
+            !isAnyArrayBuffer(buffer) &&
             !Array.isArray(buffer)) {
-            throw new BSONError('Binary can only be constructed from string, Buffer, TypedArray, or Array<number>');
+            throw new BSONError('Binary can only be constructed from Uint8Array or number[]');
         }
         this.sub_type = subType ?? Binary.BSON_BINARY_SUBTYPE_DEFAULT;
         if (buffer == null) {
@@ -338,15 +338,9 @@ class Binary extends BSONValue {
             this.position = 0;
         }
         else {
-            if (typeof buffer === 'string') {
-                this.buffer = ByteUtils.fromISO88591(buffer);
-            }
-            else if (Array.isArray(buffer)) {
-                this.buffer = ByteUtils.fromNumberArray(buffer);
-            }
-            else {
-                this.buffer = ByteUtils.toLocalBufferType(buffer);
-            }
+            this.buffer = Array.isArray(buffer)
+                ? ByteUtils.fromNumberArray(buffer)
+                : ByteUtils.toLocalBufferType(buffer);
             this.position = this.buffer.byteLength;
         }
     }
@@ -392,25 +386,17 @@ class Binary extends BSONValue {
                 offset + sequence.byteLength > this.position ? offset + sequence.length : this.position;
         }
         else if (typeof sequence === 'string') {
-            const bytes = ByteUtils.fromISO88591(sequence);
-            this.buffer.set(bytes, offset);
-            this.position =
-                offset + sequence.length > this.position ? offset + sequence.length : this.position;
+            throw new BSONError('input cannot be string');
         }
     }
     read(position, length) {
         length = length && length > 0 ? length : this.position;
         return this.buffer.slice(position, position + length);
     }
-    value(asRaw) {
-        asRaw = !!asRaw;
-        if (asRaw && this.buffer.length === this.position) {
-            return this.buffer;
-        }
-        if (asRaw) {
-            return this.buffer.slice(0, this.position);
-        }
-        return ByteUtils.toISO88591(this.buffer.subarray(0, this.position));
+    value() {
+        return this.buffer.length === this.position
+            ? this.buffer
+            : this.buffer.subarray(0, this.position);
     }
     length() {
         return this.position;
@@ -611,7 +597,6 @@ class UUID extends Binary {
         return `new UUID("${this.toHexString()}")`;
     }
 }
-UUID.cacheHexString = false;
 
 class Code extends BSONValue {
     get _bsontype() {
@@ -2005,20 +1990,11 @@ class ObjectId extends BSONValue {
             this[kId] = ByteUtils.toLocalBufferType(workingId);
         }
         else if (typeof workingId === 'string') {
-            if (workingId.length === 12) {
-                const bytes = ByteUtils.fromUTF8(workingId);
-                if (bytes.byteLength === 12) {
-                    this[kId] = bytes;
-                }
-                else {
-                    throw new BSONError('Argument passed in must be a string of 12 bytes');
-                }
-            }
-            else if (workingId.length === 24 && checkForHexRegExp.test(workingId)) {
+            if (workingId.length === 24 && checkForHexRegExp.test(workingId)) {
                 this[kId] = ByteUtils.fromHex(workingId);
             }
             else {
-                throw new BSONError('Argument passed in must be a string of 12 bytes or a string of 24 hex characters or an integer');
+                throw new BSONError('input must be a 24 character hex string, 12 byte Uint8Array, or an integer');
             }
         }
         else {
@@ -2080,30 +2056,25 @@ class ObjectId extends BSONValue {
     toJSON() {
         return this.toHexString();
     }
+    static is(variable) {
+        return (variable != null &&
+            typeof variable === 'object' &&
+            '_bsontype' in variable &&
+            variable._bsontype === 'ObjectId');
+    }
     equals(otherId) {
         if (otherId === undefined || otherId === null) {
             return false;
         }
-        if (otherId instanceof ObjectId) {
+        if (ObjectId.is(otherId)) {
             return this[kId][11] === otherId[kId][11] && ByteUtils.equals(this[kId], otherId[kId]);
         }
-        if (typeof otherId === 'string' &&
-            ObjectId.isValid(otherId) &&
-            otherId.length === 12 &&
-            isUint8Array(this.id)) {
-            return ByteUtils.equals(this.id, ByteUtils.fromISO88591(otherId));
-        }
-        if (typeof otherId === 'string' && ObjectId.isValid(otherId) && otherId.length === 24) {
+        if (typeof otherId === 'string') {
             return otherId.toLowerCase() === this.toHexString();
         }
-        if (typeof otherId === 'string' && ObjectId.isValid(otherId) && otherId.length === 12) {
-            return ByteUtils.equals(ByteUtils.fromUTF8(otherId), this.id);
-        }
-        if (typeof otherId === 'object' &&
-            'toHexString' in otherId &&
-            typeof otherId.toHexString === 'function') {
+        if (typeof otherId === 'object' && typeof otherId.toHexString === 'function') {
             const otherIdString = otherId.toHexString();
-            const thisIdString = this.toHexString().toLowerCase();
+            const thisIdString = this.toHexString();
             return typeof otherIdString === 'string' && otherIdString.toLowerCase() === thisIdString;
         }
         return false;