mongodb 3.6.8 → 3.6.9

package/HISTORY.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [3.6.9](https://github.com/mongodb/node-mongodb-native/compare/v3.6.8...v3.6.9) (2021-05-26)
+
+
+### Bug Fixes
+
+* **NODE-3309:** remove redundant iteration of bulk write result ([#2815](https://github.com/mongodb/node-mongodb-native/issues/2815)) ([fac9610](https://github.com/mongodb/node-mongodb-native/commit/fac961086eafa0f7437576fd6af900e1f9fe22ed))
+* fix url parsing for a mongodb+srv url that has commas in the database name ([#2789](https://github.com/mongodb/node-mongodb-native/issues/2789)) ([58c4e69](https://github.com/mongodb/node-mongodb-native/commit/58c4e693cc3a717254144d5f9bdddd8414217e97))
+
 ### [3.6.8](https://github.com/mongodb/node-mongodb-native/compare/v3.6.7...v3.6.8) (2021-05-21)
 
 

package/lib/bulk/common.js

@@ -57,6 +57,9 @@ class Batch {
   }
 }
 
+const kUpsertedIds = Symbol('upsertedIds');
+const kInsertedIds = Symbol('insertedIds');
+
 /**
  * @classdesc
  * The result of a bulk write.
@@ -69,6 +72,8 @@ class BulkWriteResult {
    */
   constructor(bulkResult) {
     this.result = bulkResult;
+    this[kUpsertedIds] = undefined;
+    this[kInsertedIds] = undefined;
   }
 
   /** Number of documents inserted. */
@@ -94,20 +99,33 @@ class BulkWriteResult {
 
   /** Upserted document generated Id's, hash key is the index of the originating operation */
   get upsertedIds() {
-    const upserted = {};
-    for (const doc of !this.result.upserted ? [] : this.result.upserted) {
-      upserted[doc.index] = doc._id;
+    if (this[kUpsertedIds]) {
+      return this[kUpsertedIds];
+    }
+
+    this[kUpsertedIds] = {};
+    for (const doc of this.result.upserted || []) {
+      this[kUpsertedIds][doc.index] = doc._id;
     }
-    return upserted;
+    return this[kUpsertedIds];
   }
 
   /** Inserted document generated Id's, hash key is the index of the originating operation */
   get insertedIds() {
-    const inserted = {};
-    for (const doc of !this.result.insertedIds ? [] : this.result.insertedIds) {
-      inserted[doc.index] = doc._id;
+    if (this[kInsertedIds]) {
+      return this[kInsertedIds];
+    }
+
+    this[kInsertedIds] = {};
+    for (const doc of this.result.insertedIds || []) {
+      this[kInsertedIds][doc.index] = doc._id;
     }
-    return inserted;
+    return this[kInsertedIds];
+  }
+
+  /** The number of inserted documents @type {number} */
+  get n() {
+    return this.result.insertedCount;
   }
 
   /**
@@ -1370,5 +1388,6 @@ module.exports = {
   INSERT: INSERT,
   UPDATE: UPDATE,
   REMOVE: REMOVE,
-  BulkWriteError
+  BulkWriteError,
+  BulkWriteResult
 };

package/lib/core/uri_parser.js

@@ -52,7 +52,9 @@ function parseSrvConnectionString(uri, options, callback) {
   }
 
   result.domainLength = result.hostname.split('.').length;
-  if (result.pathname && result.pathname.match(',')) {
+
+  const hostname = uri.substring('mongodb+srv://'.length).split('/')[0];
+  if (hostname.match(',')) {
     return callback(new MongoParseError('Invalid URI, cannot contain multiple hostnames'));
   }
 

package/lib/operations/bulk_write.js

@@ -70,23 +70,6 @@ class BulkWriteOperation extends OperationBase {
         return callback(err, null);
       }
 
-      // Update the n
-      r.n = r.insertedCount;
-
-      // Inserted documents
-      const inserted = r.getInsertedIds();
-      // Map inserted ids
-      for (let i = 0; i < inserted.length; i++) {
-        r.insertedIds[inserted[i].index] = inserted[i]._id;
-      }
-
-      // Upserted documents
-      const upserted = r.getUpsertedIds();
-      // Map upserted ids
-      for (let i = 0; i < upserted.length; i++) {
-        r.upsertedIds[upserted[i].index] = upserted[i]._id;
-      }
-
       // Return the results
       callback(null, r);
     });

package/lib/url_parser.js

@@ -35,7 +35,8 @@ module.exports = function(url, options, callback) {
 
   result.domainLength = result.hostname.split('.').length;
 
-  if (result.pathname && result.pathname.match(',')) {
+  const hostname = url.substring('mongodb+srv://'.length).split('/')[0];
+  if (hostname.match(',')) {
     return callback(new Error('Invalid URI, cannot contain multiple hostnames'));
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "3.6.8",
+  "version": "3.6.9",
   "description": "The official MongoDB driver for Node.js",
   "main": "index.js",
   "files": [