@salesforce/core 3.7.0 → 3.7.4

package/lib/status/types.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CometClient = 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 events_1 = require("events");
+/**
+ * Comet client interface. The is to allow for mocking the inner streaming Cometd implementation.
+ * The Faye implementation is used by default but it could be used to adapt another Cometd impl.
+ */
+class CometClient extends events_1.EventEmitter {
+}
+exports.CometClient = CometClient;
+//# sourceMappingURL=types.js.map

package/lib/testSetup.d.ts

@@ -5,7 +5,7 @@ import { AnyJson, JsonMap, Optional } from '@salesforce/ts-types';
 import { ConfigContents } from './config/configStore';
 import { Logger } from './logger';
 import { SfdxError } from './sfdxError';
-import { CometClient, CometSubscription, StreamingExtension } from './status/streamingClient';
+import { CometClient, CometSubscription, Message, StreamingExtension } from './status/streamingClient';
 import { SfOrg } from './globalInfo';
 /**
  * Different parts of the system that are mocked out. They can be restored for
@@ -306,7 +306,7 @@ export interface StreamingMockCometSubscriptionOptions {
     /**
      * A list of messages to playback for the client. One message per process tick.
      */
-    messagePlaylist?: JsonMap[];
+    messagePlaylist?: Message[];
 }
 /**
  * Simulates a comet subscription to a streaming channel.
@@ -366,7 +366,7 @@ export declare class StreamingMockCometClient extends CometClient {
      * @param channel The streaming channel.
      * @param callback The function to invoke after the subscription completes.
      */
-    subscribe(channel: string, callback: (message: JsonMap) => void): CometSubscription;
+    subscribe(channel: string, callback: (message: Message) => void): CometSubscription;
     /**
      * Fake disconnect. Does Nothing.
      */
@@ -390,7 +390,9 @@ export declare class MockTestOrgData {
     refreshToken: string;
     userId: string;
     redirectUri: string;
-    constructor(id?: string);
+    constructor(id?: string, options?: {
+        username: string;
+    });
     createDevHubUsername(username: string): void;
     makeDevHub(): void;
     createUser(user: string): MockTestOrgData;

package/lib/testSetup.js

@@ -27,13 +27,13 @@ const streamingClient_1 = require("./status/streamingClient");
 const globalInfo_1 = require("./globalInfo");
 const global_1 = require("./global");
 const uniqid = () => {
-    return crypto_1.randomBytes(16).toString('hex');
+    return (0, crypto_1.randomBytes)(16).toString('hex');
 };
 function getTestLocalPath(uid) {
-    return path_1.join(os_1.tmpdir(), uid, 'sfdx_core', 'local');
+    return (0, path_1.join)((0, os_1.tmpdir)(), uid, 'sfdx_core', 'local');
 }
 function getTestGlobalPath(uid) {
-    return path_1.join(os_1.tmpdir(), uid, 'sfdx_core', 'global');
+    return (0, path_1.join)((0, os_1.tmpdir)(), uid, 'sfdx_core', 'global');
 }
 function retrieveRootPathSync(isGlobal, uid = uniqid()) {
     return isGlobal ? getTestGlobalPath(uid) : getTestLocalPath(uid);
@@ -43,7 +43,7 @@ async function retrieveRootPath(isGlobal, uid = uniqid()) {
     return retrieveRootPathSync(isGlobal, uid);
 }
 function defaultFakeConnectionRequest() {
-    return Promise.resolve(ts_types_1.ensureAnyJson({ records: [] }));
+    return Promise.resolve((0, ts_types_1.ensureAnyJson)({ records: [] }));
 }
 /**
  * Instantiate a @salesforce/core test context. This is automatically created by `const $$ = testSetup()`
@@ -66,7 +66,7 @@ function defaultFakeConnectionRequest() {
  * ```
  * @param sinon
  */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
 const instantiateContext = (sinon) => {
     if (!sinon) {
         try {
@@ -78,7 +78,7 @@ const instantiateContext = (sinon) => {
     }
     // Import all the messages files in the sfdx-core messages dir.
     // Messages.importMessagesDirectory(pathJoin(__dirname, '..', '..'));
-    messages_1.Messages.importMessagesDirectory(path_1.join(__dirname));
+    messages_1.Messages.importMessagesDirectory((0, path_1.join)(__dirname));
     // Create a global sinon sandbox and a test logger instance for use within tests.
     const defaultSandbox = sinon.createSandbox();
     const testContext = {
@@ -110,7 +110,7 @@ const instantiateContext = (sinon) => {
             const stub = this.configStubs[name];
             if (stub && stub.contents) {
                 if (group && stub.contents[group]) {
-                    return ts_types_1.ensureJsonMap(stub.contents[group]);
+                    return (0, ts_types_1.ensureJsonMap)(stub.contents[group]);
                 }
                 else {
                     return stub.contents;
@@ -119,7 +119,7 @@ const instantiateContext = (sinon) => {
             return {};
         },
         setConfigStubContents(name, value) {
-            if (ts_types_1.ensureString(name) && ts_types_1.isJsonMap(value)) {
+            if ((0, ts_types_1.ensureString)(name) && (0, ts_types_1.isJsonMap)(value)) {
                 this.configStubs[name] = value;
             }
         },
@@ -169,12 +169,12 @@ const stubContext = (testContext) => {
     // @ts-ignore
     global_1.Global.SFDX_INTEROPERABILITY = false;
     // Most core files create a child logger so stub this to return our test logger.
-    ts_sinon_1.stubMethod(testContext.SANDBOX, logger_1.Logger, 'child').returns(Promise.resolve(testContext.TEST_LOGGER));
-    ts_sinon_1.stubMethod(testContext.SANDBOX, logger_1.Logger, 'childFromRoot').returns(testContext.TEST_LOGGER);
+    (0, ts_sinon_1.stubMethod)(testContext.SANDBOX, logger_1.Logger, 'child').returns(Promise.resolve(testContext.TEST_LOGGER));
+    (0, ts_sinon_1.stubMethod)(testContext.SANDBOX, logger_1.Logger, 'childFromRoot').returns(testContext.TEST_LOGGER);
     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));
-    ts_sinon_1.stubMethod(testContext.SANDBOXES.PROJECT, sfdxProject_1.SfdxProjectJson.prototype, 'doesPackageExist').callsFake(() => true);
+    (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.PROJECT, sfdxProject_1.SfdxProjectJson.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.
@@ -232,14 +232,14 @@ const stubContext = (testContext) => {
             writeSync.call(this);
         }
     };
-    ts_sinon_1.stubMethod(testContext.SANDBOXES.CONFIG, configFile_1.ConfigFile.prototype, 'writeSync').callsFake(writeSync);
-    ts_sinon_1.stubMethod(testContext.SANDBOXES.CONFIG, configFile_1.ConfigFile.prototype, 'write').callsFake(write);
-    ts_sinon_1.stubMethod(testContext.SANDBOXES.CRYPTO, crypto_2.Crypto.prototype, 'getKeyChain').callsFake(() => Promise.resolve({
+    (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.CONFIG, configFile_1.ConfigFile.prototype, 'writeSync').callsFake(writeSync);
+    (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.CONFIG, configFile_1.ConfigFile.prototype, 'write').callsFake(write);
+    (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.CRYPTO, crypto_2.Crypto.prototype, 'getKeyChain').callsFake(() => Promise.resolve({
         setPassword: () => Promise.resolve(),
         getPassword: (data, cb) => cb(undefined, '12345678901234567890123456789012'),
     }));
-    ts_sinon_1.stubMethod(testContext.SANDBOXES.CONNECTION, connection_1.Connection.prototype, 'isResolvable').resolves(true);
-    ts_sinon_1.stubMethod(testContext.SANDBOXES.CONNECTION, connection_1.Connection.prototype, 'request').callsFake(function (request, options) {
+    (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.CONNECTION, connection_1.Connection.prototype, 'isResolvable').resolves(true);
+    (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.CONNECTION, connection_1.Connection.prototype, 'request').callsFake(function (request, options) {
         if (request === `${this.instanceUrl}/services/data`) {
             return Promise.resolve([{ version: '42.0' }]);
         }
@@ -278,15 +278,15 @@ const restoreContext = (testContext) => {
 exports.restoreContext = restoreContext;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const _testSetup = (sinon) => {
-    const testContext = exports.instantiateContext(sinon);
+    const testContext = (0, exports.instantiateContext)(sinon);
     beforeEach(() => {
         // Allow each test to have their own config aggregator
         // @ts-ignore clear for testing.
         delete configAggregator_1.ConfigAggregator.instance;
-        exports.stubContext(testContext);
+        (0, exports.stubContext)(testContext);
     });
     afterEach(() => {
-        exports.restoreContext(testContext);
+        (0, exports.restoreContext)(testContext);
     });
     return testContext;
 };
@@ -318,7 +318,7 @@ const _testSetup = (sinon) => {
  * });
  * ```
  */
-exports.testSetup = kit_1.once(_testSetup);
+exports.testSetup = (0, kit_1.once)(_testSetup);
 /**
  * A pre-canned error for try/catch testing.
  *
@@ -413,7 +413,7 @@ class StreamingMockCometClient extends streamingClient_1.CometClient {
      * @param {StreamingMockCometSubscriptionOptions} options Extends the StreamingClient options.
      */
     constructor(options) {
-        super(options.url);
+        super();
         this.options = options;
         if (!this.options.messagePlaylist) {
             this.options.messagePlaylist = [{ id: this.options.id }];
@@ -475,11 +475,11 @@ exports.StreamingMockCometClient = StreamingMockCometClient;
  * Mock class for OrgData.
  */
 class MockTestOrgData {
-    constructor(id = uniqid()) {
+    constructor(id = uniqid(), options) {
         this.testId = id;
         this.userId = `user_id_${this.testId}`;
         this.orgId = `${this.testId}`;
-        this.username = `admin_${this.testId}@gb.org`;
+        this.username = (options === null || options === void 0 ? void 0 : options.username) || `admin_${this.testId}@gb.org`;
         this.loginUrl = `http://login.${this.testId}.salesforce.com`;
         this.instanceUrl = `http://instance.${this.testId}.salesforce.com`;
         this.clientId = `${this.testId}/client_id`;
@@ -493,7 +493,7 @@ class MockTestOrgData {
         this.devHubUsername = username;
     }
     makeDevHub() {
-        kit_1.set(this, 'isDevHub', true);
+        (0, kit_1.set)(this, 'isDevHub', true);
     }
     createUser(user) {
         const userMock = new MockTestOrgData();
@@ -544,7 +544,7 @@ class MockTestOrgData {
         if (this.devHubUsername) {
             config.devHubUsername = this.devHubUsername;
         }
-        const isDevHub = ts_types_1.getBoolean(this, 'isDevHub');
+        const isDevHub = (0, ts_types_1.getBoolean)(this, 'isDevHub');
         if (isDevHub) {
             config.isDevHub = isDevHub;
         }

package/lib/util/cache.js

@@ -41,12 +41,12 @@ class Cache extends Map {
         }
     }
     static get(key) {
-        var _b, _c;
+        var _b, _c, _d;
         if (!__classPrivateFieldGet(Cache, _a, "f", _Cache_enabled)) {
             return undefined;
         }
-        __classPrivateFieldSet(_b = Cache.instance(), _Cache_lookups, +__classPrivateFieldGet(_b, _Cache_lookups, "f") + 1, "f");
-        __classPrivateFieldSet(_c = Cache.instance(), _Cache_hits, __classPrivateFieldGet(_c, _Cache_hits, "f") + (Cache.instance().has(key) ? 1 : 0), "f");
+        __classPrivateFieldSet(_b = Cache.instance(), _Cache_lookups, (_c = __classPrivateFieldGet(_b, _Cache_lookups, "f"), _c++, _c), "f");
+        __classPrivateFieldSet(_d = Cache.instance(), _Cache_hits, __classPrivateFieldGet(_d, _Cache_hits, "f") + (Cache.instance().has(key) ? 1 : 0), "f");
         return __classPrivateFieldGet(Cache, _a, "f", _Cache_instance).get(key);
     }
     static disable() {

package/lib/util/fs.js

@@ -34,35 +34,35 @@ exports.fs = Object.assign({}, fsLib, {
     /**
      * Promisified version of {@link https://nodejs.org/api/fsLib.html#fs_fs_readfile_path_options_callback|fsLib.readFile}.
      */
-    readFile: util_1.promisify(fsLib.readFile),
+    readFile: (0, util_1.promisify)(fsLib.readFile),
     /**
      * Promisified version of {@link https://nodejs.org/api/fsLib.html#fs_fs_readdir_path_options_callback|fsLib.readdir}.
      */
-    readdir: util_1.promisify(fsLib.readdir),
+    readdir: (0, util_1.promisify)(fsLib.readdir),
     /**
      * Promisified version of {@link https://nodejs.org/api/fsLib.html#fs_fs_writefile_file_data_options_callback|fsLib.writeFile}.
      */
-    writeFile: util_1.promisify(fsLib.writeFile),
+    writeFile: (0, util_1.promisify)(fsLib.writeFile),
     /**
      * Promisified version of {@link https://nodejs.org/api/fsLib.html#fs_fs_access_path_mode_callback|fsLib.access}.
      */
-    access: util_1.promisify(fsLib.access),
+    access: (0, util_1.promisify)(fsLib.access),
     /**
      * Promisified version of {@link https://nodejs.org/api/fsLib.html#fs_fs_open_path_flags_mode_callback|fsLib.open}.
      */
-    open: util_1.promisify(fsLib.open),
+    open: (0, util_1.promisify)(fsLib.open),
     /**
      * Promisified version of {@link https://nodejs.org/api/fsLib.html#fs_fs_unlink_path_callback|fsLib.unlink}.
      */
-    unlink: util_1.promisify(fsLib.unlink),
+    unlink: (0, util_1.promisify)(fsLib.unlink),
     /**
      * Promisified version of {@link https://nodejs.org/api/fsLib.html#fs_fs_readdir_path_options_callback|fsLib.rmdir}.
      */
-    rmdir: util_1.promisify(fsLib.rmdir),
+    rmdir: (0, util_1.promisify)(fsLib.rmdir),
     /**
      * Promisified version of {@link https://nodejs.org/api/fsLib.html#fs_fs_fstat_fd_callback|fsLib.stat}.
      */
-    stat: util_1.promisify(fsLib.stat),
+    stat: (0, util_1.promisify)(fsLib.stat),
     /**
      * Promisified version of {@link https://npmjs.com/package/mkdirp|mkdirp}.
      */
@@ -183,7 +183,7 @@ exports.fs = Object.assign({}, fsLib, {
      */
     readJson: async (jsonPath, throwOnEmpty) => {
         const fileData = await exports.fs.readFile(jsonPath, 'utf8');
-        return kit_1.parseJson(fileData, jsonPath, throwOnEmpty);
+        return (0, kit_1.parseJson)(fileData, jsonPath, throwOnEmpty);
     },
     /**
      * Read a file and convert it to JSON. Returns the contents of the file as a JSON object
@@ -193,7 +193,7 @@ exports.fs = Object.assign({}, fsLib, {
      */
     readJsonSync: (jsonPath, throwOnEmpty) => {
         const fileData = exports.fs.readFileSync(jsonPath, 'utf8');
-        return kit_1.parseJson(fileData, jsonPath, throwOnEmpty);
+        return (0, kit_1.parseJson)(fileData, jsonPath, throwOnEmpty);
     },
     /**
      * Read a file and convert it to JSON, throwing an error if the parsed contents are not a `JsonMap`.
@@ -203,7 +203,7 @@ exports.fs = Object.assign({}, fsLib, {
      */
     readJsonMap: async (jsonPath, throwOnEmpty) => {
         const fileData = await exports.fs.readFile(jsonPath, 'utf8');
-        return kit_1.parseJsonMap(fileData, jsonPath, throwOnEmpty);
+        return (0, kit_1.parseJsonMap)(fileData, jsonPath, throwOnEmpty);
     },
     /**
      * Read a file and convert it to JSON, throwing an error if the parsed contents are not a `JsonMap`.
@@ -213,7 +213,7 @@ exports.fs = Object.assign({}, fsLib, {
      */
     readJsonMapSync: (jsonPath, throwOnEmpty) => {
         const fileData = exports.fs.readFileSync(jsonPath, 'utf8');
-        return kit_1.parseJsonMap(fileData, jsonPath, throwOnEmpty);
+        return (0, kit_1.parseJsonMap)(fileData, jsonPath, throwOnEmpty);
     },
     /**
      * Convert a JSON-compatible object to a `string` and write it to a file.

package/lib/util/sfdc.js

@@ -63,15 +63,15 @@ exports.sfdc = {
      */
     findUpperCaseKeys: (data, sectionBlocklist = []) => {
         let key;
-        kit_1.findKey(data, (val, k) => {
+        (0, kit_1.findKey)(data, (val, k) => {
             if (k.substr(0, 1) === k.substr(0, 1).toUpperCase()) {
                 key = k;
             }
-            else if (ts_types_1.isJsonMap(val)) {
+            else if ((0, ts_types_1.isJsonMap)(val)) {
                 if (sectionBlocklist.includes(k)) {
                     return key;
                 }
-                key = exports.sfdc.findUpperCaseKeys(ts_types_1.asJsonMap(val));
+                key = exports.sfdc.findUpperCaseKeys((0, ts_types_1.asJsonMap)(val));
             }
             return key;
         });

package/lib/util/sfdcUrl.d.ts

@@ -36,9 +36,10 @@ export declare class SfdcUrl extends URL {
      * @returns {boolean} true if this is a local machine
      */
     isLocalUrl(): boolean;
+    toLightningDomain(): string;
     /**
      * Tests whether this url has the lightning domain extension
-     * This method that performs the dns lookup of the host. If the lookup fails the internal polling (1 second), client will try again untill timeout
+     * This method that performs the dns lookup of the host. If the lookup fails the internal polling (1 second), client will try again until timeout
      * 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

package/lib/util/sfdcUrl.js

@@ -12,12 +12,13 @@ const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const myDomainResolver_1 = require("../status/myDomainResolver");
 const logger_1 = require("../logger");
+const lifecycleEvents_1 = require("../lifecycleEvents");
 class SfdcUrl extends url_1.URL {
     constructor(input, base) {
         super(input.toString(), base);
         if (this.protocol !== 'https:' && !SfdcUrl.cache.has(this.origin)) {
             SfdcUrl.cache.add(this.origin);
-            process.emitWarning('Using insecure protocol: ' + this.protocol + ' on url: ' + this.origin);
+            void lifecycleEvents_1.Lifecycle.getInstance().emitWarning(`Using insecure protocol: ${this.protocol} on url: ${this.origin}`);
         }
     }
     static isValidUrl(input) {
@@ -105,25 +106,31 @@ class SfdcUrl extends url_1.URL {
         const LOCAL_PARTS = ['localhost.sfdcdev.', '.internal.'];
         return LOCAL_PARTS.some((part) => this.origin.includes(part));
     }
+    toLightningDomain() {
+        if (this.origin.endsWith('.my.salesforce.mil')) {
+            return this.origin.replace('.my.salesforce.mil', '.lightning.crmforce.mil');
+        }
+        // all non-mil domains
+        return `https://${(0, ts_types_1.ensureArray)(/https?:\/\/([^.]*)/.exec(this.origin))
+            .slice(1, 2)
+            .pop()}.lightning.force.com`;
+    }
     /**
      * Tests whether this url has the lightning domain extension
-     * This method that performs the dns lookup of the host. If the lookup fails the internal polling (1 second), client will try again untill timeout
+     * This method that performs the dns lookup of the host. If the lookup fails the internal polling (1 second), client will try again until timeout
      * 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.
      */
     async checkLightningDomain() {
-        const domain = `https://${ts_types_1.ensureArray(/https?:\/\/([^.]*)/.exec(this.origin))
-            .slice(1, 2)
-            .pop()}.lightning.force.com`;
-        const quantity = ts_types_1.ensureNumber(new kit_1.Env().getNumber('SFDX_DOMAIN_RETRY', 240));
+        const quantity = (0, ts_types_1.ensureNumber)(new kit_1.Env().getNumber('SFDX_DOMAIN_RETRY', 240));
         const timeout = new kit_1.Duration(quantity, kit_1.Duration.Unit.SECONDS);
         if (this.isInternalUrl() || timeout.seconds === 0) {
             return true;
         }
         const resolver = await myDomainResolver_1.MyDomainResolver.create({
-            url: new url_1.URL(domain),
+            url: new url_1.URL(this.toLightningDomain()),
             timeout,
             frequency: new kit_1.Duration(1, kit_1.Duration.Unit.SECONDS),
         });
@@ -138,7 +145,7 @@ class SfdcUrl extends url_1.URL {
      * @throws {@link SfdxError} If can't resolve DNS.
      */
     async lookup() {
-        const quantity = ts_types_1.ensureNumber(new kit_1.Env().getNumber('SFDX_DOMAIN_RETRY', 240));
+        const quantity = (0, ts_types_1.ensureNumber)(new kit_1.Env().getNumber('SFDX_DOMAIN_RETRY', 240));
         const timeout = new kit_1.Duration(quantity, kit_1.Duration.Unit.SECONDS);
         const resolver = await myDomainResolver_1.MyDomainResolver.create({
             url: new url_1.URL(this.origin),
@@ -155,6 +162,7 @@ class SfdcUrl extends url_1.URL {
      */
     isSandboxUrl(createdOrgInstance) {
         return ((createdOrgInstance && /^cs|s$/gi.test(createdOrgInstance)) ||
+            this.origin.endsWith('sandbox.my.salesforce.mil') ||
             /sandbox\.my\.salesforce\.com/gi.test(this.origin) || // enhanced domains >= 230
             /(cs[0-9]+(\.my|)\.salesforce\.com)/gi.test(this.origin) || // my domains on CS instance OR CS instance without my domain
             /([a-z]{3}[0-9]+s\.sfdc-.+\.salesforce\.com)/gi.test(this.origin) || // falcon sandbox ex: usa2s.sfdc-whatever.salesforce.com

package/lib/webOAuthServer.js

@@ -146,11 +146,11 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
             this.logger.debug('Starting web auth flow');
             // eslint-disable-next-line @typescript-eslint/no-misused-promises
             this.webServer.server.on('request', async (request, response) => {
-                const url = url_1.parse(request.url);
+                const url = (0, url_1.parse)(request.url);
                 this.logger.debug(`processing request for uri: ${url.pathname}`);
                 if (request.method === 'GET') {
                     if (url.pathname && url.pathname.startsWith('/OauthRedirect')) {
-                        request.query = querystring_1.parse(url.query);
+                        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);
                             this.webServer.reportError(err, response);
@@ -158,7 +158,7 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
                         }
                         this.logger.debug(`request.query.state: ${request.query.state}`);
                         try {
-                            this.oauthConfig.authCode = ts_types_1.asString(this.parseAuthCodeFromRequest(response, request));
+                            this.oauthConfig.authCode = (0, ts_types_1.asString)(this.parseAuthCodeFromRequest(response, request));
                             resolve(response);
                         }
                         catch (err) {
@@ -194,9 +194,9 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
             this.webServer.sendError(400, `${error.message}\n`, response);
             this.closeRequest(request);
             this.logger.warn('urlStateMismatchAttempt detected.');
-            if (!ts_types_1.get(this.webServer.server, 'urlStateMismatchAttempt')) {
+            if (!(0, ts_types_1.get)(this.webServer.server, 'urlStateMismatchAttempt')) {
                 this.logger.error(error.message);
-                kit_1.set(this.webServer.server, 'urlStateMismatchAttempt', true);
+                (0, kit_1.set)(this.webServer.server, 'urlStateMismatchAttempt', true);
             }
         }
         else {
@@ -233,7 +233,7 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
      */
     validateState(request) {
         const state = request.query.state;
-        const query = url_1.parse(this.authUrl, true).query;
+        const query = (0, url_1.parse)(this.authUrl, true).query;
         return !!(state && state === query.state);
     }
 }
@@ -372,7 +372,7 @@ class WebServer extends kit_1.AsyncCreatable {
      */
     getSocketTimeout() {
         const env = new kit_1.Env();
-        const socketTimeout = kit_1.toNumber(env.getNumber('SFDX_HTTP_SOCKET_TIMEOUT'));
+        const socketTimeout = (0, kit_1.toNumber)(env.getNumber('SFDX_HTTP_SOCKET_TIMEOUT'));
         return Number.isInteger(socketTimeout) && socketTimeout > 0
             ? socketTimeout
             : WebServer.DEFAULT_CLIENT_SOCKET_TIMEOUT;

package/messages/core.json

@@ -12,9 +12,9 @@
   "OrgDataNotAvailableErrorAction2": "Use `sfdx force:config:set` to update the defaultusername.",
   "OrgDataNotAvailableErrorAction3": "Use `sfdx force:org:create` to create a new org.",
   "OrgDataNotAvailableErrorAction4": "Use `sfdx force:auth` to authenticate an existing org.",
-  "NamedOrgNotFound": "No AuthInfo found for name %s",
-  "NoAliasesFound": "Nothing to set",
-  "InvalidFormat": "Setting aliases must be in the format <key>=<value> but found: [%s]",
+  "NamedOrgNotFound": "No authorization information found for %s %s.",
+  "NoAliasesFound": "Nothing to set.",
+  "InvalidFormat": "Setting aliases must be in the format <key>=<value> but found: [%s].",
   "NoAuthInfoFound": "No authorization information can be found.",
   "InvalidJsonCasing": "All JSON input must have heads down camelcase keys.  E.g., { sfdcLoginUrl: \"https://login.salesforce.com\" }\nFound \"%s\" at %s"
 }

package/messages/core.md

@@ -41,7 +41,7 @@ An attempt to refresh the authentication token failed with a 'Data Not Found Err
 
 # namedOrgNotFound
 
-No AuthInfo found for name %s.
+No authorization information found for %s.
 
 # noAliasesFound
 

package/messages/org.md

@@ -5,3 +5,39 @@ The provided dev hub username %s is not a valid dev hub.
 # noUsernameFound
 
 No username found.
+
+# noDevHubFound
+
+Unable to associate this scratch org with a DevHub.
+
+# deleteOrgHubError
+
+The Dev Hub org cannot be deleted.
+
+# insufficientAccessToDelete
+
+You do not have the appropriate permissions to delete a scratch org. Please contact your Salesforce admin.
+
+# scratchOrgNotFound
+
+Attempting to delete an expired or deleted org
+
+# sandboxDeleteFailed
+
+The sandbox org deletion failed with a result of %s.
+
+# sandboxNotFound
+
+We can't find a SandboxProcess for the sandbox org %s.
+
+# sandboxInfoCreateFailed
+
+The sandbox org creation failed with a result of %s.
+
+# missingAuthUsername
+
+The sandbox %s does not have an authorized username.
+
+# orgPollingTimeout
+
+Sandbox status is %s; timed out waiting for completion.