@salesforce/core 3.23.8 → 3.24.1

package/lib/org/org.js

@@ -90,7 +90,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
     constructor(options) {
         super(options);
         this.status = Org.Status.UNKNOWN;
-        this.options = options !== null && options !== void 0 ? options : {};
+        this.options = options ?? {};
     }
     /**
      * create a sandbox from a production org
@@ -151,7 +151,6 @@ class Org extends kit_1.AsyncOptionalCreatable {
         async: false,
         interval: kit_1.Duration.seconds(30),
     }) {
-        var _a;
         this.logger.debug(`ResumeSandbox called with ResumeSandboxRequest: ${resumeSandboxRequest}`);
         let sandboxCreationProgress;
         // seed the sandboxCreationProgress via the resumeSandboxRequest options
@@ -163,7 +162,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
         }
         else {
             throw messages.createError('sandboxNotFound', [
-                (_a = resumeSandboxRequest.SandboxName) !== null && _a !== void 0 ? _a : resumeSandboxRequest.SandboxProcessObjId,
+                resumeSandboxRequest.SandboxName ?? resumeSandboxRequest.SandboxProcessObjId,
             ]);
         }
         this.logger.debug(`Return from calling singleRecordQuery with tooling: ${sandboxCreationProgress}`);
@@ -529,11 +528,10 @@ class Org extends kit_1.AsyncOptionalCreatable {
      * Reads and returns the content of all user auth files for this org as an array.
      */
     async readUserAuthFiles() {
-        var _a;
         const config = await this.retrieveOrgUsersConfig();
         const contents = await config.read();
         const thisUsername = (0, ts_types_1.ensure)(this.getUsername());
-        const usernames = (0, ts_types_1.ensureJsonArray)((_a = contents.usernames) !== null && _a !== void 0 ? _a : [thisUsername]);
+        const usernames = (0, ts_types_1.ensureJsonArray)(contents.usernames ?? [thisUsername]);
         return Promise.all(usernames.map((username) => {
             if (username === thisUsername) {
                 return authInfo_1.AuthInfo.create({
@@ -563,7 +561,6 @@ class Org extends kit_1.AsyncOptionalCreatable {
      * @param {AuthInfo | string} auth The AuthInfo for the username to add.
      */
     async addUsername(auth) {
-        var _a;
         if (!auth) {
             throw new sfError_1.SfError('Missing auth info', 'MissingAuthInfo');
         }
@@ -573,7 +570,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
         const contents = await orgConfig.read();
         // TODO: This is kind of screwy because contents values can be `AnyJson | object`...
         // needs config refactoring to improve
-        const usernames = (_a = contents.usernames) !== null && _a !== void 0 ? _a : [];
+        const usernames = contents.usernames ?? [];
         if (!(0, ts_types_1.isArray)(usernames)) {
             throw new sfError_1.SfError('Usernames is not an array', 'UnexpectedDataFormat');
         }
@@ -602,7 +599,6 @@ class Org extends kit_1.AsyncOptionalCreatable {
      * @param {AuthInfo | string} auth The AuthInfo containing the username to remove.
      */
     async removeUsername(auth) {
-        var _a;
         if (!auth) {
             throw new sfError_1.SfError('Missing auth info', 'MissingAuthInfoError');
         }
@@ -611,7 +607,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
         const orgConfig = await this.retrieveOrgUsersConfig();
         const contents = await orgConfig.read();
         const targetUser = authInfo.getFields().username;
-        const usernames = ((_a = contents.usernames) !== null && _a !== void 0 ? _a : []);
+        const usernames = (contents.usernames ?? []);
         contents.usernames = usernames.filter((username) => username !== targetUser);
         await orgConfig.write();
         return this;
@@ -652,8 +648,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
      * Returns the orgId for this org.
      */
     getOrgId() {
-        var _a;
-        return (_a = this.orgId) !== null && _a !== void 0 ? _a : this.getField(Org.Fields.ORG_ID);
+        return this.orgId ?? this.getField(Org.Fields.ORG_ID);
     }
     /**
      * Returns for the config aggregator.
@@ -807,13 +802,12 @@ class Org extends kit_1.AsyncOptionalCreatable {
      * @returns {SandboxProcessObject} The SandboxProcessObject for the sandbox
      */
     async queryLatestSandboxProcessBySandboxName(sandboxNameIn) {
-        var _a;
         const { tooling } = this.getConnection();
         this.logger.debug('QueryLatestSandboxProcessBySandboxName called with SandboxName: %s ', sandboxNameIn);
         const queryStr = `SELECT Id, Status, SandboxName, SandboxInfoId, LicenseType, CreatedDate, CopyProgress, SandboxOrganization, SourceId, Description, EndDate FROM SandboxProcess WHERE SandboxName='${sandboxNameIn}' AND Status != 'D' ORDER BY CreatedDate DESC LIMIT 1`;
         const queryResult = await tooling.query(queryStr);
         this.logger.debug('Return from calling queryToolingApi: %s ', queryResult);
-        if (((_a = queryResult === null || queryResult === void 0 ? void 0 : queryResult.records) === null || _a === void 0 ? void 0 : _a.length) === 1) {
+        if (queryResult?.records?.length === 1) {
             return queryResult.records[0];
         }
         else if (queryResult.records && queryResult.records.length > 1) {
@@ -839,18 +833,17 @@ class Org extends kit_1.AsyncOptionalCreatable {
      * @private
      */
     async deleteSandbox(prodOrg) {
-        var _a, _b;
         const sandbox = await this.getSandboxConfig(this.getOrgId());
-        prodOrg !== null && prodOrg !== void 0 ? prodOrg : (prodOrg = await Org.create({
+        prodOrg ?? (prodOrg = await Org.create({
             aggregator: this.configAggregator,
-            aliasOrUsername: sandbox === null || sandbox === void 0 ? void 0 : sandbox.prodOrgUsername,
+            aliasOrUsername: sandbox?.prodOrgUsername,
         }));
-        let sandboxInfoId = sandbox === null || sandbox === void 0 ? void 0 : sandbox.sandboxInfoId;
+        let sandboxInfoId = sandbox?.sandboxInfoId;
         if (!sandboxInfoId) {
             let result;
             try {
                 // grab sandboxName from config or try to calculate from the sandbox username
-                const sandboxName = (_a = sandbox === null || sandbox === void 0 ? void 0 : sandbox.sandboxName) !== null && _a !== void 0 ? _a : ((_b = this.getUsername()) !== null && _b !== void 0 ? _b : '').split(`${prodOrg.getUsername()}.`)[1];
+                const sandboxName = sandbox?.sandboxName ?? (this.getUsername() ?? '').split(`${prodOrg.getUsername()}.`)[1];
                 if (!sandboxName) {
                     this.logger.debug('Sandbox name is not available');
                     // jump to query by orgId
@@ -896,7 +889,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
      */
     async deleteScratchOrg(devHub) {
         // if we didn't get a devHub, we'll get it from the this org
-        devHub !== null && devHub !== void 0 ? devHub : (devHub = await this.getDevHubOrg());
+        devHub ?? (devHub = await this.getDevHubOrg());
         if (!devHub) {
             throw messages.createError('noDevHubFound');
         }
@@ -980,8 +973,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
         await Promise.all(authInfos
             .map((auth) => auth.getFields().username)
             .map(async (username) => {
-            var _a;
-            const aliasKeys = (_a = (username && stateAggregator.aliases.getAll(username))) !== null && _a !== void 0 ? _a : [];
+            const aliasKeys = (username && stateAggregator.aliases.getAll(username)) ?? [];
             stateAggregator.aliases.unsetAll(username);
             const orgForUser = username === this.getUsername()
                 ? this
@@ -1063,7 +1055,6 @@ class Org extends kit_1.AsyncOptionalCreatable {
         let waitingOnAuth = false;
         const pollingClient = await pollingClient_1.PollingClient.create({
             poll: async () => {
-                var _a;
                 const sandboxProcessObj = await this.querySandboxProcessBySandboxInfoId(options.sandboxProcessObj.SandboxInfoId);
                 // check to see if sandbox can authenticate via sandboxAuth endpoint
                 const sandboxInfo = await this.sandboxSignupComplete(sandboxProcessObj);
@@ -1077,7 +1068,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
                     catch (err) {
                         const error = err;
                         this.logger.debug('Exception while calling writeSandboxAuthFile', 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?.name === 'JwtAuthError' && error?.stack?.includes("user hasn't approved")) {
                             waitingOnAuth = true;
                         }
                         else {
@@ -1148,8 +1139,8 @@ class Org extends kit_1.AsyncOptionalCreatable {
             const error = err;
             // There are cases where the endDate is set before the sandbox has actually completed.
             // In that case, the sandboxAuth call will throw a specific exception.
-            if ((error === null || error === void 0 ? void 0 : error.name) === 'INVALID_STATUS') {
-                this.logger.debug('Error while authenticating the user', error === null || error === void 0 ? void 0 : error.toString());
+            if (error?.name === 'INVALID_STATUS') {
+                this.logger.debug('Error while authenticating the user', error?.toString());
             }
             else {
                 // If it fails for any unexpected reason, just pass that through
@@ -1158,9 +1149,8 @@ class Org extends kit_1.AsyncOptionalCreatable {
         }
     }
     validateWaitOptions(options) {
-        var _a, _b;
-        const wait = (_a = options.wait) !== null && _a !== void 0 ? _a : kit_1.Duration.minutes(30);
-        const interval = (_b = options.interval) !== null && _b !== void 0 ? _b : kit_1.Duration.seconds(30);
+        const wait = options.wait ?? kit_1.Duration.minutes(30);
+        const interval = options.interval ?? kit_1.Duration.seconds(30);
         let pollInterval = options.async ? kit_1.Duration.seconds(0) : interval;
         // pollInterval cannot be > wait.
         pollInterval = pollInterval.seconds > wait.seconds ? wait : pollInterval;

package/lib/org/permissionSetAssignment.js

@@ -49,7 +49,6 @@ class PermissionSetAssignment {
      * @param permSetString An array of permission set names.
      */
     async create(id, permSetString) {
-        var _a;
         if (!id) {
             throw messages.createError('userIdRequired');
         }
@@ -62,7 +61,7 @@ class PermissionSetAssignment {
             query += ` AND NamespacePrefix='${nsPrefix}'`;
         }
         const result = await this.org.getConnection().query(query);
-        const permissionSetId = (_a = result === null || result === void 0 ? void 0 : result.records[0]) === null || _a === void 0 ? void 0 : _a.Id;
+        const permissionSetId = result?.records[0]?.Id;
         if (!permissionSetId) {
             if (nsPrefix) {
                 throw messages.createError('assignCommandPermissionSetNotFoundForNSError', [permSetName, nsPrefix]);

package/lib/org/scratchOrgCreate.d.ts

@@ -47,7 +47,7 @@ export interface ScratchOrgCreateOptions {
     alias?: string;
     /** after complete, set the org as the default */
     setDefault?: boolean;
-    /** do not use source tracking for this org */
+    /** if false, do not use source tracking for this scratch org */
     tracksSource?: boolean;
 }
 export declare const scratchOrgResume: (jobId: string) => Promise<ScratchOrgCreateResult>;

package/lib/org/scratchOrgCreate.js

@@ -27,13 +27,8 @@ const messages = messages_1.Messages.load('@salesforce/core', 'scratchOrgCreate'
     'DurationDaysValidationMaxError',
     'DurationDaysValidationMinError',
     'RetryNotIntError',
-    'WaitValidationMaxError',
     'DurationDaysNotIntError',
-    'NoScratchOrgInfoError',
-    'ScratchOrgDeletedError',
-    'StillInProgressError',
     'CacheMissError',
-    'action.StillInProgress',
 ]);
 exports.DEFAULT_STREAM_TIMEOUT_MINUTES = 6;
 const validateDuration = (durationDays) => {
@@ -56,7 +51,6 @@ const validateRetry = (retry) => {
     }
 };
 const scratchOrgResume = async (jobId) => {
-    var _a, _b, _c;
     const [logger, cache] = await Promise.all([
         logger_1.Logger.child('scratchOrgResume'),
         scratchOrgCache_1.ScratchOrgCache.create(),
@@ -72,7 +66,7 @@ const scratchOrgResume = async (jobId) => {
     await (0, scratchOrgErrorCodes_1.validateScratchOrgInfoForResume)({ jobId, scratchOrgInfo: soi, cache, hubUsername });
     // At this point, the scratch org is "good".
     // Some hubs have all the usernames set to `null`
-    const username = (_a = soi.Username) !== null && _a !== void 0 ? _a : soi.SignupUsername;
+    const username = soi.Username ?? soi.SignupUsername;
     // re-auth only if the org isn't in StateAggregator
     const stateAggregator = await stateAggregator_1.StateAggregator.getInstance();
     const scratchOrgAuthInfo = (await stateAggregator.orgs.exists(username))
@@ -90,15 +84,17 @@ const scratchOrgResume = async (jobId) => {
     settingsGenerator.extract({ ...soi, ...definitionjson });
     const [authInfo] = await Promise.all([
         (0, scratchOrgInfoApi_1.resolveUrl)(scratchOrgAuthInfo),
-        (0, scratchOrgInfoApi_1.deploySettings)(scratchOrg, settingsGenerator, (_b = apiVersion !== null && apiVersion !== void 0 ? apiVersion : new configAggregator_1.ConfigAggregator().getPropertyValue('apiVersion')) !== null && _b !== void 0 ? _b : (await scratchOrg.retrieveMaxApiVersion())),
+        (0, scratchOrgInfoApi_1.deploySettings)(scratchOrg, settingsGenerator, apiVersion ??
+            new configAggregator_1.ConfigAggregator().getPropertyValue('apiVersion') ??
+            (await scratchOrg.retrieveMaxApiVersion())),
     ]);
     await scratchOrgAuthInfo.handleAliasAndDefaultSettings({
         alias,
-        setDefault: setDefault !== null && setDefault !== void 0 ? setDefault : false,
+        setDefault: setDefault ?? false,
         setDefaultDevHub: false,
-        setTracksSource: tracksSource !== null && tracksSource !== void 0 ? tracksSource : true,
+        setTracksSource: tracksSource ?? true,
     });
-    cache.unset((_c = soi.Id) !== null && _c !== void 0 ? _c : jobId);
+    cache.unset(soi.Id ?? jobId);
     const authFields = authInfo.getFields();
     await Promise.all([(0, scratchOrgLifecycleEvents_1.emit)({ stage: 'done', scratchOrgInfo: soi }), cache.write(), (0, scratchOrgLifecycleEvents_1.emitPostOrgCreate)(authFields)]);
     return {
@@ -111,7 +107,6 @@ const scratchOrgResume = async (jobId) => {
 };
 exports.scratchOrgResume = scratchOrgResume;
 const scratchOrgCreate = async (options) => {
-    var _a, _b, _c;
     const logger = await logger_1.Logger.child('scratchOrgCreate');
     logger.debug('scratchOrgCreate');
     await (0, scratchOrgLifecycleEvents_1.emit)({ stage: 'prepare request' });
@@ -146,7 +141,7 @@ const scratchOrgCreate = async (options) => {
     const cache = await scratchOrgCache_1.ScratchOrgCache.create();
     cache.set(scratchOrgInfoId, {
         hubUsername: hubOrg.getUsername(),
-        hubBaseUrl: (_a = hubOrg.getField(org_1.Org.Fields.INSTANCE_URL)) === null || _a === void 0 ? void 0 : _a.toString(),
+        hubBaseUrl: hubOrg.getField(org_1.Org.Fields.INSTANCE_URL)?.toString(),
         definitionjson: { ...(definitionjson ? JSON.parse(definitionjson) : {}), ...orgConfig, ...settings },
         clientSecret,
         alias,
@@ -174,14 +169,16 @@ const scratchOrgCreate = async (options) => {
     });
     // we'll need this scratch org connection later;
     const scratchOrg = await org_1.Org.create({
-        aliasOrUsername: (_b = soi.Username) !== null && _b !== void 0 ? _b : soi.SignupUsername,
+        aliasOrUsername: soi.Username ?? soi.SignupUsername,
     });
     const username = scratchOrg.getUsername();
     logger.debug(`scratch org username ${username}`);
     await (0, scratchOrgLifecycleEvents_1.emit)({ stage: 'deploy settings', scratchOrgInfo: soi });
     const [authInfo] = await Promise.all([
         (0, scratchOrgInfoApi_1.resolveUrl)(scratchOrgAuthInfo),
-        (0, scratchOrgInfoApi_1.deploySettings)(scratchOrg, settingsGenerator, (_c = apiversion !== null && apiversion !== void 0 ? apiversion : new configAggregator_1.ConfigAggregator().getPropertyValue('org-api-version')) !== null && _c !== void 0 ? _c : (await scratchOrg.retrieveMaxApiVersion())),
+        (0, scratchOrgInfoApi_1.deploySettings)(scratchOrg, settingsGenerator, apiversion ??
+            new configAggregator_1.ConfigAggregator().getPropertyValue('org-api-version') ??
+            (await scratchOrg.retrieveMaxApiVersion())),
     ]);
     await scratchOrgAuthInfo.handleAliasAndDefaultSettings({
         ...{
@@ -198,7 +195,7 @@ const scratchOrgCreate = async (options) => {
         username,
         scratchOrgInfo: soi,
         authInfo,
-        authFields: authInfo === null || authInfo === void 0 ? void 0 : authInfo.getFields(),
+        authFields: authInfo?.getFields(),
         warnings,
     };
 };

package/lib/org/scratchOrgErrorCodes.js

@@ -20,6 +20,10 @@ const namedMessages = messages_1.Messages.load('@salesforce/core', 'scratchOrgEr
     'SignupFailedUnknownError',
     'SignupFailedError',
     'SignupUnexpectedError',
+    'StillInProgressError',
+    'action.StillInProgress',
+    'ScratchOrgDeletedError',
+    'NoScratchOrgInfoError',
 ]);
 // getMessage will throw when the code isn't found
 // and we don't know whether a given code takes arguments or not
@@ -43,12 +47,12 @@ const validateScratchOrgInfoForResume = async ({ jobId, scratchOrgInfo, cache, h
         cache.unset(jobId);
         await cache.write();
         throw scratchOrgInfo.Status === 'Deleted'
-            ? messages.createError('ScratchOrgDeletedError')
-            : messages.createError('NoScratchOrgInfoError');
+            ? namedMessages.createError('ScratchOrgDeletedError')
+            : namedMessages.createError('NoScratchOrgInfoError');
     }
     if (['New', 'Creating'].includes(scratchOrgInfo.Status)) {
         // 2. scratchOrgInfo exists, still isn't finished.  Stays in cache for future attempts
-        throw messages.createError('StillInProgressError', [scratchOrgInfo.Status], ['action.StillInProgress']);
+        throw namedMessages.createError('StillInProgressError', [scratchOrgInfo.Status], ['action.StillInProgress']);
     }
     return (0, exports.checkScratchOrgInfoForErrors)(scratchOrgInfo, hubUsername);
 };

package/lib/org/scratchOrgInfoApi.js

@@ -46,7 +46,7 @@ const getOrgInstanceAuthority = function (scratchOrgInfoComplete, hubOrgLoginUrl
         // For Falcon sandboxes, try the LoginURL instead; createdOrgInstance will not yield a valid URL
         altUrl = scratchOrgInfoComplete.LoginUrl;
     }
-    return signupTargetLoginUrlConfig !== null && signupTargetLoginUrlConfig !== void 0 ? signupTargetLoginUrlConfig : altUrl;
+    return signupTargetLoginUrlConfig ?? altUrl;
 };
 /**
  * Returns OAuth2Options object
@@ -63,7 +63,7 @@ const buildOAuth2Options = async (options) => {
     logger.debug(`isJwtFlow: ${isJwtFlow}`);
     if (isJwtFlow && !process.env.SFDX_CLIENT_SECRET) {
         oauth2Options.privateKeyFile = options.hubOrg.getConnection().getAuthInfoFields().privateKey;
-        const retries = (options === null || options === void 0 ? void 0 : options.retry) || kit_1.env.getNumber('SFDX_JWT_AUTH_RETRY_ATTEMPTS') || 0;
+        const retries = options?.retry || kit_1.env.getNumber('SFDX_JWT_AUTH_RETRY_ATTEMPTS') || 0;
         const timeoutInSeconds = kit_1.env.getNumber('SFDX_JWT_AUTH_RETRY_TIMEOUT') || 300;
         const timeout = kit_1.Duration.seconds(timeoutInSeconds).milliseconds;
         const delay = retries ? timeout / retries : 1000;
@@ -153,7 +153,6 @@ exports.queryScratchOrgInfo = queryScratchOrgInfo;
  * @returns {Promise<AuthInfo>}
  */
 const authorizeScratchOrg = async (options) => {
-    var _a;
     const { scratchOrgInfoComplete, hubOrg, clientSecret, signupTargetLoginUrlConfig, retry } = options;
     await (0, scratchOrgLifecycleEvents_1.emit)({ stage: 'authenticate', scratchOrgInfo: scratchOrgInfoComplete });
     const logger = await logger_1.Logger.child('authorizeScratchOrg');
@@ -179,7 +178,7 @@ const authorizeScratchOrg = async (options) => {
     });
     await authInfo.save({
         devHubUsername: hubOrg.getUsername(),
-        created: new Date((_a = scratchOrgInfoComplete.CreatedDate) !== null && _a !== void 0 ? _a : new Date()).valueOf().toString(),
+        created: new Date(scratchOrgInfoComplete.CreatedDate ?? new Date()).valueOf().toString(),
         expirationDate: scratchOrgInfoComplete.ExpirationDate,
         clientId: scratchOrgInfoComplete.ConnectedAppConsumerKey,
         createdOrgInstance: scratchOrgInfoComplete.SignupInstance,

package/lib/org/scratchOrgInfoGenerator.js

@@ -65,7 +65,6 @@ const getAncestorIds = async (scratchOrgInfo, projectJson, hubOrg) => {
         return '';
     }
     const ancestorIds = await Promise.all(packagesWithAncestors.map(async (packageDir) => {
-        var _a, _b, _c;
         // ancestorID can be 05i, or 04t, alias; OR "ancestorVersion": "4.6.0.1"
         // according to docs, 05i is not ok: https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev2gp_config_file.htm
         if (packageDir.ancestorVersion) {
@@ -74,7 +73,7 @@ const getAncestorIds = async (scratchOrgInfo, projectJson, hubOrg) => {
             }
             // package can be an ID, but not according to docs
             const packageAliases = projectJson.get('packageAliases');
-            const packageId = (_a = packageAliases[(0, ts_types_1.ensureString)(packageDir.package)]) !== null && _a !== void 0 ? _a : packageDir.package;
+            const packageId = packageAliases[(0, ts_types_1.ensureString)(packageDir.package)] ?? packageDir.package;
             const [major, minor, patch] = packageDir.ancestorVersion.split('.');
             let releasedAncestor;
             try {
@@ -93,11 +92,11 @@ const getAncestorIds = async (scratchOrgInfo, projectJson, hubOrg) => {
             }
             return releasedAncestor.Id;
         }
-        if ((_b = packageDir === null || packageDir === void 0 ? void 0 : packageDir.ancestorId) === null || _b === void 0 ? void 0 : _b.startsWith('05i')) {
+        if (packageDir?.ancestorId?.startsWith('05i')) {
             // if it's already a 05i return it, otherwise query for it
             return packageDir.ancestorId;
         }
-        if ((_c = packageDir === null || packageDir === void 0 ? void 0 : packageDir.ancestorId) === null || _c === void 0 ? void 0 : _c.startsWith('04t')) {
+        if (packageDir?.ancestorId?.startsWith('04t')) {
             // query for the Id
             return (await hubOrg
                 .getConnection()
@@ -105,7 +104,7 @@ const getAncestorIds = async (scratchOrgInfo, projectJson, hubOrg) => {
         }
         // ancestorID can be an alias get it from projectJson
         const packageAliases = projectJson.get('packageAliases');
-        if (packageDir.ancestorId && (packageAliases === null || packageAliases === void 0 ? void 0 : packageAliases[packageDir.ancestorId])) {
+        if (packageDir.ancestorId && packageAliases?.[packageDir.ancestorId]) {
             return packageAliases[packageDir.ancestorId];
         }
         throw new sfError_1.SfError(`Invalid ancestorId ${packageDir.ancestorId}`, 'InvalidAncestorId');
@@ -122,7 +121,6 @@ exports.getAncestorIds = getAncestorIds;
  * @param ignoreAncestorIds true if the sfdx-project.json ancestorId keys should be ignored
  */
 const generateScratchOrgInfo = async ({ hubOrg, scratchOrgInfoPayload, nonamespace, ignoreAncestorIds, }) => {
-    var _a, _b;
     let sfProject;
     try {
         sfProject = await sfProject_1.SfProjectJson.create({});
@@ -130,17 +128,17 @@ const generateScratchOrgInfo = async ({ hubOrg, scratchOrgInfoPayload, nonamespa
     catch (e) {
         // project is not required
     }
-    scratchOrgInfoPayload.orgName = (_a = scratchOrgInfoPayload.orgName) !== null && _a !== void 0 ? _a : 'Company';
+    scratchOrgInfoPayload.orgName = scratchOrgInfoPayload.orgName ?? 'Company';
     scratchOrgInfoPayload.package2AncestorIds =
-        !ignoreAncestorIds && (sfProject === null || sfProject === void 0 ? void 0 : sfProject.hasPackages())
+        !ignoreAncestorIds && 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;
+            hubOrg.getConnection().getAuthInfoFields().clientId ?? defaultConnectedAppInfo.clientId;
     }
-    if (!nonamespace && (sfProject === null || sfProject === void 0 ? void 0 : sfProject.get('namespace'))) {
+    if (!nonamespace && 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
@@ -164,11 +162,10 @@ exports.generateScratchOrgInfo = generateScratchOrgInfo;
  warnings: string[];
  */
 const getScratchOrgInfoPayload = async (options) => {
-    var _a;
     let warnings = [];
     // orgConfig input overrides definitionjson (-j option; hidden/deprecated)
     const definitionJson = options.definitionjson ? JSON.parse(options.definitionjson) : {};
-    const orgConfigInput = { ...definitionJson, ...((_a = options.orgConfig) !== null && _a !== void 0 ? _a : {}) };
+    const orgConfigInput = { ...definitionJson, ...(options.orgConfig ?? {}) };
     let scratchOrgInfoPayload = orgConfigInput;
     // the -f option
     if (options.definitionfile) {

package/lib/org/scratchOrgSettingsGenerator.js

@@ -141,11 +141,11 @@ class SettingsGenerator {
         this.allBusinessProcesses = [];
         this.logger = logger_1.Logger.childFromRoot('SettingsGenerator');
         // If SFDX_MDAPI_TEMP_DIR is set, copy settings to that dir for people to inspect.
-        const mdApiTmpDir = (options === null || options === void 0 ? void 0 : options.mdApiTmpDir) || kit_1.env.getString('SFDX_MDAPI_TEMP_DIR');
-        this.shapeDirName = (options === null || options === void 0 ? void 0 : options.shapeDirName) || `shape_${Date.now()}`;
+        const mdApiTmpDir = options?.mdApiTmpDir || kit_1.env.getString('SFDX_MDAPI_TEMP_DIR');
+        this.shapeDirName = options?.shapeDirName || `shape_${Date.now()}`;
         this.packageFilePath = path.join(this.shapeDirName, 'package.xml');
         let storePath;
-        if (!(options === null || options === void 0 ? void 0 : options.asDirectory)) {
+        if (!options?.asDirectory) {
             storePath = mdApiTmpDir ? path.join(mdApiTmpDir, `${this.shapeDirName}.zip`) : undefined;
             this.writer = new zipWriter_1.ZipWriter(storePath);
         }

package/lib/org/user.js

@@ -225,10 +225,10 @@ class User extends kit_1.AsyncCreatable {
         this.logger.debug(`Attempting to set password for userId: ${info.getFields().userId} username: ${info.getFields().username}`);
         const userConnection = await connection_1.Connection.create({ authInfo: info });
         return new Promise((resolve, reject) => {
+            // no promises in async method
             // eslint-disable-next-line @typescript-eslint/no-misused-promises
             password.value(async (buffer) => {
                 try {
-                    // @ts-ignore TODO: expose `soap` on Connection however appropriate
                     const soap = userConnection.soap;
                     await soap.setPassword((0, ts_types_1.ensureString)(info.getFields().userId), buffer.toString('utf8'));
                     this.logger.debug(`Set password for userId: ${info.getFields().userId}`);
@@ -293,7 +293,6 @@ class User extends kit_1.AsyncCreatable {
      * ```
      */
     async createUser(fields) {
-        var _a;
         // Create a user and get a refresh token
         const refreshTokenSecret = await this.createUserInternal(fields);
         // Create the initial auth info
@@ -302,7 +301,7 @@ class User extends kit_1.AsyncCreatable {
         // Setup oauth options for the new user
         const oauthOptions = {
             // Communities users require the instance for auth
-            loginUrl: (_a = adminUserAuthFields.instanceUrl) !== null && _a !== void 0 ? _a : adminUserAuthFields.loginUrl,
+            loginUrl: adminUserAuthFields.instanceUrl ?? adminUserAuthFields.loginUrl,
             refreshToken: refreshTokenSecret.buffer.value((buffer) => buffer.toString('utf8')),
             clientId: adminUserAuthFields.clientId,
             clientSecret: adminUserAuthFields.clientSecret,

package/lib/sfProject.js

@@ -525,7 +525,6 @@ class SfProject {
      * properties, including some 3rd party custom properties.
      */
     async resolveProjectConfig() {
-        var _a;
         if (!this.projectConfig) {
             // Do fs operations in parallel
             const [global, local, configAggregator] = await Promise.all([
@@ -539,7 +538,7 @@ class SfProject {
             Object.assign(this.projectConfig, configAggregator.getConfig());
             // we don't have a login url yet, so use instanceUrl from config or default
             if (!this.projectConfig.sfdcLoginUrl) {
-                this.projectConfig.sfdcLoginUrl = (_a = configAggregator.getConfig()['org-instance-url']) !== null && _a !== void 0 ? _a : sfdcUrl_1.SfdcUrl.PRODUCTION;
+                this.projectConfig.sfdcLoginUrl = configAggregator.getConfig()['org-instance-url'] ?? sfdcUrl_1.SfdcUrl.PRODUCTION;
             }
             // LEGACY - Allow override of sfdcLoginUrl via env var FORCE_SFDC_LOGIN_URL
             if (process.env.FORCE_SFDC_LOGIN_URL) {

package/lib/stateAggregator/accessors/aliasAccessor.js

@@ -36,8 +36,7 @@ class GlobalInfoAliasAccessor {
      * @param entity the aliasable entity that you want to get the alias of
      */
     get(entity) {
-        var _a;
-        return (_a = this.getAll(entity).find((alias) => alias)) !== null && _a !== void 0 ? _a : null;
+        return this.getAll(entity).find((alias) => alias) ?? null;
     }
     /**
      * Returns the value that corresponds to the given alias if it exists
@@ -45,8 +44,7 @@ class GlobalInfoAliasAccessor {
      * @param alias the alias that corresponds to a value
      */
     getValue(alias) {
-        var _a;
-        return (_a = this.getAll()[alias]) !== null && _a !== void 0 ? _a : null;
+        return this.getAll()[alias] ?? null;
     }
     /**
      * Returns the username that corresponds to the given alias if it exists
@@ -54,8 +52,7 @@ class GlobalInfoAliasAccessor {
      * @param alias the alias that corresponds to a username
      */
     getUsername(alias) {
-        var _a;
-        return (_a = this.getAll()[alias]) !== null && _a !== void 0 ? _a : null;
+        return this.getAll()[alias] ?? null;
     }
     /**
      * If the provided string is an alias, it returns the corresponding value.
@@ -68,8 +65,7 @@ class GlobalInfoAliasAccessor {
      * @param valueOrAlias a string that might be a value or might be an alias
      */
     resolveValue(valueOrAlias) {
-        var _a;
-        return (_a = this.getValue(valueOrAlias)) !== null && _a !== void 0 ? _a : valueOrAlias;
+        return this.getValue(valueOrAlias) ?? valueOrAlias;
     }
     /**
      * If the provided string is an alias, it returns the corresponding username.
@@ -82,8 +78,7 @@ class GlobalInfoAliasAccessor {
      * @param usernameOrAlias a string that might be a username or might be an alias
      */
     resolveUsername(usernameOrAlias) {
-        var _a;
-        return (_a = this.getUsername(usernameOrAlias)) !== null && _a !== void 0 ? _a : usernameOrAlias;
+        return this.getUsername(usernameOrAlias) ?? usernameOrAlias;
     }
     /**
      * Set an alias for the given aliasable entity
@@ -121,10 +116,9 @@ class GlobalInfoAliasAccessor {
      * Returns the username of given aliasable entity
      */
     getNameOf(entity) {
-        var _a;
         if (typeof entity === 'string')
             return entity;
-        const aliaseeName = (_a = entity.username) !== null && _a !== void 0 ? _a : entity.user;
+        const aliaseeName = entity.username ?? entity.user;
         if (!aliaseeName) {
             throw new sfError_1.SfError(`Invalid aliasee, it must contain a user or username property: ${JSON.stringify(entity)}`);
         }
@@ -153,8 +147,7 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
      * @param entity the aliasable entity that you want to get the alias of
      */
     get(entity) {
-        var _a;
-        return (_a = this.getAll(entity).find((alias) => alias)) !== null && _a !== void 0 ? _a : null;
+        return this.getAll(entity).find((alias) => alias) ?? null;
     }
     /**
      * Returns the value that corresponds to the given alias if it exists
@@ -162,8 +155,7 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
      * @param alias the alias that corresponds to a value
      */
     getValue(alias) {
-        var _a;
-        return (_a = this.getAll()[alias]) !== null && _a !== void 0 ? _a : null;
+        return this.getAll()[alias] ?? null;
     }
     /**
      * Returns the username that corresponds to the given alias if it exists
@@ -171,8 +163,7 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
      * @param alias the alias that corresponds to a username
      */
     getUsername(alias) {
-        var _a;
-        return (_a = this.getAll()[alias]) !== null && _a !== void 0 ? _a : null;
+        return this.getAll()[alias] ?? null;
     }
     /**
      * If the provided string is an alias, it returns the corresponding value.
@@ -185,8 +176,7 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
      * @param valueOrAlias a string that might be a value or might be an alias
      */
     resolveValue(valueOrAlias) {
-        var _a;
-        return (_a = this.getValue(valueOrAlias)) !== null && _a !== void 0 ? _a : valueOrAlias;
+        return this.getValue(valueOrAlias) ?? valueOrAlias;
     }
     /**
      * If the provided string is an alias, it returns the corresponding username.
@@ -199,8 +189,7 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
      * @param usernameOrAlias a string that might be a username or might be an alias
      */
     resolveUsername(usernameOrAlias) {
-        var _a;
-        return (_a = this.getUsername(usernameOrAlias)) !== null && _a !== void 0 ? _a : usernameOrAlias;
+        return this.getUsername(usernameOrAlias) ?? usernameOrAlias;
     }
     /**
      * If the provided string is an alias, return it.
@@ -212,10 +201,9 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
      * @param usernameOrAlias a string that might be a username or might be an alias
      */
     resolveAlias(usernameOrAlias) {
-        var _a;
         if (this.has(usernameOrAlias))
             return usernameOrAlias;
-        return (_a = Object.entries(this.getAll()).find(([, username]) => username === usernameOrAlias)) === null || _a === void 0 ? void 0 : _a[0];
+        return Object.entries(this.getAll()).find(([, username]) => username === usernameOrAlias)?.[0];
     }
     /**
      * Set an alias for the given aliasable entity
@@ -260,10 +248,9 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
      * Returns the username of given aliasable entity
      */
     getNameOf(entity) {
-        var _a;
         if (typeof entity === 'string')
             return entity;
-        const aliaseeName = (_a = entity.username) !== null && _a !== void 0 ? _a : entity.user;
+        const aliaseeName = entity.username ?? entity.user;
         if (!aliaseeName) {
             throw new sfError_1.SfError(`Invalid aliasee, it must contain a user or username property: ${JSON.stringify(entity)}`);
         }