@mongosh/service-provider-core 2.2.4 → 2.2.5

package/lib/admin.d.ts

@@ -1,6 +1,6 @@
 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 { bson as BSON, ConnectionExtraInfo } from './index';
 import type { ReplPlatform } from './platform';
 import type { AWSEncryptionKeyOptions, AzureEncryptionKeyOptions, ClientEncryption as MongoCryptClientEncryption, ClientEncryptionDataKeyProvider, GCPEncryptionKeyOptions, ClientEncryption, ClientEncryptionOptions } from './all-fle-types';
 export interface CreateEncryptedCollectionOptions {
@@ -16,6 +16,13 @@ export interface CheckMetadataConsistencyOptions {
     };
     checkIndexes?: 1;
 }
+export interface ConnectionInfo {
+    buildInfo: Document | null;
+    topology: any | null;
+    extraInfo: (ConnectionExtraInfo & {
+        fcv?: string;
+    }) | null;
+}
 export default interface Admin {
     platform: ReplPlatform;
     initialDb: string;
@@ -23,7 +30,7 @@ export default interface Admin {
     listDatabases(database: string, options?: ListDatabasesOptions): Promise<Document>;
     getNewConnection(uri: string, options: MongoClientOptions): Promise<any>;
     getURI(): string | undefined;
-    getConnectionInfo(): Promise<Document>;
+    getConnectionInfo(): Promise<ConnectionInfo>;
     authenticate(authDoc: ShellAuthOptions): Promise<{
         ok: number;
     }>;

package/lib/connect-info.d.ts

@@ -1,21 +1,21 @@
-export interface ConnectInfo {
-    is_atlas: boolean;
-    is_localhost: boolean;
-    is_do: boolean;
-    server_version: string;
-    mongosh_version: string;
+export interface ConnectionExtraInfo {
+    is_atlas?: boolean;
+    is_localhost?: boolean;
+    is_do?: boolean;
+    server_version?: string;
+    mongosh_version?: string;
     server_os?: string;
     server_arch?: string;
-    is_enterprise: boolean;
+    is_enterprise?: boolean;
     auth_type?: string;
-    is_data_federation: boolean;
-    is_stream: boolean;
+    is_data_federation?: boolean;
+    is_stream?: boolean;
     dl_version?: string;
     atlas_version?: string;
-    is_genuine: boolean;
-    non_genuine_server_name: string;
-    node_version: string;
+    is_genuine?: boolean;
+    non_genuine_server_name?: string;
+    node_version?: string;
     uri: string;
-    is_local_atlas: boolean;
+    is_local_atlas?: boolean;
 }
-export default function getConnectInfo(uri: string, mongoshVersion: string, buildInfo: any, atlasVersion: any, topology: any, isLocalAtlas: boolean): ConnectInfo;
+export default function getConnectExtraInfo(uri: string, mongoshVersion: string, buildInfo: any, atlasVersion: any, topology: any, isLocalAtlas: boolean): ConnectionExtraInfo;

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, isLocalAtlas) {
+function getConnectExtraInfo(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);
@@ -34,5 +34,5 @@ function getConnectInfo(uri, mongoshVersion, buildInfo, atlasVersion, topology,
         is_local_atlas: isLocalAtlas,
     };
 }
-exports.default = getConnectInfo;
+exports.default = getConnectExtraInfo;
 //# sourceMappingURL=connect-info.js.map

package/lib/connect-info.js.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"connect-info.js","sourceRoot":"","sources":["../src/connect-info.ts"],"names":[],"mappings":";;;;;AAEA,4EAA8C;AAuB9C,SAAwB,mBAAmB,CACzC,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,sCAyCC"}

package/lib/index.d.ts

@@ -1,6 +1,6 @@
 import './textencoder-polyfill';
 import ServiceProvider, { ServiceProviderCore } from './service-provider';
-import getConnectInfo, { ConnectInfo } from './connect-info';
+import getConnectExtraInfo, { ConnectionExtraInfo } from './connect-info';
 import type { ReplPlatform } from './platform';
 declare const DEFAULT_DB = "test";
 import { bsonStringifiers } from './printable-bson';
@@ -8,6 +8,6 @@ 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';
+export { CreateEncryptedCollectionOptions, CheckMetadataConsistencyOptions, ConnectionInfo, } from './admin';
 export { bson } from './bson-export';
-export { ServiceProvider, ShellAuthOptions, getConnectInfo, ReplPlatform, DEFAULT_DB, ServiceProviderCore, bsonStringifiers, ConnectInfo, };
+export { ServiceProvider, ShellAuthOptions, getConnectExtraInfo, ReplPlatform, DEFAULT_DB, ServiceProviderCore, bsonStringifiers, ConnectionExtraInfo, };

package/lib/index.js

@@ -17,12 +17,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bsonStringifiers = exports.ServiceProviderCore = exports.DEFAULT_DB = exports.getConnectInfo = exports.bson = void 0;
+exports.bsonStringifiers = exports.ServiceProviderCore = exports.DEFAULT_DB = exports.getConnectExtraInfo = 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; } });
 const connect_info_1 = __importDefault(require("./connect-info"));
-exports.getConnectInfo = connect_info_1.default;
+exports.getConnectExtraInfo = connect_info_1.default;
 const DEFAULT_DB = 'test';
 exports.DEFAULT_DB = DEFAULT_DB;
 const printable_bson_1 = require("./printable-bson");

package/lib/index.js.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,kCAAgC;AAChC,yDAA0E;AAyBxE,oGAzBwB,sCAAmB,OAyBxB;AAxBrB,kEAA0E;AAqBxE,8BArBK,sBAAmB,CAqBL;AAnBrB,MAAM,UAAU,GAAG,MAAM,CAAC;AAqBxB,gCAAU;AApBZ,qDAAoD;AAsBlD,iGAtBO,iCAAgB,OAsBP;AApBlB,wDAAsC;AACtC,kDAAgC;AAUhC,6CAAqC;AAA5B,mGAAA,IAAI,OAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mongosh/service-provider-core",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "description": "MongoDB Shell Core Service Provider Package",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@aws-sdk/credential-providers": "^3.525.0",
-    "@mongosh/errors": "2.2.4",
+    "@mongosh/errors": "2.2.5",
     "bson": "^6.5.0",
     "mongodb": "^6.5.0",
     "mongodb-build-info": "^1.7.1",
@@ -54,12 +54,12 @@
     "mongodb-client-encryption": "^6.0.0"
   },
   "devDependencies": {
-    "@mongodb-js/eslint-config-mongosh": "2.2.4",
+    "@mongodb-js/eslint-config-mongosh": "2.2.5",
     "@mongodb-js/prettier-config-devtools": "^1.0.1",
-    "@mongodb-js/tsconfig-mongosh": "2.2.4",
+    "@mongodb-js/tsconfig-mongosh": "2.2.5",
     "depcheck": "^1.4.3",
     "eslint": "^7.25.0",
     "prettier": "^2.8.8"
   },
-  "gitHead": "136eb9156b1ffd54cc4f3e5eebf647f0a6f9aee2"
+  "gitHead": "3a95f1de5ce644bf6e5453c73b6ccd05a35dcfa5"
 }

package/src/admin.ts

@@ -13,7 +13,7 @@ import type {
   AutoEncryptionOptions,
   Collection,
 } from './all-transport-types';
-import type { bson as BSON } from './index';
+import type { bson as BSON, ConnectionExtraInfo } from './index';
 import type { ReplPlatform } from './platform';
 import type {
   AWSEncryptionKeyOptions,
@@ -43,6 +43,12 @@ export interface CheckMetadataConsistencyOptions {
   checkIndexes?: 1;
 }
 
+export interface ConnectionInfo {
+  buildInfo: Document | null;
+  topology: any | null;
+  extraInfo: (ConnectionExtraInfo & { fcv?: string }) | null;
+}
+
 export default interface Admin {
   /**
    * What platform (Compass/CLI/Browser)
@@ -87,7 +93,7 @@ export default interface Admin {
   /**
    * Return connection info
    */
-  getConnectionInfo(): Promise<Document>;
+  getConnectionInfo(): Promise<ConnectionInfo>;
 
   /**
    * Authenticate

package/src/connect-info.ts

@@ -2,35 +2,35 @@
 
 import getBuildInfo from 'mongodb-build-info';
 
-export interface ConnectInfo {
-  is_atlas: boolean;
-  is_localhost: boolean;
-  is_do: boolean;
-  server_version: string;
-  mongosh_version: string;
+export interface ConnectionExtraInfo {
+  is_atlas?: boolean;
+  is_localhost?: boolean;
+  is_do?: boolean;
+  server_version?: string;
+  mongosh_version?: string;
   server_os?: string;
   server_arch?: string;
-  is_enterprise: boolean;
+  is_enterprise?: boolean;
   auth_type?: string;
-  is_data_federation: boolean;
-  is_stream: boolean;
+  is_data_federation?: boolean;
+  is_stream?: boolean;
   dl_version?: string;
   atlas_version?: string;
-  is_genuine: boolean;
-  non_genuine_server_name: string;
-  node_version: string;
+  is_genuine?: boolean;
+  non_genuine_server_name?: string;
+  node_version?: string;
   uri: string;
-  is_local_atlas: boolean;
+  is_local_atlas?: boolean;
 }
 
-export default function getConnectInfo(
+export default function getConnectExtraInfo(
   uri: string,
   mongoshVersion: string,
   buildInfo: any,
   atlasVersion: any,
   topology: any,
   isLocalAtlas: boolean
-): ConnectInfo {
+): ConnectionExtraInfo {
   buildInfo ??= {}; // We're currently not getting buildInfo with --apiStrict.
   const { isGenuine: is_genuine, serverName: non_genuine_server_name } =
     getBuildInfo.getGenuineMongoDB(uri);

package/src/index.ts

@@ -1,6 +1,6 @@
 import './textencoder-polyfill'; // for mongodb-connection-string-url in the java-shell
 import ServiceProvider, { ServiceProviderCore } from './service-provider';
-import getConnectInfo, { ConnectInfo } from './connect-info';
+import getConnectExtraInfo, { ConnectionExtraInfo } from './connect-info';
 import type { ReplPlatform } from './platform';
 const DEFAULT_DB = 'test';
 import { bsonStringifiers } from './printable-bson';
@@ -13,6 +13,7 @@ export { MapReduceOptions, FinalizeFunction } from './map-reduce-options';
 export {
   CreateEncryptedCollectionOptions,
   CheckMetadataConsistencyOptions,
+  ConnectionInfo,
 } from './admin';
 
 export { bson } from './bson-export';
@@ -20,10 +21,10 @@ export { bson } from './bson-export';
 export {
   ServiceProvider,
   ShellAuthOptions,
-  getConnectInfo,
+  getConnectExtraInfo,
   ReplPlatform,
   DEFAULT_DB,
   ServiceProviderCore,
   bsonStringifiers,
-  ConnectInfo,
+  ConnectionExtraInfo,
 };