bson 7.0.0-alpha → 7.0.0-alpha.2

package/package.json

@@ -14,7 +14,7 @@
     "vendor"
   ],
   "types": "bson.d.ts",
-  "version": "7.0.0-alpha",
+  "version": "7.0.0-alpha.2",
   "author": {
     "name": "The MongoDB NodeJS Team",
     "email": "dbx-node@mongodb.com"
@@ -57,7 +57,6 @@
     "tar": "^7.4.3",
     "ts-node": "^10.9.2",
     "tsd": "^0.33.0",
-    "tslib": "^2.8.1",
     "typescript": "^5.8.3",
     "typescript-cached-transpile": "0.0.6",
     "uuid": "^11.1.0"

package/src/constants.ts

@@ -1,5 +1,5 @@
 /** @internal */
-export const BSON_MAJOR_VERSION = 6;
+export const BSON_MAJOR_VERSION = 7;
 
 /** @internal */
 export const BSON_VERSION_SYMBOL = Symbol.for('@@mdb.bson.version');

package/src/objectid.ts

@@ -7,6 +7,9 @@ import { NumberUtils } from './utils/number_utils';
 // Unique sequence for the current process (initialized on first use)
 let PROCESS_UNIQUE: Uint8Array | null = null;
 
+/** ObjectId hexString cache @internal */
+const __idCache = new WeakMap(); // TODO(NODE-6549): convert this to #__id private field when target updated to ES2022
+
 /** @public */
 export interface ObjectIdLike {
   id: string | Uint8Array;
@@ -32,20 +35,11 @@ export class ObjectId extends BSONValue {
   /** @internal */
   private static index = Math.floor(Math.random() * 0xffffff);
 
-  static cacheHexString: boolean = false;
+  static cacheHexString: boolean;
 
   /** ObjectId Bytes @internal */
   private buffer!: Uint8Array;
 
-  /**
-   * If hex string caching is enabled, contains the cached hex string.  Otherwise, is null.
-   *
-   * Note that #hexString is populated lazily, and as a result simply checking `this.#hexString != null` is
-   * not sufficient to determine if caching is enabled.  `ObjectId.prototype.isCached()` can be used to
-   * determine if the hex string has been cached yet for an ObjectId.
-   */
-  #cachedHexString: string | null = null;
-
   /** To generate a new ObjectId, use ObjectId() with no argument. */
   constructor();
   /**
@@ -113,7 +107,7 @@ export class ObjectId extends BSONValue {
         this.buffer = ByteUtils.fromHex(workingId);
         // If we are caching the hex string
         if (ObjectId.cacheHexString) {
-          this.#cachedHexString = workingId;
+          __idCache.set(this, workingId);
         }
       } else {
         throw new BSONError(
@@ -136,7 +130,7 @@ export class ObjectId extends BSONValue {
   set id(value: Uint8Array) {
     this.buffer = value;
     if (ObjectId.cacheHexString) {
-      this.#cachedHexString = ByteUtils.toHex(value);
+      __idCache.set(this, ByteUtils.toHex(value));
     }
   }
 
@@ -165,12 +159,15 @@ export class ObjectId extends BSONValue {
 
   /** Returns the ObjectId id as a 24 lowercase character hex string representation */
   toHexString(): string {
-    if (this.#cachedHexString) return this.#cachedHexString.toLowerCase();
+    if (ObjectId.cacheHexString) {
+      const __id = __idCache.get(this);
+      if (__id) return __id;
+    }
 
     const hexString = ByteUtils.toHex(this.id);
 
     if (ObjectId.cacheHexString) {
-      this.#cachedHexString = hexString;
+      __idCache.set(this, hexString);
     }
 
     return hexString;
@@ -368,13 +365,9 @@ export class ObjectId extends BSONValue {
     return new ObjectId(doc.$oid);
   }
 
-  /**
-   * @internal
-   *
-   * used for testing
-   */
+  /** @internal */
   private isCached(): boolean {
-    return ObjectId.cacheHexString && this.#cachedHexString != null;
+    return ObjectId.cacheHexString && __idCache.has(this);
   }
 
   /**