bson 6.7.0 → 6.8.0

package/lib/bson.mjs

@@ -853,19 +853,18 @@ class Long extends BSONValue {
     get __isLong__() {
         return true;
     }
-    constructor(low = 0, high, unsigned) {
+    constructor(lowOrValue = 0, highOrUnsigned, unsigned) {
         super();
-        if (typeof low === 'bigint') {
-            Object.assign(this, Long.fromBigInt(low, !!high));
-        }
-        else if (typeof low === 'string') {
-            Object.assign(this, Long.fromString(low, !!high));
-        }
-        else {
-            this.low = low | 0;
-            this.high = high | 0;
-            this.unsigned = !!unsigned;
-        }
+        const unsignedBool = typeof highOrUnsigned === 'boolean' ? highOrUnsigned : Boolean(unsigned);
+        const high = typeof highOrUnsigned === 'number' ? highOrUnsigned : 0;
+        const res = typeof lowOrValue === 'string'
+            ? Long.fromString(lowOrValue, unsignedBool)
+            : typeof lowOrValue === 'bigint'
+                ? Long.fromBigInt(lowOrValue, unsignedBool)
+                : { low: lowOrValue | 0, high: high | 0, unsigned: unsignedBool };
+        this.low = res.low;
+        this.high = res.high;
+        this.unsigned = res.unsigned;
     }
     static fromBits(lowBits, highBits, unsigned) {
         return new Long(lowBits, highBits, unsigned);
@@ -917,7 +916,9 @@ class Long extends BSONValue {
         return Long.fromBits(value % TWO_PWR_32_DBL | 0, (value / TWO_PWR_32_DBL) | 0, unsigned);
     }
     static fromBigInt(value, unsigned) {
-        return Long.fromString(value.toString(), unsigned);
+        const FROM_BIGINT_BIT_MASK = BigInt(0xffffffff);
+        const FROM_BIGINT_BIT_SHIFT = BigInt(32);
+        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) {
         if (str.length === 0)