refactor by comments

Author: LijieZhang1998

snippets/mongocompat/mongotypes.js

@@ -380,7 +380,14 @@ if (!NumberLong.prototype) {
 
 NumberLong.prototype.nativeToString = NumberLong.prototype.toString;
 NumberLong.prototype.toString = function () {
-    return `NumberLong(${this.nativeToString()})`;
+    const INT32_MIN = -2147483648;
+    const INT32_MAX = 2147483647;
+
+    const numValue = this.toNumber ? this.toNumber() : Number(this);
+    if (numValue >= INT32_MIN && numValue <= INT32_MAX && Number.isInteger(numValue)) {
+        return `NumberLong(${numValue})`;
+    }
+    return `NumberLong("${this.exactValueString}")`;
 };
 
 NumberLong.prototype.tojson = function() {
@@ -391,39 +398,36 @@ Object.defineProperty(NumberLong.prototype, 'floatApprox', {
     enumerable: false,
     configurable: true,
     get: function() {
-        return Number(this.nativeToString());
+        return this.toNumber ? this.toNumber() : Number(this);
     }
 });
 
 Object.defineProperty(NumberLong.prototype, 'top', {
     enumerable: false,
     configurable: true,
     get: function() {
-        const str = this.nativeToString();
-        const bigIntValue = BigInt(str);
-        const unsigned64 = bigIntValue < 0n 
-            ? bigIntValue + (1n << 64n)
-            : bigIntValue;
-        return Number((unsigned64 >> 32n) & 0xFFFFFFFFn);
+        return this.high;
     }
 });
 
 Object.defineProperty(NumberLong.prototype, 'bottom', {
     enumerable: false,
     configurable: true,
     get: function() {
-        const str = this.nativeToString();
-        const bigIntValue = BigInt(str);
-        const unsigned64 = bigIntValue < 0n 
-            ? bigIntValue + (1n << 64n)
-            : bigIntValue;
-        return Number(unsigned64 & 0xFFFFFFFFn);
+        return this.low;
     }
 });
 
-NumberLong.prototype.exactValueString = function() {
-    return this.nativeToString();
-};
+Object.defineProperty(NumberLong.prototype, 'exactValueString', {
+    enumerable: false,
+    configurable: true,
+    get: function() {
+        const high = BigInt(this.high);
+        const low = BigInt(this.low >>> 0);
+        const value = (high << 32n) | low;
+        return value.toString();
+    }
+});
 
 // NumberInt
 if (!NumberInt.prototype) {

snippets/mongocompat/test.js

@@ -4,11 +4,22 @@ assert.strictEqual(ObjectId('0123456789abcdef01234567').tojson(), 'ObjectId("012
 
 assert.strictEqual(BinData(4, 'abcdefgh').toString(), 'BinData(4,"abcdefgh")');
 
-assert.strictEqual(NumberLong(1234567890).toString(), 'NumberLong(1234567890)');
-const nl1 = NumberLong(9.223372036854776e+18, 2147483647, 4294967295);
-assert.strictEqual(nl1.floatApprox, 9223372036854776000);
-assert.strictEqual(nl1.top, 2147483647);
-assert.strictEqual(nl1.bottom, 4294967295);
-assert.strictEqual(nl1.exactValueString(), "9223372036854775807");
+assert.strictEqual(NumberLong(2147483647).toString(), 'NumberLong(2147483647)');
+assert.strictEqual(NumberLong("2147483648").toString(), 'NumberLong("2147483648")');
+assert.strictEqual(NumberLong(-2147483648).toString(), 'NumberLong(-2147483648)');
+console.log(NumberLong(-2147483649).toString());
+assert.strictEqual(NumberLong(-2147483649).toString(), 'NumberLong("-2147483649")');
+assert.strictEqual(NumberLong(9223372036854775807).toString(), 'NumberLong("9223372036854775807")');
+assert.strictEqual(NumberLong(-9223372036854775808).toString(), 'NumberLong("-9223372036854775808")');
+const maxLong = NumberLong(9223372036854775807, 2147483647, -1);
+assert.strictEqual(maxLong.floatApprox, 9223372036854775807);
+assert.strictEqual(maxLong.top, 2147483647);
+assert.strictEqual(maxLong.bottom, -1);//mongosh uses signed representation, while old shell uses unsigned
+assert.strictEqual(maxLong.exactValueString, "9223372036854775807");
+const minLong = NumberLong(-9223372036854775808);
+assert.strictEqual(minLong.floatApprox, -9223372036854776000);
+assert.strictEqual(minLong.top, -2147483648);
+assert.strictEqual(minLong.bottom, 0);
+assert.strictEqual(minLong.exactValueString, "-9223372036854775808");
 const nl2 = NumberLong("200");
-assert.strictEqual(nl1.compare(nl2), 1);
+assert.strictEqual(maxLong.compare(nl2), 1);