@salesforce/core 3.19.0 → 3.19.1

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.19.1](https://github.com/forcedotcom/sfdx-core/compare/v3.19.0...v3.19.1) (2022-05-27)
+
+### Bug Fixes
+
+- env var resolution in ConfigAggregator ([#590](https://github.com/forcedotcom/sfdx-core/issues/590)) ([a65cfbd](https://github.com/forcedotcom/sfdx-core/commit/a65cfbdd0e2a6c3806aa4da3270b237f68b37133))
+
 ## [3.19.0](https://github.com/forcedotcom/sfdx-core/compare/v3.18.3...v3.19.0) (2022-05-20)
 
 ### Features

package/lib/config/configAggregator.d.ts

@@ -1,5 +1,5 @@
 import { AsyncOptionalCreatable } from '@salesforce/kit';
-import { AnyJson, JsonMap, Optional } from '@salesforce/ts-types';
+import { AnyJson, Dictionary, JsonMap, Optional } from '@salesforce/ts-types';
 import { Config, ConfigPropertyMeta } from './config';
 /**
  * Information about a config property.
@@ -161,7 +161,7 @@ export declare class ConfigAggregator extends AsyncOptionalCreatable<ConfigAggre
     /**
      * Get the config properties that are environment variables.
      */
-    getEnvVars(): Map<string, string>;
+    getEnvVars(): Dictionary<string>;
     /**
      * Re-read all property configurations from disk.
      */

package/lib/config/configAggregator.js

@@ -37,6 +37,7 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
      */
     constructor(options) {
         super(options || {});
+        this.envVars = {};
         // Don't throw an project error with the aggregator, since it should resolve to global if
         // there is no project.
         try {
@@ -107,7 +108,7 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
      */
     getPropertyValue(key) {
         if (this.getAllowedProperties().some((element) => key === element.key)) {
-            return this.getConfig()[key] || this.getEnvVars().get(key);
+            return this.getConfig()[key];
         }
         else {
             throw messages.createError('unknownConfigKey', [key]);
@@ -164,7 +165,7 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
      * @param key The key of the property.
      */
     getLocation(key) {
-        if (this.getEnvVars().get(key) != null) {
+        if (this.envVars[key] != null) {
             return "Environment" /* ENVIRONMENT */;
         }
         if (this.localConfig && this.localConfig.get(key)) {
@@ -189,8 +190,8 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
      * @param key The key of the property.
      */
     getPath(key) {
-        if (this.envVars.getString(key) != null) {
-            return `$${this.envVars.propertyToEnvName(key)}`;
+        if (this.envVars[key] != null) {
+            return `$${envVars_1.EnvVars.propertyToEnvName(key)}`;
         }
         if (this.localConfig && this.localConfig.getContents()[key] != null) {
             return this.localConfig.getPath();
@@ -239,7 +240,7 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
      * Get the config properties that are environment variables.
      */
     getEnvVars() {
-        return this.envVars.asMap();
+        return this.envVars;
     }
     /**
      * Re-read all property configurations from disk.
@@ -287,9 +288,12 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
         this.resolveProperties(this.globalConfig.readSync(), this.localConfig && this.localConfig.readSync());
     }
     resolveProperties(globalConfig, localConfig) {
-        this.envVars = new envVars_1.EnvVars();
+        const envVars = new envVars_1.EnvVars();
         for (const property of this.getAllowedProperties()) {
-            this.envVars.setPropertyFromEnv(property.key);
+            const key = property.newKey ? property.newKey : property.key;
+            const value = envVars.getPropertyFromEnv(property.key);
+            if (value)
+                this.envVars[key] = value;
         }
         // Global config must be read first so it is on the left hand of the
         // object assign and is overwritten by the local config.
@@ -298,7 +302,7 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
         if (localConfig) {
             configs.push(localConfig);
         }
-        configs.push(this.envVars.asDictionary());
+        configs.push(this.envVars);
         const json = {};
         const reduced = configs.filter(ts_types_1.isJsonMap).reduce((acc, el) => (0, kit_1.merge)(acc, el), json);
         return reduced;

package/lib/config/envVars.d.ts

@@ -87,10 +87,9 @@ declare type EnvType = {
 export declare const SUPPORTED_ENV_VARS: EnvType;
 export declare class EnvVars extends Env {
     constructor(env?: NodeJS.ProcessEnv);
+    static propertyToEnvName(property: string, prefix?: string): string;
     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;
+    getPropertyFromEnv<T>(property: string, prefix?: string): Nullable<T>;
     asDictionary(): Dictionary<unknown>;
     asMap(): Map<string, string>;
     private resolve;

package/lib/config/envVars.js

@@ -337,7 +337,7 @@ exports.SUPPORTED_ENV_VARS = {
     },
     [EnvironmentVariable.SF_ORG_MAX_QUERY_LIMIT]: {
         description: getMessage(EnvironmentVariable.SF_ORG_MAX_QUERY_LIMIT),
-        synonymOf: null,
+        synonymOf: EnvironmentVariable.SFDX_MAX_QUERY_LIMIT,
     },
     [EnvironmentVariable.SF_MDAPI_TEMP_DIR]: {
         description: getMessage(EnvironmentVariable.SF_MDAPI_TEMP_DIR),
@@ -397,6 +397,9 @@ class EnvVars extends kit_1.Env {
         super(env);
         this.resolve();
     }
+    static propertyToEnvName(property, prefix = EnvVars.defaultPrefix()) {
+        return `${prefix || ''}${(0, change_case_1.snakeCase)(property).toUpperCase()}`;
+    }
     static defaultPrefix() {
         if (process.argv[0].startsWith('sfdx'))
             return 'SFDX_';
@@ -404,19 +407,11 @@ class EnvVars extends kit_1.Env {
             return 'SF_';
         return 'SFDX_';
     }
-    propertyToEnvName(property, prefix = EnvVars.defaultPrefix()) {
-        return `${prefix || ''}${(0, change_case_1.snakeCase)(property).toUpperCase()}`;
-    }
-    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);
+        var _a;
+        const envName = EnvVars.propertyToEnvName(property, prefix);
+        const synonym = (_a = exports.SUPPORTED_ENV_VARS[envName]) === null || _a === void 0 ? void 0 : _a.synonymOf;
+        return this.get(envName) || this.get(synonym);
     }
     asDictionary() {
         return this.entries().reduce((accumulator, [key, value]) => {

package/lib/org/connection.js

@@ -21,6 +21,7 @@ const sfError_1 = require("../sfError");
 const sfdc_1 = require("../util/sfdc");
 const messages_1 = require("../messages");
 const lifecycleEvents_1 = require("../lifecycleEvents");
+const orgConfigProperties_1 = require("./orgConfigProperties");
 messages_1.Messages.importMessagesDirectory(__dirname);
 const messages = messages_1.Messages.load('@salesforce/core', 'connection', [
     'incorrectAPIVersionError',
@@ -332,7 +333,7 @@ class Connection extends jsforce_1.Connection {
     async autoFetchQuery(soql, queryOptions = {}) {
         const config = await configAggregator_1.ConfigAggregator.create();
         // take the limit from the calling function, then the config, then default 10,000
-        const maxFetch = config.getInfo('org-max-query-limit').value || queryOptions.maxFetch || 10000;
+        const maxFetch = config.getInfo(orgConfigProperties_1.OrgConfigProperties.ORG_MAX_QUERY_LIMIT).value || queryOptions.maxFetch || 10000;
         const options = Object.assign(queryOptions, {
             autoFetch: true,
             maxFetch,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "3.19.0",
+  "version": "3.19.1",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",