@salesforce/core 3.7.4 → 3.7.5

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 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.7.5](https://github.com/forcedotcom/sfdx-core/compare/v3.7.4...v3.7.5) (2022-02-14)
+
+### Bug Fixes
+
+- add env vars from sfdx-cli init to envvars ([#520](https://github.com/forcedotcom/sfdx-core/issues/520)) ([8ef2785](https://github.com/forcedotcom/sfdx-core/commit/8ef27859d95bfffc5999b14f4792874d04f0504c))
+
 ### [3.7.4](https://github.com/forcedotcom/sfdx-core/compare/v3.7.3...v3.7.4) (2022-02-07)
 
 ### Bug Fixes

package/lib/config/envVars.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { Dictionary, Nullable } from '@salesforce/ts-types';
 import { Env } from '@salesforce/kit';
 export declare enum EnvironmentVariable {
@@ -35,6 +36,11 @@ export declare enum EnvironmentVariable {
     '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",
+    'SFDX_LAZY_LOAD_MODULES' = "SFDX_LAZY_LOAD_MODULES",
+    'SFDX_S3_HOST' = "SFDX_S3_HOST",
+    'SFDX_UPDATE_INSTRUCTIONS' = "SFDX_UPDATE_INSTRUCTIONS",
+    'SFDX_INSTALLER' = "SFDX_INSTALLER",
+    'SFDX_ENV' = "SFDX_ENV",
     'SF_TARGET_ORG' = "SF_TARGET_ORG",
     'SF_TARGET_DEV_HUB' = "SF_TARGET_DEV_HUB",
     'SF_ACCESS_TOKEN' = "SF_ACCESS_TOKEN",
@@ -60,7 +66,12 @@ export declare enum EnvironmentVariable {
     '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"
+    'SF_USE_PROGRESS_BAR' = "SF_USE_PROGRESS_BAR",
+    'SF_LAZY_LOAD_MODULES' = "SF_LAZY_LOAD_MODULES",
+    'SF_S3_HOST' = "SF_S3_HOST",
+    'SF_UPDATE_INSTRUCTIONS' = "SF_UPDATE_INSTRUCTIONS",
+    'SF_INSTALLER' = "SF_INSTALLER",
+    'SF_ENV' = "SF_ENV"
 }
 declare type EnvMetaData = {
     description: string;
@@ -71,11 +82,15 @@ declare type EnvType = {
 };
 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>;
+    constructor(env?: NodeJS.ProcessEnv);
+    private static defaultPrefix;
+    propertyToEnvName(property: string, prefix?: string | undefined): string;
+    setPropertyFromEnv(property: string, prefix?: string | undefined): void;
+    getPropertyFromEnv<T>(property: string, prefix?: string | undefined): T | undefined;
+    asDictionary(): Dictionary<unknown>;
     asMap(): Map<string, string>;
     private resolve;
+    private get;
 }
+export declare const envVars: EnvVars;
 export {};

package/lib/config/envVars.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EnvVars = exports.SUPPORTED_ENV_VARS = exports.EnvironmentVariable = void 0;
+exports.envVars = exports.EnvVars = exports.SUPPORTED_ENV_VARS = exports.EnvironmentVariable = void 0;
 /*
  * Copyright (c) 2020, salesforce.com, inc.
  * All rights reserved.
@@ -50,6 +50,11 @@ var EnvironmentVariable;
     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["SFDX_LAZY_LOAD_MODULES"] = "SFDX_LAZY_LOAD_MODULES";
+    EnvironmentVariable["SFDX_S3_HOST"] = "SFDX_S3_HOST";
+    EnvironmentVariable["SFDX_UPDATE_INSTRUCTIONS"] = "SFDX_UPDATE_INSTRUCTIONS";
+    EnvironmentVariable["SFDX_INSTALLER"] = "SFDX_INSTALLER";
+    EnvironmentVariable["SFDX_ENV"] = "SFDX_ENV";
     EnvironmentVariable["SF_TARGET_ORG"] = "SF_TARGET_ORG";
     EnvironmentVariable["SF_TARGET_DEV_HUB"] = "SF_TARGET_DEV_HUB";
     EnvironmentVariable["SF_ACCESS_TOKEN"] = "SF_ACCESS_TOKEN";
@@ -76,6 +81,11 @@ var EnvironmentVariable;
     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["SF_LAZY_LOAD_MODULES"] = "SF_LAZY_LOAD_MODULES";
+    EnvironmentVariable["SF_S3_HOST"] = "SF_S3_HOST";
+    EnvironmentVariable["SF_UPDATE_INSTRUCTIONS"] = "SF_UPDATE_INSTRUCTIONS";
+    EnvironmentVariable["SF_INSTALLER"] = "SF_INSTALLER";
+    EnvironmentVariable["SF_ENV"] = "SF_ENV";
 })(EnvironmentVariable = exports.EnvironmentVariable || (exports.EnvironmentVariable = {}));
 const getMessage = (environmentVariable) => messages.getMessage((0, change_case_1.camelCase)(environmentVariable));
 exports.SUPPORTED_ENV_VARS = {
@@ -216,6 +226,26 @@ exports.SUPPORTED_ENV_VARS = {
         description: getMessage(EnvironmentVariable.SFDX_USE_PROGRESS_BAR),
         synonymOf: EnvironmentVariable.SF_USE_PROGRESS_BAR,
     },
+    [EnvironmentVariable.SFDX_LAZY_LOAD_MODULES]: {
+        description: getMessage(EnvironmentVariable.SFDX_USE_PROGRESS_BAR),
+        synonymOf: EnvironmentVariable.SF_LAZY_LOAD_MODULES,
+    },
+    [EnvironmentVariable.SFDX_S3_HOST]: {
+        description: getMessage(EnvironmentVariable.SFDX_S3_HOST),
+        synonymOf: EnvironmentVariable.SF_S3_HOST,
+    },
+    [EnvironmentVariable.SFDX_UPDATE_INSTRUCTIONS]: {
+        description: getMessage(EnvironmentVariable.SFDX_UPDATE_INSTRUCTIONS),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SFDX_INSTALLER]: {
+        description: getMessage(EnvironmentVariable.SFDX_INSTALLER),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SFDX_ENV]: {
+        description: getMessage(EnvironmentVariable.SFDX_ENV),
+        synonymOf: null,
+    },
     [EnvironmentVariable.SF_TARGET_ORG]: {
         description: getMessage(EnvironmentVariable.SF_TARGET_ORG),
         synonymOf: null,
@@ -321,22 +351,53 @@ exports.SUPPORTED_ENV_VARS = {
         description: getMessage(EnvironmentVariable.SF_USE_PROGRESS_BAR),
         synonymOf: null,
     },
+    [EnvironmentVariable.SF_LAZY_LOAD_MODULES]: {
+        description: getMessage(EnvironmentVariable.SF_LAZY_LOAD_MODULES),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_S3_HOST]: {
+        description: getMessage(EnvironmentVariable.SF_S3_HOST),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_UPDATE_INSTRUCTIONS]: {
+        description: getMessage(EnvironmentVariable.SF_UPDATE_INSTRUCTIONS),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_INSTALLER]: {
+        description: getMessage(EnvironmentVariable.SF_INSTALLER),
+        synonymOf: null,
+    },
+    [EnvironmentVariable.SF_ENV]: {
+        description: getMessage(EnvironmentVariable.SF_ENV),
+        synonymOf: null,
+    },
 };
 class EnvVars extends kit_1.Env {
-    constructor() {
-        super();
+    constructor(env = process.env) {
+        super(env);
         this.resolve();
     }
-    propertyToEnvName(property, prefix = 'SFDX_') {
+    static defaultPrefix() {
+        if (process.argv[0].startsWith('sfdx'))
+            return 'SFDX_';
+        if (process.argv[0].startsWith('sf'))
+            return 'SF_';
+        return 'SFDX_';
+    }
+    propertyToEnvName(property, prefix = EnvVars.defaultPrefix()) {
         return `${prefix || ''}${(0, change_case_1.snakeCase)(property).toUpperCase()}`;
     }
-    setPropertyFromEnv(property, prefix = 'SFDX_') {
+    setPropertyFromEnv(property, prefix = EnvVars.defaultPrefix()) {
         const envName = this.propertyToEnvName(property, prefix);
         const value = this.getString(envName);
         if (value) {
             this.setString(property, value);
         }
     }
+    getPropertyFromEnv(property, prefix = EnvVars.defaultPrefix()) {
+        const envName = this.propertyToEnvName(property, prefix);
+        return this.get(envName);
+    }
     asDictionary() {
         return this.entries().reduce((accumulator, [key, value]) => {
             accumulator[key] = value;
@@ -363,6 +424,10 @@ class EnvVars extends kit_1.Env {
             }
         });
     }
+    get(envName) {
+        return this.asDictionary()[envName];
+    }
 }
 exports.EnvVars = EnvVars;
+exports.envVars = new EnvVars();
 //# sourceMappingURL=envVars.js.map

package/lib/exported.d.ts

@@ -1,6 +1,6 @@
 export { OAuth2Config } from 'jsforce';
 export { ConfigFile } from './config/configFile';
-export { EnvironmentVariable, SUPPORTED_ENV_VARS } from './config/envVars';
+export { envVars, EnvironmentVariable, SUPPORTED_ENV_VARS, EnvVars } 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';

package/lib/exported.js

@@ -16,14 +16,16 @@ 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.ORG_CONFIG_ALLOWED_PROPERTIES = exports.OrgConfigProperties = exports.OrgTypes = exports.SandboxEvents = 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.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;
+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.OrgTypes = exports.SandboxEvents = 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.AuthInfo = exports.ConfigAggregator = exports.SFDX_ALLOWED_PROPERTIES = exports.SfdxPropertyKeys = exports.Config = exports.OrgUsersConfig = exports.DeviceOauthService = exports.SfInfoKeys = exports.GlobalInfo = exports.BaseConfigStore = exports.EnvVars = exports.SUPPORTED_ENV_VARS = exports.EnvironmentVariable = exports.envVars = 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, "envVars", { enumerable: true, get: function () { return envVars_1.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; } });
+Object.defineProperty(exports, "EnvVars", { enumerable: true, get: function () { return envVars_1.EnvVars; } });
 var configStore_1 = require("./config/configStore");
 Object.defineProperty(exports, "BaseConfigStore", { enumerable: true, get: function () { return configStore_1.BaseConfigStore; } });
 var globalInfo_1 = require("./globalInfo");

package/messages/envVars.md

@@ -12,15 +12,15 @@ Speed of the spinner in milliseconds. Default is 60.
 
 # httpProxy
 
-HTTP URL and port of the proxy server when using Salesforce CLI behind a corporate firewall or web proxy. 
+HTTP URL and port of the proxy server when using Salesforce CLI behind a corporate firewall or web proxy.
 
 # httpsProxy
 
-HTTPS URL and port of the proxy server when using Salesforce CLI behind a corporate firewall or web proxy. 
+HTTPS URL and port of the proxy server when using Salesforce CLI behind a corporate firewall or web proxy.
 
 # nodeExtraCaCerts
 
-Fully qualified path to your self-signed certificate. Will be installed after you run "sfdx update". 
+Fully qualified path to your self-signed certificate. Will be installed after you run "sfdx update".
 
 # nodeTlsRejectUnauthorized
 
@@ -36,7 +36,7 @@ The API version for a specific project or all projects. Default value is the API
 
 # sfdxAudienceUrl
 
-URL that 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. 
+URL that 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
 
@@ -44,7 +44,7 @@ Code coverage percentages that are displayed in green when you run force:apex:te
 
 # sfdxContentType
 
-Set to JSON so that all CLI commands output results in JSON format. 
+Set to JSON so that all CLI commands output results in JSON format.
 
 # sfdxDefaultdevhubusername
 
@@ -56,11 +56,11 @@ Username or alias of your default org. Overrides the defaultusername configurati
 
 # sfdxDisableAutoupdate
 
-Set to true to disable the auto-update feature of Salesforce CLI. Default value is false. 
+Set to true to disable the auto-update feature of Salesforce CLI. Default value is false.
 
 # sfdxAutoupdateDisable
 
-Set to true to disable the auto-update feature of Salesforce CLI. Default value is false. 
+Set to true to disable the auto-update feature of Salesforce CLI. Default value is false.
 
 # sfdxDisableSourceMemberPolling
 
@@ -80,7 +80,7 @@ Time, in seconds, that Salesforce CLI waits for the Lightning Experience custom
 
 # sfdxImprovedCodeCoverage
 
-Set to true to scope Apex test results to the classes entered during a test run when running force:apex:test:\*. 
+Set to true to scope Apex test results to the classes entered during a test run when running force:apex:test:\*.
 
 # sfdxInstanceUrl
 
@@ -134,6 +134,26 @@ Number of seconds you want the force:source:push command to keep polling the Sou
 
 Set to false to disable the progress bar when running force:mdapi:deploy, force:source:deploy, or force:source:push.
 
+# sfdxLazyLoadModules
+
+Set to true to enable lazy loading of sfdx modules
+
+# sfdxS3Host
+
+URL to S3 host
+
+# sfdxUpdateInstructions
+
+Text that describes how to update sfdx
+
+# sfdxInstaller
+
+Boolean indicating that the installer is running
+
+# sfdxEnv
+
+Describes if sfdx is in "demo" mode
+
 # sfTargetOrg
 
 Username or alias of your default org. Overrides the target-org configuration variable.
@@ -152,7 +172,7 @@ API version for a specific project or all projects. Default value is the API ver
 
 # sfAudienceUrl
 
-URL that 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. 
+URL that 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
 
@@ -160,15 +180,15 @@ Code coverage percentages that are displayed in green when you run the Apex test
 
 # sfContentType
 
-Set to JSON so that all CLI commands output results in JSON format. 
+Set to JSON so that all CLI commands output results in JSON format.
 
 # sfDisableAutoupdate
 
-Set to true to disable the auto-update feature of Salesforce CLI. Default value is false. 
+Set to true to disable the auto-update feature of Salesforce CLI. Default value is false.
 
 # sfAutoupdateDisable
 
-Set to true to disable the auto-update feature of Salesforce CLI. Default value is false. 
+Set to true to disable the auto-update feature of Salesforce CLI. Default value is false.
 
 # sfDisableSourceMemberPolling
 
@@ -188,7 +208,7 @@ Time, in seconds, that Salesforce CLI waits for the Lightning Experience custom
 
 # sfImprovedCodeCoverage
 
-Set to true to scope Apex test results to the classes entered during a test run when running the Apex test commands. 
+Set to true to scope Apex test results to the classes entered during a test run when running the Apex test commands.
 
 # sfInstanceUrl
 
@@ -237,3 +257,23 @@ Number of seconds you want the source push command to keep polling the SourceMem
 # sfUseProgressBar
 
 Set to false to disable the progress bar when running the metadata deploy command.
+
+# sfLazyLoadModules
+
+Set to true to enable lazy loading of sf modules
+
+# sfS3Host
+
+URL to S3 host
+
+# sfUpdateInstructions
+
+Text that describes how to update sf
+
+# sfInstaller
+
+Boolean indicating that the installer is running
+
+# sfEnv
+
+Describes if sf is in "demo" mode

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "3.7.4",
+  "version": "3.7.5",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -34,6 +34,7 @@
     "!lib/**/*.map"
   ],
   "dependencies": {
+    "@oclif/core": "^1.3.1",
     "@salesforce/bunyan": "^2.0.0",
     "@salesforce/kit": "^1.5.28",
     "@salesforce/schemas": "^1.1.0",