@salesforce/core 3.7.4 → 3.7.7

package/lib/config/envVars.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EnvVars = exports.SUPPORTED_ENV_VARS = exports.EnvironmentVariable = void 0;
+exports.envVars = exports.EnvVars = exports.SUPPORTED_ENV_VARS = exports.EnvironmentVariable = void 0;
 /*
  * Copyright (c) 2020, salesforce.com, inc.
  * All rights reserved.
@@ -50,6 +50,11 @@ var EnvironmentVariable;
     EnvironmentVariable["SFDX_SOURCE_MEMBER_POLLING_TIMEOUT"] = "SFDX_SOURCE_MEMBER_POLLING_TIMEOUT";
     EnvironmentVariable["SFDX_USE_GENERIC_UNIX_KEYCHAIN"] = "SFDX_USE_GENERIC_UNIX_KEYCHAIN";
     EnvironmentVariable["SFDX_USE_PROGRESS_BAR"] = "SFDX_USE_PROGRESS_BAR";
+    EnvironmentVariable["SFDX_LAZY_LOAD_MODULES"] = "SFDX_LAZY_LOAD_MODULES";
+    EnvironmentVariable["SFDX_S3_HOST"] = "SFDX_S3_HOST";
+    EnvironmentVariable["SFDX_UPDATE_INSTRUCTIONS"] = "SFDX_UPDATE_INSTRUCTIONS";
+    EnvironmentVariable["SFDX_INSTALLER"] = "SFDX_INSTALLER";
+    EnvironmentVariable["SFDX_ENV"] = "SFDX_ENV";
     EnvironmentVariable["SF_TARGET_ORG"] = "SF_TARGET_ORG";
     EnvironmentVariable["SF_TARGET_DEV_HUB"] = "SF_TARGET_DEV_HUB";
     EnvironmentVariable["SF_ACCESS_TOKEN"] = "SF_ACCESS_TOKEN";
@@ -76,6 +81,11 @@ var EnvironmentVariable;
     EnvironmentVariable["SF_SOURCE_MEMBER_POLLING_TIMEOUT"] = "SF_SOURCE_MEMBER_POLLING_TIMEOUT";
     EnvironmentVariable["SF_USE_GENERIC_UNIX_KEYCHAIN"] = "SF_USE_GENERIC_UNIX_KEYCHAIN";
     EnvironmentVariable["SF_USE_PROGRESS_BAR"] = "SF_USE_PROGRESS_BAR";
+    EnvironmentVariable["SF_LAZY_LOAD_MODULES"] = "SF_LAZY_LOAD_MODULES";
+    EnvironmentVariable["SF_S3_HOST"] = "SF_S3_HOST";
+    EnvironmentVariable["SF_UPDATE_INSTRUCTIONS"] = "SF_UPDATE_INSTRUCTIONS";
+    EnvironmentVariable["SF_INSTALLER"] = "SF_INSTALLER";
+    EnvironmentVariable["SF_ENV"] = "SF_ENV";
 })(EnvironmentVariable = exports.EnvironmentVariable || (exports.EnvironmentVariable = {}));
 const getMessage = (environmentVariable) => messages.getMessage((0, change_case_1.camelCase)(environmentVariable));
 exports.SUPPORTED_ENV_VARS = {
@@ -216,6 +226,26 @@ exports.SUPPORTED_ENV_VARS = {
         description: getMessage(EnvironmentVariable.SFDX_USE_PROGRESS_BAR),
         synonymOf: EnvironmentVariable.SF_USE_PROGRESS_BAR,
     },
+    [EnvironmentVariable.SFDX_LAZY_LOAD_MODULES]: {
+        description: getMessage(EnvironmentVariable.SFDX_USE_PROGRESS_BAR),
+        synonymOf: EnvironmentVariable.SF_LAZY_LOAD_MODULES,
+    },
+    [EnvironmentVariable.SFDX_S3_HOST]: {
+        description: getMessage(EnvironmentVariable.SFDX_S3_HOST),
+        synonymOf: EnvironmentVariable.SF_S3_HOST,
+    },
+    [EnvironmentVariable.SFDX_UPDATE_INSTRUCTIONS]: {
+        description: getMessage(EnvironmentVariable.SFDX_UPDATE_INSTRUCTIONS),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SFDX_INSTALLER]: {
+        description: getMessage(EnvironmentVariable.SFDX_INSTALLER),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SFDX_ENV]: {
+        description: getMessage(EnvironmentVariable.SFDX_ENV),
+        synonymOf: null,
+    },
     [EnvironmentVariable.SF_TARGET_ORG]: {
         description: getMessage(EnvironmentVariable.SF_TARGET_ORG),
         synonymOf: null,
@@ -321,22 +351,53 @@ exports.SUPPORTED_ENV_VARS = {
         description: getMessage(EnvironmentVariable.SF_USE_PROGRESS_BAR),
         synonymOf: null,
     },
+    [EnvironmentVariable.SF_LAZY_LOAD_MODULES]: {
+        description: getMessage(EnvironmentVariable.SF_LAZY_LOAD_MODULES),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_S3_HOST]: {
+        description: getMessage(EnvironmentVariable.SF_S3_HOST),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_UPDATE_INSTRUCTIONS]: {
+        description: getMessage(EnvironmentVariable.SF_UPDATE_INSTRUCTIONS),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_INSTALLER]: {
+        description: getMessage(EnvironmentVariable.SF_INSTALLER),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_ENV]: {
+        description: getMessage(EnvironmentVariable.SF_ENV),
+        synonymOf: null,
+    },
 };
 class EnvVars extends kit_1.Env {
-    constructor() {
-        super();
+    constructor(env = process.env) {
+        super(env);
         this.resolve();
     }
-    propertyToEnvName(property, prefix = 'SFDX_') {
+    static defaultPrefix() {
+        if (process.argv[0].startsWith('sfdx'))
+            return 'SFDX_';
+        if (process.argv[0].startsWith('sf'))
+            return 'SF_';
+        return 'SFDX_';
+    }
+    propertyToEnvName(property, prefix = EnvVars.defaultPrefix()) {
         return `${prefix || ''}${(0, change_case_1.snakeCase)(property).toUpperCase()}`;
     }
-    setPropertyFromEnv(property, prefix = 'SFDX_') {
+    setPropertyFromEnv(property, prefix = EnvVars.defaultPrefix()) {
         const envName = this.propertyToEnvName(property, prefix);
         const value = this.getString(envName);
         if (value) {
             this.setString(property, value);
         }
     }
+    getPropertyFromEnv(property, prefix = EnvVars.defaultPrefix()) {
+        const envName = this.propertyToEnvName(property, prefix);
+        return this.get(envName);
+    }
     asDictionary() {
         return this.entries().reduce((accumulator, [key, value]) => {
             accumulator[key] = value;
@@ -363,6 +424,10 @@ class EnvVars extends kit_1.Env {
             }
         });
     }
+    get(envName) {
+        return this.asDictionary()[envName];
+    }
 }
 exports.EnvVars = EnvVars;
+exports.envVars = new EnvVars();
 //# sourceMappingURL=envVars.js.map

package/lib/crypto/keyChainImpl.js

@@ -58,9 +58,9 @@ const _isExe = (mode, gid, uid) => {
 /**
  * Private helper to validate that a program exists on the file system and is executable.
  *
- * **Throws** *{@link SfdxError}{ name: 'MissingCredentialProgramError' }* When the OS credential program isn't found.
+ * **Throws** *{@link SfError}{ name: 'MissingCredentialProgramError' }* When the OS credential program isn't found.
  *
- * **Throws** *{@link SfdxError}{ name: 'CredentialProgramAccessError' }* When the OS credential program isn't accessible.
+ * **Throws** *{@link SfError}{ name: 'CredentialProgramAccessError' }* When the OS credential program isn't accessible.
  *
  * @param programPath The absolute path of the program.
  * @param fsIfc The file system interface.
@@ -216,7 +216,6 @@ const _linuxImpl = {
             // This is a workaround for linux.
             // Calling secret-tool too fast can cause it to return an unexpected error. (below)
             if (stderr != null && stderr.includes('invalid or unencryptable secret')) {
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                 // @ts-ignore TODO: make an error subclass with this field
                 error.retry = true;
                 // Throwing here allows us to perform a retry in KeychainAccess

package/lib/deviceOauthService.js

@@ -15,7 +15,7 @@ const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const logger_1 = require("./logger");
 const authInfo_1 = require("./org/authInfo");
-const sfdxError_1 = require("./sfdxError");
+const sfError_1 = require("./sfError");
 const connection_1 = require("./org/connection");
 const messages_1 = require("./messages");
 messages_1.Messages.importMessagesDirectory(__dirname);
@@ -29,7 +29,7 @@ async function makeRequest(options) {
     const rawResponse = await new transport_1.default().httpRequest(options);
     const response = (0, kit_1.parseJsonMap)(rawResponse.body);
     if (response.error) {
-        const err = new sfdxError_1.SfdxError('Request Failed.');
+        const err = new sfError_1.SfError('Request Failed.');
         err.data = Object.assign(response, { status: rawResponse.statusCode });
         throw err;
     }

package/lib/exported.d.ts

@@ -1,6 +1,6 @@
 export { OAuth2Config } from 'jsforce';
 export { ConfigFile } from './config/configFile';
-export { EnvironmentVariable, SUPPORTED_ENV_VARS } from './config/envVars';
+export { envVars, EnvironmentVariable, SUPPORTED_ENV_VARS, EnvVars } from './config/envVars';
 export { BaseConfigStore, ConfigContents, ConfigEntry, ConfigStore, ConfigValue } from './config/configStore';
 export { GlobalInfo, SfEntry, SfInfo, SfInfoKeys, SfOrg, SfOrgs, SfToken, SfTokens } from './globalInfo';
 export { DeviceOauthService, DeviceCodeResponse, DeviceCodePollingResponse } from './deviceOauthService';
@@ -17,17 +17,19 @@ export { SfdcUrl } from './util/sfdcUrl';
 export { getJwtAudienceUrl } from './util/getJwtAudienceUrl';
 export { Fields, FieldValue, LoggerLevel, LoggerLevelValue, LogLine, LoggerOptions, LoggerStream, Logger, } from './logger';
 export { Messages } from './messages';
-export { Org, SandboxProcessObject, StatusEvent, SandboxEvents, SandboxUserAuthResponse, SandboxUserAuthRequest, SandboxRequest, OrgTypes, ResultEvent, } from './org';
+export { Org, SandboxProcessObject, StatusEvent, SandboxEvents, SandboxUserAuthResponse, SandboxUserAuthRequest, SandboxRequest, OrgTypes, ResultEvent, ScratchOrgRequest, } from './org';
 export { OrgConfigProperties, ORG_CONFIG_ALLOWED_PROPERTIES } from './org/orgConfigProperties';
-export { PackageDir, NamedPackageDir, PackageDirDependency, SfdxProject, SfdxProjectJson } from './sfdxProject';
+export { PackageDir, NamedPackageDir, PackageDirDependency, SfProject, SfProjectJson, SfdxProject, SfdxProjectJson, } from './sfProject';
 export { SchemaPrinter } from './schema/printer';
 export { SchemaValidator } from './schema/validator';
-export { SfdxError } from './sfdxError';
+export { SfError, SfdxError } from './sfError';
 export { PollingClient } from './status/pollingClient';
 export { CometClient, CometSubscription, StreamingClient, StatusResult } from './status/streamingClient';
 export { MyDomainResolver } from './status/myDomainResolver';
 export { DefaultUserFields, REQUIRED_FIELDS, User, UserFields } from './org/user';
 export { PermissionSetAssignment, PermissionSetAssignmentFields } from './org/permissionSetAssignment';
+export { ScratchOrgCreateOptions, ScratchOrgCreateResult, scratchOrgCreate } from './org/scratchOrgCreate';
+export { ScratchOrgInfo } from './org/scratchOrgInfoApi';
 export * from './util/fs';
 export * from './util/sfdc';
 export * from './util/sfdcUrl';

package/lib/exported.js

@@ -16,14 +16,16 @@ 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.PermissionSetAssignment = exports.User = exports.REQUIRED_FIELDS = exports.DefaultUserFields = exports.MyDomainResolver = exports.StreamingClient = exports.CometClient = exports.PollingClient = exports.SfdxError = exports.SchemaValidator = exports.SchemaPrinter = exports.SfdxProjectJson = exports.SfdxProject = 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.ConfigAggregator = exports.SFDX_ALLOWED_PROPERTIES = exports.SfdxPropertyKeys = exports.Config = exports.OrgUsersConfig = exports.DeviceOauthService = exports.SfInfoKeys = exports.GlobalInfo = exports.BaseConfigStore = exports.SUPPORTED_ENV_VARS = exports.EnvironmentVariable = exports.ConfigFile = void 0;
+exports.scratchOrgCreate = exports.PermissionSetAssignment = 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.ConfigAggregator = exports.SFDX_ALLOWED_PROPERTIES = exports.SfdxPropertyKeys = exports.Config = exports.OrgUsersConfig = exports.DeviceOauthService = exports.SfInfoKeys = exports.GlobalInfo = exports.BaseConfigStore = exports.EnvVars = exports.SUPPORTED_ENV_VARS = exports.EnvironmentVariable = exports.envVars = exports.ConfigFile = void 0;
 const messages_1 = require("./messages");
 messages_1.Messages.importMessagesDirectory(__dirname);
 var configFile_1 = require("./config/configFile");
 Object.defineProperty(exports, "ConfigFile", { enumerable: true, get: function () { return configFile_1.ConfigFile; } });
 var envVars_1 = require("./config/envVars");
+Object.defineProperty(exports, "envVars", { enumerable: true, get: function () { return envVars_1.envVars; } });
 Object.defineProperty(exports, "EnvironmentVariable", { enumerable: true, get: function () { return envVars_1.EnvironmentVariable; } });
 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 configStore_1 = require("./config/configStore");
 Object.defineProperty(exports, "BaseConfigStore", { enumerable: true, get: function () { return configStore_1.BaseConfigStore; } });
 var globalInfo_1 = require("./globalInfo");
@@ -69,15 +71,18 @@ Object.defineProperty(exports, "OrgTypes", { enumerable: true, get: function ()
 var orgConfigProperties_1 = require("./org/orgConfigProperties");
 Object.defineProperty(exports, "OrgConfigProperties", { enumerable: true, get: function () { return orgConfigProperties_1.OrgConfigProperties; } });
 Object.defineProperty(exports, "ORG_CONFIG_ALLOWED_PROPERTIES", { enumerable: true, get: function () { return orgConfigProperties_1.ORG_CONFIG_ALLOWED_PROPERTIES; } });
-var sfdxProject_1 = require("./sfdxProject");
-Object.defineProperty(exports, "SfdxProject", { enumerable: true, get: function () { return sfdxProject_1.SfdxProject; } });
-Object.defineProperty(exports, "SfdxProjectJson", { enumerable: true, get: function () { return sfdxProject_1.SfdxProjectJson; } });
+var sfProject_1 = require("./sfProject");
+Object.defineProperty(exports, "SfProject", { enumerable: true, get: function () { return sfProject_1.SfProject; } });
+Object.defineProperty(exports, "SfProjectJson", { enumerable: true, get: function () { return sfProject_1.SfProjectJson; } });
+Object.defineProperty(exports, "SfdxProject", { enumerable: true, get: function () { return sfProject_1.SfdxProject; } });
+Object.defineProperty(exports, "SfdxProjectJson", { enumerable: true, get: function () { return sfProject_1.SfdxProjectJson; } });
 var printer_1 = require("./schema/printer");
 Object.defineProperty(exports, "SchemaPrinter", { enumerable: true, get: function () { return printer_1.SchemaPrinter; } });
 var validator_1 = require("./schema/validator");
 Object.defineProperty(exports, "SchemaValidator", { enumerable: true, get: function () { return validator_1.SchemaValidator; } });
-var sfdxError_1 = require("./sfdxError");
-Object.defineProperty(exports, "SfdxError", { enumerable: true, get: function () { return sfdxError_1.SfdxError; } });
+var sfError_1 = require("./sfError");
+Object.defineProperty(exports, "SfError", { enumerable: true, get: function () { return sfError_1.SfError; } });
+Object.defineProperty(exports, "SfdxError", { enumerable: true, get: function () { return sfError_1.SfdxError; } });
 var pollingClient_1 = require("./status/pollingClient");
 Object.defineProperty(exports, "PollingClient", { enumerable: true, get: function () { return pollingClient_1.PollingClient; } });
 var streamingClient_1 = require("./status/streamingClient");
@@ -91,6 +96,8 @@ Object.defineProperty(exports, "REQUIRED_FIELDS", { enumerable: true, get: funct
 Object.defineProperty(exports, "User", { enumerable: true, get: function () { return user_1.User; } });
 var permissionSetAssignment_1 = require("./org/permissionSetAssignment");
 Object.defineProperty(exports, "PermissionSetAssignment", { enumerable: true, get: function () { return permissionSetAssignment_1.PermissionSetAssignment; } });
+var scratchOrgCreate_1 = require("./org/scratchOrgCreate");
+Object.defineProperty(exports, "scratchOrgCreate", { enumerable: true, get: function () { return scratchOrgCreate_1.scratchOrgCreate; } });
 // Utility sub-modules
 __exportStar(require("./util/fs"), exports);
 __exportStar(require("./util/sfdc"), exports);

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

@@ -170,7 +170,7 @@ class Lifecycle {
      */
     async emit(eventName, data) {
         const listeners = this.getListeners(eventName);
-        if (listeners.length === 0) {
+        if (listeners.length === 0 && eventName !== Lifecycle.warningEventName) {
             this.debug(`A lifecycle event with the name ${eventName} does not exist. An event must be registered before it can be emitted.`);
         }
         else {

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,13 @@ const events_1 = require("events");
 const os = require("os");
 const path = require("path");
 const stream_1 = require("stream");
-// 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 global_1 = require("./global");
-const sfdxError_1 = require("./sfdxError");
+const sfError_1 = require("./sfError");
 const fs_1 = require("./util/fs");
 /**
  * Standard `Logger` levels.
@@ -69,7 +68,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) {
@@ -103,7 +102,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.
@@ -199,13 +198,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];
     }
@@ -244,7 +243,7 @@ class Logger {
                 await fs_1.fs.writeFile(logFile, '', { mode: fs_1.fs.DEFAULT_USER_FILE_MODE });
             }
             catch (err3) {
-                throw sfdxError_1.SfdxError.wrap(err3);
+                throw sfError_1.SfError.wrap(err3);
             }
         }
         // avoid multiple streams to same log file
@@ -284,7 +283,7 @@ class Logger {
                 fs_1.fs.writeFileSync(logFile, '', { mode: fs_1.fs.DEFAULT_USER_FILE_MODE });
             }
             catch (err3) {
-                throw sfdxError_1.SfdxError.wrap(err3);
+                throw sfError_1.SfError.wrap(err3);
             }
         }
         // avoid multiple streams to same log file
@@ -320,7 +319,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.
      *
      * ```
@@ -453,7 +452,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,5 +1,5 @@
 import { AnyJson } from '@salesforce/ts-types';
-import { SfdxError } from './sfdxError';
+import { SfError } from './sfError';
 export declare type Tokens = Array<string | boolean | number | null | undefined>;
 /**
  * A loader function to return messages.
@@ -247,6 +247,6 @@ export declare class Messages<T extends string> {
      * @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.
      */
-    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;
     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);
@@ -456,7 +456,7 @@ class Messages {
         catch (e) {
             /* just ignore if actions aren't found */
         }
-        return new sfdxError_1.SfdxError(errMessage, errName, errActions, exitCodeOrCause, cause);
+        return new sfError_1.SfError(errMessage, errName, errActions, exitCodeOrCause, cause);
     }
     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

@@ -1,13 +1,12 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AuthInfo = exports.DEFAULT_CONNECTED_APP_INFO = 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
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AuthInfo = exports.DEFAULT_CONNECTED_APP_INFO = void 0;
-/* eslint-disable @typescript-eslint/ban-ts-comment */
 const crypto_1 = require("crypto");
 const path_1 = require("path");
 const os = require("os");
@@ -19,7 +18,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 sfError_1 = require("../sfError");
 const fs_1 = require("../util/fs");
 const sfdc_1 = require("../util/sfdc");
 const globalInfo_1 = require("../globalInfo");
@@ -237,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 {
@@ -490,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) {
@@ -769,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

@@ -4,8 +4,8 @@ import { JsonCollection, JsonMap, Optional } from '@salesforce/ts-types';
 import { Connection as JSForceConnection, ConnectionConfig, HttpRequest, QueryOptions, QueryResult, Record, Schema } from 'jsforce';
 import { Tooling as JSForceTooling } from 'jsforce/lib/api/tooling';
 import { StreamPromise } from 'jsforce/lib/util/promise';
-import { AuthFields, AuthInfo } from '../org/authInfo';
 import { ConfigAggregator } from '../config/configAggregator';
+import { AuthFields, AuthInfo } from './authInfo';
 export declare const SFDX_HTTP_HEADERS: {
     'content-type': string;
     'user-agent': string;
@@ -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.
      */
@@ -171,6 +171,11 @@ export declare class Connection<S extends Schema = Schema> extends JSForceConnec
      * @param options The query options.
      */
     singleRecordQuery<T extends Record>(soql: string, options?: SingleRecordQueryOptions): Promise<T>;
+    /**
+     * Executes a get request on the baseUrl to force an auth refresh
+     * Useful for the raw methods (request, requestRaw) that use the accessToken directly and don't handle refreshes
+     */
+    refreshAuth(): Promise<void>;
     private loadInstanceApiVersion;
 }
 export declare const SingleRecordQueryErrors: {

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");
@@ -138,6 +138,7 @@ class Connection extends jsforce_1.Connection {
         delete options.rest;
         if (rest) {
             this.logger.debug('deploy with REST');
+            await this.refreshAuth();
             const headers = {
                 Authorization: this && `OAuth ${this.accessToken}`,
                 'Sforce-Call-Options': 'client=sfdx-core',
@@ -273,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.
      */
@@ -356,15 +357,27 @@ 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);
         }
         return result.records[0];
     }
+    /**
+     * Executes a get request on the baseUrl to force an auth refresh
+     * Useful for the raw methods (request, requestRaw) that use the accessToken directly and don't handle refreshes
+     */
+    async refreshAuth() {
+        this.logger.debug('Refreshing auth for org.');
+        const requestInfo = {
+            url: this.baseUrl(),
+            method: 'GET',
+        };
+        await this.request(requestInfo);
+    }
     async loadInstanceApiVersion() {
         const authFileFields = this.options.authInfo.getFields();
         const lastCheckedDateString = authFileFields.instanceApiVersionLastRetrieved;