@salesforce/core 3.23.9 → 3.24.2

package/CHANGELOG.md

@@ -2,6 +2,30 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [3.24.2](https://github.com/forcedotcom/sfdx-core/compare/v3.24.1...v3.24.2) (2022-07-26)
+
+### Bug Fixes
+
+- use correct field for clone requests ([#623](https://github.com/forcedotcom/sfdx-core/issues/623)) ([2372f03](https://github.com/forcedotcom/sfdx-core/commit/2372f0364b87a7ac498c8d7ef637a9b5fdc725ea))
+
+### [3.24.1](https://github.com/forcedotcom/sfdx-core/compare/v3.24.0...v3.24.1) (2022-07-21)
+
+### Bug Fixes
+
+- bump jsforce ([#622](https://github.com/forcedotcom/sfdx-core/issues/622)) ([c7b53b7](https://github.com/forcedotcom/sfdx-core/commit/c7b53b73977012f81e029a15f39c3fb35bc1041d))
+
+## [3.24.0](https://github.com/forcedotcom/sfdx-core/compare/v3.23.9...v3.24.0) (2022-07-14)
+
+### Features
+
+- org.scratchOrgCreate uses all options except hub ([045a7aa](https://github.com/forcedotcom/sfdx-core/commit/045a7aa56c97323aa8b3191c4879cd1b43f0cfb1))
+
+### Bug Fixes
+
+- align messages/files ([5a5f04d](https://github.com/forcedotcom/sfdx-core/commit/5a5f04d3ea8ffb30fdbbfe2c83824ec56a56ec34))
+- load messages by name ([7c3a2d9](https://github.com/forcedotcom/sfdx-core/commit/7c3a2d9d84f9553bb9cf1bc369b49ca46100484e))
+- use named messages always ([2bb25a9](https://github.com/forcedotcom/sfdx-core/commit/2bb25a9c24fcb7146e363783ea81bc3708060a18))
+
 ### [3.23.9](https://github.com/forcedotcom/sfdx-core/compare/v3.23.8...v3.23.9) (2022-07-14)
 
 ### [3.23.8](https://github.com/forcedotcom/sfdx-core/compare/v3.23.7...v3.23.8) (2022-07-13)

package/lib/org/org.d.ts

@@ -61,6 +61,7 @@ export declare type SandboxProcessObject = {
 export declare type SandboxRequest = {
     SandboxName: string;
     LicenseType?: string;
+    /** Should match a SandboxInfoId, not a SandboxProcessId */
     SourceId?: string;
     Description?: string;
 };
@@ -68,7 +69,7 @@ export declare type ResumeSandboxRequest = {
     SandboxName?: string;
     SandboxProcessObjId?: string;
 };
-export declare type ScratchOrgRequest = Pick<ScratchOrgCreateOptions, 'connectedAppConsumerKey' | 'durationDays' | 'nonamespace' | 'noancestors' | 'wait' | 'retry' | 'apiversion' | 'definitionjson' | 'definitionfile' | 'orgConfig' | 'clientSecret'>;
+export declare type ScratchOrgRequest = Omit<ScratchOrgCreateOptions, 'hubOrg'>;
 export declare type SandboxFields = {
     sandboxOrgId: string;
     prodOrgUsername: string;
@@ -129,11 +130,11 @@ export declare class Org extends AsyncOptionalCreatable<Org.Options> {
     /**
      *
      * @param sandboxReq SandboxRequest options to create the sandbox with
-     * @param sandboxName
+     * @param sourceSandboxName the name of the sandbox that your new sandbox will be based on
      * @param options Wait: The amount of time to wait before timing out, defaults to 0, Interval: The time interval between polling defaults to 30 seconds
      * @returns {SandboxProcessObject} the newly created sandbox process object
      */
-    cloneSandbox(sandboxReq: SandboxRequest, sandboxName: string, options: {
+    cloneSandbox(sandboxReq: SandboxRequest, sourceSandboxName: string, options: {
         wait?: Duration;
         interval?: Duration;
     }): Promise<SandboxProcessObject>;

package/lib/org/org.js

@@ -129,12 +129,12 @@ class Org extends kit_1.AsyncOptionalCreatable {
     /**
      *
      * @param sandboxReq SandboxRequest options to create the sandbox with
-     * @param sandboxName
+     * @param sourceSandboxName the name of the sandbox that your new sandbox will be based on
      * @param options Wait: The amount of time to wait before timing out, defaults to 0, Interval: The time interval between polling defaults to 30 seconds
      * @returns {SandboxProcessObject} the newly created sandbox process object
      */
-    async cloneSandbox(sandboxReq, sandboxName, options) {
-        sandboxReq.SourceId = (await this.querySandboxProcessBySandboxName(sandboxName)).Id;
+    async cloneSandbox(sandboxReq, sourceSandboxName, options) {
+        sandboxReq.SourceId = (await this.querySandboxProcessBySandboxName(sourceSandboxName)).SandboxInfoId;
         this.logger.debug('Clone sandbox sourceId %s', sandboxReq.SourceId);
         return this.createSandbox(sandboxReq, options);
     }
@@ -242,7 +242,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
      * @ignore
      */
     async retrieveOrgUsersConfig() {
-        return await orgUsersConfig_1.OrgUsersConfig.create(orgUsersConfig_1.OrgUsersConfig.getOptions(this.getOrgId()));
+        return orgUsersConfig_1.OrgUsersConfig.create(orgUsersConfig_1.OrgUsersConfig.getOptions(this.getOrgId()));
     }
     /**
      * Cleans up all org related artifacts including users, sandbox config(if a sandbox and auth file.
@@ -269,7 +269,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
      *
      */
     async isSandbox() {
-        return await (await stateAggregator_1.StateAggregator.getInstance()).sandboxes.hasFile(this.getOrgId());
+        return (await stateAggregator_1.StateAggregator.getInstance()).sandboxes.hasFile(this.getOrgId());
     }
     /**
      * Check that this org is a scratch org by asking the dev hub if it knows about it.
@@ -636,7 +636,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
      * results in a warning.
      */
     async retrieveMaxApiVersion() {
-        return await this.getConnection().retrieveMaxApiVersion();
+        return this.getConnection().retrieveMaxApiVersion();
     }
     /**
      * Returns the admin username used to create the org.
@@ -707,7 +707,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
      * @private
      */
     async querySandboxProcessBySandboxName(name) {
-        return await this.querySandboxProcess(`SandboxName='${name}'`);
+        return this.querySandboxProcess(`SandboxName='${name}'`);
     }
     /**
      * query SandboxProcess via SandboxInfoId
@@ -716,7 +716,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
      * @private
      */
     async querySandboxProcessBySandboxInfoId(id) {
-        return await this.querySandboxProcess(`SandboxInfoId='${id}'`);
+        return this.querySandboxProcess(`SandboxInfoId='${id}'`);
     }
     /**
      * query SandboxProcess via Id
@@ -725,7 +725,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
      * @private
      */
     async querySandboxProcessById(id) {
-        return await this.querySandboxProcess(`Id='${id}'`);
+        return this.querySandboxProcess(`Id='${id}'`);
     }
     /**
      * Initialize async components.
@@ -1098,7 +1098,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
      */
     async querySandboxProcess(where) {
         const queryStr = `SELECT Id, Status, SandboxName, SandboxInfoId, LicenseType, CreatedDate, CopyProgress, SandboxOrganization, SourceId, Description, EndDate FROM SandboxProcess WHERE ${where} AND Status != 'D'`;
-        return await this.connection.singleRecordQuery(queryStr, {
+        return this.connection.singleRecordQuery(queryStr, {
             tooling: true,
         });
     }

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) => {

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/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.9",
+  "version": "3.24.2",
   "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": "beta",
+    "jsforce": "^2.0.0-beta.16",
     "jsonwebtoken": "8.5.1",
     "mkdirp": "1.0.4",
     "ts-retry-promise": "^0.6.0"