@salesforce/core 6.7.5 → 6.7.7-qa.0

package/lib/config/authInfoConfig.js

@@ -17,6 +17,7 @@ const configFile_1 = require("./configFile");
  * ```
  */
 class AuthInfoConfig extends configFile_1.ConfigFile {
+    static encryptedKeys = [/token/i, /password/i, /secret/i];
     /**
      * Gets the config options for a given org ID.
      *
@@ -31,5 +32,4 @@ class AuthInfoConfig extends configFile_1.ConfigFile {
     }
 }
 exports.AuthInfoConfig = AuthInfoConfig;
-AuthInfoConfig.encryptedKeys = [/token/i, /password/i, /secret/i];
 //# sourceMappingURL=authInfoConfig.js.map

package/lib/config/config.js

@@ -251,6 +251,12 @@ exports.SfProperty = {};
  * https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev_cli_config_values.htm
  */
 class Config extends configFile_1.ConfigFile {
+    static allowedProperties = [
+        ...exports.SFDX_ALLOWED_PROPERTIES,
+        ...exports.SF_ALLOWED_PROPERTIES,
+        ...orgConfigProperties_1.ORG_CONFIG_ALLOWED_PROPERTIES,
+    ];
+    sfdxPath;
     constructor(options) {
         super({
             ...{ isGlobal: false },
@@ -496,11 +502,6 @@ class Config extends configFile_1.ConfigFile {
     }
 }
 exports.Config = Config;
-Config.allowedProperties = [
-    ...exports.SFDX_ALLOWED_PROPERTIES,
-    ...exports.SF_ALLOWED_PROPERTIES,
-    ...orgConfigProperties_1.ORG_CONFIG_ALLOWED_PROPERTIES,
-];
 /**
  * convert from "new" to "old" config names
  * - For example, `target-org` will be renamed to `defaultusername`.

package/lib/config/configAggregator.js

@@ -31,6 +31,13 @@ const messages = new messages_1.Messages('@salesforce/core', 'config', new Map([
  * ```
  */
 class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
+    static instance;
+    static encrypted = true;
+    // Initialized in loadProperties
+    allowedProperties;
+    localConfig;
+    globalConfig;
+    envVars = {};
     /**
      * **Do not directly construct instances of this class -- use {@link ConfigAggregator.create} instead.**
      *
@@ -38,7 +45,6 @@ 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 {
@@ -347,5 +353,4 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
     }
 }
 exports.ConfigAggregator = ConfigAggregator;
-ConfigAggregator.encrypted = true;
 //# sourceMappingURL=configAggregator.js.map

package/lib/config/configFile.js

@@ -62,6 +62,12 @@ const lwwMap_1 = require("./lwwMap");
  * ```
  */
 class ConfigFile extends configStore_1.BaseConfigStore {
+    // whether file contents have been read
+    hasRead = false;
+    // Initialized in init
+    logger;
+    // Initialized in create
+    path;
     /**
      * Create an instance of a config file without reading the file. Call `read` or `readSync`
      * after creating the ConfigFile OR instantiate with {@link ConfigFile.create} instead.
@@ -71,8 +77,6 @@ class ConfigFile extends configStore_1.BaseConfigStore {
      */
     constructor(options) {
         super(options);
-        // whether file contents have been read
-        this.hasRead = false;
         this.logger = logger_1.Logger.childFromRoot(this.constructor.name);
         const statics = this.constructor;
         let defaultOptions = {};

package/lib/config/configStore.js

@@ -21,6 +21,13 @@ const lwwMap_1 = require("./lwwMap");
  * **Note:** To see the interface, look in typescripts autocomplete help or the npm package's ConfigStore.d.ts file.
  */
 class BaseConfigStore extends kit_1.AsyncOptionalCreatable {
+    // If encryptedKeys is an array of RegExps, they should not contain the /g (global) or /y (sticky) flags to avoid stateful issues.
+    static encryptedKeys = [];
+    options;
+    crypto;
+    // Initialized in setContents
+    contents = new lwwMap_1.LWWMap();
+    statics = this.constructor;
     /**
      * Constructor.
      *
@@ -29,9 +36,6 @@ class BaseConfigStore extends kit_1.AsyncOptionalCreatable {
      */
     constructor(options) {
         super(options);
-        // Initialized in setContents
-        this.contents = new lwwMap_1.LWWMap();
-        this.statics = this.constructor;
         this.options = options ?? {};
         this.setContents(this.initialContents());
     }
@@ -86,20 +90,21 @@ class BaseConfigStore extends kit_1.AsyncOptionalCreatable {
      * @param value The value.
      */
     set(key, value) {
+        let resolvedValue = value;
         if (this.hasEncryption()) {
-            if ((0, ts_types_2.isJsonMap)(value)) {
-                value = this.recursiveEncrypt(value, key);
+            if ((0, ts_types_2.isJsonMap)(resolvedValue)) {
+                resolvedValue = this.recursiveEncrypt(resolvedValue, key);
             }
             else if (this.isCryptoKey(key)) {
-                value = this.encrypt(value);
+                resolvedValue = this.encrypt(resolvedValue);
             }
         }
         // set(key, undefined) means unset
-        if (value === undefined) {
+        if (resolvedValue === undefined) {
             this.unset(key);
         }
         else {
-            this.contents.set(key, value);
+            this.contents.set(key, resolvedValue);
         }
     }
     /**
@@ -210,10 +215,8 @@ class BaseConfigStore extends kit_1.AsyncOptionalCreatable {
      * @param contents The contents.
      */
     setContents(contents = {}) {
-        if (this.hasEncryption()) {
-            contents = this.recursiveEncrypt(contents);
-        }
-        (0, ts_types_1.entriesOf)(contents).map(([key, value]) => {
+        const maybeEncryptedContents = this.hasEncryption() ? this.recursiveEncrypt(contents) : contents;
+        (0, ts_types_1.entriesOf)(maybeEncryptedContents).map(([key, value]) => {
             this.contents.set(key, value);
         });
     }
@@ -341,11 +344,11 @@ class BaseConfigStore extends kit_1.AsyncOptionalCreatable {
             }
         }
         else if (this.isCryptoKey(key)) {
+            // I think this side effect is intentional
+            // eslint-disable-next-line no-param-reassign
             data[key] = method(value);
         }
     }
 }
 exports.BaseConfigStore = BaseConfigStore;
-// If encryptedKeys is an array of RegExps, they should not contain the /g (global) or /y (sticky) flags to avoid stateful issues.
-BaseConfigStore.encryptedKeys = [];
 //# sourceMappingURL=configStore.js.map

package/lib/config/lwwMap.js

@@ -5,12 +5,6 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _LWWMap_data;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LWWMap = exports.stateFromContents = exports.SYMBOL_FOR_DELETED = void 0;
 const ts_types_1 = require("@salesforce/ts-types");
@@ -31,21 +25,21 @@ const stateFromContents = (contents, timestamp) => Object.fromEntries((0, ts_typ
 );
 exports.stateFromContents = stateFromContents;
 class LWWMap {
+    /** map of key to LWWRegister.  Used for managing conflicts */
+    #data = new Map();
     constructor(state) {
-        /** map of key to LWWRegister.  Used for managing conflicts */
-        _LWWMap_data.set(this, new Map());
         // create a new register for each key in the initial state
         for (const [key, register] of (0, ts_types_1.entriesOf)(state ?? {})) {
-            __classPrivateFieldGet(this, _LWWMap_data, "f").set(key, new lwwRegister_1.LWWRegister(register));
+            this.#data.set(key, new lwwRegister_1.LWWRegister(register));
         }
     }
     get value() {
-        return Object.fromEntries(Array.from(__classPrivateFieldGet(this, _LWWMap_data, "f").entries())
+        return Object.fromEntries(Array.from(this.#data.entries())
             .filter(([, register]) => register.value !== exports.SYMBOL_FOR_DELETED)
             .map(([key, register]) => [key, register.value]));
     }
     get state() {
-        return Object.fromEntries(Array.from(__classPrivateFieldGet(this, _LWWMap_data, "f").entries()).map(([key, register]) => [key, register.state]));
+        return Object.fromEntries(Array.from(this.#data.entries()).map(([key, register]) => [key, register.state]));
     }
     // Merge top-level properties of the incoming state with the current state.
     // The value with the latest timestamp wins.
@@ -53,44 +47,43 @@ class LWWMap {
         // properties that are in the incoming state but not the current state might have been deleted.
         // recursively merge each key's register with the incoming state for that key
         for (const [key, remote] of (0, ts_types_1.entriesOf)(state)) {
-            const local = __classPrivateFieldGet(this, _LWWMap_data, "f").get(key);
+            const local = this.#data.get(key);
             // if the register already exists, merge it with the incoming state
             if (local)
                 local.merge(remote);
             // otherwise, instantiate a new `LWWRegister` with the incoming state
             else
-                __classPrivateFieldGet(this, _LWWMap_data, "f").set(key, new lwwRegister_1.LWWRegister(remote));
+                this.#data.set(key, new lwwRegister_1.LWWRegister(remote));
         }
         return this.state;
     }
     set(key, value) {
         // get the register at the given key
-        const register = __classPrivateFieldGet(this, _LWWMap_data, "f").get(key);
+        const register = this.#data.get(key);
         // if the register already exists, set the value
         if (register)
             register.set(value);
         // otherwise, instantiate a new `LWWRegister` with the value
         else
-            __classPrivateFieldGet(this, _LWWMap_data, "f").set(key, new lwwRegister_1.LWWRegister({ timestamp: (0, time_1.nowBigInt)(), value }));
+            this.#data.set(key, new lwwRegister_1.LWWRegister({ timestamp: (0, time_1.nowBigInt)(), value }));
     }
     get(key) {
         // map loses the typing
-        const value = __classPrivateFieldGet(this, _LWWMap_data, "f").get(key)?.value;
+        const value = this.#data.get(key)?.value;
         if (value === exports.SYMBOL_FOR_DELETED)
             return undefined;
         return value;
     }
     delete(key) {
-        __classPrivateFieldGet(this, _LWWMap_data, "f").set(key, new lwwRegister_1.LWWRegister({
+        this.#data.set(key, new lwwRegister_1.LWWRegister({
             timestamp: (0, time_1.nowBigInt)(),
             value: exports.SYMBOL_FOR_DELETED,
         }));
     }
     has(key) {
         // if a register doesn't exist or its value is null, the map doesn't contain the key
-        return __classPrivateFieldGet(this, _LWWMap_data, "f").has(key) && __classPrivateFieldGet(this, _LWWMap_data, "f").get(key)?.value !== exports.SYMBOL_FOR_DELETED;
+        return this.#data.has(key) && this.#data.get(key)?.value !== exports.SYMBOL_FOR_DELETED;
     }
 }
 exports.LWWMap = LWWMap;
-_LWWMap_data = new WeakMap();
 //# sourceMappingURL=lwwMap.js.map

package/lib/config/lwwRegister.js

@@ -14,6 +14,7 @@ const time_1 = require("../util/time");
  * @param T the type of the value stored in the register
  */
 class LWWRegister {
+    state;
     constructor(state) {
         this.state = state;
     }

package/lib/crypto/crypto.js

@@ -182,6 +182,9 @@ const keychainPromises = {
  * Class for managing encrypting and decrypting private auth information.
  */
 class Crypto extends kit_1.AsyncOptionalCreatable {
+    key = new secureBuffer_1.SecureBuffer();
+    options;
+    noResetOnClose;
     /**
      * Constructor
      * **Do not directly construct instances of this class -- use {@link Crypto.create} instead.**
@@ -191,7 +194,6 @@ class Crypto extends kit_1.AsyncOptionalCreatable {
      */
     constructor(options) {
         super(options);
-        this.key = new secureBuffer_1.SecureBuffer();
         this.options = options ?? {};
     }
     // @ts-expect-error only for test access

package/lib/crypto/keyChainImpl.js

@@ -96,6 +96,8 @@ const _validateProgram = async (programPath, fsIfc, isExeIfc
  * @private
  */
 class KeychainAccess {
+    osImpl;
+    fsIfc;
     /**
      * Abstract prototype for general cross platform keychain interaction.
      *

package/lib/crypto/secureBuffer.js

@@ -49,10 +49,9 @@ const cipherSize = 32;
  * ```
  */
 class SecureBuffer {
-    constructor() {
-        this.key = crypto.randomBytes(cipherSize);
-        this.iv = crypto.randomBytes(16);
-    }
+    key = crypto.randomBytes(cipherSize);
+    iv = crypto.randomBytes(16);
+    secret;
     /**
      * Invokes a callback with a decrypted version of the buffer.
      *

package/lib/deviceOauthService.d.ts

@@ -1,5 +1,5 @@
 import { AsyncCreatable } from '@salesforce/kit';
-import { OAuth2Config } from 'jsforce';
+import { OAuth2Config } from '@jsforce/jsforce-node';
 import { JsonMap, Nullable } from '@salesforce/ts-types';
 import { AuthInfo } from './org/authInfo';
 export interface DeviceCodeResponse extends JsonMap {

package/lib/deviceOauthService.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceOauthService = void 0;
-const transport_1 = __importDefault(require("jsforce/lib/transport"));
+const transport_1 = __importDefault(require("@jsforce/jsforce-node/lib/transport"));
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const form_data_1 = __importDefault(require("form-data"));
@@ -59,9 +59,15 @@ async function makeRequest(options) {
  * ```
  */
 class DeviceOauthService extends kit_1.AsyncCreatable {
+    static RESPONSE_TYPE = 'device_code';
+    static GRANT_TYPE = 'device';
+    static SCOPE = 'refresh_token web api';
+    static POLLING_COUNT_MAX = 100;
+    logger;
+    options;
+    pollingCount = 0;
     constructor(options) {
         super(options);
-        this.pollingCount = 0;
         this.options = options;
         if (!this.options.clientId)
             this.options.clientId = authInfo_1.DEFAULT_CONNECTED_APP_INFO.clientId;
@@ -192,8 +198,4 @@ class DeviceOauthService extends kit_1.AsyncCreatable {
     }
 }
 exports.DeviceOauthService = DeviceOauthService;
-DeviceOauthService.RESPONSE_TYPE = 'device_code';
-DeviceOauthService.GRANT_TYPE = 'device';
-DeviceOauthService.SCOPE = 'refresh_token web api';
-DeviceOauthService.POLLING_COUNT_MAX = 100;
 //# sourceMappingURL=deviceOauthService.js.map

package/lib/global.js

@@ -52,6 +52,24 @@ var Mode;
  * Global constants, methods, and configuration.
  */
 class Global {
+    /**
+     * Enable interoperability between `.sfdx` and `.sf`.
+     *
+     * When @salesforce/core@v2 is deprecated and no longer used, this can be removed.
+     */
+    static SFDX_INTEROPERABILITY = kit_1.env.getBoolean('SF_SFDX_INTEROPERABILITY', true);
+    /**
+     * The global folder in which sfdx state is stored.
+     */
+    static SFDX_STATE_FOLDER = '.sfdx';
+    /**
+     * The global folder in which sf state is stored.
+     */
+    static SF_STATE_FOLDER = '.sf';
+    /**
+     * The preferred global folder in which state is stored.
+     */
+    static STATE_FOLDER = Global.SFDX_STATE_FOLDER;
     /**
      * The full system path to the global sfdx state folder.
      *
@@ -94,37 +112,19 @@ class Global {
      * @param dirPath The directory path to be created within {@link Global.SFDX_DIR}.
      */
     static async createDir(dirPath) {
-        dirPath = dirPath ? path.join(Global.SFDX_DIR, dirPath) : Global.SFDX_DIR;
+        const resolvedPath = dirPath ? path.join(Global.SFDX_DIR, dirPath) : Global.SFDX_DIR;
         try {
             if (process.platform === 'win32') {
-                await fs.promises.mkdir(dirPath, { recursive: true });
+                await fs.promises.mkdir(resolvedPath, { recursive: true });
             }
             else {
-                await fs.promises.mkdir(dirPath, { recursive: true, mode: 0o700 });
+                await fs.promises.mkdir(resolvedPath, { recursive: true, mode: 0o700 });
             }
         }
         catch (error) {
-            throw new sfError_1.SfError(`Failed to create directory or set permissions for: ${dirPath}`);
+            throw new sfError_1.SfError(`Failed to create directory or set permissions for: ${resolvedPath}`);
         }
     }
 }
 exports.Global = Global;
-/**
- * Enable interoperability between `.sfdx` and `.sf`.
- *
- * When @salesforce/core@v2 is deprecated and no longer used, this can be removed.
- */
-Global.SFDX_INTEROPERABILITY = kit_1.env.getBoolean('SF_SFDX_INTEROPERABILITY', true);
-/**
- * The global folder in which sfdx state is stored.
- */
-Global.SFDX_STATE_FOLDER = '.sfdx';
-/**
- * The global folder in which sf state is stored.
- */
-Global.SF_STATE_FOLDER = '.sf';
-/**
- * The preferred global folder in which state is stored.
- */
-Global.STATE_FOLDER = Global.SFDX_STATE_FOLDER;
 //# sourceMappingURL=global.js.map

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-export { OAuth2Config } from 'jsforce';
+export { OAuth2Config } from '@jsforce/jsforce-node';
 export { ConfigFile } from './config/configFile';
 export { TTLConfig } from './config/ttlConfig';
 export { envVars, EnvironmentVariable, SUPPORTED_ENV_VARS, EnvVars } from './config/envVars';

package/lib/lifecycleEvents.js

@@ -58,6 +58,11 @@ const logger_1 = require("./logger/logger");
  * ```
  */
 class Lifecycle {
+    listeners;
+    uniqueListeners;
+    static telemetryEventName = 'telemetry';
+    static warningEventName = 'warning';
+    logger;
     constructor(listeners = {}, uniqueListeners = new Map()) {
         this.listeners = listeners;
         this.uniqueListeners = uniqueListeners;
@@ -227,6 +232,4 @@ class Lifecycle {
     }
 }
 exports.Lifecycle = Lifecycle;
-Lifecycle.telemetryEventName = 'telemetry';
-Lifecycle.warningEventName = 'warning';
 //# sourceMappingURL=lifecycleEvents.js.map

package/lib/logger/logger.js

@@ -85,6 +85,26 @@ var LoggerLevel;
  * **See** https://developer.salesforce.com/docs/atlas.en-us.sfdx_setup.meta/sfdx_setup/sfdx_dev_cli_log_messages.htm
  */
 class Logger {
+    /**
+     * The name of the root sfdx `Logger`.
+     */
+    static ROOT_NAME = 'sf';
+    /**
+     * The default `LoggerLevel` when constructing new `Logger` instances.
+     */
+    static DEFAULT_LEVEL = LoggerLevel.WARN;
+    /**
+     * A list of all lower case `LoggerLevel` names.
+     *
+     * **See** {@link LoggerLevel}
+     */
+    static LEVEL_NAMES = Object.values(LoggerLevel)
+        .filter(ts_types_1.isString)
+        .map((v) => v.toLowerCase());
+    // The sfdx root logger singleton
+    static rootLogger;
+    pinoLogger;
+    memoryLogger;
     /**
      * Constructs a new `Logger`.
      *
@@ -194,11 +214,11 @@ class Logger {
      * @see {@Link LoggerLevel}
      */
     static getLevelByName(levelName) {
-        levelName = levelName.toUpperCase();
-        if (!(0, ts_types_1.isKeyOf)(LoggerLevel, levelName)) {
-            throw new sfError_1.SfError(`Invalid log level "${levelName}".`, 'UnrecognizedLoggerLevelNameError');
+        const upperLevel = levelName.toUpperCase();
+        if (!(0, ts_types_1.isKeyOf)(LoggerLevel, upperLevel)) {
+            throw new sfError_1.SfError(`Invalid log level "${upperLevel}".`, 'UnrecognizedLoggerLevelNameError');
         }
-        return LoggerLevel[levelName];
+        return LoggerLevel[upperLevel];
     }
     /** get the bare (pino) logger instead of using the class hierarchy */
     static getRawRootLogger() {
@@ -242,11 +262,8 @@ class Logger {
      * ```
      */
     setLevel(level) {
-        if (level == null) {
-            const logLevelFromEnvVar = new kit_1.Env().getString('SF_LOG_LEVEL');
-            level = logLevelFromEnvVar ? Logger.getLevelByName(logLevelFromEnvVar) : Logger.DEFAULT_LEVEL;
-        }
-        this.pinoLogger.level = this.pinoLogger.levels.labels[level] ?? this.pinoLogger.levels.labels[Logger.DEFAULT_LEVEL];
+        this.pinoLogger.level =
+            this.pinoLogger.levels.labels[level ?? getDefaultLevel()] ?? this.pinoLogger.levels.labels[Logger.DEFAULT_LEVEL];
         return this;
     }
     /**
@@ -272,10 +289,7 @@ class Logger {
      */
     readLogContentsAsText() {
         if (this.memoryLogger) {
-            return this.memoryLogger.loggedData.reduce((accum, line) => {
-                accum += JSON.stringify(line) + os.EOL;
-                return accum;
-            }, '');
+            return this.memoryLogger?.loggedData.map((line) => JSON.stringify(line)).join(os.EOL);
         }
         else {
             this.pinoLogger.warn('readLogContentsAsText is not supported for file streams, only used when useMemoryLogging is true');
@@ -374,22 +388,6 @@ class Logger {
     }
 }
 exports.Logger = Logger;
-/**
- * The name of the root sfdx `Logger`.
- */
-Logger.ROOT_NAME = 'sf';
-/**
- * The default `LoggerLevel` when constructing new `Logger` instances.
- */
-Logger.DEFAULT_LEVEL = LoggerLevel.WARN;
-/**
- * A list of all lower case `LoggerLevel` names.
- *
- * **See** {@link LoggerLevel}
- */
-Logger.LEVEL_NAMES = Object.values(LoggerLevel)
-    .filter(ts_types_1.isString)
-    .map((v) => v.toLowerCase());
 /** return various streams that the logger could send data to, depending on the options and env  */
 const getWriteStream = (level = 'warn') => {
     // used when debug mode, writes to stdout (colorized)
@@ -441,4 +439,8 @@ const levelFromOption = (value) => {
 const numberToLevel = (level) => pino_1.pino.levels.labels[level] ??
     Object.entries(pino_1.pino.levels.labels).find(([value]) => Number(value) > level)?.[1] ??
     'warn';
+const getDefaultLevel = () => {
+    const logLevelFromEnvVar = new kit_1.Env().getString('SF_LOG_LEVEL');
+    return logLevelFromEnvVar ? Logger.getLevelByName(logLevelFromEnvVar) : Logger.DEFAULT_LEVEL;
+};
 //# sourceMappingURL=logger.js.map

package/lib/logger/memoryLogger.js

@@ -14,9 +14,9 @@ const filters_1 = require("./filters");
  * Used by test setup to keep UT from writing to disk.
  */
 class MemoryLogger extends node_stream_1.Writable {
+    loggedData = [];
     constructor() {
         super({ objectMode: true });
-        this.loggedData = [];
     }
     _write(chunk, encoding, callback) {
         const filteredChunk = (0, unwrapArray_1.unwrapArray)((0, filters_1.filterSecrets)([chunk]));