@salesforce/core 3.25.1 → 3.26.2

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 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.2](https://github.com/forcedotcom/sfdx-core/compare/v3.26.1...v3.26.2) (2022-08-16)
+
+### [3.26.1](https://github.com/forcedotcom/sfdx-core/compare/v3.26.0...v3.26.1) (2022-08-08)
+
+### Bug Fixes
+
+- update jsforce ([0353330](https://github.com/forcedotcom/sfdx-core/commit/03533307f0ea1f8877027a5619c970e1ae2443ec))
+
+## [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

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/scratchOrgInfoApi.js

@@ -234,6 +234,9 @@ const requestScratchOrgCreation = async (hubOrg, scratchOrgRequest, settings) =>
         throw new sfError_1.SfError(messages.getMessage('DeprecatedPrefFormat'));
     }
     const scratchOrgInfo = (0, mapKeys_1.default)(scratchOrgRequest, kit_1.upperFirst, true);
+    if (typeof scratchOrgInfo.Username === 'string') {
+        scratchOrgInfo.Username = scratchOrgInfo.Username.toLowerCase();
+    }
     await checkOrgDoesntExist(scratchOrgInfo); // throw if it does exist.
     try {
         await (0, scratchOrgLifecycleEvents_1.emit)({ stage: 'send request' });

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,26 +1,11 @@
 /// <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;

package/lib/stateAggregator/accessors/orgAccessor.js

@@ -6,50 +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");
 const messages_1 = require("../../messages");
-/**
- * @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;
 function chunk(array, chunkSize) {
     const final = [];
     for (let i = 0, len = array.length; i < len; i += chunkSize)

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

package/lib/stateAggregator/accessors/tokenAccessor.js

@@ -6,37 +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.TokenAccessor = exports.GlobaInfoTokenAccessor = void 0;
+exports.TokenAccessor = void 0;
 const kit_1 = require("@salesforce/kit");
 const tokensConfig_1 = require("../../config/tokensConfig");
-const types_1 = require("../types");
-/**
- * @deprecated
- */
-class GlobaInfoTokenAccessor {
-    constructor(globalInfo) {
-        this.globalInfo = globalInfo;
-    }
-    getAll(decrypt = false) {
-        return this.globalInfo.get(types_1.SfInfoKeys.TOKENS, decrypt) || {};
-    }
-    get(name, decrypt = false) {
-        return this.globalInfo.get(`${types_1.SfInfoKeys.TOKENS}["${name}"]`, decrypt);
-    }
-    has(name) {
-        return !!this.getAll()[name];
-    }
-    set(name, token) {
-        this.globalInfo.set(`${types_1.SfInfoKeys.TOKENS}["${name}"]`, token);
-    }
-    update(name, token) {
-        this.globalInfo.update(`${types_1.SfInfoKeys.TOKENS}["${name}"]`, token);
-    }
-    unset(name) {
-        delete this.globalInfo.get(types_1.SfInfoKeys.TOKENS)[name];
-    }
-}
-exports.GlobaInfoTokenAccessor = GlobaInfoTokenAccessor;
 class TokenAccessor extends kit_1.AsyncOptionalCreatable {
     /**
      * Return all tokens.
@@ -52,7 +24,7 @@ class TokenAccessor extends kit_1.AsyncOptionalCreatable {
      *
      * @param name
      * @param decrypt
-     * @returns {Optional<SfToken & Timestamp>}
+     * @returns {Optional<SfToken>}
      */
     get(name, decrypt = false) {
         return this.config.get(name, decrypt);

package/lib/stateAggregator/index.d.ts

@@ -1,7 +1,4 @@
-export * from './globalInfoConfig';
-export * from './sfdxDataHandler';
-export * from './types';
-export { GlobalInfoOrgAccessor, OrgAccessor } from './accessors/orgAccessor';
-export { GlobalInfoAliasAccessor, AliasAccessor } from './accessors/aliasAccessor';
-export { GlobaInfoTokenAccessor, TokenAccessor } from './accessors/tokenAccessor';
+export * from './accessors/orgAccessor';
+export * from './accessors/aliasAccessor';
+export * from './accessors/tokenAccessor';
 export * from './stateAggregator';

package/lib/stateAggregator/index.js

@@ -16,18 +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.TokenAccessor = exports.GlobaInfoTokenAccessor = exports.AliasAccessor = exports.GlobalInfoAliasAccessor = exports.OrgAccessor = exports.GlobalInfoOrgAccessor = void 0;
-__exportStar(require("./globalInfoConfig"), exports);
-__exportStar(require("./sfdxDataHandler"), exports);
-__exportStar(require("./types"), exports);
-var orgAccessor_1 = require("./accessors/orgAccessor");
-Object.defineProperty(exports, "GlobalInfoOrgAccessor", { enumerable: true, get: function () { return orgAccessor_1.GlobalInfoOrgAccessor; } });
-Object.defineProperty(exports, "OrgAccessor", { enumerable: true, get: function () { return orgAccessor_1.OrgAccessor; } });
-var aliasAccessor_1 = require("./accessors/aliasAccessor");
-Object.defineProperty(exports, "GlobalInfoAliasAccessor", { enumerable: true, get: function () { return aliasAccessor_1.GlobalInfoAliasAccessor; } });
-Object.defineProperty(exports, "AliasAccessor", { enumerable: true, get: function () { return aliasAccessor_1.AliasAccessor; } });
-var tokenAccessor_1 = require("./accessors/tokenAccessor");
-Object.defineProperty(exports, "GlobaInfoTokenAccessor", { enumerable: true, get: function () { return tokenAccessor_1.GlobaInfoTokenAccessor; } });
-Object.defineProperty(exports, "TokenAccessor", { enumerable: true, get: function () { return tokenAccessor_1.TokenAccessor; } });
+__exportStar(require("./accessors/orgAccessor"), exports);
+__exportStar(require("./accessors/aliasAccessor"), exports);
+__exportStar(require("./accessors/tokenAccessor"), exports);
 __exportStar(require("./stateAggregator"), exports);
 //# sourceMappingURL=index.js.map

package/lib/testSetup.js

@@ -343,8 +343,6 @@ const restoreContext = (testContext) => {
     testContext.SANDBOX.restore();
     Object.values(testContext.SANDBOXES).forEach((theSandbox) => theSandbox.restore());
     testContext.configStubs = {};
-    // Give each test run a clean GlobalInstance
-    stateAggregator_1.GlobalInfo.clearInstance();
     // Give each test run a clean StateAggregator
     stateAggregator_1.StateAggregator.clearInstance();
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "3.25.1",
+  "version": "3.26.2",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -48,7 +48,7 @@
     "form-data": "^4.0.0",
     "graceful-fs": "^4.2.9",
     "js2xmlparser": "^4.0.1",
-    "jsforce": "^2.0.0-beta.16",
+    "jsforce": "beta",
     "jsonwebtoken": "8.5.1",
     "ts-retry-promise": "^0.6.0"
   },

package/lib/stateAggregator/globalInfoConfig.d.ts

@@ -1,41 +0,0 @@
-import { AnyJson } from '@salesforce/ts-types';
-import { ConfigFile } from '../config/configFile';
-import { ConfigValue } from '../config/configStore';
-import { GlobalInfoOrgAccessor } from './accessors/orgAccessor';
-import { GlobaInfoTokenAccessor } from './accessors/tokenAccessor';
-import { GlobalInfoAliasAccessor } from './accessors/aliasAccessor';
-import { SfInfo } from './types';
-import { GlobalInfoSandboxAccessor } from './accessors/sandboxAccessor';
-export declare function deepCopy<T extends AnyJson>(data: T): T;
-/**
- * @deprecated use StateAggregator instead.
- */
-export declare class GlobalInfo extends ConfigFile<ConfigFile.Options, SfInfo> {
-    protected static encryptedKeys: RegExp[];
-    private static EMPTY_DATA_MODEL;
-    private static instance;
-    private sfdxHandler;
-    static get emptyDataModel(): SfInfo;
-    static getInstance(): Promise<GlobalInfo>;
-    /**
-     * Clear the cache to force reading from disk.
-     *
-     * *NOTE: Only call this method if you must and you know what you are doing.*
-     */
-    static clearInstance(): void;
-    static getFileName(): string;
-    /**
-     * Gets default options for the SfConfig
-     */
-    static getDefaultOptions(): ConfigFile.Options;
-    get orgs(): GlobalInfoOrgAccessor;
-    get tokens(): GlobaInfoTokenAccessor;
-    get aliases(): GlobalInfoAliasAccessor;
-    get sandboxes(): GlobalInfoSandboxAccessor;
-    set(key: string, value: ConfigValue): void;
-    write(newContents?: SfInfo): Promise<SfInfo>;
-    protected init(): Promise<void>;
-    private timestamp;
-    private loadSfData;
-    private mergeWithSfdxData;
-}

package/lib/stateAggregator/globalInfoConfig.js

@@ -1,113 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GlobalInfo = exports.deepCopy = void 0;
-/*
- * 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
- */
-const ts_types_1 = require("@salesforce/ts-types");
-const global_1 = require("../global");
-const configFile_1 = require("../config/configFile");
-const sfdxDataHandler_1 = require("./sfdxDataHandler");
-const orgAccessor_1 = require("./accessors/orgAccessor");
-const tokenAccessor_1 = require("./accessors/tokenAccessor");
-const aliasAccessor_1 = require("./accessors/aliasAccessor");
-const types_1 = require("./types");
-const sandboxAccessor_1 = require("./accessors/sandboxAccessor");
-function deepCopy(data) {
-    return JSON.parse(JSON.stringify(data));
-}
-exports.deepCopy = deepCopy;
-/**
- * @deprecated use StateAggregator instead.
- */
-class GlobalInfo extends configFile_1.ConfigFile {
-    constructor() {
-        super(...arguments);
-        this.sfdxHandler = new sfdxDataHandler_1.SfdxDataHandler();
-    }
-    static get emptyDataModel() {
-        return deepCopy(GlobalInfo.EMPTY_DATA_MODEL);
-    }
-    static async getInstance() {
-        if (!GlobalInfo.instance) {
-            GlobalInfo.instance = await GlobalInfo.create();
-        }
-        return GlobalInfo.instance;
-    }
-    /**
-     * Clear the cache to force reading from disk.
-     *
-     * *NOTE: Only call this method if you must and you know what you are doing.*
-     */
-    static clearInstance() {
-        delete GlobalInfo.instance;
-    }
-    static getFileName() {
-        return 'sf.json';
-    }
-    /**
-     * Gets default options for the SfConfig
-     */
-    static getDefaultOptions() {
-        return {
-            isGlobal: true,
-            isState: true,
-            filename: GlobalInfo.getFileName(),
-            stateFolder: global_1.Global.SF_STATE_FOLDER,
-        };
-    }
-    get orgs() {
-        return new orgAccessor_1.GlobalInfoOrgAccessor(this);
-    }
-    get tokens() {
-        return new tokenAccessor_1.GlobaInfoTokenAccessor(this);
-    }
-    get aliases() {
-        return new aliasAccessor_1.GlobalInfoAliasAccessor(this);
-    }
-    get sandboxes() {
-        return new sandboxAccessor_1.GlobalInfoSandboxAccessor(this);
-    }
-    set(key, value) {
-        if ((0, ts_types_1.isPlainObject)(value)) {
-            value = this.timestamp(value);
-        }
-        super.set(key, value);
-    }
-    async write(newContents) {
-        const result = await super.write(newContents);
-        if (global_1.Global.SFDX_INTEROPERABILITY)
-            await this.sfdxHandler.write(result);
-        return result;
-    }
-    async init() {
-        await this.initCrypto();
-        const contents = global_1.Global.SFDX_INTEROPERABILITY ? await this.mergeWithSfdxData() : await this.loadSfData();
-        this.setContents(contents);
-    }
-    timestamp(data) {
-        return { ...data, timestamp: new Date() };
-    }
-    async loadSfData() {
-        const data = await this.read();
-        return { ...GlobalInfo.emptyDataModel, ...data };
-    }
-    async mergeWithSfdxData() {
-        const sfData = await this.loadSfData();
-        const merged = await this.sfdxHandler.merge(sfData);
-        await this.write(merged);
-        return merged;
-    }
-}
-exports.GlobalInfo = GlobalInfo;
-GlobalInfo.encryptedKeys = [/token/i, /password/i, /secret/i];
-GlobalInfo.EMPTY_DATA_MODEL = {
-    [types_1.SfInfoKeys.ORGS]: {},
-    [types_1.SfInfoKeys.TOKENS]: {},
-    [types_1.SfInfoKeys.ALIASES]: {},
-    [types_1.SfInfoKeys.SANDBOXES]: {},
-};
-//# sourceMappingURL=globalInfoConfig.js.map

package/lib/stateAggregator/sfdxDataHandler.d.ts

@@ -1,59 +0,0 @@
-import { ConfigFile } from '../config/configFile';
-import { SfInfo, SfInfoKeys, SfOrg, SfOrgs, SfSandbox } from './types';
-interface Handler<T extends SfInfoKeys> {
-    sfKey: T;
-    merge: (sfData: SfInfo) => Promise<Partial<SfInfo>>;
-    migrate: () => Promise<Pick<SfInfo, T>>;
-    write: (latest: SfInfo, original: SfInfo) => Promise<void>;
-}
-interface Changes<T> {
-    changed: T;
-    deleted: string[];
-}
-export declare class SfdxDataHandler {
-    handlers: (AuthHandler | AliasesHandler | SandboxesHandler | TokensHandler)[];
-    private original;
-    write(latest?: SfInfo): Promise<void>;
-    merge(sfData?: SfInfo): Promise<SfInfo>;
-    private setOriginal;
-}
-declare abstract class BaseHandler<T extends SfInfoKeys> implements Handler<T> {
-    abstract sfKey: T;
-    merge(sfData?: SfInfo): Promise<Partial<SfInfo>>;
-    abstract migrate(): Promise<Pick<SfInfo, T>>;
-    abstract write(latest: SfInfo, original: SfInfo): Promise<void>;
-}
-export declare class AuthHandler extends BaseHandler<SfInfoKeys.ORGS> {
-    private static authFilenameFilterRegEx;
-    sfKey: typeof SfInfoKeys.ORGS;
-    migrate(): Promise<Pick<SfInfo, SfInfoKeys.ORGS>>;
-    write(latest: SfInfo, original: SfInfo): Promise<void>;
-    findChanges(latest: SfInfo, original: SfInfo): Promise<Changes<SfOrgs>>;
-    createAuthFileConfig(username: string): Promise<ConfigFile<ConfigFile.Options>>;
-    listAllAuthFiles(): Promise<string[]>;
-    listAllAuthorizations(): Promise<SfOrg[]>;
-}
-export declare class AliasesHandler extends BaseHandler<SfInfoKeys.ALIASES> {
-    private static SFDX_ALIASES_FILENAME;
-    sfKey: typeof SfInfoKeys.ALIASES;
-    migrate(): Promise<Pick<SfInfo, SfInfoKeys.ALIASES>>;
-    merge(sfData?: SfInfo): Promise<Partial<SfInfo>>;
-    write(latest: SfInfo): Promise<void>;
-}
-export declare class SandboxesHandler extends BaseHandler<SfInfoKeys.SANDBOXES> {
-    private static sandboxFilenameFilterRegEx;
-    sfKey: typeof SfInfoKeys.SANDBOXES;
-    merge(sfData?: SfInfo): Promise<Partial<SfInfo>>;
-    migrate(): Promise<Pick<SfInfo, SfInfoKeys.SANDBOXES>>;
-    write(latest: SfInfo, original: SfInfo): Promise<void>;
-    listAllSandboxFiles(): Promise<string[]>;
-    listAllSandboxes(): Promise<SfSandbox[]>;
-    private findChanges;
-}
-export declare class TokensHandler extends BaseHandler<SfInfoKeys.TOKENS> {
-    private static SFDX_TOKENS_FILENAME;
-    sfKey: typeof SfInfoKeys.TOKENS;
-    migrate(): Promise<Pick<SfInfo, SfInfoKeys.TOKENS>>;
-    write(latest: SfInfo): Promise<void>;
-}
-export {};

package/lib/stateAggregator/sfdxDataHandler.js

@@ -1,328 +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.TokensHandler = exports.SandboxesHandler = exports.AliasesHandler = exports.AuthHandler = exports.SfdxDataHandler = void 0;
-const path_1 = require("path");
-const fs = require("fs");
-const kit_1 = require("@salesforce/kit");
-const ts_types_1 = require("@salesforce/ts-types");
-const global_1 = require("../global");
-const configFile_1 = require("../config/configFile");
-const sandboxOrgConfig_1 = require("../config/sandboxOrgConfig");
-const globalInfoConfig_1 = require("./globalInfoConfig");
-const types_1 = require("./types");
-function isEqual(object1, object2) {
-    const keys1 = Object.keys(object1).filter((k) => k !== 'timestamp');
-    const keys2 = Object.keys(object2).filter((k) => k !== 'timestamp');
-    if (keys1.length !== keys2.length)
-        return false;
-    for (const key of keys1) {
-        if (object1[key] !== object2[key])
-            return false;
-    }
-    return true;
-}
-class SfdxDataHandler {
-    constructor() {
-        this.handlers = [new AuthHandler(), new AliasesHandler(), new SandboxesHandler(), new TokensHandler()];
-    }
-    async write(latest = globalInfoConfig_1.GlobalInfo.emptyDataModel) {
-        await Promise.all(this.handlers.map((handler) => handler.write(latest, this.original)));
-        this.setOriginal(latest);
-    }
-    async merge(sfData = globalInfoConfig_1.GlobalInfo.emptyDataModel) {
-        let merged = (0, globalInfoConfig_1.deepCopy)(sfData);
-        for (const handler of this.handlers) {
-            merged = Object.assign(merged, await handler.merge(merged));
-        }
-        this.setOriginal(merged);
-        return merged;
-    }
-    setOriginal(data) {
-        this.original = (0, globalInfoConfig_1.deepCopy)(data);
-    }
-}
-exports.SfdxDataHandler = SfdxDataHandler;
-class BaseHandler {
-    async merge(sfData = globalInfoConfig_1.GlobalInfo.emptyDataModel) {
-        const sfdxData = await this.migrate();
-        const merged = (0, globalInfoConfig_1.deepCopy)(sfData);
-        // Only merge the key this handler is responsible for.
-        const key = this.sfKey;
-        const sfKeys = Object.keys(sfData[key] ?? {});
-        const sfdxKeys = Object.keys(sfdxData[key] ?? {});
-        const commonKeys = sfKeys.filter((k) => sfdxKeys.includes(k));
-        for (const k of commonKeys) {
-            const [newer, older] = [sfData[key][k], sfdxData[key][k]].sort((a, b) => {
-                if ((0, ts_types_1.isPlainObject)(a) && (0, ts_types_1.isPlainObject)(b))
-                    return new Date(a.timestamp) < new Date(b.timestamp) ? 1 : -1;
-                return 0;
-            });
-            (0, kit_1.set)(merged, `${key}["${k}"]`, Object.assign({}, older, newer));
-        }
-        // Keys that exist in .sfdx but not .sf are added because we assume
-        // that this means the key was created using sfdx.
-        // However, this is not always a valid assumption because it could
-        // also mean that the key was deleted using sf, in which case we
-        // do not want to migrate the sfdx key to sf.
-        // Programmatically differentiating between a new key and a deleted key
-        // would be nearly impossible. Instead, we should ensure that whenever
-        // sf deletes a key it also deletes it in sfdx. This way, we can safely
-        // assume that we should migrate any keys that exist in in .sfdx
-        const unhandledSfdxKeys = sfdxKeys.filter((k) => !sfKeys.includes(k));
-        for (const k of unhandledSfdxKeys) {
-            (0, kit_1.set)(merged, `${key}["${k}"]`, sfdxData[key][k]);
-        }
-        // Keys that exist in .sf but not .sfdx are deleted because we assume
-        // that this means the key was deleted while using sfdx.
-        // We can make this assumption because keys that are created by sf will
-        // always be migrated back to sfdx
-        const unhandledSfKeys = sfKeys.filter((k) => !sfdxKeys.includes(k));
-        for (const k of unhandledSfKeys) {
-            delete merged[key][k];
-        }
-        return merged;
-    }
-}
-class AuthHandler extends BaseHandler {
-    constructor() {
-        super(...arguments);
-        this.sfKey = types_1.SfInfoKeys.ORGS;
-    }
-    async migrate() {
-        const oldAuths = await this.listAllAuthorizations();
-        const newAuths = oldAuths.reduce((x, y) => Object.assign(x, { [(0, ts_types_1.ensureString)(y.username)]: y }), {});
-        return { [this.sfKey]: newAuths };
-    }
-    async write(latest, original) {
-        const { changed, deleted } = await this.findChanges(latest, original);
-        await Promise.all(Object.entries(changed)
-            .filter(([, authData]) => authData)
-            .map(async ([username, authData]) => {
-            const config = await this.createAuthFileConfig(username);
-            config.setContentsFromObject(authData);
-            return config.write();
-        }));
-        await Promise.all(deleted.map(async (username) => {
-            const config = await this.createAuthFileConfig(username);
-            return config.unlink();
-        }));
-    }
-    async findChanges(latest, original) {
-        const latestAuths = latest.orgs;
-        const originalAuths = original.orgs;
-        const changed = {};
-        for (const [username, auth] of Object.entries(latestAuths)) {
-            const originalAuth = originalAuths[username] ?? {};
-            if (!isEqual(auth, originalAuth)) {
-                changed[username] = auth;
-            }
-        }
-        const deleted = Object.keys(originalAuths).filter((username) => !latestAuths[username]);
-        return { changed, deleted };
-    }
-    async createAuthFileConfig(username) {
-        const config = await configFile_1.ConfigFile.create({
-            filename: `${username}.json`,
-            isGlobal: true,
-            isState: true,
-            stateFolder: global_1.Global.SFDX_STATE_FOLDER,
-            throwOnNotFound: false,
-            encryptedKeys: ['accessToken', 'refreshToken', 'password', 'clientSecret'],
-        });
-        return config;
-    }
-    async listAllAuthFiles() {
-        const globalFiles = await fs.promises.readdir(global_1.Global.SFDX_DIR);
-        return globalFiles.filter((file) => file.match(AuthHandler.authFilenameFilterRegEx));
-    }
-    async listAllAuthorizations() {
-        const filenames = await this.listAllAuthFiles();
-        return Promise.all(filenames
-            .map((f) => (0, path_1.basename)(f, (0, path_1.extname)(f)))
-            .map(async (username) => {
-            const configFile = await this.createAuthFileConfig(username);
-            const contents = configFile.getContents();
-            const stat = await configFile.stat();
-            return { ...contents, timestamp: stat.mtime.toISOString() };
-        }));
-    }
-}
-exports.AuthHandler = AuthHandler;
-// The regular expression that filters files stored in $HOME/.sfdx
-AuthHandler.authFilenameFilterRegEx = /^[^.][^@]*@[^.]+(\.[^.\s]+)+\.json$/;
-class AliasesHandler extends BaseHandler {
-    constructor() {
-        super(...arguments);
-        this.sfKey = types_1.SfInfoKeys.ALIASES;
-    }
-    async migrate() {
-        const aliasesFilePath = (0, path_1.join)(global_1.Global.SFDX_DIR, AliasesHandler.SFDX_ALIASES_FILENAME);
-        try {
-            const x = await fs.promises.readFile(aliasesFilePath, 'utf8');
-            const sfdxAliases = (0, kit_1.parseJson)(x).orgs;
-            return { [this.sfKey]: { ...sfdxAliases } };
-        }
-        catch (e) {
-            return { [this.sfKey]: {} };
-        }
-    }
-    // AliasesHandler implements its own merge method because the structure of aliases is flat instead of nested by SfInfoKey types.
-    async merge(sfData = globalInfoConfig_1.GlobalInfo.emptyDataModel) {
-        const sfdxAliases = (await this.migrate())[types_1.SfInfoKeys.ALIASES];
-        const merged = (0, globalInfoConfig_1.deepCopy)(sfData);
-        /* Overwrite `sf` aliases with `sfdx` aliases
-         *  `sf` will always modify `sfdx` files but `sfdx` won't modify `sf` files
-         *  because of this we can assume that any changes in `sfdx` files that aren't
-         *  in `sf` are the latest data
-         *
-         *  This breaks down if a user of `sf` manually modifies the `~/.sf/sf.json` file
-         *  but we don't support that use case out-of-the-box (yet?)
-         *
-         *  Note: See also the explanation on the merge method in the BaseHandler class
-         */
-        Object.keys(sfdxAliases).forEach((alias) => {
-            merged[types_1.SfInfoKeys.ALIASES][alias] = sfdxAliases[alias];
-        });
-        /* Delete any aliases that don't exist in sfdx config files
-         *  Aliases that exist in .sf but not .sfdx are deleted because we assume
-         *  that this means the alias was deleted while using sfdx. We can make
-         *  this assumption because keys that are created by sf will always be
-         *  migrated back to sfdx.
-         *
-         *  Note: See also the explanation on the merge method in the BaseHandler class
-         */
-        for (const alias in merged[types_1.SfInfoKeys.ALIASES]) {
-            if (!sfdxAliases[alias])
-                delete merged[types_1.SfInfoKeys.ALIASES][alias];
-        }
-        return merged;
-    }
-    async write(latest) {
-        const aliasesFilePath = (0, path_1.join)(global_1.Global.SFDX_DIR, AliasesHandler.SFDX_ALIASES_FILENAME);
-        await fs.promises.writeFile(aliasesFilePath, JSON.stringify({ orgs: latest[types_1.SfInfoKeys.ALIASES] }, null, 2));
-    }
-}
-exports.AliasesHandler = AliasesHandler;
-AliasesHandler.SFDX_ALIASES_FILENAME = 'alias.json';
-class SandboxesHandler extends BaseHandler {
-    constructor() {
-        super(...arguments);
-        this.sfKey = types_1.SfInfoKeys.SANDBOXES;
-    }
-    async merge(sfData = globalInfoConfig_1.GlobalInfo.emptyDataModel) {
-        const sfdxData = await this.migrate();
-        const merged = (0, globalInfoConfig_1.deepCopy)(sfData);
-        // Only merge the key this handler is responsible for.
-        const key = this.sfKey;
-        const sfKeys = Object.keys(sfData[key] ?? {});
-        const sfdxKeys = Object.keys(sfdxData[key] ?? {});
-        // sandbox entries for .sf and .sfdx contain static data. Given there
-        // can be no mutation during the life of the sandbox, having to merge common keys
-        // is unnecessary.
-        // Keys that exist in .sfdx but not .sf are added because we assume
-        // that this means the key was created using sfdx.
-        // However, this is not always a valid assumption because it could
-        // also mean that the key was deleted using sf, in which case we
-        // do not want to migrate the sfdx key to sf.
-        // Programmatically differentiating between a new key and a deleted key
-        // would be nearly impossible. Instead, we should ensure that whenever
-        // sf deletes a key it also deletes it in sfdx. This way, we can safely
-        // assume that we should migrate any keys that exist in .sfdx
-        const unhandledSfdxKeys = sfdxKeys.filter((k) => !sfKeys.includes(k));
-        for (const k of unhandledSfdxKeys) {
-            (0, kit_1.set)(merged, `${key}["${k}"]`, sfdxData[key][k]);
-        }
-        // Keys that exist in .sf but not .sfdx are deleted because we assume
-        // that this means the key was deleted while using sfdx.
-        // We can make this assumption because keys that are created by sf will
-        // always be migrated back to sfdx
-        const unhandledSfKeys = sfKeys.filter((k) => !sfdxKeys.includes(k));
-        for (const k of unhandledSfKeys) {
-            delete merged[key][k];
-        }
-        return merged;
-    }
-    async migrate() {
-        const oldSandboxes = await this.listAllSandboxes();
-        const newSandboxes = Object.fromEntries(oldSandboxes.map((old) => [old.sandboxOrgId, old]));
-        return { [this.sfKey]: newSandboxes };
-    }
-    async write(latest, original) {
-        const { changed, deleted } = await this.findChanges(latest, original);
-        for (const sandboxData of Object.values(changed)) {
-            if (sandboxData) {
-                const orgId = sandboxData.sandboxOrgId;
-                const sandboxConfig = new sandboxOrgConfig_1.SandboxOrgConfig(sandboxOrgConfig_1.SandboxOrgConfig.getOptions(orgId));
-                sandboxConfig.set(sandboxOrgConfig_1.SandboxOrgConfig.Fields.PROD_ORG_USERNAME, sandboxData.prodOrgUsername);
-                await sandboxConfig.write();
-            }
-        }
-        for (const username of deleted) {
-            const originalSandbox = original.sandboxes[username];
-            const orgId = originalSandbox.sandboxOrgId;
-            const sandboxConfig = new sandboxOrgConfig_1.SandboxOrgConfig(sandboxOrgConfig_1.SandboxOrgConfig.getOptions(orgId));
-            await sandboxConfig.unlink();
-        }
-    }
-    async listAllSandboxFiles() {
-        const globalFiles = await fs.promises.readdir(global_1.Global.SFDX_DIR);
-        return globalFiles.filter((file) => file.match(SandboxesHandler.sandboxFilenameFilterRegEx));
-    }
-    async listAllSandboxes() {
-        return Promise.all((await this.listAllSandboxFiles()).map(async (filename) => {
-            const matches = filename.match(SandboxesHandler.sandboxFilenameFilterRegEx);
-            const orgId = matches ? matches[1] : '';
-            const sandboxConfig = new sandboxOrgConfig_1.SandboxOrgConfig(sandboxOrgConfig_1.SandboxOrgConfig.getOptions(orgId));
-            const stat = await sandboxConfig.stat();
-            const contents = { ...(await sandboxConfig.read(true)), sandboxOrgId: orgId };
-            const sandbox = Object.assign(contents, { timestamp: stat.mtime.toISOString() });
-            return sandbox;
-        }));
-    }
-    async findChanges(latest, original) {
-        const latestSandboxes = latest.sandboxes;
-        const originalSandboxes = original.sandboxes;
-        const changed = {};
-        for (const [sandboxOrgId, sandbox] of Object.entries(latestSandboxes)) {
-            const originalSandbox = originalSandboxes[sandboxOrgId] ?? {};
-            if (!isEqual(sandbox, originalSandbox)) {
-                changed[sandboxOrgId] = sandbox;
-            }
-        }
-        const deleted = Object.keys(originalSandboxes).filter((sandboxOrgId) => !latestSandboxes[sandboxOrgId]);
-        return { changed, deleted };
-    }
-}
-exports.SandboxesHandler = SandboxesHandler;
-// The regular expression that filters files stored in $HOME/.sfdx
-SandboxesHandler.sandboxFilenameFilterRegEx = /^(00D.*?)\.sandbox\.json$/;
-class TokensHandler extends BaseHandler {
-    constructor() {
-        super(...arguments);
-        this.sfKey = types_1.SfInfoKeys.TOKENS;
-    }
-    async migrate() {
-        const filePath = (0, path_1.join)(global_1.Global.SFDX_DIR, TokensHandler.SFDX_TOKENS_FILENAME);
-        try {
-            const x = await fs.promises.readFile(filePath, 'utf8');
-            const tokens = (0, kit_1.parseJson)(x);
-            return { [this.sfKey]: tokens };
-        }
-        catch (e) {
-            return { [this.sfKey]: {} };
-        }
-    }
-    async write(latest) {
-        const filePath = (0, path_1.join)(global_1.Global.SFDX_DIR, TokensHandler.SFDX_TOKENS_FILENAME);
-        await fs.promises.writeFile(filePath, JSON.stringify(latest[types_1.SfInfoKeys.TOKENS], null, 2));
-    }
-}
-exports.TokensHandler = TokensHandler;
-TokensHandler.SFDX_TOKENS_FILENAME = 'tokens.json';
-//# sourceMappingURL=sfdxDataHandler.js.map

package/lib/stateAggregator/types.d.ts

@@ -1,72 +0,0 @@
-import { JsonMap } from '@salesforce/ts-types';
-import { AuthFields } from '../org';
-/**
- * @deprecated
- */
-export declare enum SfInfoKeys {
-    ORGS = "orgs",
-    TOKENS = "tokens",
-    ALIASES = "aliases",
-    SANDBOXES = "sandboxes"
-}
-export declare type Timestamp = {
-    timestamp: string;
-};
-export declare type SfEntry = JsonMap;
-/**
- * @deprecated
- */
-export declare type SfOrg = AuthFields & SfEntry;
-/**
- * @deprecated
- */
-export interface SfOrgs {
-    [key: string]: SfOrg & Timestamp;
-}
-export declare type SfToken = {
-    token: string;
-    url: string;
-    user?: string;
-} & SfEntry;
-/**
- */
-export declare type SfTokens = {
-    [key: string]: SfToken & Timestamp;
-};
-/**
- * The key will always be the alias and the value will always be the username, e.g.
- * { "MyAlias": "user@salesforce.com" }
- */
-export declare type SfAliases = {
-    [alias: string]: string;
-};
-/**
- * @deprecated
- */
-export declare type SfSandbox = {
-    sandboxOrgId: string;
-    prodOrgUsername: string;
-    sandboxName?: string;
-    sandboxUsername?: string;
-    sandboxProcessId?: string;
-    sandboxInfoId?: string;
-} & Timestamp & SfEntry;
-/**
- * The key will always be the sandbox username and the value will always be the
- * production org username
- * { "user@salesforce.com.mysandbox": "user@salesforce.com" }
- *
- * @deprecated
- */
-export interface SfSandboxes {
-    [sandboxOrgId: string]: SfSandbox;
-}
-/**
- * @deprecated
- */
-export declare type SfInfo = {
-    [SfInfoKeys.ORGS]: SfOrgs;
-    [SfInfoKeys.TOKENS]: SfTokens;
-    [SfInfoKeys.ALIASES]: SfAliases;
-    [SfInfoKeys.SANDBOXES]: SfSandboxes;
-};

package/lib/stateAggregator/types.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SfInfoKeys = void 0;
-/**
- * @deprecated
- */
-var SfInfoKeys;
-(function (SfInfoKeys) {
-    SfInfoKeys["ORGS"] = "orgs";
-    SfInfoKeys["TOKENS"] = "tokens";
-    SfInfoKeys["ALIASES"] = "aliases";
-    SfInfoKeys["SANDBOXES"] = "sandboxes";
-})(SfInfoKeys = exports.SfInfoKeys || (exports.SfInfoKeys = {}));
-//# sourceMappingURL=types.js.map