@salesforce/core 3.7.6 → 3.7.9

package/lib/org/org.js

@@ -8,6 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Org = exports.SandboxEvents = exports.OrgTypes = 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 config_1 = require("../config/config");
@@ -17,8 +18,7 @@ const sandboxOrgConfig_1 = require("../config/sandboxOrgConfig");
 const global_1 = require("../global");
 const lifecycleEvents_1 = require("../lifecycleEvents");
 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 webOAuthServer_1 = require("../webOAuthServer");
 const messages_1 = require("../messages");
@@ -147,7 +147,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
             }
             throw err;
         }
-        return this.manageDelete(async () => await fs_1.fs.remove(dataPath), dataPath, throwWhenRemoveFails);
+        return this.manageDelete(async () => await fs.promises.rmdir(dataPath), dataPath, throwWhenRemoveFails);
     }
     /**
      * @ignore
@@ -187,9 +187,9 @@ class Org extends kit_1.AsyncOptionalCreatable {
     /**
      * 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.
      */
@@ -205,7 +205,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
         try {
             const results = await devHubConnection.query(DEV_HUB_SOQL);
             if ((0, ts_types_1.getNumber)(results, 'records.length') !== 1) {
-                throw new sfdxError_1.SfdxError('No results', 'NoResultsError');
+                throw new sfError_1.SfError('No results', 'NoResultsError');
             }
         }
         catch (err) {
@@ -440,7 +440,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
      */
     async addUsername(auth) {
         if (!auth) {
-            throw new sfdxError_1.SfdxError('Missing auth info', 'MissingAuthInfo');
+            throw new sfError_1.SfError('Missing auth info', 'MissingAuthInfo');
         }
         const authInfo = (0, ts_types_1.isString)(auth) ? await authInfo_1.AuthInfo.create({ username: auth }) : auth;
         this.logger.debug(`adding username ${authInfo.getFields().username}`);
@@ -450,7 +450,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
         // needs config refactoring to improve
         const usernames = contents.usernames || [];
         if (!(0, ts_types_1.isArray)(usernames)) {
-            throw new sfdxError_1.SfdxError('Usernames is not an array', 'UnexpectedDataFormat');
+            throw new sfError_1.SfError('Usernames is not an array', 'UnexpectedDataFormat');
         }
         let shouldUpdate = false;
         const thisUsername = (0, ts_types_1.ensure)(this.getUsername());
@@ -472,13 +472,13 @@ class Org extends kit_1.AsyncOptionalCreatable {
     /**
      * 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.
      */
     async removeUsername(auth) {
         if (!auth) {
-            throw new sfdxError_1.SfdxError('Missing auth info', 'MissingAuthInfoError');
+            throw new sfError_1.SfError('Missing auth info', 'MissingAuthInfoError');
         }
         const authInfo = (0, ts_types_1.isString)(auth) ? await authInfo_1.AuthInfo.create({ username: auth }) : auth;
         this.logger.debug(`removing username ${authInfo.getFields().username}`);
@@ -586,7 +586,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
                 throw messages.createError('noUsernameFound');
             }
             this.connection = await connection_1.Connection.create({
-                // If no username is provided or resolvable from an alias, AuthInfo will throw an SfdxError.
+                // If no username is provided or resolvable from an alias, AuthInfo will throw an SfError.
                 authInfo: await authInfo_1.AuthInfo.create({ username, isDevHub: this.options.isDevHub }),
             });
         }
@@ -596,10 +596,10 @@ class Org extends kit_1.AsyncOptionalCreatable {
         this.orgId = this.getField(Org.Fields.ORG_ID);
     }
     /**
-     * **Throws** *{@link SfdxError}{ name: 'NotSupportedError' }* Throws an unsupported error.
+     * **Throws** *{@link SfError}{ name: 'NotSupportedError' }* Throws an unsupported error.
      */
     getDefaultOptions() {
-        throw new sfdxError_1.SfdxError('Not Supported', 'NotSupportedError');
+        throw new sfError_1.SfError('Not Supported', 'NotSupportedError');
     }
     async queryProduction(org, field, value) {
         return org.connection.singleRecordQuery(`SELECT SandboxInfoId FROM SandboxProcess WHERE ${field} ='${value}' AND Status NOT IN ('D', 'E')`, { tooling: true });
@@ -850,11 +850,11 @@ class Org extends kit_1.AsyncOptionalCreatable {
             catch (err) {
                 const error = err;
                 this.logger.debug('Exception while calling writeSandboxAuthFile %s', err);
-                if ((error === null || error === void 0 ? void 0 : error.name) === 'JWTAuthError' && ((_a = error === null || error === void 0 ? void 0 : error.stack) === null || _a === void 0 ? void 0 : _a.includes("user hasn't approved"))) {
+                if ((error === null || error === void 0 ? void 0 : error.name) === 'JwtAuthError' && ((_a = error === null || error === void 0 ? void 0 : error.stack) === null || _a === void 0 ? void 0 : _a.includes("user hasn't approved"))) {
                     waitingOnAuth = true;
                 }
                 else {
-                    throw sfdxError_1.SfdxError.wrap(error);
+                    throw sfError_1.SfError.wrap(error);
                 }
             }
         }
@@ -946,7 +946,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
             }
             else {
                 // If it fails for any unexpected reason, just pass that through
-                throw sfdxError_1.SfdxError.wrap(error);
+                throw sfError_1.SfError.wrap(error);
             }
         }
     }

package/lib/org/permissionSetAssignment.js

@@ -12,7 +12,7 @@ const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const logger_1 = require("../logger");
 const messages_1 = require("../messages");
-const sfdxError_1 = require("../sfdxError");
+const sfError_1 = require("../sfError");
 messages_1.Messages.importMessagesDirectory(__dirname);
 const messages = messages_1.Messages.load('@salesforce/core', 'permissionSetAssignment', [
     'errorsEncounteredCreatingAssignment',
@@ -86,7 +86,7 @@ class PermissionSetAssignment {
                 errors.forEach((_message) => {
                     message = `${message}${_message}${os_1.EOL}`;
                 });
-                throw new sfdxError_1.SfdxError(message, 'errorsEncounteredCreatingAssignment');
+                throw new sfError_1.SfError(message, 'errorsEncounteredCreatingAssignment');
             }
             else {
                 throw messages.createError('notSuccessfulButNoErrorsReported');

package/lib/org/scratchOrgCreate.js

@@ -12,8 +12,8 @@ const ts_types_1 = require("@salesforce/ts-types");
 const messages_1 = require("../messages");
 const logger_1 = require("../logger");
 const configAggregator_1 = require("../config/configAggregator");
-const sfdxProject_1 = require("../sfdxProject");
-const sfdxError_1 = require("../sfdxError");
+const sfProject_1 = require("../sfProject");
+const sfError_1 = require("../sfError");
 const org_1 = require("./org");
 const scratchOrgInfoApi_1 = require("./scratchOrgInfoApi");
 const scratchOrgSettingsGenerator_1 = require("./scratchOrgSettingsGenerator");
@@ -115,7 +115,7 @@ const scratchOrgCreate = async (options) => {
 exports.scratchOrgCreate = scratchOrgCreate;
 const getSignupTargetLoginUrl = async () => {
     try {
-        const project = await sfdxProject_1.SfdxProject.resolve();
+        const project = await sfProject_1.SfProject.resolve();
         const projectJson = await project.resolveProjectConfig();
         return projectJson.signupTargetLoginUrl;
     }
@@ -136,7 +136,7 @@ const updateRevisionCounterToZero = async (scratchOrg) => {
             scratchOrg.getOrgId(),
             scratchOrg.getUsername(),
         ]);
-        throw new sfdxError_1.SfdxError(message, 'SourceStatusResetFailure');
+        throw new sfError_1.SfError(message, 'SourceStatusResetFailure');
     }
 };
 //# sourceMappingURL=scratchOrgCreate.js.map

package/lib/org/scratchOrgErrorCodes.js

@@ -8,7 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkScratchOrgInfoForErrors = void 0;
 const messages_1 = require("../messages");
-const sfdxError_1 = require("../sfdxError");
+const sfError_1 = require("../sfError");
 const WORKSPACE_CONFIG_FILENAME = 'sfdx-project.json';
 messages_1.Messages.importMessagesDirectory(__dirname);
 const messages = messages_1.Messages.loadMessages('@salesforce/core', 'scratchOrgErrorCodes');
@@ -36,7 +36,7 @@ const optionalErrorCodeMessage = (errorCode, args) => {
 };
 const checkScratchOrgInfoForErrors = (orgInfo, hubUsername, logger) => {
     if (!orgInfo) {
-        throw new sfdxError_1.SfdxError('No scratch org info found.', 'ScratchOrgInfoNotFound');
+        throw new sfError_1.SfError('No scratch org info found.', 'ScratchOrgInfoNotFound');
     }
     if (orgInfo.Status === 'Active') {
         return orgInfo;
@@ -44,19 +44,19 @@ const checkScratchOrgInfoForErrors = (orgInfo, hubUsername, logger) => {
     if (orgInfo.Status === 'Error' && orgInfo.ErrorCode) {
         const message = optionalErrorCodeMessage(orgInfo.ErrorCode, [WORKSPACE_CONFIG_FILENAME]);
         if (message) {
-            throw new sfdxError_1.SfdxError(message, 'RemoteOrgSignupFailed', [
+            throw new sfError_1.SfError(message, 'RemoteOrgSignupFailed', [
                 namedMessages.getMessage('SignupFailedActionError', [orgInfo.ErrorCode]),
             ]);
         }
-        throw new sfdxError_1.SfdxError(namedMessages.getMessage('SignupFailedError', [orgInfo.ErrorCode]));
+        throw new sfError_1.SfError(namedMessages.getMessage('SignupFailedError', [orgInfo.ErrorCode]));
     }
     if (orgInfo.Status === 'Error') {
         // Maybe the request object can help the user somehow
         logger.error('No error code on signup error! Logging request.');
         logger.error(orgInfo);
-        throw new sfdxError_1.SfdxError(namedMessages.getMessage('SignupFailedUnknownError', [orgInfo.Id, hubUsername]), 'signupFailedUnknown');
+        throw new sfError_1.SfError(namedMessages.getMessage('SignupFailedUnknownError', [orgInfo.Id, hubUsername]), 'signupFailedUnknown');
     }
-    throw new sfdxError_1.SfdxError(namedMessages.getMessage('SignupUnexpectedError'), 'UnexpectedSignupStatus');
+    throw new sfError_1.SfError(namedMessages.getMessage('SignupUnexpectedError'), 'UnexpectedSignupStatus');
 };
 exports.checkScratchOrgInfoForErrors = checkScratchOrgInfoForErrors;
 //# sourceMappingURL=scratchOrgErrorCodes.js.map

package/lib/org/scratchOrgInfoApi.js

@@ -13,7 +13,7 @@ const ts_retry_promise_1 = require("ts-retry-promise");
 const logger_1 = require("../logger");
 const mapKeys_1 = require("../util/mapKeys");
 const messages_1 = require("../messages");
-const sfdxError_1 = require("../sfdxError");
+const sfError_1 = require("../sfError");
 const sfdcUrl_1 = require("../util/sfdcUrl");
 const pollingClient_1 = require("../status/pollingClient");
 const myDomainResolver_1 = require("../status/myDomainResolver");
@@ -188,13 +188,13 @@ const checkOrgDoesntExist = async (scratchOrgInfo) => {
             await authInfo_1.AuthInfo.create({ username: username.toLowerCase() });
         }
         catch (error) {
-            const sfdxError = sfdxError_1.SfdxError.wrap(error);
+            const sfError = sfError_1.SfError.wrap(error);
             // if an AuthInfo couldn't be created that means no AuthFile exists.
-            if (sfdxError.name === 'NamedOrgNotFound') {
+            if (sfError.name === 'NamedOrgNotFound') {
                 return;
             }
             // Something unexpected
-            throw sfdxError;
+            throw sfError;
         }
         // An org file already exists
         throw errorCodes.createError('C-1007');
@@ -216,11 +216,11 @@ const requestScratchOrgCreation = async (hubOrg, scratchOrgRequest, settings) =>
     // We do not allow you to specify the old and the new way of doing post create settings
     if (scratchOrgRequest.orgPreferences && settings.hasSettings()) {
         // This is not allowed
-        throw new sfdxError_1.SfdxError('SignupDuplicateSettingsSpecifiedError');
+        throw new sfError_1.SfError('SignupDuplicateSettingsSpecifiedError');
     }
     // deprecated old style orgPreferences
     if (scratchOrgRequest.orgPreferences) {
-        throw new sfdxError_1.SfdxError(messages.getMessage('DeprecatedPrefFormat'));
+        throw new sfError_1.SfError(messages.getMessage('DeprecatedPrefFormat'));
     }
     const scratchOrgInfo = (0, mapKeys_1.default)(scratchOrgRequest, kit_1.upperFirst, true);
     await checkOrgDoesntExist(scratchOrgInfo); // throw if it does exist.
@@ -231,9 +231,9 @@ const requestScratchOrgCreation = async (hubOrg, scratchOrgRequest, settings) =>
         // this is a jsforce error which contains the property "fields" which regular error don't
         const jsForceError = error;
         if (jsForceError.errorCode === 'REQUIRED_FIELD_MISSING') {
-            throw new sfdxError_1.SfdxError(messages.getMessage('SignupFieldsMissingError', [jsForceError.fields.toString()]));
+            throw new sfError_1.SfError(messages.getMessage('SignupFieldsMissingError', [jsForceError.fields.toString()]));
         }
-        throw sfdxError_1.SfdxError.wrap(jsForceError);
+        throw sfError_1.SfError.wrap(jsForceError);
     }
 };
 exports.requestScratchOrgCreation = requestScratchOrgCreation;
@@ -288,9 +288,9 @@ timeout = kit_1.Duration.minutes(15)) => {
     catch (error) {
         const err = error;
         if (err.message) {
-            throw sfdxError_1.SfdxError.wrap(err);
+            throw sfError_1.SfError.wrap(err);
         }
-        throw new sfdxError_1.SfdxError(`The scratch org did not complete within ${timeout.minutes} minutes`, 'orgCreationTimeout', [
+        throw new sfError_1.SfError(`The scratch org did not complete within ${timeout.minutes} minutes`, 'orgCreationTimeout', [
             'Try your force:org:create command again with a longer --wait value',
         ]);
     }
@@ -315,7 +315,7 @@ const deploySettingsAndResolveUrl = async (scratchOrgAuthInfo, apiVersion, orgSe
             await orgSettings.deploySettingsViaFolder(scratchOrg, apiVersion);
         }
         catch (error) {
-            throw sfdxError_1.SfdxError.wrap(error);
+            throw sfError_1.SfError.wrap(error);
         }
     }
     const { instanceUrl } = scratchOrgAuthInfo.getFields();
@@ -331,17 +331,17 @@ const deploySettingsAndResolveUrl = async (scratchOrgAuthInfo, apiVersion, orgSe
             await resolver.resolve();
         }
         catch (error) {
-            const sfdxError = sfdxError_1.SfdxError.wrap(error);
+            const sfError = sfError_1.SfError.wrap(error);
             logger.debug('processScratchOrgInfoResult - err: %s', error);
-            if (sfdxError.name === 'MyDomainResolverTimeoutError') {
-                sfdxError.setData({
+            if (sfError.name === 'MyDomainResolverTimeoutError') {
+                sfError.setData({
                     orgId: scratchOrgAuthInfo.getFields().orgId,
                     username: scratchOrgAuthInfo.getFields().username,
                     instanceUrl,
                 });
-                logger.debug('processScratchOrgInfoResult - err data: %s', sfdxError.data);
+                logger.debug('processScratchOrgInfoResult - err data: %s', sfError.data);
             }
-            throw sfdxError;
+            throw sfError;
         }
         return scratchOrgAuthInfo;
     }

package/lib/org/scratchOrgInfoGenerator.d.ts

@@ -1,4 +1,4 @@
-import { SfdxProjectJson } from '../sfdxProject';
+import { SfProjectJson } from '../sfProject';
 import { Org } from './org';
 import { ScratchOrgInfo } from './scratchOrgInfoApi';
 declare type PartialScratchOrgInfo = Pick<ScratchOrgInfo, 'ConnectedAppConsumerKey' | 'AuthCode' | 'Snapshot' | 'Status' | 'LoginUrl' | 'SignupEmail' | 'SignupUsername' | 'SignupInstance' | 'Username'>;
@@ -14,10 +14,10 @@ export interface ScratchOrgInfoPayload extends PartialScratchOrgInfo {
  * Generates the package2AncestorIds scratch org property
  *
  * @param scratchOrgInfo - the scratchOrgInfo passed in by the user
- * @param projectJson - sfdxProjectJson
+ * @param projectJson - sfProjectJson
  * @param hubOrg - the hub org, in case we need to do queries
  */
-export declare const getAncestorIds: (scratchOrgInfo: ScratchOrgInfoPayload, projectJson: SfdxProjectJson, hubOrg: Org) => Promise<string>;
+export declare const getAncestorIds: (scratchOrgInfo: ScratchOrgInfoPayload, projectJson: SfProjectJson, hubOrg: Org) => Promise<string>;
 /**
  * Takes in a scratchOrgInfo and fills in the missing fields
  *

package/lib/org/scratchOrgInfoGenerator.js

@@ -11,10 +11,10 @@ const fs_1 = require("fs");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const sfdc_1 = require("../util/sfdc");
-const sfdxProject_1 = require("../sfdxProject");
+const sfProject_1 = require("../sfProject");
 const webOAuthServer_1 = require("../webOAuthServer");
 const messages_1 = require("../messages");
-const sfdxError_1 = require("../sfdxError");
+const sfError_1 = require("../sfError");
 const scratchOrgFeatureDeprecation_1 = require("./scratchOrgFeatureDeprecation");
 const defaultConnectedAppInfo = {
     clientId: 'PlatformCLI',
@@ -38,12 +38,12 @@ const SNAPSHOT_UNSUPPORTED_OPTIONS = [
 // executed within the ctor and also after parsing/normalization of the definition file.
 const optionsValidator = (key, scratchOrgInfoPayload) => {
     if (key.toLowerCase() === 'durationdays') {
-        throw new sfdxError_1.SfdxError('unrecognizedScratchOrgOption', 'durationDays');
+        throw new sfError_1.SfError('unrecognizedScratchOrgOption', 'durationDays');
     }
     if (key.toLowerCase() === 'snapshot') {
         const foundInvalidFields = SNAPSHOT_UNSUPPORTED_OPTIONS.filter((invalidField) => invalidField in scratchOrgInfoPayload);
         if (foundInvalidFields.length > 0) {
-            throw new sfdxError_1.SfdxError(messages.getMessage('unsupportedSnapshotOrgCreateOptions', [foundInvalidFields.join(', ')]), 'orgSnapshot');
+            throw new sfError_1.SfError(messages.getMessage('unsupportedSnapshotOrgCreateOptions', [foundInvalidFields.join(', ')]), 'orgSnapshot');
         }
     }
 };
@@ -51,12 +51,12 @@ const optionsValidator = (key, scratchOrgInfoPayload) => {
  * Generates the package2AncestorIds scratch org property
  *
  * @param scratchOrgInfo - the scratchOrgInfo passed in by the user
- * @param projectJson - sfdxProjectJson
+ * @param projectJson - sfProjectJson
  * @param hubOrg - the hub org, in case we need to do queries
  */
 const getAncestorIds = async (scratchOrgInfo, projectJson, hubOrg) => {
     if (Reflect.has(scratchOrgInfo, 'package2AncestorIds')) {
-        throw new sfdxError_1.SfdxError(messages.getMessage('Package2AncestorsIdsKeyNotSupportedError'), 'DeprecationError');
+        throw new sfError_1.SfError(messages.getMessage('Package2AncestorsIdsKeyNotSupportedError'), 'DeprecationError');
     }
     const packagesWithAncestors = (await projectJson.getPackageDirectories())
         // check that the package has any ancestor types (id or version)
@@ -83,7 +83,7 @@ const getAncestorIds = async (scratchOrgInfo, projectJson, hubOrg) => {
                     .singleRecordQuery(`SELECT Id, IsReleased FROM Package2Version WHERE Package2Id = '${packageId}' AND MajorVersion = ${major} AND MinorVersion = ${minor} AND PatchVersion = ${patch} and IsReleased = true`, { tooling: true });
             }
             catch (err) {
-                throw new sfdxError_1.SfdxError(messages.getMessage('NoMatchingAncestorError', [packageDir.ancestorVersion, packageDir.package]), 'NoMatchingAncestorError', [messages.getMessage('AncestorNotReleasedError', [packageDir.ancestorVersion])]);
+                throw new sfError_1.SfError(messages.getMessage('NoMatchingAncestorError', [packageDir.ancestorVersion, packageDir.package]), 'NoMatchingAncestorError', [messages.getMessage('AncestorNotReleasedError', [packageDir.ancestorVersion])]);
             }
             if (packageDir.ancestorId && packageDir.ancestorId !== releasedAncestor.Id) {
                 throw messages.createError('AncestorIdVersionMismatchError', [
@@ -108,7 +108,7 @@ const getAncestorIds = async (scratchOrgInfo, projectJson, hubOrg) => {
         if (packageDir.ancestorId && (packageAliases === null || packageAliases === void 0 ? void 0 : packageAliases[packageDir.ancestorId])) {
             return packageAliases[packageDir.ancestorId];
         }
-        throw new sfdxError_1.SfdxError(`Invalid ancestorId ${packageDir.ancestorId}`, 'InvalidAncestorId');
+        throw new sfError_1.SfError(`Invalid ancestorId ${packageDir.ancestorId}`, 'InvalidAncestorId');
     }));
     return Array.from(new Set(ancestorIds)).join(';');
 };
@@ -123,25 +123,25 @@ exports.getAncestorIds = getAncestorIds;
  */
 const generateScratchOrgInfo = async ({ hubOrg, scratchOrgInfoPayload, nonamespace, ignoreAncestorIds, }) => {
     var _a, _b;
-    let sfdxProject;
+    let sfProject;
     try {
-        sfdxProject = await sfdxProject_1.SfdxProjectJson.create({});
+        sfProject = await sfProject_1.SfProjectJson.create({});
     }
     catch (e) {
         // project is not required
     }
     scratchOrgInfoPayload.orgName = (_a = scratchOrgInfoPayload.orgName) !== null && _a !== void 0 ? _a : 'Company';
     scratchOrgInfoPayload.package2AncestorIds =
-        !ignoreAncestorIds && (sfdxProject === null || sfdxProject === void 0 ? void 0 : sfdxProject.hasPackages())
-            ? await (0, exports.getAncestorIds)(scratchOrgInfoPayload, sfdxProject, hubOrg)
+        !ignoreAncestorIds && (sfProject === null || sfProject === void 0 ? void 0 : sfProject.hasPackages())
+            ? await (0, exports.getAncestorIds)(scratchOrgInfoPayload, sfProject, hubOrg)
             : '';
     // Use the Hub org's client ID value, if one wasn't provided to us, or the default
     if (!scratchOrgInfoPayload.connectedAppConsumerKey) {
         scratchOrgInfoPayload.connectedAppConsumerKey =
             (_b = hubOrg.getConnection().getAuthInfoFields().clientId) !== null && _b !== void 0 ? _b : defaultConnectedAppInfo.clientId;
     }
-    if (!nonamespace && (sfdxProject === null || sfdxProject === void 0 ? void 0 : sfdxProject.get('namespace'))) {
-        scratchOrgInfoPayload.namespace = sfdxProject.get('namespace');
+    if (!nonamespace && (sfProject === null || sfProject === void 0 ? void 0 : sfProject.get('namespace'))) {
+        scratchOrgInfoPayload.namespace = sfProject.get('namespace');
     }
     // we already have the info, and want to get rid of configApi, so this doesn't use that
     scratchOrgInfoPayload.connectedAppCallbackUrl = `http://localhost:${await webOAuthServer_1.WebOAuthServer.determineOauthPort()}/OauthRedirect`;
@@ -181,15 +181,15 @@ const getScratchOrgInfoPayload = async (options) => {
         catch (err) {
             const error = err;
             if (error.name === 'JsonParseError') {
-                throw new sfdxError_1.SfdxError(`An error occurred parsing ${options.definitionfile}`);
+                throw new sfError_1.SfError(`An error occurred parsing ${options.definitionfile}`);
             }
-            throw sfdxError_1.SfdxError.wrap(error);
+            throw sfError_1.SfError.wrap(error);
         }
     }
     // scratchOrgInfoPayload must be heads down camelcase.
     const upperCaseKey = sfdc_1.sfdc.findUpperCaseKeys(scratchOrgInfoPayload);
     if (upperCaseKey) {
-        throw new sfdxError_1.SfdxError('InvalidJsonCasing', upperCaseKey);
+        throw new sfError_1.SfError('InvalidJsonCasing', upperCaseKey);
     }
     // Now run the fully resolved user input against the validator
     Object.keys(scratchOrgInfoPayload).forEach((key) => {

package/lib/org/scratchOrgSettingsGenerator.js

@@ -12,7 +12,7 @@ const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const js2xmlparser = require("js2xmlparser");
 const logger_1 = require("../logger");
-const sfdxError_1 = require("../sfdxError");
+const sfError_1 = require("../sfError");
 const jsonXmlTools_1 = require("../util/jsonXmlTools");
 const zipWriter_1 = require("../util/zipWriter");
 const pollingClient_1 = require("../status/pollingClient");
@@ -107,7 +107,7 @@ class SettingsGenerator {
             const failures = (Array.isArray(componentFailures) ? componentFailures : [componentFailures])
                 .map((failure) => failure.problem)
                 .join('\n');
-            const error = new sfdxError_1.SfdxError(`A scratch org was created with username ${username}, but the settings failed to deploy due to: \n${failures}`, 'ProblemDeployingSettings');
+            const error = new sfError_1.SfError(`A scratch org was created with username ${username}, but the settings failed to deploy due to: \n${failures}`, 'ProblemDeployingSettings');
             error.setData(result);
             throw error;
         }

package/lib/org/user.js

@@ -14,7 +14,7 @@ const http_api_1 = require("jsforce/lib/http-api");
 const logger_1 = require("../logger");
 const messages_1 = require("../messages");
 const secureBuffer_1 = require("../crypto/secureBuffer");
-const sfdxError_1 = require("../sfdxError");
+const sfError_1 = require("../sfError");
 const sfdc_1 = require("../util/sfdc");
 const connection_1 = require("./connection");
 const permissionSetAssignment_1 = require("./permissionSetAssignment");
@@ -185,11 +185,11 @@ class User extends kit_1.AsyncCreatable {
     static generatePasswordUtf8(passwordCondition = { length: 13, complexity: 5 }) {
         if (!PASSWORD_COMPLEXITY[passwordCondition.complexity]) {
             const msg = messages.getMessage('complexityOutOfBound');
-            throw new sfdxError_1.SfdxError(msg, 'complexityOutOfBound');
+            throw new sfError_1.SfError(msg, 'complexityOutOfBound');
         }
         if (passwordCondition.length < 8 || passwordCondition.length > 1000) {
             const msg = messages.getMessage('lengthOutOfBound');
-            throw new sfdxError_1.SfdxError(msg, 'lengthOutOfBound');
+            throw new sfError_1.SfError(msg, 'lengthOutOfBound');
         }
         let password = [];
         ['SYMBOLS', 'NUMBERS', 'UPPER', 'LOWER'].forEach((charSet) => {
@@ -407,7 +407,7 @@ class User extends kit_1.AsyncCreatable {
                 }
             }
             this.logger.debug(message);
-            throw new sfdxError_1.SfdxError(message, 'UserCreateHttpError');
+            throw new sfError_1.SfError(message, 'UserCreateHttpError');
         }
         fields.id = (0, ts_types_1.ensureString)(responseBody.id);
         await this.updateRequiredUserFields(fields);

package/lib/schema/printer.js

@@ -8,7 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SchemaPrinter = exports.SchemaPropertyRenderer = void 0;
 const ts_types_1 = require("@salesforce/ts-types");
-const sfdxError_1 = require("../sfdxError");
+const sfError_1 = require("../sfError");
 /**
  * Renders schema properties.  By default, this is simply an identity transform.  Subclasses may provide more
  * interesting decorations of each values, such as ANSI coloring.
@@ -78,7 +78,7 @@ class SchemaPrinter {
             // No need to add to messages, since this should never happen. In fact,
             // this will cause a test failure if there is a command that uses a schema
             // with no properties defined.
-            throw new sfdxError_1.SfdxError('There is no purpose to print a schema with no properties or items');
+            throw new sfError_1.SfError('There is no purpose to print a schema with no properties or items');
         }
         const startLevel = 0;
         const add = this.addFn(startLevel);

package/lib/schema/validator.d.ts

@@ -27,8 +27,8 @@ export declare class SchemaValidator {
      * Performs validation of JSON data against the schema located at the `schemaPath` value provided
      * at instantiation.
      *
-     * **Throws** *{@link SfdxError}{ name: 'ValidationSchemaFieldError' }* If there are known validations errors.
-     * **Throws** *{@link SfdxError}{ name: 'ValidationSchemaUnknownError' }* If there are unknown validations errors.
+     * **Throws** *{@link SfError}{ name: 'ValidationSchemaFieldError' }* If there are known validations errors.
+     * **Throws** *{@link SfError}{ name: 'ValidationSchemaUnknownError' }* If there are unknown validations errors.
      *
      * @param json A JSON value to validate against this instance's target schema.
      * @returns The validated JSON data.
@@ -38,8 +38,8 @@ export declare class SchemaValidator {
      * Performs validation of JSON data against the schema located at the `schemaPath` value provided
      * at instantiation.
      *
-     * **Throws** *{@link SfdxError}{ name: 'ValidationSchemaFieldError' }* If there are known validations errors.
-     * **Throws** *{@link SfdxError}{ name: 'ValidationSchemaUnknownError' }* If there are unknown validations errors.
+     * **Throws** *{@link SfError}{ name: 'ValidationSchemaFieldError' }* If there are known validations errors.
+     * **Throws** *{@link SfError}{ name: 'ValidationSchemaUnknownError' }* If there are unknown validations errors.
      *
      * @param json A JSON value to validate against this instance's target schema.
      * @returns The validated JSON data.

package/lib/schema/validator.js

@@ -8,11 +8,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SchemaValidator = void 0;
 const path = require("path");
+const fs = require("fs");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const validator = require("jsen");
-const sfdxError_1 = require("../sfdxError");
-const fs_1 = require("../util/fs");
+const sfError_1 = require("../sfError");
 /**
  * Loads a JSON schema and performs validations against JSON objects.
  */
@@ -33,7 +33,7 @@ class SchemaValidator {
      */
     async load() {
         if (!this.schema) {
-            this.schema = await fs_1.fs.readJsonMap(this.schemaPath);
+            this.schema = (0, kit_1.parseJsonMap)(await fs.promises.readFile(this.schemaPath, 'utf8'));
             this.logger.debug(`Schema loaded for ${this.schemaPath}`);
         }
         return this.schema;
@@ -43,7 +43,7 @@ class SchemaValidator {
      */
     loadSync() {
         if (!this.schema) {
-            this.schema = fs_1.fs.readJsonMapSync(this.schemaPath);
+            this.schema = (0, kit_1.parseJsonMap)(fs.readFileSync(this.schemaPath, 'utf8'));
             this.logger.debug(`Schema loaded for ${this.schemaPath}`);
         }
         return this.schema;
@@ -52,8 +52,8 @@ class SchemaValidator {
      * Performs validation of JSON data against the schema located at the `schemaPath` value provided
      * at instantiation.
      *
-     * **Throws** *{@link SfdxError}{ name: 'ValidationSchemaFieldError' }* If there are known validations errors.
-     * **Throws** *{@link SfdxError}{ name: 'ValidationSchemaUnknownError' }* If there are unknown validations errors.
+     * **Throws** *{@link SfError}{ name: 'ValidationSchemaFieldError' }* If there are known validations errors.
+     * **Throws** *{@link SfError}{ name: 'ValidationSchemaUnknownError' }* If there are unknown validations errors.
      *
      * @param json A JSON value to validate against this instance's target schema.
      * @returns The validated JSON data.
@@ -66,8 +66,8 @@ class SchemaValidator {
      * Performs validation of JSON data against the schema located at the `schemaPath` value provided
      * at instantiation.
      *
-     * **Throws** *{@link SfdxError}{ name: 'ValidationSchemaFieldError' }* If there are known validations errors.
-     * **Throws** *{@link SfdxError}{ name: 'ValidationSchemaUnknownError' }* If there are unknown validations errors.
+     * **Throws** *{@link SfError}{ name: 'ValidationSchemaFieldError' }* If there are known validations errors.
+     * **Throws** *{@link SfError}{ name: 'ValidationSchemaUnknownError' }* If there are unknown validations errors.
      *
      * @param json A JSON value to validate against this instance's target schema.
      * @returns The validated JSON data.
@@ -85,10 +85,10 @@ class SchemaValidator {
         if (!validate(json)) {
             if (validate.errors) {
                 const errors = this.getErrorsText(validate.errors, schema);
-                throw new sfdxError_1.SfdxError(`Validation errors:\n${errors}`, 'ValidationSchemaFieldError');
+                throw new sfError_1.SfError(`Validation errors:\n${errors}`, 'ValidationSchemaFieldError');
             }
             else {
-                throw new sfdxError_1.SfdxError('Unknown schema validation error', 'ValidationSchemaUnknownError');
+                throw new sfError_1.SfError('Unknown schema validation error', 'ValidationSchemaUnknownError');
             }
         }
         return validate.build(json);
@@ -112,7 +112,7 @@ class SchemaValidator {
                 externalSchemas[externalSchema.id] = externalSchema;
             }
             else {
-                throw new sfdxError_1.SfdxError(`Unexpected external schema id type: ${typeof externalSchema.id}`, 'ValidationSchemaTypeError');
+                throw new sfError_1.SfError(`Unexpected external schema id type: ${typeof externalSchema.id}`, 'ValidationSchemaTypeError');
             }
         });
         return externalSchemas;
@@ -125,11 +125,11 @@ class SchemaValidator {
     loadExternalSchema(uri) {
         const schemaPath = path.join(this.schemasDir, `${uri}.json`);
         try {
-            return fs_1.fs.readJsonMapSync(schemaPath);
+            return (0, kit_1.parseJsonMap)(fs.readFileSync(schemaPath, 'utf8'));
         }
         catch (err) {
             if (err.code === 'ENOENT') {
-                throw new sfdxError_1.SfdxError(`Schema not found: ${schemaPath}`, 'ValidationSchemaNotFound');
+                throw new sfError_1.SfError(`Schema not found: ${schemaPath}`, 'ValidationSchemaNotFound');
             }
             throw err;
         }