@salesforce/core 3.7.5 → 3.7.8

package/lib/testSetup.js

@@ -21,8 +21,8 @@ const connection_1 = require("./org/connection");
 const crypto_2 = require("./crypto/crypto");
 const logger_1 = require("./logger");
 const messages_1 = require("./messages");
-const sfdxError_1 = require("./sfdxError");
-const sfdxProject_1 = require("./sfdxProject");
+const sfError_1 = require("./sfError");
+const sfProject_1 = require("./sfProject");
 const streamingClient_1 = require("./status/streamingClient");
 const globalInfo_1 = require("./globalInfo");
 const global_1 = require("./global");
@@ -126,12 +126,12 @@ const instantiateContext = (sinon) => {
         inProject(inProject = true) {
             testContext.SANDBOXES.PROJECT.restore();
             if (inProject) {
-                testContext.SANDBOXES.PROJECT.stub(sfdxProject_1.SfdxProject, 'resolveProjectPath').callsFake(() => testContext.localPathRetriever(testContext.id));
-                testContext.SANDBOXES.PROJECT.stub(sfdxProject_1.SfdxProject, 'resolveProjectPathSync').callsFake(() => testContext.localPathRetrieverSync(testContext.id));
+                testContext.SANDBOXES.PROJECT.stub(sfProject_1.SfProject, 'resolveProjectPath').callsFake(() => testContext.localPathRetriever(testContext.id));
+                testContext.SANDBOXES.PROJECT.stub(sfProject_1.SfProject, 'resolveProjectPathSync').callsFake(() => testContext.localPathRetrieverSync(testContext.id));
             }
             else {
-                testContext.SANDBOXES.PROJECT.stub(sfdxProject_1.SfdxProject, 'resolveProjectPath').rejects(new sfdxError_1.SfdxError('', 'InvalidProjectWorkspaceError'));
-                testContext.SANDBOXES.PROJECT.stub(sfdxProject_1.SfdxProject, 'resolveProjectPathSync').throws(new sfdxError_1.SfdxError('', 'InvalidProjectWorkspaceError'));
+                testContext.SANDBOXES.PROJECT.stub(sfProject_1.SfProject, 'resolveProjectPath').rejects(new sfError_1.SfError('', 'InvalidProjectWorkspaceError'));
+                testContext.SANDBOXES.PROJECT.stub(sfProject_1.SfProject, 'resolveProjectPathSync').throws(new sfError_1.SfError('', 'InvalidProjectWorkspaceError'));
             }
         },
     };
@@ -174,7 +174,7 @@ const stubContext = (testContext) => {
     testContext.inProject(true);
     testContext.SANDBOXES.CONFIG.stub(configFile_1.ConfigFile, 'resolveRootFolder').callsFake((isGlobal) => testContext.rootPathRetriever(isGlobal, testContext.id));
     testContext.SANDBOXES.CONFIG.stub(configFile_1.ConfigFile, 'resolveRootFolderSync').callsFake((isGlobal) => testContext.rootPathRetrieverSync(isGlobal, testContext.id));
-    (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.PROJECT, sfdxProject_1.SfdxProjectJson.prototype, 'doesPackageExist').callsFake(() => true);
+    (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.PROJECT, sfProject_1.SfProjectJson.prototype, 'doesPackageExist').callsFake(() => true);
     const initStubForRead = (configFile) => {
         const stub = testContext.configStubs[configFile.constructor.name] || {};
         // init calls read calls getPath which sets the path on the config file the first time.
@@ -324,7 +324,7 @@ exports.testSetup = (0, kit_1.once)(_testSetup);
  *
  * **See** {@link shouldThrow}
  */
-exports.unexpectedResult = new sfdxError_1.SfdxError('This code was expected to fail', 'UnexpectedResult');
+exports.unexpectedResult = new sfError_1.SfError('This code was expected to fail', 'UnexpectedResult');
 /**
  * Use for this testing pattern:
  * ```

package/lib/util/internal.d.ts

@@ -1,3 +1,4 @@
+import { Optional } from '@salesforce/ts-types';
 /**
  * The name of the project config file.
  *
@@ -11,7 +12,7 @@ export declare const SFDX_PROJECT_JSON = "sfdx-project.json";
  *
  * **See** {@link traverseForFile}
  *
- * **Throws** *{@link SfdxError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
+ * **Throws** *{@link SfError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
  *
  * @param dir The directory path to start traversing from.
  * @ignore
@@ -24,9 +25,34 @@ export declare function resolveProjectPath(dir?: string): Promise<string>;
  *
  * **See** {@link traverseForFile}
  *
- * **Throws** *{@link SfdxError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
+ * **Throws** *{@link SfError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
  *
  * @param dir The directory path to start traversing from.
  * @ignore
  */
 export declare function resolveProjectPathSync(dir?: string): string;
+/**
+ * These methods were moved from the deprecated 'fs' module in v2 and are only used in sfdx-core above
+ *
+ * They were migrated into the 'traverse' constant in order to stub them in unit tests
+ */
+export declare const traverse: {
+    /**
+     * Searches a file path in an ascending manner (until reaching the filesystem root) for the first occurrence a
+     * specific file name.  Resolves with the directory path containing the located file, or `null` if the file was
+     * not found.
+     *
+     * @param dir The directory path in which to start the upward search.
+     * @param file The file name to look for.
+     */
+    forFile: (dir: string, file: string) => Promise<Optional<string>>;
+    /**
+     * Searches a file path synchronously in an ascending manner (until reaching the filesystem root) for the first occurrence a
+     * specific file name.  Resolves with the directory path containing the located file, or `null` if the file was
+     * not found.
+     *
+     * @param dir The directory path in which to start the upward search.
+     * @param file The file name to look for.
+     */
+    forFileSync: (dir: string, file: string) => Optional<string>;
+};

package/lib/util/internal.js

@@ -6,9 +6,10 @@
  * 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.resolveProjectPathSync = exports.resolveProjectPath = exports.SFDX_PROJECT_JSON = void 0;
+exports.traverse = exports.resolveProjectPathSync = exports.resolveProjectPath = exports.SFDX_PROJECT_JSON = void 0;
+const fs = require("fs");
+const path_1 = require("path");
 const messages_1 = require("../messages");
-const fs_1 = require("./fs");
 messages_1.Messages.importMessagesDirectory(__dirname);
 const messages = messages_1.Messages.load('@salesforce/core', 'config', ['invalidProjectWorkspace']);
 /**
@@ -25,13 +26,13 @@ exports.SFDX_PROJECT_JSON = 'sfdx-project.json';
  *
  * **See** {@link traverseForFile}
  *
- * **Throws** *{@link SfdxError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
+ * **Throws** *{@link SfError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
  *
  * @param dir The directory path to start traversing from.
  * @ignore
  */
 async function resolveProjectPath(dir = process.cwd()) {
-    const projectPath = await fs_1.fs.traverseForFile(dir, exports.SFDX_PROJECT_JSON);
+    const projectPath = await exports.traverse.forFile(dir, exports.SFDX_PROJECT_JSON);
     if (!projectPath) {
         throw messages.createError('invalidProjectWorkspace');
     }
@@ -45,17 +46,74 @@ exports.resolveProjectPath = resolveProjectPath;
  *
  * **See** {@link traverseForFile}
  *
- * **Throws** *{@link SfdxError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
+ * **Throws** *{@link SfError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
  *
  * @param dir The directory path to start traversing from.
  * @ignore
  */
 function resolveProjectPathSync(dir = process.cwd()) {
-    const projectPath = fs_1.fs.traverseForFileSync(dir, exports.SFDX_PROJECT_JSON);
+    const projectPath = exports.traverse.forFileSync(dir, exports.SFDX_PROJECT_JSON);
     if (!projectPath) {
         throw messages.createError('invalidProjectWorkspace');
     }
     return projectPath;
 }
 exports.resolveProjectPathSync = resolveProjectPathSync;
+/**
+ * These methods were moved from the deprecated 'fs' module in v2 and are only used in sfdx-core above
+ *
+ * They were migrated into the 'traverse' constant in order to stub them in unit tests
+ */
+exports.traverse = {
+    /**
+     * Searches a file path in an ascending manner (until reaching the filesystem root) for the first occurrence a
+     * specific file name.  Resolves with the directory path containing the located file, or `null` if the file was
+     * not found.
+     *
+     * @param dir The directory path in which to start the upward search.
+     * @param file The file name to look for.
+     */
+    forFile: async (dir, file) => {
+        let foundProjectDir;
+        try {
+            fs.statSync((0, path_1.join)(dir, file));
+            foundProjectDir = dir;
+        }
+        catch (err) {
+            if (err && err.code === 'ENOENT') {
+                const nextDir = (0, path_1.resolve)(dir, '..');
+                if (nextDir !== dir) {
+                    // stop at root
+                    foundProjectDir = await exports.traverse.forFile(nextDir, file);
+                }
+            }
+        }
+        return foundProjectDir;
+    },
+    /**
+     * Searches a file path synchronously in an ascending manner (until reaching the filesystem root) for the first occurrence a
+     * specific file name.  Resolves with the directory path containing the located file, or `null` if the file was
+     * not found.
+     *
+     * @param dir The directory path in which to start the upward search.
+     * @param file The file name to look for.
+     */
+    forFileSync: (dir, file) => {
+        let foundProjectDir;
+        try {
+            fs.statSync((0, path_1.join)(dir, file));
+            foundProjectDir = dir;
+        }
+        catch (err) {
+            if (err && err.code === 'ENOENT') {
+                const nextDir = (0, path_1.resolve)(dir, '..');
+                if (nextDir !== dir) {
+                    // stop at root
+                    foundProjectDir = exports.traverse.forFileSync(nextDir, file);
+                }
+            }
+        }
+        return foundProjectDir;
+    },
+};
 //# sourceMappingURL=internal.js.map

package/lib/util/jsonXmlTools.d.ts

@@ -0,0 +1,14 @@
+import { JsonMap } from '@salesforce/ts-types';
+import { IOptions } from 'js2xmlparser/lib/options';
+export interface JSONasXML {
+    json: JsonMap;
+    type: string;
+    options?: IOptions;
+}
+export interface WriteJSONasXMLInputs extends JSONasXML {
+    path: string;
+}
+export declare const standardOptions: IOptions;
+export declare const writeJSONasXML: ({ path, json, type, options, }: WriteJSONasXMLInputs) => Promise<void>;
+export declare const JsonAsXml: ({ json, type, options }: JSONasXML) => string;
+export declare const fixExistingDollarSign: (existing: WriteJSONasXMLInputs['json']) => Record<string, unknown>;

package/lib/util/jsonXmlTools.js

@@ -0,0 +1,41 @@
+"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.fixExistingDollarSign = exports.JsonAsXml = exports.writeJSONasXML = exports.standardOptions = void 0;
+const fs_1 = require("fs");
+const jsToXml = require("js2xmlparser");
+exports.standardOptions = {
+    declaration: {
+        include: true,
+        encoding: 'UTF-8',
+        version: '1.0',
+    },
+    format: {
+        doubleQuotes: true,
+    },
+};
+const writeJSONasXML = async ({ path, json, type, options = exports.standardOptions, }) => {
+    const xml = jsToXml.parse(type, (0, exports.fixExistingDollarSign)(json), options);
+    return await fs_1.promises.writeFile(path, xml);
+};
+exports.writeJSONasXML = writeJSONasXML;
+const JsonAsXml = ({ json, type, options = exports.standardOptions }) => {
+    return jsToXml.parse(type, (0, exports.fixExistingDollarSign)(json), options);
+};
+exports.JsonAsXml = JsonAsXml;
+const fixExistingDollarSign = (existing) => {
+    const existingCopy = { ...existing };
+    if (existingCopy.$) {
+        const temp = existingCopy.$;
+        delete existingCopy.$;
+        existingCopy['@'] = temp;
+    }
+    return existingCopy;
+};
+exports.fixExistingDollarSign = fixExistingDollarSign;
+//# sourceMappingURL=jsonXmlTools.js.map

package/lib/util/mapKeys.d.ts

@@ -0,0 +1,14 @@
+/**
+ *  Use mapKeys to convert object keys to another format using the specified conversion function.
+ *
+ *  E.g., to deep convert all object keys to camelCase:  mapKeys(myObj, _.camelCase, true)
+ *        to shallow convert object keys to lower case:  mapKeys(myObj, _.toLower)
+ *
+ *  NOTE: This mutates the object passed in for conversion.
+ *
+ *  @param target - {Object} The object to convert the keys
+ *  @param converter - {Function} The function that converts the object key
+ *  @param deep - {boolean} Whether to do a deep object key conversion
+ *  @return {Object} - the object with the converted keys
+ */
+export default function mapKeys(obj: any, converter: (key: string) => string, deep?: boolean): Record<string, unknown>;

package/lib/util/mapKeys.js

@@ -0,0 +1,48 @@
+"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 });
+const ts_types_1 = require("@salesforce/ts-types");
+/**
+ *  Use mapKeys to convert object keys to another format using the specified conversion function.
+ *
+ *  E.g., to deep convert all object keys to camelCase:  mapKeys(myObj, _.camelCase, true)
+ *        to shallow convert object keys to lower case:  mapKeys(myObj, _.toLower)
+ *
+ *  NOTE: This mutates the object passed in for conversion.
+ *
+ *  @param target - {Object} The object to convert the keys
+ *  @param converter - {Function} The function that converts the object key
+ *  @param deep - {boolean} Whether to do a deep object key conversion
+ *  @return {Object} - the object with the converted keys
+ */
+function mapKeys(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
+obj, converter, deep) {
+    const target = Object.assign({}, obj);
+    return Object.fromEntries(Object.entries(target).map(([key, value]) => {
+        const k = converter.call(null, key);
+        if (deep) {
+            let v = value;
+            if (Array.isArray(value)) {
+                v = value.map((v1) => {
+                    if ((0, ts_types_1.isPlainObject)(v1)) {
+                        return mapKeys(v1, converter, deep);
+                    }
+                    return v1;
+                });
+            }
+            else if ((0, ts_types_1.isPlainObject)(value)) {
+                v = mapKeys(value, converter, deep);
+            }
+            return [k, v];
+        }
+        return [k, value];
+    }));
+}
+exports.default = mapKeys;
+//# sourceMappingURL=mapKeys.js.map

package/lib/util/sfdcUrl.d.ts

@@ -43,7 +43,7 @@ export declare class SfdcUrl extends URL {
      * If SFDX_DOMAIN_RETRY environment variable is set (number) it overrides the default timeout duration (240 seconds)
      *
      * @returns {Promise<true | never>} The resolved ip address or never
-     * @throws {@link SfdxError} If can't resolve DNS.
+     * @throws {@link SfError} If can't resolve DNS.
      */
     checkLightningDomain(): Promise<true | never>;
     /**
@@ -51,7 +51,7 @@ export declare class SfdcUrl extends URL {
      * If SFDX_DOMAIN_RETRY environment variable is set (number) it overrides the default timeout duration (240 seconds)
      *
      * @returns the resolved ip address.
-     * @throws {@link SfdxError} If can't resolve DNS.
+     * @throws {@link SfError} If can't resolve DNS.
      */
     lookup(): Promise<string>;
     /**

package/lib/util/sfdcUrl.js

@@ -121,7 +121,7 @@ class SfdcUrl extends url_1.URL {
      * If SFDX_DOMAIN_RETRY environment variable is set (number) it overrides the default timeout duration (240 seconds)
      *
      * @returns {Promise<true | never>} The resolved ip address or never
-     * @throws {@link SfdxError} If can't resolve DNS.
+     * @throws {@link SfError} If can't resolve DNS.
      */
     async checkLightningDomain() {
         const quantity = (0, ts_types_1.ensureNumber)(new kit_1.Env().getNumber('SFDX_DOMAIN_RETRY', 240));
@@ -142,7 +142,7 @@ class SfdcUrl extends url_1.URL {
      * If SFDX_DOMAIN_RETRY environment variable is set (number) it overrides the default timeout duration (240 seconds)
      *
      * @returns the resolved ip address.
-     * @throws {@link SfdxError} If can't resolve DNS.
+     * @throws {@link SfError} If can't resolve DNS.
      */
     async lookup() {
         const quantity = (0, ts_types_1.ensureNumber)(new kit_1.Env().getNumber('SFDX_DOMAIN_RETRY', 240));

package/lib/util/zipWriter.d.ts

@@ -0,0 +1,14 @@
+/// <reference types="node" />
+import { pipeline as cbPipeline, Readable, Writable } from 'stream';
+export declare const pipeline: typeof cbPipeline.__promisify__;
+export declare class ZipWriter extends Writable {
+    private rootDestination?;
+    private zip;
+    private buffers;
+    constructor(rootDestination?: string | undefined);
+    addToZip(contents: string | Readable | Buffer, path: string): void;
+    finalize(): Promise<void>;
+    private getOutputStream;
+    private getInputBuffer;
+    get buffer(): Buffer;
+}

package/lib/util/zipWriter.js

@@ -0,0 +1,68 @@
+"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.ZipWriter = exports.pipeline = void 0;
+const fs_1 = require("fs");
+const stream_1 = require("stream");
+const util_1 = require("util");
+const archiver_1 = require("archiver");
+exports.pipeline = (0, util_1.promisify)(stream_1.pipeline);
+class ZipWriter extends stream_1.Writable {
+    constructor(rootDestination) {
+        super({ objectMode: true });
+        this.rootDestination = rootDestination;
+        // compression-/speed+ (0)<---(3)---------->(9) compression+/speed-
+        // 3 appears to be a decent balance of compression and speed. It felt like
+        // higher values = diminishing returns on compression and made conversion slower
+        this.zip = (0, archiver_1.create)('zip', { zlib: { level: 3 } });
+        this.buffers = [];
+        void (0, exports.pipeline)(this.zip, this.getOutputStream());
+    }
+    addToZip(contents, path) {
+        this.zip.append(contents, { name: path });
+    }
+    async finalize() {
+        await this.zip.finalize();
+        await this.getInputBuffer();
+    }
+    getOutputStream() {
+        if (this.rootDestination) {
+            return (0, fs_1.createWriteStream)(this.rootDestination);
+        }
+        else {
+            const bufferWritable = new stream_1.Writable();
+            // eslint-disable-next-line no-underscore-dangle
+            bufferWritable._write = (chunk, encoding, cb) => {
+                this.buffers.push(chunk);
+                cb();
+            };
+            return bufferWritable;
+        }
+    }
+    async getInputBuffer() {
+        if (this.rootDestination) {
+            const inputStream = (0, fs_1.createReadStream)(this.rootDestination);
+            return new Promise((resolve, reject) => {
+                inputStream.on('data', (chunk) => {
+                    this.buffers.push(chunk);
+                });
+                inputStream.once('end', () => {
+                    return resolve();
+                });
+                inputStream.once('error', (error) => {
+                    return reject(error);
+                });
+            });
+        }
+    }
+    get buffer() {
+        return Buffer.concat(this.buffers);
+    }
+}
+exports.ZipWriter = ZipWriter;
+//# sourceMappingURL=zipWriter.js.map

package/lib/webOAuthServer.js

@@ -16,9 +16,9 @@ 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 sfdxError_1 = require("./sfdxError");
+const sfError_1 = require("./sfError");
 const messages_1 = require("./messages");
-const sfdxProject_1 = require("./sfdxProject");
+const sfProject_1 = require("./sfProject");
 messages_1.Messages.importMessagesDirectory(__dirname);
 const messages = messages_1.Messages.load('@salesforce/core', 'auth', [
     'invalidRequestUri',
@@ -56,8 +56,8 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
      */
     static async determineOauthPort() {
         try {
-            const sfdxProject = await sfdxProject_1.SfdxProjectJson.create();
-            return sfdxProject.get('oauthLocalPort') || WebOAuthServer.DEFAULT_PORT;
+            const sfProject = await sfProject_1.SfProjectJson.create();
+            return sfProject.get('oauthLocalPort') || WebOAuthServer.DEFAULT_PORT;
         }
         catch {
             return WebOAuthServer.DEFAULT_PORT;
@@ -144,7 +144,7 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
     async executeOauthRequest() {
         return new Promise((resolve, reject) => {
             this.logger.debug('Starting web auth flow');
-            // eslint-disable-next-line @typescript-eslint/no-misused-promises
+            // eslint-disable-next-line @typescript-eslint/no-misused-promises, @typescript-eslint/no-explicit-any
             this.webServer.server.on('request', async (request, response) => {
                 const url = (0, url_1.parse)(request.url);
                 this.logger.debug(`processing request for uri: ${url.pathname}`);
@@ -152,7 +152,7 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
                     if (url.pathname && url.pathname.startsWith('/OauthRedirect')) {
                         request.query = (0, querystring_1.parse)(url.query);
                         if (request.query.error) {
-                            const err = new sfdxError_1.SfdxError(request.query.error_description || request.query.error, request.query.error);
+                            const err = new sfError_1.SfError(request.query.error_description || request.query.error, request.query.error);
                             this.webServer.reportError(err, response);
                             return reject(err);
                         }
@@ -169,14 +169,14 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
                         this.webServer.sendError(404, 'Resource not found', response);
                         const errName = 'invalidRequestUri';
                         const errMessage = messages.getMessage(errName, [url.pathname]);
-                        reject(new sfdxError_1.SfdxError(errMessage, errName));
+                        reject(new sfError_1.SfError(errMessage, errName));
                     }
                 }
                 else {
                     this.webServer.sendError(405, 'Unsupported http methods', response);
                     const errName = 'invalidRequestMethod';
                     const errMessage = messages.getMessage(errName, [request.method]);
-                    reject(new sfdxError_1.SfdxError(errMessage, errName));
+                    reject(new sfError_1.SfError(errMessage, errName));
                 }
             });
         });
@@ -190,7 +190,7 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
      */
     parseAuthCodeFromRequest(response, request) {
         if (!this.validateState(request)) {
-            const error = new sfdxError_1.SfdxError('urlStateMismatch');
+            const error = new sfError_1.SfError('urlStateMismatch');
             this.webServer.sendError(400, `${error.message}\n`, response);
             this.closeRequest(request);
             this.logger.warn('urlStateMismatchAttempt detected.');
@@ -343,13 +343,13 @@ class WebServer extends kit_1.AsyncCreatable {
             const socket = new net_1.Socket();
             socket.setTimeout(this.getSocketTimeout(), () => {
                 socket.destroy();
-                const error = new sfdxError_1.SfdxError('timeout', 'SOCKET_TIMEOUT');
+                const error = new sfError_1.SfError('timeout', 'SOCKET_TIMEOUT');
                 reject(error);
             });
             // An existing connection, means that the port is occupied
             socket.connect(clientConfig, () => {
                 socket.destroy();
-                const error = new sfdxError_1.SfdxError('Address in use', 'EADDRINUSE');
+                const error = new sfError_1.SfError('Address in use', 'EADDRINUSE');
                 error.data = {
                     port: clientConfig.port,
                     address: clientConfig.host,

package/messages/org.md

@@ -41,3 +41,7 @@ The sandbox %s does not have an authorized username.
 # orgPollingTimeout
 
 Sandbox status is %s; timed out waiting for completion.
+
+# NotFoundOnDevHub
+
+The scratch org does not belong to the dev hub username %s.

package/messages/scratchOrgCreate.md

@@ -0,0 +1,27 @@
+# UnsupportedSnapshotOrgCreateOptionsError
+
+Org snapshots don’t support one or more options you specified: %s.
+
+# SourceStatusResetFailureError
+
+Successfully created org with ID: %s and name: %s. Unfortunately, source tracking isn’t working as expected. If you run force:source:status, the results may be incorrect. Try again by creating another scratch org.
+
+# DurationDaysValidationMinError
+
+Expected 'durationDays' greater than or equal to %s but received %s.
+
+# DurationDaysValidationMaxError
+
+Expected 'durationDays' less than or equal to %s but received %s.
+
+# DurationDaysNotIntError
+
+Expected 'durationDays' to be an integer number.
+
+# RetryNotIntError
+
+Expected 'retry' to be an integer number.
+
+# WaitValidationMaxError
+
+Expected 'wait' greater than or equal to %s but received %s.

package/messages/scratchOrgErrorCodes.md

@@ -0,0 +1,99 @@
+# SignupFailedError
+
+The request to create a scratch org failed with error code: %s.
+
+# SignupFailedUnknownError
+
+An unknown server error occurred. Please try again. If you still see this error, contact Salesforce support for assistance. Include the information from 'sfdx force:data:record:get -s ScratchOrgInfo -i %s -u %s'.
+
+# SignupFailedActionError
+
+See https://developer.salesforce.com/docs/atlas.en-us.api.meta/api/sforce_api_objects_signuprequest.htm for information on error code %s.
+
+# SignupUnexpectedError
+
+The request to create a scratch org returned an unexpected status
+
+# INVALID_ID_FIELD
+
+Provide a valid template ID, in the format 0TTxxxxxxxxxxxx.
+
+# T-0002
+
+We couldn’t find a template or snapshot with the ID or name specified in the scratch org definition. If you’re sure the ID is correct, contact Salesforce Support.
+
+# T-0003
+
+The template specified in the scratch org definition is unapproved. Contact Salesforce Support to request template approval.
+
+# T-0004
+
+The Trialforce Source Organization (TSO) for the template doesn’t exist or has expired.
+
+# S-1006
+
+Provide a valid email address in your scratch org definition or your %s file.
+
+# S-2006
+
+Provide a valid country code in your scratch org definition or your %s file.
+
+# S-1017
+
+Specify a namespace that’s used by a release org associated with your Dev Hub org.
+
+# S-1018
+
+Provide a valid My Domain value. This value can’t include double hyphens, end in a hyphen, include restricted words, or be more than 40 characters long.
+
+# S-1019
+
+The My Domain value you chose is already in use.
+
+# S-1026
+
+Provide a valid namespace value. This value must begin with a letter. It can’t include consecutive underscores, end in an underscore, be more than 15 characters long, or be a restricted or reserved namespace. Only alphanumeric characters and underscores are allowed.
+
+# S-9999
+
+A fatal signup error occurred. Please try again. If you still see this error, contact Salesforce Support for assistance.
+
+# SH-0001
+
+Can’t create scratch org. Contact the source org admin to add your Dev Hub org ID to Setup > Org Shape. Then try again.
+
+# SH-0002
+
+Can’t create scratch org. No org shape exists for the specified sourceOrg. Create an org shape and try again.
+
+# SH-0003
+
+Can’t create scratch org from org shape. The org shape version is outdated. Recreate the org shape and try again.
+
+# C-1007
+
+The username provided to the org:create command is already in use. Run 'force:org:list --clean' to remove stale org authentications or create the org with a different username.
+
+# C-1015
+
+We encountered a problem while registering your My Domain value with the DNS provider. Please try again.
+
+# C-1016
+
+We encountered a problem while attempting to configure and approve the Connected App for your org. Verify the Connected App configuration with your Salesforce admin.
+
+# C-1017
+
+Provide a valid namespace prefix. This value must begin with a letter. It can’t include consecutive underscores, end in an underscore, be more than 15 characters long, or be a restricted or reserved namespace. Only alphanumeric characters and underscores are allowed.
+
+# C-1020
+
+We couldn't find a template with the ID specified in the scratch org definition. If you’re sure the ID is correct, contact Salesforce Support.
+
+# C-1027
+
+The template specified in the Scratch Definition isn’t supported. Specify a generic edition (such as Developer or Enterprise), or specify a template ID.
+
+# C-9999
+
+A fatal signup error occurred. Please try again. If you still see this error, contact Salesforce Support for assistance