@salesforce/core 8.18.6 → 8.19.0

package/lib/config/config.js

@@ -1,39 +1,16 @@
 "use strict";
 /*
- * Copyright (c) 2020, salesforce.com, inc.
+ * Copyright (c) 2025, salesforce.com, inc.
  * All rights reserved.
  * 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 __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 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 = __importStar(require("node:fs"));
-const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
+const kit_1 = require("@salesforce/kit");
+const fs_1 = require("../fs/fs");
 const global_1 = require("../global");
 const logger_1 = require("../logger/logger");
 const messages_1 = require("../messages");
@@ -534,8 +511,8 @@ const buildSfdxPath = (options) => {
 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));
+        await fs_1.fs.promises.mkdir((0, node_path_1.dirname)(path), { recursive: true });
+        await fs_1.fs.promises.writeFile(path, JSON.stringify(translated, null, 2));
     }
     catch (e) {
         const logger = logger_1.Logger.childFromRoot('core:config:writeToSfdx');
@@ -545,8 +522,8 @@ const writeToSfdx = async (path, contents) => {
 /** 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 fileContents = fs_1.fs.readFileSync(path, 'utf8');
+        const mtimeNs = fs_1.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);

package/lib/config/configFile.d.ts

@@ -17,7 +17,7 @@ import { ConfigContents } from './configStackTypes';
  * const myConfig = await MyConfig.create({
  *   isGlobal: true
  * });
- * myConfig.set('mykey', 'myvalue');
+ * myConfig.set('myKey', 'myValue');
  * await myConfig.write();
  * ```
  */

package/lib/config/configFile.js

@@ -5,36 +5,13 @@
  * 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 __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigFile = void 0;
-const fs = __importStar(require("node:fs"));
-const node_fs_1 = require("node:fs");
 const node_os_1 = require("node:os");
 const node_path_1 = require("node:path");
+const node_fs_1 = require("node:fs");
 const kit_1 = require("@salesforce/kit");
+const fs_1 = require("../fs/fs");
 const global_1 = require("../global");
 const logger_1 = require("../logger/logger");
 const sfError_1 = require("../sfError");
@@ -57,7 +34,7 @@ const lwwMap_1 = require("./lwwMap");
  * const myConfig = await MyConfig.create({
  *   isGlobal: true
  * });
- * myConfig.set('mykey', 'myvalue');
+ * myConfig.set('myKey', 'myValue');
  * await myConfig.write();
  * ```
  */
@@ -136,7 +113,7 @@ class ConfigFile extends configStore_1.BaseConfigStore {
      */
     async access(perm) {
         try {
-            await fs.promises.access(this.getPath(), perm);
+            await fs_1.fs.promises.access(this.getPath(), perm);
             return true;
         }
         catch (err) {
@@ -153,7 +130,7 @@ class ConfigFile extends configStore_1.BaseConfigStore {
      */
     accessSync(perm) {
         try {
-            fs.accessSync(this.getPath(), perm);
+            fs_1.fs.accessSync(this.getPath(), perm);
             return true;
         }
         catch (err) {
@@ -176,8 +153,8 @@ class ConfigFile extends configStore_1.BaseConfigStore {
             if (!this.hasRead || force) {
                 this.logger.debug(`Reading config file: ${this.getPath()} because ${!this.hasRead ? 'hasRead is false' : 'force parameter is true'}`);
                 await (0, fileLocking_1.pollUntilUnlock)(this.getPath());
-                const obj = (0, kit_1.parseJsonMap)(await fs.promises.readFile(this.getPath(), 'utf8'), this.getPath());
-                this.setContentsFromFileContents(obj, (await fs.promises.stat(this.getPath(), { bigint: true })).mtimeNs);
+                const obj = (0, kit_1.parseJsonMap)(await fs_1.fs.promises.readFile(this.getPath(), 'utf8'), this.getPath());
+                this.setContentsFromFileContents(obj, (await fs_1.fs.promises.stat(this.getPath(), { bigint: true })).mtimeNs);
             }
             // Necessarily set this even when an error happens to avoid infinite re-reading.
             // To attempt another read, pass `force=true`.
@@ -213,8 +190,8 @@ class ConfigFile extends configStore_1.BaseConfigStore {
             if (!this.hasRead || force) {
                 (0, fileLocking_1.pollUntilUnlockSync)(this.getPath());
                 this.logger.debug(`Reading config file: ${this.getPath()}`);
-                const obj = (0, kit_1.parseJsonMap)(fs.readFileSync(this.getPath(), 'utf8'));
-                this.setContentsFromFileContents(obj, fs.statSync(this.getPath(), { bigint: true }).mtimeNs);
+                const obj = (0, kit_1.parseJsonMap)(fs_1.fs.readFileSync(this.getPath(), 'utf8'));
+                this.setContentsFromFileContents(obj, fs_1.fs.statSync(this.getPath(), { bigint: true }).mtimeNs);
             }
             // Necessarily set this even when an error happens to avoid infinite re-reading.
             // To attempt another read, pass `force=true`.
@@ -248,7 +225,7 @@ class ConfigFile extends configStore_1.BaseConfigStore {
         // lock the file.  Returns an unlock function to call when done.
         try {
             const fileTimestamp = await getNsTimeStamp(this.getPath());
-            const fileContents = (0, kit_1.parseJsonMap)(await fs.promises.readFile(this.getPath(), 'utf8'), this.getPath());
+            const fileContents = (0, kit_1.parseJsonMap)(await fs_1.fs.promises.readFile(this.getPath(), 'utf8'), this.getPath());
             this.logAndMergeContents(fileTimestamp, fileContents);
         }
         catch (err) {
@@ -269,7 +246,7 @@ class ConfigFile extends configStore_1.BaseConfigStore {
         try {
             // get the file modstamp.  Do this after the lock acquisition in case the file is being written to.
             const fileTimestamp = getNsTimeStampSync(this.getPath());
-            const fileContents = (0, kit_1.parseJsonMap)(fs.readFileSync(this.getPath(), 'utf8'), this.getPath());
+            const fileContents = (0, kit_1.parseJsonMap)(fs_1.fs.readFileSync(this.getPath(), 'utf8'), this.getPath());
             this.logAndMergeContents(fileTimestamp, fileContents);
         }
         catch (err) {
@@ -297,7 +274,7 @@ class ConfigFile extends configStore_1.BaseConfigStore {
      * {@link fs.stat}
      */
     async stat() {
-        return fs.promises.stat(this.getPath());
+        return fs_1.fs.promises.stat(this.getPath());
     }
     /**
      * Get the stats of the file. Returns the stats of the file.
@@ -305,7 +282,7 @@ class ConfigFile extends configStore_1.BaseConfigStore {
      * {@link fs.stat}
      */
     statSync() {
-        return fs.statSync(this.getPath());
+        return fs_1.fs.statSync(this.getPath());
     }
     /**
      * Delete the config file if it exists.
@@ -316,7 +293,7 @@ class ConfigFile extends configStore_1.BaseConfigStore {
     async unlink() {
         const exists = await this.exists();
         if (exists) {
-            return fs.promises.unlink(this.getPath());
+            return fs_1.fs.promises.unlink(this.getPath());
         }
         throw new sfError_1.SfError(`Target file doesn't exist. path: ${this.getPath()}`, 'TargetFileNotFound');
     }
@@ -329,7 +306,7 @@ class ConfigFile extends configStore_1.BaseConfigStore {
     unlinkSync() {
         const exists = this.existsSync();
         if (exists) {
-            return fs.unlinkSync(this.getPath());
+            return fs_1.fs.unlinkSync(this.getPath());
         }
         throw new sfError_1.SfError(`Target file doesn't exist. path: ${this.getPath()}`, 'TargetFileNotFound');
     }
@@ -394,8 +371,8 @@ class ConfigFile extends configStore_1.BaseConfigStore {
     }
 }
 exports.ConfigFile = ConfigFile;
-const getNsTimeStamp = async (filePath) => getNsTimeStampFromStatus(await fs.promises.stat(filePath, { bigint: true }));
-const getNsTimeStampSync = (filePath) => getNsTimeStampFromStatus(fs.statSync(filePath, { bigint: true }));
+const getNsTimeStamp = async (filePath) => getNsTimeStampFromStatus(await fs_1.fs.promises.stat(filePath, { bigint: true }));
+const getNsTimeStampSync = (filePath) => getNsTimeStampFromStatus(fs_1.fs.statSync(filePath, { bigint: true }));
 /** in browser environment, memfs is missing the bigInt ns timestamp, so we generate it from the ms */
-const getNsTimeStampFromStatus = (stats) => stats.mtimeNs ?? BigInt(stats.mtimeMs) * BigInt(1_000_000);
+const getNsTimeStampFromStatus = (stats) => 'mtimeNs' in stats ? stats.mtimeNs : BigInt(stats.mtimeMs) * BigInt(1_000_000);
 //# sourceMappingURL=configFile.js.map

package/lib/crypto/crypto.js

@@ -367,9 +367,7 @@ class Crypto extends kit_1.AsyncOptionalCreatable {
         });
     }
     async getKeyChain(platform) {
-        if (!this.options.keychain) {
-            this.options.keychain = await (0, keyChain_1.retrieveKeychain)(platform);
-        }
+        this.options.keychain ??= await (0, keyChain_1.retrieveKeychain)(platform);
         return this.options.keychain;
     }
 }

package/lib/crypto/keyChainImpl.d.ts

@@ -1,7 +1,7 @@
 import * as childProcess from 'node:child_process';
-import * as nodeFs from 'node:fs';
 import { Nullable } from '@salesforce/ts-types';
-export type FsIfc = Pick<typeof nodeFs, 'statSync'>;
+import { fs } from '../fs/fs';
+export type FsIfc = Pick<typeof fs, 'statSync'>;
 /**
  * Basic keychain interface.
  */

package/lib/crypto/keyChainImpl.js

@@ -31,13 +31,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.keyChainImpl = exports.GenericWindowsKeychainAccess = exports.GenericUnixKeychainAccess = exports.GenericKeychainAccess = exports.KeychainAccess = void 0;
 const childProcess = __importStar(require("node:child_process"));
-const nodeFs = __importStar(require("node:fs"));
-const fs = __importStar(require("node:fs"));
 const os = __importStar(require("node:os"));
 const node_os_1 = require("node:os");
 const path = __importStar(require("node:path"));
 const ts_types_1 = require("@salesforce/ts-types");
 const kit_1 = require("@salesforce/kit");
+const fs_1 = require("../fs/fs");
 const global_1 = require("../global");
 const messages_1 = require("../messages");
 ;
@@ -252,7 +251,7 @@ const linuxImpl = {
     setCommandFunc(opts, fn) {
         const secretTool = fn(linuxImpl.getProgram(), linuxImpl.setProgramOptions(opts));
         if (secretTool.stdin) {
-            secretTool.stdin.write(`${opts.password}\n`);
+            secretTool.stdin.write(`${opts.password ?? ''}\n`);
         }
         return secretTool;
     },
@@ -351,8 +350,8 @@ async function writeFile(opts, fn) {
             [SecretField.SERVICE]: opts.service,
         };
         const secretFile = getSecretFile();
-        await fs.promises.mkdir(path.dirname(secretFile), { recursive: true });
-        await fs.promises.writeFile(secretFile, JSON.stringify(contents, null, 4), { mode: '600' });
+        await fs_1.fs.promises.mkdir(path.dirname(secretFile), { recursive: true });
+        await fs_1.fs.promises.writeFile(secretFile, JSON.stringify(contents, null, 4), { mode: '600' });
         fn(null, contents);
     }
     catch (err) {
@@ -361,7 +360,7 @@ async function writeFile(opts, fn) {
 }
 async function readFile() {
     // The file and access is validated before this method is called
-    const fileContents = (0, kit_1.parseJsonMap)(await fs.promises.readFile(getSecretFile(), 'utf8'));
+    const fileContents = (0, kit_1.parseJsonMap)(await fs_1.fs.promises.readFile(getSecretFile(), 'utf8'));
     return {
         account: (0, ts_types_1.ensureString)(fileContents[SecretField.ACCOUNT]),
         password: (0, ts_types_1.asString)(fileContents[SecretField.KEY]),
@@ -427,7 +426,7 @@ class GenericKeychainAccess {
     async isValidFileAccess(cb) {
         try {
             const root = (0, node_os_1.homedir)();
-            await fs.promises.access(path.join(root, global_1.Global.SFDX_STATE_FOLDER), fs.constants.R_OK | fs.constants.X_OK | fs.constants.W_OK);
+            await fs_1.fs.promises.access(path.join(root, global_1.Global.SFDX_STATE_FOLDER), fs_1.fs.constants.R_OK | fs_1.fs.constants.X_OK | fs_1.fs.constants.W_OK);
             await cb(null);
         }
         catch (err) {
@@ -448,7 +447,7 @@ class GenericUnixKeychainAccess extends GenericKeychainAccess {
             }
             else {
                 const secretFile = getSecretFile();
-                const stats = await fs.promises.stat(secretFile);
+                const stats = await fs_1.fs.promises.stat(secretFile);
                 const octalModeStr = (stats.mode & 0o777).toString(8);
                 const EXPECTED_OCTAL_PERM_VALUE = '600';
                 if (octalModeStr === EXPECTED_OCTAL_PERM_VALUE) {
@@ -474,7 +473,7 @@ class GenericWindowsKeychainAccess extends GenericKeychainAccess {
             }
             else {
                 try {
-                    await fs.promises.access(getSecretFile(), fs.constants.R_OK | fs.constants.W_OK);
+                    await fs_1.fs.promises.access(getSecretFile(), fs_1.fs.constants.R_OK | fs_1.fs.constants.W_OK);
                     await cb(null);
                 }
                 catch (e) {
@@ -493,8 +492,8 @@ exports.keyChainImpl = {
     generic_unix: new GenericUnixKeychainAccess(),
     // eslint-disable-next-line camelcase
     generic_windows: new GenericWindowsKeychainAccess(),
-    darwin: new KeychainAccess(darwinImpl, nodeFs),
-    linux: new KeychainAccess(linuxImpl, nodeFs),
+    darwin: new KeychainAccess(darwinImpl, fs_1.fs),
+    linux: new KeychainAccess(linuxImpl, fs_1.fs),
     validateProgram: _validateProgram,
 };
 //# sourceMappingURL=keyChainImpl.js.map

package/lib/deviceOauthService.js

@@ -114,8 +114,8 @@ class DeviceOauthService extends kit_1.AsyncCreatable {
     }
     async init() {
         this.logger = await logger_1.Logger.child(this.constructor.name);
-        this.logger.debug(`this.options.clientId: ${this.options.clientId}`);
-        this.logger.debug(`this.options.loginUrl: ${this.options.loginUrl}`);
+        this.logger.debug(`this.options.clientId: ${this.options.clientId ?? '<undefined>'}`);
+        this.logger.debug(`this.options.loginUrl: ${this.options.loginUrl ?? '<undefined>'}`);
     }
     getLoginOptions(url) {
         const form = new form_data_1.default();

package/lib/fs/fs.d.ts

@@ -0,0 +1,6 @@
+import * as memfs from 'memfs';
+import type { VirtualFs } from './types';
+export declare let fs: VirtualFs;
+export declare const getVirtualFs: (memfsVolume?: memfs.Volume) => VirtualFs;
+export declare const setFs: (providedFs: VirtualFs) => void;
+export declare const resetFs: () => void;

package/lib/fs/fs.js

@@ -0,0 +1,79 @@
+"use strict";
+/*
+ * Copyright (c) 2023, salesforce.com, inc.
+ * All rights reserved.
+ * 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 __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resetFs = exports.setFs = exports.getVirtualFs = exports.fs = void 0;
+const nodeFs = __importStar(require("node:fs"));
+// yes, we're going to import it even though it might not be used.
+// the alternatives were all worse without top-level await (iife, runtime errors from something trying to use it before it's initialized)
+const memfs = __importStar(require("memfs"));
+const isWeb = () => process.env.FORCE_MEMFS === 'true' || 'window' in globalThis || 'self' in globalThis;
+const getVirtualFs = (memfsVolume) => {
+    if (isWeb()) {
+        const memfsInstance = memfs.createFsFromVolume(memfsVolume ?? new memfs.Volume());
+        // Start with memfs instance and only override problematic methods
+        const webFs = {
+            ...memfsInstance,
+            // Override only the methods that have incompatible signatures
+            promises: {
+                ...memfsInstance.promises,
+                writeFile: async (file, data, options) => {
+                    const finalOptions = typeof options === 'string' ? { encoding: options } : options;
+                    await memfsInstance.promises.writeFile(file, data, finalOptions);
+                },
+                readFile: async (path, encoding) => {
+                    const result = await memfsInstance.promises.readFile(path, encoding);
+                    return encoding === 'utf8' ? String(result) : Buffer.from(result);
+                },
+            },
+            readFileSync: (path, encoding) => {
+                const result = memfsInstance.readFileSync(path, encoding);
+                return encoding === 'utf8' ? String(result) : Buffer.from(result);
+            },
+            writeFileSync: (file, data, encoding) => {
+                memfsInstance.writeFileSync(file, data, { encoding });
+            },
+        };
+        return webFs;
+    }
+    return nodeFs;
+};
+exports.getVirtualFs = getVirtualFs;
+const setFs = (providedFs) => {
+    exports.fs = providedFs;
+};
+exports.setFs = setFs;
+const resetFs = () => {
+    exports.fs = (0, exports.getVirtualFs)();
+};
+exports.resetFs = resetFs;
+// Initialize fs at module load time
+exports.fs = (0, exports.getVirtualFs)();
+//# sourceMappingURL=fs.js.map

package/lib/fs/types.d.ts

@@ -0,0 +1,31 @@
+import type * as nodeFs from 'node:fs';
+import type { IFs as MemFs } from 'memfs';
+type NodeFs = typeof nodeFs;
+type CommonKeys<T, U> = keyof T & keyof U;
+type IntersectionType<T, U> = {
+    [K in CommonKeys<T, U>]: T[K] extends (...args: any[]) => any ? T[K] extends U[K] ? T[K] : U[K] extends T[K] ? U[K] : any : T[K] extends U[K] ? T[K] : U[K] extends T[K] ? U[K] : T[K];
+};
+type BaseVirtualFs = IntersectionType<NodeFs, MemFs>;
+export type VirtualFs = Omit<BaseVirtualFs, 'writeFileSync' | 'readFileSync' | 'statSync' | 'promises' | 'mkdtempSync' | 'createWriteStream' | 'mkdirSync'> & {
+    promises: Omit<BaseVirtualFs['promises'], 'writeFile' | 'readFile'> & {
+        writeFile: (file: string, data: string | Buffer, options?: BufferEncoding | {
+            encoding?: BufferEncoding;
+            mode?: string | number;
+        }) => Promise<void>;
+        readFile: {
+            (path: string): Promise<Buffer>;
+            (path: string, encoding: BufferEncoding): Promise<string>;
+        };
+    };
+    readFileSync: {
+        (path: string): Buffer;
+        (path: string, encoding: BufferEncoding): string;
+    };
+    writeFileSync: (file: string, data: string | Buffer, encoding?: BufferEncoding) => void;
+    /** there are some differences between node:fs and memfs for statSync around bigint stats.  Be careful if using those */
+    statSync: typeof nodeFs.statSync;
+    mkdtempSync: typeof nodeFs.mkdtempSync;
+    createWriteStream: typeof nodeFs.createWriteStream;
+    mkdirSync: typeof nodeFs.mkdirSync;
+};
+export {};

package/lib/fs/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/lib/global.js

@@ -30,10 +30,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Global = exports.Mode = void 0;
-const fs = __importStar(require("node:fs"));
 const os = __importStar(require("node:os"));
 const path = __importStar(require("node:path"));
 const kit_1 = require("@salesforce/kit");
+const fs_1 = require("./fs/fs");
 const sfError_1 = require("./sfError");
 /**
  * Represents an environment mode.  Supports `production`, `development`, `demo`, and `test`
@@ -74,7 +74,7 @@ class Global {
      * Whether the code is running in a web browser.
      */
     static get isWeb() {
-        return 'window' in globalThis;
+        return 'window' in globalThis || 'self' in globalThis;
     }
     /**
      * The full system path to the global sfdx state folder.
@@ -120,11 +120,11 @@ class Global {
     static async createDir(dirPath) {
         const resolvedPath = dirPath ? path.join(Global.SFDX_DIR, dirPath) : Global.SFDX_DIR;
         try {
-            if (process.platform === 'win32') {
-                await fs.promises.mkdir(resolvedPath, { recursive: true });
+            if (process.platform === 'win32' || Global.isWeb) {
+                await fs_1.fs.promises.mkdir(resolvedPath, { recursive: true });
             }
             else {
-                await fs.promises.mkdir(resolvedPath, { recursive: true, mode: 0o700 });
+                await fs_1.fs.promises.mkdir(resolvedPath, { recursive: true, mode: 0o700 });
             }
         }
         catch (error) {

package/lib/index.d.ts

@@ -1,4 +1,5 @@
-export { OAuth2Config } from '@jsforce/jsforce-node';
+import { OAuth2Config } from '@jsforce/jsforce-node';
+export { OAuth2Config };
 export { ConfigFile } from './config/configFile';
 export { TTLConfig } from './config/ttlConfig';
 export { envVars, EnvironmentVariable, SUPPORTED_ENV_VARS, EnvVars } from './config/envVars';
@@ -38,4 +39,6 @@ export { ScratchOrgLifecycleEvent, scratchOrgLifecycleEventName, scratchOrgLifec
 export { ScratchOrgCache } from './org/scratchOrgCache';
 export { default as ScratchOrgSettingsGenerator } from './org/scratchOrgSettingsGenerator';
 export * from './util/sfdc';
+/** for use by other libraries that need to support web and node */
+export { fs } from './fs/fs';
 export * from './util/mutex';

package/lib/index.js

@@ -24,7 +24,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.scratchOrgResume = exports.scratchOrgCreate = exports.lockInit = exports.PermissionSetAssignment = exports.User = exports.REQUIRED_FIELDS = exports.DefaultUserFields = exports.MyDomainResolver = exports.StreamingClient = exports.CometClient = exports.PollingClient = exports.SfError = exports.SchemaValidator = exports.SfProjectJson = exports.SfProject = exports.ORG_CONFIG_ALLOWED_PROPERTIES = exports.OrgConfigProperties = exports.OrgTypes = exports.SandboxEvents = exports.Org = exports.Messages = exports.Logger = exports.LoggerLevel = exports.generateApiName = exports.getJwtAudienceUrl = exports.SfdcUrl = exports.WebOAuthServer = exports.Lifecycle = exports.Global = exports.Mode = exports.SFDX_HTTP_HEADERS = exports.Connection = exports.AuthRemover = exports.AuthInfo = exports.ConfigAggregator = exports.SandboxRequestCache = exports.SF_ALLOWED_PROPERTIES = exports.SFDX_ALLOWED_PROPERTIES = exports.SfConfigProperties = exports.SfdxPropertyKeys = exports.Config = exports.OrgUsersConfig = exports.DeviceOauthService = exports.StateAggregator = exports.EnvVars = exports.SUPPORTED_ENV_VARS = exports.EnvironmentVariable = exports.envVars = exports.TTLConfig = exports.ConfigFile = void 0;
-exports.ScratchOrgSettingsGenerator = exports.ScratchOrgCache = exports.scratchOrgLifecycleStages = exports.scratchOrgLifecycleEventName = void 0;
+exports.fs = exports.ScratchOrgSettingsGenerator = exports.ScratchOrgCache = exports.scratchOrgLifecycleStages = exports.scratchOrgLifecycleEventName = void 0;
 const messages_1 = require("./messages");
 ;
 var configFile_1 = require("./config/configFile");
@@ -118,5 +118,8 @@ var scratchOrgSettingsGenerator_1 = require("./org/scratchOrgSettingsGenerator")
 Object.defineProperty(exports, "ScratchOrgSettingsGenerator", { enumerable: true, get: function () { return __importDefault(scratchOrgSettingsGenerator_1).default; } });
 // Utility sub-modules
 __exportStar(require("./util/sfdc"), exports);
+/** for use by other libraries that need to support web and node */
+var fs_1 = require("./fs/fs");
+Object.defineProperty(exports, "fs", { enumerable: true, get: function () { return fs_1.fs; } });
 __exportStar(require("./util/mutex"), exports);
 //# sourceMappingURL=index.js.map

package/lib/lifecycleEvents.js

@@ -31,9 +31,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cloneUniqueListeners = exports.Lifecycle = void 0;
 const semver_1 = require("semver");
-// needed for TS to not put everything inside /lib/src
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
 const pjson = __importStar(require("../package.json"));
 const logger_1 = require("./logger/logger");
 /**

package/lib/logger/cleanup.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOldLogFiles = exports.cleanup = void 0;
 /*
@@ -30,8 +7,8 @@ exports.getOldLogFiles = exports.cleanup = void 0;
  * 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
  */
-const fs = __importStar(require("node:fs"));
 const node_path_1 = require("node:path");
+const fs_1 = require("../fs/fs");
 const global_1 = require("../global");
 const logger_1 = require("./logger");
 /**
@@ -55,10 +32,10 @@ const shouldClean = Math.random() * CLEAN_ODDS > CLEAN_ODDS - 1;
 const cleanup = async (maxMs = MAX_FILE_AGE_MS, force = false) => {
     if (shouldClean || force) {
         try {
-            const filesToConsider = await fs.promises // get the files in that dir
+            const filesToConsider = await fs_1.fs.promises // get the files in that dir
                 .readdir(global_1.Global.SF_DIR);
             const filesToDelete = (0, exports.getOldLogFiles)(filesToConsider, maxMs);
-            await Promise.all(filesToDelete.map((f) => fs.promises.unlink((0, node_path_1.join)(global_1.Global.SF_DIR, f))));
+            await Promise.all(filesToDelete.map((f) => fs_1.fs.promises.unlink((0, node_path_1.join)(global_1.Global.SF_DIR, f))));
         }
         catch (e) {
             // we never, ever, ever throw since we're not awaiting this promise, so just log a warning

package/lib/logger/logger.d.ts

@@ -1,4 +1,4 @@
-import { Logger as PinoLogger } from 'pino';
+import { type Logger as PinoLogger } from 'pino';
 /**
  * The common set of `Logger` options.
  */

package/lib/logger/logger.js

@@ -132,8 +132,8 @@ class Logger {
             const commonOptions = {
                 name: options.name ?? Logger.ROOT_NAME,
                 base: options.fields ?? {},
-                level,
                 enabled,
+                ...(global_1.Global.isWeb ? { browser: { asObject: true } } : {}),
             };
             if (Boolean(options.useMemoryLogger) || global_1.Global.getEnvironmentMode() === global_1.Mode.TEST || !enabled) {
                 this.memoryLogger = new memoryLogger_1.MemoryLogger();

package/lib/messages.js

@@ -30,11 +30,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Messages = void 0;
-const fs = __importStar(require("node:fs"));
 const os = __importStar(require("node:os"));
 const path = __importStar(require("node:path"));
 const util = __importStar(require("node:util"));
 const node_url_1 = require("node:url");
+// this can use `real fs` because messages are bundled during build by the ts transform
+const fs = __importStar(require("node:fs"));
 const ts_types_1 = require("@salesforce/ts-types");
 const kit_1 = require("@salesforce/kit");
 const logger_1 = require("./logger/logger");