@salesforce/core 3.4.5 → 3.6.2

package/CHANGELOG.md

@@ -2,12 +2,38 @@
 
 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.4.5](https://github.com/forcedotcom/sfdx-core/compare/v3.4.4...v3.4.5) (2021-09-03)
+### [3.6.2](https://github.com/forcedotcom/sfdx-core/compare/v3.6.1...v3.6.2) (2021-09-17)
+
+
+### Bug Fixes
+
+* improve time to build auths for many orgs @W-9914839@ ([#478](https://github.com/forcedotcom/sfdx-core/issues/478)) ([c788541](https://github.com/forcedotcom/sfdx-core/commit/c7885415d59994b28552227f0b84dcee5d3ec7cf))
+
+### [3.6.1](https://github.com/forcedotcom/sfdx-core/compare/v3.6.0...v3.6.1) (2021-09-13)
+
+
+### Bug Fixes
+
+* remove tokens associated with org ([#477](https://github.com/forcedotcom/sfdx-core/issues/477)) ([5034fa2](https://github.com/forcedotcom/sfdx-core/commit/5034fa2d4c52d347c00499e137a71366e4feba7f))
 
+## [3.6.0](https://github.com/forcedotcom/sfdx-core/compare/v3.5.0...v3.6.0) (2021-09-10)
+
+
+### Features
+
+* add help section helper ([#474](https://github.com/forcedotcom/sfdx-core/issues/474)) ([b34c2d7](https://github.com/forcedotcom/sfdx-core/commit/b34c2d7a442aed2cf091fd394a7c3656287d1dbf))
+
+## [3.5.0](https://github.com/forcedotcom/sfdx-core/compare/v3.4.5...v3.5.0) (2021-09-09)
+
+### Features
+
+- expose well known env vars as part of core ([#473](https://github.com/forcedotcom/sfdx-core/issues/473)) ([11c3f53](https://github.com/forcedotcom/sfdx-core/commit/11c3f53f964459072826274e6ebb33d4a9ecb990))
+
+### [3.4.5](https://github.com/forcedotcom/sfdx-core/compare/v3.4.4...v3.4.5) (2021-09-03)
 
 ### Bug Fixes
 
-* provide the correct options to SfdxConfig ([fa2117e](https://github.com/forcedotcom/sfdx-core/commit/fa2117e12d7a903f26067bdcf35d7ec9c142101e))
+- provide the correct options to SfdxConfig ([fa2117e](https://github.com/forcedotcom/sfdx-core/commit/fa2117e12d7a903f26067bdcf35d7ec9c142101e))
 
 ### [3.4.4](https://github.com/forcedotcom/sfdx-core/compare/v3.4.3...v3.4.4) (2021-09-03)
 

package/lib/config/config.js

@@ -30,6 +30,15 @@ const messages = messages_1.Messages.load('@salesforce/core', 'config', [
     'invalidNumberConfigValue',
     'invalidWrite',
     'unknownConfigKey',
+    'defaultUsername',
+    'defaultDevHubUsername',
+    'isvDebuggerSid',
+    'isvDebuggerUrl',
+    'apiVersion',
+    'disableTelemetry',
+    'maxQueryLimit',
+    'restDeploy',
+    'instanceUrl',
 ]);
 const log = logger_1.Logger.childFromRoot('core:config');
 const SFDX_CONFIG_FILE_NAME = 'sfdx-config.json';
@@ -76,7 +85,7 @@ var SfdxPropertyKeys;
 exports.SFDX_ALLOWED_PROPERTIES = [
     {
         key: SfdxPropertyKeys.INSTANCE_URL,
-        description: '',
+        description: messages.getMessage(SfdxPropertyKeys.INSTANCE_URL),
         input: {
             // If a value is provided validate it otherwise no value is unset.
             validator: (value) => {
@@ -93,7 +102,7 @@ exports.SFDX_ALLOWED_PROPERTIES = [
     },
     {
         key: SfdxPropertyKeys.API_VERSION,
-        description: '',
+        description: messages.getMessage(SfdxPropertyKeys.API_VERSION),
         hidden: true,
         input: {
             // If a value is provided validate it otherwise no value is unset.
@@ -105,17 +114,17 @@ exports.SFDX_ALLOWED_PROPERTIES = [
         key: SfdxPropertyKeys.DEFAULT_DEV_HUB_USERNAME,
         newKey: orgConfigProperties_1.OrgConfigProperties.TARGET_DEV_HUB,
         deprecated: true,
-        description: '',
+        description: messages.getMessage('defaultDevHubUsername'),
     },
     {
         key: SfdxPropertyKeys.DEFAULT_USERNAME,
         newKey: orgConfigProperties_1.OrgConfigProperties.TARGET_ORG,
         deprecated: true,
-        description: '',
+        description: messages.getMessage('defaultUsername'),
     },
     {
         key: SfdxPropertyKeys.ISV_DEBUGGER_SID,
-        description: '',
+        description: messages.getMessage(SfdxPropertyKeys.ISV_DEBUGGER_SID),
         encrypted: true,
         input: {
             // If a value is provided validate it otherwise no value is unset.
@@ -125,7 +134,7 @@ exports.SFDX_ALLOWED_PROPERTIES = [
     },
     {
         key: SfdxPropertyKeys.ISV_DEBUGGER_URL,
-        description: '',
+        description: messages.getMessage(SfdxPropertyKeys.ISV_DEBUGGER_URL),
         input: {
             // If a value is provided validate it otherwise no value is unset.
             validator: (value) => value == null || ts_types_1.isString(value),
@@ -134,7 +143,7 @@ exports.SFDX_ALLOWED_PROPERTIES = [
     },
     {
         key: SfdxPropertyKeys.DISABLE_TELEMETRY,
-        description: '',
+        description: messages.getMessage(SfdxPropertyKeys.DISABLE_TELEMETRY),
         input: {
             validator: (value) => value == null || ['true', 'false'].includes(value.toString()),
             failedMessage: messages.getMessage('invalidBooleanConfigValue'),
@@ -143,7 +152,7 @@ exports.SFDX_ALLOWED_PROPERTIES = [
     // This should be brought in by a plugin, but there isn't a way to do that right now.
     {
         key: SfdxPropertyKeys.REST_DEPLOY,
-        description: '',
+        description: messages.getMessage(SfdxPropertyKeys.REST_DEPLOY),
         hidden: true,
         input: {
             validator: (value) => value != null && ['true', 'false'].includes(value.toString()),
@@ -152,7 +161,7 @@ exports.SFDX_ALLOWED_PROPERTIES = [
     },
     {
         key: SfdxPropertyKeys.MAX_QUERY_LIMIT,
-        description: '',
+        description: messages.getMessage(SfdxPropertyKeys.MAX_QUERY_LIMIT),
         input: {
             // the bit shift will remove the negative bit, and any decimal numbers
             // then the parseFloat will handle converting it to a number from a string

package/lib/config/configAggregator.d.ts

@@ -189,12 +189,6 @@ export declare class ConfigAggregator extends AsyncOptionalCreatable<JsonMap> {
      * @param properties The properties to set.
      */
     private setAllowedProperties;
-    /**
-     * Sets the env variables.
-     *
-     * @param envVars The env variables to set.
-     */
-    private setEnvVars;
 }
 export declare namespace ConfigAggregator {
     /**

package/lib/config/configAggregator.js

@@ -9,11 +9,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigAggregator = void 0;
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
+const change_case_1 = require("change-case");
 const messages_1 = require("../messages");
+const envVars_1 = require("./envVars");
 const config_1 = require("./config");
 messages_1.Messages.importMessagesDirectory(__dirname);
 const messages = messages_1.Messages.load('@salesforce/core', 'config', ['unknownConfigKey', 'deprecatedConfigKey']);
-const propertyToEnvName = (property) => `SFDX_${kit_1.snakeCase(property).toUpperCase()}`;
+const propertyToEnvName = (property, prefix = 'SFDX_') => `${prefix || ''}${change_case_1.snakeCase(property).toUpperCase()}`;
 /**
  * Aggregate global and local project config files, as well as environment variables for
  * `sfdx-config.json`. The resolution happens in the following bottom-up order:
@@ -186,7 +188,7 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
      * @param key The key of the property.
      */
     getPath(key) {
-        if (this.envVars[key] != null) {
+        if (this.envVars.getString(key) != null) {
             return `$${propertyToEnvName(key)}`;
         }
         if (this.localConfig && this.localConfig.getContents()[key] != null) {
@@ -236,7 +238,7 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
      * Get the config properties that are environment variables.
      */
     getEnvVars() {
-        return new Map(ts_types_1.definiteEntriesOf(this.envVars));
+        return this.envVars.asMap();
     }
     /**
      * Re-read all property configurations from disk.
@@ -270,14 +272,10 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
         this.resolveProperties(this.globalConfig.readSync(), this.localConfig && this.localConfig.readSync());
     }
     resolveProperties(globalConfig, localConfig) {
-        const accumulator = {};
-        this.setEnvVars(this.getAllowedProperties().reduce((obj, property) => {
-            const val = process.env[propertyToEnvName(property.key)];
-            if (val != null) {
-                obj[property.key] = val;
-            }
-            return obj;
-        }, accumulator));
+        this.envVars = new envVars_1.EnvVars();
+        for (const property of this.getAllowedProperties()) {
+            this.envVars.setPropertyFromEnv(property.key);
+        }
         // Global config must be read first so it is on the left hand of the
         // object assign and is overwritten by the local config.
         const configs = [globalConfig];
@@ -285,7 +283,7 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
         if (localConfig) {
             configs.push(localConfig);
         }
-        configs.push(this.envVars);
+        configs.push(this.envVars.asDictionary());
         const json = {};
         const reduced = configs.filter(ts_types_1.isJsonMap).reduce((acc, el) => kit_1.merge(acc, el), json);
         return reduced;
@@ -304,14 +302,6 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
     setAllowedProperties(properties) {
         this.allowedProperties = properties;
     }
-    /**
-     * Sets the env variables.
-     *
-     * @param envVars The env variables to set.
-     */
-    setEnvVars(envVars) {
-        this.envVars = envVars;
-    }
 }
 exports.ConfigAggregator = ConfigAggregator;
 ConfigAggregator.encrypted = true;

package/lib/config/envVars.d.ts

@@ -0,0 +1,81 @@
+import { Dictionary, Nullable } from '@salesforce/ts-types';
+import { Env } from '@salesforce/kit';
+export declare enum EnvironmentVariable {
+    'FORCE_OPEN_URL' = "FORCE_OPEN_URL",
+    'FORCE_SHOW_SPINNER' = "FORCE_SHOW_SPINNER",
+    'FORCE_SPINNER_DELAY' = "FORCE_SPINNER_DELAY",
+    'HTTP_PROXY' = "HTTP_PROXY",
+    'HTTPS_PROXY' = "HTTPS_PROXY",
+    'NODE_EXTRA_CA_CERTS' = "NODE_EXTRA_CA_CERTS",
+    'NODE_TLS_REJECT_UNAUTHORIZED' = "NODE_TLS_REJECT_UNAUTHORIZED",
+    'SFDX_ACCESS_TOKEN' = "SFDX_ACCESS_TOKEN",
+    'SFDX_API_VERSION' = "SFDX_API_VERSION",
+    'SFDX_AUDIENCE_URL' = "SFDX_AUDIENCE_URL",
+    'SFDX_CODE_COVERAGE_REQUIREMENT' = "SFDX_CODE_COVERAGE_REQUIREMENT",
+    'SFDX_CONTENT_TYPE' = "SFDX_CONTENT_TYPE",
+    'SFDX_DEFAULTDEVHUBUSERNAME' = "SFDX_DEFAULTDEVHUBUSERNAME",
+    'SFDX_DEFAULTUSERNAME' = "SFDX_DEFAULTUSERNAME",
+    'SFDX_DISABLE_AUTOUPDATE' = "SFDX_DISABLE_AUTOUPDATE",
+    'SFDX_AUTOUPDATE_DISABLE' = "SFDX_AUTOUPDATE_DISABLE",
+    'SFDX_DISABLE_SOURCE_MEMBER_POLLING' = "SFDX_DISABLE_SOURCE_MEMBER_POLLING",
+    'SFDX_DISABLE_TELEMETRY' = "SFDX_DISABLE_TELEMETRY",
+    'SFDX_DNS_TIMEOUT' = "SFDX_DNS_TIMEOUT",
+    'SFDX_DOMAIN_RETRY' = "SFDX_DOMAIN_RETRY",
+    'SFDX_IMPROVED_CODE_COVERAGE' = "SFDX_IMPROVED_CODE_COVERAGE",
+    'SFDX_INSTANCE_URL' = "SFDX_INSTANCE_URL",
+    'SFDX_JSON_TO_STDOUT' = "SFDX_JSON_TO_STDOUT",
+    'SFDX_LOG_LEVEL' = "SFDX_LOG_LEVEL",
+    'SFDX_MAX_QUERY_LIMIT' = "SFDX_MAX_QUERY_LIMIT",
+    'SFDX_MDAPI_TEMP_DIR' = "SFDX_MDAPI_TEMP_DIR",
+    'SFDX_NPM_REGISTRY' = "SFDX_NPM_REGISTRY",
+    'SFDX_PRECOMPILE_ENABLE' = "SFDX_PRECOMPILE_ENABLE",
+    'SFDX_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_CREATE' = "SFDX_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_CREATE",
+    'SFDX_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_VERSION_CREATE' = "SFDX_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_VERSION_CREATE",
+    'SFDX_REST_DEPLOY' = "SFDX_REST_DEPLOY",
+    'SFDX_SOURCE_MEMBER_POLLING_TIMEOUT' = "SFDX_SOURCE_MEMBER_POLLING_TIMEOUT",
+    'SFDX_USE_GENERIC_UNIX_KEYCHAIN' = "SFDX_USE_GENERIC_UNIX_KEYCHAIN",
+    'SFDX_USE_PROGRESS_BAR' = "SFDX_USE_PROGRESS_BAR",
+    'SF_TARGET_ORG' = "SF_TARGET_ORG",
+    'SF_TARGET_DEV_HUB' = "SF_TARGET_DEV_HUB",
+    'SF_ACCESS_TOKEN' = "SF_ACCESS_TOKEN",
+    'SF_API_VERSION' = "SF_API_VERSION",
+    'SF_AUDIENCE_URL' = "SF_AUDIENCE_URL",
+    'SF_CODE_COVERAGE_REQUIREMENT' = "SF_CODE_COVERAGE_REQUIREMENT",
+    'SF_CONTENT_TYPE' = "SF_CONTENT_TYPE",
+    'SF_DISABLE_AUTOUPDATE' = "SF_DISABLE_AUTOUPDATE",
+    'SF_AUTOUPDATE_DISABLE' = "SF_AUTOUPDATE_DISABLE",
+    'SF_DISABLE_SOURCE_MEMBER_POLLING' = "SF_DISABLE_SOURCE_MEMBER_POLLING",
+    'SF_DISABLE_TELEMETRY' = "SF_DISABLE_TELEMETRY",
+    'SF_DNS_TIMEOUT' = "SF_DNS_TIMEOUT",
+    'SF_DOMAIN_RETRY' = "SF_DOMAIN_RETRY",
+    'SF_IMPROVED_CODE_COVERAGE' = "SF_IMPROVED_CODE_COVERAGE",
+    'SF_INSTANCE_URL' = "SF_INSTANCE_URL",
+    'SF_JSON_TO_STDOUT' = "SF_JSON_TO_STDOUT",
+    'SF_LOG_LEVEL' = "SF_LOG_LEVEL",
+    'SF_MAX_QUERY_LIMIT' = "SF_MAX_QUERY_LIMIT",
+    'SF_MDAPI_TEMP_DIR' = "SF_MDAPI_TEMP_DIR",
+    'SF_NPM_REGISTRY' = "SF_NPM_REGISTRY",
+    'SF_PRECOMPILE_ENABLE' = "SF_PRECOMPILE_ENABLE",
+    'SF_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_CREATE' = "SF_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_CREATE",
+    'SF_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_VERSION_CREATE' = "SF_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_VERSION_CREATE",
+    'SF_SOURCE_MEMBER_POLLING_TIMEOUT' = "SF_SOURCE_MEMBER_POLLING_TIMEOUT",
+    'SF_USE_GENERIC_UNIX_KEYCHAIN' = "SF_USE_GENERIC_UNIX_KEYCHAIN",
+    'SF_USE_PROGRESS_BAR' = "SF_USE_PROGRESS_BAR"
+}
+declare type EnvMetaData = {
+    description: string;
+    synonymOf: Nullable<string>;
+};
+declare type EnvType = {
+    [key in EnvironmentVariable]: EnvMetaData;
+};
+export declare const SUPPORTED_ENV_VARS: EnvType;
+export declare class EnvVars extends Env {
+    constructor();
+    propertyToEnvName(property: string, prefix?: string): string;
+    setPropertyFromEnv(property: string, prefix?: string): void;
+    asDictionary(): Dictionary<string>;
+    asMap(): Map<string, string>;
+    private resolve;
+}
+export {};

package/lib/config/envVars.js

@@ -0,0 +1,368 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EnvVars = exports.SUPPORTED_ENV_VARS = exports.EnvironmentVariable = 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 path_1 = require("path");
+const change_case_1 = require("change-case");
+const kit_1 = require("@salesforce/kit");
+const messages_1 = require("../messages");
+const global_1 = require("../global");
+messages_1.Messages.importMessagesDirectory(path_1.join(__dirname));
+const messages = messages_1.Messages.loadMessages('@salesforce/core', 'envVars');
+var EnvironmentVariable;
+(function (EnvironmentVariable) {
+    EnvironmentVariable["FORCE_OPEN_URL"] = "FORCE_OPEN_URL";
+    EnvironmentVariable["FORCE_SHOW_SPINNER"] = "FORCE_SHOW_SPINNER";
+    EnvironmentVariable["FORCE_SPINNER_DELAY"] = "FORCE_SPINNER_DELAY";
+    EnvironmentVariable["HTTP_PROXY"] = "HTTP_PROXY";
+    EnvironmentVariable["HTTPS_PROXY"] = "HTTPS_PROXY";
+    EnvironmentVariable["NODE_EXTRA_CA_CERTS"] = "NODE_EXTRA_CA_CERTS";
+    EnvironmentVariable["NODE_TLS_REJECT_UNAUTHORIZED"] = "NODE_TLS_REJECT_UNAUTHORIZED";
+    EnvironmentVariable["SFDX_ACCESS_TOKEN"] = "SFDX_ACCESS_TOKEN";
+    EnvironmentVariable["SFDX_API_VERSION"] = "SFDX_API_VERSION";
+    EnvironmentVariable["SFDX_AUDIENCE_URL"] = "SFDX_AUDIENCE_URL";
+    EnvironmentVariable["SFDX_CODE_COVERAGE_REQUIREMENT"] = "SFDX_CODE_COVERAGE_REQUIREMENT";
+    EnvironmentVariable["SFDX_CONTENT_TYPE"] = "SFDX_CONTENT_TYPE";
+    EnvironmentVariable["SFDX_DEFAULTDEVHUBUSERNAME"] = "SFDX_DEFAULTDEVHUBUSERNAME";
+    EnvironmentVariable["SFDX_DEFAULTUSERNAME"] = "SFDX_DEFAULTUSERNAME";
+    EnvironmentVariable["SFDX_DISABLE_AUTOUPDATE"] = "SFDX_DISABLE_AUTOUPDATE";
+    EnvironmentVariable["SFDX_AUTOUPDATE_DISABLE"] = "SFDX_AUTOUPDATE_DISABLE";
+    EnvironmentVariable["SFDX_DISABLE_SOURCE_MEMBER_POLLING"] = "SFDX_DISABLE_SOURCE_MEMBER_POLLING";
+    EnvironmentVariable["SFDX_DISABLE_TELEMETRY"] = "SFDX_DISABLE_TELEMETRY";
+    EnvironmentVariable["SFDX_DNS_TIMEOUT"] = "SFDX_DNS_TIMEOUT";
+    EnvironmentVariable["SFDX_DOMAIN_RETRY"] = "SFDX_DOMAIN_RETRY";
+    EnvironmentVariable["SFDX_IMPROVED_CODE_COVERAGE"] = "SFDX_IMPROVED_CODE_COVERAGE";
+    EnvironmentVariable["SFDX_INSTANCE_URL"] = "SFDX_INSTANCE_URL";
+    EnvironmentVariable["SFDX_JSON_TO_STDOUT"] = "SFDX_JSON_TO_STDOUT";
+    EnvironmentVariable["SFDX_LOG_LEVEL"] = "SFDX_LOG_LEVEL";
+    EnvironmentVariable["SFDX_MAX_QUERY_LIMIT"] = "SFDX_MAX_QUERY_LIMIT";
+    EnvironmentVariable["SFDX_MDAPI_TEMP_DIR"] = "SFDX_MDAPI_TEMP_DIR";
+    EnvironmentVariable["SFDX_NPM_REGISTRY"] = "SFDX_NPM_REGISTRY";
+    EnvironmentVariable["SFDX_PRECOMPILE_ENABLE"] = "SFDX_PRECOMPILE_ENABLE";
+    EnvironmentVariable["SFDX_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_CREATE"] = "SFDX_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_CREATE";
+    EnvironmentVariable["SFDX_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_VERSION_CREATE"] = "SFDX_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_VERSION_CREATE";
+    EnvironmentVariable["SFDX_REST_DEPLOY"] = "SFDX_REST_DEPLOY";
+    EnvironmentVariable["SFDX_SOURCE_MEMBER_POLLING_TIMEOUT"] = "SFDX_SOURCE_MEMBER_POLLING_TIMEOUT";
+    EnvironmentVariable["SFDX_USE_GENERIC_UNIX_KEYCHAIN"] = "SFDX_USE_GENERIC_UNIX_KEYCHAIN";
+    EnvironmentVariable["SFDX_USE_PROGRESS_BAR"] = "SFDX_USE_PROGRESS_BAR";
+    EnvironmentVariable["SF_TARGET_ORG"] = "SF_TARGET_ORG";
+    EnvironmentVariable["SF_TARGET_DEV_HUB"] = "SF_TARGET_DEV_HUB";
+    EnvironmentVariable["SF_ACCESS_TOKEN"] = "SF_ACCESS_TOKEN";
+    EnvironmentVariable["SF_API_VERSION"] = "SF_API_VERSION";
+    EnvironmentVariable["SF_AUDIENCE_URL"] = "SF_AUDIENCE_URL";
+    EnvironmentVariable["SF_CODE_COVERAGE_REQUIREMENT"] = "SF_CODE_COVERAGE_REQUIREMENT";
+    EnvironmentVariable["SF_CONTENT_TYPE"] = "SF_CONTENT_TYPE";
+    EnvironmentVariable["SF_DISABLE_AUTOUPDATE"] = "SF_DISABLE_AUTOUPDATE";
+    EnvironmentVariable["SF_AUTOUPDATE_DISABLE"] = "SF_AUTOUPDATE_DISABLE";
+    EnvironmentVariable["SF_DISABLE_SOURCE_MEMBER_POLLING"] = "SF_DISABLE_SOURCE_MEMBER_POLLING";
+    EnvironmentVariable["SF_DISABLE_TELEMETRY"] = "SF_DISABLE_TELEMETRY";
+    EnvironmentVariable["SF_DNS_TIMEOUT"] = "SF_DNS_TIMEOUT";
+    EnvironmentVariable["SF_DOMAIN_RETRY"] = "SF_DOMAIN_RETRY";
+    EnvironmentVariable["SF_IMPROVED_CODE_COVERAGE"] = "SF_IMPROVED_CODE_COVERAGE";
+    EnvironmentVariable["SF_INSTANCE_URL"] = "SF_INSTANCE_URL";
+    EnvironmentVariable["SF_JSON_TO_STDOUT"] = "SF_JSON_TO_STDOUT";
+    EnvironmentVariable["SF_LOG_LEVEL"] = "SF_LOG_LEVEL";
+    EnvironmentVariable["SF_MAX_QUERY_LIMIT"] = "SF_MAX_QUERY_LIMIT";
+    EnvironmentVariable["SF_MDAPI_TEMP_DIR"] = "SF_MDAPI_TEMP_DIR";
+    EnvironmentVariable["SF_NPM_REGISTRY"] = "SF_NPM_REGISTRY";
+    EnvironmentVariable["SF_PRECOMPILE_ENABLE"] = "SF_PRECOMPILE_ENABLE";
+    EnvironmentVariable["SF_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_CREATE"] = "SF_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_CREATE";
+    EnvironmentVariable["SF_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_VERSION_CREATE"] = "SF_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_VERSION_CREATE";
+    EnvironmentVariable["SF_SOURCE_MEMBER_POLLING_TIMEOUT"] = "SF_SOURCE_MEMBER_POLLING_TIMEOUT";
+    EnvironmentVariable["SF_USE_GENERIC_UNIX_KEYCHAIN"] = "SF_USE_GENERIC_UNIX_KEYCHAIN";
+    EnvironmentVariable["SF_USE_PROGRESS_BAR"] = "SF_USE_PROGRESS_BAR";
+})(EnvironmentVariable = exports.EnvironmentVariable || (exports.EnvironmentVariable = {}));
+const getMessage = (environmentVariable) => messages.getMessage(change_case_1.camelCase(environmentVariable));
+exports.SUPPORTED_ENV_VARS = {
+    [EnvironmentVariable.FORCE_SHOW_SPINNER]: {
+        description: getMessage(EnvironmentVariable.FORCE_SHOW_SPINNER),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.FORCE_SPINNER_DELAY]: {
+        description: getMessage(EnvironmentVariable.FORCE_SPINNER_DELAY),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.FORCE_OPEN_URL]: {
+        description: getMessage(EnvironmentVariable.FORCE_OPEN_URL),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.HTTP_PROXY]: {
+        description: getMessage(EnvironmentVariable.HTTP_PROXY),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.HTTPS_PROXY]: {
+        description: getMessage(EnvironmentVariable.HTTPS_PROXY),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.NODE_EXTRA_CA_CERTS]: {
+        description: getMessage(EnvironmentVariable.NODE_EXTRA_CA_CERTS),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.NODE_TLS_REJECT_UNAUTHORIZED]: {
+        description: getMessage(EnvironmentVariable.NODE_TLS_REJECT_UNAUTHORIZED),
+        synonymOf: null,
+    },
+    // sfdx vars
+    [EnvironmentVariable.SFDX_ACCESS_TOKEN]: {
+        description: getMessage(EnvironmentVariable.SFDX_ACCESS_TOKEN),
+        synonymOf: EnvironmentVariable.SF_ACCESS_TOKEN,
+    },
+    [EnvironmentVariable.SFDX_API_VERSION]: {
+        description: getMessage(EnvironmentVariable.SFDX_API_VERSION),
+        synonymOf: EnvironmentVariable.SF_API_VERSION,
+    },
+    [EnvironmentVariable.SFDX_AUDIENCE_URL]: {
+        description: getMessage(EnvironmentVariable.SFDX_AUDIENCE_URL),
+        synonymOf: EnvironmentVariable.SF_AUDIENCE_URL,
+    },
+    [EnvironmentVariable.SFDX_CODE_COVERAGE_REQUIREMENT]: {
+        description: getMessage(EnvironmentVariable.SFDX_CODE_COVERAGE_REQUIREMENT),
+        synonymOf: EnvironmentVariable.SF_CODE_COVERAGE_REQUIREMENT,
+    },
+    [EnvironmentVariable.SFDX_CONTENT_TYPE]: {
+        description: getMessage(EnvironmentVariable.SFDX_CONTENT_TYPE),
+        synonymOf: EnvironmentVariable.SF_CONTENT_TYPE,
+    },
+    [EnvironmentVariable.SFDX_DEFAULTDEVHUBUSERNAME]: {
+        description: getMessage(EnvironmentVariable.SFDX_DEFAULTDEVHUBUSERNAME),
+        synonymOf: EnvironmentVariable.SF_TARGET_DEV_HUB,
+    },
+    [EnvironmentVariable.SFDX_DEFAULTUSERNAME]: {
+        description: getMessage(EnvironmentVariable.SFDX_DEFAULTUSERNAME),
+        synonymOf: EnvironmentVariable.SF_TARGET_ORG,
+    },
+    [EnvironmentVariable.SFDX_DISABLE_AUTOUPDATE]: {
+        description: getMessage(EnvironmentVariable.SFDX_DISABLE_AUTOUPDATE),
+        synonymOf: EnvironmentVariable.SF_DISABLE_AUTOUPDATE,
+    },
+    [EnvironmentVariable.SFDX_AUTOUPDATE_DISABLE]: {
+        description: getMessage(EnvironmentVariable.SFDX_AUTOUPDATE_DISABLE),
+        synonymOf: EnvironmentVariable.SF_AUTOUPDATE_DISABLE,
+    },
+    [EnvironmentVariable.SFDX_DISABLE_SOURCE_MEMBER_POLLING]: {
+        description: getMessage(EnvironmentVariable.SFDX_DISABLE_SOURCE_MEMBER_POLLING),
+        synonymOf: EnvironmentVariable.SF_DISABLE_SOURCE_MEMBER_POLLING,
+    },
+    [EnvironmentVariable.SFDX_DISABLE_TELEMETRY]: {
+        description: getMessage(EnvironmentVariable.SFDX_DISABLE_TELEMETRY),
+        synonymOf: EnvironmentVariable.SF_DISABLE_TELEMETRY,
+    },
+    [EnvironmentVariable.SFDX_DNS_TIMEOUT]: {
+        description: getMessage(EnvironmentVariable.SFDX_DNS_TIMEOUT),
+        synonymOf: EnvironmentVariable.SF_DNS_TIMEOUT,
+    },
+    [EnvironmentVariable.SFDX_DOMAIN_RETRY]: {
+        description: getMessage(EnvironmentVariable.SFDX_DOMAIN_RETRY),
+        synonymOf: EnvironmentVariable.SF_DOMAIN_RETRY,
+    },
+    [EnvironmentVariable.SFDX_IMPROVED_CODE_COVERAGE]: {
+        description: getMessage(EnvironmentVariable.SFDX_IMPROVED_CODE_COVERAGE),
+        synonymOf: EnvironmentVariable.SF_IMPROVED_CODE_COVERAGE,
+    },
+    [EnvironmentVariable.SFDX_INSTANCE_URL]: {
+        description: getMessage(EnvironmentVariable.SFDX_INSTANCE_URL),
+        synonymOf: EnvironmentVariable.SF_INSTANCE_URL,
+    },
+    [EnvironmentVariable.SFDX_JSON_TO_STDOUT]: {
+        description: getMessage(EnvironmentVariable.SFDX_JSON_TO_STDOUT),
+        synonymOf: EnvironmentVariable.SF_JSON_TO_STDOUT,
+    },
+    [EnvironmentVariable.SFDX_LOG_LEVEL]: {
+        description: getMessage(EnvironmentVariable.SFDX_LOG_LEVEL),
+        synonymOf: EnvironmentVariable.SF_LOG_LEVEL,
+    },
+    [EnvironmentVariable.SFDX_MAX_QUERY_LIMIT]: {
+        description: getMessage(EnvironmentVariable.SFDX_MAX_QUERY_LIMIT),
+        synonymOf: EnvironmentVariable.SF_MAX_QUERY_LIMIT,
+    },
+    [EnvironmentVariable.SFDX_MDAPI_TEMP_DIR]: {
+        description: getMessage(EnvironmentVariable.SFDX_MDAPI_TEMP_DIR),
+        synonymOf: EnvironmentVariable.SF_MDAPI_TEMP_DIR,
+    },
+    [EnvironmentVariable.SFDX_NPM_REGISTRY]: {
+        description: getMessage(EnvironmentVariable.SFDX_NPM_REGISTRY),
+        synonymOf: EnvironmentVariable.SF_NPM_REGISTRY,
+    },
+    [EnvironmentVariable.SFDX_PRECOMPILE_ENABLE]: {
+        description: getMessage(EnvironmentVariable.SFDX_PRECOMPILE_ENABLE),
+        synonymOf: EnvironmentVariable.SF_PRECOMPILE_ENABLE,
+    },
+    [EnvironmentVariable.SFDX_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_CREATE]: {
+        description: getMessage(EnvironmentVariable.SFDX_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_CREATE),
+        synonymOf: EnvironmentVariable.SF_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_CREATE,
+    },
+    [EnvironmentVariable.SFDX_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_VERSION_CREATE]: {
+        description: messages.getMessage(change_case_1.camelCase(EnvironmentVariable.SFDX_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_VERSION_CREATE)),
+        synonymOf: EnvironmentVariable.SF_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_VERSION_CREATE,
+    },
+    [EnvironmentVariable.SFDX_REST_DEPLOY]: {
+        description: getMessage(EnvironmentVariable.SFDX_REST_DEPLOY),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SFDX_SOURCE_MEMBER_POLLING_TIMEOUT]: {
+        description: getMessage(EnvironmentVariable.SFDX_SOURCE_MEMBER_POLLING_TIMEOUT),
+        synonymOf: EnvironmentVariable.SF_SOURCE_MEMBER_POLLING_TIMEOUT,
+    },
+    [EnvironmentVariable.SFDX_USE_GENERIC_UNIX_KEYCHAIN]: {
+        description: getMessage(EnvironmentVariable.SFDX_USE_GENERIC_UNIX_KEYCHAIN),
+        synonymOf: EnvironmentVariable.SF_USE_GENERIC_UNIX_KEYCHAIN,
+    },
+    [EnvironmentVariable.SFDX_USE_PROGRESS_BAR]: {
+        description: getMessage(EnvironmentVariable.SFDX_USE_PROGRESS_BAR),
+        synonymOf: EnvironmentVariable.SF_USE_PROGRESS_BAR,
+    },
+    [EnvironmentVariable.SF_TARGET_ORG]: {
+        description: getMessage(EnvironmentVariable.SF_TARGET_ORG),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_TARGET_DEV_HUB]: {
+        description: getMessage(EnvironmentVariable.SF_TARGET_DEV_HUB),
+        synonymOf: null,
+    },
+    // sf vars
+    [EnvironmentVariable.SF_ACCESS_TOKEN]: {
+        description: getMessage(EnvironmentVariable.SF_ACCESS_TOKEN),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_API_VERSION]: {
+        description: getMessage(EnvironmentVariable.SF_API_VERSION),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_AUDIENCE_URL]: {
+        description: getMessage(EnvironmentVariable.SF_AUDIENCE_URL),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_CODE_COVERAGE_REQUIREMENT]: {
+        description: getMessage(EnvironmentVariable.SF_CODE_COVERAGE_REQUIREMENT),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_CONTENT_TYPE]: {
+        description: getMessage(EnvironmentVariable.SF_CONTENT_TYPE),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_DISABLE_AUTOUPDATE]: {
+        description: getMessage(EnvironmentVariable.SF_DISABLE_AUTOUPDATE),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_AUTOUPDATE_DISABLE]: {
+        description: getMessage(EnvironmentVariable.SF_AUTOUPDATE_DISABLE),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_DISABLE_SOURCE_MEMBER_POLLING]: {
+        description: getMessage(EnvironmentVariable.SF_DISABLE_SOURCE_MEMBER_POLLING),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_DISABLE_TELEMETRY]: {
+        description: getMessage(EnvironmentVariable.SF_DISABLE_TELEMETRY),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_DNS_TIMEOUT]: {
+        description: getMessage(EnvironmentVariable.SF_DNS_TIMEOUT),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_DOMAIN_RETRY]: {
+        description: getMessage(EnvironmentVariable.SF_DOMAIN_RETRY),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_IMPROVED_CODE_COVERAGE]: {
+        description: getMessage(EnvironmentVariable.SF_IMPROVED_CODE_COVERAGE),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_INSTANCE_URL]: {
+        description: getMessage(EnvironmentVariable.SF_INSTANCE_URL),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_JSON_TO_STDOUT]: {
+        description: getMessage(EnvironmentVariable.SF_JSON_TO_STDOUT),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_LOG_LEVEL]: {
+        description: getMessage(EnvironmentVariable.SF_LOG_LEVEL),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_MAX_QUERY_LIMIT]: {
+        description: getMessage(EnvironmentVariable.SF_MAX_QUERY_LIMIT),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_MDAPI_TEMP_DIR]: {
+        description: getMessage(EnvironmentVariable.SF_MDAPI_TEMP_DIR),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_NPM_REGISTRY]: {
+        description: getMessage(EnvironmentVariable.SF_NPM_REGISTRY),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_PRECOMPILE_ENABLE]: {
+        description: getMessage(EnvironmentVariable.SF_PRECOMPILE_ENABLE),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_CREATE]: {
+        description: getMessage(EnvironmentVariable.SF_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_CREATE),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_VERSION_CREATE]: {
+        description: messages.getMessage(change_case_1.camelCase(EnvironmentVariable.SF_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_VERSION_CREATE)),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_SOURCE_MEMBER_POLLING_TIMEOUT]: {
+        description: getMessage(EnvironmentVariable.SF_SOURCE_MEMBER_POLLING_TIMEOUT),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_USE_GENERIC_UNIX_KEYCHAIN]: {
+        description: getMessage(EnvironmentVariable.SF_USE_GENERIC_UNIX_KEYCHAIN),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_USE_PROGRESS_BAR]: {
+        description: getMessage(EnvironmentVariable.SF_USE_PROGRESS_BAR),
+        synonymOf: null,
+    },
+};
+class EnvVars extends kit_1.Env {
+    constructor() {
+        super();
+        this.resolve();
+    }
+    propertyToEnvName(property, prefix = 'SFDX_') {
+        return `${prefix || ''}${change_case_1.snakeCase(property).toUpperCase()}`;
+    }
+    setPropertyFromEnv(property, prefix = 'SFDX_') {
+        const envName = this.propertyToEnvName(property, prefix);
+        const value = this.getString(envName);
+        if (value) {
+            this.setString(property, value);
+        }
+    }
+    asDictionary() {
+        return this.entries().reduce((accumulator, [key, value]) => {
+            accumulator[key] = value;
+            return accumulator;
+        }, {});
+    }
+    asMap() {
+        return this.entries().reduce((accumulator, [key, value]) => {
+            accumulator.set(key, value);
+            return accumulator;
+        }, new Map());
+    }
+    resolve() {
+        this.entries().forEach(([key, value]) => {
+            if (exports.SUPPORTED_ENV_VARS[key]) {
+                // cross populate value to synonym if synonym exists
+                if (exports.SUPPORTED_ENV_VARS[key].synonymOf) {
+                    const synonym = exports.SUPPORTED_ENV_VARS[key].synonymOf;
+                    // set synonym only if it is in the map and running in interoperability mode
+                    if (synonym && global_1.Global.SFDX_INTEROPERABILITY) {
+                        this.setString(synonym, value);
+                    }
+                }
+            }
+        });
+    }
+}
+exports.EnvVars = EnvVars;
+//# sourceMappingURL=envVars.js.map

package/lib/crypto/crypto.js

@@ -15,6 +15,7 @@ const ts_types_1 = require("@salesforce/ts-types");
 const kit_1 = require("@salesforce/kit");
 const logger_1 = require("../logger");
 const messages_1 = require("../messages");
+const cache_1 = require("../util/cache");
 const keyChain_1 = require("./keyChain");
 const secureBuffer_1 = require("./secureBuffer");
 const TAG_DELIMITER = ':';
@@ -31,6 +32,11 @@ const messages = messages_1.Messages.load('@salesforce/core', 'encryption', [
     'authDecryptError',
     'macKeychainOutOfSync',
 ]);
+const makeSecureBuffer = (password) => {
+    const newSb = new secureBuffer_1.SecureBuffer();
+    newSb.consume(Buffer.from(ts_types_1.ensure(password), 'utf8'));
+    return newSb;
+};
 /**
  * osxKeyChain promise wrapper.
  */
@@ -43,11 +49,24 @@ const keychainPromises = {
      * @param account The keychain account name.
      */
     getPassword(_keychain, service, account) {
-        return new Promise((resolve, reject) => _keychain.getPassword({ service, account }, (err, password) => {
-            if (err)
-                return reject(err);
-            return resolve({ username: account, password: ts_types_1.ensure(password) });
-        }));
+        const sb = cache_1.Cache.get(`${service}:${account}`);
+        if (!sb) {
+            return new Promise((resolve, reject) => {
+                return _keychain.getPassword({ service, account }, (err, password) => {
+                    if (err)
+                        return reject(err);
+                    cache_1.Cache.set(`${service}:${account}`, makeSecureBuffer(password));
+                    return resolve({ username: account, password: ts_types_1.ensure(password) });
+                });
+            });
+        }
+        else {
+            const pw = sb.value((buffer) => buffer.toString('utf8'));
+            cache_1.Cache.set(`${service}:${account}`, makeSecureBuffer(pw));
+            return new Promise((resolve) => {
+                return resolve({ username: account, password: ts_types_1.ensure(pw) });
+            });
+        }
     },
     /**
      * Sets a generic password item in OSX keychain.

package/lib/exported.d.ts

@@ -1,10 +1,11 @@
 export { OAuth2Options } from 'jsforce';
 export { ConfigFile } from './config/configFile';
+export { EnvironmentVariable, SUPPORTED_ENV_VARS } from './config/envVars';
 export { BaseConfigStore, ConfigContents, ConfigEntry, ConfigStore, ConfigValue } from './config/configStore';
 export { GlobalInfo, SfEntry, SfInfo, SfInfoKeys, SfOrg, SfOrgs, SfToken, SfTokens } from './globalInfo';
 export { DeviceOauthService, DeviceCodeResponse, DeviceCodePollingResponse } from './deviceOauthService';
 export { OrgUsersConfig } from './config/orgUsersConfig';
-export { ConfigPropertyMeta, ConfigPropertyMetaInput, Config, SfdxPropertyKeys } from './config/config';
+export { ConfigPropertyMeta, ConfigPropertyMetaInput, Config, SfdxPropertyKeys, SFDX_ALLOWED_PROPERTIES, } from './config/config';
 export { ConfigInfo, ConfigAggregator } from './config/configAggregator';
 export { AuthFields, AuthInfo, OAuth2WithVerifier, OrgAuthorization } from './org/authInfo';
 export { AuthRemover } from './org/authRemover';
@@ -17,7 +18,7 @@ export { getJwtAudienceUrl } from './util/getJwtAudienceUrl';
 export { Fields, FieldValue, LoggerLevel, LoggerLevelValue, LogLine, LoggerOptions, LoggerStream, Logger, } from './logger';
 export { Messages } from './messages';
 export { Org } from './org/org';
-export { OrgConfigProperties } from './org/orgConfigProperties';
+export { OrgConfigProperties, ORG_CONFIG_ALLOWED_PROPERTIES } from './org/orgConfigProperties';
 export { PackageDir, NamedPackageDir, PackageDirDependency, SfdxProject, SfdxProjectJson } from './sfdxProject';
 export { SchemaPrinter } from './schema/printer';
 export { SchemaValidator } from './schema/validator';

package/lib/exported.js

@@ -16,11 +16,14 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PermissionSetAssignment = exports.User = exports.REQUIRED_FIELDS = exports.DefaultUserFields = exports.MyDomainResolver = exports.StreamingClient = exports.CometClient = exports.PollingClient = exports.SfdxError = exports.SchemaValidator = exports.SchemaPrinter = exports.SfdxProjectJson = exports.SfdxProject = exports.OrgConfigProperties = exports.Org = exports.Messages = exports.Logger = exports.LoggerLevel = exports.getJwtAudienceUrl = exports.SfdcUrl = exports.WebOAuthServer = exports.Lifecycle = exports.Global = exports.Mode = exports.SFDX_HTTP_HEADERS = exports.Connection = exports.AuthRemover = exports.OAuth2WithVerifier = exports.AuthInfo = exports.ConfigAggregator = exports.SfdxPropertyKeys = exports.Config = exports.OrgUsersConfig = exports.DeviceOauthService = exports.SfInfoKeys = exports.GlobalInfo = exports.BaseConfigStore = exports.ConfigFile = void 0;
+exports.PermissionSetAssignment = exports.User = exports.REQUIRED_FIELDS = exports.DefaultUserFields = exports.MyDomainResolver = exports.StreamingClient = exports.CometClient = exports.PollingClient = exports.SfdxError = exports.SchemaValidator = exports.SchemaPrinter = exports.SfdxProjectJson = exports.SfdxProject = exports.ORG_CONFIG_ALLOWED_PROPERTIES = exports.OrgConfigProperties = exports.Org = exports.Messages = exports.Logger = exports.LoggerLevel = exports.getJwtAudienceUrl = exports.SfdcUrl = exports.WebOAuthServer = exports.Lifecycle = exports.Global = exports.Mode = exports.SFDX_HTTP_HEADERS = exports.Connection = exports.AuthRemover = exports.OAuth2WithVerifier = exports.AuthInfo = exports.ConfigAggregator = exports.SFDX_ALLOWED_PROPERTIES = exports.SfdxPropertyKeys = exports.Config = exports.OrgUsersConfig = exports.DeviceOauthService = exports.SfInfoKeys = exports.GlobalInfo = exports.BaseConfigStore = exports.SUPPORTED_ENV_VARS = exports.EnvironmentVariable = exports.ConfigFile = void 0;
 const messages_1 = require("./messages");
 messages_1.Messages.importMessagesDirectory(__dirname);
 var configFile_1 = require("./config/configFile");
 Object.defineProperty(exports, "ConfigFile", { enumerable: true, get: function () { return configFile_1.ConfigFile; } });
+var envVars_1 = require("./config/envVars");
+Object.defineProperty(exports, "EnvironmentVariable", { enumerable: true, get: function () { return envVars_1.EnvironmentVariable; } });
+Object.defineProperty(exports, "SUPPORTED_ENV_VARS", { enumerable: true, get: function () { return envVars_1.SUPPORTED_ENV_VARS; } });
 var configStore_1 = require("./config/configStore");
 Object.defineProperty(exports, "BaseConfigStore", { enumerable: true, get: function () { return configStore_1.BaseConfigStore; } });
 var globalInfo_1 = require("./globalInfo");
@@ -33,6 +36,7 @@ Object.defineProperty(exports, "OrgUsersConfig", { enumerable: true, get: functi
 var config_1 = require("./config/config");
 Object.defineProperty(exports, "Config", { enumerable: true, get: function () { return config_1.Config; } });
 Object.defineProperty(exports, "SfdxPropertyKeys", { enumerable: true, get: function () { return config_1.SfdxPropertyKeys; } });
+Object.defineProperty(exports, "SFDX_ALLOWED_PROPERTIES", { enumerable: true, get: function () { return config_1.SFDX_ALLOWED_PROPERTIES; } });
 var configAggregator_1 = require("./config/configAggregator");
 Object.defineProperty(exports, "ConfigAggregator", { enumerable: true, get: function () { return configAggregator_1.ConfigAggregator; } });
 var authInfo_1 = require("./org/authInfo");
@@ -63,6 +67,7 @@ var org_1 = require("./org/org");
 Object.defineProperty(exports, "Org", { enumerable: true, get: function () { return org_1.Org; } });
 var orgConfigProperties_1 = require("./org/orgConfigProperties");
 Object.defineProperty(exports, "OrgConfigProperties", { enumerable: true, get: function () { return orgConfigProperties_1.OrgConfigProperties; } });
+Object.defineProperty(exports, "ORG_CONFIG_ALLOWED_PROPERTIES", { enumerable: true, get: function () { return orgConfigProperties_1.ORG_CONFIG_ALLOWED_PROPERTIES; } });
 var sfdxProject_1 = require("./sfdxProject");
 Object.defineProperty(exports, "SfdxProject", { enumerable: true, get: function () { return sfdxProject_1.SfdxProject; } });
 Object.defineProperty(exports, "SfdxProjectJson", { enumerable: true, get: function () { return sfdxProject_1.SfdxProjectJson; } });

package/lib/messages.js

@@ -368,7 +368,7 @@ class Messages {
             }
         }
         if (messages) {
-            // Type gaurd on key length, but do a runtime check.
+            // Type guard on key length, but do a runtime check.
             if (!keys || keys.length === 0) {
                 throw new kit_1.NamedError('MissingKeysError', 'Can not load messages without providing the message keys that will be used.');
             }

package/lib/org/authRemover.d.ts

@@ -47,7 +47,7 @@ export declare class AuthRemover extends AsyncOptionalCreatable {
      */
     findAuth(usernameOrAlias?: string): Promise<SfOrg>;
     /**
-     * Finds all authorization files in the global .sfdx folder
+     * Finds all org authorizations in the global info file (.sf/sf.json)
      *
      * @returns {SfOrgs}
      */
@@ -83,4 +83,5 @@ export declare class AuthRemover extends AsyncOptionalCreatable {
      * @param username username that you want to remove from aliases
      */
     private unsetAliases;
+    private unsetTokens;
 }

package/lib/org/authRemover.js

@@ -50,6 +50,7 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
         this.logger.debug(`Removing authorization for user ${username}`);
         await this.unsetConfigValues(username);
         await this.unsetAliases(username);
+        this.unsetTokens(username);
         this.globalInfo.orgs.unset(username);
         await this.globalInfo.write();
     }
@@ -80,7 +81,7 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
         return auth;
     }
     /**
-     * Finds all authorization files in the global .sfdx folder
+     * Finds all org authorizations in the global info file (.sf/sf.json)
      *
      * @returns {SfOrgs}
      */
@@ -162,7 +163,15 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
             return;
         this.logger.debug(`Found these aliases to remove: ${existingAliases}`);
         existingAliases.forEach((alias) => this.globalInfo.aliases.unset(alias));
-        await this.globalInfo.write();
+    }
+    unsetTokens(username) {
+        this.logger.debug(`Clearing tokens for username: ${username}`);
+        const tokens = this.globalInfo.tokens.getAll();
+        for (const [key, token] of Object.entries(tokens)) {
+            if (token.user === username) {
+                this.globalInfo.tokens.unset(key);
+            }
+        }
     }
 }
 exports.AuthRemover = AuthRemover;

package/lib/org/orgConfigProperties.js

@@ -7,6 +7,10 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ORG_CONFIG_ALLOWED_PROPERTIES = exports.OrgConfigProperties = void 0;
+const path_1 = require("path");
+const messages_1 = require("../messages");
+messages_1.Messages.importMessagesDirectory(path_1.join(__dirname));
+const messages = messages_1.Messages.load('@salesforce/core', 'config', ['targetOrg', 'targetDevHub']);
 var OrgConfigProperties;
 (function (OrgConfigProperties) {
     OrgConfigProperties["TARGET_ORG"] = "target-org";
@@ -15,11 +19,11 @@ var OrgConfigProperties;
 exports.ORG_CONFIG_ALLOWED_PROPERTIES = [
     {
         key: OrgConfigProperties.TARGET_ORG,
-        description: 'The target to be used for any command communicating with an org.',
+        description: messages.getMessage('targetOrg'),
     },
     {
         key: OrgConfigProperties.TARGET_DEV_HUB,
-        description: 'The target to be used for any command communicating with a dev hub org.',
+        description: messages.getMessage('targetDevHub'),
     },
 ];
 //# sourceMappingURL=orgConfigProperties.js.map

package/lib/util/cache.d.ts

@@ -0,0 +1,11 @@
+export declare class Cache extends Map {
+    #private;
+    private constructor();
+    static instance(): Cache;
+    static set<V>(key: string, value: V): void;
+    static get<V>(key: string): V | undefined;
+    static disable(): void;
+    static enable(): void;
+    static get hits(): number;
+    static get lookups(): number;
+}

package/lib/util/cache.js

@@ -0,0 +1,70 @@
+"use strict";
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _a, _Cache_instance, _Cache_enabled, _Cache_hits, _Cache_lookups;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Cache = 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
+ */
+class Cache extends Map {
+    /* eslint-enable @typescript-eslint/explicit-member-accessibility */
+    constructor() {
+        super();
+        _Cache_hits.set(this, void 0);
+        _Cache_lookups.set(this, void 0);
+        __classPrivateFieldSet(this, _Cache_hits, 0, "f");
+        __classPrivateFieldSet(this, _Cache_lookups, 0, "f");
+    }
+    static instance() {
+        if (!__classPrivateFieldGet(Cache, _a, "f", _Cache_instance)) {
+            __classPrivateFieldSet(Cache, _a, true, "f", _Cache_enabled);
+            __classPrivateFieldSet(Cache, _a, new Cache(), "f", _Cache_instance);
+        }
+        return __classPrivateFieldGet(Cache, _a, "f", _Cache_instance);
+    }
+    static set(key, value) {
+        if (__classPrivateFieldGet(Cache, _a, "f", _Cache_enabled)) {
+            Cache.instance().set(key, value);
+        }
+    }
+    static get(key) {
+        var _b, _c;
+        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");
+        return __classPrivateFieldGet(Cache, _a, "f", _Cache_instance).get(key);
+    }
+    static disable() {
+        __classPrivateFieldSet(Cache, _a, false, "f", _Cache_enabled);
+    }
+    static enable() {
+        __classPrivateFieldSet(Cache, _a, true, "f", _Cache_enabled);
+    }
+    static get hits() {
+        return __classPrivateFieldGet(Cache.instance(), _Cache_hits, "f");
+    }
+    static get lookups() {
+        return __classPrivateFieldGet(Cache.instance(), _Cache_lookups, "f");
+    }
+}
+exports.Cache = Cache;
+_a = Cache, _Cache_hits = new WeakMap(), _Cache_lookups = new WeakMap();
+/* eslint-disable @typescript-eslint/explicit-member-accessibility */
+_Cache_instance = { value: void 0 };
+_Cache_enabled = { value: true };
+//# sourceMappingURL=cache.js.map

package/messages/config.md

@@ -70,3 +70,47 @@ In sfdx-project.json, indicate only one package directory (path) as the default.
 # singleNonDefaultPackage
 
 The sfdx-project.json file must include one, and only one, default package directory (path). Because your sfdx-project.json file contains only one package directory, it must be the default. Remove the `"default": false` key and try again.
+
+# targetOrg
+
+The target to be used for any command communicating with an org.
+
+# targetDevHub
+
+The target to be used for any command communicating with a dev hub org.
+
+# defaultUsername
+
+Default username to use for a given command
+
+# defaultDevHubUsername
+
+Default dev hub org
+
+# isvDebuggerSid
+
+ISV debugger SID
+
+# isvDebuggerUrl
+
+ISV debugger URL
+
+# apiVersion
+
+API version to use when making requests to app server
+
+# disableTelemetry
+
+Disable telemetry
+
+# maxQueryLimit
+
+Maximum rows to return for a SOQL query.
+
+# restDeploy
+
+Boolean that enables deploy via REST API.
+
+# instanceUrl
+
+Instance URL to use for a command.

package/messages/envVars.md

@@ -0,0 +1,239 @@
+# forceOpenUrl
+
+Specifies the web page that opens in your browser when you run force:org:open. For example, to open Lightning Experience, set to lightning.
+
+# forceShowSpinner
+
+Set to true to show a spinner animation on the command line when running asynchronous CLI commands. Default is false.
+
+# forceSpinnerDelay
+
+Specifies the speed of the spinner in milliseconds. Default is 60.
+
+# httpProxy
+
+Set this variable to your http proxy server if behind a corporate firewall
+
+# httpsProxy
+
+Set this variable to your https proxy server if behind a corporate firewall
+
+# nodeExtraCaCerts
+
+Installs your self-signed certificate. Indicate the fully qualified path to the certificate file name. Then run sfdx update.
+
+# nodeTlsRejectUnauthorized
+
+Indicate 0 to allow Node.js to use the self-signed certificate in the certificate chain.
+
+# sfdxAccessToken
+
+Specifies an access token when using the auth:accesstoken:store command.
+
+# sfdxApiVersion
+
+The API version for a specific project or all projects.
+
+# sfdxAudienceUrl
+
+Overrides the aud (audience) field used for JWT authentication so that it matches the expected value of the authorization server URL for the org you’re logging into.
+
+# sfdxCodeCoverageRequirement
+
+Specifies the code coverage percentages that are displayed in green when you run force:apex:test:run or force:apex:test:report with the --codecoverage parameter.
+
+# sfdxContentType
+
+When set to JSON, specifies that all CLI commands output results in JSON format.
+
+# sfdxDefaultdevhubusername
+
+Specifies the username of your default Dev Hub org so you don’t have to use the --targetdevhubusername CLI parameter. Overrides the value of the defaultdevhubusername runtime configuration value.
+
+# sfdxDefaultusername
+
+Specifies the username of your default org so you don’t have to use the --targetusername CLI parameter. Overrides the value of the defaultusername runtime configuration value.
+
+# sfdxDisableAutoupdate
+
+Set to true to disable the auto-update feature of the CLI.
+
+# sfdxAutoupdateDisable
+
+Set to true to disable the auto-update feature of the CLI.
+
+# sfdxDisableSourceMemberPolling
+
+Set to true to disable polling of your org’s SourceMember object when you run the force:source:push|pull commands.
+
+# sfdxDisableTelemetry
+
+Set to true to disable the CLI from collecting usage information, user environment information, and crash reports.
+
+# sfdxDnsTimeout
+
+Specifies the number of seconds that the force:org:\* commands wait for a response when checking whether an org is connected. If the commands don’t receive a response in that time, they time out. Default value is 3.
+
+# sfdxDomainRetry
+
+Specifies the time, in seconds, that the CLI waits for the Lightning Experience custom domain to resolve and become available in a newly created scratch org.
+
+# sfdxImprovedCodeCoverage
+
+Scopes Apex test results to the classes entered during a test run when running force:apex:test:run and force:apex:test:report. Set to true to improve code coverage.
+
+# sfdxInstanceUrl
+
+The URL of the Salesforce instance that is hosting your org.
+
+# sfdxJsonToStdout
+
+Sends messages when Salesforce CLI commands fail to stdout instead of stderr.
+
+# sfdxLogLevel
+
+Sets the level of messages that the CLI writes to the log file.
+
+# sfdxMaxQueryLimit
+
+The maximum number of Salesforce records returned by a CLI command. Default value is 10,000.
+
+# sfdxMdapiTempDir
+
+Places the files (in metadata format) in the specified directory when you run some CLI commands, such as force:source:<name>.
+
+# sfdxNpmRegistry
+
+Sets the URL to a private npm server, where all packages that you publish are private.
+
+# sfdxPrecompileEnable
+
+Set to true to enable Apex pre-compile before the tests are run. Default is false.
+
+# sfdxProjectAutoupdateDisableForPackageCreate
+
+For force:package:create, disables automatic updates to the sfdx-project.json file.
+
+# sfdxProjectAutoupdateDisableForPackageVersionCreate
+
+For force:package:version:create, disables automatic updates to the sfdx-project.json file.
+
+# sfdxRestDeploy
+
+Set to true to make Salesforce CLI use the Metadata REST API for deployments. By default, the CLI uses SOAP.
+
+# sfdxSourceMemberPollingTimeout
+
+Set to the number of seconds you want the force:source:push command to keep polling the SourceMember object before the command times out.
+
+# sfdxUseGenericUnixKeychain
+
+(Linux and macOS only) Set to true if you want to use the generic UNIX keychain instead of the Linux libsecret library or macOS keychain.
+
+# sfdxUseProgressBar
+
+For force:mdapi:deploy, force:source:deploy, and force:source:push, set to false to disable the progress bar.
+
+# sfTargetOrg
+
+Specifies the username of your default target org you don’t have to use the --target-org CLI parameter. Overrides the value of the target-org runtime configuration value.
+
+# sfTargetDevHub
+
+Specifies the username of your default Dev Hub org so you don’t have to use the --target-dev-hub CLI parameter. Overrides the value of the target-dev-hub runtime configuration value.
+
+# sfAccessToken
+
+Specifies an access token when using the login accesstoken command.
+
+# sfApiVersion
+
+The API version for a specific environment or all environments.
+
+# sfAudienceUrl
+
+Overrides the aud (audience) field used for JWT authentication so that it matches the expected value of the authorization server URL for the org you’re logging into.
+
+# sfCodeCoverageRequirement
+
+Specifies the code coverage percentages that are displayed in green when you run force:apex:test:run or force:apex:test:report with the --codecoverage parameter.
+
+# sfContentType
+
+When set to JSON, specifies that all CLI commands output results in JSON format.
+
+# sfDisableAutoupdate
+
+Set to true to disable the auto-update feature of the CLI.
+
+# sfAutoupdateDisable
+
+Set to true to disable the auto-update feature of the CLI.
+
+# sfDisableSourceMemberPolling
+
+Set to true to disable polling of your org’s SourceMember object when you run the force:source:push|pull commands.
+
+# sfDisableTelemetry
+
+Set to true to disable the CLI from collecting usage information, user environment information, and crash reports.
+
+# sfDnsTimeout
+
+Specifies the number of seconds that the force:org:\* commands wait for a response when checking whether an org is connected. If the commands don’t receive a response in that time, they time out. Default value is 3.
+
+# sfDomainRetry
+
+Specifies the time, in seconds, that the CLI waits for the Lightning Experience custom domain to resolve and become available in a newly created scratch org.
+
+# sfImprovedCodeCoverage
+
+Specifies the time, in seconds, that the CLI waits for the Lightning Experience custom domain to resolve and become available in a newly created scratch org.
+
+# sfInstanceUrl
+
+The URL of the Salesforce instance that is hosting your org.
+
+# sfJsonToStdout
+
+Sends messages when Salesforce CLI commands fail to stdout instead of stderr.
+
+# sfLogLevel
+
+Sets the level of messages that the CLI writes to the log file.
+
+# sfMaxQueryLimit
+
+The maximum number of Salesforce records returned by a CLI command. Default value is 10,000.
+
+# sfMdapiTempDir
+
+Places the files (in metadata format) in the specified directory when you run some CLI commands, such as force:source:<name>.
+
+# sfNpmRegistry
+
+Sets the URL to a private npm server, where all packages that you publish are private.
+
+# sfPrecompileEnable
+
+Set to true to enable Apex pre-compile before the tests are run. Default is false.
+
+# sfProjectAutoupdateDisableForPackageCreate
+
+For force:package:create, disables automatic updates to the sfdx-project.json file.
+
+# sfProjectAutoupdateDisableForPackageVersionCreate
+
+For force:package:create, disables automatic updates to the sfdx-project.json file.
+
+# sfSourceMemberPollingTimeout
+
+Set to the number of seconds you want the force:source:push command to keep polling the SourceMember object before the command times out.
+
+# sfUseGenericUnixKeychain
+
+(Linux and macOS only) Set to true if you want to use the generic UNIX keychain instead of the Linux libsecret library or macOS keychain.
+
+# sfUseProgressBar
+
+For force:mdapi:deploy, force:source:deploy, and force:source:push, set to false to disable the progress bar.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "3.4.5",
+  "version": "3.6.2",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "license": "BSD-3-Clause",
@@ -46,6 +46,7 @@
     "@types/graceful-fs": "^4.1.5",
     "@types/jsforce": "^1.9.29",
     "@types/mkdirp": "^1.0.1",
+    "change-case": "^4.1.2",
     "debug": "^3.1.0",
     "graceful-fs": "^4.2.4",
     "jsen": "0.6.6",