bson 6.10.0 → 6.10.2

package/lib/bson.cjs

@@ -1,45 +1,30 @@
 'use strict';
 
-const map = new WeakMap();
-const TYPES = {
-    ArrayBuffer: '[object ArrayBuffer]',
-    SharedArrayBuffer: '[object SharedArrayBuffer]',
-    Uint8Array: '[object Uint8Array]',
-    BigInt64Array: '[object BigInt64Array]',
-    BigUint64Array: '[object BigUint64Array]',
-    RegExp: '[object RegExp]',
-    Map: '[object Map]',
-    Date: '[object Date]'
-};
-function getPrototypeString(value) {
-    let str = map.get(value);
-    if (!str) {
-        str = Object.prototype.toString.call(value);
-        if (value !== null && typeof value === 'object') {
-            map.set(value, str);
-        }
-    }
-    return str;
+const TypedArrayPrototypeGetSymbolToStringTag = (() => {
+    const g = Object.getOwnPropertyDescriptor(Object.getPrototypeOf(Uint8Array.prototype), Symbol.toStringTag).get;
+    return (value) => g.call(value);
+})();
+function isUint8Array(value) {
+    return TypedArrayPrototypeGetSymbolToStringTag(value) === 'Uint8Array';
 }
 function isAnyArrayBuffer(value) {
-    const type = getPrototypeString(value);
-    return type === TYPES.ArrayBuffer || type === TYPES.SharedArrayBuffer;
-}
-function isUint8Array(value) {
-    const type = getPrototypeString(value);
-    return type === TYPES.Uint8Array;
+    return (typeof value === 'object' &&
+        value != null &&
+        Symbol.toStringTag in value &&
+        (value[Symbol.toStringTag] === 'ArrayBuffer' ||
+            value[Symbol.toStringTag] === 'SharedArrayBuffer'));
 }
-function isRegExp(d) {
-    const type = getPrototypeString(d);
-    return type === TYPES.RegExp;
+function isRegExp(regexp) {
+    return regexp instanceof RegExp || Object.prototype.toString.call(regexp) === '[object RegExp]';
 }
-function isMap(d) {
-    const type = getPrototypeString(d);
-    return type === TYPES.Map;
+function isMap(value) {
+    return (typeof value === 'object' &&
+        value != null &&
+        Symbol.toStringTag in value &&
+        value[Symbol.toStringTag] === 'Map');
 }
-function isDate(d) {
-    const type = getPrototypeString(d);
-    return type === TYPES.Date;
+function isDate(date) {
+    return date instanceof Date || Object.prototype.toString.call(date) === '[object Date]';
 }
 function defaultInspect(x, _options) {
     return JSON.stringify(x, (k, v) => {
@@ -2493,6 +2478,7 @@ class MinKey extends BSONValue {
 }
 
 let PROCESS_UNIQUE = null;
+const __idCache = new WeakMap();
 class ObjectId extends BSONValue {
     get _bsontype() {
         return 'ObjectId';
@@ -2523,6 +2509,9 @@ class ObjectId extends BSONValue {
         else if (typeof workingId === 'string') {
             if (ObjectId.validateHexString(workingId)) {
                 this.buffer = ByteUtils.fromHex(workingId);
+                if (ObjectId.cacheHexString) {
+                    __idCache.set(this, workingId);
+                }
             }
             else {
                 throw new BSONError('input must be a 24 character hex string, 12 byte Uint8Array, or an integer');
@@ -2531,9 +2520,6 @@ class ObjectId extends BSONValue {
         else {
             throw new BSONError('Argument passed in does not match the accepted types');
         }
-        if (ObjectId.cacheHexString) {
-            this.__id = ByteUtils.toHex(this.id);
-        }
     }
     get id() {
         return this.buffer;
@@ -2541,7 +2527,7 @@ class ObjectId extends BSONValue {
     set id(value) {
         this.buffer = value;
         if (ObjectId.cacheHexString) {
-            this.__id = ByteUtils.toHex(value);
+            __idCache.set(this, ByteUtils.toHex(value));
         }
     }
     static validateHexString(string) {
@@ -2559,12 +2545,14 @@ class ObjectId extends BSONValue {
         return true;
     }
     toHexString() {
-        if (ObjectId.cacheHexString && this.__id) {
-            return this.__id;
+        if (ObjectId.cacheHexString) {
+            const __id = __idCache.get(this);
+            if (__id)
+                return __id;
         }
         const hexString = ByteUtils.toHex(this.id);
-        if (ObjectId.cacheHexString && !this.__id) {
-            this.__id = hexString;
+        if (ObjectId.cacheHexString) {
+            __idCache.set(this, hexString);
         }
         return hexString;
     }
@@ -2688,6 +2676,9 @@ class ObjectId extends BSONValue {
     static fromExtendedJSON(doc) {
         return new ObjectId(doc.$oid);
     }
+    isCached() {
+        return ObjectId.cacheHexString && __idCache.has(this);
+    }
     inspect(depth, options, inspect) {
         inspect ??= defaultInspect;
         return `new ObjectId(${inspect(this.toHexString(), options)})`;
@@ -2845,8 +2836,14 @@ function calculateElement(name, value, serializeFunctions = false, isArray = fal
                     ByteUtils.utf8ByteLength(value.toString()) +
                     1);
             }
+            return 0;
+        case 'bigint':
+            return (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + (8 + 1);
+        case 'symbol':
+            return 0;
+        default:
+            throw new BSONError(`Unrecognized JS type: ${typeof value}`);
     }
-    return 0;
 }
 
 function alphabetize(str) {