@salesforce/core 6.7.6 → 6.7.7-qa.1

package/lib/org/user.d.ts

@@ -62,15 +62,15 @@ export declare namespace DefaultUserFields {
      * Used to initialize default values for fields based on a templateUser user. This user will be part of the
      * Standard User profile.
      */
-    interface Options {
+    type Options = {
         templateUser: string;
         newUserName?: string;
-    }
+    };
 }
-export interface PasswordConditions {
+export type PasswordConditions = {
     length: number;
     complexity: number;
-}
+};
 /**
  * A class for creating a User, generating a password for a user, and assigning a user to one or more permission sets.
  * See methods for examples.
@@ -181,7 +181,7 @@ export declare namespace User {
      * Used to initialize default values for fields based on a templateUser user. This user will be part of the
      * Standard User profile.
      */
-    interface Options {
+    type Options = {
         org: Org;
-    }
+    };
 }

package/lib/org/user.js

@@ -10,7 +10,7 @@ exports.User = exports.DefaultUserFields = exports.REQUIRED_FIELDS = void 0;
 const node_os_1 = require("node:os");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
-const http_api_1 = require("jsforce/lib/http-api");
+const http_api_1 = require("@jsforce/jsforce-node/lib/http-api");
 const logger_1 = require("../logger/logger");
 const messages_1 = require("../messages");
 const secureBuffer_1 = require("../crypto/secureBuffer");
@@ -63,17 +63,9 @@ async function retrieveUserFields(logger, username) {
     const connection = await connection_1.Connection.create({
         authInfo: await authInfo_1.AuthInfo.create({ username }),
     });
-    if ((0, sfdc_1.matchesAccessToken)(username)) {
-        logger.debug('received an accessToken for the username.  Converting...');
-        username = (await connection.identity()).username;
-        logger.debug(`accessToken converted to ${username}`);
-    }
-    else {
-        logger.debug('not a accessToken');
-    }
-    const fromFields = Object.keys(exports.REQUIRED_FIELDS).map(kit_1.upperFirst);
-    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-    const requiredFieldsFromAdminQuery = `SELECT ${fromFields} FROM User WHERE Username='${username}'`;
+    const resolvedUsername = await resolveUsernameFromAccessToken(logger)(connection)(username);
+    const fromFields = Object.keys(exports.REQUIRED_FIELDS).map(kit_1.upperFirst).filter(ts_types_1.isString).join(', ');
+    const requiredFieldsFromAdminQuery = `SELECT ${fromFields} FROM User WHERE Username='${resolvedUsername}'`;
     const result = await connection.query(requiredFieldsFromAdminQuery);
     logger.debug('Successfully retrieved the admin user for this org.');
     if (result.totalSize === 1) {
@@ -93,7 +85,7 @@ async function retrieveUserFields(logger, username) {
         return fields;
     }
     else {
-        throw messages.createError('userQueryFailed', [username]);
+        throw messages.createError('userQueryFailed', [resolvedUsername]);
     }
 }
 /**
@@ -128,6 +120,10 @@ async function retrieveProfileId(name, connection) {
  * ```
  */
 class DefaultUserFields extends kit_1.AsyncCreatable {
+    // Initialized in init
+    logger;
+    userFields;
+    options;
     /**
      * @ignore
      */
@@ -165,6 +161,8 @@ exports.DefaultUserFields = DefaultUserFields;
  * See methods for examples.
  */
 class User extends kit_1.AsyncCreatable {
+    org;
+    logger;
     /**
      * @ignore
      */
@@ -399,15 +397,15 @@ class User extends kit_1.AsyncCreatable {
             this.logger.debug(message);
             throw new sfError_1.SfError(message, 'UserCreateHttpError');
         }
-        fields.id = (0, ts_types_1.ensureString)(responseBody.id);
-        await this.updateRequiredUserFields(fields);
+        const fieldsWithId = { ...fields, id: (0, ts_types_1.ensureString)(responseBody.id) };
+        await this.updateRequiredUserFields(fieldsWithId);
         const buffer = new secureBuffer_1.SecureBuffer();
         const headers = (0, ts_types_1.ensureJsonMap)(response.headers);
         const autoApproveUser = (0, ts_types_1.ensureString)(headers['auto-approve-user']);
         buffer.consume(Buffer.from(autoApproveUser));
         return {
             buffer,
-            userId: fields.id,
+            userId: fieldsWithId.id,
         };
     }
     // eslint-disable-next-line class-methods-use-this
@@ -437,4 +435,14 @@ class User extends kit_1.AsyncCreatable {
     }
 }
 exports.User = User;
+const resolveUsernameFromAccessToken = (logger) => (conn) => async (usernameOrAccessToken) => {
+    if ((0, sfdc_1.matchesAccessToken)(usernameOrAccessToken)) {
+        logger.debug('received an accessToken for the username.  Converting...');
+        const username = (await conn.identity()).username;
+        logger.debug(`accessToken converted to ${username}`);
+        return username;
+    }
+    logger.debug('not a accessToken');
+    return usernameOrAccessToken;
+};
 //# sourceMappingURL=user.js.map

package/lib/schema/validator.js

@@ -42,6 +42,10 @@ const sfError_1 = require("../sfError");
  * Loads a JSON schema and performs validations against JSON objects.
  */
 class SchemaValidator {
+    schemaPath;
+    schemasDir;
+    logger;
+    schema;
     /**
      * Creates a new `SchemaValidator` instance given a logger and path to a schema file.
      *

package/lib/sfError.d.ts

@@ -1,5 +1,15 @@
-import { NamedError } from '@salesforce/kit';
-import { JsonMap } from '@salesforce/ts-types';
+import { AnyJson, JsonMap } from '@salesforce/ts-types';
+export type SfErrorOptions<T extends ErrorDataProperties = ErrorDataProperties> = {
+    message: string;
+    exitCode?: number;
+    name?: string;
+    data?: T;
+    /** pass an Error.  For convenience in catch blocks, code will check that it is, in fact, an Error */
+    cause?: unknown;
+    context?: string;
+    actions?: string[];
+};
+type ErrorDataProperties = AnyJson;
 /**
  * A generalized sfdx error which also contains an action. The action is used in the
  * CLI to help guide users past the error.
@@ -16,8 +26,9 @@ import { JsonMap } from '@salesforce/ts-types';
  * throw new SfError(message.getMessage('myError'), 'MyErrorName');
  * ```
  */
-export declare class SfError<T = unknown> extends NamedError {
+export declare class SfError<T extends ErrorDataProperties = ErrorDataProperties> extends Error {
     #private;
+    readonly name: string;
     /**
      * Action messages. Hints to the users regarding what can be done to fix related issues.
      */
@@ -40,15 +51,17 @@ export declare class SfError<T = unknown> extends NamedError {
      * @param exitCodeOrCause The exit code which will be used by SfdxCommand or he underlying error that caused this error to be raised.
      * @param cause The underlying error that caused this error to be raised.
      */
-    constructor(message: string, name?: string, actions?: string[], exitCodeOrCause?: number | Error, cause?: Error);
-    get code(): any;
+    constructor(message: string, name?: string, actions?: string[], exitCodeOrCause?: number | Error, cause?: unknown);
+    get code(): string;
     set code(code: string);
+    /** like the constructor, but takes an typed object and let you also set context and data properties */
+    static create<T extends ErrorDataProperties = ErrorDataProperties>(inputs: SfErrorOptions<T>): SfError<T>;
     /**
      * Convert an Error to an SfError.
      *
      * @param err The error to convert.
      */
-    static wrap(err: Error | string): SfError;
+    static wrap<T extends ErrorDataProperties = ErrorDataProperties>(err: unknown): SfError<T>;
     /**
      * Sets the context of the error. For convenience `this` object is returned.
      *
@@ -66,3 +79,4 @@ export declare class SfError<T = unknown> extends NamedError {
      */
     toObject(): JsonMap;
 }
+export {};

package/lib/sfError.js

@@ -5,21 +5,8 @@
  * 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
  */
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var _SfError_code;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SfError = void 0;
-const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 /**
  * A generalized sfdx error which also contains an action. The action is used in the
@@ -37,7 +24,26 @@ const ts_types_1 = require("@salesforce/ts-types");
  * throw new SfError(message.getMessage('myError'), 'MyErrorName');
  * ```
  */
-class SfError extends kit_1.NamedError {
+class SfError extends Error {
+    name;
+    /**
+     * Action messages. Hints to the users regarding what can be done to fix related issues.
+     */
+    actions;
+    /**
+     * SfdxCommand can return this process exit code.
+     */
+    exitCode;
+    /**
+     * The related context for this error.
+     */
+    context;
+    // Additional data helpful for consumers of this error.  E.g., API call result
+    data;
+    /**
+     * Some errors support `error.code` instead of `error.name`. This keeps backwards compatability.
+     */
+    #code;
     /**
      * Create an SfError.
      *
@@ -47,13 +53,13 @@ class SfError extends kit_1.NamedError {
      * @param exitCodeOrCause The exit code which will be used by SfdxCommand or he underlying error that caused this error to be raised.
      * @param cause The underlying error that caused this error to be raised.
      */
-    constructor(message, name, actions, exitCodeOrCause, cause) {
-        cause = exitCodeOrCause instanceof Error ? exitCodeOrCause : cause;
-        super(name ?? 'SfError', message || name, cause);
-        /**
-         * Some errors support `error.code` instead of `error.name`. This keeps backwards compatability.
-         */
-        _SfError_code.set(this, void 0);
+    constructor(message, name = 'SfError', actions, exitCodeOrCause, cause) {
+        if (typeof cause !== 'undefined' && !(cause instanceof Error)) {
+            throw new TypeError(`The cause, if provided, must be an instance of Error. Received: ${typeof cause}`);
+        }
+        super(message);
+        this.name = name;
+        this.cause = exitCodeOrCause instanceof Error ? exitCodeOrCause : cause;
         this.actions = actions;
         if (typeof exitCodeOrCause === 'number') {
             this.exitCode = exitCodeOrCause;
@@ -62,12 +68,18 @@ class SfError extends kit_1.NamedError {
             this.exitCode = 1;
         }
     }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     get code() {
-        return __classPrivateFieldGet(this, _SfError_code, "f") ?? this.name;
+        return this.#code ?? this.name;
     }
     set code(code) {
-        __classPrivateFieldSet(this, _SfError_code, code, "f");
+        this.#code = code;
+    }
+    /** like the constructor, but takes an typed object and let you also set context and data properties */
+    static create(inputs) {
+        const error = new SfError(inputs.message, inputs.name, inputs.actions, inputs.exitCode, inputs.cause);
+        error.data = inputs.data;
+        error.context = inputs.context;
+        return error;
     }
     /**
      * Convert an Error to an SfError.
@@ -81,7 +93,15 @@ class SfError extends kit_1.NamedError {
         if (err instanceof SfError) {
             return err;
         }
-        const sfError = new SfError(err.message, err.name, undefined, err);
+        const sfError = err instanceof Error
+            ? // a basic error with message and name.  We make it the cause to preserve any other properties
+                SfError.create({
+                    message: err.message,
+                    name: err.name,
+                    cause: err,
+                })
+            : // ok, something was throws that wasn't error or string.  Convert it to an Error that preserves the information as the cause and wrap that.
+                SfError.wrap(new Error(`SfError.wrap received type ${typeof err} but expects type Error or string`, { cause: err }));
         // If the original error has a code, use that instead of name.
         if ((0, ts_types_1.hasString)(err, 'code')) {
             sfError.code = err.code;
@@ -110,24 +130,15 @@ class SfError extends kit_1.NamedError {
      * Convert an {@link SfError} state to an object. Returns a plain object representing the state of this error.
      */
     toObject() {
-        const obj = {
+        return {
             name: this.name,
             message: this.message ?? this.name,
             exitCode: this.exitCode,
             actions: this.actions,
+            ...(this.context ? { context: this.context } : {}),
+            ...(this.data ? { data: this.data } : {}),
         };
-        if (this.context) {
-            obj.context = this.context;
-        }
-        if (this.data) {
-            // DANGER: data was previously typed as `unknown` and this assertion was here on the toObject.
-            // TODO in next major release: put proper type constraint on SfError.data to something that can serialize
-            // while we're making breaking changes, provide a more definite type for toObject
-            obj.data = this.data;
-        }
-        return obj;
     }
 }
 exports.SfError = SfError;
-_SfError_code = new WeakMap();
 //# sourceMappingURL=sfError.js.map

package/lib/sfProject.d.ts

@@ -229,6 +229,9 @@ export declare class SfProject {
      * **See** [process.cwd()](https://nodejs.org/api/process.html#process_process_cwd)
      */
     static resolveProjectPathSync(dir?: string): string;
+    /** shared method for resolve and getInstance.
+     * Cannot be a module-level function because instances is private */
+    private static getMemoizedInstance;
     /**
      * Returns the project path.
      */

package/lib/sfProject.js

@@ -63,6 +63,7 @@ const coreMessages = new messages_1.Messages('@salesforce/core', 'core', new Map
  * **See** [force:project:create](https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev_ws_create_new.htm)
  */
 class SfProjectJson extends configFile_1.ConfigFile {
+    static BLOCKLIST = ['packageAliases'];
     static getFileName() {
         return internal_1.SFDX_PROJECT_JSON;
     }
@@ -313,7 +314,6 @@ class SfProjectJson extends configFile_1.ConfigFile {
     }
 }
 exports.SfProjectJson = SfProjectJson;
-SfProjectJson.BLOCKLIST = ['packageAliases'];
 /**
  * Represents an SFDX project directory. This directory contains a {@link SfProjectJson} config file as well as
  * a hidden .sfdx folder that contains all the other local project config files.
@@ -325,6 +325,17 @@ SfProjectJson.BLOCKLIST = ['packageAliases'];
  * ```
  */
 class SfProject {
+    path;
+    // Cache of SfProject instances per path.
+    static instances = new Map();
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    projectConfig;
+    // Dynamically referenced in retrieveSfProjectJson
+    sfProjectJson;
+    sfProjectJsonGlobal;
+    packageDirectories;
+    activePackage;
+    packageAliases;
     /**
      * Do not directly construct instances of this class -- use {@link SfProject.resolve} instead.
      *
@@ -341,12 +352,8 @@ class SfProject {
      * **Throws** *{@link SfError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
      */
     static async resolve(path) {
-        path = await this.resolveProjectPath(path ?? process.cwd());
-        if (!SfProject.instances.has(path)) {
-            const project = new SfProject(path);
-            SfProject.instances.set(path, project);
-        }
-        return (0, ts_types_1.ensure)(SfProject.instances.get(path));
+        const resolvedPath = await this.resolveProjectPath(path ?? process.cwd());
+        return this.getMemoizedInstance(resolvedPath);
     }
     /**
      * Get a Project from a given path or from the working directory.
@@ -357,12 +364,8 @@ class SfProject {
      */
     static getInstance(path) {
         // Store instance based on the path of the actual project.
-        path = this.resolveProjectPathSync(path ?? process.cwd());
-        if (!SfProject.instances.has(path)) {
-            const project = new SfProject(path);
-            SfProject.instances.set(path, project);
-        }
-        return (0, ts_types_1.ensure)(SfProject.instances.get(path));
+        const resolvedPath = this.resolveProjectPathSync(path ?? process.cwd());
+        return this.getMemoizedInstance(resolvedPath);
     }
     /**
      * Performs an upward directory search for an sfdx project file. Returns the absolute path to the project.
@@ -392,6 +395,15 @@ class SfProject {
     static resolveProjectPathSync(dir) {
         return (0, internal_1.resolveProjectPathSync)(dir);
     }
+    /** shared method for resolve and getInstance.
+     * Cannot be a module-level function because instances is private */
+    static getMemoizedInstance(path) {
+        if (!SfProject.instances.has(path)) {
+            const project = new SfProject(path);
+            SfProject.instances.set(path, project);
+        }
+        return (0, ts_types_1.ensure)(SfProject.instances.get(path));
+    }
     /**
      * Returns the project path.
      */
@@ -652,6 +664,4 @@ class SfProject {
     }
 }
 exports.SfProject = SfProject;
-// Cache of SfProject instances per path.
-SfProject.instances = new Map();
 //# sourceMappingURL=sfProject.js.map

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

@@ -58,14 +58,6 @@ export declare class AliasAccessor extends AsyncOptionalCreatable {
      * @param usernameOrAlias a string that might be a username or might be an alias
      */
     resolveAlias(usernameOrAlias: string): string | undefined;
-    /**
-     * Set an alias for the given aliasable entity.  Writes to the file
-     *
-     * @deprecated use setAndSave
-     * @param alias the alias you want to set
-     * @param entity the aliasable entity that's being aliased
-     */
-    set(alias: string, entity: Aliasable): void;
     /**
      * Set an alias for the given aliasable entity.  Writes to the file
      *
@@ -73,36 +65,17 @@ export declare class AliasAccessor extends AsyncOptionalCreatable {
      * @param entity the aliasable entity that's being aliased
      */
     setAndSave(alias: string, entity: Aliasable): Promise<void>;
-    /**
-     * Unset the given alias.  Writes to the file
-     *
-     * @deprecated use unsetAndSave
-     *
-     */
-    unset(alias: string): void;
     /**
      * Unset the given alias(es).  Writes to the file
      *
      */
     unsetAndSave(alias: string): Promise<void>;
-    /**
-     * Unsets all the aliases for the given entity.
-     *
-     * @deprecated use unsetValuesAndSave
-     *
-     * @param entity the aliasable entity for which you want to unset all aliases
-     */
-    unsetAll(entity: Aliasable): void;
     /**
      * Unset all the aliases for the given array of entity.
      *
      * @param entity the aliasable entity for which you want to unset all aliases
      */
     unsetValuesAndSave(aliasees: Aliasable[]): Promise<void>;
-    /**
-     * @deprecated the set/unset methods now write to the file when called.  Use (un)setAndSave instead of calling (un)set and then calling write()
-     */
-    write(): Promise<ConfigContents<string>>;
     /**
      * Returns true if the provided alias exists
      *
@@ -116,13 +89,5 @@ export declare class AliasAccessor extends AsyncOptionalCreatable {
      */
     private readFileToAliasStore;
     private saveAliasStoreToFile;
-    /**
-     * @deprecated use the async version of this method instead
-     * provided for the legacy sync set/unset methods. */
-    private readFileToAliasStoreSync;
-    /**
-     * @deprecated use the async version of this method instead
-     * provided for the legacy sync set/unset methods */
-    private saveAliasStoreToFileSync;
 }
 export declare const getFileLocation: () => string;

package/lib/stateAggregator/accessors/aliasAccessor.js

@@ -10,7 +10,6 @@ exports.getFileLocation = exports.AliasAccessor = exports.FILENAME = exports.DEF
 const node_path_1 = require("node:path");
 const node_os_1 = require("node:os");
 const promises_1 = require("node:fs/promises");
-const node_fs_1 = require("node:fs");
 const proper_lockfile_1 = require("proper-lockfile");
 const kit_1 = require("@salesforce/kit");
 const global_1 = require("../../global");
@@ -19,6 +18,10 @@ const lockRetryOptions_1 = require("../../util/lockRetryOptions");
 exports.DEFAULT_GROUP = 'orgs';
 exports.FILENAME = 'alias.json';
 class AliasAccessor extends kit_1.AsyncOptionalCreatable {
+    // set in init method
+    fileLocation;
+    /** orgs is the default group */
+    aliasStore;
     getAll(entity) {
         // This will only return aliases under "orgs". This will need to be modified
         // if/when we want to support more aliases groups.
@@ -83,19 +86,6 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
             return usernameOrAlias;
         return Array.from(this.aliasStore.entries()).find(([, value]) => value === usernameOrAlias)?.[0];
     }
-    /**
-     * Set an alias for the given aliasable entity.  Writes to the file
-     *
-     * @deprecated use setAndSave
-     * @param alias the alias you want to set
-     * @param entity the aliasable entity that's being aliased
-     */
-    set(alias, entity) {
-        // get a very fresh copy to merge with to avoid conflicts
-        this.readFileToAliasStoreSync();
-        this.aliasStore.set(alias, getNameOf(entity));
-        this.saveAliasStoreToFileSync();
-    }
     /**
      * Set an alias for the given aliasable entity.  Writes to the file
      *
@@ -108,17 +98,6 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
         this.aliasStore.set(alias, getNameOf(entity));
         return this.saveAliasStoreToFile();
     }
-    /**
-     * Unset the given alias.  Writes to the file
-     *
-     * @deprecated use unsetAndSave
-     *
-     */
-    unset(alias) {
-        this.readFileToAliasStoreSync();
-        this.aliasStore.delete(alias);
-        this.saveAliasStoreToFileSync();
-    }
     /**
      * Unset the given alias(es).  Writes to the file
      *
@@ -128,19 +107,6 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
         this.aliasStore.delete(alias);
         return this.saveAliasStoreToFile();
     }
-    /**
-     * Unsets all the aliases for the given entity.
-     *
-     * @deprecated use unsetValuesAndSave
-     *
-     * @param entity the aliasable entity for which you want to unset all aliases
-     */
-    unsetAll(entity) {
-        this.readFileToAliasStoreSync();
-        const aliases = this.getAll(entity);
-        aliases.forEach((a) => this.aliasStore.delete(a));
-        this.saveAliasStoreToFileSync();
-    }
     /**
      * Unset all the aliases for the given array of entity.
      *
@@ -153,12 +119,6 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
             .map((a) => this.aliasStore.delete(a));
         return this.saveAliasStoreToFile();
     }
-    /**
-     * @deprecated the set/unset methods now write to the file when called.  Use (un)setAndSave instead of calling (un)set and then calling write()
-     */
-    async write() {
-        return Promise.resolve(this.getAll());
-    }
     /**
      * Returns true if the provided alias exists
      *
@@ -198,30 +158,6 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
         await (0, promises_1.writeFile)(this.fileLocation, aliasStoreToRawFileContents(this.aliasStore));
         return unlockIfLocked(this.fileLocation);
     }
-    /**
-     * @deprecated use the async version of this method instead
-     * provided for the legacy sync set/unset methods. */
-    readFileToAliasStoreSync() {
-        // the file is guaranteed to exist because this init method ensures it
-        // put a lock in place.  This method is only used by legacy set/unset methods.
-        (0, proper_lockfile_1.lockSync)(this.fileLocation, lockRetryOptions_1.lockOptions);
-        this.aliasStore = fileContentsRawToAliasStore((0, node_fs_1.readFileSync)(this.fileLocation, 'utf-8'));
-    }
-    /**
-     * @deprecated use the async version of this method instead
-     * provided for the legacy sync set/unset methods */
-    saveAliasStoreToFileSync() {
-        (0, node_fs_1.writeFileSync)(this.fileLocation, aliasStoreToRawFileContents(this.aliasStore));
-        try {
-            (0, proper_lockfile_1.unlockSync)(this.fileLocation);
-        }
-        catch (e) {
-            // ignore the error.  If it wasn't locked, that's what we wanted
-            if (errorIsNotAcquired(e))
-                return;
-            throw e;
-        }
-    }
 }
 exports.AliasAccessor = AliasAccessor;
 /**

package/lib/stateAggregator/accessors/orgAccessor.js

@@ -46,12 +46,10 @@ function chunk(array, chunkSize) {
     return final;
 }
 class BaseOrgAccessor extends kit_1.AsyncOptionalCreatable {
-    constructor() {
-        super(...arguments);
-        this.configs = new Map();
-        /** map of Org files by username  */
-        this.contents = new Map();
-    }
+    configs = new Map();
+    /** map of Org files by username  */
+    contents = new Map();
+    logger;
     /**
      * Read the auth file for the given username. Once the file has been read, it can be re-accessed with the `get` method.
      *
@@ -187,10 +185,7 @@ class BaseOrgAccessor extends kit_1.AsyncOptionalCreatable {
             }
         }
         else {
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore
-            org.username ??= username;
-            this.contents.set(username, org);
+            this.contents.set(username, { ...org, username: org.username ?? username });
         }
     }
     /**

package/lib/stateAggregator/stateAggregator.js

@@ -13,6 +13,10 @@ const aliasAccessor_1 = require("./accessors/aliasAccessor");
 const orgAccessor_1 = require("./accessors/orgAccessor");
 const sandboxAccessor_1 = require("./accessors/sandboxAccessor");
 class StateAggregator extends kit_1.AsyncOptionalCreatable {
+    static instanceMap = new Map();
+    aliases;
+    orgs;
+    sandboxes;
     /**
      * Reuse a StateAggregator if one was already created for the current global state directory
      * Otherwise, create one and adds it to map for future reuse.
@@ -40,5 +44,4 @@ class StateAggregator extends kit_1.AsyncOptionalCreatable {
     }
 }
 exports.StateAggregator = StateAggregator;
-StateAggregator.instanceMap = new Map();
 //# sourceMappingURL=stateAggregator.js.map

package/lib/status/myDomainResolver.d.ts

@@ -49,7 +49,7 @@ export declare namespace MyDomainResolver {
     /**
      * Options for the MyDomain DNS resolver.
      */
-    interface Options {
+    type Options = {
         /**
          * The host to resolve.
          */
@@ -62,5 +62,5 @@ export declare namespace MyDomainResolver {
          * The retry timeout.
          */
         frequency?: Duration;
-    }
+    };
 }