chore: bump driver and bson to latest MONGOSH-764 (#880)

- Bump driver to 4.0.0-beta.4
  - Adjust options of the findAndModify/findOneAnd[...] methods
    to account for the changed TS definitions and the added
    `returnDocument` options, which supersedes all three other
    alternatives currently supported by the shell.
- Bump bson to 4.4.0
  - Adjust output for `Decimal128` and `Long` formatting.
  - Also addresses MONGOSH-709.

Author: addaleax

package-lock.json

@@ -121,7 +121,7 @@
     "karma-typescript": "^4.1.1",
     "lerna": "^3.10.7",
     "mocha": "^7.1.2",
-    "mongodb": "4.0.0-beta.3",
+    "mongodb": "4.0.0-beta.4",
     "mongodb-download-url": "^1.0.1",
     "mongodb-js-precommit": "^2.0.0",
     "nock": "^13.0.11",

package.json

@@ -218,19 +218,19 @@ describe('completer.completer', () => {
 
   context('when context is collections', () => {
     it('matches a collection command', async() => {
-      const i = 'db.shipwrecks.findAnd';
-      expect(await completer(standalone440, i)).to.deep.equal([['db.shipwrecks.findAndModify'], i]);
+      const i = 'db.shipwrecks.findOneAndUp';
+      expect(await completer(standalone440, i)).to.deep.equal([['db.shipwrecks.findOneAndUpdate'], i]);
     });
 
     it('matches a collection command if part of an expression', async() => {
-      const i = 'var result = db.shipwrecks.findAnd';
-      expect(await completer(standalone440, i)).to.deep.equal([['var result = db.shipwrecks.findAndModify'], i]);
+      const i = 'var result = db.shipwrecks.findOneAndUp';
+      expect(await completer(standalone440, i)).to.deep.equal([['var result = db.shipwrecks.findOneAndUpdate'], i]);
     });
 
     it('returns all suggestions', async() => {
       const i = 'db.shipwrecks.';
       const collComplete = Object.keys(shellSignatures.Collection.attributes as any);
-      const adjusted = collComplete.filter(c => !['count', 'update', 'remove', 'insert', 'save'].includes(c)).map(c => `${i}${c}`);
+      const adjusted = collComplete.filter(c => !['count', 'update', 'remove', 'insert', 'save', 'findAndModify'].includes(c)).map(c => `${i}${c}`);
 
       expect(await completer(sharded440, i)).to.deep.equal([adjusted, i]);
     });
@@ -239,7 +239,7 @@ describe('completer.completer', () => {
       const i = 'db.shipwrecks.find';
       expect(await completer(standalone440, i)).to.deep.equal([
         [
-          'db.shipwrecks.find', 'db.shipwrecks.findAndModify',
+          'db.shipwrecks.find',
           'db.shipwrecks.findOne', 'db.shipwrecks.findOneAndDelete',
           'db.shipwrecks.findOneAndReplace', 'db.shipwrecks.findOneAndUpdate'
         ], i]);

packages/autocomplete/index.spec.ts

@@ -42,11 +42,11 @@ describe('BSON e2e', function() {
       MinKey: 'MinKey()',
       MaxKey: 'MaxKey()',
       NumberInt: 'Int32(32)',
-      NumberLong: 'Long.fromString("64")',
+      NumberLong: 'Long("64")',
       Timestamp: 'Timestamp(1, 100)',
       Symbol: 'abc',
       Code: 'Code("abc")',
-      NumberDecimal: 'Decimal128.fromString("1")',
+      NumberDecimal: 'Decimal128("1")',
       BinData: 'Binary(Buffer.from("31323334", "hex"), 128)',
       ISODate: 'ISODate("2021-05-04T15:49:33.000Z")',
       RegExp: '/match/'
@@ -61,7 +61,7 @@ describe('BSON e2e', function() {
         Timestamp: new bson.Timestamp(1, 100),
         Symbol: new bson.BSONSymbol('abc'),
         Code: new bson.Code('abc'),
-        NumberDecimal: bson.Decimal128.fromString('1'),
+        NumberDecimal: new bson.Decimal128('1'),
         BinData: new bson.Binary(buffer, 128),
         ISODate: new Date('2021-05-04T15:49:33.000Z'),
         RegExp: /match/
@@ -177,12 +177,12 @@ describe('BSON e2e', function() {
       shell.assertNoErrors();
     });
     it('Decimal128 prints when returned from the server', async() => {
-      const value = bson.Decimal128.fromString('1');
+      const value = new bson.Decimal128('1');
       await shell.writeInputLine(`use ${dbName}`);
       await db.collection('test').insertOne({ value: value });
       await shell.writeInputLine('db.test.findOne().value');
       await eventually(() => {
-        shell.assertContainsOutput('Decimal128.fromString("1")');
+        shell.assertContainsOutput('Decimal128("1")');
       });
       shell.assertNoErrors();
     });
@@ -261,15 +261,15 @@ describe('BSON e2e', function() {
       const value = 'NumberLong("64")';
       await shell.writeInputLine(value);
       await eventually(() => {
-        shell.assertContainsOutput('Long.fromString("64")');
+        shell.assertContainsOutput('Long("64")');
       });
       shell.assertNoErrors();
     });
     it('NumberLong prints when created by user (> MAX_SAFE_INTEGER)', async() => {
       const value = 'NumberLong("345678654321234561")';
       await shell.writeInputLine(value);
       await eventually(() => {
-        shell.assertContainsOutput('Long.fromString("345678654321234561")');
+        shell.assertContainsOutput('Long("345678654321234561")');
       });
       shell.assertNoErrors();
     });
@@ -309,7 +309,7 @@ describe('BSON e2e', function() {
       const value = 'NumberDecimal("100")';
       await shell.writeInputLine(value);
       await eventually(() => {
-        shell.assertContainsOutput('Decimal128.fromString("100")');
+        shell.assertContainsOutput('Decimal128("100")');
       });
       shell.assertNoErrors();
     });
@@ -427,7 +427,7 @@ describe('BSON e2e', function() {
       shell.assertNoErrors();
     });
     it('Decimal128 has help when returned from the server', async() => {
-      const value = bson.Decimal128.fromString('1');
+      const value = new bson.Decimal128('1');
       await shell.writeInputLine(`use ${dbName}`);
       await db.collection('test').insertOne({ value: value });
       await shell.writeInputLine('db.test.findOne().value.help()');

packages/cli-repl/test/e2e-bson.spec.ts

@@ -316,8 +316,8 @@ internal val findOneAndReplaceOptionsConverters: Map<String, (FindOneAndReplaceO
         typed("upsert", Boolean::class.java) { opt, value ->
             opt.upsert(value)
         },
-        typed("returnOriginal", Boolean::class.java) { opt, value ->
-            opt.returnDocument(if (value) ReturnDocument.BEFORE else ReturnDocument.AFTER)
+        typed("returnDocument", String::class.java) { opt, value ->
+            opt.returnDocument(if (value == "before") ReturnDocument.BEFORE else ReturnDocument.AFTER)
         },
         typed("collation", Map::class.java) { opt, value ->
             val collation = convert(Collation.builder(), collationConverters, collationDefaultConverter, value)
@@ -371,8 +371,8 @@ internal val findOneAndUpdateConverters: Map<String, (FindOneAndUpdateOptions, A
         typed("upsert", Boolean::class.java) { opt, value ->
             opt.upsert(value)
         },
-        typed("returnOriginal", Boolean::class.java) { opt, value ->
-            opt.returnDocument(if (value) ReturnDocument.BEFORE else ReturnDocument.AFTER)
+        typed("returnDocument", String::class.java) { opt, value ->
+            opt.returnDocument(if (value == "before") ReturnDocument.BEFORE else ReturnDocument.AFTER)
         },
         typed("arrayFilters", List::class.java) { opt, value ->
             if (value.any { it !is Document }) {

packages/java-shell/src/main/kotlin/com/mongodb/mongosh/service/optionConverters.kt

@@ -42,7 +42,7 @@
     "@mongosh/service-provider-core": "0.0.0-dev.0",
     "@mongosh/service-provider-server": "0.0.0-dev.0",
     "@mongosh/types": "0.0.0-dev.0",
-    "bson": "^4.3.0",
+    "bson": "^4.4.0",
     "interruptor": "^1.0.1",
     "postmsg-rpc": "^2.4.0"
   }

packages/node-runtime-worker-thread/package-lock.json

@@ -29,8 +29,8 @@
   "dependencies": {
     "@mongosh/errors": "0.0.0-dev.0",
     "@mongosh/i18n": "0.0.0-dev.0",
-    "bson": "^4.3.0",
-    "mongodb": "4.0.0-beta.3",
+    "bson": "^4.4.0",
+    "mongodb": "4.0.0-beta.4",
     "mongodb-build-info": "^1.1.1",
     "whatwg-url": "^8.4.0"
   },

packages/node-runtime-worker-thread/package.json

@@ -33,7 +33,9 @@ export type {
   EstimatedDocumentCountOptions,
   ExplainOptions,
   ExplainVerbosityLike,
-  FindAndModifyOptions,
+  FindOneAndDeleteOptions,
+  FindOneAndUpdateOptions,
+  FindOneAndReplaceOptions,
   FindOperators,
   FindOptions,
   HedgeOptions,