@salesforce/core 8.18.7 → 8.19.0

package/lib/org/authInfo.js

@@ -37,12 +37,12 @@ exports.AuthInfo = exports.DEFAULT_CONNECTED_APP_INFO = void 0;
 const node_crypto_1 = require("node:crypto");
 const node_path_1 = require("node:path");
 const os = __importStar(require("node:os"));
-const fs = __importStar(require("node:fs"));
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const jsforce_node_1 = require("@jsforce/jsforce-node");
 const transport_1 = __importDefault(require("@jsforce/jsforce-node/lib/transport"));
 const jwt = __importStar(require("jsonwebtoken"));
+const fs_1 = require("../fs/fs");
 const config_1 = require("../config/config");
 const configAggregator_1 = require("../config/configAggregator");
 const logger_1 = require("../logger/logger");
@@ -54,8 +54,8 @@ const messages_1 = require("../messages");
 const sfdcUrl_1 = require("../util/sfdcUrl");
 const findSuggestion_1 = require("../util/findSuggestion");
 const connection_1 = require("./connection");
-const orgConfigProperties_1 = require("./orgConfigProperties");
 const org_1 = require("./org");
+const orgConfigProperties_1 = require("./orgConfigProperties");
 ;
 const messages = new messages_1.Messages('@salesforce/core', 'core', new Map([["authInfoCreationError", "Must pass a username and/or OAuth options when creating an AuthInfo instance."], ["authInfoOverwriteError", "Cannot create an AuthInfo instance that will overwrite existing auth data."], ["authInfoOverwriteError.actions", ["Create the AuthInfo instance using existing auth data by just passing the username. E.g., `AuthInfo.create({ username: 'my@user.org' });`."]], ["authCodeExchangeError", "Error authenticating with auth code due to: %s"], ["authCodeUsernameRetrievalError", "Could not retrieve the username after successful auth code exchange.\n\nDue to: %s"], ["jwtAuthError", "Error authenticating with JWT config due to: %s"], ["jwtAuthErrors", "Error authenticating with JWT.\nErrors encountered:\n%s"], ["refreshTokenAuthError", "Error authenticating with the refresh token due to: %s"], ["invalidSfdxAuthUrlError", "Invalid SFDX authorization URL. Must be in the format \"force://<clientId>:<clientSecret>:<refreshToken>@<instanceUrl>\". Note that the \"instanceUrl\" inside the SFDX authorization URL doesn\\'t include the protocol (\"https://\"). Run \"org display --target-org\" on an org to see an example of an SFDX authorization URL."], ["orgDataNotAvailableError", "An attempt to refresh the authentication token failed with a 'Data Not Found Error'. The org identified by username %s does not appear to exist. Likely cause is that the org was deleted by another user or has expired."], ["orgDataNotAvailableError.actions", ["Run `sfdx force:org:list --clean` to remove stale org authentications.", "Use `sfdx force:config:set` to update the defaultusername.", "Use `sfdx force:org:create` to create a new org.", "Use `sfdx auth` to authenticate an existing org."]], ["namedOrgNotFound", "No authorization information found for %s."], ["noAliasesFound", "Nothing to set."], ["invalidFormat", "Setting aliases must be in the format <key>=<value> but found: [%s]."], ["invalidJsonCasing", "All JSON input must have heads down camelcase keys. E.g., `{ sfdcLoginUrl: \"https://login.salesforce.com\" }`\nFound \"%s\" at %s"], ["missingClientId", "Client ID is required for JWT authentication."]]));
 // parses the id field returned from jsForce oauth2 methods to get
@@ -283,7 +283,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
                 try {
                     const soi = await AuthInfo.queryScratchOrg(hubAuthInfo.username, fields.orgId);
                     // if any return a result
-                    logger.debug(`found orgId ${fields.orgId} in devhub ${hubAuthInfo.username}`);
+                    logger.debug(`found orgId ${fields.orgId ?? '<undefined>'} in devhub ${hubAuthInfo.username}`);
                     try {
                         await orgAuthInfo.save({
                             ...fields,
@@ -378,7 +378,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         const result = data.records.filter((r) => r.ScratchOrg === trimmedId)[0];
         if (result)
             return result;
-        throw new sfError_1.SfError(`DevHub ${devHubUsername} has no active scratch orgs that match ${trimmedId}`, 'NoActiveScratchOrgFound');
+        throw new sfError_1.SfError(`DevHub ${devHubUsername ?? '<undefined>'} has no active scratch orgs that match ${trimmedId}`, 'NoActiveScratchOrgFound');
     }
     /**
      * Get the username.
@@ -803,7 +803,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         }
     }
     async readJwtKey(keyFile) {
-        return fs.promises.readFile(keyFile, 'utf8');
+        return fs_1.fs.promises.readFile(keyFile, 'utf8');
     }
     // Build OAuth config for a JWT auth flow
     async authJwt(options) {
@@ -933,7 +933,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         // Exchange the auth code for an access token and refresh token.
         let authFields;
         try {
-            this.logger.debug(`Exchanging auth code for access token using loginUrl: ${options.loginUrl}`);
+            this.logger.debug(`Exchanging auth code for access token using loginUrl: ${options.loginUrl ?? '<undefined>'}`);
             authFields = await oauth2.requestToken((0, ts_types_1.ensure)(options.authCode));
         }
         catch (err) {

package/lib/org/connection.d.ts

@@ -6,8 +6,8 @@ import { StreamPromise } from '@jsforce/jsforce-node/lib/util/promise';
 import { ConfigAggregator } from '../config/configAggregator';
 import { AuthFields, AuthInfo } from './authInfo';
 export declare const SFDX_HTTP_HEADERS: {
+    'user-agent'?: string | undefined;
     'content-type': string;
-    'user-agent': string;
 };
 export declare const DNS_ERROR_NAME = "DomainNotFoundError";
 export type DeployOptionsWithRest = Partial<DeployOptions> & {

package/lib/org/connection.js

@@ -20,13 +20,15 @@ const sfError_1 = require("../sfError");
 const sfdc_1 = require("../util/sfdc");
 const messages_1 = require("../messages");
 const lifecycleEvents_1 = require("../lifecycleEvents");
+const global_1 = require("../global");
 const orgConfigProperties_1 = require("./orgConfigProperties");
 ;
 const messages = new messages_1.Messages('@salesforce/core', 'connection', new Map([["incorrectAPIVersionError", "Invalid API version %s. Expecting format \"[1-9][0-9].0\", i.e. 42.0"], ["domainNotFoundError", "The org cannot be found"], ["domainNotFoundError.actions", ["Verify that the org still exists,", "If your org is newly created, wait a minute and run your command again,", "If you deployed or updated the org's My Domain, logout from the CLI and authenticate again,", "If you are running in a CI environment with a DNS that blocks external IPs, try setting SFDX_DISABLE_DNS_CHECK=true"]], ["noInstanceUrlError", "Connection has no instanceUrl."], ["noInstanceUrlError.actions", "Make sure the instanceUrl is set in your command or config."], ["noApiVersionsError", "Org failed to respond with its list of API versions. This is usually the result of domain changes like activating MyDomain or Enhanced Domains"], ["noApiVersionsError.actions", "Re-authenticate to the org."]]));
 const clientId = `sfdx toolbelt:${process.env.SFDX_SET_CLIENT_IDS ?? ''}`;
 exports.SFDX_HTTP_HEADERS = {
     'content-type': 'application/json',
-    'user-agent': clientId,
+    // web browser security keeps you from setting user-agent
+    ...(global_1.Global.isWeb ? {} : { 'user-agent': clientId }),
 };
 exports.DNS_ERROR_NAME = 'DomainNotFoundError';
 /**
@@ -173,7 +175,7 @@ class Connection extends jsforce_node_1.Connection {
             return this.maxApiVersion;
         }
         await this.isResolvable();
-        this.logger.debug(`Fetching API versions supported for org: ${this.getUsername()}`);
+        this.logger.debug(`Fetching API versions supported for org: ${this.getUsername() ?? ''}`);
         const versions = await this.request(`${this.instanceUrl}/services/data`);
         // if the server doesn't return a list of versions, it's possibly a instanceUrl issue where the local file is out of date.
         if (!Array.isArray(versions)) {
@@ -372,7 +374,7 @@ class Connection extends jsforce_node_1.Connection {
         if (lastChecked) {
             const now = new Date();
             const has24HoursPastSinceLastCheck = now.getTime() - lastChecked > kit_1.Duration.hours(24).milliseconds;
-            this.logger.debug(`API version cache last checked on ${lastCheckedDateString} (now is ${now.toLocaleString()})`);
+            this.logger.debug(`API version cache last checked on ${lastCheckedDateString ?? '<undefined>'} (now is ${now.toLocaleString()})`);
             if (!has24HoursPastSinceLastCheck && version) {
                 // return cached API version
                 this.logger.debug(`Using cached API version: ${version}`);

package/lib/org/org.js

@@ -29,16 +29,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Org = exports.SandboxEvents = exports.OrgTypes = void 0;
 exports.sandboxIsResumable = sandboxIsResumable;
-const node_path_1 = __importDefault(require("node:path"));
-const fs = __importStar(require("node:fs"));
+const path = __importStar(require("node:path"));
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
+const fs_1 = require("../fs/fs");
 const config_1 = require("../config/config");
 const configAggregator_1 = require("../config/configAggregator");
 const orgUsersConfig_1 = require("../config/orgUsersConfig");
@@ -175,13 +172,13 @@ class Org extends kit_1.AsyncOptionalCreatable {
      * @file Absolute file path to the metadata file
      */
     async getMetadataUIURL(typeName, file) {
-        const botFileNameToId = async (conn, filePath) => (await conn.singleRecordQuery(`SELECT id FROM BotDefinition WHERE DeveloperName='${node_path_1.default.basename(filePath, '.bot-meta.xml')}'`)).Id;
+        const botFileNameToId = async (conn, filePath) => (await conn.singleRecordQuery(`SELECT id FROM BotDefinition WHERE DeveloperName='${path.basename(filePath, '.bot-meta.xml')}'`)).Id;
         /** query flexipage via toolingAPI to get its ID (starts with 0M0) */
-        const flexiPageFilenameToId = async (conn, filePath) => (await conn.singleRecordQuery(`SELECT id FROM flexipage WHERE DeveloperName='${node_path_1.default.basename(filePath, '.flexipage-meta.xml')}'`, { tooling: true })).Id;
+        const flexiPageFilenameToId = async (conn, filePath) => (await conn.singleRecordQuery(`SELECT id FROM flexipage WHERE DeveloperName='${path.basename(filePath, '.flexipage-meta.xml')}'`, { tooling: true })).Id;
         /** query the rest API to turn a flow's filepath into a FlowId  (starts with 301) */
         const flowFileNameToId = async (conn, filePath) => {
             try {
-                const flow = await conn.singleRecordQuery(`SELECT DurableId FROM FlowVersionView WHERE FlowDefinitionView.ApiName = '${node_path_1.default.basename(filePath, '.flow-meta.xml')}' ORDER BY VersionNumber DESC LIMIT 1`);
+                const flow = await conn.singleRecordQuery(`SELECT DurableId FROM FlowVersionView WHERE FlowDefinitionView.ApiName = '${path.basename(filePath, '.flow-meta.xml')}' ORDER BY VersionNumber DESC LIMIT 1`);
                 return flow.DurableId;
             }
             catch (error) {
@@ -190,7 +187,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
         };
         const customObjectFileNameToId = async (conn, filePath) => {
             try {
-                const customObject = await conn.singleRecordQuery(`SELECT Id FROM CustomObject WHERE DeveloperName = '${node_path_1.default.basename(filePath.replace(/__c/g, ''), '.object-meta.xml')}'`, {
+                const customObject = await conn.singleRecordQuery(`SELECT Id FROM CustomObject WHERE DeveloperName = '${path.basename(filePath.replace(/__c/g, ''), '.object-meta.xml')}'`, {
                     tooling: true,
                 });
                 return customObject.Id;
@@ -201,7 +198,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
         };
         const apexClassFileNameToId = async (conn, filePath) => {
             try {
-                const apexClass = await conn.singleRecordQuery(`SELECT Id FROM ApexClass WHERE Name = '${node_path_1.default.basename(filePath, '.cls')}'`, {
+                const apexClass = await conn.singleRecordQuery(`SELECT Id FROM ApexClass WHERE Name = '${path.basename(filePath, '.cls')}'`, {
                     tooling: true,
                 });
                 return apexClass.Id;
@@ -222,7 +219,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
                 redirectUri = `/AiCopilot/copilotStudio.app#/copilot/builder?copilotId=${await botFileNameToId(this.connection, file)}`;
                 break;
             case 'ApexPage':
-                redirectUri = `/apex/${node_path_1.default.basename(file).replace('.page-meta.xml', '').replace('.page', '')}`;
+                redirectUri = `/apex/${path.basename(file).replace('.page-meta.xml', '').replace('.page', '')}`;
                 break;
             case 'Flow':
                 redirectUri = `/builder_platform_interaction/flowBuilder.app?flowId=${await flowFileNameToId(this.connection, file)}`;
@@ -459,7 +456,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
             }
             throw err;
         }
-        return this.manageDelete(async () => fs.promises.rmdir(dataPath), dataPath, throwWhenRemoveFails);
+        return this.manageDelete(async () => fs_1.fs.promises.rmdir(dataPath), dataPath, throwWhenRemoveFails);
     }
     /**
      * @ignore
@@ -512,7 +509,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
         const devHubConnection = (await Org.create({ aliasOrUsername })).getConnection();
         const thisOrgAuthConfig = this.getConnection().getAuthInfoFields();
         const trimmedId = (0, sfdc_1.trimTo15)(thisOrgAuthConfig.orgId);
-        const DEV_HUB_SOQL = `SELECT CreatedDate,Edition,ExpirationDate FROM ActiveScratchOrg WHERE ScratchOrg='${trimmedId}'`;
+        const DEV_HUB_SOQL = `SELECT CreatedDate,Edition,ExpirationDate FROM ActiveScratchOrg WHERE ScratchOrg='${trimmedId ?? '<undefined>'}'`;
         try {
             const results = await devHubConnection.query(DEV_HUB_SOQL);
             if (results.records.length !== 1) {
@@ -732,7 +729,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
                 throw new sfError_1.SfError(`Invalid Salesforce ID format: ${by.id}`, 'InvalidSalesforceId');
             }
         }
-        const whereClause = by.id ? `Id='${by.id}'` : `SandboxName='${by.name}'`;
+        const whereClause = by.id ? `Id='${by.id}'` : `SandboxName='${by.name ?? '<undefined>'}'`;
         const soql = `SELECT ${sandboxInfoFields.join(',')} FROM SandboxInfo WHERE ${whereClause} ORDER BY CreatedDate DESC`;
         const result = (await this.connection.tooling.query(soql)).records.filter((item) => !item.IsDeleted);
         if (result.length === 0) {
@@ -819,7 +816,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
             throw new sfError_1.SfError('Missing auth info', 'MissingAuthInfo');
         }
         const authInfo = (0, ts_types_1.isString)(auth) ? await authInfo_1.AuthInfo.create({ username: auth }) : auth;
-        this.logger.debug(`adding username ${authInfo.getFields().username}`);
+        this.logger.debug(`adding username ${authInfo.getFields().username ?? '<undefined>'}`);
         const orgConfig = await this.retrieveOrgUsersConfig();
         const contents = await orgConfig.read();
         // TODO: This is kind of screwy because contents values can be `AnyJson | object`...
@@ -857,7 +854,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
             throw new sfError_1.SfError('Missing auth info', 'MissingAuthInfoError');
         }
         const authInfo = (0, ts_types_1.isString)(auth) ? await authInfo_1.AuthInfo.create({ username: auth }) : auth;
-        this.logger.debug(`removing username ${authInfo.getFields().username}`);
+        this.logger.debug(`removing username ${authInfo.getFields().username ?? '<undefined>'}`);
         const orgConfig = await this.retrieveOrgUsersConfig();
         const contents = await orgConfig.read();
         const targetUser = authInfo.getFields().username;
@@ -1033,7 +1030,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
     }
     async getLocalDataDir(orgDataPath) {
         const rootFolder = await config_1.Config.resolveRootFolder(false);
-        return node_path_1.default.join(rootFolder, global_1.Global.SFDX_STATE_FOLDER, orgDataPath ? orgDataPath : 'orgs');
+        return path.join(rootFolder, global_1.Global.SFDX_STATE_FOLDER, orgDataPath ? orgDataPath : 'orgs');
     }
     /**
      * Gets the sandboxProcessObject and then polls for it to complete.
@@ -1114,7 +1111,8 @@ class Org extends kit_1.AsyncOptionalCreatable {
             let result;
             try {
                 // grab sandboxName from config or try to calculate from the sandbox username
-                const sandboxName = sandbox?.sandboxName ?? (this.getUsername() ?? '').split(`${resolvedProdOrg.getUsername()}.`)[1];
+                const sandboxName = sandbox?.sandboxName ??
+                    (this.getUsername() ?? '').split(`${resolvedProdOrg.getUsername() ?? '<undefined>'}.`)[1];
                 if (!sandboxName) {
                     this.logger.debug('Sandbox name is not available');
                     // jump to query by orgId
@@ -1170,7 +1168,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
         }
         try {
             const devHubConn = resolvedDevHub.getConnection();
-            const username = this.getUsername();
+            const username = (0, ts_types_1.ensureString)(this.getUsername(), 'org is missing username');
             const activeScratchOrgRecordId = (await devHubConn.singleRecordQuery(`SELECT Id FROM ActiveScratchOrg WHERE SignupUsername='${username}'`)).Id;
             this.logger.trace(`found matching ActiveScratchOrg with SignupUsername: ${username}.  Deleting...`);
             await this.destroyScratchOrg(resolvedDevHub, activeScratchOrgRecordId);
@@ -1459,7 +1457,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
     async removeSourceTrackingFiles() {
         try {
             const rootFolder = await config_1.Config.resolveRootFolder(false);
-            await fs.promises.rm(node_path_1.default.join(rootFolder, global_1.Global.SF_STATE_FOLDER, 'orgs', this.getOrgId()), {
+            await fs_1.fs.promises.rm(path.join(rootFolder, global_1.Global.SF_STATE_FOLDER, 'orgs', this.getOrgId()), {
                 recursive: true,
                 force: true,
             });

package/lib/org/permissionSetAssignment.js

@@ -98,23 +98,19 @@ class PermissionSetAssignment {
      */
     parsePermissionSetString(permSetString) {
         const nsPrefixMatch = RegExp(/(\w+(?=__))(__)(.*)/).exec(permSetString);
-        let nsPrefix;
-        let permSetName;
         if (nsPrefixMatch) {
             try {
-                nsPrefix = nsPrefixMatch[1];
-                permSetName = nsPrefixMatch[3];
+                const nsPrefix = nsPrefixMatch[1];
+                const permSetName = nsPrefixMatch[3];
                 this.logger.debug(`Using namespacePrefix ${nsPrefix} for permission set ${permSetName}`);
+                return { nsPrefix, permSetName };
             }
             catch (e) {
                 // Don't fail if we parse wrong.
                 this.logger.debug(e);
             }
         }
-        else {
-            permSetName = permSetString;
-        }
-        return { nsPrefix, permSetName };
+        return { nsPrefix: undefined, permSetName: permSetString };
     }
 }
 exports.PermissionSetAssignment = PermissionSetAssignment;

package/lib/org/scratchOrgCreate.js

@@ -192,7 +192,7 @@ const scratchOrgCreate = async (options) => {
     // we'll need this scratch org connection later;
     const scratchOrg = await org_1.Org.create({ aliasOrUsername: soi.Username ?? soi.SignupUsername });
     const username = scratchOrg.getUsername();
-    logger.debug(`scratch org username ${username}`);
+    logger.debug(`scratch org username ${username ?? '<undefined>'}`);
     await (0, scratchOrgLifecycleEvents_1.emit)({ stage: 'deploy settings', scratchOrgInfo: soi });
     const configAggregator = await configAggregator_1.ConfigAggregator.create();
     const [authInfo] = await setExitCodeIfError(68)(Promise.all([

package/lib/org/scratchOrgInfoApi.js

@@ -65,7 +65,7 @@ const buildOAuth2Options = async (options) => {
         loginUrl: getOrgInstanceAuthority(options.scratchOrgInfoComplete, options.hubOrg.getField(org_1.Org.Fields.LOGIN_URL), options.signupTargetLoginUrl),
     };
     logger.debug(`isJwtFlow: ${isJwtFlow}`);
-    logger.debug(`using resolved loginUrl: ${oauth2Options.loginUrl}`);
+    logger.debug(`using resolved loginUrl: ${oauth2Options.loginUrl ?? '<undefined>'}`);
     if (isJwtFlow && !process.env.SFDX_CLIENT_SECRET) {
         oauth2Options.privateKeyFile = options.hubOrg.getConnection().getAuthInfoFields().privateKey;
         const retries = options?.retry ?? kit_1.env.getNumber('SFDX_JWT_AUTH_RETRY_ATTEMPTS') ?? 0;
@@ -187,7 +187,7 @@ const authorizeScratchOrg = async (options) => {
         // If we didn't already try authenticating with the LoginUrl from ScratchOrgInfo object,
         // try the oauth flow again using it now.
         if (scratchOrgInfoComplete.LoginUrl && oAuth2Options.options.loginUrl !== scratchOrgInfoComplete.LoginUrl) {
-            logger.debug(`Auth failed with loginUrl ${oAuth2Options.options.loginUrl} so trying with ${scratchOrgInfoComplete.LoginUrl}`);
+            logger.debug(`Auth failed with loginUrl ${oAuth2Options.options.loginUrl ?? '<undefined>'} so trying with ${scratchOrgInfoComplete.LoginUrl}`);
             oAuth2Options.options = { ...oAuth2Options.options, ...{ loginUrl: scratchOrgInfoComplete.LoginUrl } };
             try {
                 authInfo = await getAuthInfo({

package/lib/org/scratchOrgInfoGenerator.js

@@ -7,9 +7,9 @@ exports.getScratchOrgInfoPayload = exports.generateScratchOrgInfo = exports.getA
  * 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 node_fs_1 = require("node:fs");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
+const fs_1 = require("../fs/fs");
 const sfProject_1 = require("../sfProject");
 const webOAuthServer_1 = require("../webOAuthServer");
 const messages_1 = require("../messages");
@@ -122,7 +122,7 @@ const getAncestorIds = async (scratchOrgInfo, projectJson, hubOrg) => {
         if (packageDir.ancestorId && packageAliases?.[packageDir.ancestorId]) {
             return packageAliases[packageDir.ancestorId];
         }
-        throw new sfError_1.SfError(`Invalid ancestorId ${packageDir.ancestorId}`, 'InvalidAncestorId');
+        throw new sfError_1.SfError(`Invalid ancestorId ${packageDir.ancestorId ?? '<undefined>'}`, 'InvalidAncestorId');
     }));
     // strip out '' due to NONE
     return Array.from(new Set(ancestorIds.filter((id) => id !== ''))).join(';');
@@ -223,7 +223,7 @@ const getScratchOrgInfoPayload = async (options) => {
 exports.getScratchOrgInfoPayload = getScratchOrgInfoPayload;
 const parseDefinitionFile = async (definitionFile) => {
     try {
-        const fileData = await node_fs_1.promises.readFile(definitionFile, 'utf8');
+        const fileData = await fs_1.fs.promises.readFile(definitionFile, 'utf8');
         const defFileContents = (0, kit_1.parseJson)(fileData);
         // remove key '$schema' from the definition file
         delete defFileContents['$schema'];

package/lib/org/scratchOrgSettingsGenerator.js

@@ -276,7 +276,7 @@ class SettingsGenerator {
                 .map((failure) => `[${failure.problemType}] ${failure.fullName} : ${failure.problem} `)
                 .join('\n');
             throw sfError_1.SfError.create({
-                message: `A scratch org was created with username ${username}, but the settings failed to deploy due to: \n${failures}`,
+                message: `A scratch org was created with username ${username ?? '<undefined>'}, but the settings failed to deploy due to: \n${failures}`,
                 name: 'ProblemDeployingSettings',
                 data: { ...result, username },
             });

package/lib/org/user.js

@@ -213,7 +213,7 @@ class User extends kit_1.AsyncCreatable {
      * @param password [throwWhenRemoveFails = User.generatePasswordUtf8()] A SecureBuffer containing the new password.
      */
     async assignPassword(info, password = User.generatePasswordUtf8()) {
-        this.logger.debug(`Attempting to set password for userId: ${info.getFields().userId} username: ${info.getFields().username}`);
+        this.logger.debug(`Attempting to set password for userId: ${info.getFields().userId ?? '<undefined>'} username: ${info.getFields().username ?? '<undefined>'}`);
         const userConnection = await connection_1.Connection.create({ authInfo: info });
         return new Promise((resolve, reject) => {
             // no promises in async method
@@ -221,8 +221,9 @@ class User extends kit_1.AsyncCreatable {
             password.value(async (buffer) => {
                 try {
                     const soap = userConnection.soap;
-                    await soap.setPassword((0, ts_types_1.ensureString)(info.getFields().userId), buffer.toString('utf8'));
-                    this.logger.debug(`Set password for userId: ${info.getFields().userId}`);
+                    const userId = (0, ts_types_1.ensureString)(info.getFields().userId);
+                    await soap.setPassword(userId, buffer.toString('utf8'));
+                    this.logger.debug(`Set password for userId: ${userId}`);
                     resolve();
                 }
                 catch (e) {

package/lib/schema/validator.js

@@ -34,9 +34,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SchemaValidator = void 0;
 const path = __importStar(require("node:path"));
-const fs = __importStar(require("node:fs"));
 const ajv_1 = __importDefault(require("ajv"));
 const kit_1 = require("@salesforce/kit");
+const fs_1 = require("../fs/fs");
 const sfError_1 = require("../sfError");
 /**
  * Loads a JSON schema and performs validations against JSON objects.
@@ -62,7 +62,7 @@ class SchemaValidator {
      */
     async load() {
         if (!this.schema) {
-            this.schema = (0, kit_1.parseJsonMap)(await fs.promises.readFile(this.schemaPath, 'utf8'));
+            this.schema = (0, kit_1.parseJsonMap)(await fs_1.fs.promises.readFile(this.schemaPath, 'utf8'));
             this.logger.debug(`Schema loaded for ${this.schemaPath}`);
         }
         return this.schema;
@@ -72,7 +72,7 @@ class SchemaValidator {
      */
     loadSync() {
         if (!this.schema) {
-            this.schema = (0, kit_1.parseJsonMap)(fs.readFileSync(this.schemaPath, 'utf8'));
+            this.schema = (0, kit_1.parseJsonMap)(fs_1.fs.readFileSync(this.schemaPath, 'utf8'));
             this.logger.debug(`Schema loaded for ${this.schemaPath}`);
         }
         return this.schema;
@@ -165,7 +165,7 @@ class SchemaValidator {
     loadExternalSchema(uri) {
         const schemaPath = path.join(this.schemasDir, `${uri}.json`);
         try {
-            return (0, kit_1.parseJsonMap)(fs.readFileSync(schemaPath, 'utf8'));
+            return (0, kit_1.parseJsonMap)(fs_1.fs.readFileSync(schemaPath, 'utf8'));
         }
         catch (err) {
             if (err.code === 'ENOENT') {
@@ -184,7 +184,7 @@ class SchemaValidator {
     getErrorsText(errors) {
         return errors
             .map((error) => {
-            const msg = `${error.schemaPath}: ${error.message}`;
+            const msg = `${error.schemaPath}: ${error.message ?? '<no error message>'}`;
             switch (error.keyword) {
                 case 'additionalProperties':
                     return `${msg} '${error.params.additionalProperty}'`;

package/lib/sfProject.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.isNamedPackagingDirectory = exports.isPackagingDirectory = exports.SfProject = exports.SfProjectJson = void 0;
 /*
@@ -31,9 +8,9 @@ exports.isNamedPackagingDirectory = exports.isPackagingDirectory = exports.SfPro
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 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 fs_1 = require("./fs/fs");
 const sfdcUrl_1 = require("./util/sfdcUrl");
 const configAggregator_1 = require("./config/configAggregator");
 const configFile_1 = require("./config/configFile");
@@ -307,7 +284,7 @@ class SfProjectJson extends configFile_1.ConfigFile {
     // keep it because testSetup stubs it!
     // eslint-disable-next-line class-methods-use-this
     doesPackageExist(packagePath) {
-        return fs.existsSync(packagePath);
+        return fs_1.fs.existsSync(packagePath);
     }
     validateKeys() {
         (0, findUppercaseKeys_1.ensureNoUppercaseKeys)(this.getPath())(SfProjectJson.BLOCKLIST)(this.toObject());

package/lib/stateAggregator/accessors/aliasAccessor.js

@@ -9,8 +9,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFileLocation = exports.AliasAccessor = exports.FILENAME = exports.DEFAULT_GROUP = void 0;
 const node_path_1 = require("node:path");
 const node_os_1 = require("node:os");
-const promises_1 = require("node:fs/promises");
 const kit_1 = require("@salesforce/kit");
+const fs_1 = require("../../fs/fs");
 const global_1 = require("../../global");
 const sfError_1 = require("../../sfError");
 const fileLocking_1 = require("../../util/fileLocking");
@@ -104,7 +104,7 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
      */
     async unsetAndSave(alias) {
         const lockResponse = await (0, fileLocking_1.lockInit)(this.fileLocation);
-        await this.readFileToAliasStore();
+        await this.readFileToAliasStore(false);
         this.aliasStore.delete(alias);
         return lockResponse.writeAndUnlock(aliasStoreToRawFileContents(this.aliasStore));
     }
@@ -115,7 +115,7 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
      */
     async unsetValuesAndSave(aliasees) {
         const lockResponse = await (0, fileLocking_1.lockInit)(this.fileLocation);
-        await this.readFileToAliasStore();
+        await this.readFileToAliasStore(false);
         (0, kit_1.ensureArray)(aliasees)
             .flatMap((a) => this.getAll(a))
             .map((a) => this.aliasStore.delete(a));
@@ -137,15 +137,22 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
      * go to the fileSystem and read the file, storing a copy in the class's store
      * if the file doesn't exist, create it empty
      */
-    async readFileToAliasStore() {
+    async readFileToAliasStore(useLock = false) {
+        const lockResponse = useLock ? await (0, fileLocking_1.lockInit)(this.fileLocation) : undefined;
         try {
-            this.aliasStore = fileContentsRawToAliasStore(await (0, promises_1.readFile)(this.fileLocation, 'utf-8'));
+            this.aliasStore = fileContentsRawToAliasStore(await fs_1.fs.promises.readFile(this.fileLocation, 'utf-8'));
+            if (lockResponse)
+                return await lockResponse.unlock();
         }
         catch (e) {
             if (e instanceof Error && 'code' in e && typeof e.code === 'string' && ['ENOENT', 'ENOTDIR'].includes(e.code)) {
-                await (0, promises_1.mkdir)((0, node_path_1.dirname)(this.fileLocation), { recursive: true });
+                await fs_1.fs.promises.mkdir((0, node_path_1.dirname)(this.fileLocation), { recursive: true });
                 this.aliasStore = new Map();
-                return (0, promises_1.writeFile)(this.fileLocation, aliasStoreToRawFileContents(this.aliasStore));
+                await fs_1.fs.promises.writeFile(this.fileLocation, aliasStoreToRawFileContents(this.aliasStore));
+                return lockResponse ? await lockResponse.unlock() : undefined;
+            }
+            if (lockResponse) {
+                await lockResponse.unlock();
             }
             throw e;
         }

package/lib/stateAggregator/accessors/orgAccessor.d.ts

@@ -1,6 +1,6 @@
-import * as fs from 'node:fs';
 import { Nullable } from '@salesforce/ts-types';
 import { AsyncOptionalCreatable } from '@salesforce/kit';
+import { fs } from '../../fs/fs';
 import { AuthInfoConfig } from '../../config/authInfoConfig';
 import { AuthFields } from '../../org/authInfo';
 import { ConfigFile } from '../../config/configFile';
@@ -49,7 +49,7 @@ export declare abstract class BaseOrgAccessor<T extends ConfigFile, P extends Co
      *
      * @param username
      */
-    stat(username: string): Promise<Nullable<fs.Stats>>;
+    stat(username: string): Promise<Nullable<Awaited<ReturnType<typeof fs.promises.stat>>>>;
     /**
      * Returns true if there is an auth file for the given username
      *

package/lib/stateAggregator/accessors/orgAccessor.js

@@ -30,10 +30,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrgAccessor = exports.BaseOrgAccessor = void 0;
-const fs = __importStar(require("node:fs"));
 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 authInfoConfig_1 = require("../../config/authInfoConfig");
 const global_1 = require("../../global");
 const logger_1 = require("../../logger/logger");
@@ -165,7 +165,7 @@ class BaseOrgAccessor extends kit_1.AsyncOptionalCreatable {
      */
     async hasFile(username) {
         try {
-            await fs.promises.access(this.parseFilename(username));
+            await fs_1.fs.promises.access(this.parseFilename(username));
             return true;
         }
         catch {
@@ -247,7 +247,7 @@ class BaseOrgAccessor extends kit_1.AsyncOptionalCreatable {
     async getAllFiles() {
         const regex = this.getFileRegex();
         try {
-            return (await fs.promises.readdir(global_1.Global.DIR)).filter((file) => regex.test(file));
+            return (await fs_1.fs.promises.readdir(global_1.Global.DIR)).filter((file) => regex.test(file));
         }
         catch {
             return [];

package/lib/status/myDomainResolver.d.ts

@@ -38,8 +38,6 @@ export declare class MyDomainResolver extends AsyncOptionalCreatable<MyDomainRes
      * executing the dns loookup.
      */
     resolve(): Promise<string>;
-    /** @deprecated there is nothing using this in forcedotcom, salesforcecli, or public github search */
-    getCnames(): Promise<string[]>;
     /**
      * Used to initialize asynchronous components.
      */

package/lib/status/myDomainResolver.js

@@ -111,18 +111,6 @@ class MyDomainResolver extends kit_1.AsyncOptionalCreatable {
         const client = await pollingClient_1.PollingClient.create(pollingOptions);
         return (0, ts_types_1.ensureString)(await client.subscribe());
     }
-    /** @deprecated there is nothing using this in forcedotcom, salesforcecli, or public github search */
-    async getCnames() {
-        try {
-            await this.resolve();
-            return await (0, node_util_1.promisify)(node_dns_1.resolveCname)(this.options.url.host);
-        }
-        catch (e) {
-            this.logger.debug(`An error occurred trying to resolve: ${this.options.url.host}`);
-            this.logger.debug(`Error: ${e.message}`);
-            return [];
-        }
-    }
     /**
      * Used to initialize asynchronous components.
      */

package/lib/status/streamingClient.d.ts

@@ -1,5 +1,5 @@
-import { AsyncOptionalCreatable, Duration, Env } from '@salesforce/kit/lib';
-import { AnyJson } from '@salesforce/ts-types/lib';
+import { AsyncOptionalCreatable, Duration, Env } from '@salesforce/kit';
+import { AnyJson } from '@salesforce/ts-types';
 import { Org } from '../org/org';
 import { CometClient, CometSubscription, Message, StatusResult, StreamingExtension, StreamProcessor } from './types';
 export { CometClient, CometSubscription, Message, StatusResult, StreamingExtension, StreamProcessor };