@mongosh/service-provider-core 1.3.1 → 1.5.0

package/AUTHORS

@@ -9,3 +9,4 @@ Sergey Petushkov <petushkov.sergey@gmail.com>
 Michael Rose <michael_rose@gmx.de>
 github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 Alena Khineika <alena.khineika@gmail.com>
+Leonardo Rossi <leonardo.rossi@gmail.com>

package/lib/index.d.ts

@@ -2,8 +2,6 @@ import './textencoder-polyfill';
 import ServiceProvider, { ServiceProviderCore } from './service-provider';
 import getConnectInfo, { ConnectInfo } from './connect-info';
 import { ReplPlatform } from './platform';
-import CliOptions from './cli-options';
-import generateUri from './uri-generator';
 declare 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';
@@ -28,4 +26,4 @@ declare const bson: {
     EJSON: typeof EJSON;
     BSONRegExp: typeof BSONRegExp;
 };
-export { ServiceProvider, ShellAuthOptions, getConnectInfo, ReplPlatform, CliOptions, generateUri, DEFAULT_DB, ServiceProviderCore, bson, bsonStringifiers, ConnectInfo };
+export { ServiceProvider, ShellAuthOptions, getConnectInfo, ReplPlatform, DEFAULT_DB, ServiceProviderCore, bson, 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.generateUri = exports.ReplPlatform = exports.getConnectInfo = void 0;
+exports.bsonStringifiers = exports.bson = exports.ServiceProviderCore = exports.DEFAULT_DB = exports.ReplPlatform = exports.getConnectInfo = 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,8 +25,6 @@ const connect_info_1 = __importDefault(require("./connect-info"));
 exports.getConnectInfo = connect_info_1.default;
 const platform_1 = require("./platform");
 Object.defineProperty(exports, "ReplPlatform", { enumerable: true, get: function () { return platform_1.ReplPlatform; } });
-const uri_generator_1 = __importDefault(require("./uri-generator"));
-exports.generateUri = uri_generator_1.default;
 const DEFAULT_DB = 'test';
 exports.DEFAULT_DB = DEFAULT_DB;
 const bson_1 = require("bson");

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,kCAAgC;AAChC,yDAA0E;AAwDxE,oGAxDwB,sCAAmB,OAwDxB;AAvDrB,kEAA6D;AAkD3D,yBAlDK,sBAAc,CAkDL;AAjDhB,yCAA0C;AAkDxC,6FAlDO,uBAAY,OAkDP;AAhDd,oEAA0C;AAkDxC,sBAlDK,uBAAW,CAkDL;AAjDb,MAAM,UAAU,GAAG,MAAM,CAAC;AAkDxB,gCAAU;AAjDZ,+BAiBc;AACd,qDAAoD;AAkClD,iGAlCO,iCAAgB,OAkCP;AAhClB,wDAAsC;AACtC,kDAAgC;AAEhC,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,GAAG,EAAH,UAAG;IACH,mBAAmB,EAAnB,0BAAmB;IACnB,MAAM,EAAN,aAAM;IACN,KAAK,EAAL,YAAK;IACL,UAAU,EAAV,iBAAU;CACX,CAAC;AAWA,oBAAI"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,kCAAgC;AAChC,yDAA0E;AAoDxE,oGApDwB,sCAAmB,OAoDxB;AAnDrB,kEAA6D;AAgD3D,yBAhDK,sBAAc,CAgDL;AA/ChB,yCAA0C;AAgDxC,6FAhDO,uBAAY,OAgDP;AA/Cd,MAAM,UAAU,GAAG,MAAM,CAAC;AAgDxB,gCAAU;AA/CZ,+BAiBc;AACd,qDAAoD;AAgClD,iGAhCO,iCAAgB,OAgCP;AA9BlB,wDAAsC;AACtC,kDAAgC;AAEhC,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,GAAG,EAAH,UAAG;IACH,mBAAmB,EAAnB,0BAAmB;IACnB,MAAM,EAAN,aAAM;IACN,KAAK,EAAL,YAAK;IACL,UAAU,EAAV,iBAAU;CACX,CAAC;AASA,oBAAI"}

package/lib/readable.d.ts

@@ -1,4 +1,4 @@
-import type { Document, AggregateOptions, CountOptions, CountDocumentsOptions, DistinctOptions, EstimatedDocumentCountOptions, FindOptions, ListCollectionsOptions, CollStatsOptions, ListIndexesOptions, AggregationCursor, FindCursor, DbOptions, ReadPreferenceFromOptions, ReadPreferenceLike } from './all-transport-types';
+import type { Document, AggregateOptions, CountOptions, CountDocumentsOptions, DistinctOptions, EstimatedDocumentCountOptions, FindOptions, ListCollectionsOptions, ListIndexesOptions, AggregationCursor, FindCursor, DbOptions, ReadPreferenceFromOptions, ReadPreferenceLike } from './all-transport-types';
 import { ChangeStream, ChangeStreamOptions } from './all-transport-types';
 export default interface Readable {
     aggregate(database: string, collection: string, pipeline: Document[], options?: AggregateOptions, dbOptions?: DbOptions): AggregationCursor;
@@ -9,10 +9,8 @@ export default interface Readable {
     estimatedDocumentCount(database: string, collection: string, options?: EstimatedDocumentCountOptions, dbOptions?: DbOptions): Promise<number>;
     find(database: string, collection: string, filter?: Document, options?: FindOptions, dbOptions?: DbOptions): FindCursor;
     getTopology(): any;
-    isCapped(database: string, collection: string, dbOptions?: DbOptions): Promise<boolean>;
     getIndexes(database: string, collection: string, options: ListIndexesOptions, dbOptions?: DbOptions): Promise<Document[]>;
     listCollections(database: string, filter?: Document, options?: ListCollectionsOptions, dbOptions?: DbOptions): Promise<Document[]>;
     readPreferenceFromOptions(options?: Omit<ReadPreferenceFromOptions, 'session'>): ReadPreferenceLike | undefined;
-    stats(database: string, collection: string, options?: CollStatsOptions, dbOptions?: DbOptions): Promise<Document>;
     watch(pipeline: Document[], options: ChangeStreamOptions, dbOptions?: DbOptions, db?: string, coll?: string): ChangeStream<Document>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mongosh/service-provider-core",
-  "version": "1.3.1",
+  "version": "1.5.0",
   "description": "MongoDB Shell Core Service Provider Package",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -24,21 +24,27 @@
     "access": "public"
   },
   "engines": {
-    "node": ">=12.4.0"
+    "node": ">=14.15.1"
   },
   "mongosh": {
-    "unitTestsOnly": true
+    "unitTestsOnly": true,
+    "ciRequiredOptionalDependencies": {
+      "mongodb-client-encryption": [
+        "darwin",
+        "linux",
+        "win32"
+      ]
+    }
   },
   "dependencies": {
-    "@mongosh/errors": "1.3.1",
-    "@mongosh/i18n": "1.3.1",
-    "bson": "^4.6.1",
-    "mongodb": "^4.4.0",
+    "@mongosh/errors": "1.5.0",
+    "bson": "^4.6.2",
+    "mongodb": "^4.6.0",
     "mongodb-build-info": "^1.2.0",
-    "mongodb-connection-string-url": "^2.3.2"
+    "mongodb-client-encryption": "^2.2.0-alpha.1"
   },
   "optionalDependencies": {
-    "mongodb-client-encryption": "^2.0.0"
+    "mongodb-client-encryption": "^2.2.0-alpha.1"
   },
   "dependency-check": {
     "entries": [
@@ -51,5 +57,5 @@
       "encoding"
     ]
   },
-  "gitHead": "29a1453899120580f7ee669ec5952810b86d11b7"
+  "gitHead": "78a16fa4cbd0c5d98ca8131aa2896be5845aa919"
 }

package/src/index.ts

@@ -2,8 +2,6 @@ import './textencoder-polyfill'; // for mongodb-connection-string-url in the jav
 import ServiceProvider, { ServiceProviderCore } from './service-provider';
 import getConnectInfo, { ConnectInfo } from './connect-info';
 import { ReplPlatform } from './platform';
-import CliOptions from './cli-options';
-import generateUri from './uri-generator';
 const DEFAULT_DB = 'test';
 import {
   ObjectId,
@@ -52,8 +50,6 @@ export {
   ShellAuthOptions,
   getConnectInfo,
   ReplPlatform,
-  CliOptions,
-  generateUri,
   DEFAULT_DB,
   ServiceProviderCore,
   bson,

package/src/readable.ts

@@ -7,7 +7,6 @@ import type {
   EstimatedDocumentCountOptions,
   FindOptions,
   ListCollectionsOptions,
-  CollStatsOptions,
   ListIndexesOptions,
   AggregationCursor,
   FindCursor,
@@ -154,20 +153,6 @@ export default interface Readable {
    */
   getTopology(): any;
 
-  /**
-   * Is the collection capped?
-   *
-   * @param {String} database - The database name.
-   * @param {String} collection - The collection name.
-   * @param {DbOptions} dbOptions - The database options
-   *
-   * @returns {Promise} The promise of the result.
-   */
-  isCapped(
-    database: string,
-    collection: string,
-    dbOptions?: DbOptions): Promise<boolean>;
-
   /**
    * Returns an array that holds a list of documents that identify and
    * describe the existing indexes on the collection.
@@ -206,23 +191,6 @@ export default interface Readable {
    */
   readPreferenceFromOptions(options?: Omit<ReadPreferenceFromOptions, 'session'>): ReadPreferenceLike | undefined;
 
-  /**
-   * Get all the collection statistics.
-   *
-   * @param {String} database - The db name.
-   * @param {String} collection - The collection name.
-   * @param {Object} options - The count options.
-   * @param {DbOptions} dbOptions - The database options
-   *
-   * @return {Promise} returns Promise
-   */
-  stats(
-    database: string,
-    collection: string,
-    options?: CollStatsOptions,
-    dbOptions?: DbOptions
-  ): Promise<Document>;
-
   /**
    * Start a change stream cursor on either the client, db, or collection.
    * @param pipeline

package/lib/cli-options.d.ts

@@ -1,43 +0,0 @@
-export default interface CliOptions {
-    connectionSpecifier?: string;
-    fileNames?: string[];
-    apiDeprecationErrors?: boolean;
-    apiStrict?: boolean;
-    apiVersion?: string;
-    authenticationDatabase?: string;
-    authenticationMechanism?: string;
-    awsAccessKeyId?: string;
-    awsIamSessionToken?: string;
-    awsSecretAccessKey?: string;
-    awsSessionToken?: string;
-    db?: string;
-    eval?: string;
-    gssapiServiceName?: string;
-    sspiHostnameCanonicalization?: string;
-    sspiRealmOverride?: string;
-    help?: boolean;
-    host?: string;
-    ipv6?: boolean;
-    keyVaultNamespace?: string;
-    kmsURL?: string;
-    nodb?: boolean;
-    norc?: boolean;
-    password?: string;
-    port?: string;
-    quiet?: boolean;
-    retryWrites?: boolean;
-    shell?: boolean;
-    tls?: boolean;
-    tlsAllowInvalidCertificates?: boolean;
-    tlsAllowInvalidHostnames?: boolean;
-    tlsCAFile?: string;
-    tlsCertificateKeyFile?: string;
-    tlsCertificateKeyFilePassword?: string;
-    tlsCertificateSelector?: string;
-    tlsCRLFile?: string;
-    tlsDisabledProtocols?: boolean;
-    tlsFIPSMode?: boolean;
-    username?: string;
-    verbose?: boolean;
-    version?: boolean;
-}

package/lib/cli-options.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=cli-options.js.map

package/lib/cli-options.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"cli-options.js","sourceRoot":"","sources":["../src/cli-options.ts"],"names":[],"mappings":""}

package/lib/uri-generator.d.ts

@@ -1,8 +0,0 @@
-import CliOptions from './cli-options';
-declare enum Scheme {
-    Mongo = "mongodb://",
-    MongoSrv = "mongodb+srv://"
-}
-declare function generateUri(options: CliOptions): string;
-export default generateUri;
-export { Scheme };

package/lib/uri-generator.js

@@ -1,176 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Scheme = void 0;
-const errors_1 = require("@mongosh/errors");
-const i18n_1 = __importDefault(require("@mongosh/i18n"));
-const mongodb_connection_string_url_1 = __importStar(require("mongodb-connection-string-url"));
-const index_1 = require("./index");
-var Scheme;
-(function (Scheme) {
-    Scheme["Mongo"] = "mongodb://";
-    Scheme["MongoSrv"] = "mongodb+srv://";
-})(Scheme || (Scheme = {}));
-exports.Scheme = Scheme;
-const DEFAULT_HOST = '127.0.0.1';
-const DEFAULT_PORT = '27017';
-const CONFLICT = 'cli-repl.uri-generator.no-host-port';
-const INVALID_HOST = 'cli-repl.uri-generator.invalid-host';
-const HOST_LIST_PORT_MISMATCH = 'cli-repl.uri-generator.host-list-port-mismatch';
-const DIVERGING_SERVICE_NAME = 'cli-repl.uri-generator.diverging-service-name';
-const GSSAPI_SERVICE_NAME_UNSUPPORTED = 'cli-repl.uri-generator.gssapi-service-name-unsupported';
-function validateConflicts(options, connectionString) {
-    if (options.host || options.port) {
-        throw new errors_1.MongoshInvalidInputError(i18n_1.default.__(CONFLICT), errors_1.CommonErrors.InvalidArgument);
-    }
-    if (options.gssapiServiceName && (connectionString === null || connectionString === void 0 ? void 0 : connectionString.searchParams.has('authMechanismProperties'))) {
-        const authProperties = new mongodb_connection_string_url_1.CommaAndColonSeparatedRecord(connectionString.searchParams.get('authMechanismProperties'));
-        const serviceName = authProperties.get('SERVICE_NAME');
-        if (serviceName !== undefined && options.gssapiServiceName !== serviceName) {
-            throw new errors_1.MongoshInvalidInputError(i18n_1.default.__(DIVERGING_SERVICE_NAME), errors_1.CommonErrors.InvalidArgument);
-        }
-    }
-    if (connectionString === null || connectionString === void 0 ? void 0 : connectionString.searchParams.has('gssapiServiceName')) {
-        throw new errors_1.MongoshInvalidInputError(i18n_1.default.__(GSSAPI_SERVICE_NAME_UNSUPPORTED), errors_1.CommonErrors.InvalidArgument);
-    }
-}
-function validateHost(host) {
-    const invalidCharacter = host.match(/[^a-zA-Z0-9.:\[\]_-]/);
-    if (invalidCharacter) {
-        throw new errors_1.MongoshInvalidInputError(i18n_1.default.__(INVALID_HOST) + ': ' + invalidCharacter[0], errors_1.CommonErrors.InvalidArgument);
-    }
-}
-function validateHostSeedList(hosts, fixedPort) {
-    const trimmedHosts = hosts.split(',').map(h => h.trim()).filter(h => !!h);
-    const hostList = [];
-    trimmedHosts.forEach(h => {
-        const [host, port] = h.split(':');
-        if (fixedPort && port !== undefined && port !== fixedPort) {
-            throw new errors_1.MongoshInvalidInputError(i18n_1.default.__(HOST_LIST_PORT_MISMATCH), errors_1.CommonErrors.InvalidArgument);
-        }
-        hostList.push(`${host}${(port || fixedPort) ? ':' + (port || fixedPort) : ''}`);
-    });
-    return hostList;
-}
-function generateHost(options) {
-    if (options.host) {
-        validateHost(options.host);
-        if (options.host.includes(':')) {
-            return options.host.split(':')[0];
-        }
-        return options.host;
-    }
-    return DEFAULT_HOST;
-}
-function generatePort(options) {
-    if (options.host && options.host.includes(':')) {
-        validateHost(options.host);
-        const port = options.host.split(':')[1];
-        if (!options.port || options.port === port) {
-            return port;
-        }
-        throw new errors_1.MongoshInvalidInputError(i18n_1.default.__(CONFLICT), errors_1.CommonErrors.InvalidArgument);
-    }
-    return options.port ? options.port : DEFAULT_PORT;
-}
-function generateUri(options) {
-    if (options.nodb) {
-        return '';
-    }
-    const connectionString = generateUriNormalized(options);
-    if (connectionString.hosts.every(host => ['localhost', '127.0.0.1'].includes(host.split(':')[0]))) {
-        const params = connectionString.searchParams;
-        if (!params.has('serverSelectionTimeoutMS')) {
-            params.set('serverSelectionTimeoutMS', '2000');
-        }
-    }
-    return connectionString.toString();
-}
-function generateUriNormalized(options) {
-    var _a, _b, _c;
-    const uri = options.connectionSpecifier;
-    const replSetHostMatch = ((_a = options.host) !== null && _a !== void 0 ? _a : '').match(/^(?<replSetName>[^/]+)\/(?<hosts>([A-Za-z0-9._-]+(:\d+)?,?)+)$/);
-    if (replSetHostMatch) {
-        const { replSetName, hosts } = replSetHostMatch.groups;
-        const connectionString = new mongodb_connection_string_url_1.default(`${Scheme.Mongo}replacemeHost/${encodeURIComponent(uri || '')}`);
-        connectionString.hosts = validateHostSeedList(hosts, options.port);
-        connectionString.searchParams.set('replicaSet', replSetName);
-        return addShellConnectionStringParameters(connectionString);
-    }
-    const seedList = ((_b = options.host) !== null && _b !== void 0 ? _b : '').match(/^(?<hosts>([A-Za-z0-9._-]+(:\d+)?,?)+)$/);
-    if (seedList && ((_c = options.host) === null || _c === void 0 ? void 0 : _c.includes(','))) {
-        const { hosts } = seedList.groups;
-        const connectionString = new mongodb_connection_string_url_1.default(`${Scheme.Mongo}replacemeHost/${encodeURIComponent(uri || '')}`);
-        connectionString.hosts = validateHostSeedList(hosts, options.port);
-        return addShellConnectionStringParameters(connectionString);
-    }
-    if (!uri) {
-        return new mongodb_connection_string_url_1.default(`${Scheme.Mongo}${generateHost(options)}:${generatePort(options)}/?directConnection=true`);
-    }
-    if (uri.startsWith(Scheme.MongoSrv)) {
-        const connectionString = new mongodb_connection_string_url_1.default(uri);
-        validateConflicts(options, connectionString);
-        return connectionString;
-    }
-    else if (uri.startsWith(Scheme.Mongo)) {
-        const connectionString = new mongodb_connection_string_url_1.default(uri);
-        validateConflicts(options, connectionString);
-        return addShellConnectionStringParameters(connectionString);
-    }
-    const uriMatch = /^([A-Za-z0-9][A-Za-z0-9._-]+):?(\d+)?(?:\/(\S*))?$/gi;
-    let parts = uriMatch.exec(uri);
-    if (parts === null) {
-        if (/[/\\. "$]/.test(uri)) {
-            throw new errors_1.MongoshInvalidInputError(`Invalid URI: ${uri}`, errors_1.CommonErrors.InvalidArgument);
-        }
-        else {
-            parts = [uri, uri];
-        }
-    }
-    let host = parts === null || parts === void 0 ? void 0 : parts[1];
-    const port = parts === null || parts === void 0 ? void 0 : parts[2];
-    let dbAndQueryString = parts === null || parts === void 0 ? void 0 : parts[3];
-    if (!port && !dbAndQueryString && host.indexOf('.') < 0) {
-        dbAndQueryString = host;
-        host = undefined;
-    }
-    if (host || port) {
-        validateConflicts(options);
-    }
-    return addShellConnectionStringParameters(new mongodb_connection_string_url_1.default(`${Scheme.Mongo}${host || generateHost(options)}:${port || generatePort(options)}/${encodeURIComponent(dbAndQueryString || index_1.DEFAULT_DB)}`));
-}
-function addShellConnectionStringParameters(uri) {
-    uri = uri.clone();
-    const params = uri.searchParams;
-    if (!params.has('replicaSet') && !params.has('directConnection') && !params.has('loadBalanced') && uri.hosts.length === 1) {
-        params.set('directConnection', 'true');
-    }
-    return uri;
-}
-exports.default = generateUri;
-//# sourceMappingURL=uri-generator.js.map

package/lib/uri-generator.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"uri-generator.js","sourceRoot":"","sources":["../src/uri-generator.ts"],"names":[],"mappings":"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"}

package/src/cli-options.ts

@@ -1,49 +0,0 @@
-/**
- * Valid options that can be parsed from the command line.
- */
-export default interface CliOptions {
-  // Positional arguments:
-  connectionSpecifier?: string;
-  fileNames?: string[];
-
-  // Non-positional arguments:
-  apiDeprecationErrors?: boolean;
-  apiStrict?: boolean;
-  apiVersion?: string;
-  authenticationDatabase?: string;
-  authenticationMechanism?: string;
-  awsAccessKeyId?: string;
-  awsIamSessionToken?: string;
-  awsSecretAccessKey?: string;
-  awsSessionToken?: string;
-  db?: string;
-  eval?: string;
-  gssapiServiceName?: string;
-  sspiHostnameCanonicalization?: string;
-  sspiRealmOverride?: string;
-  help?: boolean;
-  host?: string;
-  ipv6?: boolean;
-  keyVaultNamespace?: string;
-  kmsURL?: string;
-  nodb?: boolean;
-  norc?: boolean;
-  password?: string;
-  port?: string;
-  quiet?: boolean;
-  retryWrites?: boolean;
-  shell?: boolean;
-  tls?: boolean;
-  tlsAllowInvalidCertificates?: boolean;
-  tlsAllowInvalidHostnames?: boolean;
-  tlsCAFile?: string;
-  tlsCertificateKeyFile?: string;
-  tlsCertificateKeyFilePassword?: string;
-  tlsCertificateSelector?: string;
-  tlsCRLFile?: string;
-  tlsDisabledProtocols?: boolean;
-  tlsFIPSMode?: boolean;
-  username?: string;
-  verbose?: boolean;
-  version?: boolean;
-}

package/src/uri-generator.spec.ts

@@ -1,481 +0,0 @@
-import { CommonErrors, MongoshInvalidInputError } from '@mongosh/errors';
-import { expect } from 'chai';
-import CliOptions from './cli-options';
-import generateUri from './uri-generator';
-
-describe('uri-generator.generate-uri', () => {
-  context('when no arguments are provided', () => {
-    const options = { connectionSpecifier: undefined };
-
-    it('returns the default uri', () => {
-      expect(generateUri(options)).to.equal('mongodb://127.0.0.1:27017/?directConnection=true&serverSelectionTimeoutMS=2000');
-    });
-  });
-
-  context('when no URI is provided', () => {
-    it('handles host', () => {
-      expect(generateUri({ connectionSpecifier: undefined, host: 'localhost' })).to.equal('mongodb://localhost:27017/?directConnection=true&serverSelectionTimeoutMS=2000');
-    });
-    it('handles port', () => {
-      expect(generateUri({ connectionSpecifier: undefined, port: '27018' })).to.equal('mongodb://127.0.0.1:27018/?directConnection=true&serverSelectionTimeoutMS=2000');
-    });
-    it('handles both host and port', () => {
-      expect(generateUri({ connectionSpecifier: undefined, host: 'localhost', port: '27018' })).to.equal('mongodb://localhost:27018/?directConnection=true&serverSelectionTimeoutMS=2000');
-    });
-    it('handles host with port included', () => {
-      expect(generateUri({ connectionSpecifier: undefined, host: 'localhost:27018' })).to.equal('mongodb://localhost:27018/?directConnection=true&serverSelectionTimeoutMS=2000');
-    });
-    it('handles host with an underscore', () => {
-      expect(generateUri({ connectionSpecifier: undefined, host: 'some_host' })).to.equal('mongodb://some_host:27017/?directConnection=true');
-    });
-    it('throws if host has port AND port set to other value', () => {
-      try {
-        generateUri({ connectionSpecifier: undefined, host: 'localhost:27018', port: '27019' });
-        expect.fail('expected error');
-      } catch (e: any) {
-        expect(e).to.be.instanceOf(MongoshInvalidInputError);
-        expect(e.code).to.equal(CommonErrors.InvalidArgument);
-      }
-    });
-    it('handles host has port AND port set to equal value', () => {
-      expect(generateUri({ connectionSpecifier: undefined, host: 'localhost:27018', port: '27018' })).to.equal('mongodb://localhost:27018/?directConnection=true&serverSelectionTimeoutMS=2000');
-    });
-  });
-
-  context('when a full URI is provided', () => {
-    context('when no additional options are provided', () => {
-      const options = { connectionSpecifier: 'mongodb://192.0.0.1:27018/foo' };
-
-      it('returns the uri', () => {
-        expect(generateUri(options)).to.equal('mongodb://192.0.0.1:27018/foo?directConnection=true');
-      });
-    });
-
-    context('when additional options are provided', () => {
-      context('when providing host with URI', () => {
-        const uri = 'mongodb://192.0.0.1:27018/foo';
-        const options = { connectionSpecifier: uri, host: '127.0.0.1' };
-
-        it('throws an exception', () => {
-          try {
-            generateUri(options);
-            expect.fail('expected error');
-          } catch (e: any) {
-            expect(e).to.be.instanceOf(MongoshInvalidInputError);
-            expect(e.code).to.equal(CommonErrors.InvalidArgument);
-          }
-        });
-      });
-
-      context('when providing port with URI', () => {
-        const uri = 'mongodb://192.0.0.1:27018/foo';
-        const options = { connectionSpecifier: uri, port: '27018' };
-
-        it('throws an exception', () => {
-          try {
-            generateUri(options);
-            expect.fail('expected error');
-          } catch (e: any) {
-            expect(e.name).to.equal('MongoshInvalidInputError');
-            expect(e.code).to.equal(CommonErrors.InvalidArgument);
-          }
-        });
-      });
-
-      context('when providing gssapiServiceName', () => {
-        context('and the URI does not include SERVICE_NAME in authMechanismProperties', () => {
-          const uri = 'mongodb+srv://some.host/foo';
-          const options: CliOptions = { connectionSpecifier: uri, gssapiServiceName: 'alternate' };
-
-          it('does not throw an error', () => {
-            expect(generateUri(options)).to.equal('mongodb+srv://some.host/foo');
-          });
-        });
-
-        context('and the URI includes SERVICE_NAME in authMechanismProperties', () => {
-          const uri = 'mongodb+srv://some.host/foo?authMechanismProperties=SERVICE_NAME:whatever';
-          const options: CliOptions = { connectionSpecifier: uri, gssapiServiceName: 'alternate' };
-
-          it('throws an error', () => {
-            try {
-              generateUri(options);
-            } catch (e: any) {
-              expect(e.name).to.equal('MongoshInvalidInputError');
-              expect(e.code).to.equal(CommonErrors.InvalidArgument);
-              expect(e.message).to.contain('--gssapiServiceName parameter or the SERVICE_NAME');
-              return;
-            }
-            expect.fail('expected error');
-          });
-        });
-      });
-    });
-
-    context('when providing a URI with query parameters', () => {
-      context('that do not conflict with directConnection', () => {
-        const uri = 'mongodb://192.0.0.1:27018?readPreference=primary';
-        const options = { connectionSpecifier: uri };
-        it('still includes directConnection', () => {
-          expect(generateUri(options)).to.equal('mongodb://192.0.0.1:27018/?readPreference=primary&directConnection=true');
-        });
-      });
-
-      context('including replicaSet', () => {
-        const uri = 'mongodb://192.0.0.1:27018/db?replicaSet=replicaset';
-        const options = { connectionSpecifier: uri };
-        it('does not add the directConnection parameter', () => {
-          expect(generateUri(options)).to.equal(uri);
-        });
-      });
-
-      context('including loadBalanced', () => {
-        const uri = 'mongodb://192.0.0.1:27018/db?loadBalanced=true';
-        const options = { connectionSpecifier: uri };
-        it('does not add the directConnection parameter', () => {
-          expect(generateUri(options)).to.equal(uri);
-        });
-      });
-
-      context('including explicit directConnection', () => {
-        const uri = 'mongodb://192.0.0.1:27018/db?directConnection=false';
-        const options = { connectionSpecifier: uri };
-        it('does not change the directConnection parameter', () => {
-          expect(generateUri(options)).to.equal(uri);
-        });
-      });
-    });
-
-    context('when providing a URI with SRV record', () => {
-      const uri = 'mongodb+srv://somehost/?readPreference=primary';
-      const options = { connectionSpecifier: uri };
-      it('no directConnection is added', () => {
-        expect(generateUri(options)).to.equal(uri);
-      });
-    });
-
-    context('when providing a URI with multiple seeds', () => {
-      const uri = 'mongodb://192.42.42.42:27017,192.0.0.1:27018/db?readPreference=primary';
-      const options = { connectionSpecifier: uri };
-      it('no directConnection is added', () => {
-        expect(generateUri(options)).to.equal(uri);
-      });
-    });
-
-    context('when providing a URI with the legacy gssapiServiceName query parameter', () => {
-      const uri = 'mongodb://192.42.42.42:27017,192.0.0.1:27018/db?gssapiServiceName=primary';
-      const options = { connectionSpecifier: uri };
-
-      it('throws an error', () => {
-        try {
-          generateUri(options);
-        } catch (e: any) {
-          expect(e.name).to.equal('MongoshInvalidInputError');
-          expect(e.code).to.equal(CommonErrors.InvalidArgument);
-          expect(e.message).to.contain('gssapiServiceName query parameter is not supported');
-          return;
-        }
-        expect.fail('expected error');
-      });
-    });
-  });
-
-  context('when a URI is provided without a scheme', () => {
-    context('when providing host', () => {
-      const uri = '192.0.0.1';
-      const options = { connectionSpecifier: uri };
-
-      it('returns the uri with the scheme', () => {
-        expect(generateUri(options)).to.equal(`mongodb://${uri}:27017/test?directConnection=true`);
-      });
-    });
-
-    context('when providing host:port', () => {
-      const uri = '192.0.0.1:27018';
-      const options = { connectionSpecifier: uri };
-
-      it('returns the uri with the scheme', () => {
-        expect(generateUri(options)).to.equal(`mongodb://${uri}/test?directConnection=true`);
-      });
-    });
-
-    context('when proving host + port option', () => {
-      const uri = '192.0.0.1';
-      const options = { connectionSpecifier: uri, port: '27018' };
-
-      it('throws an exception', () => {
-        try {
-          generateUri(options);
-          expect.fail('expected error');
-        } catch (e: any) {
-          expect(e).to.be.instanceOf(MongoshInvalidInputError);
-          expect(e.code).to.equal(CommonErrors.InvalidArgument);
-        }
-      });
-    });
-
-    context('when no additional options are provided without db', () => {
-      const uri = '192.0.0.1:27018';
-      const options = { connectionSpecifier: uri };
-
-      it('returns the uri with the scheme', () => {
-        expect(generateUri(options)).to.equal(`mongodb://${uri}/test?directConnection=true`);
-      });
-    });
-
-    context('when no additional options are provided with empty db', () => {
-      const uri = '192.0.0.1:27018/';
-      const options = { connectionSpecifier: uri };
-
-      it('returns the uri with the scheme', () => {
-        expect(generateUri(options)).to.equal(`mongodb://${uri}test?directConnection=true`);
-      });
-    });
-
-    context('when no additional options are provided with db', () => {
-      const uri = '192.0.0.1:27018/foo';
-      const options = { connectionSpecifier: uri };
-
-      it('returns the uri with the scheme', () => {
-        expect(generateUri(options)).to.equal(`mongodb://${uri}?directConnection=true`);
-      });
-    });
-
-    context('when no additional options are provided with db with special characters', () => {
-      const uri = '192.0.0.1:27018/föö-:?%ab💙,\'_.c';
-      const options = { connectionSpecifier: uri };
-
-      it('returns the uri with the scheme', () => {
-        expect(generateUri(options)).to.equal('mongodb://192.0.0.1:27018/f%C3%B6%C3%B6-%3A%3F%25ab%F0%9F%92%99%2C\'_.c?directConnection=true');
-      });
-    });
-
-    context('when the db part does not start with a slash', () => {
-      const uri = '192.0.0.1:27018?foo=bar';
-      const options = { connectionSpecifier: uri };
-
-      it('throws an exception', () => {
-        try {
-          generateUri(options);
-          expect.fail('expected error');
-        } catch (e: any) {
-          expect(e).to.be.instanceOf(MongoshInvalidInputError);
-          expect(e.code).to.equal(CommonErrors.InvalidArgument);
-        }
-      });
-    });
-
-    context('when additional options are provided', () => {
-      context('when providing host with URI', () => {
-        const uri = '192.0.0.1:27018/foo';
-        const options = { connectionSpecifier: uri, host: '127.0.0.1' };
-
-        it('throws an exception', () => {
-          try {
-            generateUri(options);
-            expect.fail('expected error');
-          } catch (e: any) {
-            expect(e).to.be.instanceOf(MongoshInvalidInputError);
-            expect(e.code).to.equal(CommonErrors.InvalidArgument);
-          }
-        });
-      });
-
-      context('when providing host with db', () => {
-        const uri = 'foo';
-        const options = { connectionSpecifier: uri, host: '127.0.0.2' };
-
-        it('uses the provided host with default port', () => {
-          expect(generateUri(options)).to.equal('mongodb://127.0.0.2:27017/foo?directConnection=true');
-        });
-      });
-
-      context('when providing port with URI', () => {
-        const uri = '192.0.0.1:27018/foo';
-        const options = { connectionSpecifier: uri, port: '27018' };
-
-        it('throws an exception', () => {
-          try {
-            generateUri(options);
-            expect.fail('expected error');
-          } catch (e: any) {
-            expect(e).to.be.instanceOf(MongoshInvalidInputError);
-            expect(e.code).to.equal(CommonErrors.InvalidArgument);
-          }
-        });
-      });
-
-      context('when providing port with db', () => {
-        const uri = 'foo';
-        const options = { connectionSpecifier: uri, port: '27018' };
-
-        it('uses the provided host with default port', () => {
-          expect(generateUri(options)).to.equal('mongodb://127.0.0.1:27018/foo?directConnection=true&serverSelectionTimeoutMS=2000');
-        });
-      });
-
-      context('when providing port with only a host URI', () => {
-        const uri = '127.0.0.2/foo';
-        const options = { connectionSpecifier: uri, port: '27018' };
-
-        it('throws an exception', () => {
-          try {
-            generateUri(options);
-            expect.fail('expected error');
-          } catch (e: any) {
-            expect(e).to.be.instanceOf(MongoshInvalidInputError);
-            expect(e.code).to.equal(CommonErrors.InvalidArgument);
-          }
-        });
-      });
-
-      context('when providing nodb', () => {
-        const uri = 'mongodb://127.0.0.2/foo';
-        const options = { connectionSpecifier: uri, nodb: true };
-
-        it('returns an empty string', () => {
-          expect(generateUri(options)).to.equal('');
-        });
-      });
-
-      context('when providing explicit serverSelectionTimeoutMS', () => {
-        const uri = 'mongodb://127.0.0.2/foo?serverSelectionTimeoutMS=10';
-        const options = { connectionSpecifier: uri };
-
-        it('does not override the existing value', () => {
-          expect(generateUri(options)).to.equal('mongodb://127.0.0.2/foo?serverSelectionTimeoutMS=10&directConnection=true');
-        });
-      });
-
-      context('when providing explicit serverSelectionTimeoutMS (different case)', () => {
-        const uri = 'mongodb://127.0.0.2/foo?SERVERSELECTIONTIMEOUTMS=10';
-        const options = { connectionSpecifier: uri };
-
-        it('does not override the existing value', () => {
-          expect(generateUri(options)).to.equal('mongodb://127.0.0.2/foo?SERVERSELECTIONTIMEOUTMS=10&directConnection=true');
-        });
-      });
-    });
-
-    context('when providing a URI with query parameters', () => {
-      context('that do not conflict with directConnection', () => {
-        const uri = 'mongodb://192.0.0.1:27018/?readPreference=primary';
-        const options = { connectionSpecifier: uri };
-        it('still includes directConnection', () => {
-          expect(generateUri(options)).to.equal('mongodb://192.0.0.1:27018/?readPreference=primary&directConnection=true');
-        });
-      });
-
-      context('including replicaSet', () => {
-        const uri = 'mongodb://192.0.0.1:27018/db?replicaSet=replicaset';
-        const options = { connectionSpecifier: uri };
-        it('does not add the directConnection parameter', () => {
-          expect(generateUri(options)).to.equal(uri);
-        });
-      });
-
-      context('including explicit directConnection', () => {
-        const uri = 'mongodb://192.0.0.1:27018/?directConnection=false';
-        const options = { connectionSpecifier: uri };
-        it('does not change the directConnection parameter', () => {
-          expect(generateUri(options)).to.equal('mongodb://192.0.0.1:27018/?directConnection=false');
-        });
-      });
-    });
-  });
-
-
-  context('when an invalid URI is provided', () => {
-    const uri = '/x';
-    const options = { connectionSpecifier: uri };
-
-    it('returns the uri', () => {
-      try {
-        generateUri(options);
-      } catch (e: any) {
-        expect(e.message).to.contain('Invalid URI: /x');
-        expect(e).to.be.instanceOf(MongoshInvalidInputError);
-        expect(e.code).to.equal(CommonErrors.InvalidArgument);
-        return;
-      }
-      expect.fail('expected error');
-    });
-  });
-
-  context('when the --host option contains invalid characters', () => {
-    const options = { host: 'a$b,c' };
-
-    it('returns the uri', () => {
-      try {
-        generateUri(options);
-      } catch (e: any) {
-        expect(e.message).to.contain('The --host argument contains an invalid character: $');
-        expect(e).to.be.instanceOf(MongoshInvalidInputError);
-        expect(e.code).to.equal(CommonErrors.InvalidArgument);
-        return;
-      }
-      expect.fail('expected error');
-    });
-  });
-
-  context('when the --host option contains a seed list', () => {
-    context('without a replica set', () => {
-      it('returns a URI for the hosts and ports specified in --host', () => {
-        const options = { host: 'host1:123,host2,host3:456,' };
-        expect(generateUri(options)).to.equal('mongodb://host1:123,host2,host3:456/');
-      });
-
-      it('returns a URI for the hosts and ports specified in --host and database name', () => {
-        const options = {
-          host: 'host1:123,host_2,host3:456,',
-          connectionSpecifier: 'admin'
-        };
-        expect(generateUri(options)).to.equal('mongodb://host1:123,host_2,host3:456/admin');
-      });
-
-      it('returns a URI for the hosts in --host and fixed --port', () => {
-        const options = {
-          host: 'host1:1234,host_2',
-          port: '1234',
-          connectionSpecifier: 'admin'
-        };
-        expect(generateUri(options)).to.equal('mongodb://host1:1234,host_2:1234/admin');
-      });
-
-      it('throws an error if seed list in --host contains port mismatches from fixed --port', () => {
-        const options = {
-          host: 'host1,host_2:123',
-          port: '1234',
-          connectionSpecifier: 'admin'
-        };
-        expect(() => generateUri(options)).to.throw('The host list contains different ports than provided by --port');
-      });
-    });
-
-    context('with a replica set', () => {
-      it('returns a URI for the hosts and ports specified in --host', () => {
-        const options = { host: 'replsetname/host1:123,host2,host3:456,' };
-        expect(generateUri(options)).to.equal('mongodb://host1:123,host2,host3:456/?replicaSet=replsetname');
-      });
-
-      it('returns a URI for the hosts and ports specified in --host and database name', () => {
-        const options = { host: 'replsetname/host1:123,host2,host3:456', connectionSpecifier: 'admin' };
-        expect(generateUri(options)).to.equal('mongodb://host1:123,host2,host3:456/admin?replicaSet=replsetname');
-      });
-
-      it('returns a URI for the hosts and ports specified in --host and database name with escaped chars', () => {
-        const options = { host: 'replsetname/host1:123,host2,host3:456', connectionSpecifier: 'admin?foo=bar' };
-        expect(generateUri(options)).to.equal('mongodb://host1:123,host2,host3:456/admin%3Ffoo%3Dbar?replicaSet=replsetname');
-      });
-
-      it('returns a URI for the hosts specified in --host and explicit --port', () => {
-        const options = { host: 'replsetname/host1:123,host2,', port: '123' };
-        expect(generateUri(options)).to.equal('mongodb://host1:123,host2:123/?replicaSet=replsetname');
-      });
-
-      it('throws an error if the hosts contain ports that mismatch from --port', () => {
-        const options = { host: 'replsetname/host1:1234,host2,', port: '123' };
-        expect(() => generateUri(options)).to.throw('The host list contains different ports than provided by --port');
-      });
-    });
-  });
-});

package/src/uri-generator.ts

@@ -1,265 +0,0 @@
-/* eslint complexity: 0*/
-
-import { CommonErrors, MongoshInvalidInputError } from '@mongosh/errors';
-import i18n from '@mongosh/i18n';
-import CliOptions from './cli-options';
-import ConnectionString, { CommaAndColonSeparatedRecord } from 'mongodb-connection-string-url';
-import { DEFAULT_DB } from './index';
-
-/**
- * URI schemes.
- */
-enum Scheme {
-  Mongo = 'mongodb://',
-  MongoSrv = 'mongodb+srv://'
-}
-
-/**
- * The default host.
- */
-const DEFAULT_HOST = '127.0.0.1';
-
-/**
- * The default port.
- */
-const DEFAULT_PORT = '27017';
-
-/**
- * Conflicting host/port message.
- */
-const CONFLICT = 'cli-repl.uri-generator.no-host-port';
-
-/**
- * Invalid host message.
- */
-const INVALID_HOST = 'cli-repl.uri-generator.invalid-host';
-
-/**
- * Host seed list contains a port that mismatches an explicit --port.
- */
-const HOST_LIST_PORT_MISMATCH = 'cli-repl.uri-generator.host-list-port-mismatch';
-
-/**
- * Diverging gssapiServiceName and SERVICE_NAME mechanism property
- */
-const DIVERGING_SERVICE_NAME = 'cli-repl.uri-generator.diverging-service-name';
-
-/**
- * Usage of unsupported gssapiServiceName query parameter
- */
-const GSSAPI_SERVICE_NAME_UNSUPPORTED = 'cli-repl.uri-generator.gssapi-service-name-unsupported';
-
-/**
- * Validate conflicts in the options.
- */
-function validateConflicts(options: CliOptions, connectionString?: ConnectionString): void {
-  if (options.host || options.port) {
-    throw new MongoshInvalidInputError(i18n.__(CONFLICT), CommonErrors.InvalidArgument);
-  }
-
-  if (options.gssapiServiceName && connectionString?.searchParams.has('authMechanismProperties')) {
-    const authProperties = new CommaAndColonSeparatedRecord(
-      connectionString.searchParams.get('authMechanismProperties'));
-    const serviceName = authProperties.get('SERVICE_NAME');
-    if (serviceName !== undefined && options.gssapiServiceName !== serviceName) {
-      throw new MongoshInvalidInputError(i18n.__(DIVERGING_SERVICE_NAME), CommonErrors.InvalidArgument);
-    }
-  }
-
-  if (connectionString?.searchParams.has('gssapiServiceName')) {
-    throw new MongoshInvalidInputError(i18n.__(GSSAPI_SERVICE_NAME_UNSUPPORTED), CommonErrors.InvalidArgument);
-  }
-}
-
-/**
- * Perform basic validation of the --host option.
- *
- * @param {string} host - The value of the --host option.
- */
-function validateHost(host: string): void {
-  const invalidCharacter = host.match(/[^a-zA-Z0-9.:\[\]_-]/);
-  if (invalidCharacter) {
-    throw new MongoshInvalidInputError(
-      i18n.__(INVALID_HOST) + ': ' + invalidCharacter[0],
-      CommonErrors.InvalidArgument);
-  }
-}
-
-/**
- * Validates a host seed list against a specified fixed port and
- * returns an individual `<host>:<port>` array.
- */
-function validateHostSeedList(hosts: string, fixedPort: string | undefined): string[] {
-  const trimmedHosts = hosts.split(',').map(h => h.trim()).filter(h => !!h);
-  const hostList: string[] = [];
-  trimmedHosts.forEach(h => {
-    const [host, port] = h.split(':');
-    if (fixedPort && port !== undefined && port !== fixedPort) {
-      throw new MongoshInvalidInputError(
-        i18n.__(HOST_LIST_PORT_MISMATCH),
-        CommonErrors.InvalidArgument
-      );
-    }
-    hostList.push(`${host}${(port || fixedPort) ? ':' + (port || fixedPort) : ''}`);
-  });
-  return hostList;
-}
-
-/**
- * Generate the host from the options or default.
- *
- * @param {CliOptions} options - The options.
- *
- * @returns {string} The host.
- */
-function generateHost(options: CliOptions): string {
-  if (options.host) {
-    validateHost(options.host);
-    if (options.host.includes(':')) {
-      return options.host.split(':')[0];
-    }
-    return options.host;
-  }
-  return DEFAULT_HOST;
-}
-
-/**
- * Generate the port from the options or default.
- *
- * @param {CliOptions} options - The options.
- *
- * @returns {string} The port.
- */
-function generatePort(options: CliOptions): string {
-  if (options.host && options.host.includes(':')) {
-    validateHost(options.host);
-    const port = options.host.split(':')[1];
-    if (!options.port || options.port === port) {
-      return port;
-    }
-    throw new MongoshInvalidInputError(i18n.__(CONFLICT), CommonErrors.InvalidArgument);
-  }
-  return options.port ? options.port : DEFAULT_PORT;
-}
-
-/**
- * Generate a URI from the provided CLI options.
- *
- * If a full URI is provided, you cannot also specify --host or --port
- *
- * Rules from the existing Shell code:
- *
- * if nodb is set then all positional parameters are files
- * otherwise the first positional parameter might be a dbaddress, but
- * only if one of these conditions is met:
- *   - it contains no '.' after the last appearance of '\' or '/'
- *   - it doesn't end in '.js' and it doesn't specify a path to an existing file
- */
-function generateUri(options: CliOptions): string {
-  if (options.nodb) {
-    return '';
-  }
-  const connectionString = generateUriNormalized(options);
-  if (connectionString.hosts.every(host =>
-    ['localhost', '127.0.0.1'].includes(host.split(':')[0]))) {
-    const params = connectionString.searchParams;
-    if (!params.has('serverSelectionTimeoutMS')) {
-      params.set('serverSelectionTimeoutMS', '2000');
-    }
-  }
-  return connectionString.toString();
-}
-function generateUriNormalized(options: CliOptions): ConnectionString {
-  const uri = options.connectionSpecifier;
-
-  // If the --host argument contains /, it has the format
-  // <replSetName>/<hostname1><:port>,<hostname2><:port>,<...>
-  const replSetHostMatch = (options.host ?? '').match(
-    /^(?<replSetName>[^/]+)\/(?<hosts>([A-Za-z0-9._-]+(:\d+)?,?)+)$/
-  );
-  if (replSetHostMatch) {
-    const { replSetName, hosts } = replSetHostMatch.groups as { replSetName: string, hosts: string };
-    const connectionString = new ConnectionString(`${Scheme.Mongo}replacemeHost/${encodeURIComponent(uri || '')}`);
-    connectionString.hosts = validateHostSeedList(hosts, options.port);
-    connectionString.searchParams.set('replicaSet', replSetName);
-    return addShellConnectionStringParameters(connectionString);
-  }
-
-  // If the --host argument contains multiple hosts as a seed list
-  // we directly do not do additional host/port parsing
-  const seedList = (options.host ?? '').match(
-    /^(?<hosts>([A-Za-z0-9._-]+(:\d+)?,?)+)$/
-  );
-  if (seedList && options.host?.includes(',')) {
-    const { hosts } = seedList.groups as { hosts: string };
-    const connectionString = new ConnectionString(`${Scheme.Mongo}replacemeHost/${encodeURIComponent(uri || '')}`);
-    connectionString.hosts = validateHostSeedList(hosts, options.port);
-    return addShellConnectionStringParameters(connectionString);
-  }
-
-  // There is no URI provided, use default 127.0.0.1:27017
-  if (!uri) {
-    return new ConnectionString(`${Scheme.Mongo}${generateHost(options)}:${generatePort(options)}/?directConnection=true`);
-  }
-
-  // mongodb+srv:// URI is provided, treat as correct and immediately return
-  if (uri.startsWith(Scheme.MongoSrv)) {
-    const connectionString = new ConnectionString(uri);
-    validateConflicts(options, connectionString);
-    return connectionString;
-  } else if (uri.startsWith(Scheme.Mongo)) {
-    // we need to figure out if we have to add the directConnection query parameter
-    const connectionString = new ConnectionString(uri);
-    validateConflicts(options, connectionString);
-    return addShellConnectionStringParameters(connectionString);
-  }
-
-  // Capture host, port and db from the string and generate a URI from
-  // the parts. If there is a db part, it *must* start with /.
-  const uriMatch = /^([A-Za-z0-9][A-Za-z0-9._-]+):?(\d+)?(?:\/(\S*))?$/gi;
-  let parts: string[] | null = uriMatch.exec(uri);
-
-  if (parts === null) {
-    if (/[/\\. "$]/.test(uri)) {
-      // This cannot be a database name because 'uri' contains characters invalid in a database.
-      throw new MongoshInvalidInputError(`Invalid URI: ${uri}`, CommonErrors.InvalidArgument);
-    } else {
-      parts = [ uri, uri ];
-    }
-  }
-
-  let host: string | undefined = parts?.[1];
-  const port = parts?.[2];
-  let dbAndQueryString = parts?.[3];
-
-  // If there is no port and db, host becomes db if there is no
-  // '.' in the string. (legacy shell behaviour)
-  if (!port && !dbAndQueryString && host.indexOf('.') < 0) {
-    dbAndQueryString = host;
-    host = undefined;
-  }
-
-  // If we have a host or port, validate that the options don't also
-  // have a host or port in them.
-  if (host || port) {
-    validateConflicts(options);
-  }
-  return addShellConnectionStringParameters(new ConnectionString(
-    `${Scheme.Mongo}${host || generateHost(options)}:${port || generatePort(options)}/${encodeURIComponent(dbAndQueryString || DEFAULT_DB)}`));
-}
-
-/**
- * Adds the `directConnection=true` query parameter if required.
- * @param uri mongodb:// connection string
- */
-function addShellConnectionStringParameters(uri: ConnectionString): ConnectionString {
-  uri = uri.clone();
-  const params = uri.searchParams;
-  if (!params.has('replicaSet') && !params.has('directConnection') && !params.has('loadBalanced') && uri.hosts.length === 1) {
-    params.set('directConnection', 'true');
-  }
-  return uri;
-}
-
-export default generateUri;
-export { Scheme };