bson 6.10.4 → 7.0.0-alpha.1

package/lib/bson.node.mjs

@@ -1,5 +1,3 @@
-import { randomBytes } from 'crypto';
-
 const TypedArrayPrototypeGetSymbolToStringTag = (() => {
     const g = Object.getOwnPropertyDescriptor(Object.getPrototypeOf(Uint8Array.prototype), Symbol.toStringTag).get;
     return (value) => g.call(value);
@@ -47,7 +45,7 @@ function getStylizeFunction(options) {
     }
 }
 
-const BSON_MAJOR_VERSION = 6;
+const BSON_MAJOR_VERSION = 7;
 const BSON_VERSION_SYMBOL = Symbol.for('@@mdb.bson.version');
 const BSON_INT32_MAX = 0x7fffffff;
 const BSON_INT32_MIN = -2147483648;
@@ -142,6 +140,7 @@ class BSONOffsetError extends BSONError {
     get name() {
         return 'BSONOffsetError';
     }
+    offset;
     constructor(message, offset, options) {
         super(`${message}. offset: ${offset}`, options);
         this.offset = offset;
@@ -215,6 +214,21 @@ function tryWriteBasicLatin(destination, source, offset) {
     return source.length;
 }
 
+function nodejsMathRandomBytes(byteLength) {
+    return nodeJsByteUtils.fromNumberArray(Array.from({ length: byteLength }, () => Math.floor(Math.random() * 256)));
+}
+function nodejsSecureRandomBytes(byteLength) {
+    return crypto.getRandomValues(nodeJsByteUtils.allocate(byteLength));
+}
+const nodejsRandomBytes = (() => {
+    const { crypto } = globalThis;
+    if (crypto != null && typeof crypto.getRandomValues === 'function') {
+        return nodejsSecureRandomBytes;
+    }
+    else {
+        return nodejsMathRandomBytes;
+    }
+})();
 const nodeJsByteUtils = {
     toLocalBufferType(potentialBuffer) {
         if (Buffer.isBuffer(potentialBuffer)) {
@@ -288,7 +302,7 @@ const nodeJsByteUtils = {
         }
         return nodeJsByteUtils.toLocalBufferType(buffer).write(source, byteOffset, undefined, 'utf8');
     },
-    randomBytes: randomBytes,
+    randomBytes: nodejsRandomBytes,
     swap32(buffer) {
         return nodeJsByteUtils.toLocalBufferType(buffer).swap32();
     }
@@ -430,7 +444,11 @@ const webByteUtils = {
 const hasGlobalBuffer = typeof Buffer === 'function' && Buffer.prototype?._isBuffer !== true;
 const ByteUtils = hasGlobalBuffer ? nodeJsByteUtils : webByteUtils;
 
+const bsonType = Symbol.for('@@mdb.bson.type');
 class BSONValue {
+    get [bsonType]() {
+        return this._bsontype;
+    }
     get [BSON_VERSION_SYMBOL]() {
         return BSON_MAJOR_VERSION;
     }
@@ -481,7 +499,7 @@ const NumberUtils = {
             source[offset + 1] * 256 +
             source[offset + 2] * 65536 +
             source[offset + 3] * 16777216);
-        return (hi << BigInt(32)) + lo;
+        return (hi << 32n) + lo;
     },
     getFloat64LE: isBigEndian
         ? (source, offset) => {
@@ -527,7 +545,7 @@ const NumberUtils = {
         return 4;
     },
     setBigInt64LE(destination, offset, value) {
-        const mask32bits = BigInt(0xffff_ffff);
+        const mask32bits = 0xffffffffn;
         let lo = Number(value & mask32bits);
         destination[offset] = lo;
         lo >>= 8;
@@ -536,7 +554,7 @@ const NumberUtils = {
         destination[offset + 2] = lo;
         lo >>= 8;
         destination[offset + 3] = lo;
-        let hi = Number((value >> BigInt(32)) & mask32bits);
+        let hi = Number((value >> 32n) & mask32bits);
         destination[offset + 4] = hi;
         hi >>= 8;
         destination[offset + 5] = hi;
@@ -577,6 +595,27 @@ class Binary extends BSONValue {
     get _bsontype() {
         return 'Binary';
     }
+    static BSON_BINARY_SUBTYPE_DEFAULT = 0;
+    static BUFFER_SIZE = 256;
+    static SUBTYPE_DEFAULT = 0;
+    static SUBTYPE_FUNCTION = 1;
+    static SUBTYPE_BYTE_ARRAY = 2;
+    static SUBTYPE_UUID_OLD = 3;
+    static SUBTYPE_UUID = 4;
+    static SUBTYPE_MD5 = 5;
+    static SUBTYPE_ENCRYPTED = 6;
+    static SUBTYPE_COLUMN = 7;
+    static SUBTYPE_SENSITIVE = 8;
+    static SUBTYPE_VECTOR = 9;
+    static SUBTYPE_USER_DEFINED = 128;
+    static VECTOR_TYPE = Object.freeze({
+        Int8: 0x03,
+        Float32: 0x27,
+        PackedBit: 0x10
+    });
+    buffer;
+    sub_type;
+    position;
     constructor(buffer, subType) {
         super();
         if (!(buffer == null) &&
@@ -836,24 +875,6 @@ class Binary extends BSONValue {
         return new this(bytes, Binary.SUBTYPE_VECTOR);
     }
 }
-Binary.BSON_BINARY_SUBTYPE_DEFAULT = 0;
-Binary.BUFFER_SIZE = 256;
-Binary.SUBTYPE_DEFAULT = 0;
-Binary.SUBTYPE_FUNCTION = 1;
-Binary.SUBTYPE_BYTE_ARRAY = 2;
-Binary.SUBTYPE_UUID_OLD = 3;
-Binary.SUBTYPE_UUID = 4;
-Binary.SUBTYPE_MD5 = 5;
-Binary.SUBTYPE_ENCRYPTED = 6;
-Binary.SUBTYPE_COLUMN = 7;
-Binary.SUBTYPE_SENSITIVE = 8;
-Binary.SUBTYPE_VECTOR = 9;
-Binary.SUBTYPE_USER_DEFINED = 128;
-Binary.VECTOR_TYPE = Object.freeze({
-    Int8: 0x03,
-    Float32: 0x27,
-    PackedBit: 0x10
-});
 function validateBinaryVector(vector) {
     if (vector.sub_type !== Binary.SUBTYPE_VECTOR)
         return;
@@ -990,6 +1011,8 @@ class Code extends BSONValue {
     get _bsontype() {
         return 'Code';
     }
+    code;
+    scope;
     constructor(code, scope) {
         super();
         this.code = code.toString();
@@ -1035,6 +1058,10 @@ class DBRef extends BSONValue {
     get _bsontype() {
         return 'DBRef';
     }
+    collection;
+    oid;
+    db;
+    fields;
     constructor(collection, oid, db, fields) {
         super();
         const parts = collection.split('.');
@@ -1144,6 +1171,9 @@ class Long extends BSONValue {
     get __isLong__() {
         return true;
     }
+    high;
+    low;
+    unsigned;
     constructor(lowOrValue = 0, highOrUnsigned, unsigned) {
         super();
         const unsignedBool = typeof highOrUnsigned === 'boolean' ? highOrUnsigned : Boolean(unsigned);
@@ -1157,6 +1187,15 @@ class Long extends BSONValue {
         this.high = res.high;
         this.unsigned = res.unsigned;
     }
+    static TWO_PWR_24 = Long.fromInt(TWO_PWR_24_DBL);
+    static MAX_UNSIGNED_VALUE = Long.fromBits(0xffffffff | 0, 0xffffffff | 0, true);
+    static ZERO = Long.fromInt(0);
+    static UZERO = Long.fromInt(0, true);
+    static ONE = Long.fromInt(1);
+    static UONE = Long.fromInt(1, true);
+    static NEG_ONE = Long.fromInt(-1);
+    static MAX_VALUE = Long.fromBits(0xffffffff | 0, 0x7fffffff | 0, false);
+    static MIN_VALUE = Long.fromBits(0, 0x80000000 | 0, false);
     static fromBits(lowBits, highBits, unsigned) {
         return new Long(lowBits, highBits, unsigned);
     }
@@ -1197,7 +1236,7 @@ class Long extends BSONValue {
                 return Long.MAX_UNSIGNED_VALUE;
         }
         else {
-            if (value <= -9223372036854776e3)
+            if (value <= -TWO_PWR_63_DBL)
                 return Long.MIN_VALUE;
             if (value + 1 >= TWO_PWR_63_DBL)
                 return Long.MAX_VALUE;
@@ -1207,8 +1246,8 @@ class Long extends BSONValue {
         return Long.fromBits(value % TWO_PWR_32_DBL | 0, (value / TWO_PWR_32_DBL) | 0, unsigned);
     }
     static fromBigInt(value, unsigned) {
-        const FROM_BIGINT_BIT_MASK = BigInt(0xffffffff);
-        const FROM_BIGINT_BIT_SHIFT = BigInt(32);
+        const FROM_BIGINT_BIT_MASK = 0xffffffffn;
+        const FROM_BIGINT_BIT_SHIFT = 32n;
         return new Long(Number(value & FROM_BIGINT_BIT_MASK), Number((value >> FROM_BIGINT_BIT_SHIFT) & FROM_BIGINT_BIT_MASK), unsigned);
     }
     static _fromString(str, unsigned, radix) {
@@ -1241,7 +1280,7 @@ class Long extends BSONValue {
     static fromStringStrict(str, unsignedOrRadix, radix) {
         let unsigned = false;
         if (typeof unsignedOrRadix === 'number') {
-            (radix = unsignedOrRadix), (unsignedOrRadix = false);
+            ((radix = unsignedOrRadix), (unsignedOrRadix = false));
         }
         else {
             unsigned = !!unsignedOrRadix;
@@ -1263,7 +1302,7 @@ class Long extends BSONValue {
     static fromString(str, unsignedOrRadix, radix) {
         let unsigned = false;
         if (typeof unsignedOrRadix === 'number') {
-            (radix = unsignedOrRadix), (unsignedOrRadix = false);
+            ((radix = unsignedOrRadix), (unsignedOrRadix = false));
         }
         else {
             unsigned = !!unsignedOrRadix;
@@ -1783,15 +1822,6 @@ class Long extends BSONValue {
         return `new Long(${longVal}${unsignedVal})`;
     }
 }
-Long.TWO_PWR_24 = Long.fromInt(TWO_PWR_24_DBL);
-Long.MAX_UNSIGNED_VALUE = Long.fromBits(0xffffffff | 0, 0xffffffff | 0, true);
-Long.ZERO = Long.fromInt(0);
-Long.UZERO = Long.fromInt(0, true);
-Long.ONE = Long.fromInt(1);
-Long.UONE = Long.fromInt(1, true);
-Long.NEG_ONE = Long.fromInt(-1);
-Long.MAX_VALUE = Long.fromBits(0xffffffff | 0, 0x7fffffff | 0, false);
-Long.MIN_VALUE = Long.fromBits(0, 0x80000000 | 0, false);
 
 const PARSE_STRING_REGEXP = /^(\+|-)?(\d+|(\d*\.\d*))?(E|e)?([-+])?(\d+)?$/;
 const PARSE_INF_REGEXP = /^(\+|-)?(Infinity|inf)$/i;
@@ -1872,6 +1902,7 @@ class Decimal128 extends BSONValue {
     get _bsontype() {
         return 'Decimal128';
     }
+    bytes;
     constructor(bytes) {
         super();
         if (typeof bytes === 'string') {
@@ -2347,6 +2378,7 @@ class Double extends BSONValue {
     get _bsontype() {
         return 'Double';
     }
+    value;
     constructor(value) {
         super();
         if (value instanceof Number) {
@@ -2410,6 +2442,7 @@ class Int32 extends BSONValue {
     get _bsontype() {
         return 'Int32';
     }
+    value;
     constructor(value) {
         super();
         if (value instanceof Number) {
@@ -2488,11 +2521,14 @@ class MinKey extends BSONValue {
 }
 
 let PROCESS_UNIQUE = null;
-const __idCache = new WeakMap();
 class ObjectId extends BSONValue {
     get _bsontype() {
         return 'ObjectId';
     }
+    static index = Math.floor(Math.random() * 0xffffff);
+    static cacheHexString = false;
+    buffer;
+    #cachedHexString = null;
     constructor(inputId) {
         super();
         let workingId;
@@ -2510,8 +2546,8 @@ class ObjectId extends BSONValue {
         else {
             workingId = inputId;
         }
-        if (workingId == null || typeof workingId === 'number') {
-            this.buffer = ObjectId.generate(typeof workingId === 'number' ? workingId : undefined);
+        if (workingId == null) {
+            this.buffer = ObjectId.generate();
         }
         else if (ArrayBuffer.isView(workingId) && workingId.byteLength === 12) {
             this.buffer = ByteUtils.toLocalBufferType(workingId);
@@ -2520,7 +2556,7 @@ class ObjectId extends BSONValue {
             if (ObjectId.validateHexString(workingId)) {
                 this.buffer = ByteUtils.fromHex(workingId);
                 if (ObjectId.cacheHexString) {
-                    __idCache.set(this, workingId);
+                    this.#cachedHexString = workingId;
                 }
             }
             else {
@@ -2537,7 +2573,7 @@ class ObjectId extends BSONValue {
     set id(value) {
         this.buffer = value;
         if (ObjectId.cacheHexString) {
-            __idCache.set(this, ByteUtils.toHex(value));
+            this.#cachedHexString = ByteUtils.toHex(value);
         }
     }
     static validateHexString(string) {
@@ -2555,14 +2591,11 @@ class ObjectId extends BSONValue {
         return true;
     }
     toHexString() {
-        if (ObjectId.cacheHexString) {
-            const __id = __idCache.get(this);
-            if (__id)
-                return __id;
-        }
+        if (this.#cachedHexString)
+            return this.#cachedHexString.toLowerCase();
         const hexString = ByteUtils.toHex(this.id);
         if (ObjectId.cacheHexString) {
-            __idCache.set(this, hexString);
+            this.#cachedHexString = hexString;
         }
         return hexString;
     }
@@ -2687,14 +2720,13 @@ class ObjectId extends BSONValue {
         return new ObjectId(doc.$oid);
     }
     isCached() {
-        return ObjectId.cacheHexString && __idCache.has(this);
+        return ObjectId.cacheHexString && this.#cachedHexString != null;
     }
     inspect(depth, options, inspect) {
         inspect ??= defaultInspect;
         return `new ObjectId(${inspect(this.toHexString(), options)})`;
     }
 }
-ObjectId.index = Math.floor(Math.random() * 0xffffff);
 
 function internalCalculateObjectSize(object, serializeFunctions, ignoreUndefined) {
     let totalLength = 4 + 1;
@@ -2863,6 +2895,8 @@ class BSONRegExp extends BSONValue {
     get _bsontype() {
         return 'BSONRegExp';
     }
+    pattern;
+    options;
     constructor(pattern, options) {
         super();
         this.pattern = pattern;
@@ -2923,6 +2957,7 @@ class BSONSymbol extends BSONValue {
     get _bsontype() {
         return 'BSONSymbol';
     }
+    value;
     constructor(value) {
         super();
         this.value = value;
@@ -2953,6 +2988,10 @@ class Timestamp extends LongWithoutOverridesClass {
     get _bsontype() {
         return 'Timestamp';
     }
+    get [bsonType]() {
+        return 'Timestamp';
+    }
+    static MAX_VALUE = Long.MAX_UNSIGNED_VALUE;
     get i() {
         return this.low >>> 0;
     }
@@ -3032,7 +3071,6 @@ class Timestamp extends LongWithoutOverridesClass {
         return `new Timestamp({ t: ${t}, i: ${i} })`;
     }
 }
-Timestamp.MAX_VALUE = Long.MAX_UNSIGNED_VALUE;
 
 const JS_INT_MAX_LONG = Long.fromNumber(JS_INT_MAX);
 const JS_INT_MIN_LONG = Long.fromNumber(JS_INT_MIN);
@@ -4584,6 +4622,7 @@ var bson = /*#__PURE__*/Object.freeze({
     ObjectId: ObjectId,
     Timestamp: Timestamp,
     UUID: UUID,
+    bsonType: bsonType,
     calculateObjectSize: calculateObjectSize,
     deserialize: deserialize,
     deserializeStream: deserializeStream,
@@ -4593,5 +4632,5 @@ var bson = /*#__PURE__*/Object.freeze({
     setInternalBufferSize: setInternalBufferSize
 });
 
-export { bson as BSON, BSONError, BSONOffsetError, BSONRegExp, BSONRuntimeError, BSONSymbol, BSONType, BSONValue, BSONVersionError, Binary, Code, DBRef, Decimal128, Double, EJSON, Int32, Long, MaxKey, MinKey, ObjectId, Timestamp, UUID, calculateObjectSize, deserialize, deserializeStream, onDemand, serialize, serializeWithBufferAndIndex, setInternalBufferSize };
+export { bson as BSON, BSONError, BSONOffsetError, BSONRegExp, BSONRuntimeError, BSONSymbol, BSONType, BSONValue, BSONVersionError, Binary, Code, DBRef, Decimal128, Double, EJSON, Int32, Long, MaxKey, MinKey, ObjectId, Timestamp, UUID, bsonType, calculateObjectSize, deserialize, deserializeStream, onDemand, serialize, serializeWithBufferAndIndex, setInternalBufferSize };
 //# sourceMappingURL=bson.node.mjs.map