@salesforce/core 7.3.12 → 7.4.1

package/lib/org/scratchOrgCreate.js

@@ -18,6 +18,7 @@ const configAggregator_1 = require("../config/configAggregator");
 const orgConfigProperties_1 = require("../org/orgConfigProperties");
 const sfProject_1 = require("../sfProject");
 const stateAggregator_1 = require("../stateAggregator/stateAggregator");
+const sfError_1 = require("../sfError");
 const org_1 = require("./org");
 const scratchOrgInfoApi_1 = require("./scratchOrgInfoApi");
 const scratchOrgSettingsGenerator_1 = __importDefault(require("./scratchOrgSettingsGenerator"));
@@ -77,6 +78,12 @@ const scratchOrgResume = async (jobId) => {
             signupTargetLoginUrlConfig,
             retry: 0,
         });
+    await setExitCodeIfError(68)(scratchOrgAuthInfo.handleAliasAndDefaultSettings({
+        alias,
+        setDefault: setDefault ?? false,
+        setDefaultDevHub: false,
+        setTracksSource: tracksSource ?? true,
+    }));
     const scratchOrg = await org_1.Org.create({ aliasOrUsername: username });
     const configAggregator = await configAggregator_1.ConfigAggregator.create();
     await (0, scratchOrgLifecycleEvents_1.emit)({ stage: 'deploy settings', scratchOrgInfo: soi });
@@ -85,18 +92,12 @@ const scratchOrgResume = async (jobId) => {
         capitalizeRecordTypes,
     });
     await settingsGenerator.extract({ ...soi, ...definitionjson });
-    const [authInfo] = await Promise.all([
+    const [authInfo] = await setExitCodeIfError(68)(Promise.all([
         (0, scratchOrgInfoApi_1.resolveUrl)(scratchOrgAuthInfo),
         (0, scratchOrgInfoApi_1.deploySettings)(scratchOrg, settingsGenerator, apiVersion ??
             configAggregator.getPropertyValue(orgConfigProperties_1.OrgConfigProperties.ORG_API_VERSION) ??
             (await scratchOrg.retrieveMaxApiVersion())),
-    ]);
-    await scratchOrgAuthInfo.handleAliasAndDefaultSettings({
-        alias,
-        setDefault: setDefault ?? false,
-        setDefaultDevHub: false,
-        setTracksSource: tracksSource ?? true,
-    });
+    ]));
     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)]);
@@ -176,30 +177,29 @@ const scratchOrgCreate = async (options) => {
         signupTargetLoginUrlConfig,
         retry: retry || 0,
     });
+    // anything after this point (org is created and auth'd) is potentially recoverable with the resume scratch command.
+    await setExitCodeIfError(68)(scratchOrgAuthInfo.handleAliasAndDefaultSettings({
+        ...{
+            alias,
+            setDefault,
+            setDefaultDevHub: false,
+            setTracksSource: tracksSource === false ? false : true,
+        },
+    }));
     // we'll need this scratch org connection later;
-    const scratchOrg = await org_1.Org.create({
-        aliasOrUsername: soi.Username ?? soi.SignupUsername,
-    });
+    const scratchOrg = await org_1.Org.create({ 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 configAggregator = await configAggregator_1.ConfigAggregator.create();
-    const [authInfo] = await Promise.all([
+    const [authInfo] = await setExitCodeIfError(68)(Promise.all([
         (0, scratchOrgInfoApi_1.resolveUrl)(scratchOrgAuthInfo),
         (0, scratchOrgInfoApi_1.deploySettings)(scratchOrg, settingsGenerator, apiversion ??
             configAggregator.getPropertyValue(orgConfigProperties_1.OrgConfigProperties.ORG_API_VERSION) ??
             (await scratchOrg.retrieveMaxApiVersion()), 
         // some of our "wait" time has already been used.  Calculate how much remains that we can spend on the deployment.
         kit_1.Duration.milliseconds(wait.milliseconds - (Date.now() - startTimestamp))),
-    ]);
-    await scratchOrgAuthInfo.handleAliasAndDefaultSettings({
-        ...{
-            alias,
-            setDefault,
-            setDefaultDevHub: false,
-            setTracksSource: tracksSource === false ? false : true,
-        },
-    });
+    ]));
     cache.unset(scratchOrgInfoId);
     const authFields = authInfo.getFields();
     await Promise.all([(0, scratchOrgLifecycleEvents_1.emit)({ stage: 'done', scratchOrgInfo: soi }), cache.write(), (0, scratchOrgLifecycleEvents_1.emitPostOrgCreate)(authFields)]);
@@ -225,9 +225,17 @@ const getSignupTargetLoginUrl = async () => {
 async function getCapitalizeRecordTypesConfig() {
     const configAgg = await configAggregator_1.ConfigAggregator.create();
     const value = configAgg.getInfo('org-capitalize-record-types').value;
-    if (value !== undefined)
-        return (0, kit_1.toBoolean)(value);
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-    return value;
+    return value !== undefined ? (0, kit_1.toBoolean)(value) : undefined;
 }
+/** wrap an async function, intercept error and set the given exit code   */
+const setExitCodeIfError = (exitCode) => async (p) => {
+    try {
+        return await p;
+    }
+    catch (e) {
+        const sfError = sfError_1.SfError.wrap(e);
+        sfError.exitCode = exitCode;
+        throw sfError;
+    }
+};
 //# sourceMappingURL=scratchOrgCreate.js.map

package/lib/org/scratchOrgInfoApi.d.ts

@@ -60,6 +60,7 @@ export declare const pollForScratchOrgInfo: (hubOrg: Org, scratchOrgInfoId: stri
  */
 export declare const deploySettings: (scratchOrg: Org, orgSettings: SettingsGenerator, apiVersion: string, timeout?: Duration) => Promise<void>;
 /**
+ * Makes sure the scratch org's instanceUrl is resolvable (that is, DNS is ready)
  *
  * @param scratchOrgAuthInfo an AuthInfo class from the scratch org
  * @returns AuthInfo

package/lib/org/scratchOrgInfoApi.js

@@ -352,6 +352,7 @@ const deploySettings = async (scratchOrg, orgSettings, apiVersion, timeout = kit
 };
 exports.deploySettings = deploySettings;
 /**
+ * Makes sure the scratch org's instanceUrl is resolvable (that is, DNS is ready)
  *
  * @param scratchOrgAuthInfo an AuthInfo class from the scratch org
  * @returns AuthInfo
@@ -360,13 +361,14 @@ const resolveUrl = async (scratchOrgAuthInfo) => {
     const logger = await logger_1.Logger.child('scratchOrgInfoApi-resolveUrl');
     const { instanceUrl } = scratchOrgAuthInfo.getFields();
     if (!instanceUrl) {
-        const sfError = new sfError_1.SfError('Org does not have instanceUrl');
-        sfError.setData({
-            orgId: scratchOrgAuthInfo.getFields().orgId,
-            username: scratchOrgAuthInfo.getFields().username,
-            instanceUrl,
+        throw sfError_1.SfError.create({
+            message: 'Org does not have instanceUrl',
+            data: {
+                orgId: scratchOrgAuthInfo.getFields().orgId,
+                username: scratchOrgAuthInfo.getFields().username,
+                instanceUrl,
+            },
         });
-        throw sfError;
     }
     logger.debug(`processScratchOrgInfoResult - resultData.instanceUrl: ${instanceUrl}`);
     const options = {

package/lib/org/scratchOrgSettingsGenerator.js

@@ -271,9 +271,11 @@ class SettingsGenerator {
             const failures = (Array.isArray(componentFailures) ? componentFailures : [componentFailures])
                 .map((failure) => `[${failure.problemType}] ${failure.fullName} : ${failure.problem} `)
                 .join('\n');
-            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;
+            throw sfError_1.SfError.create({
+                message: `A scratch org was created with username ${username}, but the settings failed to deploy due to: \n${failures}`,
+                name: 'ProblemDeployingSettings',
+                data: { ...result, username },
+            });
         }
     }
     async createDeployPackageContents(apiVersion) {

package/lib/sfProject.js

@@ -588,7 +588,9 @@ class SfProject {
      */
     getDefaultPackage() {
         if (!this.hasPackages()) {
-            throw new sfError_1.SfError('The sfdx-project.json does not have any packageDirectories defined.');
+            throw new sfError_1.SfError('The sfdx-project.json does not have any packageDirectories defined.', 'NoPackageDirectories', [
+                `Check ${this.getPath()} for packageDirectories.`,
+            ]);
         }
         const defaultPackage = this.findPackage((packageDir) => packageDir.default === true);
         return defaultPackage ?? this.getPackageDirectories()[0];

package/lib/testSetup.js

@@ -532,6 +532,8 @@ const restoreContext = (testContext) => {
     testContext.configStubs = {};
     // Give each test run a clean StateAggregator
     stateAggregator_1.StateAggregator.clearInstance();
+    // @ts-expect-error accessing a private property
+    sfProject_1.SfProject.instances.clear();
     // Allow each test to have their own config aggregator
     // @ts-ignore clear for testing.
     delete configAggregator_1.ConfigAggregator.instance;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "7.3.12",
+  "version": "7.4.1",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/index",
   "types": "lib/index.d.ts",
@@ -83,7 +83,7 @@
     "benchmark": "^2.1.4",
     "chai-string": "^1.5.0",
     "ts-node": "^10.9.2",
-    "ts-patch": "^3.1.1",
+    "ts-patch": "^3.2.0",
     "typescript": "^5.4.5"
   },
   "repository": {