@salesforce/core 3.7.4 → 3.7.7

package/lib/org/org.d.ts

@@ -5,6 +5,7 @@ import { OrgUsersConfig } from '../config/orgUsersConfig';
 import { SandboxOrgConfig } from '../config/sandboxOrgConfig';
 import { Connection } from './connection';
 import { AuthFields, AuthInfo } from './authInfo';
+import { ScratchOrgCreateOptions, ScratchOrgCreateResult } from './scratchOrgCreate';
 export declare type OrganizationInformation = {
     Name: string;
     InstanceName: string;
@@ -63,6 +64,7 @@ export declare type SandboxRequest = {
     SourceId?: string;
     Description?: string;
 };
+export declare type ScratchOrgRequest = Pick<ScratchOrgCreateOptions, 'connectedAppConsumerKey' | 'durationDays' | 'nonamespace' | 'noancestors' | 'wait' | 'retry' | 'apiversion' | 'definitionjson' | 'definitionfile' | 'orgConfig' | 'clientSecret'>;
 /**
  * Provides a way to manage a locally authenticated Org.
  *
@@ -111,6 +113,14 @@ export declare class Org extends AsyncOptionalCreatable<Org.Options> {
         wait?: Duration;
         interval?: Duration;
     }): Promise<SandboxProcessObject>;
+    /**
+     * Creates a scratchOrg
+     * 'this' needs to be a valid dev-hub
+     *
+     * @param {options} ScratchOrgCreateOptions
+     * @returns {ScratchOrgCreateResult}
+     */
+    scratchOrgCreate(options: ScratchOrgRequest): Promise<ScratchOrgCreateResult>;
     /**
      * Clean all data files in the org's data path. Usually <workspace>/.sfdx/orgs/<username>.
      *
@@ -138,9 +148,9 @@ export declare class Org extends AsyncOptionalCreatable<Org.Options> {
     /**
      * 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.
      */
@@ -243,7 +253,7 @@ export declare class Org extends AsyncOptionalCreatable<Org.Options> {
     /**
      * 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.
      */
@@ -295,12 +305,12 @@ export declare class Org extends AsyncOptionalCreatable<Org.Options> {
      */
     protected init(): Promise<void>;
     /**
-     * **Throws** *{@link SfdxError}{ name: 'NotSupportedError' }* Throws an unsupported error.
+     * **Throws** *{@link SfError}{ name: 'NotSupportedError' }* Throws an unsupported error.
      */
     protected getDefaultOptions(): Org.Options;
     private queryProduction;
-    private destorySandbox;
-    private destoryScratchOrg;
+    private destroySandbox;
+    private destroyScratchOrg;
     /**
      * this method will delete the sandbox org from the production org and clean up any local files
      *

package/lib/org/org.js

@@ -15,16 +15,17 @@ const configAggregator_1 = require("../config/configAggregator");
 const orgUsersConfig_1 = require("../config/orgUsersConfig");
 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 sfError_1 = require("../sfError");
 const fs_1 = require("../util/fs");
 const sfdc_1 = require("../util/sfdc");
-const globalInfo_1 = require("../globalInfo");
-const messages_1 = require("../messages");
-const lifecycleEvents_1 = require("../lifecycleEvents");
 const webOAuthServer_1 = require("../webOAuthServer");
+const messages_1 = require("../messages");
+const globalInfo_1 = require("../globalInfo");
 const connection_1 = require("./connection");
 const authInfo_1 = require("./authInfo");
+const scratchOrgCreate_1 = require("./scratchOrgCreate");
 const orgConfigProperties_1 = require("./orgConfigProperties");
 messages_1.Messages.importMessagesDirectory(__dirname);
 const messages = messages_1.Messages.load('@salesforce/core', 'org', [
@@ -114,6 +115,16 @@ class Org extends kit_1.AsyncOptionalCreatable {
             pollInterval,
         });
     }
+    /**
+     * Creates a scratchOrg
+     * 'this' needs to be a valid dev-hub
+     *
+     * @param {options} ScratchOrgCreateOptions
+     * @returns {ScratchOrgCreateResult}
+     */
+    async scratchOrgCreate(options) {
+        return (0, scratchOrgCreate_1.scratchOrgCreate)({ ...options, hubOrg: this });
+    }
     /**
      * Clean all data files in the org's data path. Usually <workspace>/.sfdx/orgs/<username>.
      *
@@ -176,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.
      */
@@ -194,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) {
@@ -429,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}`);
@@ -439,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());
@@ -461,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}`);
@@ -575,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 }),
             });
         }
@@ -585,18 +596,18 @@ 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 });
     }
-    async destorySandbox(org, id) {
+    async destroySandbox(org, id) {
         return org.getConnection().tooling.delete('SandboxInfo', id);
     }
-    async destoryScratchOrg(org, id) {
+    async destroyScratchOrg(org, id) {
         return org.getConnection().delete('ActiveScratchOrg', id);
     }
     /**
@@ -641,7 +652,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
             }
         }
         // const deleteResult = await prodOrg.connection.tooling.delete('SandboxInfo', result.SandboxInfoId);
-        const deleteResult = await this.destorySandbox(prodOrg, result.SandboxInfoId);
+        const deleteResult = await this.destroySandbox(prodOrg, result.SandboxInfoId);
         this.logger.debug('Return from calling tooling.delete: %o ', deleteResult);
         await this.remove();
         if (Array.isArray(deleteResult) || !deleteResult.success) {
@@ -669,7 +680,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
             const username = this.getUsername();
             const activeScratchOrgRecordId = (await devHubConn.singleRecordQuery(`SELECT Id FROM ActiveScratchOrg WHERE SignupUsername='${username}'`)).Id;
             this.logger.trace(`found matching ActiveScratchOrg with SignupUsername: ${username}.  Deleting...`);
-            await this.destoryScratchOrg(devHub, activeScratchOrgRecordId);
+            await this.destroyScratchOrg(devHub, activeScratchOrgRecordId);
             await this.remove();
         }
         catch (err) {
@@ -703,7 +714,6 @@ class Org extends kit_1.AsyncOptionalCreatable {
             this.logger.debug(`Clearing auth cache for user: ${username}`);
             config.orgs.unset(username);
         }
-        await config.write();
     }
     /**
      * Deletes the users config file
@@ -743,34 +753,27 @@ class Org extends kit_1.AsyncOptionalCreatable {
         this.logger.debug(`Removing users associate with org: ${this.getOrgId()}`);
         const config = await this.retrieveOrgUsersConfig();
         this.logger.debug(`using path for org users: ${config.getPath()}`);
-        if (await config.exists()) {
-            const authInfos = await this.readUserAuthFiles();
-            this.logger.info(`Cleaning up usernames in org: ${this.getOrgId()}`);
-            for (const auth of authInfos) {
-                const username = auth.getFields().username;
-                const aliases = (username && globalInfo.aliases.getAll(username)) || [];
-                globalInfo.aliases.unsetAll(username);
-                let orgForUser;
-                if (username === this.getUsername()) {
-                    orgForUser = this;
-                }
-                else {
-                    const info = await authInfo_1.AuthInfo.create({ username });
-                    const connection = await connection_1.Connection.create({ authInfo: info });
-                    orgForUser = await Org.create({ connection });
-                }
-                const removeConfig = async (configInfo) => {
-                    if ((configInfo.value === username || aliases.includes(configInfo.value)) &&
-                        (configInfo.isGlobal() || configInfo.isLocal())) {
-                        await config_1.Config.update(configInfo.isGlobal(), configInfo.key, undefined);
-                    }
-                };
-                await removeConfig(this.configAggregator.getInfo(orgConfigProperties_1.OrgConfigProperties.TARGET_DEV_HUB));
-                await removeConfig(this.configAggregator.getInfo(orgConfigProperties_1.OrgConfigProperties.TARGET_ORG));
-                await orgForUser.removeAuth();
-            }
-            await globalInfo.write();
-        }
+        const authInfos = await this.readUserAuthFiles();
+        await Promise.all(authInfos
+            .map((auth) => auth.getFields().username)
+            .map(async (username) => {
+            const aliasKeys = (username && globalInfo.aliases.getAll(username)) || [];
+            globalInfo.aliases.unsetAll(username);
+            const orgForUser = username === this.getUsername()
+                ? this
+                : await Org.create({
+                    connection: await connection_1.Connection.create({ authInfo: await authInfo_1.AuthInfo.create({ username }) }),
+                });
+            const orgType = this.isDevHubOrg() ? orgConfigProperties_1.OrgConfigProperties.TARGET_DEV_HUB : orgConfigProperties_1.OrgConfigProperties.TARGET_ORG;
+            const configInfo = orgForUser.configAggregator.getInfo(orgType);
+            const needsConfigUpdate = (configInfo.isGlobal() || configInfo.isLocal()) &&
+                (configInfo.value === username || aliasKeys.includes(configInfo.value));
+            return [
+                orgForUser.removeAuth(),
+                needsConfigUpdate ? config_1.Config.update(configInfo.isGlobal(), orgType, undefined) : undefined,
+            ].filter(Boolean);
+        }));
+        await globalInfo.write();
     }
     /**
      * Remove an associate sandbox config.
@@ -851,7 +854,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
                     waitingOnAuth = true;
                 }
                 else {
-                    throw sfdxError_1.SfdxError.wrap(error);
+                    throw sfError_1.SfError.wrap(error);
                 }
             }
         }
@@ -943,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.d.ts

@@ -0,0 +1,43 @@
+import { Duration } from '@salesforce/kit';
+import { Org } from './org';
+import { ScratchOrgInfo } from './scratchOrgInfoApi';
+import { AuthFields, AuthInfo } from './authInfo';
+export declare const DEFAULT_STREAM_TIMEOUT_MINUTES = 6;
+export interface ScratchOrgCreateResult {
+    username?: string;
+    scratchOrgInfo?: ScratchOrgInfo;
+    authInfo?: AuthInfo;
+    authFields?: AuthFields;
+    warnings: string[];
+}
+/**
+ * interface ScratchOrgCreateOptions
+ *
+ * @param hubOrg the environment hub org
+ * @param connectedAppConsumerKey The connected app consumer key.
+ * @param durationDays duration of the scratch org (in days) (default:1, min:1, max:30)
+ * @param nonamespace create the scratch org with no namespace
+ * @param noancestors do not include second-generation package ancestors in the scratch org
+ * @param wait the streaming client socket timeout (in minutes) must be an instance of the Duration utility class (default:6, min:2)
+ * @param retry number of scratch org auth retries after scratch org is successfully signed up (default:0, min:0, max:10)
+ * @param apiversion target server instance API version
+ * @param definitionjson org definition in JSON format
+ * @param definitionfile path to an org definition file
+ * @param orgConfig overrides definitionjson
+ * @param clientSecret OAuth client secret of personal connected app
+ */
+export interface ScratchOrgCreateOptions {
+    hubOrg: Org;
+    connectedAppConsumerKey?: string;
+    durationDays?: number;
+    nonamespace?: boolean;
+    noancestors?: boolean;
+    wait?: Duration;
+    retry?: number;
+    apiversion?: string;
+    definitionjson?: string;
+    definitionfile?: string;
+    orgConfig?: Record<string, unknown>;
+    clientSecret?: string;
+}
+export declare const scratchOrgCreate: (options: ScratchOrgCreateOptions) => Promise<ScratchOrgCreateResult>;

package/lib/org/scratchOrgCreate.js

@@ -0,0 +1,142 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.scratchOrgCreate = exports.DEFAULT_STREAM_TIMEOUT_MINUTES = void 0;
+/*
+ * Copyright (c) 2020, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+const kit_1 = require("@salesforce/kit");
+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 sfProject_1 = require("../sfProject");
+const sfError_1 = require("../sfError");
+const org_1 = require("./org");
+const scratchOrgInfoApi_1 = require("./scratchOrgInfoApi");
+const scratchOrgSettingsGenerator_1 = require("./scratchOrgSettingsGenerator");
+const scratchOrgInfoGenerator_1 = require("./scratchOrgInfoGenerator");
+const connection_1 = require("./connection");
+messages_1.Messages.importMessagesDirectory(__dirname);
+const messages = messages_1.Messages.load('@salesforce/core', 'scratchOrgCreate', [
+    'SourceStatusResetFailureError',
+    'DurationDaysValidationMaxError',
+    'DurationDaysValidationMinError',
+    'RetryNotIntError',
+    'WaitValidationMaxError',
+    'DurationDaysNotIntError',
+]);
+exports.DEFAULT_STREAM_TIMEOUT_MINUTES = 6;
+const validateDuration = (durationDays) => {
+    const min = 1;
+    const max = 30;
+    if (Number.isInteger(durationDays)) {
+        if (durationDays < min) {
+            throw messages.createError('DurationDaysValidationMinError', [min, durationDays]);
+        }
+        if (durationDays > max) {
+            throw messages.createError('DurationDaysValidationMaxError', [max, durationDays]);
+        }
+        return;
+    }
+    throw messages.createError('DurationDaysNotIntError');
+};
+const validateRetry = (retry) => {
+    if (!Number.isInteger(retry)) {
+        throw messages.createError('RetryNotIntError');
+    }
+};
+const validateWait = (wait) => {
+    const min = 2;
+    if (wait.minutes < min) {
+        throw messages.createError('WaitValidationMaxError', [min, wait.minutes]);
+    }
+};
+const scratchOrgCreate = async (options) => {
+    var _a;
+    const logger = await logger_1.Logger.child('scratchOrgCreate');
+    logger.debug('scratchOrgCreate');
+    const { hubOrg, connectedAppConsumerKey, durationDays = 1, nonamespace, noancestors, wait = kit_1.Duration.minutes(exports.DEFAULT_STREAM_TIMEOUT_MINUTES), retry = 0, apiversion, definitionjson, definitionfile, orgConfig, clientSecret = undefined, } = options;
+    validateDuration(durationDays);
+    validateRetry(retry);
+    validateWait(wait);
+    const { scratchOrgInfoPayload, ignoreAncestorIds, warnings } = await (0, scratchOrgInfoGenerator_1.getScratchOrgInfoPayload)({
+        definitionjson,
+        definitionfile,
+        connectedAppConsumerKey,
+        durationDays,
+        nonamespace,
+        noancestors,
+        orgConfig,
+    });
+    const scratchOrgInfo = await (0, scratchOrgInfoGenerator_1.generateScratchOrgInfo)({
+        hubOrg,
+        scratchOrgInfoPayload,
+        nonamespace,
+        ignoreAncestorIds,
+    });
+    // gets the scratch org settings (will use in both signup paths AND to deploy the settings)
+    const settingsGenerator = new scratchOrgSettingsGenerator_1.default();
+    await settingsGenerator.extract(scratchOrgInfo);
+    logger.debug(`the scratch org def file has settings: ${settingsGenerator.hasSettings()}`);
+    // creates the scratch org info in the devhub
+    const scratchOrgInfoRequestResult = await (0, scratchOrgInfoApi_1.requestScratchOrgCreation)(hubOrg, scratchOrgInfo, settingsGenerator);
+    const scratchOrgInfoId = (0, ts_types_1.ensureString)((0, ts_types_1.getString)(scratchOrgInfoRequestResult, 'id'));
+    logger.debug(`scratch org has recordId ${scratchOrgInfoId}`);
+    const scratchOrgInfoResult = await (0, scratchOrgInfoApi_1.pollForScratchOrgInfo)(hubOrg, scratchOrgInfoId, wait);
+    const signupTargetLoginUrlConfig = await getSignupTargetLoginUrl();
+    const scratchOrgAuthInfo = await (0, scratchOrgInfoApi_1.authorizeScratchOrg)({
+        scratchOrgInfoComplete: scratchOrgInfoResult,
+        hubOrg,
+        clientSecret,
+        signupTargetLoginUrlConfig,
+        retry: retry || 0,
+    });
+    // we'll need this scratch org connection later;
+    const connection = await connection_1.Connection.create({ authInfo: scratchOrgAuthInfo });
+    const scratchOrg = await org_1.Org.create({ connection }); // scartchOrg should come from command
+    const username = scratchOrg.getUsername();
+    logger.debug(`scratch org username ${username}`);
+    const configAggregator = new configAggregator_1.ConfigAggregator();
+    const authInfo = await (0, scratchOrgInfoApi_1.deploySettingsAndResolveUrl)(scratchOrgAuthInfo, (_a = apiversion !== null && apiversion !== void 0 ? apiversion : configAggregator.getPropertyValue('apiVersion')) !== null && _a !== void 0 ? _a : (await scratchOrg.retrieveMaxApiVersion()), settingsGenerator, scratchOrg);
+    logger.trace('Settings deployed to org');
+    /** updating the revision num to zero during org:creation if source members are created during org:create.This only happens for some specific scratch org definition file.*/
+    await updateRevisionCounterToZero(scratchOrg);
+    return {
+        username,
+        scratchOrgInfo: scratchOrgInfoResult,
+        authInfo,
+        authFields: authInfo === null || authInfo === void 0 ? void 0 : authInfo.getFields(),
+        warnings,
+    };
+};
+exports.scratchOrgCreate = scratchOrgCreate;
+const getSignupTargetLoginUrl = async () => {
+    try {
+        const project = await sfProject_1.SfProject.resolve();
+        const projectJson = await project.resolveProjectConfig();
+        return projectJson.signupTargetLoginUrl;
+    }
+    catch {
+        // a project isn't required for org:create
+    }
+};
+const updateRevisionCounterToZero = async (scratchOrg) => {
+    const conn = scratchOrg.getConnection();
+    const queryResult = await conn.tooling.sobject('SourceMember').find({ RevisionCounter: { $gt: 0 } }, ['Id']);
+    try {
+        await conn.tooling
+            .sobject('SourceMember')
+            .update(queryResult.map((record) => ({ Id: record.Id, RevisionCounter: 0 })));
+    }
+    catch (err) {
+        const message = messages.getMessage('SourceStatusResetFailureError', [
+            scratchOrg.getOrgId(),
+            scratchOrg.getUsername(),
+        ]);
+        throw new sfError_1.SfError(message, 'SourceStatusResetFailure');
+    }
+};
+//# sourceMappingURL=scratchOrgCreate.js.map

package/lib/org/scratchOrgErrorCodes.d.ts

@@ -0,0 +1,4 @@
+import { Optional } from '@salesforce/ts-types';
+import { Logger } from '../logger';
+import { ScratchOrgInfo } from './scratchOrgInfoApi';
+export declare const checkScratchOrgInfoForErrors: (orgInfo: Optional<ScratchOrgInfo>, hubUsername: Optional<string>, logger: Logger) => ScratchOrgInfo;

package/lib/org/scratchOrgErrorCodes.js

@@ -0,0 +1,62 @@
+"use strict";
+/*
+ * Copyright (c) 2021, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkScratchOrgInfoForErrors = void 0;
+const messages_1 = require("../messages");
+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');
+const namedMessages = messages_1.Messages.load('@salesforce/core', 'scratchOrgErrorCodes', [
+    'SignupFailedActionError',
+    'SignupFailedUnknownError',
+    'SignupFailedError',
+    'SignupUnexpectedError',
+]);
+// getMessage will throw when the code isn't found
+// and we don't know whether a given code takes arguments or not
+const optionalErrorCodeMessage = (errorCode, args) => {
+    try {
+        // only apply args if message requires them
+        let message = messages.getMessage(errorCode);
+        if (message.includes('%s')) {
+            message = messages.getMessage(errorCode, args);
+        }
+        return message;
+    }
+    catch {
+        // generic error message
+        return undefined;
+    }
+};
+const checkScratchOrgInfoForErrors = (orgInfo, hubUsername, logger) => {
+    if (!orgInfo) {
+        throw new sfError_1.SfError('No scratch org info found.', 'ScratchOrgInfoNotFound');
+    }
+    if (orgInfo.Status === 'Active') {
+        return orgInfo;
+    }
+    if (orgInfo.Status === 'Error' && orgInfo.ErrorCode) {
+        const message = optionalErrorCodeMessage(orgInfo.ErrorCode, [WORKSPACE_CONFIG_FILENAME]);
+        if (message) {
+            throw new sfError_1.SfError(message, 'RemoteOrgSignupFailed', [
+                namedMessages.getMessage('SignupFailedActionError', [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 sfError_1.SfError(namedMessages.getMessage('SignupFailedUnknownError', [orgInfo.Id, hubUsername]), 'signupFailedUnknown');
+    }
+    throw new sfError_1.SfError(namedMessages.getMessage('SignupUnexpectedError'), 'UnexpectedSignupStatus');
+};
+exports.checkScratchOrgInfoForErrors = checkScratchOrgInfoForErrors;
+//# sourceMappingURL=scratchOrgErrorCodes.js.map

package/lib/org/scratchOrgFeatureDeprecation.d.ts

@@ -0,0 +1,26 @@
+interface FeatureTypes {
+    simpleFeatureMapping: {
+        [key: string]: string[];
+    };
+    quantifiedFeatureMapping: Record<string, string | number | boolean | null | undefined>;
+    deprecatedFeatures: string[];
+}
+export declare class ScratchOrgFeatureDeprecation {
+    private featureTypes;
+    constructor(options?: FeatureTypes);
+    /**
+     * Gets list of feature warnings that should be logged
+     *
+     * @param features The requested features.
+     * @returns List of string feature warnings.
+     */
+    getFeatureWarnings(features: string | string[]): string[];
+    /**
+     * Removes all deprecated features for the organization.
+     *
+     * @param features List of features to filter
+     * @returns feature array with proper mapping.
+     */
+    filterDeprecatedFeatures(features: string[]): string[];
+}
+export {};