bson 5.0.1 → 5.2.0

package/bson.d.ts

@@ -74,6 +74,10 @@ export declare class Binary extends BSONValue {
     toString(encoding?: 'hex' | 'base64' | 'utf8' | 'utf-8'): string;
     /* Excluded from this release type: toExtendedJSON */
     toUUID(): UUID;
+    /** Creates an Binary instance from a hex digit string */
+    static createFromHexString(hex: string, subType?: number): Binary;
+    /** Creates an Binary instance from a base64 string */
+    static createFromBase64(base64: string, subType?: number): Binary;
     /* Excluded from this release type: fromExtendedJSON */
     inspect(): string;
 }
@@ -991,6 +995,8 @@ export declare class ObjectId extends BSONValue {
      * @param hexString - create a ObjectId from a passed in 24 character hexstring.
      */
     static createFromHexString(hexString: string): ObjectId;
+    /** Creates an ObjectId instance from a base64 string */
+    static createFromBase64(base64: string): ObjectId;
     /**
      * Checks if a value is a valid bson ObjectId
      *
@@ -1214,6 +1220,8 @@ export declare class UUID extends Binary {
      * @param hexString - 32 or 36 character hex string (dashes excluded/included).
      */
     static createFromHexString(hexString: string): UUID;
+    /** Creates an UUID from a base64 string representation of an UUID. */
+    static createFromBase64(base64: string): UUID;
     inspect(): string;
 }
 

package/lib/bson.bundle.js

@@ -458,6 +458,12 @@ class Binary extends BSONValue {
         }
         throw new BSONError(`Binary sub_type "${this.sub_type}" is not supported for converting to UUID. Only "${Binary.SUBTYPE_UUID}" is currently supported.`);
     }
+    static createFromHexString(hex, subType) {
+        return new Binary(ByteUtils.fromHex(hex), subType);
+    }
+    static createFromBase64(base64, subType) {
+        return new Binary(ByteUtils.fromBase64(base64), subType);
+    }
     static fromExtendedJSON(doc, options) {
         options = options || {};
         let data;
@@ -487,7 +493,8 @@ class Binary extends BSONValue {
         return this.inspect();
     }
     inspect() {
-        return `new Binary(Buffer.from("${ByteUtils.toHex(this.buffer)}", "hex"), ${this.sub_type})`;
+        const base64 = ByteUtils.toBase64(this.buffer.subarray(0, this.position));
+        return `Binary.createFromBase64("${base64}", ${this.sub_type})`;
     }
 }
 Binary.BSON_BINARY_SUBTYPE_DEFAULT = 0;
@@ -599,6 +606,9 @@ class UUID extends Binary {
         const buffer = uuidHexStringToBuffer(hexString);
         return new UUID(buffer);
     }
+    static createFromBase64(base64) {
+        return new UUID(ByteUtils.fromBase64(base64));
+    }
     [Symbol.for('nodejs.util.inspect.custom')]() {
         return this.inspect();
     }
@@ -2117,11 +2127,17 @@ class ObjectId extends BSONValue {
         return new ObjectId(buffer);
     }
     static createFromHexString(hexString) {
-        if (typeof hexString === 'undefined' || (hexString != null && hexString.length !== 24)) {
-            throw new BSONError('Argument passed in must be a single String of 12 bytes or a string of 24 hex characters');
+        if (hexString?.length !== 24) {
+            throw new BSONError('hex string must be 24 characters');
         }
         return new ObjectId(ByteUtils.fromHex(hexString));
     }
+    static createFromBase64(base64) {
+        if (base64?.length !== 16) {
+            throw new BSONError('base64 string must be 16 characters');
+        }
+        return new ObjectId(ByteUtils.fromBase64(base64));
+    }
     static isValid(id) {
         if (id == null)
             return false;
@@ -3788,6 +3804,16 @@ function getISOString(date) {
     return date.getUTCMilliseconds() !== 0 ? isoStr : isoStr.slice(0, -5) + 'Z';
 }
 function serializeValue(value, options) {
+    if (value instanceof Map || isMap(value)) {
+        const obj = Object.create(null);
+        for (const [k, v] of value) {
+            if (typeof k !== 'string') {
+                throw new BSONError('Can only serialize maps with string keys');
+            }
+            obj[k] = v;
+        }
+        return serializeValue(obj, options);
+    }
     if ((typeof value === 'object' || typeof value === 'function') && value !== null) {
         const index = options.seenObjects.findIndex(entry => entry.obj === value);
         if (index !== -1) {