@salesforce/core 6.0.1-crdt.0 → 6.1.1

package/lib/util/cache.js

@@ -29,37 +29,37 @@ class Cache extends Map {
         __classPrivateFieldSet(this, _Cache_lookups, 0, "f");
     }
     static get hits() {
-        return __classPrivateFieldGet(Cache.instance(), _Cache_hits, "f");
+        return __classPrivateFieldGet(_a.instance(), _Cache_hits, "f");
     }
     static get lookups() {
-        return __classPrivateFieldGet(Cache.instance(), _Cache_lookups, "f");
+        return __classPrivateFieldGet(_a.instance(), _Cache_lookups, "f");
     }
     static instance() {
-        if (!__classPrivateFieldGet(Cache, _a, "f", _Cache_instance)) {
-            __classPrivateFieldSet(Cache, _a, true, "f", _Cache_enabled);
-            __classPrivateFieldSet(Cache, _a, new Cache(), "f", _Cache_instance);
+        if (!__classPrivateFieldGet(_a, _a, "f", _Cache_instance)) {
+            __classPrivateFieldSet(_a, _a, true, "f", _Cache_enabled);
+            __classPrivateFieldSet(_a, _a, new _a(), "f", _Cache_instance);
         }
-        return __classPrivateFieldGet(Cache, _a, "f", _Cache_instance);
+        return __classPrivateFieldGet(_a, _a, "f", _Cache_instance);
     }
     static set(key, value) {
-        if (__classPrivateFieldGet(Cache, _a, "f", _Cache_enabled)) {
-            Cache.instance().set(key, value);
+        if (__classPrivateFieldGet(_a, _a, "f", _Cache_enabled)) {
+            _a.instance().set(key, value);
         }
     }
     static get(key) {
         var _b, _c, _d;
-        if (!__classPrivateFieldGet(Cache, _a, "f", _Cache_enabled)) {
+        if (!__classPrivateFieldGet(_a, _a, "f", _Cache_enabled)) {
             return undefined;
         }
-        __classPrivateFieldSet(_b = Cache.instance(), _Cache_lookups, (_c = __classPrivateFieldGet(_b, _Cache_lookups, "f"), _c++, _c), "f");
-        __classPrivateFieldSet(_d = Cache.instance(), _Cache_hits, __classPrivateFieldGet(_d, _Cache_hits, "f") + (Cache.instance().has(key) ? 1 : 0), "f");
-        return __classPrivateFieldGet(Cache, _a, "f", _Cache_instance).get(key);
+        __classPrivateFieldSet(_b = _a.instance(), _Cache_lookups, (_c = __classPrivateFieldGet(_b, _Cache_lookups, "f"), _c++, _c), "f");
+        __classPrivateFieldSet(_d = _a.instance(), _Cache_hits, __classPrivateFieldGet(_d, _Cache_hits, "f") + (_a.instance().has(key) ? 1 : 0), "f");
+        return __classPrivateFieldGet(_a, _a, "f", _Cache_instance).get(key);
     }
     static disable() {
-        __classPrivateFieldSet(Cache, _a, false, "f", _Cache_enabled);
+        __classPrivateFieldSet(_a, _a, false, "f", _Cache_enabled);
     }
     static enable() {
-        __classPrivateFieldSet(Cache, _a, true, "f", _Cache_enabled);
+        __classPrivateFieldSet(_a, _a, true, "f", _Cache_enabled);
     }
 }
 exports.Cache = Cache;

package/lib/util/checkLightningDomain.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 url_1 = require("url");
+const node_url_1 = require("node:url");
 const kit_1 = require("@salesforce/kit");
 const myDomainResolver_1 = require("../status/myDomainResolver");
 const sfdcUrl_1 = require("./sfdcUrl");
@@ -18,7 +18,7 @@ async function checkLightningDomain(url) {
         return true;
     }
     const resolver = await myDomainResolver_1.MyDomainResolver.create({
-        url: new url_1.URL(domain),
+        url: new node_url_1.URL(domain),
         timeout,
         frequency: new kit_1.Duration(1, kit_1.Duration.Unit.SECONDS),
     });

package/lib/util/directoryWriter.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { Readable } from 'stream';
+import { Readable } from 'node:stream';
 import { StructuredWriter } from './structuredWriter';
 export declare class DirectoryWriter implements StructuredWriter {
     private readonly rootDestination?;

package/lib/util/directoryWriter.js

@@ -7,12 +7,12 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DirectoryWriter = void 0;
-const stream_1 = require("stream");
-const fs = require("fs");
-const os = require("os");
-const path = require("path");
-const util_1 = require("util");
-const pipeline = (0, util_1.promisify)(stream_1.pipeline);
+const node_stream_1 = require("node:stream");
+const fs = require("node:fs");
+const os = require("node:os");
+const path = require("node:path");
+const node_util_1 = require("node:util");
+const pipeline = (0, node_util_1.promisify)(node_stream_1.pipeline);
 class DirectoryWriter {
     constructor(rootDestination) {
         this.rootDestination = rootDestination;
@@ -31,7 +31,7 @@ class DirectoryWriter {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const destPath = path.join(this.rootDestination, targetPath);
         fs.mkdirSync(path.dirname(destPath), { recursive: true });
-        if (contents instanceof stream_1.Readable) {
+        if (contents instanceof node_stream_1.Readable) {
             const writeStream = fs.createWriteStream(destPath);
             await pipeline(contents, writeStream);
         }

package/lib/util/fileLocking.d.ts

@@ -0,0 +1,24 @@
+type LockInitResponse = {
+    writeAndUnlock: (data: string) => Promise<void>;
+    unlock: () => Promise<void>;
+};
+type LockInitSyncResponse = {
+    writeAndUnlock: (data: string) => void;
+    unlock: () => void;
+};
+/**
+ *
+ *This method exists as a separate function so it can be used by ConfigFile OR outside of ConfigFile.
+ *
+ * @param filePath where to save the file
+ * @returns 2 functions:
+ * - writeAndUnlock: a function that takes the data to write and writes it to the file, then unlocks the file whether write succeeded or not
+ * - unlock: a function that unlocks the file (in case you don't end up calling writeAndUnlock)
+ */
+export declare const lockInit: (filePath: string) => Promise<LockInitResponse>;
+/**
+ * prefer async {@link lockInit}.
+ * See its documentation for details.
+ */
+export declare const lockInitSync: (filePath: string) => LockInitSyncResponse;
+export {};

package/lib/util/fileLocking.js

@@ -0,0 +1,91 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.lockInitSync = exports.lockInit = void 0;
+/*
+ * 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
+ */
+const fs = require("node:fs");
+const node_path_1 = require("node:path");
+const proper_lockfile_1 = require("proper-lockfile");
+const sfError_1 = require("../sfError");
+const logger_1 = require("../logger/logger");
+const lockRetryOptions_1 = require("./lockRetryOptions");
+/**
+ *
+ *This method exists as a separate function so it can be used by ConfigFile OR outside of ConfigFile.
+ *
+ * @param filePath where to save the file
+ * @returns 2 functions:
+ * - writeAndUnlock: a function that takes the data to write and writes it to the file, then unlocks the file whether write succeeded or not
+ * - unlock: a function that unlocks the file (in case you don't end up calling writeAndUnlock)
+ */
+const lockInit = async (filePath) => {
+    // make sure we can write to the directory
+    try {
+        await fs.promises.mkdir((0, node_path_1.dirname)(filePath), { recursive: true });
+    }
+    catch (err) {
+        throw sfError_1.SfError.wrap(err);
+    }
+    const [unlock] = await Promise.all(fs.existsSync(filePath)
+        ? // if the file exists, wait for it to be unlocked
+            [(0, proper_lockfile_1.lock)(filePath, lockRetryOptions_1.lockRetryOptions)]
+        : // lock the entire directory to keep others from trying to create the file while we are
+            [
+                (0, proper_lockfile_1.lock)((0, node_path_1.dirname)(filePath), lockRetryOptions_1.lockRetryOptions),
+                (await logger_1.Logger.child('fileLocking.lockInit')).debug(`No file found at ${filePath}.  Write will create it.  Locking the entire directory until file is written.`),
+            ]);
+    return {
+        writeAndUnlock: async (data) => {
+            const logger = await logger_1.Logger.child('fileLocking.writeAndUnlock');
+            logger.debug(`Writing to file: ${filePath}`);
+            try {
+                await fs.promises.writeFile(filePath, data);
+            }
+            finally {
+                await unlock();
+            }
+        },
+        unlock,
+    };
+};
+exports.lockInit = lockInit;
+/**
+ * prefer async {@link lockInit}.
+ * See its documentation for details.
+ */
+const lockInitSync = (filePath) => {
+    // make sure we can write to the directory
+    try {
+        fs.mkdirSync((0, node_path_1.dirname)(filePath), { recursive: true });
+    }
+    catch (err) {
+        throw sfError_1.SfError.wrap(err);
+    }
+    const [unlock] = fs.existsSync(filePath)
+        ? // if the file exists, wait for it to be unlocked
+            [(0, proper_lockfile_1.lockSync)(filePath, lockRetryOptions_1.lockRetryOptions)]
+        : // lock the entire directory to keep others from trying to create the file while we are
+            [
+                (0, proper_lockfile_1.lockSync)((0, node_path_1.dirname)(filePath), lockRetryOptions_1.lockRetryOptions),
+                logger_1.Logger.childFromRoot('fileLocking.lockInit').debug(`No file found at ${filePath}.  Write will create it.  Locking the entire directory until file is written.`),
+            ];
+    return {
+        writeAndUnlock: (data) => {
+            const logger = logger_1.Logger.childFromRoot('fileLocking.writeAndUnlock');
+            logger.debug(`Writing to file: ${filePath}`);
+            try {
+                fs.writeFileSync(filePath, data);
+            }
+            finally {
+                unlock();
+            }
+        },
+        unlock,
+    };
+};
+exports.lockInitSync = lockInitSync;
+//# sourceMappingURL=fileLocking.js.map

package/lib/util/findUppercaseKeys.d.ts

@@ -0,0 +1,2 @@
+import { JsonMap, Optional } from '@salesforce/ts-types';
+export declare const findUpperCaseKeys: (data?: JsonMap, sectionBlocklist?: string[]) => Optional<string>;

package/lib/util/findUppercaseKeys.js

@@ -0,0 +1,29 @@
+"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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findUpperCaseKeys = void 0;
+const ts_types_1 = require("@salesforce/ts-types");
+const kit_1 = require("@salesforce/kit");
+const findUpperCaseKeys = (data, sectionBlocklist = []) => {
+    let key;
+    (0, kit_1.findKey)(data, (val, k) => {
+        if (/^[A-Z]/.test(k)) {
+            key = k;
+        }
+        else if ((0, ts_types_1.isJsonMap)(val)) {
+            if (sectionBlocklist.includes(k)) {
+                return key;
+            }
+            key = (0, exports.findUpperCaseKeys)((0, ts_types_1.asJsonMap)(val));
+        }
+        return key;
+    });
+    return key;
+};
+exports.findUpperCaseKeys = findUpperCaseKeys;
+//# sourceMappingURL=findUppercaseKeys.js.map

package/lib/util/internal.js

@@ -7,9 +7,10 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.traverse = exports.resolveProjectPathSync = exports.resolveProjectPath = exports.SFDX_PROJECT_JSON = void 0;
-const fs = require("fs");
-const path_1 = require("path");
+const fs = require("node:fs");
+const node_path_1 = require("node:path");
 const messages_1 = require("../messages");
+;
 const messages = new messages_1.Messages('@salesforce/core', 'config', new Map([["unknownConfigKey", "Unknown config name: %s."], ["deprecatedConfigKey", "Deprecated config name: %s. Please use %s instead."], ["invalidWrite", "The writeSync method is not allowed on SfdxConfig. Use the async write method instead."], ["invalidConfigValue", "Invalid config value: %s."], ["invalidInstanceUrl", "Specify a valid Salesforce instance URL."], ["invalidApiVersion", "Specify a valid Salesforce API version, for example, 42.0."], ["invalidCustomOrgMetadataTemplates", "Specify a valid repository URL or directory for the custom org metadata templates."], ["invalidIsvDebuggerSid", "Specify a valid Debugger SID."], ["invalidIsvDebuggerUrl", "Specify a valid Debugger URL."], ["invalidNumberConfigValue", "Specify a valid positive integer, for example, 150000."], ["invalidBooleanConfigValue", "The config value can only be set to true or false."], ["invalidProjectWorkspace", "This directory does not contain a valid Salesforce DX project."], ["schemaValidationError", "The config file \"%s\" is not schema valid.\nDue to: %s"], ["schemaValidationError.actions", ["Fix the invalid entries at %s."]], ["missingDefaultPath", "In sfdx-project.json, be sure to specify which package directory (path) is the default. Example: `[{ \"path\": \"packageDirectory1\", \"default\": true }, { \"path\": \"packageDirectory2\" }]`"], ["missingPackageDirectory", "The path \"%s\", specified in sfdx-project.json, does not exist. Be sure this directory is included in your project root."], ["invalidPackageDirectory", "The path \"%s\", specified in sfdx-project.json, must be indicated as a relative path to the project root."], ["multipleDefaultPaths", "In sfdx-project.json, indicate only one package directory (path) as the default."], ["singleNonDefaultPackage", "The sfdx-project.json file must include one, and only one, default package directory (path). Because your sfdx-project.json file contains only one package directory, it must be the default. Remove the `\"default\": false` key and try again."], ["target-org", "Username or alias of the org that all commands run against by default. (sf only)"], ["target-dev-hub", "Username or alias of your default Dev Hub org. (sf only)"], ["defaultUsername", "Username or alias of the org that all commands run against by default. (sfdx only)"], ["defaultDevHubUsername", "Username or alias of your default Dev Hub org. (sfdx only)"], ["isvDebuggerSid", "ISV debugger SID (sfdx only)"], ["isvDebuggerUrl", "ISV debugger URL (sfdx only)"], ["org-isv-debugger-sid", "ISV debugger SID."], ["org-isv-debugger-url", "ISV debugger URL."], ["apiVersion", "API version of your project. Default: API version of your Dev Hub org. (sfdx only)"], ["org-api-version", "API version of your project. Default: API version of your Dev Hub org."], ["disableTelemetry", "Disables the collection of usage and user environment information, etc. Default: false. (sfdx only)"], ["disable-telemetry", "Disables the collection of usage and user environment information, etc. Default: false."], ["maxQueryLimit", "Maximum number of Salesforce records returned by a CLI command. Default: 10,000. (sfdx only)"], ["org-max-query-limit", "Maximum number of Salesforce records returned by a CLI command. Default: 10,000."], ["restDeploy", "Whether deployments use the Metadata REST API (true) or SOAP API (false, default value). (sfdx only)"], ["instanceUrl", "URL of the Salesforce instance hosting your org. Default: https://login.salesforce.com. (sfdx only)"], ["org-instance-url", "URL of the Salesforce instance hosting your org. Default: https://login.salesforce.com."], ["customOrgMetadataTemplates", "A valid repository URL or directory for the custom org metadata templates."], ["org-custom-metadata-templates", "A valid repository URL or directory for the custom org metadata templates."], ["invalidId", "The given id %s is not a valid 15 or 18 character Salesforce ID."]]));
 /**
  * The name of the project config file.
@@ -75,12 +76,12 @@ exports.traverse = {
     forFile: async (dir, file) => {
         let foundProjectDir;
         try {
-            fs.statSync((0, path_1.join)(dir, file));
+            fs.statSync((0, node_path_1.join)(dir, file));
             foundProjectDir = dir;
         }
         catch (err) {
             if (err && err.code === 'ENOENT') {
-                const nextDir = (0, path_1.resolve)(dir, '..');
+                const nextDir = (0, node_path_1.resolve)(dir, '..');
                 if (nextDir !== dir) {
                     // stop at root
                     foundProjectDir = await exports.traverse.forFile(nextDir, file);
@@ -100,12 +101,12 @@ exports.traverse = {
     forFileSync: (dir, file) => {
         let foundProjectDir;
         try {
-            fs.statSync((0, path_1.join)(dir, file));
+            fs.statSync((0, node_path_1.join)(dir, file));
             foundProjectDir = dir;
         }
         catch (err) {
             if (err && err.code === 'ENOENT') {
-                const nextDir = (0, path_1.resolve)(dir, '..');
+                const nextDir = (0, node_path_1.resolve)(dir, '..');
                 if (nextDir !== dir) {
                     // stop at root
                     foundProjectDir = exports.traverse.forFileSync(nextDir, file);

package/lib/util/sfdc.d.ts

@@ -1,4 +1,3 @@
-import { JsonMap, Optional } from '@salesforce/ts-types';
 /**
  * Converts an 18 character Salesforce ID to 15 characters.
  *
@@ -19,14 +18,6 @@ export declare const validateApiVersion: (value: string) => boolean;
  * @param value The email as a string.
  */
 export declare const validateEmail: (value: string) => boolean;
-/**
- *
- * @deprecated use `new SfdcUrl(url).isInternalUrl()`
- * Tests whether a given url is an internal Salesforce domain
- *
- * @param url
- */
-export declare const isInternalUrl: (url: string) => boolean;
 /**
  * Tests whether a Salesforce ID is in the correct format, a 15- or 18-character length string with only letters and numbers
  *
@@ -39,15 +30,6 @@ export declare const validateSalesforceId: (value: string) => boolean;
  * @param value The path as a string.
  */
 export declare const validatePathDoesNotContainInvalidChars: (value: string) => boolean;
-/**
- * @deprecated
- * // TODO: move this to a module-scope function in sfProject
- * Returns the first key within the object that has an upper case first letter.
- *
- * @param data The object in which to check key casing.
- * @param sectionBlocklist properties in the object to exclude from the search. e.g. a blocklist of `["a"]` and data of `{ "a": { "B" : "b"}}` would ignore `B` because it is in the object value under `a`.
- */
-export declare const findUpperCaseKeys: (data?: JsonMap, sectionBlocklist?: string[]) => Optional<string>;
 export declare const accessTokenRegex: RegExp;
 export declare const sfdxAuthUrlRegex: RegExp;
 /**

package/lib/util/sfdc.js

@@ -6,9 +6,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.matchesAccessToken = exports.sfdxAuthUrlRegex = exports.accessTokenRegex = exports.findUpperCaseKeys = exports.validatePathDoesNotContainInvalidChars = exports.validateSalesforceId = exports.isInternalUrl = exports.validateEmail = exports.validateApiVersion = exports.trimTo15 = void 0;
-const kit_1 = require("@salesforce/kit");
-const ts_types_1 = require("@salesforce/ts-types");
+exports.matchesAccessToken = exports.sfdxAuthUrlRegex = exports.accessTokenRegex = exports.validatePathDoesNotContainInvalidChars = exports.validateSalesforceId = exports.validateEmail = exports.validateApiVersion = exports.trimTo15 = void 0;
 function trimTo15(id) {
     if (!id) {
         return undefined;
@@ -33,20 +31,6 @@ exports.validateApiVersion = validateApiVersion;
  */
 const validateEmail = (value) => /^[^.][^@]*@[^.]+(\.[^.\s]+)+$/.test(value);
 exports.validateEmail = validateEmail;
-/**
- *
- * @deprecated use `new SfdcUrl(url).isInternalUrl()`
- * Tests whether a given url is an internal Salesforce domain
- *
- * @param url
- */
-const isInternalUrl = (url) => {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-var-requires
-    const SfdcUrl = require('./sfdcUrl');
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
-    return new SfdcUrl(url).isInternalUrl();
-};
-exports.isInternalUrl = isInternalUrl;
 /**
  * Tests whether a Salesforce ID is in the correct format, a 15- or 18-character length string with only letters and numbers
  *
@@ -63,31 +47,6 @@ const validatePathDoesNotContainInvalidChars = (value) =>
 // eslint-disable-next-line no-useless-escape
 !/[\["\?<>\|\]]+/.test(value);
 exports.validatePathDoesNotContainInvalidChars = validatePathDoesNotContainInvalidChars;
-/**
- * @deprecated
- * // TODO: move this to a module-scope function in sfProject
- * Returns the first key within the object that has an upper case first letter.
- *
- * @param data The object in which to check key casing.
- * @param sectionBlocklist properties in the object to exclude from the search. e.g. a blocklist of `["a"]` and data of `{ "a": { "B" : "b"}}` would ignore `B` because it is in the object value under `a`.
- */
-const findUpperCaseKeys = (data, sectionBlocklist = []) => {
-    let key;
-    (0, kit_1.findKey)(data, (val, k) => {
-        if (/^[A-Z]/.test(k)) {
-            key = k;
-        }
-        else if ((0, ts_types_1.isJsonMap)(val)) {
-            if (sectionBlocklist.includes(k)) {
-                return key;
-            }
-            key = (0, exports.findUpperCaseKeys)((0, ts_types_1.asJsonMap)(val));
-        }
-        return key;
-    });
-    return key;
-};
-exports.findUpperCaseKeys = findUpperCaseKeys;
 exports.accessTokenRegex = /(00D\w{12,15})![.\w]*/;
 exports.sfdxAuthUrlRegex = /force:\/\/([a-zA-Z0-9._-]+):([a-zA-Z0-9._-]*):([a-zA-Z0-9._-]+={0,2})@([a-zA-Z0-9._-]+)/;
 /**

package/lib/util/sfdcUrl.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { URL } from 'url';
+import { URL } from 'node:url';
 export declare function getLoginAudienceCombos(audienceUrl: string, loginUrl: string): Array<[string, string]>;
 export declare class SfdcUrl extends URL {
     /**
@@ -46,7 +46,7 @@ export declare class SfdcUrl extends URL {
      * @returns {Promise<true | never>} The resolved ip address or never
      * @throws {@link SfError} If can't resolve DNS.
      */
-    checkLightningDomain(): Promise<true | never>;
+    checkLightningDomain(): Promise<true>;
     /**
      * Method that performs the dns lookup of the host. If the lookup fails the internal polling (1 second), client will try again until timeout
      * If SFDX_DOMAIN_RETRY environment variable is set (number) it overrides the default timeout duration (240 seconds)

package/lib/util/sfdcUrl.js

@@ -7,7 +7,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SfdcUrl = exports.getLoginAudienceCombos = void 0;
-const url_1 = require("url");
+const node_url_1 = require("node:url");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const myDomainResolver_1 = require("../status/myDomainResolver");
@@ -29,15 +29,15 @@ function getLoginAudienceCombos(audienceUrl, loginUrl) {
     ].filter(([login, audience]) => !((login === SfdcUrl.PRODUCTION && audience === SfdcUrl.SANDBOX) ||
         (login === SfdcUrl.SANDBOX && audience === SfdcUrl.PRODUCTION)));
     const reduced = filtered.reduce((acc, [login, audience]) => {
-        const l = new url_1.URL(login);
-        const a = new url_1.URL(audience);
+        const l = new node_url_1.URL(login);
+        const a = new node_url_1.URL(audience);
         acc.set(`${l.origin}:${a.origin}`, [login, audience]);
         return acc;
     }, new Map());
     return [...reduced.values()];
 }
 exports.getLoginAudienceCombos = getLoginAudienceCombos;
-class SfdcUrl extends url_1.URL {
+class SfdcUrl extends node_url_1.URL {
     constructor(input, base) {
         super(input.toString(), base);
         if (this.protocol !== 'https:' && !SfdcUrl.cache.has(this.origin)) {
@@ -47,7 +47,7 @@ class SfdcUrl extends url_1.URL {
     }
     static isValidUrl(input) {
         try {
-            new url_1.URL(input.toString());
+            new node_url_1.URL(input.toString());
             return true;
         }
         catch {
@@ -69,7 +69,8 @@ class SfdcUrl extends url_1.URL {
             this.logger.debug(`Audience URL overridden by env var SFDX_AUDIENCE_URL=${envVarVal}`);
             return envVarVal;
         }
-        if ((createdOrgInstance && /^gs1/gi.test(createdOrgInstance)) || /(gs1.my.salesforce.com)/gi.test(this.origin)) {
+        if (Boolean(createdOrgInstance && /^gs1/gi.test(createdOrgInstance)) ||
+            /(gs1.my.salesforce.com)/gi.test(this.origin)) {
             return 'https://gs1.salesforce.com';
         }
         return SfdcUrl.PRODUCTION;
@@ -154,7 +155,7 @@ class SfdcUrl extends url_1.URL {
             return true;
         }
         const resolver = await myDomainResolver_1.MyDomainResolver.create({
-            url: new url_1.URL(this.toLightningDomain()),
+            url: new node_url_1.URL(this.toLightningDomain()),
             timeout,
             frequency: new kit_1.Duration(1, kit_1.Duration.Unit.SECONDS),
         });
@@ -172,7 +173,7 @@ class SfdcUrl extends url_1.URL {
         const quantity = (0, ts_types_1.ensureNumber)(new kit_1.Env().getNumber('SFDX_DOMAIN_RETRY', 240));
         const timeout = new kit_1.Duration(quantity, kit_1.Duration.Unit.SECONDS);
         const resolver = await myDomainResolver_1.MyDomainResolver.create({
-            url: new url_1.URL(this.origin),
+            url: new node_url_1.URL(this.origin),
             timeout,
             frequency: new kit_1.Duration(1, kit_1.Duration.Unit.SECONDS),
         });

package/lib/util/structuredWriter.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { Readable } from 'stream';
+import { Readable } from 'node:stream';
 export interface StructuredWriter {
     addToStore(contents: string | Readable | Buffer, path: string): Promise<void>;
     finalize(): Promise<void>;

package/lib/util/time.d.ts

@@ -0,0 +1 @@
+export declare const nowBigInt: () => bigint;

package/lib/util/time.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.nowBigInt = void 0;
+/*
+ * 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
+ */
+const node_perf_hooks_1 = require("node:perf_hooks");
+const nowBigInt = () => BigInt((node_perf_hooks_1.performance.now() + node_perf_hooks_1.performance.timeOrigin) * 1000000);
+exports.nowBigInt = nowBigInt;
+//# sourceMappingURL=time.js.map

package/lib/util/uniqid.js

@@ -7,8 +7,8 @@ exports.uniqid = 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 crypto_1 = require("crypto");
-const util = require("util");
+const node_crypto_1 = require("node:crypto");
+const util = require("node:util");
 /**
  * A function to generate a unique id and return it in the context of a template, if supplied.
  *
@@ -20,7 +20,7 @@ const util = require("util");
  * - length: the length of the unique id as presented in hexadecimal.
  */
 function uniqid(options) {
-    const uniqueString = (0, crypto_1.randomBytes)(Math.ceil((options?.length ?? 32) / 2))
+    const uniqueString = (0, node_crypto_1.randomBytes)(Math.ceil((options?.length ?? 32) / 2))
         .toString('hex')
         .slice(0, options?.length ?? 32);
     if (!options?.template) {

package/lib/util/zipWriter.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { Readable, Writable } from 'stream';
+import { Readable, Writable } from 'node:stream';
 import { StructuredWriter } from './structuredWriter';
 export declare class ZipWriter extends Writable implements StructuredWriter {
     private readonly rootDestination?;

package/lib/util/zipWriter.js

@@ -7,11 +7,11 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZipWriter = void 0;
-const stream_1 = require("stream");
+const node_stream_1 = require("node:stream");
 const JSZip = require("jszip");
 const logger_1 = require("../logger/logger");
 const sfError_1 = require("../sfError");
-class ZipWriter extends stream_1.Writable {
+class ZipWriter extends node_stream_1.Writable {
     constructor(rootDestination) {
         super({ objectMode: true });
         this.rootDestination = rootDestination;

package/lib/webOAuthServer.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
-import * as http from 'http';
+import * as http from 'node:http';
 import { AsyncCreatable } from '@salesforce/kit';
-import { AuthInfo } from './org';
+import { AuthInfo } from './org/authInfo';
 import { JwtOAuth2Config } from './org/authInfo';
 /**
  * Handles the creation of a web server for web based login flows.