bson 5.4.0 → 6.0.0-alpha

package/lib/bson.cjs

@@ -16,7 +16,7 @@ function isDate(d) {
     return Object.prototype.toString.call(d) === '[object Date]';
 }
 
-const BSON_MAJOR_VERSION = 5;
+const BSON_MAJOR_VERSION = 6;
 const BSON_INT32_MAX = 0x7fffffff;
 const BSON_INT32_MIN = -0x80000000;
 const BSON_INT64_MAX = Math.pow(2, 63) - 1;
@@ -311,11 +311,11 @@ class Binary extends BSONValue {
     constructor(buffer, subType) {
         super();
         if (!(buffer == null) &&
-            !(typeof buffer === 'string') &&
+            typeof buffer === 'string' &&
             !ArrayBuffer.isView(buffer) &&
-            !(buffer instanceof ArrayBuffer) &&
+            !isAnyArrayBuffer(buffer) &&
             !Array.isArray(buffer)) {
-            throw new BSONError('Binary can only be constructed from string, Buffer, TypedArray, or Array<number>');
+            throw new BSONError('Binary can only be constructed from Uint8Array or number[]');
         }
         this.sub_type = subType ?? Binary.BSON_BINARY_SUBTYPE_DEFAULT;
         if (buffer == null) {
@@ -323,15 +323,9 @@ class Binary extends BSONValue {
             this.position = 0;
         }
         else {
-            if (typeof buffer === 'string') {
-                this.buffer = ByteUtils.fromISO88591(buffer);
-            }
-            else if (Array.isArray(buffer)) {
-                this.buffer = ByteUtils.fromNumberArray(buffer);
-            }
-            else {
-                this.buffer = ByteUtils.toLocalBufferType(buffer);
-            }
+            this.buffer = Array.isArray(buffer)
+                ? ByteUtils.fromNumberArray(buffer)
+                : ByteUtils.toLocalBufferType(buffer);
             this.position = this.buffer.byteLength;
         }
     }
@@ -377,25 +371,17 @@ class Binary extends BSONValue {
                 offset + sequence.byteLength > this.position ? offset + sequence.length : this.position;
         }
         else if (typeof sequence === 'string') {
-            const bytes = ByteUtils.fromISO88591(sequence);
-            this.buffer.set(bytes, offset);
-            this.position =
-                offset + sequence.length > this.position ? offset + sequence.length : this.position;
+            throw new BSONError('input cannot be string');
         }
     }
     read(position, length) {
         length = length && length > 0 ? length : this.position;
         return this.buffer.slice(position, position + length);
     }
-    value(asRaw) {
-        asRaw = !!asRaw;
-        if (asRaw && this.buffer.length === this.position) {
-            return this.buffer;
-        }
-        if (asRaw) {
-            return this.buffer.slice(0, this.position);
-        }
-        return ByteUtils.toISO88591(this.buffer.subarray(0, this.position));
+    value() {
+        return this.buffer.length === this.position
+            ? this.buffer
+            : this.buffer.subarray(0, this.position);
     }
     length() {
         return this.position;
@@ -596,7 +582,6 @@ class UUID extends Binary {
         return `new UUID("${this.toHexString()}")`;
     }
 }
-UUID.cacheHexString = false;
 
 class Code extends BSONValue {
     get _bsontype() {
@@ -627,7 +612,7 @@ class Code extends BSONValue {
     }
     inspect() {
         const codeJson = this.toJSON();
-        return `new Code("${String(codeJson.code)}"${codeJson.scope != null ? `, ${JSON.stringify(codeJson.scope)}` : ''})`;
+        return `new Code(${JSON.stringify(String(codeJson.code))}${codeJson.scope != null ? `, ${JSON.stringify(codeJson.scope)}` : ''})`;
     }
 }
 
@@ -1437,6 +1422,7 @@ class Decimal128 extends BSONValue {
     }
     static fromString(representation) {
         let isNegative = false;
+        let sawSign = false;
         let sawRadix = false;
         let foundNonZero = false;
         let significantDigits = 0;
@@ -1447,10 +1433,8 @@ class Decimal128 extends BSONValue {
         const digits = [0];
         let nDigitsStored = 0;
         let digitsInsert = 0;
-        let firstDigit = 0;
         let lastDigit = 0;
         let exponent = 0;
-        let i = 0;
         let significandHigh = new Long(0, 0);
         let significandLow = new Long(0, 0);
         let biasedExponent = 0;
@@ -1478,6 +1462,7 @@ class Decimal128 extends BSONValue {
             }
         }
         if (representation[index] === '+' || representation[index] === '-') {
+            sawSign = true;
             isNegative = representation[index++] === '-';
         }
         if (!isDigit(representation[index]) && representation[index] !== '.') {
@@ -1496,7 +1481,7 @@ class Decimal128 extends BSONValue {
                 index = index + 1;
                 continue;
             }
-            if (nDigitsStored < 34) {
+            if (nDigitsStored < MAX_DIGITS) {
                 if (representation[index] !== '0' || foundNonZero) {
                     if (!foundNonZero) {
                         firstNonZero = nDigitsRead;
@@ -1524,10 +1509,7 @@ class Decimal128 extends BSONValue {
         }
         if (representation[index])
             return new Decimal128(NAN_BUFFER);
-        firstDigit = 0;
         if (!nDigitsStored) {
-            firstDigit = 0;
-            lastDigit = 0;
             digits[0] = 0;
             nDigits = 1;
             nDigitsStored = 1;
@@ -1537,12 +1519,12 @@ class Decimal128 extends BSONValue {
             lastDigit = nDigitsStored - 1;
             significantDigits = nDigits;
             if (significantDigits !== 1) {
-                while (digits[firstNonZero + significantDigits - 1] === 0) {
+                while (representation[firstNonZero + significantDigits - 1 + Number(sawSign) + Number(sawRadix)] === '0') {
                     significantDigits = significantDigits - 1;
                 }
             }
         }
-        if (exponent <= radixPosition && radixPosition - exponent > 1 << 14) {
+        if (exponent <= radixPosition && radixPosition > exponent + (1 << 14)) {
             exponent = EXPONENT_MIN;
         }
         else {
@@ -1550,9 +1532,8 @@ class Decimal128 extends BSONValue {
         }
         while (exponent > EXPONENT_MAX) {
             lastDigit = lastDigit + 1;
-            if (lastDigit - firstDigit > MAX_DIGITS) {
-                const digitsString = digits.join('');
-                if (digitsString.match(/^0+$/)) {
+            if (lastDigit >= MAX_DIGITS) {
+                if (significantDigits === 0) {
                     exponent = EXPONENT_MAX;
                     break;
                 }
@@ -1561,69 +1542,43 @@ class Decimal128 extends BSONValue {
             exponent = exponent - 1;
         }
         while (exponent < EXPONENT_MIN || nDigitsStored < nDigits) {
-            if (lastDigit === 0 && significantDigits < nDigitsStored) {
-                exponent = EXPONENT_MIN;
-                significantDigits = 0;
-                break;
+            if (lastDigit === 0) {
+                if (significantDigits === 0) {
+                    exponent = EXPONENT_MIN;
+                    break;
+                }
+                invalidErr(representation, 'exponent underflow');
             }
             if (nDigitsStored < nDigits) {
+                if (representation[nDigits - 1 + Number(sawSign) + Number(sawRadix)] !== '0' &&
+                    significantDigits !== 0) {
+                    invalidErr(representation, 'inexact rounding');
+                }
                 nDigits = nDigits - 1;
             }
             else {
+                if (digits[lastDigit] !== 0) {
+                    invalidErr(representation, 'inexact rounding');
+                }
                 lastDigit = lastDigit - 1;
             }
             if (exponent < EXPONENT_MAX) {
                 exponent = exponent + 1;
             }
             else {
-                const digitsString = digits.join('');
-                if (digitsString.match(/^0+$/)) {
-                    exponent = EXPONENT_MAX;
-                    break;
-                }
                 invalidErr(representation, 'overflow');
             }
         }
-        if (lastDigit - firstDigit + 1 < significantDigits) {
-            let endOfString = nDigitsRead;
+        if (lastDigit + 1 < significantDigits) {
             if (sawRadix) {
                 firstNonZero = firstNonZero + 1;
-                endOfString = endOfString + 1;
             }
-            if (isNegative) {
+            if (sawSign) {
                 firstNonZero = firstNonZero + 1;
-                endOfString = endOfString + 1;
             }
             const roundDigit = parseInt(representation[firstNonZero + lastDigit + 1], 10);
-            let roundBit = 0;
-            if (roundDigit >= 5) {
-                roundBit = 1;
-                if (roundDigit === 5) {
-                    roundBit = digits[lastDigit] % 2 === 1 ? 1 : 0;
-                    for (i = firstNonZero + lastDigit + 2; i < endOfString; i++) {
-                        if (parseInt(representation[i], 10)) {
-                            roundBit = 1;
-                            break;
-                        }
-                    }
-                }
-            }
-            if (roundBit) {
-                let dIdx = lastDigit;
-                for (; dIdx >= 0; dIdx--) {
-                    if (++digits[dIdx] > 9) {
-                        digits[dIdx] = 0;
-                        if (dIdx === 0) {
-                            if (exponent < EXPONENT_MAX) {
-                                exponent = exponent + 1;
-                                digits[dIdx] = 1;
-                            }
-                            else {
-                                return new Decimal128(isNegative ? INF_NEGATIVE_BUFFER : INF_POSITIVE_BUFFER);
-                            }
-                        }
-                    }
-                }
+            if (roundDigit !== 0) {
+                invalidErr(representation, 'inexact rounding');
             }
         }
         significandHigh = Long.fromNumber(0);
@@ -1632,8 +1587,8 @@ class Decimal128 extends BSONValue {
             significandHigh = Long.fromNumber(0);
             significandLow = Long.fromNumber(0);
         }
-        else if (lastDigit - firstDigit < 17) {
-            let dIdx = firstDigit;
+        else if (lastDigit < 17) {
+            let dIdx = 0;
             significandLow = Long.fromNumber(digits[dIdx++]);
             significandHigh = new Long(0, 0);
             for (; dIdx <= lastDigit; dIdx++) {
@@ -1642,7 +1597,7 @@ class Decimal128 extends BSONValue {
             }
         }
         else {
-            let dIdx = firstDigit;
+            let dIdx = 0;
             significandHigh = Long.fromNumber(digits[dIdx++]);
             for (; dIdx <= lastDigit - 17; dIdx++) {
                 significandHigh = significandHigh.multiply(Long.fromNumber(10));
@@ -1990,20 +1945,11 @@ class ObjectId extends BSONValue {
             this[kId] = ByteUtils.toLocalBufferType(workingId);
         }
         else if (typeof workingId === 'string') {
-            if (workingId.length === 12) {
-                const bytes = ByteUtils.fromUTF8(workingId);
-                if (bytes.byteLength === 12) {
-                    this[kId] = bytes;
-                }
-                else {
-                    throw new BSONError('Argument passed in must be a string of 12 bytes');
-                }
-            }
-            else if (workingId.length === 24 && checkForHexRegExp.test(workingId)) {
+            if (workingId.length === 24 && checkForHexRegExp.test(workingId)) {
                 this[kId] = ByteUtils.fromHex(workingId);
             }
             else {
-                throw new BSONError('Argument passed in must be a string of 12 bytes or a string of 24 hex characters or an integer');
+                throw new BSONError('input must be a 24 character hex string, 12 byte Uint8Array, or an integer');
             }
         }
         else {
@@ -2065,30 +2011,25 @@ class ObjectId extends BSONValue {
     toJSON() {
         return this.toHexString();
     }
+    static is(variable) {
+        return (variable != null &&
+            typeof variable === 'object' &&
+            '_bsontype' in variable &&
+            variable._bsontype === 'ObjectId');
+    }
     equals(otherId) {
         if (otherId === undefined || otherId === null) {
             return false;
         }
-        if (otherId instanceof ObjectId) {
+        if (ObjectId.is(otherId)) {
             return this[kId][11] === otherId[kId][11] && ByteUtils.equals(this[kId], otherId[kId]);
         }
-        if (typeof otherId === 'string' &&
-            ObjectId.isValid(otherId) &&
-            otherId.length === 12 &&
-            isUint8Array(this.id)) {
-            return ByteUtils.equals(this.id, ByteUtils.fromISO88591(otherId));
-        }
-        if (typeof otherId === 'string' && ObjectId.isValid(otherId) && otherId.length === 24) {
+        if (typeof otherId === 'string') {
             return otherId.toLowerCase() === this.toHexString();
         }
-        if (typeof otherId === 'string' && ObjectId.isValid(otherId) && otherId.length === 12) {
-            return ByteUtils.equals(ByteUtils.fromUTF8(otherId), this.id);
-        }
-        if (typeof otherId === 'object' &&
-            'toHexString' in otherId &&
-            typeof otherId.toHexString === 'function') {
+        if (typeof otherId === 'object' && typeof otherId.toHexString === 'function') {
             const otherIdString = otherId.toHexString();
-            const thisIdString = this.toHexString().toLowerCase();
+            const thisIdString = this.toHexString();
             return typeof otherIdString === 'string' && otherIdString.toLowerCase() === thisIdString;
         }
         return false;
@@ -2378,7 +2319,7 @@ class BSONSymbol extends BSONValue {
         return this.value;
     }
     inspect() {
-        return `new BSONSymbol("${this.value}")`;
+        return `new BSONSymbol(${JSON.stringify(this.value)})`;
     }
     toJSON() {
         return this.value;