@mongosh/service-provider-core 2.0.2 → 2.1.1

package/lib/printable-bson.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makePrintableBson = exports.bsonStringifiers = void 0;
 const bson_export_1 = require("./bson-export");
-const util_1 = require("util");
 const inspectCustom = Symbol.for('nodejs.util.inspect.custom');
 function removeNewFromInspectResult(str) {
     return String(str).replace(/^(\s*)(new )/, '$1');
@@ -13,15 +12,11 @@ function makeClasslessInspect(className) {
         return removeNewFromInspectResult(originalInspect.apply(this, args));
     };
 }
+const binaryInspect = makeClasslessInspect('Binary');
 exports.bsonStringifiers = {
     ObjectId: makeClasslessInspect('ObjectId'),
     ObjectID: makeClasslessInspect('ObjectId'),
-    DBRef: function (depth, options) {
-        return (`DBRef("${this.collection}", ` +
-            (0, util_1.inspect)(this.oid, options) +
-            (this.db ? `, ${(0, util_1.inspect)(this.db, options)}` : '') +
-            ')');
-    },
+    DBRef: makeClasslessInspect('DBRef'),
     MaxKey: makeClasslessInspect('MaxKey'),
     MinKey: makeClasslessInspect('MinKey'),
     Timestamp: makeClasslessInspect('Timestamp'),
@@ -32,21 +27,21 @@ exports.bsonStringifiers = {
     Long: makeClasslessInspect('Long'),
     Double: makeClasslessInspect('Double'),
     BSONRegExp: makeClasslessInspect('BSONRegExp'),
-    Binary: function () {
+    Binary: function (...args) {
         const hexString = this.toString('hex');
         switch (this.sub_type) {
             case bson_export_1.bson.Binary.SUBTYPE_MD5:
-                return `MD5("${hexString}")`;
+                return `MD5('${hexString}')`;
             case bson_export_1.bson.Binary.SUBTYPE_UUID:
                 if (hexString.length === 32) {
                     const asUUID = /^(.{8})(.{4})(.{4})(.{4})(.{12})$/
                         .exec(hexString)
                         .slice(1, 6)
                         .join('-');
-                    return `UUID("${asUUID}")`;
+                    return `UUID('${asUUID}')`;
                 }
             default:
-                return `Binary.createFromBase64("${this.toString('base64')}", ${this.sub_type})`;
+                return binaryInspect.apply(this, args);
         }
     },
 };

package/lib/printable-bson.js.map

@@ -1 +1 @@
-{"version":3,"file":"printable-bson.js","sourceRoot":"","sources":["../src/printable-bson.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"printable-bson.js","sourceRoot":"","sources":["../src/printable-bson.ts"],"names":[],"mappings":";;;AAAA,+CAA6C;AAC7C,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;AAO/D,SAAS,0BAA0B,CAAC,GAAW;IAC7C,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;AACnD,CAAC;AAKD,SAAS,oBAAoB,CAAyB,SAAY;IAChE,MAAM,eAAe,GAAG,kBAAI,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC;IAC1D,OAAO,UAEL,GAAG,IAAS;QAEZ,OAAO,0BAA0B,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,EAAE,IAAW,CAAC,CAAC,CAAC;IAC9E,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,aAAa,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC;AACxC,QAAA,gBAAgB,GAGzB;IACF,QAAQ,EAAE,oBAAoB,CAAC,UAAU,CAAC;IAC1C,QAAQ,EAAE,oBAAoB,CAAC,UAAU,CAAC;IAC1C,KAAK,EAAE,oBAAoB,CAAC,OAAO,CAAC;IACpC,MAAM,EAAE,oBAAoB,CAAC,QAAQ,CAAC;IACtC,MAAM,EAAE,oBAAoB,CAAC,QAAQ,CAAC;IACtC,SAAS,EAAE,oBAAoB,CAAC,WAAW,CAAC;IAC5C,UAAU,EAAE,oBAAoB,CAAC,YAAY,CAAC;IAC9C,IAAI,EAAE,oBAAoB,CAAC,MAAM,CAAC;IAClC,UAAU,EAAE,oBAAoB,CAAC,YAAY,CAAC;IAC9C,KAAK,EAAE,oBAAoB,CAAC,OAAO,CAAC;IACpC,IAAI,EAAE,oBAAoB,CAAC,MAAM,CAAC;IAClC,MAAM,EAAE,oBAAoB,CAAC,QAAQ,CAAC;IACtC,UAAU,EAAE,oBAAoB,CAAC,YAAY,CAAC;IAC9C,MAAM,EAAE,UAEN,GAAG,IAAW;QAEd,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACvC,QAAQ,IAAI,CAAC,QAAQ,EAAE;YACrB,KAAK,kBAAI,CAAC,MAAM,CAAC,WAAW;gBAC1B,OAAO,QAAQ,SAAS,IAAI,CAAC;YAC/B,KAAK,kBAAI,CAAC,MAAM,CAAC,YAAY;gBAC3B,IAAI,SAAS,CAAC,MAAM,KAAK,EAAE,EAAE;oBAG3B,MAAM,MAAM,GAAG,mCAAmC;yBAC/C,IAAI,CAAC,SAAS,CAAE;yBAChB,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;yBACX,IAAI,CAAC,GAAG,CAAC,CAAC;oBACb,OAAO,SAAS,MAAM,IAAI,CAAC;iBAC5B;YAGH;gBACE,OAAO,aAAa,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SAC1C;IACH,CAAC;CACF,CAAC;AAOF,SAAgB,iBAAiB,CAAC,IAAkB;IAClD,IAAI,CAAC,IAAI,EAAE;QACT,IAAI,GAAG,kBAAI,CAAC;KACb;IAED,KAAK,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,wBAAgB,CAAC,EAAE;QACjE,IAAI,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,EAAE;YAClB,SAAS;SACV;QACD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAwB,CAAC,CAAC;QAC3C,KAAK,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,EAAE;YAC3C,GAAW,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC;SAC3C;KACF;AACH,CAAC;AAdD,8CAcC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mongosh/service-provider-core",
-  "version": "2.0.2",
+  "version": "2.1.1",
   "description": "MongoDB Shell Core Service Provider Package",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -44,10 +44,10 @@
   },
   "dependencies": {
     "@aws-sdk/credential-providers": "^3.347.1",
-    "@mongosh/errors": "2.0.2",
-    "bson": "^6.1.0",
-    "mongodb": "^6.0.0",
-    "mongodb-build-info": "^1.6.2",
+    "@mongosh/errors": "2.1.1",
+    "bson": "^6.2.0",
+    "mongodb": "^6.3.0",
+    "mongodb-build-info": "^1.7.1",
     "mongodb-client-encryption": "^6.0.0"
   },
   "optionalDependencies": {
@@ -61,5 +61,5 @@
     "eslint": "^7.25.0",
     "prettier": "^2.8.8"
   },
-  "gitHead": "5737e60cdbcd551f6a355b38fc9b5b6cc19ac5a4"
+  "gitHead": "c7e70b65988d21c9020abf2bbd253a94b1d3316c"
 }

package/src/printable-bson.spec.ts

@@ -10,7 +10,7 @@ describe('BSON printers', function () {
 
   it('formats ObjectIds correctly', function () {
     expect(inspect(new bson.ObjectId('5fa5694f88211043b23c7f11'))).to.equal(
-      'ObjectId("5fa5694f88211043b23c7f11")'
+      "ObjectId('5fa5694f88211043b23c7f11')"
     );
   });
 
@@ -19,12 +19,12 @@ describe('BSON printers', function () {
       inspect(
         new bson.DBRef('a', new bson.ObjectId('5f16b8bebe434dc98cdfc9cb'), 'db')
       )
-    ).to.equal('DBRef("a", ObjectId("5f16b8bebe434dc98cdfc9cb"), \'db\')');
+    ).to.equal("DBRef('a', ObjectId('5f16b8bebe434dc98cdfc9cb'), 'db')");
     expect(inspect(new bson.DBRef('a', 'foo' as any, 'db'))).to.equal(
-      "DBRef(\"a\", 'foo', 'db')"
+      "DBRef('a', 'foo', 'db')"
     );
     expect(inspect(new bson.DBRef('a', { x: 1 } as any, 'db'))).to.equal(
-      'DBRef("a", { x: 1 }, \'db\')'
+      "DBRef('a', { x: 1 }, 'db')"
     );
   });
 
@@ -38,18 +38,18 @@ describe('BSON printers', function () {
   });
 
   it('formats NumberLong correctly', function () {
-    expect(inspect(bson.Long.fromString('64'))).to.equal('Long("64")');
+    expect(inspect(bson.Long.fromString('64'))).to.equal("Long('64')");
   });
 
   it('formats unsigned NumberLong correctly', function () {
     expect(inspect(bson.Long.fromString('64', true))).to.equal(
-      'Long("64", true)'
+      "Long('64', true)"
     );
   });
 
   it('formats NumberDecimal correctly', function () {
     expect(inspect(bson.Decimal128.fromString('1'))).to.equal(
-      'Decimal128("1")'
+      "Decimal128('1')"
     );
   });
 
@@ -60,16 +60,16 @@ describe('BSON printers', function () {
   });
 
   it('formats Symbol correctly', function () {
-    expect(inspect(new bson.BSONSymbol('abc'))).to.equal('BSONSymbol("abc")');
+    expect(inspect(new bson.BSONSymbol('abc'))).to.equal("BSONSymbol('abc')");
   });
 
   it('formats Code correctly', function () {
-    expect(inspect(new bson.Code('abc'))).to.equal('Code("abc")');
+    expect(inspect(new bson.Code('abc'))).to.equal("Code('abc')");
   });
 
   it('formats BSONRegExp correctly', function () {
     expect(inspect(new bson.BSONRegExp('(?-i)AA_', 'im'))).to.equal(
-      'BSONRegExp("(?-i)AA_", "im")'
+      "BSONRegExp('(?-i)AA_', 'im')"
     );
   });
 
@@ -81,7 +81,7 @@ describe('BSON printers', function () {
           4
         )
       )
-    ).to.equal('UUID("01234567-89ab-cdef-0123-456789abcdef")');
+    ).to.equal("UUID('01234567-89ab-cdef-0123-456789abcdef')");
   });
 
   it('formats MD5s correctly', function () {
@@ -92,12 +92,12 @@ describe('BSON printers', function () {
           5
         )
       )
-    ).to.equal('MD5("0123456789abcdef0123456789abcdef")');
+    ).to.equal("MD5('0123456789abcdef0123456789abcdef')");
   });
 
   it('formats any other value with the new format using createfromBase64', function () {
     expect(
       inspect(bson.Binary.createFromBase64('SGVsbG8sIFdvcmxkIQo='))
-    ).to.equal('Binary.createFromBase64("SGVsbG8sIFdvcmxkIQo=", 0)');
+    ).to.equal("Binary.createFromBase64('SGVsbG8sIFdvcmxkIQo=', 0)");
   });
 });

package/src/printable-bson.ts

@@ -1,5 +1,4 @@
 import { bson as BSON } from './bson-export';
-import { inspect } from 'util';
 const inspectCustom = Symbol.for('nodejs.util.inspect.custom');
 type BSONClassKey = (typeof BSON)[Exclude<
   keyof typeof BSON,
@@ -24,24 +23,14 @@ function makeClasslessInspect<K extends BSONClassKey>(className: K) {
   };
 }
 
+const binaryInspect = makeClasslessInspect('Binary');
 export const bsonStringifiers: Record<
   BSONClassKey | 'ObjectID',
   (this: any, depth: any, options: any) => string
 > = {
   ObjectId: makeClasslessInspect('ObjectId'),
   ObjectID: makeClasslessInspect('ObjectId'),
-  DBRef: function (
-    this: typeof BSON.DBRef.prototype,
-    depth: any,
-    options: any
-  ): string {
-    return (
-      `DBRef("${this.collection}", ` +
-      inspect(this.oid, options) + // The driver's inspect() does not account for non-ObjectID oid values
-      (this.db ? `, ${inspect(this.db, options)}` : '') +
-      ')'
-    );
-  },
+  DBRef: makeClasslessInspect('DBRef'),
   MaxKey: makeClasslessInspect('MaxKey'),
   MinKey: makeClasslessInspect('MinKey'),
   Timestamp: makeClasslessInspect('Timestamp'),
@@ -52,11 +41,14 @@ export const bsonStringifiers: Record<
   Long: makeClasslessInspect('Long'),
   Double: makeClasslessInspect('Double'),
   BSONRegExp: makeClasslessInspect('BSONRegExp'),
-  Binary: function (this: typeof BSON.Binary.prototype): string {
+  Binary: function (
+    this: typeof BSON.Binary.prototype,
+    ...args: any[]
+  ): string {
     const hexString = this.toString('hex');
     switch (this.sub_type) {
       case BSON.Binary.SUBTYPE_MD5:
-        return `MD5("${hexString}")`;
+        return `MD5('${hexString}')`;
       case BSON.Binary.SUBTYPE_UUID:
         if (hexString.length === 32) {
           // Format '0123456789abcdef0123456789abcdef' into
@@ -65,14 +57,12 @@ export const bsonStringifiers: Record<
             .exec(hexString)!
             .slice(1, 6)
             .join('-');
-          return `UUID("${asUUID}")`;
+          return `UUID('${asUUID}')`;
         }
       // In case somebody did something weird and used an UUID with a
       // non-standard length, fall through.
       default:
-        return `Binary.createFromBase64("${this.toString('base64')}", ${
-          this.sub_type
-        })`;
+        return binaryInspect.apply(this, args);
     }
   },
 };