@salesforce/core 3.15.1 → 3.15.4

package/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 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.15.4](https://github.com/forcedotcom/sfdx-core/compare/v3.15.3...v3.15.4) (2022-05-03)
+
+### Bug Fixes
+
+- SfdxConfigAggregator ([#576](https://github.com/forcedotcom/sfdx-core/issues/576)) ([9a25928](https://github.com/forcedotcom/sfdx-core/commit/9a259282efd3d2d97da42a54fd76c45d7f73df27))
+
+### [3.15.3](https://github.com/forcedotcom/sfdx-core/compare/v3.15.2...v3.15.3) (2022-05-02)
+
+### Bug Fixes
+
+- SfdxConfigAggregator ([6ee1437](https://github.com/forcedotcom/sfdx-core/commit/6ee14378f10df123ac38325853bc3b83d4d953bd))
+
+### [3.15.2](https://github.com/forcedotcom/sfdx-core/compare/v3.15.1...v3.15.2) (2022-05-02)
+
+### Bug Fixes
+
+- allow ConfigAggregator to accept custom config vars ([#575](https://github.com/forcedotcom/sfdx-core/issues/575)) ([2642128](https://github.com/forcedotcom/sfdx-core/commit/264212898cf14d8f34638926841ace89abf7efb0))
+
 ### [3.15.1](https://github.com/forcedotcom/sfdx-core/compare/v3.15.0...v3.15.1) (2022-04-28)
 
 ### Bug Fixes

package/lib/config/configAggregator.d.ts

@@ -53,7 +53,7 @@ export interface ConfigInfo {
  * console.log(aggregator.getPropertyValue('target-org'));
  * ```
  */
-export declare class ConfigAggregator extends AsyncOptionalCreatable<JsonMap> {
+export declare class ConfigAggregator extends AsyncOptionalCreatable<ConfigAggregator.Options> {
     private static instance;
     private static encrypted;
     private allowedProperties;
@@ -66,8 +66,8 @@ export declare class ConfigAggregator extends AsyncOptionalCreatable<JsonMap> {
      *
      * @ignore
      */
-    constructor(options?: JsonMap);
-    static create<P, T extends AsyncOptionalCreatable<P>>(this: new (options?: P) => T, options?: P): Promise<T>;
+    constructor(options?: ConfigAggregator.Options);
+    static create<P, T extends AsyncOptionalCreatable<P>>(this: new (options?: ConfigAggregator.Options) => T, options?: ConfigAggregator.Options): Promise<T>;
     /**
      * Get the info for a given key. If the ConfigAggregator was not asynchronously created OR
      * the {@link ConfigAggregator.reload} was not called, the config value may be encrypted.
@@ -208,12 +208,18 @@ export declare namespace ConfigAggregator {
          */
         ENVIRONMENT = "Environment"
     }
+    type Options = {
+        customConfigMeta?: ConfigPropertyMeta[];
+    };
 }
 /**
  * A ConfigAggregator that will work with deprecated config vars (e.g. defaultusername, apiVersion).
  * We do NOT recommend using this class unless you absolutelty have to.
+ *
+ * @deprecated
  */
 export declare class SfdxConfigAggregator extends ConfigAggregator {
+    constructor(options?: ConfigAggregator.Options);
     getPropertyMeta(key: string): ConfigPropertyMeta;
     getPropertyValue<T extends AnyJson>(key: string): Optional<T>;
     getInfo(key: string): ConfigInfo;

package/lib/config/configAggregator.js

@@ -64,6 +64,9 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
         if (ConfigAggregator.encrypted) {
             await config.loadProperties();
         }
+        if (options === null || options === void 0 ? void 0 : options.customConfigMeta) {
+            config_1.Config.addAllowedProperties(options.customConfigMeta);
+        }
         return ConfigAggregator.instance;
     }
     /**
@@ -306,8 +309,19 @@ ConfigAggregator.encrypted = true;
 /**
  * A ConfigAggregator that will work with deprecated config vars (e.g. defaultusername, apiVersion).
  * We do NOT recommend using this class unless you absolutelty have to.
+ *
+ * @deprecated
  */
 class SfdxConfigAggregator extends ConfigAggregator {
+    constructor(options = {}) {
+        const customConfigMeta = options.customConfigMeta || [];
+        // org-metadata-rest-deploy has been moved to plugin-deploy-retrieve but we need to have a placeholder
+        // for it here since sfdx needs to know how to set the deprecated restDeploy config var.
+        const restDeploy = config_1.SFDX_ALLOWED_PROPERTIES.find((p) => p.key === config_1.SfdxPropertyKeys.REST_DEPLOY);
+        const orgRestDeploy = Object.assign({}, restDeploy, { key: 'org-metadata-rest-deploy', deprecated: false });
+        options.customConfigMeta = [...customConfigMeta, orgRestDeploy];
+        super(options);
+    }
     getPropertyMeta(key) {
         const match = this.getAllowedProperties().find((element) => key === element.key);
         if ((match === null || match === void 0 ? void 0 : match.deprecated) && (match === null || match === void 0 ? void 0 : match.newKey)) {
@@ -324,7 +338,9 @@ class SfdxConfigAggregator extends ConfigAggregator {
         return super.getPropertyValue(this.translate(key));
     }
     getInfo(key) {
-        return super.getInfo(this.translate(key));
+        const info = super.getInfo(this.translate(key));
+        info.key = this.translate(info.key, 'toOld');
+        return info;
     }
     getLocation(key) {
         return super.getLocation(this.translate(key));

package/lib/config/configFile.js

@@ -306,7 +306,7 @@ class ConfigFile extends configStore_1.BaseConfigStore {
                 ? this.options.rootFolder
                 : ConfigFile.resolveRootFolderSync(!!this.options.isGlobal);
             if (_isGlobal || _isState) {
-                configRootFolder = (0, path_1.join)(configRootFolder, this.options.stateFolder || global_1.Global.SFDX_STATE_FOLDER);
+                configRootFolder = (0, path_1.join)(configRootFolder, this.options.stateFolder || global_1.Global.SF_STATE_FOLDER);
             }
             this.path = (0, path_1.join)(configRootFolder, this.options.filePath ? this.options.filePath : '', this.options.filename);
         }

package/lib/config/orgUsersConfig.js

@@ -7,6 +7,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrgUsersConfig = void 0;
+const global_1 = require("../global");
 const configFile_1 = require("./configFile");
 /**
  * A config file that stores usernames for an org.
@@ -33,6 +34,7 @@ class OrgUsersConfig extends configFile_1.ConfigFile {
             isState: true,
             filename: `${orgId}.json`,
             orgId,
+            stateFolder: global_1.Global.SFDX_STATE_FOLDER,
         };
     }
 }

package/lib/config/sandboxOrgConfig.js

@@ -7,6 +7,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SandboxOrgConfig = void 0;
+const global_1 = require("../global");
 const configFile_1 = require("./configFile");
 /**
  * A config file that stores usernames for an org.
@@ -33,6 +34,7 @@ class SandboxOrgConfig extends configFile_1.ConfigFile {
             isState: true,
             filename: `${orgId}.sandbox.json`,
             orgId,
+            stateFolder: global_1.Global.SFDX_STATE_FOLDER,
         };
     }
 }

package/package.json

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