@salesforce/core 3.7.6 → 3.7.9

package/lib/global.js

@@ -10,7 +10,7 @@ exports.Global = exports.Mode = void 0;
 const os = require("os");
 const path = require("path");
 const kit_1 = require("@salesforce/kit");
-const fs_1 = require("./util/fs");
+const mkdirp = require("mkdirp");
 /**
  * Represents an environment mode.  Supports `production`, `development`, `demo`, and `test`
  * with the default mode being `production`.
@@ -46,7 +46,7 @@ class Global {
      */
     static async createDir(dirPath) {
         dirPath = dirPath ? path.join(Global.SFDX_DIR, dirPath) : Global.SFDX_DIR;
-        await fs_1.fs.mkdirp(dirPath, fs_1.fs.DEFAULT_USER_DIR_MODE);
+        await mkdirp(dirPath, '700');
     }
 }
 exports.Global = Global;

package/lib/globalInfo/accessors/aliasAccessor.js

@@ -7,7 +7,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AliasAccessor = void 0;
-const sfdxError_1 = require("../../sfdxError");
+const sfError_1 = require("../../sfError");
 const types_1 = require("../types");
 class AliasAccessor {
     constructor(globalInfo) {
@@ -121,7 +121,7 @@ class AliasAccessor {
             return entity;
         const aliaseeName = (_a = entity.username) !== null && _a !== void 0 ? _a : entity.user;
         if (!aliaseeName) {
-            throw new sfdxError_1.SfdxError(`Invalid aliasee, it must contain a user or username property: ${JSON.stringify(entity)}`);
+            throw new sfError_1.SfError(`Invalid aliasee, it must contain a user or username property: ${JSON.stringify(entity)}`);
         }
         return aliaseeName;
     }

package/lib/globalInfo/sfdxDataHandler.d.ts

@@ -1,5 +1,5 @@
 import { ConfigFile } from '../config/configFile';
-import { SfOrgs, SfOrg, SfInfo, SfInfoKeys } from './types';
+import { SfInfo, SfInfoKeys, SfOrg, SfOrgs } from './types';
 interface Handler<T extends SfInfoKeys> {
     sfKey: T;
     merge: (sfData: SfInfo) => Promise<Partial<SfInfo>>;

package/lib/globalInfo/sfdxDataHandler.js

@@ -8,10 +8,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 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 fs_1 = require("../util/fs");
 const configFile_1 = require("../config/configFile");
 const globalInfoConfig_1 = require("./globalInfoConfig");
 const types_1 = require("./types");
@@ -141,7 +141,7 @@ class AuthHandler extends BaseHandler {
         return config;
     }
     async listAllAuthFiles() {
-        const globalFiles = await fs_1.fs.readdir(global_1.Global.SFDX_DIR);
+        const globalFiles = await fs.promises.readdir(global_1.Global.SFDX_DIR);
         return globalFiles.filter((file) => file.match(AuthHandler.authFilenameFilterRegEx));
     }
     async listAllAuthorizations() {
@@ -169,7 +169,8 @@ class AliasesHandler extends BaseHandler {
     async migrate() {
         const aliasesFilePath = (0, path_1.join)(global_1.Global.SFDX_DIR, AliasesHandler.SFDX_ALIASES_FILENAME);
         try {
-            const sfdxAliases = (await fs_1.fs.readJson(aliasesFilePath)).orgs;
+            const x = await fs.promises.readFile(aliasesFilePath, 'utf8');
+            const sfdxAliases = (0, kit_1.parseJson)(x).orgs;
             return { [this.sfKey]: { ...sfdxAliases } };
         }
         catch (e) {
@@ -209,7 +210,7 @@ class AliasesHandler extends BaseHandler {
     }
     async write(latest) {
         const aliasesFilePath = (0, path_1.join)(global_1.Global.SFDX_DIR, AliasesHandler.SFDX_ALIASES_FILENAME);
-        fs_1.fs.writeJson(aliasesFilePath, { orgs: latest[types_1.SfInfoKeys.ALIASES] });
+        await fs.promises.writeFile(aliasesFilePath, JSON.stringify({ orgs: latest[types_1.SfInfoKeys.ALIASES] }, null, 2));
     }
 }
 exports.AliasesHandler = AliasesHandler;

package/lib/logger.d.ts

@@ -174,7 +174,7 @@ export declare class Logger {
      *
      * @param optionsOrName A set of `LoggerOptions` or name to use with the default options.
      *
-     * **Throws** *{@link SfdxError}{ name: 'RedundantRootLoggerError' }* More than one attempt is made to construct the root
+     * **Throws** *{@link SfError}{ name: 'RedundantRootLoggerError' }* More than one attempt is made to construct the root
      * `Logger`.
      */
     constructor(optionsOrName: LoggerOptions | string);
@@ -211,7 +211,7 @@ export declare class Logger {
      *
      * @param {string} levelName The level name to convert to a `LoggerLevel` enum value.
      *
-     * **Throws** *{@link SfdxError}{ name: 'UnrecognizedLoggerLevelNameError' }* The level name was not case-insensitively recognized as a valid `LoggerLevel` value.
+     * **Throws** *{@link SfError}{ name: 'UnrecognizedLoggerLevelNameError' }* The level name was not case-insensitively recognized as a valid `LoggerLevel` value.
      * @see {@Link LoggerLevel}
      */
     static getLevelByName(levelName: string): LoggerLevelValue;
@@ -249,7 +249,7 @@ export declare class Logger {
      *
      * @param {LoggerLevelValue} [level] The logger level.
      *
-     * **Throws** *{@link SfdxError}{ name: 'UnrecognizedLoggerLevelNameError' }* A value of `level` read from `SFDX_LOG_LEVEL`
+     * **Throws** *{@link SfError}{ name: 'UnrecognizedLoggerLevelNameError' }* A value of `level` read from `SFDX_LOG_LEVEL`
      * was invalid.
      *
      * ```

package/lib/logger.js

@@ -11,14 +11,16 @@ const events_1 = require("events");
 const os = require("os");
 const path = require("path");
 const stream_1 = require("stream");
+const fs = require("fs");
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 const Bunyan = require("@salesforce/bunyan");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const Debug = require("debug");
+const mkdirp = require("mkdirp");
 const global_1 = require("./global");
-const sfdxError_1 = require("./sfdxError");
-const fs_1 = require("./util/fs");
+const sfError_1 = require("./sfError");
 /**
  * Standard `Logger` levels.
  *
@@ -68,7 +70,7 @@ class Logger {
      *
      * @param optionsOrName A set of `LoggerOptions` or name to use with the default options.
      *
-     * **Throws** *{@link SfdxError}{ name: 'RedundantRootLoggerError' }* More than one attempt is made to construct the root
+     * **Throws** *{@link SfError}{ name: 'RedundantRootLoggerError' }* More than one attempt is made to construct the root
      * `Logger`.
      */
     constructor(optionsOrName) {
@@ -102,7 +104,7 @@ class Logger {
             options = optionsOrName;
         }
         if (Logger.rootLogger && options.name === Logger.ROOT_NAME) {
-            throw new sfdxError_1.SfdxError('Can not create another root logger.', 'RedundantRootLoggerError');
+            throw new sfError_1.SfError('Can not create another root logger.', 'RedundantRootLoggerError');
         }
         // Inspect format to know what logging format to use then delete from options to
         // ensure it doesn't conflict with Bunyan.
@@ -198,13 +200,13 @@ class Logger {
      *
      * @param {string} levelName The level name to convert to a `LoggerLevel` enum value.
      *
-     * **Throws** *{@link SfdxError}{ name: 'UnrecognizedLoggerLevelNameError' }* The level name was not case-insensitively recognized as a valid `LoggerLevel` value.
+     * **Throws** *{@link SfError}{ name: 'UnrecognizedLoggerLevelNameError' }* The level name was not case-insensitively recognized as a valid `LoggerLevel` value.
      * @see {@Link LoggerLevel}
      */
     static getLevelByName(levelName) {
         levelName = levelName.toUpperCase();
         if (!(0, ts_types_1.isKeyOf)(LoggerLevel, levelName)) {
-            throw new sfdxError_1.SfdxError(`Invalid log level "${levelName}".`, 'UnrecognizedLoggerLevelNameError');
+            throw new sfError_1.SfError(`Invalid log level "${levelName}".`, 'UnrecognizedLoggerLevelNameError');
         }
         return LoggerLevel[levelName];
     }
@@ -228,22 +230,22 @@ class Logger {
     async addLogFileStream(logFile) {
         try {
             // Check if we have write access to the log file (i.e., we created it already)
-            await fs_1.fs.access(logFile, fs_1.fs.constants.W_OK);
+            await fs.promises.access(logFile, fs.constants.W_OK);
         }
         catch (err1) {
             try {
-                await fs_1.fs.mkdirp(path.dirname(logFile), {
-                    mode: fs_1.fs.DEFAULT_USER_DIR_MODE,
+                await mkdirp(path.dirname(logFile), {
+                    mode: '700',
                 });
             }
             catch (err2) {
                 // noop; directory exists already
             }
             try {
-                await fs_1.fs.writeFile(logFile, '', { mode: fs_1.fs.DEFAULT_USER_FILE_MODE });
+                await fs.promises.writeFile(logFile, '', { mode: '600' });
             }
             catch (err3) {
-                throw sfdxError_1.SfdxError.wrap(err3);
+                throw sfError_1.SfError.wrap(err3);
             }
         }
         // avoid multiple streams to same log file
@@ -268,22 +270,22 @@ class Logger {
     addLogFileStreamSync(logFile) {
         try {
             // Check if we have write access to the log file (i.e., we created it already)
-            fs_1.fs.accessSync(logFile, fs_1.fs.constants.W_OK);
+            fs.accessSync(logFile, fs.constants.W_OK);
         }
         catch (err1) {
             try {
-                fs_1.fs.mkdirpSync(path.dirname(logFile), {
-                    mode: fs_1.fs.DEFAULT_USER_DIR_MODE,
+                mkdirp.sync(path.dirname(logFile), {
+                    mode: '700',
                 });
             }
             catch (err2) {
                 // noop; directory exists already
             }
             try {
-                fs_1.fs.writeFileSync(logFile, '', { mode: fs_1.fs.DEFAULT_USER_FILE_MODE });
+                fs.writeFileSync(logFile, '', { mode: '600' });
             }
             catch (err3) {
-                throw sfdxError_1.SfdxError.wrap(err3);
+                throw sfError_1.SfError.wrap(err3);
             }
         }
         // avoid multiple streams to same log file
@@ -319,7 +321,7 @@ class Logger {
      *
      * @param {LoggerLevelValue} [level] The logger level.
      *
-     * **Throws** *{@link SfdxError}{ name: 'UnrecognizedLoggerLevelNameError' }* A value of `level` read from `SFDX_LOG_LEVEL`
+     * **Throws** *{@link SfError}{ name: 'UnrecognizedLoggerLevelNameError' }* A value of `level` read from `SFDX_LOG_LEVEL`
      * was invalid.
      *
      * ```
@@ -400,7 +402,7 @@ class Logger {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             this.bunyan.streams.forEach(async (stream) => {
                 if (stream.type === 'file') {
-                    content += await fs_1.fs.readFile(stream.path, 'utf8');
+                    content += await fs.promises.readFile(stream.path, 'utf8');
                 }
             });
             return content;
@@ -452,7 +454,7 @@ class Logger {
      */
     child(name, fields = {}) {
         if (!name) {
-            throw new sfdxError_1.SfdxError('LoggerNameRequired');
+            throw new sfError_1.SfError('LoggerNameRequired');
         }
         fields.log = name;
         const child = new Logger(name);

package/lib/messages.d.ts

@@ -1,6 +1,11 @@
 import { AnyJson } from '@salesforce/ts-types';
-import { SfdxError } from './sfdxError';
+import { SfError } from './sfError';
 export declare type Tokens = Array<string | boolean | number | null | undefined>;
+export declare type StructuredMessage = {
+    message: string;
+    name: string;
+    actions?: string[];
+};
 /**
  * A loader function to return messages.
  *
@@ -244,9 +249,43 @@ export declare class Messages<T extends string> {
      * @param key The key of the error message.
      * @param tokens The error message tokens.
      * @param actionTokens The action messages tokens.
-     * @param exitCodeOrCause The exit code which will be used by SfdxCommand or he underlying error that caused this error to be raised.
+     * @param exitCodeOrCause The exit code which will be used by SfdxCommand or the underlying error that caused this error to be raised.
      * @param cause The underlying error that caused this error to be raised.
      */
-    createError(key: T, tokens?: Tokens, actionTokens?: Tokens, exitCodeOrCause?: number | Error, cause?: Error): SfdxError;
+    createError(key: T, tokens?: Tokens, actionTokens?: Tokens, exitCodeOrCause?: number | Error, cause?: Error): SfError;
+    /**
+     * Convenience method to create warning using message labels.
+     *
+     * `warning.name` will be the upper-cased key, remove prefixed `warning.` and will always end in Warning.
+     * `warning.actions` will be loaded using `${key}.actions` if available.
+     *
+     * @param key The key of the warning message.
+     * @param tokens The warning message tokens.
+     * @param actionTokens The action messages tokens.
+     */
+    createWarning(key: T, tokens?: Tokens, actionTokens?: Tokens): StructuredMessage;
+    /**
+     * Convenience method to create info using message labels.
+     *
+     * `info.name` will be the upper-cased key, remove prefixed `info.` and will always end in Info.
+     * `info.actions` will be loaded using `${key}.actions` if available.
+     *
+     * @param key The key of the warning message.
+     * @param tokens The warning message tokens.
+     * @param actionTokens The action messages tokens.
+     */
+    createInfo(key: T, tokens?: Tokens, actionTokens?: Tokens): StructuredMessage;
+    /**
+     * Formats message contents given a message type, key, tokens and actions tokens
+     *
+     * `<type>.name` will be the upper-cased key, remove prefixed `<type>.` and will always end in 'Error | Warning | Info.
+     * `<type>.actions` will be loaded using `${key}.actions` if available.
+     *
+     * @param type The type of the message set must 'error' | 'warning' | 'info'.
+     * @param key The key of the warning message.
+     * @param tokens The warning message tokens.
+     * @param actionTokens The action messages tokens.
+     */
+    private formatMessageContents;
     private getMessageWithMap;
 }

package/lib/messages.js

@@ -13,7 +13,7 @@ const path = require("path");
 const util = require("util");
 const ts_types_1 = require("@salesforce/ts-types");
 const kit_1 = require("@salesforce/kit");
-const sfdxError_1 = require("./sfdxError");
+const sfError_1 = require("./sfError");
 class Key {
     constructor(packageName, bundleName) {
         this.packageName = packageName;
@@ -57,7 +57,7 @@ const markdownLoader = (filePath, fileContents) => {
             }
         }
         else {
-            // use error instead of SfdxError because messages.js should have no internal dependencies.
+            // use error instead of SfError because messages.js should have no internal dependencies.
             throw new Error(`Invalid markdown message file: ${filePath}\nThe line "# <key>" must be immediately followed by the message on a new line.`);
         }
     }
@@ -217,7 +217,7 @@ class Messages {
             if (!fileContents || fileContents.trim().length === 0) {
                 // messages.js should have no internal dependencies.
                 const error = new Error(`Invalid message file: ${filePath}. No content.`);
-                error.name = 'SfdxError';
+                error.name = 'SfError';
                 throw error;
             }
             const map = parser(filePath, fileContents);
@@ -438,25 +438,68 @@ class Messages {
      * @param key The key of the error message.
      * @param tokens The error message tokens.
      * @param actionTokens The action messages tokens.
-     * @param exitCodeOrCause The exit code which will be used by SfdxCommand or he underlying error that caused this error to be raised.
+     * @param exitCodeOrCause The exit code which will be used by SfdxCommand or the underlying error that caused this error to be raised.
      * @param cause The underlying error that caused this error to be raised.
      */
     createError(key, tokens = [], actionTokens = [], exitCodeOrCause, cause) {
+        const structuredMessage = this.formatMessageContents('error', key, tokens, actionTokens);
+        return new sfError_1.SfError(structuredMessage.message, structuredMessage.name, structuredMessage.actions, exitCodeOrCause, cause);
+    }
+    /**
+     * Convenience method to create warning using message labels.
+     *
+     * `warning.name` will be the upper-cased key, remove prefixed `warning.` and will always end in Warning.
+     * `warning.actions` will be loaded using `${key}.actions` if available.
+     *
+     * @param key The key of the warning message.
+     * @param tokens The warning message tokens.
+     * @param actionTokens The action messages tokens.
+     */
+    createWarning(key, tokens = [], actionTokens = []) {
+        return this.formatMessageContents('warning', key, tokens, actionTokens);
+    }
+    /**
+     * Convenience method to create info using message labels.
+     *
+     * `info.name` will be the upper-cased key, remove prefixed `info.` and will always end in Info.
+     * `info.actions` will be loaded using `${key}.actions` if available.
+     *
+     * @param key The key of the warning message.
+     * @param tokens The warning message tokens.
+     * @param actionTokens The action messages tokens.
+     */
+    createInfo(key, tokens = [], actionTokens = []) {
+        return this.formatMessageContents('info', key, tokens, actionTokens);
+    }
+    /**
+     * Formats message contents given a message type, key, tokens and actions tokens
+     *
+     * `<type>.name` will be the upper-cased key, remove prefixed `<type>.` and will always end in 'Error | Warning | Info.
+     * `<type>.actions` will be loaded using `${key}.actions` if available.
+     *
+     * @param type The type of the message set must 'error' | 'warning' | 'info'.
+     * @param key The key of the warning message.
+     * @param tokens The warning message tokens.
+     * @param actionTokens The action messages tokens.
+     */
+    formatMessageContents(type, key, tokens = [], actionTokens = []) {
+        const label = (0, kit_1.upperFirst)(type);
+        const labelRegExp = new RegExp(`${label}$`);
+        const searchValue = type === 'error' ? /^error.*\./ : new RegExp(`^${type}.`);
         // Convert key to name:
-        //     'myMessage' -> `MyMessageError`
+        //     'myMessage' -> `MyMessageWarning`
         //     'myMessageError' -> `MyMessageError`
-        //     'error.myMessage' -> `MyMessageError`
-        //     'errors.myMessage' -> `MyMessageError`
-        const errName = `${(0, kit_1.upperFirst)(key.replace(/^errors*\./, ''))}${/Error$/.exec(key) ? '' : 'Error'}`;
-        const errMessage = this.getMessage(key, tokens);
-        let errActions;
+        //     'warning.myMessage' -> `MyMessageWarning`
+        const name = `${(0, kit_1.upperFirst)(key.replace(searchValue, ''))}${labelRegExp.exec(key) ? '' : label}`;
+        const message = this.getMessage(key, tokens);
+        let actions;
         try {
-            errActions = this.getMessageWithMap(`${key}.actions`, actionTokens, this.messages);
+            actions = this.getMessageWithMap(`${key}.actions`, actionTokens, this.messages);
         }
         catch (e) {
             /* just ignore if actions aren't found */
         }
-        return new sfdxError_1.SfdxError(errMessage, errName, errActions, exitCodeOrCause, cause);
+        return { message, name, actions };
     }
     getMessageWithMap(key, tokens = [], map) {
         // Allow nested keys for better grouping

package/lib/org/authInfo.d.ts

@@ -253,7 +253,7 @@ export declare class AuthInfo extends AsyncOptionalCreatable<AuthInfo.Options> {
      *
      * @param options Options to be used for creating an OAuth2 instance.
      *
-     * **Throws** *{@link SfdxError}{ name: 'NamedOrgNotFoundError' }* Org information does not exist.
+     * **Throws** *{@link SfError}{ name: 'NamedOrgNotFoundError' }* Org information does not exist.
      * @returns {Promise<AuthInfo>}
      */
     private initAuthOptions;

package/lib/org/authInfo.js

@@ -10,6 +10,7 @@ exports.AuthInfo = exports.DEFAULT_CONNECTED_APP_INFO = void 0;
 const crypto_1 = require("crypto");
 const path_1 = require("path");
 const os = require("os");
+const fs = require("fs");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const jsforce_1 = require("jsforce");
@@ -18,8 +19,7 @@ const jwt = require("jsonwebtoken");
 const config_1 = require("../config/config");
 const configAggregator_1 = require("../config/configAggregator");
 const logger_1 = require("../logger");
-const sfdxError_1 = require("../sfdxError");
-const fs_1 = require("../util/fs");
+const sfError_1 = require("../sfError");
 const sfdc_1 = require("../util/sfdc");
 const globalInfo_1 = require("../globalInfo");
 const messages_1 = require("../messages");
@@ -236,7 +236,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
     static parseSfdxAuthUrl(sfdxAuthUrl) {
         const match = sfdxAuthUrl.match(/^force:\/\/([a-zA-Z0-9._-]+):([a-zA-Z0-9._-]*):([a-zA-Z0-9._-]+={0,2})@([a-zA-Z0-9._-]+)/);
         if (!match) {
-            throw new sfdxError_1.SfdxError('Invalid SFDX auth URL. Must be in the format "force://<clientId>:<clientSecret>:<refreshToken>@<instanceUrl>".  Note that the SFDX auth URL uses the "force" protocol, and not "http" or "https".  Also note that the "instanceUrl" inside the SFDX auth URL doesn\'t include the protocol ("https://").', 'INVALID_SFDX_AUTH_URL');
+            throw new sfError_1.SfError('Invalid SFDX auth URL. Must be in the format "force://<clientId>:<clientSecret>:<refreshToken>@<instanceUrl>".  Note that the SFDX auth URL uses the "force" protocol, and not "http" or "https".  Also note that the "instanceUrl" inside the SFDX auth URL doesn\'t include the protocol ("https://").', 'INVALID_SFDX_AUTH_URL');
         }
         const [, clientId, clientSecret, refreshToken, loginUrl] = match;
         return {
@@ -489,7 +489,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
      *
      * @param options Options to be used for creating an OAuth2 instance.
      *
-     * **Throws** *{@link SfdxError}{ name: 'NamedOrgNotFoundError' }* Org information does not exist.
+     * **Throws** *{@link SfError}{ name: 'NamedOrgNotFoundError' }* Org information does not exist.
      * @returns {Promise<AuthInfo>}
      */
     async initAuthOptions(options) {
@@ -584,7 +584,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
     }
     // Build OAuth config for a JWT auth flow
     async buildJwtConfig(options) {
-        const privateKeyContents = await fs_1.fs.readFile((0, ts_types_1.ensure)(options.privateKey), 'utf8');
+        const privateKeyContents = await fs.promises.readFile((0, ts_types_1.ensure)(options.privateKey), 'utf8');
         const { loginUrl = sfdcUrl_1.SfdcUrl.PRODUCTION } = options;
         const url = new sfdcUrl_1.SfdcUrl(loginUrl);
         const createdOrgInstance = (0, ts_types_1.getString)(options, 'createdOrgInstance', '').trim().toLowerCase();
@@ -768,7 +768,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         catch (err) {
             errorMsg = `${bodyAsString}`;
         }
-        throw new sfdxError_1.SfdxError(errorMsg);
+        throw new sfError_1.SfError(errorMsg);
     }
 }
 exports.AuthInfo = AuthInfo;

package/lib/org/authRemover.d.ts

@@ -39,8 +39,8 @@ export declare class AuthRemover extends AsyncOptionalCreatable {
     removeAllAuths(): Promise<void>;
     /**
      * Finds authorization files for username/alias in the global .sfdx folder
-     * **Throws** *{@link SfdxError}{ name: 'TargetOrgNotSetError' }* if no target-org
-     * **Throws** *{@link SfdxError}{ name: 'NamedOrgNotFoundError' }* if specified user is not found
+     * **Throws** *{@link SfError}{ name: 'TargetOrgNotSetError' }* if no target-org
+     * **Throws** *{@link SfError}{ name: 'NamedOrgNotFoundError' }* if specified user is not found
      *
      * @param usernameOrAlias username or alias of the auth you want to find, defaults to the configured target-org
      * @returns {Promise<SfOrg>}

package/lib/org/authRemover.js

@@ -66,8 +66,8 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
     }
     /**
      * Finds authorization files for username/alias in the global .sfdx folder
-     * **Throws** *{@link SfdxError}{ name: 'TargetOrgNotSetError' }* if no target-org
-     * **Throws** *{@link SfdxError}{ name: 'NamedOrgNotFoundError' }* if specified user is not found
+     * **Throws** *{@link SfError}{ name: 'TargetOrgNotSetError' }* if no target-org
+     * **Throws** *{@link SfError}{ name: 'NamedOrgNotFoundError' }* if specified user is not found
      *
      * @param usernameOrAlias username or alias of the auth you want to find, defaults to the configured target-org
      * @returns {Promise<SfOrg>}

package/lib/org/connection.d.ts

@@ -123,7 +123,7 @@ export declare class Connection<S extends Schema = Schema> extends JSForceConnec
     /**
      * Set the API version for all connection requests.
      *
-     * **Throws** *{@link SfdxError}{ name: 'IncorrectAPIVersionError' }* Incorrect API version.
+     * **Throws** *{@link SfError}{ name: 'IncorrectAPIVersionError' }* Incorrect API version.
      *
      * @param version The API version.
      */

package/lib/org/connection.js

@@ -17,7 +17,7 @@ const tooling_1 = require("jsforce/lib/api/tooling");
 const myDomainResolver_1 = require("../status/myDomainResolver");
 const configAggregator_1 = require("../config/configAggregator");
 const logger_1 = require("../logger");
-const sfdxError_1 = require("../sfdxError");
+const sfError_1 = require("../sfError");
 const sfdc_1 = require("../util/sfdc");
 const messages_1 = require("../messages");
 const lifecycleEvents_1 = require("../lifecycleEvents");
@@ -274,7 +274,7 @@ class Connection extends jsforce_1.Connection {
     /**
      * Set the API version for all connection requests.
      *
-     * **Throws** *{@link SfdxError}{ name: 'IncorrectAPIVersionError' }* Incorrect API version.
+     * **Throws** *{@link SfError}{ name: 'IncorrectAPIVersionError' }* Incorrect API version.
      *
      * @param version The API version.
      */
@@ -357,10 +357,10 @@ class Connection extends jsforce_1.Connection {
     }) {
         const result = options.tooling ? await this.tooling.query(soql) : await this.query(soql);
         if (result.totalSize === 0) {
-            throw new sfdxError_1.SfdxError(`No record found for ${soql}`, exports.SingleRecordQueryErrors.NoRecords);
+            throw new sfError_1.SfError(`No record found for ${soql}`, exports.SingleRecordQueryErrors.NoRecords);
         }
         if (result.totalSize > 1) {
-            throw new sfdxError_1.SfdxError(options.returnChoicesOnMultiple
+            throw new sfError_1.SfError(options.returnChoicesOnMultiple
                 ? `Multiple records found. ${result.records.map((item) => item[options.choiceField]).join(',')}`
                 : 'The query returned more than 1 record', exports.SingleRecordQueryErrors.MultipleRecords);
         }

package/lib/org/org.d.ts

@@ -148,9 +148,9 @@ export declare class Org extends AsyncOptionalCreatable<Org.Options> {
     /**
      * Check that this org is a scratch org by asking the dev hub if it knows about it.
      *
-     * **Throws** *{@link SfdxError}{ name: 'NotADevHubError' }* Not a Dev Hub.
+     * **Throws** *{@link SfError}{ name: 'NotADevHubError' }* Not a Dev Hub.
      *
-     * **Throws** *{@link SfdxError}{ name: 'NoResultsError' }* No results.
+     * **Throws** *{@link SfError}{ name: 'NoResultsError' }* No results.
      *
      * @param devHubUsernameOrAlias The username or alias of the dev hub org.
      */
@@ -253,7 +253,7 @@ export declare class Org extends AsyncOptionalCreatable<Org.Options> {
     /**
      * Removes a username from the user config for this object. For convenience `this` object is returned.
      *
-     * **Throws** *{@link SfdxError}{ name: 'MissingAuthInfoError' }* Auth info is missing.
+     * **Throws** *{@link SfError}{ name: 'MissingAuthInfoError' }* Auth info is missing.
      *
      * @param {AuthInfo | string} auth The AuthInfo containing the username to remove.
      */
@@ -305,7 +305,7 @@ export declare class Org extends AsyncOptionalCreatable<Org.Options> {
      */
     protected init(): Promise<void>;
     /**
-     * **Throws** *{@link SfdxError}{ name: 'NotSupportedError' }* Throws an unsupported error.
+     * **Throws** *{@link SfError}{ name: 'NotSupportedError' }* Throws an unsupported error.
      */
     protected getDefaultOptions(): Org.Options;
     private queryProduction;