@salesforce/core 4.0.1 → 4.1.1

package/README.md

@@ -95,7 +95,7 @@ describe('Mocking Aliases', () => {
     const testData = new MockTestOrgData();
     await $$.stubAliases({ myAlias: testData.username });
     const alias = (await StateAggregator.getInstance()).aliases.get(testData.username);
-    strictEqual(alias, 'myAlais');
+    strictEqual(alias, 'myAlias');
   });
 });
 

package/lib/org/org.js

@@ -984,12 +984,8 @@ class Org extends kit_1.AsyncOptionalCreatable {
         this.logger.debug(`Removing users associate with org: ${this.getOrgId()}`);
         const config = await this.retrieveOrgUsersConfig();
         this.logger.debug(`using path for org users: ${config.getPath()}`);
-        const authInfos = await this.readUserAuthFiles();
-        await Promise.all(authInfos
-            .map((auth) => auth.getFields().username)
-            .map(async (username) => {
-            const aliasKeys = (username && stateAggregator.aliases.getAll(username)) ?? [];
-            stateAggregator.aliases.unsetAll(username);
+        const usernames = (await this.readUserAuthFiles()).map((auth) => auth.getFields().username).filter(ts_types_1.isString);
+        await Promise.all(usernames.map(async (username) => {
             const orgForUser = username === this.getUsername()
                 ? this
                 : await Org.create({
@@ -998,13 +994,14 @@ class Org extends kit_1.AsyncOptionalCreatable {
             const orgType = this.isDevHubOrg() ? orgConfigProperties_1.OrgConfigProperties.TARGET_DEV_HUB : orgConfigProperties_1.OrgConfigProperties.TARGET_ORG;
             const configInfo = orgForUser.configAggregator.getInfo(orgType);
             const needsConfigUpdate = (configInfo.isGlobal() || configInfo.isLocal()) &&
-                (configInfo.value === username || aliasKeys.includes(configInfo.value));
+                (configInfo.value === username || stateAggregator.aliases.get(configInfo.value) === username);
             return [
                 orgForUser.removeAuth(),
                 needsConfigUpdate ? config_1.Config.update(configInfo.isGlobal(), orgType, undefined) : undefined,
             ].filter(Boolean);
         }));
-        await stateAggregator.aliases.write();
+        // now that we're done with all the aliases, we can unset those
+        await stateAggregator.aliases.unsetValuesAndSave(usernames);
     }
     async removeSandboxConfig() {
         const stateAggregator = await stateAggregator_1.StateAggregator.getInstance();

package/lib/stateAggregator/accessors/aliasAccessor.d.ts

@@ -1,10 +1,15 @@
 import { AsyncOptionalCreatable } from '@salesforce/kit';
 import { Nullable } from '@salesforce/ts-types';
-import { AuthFields, ConfigContents } from '../../exported';
+import { AuthFields } from '../../org/authInfo';
+import { ConfigContents } from '../../config/configStore';
 import { SfToken } from './tokenAccessor';
 export type Aliasable = string | (Partial<AuthFields> & Partial<SfToken>);
+export declare const DEFAULT_GROUP = "orgs";
+export declare const FILENAME = "alias.json";
 export declare class AliasAccessor extends AsyncOptionalCreatable {
-    private config;
+    private fileLocation;
+    /** orgs is the default group */
+    private aliasStore;
     /**
      * Returns all the aliases for all the values
      */
@@ -33,17 +38,6 @@ export declare class AliasAccessor extends AsyncOptionalCreatable {
      * @param alias the alias that corresponds to a username
      */
     getUsername(alias: string): Nullable<string>;
-    /**
-     * If the provided string is an alias, it returns the corresponding value.
-     * If the provided string is not an alias, we assume that the provided string
-     * is the value and return it.
-     *
-     * This method is helpful when you don't know if the string you have is a value
-     * or an alias.
-     *
-     * @param valueOrAlias a string that might be a value or might be an alias
-     */
-    resolveValue(valueOrAlias: string): string;
     /**
      * If the provided string is an alias, it returns the corresponding username.
      * If the provided string is not an alias, we assume that the provided string
@@ -64,25 +58,51 @@ export declare class AliasAccessor extends AsyncOptionalCreatable {
      *
      * @param usernameOrAlias a string that might be a username or might be an alias
      */
-    resolveAlias(usernameOrAlias: string): Nullable<string>;
+    resolveAlias(usernameOrAlias: string): string | undefined;
     /**
-     * Set an alias for the given aliasable entity
+     * Set an alias for the given aliasable entity.  Writes to the file
      *
+     * @deprecated use setAndSave
      * @param alias the alias you want to set
      * @param entity the aliasable entity that's being aliased
      */
     set(alias: string, entity: Aliasable): void;
     /**
-     * Unset the given alias.
+     * Set an alias for the given aliasable entity.  Writes to the file
+     *
+     * @param alias the alias you want to set
+     * @param entity the aliasable entity that's being aliased
+     */
+    setAndSave(alias: string, entity: Aliasable): Promise<void>;
+    /**
+     * Unset the given alias.  Writes to the file
+     *
+     * @deprecated use unsetAndSave
      *
      */
     unset(alias: string): void;
+    /**
+     * Unset the given alias(es).  Writes to the file
+     *
+     */
+    unsetAndSave(alias: string): Promise<void>;
     /**
      * Unsets all the aliases for the given entity.
      *
+     * @deprecated use unsetValuesAndSave
+     *
      * @param entity the aliasable entity for which you want to unset all aliases
      */
     unsetAll(entity: Aliasable): void;
+    /**
+     * Unset all the aliases for the given array of entity.
+     *
+     * @param entity the aliasable entity for which you want to unset all aliases
+     */
+    unsetValuesAndSave(aliasees: Aliasable[]): Promise<void>;
+    /**
+     * @deprecated the set/unset methods now write to the file when called.  Use (un)setAndSave instead of calling (un)set and then calling write()
+     */
     write(): Promise<ConfigContents>;
     /**
      * Returns true if the provided alias exists
@@ -92,7 +112,18 @@ export declare class AliasAccessor extends AsyncOptionalCreatable {
     has(alias: string): boolean;
     protected init(): Promise<void>;
     /**
-     * Returns the username of given aliasable entity
+     * go to the fileSystem and read the file, storing a copy in the class's store
+     * if the file doesn't exist, create it empty
      */
-    private getNameOf;
+    private readFileToAliasStore;
+    private saveAliasStoreToFile;
+    /**
+     * @deprecated use the async version of this method instead
+     * provided for the legacy sync set/unset methods. */
+    private readFileToAliasStoreSync;
+    /**
+     * @deprecated use the async version of this method instead
+     * provided for the legacy sync set/unset methods */
+    private saveAliasStoreToFileSync;
 }
+export declare const getFileLocation: () => string;

package/lib/stateAggregator/accessors/aliasAccessor.js

@@ -6,23 +6,34 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AliasAccessor = void 0;
+exports.getFileLocation = exports.AliasAccessor = exports.FILENAME = exports.DEFAULT_GROUP = void 0;
+const node_path_1 = require("node:path");
+const node_os_1 = require("node:os");
+const promises_1 = require("node:fs/promises");
+const node_fs_1 = require("node:fs");
+const proper_lockfile_1 = require("proper-lockfile");
 const kit_1 = require("@salesforce/kit");
-const aliasesConfig_1 = require("../../config/aliasesConfig");
+const global_1 = require("../../global");
 const sfError_1 = require("../../sfError");
+exports.DEFAULT_GROUP = 'orgs';
+exports.FILENAME = 'alias.json';
+const lockOptions = { stale: 10000 };
+const lockRetryOptions = {
+    ...lockOptions,
+    retries: { retries: 10, maxTimeout: 1000, factor: 2 },
+};
 class AliasAccessor extends kit_1.AsyncOptionalCreatable {
     getAll(entity) {
         // This will only return aliases under "orgs". This will need to be modified
         // if/when we want to support more aliases groups.
-        const all = (this.config.getGroup() ?? {});
         if (entity) {
-            const value = this.getNameOf(entity);
-            return Object.entries(all)
-                .filter((entry) => entry[1] === value)
-                .map((entry) => entry[0]);
+            const nameFromEntity = getNameOf(entity);
+            return Array.from(this.aliasStore.entries())
+                .filter(([, value]) => nameFromEntity === value)
+                .map(([alias]) => alias);
         }
         else {
-            return all;
+            return Object.fromEntries(this.aliasStore.entries());
         }
     }
     /**
@@ -31,7 +42,7 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
      * @param entity the aliasable entity that you want to get the alias of
      */
     get(entity) {
-        return this.getAll(entity).find((alias) => alias) ?? null;
+        return this.getAll(entity)[0] ?? null;
     }
     /**
      * Returns the value that corresponds to the given alias if it exists
@@ -39,7 +50,7 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
      * @param alias the alias that corresponds to a value
      */
     getValue(alias) {
-        return this.getAll()[alias] ?? null;
+        return this.aliasStore.get(alias) ?? null;
     }
     /**
      * Returns the username that corresponds to the given alias if it exists
@@ -47,20 +58,7 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
      * @param alias the alias that corresponds to a username
      */
     getUsername(alias) {
-        return this.getAll()[alias] ?? null;
-    }
-    /**
-     * If the provided string is an alias, it returns the corresponding value.
-     * If the provided string is not an alias, we assume that the provided string
-     * is the value and return it.
-     *
-     * This method is helpful when you don't know if the string you have is a value
-     * or an alias.
-     *
-     * @param valueOrAlias a string that might be a value or might be an alias
-     */
-    resolveValue(valueOrAlias) {
-        return this.getValue(valueOrAlias) ?? valueOrAlias;
+        return this.aliasStore.get(alias) ?? null;
     }
     /**
      * If the provided string is an alias, it returns the corresponding username.
@@ -85,37 +83,85 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
      * @param usernameOrAlias a string that might be a username or might be an alias
      */
     resolveAlias(usernameOrAlias) {
-        if (this.has(usernameOrAlias))
+        if (this.aliasStore.has(usernameOrAlias))
             return usernameOrAlias;
-        return Object.entries(this.getAll()).find(([, username]) => username === usernameOrAlias)?.[0];
+        return Array.from(this.aliasStore.entries()).find(([, value]) => value === usernameOrAlias)?.[0];
     }
     /**
-     * Set an alias for the given aliasable entity
+     * Set an alias for the given aliasable entity.  Writes to the file
      *
+     * @deprecated use setAndSave
      * @param alias the alias you want to set
      * @param entity the aliasable entity that's being aliased
      */
     set(alias, entity) {
-        this.config.set(alias, this.getNameOf(entity));
+        // get a very fresh copy to merge with to avoid conflicts
+        this.readFileToAliasStoreSync();
+        this.aliasStore.set(alias, getNameOf(entity));
+        this.saveAliasStoreToFileSync();
+    }
+    /**
+     * Set an alias for the given aliasable entity.  Writes to the file
+     *
+     * @param alias the alias you want to set
+     * @param entity the aliasable entity that's being aliased
+     */
+    async setAndSave(alias, entity) {
+        // get a very fresh copy to merge with to avoid conflicts, then lock
+        await this.readFileToAliasStore(true);
+        this.aliasStore.set(alias, getNameOf(entity));
+        return this.saveAliasStoreToFile();
     }
     /**
-     * Unset the given alias.
+     * Unset the given alias.  Writes to the file
+     *
+     * @deprecated use unsetAndSave
      *
      */
     unset(alias) {
-        this.config.unset(alias);
+        this.readFileToAliasStoreSync();
+        this.aliasStore.delete(alias);
+        this.saveAliasStoreToFileSync();
+    }
+    /**
+     * Unset the given alias(es).  Writes to the file
+     *
+     */
+    async unsetAndSave(alias) {
+        await this.readFileToAliasStore(true);
+        this.aliasStore.delete(alias);
+        return this.saveAliasStoreToFile();
     }
     /**
      * Unsets all the aliases for the given entity.
      *
+     * @deprecated use unsetValuesAndSave
+     *
      * @param entity the aliasable entity for which you want to unset all aliases
      */
     unsetAll(entity) {
+        this.readFileToAliasStoreSync();
         const aliases = this.getAll(entity);
-        aliases.forEach((alias) => this.unset(alias));
+        aliases.forEach((a) => this.aliasStore.delete(a));
+        this.saveAliasStoreToFileSync();
     }
+    /**
+     * Unset all the aliases for the given array of entity.
+     *
+     * @param entity the aliasable entity for which you want to unset all aliases
+     */
+    async unsetValuesAndSave(aliasees) {
+        await this.readFileToAliasStore(true);
+        (0, kit_1.ensureArray)(aliasees)
+            .flatMap((a) => this.getAll(a))
+            .map((a) => this.aliasStore.delete(a));
+        return this.saveAliasStoreToFile();
+    }
+    /**
+     * @deprecated the set/unset methods now write to the file when called.  Use (un)setAndSave instead of calling (un)set and then calling write()
+     */
     async write() {
-        return this.config.write();
+        return Promise.resolve(this.getAll());
     }
     /**
      * Returns true if the provided alias exists
@@ -123,24 +169,95 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
      * @param alias the alias you want to check
      */
     has(alias) {
-        return this.config.has(alias);
+        return this.aliasStore.has(alias);
     }
     async init() {
-        this.config = await aliasesConfig_1.AliasesConfig.create(aliasesConfig_1.AliasesConfig.getDefaultOptions());
+        this.fileLocation = (0, exports.getFileLocation)();
+        await this.readFileToAliasStore();
     }
     /**
-     * Returns the username of given aliasable entity
+     * go to the fileSystem and read the file, storing a copy in the class's store
+     * if the file doesn't exist, create it empty
      */
-    // eslint-disable-next-line class-methods-use-this
-    getNameOf(entity) {
-        if (typeof entity === 'string')
-            return entity;
-        const aliaseeName = entity.username ?? entity.user;
-        if (!aliaseeName) {
-            throw new sfError_1.SfError(`Invalid aliasee, it must contain a user or username property: ${JSON.stringify(entity)}`);
+    async readFileToAliasStore(useLock = false) {
+        if (useLock) {
+            await (0, proper_lockfile_1.lock)(this.fileLocation, lockRetryOptions);
+        }
+        try {
+            this.aliasStore = fileContentsRawToAliasStore(await (0, promises_1.readFile)(this.fileLocation, 'utf-8'));
+        }
+        catch (e) {
+            if (e instanceof Error && 'code' in e && e.code === 'ENOENT') {
+                this.aliasStore = new Map();
+                await (0, promises_1.mkdir)((0, node_path_1.dirname)(this.fileLocation), { recursive: true });
+                await this.saveAliasStoreToFile();
+                return;
+            }
+            if (useLock)
+                return unlockIfLocked(this.fileLocation);
+            throw e;
+        }
+    }
+    async saveAliasStoreToFile() {
+        await (0, promises_1.writeFile)(this.fileLocation, aliasStoreToRawFileContents(this.aliasStore));
+        return unlockIfLocked(this.fileLocation);
+    }
+    /**
+     * @deprecated use the async version of this method instead
+     * provided for the legacy sync set/unset methods. */
+    readFileToAliasStoreSync() {
+        // the file is guaranteed to exist because this init method ensures it
+        // put a lock in place.  This method is only used by legacy set/unset methods.
+        (0, proper_lockfile_1.lockSync)(this.fileLocation, lockOptions);
+        this.aliasStore = fileContentsRawToAliasStore((0, node_fs_1.readFileSync)(this.fileLocation, 'utf-8'));
+    }
+    /**
+     * @deprecated use the async version of this method instead
+     * provided for the legacy sync set/unset methods */
+    saveAliasStoreToFileSync() {
+        (0, node_fs_1.writeFileSync)(this.fileLocation, aliasStoreToRawFileContents(this.aliasStore));
+        try {
+            (0, proper_lockfile_1.unlockSync)(this.fileLocation);
+        }
+        catch (e) {
+            // ignore the error.  If it wasn't locked, that's what we wanted
+            if (errorIsNotAcquired(e))
+                return;
+            throw e;
         }
-        return aliaseeName;
     }
 }
 exports.AliasAccessor = AliasAccessor;
+/**
+ * Returns the username of given aliasable entity
+ */
+const getNameOf = (entity) => {
+    if (typeof entity === 'string')
+        return entity;
+    const aliaseeName = entity.username ?? entity.user;
+    if (!aliaseeName) {
+        throw new sfError_1.SfError(`Invalid aliasee, it must contain a user or username property: ${JSON.stringify(entity)}`);
+    }
+    return aliaseeName;
+};
+const fileContentsRawToAliasStore = (contents) => {
+    const fileContents = JSON.parse(contents);
+    return new Map(Object.entries(fileContents[exports.DEFAULT_GROUP]));
+};
+const aliasStoreToRawFileContents = (aliasStore) => JSON.stringify({ [exports.DEFAULT_GROUP]: Object.fromEntries(Array.from(aliasStore.entries())) });
+// exported for testSetup mocking
+const getFileLocation = () => (0, node_path_1.join)((0, node_os_1.homedir)(), global_1.Global.SFDX_STATE_FOLDER, exports.FILENAME);
+exports.getFileLocation = getFileLocation;
+const unlockIfLocked = async (fileLocation) => {
+    try {
+        await (0, proper_lockfile_1.unlock)(fileLocation);
+    }
+    catch (e) {
+        // ignore the error.  If it wasn't locked, that's what we wanted
+        if (errorIsNotAcquired(e))
+            return;
+        throw e;
+    }
+};
+const errorIsNotAcquired = (e) => e instanceof Error && 'code' in e && e.code === 'ENOTACQUIRED';
 //# sourceMappingURL=aliasAccessor.js.map

package/lib/status/myDomainResolver.js

@@ -61,8 +61,9 @@ class MyDomainResolver extends kit_1.AsyncOptionalCreatable {
      * executing the dns loookup.
      */
     async resolve() {
-        if (new kit_1.Env().getBoolean('SFDX_DISABLE_DNS_CHECK', false)) {
-            this.logger.debug('SFDX_DISABLE_DNS_CHECK set to true. Skipping DNS check...');
+        const env = new kit_1.Env();
+        if (env.getBoolean('SF_DISABLE_DNS_CHECK', env.getBoolean('SFDX_DISABLE_DNS_CHECK', false))) {
+            this.logger.debug('SF_DISABLE_DNS_CHECK set to true. Skipping DNS check...');
             return this.options.url.host;
         }
         // eslint-disable-next-line @typescript-eslint/no-this-alias

package/lib/testSetup.d.ts

@@ -8,7 +8,6 @@ import { Logger } from './logger';
 import { SfError } from './sfError';
 import { CometClient, CometSubscription, Message, StreamingExtension } from './status/streamingClient';
 import { AuthFields, SandboxFields } from './org';
-import { AliasGroup } from './config/aliasesConfig';
 /**
  * Different parts of the system that are mocked out. They can be restored for
  * individual tests. Test's stubs should always go on the DEFAULT which is exposed
@@ -82,7 +81,6 @@ export declare class TestContext {
      */
     configStubs: {
         [configName: string]: Optional<ConfigStub>;
-        AliasesConfig?: ConfigStub;
         AuthInfoConfig?: ConfigStub;
         Config?: ConfigStub;
         SfProjectJson?: ConfigStub;
@@ -187,7 +185,7 @@ export declare class TestContext {
     /**
      * Stub the aliases in the global aliases config file.
      */
-    stubAliases(aliases: Record<string, string>, group?: AliasGroup): void;
+    stubAliases(aliases: Record<string, string>, group?: string): void;
     /**
      * Stub contents in the config file.
      */

package/lib/testSetup.js

@@ -1,4 +1,6 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MockTestSandboxData = exports.MockTestOrgData = exports.StreamingMockCometClient = exports.StreamingMockCometSubscription = exports.StreamingMockSubscriptionCall = exports.shouldThrowSync = exports.shouldThrow = exports.unexpectedResult = exports.restoreContext = exports.stubContext = exports.instantiateContext = exports.uniqid = exports.TestContext = void 0;
 /*
  * Copyright (c) 2020, salesforce.com, inc.
  * All rights reserved.
@@ -10,8 +12,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MockTestSandboxData = exports.MockTestOrgData = exports.StreamingMockCometClient = exports.StreamingMockCometSubscription = exports.StreamingMockSubscriptionCall = exports.shouldThrowSync = exports.shouldThrow = exports.unexpectedResult = exports.restoreContext = exports.stubContext = exports.instantiateContext = exports.uniqid = exports.TestContext = void 0;
+const fs = require("node:fs");
 const crypto_1 = require("crypto");
 const events_1 = require("events");
 const os_1 = require("os");
@@ -27,11 +28,11 @@ const logger_1 = require("./logger");
 const messages_1 = require("./messages");
 const sfError_1 = require("./sfError");
 const sfProject_1 = require("./sfProject");
+const aliasAccessorEntireFile = require("./stateAggregator/accessors/aliasAccessor");
 const streamingClient_1 = require("./status/streamingClient");
 const stateAggregator_1 = require("./stateAggregator");
 const org_1 = require("./org");
 const sandboxAccessor_1 = require("./stateAggregator/accessors/sandboxAccessor");
-const aliasesConfig_1 = require("./config/aliasesConfig");
 const global_1 = require("./global");
 /**
  * Instantiate a @salesforce/core test context.
@@ -246,8 +247,11 @@ class TestContext {
     /**
      * Stub the aliases in the global aliases config file.
      */
-    stubAliases(aliases, group = aliasesConfig_1.AliasGroup.ORGS) {
-        this.configStubs.AliasesConfig = { contents: { [group]: aliases } };
+    stubAliases(aliases, group = aliasAccessorEntireFile.DEFAULT_GROUP) {
+        // we don't really "stub" these since they don't use configFile.
+        // write the fileContents to location
+        fs.mkdirSync((0, path_1.dirname)(getAliasFileLocation()), { recursive: true });
+        fs.writeFileSync(getAliasFileLocation(), JSON.stringify({ [group]: aliases }));
     }
     /**
      * Stub contents in the config file.
@@ -463,6 +467,7 @@ const stubContext = (testContext) => {
         }
         return testContext.fakeConnectionRequest.call(this, request, options);
     });
+    (0, ts_sinon_1.stubMethod)(testContext.SANDBOX, aliasAccessorEntireFile, 'getFileLocation').returns(getAliasFileLocation());
     stubs.configExists = (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.ORGS, stateAggregator_1.OrgAccessor.prototype, 'exists').callsFake(async function (username) {
         // @ts-expect-error because private member
         if ([...this.contents.keys()].includes(username))
@@ -483,6 +488,7 @@ const stubContext = (testContext) => {
     return stubs;
 };
 exports.stubContext = stubContext;
+const getAliasFileLocation = () => (0, path_1.join)((0, os_1.tmpdir)(), global_1.Global.SFDX_STATE_FOLDER, aliasAccessorEntireFile.FILENAME);
 /**
  * Restore a @salesforce/core test context. This is automatically stubbed in the global beforeEach created by
  * `const $$ = testSetup()` but is useful if you don't want to have a global stub of @salesforce/core and you

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "4.0.1",
+  "version": "4.1.1",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -52,6 +52,7 @@
     "js2xmlparser": "^4.0.1",
     "jsforce": "^2.0.0-beta.23",
     "jsonwebtoken": "9.0.0",
+    "proper-lockfile": "^4.1.2",
     "ts-retry-promise": "^0.7.0"
   },
   "devDependencies": {
@@ -64,6 +65,7 @@
     "@types/debug": "0.0.31",
     "@types/jsonwebtoken": "9.0.2",
     "@types/lodash": "^4.14.194",
+    "@types/proper-lockfile": "^4.1.2",
     "@types/shelljs": "0.8.12",
     "@typescript-eslint/eslint-plugin": "^5.59.7",
     "@typescript-eslint/parser": "^5.59.7",

package/lib/config/aliasesConfig.d.ts

@@ -1,12 +0,0 @@
-import { ConfigGroup } from './configGroup';
-import { ConfigContents, ConfigValue } from './configStore';
-/**
- * Different groups of aliases. Currently only support orgs.
- */
-export declare enum AliasGroup {
-    ORGS = "orgs"
-}
-export declare class AliasesConfig extends ConfigGroup<ConfigGroup.Options> {
-    static getDefaultOptions(): ConfigGroup.Options;
-    protected setMethod(contents: ConfigContents, key: string, value?: ConfigValue): void;
-}

package/lib/config/aliasesConfig.js

@@ -1,28 +0,0 @@
-"use strict";
-/*
- * Copyright (c) 2022, salesforce.com, inc.
- * All rights reserved.
- * 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
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AliasesConfig = exports.AliasGroup = void 0;
-const configGroup_1 = require("./configGroup");
-/**
- * Different groups of aliases. Currently only support orgs.
- */
-var AliasGroup;
-(function (AliasGroup) {
-    AliasGroup["ORGS"] = "orgs";
-})(AliasGroup = exports.AliasGroup || (exports.AliasGroup = {}));
-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;
-    }
-}
-exports.AliasesConfig = AliasesConfig;
-//# sourceMappingURL=aliasesConfig.js.map

package/lib/config/configGroup.d.ts

@@ -1,141 +0,0 @@
-import { Dictionary, JsonMap, Optional } from '@salesforce/ts-types';
-import { ConfigFile } from './configFile';
-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.
- *
- * **Note:** All config methods are overwritten to use the {@link ConfigGroup.setDefaultGroup}.
- *
- * ```
- * class MyPluginConfig extends ConfigGroup<ConfigGroup.Options> {
- *   public static getFileName(): string {
- *     return 'myPluginConfigFilename.json';
- *   }
- * }
- * const myConfig = await MyPluginConfig.create(ConfigGroup.getOptions('all'));
- * myConfig.setDefaultGroup('myCommand'); // Can be set in your command's init.
- * myConfig.set('mykey', 'myvalue'); // Sets 'myKey' for the 'myCommand' group.
- * myConfig.setInGroup('myKey', 'myvalue', 'all'); // Manually set in another group.
- * await myConfig.write();
- * ```
- */
-export declare class ConfigGroup<T extends ConfigGroup.Options> extends ConfigFile<T> {
-    protected defaultGroup: string;
-    /**
-     * Get ConfigGroup specific options, such as the default group.
-     *
-     * @param defaultGroup The default group to use when creating the config.
-     * @param filename The filename of the config file. Uses the static {@link getFileName} by default.
-     */
-    static getOptions(defaultGroup: string, filename?: string): ConfigGroup.Options;
-    /**
-     * Sets the default group for all {@link BaseConfigStore} methods to use.
-     * **Throws** *{@link SfError}{ name: 'MissingGroupName' }* The group parameter is null or undefined.
-     *
-     * @param group The group.
-     */
-    setDefaultGroup(group: string): void;
-    /**
-     * Set a group of entries in a bulk save. Returns The new properties that were saved.
-     *
-     * @param newEntries An object representing the aliases to set.
-     * @param group The group the property belongs to.
-     */
-    updateValues(newEntries: Dictionary<ConfigValue>, group?: string): Promise<Dictionary<ConfigValue>>;
-    /**
-     * Set a value on a group. Returns the promise resolved when the value is set.
-     *
-     * @param key The key.
-     * @param value The value.
-     * @param group The group.
-     */
-    updateValue(key: string, value: ConfigValue, group?: string): Promise<void>;
-    /**
-     * Gets an array of key value pairs.
-     */
-    entries(): ConfigEntry[];
-    /**
-     * Returns a specified element from ConfigGroup. Returns the associated value.
-     *
-     * @param key The key.
-     */
-    get(key: string): Optional<ConfigValue>;
-    /**
-     * Returns a boolean if an element with the specified key exists in the default group.
-     *
-     * @param {string} key The key.
-     */
-    has(key: string): boolean;
-    /**
-     * Returns an array of the keys from the default group.
-     */
-    keys(): string[];
-    /**
-     * Returns an array of the values from the default group.
-     */
-    values(): ConfigValue[];
-    /**
-     * Add or updates an element with the specified key in the default group.
-     *
-     * @param key The key.
-     * @param value The value.
-     */
-    set(key: string, value: ConfigValue): ConfigContents;
-    /**
-     * Removes an element with the specified key from the default group. Returns `true` if the item was deleted.
-     *
-     * @param key The key.
-     */
-    unset(key: string): boolean;
-    /**
-     * Remove all key value pairs from the default group.
-     */
-    clear(): void;
-    /**
-     * Get all config contents for a group.
-     *
-     * @param {string} [group = 'default'] The group.
-     */
-    getGroup(group?: string): Optional<ConfigContents>;
-    /**
-     * Returns the value associated to the key and group, or undefined if there is none.
-     *
-     * @param key The key.
-     * @param group The group. Defaults to the default group.
-     */
-    getInGroup(key: string, group?: string): Optional<ConfigValue>;
-    /**
-     * Convert the config object to a json object.
-     */
-    toObject(): JsonMap;
-    /**
-     * Convert an object to a {@link ConfigContents} and set it as the config contents.
-     *
-     * @param {object} obj The object.
-     */
-    setContentsFromObject<U extends object>(obj: U): void;
-    /**
-     * Sets the value for the key and group in the config object.
-     *
-     * @param key The key.
-     * @param value The value.
-     * @param group The group. Uses the default group if not specified.
-     */
-    setInGroup(key: string, value?: ConfigValue, group?: string): ConfigContents;
-    /**
-     * Initialize the asynchronous dependencies.
-     */
-    init(): Promise<void>;
-}
-export declare namespace ConfigGroup {
-    /**
-     * Options when creating the config file.
-     */
-    interface Options extends ConfigFile.Options {
-        /**
-         * The default group for properties to go into.
-         */
-        defaultGroup?: string;
-    }
-}

package/lib/config/configGroup.js

@@ -1,225 +0,0 @@
-"use strict";
-/*
- * Copyright (c) 2020, salesforce.com, inc.
- * All rights reserved.
- * 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
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConfigGroup = void 0;
-const ts_types_1 = require("@salesforce/ts-types");
-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
- * values for different commands, without having manually manipulate the config.
- *
- * **Note:** All config methods are overwritten to use the {@link ConfigGroup.setDefaultGroup}.
- *
- * ```
- * class MyPluginConfig extends ConfigGroup<ConfigGroup.Options> {
- *   public static getFileName(): string {
- *     return 'myPluginConfigFilename.json';
- *   }
- * }
- * const myConfig = await MyPluginConfig.create(ConfigGroup.getOptions('all'));
- * myConfig.setDefaultGroup('myCommand'); // Can be set in your command's init.
- * myConfig.set('mykey', 'myvalue'); // Sets 'myKey' for the 'myCommand' group.
- * myConfig.setInGroup('myKey', 'myvalue', 'all'); // Manually set in another group.
- * await myConfig.write();
- * ```
- */
-class ConfigGroup extends configFile_1.ConfigFile {
-    constructor() {
-        super(...arguments);
-        this.defaultGroup = 'default';
-    }
-    /**
-     * Get ConfigGroup specific options, such as the default group.
-     *
-     * @param defaultGroup The default group to use when creating the config.
-     * @param filename The filename of the config file. Uses the static {@link getFileName} by default.
-     */
-    static getOptions(defaultGroup, filename) {
-        const options = configFile_1.ConfigFile.getDefaultOptions(true, filename);
-        const configGroupOptions = { defaultGroup };
-        Object.assign(configGroupOptions, options);
-        return configGroupOptions;
-    }
-    /**
-     * Sets the default group for all {@link BaseConfigStore} methods to use.
-     * **Throws** *{@link SfError}{ name: 'MissingGroupName' }* The group parameter is null or undefined.
-     *
-     * @param group The group.
-     */
-    setDefaultGroup(group) {
-        if (!group) {
-            throw new sfError_1.SfError('null or undefined group', 'MissingGroupName');
-        }
-        this.defaultGroup = group;
-    }
-    /**
-     * Set a group of entries in a bulk save. Returns The new properties that were saved.
-     *
-     * @param newEntries An object representing the aliases to set.
-     * @param group The group the property belongs to.
-     */
-    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));
-        await this.write();
-        return newEntries;
-    }
-    /**
-     * Set a value on a group. Returns the promise resolved when the value is set.
-     *
-     * @param key The key.
-     * @param value The value.
-     * @param group The group.
-     */
-    async updateValue(key, value, group) {
-        // Make sure the content is loaded
-        await this.read();
-        this.setInGroup(key, value, group ?? this.defaultGroup);
-        // Then save it
-        await this.write();
-    }
-    /**
-     * Gets an array of key value pairs.
-     */
-    entries() {
-        const group = this.getGroup();
-        if (group) {
-            return (0, ts_types_1.definiteEntriesOf)(group);
-        }
-        return [];
-    }
-    /**
-     * Returns a specified element from ConfigGroup. Returns the associated value.
-     *
-     * @param key The key.
-     */
-    get(key) {
-        return this.getInGroup(key);
-    }
-    /**
-     * Returns a boolean if an element with the specified key exists in the default group.
-     *
-     * @param {string} key The key.
-     */
-    has(key) {
-        const group = this.getGroup();
-        return !!group && super.has(this.defaultGroup) && !!group[key];
-    }
-    /**
-     * Returns an array of the keys from the default group.
-     */
-    keys() {
-        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) ?? {});
-    }
-    /**
-     * Add or updates an element with the specified key in the default group.
-     *
-     * @param key The key.
-     * @param value The value.
-     */
-    set(key, value) {
-        return this.setInGroup(key, value, this.defaultGroup);
-    }
-    /**
-     * Removes an element with the specified key from the default group. Returns `true` if the item was deleted.
-     *
-     * @param key The key.
-     */
-    unset(key) {
-        const groupContents = this.getGroup(this.defaultGroup);
-        if (groupContents) {
-            delete groupContents[key];
-            return true;
-        }
-        return false;
-    }
-    /**
-     * Remove all key value pairs from the default group.
-     */
-    clear() {
-        delete this.getContents()[this.defaultGroup];
-    }
-    /**
-     * Get all config contents for a group.
-     *
-     * @param {string} [group = 'default'] The group.
-     */
-    getGroup(group = this.defaultGroup) {
-        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.
-     *
-     * @param key The key.
-     * @param group The group. Defaults to the default group.
-     */
-    getInGroup(key, group) {
-        const groupContents = this.getGroup(group);
-        if (groupContents) {
-            return groupContents[key];
-        }
-    }
-    /**
-     * Convert the config object to a json object.
-     */
-    toObject() {
-        return this.getContents();
-    }
-    /**
-     * Convert an object to a {@link ConfigContents} and set it as the config contents.
-     *
-     * @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);
-                });
-            }
-        });
-    }
-    /**
-     * Sets the value for the key and group in the config object.
-     *
-     * @param key The key.
-     * @param value The value.
-     * @param group The group. Uses the default group if not specified.
-     */
-    setInGroup(key, value, group) {
-        group = group ?? this.defaultGroup;
-        if (!super.has(group)) {
-            super.set(group, {});
-        }
-        const content = this.getGroup(group) ?? {};
-        this.setMethod(content, key, value);
-        return content;
-    }
-    /**
-     * Initialize the asynchronous dependencies.
-     */
-    async init() {
-        await super.init();
-        if (this.options.defaultGroup) {
-            this.setDefaultGroup(this.options.defaultGroup);
-        }
-    }
-}
-exports.ConfigGroup = ConfigGroup;
-//# sourceMappingURL=configGroup.js.map