bson 4.6.0 → 4.6.2

package/dist/bson.browser.umd.js

@@ -3806,9 +3806,15 @@
 	        if (typeof bytes === 'string') {
 	            this.bytes = Decimal128.fromString(bytes).bytes;
 	        }
-	        else {
+	        else if (isUint8Array(bytes)) {
+	            if (bytes.byteLength !== 16) {
+	                throw new BSONTypeError('Decimal128 must take a Buffer of 16 bytes');
+	            }
 	            this.bytes = bytes;
 	        }
+	        else {
+	            throw new BSONTypeError('Decimal128 must take a Buffer or string');
+	        }
 	    }
 	    /**
 	     * Create a Decimal128 instance from a string representation
@@ -4593,7 +4599,7 @@
 	                this[kId] = buffer_1.from(workingId, 'hex');
 	            }
 	            else {
-	                throw new BSONTypeError('Argument passed in must be a string of 12 bytes or a string of 24 hex characters');
+	                throw new BSONTypeError('Argument passed in must be a string of 12 bytes or a string of 24 hex characters or an integer');
 	            }
 	        }
 	        else {
@@ -4710,7 +4716,7 @@
 	            return false;
 	        }
 	        if (otherId instanceof ObjectId) {
-	            return this.toString() === otherId.toString();
+	            return this[kId][11] === otherId[kId][11] && this[kId].equals(otherId[kId]);
 	        }
 	        if (typeof otherId === 'string' &&
 	            ObjectId.isValid(otherId) &&
@@ -4727,7 +4733,9 @@
 	        if (typeof otherId === 'object' &&
 	            'toHexString' in otherId &&
 	            typeof otherId.toHexString === 'function') {
-	            return otherId.toHexString() === this.toHexString();
+	            var otherIdString = otherId.toHexString();
+	            var thisIdString = this.toHexString().toLowerCase();
+	            return typeof otherIdString === 'string' && otherIdString.toLowerCase() === thisIdString;
 	        }
 	        return false;
 	    };
@@ -4774,26 +4782,13 @@
 	    ObjectId.isValid = function (id) {
 	        if (id == null)
 	            return false;
-	        if (typeof id === 'number') {
-	            return true;
-	        }
-	        if (typeof id === 'string') {
-	            return id.length === 12 || (id.length === 24 && checkForHexRegExp.test(id));
-	        }
-	        if (id instanceof ObjectId) {
-	            return true;
-	        }
-	        if (isUint8Array(id) && id.length === 12) {
+	        try {
+	            new ObjectId(id);
 	            return true;
 	        }
-	        // Duck-Typing detection of ObjectId like objects
-	        if (typeof id === 'object' && 'toHexString' in id && typeof id.toHexString === 'function') {
-	            if (typeof id.id === 'string') {
-	                return id.id.length === 12;
-	            }
-	            return id.toHexString().length === 24 && checkForHexRegExp.test(id.id.toString('hex'));
+	        catch (_a) {
+	            return false;
 	        }
-	        return false;
 	    };
 	    /** @internal */
 	    ObjectId.prototype.toExtendedJSON = function () {
@@ -5589,7 +5584,7 @@
 	    }
 	    else {
 	        // If we have toBSON defined, override the current object
-	        if (object.toBSON) {
+	        if (typeof (object === null || object === void 0 ? void 0 : object.toBSON) === 'function') {
 	            object = object.toBSON();
 	        }
 	        // Calculate size
@@ -5607,7 +5602,7 @@
 	    if (isArray === void 0) { isArray = false; }
 	    if (ignoreUndefined === void 0) { ignoreUndefined = false; }
 	    // If we have toBSON defined, override the current object
-	    if (value && value.toBSON) {
+	    if (typeof (value === null || value === void 0 ? void 0 : value.toBSON) === 'function') {
 	        value = value.toBSON();
 	    }
 	    switch (typeof value) {
@@ -7055,9 +7050,7 @@
 	            var key = '' + i;
 	            var value = object[i];
 	            // Is there an override value
-	            if (value && value.toBSON) {
-	                if (typeof value.toBSON !== 'function')
-	                    throw new BSONTypeError('toBSON is not a function');
+	            if (typeof (value === null || value === void 0 ? void 0 : value.toBSON) === 'function') {
 	                value = value.toBSON();
 	            }
 	            if (typeof value === 'string') {
@@ -7233,21 +7226,18 @@
 	        }
 	    }
 	    else {
-	        // Did we provide a custom serialization method
-	        if (object.toBSON) {
-	            if (typeof object.toBSON !== 'function')
-	                throw new BSONTypeError('toBSON is not a function');
+	        if (typeof (object === null || object === void 0 ? void 0 : object.toBSON) === 'function') {
+	            // Provided a custom serialization method
 	            object = object.toBSON();
-	            if (object != null && typeof object !== 'object')
+	            if (object != null && typeof object !== 'object') {
 	                throw new BSONTypeError('toBSON function did not return an object');
+	            }
 	        }
 	        // Iterate over all the keys
 	        for (var key in object) {
 	            var value = object[key];
 	            // Is there an override value
-	            if (value && value.toBSON) {
-	                if (typeof value.toBSON !== 'function')
-	                    throw new BSONTypeError('toBSON is not a function');
+	            if (typeof (value === null || value === void 0 ? void 0 : value.toBSON) === 'function') {
 	                value = value.toBSON();
 	            }
 	            // Check the type of the value