@salesforce/core 4.0.0-v3.0 → 4.0.1

package/lib/config/configFile.js

@@ -7,14 +7,15 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigFile = void 0;
+const fs = require("fs");
 const fs_1 = require("fs");
 const os_1 = require("os");
 const path_1 = require("path");
 const ts_types_1 = require("@salesforce/ts-types");
+const kit_1 = require("@salesforce/kit");
 const global_1 = require("../global");
 const logger_1 = require("../logger");
-const sfdxError_1 = require("../sfdxError");
-const fs_2 = require("../util/fs");
+const sfError_1 = require("../sfError");
 const internal_1 = require("../util/internal");
 const configStore_1 = require("./configStore");
 /**
@@ -65,7 +66,7 @@ class ConfigFile extends configStore_1.BaseConfigStore {
      */
     static getFileName() {
         // Can not have abstract static methods, so throw a runtime error.
-        throw new sfdxError_1.SfdxError('Unknown filename for config file.');
+        throw new sfError_1.SfError('Unknown filename for config file.');
     }
     /**
      * Returns the default options for the config file.
@@ -77,7 +78,7 @@ class ConfigFile extends configStore_1.BaseConfigStore {
         return {
             isGlobal,
             isState: true,
-            filename: filename || this.getFileName(),
+            filename: filename ?? this.getFileName(),
             stateFolder: global_1.Global.SFDX_STATE_FOLDER,
         };
     }
@@ -87,7 +88,7 @@ class ConfigFile extends configStore_1.BaseConfigStore {
      * @param isGlobal True if the config should be global. False for local.
      */
     static async resolveRootFolder(isGlobal) {
-        return isGlobal ? os_1.homedir() : await internal_1.resolveProjectPath();
+        return isGlobal ? (0, os_1.homedir)() : (0, internal_1.resolveProjectPath)();
     }
     /**
      * Helper used to determine what the local and global folder point to. Returns the file path of the root folder.
@@ -95,7 +96,7 @@ class ConfigFile extends configStore_1.BaseConfigStore {
      * @param isGlobal True if the config should be global. False for local.
      */
     static resolveRootFolderSync(isGlobal) {
-        return isGlobal ? os_1.homedir() : internal_1.resolveProjectPathSync();
+        return isGlobal ? (0, os_1.homedir)() : (0, internal_1.resolveProjectPathSync)();
     }
     /**
      * Determines if the config file is read/write accessible. Returns `true` if the user has capabilities specified
@@ -107,7 +108,7 @@ class ConfigFile extends configStore_1.BaseConfigStore {
      */
     async access(perm) {
         try {
-            await fs_2.fs.access(this.getPath(), perm);
+            await fs.promises.access(this.getPath(), perm);
             return true;
         }
         catch (err) {
@@ -124,7 +125,7 @@ class ConfigFile extends configStore_1.BaseConfigStore {
      */
     accessSync(perm) {
         try {
-            fs_2.fs.accessSync(this.getPath(), perm);
+            fs.accessSync(this.getPath(), perm);
             return true;
         }
         catch (err) {
@@ -135,7 +136,7 @@ class ConfigFile extends configStore_1.BaseConfigStore {
      * Read the config file and set the config contents. Returns the config contents of the config file. As an
      * optimization, files are only read once per process and updated in memory and via `write()`. To force
      * a read from the filesystem pass `force=true`.
-     * **Throws** *{@link SfdxError}{ name: 'UnexpectedJsonFileFormat' }* There was a problem reading or parsing the file.
+     * **Throws** *{@link SfError}{ name: 'UnexpectedJsonFileFormat' }* There was a problem reading or parsing the file.
      *
      * @param [throwOnNotFound = false] Optionally indicate if a throw should occur on file read.
      * @param [force = false] Optionally force the file to be read from disk even when already read within the process.
@@ -146,7 +147,7 @@ class ConfigFile extends configStore_1.BaseConfigStore {
             // internally and updated persistently via write().
             if (!this.hasRead || force) {
                 this.logger.info(`Reading config file: ${this.getPath()}`);
-                const obj = await fs_2.fs.readJsonMap(this.getPath());
+                const obj = (0, kit_1.parseJsonMap)(await fs.promises.readFile(this.getPath(), 'utf8'));
                 this.setContentsFromObject(obj);
             }
             return this.getContents();
@@ -170,7 +171,7 @@ class ConfigFile extends configStore_1.BaseConfigStore {
      * Read the config file and set the config contents. Returns the config contents of the config file. As an
      * optimization, files are only read once per process and updated in memory and via `write()`. To force
      * a read from the filesystem pass `force=true`.
-     * **Throws** *{@link SfdxError}{ name: 'UnexpectedJsonFileFormat' }* There was a problem reading or parsing the file.
+     * **Throws** *{@link SfError}{ name: 'UnexpectedJsonFileFormat' }* There was a problem reading or parsing the file.
      *
      * @param [throwOnNotFound = false] Optionally indicate if a throw should occur on file read.
      * @param [force = false] Optionally force the file to be read from disk even when already read within the process.
@@ -181,7 +182,7 @@ class ConfigFile extends configStore_1.BaseConfigStore {
             // internally and updated persistently via write().
             if (!this.hasRead || force) {
                 this.logger.info(`Reading config file: ${this.getPath()}`);
-                const obj = fs_2.fs.readJsonMapSync(this.getPath());
+                const obj = (0, kit_1.parseJsonMap)(fs.readFileSync(this.getPath(), 'utf8'));
                 this.setContentsFromObject(obj);
             }
             return this.getContents();
@@ -211,9 +212,14 @@ class ConfigFile extends configStore_1.BaseConfigStore {
         if (newContents) {
             this.setContents(newContents);
         }
-        await fs_2.fs.mkdirp(path_1.dirname(this.getPath()));
+        try {
+            await fs.promises.mkdir((0, path_1.dirname)(this.getPath()), { recursive: true });
+        }
+        catch (err) {
+            throw sfError_1.SfError.wrap(err);
+        }
         this.logger.info(`Writing to config file: ${this.getPath()}`);
-        await fs_2.fs.writeJson(this.getPath(), this.toObject());
+        await fs.promises.writeFile(this.getPath(), JSON.stringify(this.toObject(), null, 2));
         return this.getContents();
     }
     /**
@@ -223,19 +229,24 @@ class ConfigFile extends configStore_1.BaseConfigStore {
      * @param newContents The new contents of the file.
      */
     writeSync(newContents) {
-        if (ts_types_1.isPlainObject(newContents)) {
+        if ((0, ts_types_1.isPlainObject)(newContents)) {
             this.setContents(newContents);
         }
-        fs_2.fs.mkdirpSync(path_1.dirname(this.getPath()));
+        try {
+            fs.mkdirSync((0, path_1.dirname)(this.getPath()), { recursive: true });
+        }
+        catch (err) {
+            throw sfError_1.SfError.wrap(err);
+        }
         this.logger.info(`Writing to config file: ${this.getPath()}`);
-        fs_2.fs.writeJsonSync(this.getPath(), this.toObject());
+        fs.writeFileSync(this.getPath(), JSON.stringify(this.toObject(), null, 2));
         return this.getContents();
     }
     /**
      * Check to see if the config file exists. Returns `true` if the config file exists and has access, false otherwise.
      */
     async exists() {
-        return await this.access(fs_1.constants.R_OK);
+        return this.access(fs_1.constants.R_OK);
     }
     /**
      * Check to see if the config file exists. Returns `true` if the config file exists and has access, false otherwise.
@@ -249,7 +260,7 @@ class ConfigFile extends configStore_1.BaseConfigStore {
      * {@link fs.stat}
      */
     async stat() {
-        return fs_2.fs.stat(this.getPath());
+        return fs.promises.stat(this.getPath());
     }
     /**
      * Get the stats of the file. Returns the stats of the file.
@@ -257,7 +268,7 @@ class ConfigFile extends configStore_1.BaseConfigStore {
      * {@link fs.stat}
      */
     statSync() {
-        return fs_2.fs.statSync(this.getPath());
+        return fs.statSync(this.getPath());
     }
     /**
      * Delete the config file if it exists.
@@ -268,9 +279,9 @@ class ConfigFile extends configStore_1.BaseConfigStore {
     async unlink() {
         const exists = await this.exists();
         if (exists) {
-            return await fs_2.fs.unlink(this.getPath());
+            return fs.promises.unlink(this.getPath());
         }
-        throw new sfdxError_1.SfdxError(`Target file doesn't exist. path: ${this.getPath()}`, 'TargetFileNotFound');
+        throw new sfError_1.SfError(`Target file doesn't exist. path: ${this.getPath()}`, 'TargetFileNotFound');
     }
     /**
      * Delete the config file if it exists.
@@ -281,9 +292,9 @@ class ConfigFile extends configStore_1.BaseConfigStore {
     unlinkSync() {
         const exists = this.existsSync();
         if (exists) {
-            return fs_2.fs.unlinkSync(this.getPath());
+            return fs.unlinkSync(this.getPath());
         }
-        throw new sfdxError_1.SfdxError(`Target file doesn't exist. path: ${this.getPath()}`, 'TargetFileNotFound');
+        throw new sfError_1.SfError(`Target file doesn't exist. path: ${this.getPath()}`, 'TargetFileNotFound');
     }
     /**
      * Returns the absolute path to the config file.
@@ -295,18 +306,16 @@ class ConfigFile extends configStore_1.BaseConfigStore {
     getPath() {
         if (!this.path) {
             if (!this.options.filename) {
-                throw new sfdxError_1.SfdxError('The ConfigOptions filename parameter is invalid.', 'InvalidParameter');
+                throw new sfError_1.SfError('The ConfigOptions filename parameter is invalid.', 'InvalidParameter');
             }
-            const _isGlobal = ts_types_1.isBoolean(this.options.isGlobal) && this.options.isGlobal;
-            const _isState = ts_types_1.isBoolean(this.options.isState) && this.options.isState;
             // Don't let users store config files in homedir without being in the state folder.
             let configRootFolder = this.options.rootFolder
                 ? this.options.rootFolder
-                : ConfigFile.resolveRootFolderSync(!!this.options.isGlobal);
-            if (_isGlobal || _isState) {
-                configRootFolder = path_1.join(configRootFolder, this.options.stateFolder || global_1.Global.SFDX_STATE_FOLDER);
+                : ConfigFile.resolveRootFolderSync(Boolean(this.options.isGlobal));
+            if (this.options.isGlobal === true || this.options.isState === true) {
+                configRootFolder = (0, path_1.join)(configRootFolder, this.options.stateFolder ?? global_1.Global.SFDX_STATE_FOLDER);
             }
-            this.path = path_1.join(configRootFolder, this.options.filePath ? this.options.filePath : '', this.options.filename);
+            this.path = (0, path_1.join)(configRootFolder, this.options.filePath ? this.options.filePath : '', this.options.filename);
         }
         return this.path;
     }

package/lib/config/configGroup.d.ts

@@ -1,6 +1,6 @@
 import { Dictionary, JsonMap, Optional } from '@salesforce/ts-types';
 import { ConfigFile } from './configFile';
-import { ConfigContents, ConfigEntry, ConfigValue, Key } from './configStore';
+import { ConfigContents, ConfigEntry, ConfigValue } from './configStore';
 /**
  * A config file that stores config values in groups. e.g. to store different config
  * values for different commands, without having manually manipulate the config.
@@ -20,8 +20,8 @@ import { ConfigContents, ConfigEntry, ConfigValue, Key } from './configStore';
  * await myConfig.write();
  * ```
  */
-export declare class ConfigGroup<T extends ConfigGroup.Options = ConfigGroup.Options, P extends ConfigContents = ConfigContents> extends ConfigFile<T, P> {
-    protected defaultGroup: Extract<keyof P, string>;
+export declare class ConfigGroup<T extends ConfigGroup.Options> extends ConfigFile<T> {
+    protected defaultGroup: string;
     /**
      * Get ConfigGroup specific options, such as the default group.
      *
@@ -31,11 +31,11 @@ export declare class ConfigGroup<T extends ConfigGroup.Options = ConfigGroup.Opt
     static getOptions(defaultGroup: string, filename?: string): ConfigGroup.Options;
     /**
      * Sets the default group for all {@link BaseConfigStore} methods to use.
-     * **Throws** *{@link SfdxError}{ name: 'MissingGroupNameError' }* The group parameter is null or undefined.
+     * **Throws** *{@link SfError}{ name: 'MissingGroupName' }* The group parameter is null or undefined.
      *
      * @param group The group.
      */
-    setDefaultGroup(group: Key<P>): void;
+    setDefaultGroup(group: string): void;
     /**
      * Set a group of entries in a bulk save. Returns The new properties that were saved.
      *
@@ -60,7 +60,7 @@ export declare class ConfigGroup<T extends ConfigGroup.Options = ConfigGroup.Opt
      *
      * @param key The key.
      */
-    get<K extends Extract<keyof P, string>>(key: string): P[K];
+    get(key: string): Optional<ConfigValue>;
     /**
      * Returns a boolean if an element with the specified key exists in the default group.
      *
@@ -70,7 +70,7 @@ export declare class ConfigGroup<T extends ConfigGroup.Options = ConfigGroup.Opt
     /**
      * Returns an array of the keys from the default group.
      */
-    keys(): Array<Key<P>>;
+    keys(): string[];
     /**
      * Returns an array of the values from the default group.
      */
@@ -81,7 +81,7 @@ export declare class ConfigGroup<T extends ConfigGroup.Options = ConfigGroup.Opt
      * @param key The key.
      * @param value The value.
      */
-    set<K extends Extract<keyof P, string>>(key: K, value: P[K]): P;
+    set(key: string, value: ConfigValue): ConfigContents;
     /**
      * Removes an element with the specified key from the default group. Returns `true` if the item was deleted.
      *
@@ -97,7 +97,7 @@ export declare class ConfigGroup<T extends ConfigGroup.Options = ConfigGroup.Opt
      *
      * @param {string} [group = 'default'] The group.
      */
-    getGroup(group?: Extract<keyof P, string>): Optional<ConfigContents>;
+    getGroup(group?: string): Optional<ConfigContents>;
     /**
      * Returns the value associated to the key and group, or undefined if there is none.
      *

package/lib/config/configGroup.js

@@ -8,7 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigGroup = void 0;
 const ts_types_1 = require("@salesforce/ts-types");
-const sfdxError_1 = require("../sfdxError");
+const sfError_1 = require("../sfError");
 const configFile_1 = require("./configFile");
 /**
  * A config file that stores config values in groups. e.g. to store different config
@@ -48,13 +48,13 @@ class ConfigGroup extends configFile_1.ConfigFile {
     }
     /**
      * Sets the default group for all {@link BaseConfigStore} methods to use.
-     * **Throws** *{@link SfdxError}{ name: 'MissingGroupNameError' }* The group parameter is null or undefined.
+     * **Throws** *{@link SfError}{ name: 'MissingGroupName' }* The group parameter is null or undefined.
      *
      * @param group The group.
      */
     setDefaultGroup(group) {
         if (!group) {
-            throw new sfdxError_1.SfdxError('null or undefined group', 'MissingGroupNameError');
+            throw new sfError_1.SfError('null or undefined group', 'MissingGroupName');
         }
         this.defaultGroup = group;
     }
@@ -67,7 +67,7 @@ class ConfigGroup extends configFile_1.ConfigFile {
     async updateValues(newEntries, group) {
         // Make sure the contents are loaded
         await this.read();
-        Object.entries(newEntries).forEach(([key, val]) => this.setInGroup(key, val, group || this.defaultGroup));
+        Object.entries(newEntries).forEach(([key, val]) => this.setInGroup(key, val, group ?? this.defaultGroup));
         await this.write();
         return newEntries;
     }
@@ -81,7 +81,7 @@ class ConfigGroup extends configFile_1.ConfigFile {
     async updateValue(key, value, group) {
         // Make sure the content is loaded
         await this.read();
-        this.setInGroup(key, value, group || this.defaultGroup);
+        this.setInGroup(key, value, group ?? this.defaultGroup);
         // Then save it
         await this.write();
     }
@@ -91,7 +91,7 @@ class ConfigGroup extends configFile_1.ConfigFile {
     entries() {
         const group = this.getGroup();
         if (group) {
-            return ts_types_1.definiteEntriesOf(group);
+            return (0, ts_types_1.definiteEntriesOf)(group);
         }
         return [];
     }
@@ -116,13 +116,13 @@ class ConfigGroup extends configFile_1.ConfigFile {
      * Returns an array of the keys from the default group.
      */
     keys() {
-        return Object.keys(this.getGroup(this.defaultGroup) || {});
+        return Object.keys(this.getGroup(this.defaultGroup) ?? {});
     }
     /**
      * Returns an array of the values from the default group.
      */
     values() {
-        return ts_types_1.definiteValuesOf(this.getGroup(this.defaultGroup) || {});
+        return (0, ts_types_1.definiteValuesOf)(this.getGroup(this.defaultGroup) ?? {});
     }
     /**
      * Add or updates an element with the specified key in the default group.
@@ -158,7 +158,7 @@ class ConfigGroup extends configFile_1.ConfigFile {
      * @param {string} [group = 'default'] The group.
      */
     getGroup(group = this.defaultGroup) {
-        return ts_types_1.getJsonMap(this.getContents(), group) || undefined;
+        return (0, ts_types_1.getJsonMap)(this.getContents(), group) ?? undefined;
     }
     /**
      * Returns the value associated to the key and group, or undefined if there is none.
@@ -183,11 +183,13 @@ class ConfigGroup extends configFile_1.ConfigFile {
      *
      * @param {object} obj The object.
      */
+    // eslint-disable-next-line @typescript-eslint/ban-types
     setContentsFromObject(obj) {
         const contents = new Map(Object.entries(obj));
         Array.from(contents.entries()).forEach(([groupKey, groupContents]) => {
             if (groupContents) {
                 Object.entries(groupContents).forEach(([contentKey, contentValue]) => {
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
                     this.setInGroup(contentKey, contentValue, groupKey);
                 });
             }
@@ -201,11 +203,11 @@ class ConfigGroup extends configFile_1.ConfigFile {
      * @param group The group. Uses the default group if not specified.
      */
     setInGroup(key, value, group) {
-        group = group || this.defaultGroup;
+        group = group ?? this.defaultGroup;
         if (!super.has(group)) {
             super.set(group, {});
         }
-        const content = this.getGroup(group) || {};
+        const content = this.getGroup(group) ?? {};
         this.setMethod(content, key, value);
         return content;
     }

package/lib/config/configStore.d.ts

@@ -4,16 +4,16 @@ import { Crypto } from '../crypto/crypto';
 /**
  * The allowed types stored in a config store.
  */
-export declare type ConfigValue = AnyJson;
+export type ConfigValue = AnyJson;
 /**
  * The type of entries in a config store defined by the key and value type of {@link ConfigContents}.
  */
-export declare type ConfigEntry = [string, ConfigValue];
+export type ConfigEntry = [string, ConfigValue];
 /**
  * The type of content a config stores.
  */
-export declare type ConfigContents = Dictionary<ConfigValue>;
-export declare type Key<P extends ConfigContents> = Extract<keyof P, string>;
+export type ConfigContents<T = ConfigValue> = Dictionary<T>;
+export type Key<P extends ConfigContents> = Extract<keyof P, string>;
 /**
  * An interface for a config object with a persistent store.
  */
@@ -68,7 +68,7 @@ export declare abstract class BaseConfigStore<T extends BaseConfigStore.Options
      * If the value is an object, a clone will be returned.
      */
     get<K extends Key<P>>(key: K, decrypt?: boolean): P[K];
-    get<T = ConfigValue>(key: string, decrypt?: boolean): T;
+    get<V = ConfigValue>(key: string, decrypt?: boolean): V;
     /**
      * Returns the list of keys that contain a value.
      *
@@ -93,7 +93,7 @@ export declare abstract class BaseConfigStore<T extends BaseConfigStore.Options
      * @param value The value.
      */
     set<K extends Key<P>>(key: K, value: P[K]): void;
-    set<T = ConfigValue>(key: string, value: T): void;
+    set<V = ConfigValue>(key: string, value: V): void;
     /**
      * Updates the value for the key in the config object. If the value is an object, it
      * will be merged with the existing object.
@@ -102,7 +102,7 @@ export declare abstract class BaseConfigStore<T extends BaseConfigStore.Options
      * @param value The value.
      */
     update<K extends Key<P>>(key: K, value: Partial<P[K]>): void;
-    update<T = ConfigValue>(key: string, value: Partial<T>): void;
+    update<V = ConfigValue>(key: string, value: Partial<V>): void;
     /**
      * Returns `true` if an element in the config object existed and has been removed, or `false` if the element does not
      * exist. {@link BaseConfigStore.has} will return false afterwards.
@@ -166,7 +166,7 @@ export declare abstract class BaseConfigStore<T extends BaseConfigStore.Options
      *
      * @param obj The object.
      */
-    setContentsFromObject<U extends object>(obj: U): void;
+    setContentsFromObject<U extends JsonMap>(obj: U): void;
     protected getEncryptedKeys(): Array<string | RegExp>;
     /**
      * This config file has encrypted keys and it should attempt to encrypt them.
@@ -204,7 +204,7 @@ export declare abstract class BaseConfigStore<T extends BaseConfigStore.Options
      * @param keyPaths: The complete path of the (nested) data
      * @param data: The current (nested) data being worked on.
      */
-    protected recursiveEncrypt<T extends JsonMap>(data: T, parentKey?: string): T;
+    protected recursiveEncrypt<J extends JsonMap>(data: J, parentKey?: string): J;
     /**
      * Decrypt all values in a nested JsonMap.
      *

package/lib/config/configStore.js

@@ -11,7 +11,7 @@ const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const ts_types_2 = require("@salesforce/ts-types");
 const crypto_1 = require("../crypto/crypto");
-const sfdxError_1 = require("../sfdxError");
+const sfError_1 = require("../sfError");
 /**
  * An abstract class that implements all the config management functions but
  * none of the storage functions.
@@ -28,21 +28,21 @@ class BaseConfigStore extends kit_1.AsyncOptionalCreatable {
     constructor(options) {
         super(options);
         this.statics = this.constructor;
-        this.options = options || {};
+        this.options = options ?? {};
         this.setContents(this.initialContents());
     }
     /**
      * Returns an array of {@link ConfigEntry} for each element in the config.
      */
     entries() {
-        return ts_types_2.definiteEntriesOf(this.contents);
+        return (0, ts_types_2.definiteEntriesOf)(this.contents);
     }
     get(key, decrypt = false) {
         const k = key;
         let value = this.getMethod(this.contents, k);
         if (this.hasEncryption() && decrypt) {
-            if (ts_types_2.isJsonMap(value)) {
-                value = this.recursiveDecrypt(kit_1.cloneJson(value), k);
+            if ((0, ts_types_2.isJsonMap)(value)) {
+                value = this.recursiveDecrypt((0, kit_1.cloneJson)(value), k);
             }
             else if (this.isCryptoKey(k)) {
                 value = this.decrypt(value);
@@ -76,7 +76,7 @@ class BaseConfigStore extends kit_1.AsyncOptionalCreatable {
     }
     set(key, value) {
         if (this.hasEncryption()) {
-            if (ts_types_2.isJsonMap(value)) {
+            if ((0, ts_types_2.isJsonMap)(value)) {
                 value = this.recursiveEncrypt(value, key);
             }
             else if (this.isCryptoKey(key)) {
@@ -87,7 +87,7 @@ class BaseConfigStore extends kit_1.AsyncOptionalCreatable {
     }
     update(key, value) {
         const existingValue = this.get(key, true);
-        if (ts_types_1.isPlainObject(existingValue) && ts_types_1.isPlainObject(value)) {
+        if ((0, ts_types_1.isPlainObject)(existingValue) && (0, ts_types_1.isPlainObject)(value)) {
             value = Object.assign({}, existingValue, value);
         }
         this.set(key, value);
@@ -130,7 +130,7 @@ class BaseConfigStore extends kit_1.AsyncOptionalCreatable {
      * Returns an array that contains the values for each element in the config object.
      */
     values() {
-        return ts_types_2.definiteValuesOf(this.contents);
+        return (0, ts_types_2.definiteValuesOf)(this.contents);
     }
     /**
      * Returns the entire config contents.
@@ -147,7 +147,7 @@ class BaseConfigStore extends kit_1.AsyncOptionalCreatable {
             this.setContents();
         }
         if (this.hasEncryption() && decrypt) {
-            return this.recursiveDecrypt(kit_1.cloneJson(this.contents));
+            return this.recursiveDecrypt((0, kit_1.cloneJson)(this.contents));
         }
         return this.contents;
     }
@@ -183,6 +183,8 @@ class BaseConfigStore extends kit_1.AsyncOptionalCreatable {
     async awaitEach(actionFn) {
         const entries = this.entries();
         for (const entry of entries) {
+            // prevent ConfigFile collision bug
+            // eslint-disable-next-line no-await-in-loop
             await actionFn(entry[0], entry[1]);
         }
     }
@@ -199,13 +201,13 @@ class BaseConfigStore extends kit_1.AsyncOptionalCreatable {
      * @param obj The object.
      */
     setContentsFromObject(obj) {
-        this.contents = {};
+        this.contents = (this.hasEncryption() ? this.recursiveEncrypt(obj) : {});
         Object.entries(obj).forEach(([key, value]) => {
             this.setMethod(this.contents, key, value);
         });
     }
     getEncryptedKeys() {
-        return [...(this.options.encryptedKeys || []), ...(this.statics.encryptedKeys || [])];
+        return [...(this.options?.encryptedKeys ?? []), ...(this.statics?.encryptedKeys || [])];
     }
     /**
      * This config file has encrypted keys and it should attempt to encrypt them.
@@ -217,16 +219,18 @@ class BaseConfigStore extends kit_1.AsyncOptionalCreatable {
     }
     // Allows extended classes the ability to override the set method. i.e. maybe they want
     // nested object set from kit.
-    // NOTE: Key and value must stay string and value to be reliably overwritten.
+    // eslint-disable-next-line class-methods-use-this
     setMethod(contents, key, value) {
-        kit_1.set(contents, key, value);
+        (0, kit_1.set)(contents, key, value);
     }
     // Allows extended classes the ability to override the get method. i.e. maybe they want
     // nested object get from ts-types.
     // NOTE: Key must stay string to be reliably overwritten.
+    // eslint-disable-next-line class-methods-use-this
     getMethod(contents, key) {
-        return ts_types_2.get(contents, key);
+        return (0, ts_types_2.get)(contents, key);
     }
+    // eslint-disable-next-line class-methods-use-this
     initialContents() {
         return {};
     }
@@ -268,7 +272,7 @@ class BaseConfigStore extends kit_1.AsyncOptionalCreatable {
             const dotAccessor = /\.([a-zA-Z0-9@._-]+)$/;
             const singleQuoteAccessor = /\['([a-zA-Z0-9@._-]+)'\]$/;
             const doubleQuoteAccessor = /\["([a-zA-Z0-9@._-]+)"\]$/;
-            const matcher = dotAccessor.exec(key) || singleQuoteAccessor.exec(key) || doubleQuoteAccessor.exec(key);
+            const matcher = dotAccessor.exec(key) ?? singleQuoteAccessor.exec(key) ?? doubleQuoteAccessor.exec(key);
             return matcher ? matcher[1] : key;
         }
         // Any keys named the following should be encrypted/decrypted
@@ -286,18 +290,18 @@ class BaseConfigStore extends kit_1.AsyncOptionalCreatable {
         if (!value)
             return;
         if (!this.crypto)
-            throw new sfdxError_1.SfdxError('crypto is not initialized', 'CryptoNotInitializedError');
-        if (!ts_types_2.isString(value))
-            throw new sfdxError_1.SfdxError(`can only encrypt strings but found: ${typeof value} : ${value}`, 'InvalidCryptoValueError');
+            throw new sfError_1.SfError('crypto is not initialized', 'CryptoNotInitializedError');
+        if (!(0, ts_types_2.isString)(value))
+            throw new sfError_1.SfError(`can only encrypt strings but found: ${typeof value} : ${value.toString()}`, 'InvalidCryptoValueError');
         return this.crypto.isEncrypted(value) ? value : this.crypto.encrypt(value);
     }
     decrypt(value) {
         if (!value)
             return;
         if (!this.crypto)
-            throw new sfdxError_1.SfdxError('crypto is not initialized', 'CryptoNotInitializedError');
-        if (!ts_types_2.isString(value))
-            throw new sfdxError_1.SfdxError(`can only encrypt strings but found: ${typeof value} : ${value}`, 'InvalidCryptoValueError');
+            throw new sfError_1.SfError('crypto is not initialized', 'CryptoNotInitializedError');
+        if (!(0, ts_types_2.isString)(value))
+            throw new sfError_1.SfError(`can only encrypt strings but found: ${typeof value} : ${value.toString()}`, 'InvalidCryptoValueError');
         return this.crypto.isEncrypted(value) ? this.crypto.decrypt(value) : value;
     }
     /**
@@ -333,18 +337,17 @@ class BaseConfigStore extends kit_1.AsyncOptionalCreatable {
     recursiveCrypto(method, keyPaths, data) {
         const key = keyPaths.pop();
         const value = data[key];
-        if (ts_types_2.isJsonMap(value)) {
+        if ((0, ts_types_2.isJsonMap)(value)) {
             for (const newKey of Object.keys(value)) {
                 this.recursiveCrypto(method, [...keyPaths, key, newKey], value);
             }
         }
-        else {
-            if (this.isCryptoKey(key)) {
-                data[key] = method(value);
-            }
+        else if (this.isCryptoKey(key)) {
+            data[key] = method(value);
         }
     }
 }
 exports.BaseConfigStore = BaseConfigStore;
+// If encryptedKeys is an array of RegExps, they should not contain the /g (global) or /y (sticky) flags to avoid stateful issues.
 BaseConfigStore.encryptedKeys = [];
 //# sourceMappingURL=configStore.js.map