bson 4.6.0 → 4.6.2

package/bower.json

@@ -22,5 +22,5 @@
     "test",
     "tools"
   ],
-  "version": "4.6.0"
+  "version": "4.6.2"
 }

package/bson.d.ts

@@ -875,7 +875,7 @@ export declare interface MinKeyExtended {
  * @public
  */
 declare class ObjectId {
-    _bsontype: 'ObjectId';
+    _bsontype: 'ObjectID';
     /* Excluded from this release type: index */
     static cacheHexString: boolean;
     /* Excluded from this release type: [kId] */
@@ -885,7 +885,7 @@ declare class ObjectId {
      *
      * @param inputId - Can be a 24 character hex string, 12 byte binary Buffer, or a number.
      */
-    constructor(inputId?: string | Buffer | number | ObjectIdLike | ObjectId);
+    constructor(inputId?: string | number | ObjectId | ObjectIdLike | Buffer | Uint8Array);
     /*
     * The ObjectId bytes
     * @readonly
@@ -939,7 +939,7 @@ declare class ObjectId {
      *
      * @param id - ObjectId instance to validate.
      */
-    static isValid(id: number | string | ObjectId | Uint8Array | ObjectIdLike): boolean;
+    static isValid(id: string | number | ObjectId | ObjectIdLike | Buffer | Uint8Array): boolean;
     /* Excluded from this release type: toExtendedJSON */
     /* Excluded from this release type: fromExtendedJSON */
     inspect(): string;

package/dist/bson.browser.esm.js

@@ -3800,9 +3800,15 @@ var Decimal128 = /** @class */ (function () {
         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
@@ -4587,7 +4593,7 @@ var ObjectId = /** @class */ (function () {
                 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 {
@@ -4704,7 +4710,7 @@ var ObjectId = /** @class */ (function () {
             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) &&
@@ -4721,7 +4727,9 @@ var ObjectId = /** @class */ (function () {
         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;
     };
@@ -4768,26 +4776,13 @@ var ObjectId = /** @class */ (function () {
     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 () {
@@ -5583,7 +5578,7 @@ function calculateObjectSize$1(object, serializeFunctions, ignoreUndefined) {
     }
     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
@@ -5601,7 +5596,7 @@ value, serializeFunctions, isArray, ignoreUndefined) {
     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) {
@@ -7049,9 +7044,7 @@ function serializeInto(buffer, object, checkKeys, startingIndex, depth, serializ
             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') {
@@ -7227,21 +7220,18 @@ function serializeInto(buffer, object, checkKeys, startingIndex, depth, serializ
         }
     }
     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