@salesforce/core 5.3.8 → 5.4.0-crdt.1

package/lib/config/lwwRegister.js

@@ -0,0 +1,39 @@
+"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.LWWRegister = void 0;
+/** 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;
+        this.state = state;
+    }
+    get value() {
+        return this.state.value;
+    }
+    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 };
+    }
+    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;
+    }
+}
+exports.LWWRegister = LWWRegister;
+//# sourceMappingURL=lwwRegister.js.map

package/lib/config/orgUsersConfig.d.ts

@@ -1,8 +1,11 @@
 import { ConfigFile } from './configFile';
+type UserConfig = {
+    usernames: string[];
+};
 /**
  * A config file that stores usernames for an org.
  */
-export declare class OrgUsersConfig extends ConfigFile<OrgUsersConfig.Options> {
+export declare class OrgUsersConfig extends ConfigFile<OrgUsersConfig.Options, UserConfig> {
     /**
      * Constructor.
      * **Do not directly construct instances of this class -- use {@link OrgUsersConfig.create} instead.**
@@ -29,3 +32,4 @@ export declare namespace OrgUsersConfig {
         orgId: string;
     }
 }
+export {};

package/lib/config/tokensConfig.d.ts

@@ -1,7 +1,7 @@
 import { Optional } from '@salesforce/ts-types';
 import { SfTokens } from '../stateAggregator';
 import { ConfigFile } from './configFile';
-import { ConfigContents, ConfigValue } from './configStore';
+import { ConfigContents, ConfigValue } from './configStackTypes';
 export declare class TokensConfig extends ConfigFile<ConfigFile.Options, SfTokens> {
     protected static encryptedKeys: RegExp[];
     static getDefaultOptions(): ConfigFile.Options;

package/lib/config/ttlConfig.js

@@ -39,7 +39,10 @@ class TTLConfig extends configFile_1.ConfigFile {
     async init() {
         const contents = await this.read(this.options.throwOnNotFound);
         const date = new Date().getTime();
-        this.setContents(Object.fromEntries(Object.entries(contents).filter(([, value]) => !this.isExpired(date, value))));
+        // delete all the expired entries
+        Object.entries(contents)
+            .filter(([, value]) => this.isExpired(date, value))
+            .map(([key]) => this.unset(key));
     }
     // eslint-disable-next-line class-methods-use-this
     timestamp(value) {

package/lib/exported.d.ts

@@ -2,7 +2,8 @@ export { OAuth2Config } from 'jsforce';
 export { ConfigFile } from './config/configFile';
 export { TTLConfig } from './config/ttlConfig';
 export { envVars, EnvironmentVariable, SUPPORTED_ENV_VARS, EnvVars } from './config/envVars';
-export { ConfigContents, ConfigEntry, ConfigStore, ConfigValue } from './config/configStore';
+export { ConfigStore } from './config/configStore';
+export { ConfigEntry, ConfigContents, ConfigValue } from './config/configStackTypes';
 export { SfTokens, StateAggregator } from './stateAggregator';
 export { DeviceOauthService, DeviceCodeResponse, DeviceCodePollingResponse } from './deviceOauthService';
 export { OrgUsersConfig } from './config/orgUsersConfig';

package/lib/org/authInfo.d.ts

@@ -242,8 +242,10 @@ export declare class AuthInfo extends AsyncOptionalCreatable<AuthInfo.Options> {
      * Get the authorization fields.
      *
      * @param decrypt Decrypt the fields.
+     *
+     * Returns a ReadOnly object of the fields.  If you need to modify the fields, use AuthInfo.update()
      */
-    getFields(decrypt?: boolean): AuthFields;
+    getFields(decrypt?: boolean): Readonly<AuthFields>;
     /**
      * Get the org front door (used for web based oauth flows)
      */

package/lib/org/authInfo.js

@@ -461,6 +461,8 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
      * Get the authorization fields.
      *
      * @param decrypt Decrypt the fields.
+     *
+     * Returns a ReadOnly object of the fields.  If you need to modify the fields, use AuthInfo.update()
      */
     getFields(decrypt) {
         return this.stateAggregator.orgs.get(this.username, decrypt) ?? {};

package/lib/org/org.js

@@ -631,8 +631,8 @@ class Org extends kit_1.AsyncOptionalCreatable {
         const orgConfig = await this.retrieveOrgUsersConfig();
         const contents = await orgConfig.read();
         const targetUser = authInfo.getFields().username;
-        const usernames = (contents.usernames ?? []);
-        contents.usernames = usernames.filter((username) => username !== targetUser);
+        const usernames = (contents.usernames ?? []).filter((username) => username !== targetUser);
+        orgConfig.set('usernames', usernames);
         await orgConfig.write();
         return this;
     }

package/lib/org/orgConfigProperties.d.ts

@@ -1,4 +1,4 @@
-import { ConfigValue } from '../config/configStore';
+import { ConfigValue } from '../config/configStackTypes';
 export declare enum OrgConfigProperties {
     /**
      * Username associate with the default org.

package/lib/org/user.js

@@ -303,8 +303,7 @@ class User extends kit_1.AsyncCreatable {
             oauth2Options: oauthOptions,
         });
         // Update the auth info object with created user id.
-        const newUserAuthFields = newUserAuthInfo.getFields();
-        newUserAuthFields.userId = refreshTokenSecret.userId;
+        newUserAuthInfo.update({ userId: refreshTokenSecret.userId });
         // Make sure we can connect and if so save the auth info.
         await this.describeUserAndSave(newUserAuthInfo);
         // Let the org know there is a new user. See $HOME/.sfdx/[orgid].json for the mapping.

package/lib/sfProject.d.ts

@@ -1,6 +1,6 @@
 import { Dictionary, JsonMap, Nullable, Optional } from '@salesforce/ts-types';
 import { ConfigFile } from './config/configFile';
-import { ConfigContents } from './config/configStore';
+import { ConfigContents } from './config/configStackTypes';
 export type PackageDirDependency = {
     [k: string]: unknown;
     package: string;
@@ -70,8 +70,8 @@ export declare class SfProjectJson extends ConfigFile {
     static getDefaultOptions(isGlobal?: boolean): ConfigFile.Options;
     read(): Promise<ConfigContents>;
     readSync(): ConfigContents;
-    write(newContents?: ConfigContents): Promise<ConfigContents>;
-    writeSync(newContents?: ConfigContents): ConfigContents;
+    write(): Promise<ConfigContents>;
+    writeSync(): ConfigContents;
     getContents(): ProjectJson;
     getDefaultOptions(options?: ConfigFile.Options): ConfigFile.Options;
     /**

package/lib/sfProject.js

@@ -57,17 +57,11 @@ class SfProjectJson extends configFile_1.ConfigFile {
         this.validateKeys();
         return contents;
     }
-    async write(newContents) {
-        if (newContents) {
-            this.setContents(newContents);
-        }
+    async write() {
         this.validateKeys();
         return super.write();
     }
-    writeSync(newContents) {
-        if (newContents) {
-            this.setContents(newContents);
-        }
+    writeSync() {
         this.validateKeys();
         return super.writeSync();
     }
@@ -76,11 +70,7 @@ class SfProjectJson extends configFile_1.ConfigFile {
     }
     // eslint-disable-next-line class-methods-use-this
     getDefaultOptions(options) {
-        const defaultOptions = {
-            isState: false,
-        };
-        Object.assign(defaultOptions, options ?? {});
-        return defaultOptions;
+        return { ...{ isState: false }, ...(options ?? {}) };
     }
     /**
      * Validates sfdx-project.json against the schema.
@@ -259,12 +249,8 @@ class SfProjectJson extends configFile_1.ConfigFile {
         if (!/^.{15,18}$/.test(id)) {
             throw messages.createError('invalidId', [id]);
         }
-        const contents = this.getContents();
-        if (!contents.packageAliases) {
-            contents.packageAliases = {};
-        }
-        contents.packageAliases[alias] = id;
-        this.setContents(contents);
+        const newAliases = { ...(this.getContents().packageAliases ?? {}), [alias]: id };
+        this.contents.set('packageAliases', newAliases);
     }
     /**
      * Add a package directory to the project.

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

@@ -1,7 +1,7 @@
 import { AsyncOptionalCreatable } from '@salesforce/kit';
 import { Nullable } from '@salesforce/ts-types';
 import { AuthFields } from '../../org/authInfo';
-import { ConfigContents } from '../../config/configStore';
+import { ConfigContents } from '../../config/configStackTypes';
 import { SfToken } from './tokenAccessor';
 export type Aliasable = string | (Partial<AuthFields> & Partial<SfToken>);
 export declare const DEFAULT_GROUP = "orgs";
@@ -103,7 +103,7 @@ export declare class AliasAccessor extends AsyncOptionalCreatable {
     /**
      * @deprecated the set/unset methods now write to the file when called.  Use (un)setAndSave instead of calling (un)set and then calling write()
      */
-    write(): Promise<ConfigContents>;
+    write(): Promise<ConfigContents<string>>;
     /**
      * Returns true if the provided alias exists
      *

package/lib/stateAggregator/accessors/aliasAccessor.js

@@ -15,13 +15,9 @@ const proper_lockfile_1 = require("proper-lockfile");
 const kit_1 = require("@salesforce/kit");
 const global_1 = require("../../global");
 const sfError_1 = require("../../sfError");
+const lockRetryOptions_1 = require("../../util/lockRetryOptions");
 exports.DEFAULT_GROUP = 'orgs';
 exports.FILENAME = 'alias.json';
-const lockOptions = { stale: 10000 };
-const lockRetryOptions = {
-    ...lockOptions,
-    retries: { retries: 10, maxTimeout: 1000, factor: 2 },
-};
 class AliasAccessor extends kit_1.AsyncOptionalCreatable {
     getAll(entity) {
         // This will only return aliases under "orgs". This will need to be modified
@@ -181,7 +177,7 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
      */
     async readFileToAliasStore(useLock = false) {
         if (useLock) {
-            await (0, proper_lockfile_1.lock)(this.fileLocation, lockRetryOptions);
+            await (0, proper_lockfile_1.lock)(this.fileLocation, lockRetryOptions_1.lockRetryOptions);
         }
         try {
             this.aliasStore = fileContentsRawToAliasStore(await (0, promises_1.readFile)(this.fileLocation, 'utf-8'));
@@ -208,7 +204,7 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
     readFileToAliasStoreSync() {
         // the file is guaranteed to exist because this init method ensures it
         // put a lock in place.  This method is only used by legacy set/unset methods.
-        (0, proper_lockfile_1.lockSync)(this.fileLocation, lockOptions);
+        (0, proper_lockfile_1.lockSync)(this.fileLocation, lockRetryOptions_1.lockOptions);
         this.aliasStore = fileContentsRawToAliasStore((0, node_fs_1.readFileSync)(this.fileLocation, 'utf-8'));
     }
     /**

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

@@ -5,9 +5,10 @@ import { AsyncOptionalCreatable } from '@salesforce/kit';
 import { AuthInfoConfig } from '../../config/authInfoConfig';
 import { AuthFields } from '../../org';
 import { ConfigFile } from '../../config/configFile';
-import { ConfigContents } from '../../config/configStore';
+import { ConfigContents } from '../../config/configStackTypes';
 export declare abstract class BaseOrgAccessor<T extends ConfigFile, P extends ConfigContents> extends AsyncOptionalCreatable {
     private configs;
+    /** map of Org files by username  */
     private contents;
     private logger;
     /**

package/lib/stateAggregator/accessors/orgAccessor.js

@@ -25,6 +25,7 @@ class BaseOrgAccessor extends kit_1.AsyncOptionalCreatable {
     constructor() {
         super(...arguments);
         this.configs = new Map();
+        /** map of Org files by username  */
         this.contents = new Map();
     }
     /**

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

@@ -48,7 +48,7 @@ export declare class TokenAccessor extends AsyncOptionalCreatable {
      */
     update(name: string, token: Partial<SfToken>): void;
     /**
-     * Unet the token for the provided name.
+     * Unset the token for the provided name.
      *
      * @param name
      */

package/lib/stateAggregator/accessors/tokenAccessor.js

@@ -57,7 +57,7 @@ class TokenAccessor extends kit_1.AsyncOptionalCreatable {
         this.config.update(name, token);
     }
     /**
-     * Unet the token for the provided name.
+     * Unset the token for the provided name.
      *
      * @param name
      */

package/lib/testSetup.d.ts

@@ -2,12 +2,14 @@
 import { EventEmitter } from 'events';
 import { SinonSandbox, SinonStatic, SinonStub } from 'sinon';
 import { AnyJson, JsonMap, Optional } from '@salesforce/ts-types';
-import { ConfigContents } from './config/configStore';
+import { ConfigContents } from './config/configStackTypes';
 import { Connection } from './org/connection';
 import { Logger } from './logger/logger';
 import { SfError } from './sfError';
 import { CometClient, CometSubscription, Message, StreamingExtension } from './status/streamingClient';
 import { AuthFields, SandboxFields } from './org';
+import { uniqid } from './util/uniqid';
+export { uniqid };
 /**
  * Different parts of the system that are mocked out. They can be restored for
  * individual tests. Test's stubs should always go on the DEFAULT which is exposed
@@ -48,10 +50,6 @@ export interface ConfigStub {
      * A function to conditionally read based on the config instance. The `this` value will be the config instance.
      */
     retrieveContents?: () => Promise<JsonMap>;
-    /**
-     * A function to conditionally set based on the config instance. The `this` value will be the config instance.
-     */
-    updateContents?: () => Promise<JsonMap>;
 }
 /**
  * Instantiate a @salesforce/core test context.
@@ -203,20 +201,6 @@ export declare class TestContext {
     setup(): void;
     private requireSinon;
 }
-/**
- * A function to generate a unique id and return it in the context of a template, if supplied.
- *
- * A template is a string that can contain `${%s}` to be replaced with a unique id.
- * If the template contains the "%s" placeholder, it will be replaced with the unique id otherwise the id will be appended to the template.
- *
- * @param options an object with the following properties:
- * - template: a template string.
- * - length: the length of the unique id as presented in hexadecimal.
- */
-export declare function uniqid(options?: {
-    template?: string;
-    length?: number;
-}): string;
 /**
  * Instantiate a @salesforce/core test context. This is automatically created by `const $$ = testSetup()`
  * but is useful if you don't want to have a global stub of @salesforce/core and you want to isolate it to
@@ -528,4 +512,3 @@ export declare class MockTestSandboxData {
      */
     getConfig(): Promise<SandboxFields>;
 }
-export {};

package/lib/testSetup.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MockTestSandboxData = exports.MockTestOrgData = exports.StreamingMockCometClient = exports.StreamingMockCometSubscription = exports.StreamingMockSubscriptionCall = exports.shouldThrowSync = exports.shouldThrow = exports.unexpectedResult = exports.restoreContext = exports.stubContext = exports.instantiateContext = exports.uniqid = exports.TestContext = void 0;
+exports.MockTestSandboxData = exports.MockTestOrgData = exports.StreamingMockCometClient = exports.StreamingMockCometSubscription = exports.StreamingMockSubscriptionCall = exports.shouldThrowSync = exports.shouldThrow = exports.unexpectedResult = exports.restoreContext = exports.stubContext = exports.instantiateContext = exports.TestContext = exports.uniqid = void 0;
 /*
  * Copyright (c) 2020, salesforce.com, inc.
  * All rights reserved.
@@ -13,17 +13,15 @@ exports.MockTestSandboxData = exports.MockTestOrgData = exports.StreamingMockCom
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 const fs = require("node:fs");
-const crypto_1 = require("crypto");
 const events_1 = require("events");
 const os_1 = require("os");
 const path_1 = require("path");
-const util = require("util");
 const ts_sinon_1 = require("@salesforce/ts-sinon");
 const ts_types_1 = require("@salesforce/ts-types");
 const configAggregator_1 = require("./config/configAggregator");
 const configFile_1 = require("./config/configFile");
 const connection_1 = require("./org/connection");
-const crypto_2 = require("./crypto/crypto");
+const crypto_1 = require("./crypto/crypto");
 const logger_1 = require("./logger/logger");
 const messages_1 = require("./messages");
 const sfError_1 = require("./sfError");
@@ -34,6 +32,8 @@ const stateAggregator_1 = require("./stateAggregator");
 const org_1 = require("./org");
 const sandboxAccessor_1 = require("./stateAggregator/accessors/sandboxAccessor");
 const global_1 = require("./global");
+const uniqid_1 = require("./util/uniqid");
+Object.defineProperty(exports, "uniqid", { enumerable: true, get: function () { return uniqid_1.uniqid; } });
 /**
  * Instantiate a @salesforce/core test context.
  */
@@ -42,7 +42,7 @@ class TestContext {
         /**
          * id A unique id for the test run.
          */
-        this.id = uniqid();
+        this.id = (0, uniqid_1.uniqid)();
         /**
          * An object used in tests that interact with config files.
          */
@@ -73,7 +73,7 @@ class TestContext {
      * Generate unique string.
      */
     uniqid() {
-        return uniqid();
+        return (0, uniqid_1.uniqid)();
     }
     /**
      * A function used when resolving the local path. Calls localPathResolverSync by default.
@@ -300,39 +300,17 @@ class TestContext {
     }
 }
 exports.TestContext = TestContext;
-/**
- * A function to generate a unique id and return it in the context of a template, if supplied.
- *
- * A template is a string that can contain `${%s}` to be replaced with a unique id.
- * If the template contains the "%s" placeholder, it will be replaced with the unique id otherwise the id will be appended to the template.
- *
- * @param options an object with the following properties:
- * - template: a template string.
- * - 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.0))
-        .toString('hex')
-        .slice(0, options?.length ?? 32);
-    if (!options?.template) {
-        return uniqueString;
-    }
-    return options.template.includes('%s')
-        ? util.format(options.template, uniqueString)
-        : `${options.template}${uniqueString}`;
-}
-exports.uniqid = uniqid;
 function getTestLocalPath(uid) {
     return (0, path_1.join)((0, os_1.tmpdir)(), uid, 'sfdx_core', 'local');
 }
 function getTestGlobalPath(uid) {
     return (0, path_1.join)((0, os_1.tmpdir)(), uid, 'sfdx_core', 'global');
 }
-function retrieveRootPathSync(isGlobal, uid = uniqid()) {
+function retrieveRootPathSync(isGlobal, uid = (0, uniqid_1.uniqid)()) {
     return isGlobal ? getTestGlobalPath(uid) : getTestLocalPath(uid);
 }
 // eslint-disable-next-line @typescript-eslint/require-await
-async function retrieveRootPath(isGlobal, uid = uniqid()) {
+async function retrieveRootPath(isGlobal, uid = (0, uniqid_1.uniqid)()) {
     return retrieveRootPathSync(isGlobal, uid);
 }
 function defaultFakeConnectionRequest() {
@@ -398,6 +376,7 @@ const stubContext = (testContext) => {
     testContext.SANDBOXES.CONFIG.stub(configFile_1.ConfigFile, 'resolveRootFolderSync').callsFake((isGlobal) => testContext.rootPathRetrieverSync(isGlobal, testContext.id));
     (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.PROJECT, sfProject_1.SfProjectJson.prototype, 'doesPackageExist').callsFake(() => true);
     const initStubForRead = (configFile) => {
+        testContext.configStubs[configFile.constructor.name] ??= {};
         const stub = testContext.configStubs[configFile.constructor.name] ?? {};
         // init calls read calls getPath which sets the path on the config file the first time.
         // Since read is now stubbed, make sure to call getPath to initialize it.
@@ -408,7 +387,7 @@ const stubContext = (testContext) => {
     };
     const readSync = function (newContents) {
         const stub = initStubForRead(this);
-        this.setContentsFromObject(newContents ?? stub.contents ?? {});
+        this.setContentsFromFileContents(newContents ?? stub.contents ?? {}, BigInt(Date.now()));
         return this.getContents();
     };
     const read = async function () {
@@ -427,36 +406,22 @@ const stubContext = (testContext) => {
     stubs.configRead = testContext.SANDBOXES.CONFIG.stub(configFile_1.ConfigFile.prototype, 'read').callsFake(read);
     // @ts-expect-error: muting exact type match for stub readSync
     stubs.configReadSync = testContext.SANDBOXES.CONFIG.stub(configFile_1.ConfigFile.prototype, 'readSync').callsFake(readSync);
-    const writeSync = function (newContents) {
-        if (!testContext.configStubs[this.constructor.name]) {
-            testContext.configStubs[this.constructor.name] = {};
-        }
-        const stub = testContext.configStubs[this.constructor.name];
-        if (!stub)
-            return;
-        this.setContents(newContents ?? this.getContents());
+    const writeSync = function () {
+        testContext.configStubs[this.constructor.name] ??= {};
+        const stub = testContext.configStubs[this.constructor.name] ?? {};
         stub.contents = this.toObject();
     };
-    const write = async function (newContents) {
-        if (!testContext.configStubs[this.constructor.name]) {
-            testContext.configStubs[this.constructor.name] = {};
-        }
-        const stub = testContext.configStubs[this.constructor.name];
-        if (!stub)
-            return;
+    const write = async function () {
+        testContext.configStubs[this.constructor.name] ??= {};
+        const stub = testContext.configStubs[this.constructor.name] ?? {};
         if (stub.writeFn) {
-            return stub.writeFn.call(this, newContents);
-        }
-        if (stub.updateContents) {
-            writeSync.call(this, await stub.updateContents.call(this));
-        }
-        else {
-            writeSync.call(this);
+            return stub.writeFn.call(this);
         }
+        writeSync.call(this);
     };
     stubs.configWriteSync = (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.CONFIG, configFile_1.ConfigFile.prototype, 'writeSync').callsFake(writeSync);
     stubs.configWrite = (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.CONFIG, configFile_1.ConfigFile.prototype, 'write').callsFake(write);
-    (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.CRYPTO, crypto_2.Crypto.prototype, 'getKeyChain').callsFake(() => Promise.resolve({
+    (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.CRYPTO, crypto_1.Crypto.prototype, 'getKeyChain').callsFake(() => Promise.resolve({
         setPassword: () => Promise.resolve(),
         getPassword: (data, cb) => cb(undefined, '12345678901234567890123456789012'),
     }));
@@ -720,7 +685,7 @@ exports.StreamingMockCometClient = StreamingMockCometClient;
  * ```
  */
 class MockTestOrgData {
-    constructor(id = uniqid(), options) {
+    constructor(id = (0, uniqid_1.uniqid)(), options) {
         this.testId = id;
         this.userId = `user_id_${this.testId}`;
         this.orgId = `${this.testId}`;
@@ -791,7 +756,7 @@ class MockTestOrgData {
      * Return the auth config file contents.
      */
     async getConfig() {
-        const crypto = await crypto_2.Crypto.create();
+        const crypto = await crypto_1.Crypto.create();
         const config = {};
         config.orgId = this.orgId;
         config.clientId = this.clientId;
@@ -816,7 +781,8 @@ class MockTestOrgData {
         if (this.password) {
             config.password = crypto.encrypt(this.password);
         }
-        return config;
+        // remove "undefined" properties that don't exist in actual files
+        return Object.fromEntries(Object.entries(config).filter(([, v]) => v !== undefined));
     }
     /**
      * Return the Connection for the org.
@@ -836,7 +802,7 @@ exports.MockTestOrgData = MockTestOrgData;
  * ```
  */
 class MockTestSandboxData {
-    constructor(id = uniqid(), options) {
+    constructor(id = (0, uniqid_1.uniqid)(), options) {
         this.id = id;
         this.sandboxOrgId = id;
         this.prodOrgUsername = options?.prodOrgUsername ?? `admin_${id}@gb.org`;

package/lib/util/lockRetryOptions.d.ts

@@ -0,0 +1,11 @@
+export declare const lockOptions: {
+    stale: number;
+};
+export declare const lockRetryOptions: {
+    retries: {
+        retries: number;
+        maxTimeout: number;
+        factor: number;
+    };
+    stale: number;
+};

package/lib/util/lockRetryOptions.js

@@ -0,0 +1,16 @@
+"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.lockRetryOptions = exports.lockOptions = void 0;
+// docs: https://github.com/moxystudio/node-proper-lockfile
+exports.lockOptions = { stale: 10000 };
+exports.lockRetryOptions = {
+    ...exports.lockOptions,
+    retries: { retries: 10, maxTimeout: 1000, factor: 2 },
+};
+//# sourceMappingURL=lockRetryOptions.js.map

package/lib/util/uniqid.d.ts

@@ -0,0 +1,14 @@
+/**
+ * A function to generate a unique id and return it in the context of a template, if supplied.
+ *
+ * A template is a string that can contain `${%s}` to be replaced with a unique id.
+ * If the template contains the "%s" placeholder, it will be replaced with the unique id otherwise the id will be appended to the template.
+ *
+ * @param options an object with the following properties:
+ * - template: a template string.
+ * - length: the length of the unique id as presented in hexadecimal.
+ */
+export declare function uniqid(options?: {
+    template?: string;
+    length?: number;
+}): string;

package/lib/util/uniqid.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uniqid = 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 crypto_1 = require("crypto");
+const util = require("util");
+/**
+ * A function to generate a unique id and return it in the context of a template, if supplied.
+ *
+ * A template is a string that can contain `${%s}` to be replaced with a unique id.
+ * If the template contains the "%s" placeholder, it will be replaced with the unique id otherwise the id will be appended to the template.
+ *
+ * @param options an object with the following properties:
+ * - template: a template string.
+ * - 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))
+        .toString('hex')
+        .slice(0, options?.length ?? 32);
+    if (!options?.template) {
+        return uniqueString;
+    }
+    return options.template.includes('%s')
+        ? util.format(options.template, uniqueString)
+        : `${options.template}${uniqueString}`;
+}
+exports.uniqid = uniqid;
+//# sourceMappingURL=uniqid.js.map