@salesforce/core 3.15.1 → 3.15.2

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,7 +66,7 @@ export declare class ConfigAggregator extends AsyncOptionalCreatable<JsonMap> {
      *
      * @ignore
      */
-    constructor(options?: JsonMap);
+    constructor(options?: ConfigAggregator.Options);
     static create<P, T extends AsyncOptionalCreatable<P>>(this: new (options?: P) => T, options?: P): Promise<T>;
     /**
      * Get the info for a given key. If the ConfigAggregator was not asynchronously created OR
@@ -208,12 +208,19 @@ 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 {
+    private static CUSTOM_CONFIG_VARS;
+    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

@@ -37,6 +37,9 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
      */
     constructor(options) {
         super(options || {});
+        if (options === null || options === void 0 ? void 0 : options.customConfigMeta) {
+            config_1.Config.addAllowedProperties(options.customConfigMeta);
+        }
         // Don't throw an project error with the aggregator, since it should resolve to global if
         // there is no project.
         try {
@@ -306,8 +309,15 @@ 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 || [];
+        options.customConfigMeta = [...customConfigMeta, ...SfdxConfigAggregator.CUSTOM_CONFIG_VARS];
+        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)) {
@@ -347,4 +357,7 @@ class SfdxConfigAggregator extends ConfigAggregator {
     }
 }
 exports.SfdxConfigAggregator = SfdxConfigAggregator;
+// 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.
+SfdxConfigAggregator.CUSTOM_CONFIG_VARS = [{ key: 'org-metadata-rest-deploy', hidden: true }];
 //# sourceMappingURL=configAggregator.js.map

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/package.json

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