@mongosh/service-provider-core 1.10.5 → 2.0.0

package/AUTHORS

@@ -14,3 +14,6 @@ Le Roux Bodenstein <lerouxb@gmail.com>
 Bailey Pearson <bailey.pearson@mongodb.com>
 Himanshu Singh <himanshu.singhs@outlook.in>
 Martin Rodriguez Reboredo <yakoyoku@gmail.com>
+Kevin Mas Ruiz <kevin.mas@hey.com>
+Hao <shaketbaby@gmail.com>
+Basit <1305718+mabaasit@users.noreply.github.com>

package/lib/admin.d.ts

@@ -2,7 +2,7 @@ import type ShellAuthOptions from './shell-auth-options';
 import type { MongoClientOptions, ReadConcern, ReadPreference, WriteConcern, Document, CreateCollectionOptions, ClientSession, DbOptions, ClientSessionOptions, ListDatabasesOptions, AutoEncryptionOptions, Collection } from './all-transport-types';
 import type { bson as BSON } from './index';
 import type { ReplPlatform } from './platform';
-import type { AWSEncryptionKeyOptions, AzureEncryptionKeyOptions, ClientEncryption as MongoCryptClientEncryption, ClientEncryptionDataKeyProvider, FLE, GCPEncryptionKeyOptions } from './all-fle-types';
+import type { AWSEncryptionKeyOptions, AzureEncryptionKeyOptions, ClientEncryption as MongoCryptClientEncryption, ClientEncryptionDataKeyProvider, GCPEncryptionKeyOptions, ClientEncryption, ClientEncryptionOptions } from './all-fle-types';
 export interface CreateEncryptedCollectionOptions {
     provider: ClientEncryptionDataKeyProvider;
     createCollectionOptions: Omit<CreateCollectionOptions, 'encryptedFields'> & {
@@ -36,7 +36,7 @@ export default interface Admin {
     resetConnectionOptions(options: MongoClientOptions): Promise<void>;
     startSession(options: ClientSessionOptions): ClientSession;
     getRawClient(): any;
-    fle?: FLE | undefined;
+    createClientEncryption?(options: ClientEncryptionOptions): ClientEncryption;
     getFleOptions?: () => AutoEncryptionOptions | undefined;
     createEncryptedCollection?(dbName: string, collName: string, options: CreateEncryptedCollectionOptions, libmongocrypt: MongoCryptClientEncryption): Promise<{
         collection: Collection;

package/lib/all-fle-types.d.ts

@@ -1,2 +1 @@
-export type { AWSEncryptionKeyOptions, AzureEncryptionKeyOptions, GCPEncryptionKeyOptions, ClientEncryption, ClientEncryptionCreateDataKeyCallback, ClientEncryptionCreateDataKeyProviderOptions, ClientEncryptionDataKeyProvider, ClientEncryptionDecryptCallback, ClientEncryptionEncryptCallback, ClientEncryptionEncryptOptions, ClientEncryptionOptions, ClientEncryptionTlsOptions, KMSProviders, } from 'mongodb-client-encryption';
-export type FLE = typeof import('mongodb-client-encryption');
+export type { AWSEncryptionKeyOptions, AzureEncryptionKeyOptions, GCPEncryptionKeyOptions, ClientEncryption, ClientEncryptionCreateDataKeyProviderOptions, ClientEncryptionDataKeyProvider, ClientEncryptionEncryptOptions, ClientEncryptionOptions, ClientEncryptionTlsOptions, KMSProviders, } from 'mongodb';

package/lib/all-transport-types.d.ts

@@ -1 +1 @@
-export type { AggregateOptions, AggregationCursor, AnyBulkWriteOperation, Batch, BulkWriteOptions, BulkWriteResult, ChangeStream, ChangeStreamOptions, ClientSession, CloseOptions, CollationOptions, CollStatsOptions, Collection, CommandOperationOptions, CountDocumentsOptions, CountOptions, CreateCollectionOptions, CreateIndexesOptions, ClientSessionOptions, ClusterTime, FindCursor, CursorFlag, RunCommandCursor, Db, DbOptions, DeleteOptions, DeleteResult, DistinctOptions, Document, DropCollectionOptions, DropDatabaseOptions, EstimatedDocumentCountOptions, ExplainOptions, ExplainVerbosityLike, FindOneAndDeleteOptions, FindOneAndUpdateOptions, FindOneAndReplaceOptions, FindOperators, FindOptions, HedgeOptions, IndexDescription, InsertManyResult, InsertOneOptions, InsertOneResult, ListCollectionsOptions, ListDatabasesOptions, ListIndexesOptions, MongoClientOptions, OrderedBulkOperation, ReadConcern, ReadConcernLike, ReadConcernLevel, ReadPreference, ReadPreferenceLike, ReadPreferenceFromOptions, ReadPreferenceMode, RenameOptions, ReplaceOptions, ResumeToken, RunCommandOptions, ServerSessionId, TagSet, TransactionOptions, UpdateOptions, UpdateResult, UnorderedBulkOperation, WriteConcern, ObjectId as ObjectIdType, Timestamp as TimestampType, Binary as BinaryType, TopologyDescription, TopologyType, ServerType, AutoEncryptionOptions, ServerApi, ServerApiVersion, MongoClient, } from 'mongodb';
+export type { AggregateOptions, AggregationCursor, AnyBulkWriteOperation, Batch, BulkWriteOptions, BulkWriteResult, ChangeStream, ChangeStreamOptions, ClientSession, CloseOptions, CollationOptions, Collection, CommandOperationOptions, CountDocumentsOptions, CountOptions, CreateCollectionOptions, CreateIndexesOptions, ClientSessionOptions, ClusterTime, FindCursor, CursorFlag, RunCommandCursor, Db, DbOptions, DeleteOptions, DeleteResult, DistinctOptions, Document, DropCollectionOptions, DropDatabaseOptions, EstimatedDocumentCountOptions, ExplainOptions, ExplainVerbosityLike, FindOneAndDeleteOptions, FindOneAndUpdateOptions, FindOneAndReplaceOptions, FindOperators, FindOptions, HedgeOptions, IndexDescription, InsertManyResult, InsertOneOptions, InsertOneResult, ListCollectionsOptions, ListDatabasesOptions, ListIndexesOptions, MongoClientOptions, OrderedBulkOperation, ReadConcern, ReadConcernLike, ReadConcernLevel, ReadPreference, ReadPreferenceLike, ReadPreferenceFromOptions, ReadPreferenceMode, RenameOptions, ReplaceOptions, ResumeToken, RunCommandOptions, ServerSessionId, TagSet, TransactionOptions, UpdateOptions, UpdateResult, UnorderedBulkOperation, WriteConcern, ObjectId as ObjectIdType, Timestamp as TimestampType, Binary as BinaryType, TopologyDescription, TopologyType, ServerType, AutoEncryptionOptions, ServerApi, ServerApiVersion, MongoClient, } from 'mongodb';

package/lib/bson-export.d.ts

@@ -0,0 +1,23 @@
+import { ObjectId, DBRef, MaxKey, MinKey, Timestamp, BSONSymbol, Code, Decimal128, Int32, Long, Binary, calculateObjectSize, Double, BSONRegExp } from 'bson';
+export declare const bson: {
+    ObjectId: typeof ObjectId;
+    DBRef: typeof DBRef;
+    MaxKey: typeof MaxKey;
+    MinKey: typeof MinKey;
+    Timestamp: typeof Timestamp;
+    BSONSymbol: typeof BSONSymbol;
+    Code: typeof Code;
+    Decimal128: typeof Decimal128;
+    Int32: typeof Int32;
+    Long: typeof Long;
+    Binary: typeof Binary;
+    calculateObjectSize: typeof calculateObjectSize;
+    Double: typeof Double;
+    EJSON: {
+        parse: (text: string, options?: import("bson").EJSONOptions | undefined) => any;
+        stringify: (value: any, replacer?: (string | number)[] | import("bson").EJSONOptions | ((this: any, key: string, value: any) => any) | undefined, space?: string | number | undefined, options?: import("bson").EJSONOptions | undefined) => string;
+        serialize: (value: any, options?: import("bson").EJSONOptions | undefined) => import("bson").Document;
+        deserialize: (ejson: import("bson").Document, options?: import("bson").EJSONOptions | undefined) => any;
+    };
+    BSONRegExp: typeof BSONRegExp;
+};

package/lib/bson-export.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.bson = void 0;
+const bson_1 = require("bson");
+exports.bson = {
+    ObjectId: bson_1.ObjectId,
+    DBRef: bson_1.DBRef,
+    MaxKey: bson_1.MaxKey,
+    MinKey: bson_1.MinKey,
+    Timestamp: bson_1.Timestamp,
+    BSONSymbol: bson_1.BSONSymbol,
+    Code: bson_1.Code,
+    Decimal128: bson_1.Decimal128,
+    Int32: bson_1.Int32,
+    Long: bson_1.Long,
+    Binary: bson_1.Binary,
+    calculateObjectSize: bson_1.calculateObjectSize,
+    Double: bson_1.Double,
+    EJSON: bson_1.EJSON,
+    BSONRegExp: bson_1.BSONRegExp,
+};
+//# sourceMappingURL=bson-export.js.map

package/lib/bson-export.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bson-export.js","sourceRoot":"","sources":["../src/bson-export.ts"],"names":[],"mappings":";;;AAAA,+BAgBc;AAED,QAAA,IAAI,GAAG;IAClB,QAAQ,EAAR,eAAQ;IACR,KAAK,EAAL,YAAK;IACL,MAAM,EAAN,aAAM;IACN,MAAM,EAAN,aAAM;IACN,SAAS,EAAT,gBAAS;IACT,UAAU,EAAV,iBAAU;IACV,IAAI,EAAJ,WAAI;IACJ,UAAU,EAAV,iBAAU;IACV,KAAK,EAAL,YAAK;IACL,IAAI,EAAJ,WAAI;IACJ,MAAM,EAAN,aAAM;IACN,mBAAmB,EAAnB,0BAAmB;IACnB,MAAM,EAAN,aAAM;IACN,KAAK,EAAL,YAAK;IACL,UAAU,EAAV,iBAAU;CACX,CAAC"}

package/lib/connect-info.d.ts

@@ -9,11 +9,13 @@ export interface ConnectInfo {
     is_enterprise: boolean;
     auth_type?: string;
     is_data_federation: boolean;
+    is_stream: boolean;
     dl_version?: string;
     atlas_version?: string;
     is_genuine: boolean;
     non_genuine_server_name: string;
     node_version: string;
     uri: string;
+    is_local_atlas: boolean;
 }
-export default function getConnectInfo(uri: string, mongoshVersion: string, buildInfo: any, atlasVersion: any, topology: any): ConnectInfo;
+export default function getConnectInfo(uri: string, mongoshVersion: string, buildInfo: any, atlasVersion: any, topology: any, isLocalAtlas: boolean): ConnectInfo;

package/lib/connect-info.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const mongodb_build_info_1 = __importDefault(require("mongodb-build-info"));
-function getConnectInfo(uri, mongoshVersion, buildInfo, atlasVersion, topology) {
+function getConnectInfo(uri, mongoshVersion, buildInfo, atlasVersion, topology, isLocalAtlas) {
     var _a;
     buildInfo !== null && buildInfo !== void 0 ? buildInfo : (buildInfo = {});
     const { isGenuine: is_genuine, serverName: non_genuine_server_name } = mongodb_build_info_1.default.getGenuineMongoDB(uri);
@@ -26,10 +26,12 @@ function getConnectInfo(uri, mongoshVersion, buildInfo, atlasVersion, topology)
         is_enterprise: mongodb_build_info_1.default.isEnterprise(buildInfo),
         auth_type,
         is_data_federation,
+        is_stream: mongodb_build_info_1.default.isAtlasStream(uri),
         dl_version,
         atlas_version: (_a = atlasVersion === null || atlasVersion === void 0 ? void 0 : atlasVersion.atlasVersion) !== null && _a !== void 0 ? _a : null,
         is_genuine,
         non_genuine_server_name,
+        is_local_atlas: isLocalAtlas,
     };
 }
 exports.default = getConnectInfo;

package/lib/connect-info.js.map

@@ -1 +1 @@
-{"version":3,"file":"connect-info.js","sourceRoot":"","sources":["../src/connect-info.ts"],"names":[],"mappings":";;;;;AAEA,4EAA8C;AAqB9C,SAAwB,cAAc,CACpC,GAAW,EACX,cAAsB,EACtB,SAAc,EACd,YAAiB,EACjB,QAAa;;IAEb,SAAS,aAAT,SAAS,cAAT,SAAS,IAAT,SAAS,GAAK,EAAE,EAAC;IACjB,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,uBAAuB,EAAE,GAClE,4BAAY,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAEtC,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,SAAS,EAAE,UAAU,EAAE,GAC7D,4BAAY,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAEtC,MAAM,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,WAAW;QACtC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,SAAS;QAClC,CAAC,CAAC,IAAI,CAAC;IACT,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,GACpD,4BAAY,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAEtC,OAAO;QACL,QAAQ,EAAE,CAAC,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,YAAY,CAAA,IAAI,4BAAY,CAAC,OAAO,CAAC,GAAG,CAAC;QACnE,YAAY,EAAE,4BAAY,CAAC,WAAW,CAAC,GAAG,CAAC;QAC3C,KAAK,EAAE,4BAAY,CAAC,cAAc,CAAC,GAAG,CAAC;QACvC,cAAc,EAAE,SAAS,CAAC,OAAO;QACjC,YAAY,EAAE,OAAO,CAAC,OAAO;QAC7B,eAAe,EAAE,cAAc;QAC/B,SAAS;QACT,GAAG;QACH,WAAW;QACX,aAAa,EAAE,4BAAY,CAAC,YAAY,CAAC,SAAS,CAAC;QACnD,SAAS;QACT,kBAAkB;QAClB,UAAU;QACV,aAAa,EAAE,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,YAAY,mCAAI,IAAI;QACjD,UAAU;QACV,uBAAuB;KACxB,CAAC;AACJ,CAAC;AAtCD,iCAsCC"}
+{"version":3,"file":"connect-info.js","sourceRoot":"","sources":["../src/connect-info.ts"],"names":[],"mappings":";;;;;AAEA,4EAA8C;AAuB9C,SAAwB,cAAc,CACpC,GAAW,EACX,cAAsB,EACtB,SAAc,EACd,YAAiB,EACjB,QAAa,EACb,YAAqB;;IAErB,SAAS,aAAT,SAAS,cAAT,SAAS,IAAT,SAAS,GAAK,EAAE,EAAC;IACjB,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,uBAAuB,EAAE,GAClE,4BAAY,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAEtC,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,SAAS,EAAE,UAAU,EAAE,GAC7D,4BAAY,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAEtC,MAAM,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,WAAW;QACtC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,SAAS;QAClC,CAAC,CAAC,IAAI,CAAC;IACT,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,GACpD,4BAAY,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAEtC,OAAO;QACL,QAAQ,EAAE,CAAC,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,YAAY,CAAA,IAAI,4BAAY,CAAC,OAAO,CAAC,GAAG,CAAC;QACnE,YAAY,EAAE,4BAAY,CAAC,WAAW,CAAC,GAAG,CAAC;QAC3C,KAAK,EAAE,4BAAY,CAAC,cAAc,CAAC,GAAG,CAAC;QACvC,cAAc,EAAE,SAAS,CAAC,OAAO;QACjC,YAAY,EAAE,OAAO,CAAC,OAAO;QAC7B,eAAe,EAAE,cAAc;QAC/B,SAAS;QACT,GAAG;QACH,WAAW;QACX,aAAa,EAAE,4BAAY,CAAC,YAAY,CAAC,SAAS,CAAC;QACnD,SAAS;QACT,kBAAkB;QAClB,SAAS,EAAE,4BAAY,CAAC,aAAa,CAAC,GAAG,CAAC;QAC1C,UAAU;QACV,aAAa,EAAE,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,YAAY,mCAAI,IAAI;QACjD,UAAU;QACV,uBAAuB;QACvB,cAAc,EAAE,YAAY;KAC7B,CAAC;AACJ,CAAC;AAzCD,iCAyCC"}

package/lib/index.d.ts

@@ -3,33 +3,11 @@ import ServiceProvider, { ServiceProviderCore } from './service-provider';
 import getConnectInfo, { ConnectInfo } from './connect-info';
 import type { ReplPlatform } from './platform';
 declare const DEFAULT_DB = "test";
-import { ObjectId, DBRef, MaxKey, MinKey, Timestamp, BSONSymbol, Code, Decimal128, Int32, Long, Binary, calculateObjectSize, Double, BSONRegExp } from 'bson';
 import { bsonStringifiers } from './printable-bson';
 import ShellAuthOptions from './shell-auth-options';
 export * from './all-transport-types';
 export * from './all-fle-types';
 export { MapReduceOptions, FinalizeFunction } from './map-reduce-options';
 export { CreateEncryptedCollectionOptions, CheckMetadataConsistencyOptions, } from './admin';
-declare const bson: {
-    ObjectId: typeof ObjectId;
-    DBRef: typeof DBRef;
-    MaxKey: typeof MaxKey;
-    MinKey: typeof MinKey;
-    Timestamp: typeof Timestamp;
-    BSONSymbol: typeof BSONSymbol;
-    Code: typeof Code;
-    Decimal128: typeof Decimal128;
-    Int32: typeof Int32;
-    Long: typeof Long;
-    Binary: typeof Binary;
-    calculateObjectSize: typeof calculateObjectSize;
-    Double: typeof Double;
-    EJSON: {
-        parse: (text: string, options?: import("bson").EJSONOptions | undefined) => any;
-        stringify: (value: any, replacer?: (string | number)[] | import("bson").EJSONOptions | ((this: any, key: string, value: any) => any) | undefined, space?: string | number | undefined, options?: import("bson").EJSONOptions | undefined) => string;
-        serialize: (value: any, options?: import("bson").EJSONOptions | undefined) => import("bson").Document;
-        deserialize: (ejson: import("bson").Document, options?: import("bson").EJSONOptions | undefined) => any;
-    };
-    BSONRegExp: typeof BSONRegExp;
-};
-export { ServiceProvider, ShellAuthOptions, getConnectInfo, ReplPlatform, DEFAULT_DB, ServiceProviderCore, bson, bsonStringifiers, ConnectInfo, };
+export { bson } from './bson-export';
+export { ServiceProvider, ShellAuthOptions, getConnectInfo, ReplPlatform, DEFAULT_DB, ServiceProviderCore, bsonStringifiers, ConnectInfo, };

package/lib/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bsonStringifiers = exports.bson = exports.ServiceProviderCore = exports.DEFAULT_DB = exports.getConnectInfo = void 0;
+exports.bsonStringifiers = exports.ServiceProviderCore = exports.DEFAULT_DB = exports.getConnectInfo = exports.bson = void 0;
 require("./textencoder-polyfill");
 const service_provider_1 = require("./service-provider");
 Object.defineProperty(exports, "ServiceProviderCore", { enumerable: true, get: function () { return service_provider_1.ServiceProviderCore; } });
@@ -25,27 +25,10 @@ const connect_info_1 = __importDefault(require("./connect-info"));
 exports.getConnectInfo = connect_info_1.default;
 const DEFAULT_DB = 'test';
 exports.DEFAULT_DB = DEFAULT_DB;
-const bson_1 = require("bson");
 const printable_bson_1 = require("./printable-bson");
 Object.defineProperty(exports, "bsonStringifiers", { enumerable: true, get: function () { return printable_bson_1.bsonStringifiers; } });
 __exportStar(require("./all-transport-types"), exports);
 __exportStar(require("./all-fle-types"), exports);
-const bson = {
-    ObjectId: bson_1.ObjectId,
-    DBRef: bson_1.DBRef,
-    MaxKey: bson_1.MaxKey,
-    MinKey: bson_1.MinKey,
-    Timestamp: bson_1.Timestamp,
-    BSONSymbol: bson_1.BSONSymbol,
-    Code: bson_1.Code,
-    Decimal128: bson_1.Decimal128,
-    Int32: bson_1.Int32,
-    Long: bson_1.Long,
-    Binary: bson_1.Binary,
-    calculateObjectSize: bson_1.calculateObjectSize,
-    Double: bson_1.Double,
-    EJSON: bson_1.EJSON,
-    BSONRegExp: bson_1.BSONRegExp,
-};
-exports.bson = bson;
+var bson_export_1 = require("./bson-export");
+Object.defineProperty(exports, "bson", { enumerable: true, get: function () { return bson_export_1.bson; } });
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,kCAAgC;AAChC,yDAA0E;AAyDxE,oGAzDwB,sCAAmB,OAyDxB;AAxDrB,kEAA6D;AAqD3D,yBArDK,sBAAc,CAqDL;AAnDhB,MAAM,UAAU,GAAG,MAAM,CAAC;AAqDxB,gCAAU;AApDZ,+BAgBc;AACd,qDAAoD;AAsClD,iGAtCO,iCAAgB,OAsCP;AApClB,wDAAsC;AACtC,kDAAgC;AAShC,MAAM,IAAI,GAAG;IACX,QAAQ,EAAR,eAAQ;IACR,KAAK,EAAL,YAAK;IACL,MAAM,EAAN,aAAM;IACN,MAAM,EAAN,aAAM;IACN,SAAS,EAAT,gBAAS;IACT,UAAU,EAAV,iBAAU;IACV,IAAI,EAAJ,WAAI;IACJ,UAAU,EAAV,iBAAU;IACV,KAAK,EAAL,YAAK;IACL,IAAI,EAAJ,WAAI;IACJ,MAAM,EAAN,aAAM;IACN,mBAAmB,EAAnB,0BAAmB;IACnB,MAAM,EAAN,aAAM;IACN,KAAK,EAAL,YAAK;IACL,UAAU,EAAV,iBAAU;CACX,CAAC;AASA,oBAAI"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,kCAAgC;AAChC,yDAA0E;AAwBxE,oGAxBwB,sCAAmB,OAwBxB;AAvBrB,kEAA6D;AAoB3D,yBApBK,sBAAc,CAoBL;AAlBhB,MAAM,UAAU,GAAG,MAAM,CAAC;AAoBxB,gCAAU;AAnBZ,qDAAoD;AAqBlD,iGArBO,iCAAgB,OAqBP;AAnBlB,wDAAsC;AACtC,kDAAgC;AAShC,6CAAqC;AAA5B,mGAAA,IAAI,OAAA"}

package/lib/printable-bson.d.ts

@@ -1,3 +1,5 @@
-import { bson as BSON } from './index';
-export declare const bsonStringifiers: Record<string, (this: any, depth: any, options: any) => string>;
-export default function (bson?: typeof BSON): void;
+import { bson as BSON } from './bson-export';
+type BSONClassKey = (typeof BSON)[Exclude<keyof typeof BSON, 'EJSON' | 'calculateObjectSize'>]['prototype']['_bsontype'];
+export declare const bsonStringifiers: Record<BSONClassKey | 'ObjectID', (this: any, depth: any, options: any) => string>;
+export declare function makePrintableBson(bson?: typeof BSON): void;
+export {};

package/lib/printable-bson.js

@@ -1,53 +1,43 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bsonStringifiers = void 0;
-const index_1 = require("./index");
+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');
+}
+function makeClasslessInspect(className) {
+    const originalInspect = bson_export_1.bson[className].prototype.inspect;
+    return function (...args) {
+        return removeNewFromInspectResult(originalInspect.apply(this, args));
+    };
+}
 exports.bsonStringifiers = {
-    ObjectId: function () {
-        return `ObjectId("${this.toHexString()}")`;
-    },
+    ObjectId: makeClasslessInspect('ObjectId'),
+    ObjectID: makeClasslessInspect('ObjectId'),
     DBRef: function (depth, options) {
         return (`DBRef("${this.collection}", ` +
             (0, util_1.inspect)(this.oid, options) +
-            (this.db ? `, "${this.db}"` : '') +
+            (this.db ? `, ${(0, util_1.inspect)(this.db, options)}` : '') +
             ')');
     },
-    MaxKey: function () {
-        return 'MaxKey()';
-    },
-    MinKey: function () {
-        return 'MinKey()';
-    },
-    Timestamp: function () {
-        return `Timestamp({ t: ${this.getHighBits()}, i: ${this.getLowBits()} })`;
-    },
-    BSONSymbol: function () {
-        return `BSONSymbol("${this.valueOf()}")`;
-    },
-    Code: function () {
-        const j = this.toJSON();
-        return `Code("${j.code}"${j.scope ? `, ${JSON.stringify(j.scope)}` : ''})`;
-    },
-    Decimal128: function () {
-        return `Decimal128("${this.toString()}")`;
-    },
-    Int32: function () {
-        return `Int32(${this.valueOf()})`;
-    },
-    Long: function () {
-        return `Long("${this.toString()}"${this.unsigned ? ', true' : ''})`;
-    },
-    BSONRegExp: function () {
-        return `BSONRegExp(${JSON.stringify(this.pattern)}, ${JSON.stringify(this.options)})`;
-    },
+    MaxKey: makeClasslessInspect('MaxKey'),
+    MinKey: makeClasslessInspect('MinKey'),
+    Timestamp: makeClasslessInspect('Timestamp'),
+    BSONSymbol: makeClasslessInspect('BSONSymbol'),
+    Code: makeClasslessInspect('Code'),
+    Decimal128: makeClasslessInspect('Decimal128'),
+    Int32: makeClasslessInspect('Int32'),
+    Long: makeClasslessInspect('Long'),
+    Double: makeClasslessInspect('Double'),
+    BSONRegExp: makeClasslessInspect('BSONRegExp'),
     Binary: function () {
         const hexString = this.toString('hex');
         switch (this.sub_type) {
-            case index_1.bson.Binary.SUBTYPE_MD5:
+            case bson_export_1.bson.Binary.SUBTYPE_MD5:
                 return `MD5("${hexString}")`;
-            case index_1.bson.Binary.SUBTYPE_UUID:
+            case bson_export_1.bson.Binary.SUBTYPE_UUID:
                 if (hexString.length === 32) {
                     const asUUID = /^(.{8})(.{4})(.{4})(.{4})(.{12})$/
                         .exec(hexString)
@@ -56,14 +46,13 @@ exports.bsonStringifiers = {
                     return `UUID("${asUUID}")`;
                 }
             default:
-                return `Binary(Buffer.from("${hexString}", "hex"), ${this.sub_type})`;
+                return `Binary.createFromBase64("${this.toString('base64')}", ${this.sub_type})`;
         }
     },
 };
-exports.bsonStringifiers.ObjectID = exports.bsonStringifiers.ObjectId;
-function default_1(bson) {
+function makePrintableBson(bson) {
     if (!bson) {
-        bson = index_1.bson;
+        bson = bson_export_1.bson;
     }
     for (const [key, stringifier] of Object.entries(exports.bsonStringifiers)) {
         if (!(key in bson)) {
@@ -71,13 +60,9 @@ function default_1(bson) {
         }
         const cls = bson[key];
         for (const key of [inspectCustom, 'inspect']) {
-            try {
-                cls.prototype[key] = stringifier;
-            }
-            catch (_a) {
-            }
+            cls.prototype[key] = stringifier;
         }
     }
 }
-exports.default = default_1;
+exports.makePrintableBson = makePrintableBson;
 //# sourceMappingURL=printable-bson.js.map

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":"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"}

package/lib/service-provider.js

@@ -1,17 +1,14 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServiceProviderCore = void 0;
 const errors_1 = require("@mongosh/errors");
-const printable_bson_1 = __importDefault(require("./printable-bson"));
+const printable_bson_1 = require("./printable-bson");
 class ServiceProviderCore {
     constructor(bsonLibrary) {
         if (bsonLibrary === undefined) {
             throw new errors_1.MongoshInternalError('BSON Library is undefined.');
         }
-        (0, printable_bson_1.default)(bsonLibrary);
+        (0, printable_bson_1.makePrintableBson)(bsonLibrary);
         this.bsonLibrary = bsonLibrary;
     }
 }

package/lib/service-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"service-provider.js","sourceRoot":"","sources":["../src/service-provider.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAuD;AAGvD,sEAAiD;AAcjD,MAAa,mBAAmB;IAE9B,YAAY,WAAyB;QACnC,IAAI,WAAW,KAAK,SAAS,EAAE;YAC7B,MAAM,IAAI,6BAAoB,CAAC,4BAA4B,CAAC,CAAC;SAC9D;QACD,IAAA,wBAAiB,EAAC,WAAW,CAAC,CAAC;QAC/B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;CACF;AATD,kDASC"}
+{"version":3,"file":"service-provider.js","sourceRoot":"","sources":["../src/service-provider.ts"],"names":[],"mappings":";;;AAAA,4CAAuD;AAGvD,qDAAqD;AAcrD,MAAa,mBAAmB;IAE9B,YAAY,WAAyB;QACnC,IAAI,WAAW,KAAK,SAAS,EAAE;YAC7B,MAAM,IAAI,6BAAoB,CAAC,4BAA4B,CAAC,CAAC;SAC9D;QACD,IAAA,kCAAiB,EAAC,WAAW,CAAC,CAAC;QAC/B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;CACF;AATD,kDASC"}

package/lib/textencoder-polyfill.js.map

@@ -1 +1 @@
-{"version":3,"file":"textencoder-polyfill.js","sourceRoot":"","sources":["../src/textencoder-polyfill.ts"],"names":[],"mappings":";;;AAIA,IAGE,OAAO,WAAW,KAAK,UAAU;IAGjC,OAAO,WAAW,KAAK,UAAU,EACjC;IACA,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,EAAE,oBAAoB,EAAE,CAAC,CAAC;CAClE;AAGD,SAAS,oBAAoB;IAC3B,MAAM,WAAW;QACf,MAAM,CAAC,MAAc;YACnB,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACrC,CAAC;KACF;IACD,MAAM,WAAW;QACf,MAAM,CAAC,KAAiB;YACtB,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAChD,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC9C,CAAC;KACF;IACD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC;AACtC,CAAC;AAEQ,oDAAoB"}
+{"version":3,"file":"textencoder-polyfill.js","sourceRoot":"","sources":["../src/textencoder-polyfill.ts"],"names":[],"mappings":";;;AAIA,IAGE,OAAO,WAAW,KAAK,UAAU;IAGjC,OAAO,WAAW,KAAK,UAAU,EACjC;IAEA,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,EAAE,oBAAoB,EAAE,CAAC,CAAC;CAClE;AAGD,SAAS,oBAAoB;IAC3B,MAAM,WAAW;QACf,MAAM,CAAC,MAAc;YACnB,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACrC,CAAC;KACF;IACD,MAAM,WAAW;QACf,MAAM,CAAC,KAAiB;YACtB,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAChD,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC9C,CAAC;KACF;IACD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC;AACtC,CAAC;AAEQ,oDAAoB"}

package/lib/writable.d.ts

@@ -8,7 +8,7 @@ export default interface Writable {
     bulkWrite(database: string, collection: string, requests: AnyBulkWriteOperation[], options: BulkWriteOptions, dbOptions?: DbOptions): Promise<BulkWriteResult>;
     deleteMany(database: string, collection: string, filter: Document, options: DeleteOptions, dbOptions?: DbOptions): Promise<DeleteResult>;
     deleteOne(database: string, collection: string, filter: Document, options: DeleteOptions, dbOptions?: DbOptions): Promise<DeleteResult>;
-    findOneAndDelete(database: string, collection: string, filter: Document, options: FindOneAndDeleteOptions, dbOptions?: DbOptions): Promise<Document>;
+    findOneAndDelete(database: string, collection: string, filter: Document, options: FindOneAndDeleteOptions, dbOptions?: DbOptions): Promise<Document | null>;
     findOneAndReplace(database: string, collection: string, filter: Document, replacement: Document, options: FindOneAndReplaceOptions, dbOptions?: DbOptions): Promise<Document>;
     findOneAndUpdate(database: string, collection: string, filter: Document, update: Document | Document[], options: FindOneAndUpdateOptions, dbOptions?: DbOptions): Promise<Document>;
     insertMany(database: string, collection: string, docs: Document[], options: BulkWriteOptions, dbOptions?: DbOptions): Promise<InsertManyResult>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mongosh/service-provider-core",
-  "version": "1.10.5",
+  "version": "2.0.0",
   "description": "MongoDB Shell Core Service Provider Package",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -16,6 +16,8 @@
     "prepublish": "npm run compile",
     "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./src/**/*.spec.ts\"",
     "test-ci": "node ../../scripts/run-if-package-requested.js npm test",
+    "test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test",
+    "test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci",
     "eslint": "eslint",
     "lint": "npm run eslint . && npm run prettier -- --check .",
     "check": "npm run lint && npm run depcheck",
@@ -42,22 +44,22 @@
   },
   "dependencies": {
     "@aws-sdk/credential-providers": "^3.347.1",
-    "@mongosh/errors": "1.10.5",
-    "bson": "^5.3.0",
-    "mongodb": "^5.7.0",
+    "@mongosh/errors": "2.0.0",
+    "bson": "^6.0.0",
+    "mongodb": "^6.0.0",
     "mongodb-build-info": "^1.6.2",
-    "mongodb-client-encryption": "^2.8.0"
+    "mongodb-client-encryption": "^6.0.0"
   },
   "optionalDependencies": {
-    "mongodb-client-encryption": "^2.8.0"
+    "mongodb-client-encryption": "^6.0.0"
   },
   "devDependencies": {
-    "@mongodb-js/eslint-config-mongosh": "1.10.5",
+    "@mongodb-js/eslint-config-mongosh": "^1.0.0",
     "@mongodb-js/prettier-config-devtools": "^1.0.1",
-    "@mongodb-js/tsconfig-mongosh": "1.10.5",
+    "@mongodb-js/tsconfig-mongosh": "^1.0.0",
     "depcheck": "^1.4.3",
     "eslint": "^7.25.0",
     "prettier": "^2.8.8"
   },
-  "gitHead": "bb658a0758c886a751f0798df7ce805a3fe911c4"
+  "gitHead": "60053aa2f37dc6c3e4fe059e806565ec51ece9e8"
 }

package/src/admin.ts

@@ -20,8 +20,9 @@ import type {
   AzureEncryptionKeyOptions,
   ClientEncryption as MongoCryptClientEncryption,
   ClientEncryptionDataKeyProvider,
-  FLE,
   GCPEncryptionKeyOptions,
+  ClientEncryption,
+  ClientEncryptionOptions,
 } from './all-fle-types';
 
 export interface CreateEncryptedCollectionOptions {
@@ -139,7 +140,7 @@ export default interface Admin {
   /**
    * The FLE implementation for access to the client-side encryption API.
    */
-  fle?: FLE | undefined;
+  createClientEncryption?(options: ClientEncryptionOptions): ClientEncryption;
 
   /**
    * The FLE options passed to the client, if any.

package/src/all-fle-types.ts

@@ -3,15 +3,10 @@ export type {
   AzureEncryptionKeyOptions,
   GCPEncryptionKeyOptions,
   ClientEncryption,
-  ClientEncryptionCreateDataKeyCallback,
   ClientEncryptionCreateDataKeyProviderOptions,
   ClientEncryptionDataKeyProvider,
-  ClientEncryptionDecryptCallback,
-  ClientEncryptionEncryptCallback,
   ClientEncryptionEncryptOptions,
   ClientEncryptionOptions,
   ClientEncryptionTlsOptions,
   KMSProviders,
-} from 'mongodb-client-encryption';
-
-export type FLE = typeof import('mongodb-client-encryption');
+} from 'mongodb';

package/src/all-transport-types.ts

@@ -10,7 +10,6 @@ export type {
   ClientSession,
   CloseOptions,
   CollationOptions,
-  CollStatsOptions,
   Collection,
   CommandOperationOptions,
   CountDocumentsOptions,

package/src/bson-export.ts

@@ -0,0 +1,35 @@
+import {
+  ObjectId,
+  DBRef,
+  MaxKey,
+  MinKey,
+  Timestamp,
+  BSONSymbol,
+  Code,
+  Decimal128,
+  Int32,
+  Long,
+  Binary,
+  calculateObjectSize,
+  Double,
+  EJSON,
+  BSONRegExp,
+} from 'bson';
+
+export const bson = {
+  ObjectId,
+  DBRef,
+  MaxKey,
+  MinKey,
+  Timestamp,
+  BSONSymbol,
+  Code,
+  Decimal128,
+  Int32,
+  Long,
+  Binary,
+  calculateObjectSize,
+  Double,
+  EJSON,
+  BSONRegExp,
+};

package/src/connect-info.spec.ts

@@ -71,6 +71,7 @@ describe('getConnectInfo', function () {
       is_enterprise: true,
       auth_type: 'LDAP',
       is_data_federation: false,
+      is_stream: false,
       dl_version: null,
       atlas_version: '20210330.0.0.1617063608',
       is_genuine: true,
@@ -79,6 +80,7 @@ describe('getConnectInfo', function () {
       node_version: process.version,
       server_os: 'osx',
       uri: ATLAS_URI,
+      is_local_atlas: false,
     };
     expect(
       getConnectInfo(
@@ -86,7 +88,8 @@ describe('getConnectInfo', function () {
         '0.0.6',
         BUILD_INFO,
         ATLAS_VERSION,
-        TOPOLOGY_WITH_CREDENTIALS
+        TOPOLOGY_WITH_CREDENTIALS,
+        false
       )
     ).to.deep.equal(output);
   });
@@ -101,6 +104,7 @@ describe('getConnectInfo', function () {
       is_enterprise: true,
       auth_type: null,
       is_data_federation: false,
+      is_stream: false,
       dl_version: null,
       atlas_version: '20210330.0.0.1617063608',
       is_genuine: true,
@@ -109,6 +113,7 @@ describe('getConnectInfo', function () {
       node_version: process.version,
       server_os: 'osx',
       uri: ATLAS_URI,
+      is_local_atlas: false,
     };
     expect(
       getConnectInfo(
@@ -116,7 +121,43 @@ describe('getConnectInfo', function () {
         '0.0.6',
         BUILD_INFO,
         ATLAS_VERSION,
-        TOPOLOGY_NO_CREDENTIALS
+        TOPOLOGY_NO_CREDENTIALS,
+        false
+      )
+    ).to.deep.equal(output);
+  });
+
+  it('reports correct information when a stream uri is passed', function () {
+    const streamUri =
+      'mongodb://atlas-stream-67b8e1cd6d60357be377be7b-1dekw.virginia-usa.a.query.mongodb-dev.net/';
+    const output = {
+      is_atlas: true,
+      is_localhost: false,
+      is_do: false,
+      server_version: '3.2.0-rc2',
+      mongosh_version: '0.0.6',
+      is_enterprise: true,
+      auth_type: 'LDAP',
+      is_data_federation: false,
+      is_stream: true,
+      dl_version: null,
+      atlas_version: null,
+      is_genuine: true,
+      is_local_atlas: false,
+      non_genuine_server_name: 'mongodb',
+      server_arch: 'x86_64',
+      node_version: process.version,
+      server_os: 'osx',
+      uri: streamUri,
+    };
+    expect(
+      getConnectInfo(
+        streamUri,
+        '0.0.6',
+        BUILD_INFO,
+        null,
+        TOPOLOGY_WITH_CREDENTIALS,
+        false
       )
     ).to.deep.equal(output);
   });
@@ -131,6 +172,7 @@ describe('getConnectInfo', function () {
       is_enterprise: true,
       auth_type: 'LDAP',
       is_data_federation: false,
+      is_stream: false,
       dl_version: null,
       atlas_version: null,
       is_genuine: true,
@@ -139,9 +181,17 @@ describe('getConnectInfo', function () {
       node_version: process.version,
       server_os: 'osx',
       uri: '',
+      is_local_atlas: true,
     };
     expect(
-      getConnectInfo('', '0.0.6', BUILD_INFO, null, TOPOLOGY_WITH_CREDENTIALS)
+      getConnectInfo(
+        '',
+        '0.0.6',
+        BUILD_INFO,
+        null,
+        TOPOLOGY_WITH_CREDENTIALS,
+        true
+      )
     ).to.deep.equal(output);
   });
 
@@ -155,6 +205,7 @@ describe('getConnectInfo', function () {
       is_enterprise: false,
       auth_type: 'LDAP',
       is_data_federation: false,
+      is_stream: false,
       dl_version: null,
       atlas_version: null,
       is_genuine: true,
@@ -163,9 +214,10 @@ describe('getConnectInfo', function () {
       node_version: process.version,
       server_os: null,
       uri: '',
+      is_local_atlas: false,
     };
     expect(
-      getConnectInfo('', '0.0.6', null, null, TOPOLOGY_WITH_CREDENTIALS)
+      getConnectInfo('', '0.0.6', null, null, TOPOLOGY_WITH_CREDENTIALS, false)
     ).to.deep.equal(output);
   });
 });

package/src/connect-info.ts

@@ -13,12 +13,14 @@ export interface ConnectInfo {
   is_enterprise: boolean;
   auth_type?: string;
   is_data_federation: boolean;
+  is_stream: boolean;
   dl_version?: string;
   atlas_version?: string;
   is_genuine: boolean;
   non_genuine_server_name: string;
   node_version: string;
   uri: string;
+  is_local_atlas: boolean;
 }
 
 export default function getConnectInfo(
@@ -26,7 +28,8 @@ export default function getConnectInfo(
   mongoshVersion: string,
   buildInfo: any,
   atlasVersion: any,
-  topology: any
+  topology: any,
+  isLocalAtlas: boolean
 ): ConnectInfo {
   buildInfo ??= {}; // We're currently not getting buildInfo with --apiStrict.
   const { isGenuine: is_genuine, serverName: non_genuine_server_name } =
@@ -54,9 +57,11 @@ export default function getConnectInfo(
     is_enterprise: getBuildInfo.isEnterprise(buildInfo),
     auth_type,
     is_data_federation,
+    is_stream: getBuildInfo.isAtlasStream(uri),
     dl_version,
     atlas_version: atlasVersion?.atlasVersion ?? null,
     is_genuine,
     non_genuine_server_name,
+    is_local_atlas: isLocalAtlas,
   };
 }

package/src/index.ts

@@ -3,23 +3,6 @@ import ServiceProvider, { ServiceProviderCore } from './service-provider';
 import getConnectInfo, { ConnectInfo } from './connect-info';
 import type { ReplPlatform } from './platform';
 const DEFAULT_DB = 'test';
-import {
-  ObjectId,
-  DBRef,
-  MaxKey,
-  MinKey,
-  Timestamp,
-  BSONSymbol,
-  Code,
-  Decimal128,
-  Int32,
-  Long,
-  Binary,
-  calculateObjectSize,
-  Double,
-  EJSON,
-  BSONRegExp,
-} from 'bson';
 import { bsonStringifiers } from './printable-bson';
 import ShellAuthOptions from './shell-auth-options';
 export * from './all-transport-types';
@@ -32,23 +15,7 @@ export {
   CheckMetadataConsistencyOptions,
 } from './admin';
 
-const bson = {
-  ObjectId,
-  DBRef,
-  MaxKey,
-  MinKey,
-  Timestamp,
-  BSONSymbol,
-  Code,
-  Decimal128,
-  Int32,
-  Long,
-  Binary,
-  calculateObjectSize,
-  Double,
-  EJSON,
-  BSONRegExp,
-};
+export { bson } from './bson-export';
 
 export {
   ServiceProvider,
@@ -57,7 +24,6 @@ export {
   ReplPlatform,
   DEFAULT_DB,
   ServiceProviderCore,
-  bson,
   bsonStringifiers,
   ConnectInfo,
 };

package/src/printable-bson.spec.ts

@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import { bson } from './index';
 import { inspect } from 'util';
-import makePrintableBson from './printable-bson';
+import { makePrintableBson } from './printable-bson';
 
 describe('BSON printers', function () {
   before('make BSON objects printable', function () {
@@ -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\')'
     );
   });
 
@@ -67,12 +67,6 @@ describe('BSON printers', function () {
     expect(inspect(new bson.Code('abc'))).to.equal('Code("abc")');
   });
 
-  it('formats BinData correctly', function () {
-    expect(inspect(new bson.Binary('abc'))).to.equal(
-      'Binary(Buffer.from("616263", "hex"), 0)'
-    );
-  });
-
   it('formats BSONRegExp correctly', function () {
     expect(inspect(new bson.BSONRegExp('(?-i)AA_', 'im'))).to.equal(
       'BSONRegExp("(?-i)AA_", "im")'
@@ -100,4 +94,10 @@ describe('BSON printers', function () {
       )
     ).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)');
+  });
 });

package/src/printable-bson.ts

@@ -1,15 +1,35 @@
-import { bson as BSON } from './index';
+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,
+  'EJSON' | 'calculateObjectSize'
+>]['prototype']['_bsontype'];
+
+// Turn e.g. 'new Double(...)' into 'Double(...)' but preserve possible leading whitespace
+function removeNewFromInspectResult(str: string): string {
+  return String(str).replace(/^(\s*)(new )/, '$1');
+}
+
+// Create a Node.js-util-inspect() style custom inspect function that
+// strips 'new ' from inspect results but otherwise uses the Node.js
+// driver's bson library's inspect functions.
+function makeClasslessInspect<K extends BSONClassKey>(className: K) {
+  const originalInspect = BSON[className].prototype.inspect;
+  return function (
+    this: (typeof BSON)[typeof className]['prototype'],
+    ...args: any
+  ) {
+    return removeNewFromInspectResult(originalInspect.apply(this, args as any));
+  };
+}
 
 export const bsonStringifiers: Record<
-  string,
+  BSONClassKey | 'ObjectID',
   (this: any, depth: any, options: any) => string
 > = {
-  ObjectId: function (this: typeof BSON.ObjectId.prototype): string {
-    return `ObjectId("${this.toHexString()}")`;
-  },
-
+  ObjectId: makeClasslessInspect('ObjectId'),
+  ObjectID: makeClasslessInspect('ObjectId'),
   DBRef: function (
     this: typeof BSON.DBRef.prototype,
     depth: any,
@@ -17,51 +37,21 @@ export const bsonStringifiers: Record<
   ): string {
     return (
       `DBRef("${this.collection}", ` +
-      inspect(this.oid, options) +
-      (this.db ? `, "${this.db}"` : '') +
+      inspect(this.oid, options) + // The driver's inspect() does not account for non-ObjectID oid values
+      (this.db ? `, ${inspect(this.db, options)}` : '') +
       ')'
     );
   },
-
-  MaxKey: function (this: typeof BSON.MaxKey.prototype): string {
-    return 'MaxKey()';
-  },
-
-  MinKey: function (this: typeof BSON.MinKey.prototype): string {
-    return 'MinKey()';
-  },
-
-  Timestamp: function (this: typeof BSON.Timestamp.prototype): string {
-    return `Timestamp({ t: ${this.getHighBits()}, i: ${this.getLowBits()} })`;
-  },
-
-  BSONSymbol: function (this: typeof BSON.BSONSymbol.prototype): string {
-    return `BSONSymbol("${this.valueOf()}")`;
-  },
-
-  Code: function (this: typeof BSON.Code.prototype): string {
-    const j = this.toJSON();
-    return `Code("${j.code}"${j.scope ? `, ${JSON.stringify(j.scope)}` : ''})`;
-  },
-
-  Decimal128: function (this: typeof BSON.Decimal128.prototype): string {
-    return `Decimal128("${this.toString()}")`;
-  },
-
-  Int32: function (this: typeof BSON.Int32.prototype): string {
-    return `Int32(${this.valueOf()})`;
-  },
-
-  Long: function (this: typeof BSON.Long.prototype): string {
-    return `Long("${this.toString()}"${this.unsigned ? ', true' : ''})`;
-  },
-
-  BSONRegExp: function (this: typeof BSON.BSONRegExp.prototype): string {
-    return `BSONRegExp(${JSON.stringify(this.pattern)}, ${JSON.stringify(
-      this.options
-    )})`;
-  },
-
+  MaxKey: makeClasslessInspect('MaxKey'),
+  MinKey: makeClasslessInspect('MinKey'),
+  Timestamp: makeClasslessInspect('Timestamp'),
+  BSONSymbol: makeClasslessInspect('BSONSymbol'),
+  Code: makeClasslessInspect('Code'),
+  Decimal128: makeClasslessInspect('Decimal128'),
+  Int32: makeClasslessInspect('Int32'),
+  Long: makeClasslessInspect('Long'),
+  Double: makeClasslessInspect('Double'),
+  BSONRegExp: makeClasslessInspect('BSONRegExp'),
   Binary: function (this: typeof BSON.Binary.prototype): string {
     const hexString = this.toString('hex');
     switch (this.sub_type) {
@@ -80,18 +70,19 @@ export const bsonStringifiers: Record<
       // In case somebody did something weird and used an UUID with a
       // non-standard length, fall through.
       default:
-        return `Binary(Buffer.from("${hexString}", "hex"), ${this.sub_type})`;
+        return `Binary.createFromBase64("${this.toString('base64')}", ${
+          this.sub_type
+        })`;
     }
   },
 };
-bsonStringifiers.ObjectID = bsonStringifiers.ObjectId;
 
 /**
  * This method modifies the BSON class passed in as argument. This is required so that
  * we can have the driver return our BSON classes without having to write our own serializer.
  * @param {Object} bson
  */
-export default function (bson?: typeof BSON): void {
+export function makePrintableBson(bson?: typeof BSON): void {
   if (!bson) {
     bson = BSON;
   }
@@ -102,14 +93,7 @@ export default function (bson?: typeof BSON): void {
     }
     const cls = bson[key as keyof typeof BSON];
     for (const key of [inspectCustom, 'inspect']) {
-      try {
-        (cls as any).prototype[key] = stringifier;
-      } catch {
-        // This may fail because bson.ObjectId.prototype[toString] can exist as a
-        // read-only property. https://github.com/mongodb/js-bson/pull/412 takes
-        // care of this. In the CLI repl and Compass this still works fine, because
-        // those are on bson@1.x.
-      }
+      (cls as any).prototype[key] = stringifier;
     }
   }
 }

package/src/service-provider.ts

@@ -1,7 +1,7 @@
 import { MongoshInternalError } from '@mongosh/errors';
 import type Admin from './admin';
 import type Closable from './closable';
-import makePrintableBson from './printable-bson';
+import { makePrintableBson } from './printable-bson';
 import type Readable from './readable';
 import type Writable from './writable';
 import type { bson as BSON } from './index';

package/src/textencoder-polyfill.ts

@@ -10,6 +10,7 @@ if (
   // @ts-ignore
   typeof TextEncoder !== 'function'
 ) {
+  // eslint-disable-next-line @typescript-eslint/no-implied-eval
   Object.assign(Function('return this')(), textEncodingPolyfill());
 }
 

package/src/writable.ts

@@ -161,7 +161,7 @@ export default interface Writable {
     filter: Document,
     options: FindOneAndDeleteOptions,
     dbOptions?: DbOptions
-  ): Promise<Document>;
+  ): Promise<Document | null>;
 
   /**
    * Find one document and replace it.