pr requested changes

Author: aditi-khare-mongoDB

src/long.ts

@@ -133,26 +133,51 @@ export class Long extends BSONValue {
 
   /**
    * Constructs a 64 bit two's-complement integer, given its low and high 32 bit values as *signed* integers.
-   *  See the from* functions below for more convenient ways of constructing Longs.
-   *
-   * Acceptable signatures are:
-   * - Long(low, high, unsigned?)
-   * - Long(bigint, unsigned?)
-   * - Long(string, unsigned?)
    *
    * @param low - The low (signed) 32 bits of the long
    * @param high - The high (signed) 32 bits of the long
    * @param unsigned - Whether unsigned or not, defaults to signed
    */
-  constructor(low: number | bigint | string = 0, high?: number | boolean, unsigned?: boolean) {
+  constructor(low: number, high?: number, unsigned?: boolean);
+  /**
+   * Constructs a 64 bit two's-complement integer, given a bigint representation.
+   *
+   * @param value - BigInt representation of the long value
+   * @param unsigned - Whether unsigned or not, defaults to signed
+   */
+  constructor(value: bigint, unsigned?: boolean);
+  /**
+   * Constructs a 64 bit two's-complement integer, given a string representation.
+   *
+   * @param value - 32 bit number representation of the Long
+   * @param unsigned - Whether unsigned or not, defaults to signed
+   */
+  constructor(value: number, unsigned?: boolean);
+  /**
+   * Constructs a 64 bit two's-complement integer, given a string representation.
+   *
+   * @param value - String representation of the long value
+   * @param unsigned - Whether unsigned or not, defaults to signed
+   */
+  constructor(value: string, unsigned?: boolean);
+  constructor(
+    lowOrValue: number | bigint | string = 0,
+    highOrUnsigned?: number | boolean,
+    unsigned?: boolean
+  ) {
     super();
-    if (typeof low === 'bigint') {
-      Object.assign(this, Long.fromBigInt(low, !!high));
-    } else if (typeof low === 'string') {
-      Object.assign(this, Long.fromString(low, !!high));
+    unsigned = typeof highOrUnsigned === 'boolean' ? highOrUnsigned : !!unsigned;
+    const high = typeof highOrUnsigned === 'number' ? highOrUnsigned : 0;
+    if (typeof lowOrValue === 'bigint') {
+      const longFromBigInt = Long.fromBigInt(lowOrValue, unsigned);
+      this.low = longFromBigInt.low;
+      this.high = longFromBigInt.high;
+      this.unsigned = longFromBigInt.unsigned;
+    } else if (typeof lowOrValue === 'string') {
+      Object.assign(this, Long.fromString(lowOrValue, unsigned));
     } else {
-      this.low = low | 0;
-      this.high = (high as number) | 0;
+      this.low = lowOrValue | 0;
+      this.high = high | 0;
       this.unsigned = !!unsigned;
     }
   }
@@ -176,17 +201,6 @@ export class Long extends BSONValue {
   /** Minimum signed value. */
   static MIN_VALUE = Long.fromBits(0, 0x80000000 | 0, false);
 
-  /**
-   * @internal
-   * bit mask used for fromBigInt method, lazy loaded
-   */
-  static FROM_BIGINT_BIT_MASK: bigint;
-
-  /**
-   * @internal
-   * bit shift used for fromBigInt method, lazy loaded */
-  static FROM_BIGINT_BIT_SHIFT: bigint;
-
   /**
    * Returns a Long representing the 64 bit integer that comes by concatenating the given low and high bits.
    * Each is assumed to use 32 bits.
@@ -255,12 +269,12 @@ export class Long extends BSONValue {
    */
   static fromBigInt(value: bigint, unsigned?: boolean): Long {
     // eslint-disable-next-line no-restricted-globals
-    Long.FROM_BIGINT_BIT_MASK ??= BigInt(0xffffffff);
+    const FROM_BIGINT_BIT_MASK = BigInt(0xffffffff);
     // eslint-disable-next-line no-restricted-globals
-    Long.FROM_BIGINT_BIT_SHIFT ??= BigInt(32);
+    const FROM_BIGINT_BIT_SHIFT = BigInt(32);
     return new Long(
-      Number(value & Long.FROM_BIGINT_BIT_MASK),
-      Number((value >> Long.FROM_BIGINT_BIT_SHIFT) & Long.FROM_BIGINT_BIT_MASK),
+      Number(value & FROM_BIGINT_BIT_MASK),
+      Number((value >> FROM_BIGINT_BIT_SHIFT) & FROM_BIGINT_BIT_MASK),
       unsigned
     );
   }

test/node/long.test.ts

@@ -171,25 +171,30 @@ describe('Long', function () {
       name: string,
       input: bigint,
       unsigned: boolean | undefined,
-      expectedStr?: string
+      expectedLong?: Long
     ][] = [
-      ['0', BigInt('0'), false, '0'],
-      ['-0 (bigint coerces this to 0)', BigInt('-0'), false, '0'],
+      ['0', BigInt('0'), false, Long.ZERO],
+      ['-0 (bigint coerces this to 0)', BigInt('-0'), false, Long.ZERO],
       [
         'max unsigned input',
         BigInt(Long.MAX_UNSIGNED_VALUE.toString(10)),
         true,
-        Long.MAX_UNSIGNED_VALUE.toString(10)
+        Long.MAX_UNSIGNED_VALUE
+      ],
+      ['max signed input', BigInt(Long.MAX_VALUE.toString(10)), false, Long.MAX_VALUE],
+      ['min signed input', BigInt(Long.MIN_VALUE.toString(10)), false, Long.MIN_VALUE],
+      [
+        'negative greater than 32 bits',
+        BigInt(-9228915101),
+        false,
+        Long.fromBits(0xd9e9ee63, 0xfffffffd)
       ],
-      ['max signed input', BigInt(Long.MAX_VALUE.toString(10)), false, Long.MAX_VALUE.toString(10)],
-      ['min signed input', BigInt(Long.MIN_VALUE.toString(10)), false, Long.MIN_VALUE.toString(10)],
-      ['negative greater than 32 bits', BigInt(-9228915101), false, '-9228915101'],
-      ['less than 32 bits', BigInt(245666), false, '245666'],
-      ['unsigned less than 32 bits', BigInt(245666), true, '245666'],
-      ['negative less than 32 bits', BigInt(-245666), false, '-245666'],
-      ['max int32', BigInt(BSON_INT32_MAX), false, BSON_INT32_MAX.toString(10)],
-      ['max int32 unsigned', BigInt(BSON_INT32_MAX), true, BSON_INT32_MAX.toString(10)],
-      ['min int32', BigInt(BSON_INT32_MIN), false, BSON_INT32_MIN.toString(10)]
+      ['less than 32 bits', BigInt(245666), false, new Long(245666)],
+      ['unsigned less than 32 bits', BigInt(245666), true, new Long(245666, true)],
+      ['negative less than 32 bits', BigInt(-245666), false, new Long(-245666, -1)],
+      ['max int32', BigInt(BSON_INT32_MAX), false, new Long(BSON_INT32_MAX)],
+      ['max int32 unsigned', BigInt(BSON_INT32_MAX), true, new Long(BSON_INT32_MAX, 0, true)],
+      ['min int32', BigInt(BSON_INT32_MIN), false, new Long(BSON_INT32_MIN, -1)]
     ];
 
     beforeEach(function () {
@@ -198,10 +203,10 @@ describe('Long', function () {
       }
     });
 
-    for (const [testName, num, unsigned, expectedStr] of inputs) {
+    for (const [testName, num, unsigned, expectedLong] of inputs) {
       context(`when the input is ${testName}`, () => {
         it(`should return a Long representation of the input`, () => {
-          expect(Long.fromBigInt(num, unsigned).toString(10)).to.equal(expectedStr);
+          expect(Long.fromBigInt(num, unsigned)).to.deep.equal(expectedLong);
         });
       });
     }