@salesforce/core 3.24.5 → 3.26.0

package/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [3.26.0](https://github.com/forcedotcom/sfdx-core/compare/v3.25.1...v3.26.0) (2022-08-04)
+
+### Features
+
+- remove GlobalInfo ([57bd0fa](https://github.com/forcedotcom/sfdx-core/commit/57bd0fa50c5fe3cc859ca107fd0a18dc1b871c1f))
+
+### [3.25.1](https://github.com/forcedotcom/sfdx-core/compare/v3.25.0...v3.25.1) (2022-08-03)
+
+### Bug Fixes
+
+- add interop between templates config/env var ([eea3d05](https://github.com/forcedotcom/sfdx-core/commit/eea3d055b75ceb61639e06bc53e309a01f70a8e2))
+
+## [3.25.0](https://github.com/forcedotcom/sfdx-core/compare/v3.24.5...v3.25.0) (2022-07-29)
+
+### Features
+
+- orgAccessor.get has throwOnNotFound option ([a2ee821](https://github.com/forcedotcom/sfdx-core/commit/a2ee8219adf692de7de17ba254e05f501ef5814c))
+
 ### [3.24.5](https://github.com/forcedotcom/sfdx-core/compare/v3.24.4...v3.24.5) (2022-07-28)
 
 ### Bug Fixes

package/lib/config/config.js

@@ -40,6 +40,7 @@ const messages = messages_1.Messages.load('@salesforce/core', 'config', [
     'restDeploy',
     'instanceUrl',
     'disable-telemetry',
+    'customOrgMetadataTemplates',
 ]);
 const SFDX_CONFIG_FILE_NAME = 'sfdx-config.json';
 const CONFIG_FILE_NAME = 'config.json';
@@ -200,6 +201,12 @@ exports.SFDX_ALLOWED_PROPERTIES = [
             failedMessage: messages.getMessage('invalidBooleanConfigValue'),
         },
     },
+    {
+        key: SfdxPropertyKeys.CUSTOM_ORG_METADATA_TEMPLATES,
+        newKey: orgConfigProperties_1.OrgConfigProperties.ORG_CUSTOM_METADATA_TEMPLATES,
+        deprecated: true,
+        description: messages.getMessage(SfdxPropertyKeys.CUSTOM_ORG_METADATA_TEMPLATES),
+    },
     {
         key: SfdxPropertyKeys.REST_DEPLOY,
         description: messages.getMessage(SfdxPropertyKeys.REST_DEPLOY),

package/lib/exported.d.ts

@@ -3,7 +3,7 @@ export { ConfigFile } from './config/configFile';
 export { TTLConfig } from './config/ttlConfig';
 export { envVars, EnvironmentVariable, SUPPORTED_ENV_VARS, EnvVars } from './config/envVars';
 export { ConfigContents, ConfigEntry, ConfigStore, ConfigValue } from './config/configStore';
-export { GlobalInfo, SfInfo, SfInfoKeys, SfOrg, SfOrgs, SfToken, SfTokens, StateAggregator } from './stateAggregator';
+export { SfTokens, StateAggregator } from './stateAggregator';
 export { DeviceOauthService, DeviceCodeResponse, DeviceCodePollingResponse } from './deviceOauthService';
 export { OrgUsersConfig } from './config/orgUsersConfig';
 export { ConfigPropertyMeta, ConfigPropertyMetaInput, Config, SfdxPropertyKeys, SfConfigProperties, SFDX_ALLOWED_PROPERTIES, SF_ALLOWED_PROPERTIES, } from './config/config';

package/lib/exported.js

@@ -16,8 +16,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefaultUserFields = exports.MyDomainResolver = exports.StreamingClient = exports.CometClient = exports.PollingClient = exports.SfdxError = exports.SfError = exports.SchemaValidator = exports.SchemaPrinter = exports.SfdxProjectJson = exports.SfdxProject = exports.SfProjectJson = exports.SfProject = exports.ORG_CONFIG_ALLOWED_PROPERTIES = exports.OrgConfigProperties = exports.OrgTypes = exports.SandboxEvents = exports.Org = exports.Messages = exports.Logger = exports.LoggerLevel = exports.getJwtAudienceUrl = exports.SfdcUrl = exports.WebOAuthServer = exports.Lifecycle = exports.Global = exports.Mode = exports.SFDX_HTTP_HEADERS = exports.Connection = exports.AuthRemover = exports.AuthInfo = exports.SfdxConfigAggregator = exports.ConfigAggregator = exports.SandboxRequestCache = exports.SF_ALLOWED_PROPERTIES = exports.SFDX_ALLOWED_PROPERTIES = exports.SfConfigProperties = exports.SfdxPropertyKeys = exports.Config = exports.OrgUsersConfig = exports.DeviceOauthService = exports.StateAggregator = exports.SfInfoKeys = exports.GlobalInfo = exports.EnvVars = exports.SUPPORTED_ENV_VARS = exports.EnvironmentVariable = exports.envVars = exports.TTLConfig = exports.ConfigFile = void 0;
-exports.ScratchOrgCache = exports.scratchOrgLifecycleStages = exports.scratchOrgLifecycleEventName = exports.scratchOrgResume = exports.scratchOrgCreate = exports.PermissionSetAssignment = exports.User = exports.REQUIRED_FIELDS = void 0;
+exports.User = exports.REQUIRED_FIELDS = exports.DefaultUserFields = exports.MyDomainResolver = exports.StreamingClient = exports.CometClient = exports.PollingClient = exports.SfdxError = exports.SfError = exports.SchemaValidator = exports.SchemaPrinter = exports.SfdxProjectJson = exports.SfdxProject = exports.SfProjectJson = exports.SfProject = exports.ORG_CONFIG_ALLOWED_PROPERTIES = exports.OrgConfigProperties = exports.OrgTypes = exports.SandboxEvents = exports.Org = exports.Messages = exports.Logger = exports.LoggerLevel = exports.getJwtAudienceUrl = exports.SfdcUrl = exports.WebOAuthServer = exports.Lifecycle = exports.Global = exports.Mode = exports.SFDX_HTTP_HEADERS = exports.Connection = exports.AuthRemover = exports.AuthInfo = exports.SfdxConfigAggregator = exports.ConfigAggregator = exports.SandboxRequestCache = exports.SF_ALLOWED_PROPERTIES = exports.SFDX_ALLOWED_PROPERTIES = exports.SfConfigProperties = exports.SfdxPropertyKeys = exports.Config = exports.OrgUsersConfig = exports.DeviceOauthService = exports.StateAggregator = exports.EnvVars = exports.SUPPORTED_ENV_VARS = exports.EnvironmentVariable = exports.envVars = exports.TTLConfig = exports.ConfigFile = void 0;
+exports.ScratchOrgCache = exports.scratchOrgLifecycleStages = exports.scratchOrgLifecycleEventName = exports.scratchOrgResume = exports.scratchOrgCreate = exports.PermissionSetAssignment = void 0;
 const messages_1 = require("./messages");
 messages_1.Messages.importMessagesDirectory(__dirname);
 var configFile_1 = require("./config/configFile");
@@ -30,8 +30,6 @@ Object.defineProperty(exports, "EnvironmentVariable", { enumerable: true, get: f
 Object.defineProperty(exports, "SUPPORTED_ENV_VARS", { enumerable: true, get: function () { return envVars_1.SUPPORTED_ENV_VARS; } });
 Object.defineProperty(exports, "EnvVars", { enumerable: true, get: function () { return envVars_1.EnvVars; } });
 var stateAggregator_1 = require("./stateAggregator");
-Object.defineProperty(exports, "GlobalInfo", { enumerable: true, get: function () { return stateAggregator_1.GlobalInfo; } });
-Object.defineProperty(exports, "SfInfoKeys", { enumerable: true, get: function () { return stateAggregator_1.SfInfoKeys; } });
 Object.defineProperty(exports, "StateAggregator", { enumerable: true, get: function () { return stateAggregator_1.StateAggregator; } });
 var deviceOauthService_1 = require("./deviceOauthService");
 Object.defineProperty(exports, "DeviceOauthService", { enumerable: true, get: function () { return deviceOauthService_1.DeviceOauthService; } });

package/lib/org/authRemover.js

@@ -14,7 +14,6 @@ const messages_1 = require("../messages");
 const stateAggregator_1 = require("../stateAggregator");
 const orgConfigProperties_1 = require("./orgConfigProperties");
 messages_1.Messages.importMessagesDirectory(__dirname);
-const coreMessages = messages_1.Messages.load('@salesforce/core', 'core', ['namedOrgNotFound']);
 const messages = messages_1.Messages.load('@salesforce/core', 'auth', ['targetOrgNotSet']);
 /**
  * Handles  the removing of authorizations, which includes deleting the auth file
@@ -72,12 +71,8 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
      * @returns {Promise<SfOrg>}
      */
     async findAuth(usernameOrAlias) {
-        const username = await this.resolveUsername(usernameOrAlias || this.getTargetOrg());
-        const auth = this.stateAggregator.orgs.get(username);
-        if (!auth) {
-            throw coreMessages.createError('namedOrgNotFound');
-        }
-        return auth;
+        const username = await this.resolveUsername(usernameOrAlias ?? this.getTargetOrg());
+        return this.stateAggregator.orgs.get(username, false, true);
     }
     /**
      * Finds all org authorizations in the global info file (.sf/sf.json)

package/lib/org/orgConfigProperties.js

@@ -27,6 +27,7 @@ const messages = messages_1.Messages.load('@salesforce/core', 'config', [
     'org-max-query-limit',
     'target-dev-hub',
     'target-org',
+    'org-custom-metadata-templates',
 ]);
 var OrgConfigProperties;
 (function (OrgConfigProperties) {
@@ -64,6 +65,10 @@ var OrgConfigProperties;
     OrgConfigProperties["ORG_ISV_DEBUGGER_URL"] = "org-isv-debugger-url";
 })(OrgConfigProperties = exports.OrgConfigProperties || (exports.OrgConfigProperties = {}));
 exports.ORG_CONFIG_ALLOWED_PROPERTIES = [
+    {
+        key: OrgConfigProperties.ORG_CUSTOM_METADATA_TEMPLATES,
+        description: messages.getMessage(OrgConfigProperties.ORG_CUSTOM_METADATA_TEMPLATES),
+    },
     {
         key: OrgConfigProperties.TARGET_ORG,
         description: messages.getMessage(OrgConfigProperties.TARGET_ORG),

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

@@ -1,91 +1,8 @@
 import { AsyncOptionalCreatable } from '@salesforce/kit';
 import { Nullable } from '@salesforce/ts-types';
-import { ConfigContents } from '../../exported';
-import { GlobalInfo } from '../globalInfoConfig';
-import { SfAliases, SfOrg, SfToken } from '../types';
-export declare type Aliasable = string | Partial<SfOrg> | Partial<SfToken>;
-/**
- * @deprecated
- */
-export declare class GlobalInfoAliasAccessor {
-    private globalInfo;
-    constructor(globalInfo: GlobalInfo);
-    /**
-     * Returns all the aliases for all the values
-     */
-    getAll(): SfAliases;
-    /**
-     * Returns all the aliases for a given entity
-     *
-     * @param entity the aliasable entity that you want to get the aliases of
-     */
-    getAll(entity: Aliasable): string[];
-    /**
-     * Returns the first alias found for a given entity
-     *
-     * @param entity the aliasable entity that you want to get the alias of
-     */
-    get(entity: Aliasable): Nullable<string>;
-    /**
-     * Returns the value that corresponds to the given alias if it exists
-     *
-     * @param alias the alias that corresponds to a value
-     */
-    getValue(alias: string): Nullable<string>;
-    /**
-     * Returns the username that corresponds to the given alias if it exists
-     *
-     * @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
-     * is the username and return it.
-     *
-     * This method is helpful when you don't know if the string you have is a username
-     * or an alias.
-     *
-     * @param usernameOrAlias a string that might be a username or might be an alias
-     */
-    resolveUsername(usernameOrAlias: string): string;
-    /**
-     * Set an alias for the given aliasable entity
-     *
-     * @param alias the alias you want to set
-     * @param entity the aliasable entity that's being aliased
-     */
-    set(alias: string, entity: Aliasable): void;
-    /**
-     * Updates the alias for the given aliasable entity
-     *
-     * @param alias the alias you want to set
-     * @param entity the aliasable entity that's being aliased
-     */
-    update(alias: string, entity: Aliasable): void;
-    unset(alias: string): void;
-    /**
-     * This method unsets all the aliases for the given entity.
-     *
-     * @param entity the aliasable entity for which you want to unset all aliases
-     */
-    unsetAll(entity: Aliasable): void;
-    /**
-     * Returns the username of given aliasable entity
-     */
-    private getNameOf;
-}
+import { AuthFields, ConfigContents } from '../../exported';
+import { SfToken } from './tokenAccessor';
+export declare type Aliasable = string | (Partial<AuthFields> & Partial<SfToken>);
 export declare class AliasAccessor extends AsyncOptionalCreatable {
     private config;
     /**

package/lib/stateAggregator/accessors/aliasAccessor.js

@@ -6,126 +6,10 @@
  * 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 = exports.GlobalInfoAliasAccessor = void 0;
+exports.AliasAccessor = void 0;
 const kit_1 = require("@salesforce/kit");
 const aliasesConfig_1 = require("../../config/aliasesConfig");
 const sfError_1 = require("../../sfError");
-const types_1 = require("../types");
-/**
- * @deprecated
- */
-class GlobalInfoAliasAccessor {
-    constructor(globalInfo) {
-        this.globalInfo = globalInfo;
-    }
-    getAll(entity) {
-        const all = this.globalInfo.get(types_1.SfInfoKeys.ALIASES) || {};
-        if (entity) {
-            const value = this.getNameOf(entity);
-            return Object.entries(all)
-                .filter((entry) => entry[1] === value)
-                .map((entry) => entry[0]);
-        }
-        else {
-            return all;
-        }
-    }
-    /**
-     * Returns the first alias found for a given entity
-     *
-     * @param entity the aliasable entity that you want to get the alias of
-     */
-    get(entity) {
-        return this.getAll(entity).find((alias) => alias) ?? null;
-    }
-    /**
-     * Returns the value that corresponds to the given alias if it exists
-     *
-     * @param alias the alias that corresponds to a value
-     */
-    getValue(alias) {
-        return this.getAll()[alias] ?? null;
-    }
-    /**
-     * Returns the username that corresponds to the given alias if it exists
-     *
-     * @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;
-    }
-    /**
-     * 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
-     * is the username and return it.
-     *
-     * This method is helpful when you don't know if the string you have is a username
-     * or an alias.
-     *
-     * @param usernameOrAlias a string that might be a username or might be an alias
-     */
-    resolveUsername(usernameOrAlias) {
-        return this.getUsername(usernameOrAlias) ?? usernameOrAlias;
-    }
-    /**
-     * Set an alias for the given aliasable entity
-     *
-     * @param alias the alias you want to set
-     * @param entity the aliasable entity that's being aliased
-     */
-    set(alias, entity) {
-        const value = this.getNameOf(entity);
-        this.globalInfo.set(`${types_1.SfInfoKeys.ALIASES}["${alias}"]`, value);
-    }
-    /**
-     * Updates the alias for the given aliasable entity
-     *
-     * @param alias the alias you want to set
-     * @param entity the aliasable entity that's being aliased
-     */
-    update(alias, entity) {
-        const value = this.getNameOf(entity);
-        this.globalInfo.update(`${types_1.SfInfoKeys.ALIASES}["${alias}"]`, value);
-    }
-    unset(alias) {
-        delete this.globalInfo.get(types_1.SfInfoKeys.ALIASES)[alias];
-    }
-    /**
-     * This method unsets all the aliases for the given entity.
-     *
-     * @param entity the aliasable entity for which you want to unset all aliases
-     */
-    unsetAll(entity) {
-        const aliases = this.getAll(entity);
-        aliases.forEach((alias) => this.unset(alias));
-    }
-    /**
-     * Returns the username of given aliasable entity
-     */
-    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;
-    }
-}
-exports.GlobalInfoAliasAccessor = GlobalInfoAliasAccessor;
 class AliasAccessor extends kit_1.AsyncOptionalCreatable {
     getAll(entity) {
         // This will only return aliases under "orgs". This will need to be modified

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

@@ -1,32 +1,17 @@
 /// <reference types="node" />
 import * as fs from 'fs';
-import { Nullable, Optional } from '@salesforce/ts-types';
+import { Nullable } from '@salesforce/ts-types';
 import { AsyncOptionalCreatable } from '@salesforce/kit';
 import { AuthInfoConfig } from '../../config/authInfoConfig';
-import { GlobalInfo } from '../globalInfoConfig';
-import { SfOrgs, SfOrg } from '../types';
 import { AuthFields } from '../../org';
 import { ConfigFile } from '../../config/configFile';
 import { ConfigContents } from '../../config/configStore';
-/**
- * @deprecated
- */
-export declare class GlobalInfoOrgAccessor {
-    private globalInfo;
-    constructor(globalInfo: GlobalInfo);
-    getAll(decrypt?: boolean): SfOrgs;
-    get(username: string, decrypt?: boolean): Optional<SfOrg>;
-    has(username: string): boolean;
-    set(username: string, org: SfOrg): void;
-    update(username: string, org: Partial<SfOrg>): void;
-    unset(username: string): void;
-}
 export declare abstract class BaseOrgAccessor<T extends ConfigFile, P extends ConfigContents> extends AsyncOptionalCreatable {
     private configs;
     private contents;
     private logger;
     /**
-     * Read the auth file for the given useranme. Once the file has been read, it can be reaccessed with the `get` method.
+     * Read the auth file for the given username. Once the file has been read, it can be re-accessed with the `get` method.
      *
      * @param username username to read
      * @param decrypt if true, decrypt encrypted values
@@ -39,13 +24,7 @@ export declare abstract class BaseOrgAccessor<T extends ConfigFile, P extends Co
      * @param decrypt if true, decrypt encrypted values
      */
     readAll(decrypt?: boolean): Promise<P[]>;
-    /**
-     * Return the contents of the username's auth file from cache. The `read` or `readAll` methods must be called first in order to populate the cache.
-     *
-     * @param username username to get
-     * @param decrypt if true, decrypt encrypted values
-     */
-    get(username: string, decrypt?: boolean): Nullable<P>;
+    get(username: string, decrypt?: boolean, throwOnNotFound?: true): P;
     /**
      * Return the contents of all the auth files from cache. The `read` or `readAll` methods must be called first in order to populate the cache.
      *

package/lib/stateAggregator/accessors/orgAccessor.js

@@ -6,49 +6,14 @@
  * 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.OrgAccessor = exports.BaseOrgAccessor = exports.GlobalInfoOrgAccessor = void 0;
+exports.OrgAccessor = exports.BaseOrgAccessor = void 0;
 const fs = require("fs");
 const path = require("path");
 const kit_1 = require("@salesforce/kit");
 const authInfoConfig_1 = require("../../config/authInfoConfig");
 const global_1 = require("../../global");
-const types_1 = require("../types");
 const logger_1 = require("../../logger");
-/**
- * @deprecated
- */
-class GlobalInfoOrgAccessor {
-    constructor(globalInfo) {
-        this.globalInfo = globalInfo;
-    }
-    getAll(decrypt = false) {
-        return this.globalInfo.get(types_1.SfInfoKeys.ORGS, decrypt);
-    }
-    get(username, decrypt = false) {
-        const auth = this.globalInfo.get(`${types_1.SfInfoKeys.ORGS}["${username}"]`, decrypt);
-        // For legacy, some things wants the username in the returned auth info.
-        if (auth && !auth.username)
-            auth.username = username;
-        return auth;
-    }
-    has(username) {
-        return !!this.getAll()[username];
-    }
-    set(username, org) {
-        // For legacy, and to keep things standard, some things wants the username in auth info.
-        org.username ?? (org.username = username);
-        this.globalInfo.set(`${types_1.SfInfoKeys.ORGS}["${username}"]`, org);
-    }
-    update(username, org) {
-        // For legacy, and to keep things standard, some things wants the username in auth info.
-        org.username ?? (org.username = username);
-        this.globalInfo.update(`${types_1.SfInfoKeys.ORGS}["${username}"]`, org);
-    }
-    unset(username) {
-        delete this.globalInfo.get(types_1.SfInfoKeys.ORGS)[username];
-    }
-}
-exports.GlobalInfoOrgAccessor = GlobalInfoOrgAccessor;
+const messages_1 = require("../../messages");
 function chunk(array, chunkSize) {
     const final = [];
     for (let i = 0, len = array.length; i < len; i += chunkSize)
@@ -62,7 +27,7 @@ class BaseOrgAccessor extends kit_1.AsyncOptionalCreatable {
         this.contents = new Map();
     }
     /**
-     * Read the auth file for the given useranme. Once the file has been read, it can be reaccessed with the `get` method.
+     * Read the auth file for the given username. Once the file has been read, it can be re-accessed with the `get` method.
      *
      * @param username username to read
      * @param decrypt if true, decrypt encrypted values
@@ -96,13 +61,21 @@ class BaseOrgAccessor extends kit_1.AsyncOptionalCreatable {
         return this.getAll(decrypt);
     }
     /**
-     * Return the contents of the username's auth file from cache. The `read` or `readAll` methods must be called first in order to populate the cache.
+     * Return the contents of the username's auth file from cache.
+     * The `read` or `readAll` methods must be called first in order to populate the cache.
+     * If throwOnNotFound is not true, an empty object {} is returned if the org is not found.
      *
      * @param username username to get
      * @param decrypt if true, decrypt encrypted values
+     * @param throwOnNotFound if true, throw if the auth file does not already exist in the cache
      */
-    get(username, decrypt = false) {
+    get(username, decrypt = false, throwOnNotFound = false) {
         const config = this.configs.get(username);
+        if (throwOnNotFound && config?.keys().length === 0) {
+            messages_1.Messages.importMessagesDirectory(__dirname);
+            const messages = messages_1.Messages.load('@salesforce/core', 'core', ['namedOrgNotFound']);
+            throw messages.createError('namedOrgNotFound', [username]);
+        }
         if (config) {
             this.contents.set(username, config.getContents(decrypt));
         }
@@ -115,10 +88,7 @@ class BaseOrgAccessor extends kit_1.AsyncOptionalCreatable {
      * @returns
      */
     getAll(decrypt = false) {
-        return [...this.configs.keys()].reduce((orgs, username) => {
-            const org = this.get(username, decrypt);
-            return org && !(0, kit_1.isEmpty)(org) ? orgs.concat([org]) : orgs;
-        }, []);
+        return [...this.configs.keys()].map((username) => this.get(username, decrypt)).filter((org) => !(0, kit_1.isEmpty)(org));
     }
     /**
      * Returns true if the username has been cached.

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

@@ -1,45 +1,6 @@
-import { Nullable } from '@salesforce/ts-types';
 import { SandboxOrgConfig } from '../../config/sandboxOrgConfig';
 import { SandboxFields } from '../../org';
-import { GlobalInfo } from '../globalInfoConfig';
-import { SfSandbox, SfSandboxes } from '../types';
 import { BaseOrgAccessor } from './orgAccessor';
-/**
- * @deprecated
- */
-export declare class GlobalInfoSandboxAccessor {
-    private globalInfo;
-    constructor(globalInfo: GlobalInfo);
-    /**
-     * Returns all the sandboxes (or all the sandboxes for a given prod org)
-     *
-     * @param entity entity as a string should be a production org username
-     * and when entity is a SfSandbox, the prod org entity.prodOrgUsername will
-     * used in the filter.
-     */
-    getAll(entity?: string | SfSandbox): SfSandboxes;
-    /**
-     * Returns the SfSandbox config entry that corresponds to the given
-     * sandbox org id if it exists
-     *
-     * @param sandboxOrgId the sandboxOrgId that corresponds to a sandbox
-     */
-    get(sandboxOrgId?: string): Nullable<SfSandbox>;
-    /**
-     * Returns true if the given sandbox org id exists
-     *
-     * @param sandboxOrgId the sandboxOrgId that corresponds to a sandbox
-     */
-    has(sandboxOrgId?: string): boolean;
-    /**
-     * Set an sandboxOrgId for the given sandbox entity
-     *
-     * @param sandboxOrgId the sandboxOrgId you want to set
-     * @param entity the sandbox entity
-     */
-    set(sandboxOrgId: string, entity: SfSandbox): void;
-    unset(sandboxOrgId: string): void;
-}
 export declare class SandboxAccessor extends BaseOrgAccessor<SandboxOrgConfig, SandboxFields> {
     protected initAuthFile(username: string, throwOnNotFound?: boolean): Promise<SandboxOrgConfig>;
     protected getFileRegex(): RegExp;

package/lib/stateAggregator/accessors/sandboxAccessor.js

@@ -6,63 +6,9 @@
  * 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.SandboxAccessor = exports.GlobalInfoSandboxAccessor = void 0;
+exports.SandboxAccessor = void 0;
 const sandboxOrgConfig_1 = require("../../config/sandboxOrgConfig");
-const types_1 = require("../types");
 const orgAccessor_1 = require("./orgAccessor");
-/**
- * @deprecated
- */
-class GlobalInfoSandboxAccessor {
-    constructor(globalInfo) {
-        this.globalInfo = globalInfo;
-    }
-    /**
-     * Returns all the sandboxes (or all the sandboxes for a given prod org)
-     *
-     * @param entity entity as a string should be a production org username
-     * and when entity is a SfSandbox, the prod org entity.prodOrgUsername will
-     * used in the filter.
-     */
-    getAll(entity) {
-        const all = this.globalInfo.get(types_1.SfInfoKeys.SANDBOXES) || {};
-        if (!entity) {
-            return all;
-        }
-        const prodOrgUsername = typeof entity === 'string' ? entity : entity.prodOrgUsername;
-        return Object.fromEntries(Object.entries(all).filter(([, value]) => value.prodOrgUsername === prodOrgUsername));
-    }
-    /**
-     * Returns the SfSandbox config entry that corresponds to the given
-     * sandbox org id if it exists
-     *
-     * @param sandboxOrgId the sandboxOrgId that corresponds to a sandbox
-     */
-    get(sandboxOrgId) {
-        return sandboxOrgId ? this.getAll()[sandboxOrgId] ?? null : null;
-    }
-    /**
-     * Returns true if the given sandbox org id exists
-     *
-     * @param sandboxOrgId the sandboxOrgId that corresponds to a sandbox
-     */
-    has(sandboxOrgId) {
-        return !!(sandboxOrgId ? this.getAll()[sandboxOrgId] ?? null : null);
-    }
-    /**
-     * Set an sandboxOrgId for the given sandbox entity
-     *
-     * @param sandboxOrgId the sandboxOrgId you want to set
-     * @param entity the sandbox entity
-     */
-    set(sandboxOrgId, entity) {
-        this.globalInfo.set(`${types_1.SfInfoKeys.SANDBOXES}["${sandboxOrgId}"]`, entity);
-    }
-    unset(sandboxOrgId) {
-        delete this.globalInfo.get(types_1.SfInfoKeys.SANDBOXES)[sandboxOrgId];
-    }
-}
-exports.GlobalInfoSandboxAccessor = GlobalInfoSandboxAccessor;
 class SandboxAccessor extends orgAccessor_1.BaseOrgAccessor {
     async initAuthFile(username, throwOnNotFound = false) {
         return sandboxOrgConfig_1.SandboxOrgConfig.create({

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

@@ -1,20 +1,14 @@
 import { AsyncOptionalCreatable } from '@salesforce/kit';
-import { Optional } from '@salesforce/ts-types';
-import { GlobalInfo } from '../globalInfoConfig';
-import { SfTokens, SfToken, Timestamp } from '../types';
-/**
- * @deprecated
- */
-export declare class GlobaInfoTokenAccessor {
-    private globalInfo;
-    constructor(globalInfo: GlobalInfo);
-    getAll(decrypt?: boolean): SfTokens;
-    get(name: string, decrypt?: boolean): Optional<SfToken & Timestamp>;
-    has(name: string): boolean;
-    set(name: string, token: SfToken): void;
-    update(name: string, token: Partial<SfToken>): void;
-    unset(name: string): void;
-}
+import { JsonMap, Optional } from '@salesforce/ts-types';
+export declare type SfToken = {
+    token: string;
+    url: string;
+    user?: string;
+    timestamp: string;
+} & JsonMap;
+export declare type SfTokens = {
+    [key: string]: SfToken;
+};
 export declare class TokenAccessor extends AsyncOptionalCreatable {
     private config;
     /**
@@ -29,9 +23,9 @@ export declare class TokenAccessor extends AsyncOptionalCreatable {
      *
      * @param name
      * @param decrypt
-     * @returns {Optional<SfToken & Timestamp>}
+     * @returns {Optional<SfToken>}
      */
-    get(name: string, decrypt?: boolean): Optional<SfToken & Timestamp>;
+    get(name: string, decrypt?: boolean): Optional<SfToken>;
     /**
      * Return true if a given name has a token associated with it.
      *