@salesforce/core 3.30.10 → 3.30.12

package/README.md

@@ -41,7 +41,7 @@ const $$ = testSetup();
 describe('Mocking Auth data', () => {
   it('example', async () => {
     const testData = new MockTestOrgData();
-    await $$.stubAuths(testData)
+    await $$.stubAuths(testData);
     const auth = await AuthInfo.create({ username: testData.username });
     strictEqual(auth.getUsername(), testData.username);
   });
@@ -106,7 +106,7 @@ describe('Mocking Config', () => {
   it('example', async () => {
     const testData = new MockTestOrgData();
     await $$.stubConfig({ [OrgConfigProperties.TARGET_ORG]: testData.username });
-    const {value} = (await ConfigAggregator.create()).getInfo(OrgConfigProperties.TARGET_ORG);
+    const { value } = (await ConfigAggregator.create()).getInfo(OrgConfigProperties.TARGET_ORG);
     strictEqual(value, testData.username);
   });
 });
@@ -121,7 +121,7 @@ describe('Mocking Arbitrary Config Files', () => {
 
 ## Using the Built-in Sinon Sandboxes
 
-sfdx-core uses Sinon as its underlying mocking system. If you're unfamiliar with Sinon and it's sandboxing concept you can find more information here:
+sfdx-core uses Sinon as its underlying mocking system. If you're unfamiliar with Sinon and its sandboxing concept you can find more information here:
 https://sinonjs.org/
 Sinon `stub`s and `spy`s must be cleaned up after test invocations. To ease the use of Sinon with sfdx core we've exposed our sandbox in TestSetup. After adding your own `stub`s and/or `spy`s they will automatically be cleaned up after each test using mocha's afterEach method.
 

package/lib/config/aliasesConfig.js

@@ -19,6 +19,7 @@ class AliasesConfig extends configGroup_1.ConfigGroup {
     static getDefaultOptions() {
         return { ...configGroup_1.ConfigGroup.getOptions(AliasGroup.ORGS, 'alias.json'), isGlobal: true, isState: true };
     }
+    // eslint-disable-next-line class-methods-use-this
     setMethod(contents, key, value) {
         contents[key] = value;
     }

package/lib/config/config.js

@@ -380,7 +380,7 @@ class Config extends configFile_1.ConfigFile {
      *
      * @param newContents Contents to write
      */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
     writeSync(newContents) {
         throw messages.createError('invalidWrite');
     }
@@ -402,11 +402,11 @@ class Config extends configFile_1.ConfigFile {
             throw messages.createError('deprecatedConfigKey', [key, property.newKey]);
         }
         if (property.input) {
-            if (property.input && property.input.validator(value)) {
+            if (property.input?.validator(value)) {
                 super.set(property.key, value);
             }
             else {
-                let valueError = value?.toString() || '';
+                let valueError = value?.toString() ?? '';
                 if (property.input.failedMessage) {
                     valueError = (0, ts_types_1.isString)(property.input.failedMessage)
                         ? property.input.failedMessage
@@ -444,6 +444,7 @@ class Config extends configFile_1.ConfigFile {
      *
      * @param propertyName The name of the property.
      */
+    // eslint-disable-next-line class-methods-use-this
     getPropertyConfig(propertyName) {
         const prop = Config.propertyConfigMap()[propertyName];
         if (!prop) {
@@ -465,9 +466,7 @@ class Config extends configFile_1.ConfigFile {
      * @param encrypt `true` to encrypt.
      */
     async cryptProperties(encrypt) {
-        const hasEncryptedProperties = this.entries().some(([key]) => {
-            return !!Config.propertyConfigMap()[key]?.encrypted;
-        });
+        const hasEncryptedProperties = this.entries().some(([key]) => !!Config.propertyConfigMap()[key]?.encrypted);
         if (hasEncryptedProperties) {
             await this.initCrypto();
             const crypto = (0, ts_types_1.ensure)(this.crypto);
@@ -537,13 +536,11 @@ class SfdxConfig {
         if (!this.sfdxPath) {
             const stateFolder = global_1.Global.SFDX_STATE_FOLDER;
             const fileName = SFDX_CONFIG_FILE_NAME;
-            const _isGlobal = (0, ts_types_1.isBoolean)(this.options.isGlobal) && this.options.isGlobal;
-            const _isState = (0, 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_1.ConfigFile.resolveRootFolderSync(!!this.options.isGlobal);
-            if (_isGlobal || _isState) {
+            if (this.options.isGlobal === true || this.options.isState === true) {
                 configRootFolder = (0, path_1.join)(configRootFolder, stateFolder);
             }
             this.sfdxPath = (0, path_1.join)(configRootFolder, fileName);

package/lib/config/configAggregator.d.ts

@@ -60,14 +60,14 @@ export declare class ConfigAggregator extends AsyncOptionalCreatable<ConfigAggre
     private localConfig?;
     private globalConfig;
     private envVars;
-    private get config();
     /**
      * **Do not directly construct instances of this class -- use {@link ConfigAggregator.create} instead.**
      *
      * @ignore
      */
     constructor(options?: ConfigAggregator.Options);
-    static create<P, T extends AsyncOptionalCreatable<P>>(this: new (options?: ConfigAggregator.Options) => T, options?: ConfigAggregator.Options): Promise<T>;
+    private get config();
+    static create<P extends ConfigAggregator.Options, T extends AsyncOptionalCreatable<P>>(this: new (options?: P) => T, options?: P): Promise<T>;
     /**
      * Get the info for a given key. If the ConfigAggregator was not asynchronously created OR
      * the {@link ConfigAggregator.reload} was not called, the config value may be encrypted.
@@ -214,7 +214,7 @@ export declare namespace ConfigAggregator {
 }
 /**
  * A ConfigAggregator that will work with deprecated config vars (e.g. defaultusername, apiVersion).
- * We do NOT recommend using this class unless you absolutelty have to.
+ * We do NOT recommend using this class unless you absolutely have to.
  *
  * @deprecated
  */

package/lib/config/configAggregator.js

@@ -36,7 +36,7 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
      * @ignore
      */
     constructor(options) {
-        super(options || {});
+        super(options ?? {});
         this.envVars = {};
         // Don't throw an project error with the aggregator, since it should resolve to global if
         // there is no project.
@@ -52,7 +52,7 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
         this.setAllowedProperties(config_1.Config.getAllowedProperties());
     }
     get config() {
-        return this.resolveProperties(this.globalConfig.getContents(), this.localConfig && this.localConfig.getContents());
+        return this.resolveProperties(this.globalConfig.getContents(), this.localConfig?.getContents());
     }
     // Use typing from AsyncOptionalCreatable to support extending ConfigAggregator.
     // We really don't want ConfigAggregator extended but typescript doesn't support a final.
@@ -147,9 +147,9 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
             location,
             value: this.getPropertyValue(key),
             path: this.getPath(key),
-            isLocal: () => location === "Local" /* LOCAL */,
-            isGlobal: () => location === "Global" /* GLOBAL */,
-            isEnvVar: () => location === "Environment" /* ENVIRONMENT */,
+            isLocal: () => location === "Local" /* ConfigAggregator.Location.LOCAL */,
+            isGlobal: () => location === "Global" /* ConfigAggregator.Location.GLOBAL */,
+            isEnvVar: () => location === "Environment" /* ConfigAggregator.Location.ENVIRONMENT */,
             deprecated: meta.deprecated ?? false,
         };
     }
@@ -165,13 +165,13 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
      */
     getLocation(key) {
         if (this.envVars[key] != null) {
-            return "Environment" /* ENVIRONMENT */;
+            return "Environment" /* ConfigAggregator.Location.ENVIRONMENT */;
         }
-        if (this.localConfig && this.localConfig.get(key)) {
-            return "Local" /* LOCAL */;
+        if (this.localConfig?.get(key)) {
+            return "Local" /* ConfigAggregator.Location.LOCAL */;
         }
-        if (this.globalConfig && this.globalConfig.get(key)) {
-            return "Global" /* GLOBAL */;
+        if (this.globalConfig?.get(key)) {
+            return "Global" /* ConfigAggregator.Location.GLOBAL */;
         }
     }
     /**
@@ -192,7 +192,7 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
         if (this.envVars[key] != null) {
             return `$${envVars_1.EnvVars.propertyToEnvName(key)}`;
         }
-        if (this.localConfig && this.localConfig.getContents()[key] != null) {
+        if (this.localConfig?.getContents()[key] != null) {
             return this.localConfig.getPath();
         }
         if (this.globalConfig.getContents()[key] != null) {
@@ -284,7 +284,7 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
      * Loads all the properties and aggregates them according to location.
      */
     loadPropertiesSync() {
-        this.resolveProperties(this.globalConfig.readSync(), this.localConfig && this.localConfig.readSync());
+        this.resolveProperties(this.globalConfig.readSync(), this.localConfig?.readSync());
     }
     resolveProperties(globalConfig, localConfig) {
         const envVars = new envVars_1.EnvVars();
@@ -311,13 +311,13 @@ exports.ConfigAggregator = ConfigAggregator;
 ConfigAggregator.encrypted = true;
 /**
  * A ConfigAggregator that will work with deprecated config vars (e.g. defaultusername, apiVersion).
- * We do NOT recommend using this class unless you absolutelty have to.
+ * We do NOT recommend using this class unless you absolutely have to.
  *
  * @deprecated
  */
 class SfdxConfigAggregator extends ConfigAggregator {
     static async create(options = {}) {
-        const customConfigMeta = options.customConfigMeta || [];
+        const customConfigMeta = options.customConfigMeta ?? [];
         // org-metadata-rest-deploy has been moved to plugin-deploy-retrieve but we need to have a placeholder
         // for it here since sfdx needs to know how to set the deprecated restDeploy config var.
         const restDeploy = config_1.SFDX_ALLOWED_PROPERTIES.find((p) => p.key === config_1.SfdxPropertyKeys.REST_DEPLOY);

package/lib/config/configFile.js

@@ -78,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,
         };
     }
@@ -88,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 ? (0, os_1.homedir)() : await (0, 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.
@@ -246,7 +246,7 @@ class ConfigFile extends configStore_1.BaseConfigStore {
      * 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.
@@ -279,7 +279,7 @@ class ConfigFile extends configStore_1.BaseConfigStore {
     async unlink() {
         const exists = await this.exists();
         if (exists) {
-            return await fs.promises.unlink(this.getPath());
+            return fs.promises.unlink(this.getPath());
         }
         throw new sfError_1.SfError(`Target file doesn't exist. path: ${this.getPath()}`, 'TargetFileNotFound');
     }
@@ -308,14 +308,12 @@ class ConfigFile extends configStore_1.BaseConfigStore {
             if (!this.options.filename) {
                 throw new sfError_1.SfError('The ConfigOptions filename parameter is invalid.', 'InvalidParameter');
             }
-            const _isGlobal = (0, ts_types_1.isBoolean)(this.options.isGlobal) && this.options.isGlobal;
-            const _isState = (0, 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 = (0, 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 = (0, path_1.join)(configRootFolder, this.options.filePath ? this.options.filePath : '', this.options.filename);
         }

package/lib/config/configGroup.js

@@ -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();
     }
@@ -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 (0, 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 (0, 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.
@@ -189,6 +189,7 @@ class ConfigGroup extends configFile_1.ConfigFile {
         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);
                 });
             }
@@ -202,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

@@ -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.
@@ -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

@@ -28,7 +28,7 @@ class BaseConfigStore extends kit_1.AsyncOptionalCreatable {
     constructor(options) {
         super(options);
         this.statics = this.constructor;
-        this.options = options || {};
+        this.options = options ?? {};
         this.setContents(this.initialContents());
     }
     /**
@@ -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]);
         }
     }
@@ -205,7 +207,7 @@ class BaseConfigStore extends kit_1.AsyncOptionalCreatable {
         });
     }
     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,15 +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.
+    // eslint-disable-next-line class-methods-use-this
     setMethod(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 (0, ts_types_2.get)(contents, key);
     }
+    // eslint-disable-next-line class-methods-use-this
     initialContents() {
         return {};
     }
@@ -267,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
@@ -287,7 +292,7 @@ class BaseConfigStore extends kit_1.AsyncOptionalCreatable {
         if (!this.crypto)
             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}`, 'InvalidCryptoValueError');
+            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) {
@@ -296,7 +301,7 @@ class BaseConfigStore extends kit_1.AsyncOptionalCreatable {
         if (!this.crypto)
             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}`, 'InvalidCryptoValueError');
+            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;
     }
     /**
@@ -337,10 +342,8 @@ class BaseConfigStore extends kit_1.AsyncOptionalCreatable {
                 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);
         }
     }
 }

package/lib/config/envVars.js

@@ -420,7 +420,7 @@ class EnvVars extends kit_1.Env {
     getPropertyFromEnv(property, prefix = EnvVars.defaultPrefix()) {
         const envName = EnvVars.propertyToEnvName(property, prefix);
         const synonym = exports.SUPPORTED_ENV_VARS[envName]?.synonymOf;
-        return this.get(envName) || this.get(synonym);
+        return this.get(envName) ?? this.get(synonym);
     }
     asDictionary() {
         return this.entries().reduce((accumulator, [key, value]) => {

package/lib/config/tokensConfig.js

@@ -5,6 +5,7 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
+/* eslint-disable class-methods-use-this */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TokensConfig = void 0;
 const configFile_1 = require("./configFile");

package/lib/config/ttlConfig.d.ts

@@ -5,11 +5,13 @@ import { ConfigFile } from './configFile';
  * A Time To Live configuration file where each entry is timestamped and removed once the TTL has expired.
  *
  * @example
+ * ```
  * import { Duration } from '@salesforce/kit';
  * const config = await TTLConfig.create({
  *   isGlobal: false,
  *   ttl: Duration.days(1)
  * });
+ * ```
  */
 export declare class TTLConfig<T extends TTLConfig.Options, P extends JsonMap> extends ConfigFile<T, TTLConfig.Contents<P>> {
     set(key: string, value: Partial<TTLConfig.Entry<P>>): void;

package/lib/config/ttlConfig.js

@@ -12,11 +12,13 @@ const configFile_1 = require("./configFile");
  * A Time To Live configuration file where each entry is timestamped and removed once the TTL has expired.
  *
  * @example
+ * ```
  * import { Duration } from '@salesforce/kit';
  * const config = await TTLConfig.create({
  *   isGlobal: false,
  *   ttl: Duration.days(1)
  * });
+ * ```
  */
 class TTLConfig extends configFile_1.ConfigFile {
     set(key, value) {
@@ -24,13 +26,11 @@ class TTLConfig extends configFile_1.ConfigFile {
     }
     getLatestEntry() {
         const entries = this.entries();
-        const sorted = entries.sort(([, valueA], [, valueB]) => {
-            return new Date(valueB.timestamp).getTime() - new Date(valueA.timestamp).getTime();
-        });
+        const sorted = entries.sort(([, valueA], [, valueB]) => new Date(valueB.timestamp).getTime() - new Date(valueA.timestamp).getTime());
         return sorted.length > 0 ? sorted[0] : null;
     }
     getLatestKey() {
-        const [key] = this.getLatestEntry() || [null];
+        const [key] = this.getLatestEntry() ?? [null];
         return key;
     }
     isExpired(dateTime, value) {
@@ -46,6 +46,7 @@ class TTLConfig extends configFile_1.ConfigFile {
         }
         this.setContents(purged);
     }
+    // eslint-disable-next-line class-methods-use-this
     timestamp(value) {
         return { ...value, timestamp: new Date().toISOString() };
     }

package/lib/crypto/crypto.js

@@ -53,21 +53,17 @@ const keychainPromises = {
         const cacheKey = `${global_1.Global.DIR}:${service}:${account}`;
         const sb = cache_1.Cache.get(cacheKey);
         if (!sb) {
-            return new Promise((resolve, reject) => {
-                return _keychain.getPassword({ service, account }, (err, password) => {
-                    if (err)
-                        return reject(err);
-                    cache_1.Cache.set(cacheKey, makeSecureBuffer(password));
-                    return resolve({ username: account, password: (0, ts_types_1.ensure)(password) });
-                });
-            });
+            return new Promise((resolve, reject) => _keychain.getPassword({ service, account }, (err, password) => {
+                if (err)
+                    return reject(err);
+                cache_1.Cache.set(cacheKey, makeSecureBuffer(password));
+                return resolve({ username: account, password: (0, ts_types_1.ensure)(password) });
+            }));
         }
         else {
             const pw = sb.value((buffer) => buffer.toString('utf8'));
             cache_1.Cache.set(cacheKey, makeSecureBuffer(pw));
-            return new Promise((resolve) => {
-                return resolve({ username: account, password: (0, ts_types_1.ensure)(pw) });
-            });
+            return new Promise((resolve) => resolve({ username: account, password: (0, ts_types_1.ensure)(pw) }));
         }
     },
     /**
@@ -100,7 +96,7 @@ class Crypto extends kit_1.AsyncOptionalCreatable {
     constructor(options) {
         super(options);
         this.key = new secureBuffer_1.SecureBuffer();
-        this.options = options || {};
+        this.options = options ?? {};
     }
     encrypt(text) {
         if (text == null) {
@@ -155,6 +151,7 @@ class Crypto extends kit_1.AsyncOptionalCreatable {
      * @param text The text
      * @returns true if the text is encrypted, false otherwise.
      */
+    // eslint-disable-next-line class-methods-use-this
     isEncrypted(text) {
         if (text == null) {
             return false;

package/lib/crypto/keyChainImpl.d.ts

@@ -1,4 +1,6 @@
 /// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
 import * as childProcess from 'child_process';
 import * as nodeFs from 'fs';
 import { Nullable } from '@salesforce/ts-types';