@salesforce/core 5.4.0-crdt.1 → 6.1.0

package/README.md

@@ -34,11 +34,11 @@ The Messages class, by default, loads message text during run time. It's optimiz
 
 If you're using @salesforce/core or other code that uses its Messages class in a bundler (webpack, esbuild, etc) it may struggle with these runtime references.
 
-src/messageTransformer will "inline" the messages into the js files during TS compile using `https://github.com/cevek/ttypescript`.
+src/messageTransformer will "inline" the messages into the js files during TS compile using `https://github.com/nonara/ts-patch`.
 
 In your plugin or library,
 
-`yarn add --dev ttypescript`
+`yarn add --dev ts-patch`
 
 > tsconfig.json
 
@@ -54,7 +54,7 @@ In your plugin or library,
 ```json
 "wireit": {
     "compile": {
-      "command": "ttsc -p . --pretty --incremental",
+      "command": "tspc -p . --pretty --incremental",
       "files": [
         "src/**/*.ts",
         "tsconfig.json",

package/lib/config/authInfoConfig.d.ts

@@ -1,4 +1,4 @@
-import { AuthFields } from '../org';
+import { AuthFields } from '../org/authInfo';
 import { ConfigFile } from './configFile';
 /**
  * An auth config file that stores information such as access tokens, usernames, etc.,

package/lib/config/config.d.ts

@@ -1,7 +1,7 @@
-import { JsonCollection, JsonPrimitive, Nullable } from '@salesforce/ts-types';
+import { Nullable } from '@salesforce/ts-types';
 import { OrgConfigProperties } from '../org/orgConfigProperties';
 import { ConfigFile } from './configFile';
-import { ConfigContents, ConfigValue } from './configStackTypes';
+import { ConfigContents, ConfigValue, Key } from './configStackTypes';
 /**
  * Interface for meta information about config properties
  */
@@ -181,9 +181,7 @@ export declare const SFDX_ALLOWED_PROPERTIES: ({
 export declare const SfProperty: {
     [index: string]: ConfigPropertyMeta;
 };
-export type ConfigProperties = {
-    [index: string]: JsonPrimitive;
-};
+export type ConfigProperties = ConfigContents;
 /**
  * The files where sfdx config values are stored for projects and the global space.
  *
@@ -199,7 +197,7 @@ export type ConfigProperties = {
  */
 export declare class Config extends ConfigFile<ConfigFile.Options, ConfigProperties> {
     private static allowedProperties;
-    private sfdxConfig;
+    private sfdxPath?;
     constructor(options?: ConfigFile.Options);
     /**
      * Returns the default file name for a config file.
@@ -224,7 +222,7 @@ export declare class Config extends ConfigFile<ConfigFile.Options, ConfigPropert
      * @param propertyName The name of the property to set.
      * @param value The property value.
      */
-    static update(isGlobal: boolean, propertyName: string, value?: ConfigValue): Promise<ConfigContents>;
+    static update<K extends Key<ConfigProperties>>(isGlobal: boolean, propertyName: K, value?: ConfigProperties[K]): Promise<ConfigContents>;
     /**
      * Clear all the configured properties both local and global.
      */
@@ -260,7 +258,7 @@ export declare class Config extends ConfigFile<ConfigFile.Options, ConfigPropert
      * @param key The property to set.
      * @param value The value of the property.
      */
-    set(key: string, value: JsonPrimitive | JsonCollection): ConfigProperties;
+    set<K extends Key<ConfigProperties>>(key: K, value: ConfigProperties[K]): ConfigProperties;
     /**
      * Unsets a value for a property.
      *
@@ -288,24 +286,3 @@ export declare class Config extends ConfigFile<ConfigFile.Options, ConfigPropert
      */
     private cryptProperties;
 }
-export declare class SfdxConfig {
-    private options;
-    private config;
-    private sfdxPath;
-    constructor(options: ConfigFile.Options, config: Config);
-    /**
-     * If Global.SFDX_INTEROPERABILITY is enabled, merge the sfdx config into the sf config
-     */
-    merge(config: ConfigProperties): ConfigProperties | undefined;
-    write(config?: import("@salesforce/ts-types").JsonMap): Promise<void>;
-    private readSync;
-    private getSfdxPath;
-    /**
-     * If toNew is specified: migrate all deprecated configs with a newKey to the newKey.
-     * - For example, defaultusername will be renamed to target-org.
-     *
-     * If toOld is specified: migrate all deprecated configs back to their original key.
-     * - For example, target-org will be renamed to defaultusername.
-     */
-    private translate;
-}

package/lib/config/config.js

@@ -6,9 +6,9 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SfdxConfig = exports.Config = exports.SfProperty = exports.SFDX_ALLOWED_PROPERTIES = exports.SfdxPropertyKeys = exports.SF_ALLOWED_PROPERTIES = exports.SfConfigProperties = void 0;
-const path_1 = require("path");
-const fs = require("fs");
+exports.Config = exports.SfProperty = exports.SFDX_ALLOWED_PROPERTIES = exports.SfdxPropertyKeys = exports.SF_ALLOWED_PROPERTIES = exports.SfConfigProperties = void 0;
+const node_path_1 = require("node:path");
+const fs = require("node:fs");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const global_1 = require("../global");
@@ -19,6 +19,8 @@ const sfdcUrl_1 = require("../util/sfdcUrl");
 const orgConfigProperties_1 = require("../org/orgConfigProperties");
 const lifecycleEvents_1 = require("../lifecycleEvents");
 const configFile_1 = require("./configFile");
+const lwwMap_1 = require("./lwwMap");
+;
 const messages = new messages_1.Messages('@salesforce/core', 'config', new Map([["unknownConfigKey", "Unknown config name: %s."], ["deprecatedConfigKey", "Deprecated config name: %s. Please use %s instead."], ["invalidWrite", "The writeSync method is not allowed on SfdxConfig. Use the async write method instead."], ["invalidConfigValue", "Invalid config value: %s."], ["invalidInstanceUrl", "Specify a valid Salesforce instance URL."], ["invalidApiVersion", "Specify a valid Salesforce API version, for example, 42.0."], ["invalidCustomOrgMetadataTemplates", "Specify a valid repository URL or directory for the custom org metadata templates."], ["invalidIsvDebuggerSid", "Specify a valid Debugger SID."], ["invalidIsvDebuggerUrl", "Specify a valid Debugger URL."], ["invalidNumberConfigValue", "Specify a valid positive integer, for example, 150000."], ["invalidBooleanConfigValue", "The config value can only be set to true or false."], ["invalidProjectWorkspace", "This directory does not contain a valid Salesforce DX project."], ["schemaValidationError", "The config file \"%s\" is not schema valid.\nDue to: %s"], ["schemaValidationError.actions", ["Fix the invalid entries at %s."]], ["missingDefaultPath", "In sfdx-project.json, be sure to specify which package directory (path) is the default. Example: `[{ \"path\": \"packageDirectory1\", \"default\": true }, { \"path\": \"packageDirectory2\" }]`"], ["missingPackageDirectory", "The path \"%s\", specified in sfdx-project.json, does not exist. Be sure this directory is included in your project root."], ["invalidPackageDirectory", "The path \"%s\", specified in sfdx-project.json, must be indicated as a relative path to the project root."], ["multipleDefaultPaths", "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."], ["target-org", "Username or alias of the org that all commands run against by default. (sf only)"], ["target-dev-hub", "Username or alias of your default Dev Hub org. (sf only)"], ["defaultUsername", "Username or alias of the org that all commands run against by default. (sfdx only)"], ["defaultDevHubUsername", "Username or alias of your default Dev Hub org. (sfdx only)"], ["isvDebuggerSid", "ISV debugger SID (sfdx only)"], ["isvDebuggerUrl", "ISV debugger URL (sfdx only)"], ["org-isv-debugger-sid", "ISV debugger SID."], ["org-isv-debugger-url", "ISV debugger URL."], ["apiVersion", "API version of your project. Default: API version of your Dev Hub org. (sfdx only)"], ["org-api-version", "API version of your project. Default: API version of your Dev Hub org."], ["disableTelemetry", "Disables the collection of usage and user environment information, etc. Default: false. (sfdx only)"], ["disable-telemetry", "Disables the collection of usage and user environment information, etc. Default: false."], ["maxQueryLimit", "Maximum number of Salesforce records returned by a CLI command. Default: 10,000. (sfdx only)"], ["org-max-query-limit", "Maximum number of Salesforce records returned by a CLI command. Default: 10,000."], ["restDeploy", "Whether deployments use the Metadata REST API (true) or SOAP API (false, default value). (sfdx only)"], ["instanceUrl", "URL of the Salesforce instance hosting your org. Default: https://login.salesforce.com. (sfdx only)"], ["org-instance-url", "URL of the Salesforce instance hosting your org. Default: https://login.salesforce.com."], ["customOrgMetadataTemplates", "A valid repository URL or directory for the custom org metadata templates."], ["org-custom-metadata-templates", "A valid repository URL or directory for the custom org metadata templates."], ["invalidId", "The given id %s is not a valid 15 or 18 character Salesforce ID."]]));
 const SFDX_CONFIG_FILE_NAME = 'sfdx-config.json';
 const CONFIG_FILE_NAME = 'config.json';
@@ -28,13 +30,13 @@ var SfConfigProperties;
      * Disables telemetry reporting
      */
     SfConfigProperties["DISABLE_TELEMETRY"] = "disable-telemetry";
-})(SfConfigProperties = exports.SfConfigProperties || (exports.SfConfigProperties = {}));
+})(SfConfigProperties || (exports.SfConfigProperties = SfConfigProperties = {}));
 exports.SF_ALLOWED_PROPERTIES = [
     {
         key: SfConfigProperties.DISABLE_TELEMETRY,
         description: messages.getMessage(SfConfigProperties.DISABLE_TELEMETRY),
         input: {
-            validator: (value) => value == null || ['true', 'false'].includes(value.toString()),
+            validator: (value) => value == null || isBooleanOrBooleanString(value),
             failedMessage: messages.getMessage('invalidBooleanConfigValue'),
         },
     },
@@ -99,7 +101,7 @@ var SfdxPropertyKeys;
      * @deprecated Replaced by OrgConfigProperties.ORG_INSTANCE_URL in v3 {@link https://github.com/forcedotcom/sfdx-core/blob/v3/MIGRATING_V2-V3.md#config}
      */
     SfdxPropertyKeys["INSTANCE_URL"] = "instanceUrl";
-})(SfdxPropertyKeys = exports.SfdxPropertyKeys || (exports.SfdxPropertyKeys = {}));
+})(SfdxPropertyKeys || (exports.SfdxPropertyKeys = SfdxPropertyKeys = {}));
 exports.SFDX_ALLOWED_PROPERTIES = [
     {
         key: SfdxPropertyKeys.INSTANCE_URL,
@@ -175,7 +177,7 @@ exports.SFDX_ALLOWED_PROPERTIES = [
         deprecated: true,
         description: messages.getMessage(SfdxPropertyKeys.DISABLE_TELEMETRY),
         input: {
-            validator: (value) => value == null || ['true', 'false'].includes(value.toString()),
+            validator: (value) => value == null || isBooleanOrBooleanString(value),
             failedMessage: messages.getMessage('invalidBooleanConfigValue'),
         },
     },
@@ -192,7 +194,7 @@ exports.SFDX_ALLOWED_PROPERTIES = [
         newKey: 'org-metadata-rest-deploy',
         deprecated: true,
         input: {
-            validator: (value) => value != null && ['true', 'false'].includes(value.toString()),
+            validator: (value) => value != null && isBooleanOrBooleanString(value),
             failedMessage: messages.getMessage('invalidBooleanConfigValue'),
         },
     },
@@ -227,18 +229,20 @@ exports.SfProperty = {};
  */
 class Config extends configFile_1.ConfigFile {
     constructor(options) {
-        super(Object.assign({
-            isGlobal: false,
-        }, options ?? {}, {
+        super({
+            ...{ isGlobal: false },
+            ...(options ?? {}),
             // Don't let consumers of config override this. If they really really want to,
             // they can extend this class.
             isState: true,
             filename: Config.getFileName(),
             stateFolder: global_1.Global.SF_STATE_FOLDER,
-        }));
+        });
         // Resolve the config path on creation.
         this.getPath();
-        this.sfdxConfig = new SfdxConfig(this.options, this);
+        if (global_1.Global.SFDX_INTEROPERABILITY) {
+            this.sfdxPath = buildSfdxPath(this.options);
+        }
     }
     /**
      * Returns the default file name for a config file.
@@ -282,7 +286,7 @@ class Config extends configFile_1.ConfigFile {
     static async update(isGlobal, propertyName, value) {
         const config = await Config.create({ isGlobal });
         await config.read();
-        if (value == null || value === undefined) {
+        if (value == null) {
             config.unset(propertyName);
         }
         else {
@@ -294,12 +298,10 @@ class Config extends configFile_1.ConfigFile {
      * Clear all the configured properties both local and global.
      */
     static async clear() {
-        const globalConfig = await Config.create({ isGlobal: true });
+        const [globalConfig, localConfig] = await Promise.all([Config.create({ isGlobal: true }), Config.create()]);
         globalConfig.clear();
-        await globalConfig.write();
-        const localConfig = await Config.create();
         localConfig.clear();
-        await localConfig.write();
+        await Promise.all([globalConfig.write(), localConfig.write()]);
     }
     static getPropertyConfigMeta(propertyName) {
         const prop = Config.propertyConfigMap()[propertyName];
@@ -316,10 +318,12 @@ class Config extends configFile_1.ConfigFile {
      */
     async read(force = true) {
         try {
-            const config = await super.read(false, force);
-            // Merge .sfdx/sfdx-config.json and .sf/config.json
-            const merged = this.sfdxConfig.merge(config);
-            this.setContents(merged);
+            await super.read(false, force);
+            if (global_1.Global.SFDX_INTEROPERABILITY) {
+                // will exist if Global.SFDX_INTEROPERABILITY is enabled
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                this.contents.merge(stateFromSfdxFileSync(this.sfdxPath, this));
+            }
             await this.cryptProperties(false);
             return this.getContents();
         }
@@ -328,10 +332,12 @@ class Config extends configFile_1.ConfigFile {
         }
     }
     readSync(force = true) {
-        const config = super.readSync(false, force);
-        // Merge .sfdx/sfdx-config.json and .sf/config.json
-        const merged = this.sfdxConfig.merge(config);
-        this.setContents(merged);
+        super.readSync(false, force);
+        if (global_1.Global.SFDX_INTEROPERABILITY) {
+            // will exist if Global.SFDX_INTEROPERABILITY is enabled
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            this.contents.merge(stateFromSfdxFileSync(this.sfdxPath, this));
+        }
         return this.getContents();
     }
     /**
@@ -341,9 +347,13 @@ class Config extends configFile_1.ConfigFile {
      */
     async write() {
         await this.cryptProperties(true);
+        // super.write will merge the contents if the target file had newer properties
         await super.write();
-        if (global_1.Global.SFDX_INTEROPERABILITY)
-            await this.sfdxConfig.write();
+        if (global_1.Global.SFDX_INTEROPERABILITY) {
+            // will exist if Global.SFDX_INTEROPERABILITY is enabled
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            await writeToSfdx(this.sfdxPath, this.getContents());
+        }
         await this.cryptProperties(false);
         return this.getContents();
     }
@@ -378,7 +388,7 @@ class Config extends configFile_1.ConfigFile {
             void lifecycleEvents_1.Lifecycle.getInstance().emitWarning(messages.getMessage('deprecatedConfigKey', [key, property.newKey]));
             return this.set(property.newKey, value);
         }
-        if (property.input) {
+        if (value !== undefined && property.input) {
             if (property.input?.validator(value)) {
                 super.set(property.key, value);
             }
@@ -468,92 +478,60 @@ Config.allowedProperties = [
     ...exports.SF_ALLOWED_PROPERTIES,
     ...orgConfigProperties_1.ORG_CONFIG_ALLOWED_PROPERTIES,
 ];
-class SfdxConfig {
-    constructor(options = {}, config) {
-        this.options = options;
-        this.config = config;
-        this.sfdxPath = this.getSfdxPath();
-    }
-    /**
-     * If Global.SFDX_INTEROPERABILITY is enabled, merge the sfdx config into the sf config
-     */
-    merge(config) {
-        if (!global_1.Global.SFDX_INTEROPERABILITY)
-            return config;
-        const sfdxConfig = this.readSync();
-        const sfdxPropKeys = Object.values(SfdxPropertyKeys);
-        // Get a list of config keys that are NOT provided by SfdxPropertyKeys
-        const nonSfdxPropKeys = Config.getAllowedProperties()
-            .filter((p) => !sfdxPropKeys.includes(p.key))
-            .map((p) => p.key);
-        // Remove any config from .sf that isn't also in .sfdx
-        // This handles the scenario where a config has been deleted
-        // from .sfdx and we want to mirror that change in .sf
-        for (const key of nonSfdxPropKeys) {
-            if (!sfdxConfig[key])
-                delete config[key];
-        }
-        return Object.assign(config, sfdxConfig);
-    }
-    async write(config = this.config.toObject()) {
-        try {
-            const translated = this.translate(config, 'toOld');
-            const sfdxPath = this.getSfdxPath();
-            await fs.promises.mkdir((0, path_1.dirname)(sfdxPath), { recursive: true });
-            await fs.promises.writeFile(sfdxPath, JSON.stringify(translated, null, 2));
-        }
-        catch (error) {
-            /* Do nothing */
-        }
+/**
+ * convert from "new" to "old" config names
+ * - For example, `target-org` will be renamed to `defaultusername`.
+ */
+const translateToSfdx = (sfContents) => Object.fromEntries(Object.entries(sfContents).map(([key, value]) => {
+    const propConfig = Config.getAllowedProperties().find((c) => c.newKey === key) ?? {};
+    return propConfig.deprecated && propConfig.newKey ? [propConfig.key, value] : [key, value];
+}));
+/**
+ * convert from "old" to "new" config names
+ * - For example, `defaultusername` will be renamed to `target-org`
+ */
+const translateToSf = (sfdxContents, SfConfig) => Object.fromEntries(Object.entries(sfdxContents).map(([key, value]) => {
+    const propConfig = SfConfig.getPropertyConfig(key);
+    return propConfig.deprecated && propConfig.newKey ? [propConfig.newKey, value] : [key, value];
+}));
+/** given the ConfigFile options, calculate the full path where the config file goes */
+const buildSfdxPath = (options) => {
+    // Don't let users store config files in homedir without being in the state folder.
+    const configRootFolder = options.rootFolder ?? configFile_1.ConfigFile.resolveRootFolderSync(!!options.isGlobal);
+    const rootWithState = options.isGlobal === true || options.isState === true
+        ? (0, node_path_1.join)(configRootFolder, global_1.Global.SFDX_STATE_FOLDER)
+        : configRootFolder;
+    return (0, node_path_1.join)(rootWithState, SFDX_CONFIG_FILE_NAME);
+};
+/**
+ * writes (in an unsafe way) the configuration file to the sfdx file location.
+ * Make sure you call ConfigFile.write and getContents so that the contents passed here are not cross-saving something
+ */
+const writeToSfdx = async (path, contents) => {
+    try {
+        const translated = translateToSfdx(contents);
+        await fs.promises.mkdir((0, node_path_1.dirname)(path), { recursive: true });
+        await fs.promises.writeFile(path, JSON.stringify(translated, null, 2));
     }
-    readSync() {
-        try {
-            const contents = (0, kit_1.parseJsonMap)(fs.readFileSync(this.getSfdxPath(), 'utf8'));
-            return this.translate(contents, 'toNew');
-        }
-        catch (error) {
-            /* Do nothing */
-            return {};
-        }
+    catch (e) {
+        const logger = logger_1.Logger.childFromRoot('core:config:writeToSfdx');
+        logger.debug(`Error writing to sfdx config file at ${path}: ${e instanceof Error ? e.message : ''}`);
     }
-    getSfdxPath() {
-        if (!this.sfdxPath) {
-            const stateFolder = global_1.Global.SFDX_STATE_FOLDER;
-            const fileName = SFDX_CONFIG_FILE_NAME;
-            // Don't let users store config files in homedir without being in the state folder.
-            let configRootFolder = this.options.rootFolder
-                ? this.options.rootFolder
-                : configFile_1.ConfigFile.resolveRootFolderSync(!!this.options.isGlobal);
-            if (this.options.isGlobal === true || this.options.isState === true) {
-                configRootFolder = (0, path_1.join)(configRootFolder, stateFolder);
-            }
-            this.sfdxPath = (0, path_1.join)(configRootFolder, fileName);
-        }
-        return this.sfdxPath;
+};
+/** turn the sfdx config file into a LWWState based on its contents and its timestamp */
+const stateFromSfdxFileSync = (path, config) => {
+    try {
+        const fileContents = fs.readFileSync(path, 'utf8');
+        const mtimeNs = fs.statSync(path, { bigint: true }).mtimeNs;
+        const translatedContents = translateToSf((0, kit_1.parseJsonMap)(fileContents, path), config);
+        // get the file timestamp
+        return (0, lwwMap_1.stateFromContents)(translatedContents, mtimeNs);
     }
-    /**
-     * If toNew is specified: migrate all deprecated configs with a newKey to the newKey.
-     * - For example, defaultusername will be renamed to target-org.
-     *
-     * If toOld is specified: migrate all deprecated configs back to their original key.
-     * - For example, target-org will be renamed to defaultusername.
-     */
-    translate(contents, direction) {
-        const translated = {};
-        for (const [key, value] of Object.entries(contents)) {
-            const propConfig = direction === 'toNew'
-                ? this.config.getPropertyConfig(key)
-                : Config.getAllowedProperties().find((c) => c.newKey === key) ?? {};
-            if (propConfig.deprecated && propConfig.newKey) {
-                const normalizedKey = direction === 'toNew' ? propConfig.newKey : propConfig.key;
-                translated[normalizedKey] = value;
-            }
-            else {
-                translated[key] = value;
-            }
-        }
-        return translated;
+    catch (e) {
+        const logger = logger_1.Logger.childFromRoot('core:config:stateFromSfdxFileSync');
+        logger.debug(`Error reading state from sfdx config file at ${path}: ${e instanceof Error ? e.message : ''}`);
+        return {};
     }
-}
-exports.SfdxConfig = SfdxConfig;
+};
+const isBooleanOrBooleanString = (value) => (typeof value === 'string' && ['true', 'false'].includes(value)) || typeof value === 'boolean';
 //# sourceMappingURL=config.js.map

package/lib/config/configAggregator.js

@@ -13,6 +13,7 @@ const messages_1 = require("../messages");
 const lifecycleEvents_1 = require("../lifecycleEvents");
 const envVars_1 = require("./envVars");
 const config_1 = require("./config");
+;
 const messages = new messages_1.Messages('@salesforce/core', 'config', new Map([["unknownConfigKey", "Unknown config name: %s."], ["deprecatedConfigKey", "Deprecated config name: %s. Please use %s instead."], ["invalidWrite", "The writeSync method is not allowed on SfdxConfig. Use the async write method instead."], ["invalidConfigValue", "Invalid config value: %s."], ["invalidInstanceUrl", "Specify a valid Salesforce instance URL."], ["invalidApiVersion", "Specify a valid Salesforce API version, for example, 42.0."], ["invalidCustomOrgMetadataTemplates", "Specify a valid repository URL or directory for the custom org metadata templates."], ["invalidIsvDebuggerSid", "Specify a valid Debugger SID."], ["invalidIsvDebuggerUrl", "Specify a valid Debugger URL."], ["invalidNumberConfigValue", "Specify a valid positive integer, for example, 150000."], ["invalidBooleanConfigValue", "The config value can only be set to true or false."], ["invalidProjectWorkspace", "This directory does not contain a valid Salesforce DX project."], ["schemaValidationError", "The config file \"%s\" is not schema valid.\nDue to: %s"], ["schemaValidationError.actions", ["Fix the invalid entries at %s."]], ["missingDefaultPath", "In sfdx-project.json, be sure to specify which package directory (path) is the default. Example: `[{ \"path\": \"packageDirectory1\", \"default\": true }, { \"path\": \"packageDirectory2\" }]`"], ["missingPackageDirectory", "The path \"%s\", specified in sfdx-project.json, does not exist. Be sure this directory is included in your project root."], ["invalidPackageDirectory", "The path \"%s\", specified in sfdx-project.json, must be indicated as a relative path to the project root."], ["multipleDefaultPaths", "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."], ["target-org", "Username or alias of the org that all commands run against by default. (sf only)"], ["target-dev-hub", "Username or alias of your default Dev Hub org. (sf only)"], ["defaultUsername", "Username or alias of the org that all commands run against by default. (sfdx only)"], ["defaultDevHubUsername", "Username or alias of your default Dev Hub org. (sfdx only)"], ["isvDebuggerSid", "ISV debugger SID (sfdx only)"], ["isvDebuggerUrl", "ISV debugger URL (sfdx only)"], ["org-isv-debugger-sid", "ISV debugger SID."], ["org-isv-debugger-url", "ISV debugger URL."], ["apiVersion", "API version of your project. Default: API version of your Dev Hub org. (sfdx only)"], ["org-api-version", "API version of your project. Default: API version of your Dev Hub org."], ["disableTelemetry", "Disables the collection of usage and user environment information, etc. Default: false. (sfdx only)"], ["disable-telemetry", "Disables the collection of usage and user environment information, etc. Default: false."], ["maxQueryLimit", "Maximum number of Salesforce records returned by a CLI command. Default: 10,000. (sfdx only)"], ["org-max-query-limit", "Maximum number of Salesforce records returned by a CLI command. Default: 10,000."], ["restDeploy", "Whether deployments use the Metadata REST API (true) or SOAP API (false, default value). (sfdx only)"], ["instanceUrl", "URL of the Salesforce instance hosting your org. Default: https://login.salesforce.com. (sfdx only)"], ["org-instance-url", "URL of the Salesforce instance hosting your org. Default: https://login.salesforce.com."], ["customOrgMetadataTemplates", "A valid repository URL or directory for the custom org metadata templates."], ["org-custom-metadata-templates", "A valid repository URL or directory for the custom org metadata templates."], ["invalidId", "The given id %s is not a valid 15 or 18 character Salesforce ID."]]));
 /**
  * Aggregate global and local project config files, as well as environment variables for

package/lib/config/configFile.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Stats as fsStats } from 'fs';
+import { Stats as fsStats } from 'node:fs';
 import { Logger } from '../logger/logger';
 import { BaseConfigStore } from './configStore';
 import { ConfigContents } from './configStackTypes';
@@ -162,6 +162,8 @@ export declare class ConfigFile<T extends ConfigFile.Options = ConfigFile.Option
      * options.throwOnNotFound is true.
      */
     protected init(): Promise<void>;
+    private logAndMergeContents;
+    private handleWriteError;
 }
 export declare namespace ConfigFile {
     /**