@salesforce/core 3.19.1 → 3.19.4

package/lib/stateAggregator/accessors/orgAccessor.js

@@ -0,0 +1,201 @@
+"use strict";
+/*
+ * Copyright (c) 2021, 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.OrgAccessor = exports.BaseOrgAccessor = exports.GlobalInfoOrgAccessor = 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) {
+        var _a;
+        // For legacy, and to keep things standard, some things wants the username in auth info.
+        (_a = org.username) !== null && _a !== void 0 ? _a : (org.username = username);
+        this.globalInfo.set(`${types_1.SfInfoKeys.ORGS}["${username}"]`, org);
+    }
+    update(username, org) {
+        var _a;
+        // For legacy, and to keep things standard, some things wants the username in auth info.
+        (_a = org.username) !== null && _a !== void 0 ? _a : (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)
+        final.push(array.slice(i, i + chunkSize));
+    return final;
+}
+class BaseOrgAccessor extends kit_1.AsyncOptionalCreatable {
+    constructor() {
+        super(...arguments);
+        this.configs = new Map();
+        this.contents = new Map();
+    }
+    async read(username, decrypt = false, throwOnNotFound = true) {
+        try {
+            const config = await this.initAuthFile(username, throwOnNotFound);
+            this.configs.set(username, config);
+            return this.get(username, decrypt);
+        }
+        catch (err) {
+            return null;
+        }
+    }
+    async readAll(decrypt = false) {
+        const fileChunks = chunk(await this.getAllFiles(), 50);
+        for (const fileChunk of fileChunks) {
+            const promises = fileChunk.map(async (f) => {
+                const username = this.parseUsername(f);
+                const config = await this.initAuthFile(username);
+                this.configs.set(username, config);
+            });
+            await Promise.all(promises);
+        }
+        return this.getAll(decrypt);
+    }
+    get(username, decrypt = false) {
+        const config = this.configs.get(username);
+        if (config) {
+            this.contents.set(username, config.getContents(decrypt));
+        }
+        return this.contents.get(username);
+    }
+    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;
+        }, []);
+    }
+    has(username) {
+        return this.contents.has(username);
+    }
+    async exists(username) {
+        const config = this.configs.get(username);
+        return config ? await config.exists() : false;
+    }
+    async stat(username) {
+        const config = this.configs.get(username);
+        return config ? await config.stat() : null;
+    }
+    async hasFile(username) {
+        try {
+            await fs.promises.access(this.parseFilename(username));
+            return true;
+        }
+        catch {
+            this.logger.debug(`No auth file found for ${username}`);
+            return false;
+        }
+    }
+    async list() {
+        return this.getAllFiles();
+    }
+    set(username, org) {
+        var _a, _b;
+        const config = this.configs.get(username);
+        if (config) {
+            config.setContentsFromObject(org);
+            const contents = config.getContents();
+            (_a = contents.username) !== null && _a !== void 0 ? _a : (contents.username = username);
+            this.contents.set(username, contents);
+        }
+        else {
+            // @ts-ignore
+            (_b = org.username) !== null && _b !== void 0 ? _b : (org.username = username);
+            this.contents.set(username, org);
+        }
+    }
+    update(username, org) {
+        const existing = this.get(username) || {};
+        const merged = Object.assign({}, existing, org);
+        return this.set(username, merged);
+    }
+    async remove(username) {
+        var _a;
+        await ((_a = this.configs.get(username)) === null || _a === void 0 ? void 0 : _a.unlink());
+        this.configs.delete(username);
+        this.contents.delete(username);
+    }
+    async write(username) {
+        const config = this.configs.get(username);
+        if (config) {
+            return (await config.write());
+        }
+        else {
+            const contents = this.contents.get(username) || {};
+            await this.read(username, false, false);
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            const config = this.configs.get(username);
+            config.setContentsFromObject(contents);
+            return (await config.write());
+        }
+    }
+    async init() {
+        this.logger = await logger_1.Logger.child(this.constructor.name);
+    }
+    async getAllFiles() {
+        const regex = this.getFileRegex();
+        try {
+            return (await fs.promises.readdir(global_1.Global.DIR)).filter((file) => regex.test(file));
+        }
+        catch {
+            return [];
+        }
+    }
+    parseUsername(filename) {
+        return filename.replace(this.getFileExtension(), '');
+    }
+    parseFilename(username) {
+        return path.join(global_1.Global.DIR, `${username}${this.getFileExtension()}`);
+    }
+}
+exports.BaseOrgAccessor = BaseOrgAccessor;
+class OrgAccessor extends BaseOrgAccessor {
+    async initAuthFile(username, throwOnNotFound = false) {
+        return authInfoConfig_1.AuthInfoConfig.create({
+            ...authInfoConfig_1.AuthInfoConfig.getOptions(username),
+            throwOnNotFound,
+        });
+    }
+    getFileRegex() {
+        // The regular expression that filters files stored in $HOME/.sfdx
+        return /^[^.][^@]*@[^.]+(\.[^.\s]+)+\.json$/;
+    }
+    getFileExtension() {
+        return '.json';
+    }
+}
+exports.OrgAccessor = OrgAccessor;
+//# sourceMappingURL=orgAccessor.js.map

package/lib/{globalInfo → stateAggregator}/accessors/sandboxAccessor.d.ts

@@ -1,7 +1,13 @@
 import { Nullable } from '@salesforce/ts-types';
+import { SandboxOrgConfig } from '../../config/sandboxOrgConfig';
+import { SandboxFields } from '../../org';
 import { GlobalInfo } from '../globalInfoConfig';
 import { SfSandbox, SfSandboxes } from '../types';
-export declare class SandboxAccessor {
+import { BaseOrgAccessor } from './orgAccessor';
+/**
+ * @deprecated
+ */
+export declare class GlobalInfoSandboxAccessor {
     private globalInfo;
     constructor(globalInfo: GlobalInfo);
     /**
@@ -34,3 +40,8 @@ export declare class SandboxAccessor {
     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;
+    protected getFileExtension(): string;
+}

package/lib/{globalInfo → stateAggregator}/accessors/sandboxAccessor.js

@@ -6,9 +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.SandboxAccessor = void 0;
+exports.SandboxAccessor = exports.GlobalInfoSandboxAccessor = void 0;
+const sandboxOrgConfig_1 = require("../../config/sandboxOrgConfig");
 const types_1 = require("../types");
-class SandboxAccessor {
+const orgAccessor_1 = require("./orgAccessor");
+/**
+ * @deprecated
+ */
+class GlobalInfoSandboxAccessor {
     constructor(globalInfo) {
         this.globalInfo = globalInfo;
     }
@@ -59,5 +64,20 @@ class SandboxAccessor {
         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({
+            ...sandboxOrgConfig_1.SandboxOrgConfig.getOptions(username),
+            throwOnNotFound,
+        });
+    }
+    getFileRegex() {
+        return /^(00D.*?)\.sandbox\.json$/;
+    }
+    getFileExtension() {
+        return '.sandbox.json';
+    }
+}
 exports.SandboxAccessor = SandboxAccessor;
 //# sourceMappingURL=sandboxAccessor.js.map

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

@@ -0,0 +1,28 @@
+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;
+}
+export declare class TokenAccessor extends AsyncOptionalCreatable {
+    private config;
+    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;
+    write(): Promise<SfTokens>;
+    protected init(): Promise<void>;
+}

package/lib/{globalInfo → stateAggregator}/accessors/tokenAccessor.js

@@ -6,9 +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.TokenAccessor = void 0;
+exports.TokenAccessor = exports.GlobaInfoTokenAccessor = void 0;
+const kit_1 = require("@salesforce/kit");
+const tokensConfig_1 = require("../../config/tokensConfig");
 const types_1 = require("../types");
-class TokenAccessor {
+/**
+ * @deprecated
+ */
+class GlobaInfoTokenAccessor {
     constructor(globalInfo) {
         this.globalInfo = globalInfo;
     }
@@ -31,5 +36,32 @@ class TokenAccessor {
         delete this.globalInfo.get(types_1.SfInfoKeys.TOKENS)[name];
     }
 }
+exports.GlobaInfoTokenAccessor = GlobaInfoTokenAccessor;
+class TokenAccessor extends kit_1.AsyncOptionalCreatable {
+    getAll(decrypt = false) {
+        return this.config.getContents(decrypt) || {};
+    }
+    get(name, decrypt = false) {
+        return this.config.get(name, decrypt);
+    }
+    has(name) {
+        return !!this.getAll()[name];
+    }
+    set(name, token) {
+        this.config.set(name, token);
+    }
+    update(name, token) {
+        this.config.update(name, token);
+    }
+    unset(name) {
+        this.config.unset(name);
+    }
+    async write() {
+        return this.config.write();
+    }
+    async init() {
+        this.config = await tokensConfig_1.TokensConfig.create();
+    }
+}
 exports.TokenAccessor = TokenAccessor;
 //# sourceMappingURL=tokenAccessor.js.map

package/lib/{globalInfo → stateAggregator}/globalInfoConfig.d.ts

@@ -1,12 +1,15 @@
 import { AnyJson } from '@salesforce/ts-types';
 import { ConfigFile } from '../config/configFile';
 import { ConfigValue } from '../config/configStore';
-import { OrgAccessor } from './accessors/orgAccessor';
-import { TokenAccessor } from './accessors/tokenAccessor';
-import { AliasAccessor } from './accessors/aliasAccessor';
+import { GlobalInfoOrgAccessor } from './accessors/orgAccessor';
+import { GlobaInfoTokenAccessor } from './accessors/tokenAccessor';
+import { GlobalInfoAliasAccessor } from './accessors/aliasAccessor';
 import { SfInfo } from './types';
-import { SandboxAccessor } from './accessors/sandboxAccessor';
+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;
@@ -25,10 +28,10 @@ export declare class GlobalInfo extends ConfigFile<ConfigFile.Options, SfInfo> {
      * Gets default options for the SfConfig
      */
     static getDefaultOptions(): ConfigFile.Options;
-    get orgs(): OrgAccessor;
-    get tokens(): TokenAccessor;
-    get aliases(): AliasAccessor;
-    get sandboxes(): SandboxAccessor;
+    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>;

package/lib/{globalInfo → stateAggregator}/globalInfoConfig.js

@@ -20,6 +20,9 @@ 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);
@@ -57,16 +60,16 @@ class GlobalInfo extends configFile_1.ConfigFile {
         };
     }
     get orgs() {
-        return new orgAccessor_1.OrgAccessor(this);
+        return new orgAccessor_1.GlobalInfoOrgAccessor(this);
     }
     get tokens() {
-        return new tokenAccessor_1.TokenAccessor(this);
+        return new tokenAccessor_1.GlobaInfoTokenAccessor(this);
     }
     get aliases() {
-        return new aliasAccessor_1.AliasAccessor(this);
+        return new aliasAccessor_1.GlobalInfoAliasAccessor(this);
     }
     get sandboxes() {
-        return new sandboxAccessor_1.SandboxAccessor(this);
+        return new sandboxAccessor_1.GlobalInfoSandboxAccessor(this);
     }
     set(key, value) {
         if ((0, ts_types_1.isPlainObject)(value)) {

package/lib/stateAggregator/index.d.ts

@@ -0,0 +1,7 @@
+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 './stateAggregator';

package/lib/{globalInfo → stateAggregator}/index.js

@@ -16,14 +16,18 @@ 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.AliasAccessor = exports.OrgAccessor = void 0;
+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("./stateAggregator"), exports);
 //# sourceMappingURL=index.js.map

package/lib/{globalInfo → stateAggregator}/sfdxDataHandler.d.ts

@@ -11,7 +11,7 @@ interface Changes<T> {
     deleted: string[];
 }
 export declare class SfdxDataHandler {
-    handlers: (AuthHandler | AliasesHandler | SandboxesHandler)[];
+    handlers: (AuthHandler | AliasesHandler | SandboxesHandler | TokensHandler)[];
     private original;
     write(latest?: SfInfo): Promise<void>;
     merge(sfData?: SfInfo): Promise<SfInfo>;
@@ -50,4 +50,10 @@ export declare class SandboxesHandler extends BaseHandler<SfInfoKeys.SANDBOXES>
     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/{globalInfo → stateAggregator}/sfdxDataHandler.js

@@ -6,7 +6,7 @@
  * 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.SandboxesHandler = exports.AliasesHandler = exports.AuthHandler = exports.SfdxDataHandler = void 0;
+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");
@@ -29,7 +29,7 @@ function isEqual(object1, object2) {
 }
 class SfdxDataHandler {
     constructor() {
-        this.handlers = [new AuthHandler(), new AliasesHandler(), new SandboxesHandler()];
+        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)));
@@ -306,4 +306,27 @@ class SandboxesHandler extends BaseHandler {
 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/stateAggregator.d.ts

@@ -0,0 +1,20 @@
+import { AsyncOptionalCreatable } from '@salesforce/kit';
+import { AliasAccessor } from './accessors/aliasAccessor';
+import { OrgAccessor } from './accessors/orgAccessor';
+import { SandboxAccessor } from './accessors/sandboxAccessor';
+import { TokenAccessor } from './accessors/tokenAccessor';
+export declare class StateAggregator extends AsyncOptionalCreatable {
+    private static instance;
+    aliases: AliasAccessor;
+    orgs: OrgAccessor;
+    sandboxes: SandboxAccessor;
+    tokens: TokenAccessor;
+    static getInstance(): Promise<StateAggregator>;
+    /**
+     * 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;
+    protected init(): Promise<void>;
+}

package/lib/stateAggregator/stateAggregator.js

@@ -0,0 +1,38 @@
+"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.StateAggregator = void 0;
+const kit_1 = require("@salesforce/kit");
+const aliasAccessor_1 = require("./accessors/aliasAccessor");
+const orgAccessor_1 = require("./accessors/orgAccessor");
+const sandboxAccessor_1 = require("./accessors/sandboxAccessor");
+const tokenAccessor_1 = require("./accessors/tokenAccessor");
+class StateAggregator extends kit_1.AsyncOptionalCreatable {
+    static async getInstance() {
+        if (!StateAggregator.instance) {
+            StateAggregator.instance = await StateAggregator.create();
+        }
+        return StateAggregator.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 StateAggregator.instance;
+    }
+    async init() {
+        this.orgs = await orgAccessor_1.OrgAccessor.create();
+        this.sandboxes = await sandboxAccessor_1.SandboxAccessor.create();
+        this.aliases = await aliasAccessor_1.AliasAccessor.create();
+        this.tokens = await tokenAccessor_1.TokenAccessor.create();
+    }
+}
+exports.StateAggregator = StateAggregator;
+//# sourceMappingURL=stateAggregator.js.map

package/lib/{globalInfo → stateAggregator}/types.d.ts

@@ -1,4 +1,8 @@
 import { JsonMap } from '@salesforce/ts-types';
+import { AuthFields } from '../org';
+/**
+ * @deprecated
+ */
 export declare enum SfInfoKeys {
     ORGS = "orgs",
     TOKENS = "tokens",
@@ -9,12 +13,13 @@ export declare type Timestamp = {
     timestamp: string;
 };
 export declare type SfEntry = JsonMap;
-export declare type SfOrg = {
-    username: string;
-    orgId: string;
-    instanceUrl: string;
-    accessToken?: string;
-} & SfEntry;
+/**
+ * @deprecated
+ */
+export declare type SfOrg = AuthFields & SfEntry;
+/**
+ * @deprecated
+ */
 export interface SfOrgs {
     [key: string]: SfOrg & Timestamp;
 }
@@ -23,16 +28,21 @@ export declare type SfToken = {
     url: string;
     user?: string;
 } & SfEntry;
-export interface SfTokens {
+/**
+ */
+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 interface SfAliases {
+export declare type SfAliases = {
     [alias: string]: string;
-}
+};
+/**
+ * @deprecated
+ */
 export declare type SfSandbox = {
     sandboxOrgId: string;
     prodOrgUsername: string;
@@ -45,10 +55,15 @@ export declare type SfSandbox = {
  * 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;

package/lib/{globalInfo → stateAggregator}/types.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SfInfoKeys = void 0;
+/**
+ * @deprecated
+ */
 var SfInfoKeys;
 (function (SfInfoKeys) {
     SfInfoKeys["ORGS"] = "orgs";