bson 6.10.0 → 6.10.1

package/package.json

@@ -14,7 +14,7 @@
     "vendor"
   ],
   "types": "bson.d.ts",
-  "version": "6.10.0",
+  "version": "6.10.1",
   "author": {
     "name": "The MongoDB NodeJS Team",
     "email": "dbx-node@mongodb.com"
@@ -55,7 +55,6 @@
     "sinon": "^18.0.0",
     "sinon-chai": "^3.7.0",
     "source-map-support": "^0.5.21",
-    "standard-version": "^9.5.0",
     "tar": "^7.4.3",
     "ts-node": "^10.9.2",
     "tsd": "^0.31.1",

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;
@@ -36,8 +39,6 @@ export class ObjectId extends BSONValue {
 
   /** ObjectId Bytes @internal */
   private buffer!: Uint8Array;
-  /** ObjectId hexString cache @internal */
-  private __id?: string;
 
   /**
    * Create ObjectId from a number.
@@ -111,6 +112,10 @@ export class ObjectId extends BSONValue {
     } else if (typeof workingId === 'string') {
       if (ObjectId.validateHexString(workingId)) {
         this.buffer = ByteUtils.fromHex(workingId);
+        // If we are caching the hex string
+        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'
@@ -119,10 +124,6 @@ export class ObjectId extends BSONValue {
     } else {
       throw new BSONError('Argument passed in does not match the accepted types');
     }
-    // If we are caching the hex string
-    if (ObjectId.cacheHexString) {
-      this.__id = ByteUtils.toHex(this.id);
-    }
   }
 
   /**
@@ -136,7 +137,7 @@ export class ObjectId extends BSONValue {
   set id(value: Uint8Array) {
     this.buffer = value;
     if (ObjectId.cacheHexString) {
-      this.__id = ByteUtils.toHex(value);
+      __idCache.set(this, ByteUtils.toHex(value));
     }
   }
 
@@ -165,14 +166,15 @@ export class ObjectId extends BSONValue {
 
   /** Returns the ObjectId id as a 24 lowercase character hex string representation */
   toHexString(): string {
-    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;
@@ -370,6 +372,11 @@ export class ObjectId extends BSONValue {
     return new ObjectId(doc.$oid);
   }
 
+  /** @internal */
+  private isCached(): boolean {
+    return ObjectId.cacheHexString && __idCache.has(this);
+  }
+
   /**
    * Converts to a string representation of this Id.
    *

package/src/parser/utils.ts

@@ -1,65 +1,44 @@
-const map = new WeakMap<object, string>();
+const TypedArrayPrototypeGetSymbolToStringTag = (() => {
+  // Type check system lovingly referenced from:
+  // https://github.com/nodejs/node/blob/7450332339ed40481f470df2a3014e2ec355d8d8/lib/internal/util/types.js#L13-L15
+  // eslint-disable-next-line @typescript-eslint/unbound-method -- the intention is to call this method with a bound value
+  const g = Object.getOwnPropertyDescriptor(
+    Object.getPrototypeOf(Uint8Array.prototype),
+    Symbol.toStringTag
+  )!.get!;
 
-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]'
-};
-
-/**
- * Retrieves the prototype.toString() of a value.
- * If the value is an object, it will cache the result in a WeakMap for future use.
- */
-function getPrototypeString(value: unknown): string {
-  let str = map.get(value as object);
-
-  if (!str) {
-    str = Object.prototype.toString.call(value);
-    if (value !== null && typeof value === 'object') {
-      map.set(value, str);
-    }
-  }
-  return str;
-}
-
-export function isAnyArrayBuffer(value: unknown): value is ArrayBuffer {
-  const type = getPrototypeString(value);
-  return type === TYPES.ArrayBuffer || type === TYPES.SharedArrayBuffer;
-}
+  return (value: unknown) => g.call(value);
+})();
 
 export function isUint8Array(value: unknown): value is Uint8Array {
-  const type = getPrototypeString(value);
-  return type === TYPES.Uint8Array;
+  return TypedArrayPrototypeGetSymbolToStringTag(value) === 'Uint8Array';
 }
 
-export function isBigInt64Array(value: unknown): value is BigInt64Array {
-  const type = getPrototypeString(value);
-  return type === TYPES.BigInt64Array;
-}
-
-export function isBigUInt64Array(value: unknown): value is BigUint64Array {
-  const type = getPrototypeString(value);
-  return type === TYPES.BigUint64Array;
+export function isAnyArrayBuffer(value: unknown): value is ArrayBuffer {
+  return (
+    typeof value === 'object' &&
+    value != null &&
+    Symbol.toStringTag in value &&
+    (value[Symbol.toStringTag] === 'ArrayBuffer' ||
+      value[Symbol.toStringTag] === 'SharedArrayBuffer')
+  );
 }
 
-export function isRegExp(d: unknown): d is RegExp {
-  const type = getPrototypeString(d);
-  return type === TYPES.RegExp;
+export function isRegExp(regexp: unknown): regexp is RegExp {
+  return regexp instanceof RegExp || Object.prototype.toString.call(regexp) === '[object RegExp]';
 }
 
-export function isMap(d: unknown): d is Map<unknown, unknown> {
-  const type = getPrototypeString(d);
-  return type === TYPES.Map;
+export function isMap(value: unknown): value is Map<unknown, unknown> {
+  return (
+    typeof value === 'object' &&
+    value != null &&
+    Symbol.toStringTag in value &&
+    value[Symbol.toStringTag] === 'Map'
+  );
 }
 
-export function isDate(d: unknown): d is Date {
-  const type = getPrototypeString(d);
-  return type === TYPES.Date;
+export function isDate(date: unknown): date is Date {
+  return date instanceof Date || Object.prototype.toString.call(date) === '[object Date]';
 }
 
 export type InspectFn = (x: unknown, options?: unknown) => string;