@salesforce/core 5.4.0-crdt.1 → 6.1.0

package/lib/config/lwwMap.js

@@ -14,28 +14,29 @@ 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");
-const uniqid_1 = require("../util/uniqid");
+const time_1 = require("../util/time");
 const lwwRegister_1 = require("./lwwRegister");
 exports.SYMBOL_FOR_DELETED = 'UNIQUE_IDENTIFIER_FOR_DELETED';
 /**
  * @param contents object aligning with ConfigContents
  * @param timestamp a bigInt that sets the timestamp.  Defaults to the current time
  * construct a LWWState from an object
- *
+ * @param keysToCheckForDeletion if a key is in this array, AND not in the contents, it will be marked as deleted
  * */
-const stateFromContents = (contents, timestamp = process.hrtime.bigint(), id) => Object.fromEntries((0, ts_types_1.entriesOf)(contents).map(([key, value]) => [
+const stateFromContents = (contents, timestamp) => Object.fromEntries((0, ts_types_1.entriesOf)(contents).map(([key, value]) => [
     key,
-    new lwwRegister_1.LWWRegister(id ?? (0, uniqid_1.uniqid)(), { peer: 'file', timestamp, value }),
-]));
+    new lwwRegister_1.LWWRegister({ timestamp: timestamp ?? (0, time_1.nowBigInt)(), value }),
+])
+// I'd love to get rid of this ASsertion but don't know how.
+);
 exports.stateFromContents = stateFromContents;
 class LWWMap {
-    constructor(id, state) {
+    constructor(state) {
         /** map of key to LWWRegister.  Used for managing conflicts */
         _LWWMap_data.set(this, new Map());
-        this.id = id ?? (0, uniqid_1.uniqid)();
         // 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(this.id, register));
+            __classPrivateFieldGet(this, _LWWMap_data, "f").set(key, new lwwRegister_1.LWWRegister(register));
         }
     }
     get value() {
@@ -44,11 +45,12 @@ class LWWMap {
             .map(([key, register]) => [key, register.value]));
     }
     get state() {
-        return Object.fromEntries(Array.from(__classPrivateFieldGet(this, _LWWMap_data, "f").entries())
-            // .filter(([, register]) => Boolean(register))
-            .map(([key, register]) => [key, register.state]));
+        return Object.fromEntries(Array.from(__classPrivateFieldGet(this, _LWWMap_data, "f").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.
     merge(state) {
+        // 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);
@@ -57,7 +59,7 @@ class LWWMap {
                 local.merge(remote);
             // otherwise, instantiate a new `LWWRegister` with the incoming state
             else
-                __classPrivateFieldGet(this, _LWWMap_data, "f").set(key, new lwwRegister_1.LWWRegister(this.id, remote));
+                __classPrivateFieldGet(this, _LWWMap_data, "f").set(key, new lwwRegister_1.LWWRegister(remote));
         }
         return this.state;
     }
@@ -69,9 +71,8 @@ class LWWMap {
             register.set(value);
         // otherwise, instantiate a new `LWWRegister` with the value
         else
-            __classPrivateFieldGet(this, _LWWMap_data, "f").set(key, new lwwRegister_1.LWWRegister(this.id, { peer: this.id, timestamp: process.hrtime.bigint(), value }));
+            __classPrivateFieldGet(this, _LWWMap_data, "f").set(key, new lwwRegister_1.LWWRegister({ timestamp: (0, time_1.nowBigInt)(), value }));
     }
-    // TODO: how to handle the deep `get` that is currently allowed ex: get('foo.bar.baz')
     get(key) {
         // map loses the typing
         const value = __classPrivateFieldGet(this, _LWWMap_data, "f").get(key)?.value;
@@ -80,8 +81,10 @@ class LWWMap {
         return value;
     }
     delete(key) {
-        // set the register to null, if it exists
-        __classPrivateFieldGet(this, _LWWMap_data, "f").get(key)?.set(exports.SYMBOL_FOR_DELETED);
+        __classPrivateFieldGet(this, _LWWMap_data, "f").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

package/lib/config/lwwRegister.d.ts

@@ -1,5 +1,4 @@
 type LWWRegisterState<T> = {
-    peer: string;
     timestamp: bigint;
     value: T;
 };
@@ -9,10 +8,10 @@ type LWWRegisterState<T> = {
  * @param T the type of the value stored in the register
  */
 export declare class LWWRegister<T> {
-    readonly id: string;
     state: LWWRegisterState<T>;
-    constructor(id: string, state: LWWRegisterState<T>);
+    constructor(state: LWWRegisterState<T>);
     get value(): T;
+    get timestamp(): bigint;
     set(value: T): void;
     merge(incoming: LWWRegisterState<T>): LWWRegisterState<T>;
 }

package/lib/config/lwwRegister.js

@@ -7,31 +7,30 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LWWRegister = void 0;
+const time_1 = require("../util/time");
 /** a CRDT implementation.  Uses timestamps to resolve conflicts when updating the value (last write wins)
  * mostly based on https://jakelazaroff.com/words/an-interactive-intro-to-crdts/
  *
  * @param T the type of the value stored in the register
  */
 class LWWRegister {
-    constructor(id, state) {
-        this.id = id;
+    constructor(state) {
         this.state = state;
     }
     get value() {
         return this.state.value;
     }
+    get timestamp() {
+        return this.state.timestamp;
+    }
     set(value) {
-        // set the peer ID to the local ID, timestamp it and set the value
-        this.state = { peer: this.id, timestamp: process.hrtime.bigint(), value };
+        this.state = { timestamp: (0, time_1.nowBigInt)(), value };
     }
     merge(incoming) {
         // only update if the incoming timestamp is greater than the local timestamp
-        // console.log(`incoming: ${}`);
-        // console.log(`local: ${JSON.stringify(this.state)}`);
         if (incoming.timestamp > this.state.timestamp) {
             this.state = incoming;
         }
-        // TODO: if the timestamps match, use the peer ID to break the tie (prefer self?)
         return this.state;
     }
 }

package/lib/config/sandboxOrgConfig.js

@@ -47,5 +47,5 @@ exports.SandboxOrgConfig = SandboxOrgConfig;
          */
         Fields["PROD_ORG_USERNAME"] = "prodOrgUsername";
     })(Fields = SandboxOrgConfig.Fields || (SandboxOrgConfig.Fields = {}));
-})(SandboxOrgConfig = exports.SandboxOrgConfig || (exports.SandboxOrgConfig = {}));
+})(SandboxOrgConfig || (exports.SandboxOrgConfig = SandboxOrgConfig = {}));
 //# sourceMappingURL=sandboxOrgConfig.js.map

package/lib/config/sandboxProcessCache.d.ts

@@ -1,4 +1,4 @@
-import { SandboxProcessObject, SandboxRequest } from '../org';
+import { SandboxProcessObject, SandboxRequest } from '../org/org';
 import { TTLConfig } from './ttlConfig';
 export type SandboxRequestCacheEntry = {
     alias?: string;

package/lib/crypto/crypto.js

@@ -8,9 +8,9 @@
 /* eslint-disable @typescript-eslint/ban-types */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Crypto = void 0;
-const crypto = require("crypto");
-const os = require("os");
-const path_1 = require("path");
+const crypto = require("node:crypto");
+const os = require("node:os");
+const node_path_1 = require("node:path");
 const ts_types_1 = require("@salesforce/ts-types");
 const kit_1 = require("@salesforce/kit");
 const logger_1 = require("../logger/logger");
@@ -26,6 +26,7 @@ const AUTH_TAG_LENGTH = 32;
 const ENCRYPTED_CHARS = /[a-f0-9]/;
 const KEY_NAME = 'sfdx';
 const ACCOUNT = 'local';
+;
 const messages = new messages_1.Messages('@salesforce/core', 'encryption', new Map([["invalidEncryptedFormatError", "The encrypted data is not properly formatted."], ["invalidEncryptedFormatError.actions", ["If attempting to create a scratch org then re-authorize. Otherwise create a new scratch org."]], ["authDecryptError", "Failed to decipher auth data. reason: %s."], ["unsupportedOperatingSystemError", "Unsupported Operating System: %s"], ["missingCredentialProgramError", "Unable to find required security software: %s"], ["credentialProgramAccessError", "Unable to execute security software: %s"], ["passwordRetryError", "Failed to get the password after %i retries."], ["passwordRequiredError", "A password is required."], ["keyChainServiceRequiredError", "Unable to get or set a keychain value without a service name."], ["keyChainAccountRequiredError", "Unable to get or set a keychain value without an account name."], ["keyChainUserCanceledError", "User canceled authentication."], ["keychainPasswordCreationError", "Failed to create a password in the keychain."], ["genericKeychainServiceError", "The service and account specified in %s do not match the version of the toolbelt."], ["genericKeychainServiceError.actions", ["Check your toolbelt version and re-auth."]], ["genericKeychainInvalidPermsError", "Invalid file permissions for secret file"], ["genericKeychainInvalidPermsError.actions", ["Ensure the file %s has the file permission octal value of %s."]], ["passwordNotFoundError", "Could not find password.\n%s"], ["passwordNotFoundError.actions", ["Ensure a valid password is returned with the following command: [%s]"]], ["setCredentialError", "Command failed with response:\n%s"], ["setCredentialError.actions", ["Determine why this command failed to set an encryption key for user %s: [%s]."]], ["macKeychainOutOfSync", "We\u2019ve encountered an error with the Mac keychain being out of sync with your `sfdx` credentials. To fix the problem, sync your credentials by authenticating into your org again using the auth commands."]]));
 const makeSecureBuffer = (password) => {
     const newSb = new secureBuffer_1.SecureBuffer();

package/lib/crypto/keyChain.js

@@ -11,6 +11,7 @@ const kit_1 = require("@salesforce/kit");
 const logger_1 = require("../logger/logger");
 const messages_1 = require("../messages");
 const keyChainImpl_1 = require("./keyChainImpl");
+;
 const messages = new messages_1.Messages('@salesforce/core', 'encryption', new Map([["invalidEncryptedFormatError", "The encrypted data is not properly formatted."], ["invalidEncryptedFormatError.actions", ["If attempting to create a scratch org then re-authorize. Otherwise create a new scratch org."]], ["authDecryptError", "Failed to decipher auth data. reason: %s."], ["unsupportedOperatingSystemError", "Unsupported Operating System: %s"], ["missingCredentialProgramError", "Unable to find required security software: %s"], ["credentialProgramAccessError", "Unable to execute security software: %s"], ["passwordRetryError", "Failed to get the password after %i retries."], ["passwordRequiredError", "A password is required."], ["keyChainServiceRequiredError", "Unable to get or set a keychain value without a service name."], ["keyChainAccountRequiredError", "Unable to get or set a keychain value without an account name."], ["keyChainUserCanceledError", "User canceled authentication."], ["keychainPasswordCreationError", "Failed to create a password in the keychain."], ["genericKeychainServiceError", "The service and account specified in %s do not match the version of the toolbelt."], ["genericKeychainServiceError.actions", ["Check your toolbelt version and re-auth."]], ["genericKeychainInvalidPermsError", "Invalid file permissions for secret file"], ["genericKeychainInvalidPermsError.actions", ["Ensure the file %s has the file permission octal value of %s."]], ["passwordNotFoundError", "Could not find password.\n%s"], ["passwordNotFoundError.actions", ["Ensure a valid password is returned with the following command: [%s]"]], ["setCredentialError", "Command failed with response:\n%s"], ["setCredentialError.actions", ["Determine why this command failed to set an encryption key for user %s: [%s]."]], ["macKeychainOutOfSync", "We\u2019ve encountered an error with the Mac keychain being out of sync with your `sfdx` credentials. To fix the problem, sync your credentials by authenticating into your org again using the auth commands."]]));
 /**
  * Gets the os level keychain impl.

package/lib/crypto/keyChainImpl.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
-import * as childProcess from 'child_process';
-import * as nodeFs from 'fs';
+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'>;
 /**

package/lib/crypto/keyChainImpl.js

@@ -7,16 +7,17 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.keyChainImpl = exports.GenericWindowsKeychainAccess = exports.GenericUnixKeychainAccess = exports.GenericKeychainAccess = exports.KeychainAccess = void 0;
-const childProcess = require("child_process");
-const nodeFs = require("fs");
-const fs = require("fs");
-const os = require("os");
-const os_1 = require("os");
-const path = require("path");
+const childProcess = require("node:child_process");
+const nodeFs = require("node:fs");
+const fs = require("node:fs");
+const os = require("node:os");
+const node_os_1 = require("node:os");
+const path = require("node:path");
 const ts_types_1 = require("@salesforce/ts-types");
 const kit_1 = require("@salesforce/kit");
 const global_1 = require("../global");
 const messages_1 = require("../messages");
+;
 const messages = new messages_1.Messages('@salesforce/core', 'encryption', new Map([["invalidEncryptedFormatError", "The encrypted data is not properly formatted."], ["invalidEncryptedFormatError.actions", ["If attempting to create a scratch org then re-authorize. Otherwise create a new scratch org."]], ["authDecryptError", "Failed to decipher auth data. reason: %s."], ["unsupportedOperatingSystemError", "Unsupported Operating System: %s"], ["missingCredentialProgramError", "Unable to find required security software: %s"], ["credentialProgramAccessError", "Unable to execute security software: %s"], ["passwordRetryError", "Failed to get the password after %i retries."], ["passwordRequiredError", "A password is required."], ["keyChainServiceRequiredError", "Unable to get or set a keychain value without a service name."], ["keyChainAccountRequiredError", "Unable to get or set a keychain value without an account name."], ["keyChainUserCanceledError", "User canceled authentication."], ["keychainPasswordCreationError", "Failed to create a password in the keychain."], ["genericKeychainServiceError", "The service and account specified in %s do not match the version of the toolbelt."], ["genericKeychainServiceError.actions", ["Check your toolbelt version and re-auth."]], ["genericKeychainInvalidPermsError", "Invalid file permissions for secret file"], ["genericKeychainInvalidPermsError.actions", ["Ensure the file %s has the file permission octal value of %s."]], ["passwordNotFoundError", "Could not find password.\n%s"], ["passwordNotFoundError.actions", ["Ensure a valid password is returned with the following command: [%s]"]], ["setCredentialError", "Command failed with response:\n%s"], ["setCredentialError.actions", ["Determine why this command failed to set an encryption key for user %s: [%s]."]], ["macKeychainOutOfSync", "We\u2019ve encountered an error with the Mac keychain being out of sync with your `sfdx` credentials. To fix the problem, sync your credentials by authenticating into your org again using the auth commands."]]));
 const GET_PASSWORD_RETRY_COUNT = 3;
 /**
@@ -38,7 +39,7 @@ const isExe = (mode, gid, uid) => {
         return true;
     }
     return Boolean(mode & parseInt('0001', 8) ||
-        (mode & parseInt('0010', 8) && process.getgid && gid === process.getgid()) ||
+        Boolean(mode & parseInt('0010', 8) && process.getgid && gid === process.getgid()) ||
         (mode & parseInt('0100', 8) && process.getuid && uid === process.getuid()));
 };
 /**
@@ -400,7 +401,7 @@ class GenericKeychainAccess {
     // eslint-disable-next-line class-methods-use-this
     async isValidFileAccess(cb) {
         try {
-            const root = (0, os_1.homedir)();
+            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 cb(null);
         }

package/lib/crypto/secureBuffer.js

@@ -7,7 +7,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SecureBuffer = void 0;
-const crypto = require("crypto");
+const crypto = require("node:crypto");
 const ts_types_1 = require("@salesforce/ts-types");
 const cipherName = 'aes-256-cbc';
 const cipherSize = 32;

package/lib/deviceOauthService.d.ts

@@ -1,7 +1,7 @@
 import { AsyncCreatable } from '@salesforce/kit';
 import { OAuth2Config } from 'jsforce';
 import { JsonMap, Nullable } from '@salesforce/ts-types';
-import { AuthInfo } from './org';
+import { AuthInfo } from './org/authInfo';
 export interface DeviceCodeResponse extends JsonMap {
     device_code: string;
     interval: number;

package/lib/deviceOauthService.js

@@ -14,9 +14,11 @@ const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const FormData = require("form-data");
 const logger_1 = require("./logger/logger");
-const org_1 = require("./org");
+const authInfo_1 = require("./org/authInfo");
+const connection_1 = require("./org/connection");
 const sfError_1 = require("./sfError");
 const messages_1 = require("./messages");
+;
 const messages = new messages_1.Messages('@salesforce/core', 'auth', new Map([["targetOrgNotSet", "A default user is not set."], ["targetOrgNotSet.actions", ["Run the \"sfdx auth\" commands with --setdefaultusername to connect to an org and set it as your default org.", "Run \"force:org:create\" with --setdefaultusername to create a scratch org and set it as your default org.", "Run \"sfdx config:set defaultusername=<username>\" to set your default username."]], ["portInUse", "Cannot start the OAuth redirect server on port %s."], ["portInUse.actions", ["Kill the process running on port %s or use a custom connected app and update OauthLocalPort in the sfdx-project.json file."]], ["invalidRequestMethod", "Invalid request method: %s"], ["invalidRequestUri", "Invalid request uri: %s"], ["pollingTimeout", "The device authorization request timed out. After executing force:auth:device:login, you must approve access to the device within 10 minutes. This can happen if the URL wasn\u2019t copied into the browser, login was not attempted, or the 2FA process was not completed within 10 minutes. Request authorization again."], ["serverErrorHTMLResponse", "<html><head><style>body {background-color:#F4F6F9; font-family: Arial, sans-serif; font-size: 0.8125rem; line-height: 1.5rem; color: #16325c;} #center {margin: auto; width: 370px; padding: 100px 0px 20px;} #logo-container {margin-left: auto; margin-right: auto; text-align: center;} #logo {max-width: 180px; max-height: 113px; margin-bottom: 2rem; border: 0;} #header {font-size: 1.5rem; text-align: center; margin-bottom: 1rem;} #message {background-color: #FFFFFF; margin: 0px auto; padding: 1.25rem; border-radius: 0.25rem; border: 1px solid #D8DDE6;} #footer {height: 24px; width: 370px; text-align: center; font-size: .75rem; position: absolute; bottom: 10;}</style></head><body><div id=\"center\"><div id=\"logo-container\"><img id=\"logo\" aria-hidden=\"true\" name=\"logo\" alt=\"Salesforce\" src=\"data:image/svg+xml;base64,%s\"></div><div id=\"header\">%s</div><div id=\"message\">%s<br/><br/>This is most likely <b>not</b> an error with the Salesforce CLI. Please ensure all information is accurate and try again.</div><div id=\"footer\">&copy; %s Salesforce, Inc. All rights reserved.</div></div></body></html>"], ["missingAuthCode", "No authentication code found on login response."], ["serverSuccessHTMLResponse", "<html><head><style>body {background-color:#F4F6F9; font-family: Arial, sans-serif; font-size: 0.8125rem; line-height: 1.5rem; color: #16325c;} #center {margin: auto; width: 300px; padding: 100px 0px 20px;} #logo-container {margin-left: auto; margin-right: auto; text-align: center;} #logo {max-width: 180px; max-height: 113px; margin-bottom: 2rem; border: 0;} #header {font-size: 1.5rem; text-align: center; margin-bottom: 1rem;} #message {background-color: #FFFFFF; margin: 0px auto; padding: 1.25rem; border-radius: 0.25rem; border: 1px solid #D8DDE6;} #footer {height: 24px; width: 300px; text-align: center; font-size: .75rem; position: absolute; bottom: 10;}</style></head><body><div id=\"center\"><div id=\"logo-container\"><img id=\"logo\" aria-hidden=\"true\" name=\"logo\" alt=\"Salesforce\" src=\"data:image/svg+xml;base64,%s\"></div><div id=\"header\">Authentication Successful</div><div id=\"message\">You've successfully logged in. You can now close this browser tab or window.</div><div id=\"footer\">&copy; %s Salesforce, Inc. All rights reserved.</div></div></body></html>"], ["serverSfdcImage", "<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
	 viewBox="0 0 262 184" style="enable-background:new 0 0 262 184;" xml:space="preserve">
<style type="text/css">
	.st0{fill:#00A1E0;}
	.st1{fill:#FFFFFF;}
</style>
<title>logo-salesforce</title>
<desc>Created with Sketch.</desc>
<g id="Test-B">
	<g id="Mobile-Nav---Test-B-_x28_0_x29_">
		<g id="Group">
			<g id="logo-salesforce">
				<path id="Fill-1" class="st0" d="M109.2,20.9c8.4-8.7,20.1-14.2,33-14.2c17.2,0,32.1,9.6,40.1,23.8c6.9-3.1,14.6-4.8,22.7-4.8
					c31,0,56,25.3,56,56.5s-25.1,56.5-56,56.5c-3.8,0-7.5-0.4-11-1.1c-7,12.5-20.4,21-35.8,21c-6.4,0-12.5-1.5-17.9-4.1
					c-7.1,16.7-23.7,28.5-43,28.5c-20.1,0-37.3-12.7-43.9-30.6c-2.9,0.6-5.9,0.9-8.9,0.9c-24,0-43.4-19.6-43.4-43.9
					c0-16.2,8.7-30.4,21.7-38c-2.7-6.1-4.2-12.9-4.2-20.1C18.5,23.6,41.2,1,69,1C85.4,1,100,8.8,109.2,20.9"/>
				<path id="Combined-Shape" class="st1" d="M38.7,95.4l1.1-2.9c0.2-0.5,0.5-0.3,0.7-0.2c0.3,0.2,0.5,0.3,0.9,0.6c3.1,2,6,2,6.9,2
					c2.3,0,3.8-1.2,3.8-2.9v-0.1c0-1.8-2.2-2.5-4.8-3.3l-0.6-0.2c-3.5-1-7.3-2.5-7.3-6.9v-0.1c0-4.2,3.4-7.2,8.3-7.2l0.5,0
					c2.9,0,5.6,0.8,7.6,2.1c0.2,0.1,0.4,0.3,0.3,0.6c-0.1,0.3-1,2.6-1.1,2.9c-0.2,0.5-0.7,0.2-0.7,0.2c-1.8-1-4.5-1.7-6.8-1.7
					c-2.1,0-3.4,1.1-3.4,2.6v0.1c0,1.7,2.3,2.5,4.9,3.3l0.5,0.1c3.5,1.1,7.2,2.6,7.2,6.9v0.1c0,4.6-3.3,7.4-8.6,7.4
					c-2.6,0-5.1-0.4-7.8-1.8c-0.5-0.3-1-0.5-1.5-0.9C38.7,95.9,38.5,95.8,38.7,95.4z M116.7,95.4l1.1-2.9c0.2-0.5,0.6-0.3,0.7-0.2
					c0.3,0.2,0.5,0.3,0.9,0.6c3.1,2,6,2,6.9,2c2.3,0,3.8-1.2,3.8-2.9v-0.1c0-1.8-2.2-2.5-4.8-3.3l-0.6-0.2c-3.5-1-7.3-2.5-7.3-6.9
					v-0.1c0-4.2,3.4-7.2,8.3-7.2l0.5,0c2.9,0,5.6,0.8,7.6,2.1c0.2,0.1,0.4,0.3,0.3,0.6c-0.1,0.3-1,2.6-1.1,2.9
					c-0.2,0.5-0.7,0.2-0.7,0.2c-1.8-1-4.5-1.7-6.8-1.7c-2.1,0-3.4,1.1-3.4,2.6v0.1c0,1.7,2.3,2.5,4.9,3.3l0.5,0.1
					c3.5,1.1,7.2,2.6,7.2,6.9v0.1c0,4.6-3.3,7.4-8.6,7.4c-2.6,0-5.1-0.4-7.8-1.8c-0.5-0.3-1-0.5-1.5-0.9
					C116.8,95.9,116.6,95.8,116.7,95.4z M174.5,81.7c0.4,1.5,0.7,3.1,0.7,4.8s-0.2,3.3-0.7,4.8c-0.4,1.5-1.1,2.8-2,3.9
					c-0.9,1.1-2.1,2-3.4,2.6c-1.4,0.6-3,0.9-4.8,0.9c-1.8,0-3.4-0.3-4.8-0.9c-1.4-0.6-2.5-1.5-3.4-2.6c-0.9-1.1-1.6-2.4-2-3.9
					c-0.4-1.5-0.7-3.1-0.7-4.8c0-1.7,0.2-3.3,0.7-4.8c0.4-1.5,1.1-2.8,2-3.9c0.9-1.1,2.1-2,3.4-2.6c1.4-0.6,3-1,4.8-1
					c1.8,0,3.4,0.3,4.8,1c1.4,0.6,2.5,1.5,3.4,2.6C173.4,78.9,174.1,80.2,174.5,81.7z M170,86.4c0-2.6-0.5-4.6-1.4-6
					c-0.9-1.4-2.4-2.1-4.3-2.1c-2,0-3.4,0.7-4.3,2.1c-0.9,1.4-1.4,3.4-1.4,6c0,2.6,0.5,4.6,1.4,6.1c0.9,1.4,2.3,2.1,4.3,2.1
					c2,0,3.4-0.7,4.3-2.1C169.6,91.1,170,89,170,86.4z M211.1,93.9l1.1,3c0.1,0.4-0.2,0.5-0.2,0.5c-1.7,0.7-4,1.1-6.3,1.1
					c-3.9,0-6.8-1.1-8.8-3.3c-2-2.2-3-5.2-3-8.9c0-1.7,0.2-3.3,0.7-4.8c0.5-1.5,1.2-2.8,2.2-3.9c1-1.1,2.2-2,3.6-2.6
					c1.4-0.6,3.1-1,5-1c1.3,0,2.4,0.1,3.3,0.2c1,0.2,2.4,0.5,3,0.8c0.1,0,0.4,0.2,0.3,0.5c-0.4,1.2-0.7,2-1.1,3
					c-0.2,0.5-0.5,0.3-0.5,0.3c-1.5-0.5-2.9-0.7-4.7-0.7c-2.2,0-3.9,0.7-4.9,2.2c-1.1,1.4-1.7,3.3-1.7,5.9c0,2.8,0.7,4.8,1.9,6.1
					c1.2,1.3,2.9,1.9,5.1,1.9c0.9,0,1.7-0.1,2.4-0.2c0.7-0.1,1.4-0.3,2.1-0.6C210.5,93.6,210.9,93.5,211.1,93.9z M233.8,80.8
					c1,3.4,0.5,6.3,0.4,6.5c0,0.4-0.4,0.4-0.4,0.4l-15.1,0c0.1,2.3,0.6,3.9,1.8,5c1.1,1.1,2.8,1.8,5.2,1.8c3.6,0,5.1-0.7,6.2-1.1
					c0,0,0.4-0.1,0.6,0.3l1,2.8c0.2,0.5,0,0.6-0.1,0.7c-0.9,0.5-3.2,1.5-7.6,1.5c-2.1,0-4-0.3-5.5-0.9c-1.5-0.6-2.8-1.4-3.8-2.5
					c-1-1.1-1.7-2.4-2.2-3.8c-0.5-1.5-0.7-3.1-0.7-4.8c0-1.7,0.2-3.3,0.7-4.8c0.4-1.5,1.1-2.8,2-3.9c0.9-1.1,2.1-2,3.5-2.6
					c1.4-0.7,3.1-1,5-1c1.6,0,3.1,0.3,4.3,0.9c0.9,0.4,1.9,1.1,2.9,2.2C232.5,77.9,233.4,79.4,233.8,80.8z M218.8,84h10.7
					c-0.1-1.4-0.4-2.6-1-3.6c-0.9-1.4-2.2-2.2-4.2-2.2c-2,0-3.4,0.8-4.3,2.2C219.4,81.3,219.1,82.5,218.8,84z M113.1,80.8
					c1,3.4,0.5,6.3,0.5,6.5c0,0.4-0.4,0.4-0.4,0.4l-15.1,0c0.1,2.3,0.6,3.9,1.8,5c1.1,1.1,2.8,1.8,5.2,1.8c3.6,0,5.1-0.7,6.2-1.1
					c0,0,0.4-0.1,0.6,0.3l1,2.8c0.2,0.5,0,0.6-0.1,0.7c-0.9,0.5-3.2,1.5-7.6,1.5c-2.1,0-4-0.3-5.5-0.9c-1.5-0.6-2.8-1.4-3.8-2.5
					c-1-1.1-1.7-2.4-2.2-3.8c-0.5-1.5-0.7-3.1-0.7-4.8c0-1.7,0.2-3.3,0.7-4.8c0.4-1.5,1.1-2.8,2-3.9c0.9-1.1,2.1-2,3.5-2.6
					c1.4-0.7,3.1-1,5-1c1.6,0,3.1,0.3,4.3,0.9c0.9,0.4,1.9,1.1,2.9,2.2C111.8,77.9,112.8,79.4,113.1,80.8z M98.1,84h10.8
					c-0.1-1.4-0.4-2.6-1-3.6c-0.9-1.4-2.2-2.2-4.2-2.2c-2,0-3.4,0.8-4.3,2.2C98.7,81.3,98.4,82.5,98.1,84z M71.6,83.2
					c0,0,1.2,0.1,2.5,0.3v-0.6c0-2-0.4-3-1.2-3.6c-0.8-0.6-2.1-1-3.7-1c0,0-3.7,0-6.6,1.5c-0.1,0.1-0.2,0.1-0.2,0.1
					s-0.4,0.1-0.5-0.2l-1.1-2.9c-0.2-0.4,0.1-0.6,0.1-0.6c1.4-1.1,4.6-1.7,4.6-1.7c1.1-0.2,2.9-0.4,4-0.4c3,0,5.3,0.7,6.9,2.1
					c1.6,1.4,2.4,3.6,2.4,6.7l0,13.8c0,0,0,0.4-0.3,0.5c0,0-0.6,0.2-1.1,0.3c-0.5,0.1-2.3,0.5-3.8,0.7c-1.5,0.3-3,0.4-4.6,0.4
					c-1.5,0-2.8-0.1-4-0.4c-1.2-0.3-2.2-0.7-3.1-1.3c-0.8-0.6-1.5-1.4-2-2.4c-0.5-0.9-0.7-2.1-0.7-3.4c0-1.3,0.3-2.5,0.8-3.5
					c0.5-1,1.3-1.8,2.2-2.5c0.9-0.7,2-1.1,3.1-1.5c1.2-0.3,2.4-0.5,3.7-0.5C70.2,83.2,71,83.2,71.6,83.2z M65.6,93.8
					c0,0,1.4,1.1,4.4,0.9c2.2-0.1,4.1-0.5,4.1-0.5v-6.9c0,0-1.9-0.3-4.1-0.3c-3.1,0-4.4,1.1-4.4,1.1c-0.9,0.6-1.3,1.6-1.3,2.9
					c0,0.8,0.2,1.5,0.5,2C64.9,93.2,65,93.4,65.6,93.8z M193.1,75.5c-0.1,0.4-0.9,2.5-1.1,3.2c-0.1,0.3-0.3,0.4-0.6,0.4
					c0,0-0.9-0.2-1.7-0.2c-0.5,0-1.3,0.1-2,0.3c-0.7,0.2-1.3,0.6-1.9,1.1c-0.6,0.5-1,1.3-1.3,2.2c-0.3,0.9-0.5,2.4-0.5,4v11.2
					c0,0.3-0.2,0.5-0.5,0.5h-4c-0.3,0-0.5-0.2-0.5-0.5V75.2c0-0.3,0.2-0.5,0.4-0.5h3.9c0.3,0,0.4,0.2,0.4,0.5V77
					c0.6-0.8,1.6-1.5,2.5-1.9c0.9-0.4,2-0.7,3.9-0.6c1,0.1,2.3,0.3,2.5,0.4C193,75,193.2,75.1,193.1,75.5z M156,65.1
					c0.1,0,0.4,0.2,0.3,0.5l-1.2,3.2c-0.1,0.2-0.2,0.4-0.7,0.2c-0.1,0-0.3-0.1-0.8-0.2c-0.3-0.1-0.8-0.1-1.2-0.1
					c-0.6,0-1.1,0.1-1.6,0.2c-0.5,0.1-0.9,0.4-1.3,0.8c-0.4,0.4-0.8,0.9-1.1,1.6c-0.6,1.6-0.8,3.3-0.8,3.4h4.8
					c0.4,0,0.5,0.2,0.5,0.5l-0.6,3.1c-0.1,0.5-0.5,0.4-0.5,0.4h-5L143.6,98c-0.4,2-0.8,3.7-1.3,5.1c-0.5,1.4-1.1,2.4-2,3.4
					c-0.8,0.9-1.7,1.6-2.8,1.9c-1,0.4-2.3,0.6-3.7,0.6c-0.7,0-1.4,0-2.2-0.2c-0.6-0.1-0.9-0.2-1.4-0.4c-0.2-0.1-0.3-0.3-0.2-0.6
					c0.1-0.3,1-2.7,1.1-3.1c0.2-0.4,0.5-0.2,0.5-0.2c0.3,0.1,0.5,0.2,0.8,0.3c0.4,0.1,0.8,0.1,1.2,0.1c0.7,0,1.3-0.1,1.8-0.3
					c0.6-0.2,1-0.6,1.4-1.1c0.4-0.5,0.7-1.2,1.1-2.1c0.3-0.9,0.6-2.2,0.9-3.7l3.4-18.9h-3.3c-0.4,0-0.5-0.2-0.5-0.5l0.6-3.1
					c0.1-0.5,0.5-0.4,0.5-0.4h3.4l0.2-1c0.5-3,1.5-5.3,3-6.8c1.5-1.5,3.7-2.3,6.4-2.3c0.8,0,1.5,0.1,2.1,0.2
					C155,64.8,155.5,64.9,156,65.1z M88.6,97.6c0,0.3-0.2,0.5-0.4,0.5h-4c-0.3,0-0.4-0.2-0.4-0.5V65.5c0-0.2,0.2-0.5,0.4-0.5h4
					c0.3,0,0.4,0.2,0.4,0.5V97.6z"/>
			</g>
		</g>
	</g>
</g>
</svg>
"]]));
 async function wait(ms = 1000) {
     return new Promise((resolve) => {
@@ -59,9 +61,9 @@ class DeviceOauthService extends kit_1.AsyncCreatable {
         this.pollingCount = 0;
         this.options = options;
         if (!this.options.clientId)
-            this.options.clientId = org_1.DEFAULT_CONNECTED_APP_INFO.clientId;
+            this.options.clientId = authInfo_1.DEFAULT_CONNECTED_APP_INFO.clientId;
         if (!this.options.loginUrl)
-            this.options.loginUrl = org_1.AuthInfo.getDefaultInstanceUrl();
+            this.options.loginUrl = authInfo_1.AuthInfo.getDefaultInstanceUrl();
     }
     /**
      * Begin the authorization flow by requesting the login
@@ -90,7 +92,7 @@ class DeviceOauthService extends kit_1.AsyncCreatable {
      * @returns {Promise<AuthInfo>}
      */
     async authorizeAndSave(approval) {
-        const authInfo = await org_1.AuthInfo.create({
+        const authInfo = await authInfo_1.AuthInfo.create({
             oauth2Options: {
                 loginUrl: approval.instance_url,
                 refreshToken: approval.refresh_token,
@@ -113,7 +115,7 @@ class DeviceOauthService extends kit_1.AsyncCreatable {
         form.append('scope', DeviceOauthService.SCOPE);
         return {
             url,
-            headers: { ...org_1.SFDX_HTTP_HEADERS, ...form.getHeaders() },
+            headers: { ...connection_1.SFDX_HTTP_HEADERS, ...form.getHeaders() },
             method: 'POST',
             body: form.getBuffer(),
         };
@@ -125,7 +127,7 @@ class DeviceOauthService extends kit_1.AsyncCreatable {
         form.append('code', code);
         return {
             url,
-            headers: { ...org_1.SFDX_HTTP_HEADERS, ...form.getHeaders() },
+            headers: { ...connection_1.SFDX_HTTP_HEADERS, ...form.getHeaders() },
             method: 'POST',
             body: form.getBuffer(),
         };

package/lib/exported.d.ts

@@ -4,7 +4,7 @@ export { TTLConfig } from './config/ttlConfig';
 export { envVars, EnvironmentVariable, SUPPORTED_ENV_VARS, EnvVars } from './config/envVars';
 export { ConfigStore } from './config/configStore';
 export { ConfigEntry, ConfigContents, ConfigValue } from './config/configStackTypes';
-export { SfTokens, StateAggregator } from './stateAggregator';
+export { StateAggregator } from './stateAggregator/stateAggregator';
 export { DeviceOauthService, DeviceCodeResponse, DeviceCodePollingResponse } from './deviceOauthService';
 export { OrgUsersConfig } from './config/orgUsersConfig';
 export { ConfigPropertyMeta, ConfigPropertyMetaInput, Config, SfdxPropertyKeys, SfConfigProperties, SFDX_ALLOWED_PROPERTIES, SF_ALLOWED_PROPERTIES, } from './config/config';
@@ -20,20 +20,19 @@ export { SfdcUrl } from './util/sfdcUrl';
 export { getJwtAudienceUrl } from './util/getJwtAudienceUrl';
 export { Fields, FieldValue, LoggerLevel, LoggerLevelValue, LogLine, LoggerOptions, Logger } from './logger/logger';
 export { Messages, StructuredMessage } from './messages';
-export { Org, SandboxProcessObject, StatusEvent, SandboxEvents, SandboxUserAuthResponse, SandboxUserAuthRequest, SandboxRequest, ResumeSandboxRequest, OrgTypes, ResultEvent, ScratchOrgRequest, } from './org';
+export { Org, SandboxProcessObject, StatusEvent, SandboxEvents, SandboxUserAuthResponse, SandboxUserAuthRequest, SandboxRequest, ResumeSandboxRequest, OrgTypes, ResultEvent, ScratchOrgRequest, } from './org/org';
 export { OrgConfigProperties, ORG_CONFIG_ALLOWED_PROPERTIES } from './org/orgConfigProperties';
 export { PackageDir, NamedPackageDir, PackageDirDependency, SfProject, SfProjectJson } from './sfProject';
 export { SchemaValidator } from './schema/validator';
-export { SchemaPrinter } from './schema/printer';
 export { SfError } from './sfError';
 export { PollingClient } from './status/pollingClient';
 export { CometClient, CometSubscription, StreamingClient, StatusResult } from './status/streamingClient';
 export { MyDomainResolver } from './status/myDomainResolver';
 export { DefaultUserFields, REQUIRED_FIELDS, User, UserFields } from './org/user';
 export { PermissionSetAssignment, PermissionSetAssignmentFields } from './org/permissionSetAssignment';
+export { lockInit } from './util/fileLocking';
 export { ScratchOrgCreateOptions, ScratchOrgCreateResult, scratchOrgCreate, scratchOrgResume, } from './org/scratchOrgCreate';
 export { ScratchOrgInfo } from './org/scratchOrgTypes';
 export { ScratchOrgLifecycleEvent, scratchOrgLifecycleEventName, scratchOrgLifecycleStages, } from './org/scratchOrgLifecycleEvents';
 export { ScratchOrgCache } from './org/scratchOrgCache';
 export * from './util/sfdc';
-export * from './util/sfdcUrl';

package/lib/exported.js

@@ -20,9 +20,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scratchOrgLifecycleEventName = exports.scratchOrgResume = exports.scratchOrgCreate = exports.PermissionSetAssignment = exports.User = exports.REQUIRED_FIELDS = exports.DefaultUserFields = exports.MyDomainResolver = exports.StreamingClient = exports.CometClient = exports.PollingClient = exports.SfError = exports.SchemaPrinter = 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.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.scratchOrgLifecycleEventName = 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.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.ScratchOrgCache = exports.scratchOrgLifecycleStages = void 0;
 const messages_1 = require("./messages");
+;
 var configFile_1 = require("./config/configFile");
 Object.defineProperty(exports, "ConfigFile", { enumerable: true, get: function () { return configFile_1.ConfigFile; } });
 var ttlConfig_1 = require("./config/ttlConfig");
@@ -32,7 +33,7 @@ Object.defineProperty(exports, "envVars", { enumerable: true, get: function () {
 Object.defineProperty(exports, "EnvironmentVariable", { enumerable: true, get: function () { return envVars_1.EnvironmentVariable; } });
 Object.defineProperty(exports, "SUPPORTED_ENV_VARS", { enumerable: true, get: function () { return envVars_1.SUPPORTED_ENV_VARS; } });
 Object.defineProperty(exports, "EnvVars", { enumerable: true, get: function () { return envVars_1.EnvVars; } });
-var stateAggregator_1 = require("./stateAggregator");
+var stateAggregator_1 = require("./stateAggregator/stateAggregator");
 Object.defineProperty(exports, "StateAggregator", { enumerable: true, get: function () { return stateAggregator_1.StateAggregator; } });
 var deviceOauthService_1 = require("./deviceOauthService");
 Object.defineProperty(exports, "DeviceOauthService", { enumerable: true, get: function () { return deviceOauthService_1.DeviceOauthService; } });
@@ -71,7 +72,7 @@ Object.defineProperty(exports, "LoggerLevel", { enumerable: true, get: function
 Object.defineProperty(exports, "Logger", { enumerable: true, get: function () { return logger_1.Logger; } });
 var messages_2 = require("./messages");
 Object.defineProperty(exports, "Messages", { enumerable: true, get: function () { return messages_2.Messages; } });
-var org_1 = require("./org");
+var org_1 = require("./org/org");
 Object.defineProperty(exports, "Org", { enumerable: true, get: function () { return org_1.Org; } });
 Object.defineProperty(exports, "SandboxEvents", { enumerable: true, get: function () { return org_1.SandboxEvents; } });
 Object.defineProperty(exports, "OrgTypes", { enumerable: true, get: function () { return org_1.OrgTypes; } });
@@ -83,8 +84,6 @@ Object.defineProperty(exports, "SfProject", { enumerable: true, get: function ()
 Object.defineProperty(exports, "SfProjectJson", { enumerable: true, get: function () { return sfProject_1.SfProjectJson; } });
 var validator_1 = require("./schema/validator");
 Object.defineProperty(exports, "SchemaValidator", { enumerable: true, get: function () { return validator_1.SchemaValidator; } });
-var printer_1 = require("./schema/printer");
-Object.defineProperty(exports, "SchemaPrinter", { enumerable: true, get: function () { return printer_1.SchemaPrinter; } });
 var sfError_1 = require("./sfError");
 Object.defineProperty(exports, "SfError", { enumerable: true, get: function () { return sfError_1.SfError; } });
 var pollingClient_1 = require("./status/pollingClient");
@@ -100,6 +99,8 @@ Object.defineProperty(exports, "REQUIRED_FIELDS", { enumerable: true, get: funct
 Object.defineProperty(exports, "User", { enumerable: true, get: function () { return user_1.User; } });
 var permissionSetAssignment_1 = require("./org/permissionSetAssignment");
 Object.defineProperty(exports, "PermissionSetAssignment", { enumerable: true, get: function () { return permissionSetAssignment_1.PermissionSetAssignment; } });
+var fileLocking_1 = require("./util/fileLocking");
+Object.defineProperty(exports, "lockInit", { enumerable: true, get: function () { return fileLocking_1.lockInit; } });
 var scratchOrgCreate_1 = require("./org/scratchOrgCreate");
 Object.defineProperty(exports, "scratchOrgCreate", { enumerable: true, get: function () { return scratchOrgCreate_1.scratchOrgCreate; } });
 Object.defineProperty(exports, "scratchOrgResume", { enumerable: true, get: function () { return scratchOrgCreate_1.scratchOrgResume; } });
@@ -110,5 +111,4 @@ var scratchOrgCache_1 = require("./org/scratchOrgCache");
 Object.defineProperty(exports, "ScratchOrgCache", { enumerable: true, get: function () { return scratchOrgCache_1.ScratchOrgCache; } });
 // Utility sub-modules
 __exportStar(require("./util/sfdc"), exports);
-__exportStar(require("./util/sfdcUrl"), exports);
 //# sourceMappingURL=exported.js.map

package/lib/global.js

@@ -7,9 +7,9 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Global = exports.Mode = void 0;
-const fs = require("fs");
-const os = require("os");
-const path = require("path");
+const fs = require("node:fs");
+const os = require("node:os");
+const path = require("node:path");
 const kit_1 = require("@salesforce/kit");
 const sfError_1 = require("./sfError");
 /**
@@ -24,7 +24,7 @@ var Mode;
     Mode["DEVELOPMENT"] = "development";
     Mode["DEMO"] = "demo";
     Mode["TEST"] = "test";
-})(Mode = exports.Mode || (exports.Mode = {}));
+})(Mode || (exports.Mode = Mode = {}));
 /**
  * Global constants, methods, and configuration.
  */

package/lib/logger/logger.js

@@ -7,8 +7,8 @@ exports.computeLevel = exports.Logger = exports.LoggerLevel = 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 os = require("os");
-const path = require("path");
+const os = require("node:os");
+const path = require("node:path");
 const pino_1 = require("pino");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
@@ -30,7 +30,7 @@ var LoggerLevel;
     LoggerLevel[LoggerLevel["WARN"] = 40] = "WARN";
     LoggerLevel[LoggerLevel["ERROR"] = 50] = "ERROR";
     LoggerLevel[LoggerLevel["FATAL"] = 60] = "FATAL";
-})(LoggerLevel = exports.LoggerLevel || (exports.LoggerLevel = {}));
+})(LoggerLevel || (exports.LoggerLevel = LoggerLevel = {}));
 /**
  * A logging abstraction powered by {@link https://github.com/pinojs/pino | Pino} that provides both a default
  * logger configuration that will log to the default path, and a way to create custom loggers based on the same foundation.
@@ -71,6 +71,7 @@ class Logger {
      * `Logger`.
      */
     constructor(optionsOrName) {
+        const enabled = process.env.SFDX_DISABLE_LOG_FILE !== 'true' && process.env.SF_DISABLE_LOG_FILE !== 'true';
         const options = typeof optionsOrName === 'string'
             ? { name: optionsOrName, level: Logger.DEFAULT_LEVEL, fields: {} }
             : optionsOrName;
@@ -89,9 +90,9 @@ class Logger {
                 name: options.name ?? Logger.ROOT_NAME,
                 base: options.fields ?? {},
                 level,
-                enabled: process.env.SFDX_DISABLE_LOG_FILE !== 'true' && process.env.SF_DISABLE_LOG_FILE !== 'true',
+                enabled,
             };
-            if (options.useMemoryLogger || global_1.Global.getEnvironmentMode() === global_1.Mode.TEST) {
+            if (Boolean(options.useMemoryLogger) || global_1.Global.getEnvironmentMode() === global_1.Mode.TEST || !enabled) {
                 this.memoryLogger = new memoryLogger_1.MemoryLogger();
                 this.pinoLogger = (0, pino_1.pino)({
                     ...commonOptions,

package/lib/logger/memoryLogger.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Writable } from 'stream';
+import { Writable } from 'node:stream';
 /**
  * Used by test setup to keep UT from writing to disk.
  */

package/lib/logger/memoryLogger.js

@@ -7,13 +7,13 @@ exports.MemoryLogger = 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 stream_1 = require("stream");
+const node_stream_1 = require("node:stream");
 const unwrapArray_1 = require("../util/unwrapArray");
 const filters_1 = require("./filters");
 /**
  * Used by test setup to keep UT from writing to disk.
  */
-class MemoryLogger extends stream_1.Writable {
+class MemoryLogger extends node_stream_1.Writable {
     constructor() {
         super({ objectMode: true });
         this.loggedData = [];

package/lib/logger/transformStream.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="node" />
-import { Transform } from 'stream';
+import { Transform } from 'node:stream';
 export default function (): Transform;

package/lib/logger/transformStream.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * 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 stream_1 = require("stream");
+const node_stream_1 = require("node:stream");
 const unwrapArray_1 = require("../util/unwrapArray");
 const filters_1 = require("./filters");
 // eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-unsafe-assignment
@@ -16,7 +16,7 @@ function default_1() {
     return build(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     (source) => {
-        const myTransportStream = new stream_1.Transform({
+        const myTransportStream = new node_stream_1.Transform({
             objectMode: true,
             transform(chunk, enc, cb) {
                 if (debugAllows(chunk)) {
@@ -29,7 +29,7 @@ function default_1() {
             },
         });
         // eslint-disable-next-line @typescript-eslint/no-empty-function
-        (0, stream_1.pipeline)(source, myTransportStream, () => { });
+        (0, node_stream_1.pipeline)(source, myTransportStream, () => { });
         return myTransportStream;
     }, {
         // This is needed to be able to pipeline transports.

package/lib/messageTransformer.js

@@ -28,7 +28,7 @@ const messageTransformer = () => {
             if (ts.isExpressionStatement(node) && node.getText().includes('importMessagesDirectory')) {
                 // importMessagesDirectory now happens at compile, not in runtime
                 // returning undefined removes the node
-                return undefined;
+                return ts.factory.createEmptyStatement();
             }
             if (
             // transform a runtime load call into hardcoded messages values
@@ -54,7 +54,7 @@ const messageTransformer = () => {
             // it might be a node that contains one of the things we're interested in, so keep digging
             return ts.visitEachChild(node, visitor, context);
         };
-        return ts.visitNode(sourceFile, visitor);
+        return ts.visitNode(sourceFile, visitor, ts.isSourceFile);
     };
     return transformerFactory;
 };

package/lib/messages.js

@@ -7,10 +7,10 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Messages = void 0;
-const fs = require("fs");
-const os = require("os");
-const path = require("path");
-const util = require("util");
+const fs = require("node:fs");
+const os = require("node:os");
+const path = require("node:path");
+const util = require("node:util");
 const ts_types_1 = require("@salesforce/ts-types");
 const kit_1 = require("@salesforce/kit");
 const sfError_1 = require("./sfError");
@@ -438,7 +438,7 @@ class Messages {
         //     'myMessage' -> `MyMessageWarning`
         //     'myMessageError' -> `MyMessageError`
         //     'warning.myMessage' -> `MyMessageWarning`
-        const name = `${(0, kit_1.upperFirst)(key.replace(searchValue, ''))}${labelRegExp.exec(key) || preserveName ? '' : label}`;
+        const name = `${(0, kit_1.upperFirst)(key.replace(searchValue, ''))}${labelRegExp.exec(key) ?? preserveName ? '' : label}`;
         const message = this.getMessage(key, tokens);
         let actions;
         try {