@mongodb-js/connection-form 1.87.1 → 1.89.0

package/dist/components/connection-form.js

@@ -40,13 +40,16 @@ exports.ColorCircleGlyph = void 0;
 const react_1 = __importStar(require("react"));
 const compass_components_1 = require("@mongodb-js/compass-components");
 const lodash_1 = require("lodash");
-const connection_string_input_1 = __importDefault(require("./connection-string-input"));
-const advanced_connection_options_1 = __importDefault(require("./advanced-connection-options"));
-const connection_form_modal_actions_1 = require("./connection-form-modal-actions");
 const use_connect_form_1 = require("../hooks/use-connect-form");
 const validation_1 = require("../utils/validation");
+const csfle_handler_1 = require("../utils/csfle-handler");
+const connection_string_helpers_1 = require("../utils/connection-string-helpers");
 const use_connect_form_settings_1 = require("../hooks/use-connect-form-settings");
 const use_connection_color_1 = require("../hooks/use-connection-color");
+const connection_form_modal_actions_1 = require("./connection-form-modal-actions");
+const read_preference_form_1 = __importDefault(require("./advanced-options-tabs/advanced-tab/read-preference-form"));
+const advanced_connection_options_1 = __importDefault(require("./advanced-connection-options"));
+const connection_string_input_1 = __importDefault(require("./connection-string-input"));
 const form_help_1 = __importDefault(require("./form-help/form-help"));
 const descriptionStyles = (0, compass_components_1.css)({
     marginTop: compass_components_1.spacing[200],
@@ -85,12 +88,10 @@ const formContentStyles = (0, compass_components_1.css)({
     flex: '1 1 auto',
     // To prevent input outline being cut by the overflow
     paddingLeft: compass_components_1.spacing[100],
-    // Adds some scrollable spacing to the end of the form. Needs to be applied to
-    // the child so that the form is scrollable with the padding and not with
-    // padding cutting the form content at the end
-    '& > :last-child': {
-        paddingBottom: compass_components_1.spacing[600],
-    },
+    // Leaves some space after the last field when scrolled to the end. Set here
+    // rather than on the last child, which can be the disconnect banner and
+    // would get the padding inside it.
+    paddingBottom: compass_components_1.spacing[600],
 });
 const formHelpContainerStyles = (0, compass_components_1.css)({
     position: 'sticky',
@@ -196,6 +197,7 @@ function ConnectionPersonalizationForm({ updateConnectionFormField, personalizat
 function ConnectionForm({ initialConnectionInfo, connectionErrorMessage, disableEditingConnectedConnection = false, onSaveAndConnectClicked, onSaveClicked, onConnectClicked, onDisconnectClicked, onCancel, onAdvancedOptionsToggle, openSettingsModal, }) {
     const [advancedOpen, setAdvancedOpen] = (0, react_1.useState)(false);
     const isDarkMode = (0, compass_components_1.useDarkMode)();
+    const isAtlas = !!initialConnectionInfo.atlasMetadata;
     const onAdvancedChange = (0, react_1.useCallback)((newState) => {
         setAdvancedOpen(newState);
         onAdvancedOptionsToggle?.(newState);
@@ -218,9 +220,11 @@ function ConnectionForm({ initialConnectionInfo, connectionErrorMessage, disable
         ];
     }, [_warnings, forceConnectionOptions]);
     const connectionStringInvalidError = errors.find((error) => error.fieldName === 'connectionString');
-    const getConnectionInfoToSave = (0, react_1.useCallback)((favoriteInfo) => ({
+    const [connectionStringUrl] = (0, react_1.useMemo)(() => (0, connection_string_helpers_1.tryToParseConnectionString)(connectionOptions.connectionString), [connectionOptions.connectionString]);
+    const getConnectionInfoToSave = (0, react_1.useCallback)(async (favoriteInfo) => ({
         ...(0, lodash_1.cloneDeep)(initialConnectionInfo),
-        connectionOptions: (0, lodash_1.cloneDeep)(connectionOptions),
+        // Encrypted field maps typed in the form are only parsed here
+        connectionOptions: await (0, csfle_handler_1.adjustCSFLEParams)(connectionOptions),
         savedConnectionType: personalizationOptions.isFavorite
             ? 'favorite'
             : 'recent',
@@ -245,11 +249,12 @@ function ConnectionForm({ initialConnectionInfo, connectionErrorMessage, disable
             ]);
         }
     }, [onSaveClicked, setErrors]);
-    const onSubmitForm = (0, react_1.useCallback)((intendedAction) => {
-        const updatedConnectionOptions = (0, lodash_1.cloneDeep)(connectionOptions);
+    const onSubmitForm = (0, react_1.useCallback)(async (intendedAction) => {
+        const connectionInfoToSave = await getConnectionInfoToSave();
+        const updatedConnectionOptions = connectionInfoToSave.connectionOptions;
         // TODO: this method throws on malformed connection strings instead of
         // returning errors
-        const formErrors = (0, validation_1.validateConnectionOptionsErrors)(updatedConnectionOptions);
+        const formErrors = (0, validation_1.validateConnectionOptionsErrors)(updatedConnectionOptions, undefined, { isAtlas });
         if (formErrors.length) {
             setErrors(formErrors);
             return;
@@ -258,8 +263,7 @@ function ConnectionForm({ initialConnectionInfo, connectionErrorMessage, disable
             // The user explicitly clicked connect, so we use that.
             onConnectClicked?.({
                 ...initialConnectionInfo,
-                ...getConnectionInfoToSave(),
-                connectionOptions: updatedConnectionOptions,
+                ...connectionInfoToSave,
             });
         }
         else {
@@ -267,24 +271,23 @@ function ConnectionForm({ initialConnectionInfo, connectionErrorMessage, disable
                 // If there is a save&connect button, we use that action by default.
                 onSaveAndConnectClicked?.({
                     ...initialConnectionInfo,
-                    ...getConnectionInfoToSave(),
-                    connectionOptions: updatedConnectionOptions,
+                    ...connectionInfoToSave,
                 });
             }
             else {
                 // If there isn't a save&connect button then the next default action
                 // should be to save.
-                void callOnSaveConnectionClickedAndStoreErrors?.(getConnectionInfoToSave());
+                void callOnSaveConnectionClickedAndStoreErrors?.(connectionInfoToSave);
             }
         }
     }, [
-        connectionOptions,
         setErrors,
         onConnectClicked,
         initialConnectionInfo,
         getConnectionInfoToSave,
         callOnSaveConnectionClickedAndStoreErrors,
         onSaveAndConnectClicked,
+        isAtlas,
     ]);
     const showPersonalisationForm = (0, use_connect_form_settings_1.useConnectionFormSetting)('showPersonalisationForm');
     const showHelpCardsInForm = (0, use_connect_form_settings_1.useConnectionFormSetting)('showHelpCardsInForm');
@@ -300,41 +303,65 @@ function ConnectionForm({ initialConnectionInfo, connectionErrorMessage, disable
         react_1.default.createElement("form", { role: "form", className: formStyles, onSubmit: (e) => {
                 // Prevent default html page refresh.
                 e.preventDefault();
-                onSubmitForm();
+                void onSubmitForm();
             }, 
             // Prevent default html tooltip popups.
             noValidate: true },
             react_1.default.createElement("div", { className: formHeaderStyles },
                 react_1.default.createElement("div", { className: formHeaderContentStyles },
-                    react_1.default.createElement(compass_components_1.H3, { className: headingWithHiddenButtonStyles }, (initialConnectionInfo.favorite?.name ?? 'New Connection') ||
-                        'Edit Connection'),
-                    react_1.default.createElement(compass_components_1.Description, { className: descriptionStyles }, "Manage your connection settings"))),
+                    react_1.default.createElement(compass_components_1.H3, { className: headingWithHiddenButtonStyles }, isAtlas
+                        ? 'Edit Connection'
+                        : (initialConnectionInfo.favorite?.name ?? 'New Connection') ||
+                            'Edit Connection'),
+                    react_1.default.createElement(compass_components_1.Description, { className: descriptionStyles }, isAtlas
+                        ? 'Manage your connection settings. Changes are not preserved across sessions.'
+                        : 'Manage your connection settings'))),
             react_1.default.createElement("div", { className: formContentContainerStyles },
                 react_1.default.createElement("div", { className: formContentStyles },
                     disableEditingConnectedConnection && onDisconnectClicked && (react_1.default.createElement(compass_components_1.Banner, { "data-testid": "disabled-connected-connection-banner", className: bannerStyles },
                         react_1.default.createElement("div", { className: disabledConnectedConnectionContentStyles },
-                            react_1.default.createElement("div", null, "While connected, you may only personalize your connection's name, color or favorite status. To fully configure it, you must first disconnect. Beware that disconnecting might cause work in progress to be lost."),
+                            react_1.default.createElement("div", null,
+                                isAtlas
+                                    ? 'To change the read preference, you must first disconnect.'
+                                    : "While connected, you may only personalize your connection's name, color or favorite status. To fully configure it, you must first disconnect.",
+                                ' ',
+                                "Beware that disconnecting might cause work in progress to be lost."),
                             react_1.default.createElement("div", null,
                                 react_1.default.createElement(compass_components_1.Button, { size: "small", leftGlyph: react_1.default.createElement(compass_components_1.Icon, { glyph: "Disconnect" }), onClick: onDisconnectClicked }, "Disconnect"))))),
-                    protectConnectionStrings && !disableEditingConnectedConnection && (react_1.default.createElement(compass_components_1.Banner, { "data-testid": "protect-connection-strings-banner", className: bannerStyles }, "Advanced Connection Options are hidden while the \"Protect Connection String Secrets\" setting is enabled. Disable the setting to configure Advanced Connection Options or edit your connection string.")),
-                    react_1.default.createElement(connection_string_input_1.default, { connectionString: connectionOptions.connectionString, enableEditingConnectionString: enableEditingConnectionString, disableEditingConnectedConnection: !!disableEditingConnectedConnection, setEnableEditingConnectionString: setEnableEditingConnectionString, onSubmit: onSubmitForm, updateConnectionFormField: updateConnectionFormField, protectConnectionStrings: protectConnectionStrings }),
-                    connectionStringInvalidError && (react_1.default.createElement(compass_components_1.Banner, { className: connectionStringErrorStyles, variant: compass_components_1.BannerVariant.Danger }, connectionStringInvalidError.message)),
-                    showPersonalisationForm && (react_1.default.createElement(ConnectionPersonalizationForm, { personalizationOptions: personalizationOptions, updateConnectionFormField: updateConnectionFormField })),
-                    !(protectConnectionStrings || disableEditingConnectedConnection) && (react_1.default.createElement(advanced_connection_options_1.default, { open: advancedOpen, setOpen: onAdvancedChange, errors: connectionStringInvalidError ? [] : errors, disabled: !!(connectionStringInvalidError ||
-                            disableEditingConnectedConnection), updateConnectionFormField: updateConnectionFormField, connectionOptions: connectionOptions, openSettingsModal: openSettingsModal }))),
+                    isAtlas ? (!disableEditingConnectedConnection &&
+                        connectionStringUrl && (react_1.default.createElement(read_preference_form_1.default, { errors: errors, connectionStringUrl: connectionStringUrl, updateConnectionFormField: updateConnectionFormField }))) : (react_1.default.createElement(react_1.default.Fragment, null,
+                        protectConnectionStrings &&
+                            !disableEditingConnectedConnection && (react_1.default.createElement(compass_components_1.Banner, { "data-testid": "protect-connection-strings-banner", className: bannerStyles }, "Advanced Connection Options are hidden while the \"Protect Connection String Secrets\" setting is enabled. Disable the setting to configure Advanced Connection Options or edit your connection string.")),
+                        react_1.default.createElement(connection_string_input_1.default, { connectionString: connectionOptions.connectionString, enableEditingConnectionString: enableEditingConnectionString, disableEditingConnectedConnection: !!disableEditingConnectedConnection, setEnableEditingConnectionString: setEnableEditingConnectionString, onSubmit: () => void onSubmitForm(), updateConnectionFormField: updateConnectionFormField, protectConnectionStrings: protectConnectionStrings }),
+                        connectionStringInvalidError && (react_1.default.createElement(compass_components_1.Banner, { className: connectionStringErrorStyles, variant: compass_components_1.BannerVariant.Danger }, connectionStringInvalidError.message)),
+                        showPersonalisationForm && (react_1.default.createElement(ConnectionPersonalizationForm, { personalizationOptions: personalizationOptions, updateConnectionFormField: updateConnectionFormField })),
+                        !(protectConnectionStrings || disableEditingConnectedConnection) && (react_1.default.createElement(advanced_connection_options_1.default, { open: advancedOpen, setOpen: onAdvancedChange, errors: connectionStringInvalidError ? [] : errors, disabled: !!(connectionStringInvalidError ||
+                                disableEditingConnectedConnection), updateConnectionFormField: updateConnectionFormField, connectionOptions: connectionOptions, openSettingsModal: openSettingsModal }))))),
                 showHelpCardsInForm && (react_1.default.createElement("div", { className: formHelpContainerStyles },
                     react_1.default.createElement(form_help_1.default, null)))),
             react_1.default.createElement("div", { className: (0, compass_components_1.cx)(formFooterStyles, isDarkMode
                     ? formFooterBorderDarkModeStyles
                     : formFooterBorderLightModeStyles) },
-                react_1.default.createElement(connection_form_modal_actions_1.ConnectionFormModalActions, { errors: connectionStringInvalidError ? [] : errors, warnings: connectionStringInvalidError ? [] : warnings, onCancel: onCancel, onSave: onSaveClicked
-                        ? () => void callOnSaveConnectionClickedAndStoreErrors?.(getConnectionInfoToSave())
-                        : undefined, onConnect: onConnectClicked ? () => onSubmitForm('connect') : undefined, onSaveAndConnect: onSaveAndConnectClicked
-                        ? () => onSubmitForm('save-and-connect')
+                react_1.default.createElement(connection_form_modal_actions_1.ConnectionFormModalActions, { errors: connectionStringInvalidError ? [] : errors, warnings: connectionStringInvalidError ? [] : warnings, onCancel: onCancel, onSave: onSaveClicked && !isAtlas
+                        ? () => void getConnectionInfoToSave().then(callOnSaveConnectionClickedAndStoreErrors)
+                        : undefined, onConnect: onConnectClicked && !isAtlas
+                        ? () => void onSubmitForm('connect')
+                        : undefined, onSaveAndConnect: onSaveAndConnectClicked
+                        ? () => void onSubmitForm('save-and-connect')
                         : undefined })))));
     /* eslint-enable jsx-a11y/no-redundant-roles */
 }
+// Atlas connections come from the Atlas API and only last for the session, so
+// read preference is the only thing users can change and there is nothing to
+// name, favorite or save.
+const atlasConnectionSettings = {
+    showPersonalisationForm: false,
+    showFavoriteActions: false,
+    showHelpCardsInForm: false,
+    saveAndConnectLabel: 'Connect',
+};
 const ConnectionFormWithSettings = ({ showFavoriteActions, showHelpCardsInForm, showPersonalisationForm, protectConnectionStrings, forceConnectionOptions, showKerberosPasswordField, showOIDCDeviceAuthFlow, enableOidc, enableDebugUseCsfleSchemaMap, protectConnectionStringsForNewConnections, showOIDCAuth, showKerberosAuth, showCSFLE, showProxySettings, saveAndConnectLabel, ...rest }) => {
+    const isAtlas = !!rest.initialConnectionInfo.atlasMetadata;
     const value = (0, react_1.useMemo)(() => ({
         showFavoriteActions,
         showHelpCardsInForm,
@@ -351,6 +378,7 @@ const ConnectionFormWithSettings = ({ showFavoriteActions, showHelpCardsInForm,
         showCSFLE,
         showProxySettings,
         saveAndConnectLabel,
+        ...(isAtlas && atlasConnectionSettings),
     }), [
         showFavoriteActions,
         showHelpCardsInForm,
@@ -367,6 +395,7 @@ const ConnectionFormWithSettings = ({ showFavoriteActions, showHelpCardsInForm,
         showCSFLE,
         showProxySettings,
         saveAndConnectLabel,
+        isAtlas,
     ]);
     return (react_1.default.createElement(use_connect_form_settings_1.ConnectionFormSettingsContext.Provider, { value: value },
         react_1.default.createElement(ConnectionForm, { ...rest })));

package/dist/hooks/use-connect-form.d.ts

@@ -4,6 +4,7 @@ import type { MongoClientOptions, AuthMechanismProperties } from 'mongodb';
 import type { ConnectionFormError, ConnectionFormWarning } from '../utils/validation';
 import type { UpdateSshOptions } from '../utils/connection-ssh-handler';
 import type { UpdateTlsAction, UpdateTlsOptionAction } from '../utils/tls-handler';
+import type { UpdateReadPreferenceAction } from '../utils/read-preference-handler';
 import type { UpdateAuthMechanismAction, UpdatePasswordAction, UpdateUsernameAction } from '../utils/authentication-handler';
 import type { UpdateCsfleStoreCredentialsAction, UpdateCsfleAction, UpdateCsfleKmsAction, UpdateCsfleKmsTlsAction, AddCsfleProviderAction, RemoveCsfleProviderAction, RenameCsfleProviderAction } from '../utils/csfle-handler';
 import type { UpdateOIDCAction } from '../utils/oidc-handler';
@@ -55,7 +56,7 @@ type ConnectionFormFieldActions = UpdateConnectionStringAction | {
 } | {
     type: 'delete-search-param';
     key: keyof MongoClientOptions;
-} | {
+} | UpdateReadPreferenceAction | {
     type: 'update-auth-mechanism-property';
     key: keyof AuthMechanismProperties & string;
     value?: string;
@@ -99,6 +100,6 @@ export declare function adjustConnectionOptionsBeforeConnect({ connectionOptions
         telemetryAnonymousId?: string;
         forceConnectionOptions: [string, string][];
     };
-}): ConnectionOptions;
+}): Promise<ConnectionOptions>;
 export {};
 //# sourceMappingURL=use-connect-form.d.ts.map

package/dist/hooks/use-connect-form.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-connect-form.d.ts","sourceRoot":"","sources":["../../src/hooks/use-connect-form.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-connect-form.d.ts","sourceRoot":"","sources":["../../src/hooks/use-connect-form.ts"],"names":[],"mappings":"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"}

package/dist/hooks/use-connect-form.js

@@ -9,6 +9,8 @@ exports.useConnectForm = useConnectForm;
 exports.adjustConnectionOptionsBeforeConnect = adjustConnectionOptionsBeforeConnect;
 const react_1 = require("react");
 const lodash_1 = require("lodash");
+const mongodb_connection_string_url_1 = __importDefault(require("mongodb-connection-string-url"));
+const mongodb_build_info_1 = require("@mongodb-js/mongodb-build-info");
 const validation_1 = require("../utils/validation");
 const get_next_host_1 = require("../utils/get-next-host");
 const default_connection_1 = require("../constants/default-connection");
@@ -16,6 +18,7 @@ const check_for_invalid_character_in_host_1 = require("../utils/check-for-invali
 const connection_string_schema_1 = require("../utils/connection-string-schema");
 const connection_ssh_handler_1 = require("../utils/connection-ssh-handler");
 const tls_handler_1 = require("../utils/tls-handler");
+const read_preference_handler_1 = require("../utils/read-preference-handler");
 const authentication_handler_1 = require("../utils/authentication-handler");
 const connection_string_helpers_1 = require("../utils/connection-string-helpers");
 const csfle_handler_1 = require("../utils/csfle-handler");
@@ -23,8 +26,6 @@ const oidc_handler_1 = require("../utils/oidc-handler");
 const set_app_name_if_missing_1 = require("../utils/set-app-name-if-missing");
 const force_connection_options_1 = require("../utils/force-connection-options");
 const use_connect_form_settings_1 = require("./use-connect-form-settings");
-const mongodb_connection_string_url_1 = __importDefault(require("mongodb-connection-string-url"));
-const mongodb_build_info_1 = require("mongodb-build-info");
 function connectFormReducer(state, action) {
     switch (action.type) {
         case 'set-connection-form-state':
@@ -81,7 +82,9 @@ function buildStateFromConnectionInfo(initialConnectionInfo) {
         warnings: errors?.length
             ? []
             : (0, validation_1.validateConnectionOptionsWarnings)(initialConnectionInfo.connectionOptions),
-        connectionOptions: (0, csfle_handler_1.adjustCSFLEParams)((0, lodash_1.cloneDeep)(initialConnectionInfo.connectionOptions)),
+        // Encrypted field maps keep their raw text here, they are parsed (which
+        // is async) when saving or connecting
+        connectionOptions: (0, lodash_1.cloneDeep)(initialConnectionInfo.connectionOptions),
         isDirty: false,
         personalizationOptions: {
             color: initialConnectionInfo.favorite?.color || undefined,
@@ -237,6 +240,13 @@ function handleConnectionFormFieldUpdate(action, currentConnectionOptions, curre
                 connectionOptions: currentConnectionOptions,
             });
         }
+        case 'update-read-preference': {
+            return (0, read_preference_handler_1.handleUpdateReadPreference)({
+                action,
+                connectionStringUrl: parsedConnectionStringUrl,
+                connectionOptions: currentConnectionOptions,
+            });
+        }
         case 'update-auth-mechanism': {
             return (0, authentication_handler_1.handleUpdateAuthMechanism)({
                 action,
@@ -517,9 +527,9 @@ function setInitialState({ connectionErrorMessage, initialConnectionInfo, setErr
         }
     }, [setErrors, connectionErrorMessage]);
 }
-function adjustConnectionOptionsBeforeConnect({ connectionOptions, connectionId, defaultAppName, notifyDeviceFlow, preferences, }) {
+async function adjustConnectionOptionsBeforeConnect({ connectionOptions, connectionId, defaultAppName, notifyDeviceFlow, preferences, }) {
+    connectionOptions = await (0, csfle_handler_1.adjustCSFLEParams)(connectionOptions);
     const transformers = [
-        csfle_handler_1.adjustCSFLEParams,
         csfle_handler_1.unsetFleOptionsIfEmptyAutoEncryption,
         (0, set_app_name_if_missing_1.setAppNameParamIfMissing)({
             defaultAppName,

package/dist/utils/authentication-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authentication-handler.d.ts","sourceRoot":"","sources":["../../src/utils/authentication-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,mBAAmB,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAsB,MAAM,SAAS,CAAC;AAEjE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAQxD,MAAM,MAAM,yBAAyB,GAAG;IACtC,IAAI,EAAE,uBAAuB,CAAC;IAC9B,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,iBAAiB,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AACF,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,iBAAiB,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,wBAAgB,2BAA2B,CACzC,mBAAmB,EAAE,mBAAmB,GACvC,mBAAmB,CAkBrB;AAED,wBAAgB,yBAAyB,CAAC,EACxC,MAAM,EACN,mBAAmB,EACnB,iBAAiB,GAClB,EAAE;IACD,MAAM,EAAE,yBAAyB,CAAC;IAClC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,iBAAiB,EAAE,iBAAiB,CAAC;CACtC,GAAG;IACF,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,MAAM,CAAC,EAAE,mBAAmB,EAAE,CAAC;CAChC,CA2BA;AAED,wBAAgB,oBAAoB,CAAC,EACnC,MAAM,EACN,mBAAmB,EACnB,iBAAiB,GAClB,EAAE;IACD,MAAM,EAAE,oBAAoB,CAAC;IAC7B,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,iBAAiB,EAAE,iBAAiB,CAAC;CACtC,GAAG;IACF,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,MAAM,CAAC,EAAE,mBAAmB,EAAE,CAAC;CAChC,CA6BA;AAED,wBAAgB,oBAAoB,CAAC,EACnC,MAAM,EACN,mBAAmB,EACnB,iBAAiB,GAClB,EAAE;IACD,MAAM,EAAE,oBAAoB,CAAC;IAC7B,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,iBAAiB,EAAE,iBAAiB,CAAC;CACtC,GAAG;IACF,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,MAAM,CAAC,EAAE,mBAAmB,EAAE,CAAC;CAChC,CA6BA"}
+{"version":3,"file":"authentication-handler.d.ts","sourceRoot":"","sources":["../../src/utils/authentication-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,mBAAmB,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAsB,MAAM,SAAS,CAAC;AAGjE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAOxD,MAAM,MAAM,yBAAyB,GAAG;IACtC,IAAI,EAAE,uBAAuB,CAAC;IAC9B,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,iBAAiB,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AACF,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,iBAAiB,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,wBAAgB,2BAA2B,CACzC,mBAAmB,EAAE,mBAAmB,GACvC,mBAAmB,CAkBrB;AAED,wBAAgB,yBAAyB,CAAC,EACxC,MAAM,EACN,mBAAmB,EACnB,iBAAiB,GAClB,EAAE;IACD,MAAM,EAAE,yBAAyB,CAAC;IAClC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,iBAAiB,EAAE,iBAAiB,CAAC;CACtC,GAAG;IACF,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,MAAM,CAAC,EAAE,mBAAmB,EAAE,CAAC;CAChC,CA2BA;AAED,wBAAgB,oBAAoB,CAAC,EACnC,MAAM,EACN,mBAAmB,EACnB,iBAAiB,GAClB,EAAE;IACD,MAAM,EAAE,oBAAoB,CAAC;IAC7B,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,iBAAiB,EAAE,iBAAiB,CAAC;CACtC,GAAG;IACF,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,MAAM,CAAC,EAAE,mBAAmB,EAAE,CAAC;CAChC,CA6BA;AAED,wBAAgB,oBAAoB,CAAC,EACnC,MAAM,EACN,mBAAmB,EACnB,iBAAiB,GAClB,EAAE;IACD,MAAM,EAAE,oBAAoB,CAAC;IAC7B,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,iBAAiB,EAAE,iBAAiB,CAAC;CACtC,GAAG;IACF,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,MAAM,CAAC,EAAE,mBAAmB,EAAE,CAAC;CAChC,CA6BA"}

package/dist/utils/authentication-handler.js

@@ -4,8 +4,8 @@ exports.getConnectionUrlWithoutAuth = getConnectionUrlWithoutAuth;
 exports.handleUpdateAuthMechanism = handleUpdateAuthMechanism;
 exports.handleUpdateUsername = handleUpdateUsername;
 exports.handleUpdatePassword = handleUpdatePassword;
-const connection_string_helpers_1 = require("./connection-string-helpers");
 const lodash_1 = require("lodash");
+const connection_string_helpers_1 = require("./connection-string-helpers");
 function getConnectionUrlWithoutAuth(connectionStringUrl) {
     const updatedConnectionString = connectionStringUrl.clone();
     const updatedSearchParams = updatedConnectionString.typedSearchParams();

package/dist/utils/connection-ssh-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection-ssh-handler.d.ts","sourceRoot":"","sources":["../../src/utils/connection-ssh-handler.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAG9D,MAAM,MAAM,oBAAoB,GAAG,WAAW,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC,CAAC;AAE/E,MAAM,MAAM,UAAU,GAClB,MAAM,GACN,cAAc,GACd,cAAc,GACd,OAAO,GACP,WAAW,CAAC;AAEhB,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,oBAAoB,CAAC;IAC3B,GAAG,EAAE,MAAM,oBAAoB,CAAC;IAChC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;CACpC;AAED,wBAAgB,sBAAsB,CAAC,EACrC,MAAM,EACN,iBAAiB,GAClB,EAAE;IACD,MAAM,EAAE,gBAAgB,CAAC;IACzB,iBAAiB,EAAE,iBAAiB,CAAC;CACtC,GAAG;IAAE,iBAAiB,EAAE,iBAAiB,CAAA;CAAE,CAe3C"}
+{"version":3,"file":"connection-ssh-handler.d.ts","sourceRoot":"","sources":["../../src/utils/connection-ssh-handler.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAG9D,MAAM,MAAM,oBAAoB,GAAG,WAAW,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC,CAAC;AAE/E,MAAM,MAAM,UAAU,GACpB,MAAM,GAAG,cAAc,GAAG,cAAc,GAAG,OAAO,GAAG,WAAW,CAAC;AAEnE,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,oBAAoB,CAAC;IAC3B,GAAG,EAAE,MAAM,oBAAoB,CAAC;IAChC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;CACpC;AAED,wBAAgB,sBAAsB,CAAC,EACrC,MAAM,EACN,iBAAiB,GAClB,EAAE;IACD,MAAM,EAAE,gBAAgB,CAAC;IACzB,iBAAiB,EAAE,iBAAiB,CAAC;CACtC,GAAG;IAAE,iBAAiB,EAAE,iBAAiB,CAAA;CAAE,CAe3C"}

package/dist/utils/csfle-handler.d.ts

@@ -63,9 +63,10 @@ export declare function handleUpdateCsfleKmsTlsParam<T extends KMSTLSProviderTyp
 };
 export declare function unsetFleOptionsIfEmptyAutoEncryption(connectionOptions: Readonly<ConnectionOptions>): ConnectionOptions;
 export declare function hasAnyCsfleOption(o: Readonly<AutoEncryptionOptions>): boolean;
-export declare function textToEncryptedFieldConfig(text: string): Document | undefined;
+export declare function textToEncryptedFieldConfig(text: string): Promise<Document | undefined>;
+export declare function textToUnparsedEncryptedFieldConfig(text: string): Document | undefined;
 export declare function encryptedFieldConfigToText(config: Readonly<Document> | undefined): string;
-export declare function adjustCSFLEParams(connectionOptions: Readonly<ConnectionOptions>): ConnectionOptions;
+export declare function adjustCSFLEParams(connectionOptions: Readonly<ConnectionOptions>): Promise<ConnectionOptions>;
 export declare function randomLocalKey(): string;
 export declare function handleAddKmsProvider<T extends KMSProviderType>({ action, connectionOptions, }: {
     action: AddCsfleProviderAction<T>;

package/dist/utils/csfle-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"csfle-handler.d.ts","sourceRoot":"","sources":["../../src/utils/csfle-handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"csfle-handler.d.ts","sourceRoot":"","sources":["../../src/utils/csfle-handler.ts"],"names":[],"mappings":"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"}

package/dist/utils/csfle-handler.js

@@ -40,6 +40,7 @@ exports.handleUpdateCsfleKmsTlsParam = handleUpdateCsfleKmsTlsParam;
 exports.unsetFleOptionsIfEmptyAutoEncryption = unsetFleOptionsIfEmptyAutoEncryption;
 exports.hasAnyCsfleOption = hasAnyCsfleOption;
 exports.textToEncryptedFieldConfig = textToEncryptedFieldConfig;
+exports.textToUnparsedEncryptedFieldConfig = textToUnparsedEncryptedFieldConfig;
 exports.encryptedFieldConfigToText = encryptedFieldConfigToText;
 exports.adjustCSFLEParams = adjustCSFLEParams;
 exports.randomLocalKey = randomLocalKey;
@@ -47,7 +48,6 @@ exports.handleAddKmsProvider = handleAddKmsProvider;
 exports.handleRenameKmsProvider = handleRenameKmsProvider;
 exports.handleRemoveKmsProvider = handleRemoveKmsProvider;
 const lodash_1 = require("lodash");
-const mongodb_query_parser_1 = require("mongodb-query-parser");
 const shell_bson_parser_1 = __importStar(require("@mongodb-js/shell-bson-parser"));
 const DEFAULT_FLE_OPTIONS = {
     storeCredentials: false,
@@ -208,7 +208,7 @@ function hasAnyCsfleOption(o) {
             .flatMap((o) => Object.values(o ?? {}))
             .filter(Boolean).length > 0);
 }
-function textToEncryptedFieldConfig(text) {
+async function textToEncryptedFieldConfig(text) {
     if (!text.trim()) {
         return undefined;
     }
@@ -217,7 +217,7 @@ function textToEncryptedFieldConfig(text) {
     // those never contain `$`.
     let parsed = {};
     try {
-        parsed = (0, shell_bson_parser_1.default)(text, {
+        parsed = await (0, shell_bson_parser_1.default)(text, {
             mode: shell_bson_parser_1.ParseMode.Strict,
         });
         if (!parsed || typeof parsed !== 'object') {
@@ -239,6 +239,13 @@ function textToEncryptedFieldConfig(text) {
     parsed['$compass.rawText'] = text;
     return parsed;
 }
+// Same shape that saved connections use, adjustCSFLEParams parses it later
+function textToUnparsedEncryptedFieldConfig(text) {
+    if (!text.trim()) {
+        return undefined;
+    }
+    return { '$compass.error': null, '$compass.rawText': text };
+}
 function encryptedFieldConfigToText(config) {
     if (!config) {
         return '';
@@ -247,20 +254,20 @@ function encryptedFieldConfigToText(config) {
         return config['$compass.rawText'];
     }
     const withoutCompassKeys = Object.fromEntries(Object.entries(config).filter(([key]) => !key.startsWith('$compass.')));
-    return (0, mongodb_query_parser_1.toJSString)(withoutCompassKeys) || '';
+    return (0, shell_bson_parser_1.toJSString)(withoutCompassKeys) || '';
 }
 // The CSFLE encryptedFieldConfigMap contains BSON values, including
 // UUIDs, which are not serialized correctly by the connection model.
 // To account for this, we regenerate the actual values from its
 // text representation on connection form load.
-function adjustCSFLEParams(connectionOptions) {
+async function adjustCSFLEParams(connectionOptions) {
     connectionOptions = (0, lodash_1.cloneDeep)(connectionOptions);
     const autoEncryptionOptions = connectionOptions.fleOptions?.autoEncryption;
     if (autoEncryptionOptions?.schemaMap?.['$compass.error'] === null) {
-        autoEncryptionOptions.schemaMap = textToEncryptedFieldConfig(autoEncryptionOptions.schemaMap['$compass.rawText']);
+        autoEncryptionOptions.schemaMap = await textToEncryptedFieldConfig(autoEncryptionOptions.schemaMap['$compass.rawText']);
     }
     if (autoEncryptionOptions?.encryptedFieldsMap?.['$compass.error'] === null) {
-        autoEncryptionOptions.encryptedFieldsMap = textToEncryptedFieldConfig(autoEncryptionOptions.encryptedFieldsMap['$compass.rawText']);
+        autoEncryptionOptions.encryptedFieldsMap = await textToEncryptedFieldConfig(autoEncryptionOptions.encryptedFieldsMap['$compass.rawText']);
     }
     return connectionOptions;
 }

package/dist/utils/csfle-kms-fields.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"csfle-kms-fields.d.ts","sourceRoot":"","sources":["../../src/utils/csfle-kms-fields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAExD,YAAY,EACV,0BAA0B,EAC1B,YAAY,EACZ,6BAA6B,GAC9B,MAAM,SAAS,CAAC;AACjB,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,GAAG,KAAK,CAAC;AACpD,MAAM,MAAM,SAAS,CAAC,WAAW,SAAS,eAAe,IAAI,WAAW,CACtE,WAAW,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CACvC,CAAC;AACF,MAAM,MAAM,eAAe,GAAG,OAAO,CACnC,MAAM,YAAY,EAClB,KAAK,GAAG,KAAK,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,CAC3C,CAAC;AACF,MAAM,MAAM,eAAe,CAAC,CAAC,SAAS,eAAe,IAAI,CAAC,GAAG,GAAG,CAAC,IAAI,MAAM,EAAE,CAAC;AAC9E,MAAM,MAAM,kBAAkB,GAAG,eAAe,CAAC;AACjD,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,eAAe,IAAI,eAAe,CAAC,CAAC,CAAC,CAAC;AAE/E,MAAM,WAAW,QAAQ,CAAC,CAAC,SAAS,eAAe;IACjD,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,UAAU,GAAG,MAAM,GAAG,UAAU,CAAC;IACvC,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,CACL,cAAc,EAAE;QAAE,YAAY,CAAC,EAAE,YAAY,CAAA;KAAE,EAC/C,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC,KAChC,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,CACb,MAAM,EAAE,mBAAmB,EAAE,EAC7B,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC,KAChC,MAAM,GAAG,SAAS,CAAC;IACxB,KAAK,EACD,OAAO,GACP,MAAM,GACN,CAAC,CAAC,MAAM,EAAE,mBAAmB,EAAE,KAAK,OAAO,GAAG,MAAM,CAAC,CAAC;IAC1D,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAqKD,eAAO,MAAM,iBAAiB;;;;;;CAM7B,CAAC"}
+{"version":3,"file":"csfle-kms-fields.d.ts","sourceRoot":"","sources":["../../src/utils/csfle-kms-fields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAGxD,YAAY,EACV,0BAA0B,EAC1B,YAAY,EACZ,6BAA6B,GAC9B,MAAM,SAAS,CAAC;AACjB,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,GAAG,KAAK,CAAC;AACpD,MAAM,MAAM,SAAS,CAAC,WAAW,SAAS,eAAe,IAAI,WAAW,CACtE,WAAW,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CACvC,CAAC;AACF,MAAM,MAAM,eAAe,GAAG,OAAO,CACnC,MAAM,YAAY,EAClB,KAAK,GAAG,KAAK,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,CAC3C,CAAC;AACF,MAAM,MAAM,eAAe,CAAC,CAAC,SAAS,eAAe,IAAI,CAAC,GAAG,GAAG,CAAC,IAAI,MAAM,EAAE,CAAC;AAC9E,MAAM,MAAM,kBAAkB,GAAG,eAAe,CAAC;AACjD,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,eAAe,IAAI,eAAe,CAAC,CAAC,CAAC,CAAC;AAE/E,MAAM,WAAW,QAAQ,CAAC,CAAC,SAAS,eAAe;IACjD,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,UAAU,GAAG,MAAM,GAAG,UAAU,CAAC;IACvC,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,CACL,cAAc,EAAE;QAAE,YAAY,CAAC,EAAE,YAAY,CAAA;KAAE,EAC/C,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC,KAChC,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,CACb,MAAM,EAAE,mBAAmB,EAAE,EAC7B,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC,KAChC,MAAM,GAAG,SAAS,CAAC;IACxB,KAAK,EACH,OAAO,GAAG,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,mBAAmB,EAAE,KAAK,OAAO,GAAG,MAAM,CAAC,CAAC;IAC3E,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAqKD,eAAO,MAAM,iBAAiB;;;;;;CAM7B,CAAC"}

package/dist/utils/read-preference-handler.d.ts

@@ -0,0 +1,18 @@
+import type ConnectionStringUrl from 'mongodb-connection-string-url';
+import type { ConnectionOptions } from 'mongodb-data-service';
+import type { ReadPreferenceMode } from 'mongodb';
+export interface UpdateReadPreferenceAction {
+    type: 'update-read-preference';
+    mode?: ReadPreferenceMode;
+    tagSets: string[];
+    maxStalenessSeconds?: string;
+}
+export declare function supportsReadPreferenceOptions(mode: string | null | undefined): boolean;
+export declare function handleUpdateReadPreference({ action, connectionStringUrl, connectionOptions, }: {
+    action: UpdateReadPreferenceAction;
+    connectionStringUrl: ConnectionStringUrl;
+    connectionOptions: ConnectionOptions;
+}): {
+    connectionOptions: ConnectionOptions;
+};
+//# sourceMappingURL=read-preference-handler.d.ts.map

package/dist/utils/read-preference-handler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"read-preference-handler.d.ts","sourceRoot":"","sources":["../../src/utils/read-preference-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,mBAAmB,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,KAAK,EAAsB,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAGtE,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,wBAAwB,CAAC;IAC/B,IAAI,CAAC,EAAE,kBAAkB,CAAC;IAI1B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAC9B,OAAO,CAET;AAED,wBAAgB,0BAA0B,CAAC,EACzC,MAAM,EACN,mBAAmB,EACnB,iBAAiB,GAClB,EAAE;IACD,MAAM,EAAE,0BAA0B,CAAC;IACnC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,iBAAiB,EAAE,iBAAiB,CAAC;CACtC,GAAG;IACF,iBAAiB,EAAE,iBAAiB,CAAC;CACtC,CAmCA"}

package/dist/utils/read-preference-handler.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.supportsReadPreferenceOptions = supportsReadPreferenceOptions;
+exports.handleUpdateReadPreference = handleUpdateReadPreference;
+const lodash_1 = require("lodash");
+function supportsReadPreferenceOptions(mode) {
+    return !!mode && mode !== 'primary';
+}
+function handleUpdateReadPreference({ action, connectionStringUrl, connectionOptions, }) {
+    const updatedConnectionString = connectionStringUrl.clone();
+    const updatedSearchParams = updatedConnectionString.typedSearchParams();
+    if (action.mode) {
+        updatedSearchParams.set('readPreference', action.mode);
+    }
+    else {
+        updatedSearchParams.delete('readPreference');
+    }
+    updatedSearchParams.delete('readPreferenceTags');
+    updatedSearchParams.delete('maxStalenessSeconds');
+    if (supportsReadPreferenceOptions(action.mode)) {
+        const hasTagSets = action.tagSets.some((tagSet) => tagSet !== '');
+        if (hasTagSets) {
+            for (const tagSet of action.tagSets) {
+                updatedSearchParams.append('readPreferenceTags', tagSet);
+            }
+        }
+        if (action.maxStalenessSeconds) {
+            updatedSearchParams.set('maxStalenessSeconds', action.maxStalenessSeconds);
+        }
+    }
+    return {
+        connectionOptions: {
+            ...(0, lodash_1.cloneDeep)(connectionOptions),
+            connectionString: updatedConnectionString.toString(),
+        },
+    };
+}

package/dist/utils/url-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"url-options.d.ts","sourceRoot":"","sources":["../../src/utils/url-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAElD,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,kBAAkB,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,kBAAkB;;;GAmD9B,CAAC"}
+{"version":3,"file":"url-options.d.ts","sourceRoot":"","sources":["../../src/utils/url-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAElD,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,kBAAkB,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,kBAAkB;;;GA+C9B,CAAC"}

package/dist/utils/url-options.js

@@ -28,10 +28,6 @@ exports.editableUrlOptions = [
         title: 'Read Concern Options',
         values: ['readConcernLevel'],
     },
-    {
-        title: 'Read Preferences Options',
-        values: ['maxStalenessSeconds', 'readPreferenceTags'],
-    },
     {
         title: 'Server Options',
         values: [

package/dist/utils/validation.d.ts

@@ -1,7 +1,7 @@
 import type { ConnectionOptions } from 'mongodb-data-service';
 import ConnectionString from 'mongodb-connection-string-url';
 import type { ConnectionStringParsingOptions } from 'mongodb-connection-string-url';
-export type FieldName = 'connectionString' | 'hostname' | 'hosts' | 'isSrv' | 'kerberosPrincipal' | 'keyVaultNamespace' | 'kmip.endpoint' | `kmip:${string}.endpoint` | 'local.key' | `local:${string}.key` | 'password' | 'schema' | 'proxyHostname' | 'schemaMap' | 'encryptedFieldsMap' | 'sshHostname' | 'sshIdentityKeyFile' | 'sshPassword' | 'sshUsername' | 'tls' | 'tlsCertificateKeyFile' | 'username';
+export type FieldName = 'connectionString' | 'hostname' | 'hosts' | 'isSrv' | 'kerberosPrincipal' | 'keyVaultNamespace' | 'kmip.endpoint' | 'maxStalenessSeconds' | `kmip:${string}.endpoint` | 'local.key' | `local:${string}.key` | 'password' | 'schema' | 'proxyHostname' | 'readPreferenceTags' | 'schemaMap' | 'encryptedFieldsMap' | 'sshHostname' | 'sshIdentityKeyFile' | 'sshPassword' | 'sshUsername' | 'tls' | 'tlsCertificateKeyFile' | 'username';
 export type TabId = 'general' | 'authentication' | 'tls' | 'proxy' | 'csfle' | 'advanced';
 type ConnectionFormErrorWithField = {
     fieldName: FieldName;
@@ -23,7 +23,9 @@ export declare function errorsByFieldTab(errors: ConnectionFormError[], tabId: T
 export declare function errorMessageByFieldName(errors: ConnectionFormError[], fieldName: FieldName): string | undefined;
 export declare function fieldNameHasError(errors: ConnectionFormError[], fieldName: FieldName): boolean;
 export declare function errorMessageByFieldNameAndIndex(errors: ConnectionFormError[], fieldName: FieldName, fieldIndex: number): string | undefined;
-export declare function validateConnectionOptionsErrors(connectionOptions: ConnectionOptions, parsingOptions?: ConnectionStringParsingOptions): ConnectionFormError[];
+export declare function validateConnectionOptionsErrors(connectionOptions: ConnectionOptions, parsingOptions?: ConnectionStringParsingOptions, { isAtlas }?: {
+    isAtlas?: boolean;
+}): ConnectionFormError[];
 export declare function isSecure(connectionString: ConnectionString): boolean;
 export declare function validateConnectionOptionsWarnings(connectionOptions: ConnectionOptions): ConnectionFormWarning[];
 export {};

package/dist/utils/validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/utils/validation.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,gBAAgB,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAGpF,MAAM,MAAM,SAAS,GACjB,kBAAkB,GAClB,UAAU,GACV,OAAO,GACP,OAAO,GACP,mBAAmB,GACnB,mBAAmB,GACnB,eAAe,GACf,QAAQ,MAAM,WAAW,GACzB,WAAW,GACX,SAAS,MAAM,MAAM,GACrB,UAAU,GACV,QAAQ,GACR,eAAe,GACf,WAAW,GACX,oBAAoB,GACpB,aAAa,GACb,oBAAoB,GACpB,aAAa,GACb,aAAa,GACb,KAAK,GACL,uBAAuB,GACvB,UAAU,CAAC;AAEf,MAAM,MAAM,KAAK,GACb,SAAS,GACT,gBAAgB,GAChB,KAAK,GACL,OAAO,GACP,OAAO,GACP,UAAU,CAAC;AAEf,KAAK,4BAA4B,GAAG;IAClC,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,KAAK,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AACF,KAAK,+BAA+B,GAAG;IACrC,SAAS,CAAC,EAAE,KAAK,CAAC;IAClB,QAAQ,CAAC,EAAE,KAAK,CAAC;IACjB,UAAU,CAAC,EAAE,KAAK,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AACF,MAAM,MAAM,mBAAmB,GAC3B,4BAA4B,GAC5B,+BAA+B,CAAC;AACpC,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,mBAAmB,EAAE,EAC7B,KAAK,EAAE,KAAK,GACX,mBAAmB,EAAE,CAEvB;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,mBAAmB,EAAE,EAC7B,SAAS,EAAE,SAAS,GACnB,MAAM,GAAG,SAAS,CAEpB;AAED,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,mBAAmB,EAAE,EAC7B,SAAS,EAAE,SAAS,GACnB,OAAO,CAET;AAED,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,mBAAmB,EAAE,EAC7B,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,GACjB,MAAM,GAAG,SAAS,CAIpB;AAED,wBAAgB,+BAA+B,CAC7C,iBAAiB,EAAE,iBAAiB,EACpC,cAAc,CAAC,EAAE,8BAA8B,GAC9C,mBAAmB,EAAE,CAavB;AA0ND,wBAAgB,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAQpE;AAED,wBAAgB,iCAAiC,CAC/C,iBAAiB,EAAE,iBAAiB,GACnC,qBAAqB,EAAE,CAuBzB"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/utils/validation.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,gBAAgB,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAIpF,MAAM,MAAM,SAAS,GACjB,kBAAkB,GAClB,UAAU,GACV,OAAO,GACP,OAAO,GACP,mBAAmB,GACnB,mBAAmB,GACnB,eAAe,GACf,qBAAqB,GACrB,QAAQ,MAAM,WAAW,GACzB,WAAW,GACX,SAAS,MAAM,MAAM,GACrB,UAAU,GACV,QAAQ,GACR,eAAe,GACf,oBAAoB,GACpB,WAAW,GACX,oBAAoB,GACpB,aAAa,GACb,oBAAoB,GACpB,aAAa,GACb,aAAa,GACb,KAAK,GACL,uBAAuB,GACvB,UAAU,CAAC;AAEf,MAAM,MAAM,KAAK,GACf,SAAS,GAAG,gBAAgB,GAAG,KAAK,GAAG,OAAO,GAAG,OAAO,GAAG,UAAU,CAAC;AAExE,KAAK,4BAA4B,GAAG;IAClC,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,KAAK,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AACF,KAAK,+BAA+B,GAAG;IACrC,SAAS,CAAC,EAAE,KAAK,CAAC;IAClB,QAAQ,CAAC,EAAE,KAAK,CAAC;IACjB,UAAU,CAAC,EAAE,KAAK,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AACF,MAAM,MAAM,mBAAmB,GAC7B,4BAA4B,GAAG,+BAA+B,CAAC;AACjE,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,mBAAmB,EAAE,EAC7B,KAAK,EAAE,KAAK,GACX,mBAAmB,EAAE,CAEvB;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,mBAAmB,EAAE,EAC7B,SAAS,EAAE,SAAS,GACnB,MAAM,GAAG,SAAS,CAEpB;AAED,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,mBAAmB,EAAE,EAC7B,SAAS,EAAE,SAAS,GACnB,OAAO,CAET;AAED,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,mBAAmB,EAAE,EAC7B,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,GACjB,MAAM,GAAG,SAAS,CAIpB;AAED,wBAAgB,+BAA+B,CAC7C,iBAAiB,EAAE,iBAAiB,EACpC,cAAc,CAAC,EAAE,8BAA8B,EAC/C,EAAE,OAAe,EAAE,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAO,GAC9C,mBAAmB,EAAE,CAcvB;AAmRD,wBAAgB,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAQpE;AAED,wBAAgB,iCAAiC,CAC/C,iBAAiB,EAAE,iBAAiB,GACnC,qBAAqB,EAAE,CAuBzB"}