@salesforce/core 3.23.8 → 3.24.1

package/lib/stateAggregator/accessors/orgAccessor.js

@@ -35,15 +35,13 @@ class GlobalInfoOrgAccessor {
         return !!this.getAll()[username];
     }
     set(username, org) {
-        var _a;
         // For legacy, and to keep things standard, some things wants the username in auth info.
-        (_a = org.username) !== null && _a !== void 0 ? _a : (org.username = username);
+        org.username ?? (org.username = username);
         this.globalInfo.set(`${types_1.SfInfoKeys.ORGS}["${username}"]`, org);
     }
     update(username, org) {
-        var _a;
         // For legacy, and to keep things standard, some things wants the username in auth info.
-        (_a = org.username) !== null && _a !== void 0 ? _a : (org.username = username);
+        org.username ?? (org.username = username);
         this.globalInfo.update(`${types_1.SfInfoKeys.ORGS}["${username}"]`, org);
     }
     unset(username) {
@@ -176,17 +174,16 @@ class BaseOrgAccessor extends kit_1.AsyncOptionalCreatable {
      * @param org
      */
     set(username, org) {
-        var _a, _b;
         const config = this.configs.get(username);
         if (config) {
             config.setContentsFromObject(org);
             const contents = config.getContents();
-            (_a = contents.username) !== null && _a !== void 0 ? _a : (contents.username = username);
+            contents.username ?? (contents.username = username);
             this.contents.set(username, contents);
         }
         else {
             // @ts-ignore
-            (_b = org.username) !== null && _b !== void 0 ? _b : (org.username = username);
+            org.username ?? (org.username = username);
             this.contents.set(username, org);
         }
     }
@@ -207,8 +204,7 @@ class BaseOrgAccessor extends kit_1.AsyncOptionalCreatable {
      * @param username
      */
     async remove(username) {
-        var _a;
-        await ((_a = this.configs.get(username)) === null || _a === void 0 ? void 0 : _a.unlink());
+        await this.configs.get(username)?.unlink();
         this.configs.delete(username);
         this.contents.delete(username);
     }

package/lib/stateAggregator/accessors/sandboxAccessor.js

@@ -39,8 +39,7 @@ class GlobalInfoSandboxAccessor {
      * @param sandboxOrgId the sandboxOrgId that corresponds to a sandbox
      */
     get(sandboxOrgId) {
-        var _a;
-        return sandboxOrgId ? (_a = this.getAll()[sandboxOrgId]) !== null && _a !== void 0 ? _a : null : null;
+        return sandboxOrgId ? this.getAll()[sandboxOrgId] ?? null : null;
     }
     /**
      * Returns true if the given sandbox org id exists
@@ -48,8 +47,7 @@ class GlobalInfoSandboxAccessor {
      * @param sandboxOrgId the sandboxOrgId that corresponds to a sandbox
      */
     has(sandboxOrgId) {
-        var _a;
-        return !!(sandboxOrgId ? (_a = this.getAll()[sandboxOrgId]) !== null && _a !== void 0 ? _a : null : null);
+        return !!(sandboxOrgId ? this.getAll()[sandboxOrgId] ?? null : null);
     }
     /**
      * Set an sandboxOrgId for the given sandbox entity

package/lib/stateAggregator/sfdxDataHandler.js

@@ -50,13 +50,12 @@ class SfdxDataHandler {
 exports.SfdxDataHandler = SfdxDataHandler;
 class BaseHandler {
     async merge(sfData = globalInfoConfig_1.GlobalInfo.emptyDataModel) {
-        var _a, _b;
         const sfdxData = await this.migrate();
         const merged = (0, globalInfoConfig_1.deepCopy)(sfData);
         // Only merge the key this handler is responsible for.
         const key = this.sfKey;
-        const sfKeys = Object.keys((_a = sfData[key]) !== null && _a !== void 0 ? _a : {});
-        const sfdxKeys = Object.keys((_b = sfdxData[key]) !== null && _b !== void 0 ? _b : {});
+        const sfKeys = Object.keys(sfData[key] ?? {});
+        const sfdxKeys = Object.keys(sfdxData[key] ?? {});
         const commonKeys = sfKeys.filter((k) => sfdxKeys.includes(k));
         for (const k of commonKeys) {
             const [newer, older] = [sfData[key][k], sfdxData[key][k]].sort((a, b) => {
@@ -115,12 +114,11 @@ class AuthHandler extends BaseHandler {
         }));
     }
     async findChanges(latest, original) {
-        var _a;
         const latestAuths = latest.orgs;
         const originalAuths = original.orgs;
         const changed = {};
         for (const [username, auth] of Object.entries(latestAuths)) {
-            const originalAuth = (_a = originalAuths[username]) !== null && _a !== void 0 ? _a : {};
+            const originalAuth = originalAuths[username] ?? {};
             if (!isEqual(auth, originalAuth)) {
                 changed[username] = auth;
             }
@@ -218,13 +216,12 @@ class SandboxesHandler extends BaseHandler {
         this.sfKey = types_1.SfInfoKeys.SANDBOXES;
     }
     async merge(sfData = globalInfoConfig_1.GlobalInfo.emptyDataModel) {
-        var _a, _b;
         const sfdxData = await this.migrate();
         const merged = (0, globalInfoConfig_1.deepCopy)(sfData);
         // Only merge the key this handler is responsible for.
         const key = this.sfKey;
-        const sfKeys = Object.keys((_a = sfData[key]) !== null && _a !== void 0 ? _a : {});
-        const sfdxKeys = Object.keys((_b = sfdxData[key]) !== null && _b !== void 0 ? _b : {});
+        const sfKeys = Object.keys(sfData[key] ?? {});
+        const sfdxKeys = Object.keys(sfdxData[key] ?? {});
         // sandbox entries for .sf and .sfdx contain static data. Given there
         // can be no mutation during the life of the sandbox, having to merge common keys
         // is unnecessary.
@@ -289,12 +286,11 @@ class SandboxesHandler extends BaseHandler {
         }));
     }
     async findChanges(latest, original) {
-        var _a;
         const latestSandboxes = latest.sandboxes;
         const originalSandboxes = original.sandboxes;
         const changed = {};
         for (const [sandboxOrgId, sandbox] of Object.entries(latestSandboxes)) {
-            const originalSandbox = (_a = originalSandboxes[sandboxOrgId]) !== null && _a !== void 0 ? _a : {};
+            const originalSandbox = originalSandboxes[sandboxOrgId] ?? {};
             if (!isEqual(sandbox, originalSandbox)) {
                 changed[sandboxOrgId] = sandbox;
             }

package/lib/status/pollingClient.js

@@ -53,7 +53,6 @@ class PollingClient extends kit_1.AsyncOptionalCreatable {
      * in the polling options.
      */
     async subscribe() {
-        var _a;
         let errorInPollingFunction; // keep this around for returning in the catch block
         const doPoll = async () => {
             let result;
@@ -89,7 +88,7 @@ class PollingClient extends kit_1.AsyncOptionalCreatable {
             }
             await lifecycleEvents_1.Lifecycle.getInstance().emit('POLLING_TIME_OUT', error);
             this.logger.debug('Polling timed out');
-            throw new sfError_1.SfError('The client has timed out.', (_a = this.options.timeoutErrorName) !== null && _a !== void 0 ? _a : 'PollingClientTimeout');
+            throw new sfError_1.SfError('The client has timed out.', this.options.timeoutErrorName ?? 'PollingClientTimeout');
         }
     }
 }

package/lib/testSetup.js

@@ -41,11 +41,10 @@ const global_1 = require("./global");
  * - length: the length of the unique id as presented in hexadecimal.
  */
 function uniqid(options) {
-    var _a, _b;
-    const uniqueString = (0, crypto_1.randomBytes)(Math.ceil(((_a = options === null || options === void 0 ? void 0 : options.length) !== null && _a !== void 0 ? _a : 32) / 2.0))
+    const uniqueString = (0, crypto_1.randomBytes)(Math.ceil((options?.length ?? 32) / 2.0))
         .toString('hex')
-        .slice(0, (_b = options === null || options === void 0 ? void 0 : options.length) !== null && _b !== void 0 ? _b : 32);
-    if (!(options === null || options === void 0 ? void 0 : options.template)) {
+        .slice(0, options?.length ?? 32);
+    if (!options?.template) {
         return uniqueString;
     }
     return options.template.includes('%s')
@@ -168,9 +167,8 @@ const instantiateContext = (sinon) => {
                 return orgMap.has(username);
             });
             const retrieveContents = async function () {
-                var _a;
                 const username = (0, path_1.basename)(this.path.replace('.json', ''));
-                return Promise.resolve((_a = orgMap.get(username)) !== null && _a !== void 0 ? _a : {});
+                return Promise.resolve(orgMap.get(username) ?? {});
             };
             this.configStubs.AuthInfoConfig = { retrieveContents };
         },
@@ -179,9 +177,8 @@ const instantiateContext = (sinon) => {
             const sandboxMap = new Map(entries);
             (0, ts_sinon_1.stubMethod)(testContext.SANDBOX, sandboxAccessor_1.SandboxAccessor.prototype, 'getAllFiles').returns([...sandboxMap.keys()].map((o) => `${o}.sandbox.json`));
             const retrieveContents = async function () {
-                var _a;
                 const username = (0, path_1.basename)(this.path.replace('.sandbox.json', ''));
-                return Promise.resolve((_a = sandboxMap.get(username)) !== null && _a !== void 0 ? _a : {});
+                return Promise.resolve(sandboxMap.get(username) ?? {});
             };
             this.configStubs.SandboxOrgConfig = { retrieveContents };
         },
@@ -595,7 +592,7 @@ class MockTestOrgData {
         this.testId = id;
         this.userId = `user_id_${this.testId}`;
         this.orgId = `${this.testId}`;
-        this.username = (options === null || options === void 0 ? void 0 : options.username) || `admin_${this.testId}@gb.org`;
+        this.username = options?.username || `admin_${this.testId}@gb.org`;
         this.loginUrl = `https://login.${this.testId}.salesforce.com`;
         this.instanceUrl = `https://instance.${this.testId}.salesforce.com`;
         this.clientId = `${this.testId}/client_id`;
@@ -702,9 +699,9 @@ class MockTestSandboxData {
     constructor(id = uniqid(), options) {
         this.id = id;
         this.sandboxOrgId = id;
-        this.prodOrgUsername = (options === null || options === void 0 ? void 0 : options.prodOrgUsername) || `admin_${id}@gb.org`;
-        this.sandboxName = (options === null || options === void 0 ? void 0 : options.name) || `sandbox_${id}`;
-        this.username = (options === null || options === void 0 ? void 0 : options.username) || `${this.prodOrgUsername}.sandbox`;
+        this.prodOrgUsername = options?.prodOrgUsername || `admin_${id}@gb.org`;
+        this.sandboxName = options?.name || `sandbox_${id}`;
+        this.username = options?.username || `${this.prodOrgUsername}.sandbox`;
     }
     /**
      * Return the auth config file contents.

package/lib/util/checkLightningDomain.js

@@ -11,9 +11,8 @@ const kit_1 = require("@salesforce/kit");
 const myDomainResolver_1 = require("../status/myDomainResolver");
 const sfdc_1 = require("./sfdc");
 async function checkLightningDomain(url) {
-    var _a, _b;
-    const domain = `https://${(_a = /https?:\/\/([^.]*)/.exec(url)) === null || _a === void 0 ? void 0 : _a.slice(1, 2).pop()}.lightning.force.com`;
-    const quantity = (_b = new kit_1.Env().getNumber('SFDX_DOMAIN_RETRY', 240)) !== null && _b !== void 0 ? _b : 0;
+    const domain = `https://${/https?:\/\/([^.]*)/.exec(url)?.slice(1, 2).pop()}.lightning.force.com`;
+    const quantity = new kit_1.Env().getNumber('SFDX_DOMAIN_RETRY', 240) ?? 0;
     const timeout = new kit_1.Duration(quantity, kit_1.Duration.Unit.SECONDS);
     if (sfdc_1.sfdc.isInternalUrl(url) || timeout.seconds === 0) {
         return true;

package/lib/webOAuthServer.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="node" />
 import * as http from 'http';
+import { JwtOAuth2Config } from 'jsforce';
 import { AsyncCreatable } from '@salesforce/kit';
-import { AuthInfo, OAuth2Config } from './org/authInfo';
+import { AuthInfo } from './org';
 /**
  * Handles the creation of a web server for web based login flows.
  *
@@ -79,7 +80,7 @@ export declare class WebOAuthServer extends AsyncCreatable<WebOAuthServer.Option
 }
 export declare namespace WebOAuthServer {
     interface Options {
-        oauthConfig: OAuth2Config;
+        oauthConfig: JwtOAuth2Config;
     }
     type Request = http.IncomingMessage & {
         query: {

package/lib/webOAuthServer.js

@@ -11,11 +11,11 @@ const http = require("http");
 const querystring_1 = require("querystring");
 const url_1 = require("url");
 const net_1 = require("net");
+const jsforce_1 = require("jsforce");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
-const jsforce_1 = require("jsforce");
 const logger_1 = require("./logger");
-const authInfo_1 = require("./org/authInfo");
+const org_1 = require("./org");
 const sfError_1 = require("./sfError");
 const messages_1 = require("./messages");
 const sfProject_1 = require("./sfProject");
@@ -85,7 +85,7 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
                 this.executeOauthRequest()
                     .then(async (response) => {
                     try {
-                        const authInfo = await authInfo_1.AuthInfo.create({
+                        const authInfo = await org_1.AuthInfo.create({
                             oauth2Options: this.oauthConfig,
                             oauth2: this.oauth2,
                         });
@@ -127,14 +127,14 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
         this.logger = await logger_1.Logger.child(this.constructor.name);
         const port = await WebOAuthServer.determineOauthPort();
         if (!this.oauthConfig.clientId)
-            this.oauthConfig.clientId = authInfo_1.DEFAULT_CONNECTED_APP_INFO.clientId;
+            this.oauthConfig.clientId = org_1.DEFAULT_CONNECTED_APP_INFO.clientId;
         if (!this.oauthConfig.loginUrl)
-            this.oauthConfig.loginUrl = authInfo_1.AuthInfo.getDefaultInstanceUrl();
+            this.oauthConfig.loginUrl = org_1.AuthInfo.getDefaultInstanceUrl();
         if (!this.oauthConfig.redirectUri)
             this.oauthConfig.redirectUri = `http://localhost:${port}/OauthRedirect`;
         this.webServer = await WebServer.create({ port });
         this.oauth2 = new jsforce_1.OAuth2(this.oauthConfig);
-        this.authUrl = authInfo_1.AuthInfo.getAuthorizationUrl(this.oauthConfig, this.oauth2);
+        this.authUrl = org_1.AuthInfo.getAuthorizationUrl(this.oauthConfig, this.oauth2);
     }
     /**
      * Executes the oauth request

package/messages/scratchOrgCreate.md

@@ -18,26 +18,6 @@ Expected 'durationDays' to be an integer number.
 
 Expected 'retry' to be an integer number.
 
-# WaitValidationMaxError
-
-Expected 'wait' greater than or equal to %s but received %s.
-
-# NoScratchOrgInfoError
-
-No ScratchOrgInfo object found in the Dev Hub you specified. Check that the ID and the Dev Hub are correct.
-
-# ScratchOrgDeletedError
-
-That scratch org has been deleted, so you can't connect to it anymore.
-
 # CacheMissError
 
 The ScratchOrgInfoId %s was not found in the cache.
-
-# StillInProgressError
-
-The scratch org is not ready yet (Status = %).
-
-# action.StillInProgress
-
-Wait for a few minutes, and then try the <%= config.bin %> <%= command.id %> command again

package/messages/scratchOrgErrorCodes.md

@@ -14,6 +14,22 @@ See https://developer.salesforce.com/docs/atlas.en-us.api.meta/api/sforce_api_ob
 
 The request to create a scratch org returned an unexpected status
 
+# StillInProgressError
+
+The scratch org is not ready yet (Status = %).
+
+# action.StillInProgress
+
+Wait for a few minutes, and then try the <%= config.bin %> <%= command.id %> command again
+
+# NoScratchOrgInfoError
+
+No ScratchOrgInfo object found in the Dev Hub you specified. Check that the ID and the Dev Hub are correct.
+
+# ScratchOrgDeletedError
+
+That scratch org has been deleted, so you can't connect to it anymore.
+
 # INVALID_ID_FIELD
 
 Provide a valid template ID, in the format 0TTxxxxxxxxxxxx.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "3.23.8",
+  "version": "3.24.1",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -49,7 +49,7 @@
     "form-data": "^4.0.0",
     "graceful-fs": "^4.2.9",
     "js2xmlparser": "^4.0.1",
-    "jsforce": "2.0.0-beta.14",
+    "jsforce": "^2.0.0-beta.16",
     "jsonwebtoken": "8.5.1",
     "mkdirp": "1.0.4",
     "ts-retry-promise": "^0.6.0"