@salesforce/core 3.30.9 → 3.30.11

package/lib/stateAggregator/accessors/sandboxAccessor.js

@@ -5,6 +5,7 @@
  * 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
  */
+/* eslint-disable class-methods-use-this */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SandboxAccessor = void 0;
 const sandboxOrgConfig_1 = require("../../config/sandboxOrgConfig");

package/lib/stateAggregator/index.js

@@ -7,7 +7,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/status/myDomainResolver.d.ts

@@ -2,7 +2,7 @@
 import { URL } from 'url';
 import { AsyncOptionalCreatable, Duration } from '@salesforce/kit';
 /**
- * A class used to resolve MyDomains. After a ScratchOrg is created it's host name my not be propagated to the
+ * A class used to resolve MyDomains. After a ScratchOrg is created its host name my not be propagated to the
  * Salesforce DNS service. This service is not exclusive to Salesforce My Domain URL and could be used for any hostname.
  *
  * ```

package/lib/status/myDomainResolver.js

@@ -20,7 +20,7 @@ const DNS_TIMEOUT = Math.max(3, new kit_1.Env().getNumber('SFDX_DNS_TIMEOUT', 3)
 // Retry frequency for DNS lookup polling defaults to 1 second and should be at least 1 second
 const DNS_RETRY_FREQ = Math.max(1, new kit_1.Env().getNumber('SFDX_DNS_RETRY_FREQUENCY', 1));
 /**
- * A class used to resolve MyDomains. After a ScratchOrg is created it's host name my not be propagated to the
+ * A class used to resolve MyDomains. After a ScratchOrg is created its host name my not be propagated to the
  * Salesforce DNS service. This service is not exclusive to Salesforce My Domain URL and could be used for any hostname.
  *
  * ```
@@ -45,13 +45,13 @@ class MyDomainResolver extends kit_1.AsyncOptionalCreatable {
      */
     constructor(options) {
         super(options);
-        this.options = options || { url: MyDomainResolver.DEFAULT_DOMAIN };
+        this.options = options ?? { url: MyDomainResolver.DEFAULT_DOMAIN };
     }
     getTimeout() {
-        return this.options.timeout || kit_1.Duration.seconds(DNS_TIMEOUT);
+        return this.options.timeout ?? kit_1.Duration.seconds(DNS_TIMEOUT);
     }
     getFrequency() {
-        return this.options.frequency || kit_1.Duration.seconds(DNS_RETRY_FREQ);
+        return this.options.frequency ?? kit_1.Duration.seconds(DNS_RETRY_FREQ);
     }
     /**
      * Method that performs the dns lookup of the host. If the lookup fails the internal polling client will try again

package/lib/status/streamingClient.js

@@ -211,54 +211,52 @@ class StreamingClient extends lib_1.AsyncOptionalCreatable {
         // This outer promise is to hold the streaming promise chain open until the streaming processor
         // says it's complete.
         // eslint-disable-next-line @typescript-eslint/no-misused-promises
-        return new Promise((subscribeResolve, subscribeReject) => {
-            // This is the inner promise chain that's satisfied when the client impl (Faye/Mock) says it's subscribed.
-            return new Promise((subscriptionResolve, subscriptionReject) => {
-                timeout = setTimeout(() => {
-                    const timeoutError = messages.createError('genericTimeout');
-                    this.doTimeout(timeout, timeoutError);
-                    subscribeReject(timeoutError);
-                }, this.options.subscribeTimeout.milliseconds);
-                // Initialize the subscription.
-                const subscription = this.cometClient.subscribe(this.options.channel, (message) => {
-                    try {
-                        // The result of the stream processor determines the state of the outer promise.
-                        const result = this.options.streamProcessor(message);
-                        // The stream processor says it's complete. Clean up and resolve the outer promise.
-                        if (result && result.completed) {
-                            clearTimeout(timeout);
-                            this.disconnectClient();
-                            subscribeResolve(result.payload);
-                        } // This 'if' is intended to be evaluated until it's completed or until the timeout fires.
-                    }
-                    catch (e) {
-                        // it's completely valid for the stream processor to throw an error. If it does we will
-                        // reject the outer promise. Keep in mind if we are here the subscription was resolved.
+        return new Promise((subscribeResolve, subscribeReject) => 
+        // This is the inner promise chain that's satisfied when the client impl (Faye/Mock) says it's subscribed.
+        new Promise((subscriptionResolve, subscriptionReject) => {
+            timeout = setTimeout(() => {
+                const timeoutError = messages.createError('genericTimeout');
+                this.doTimeout(timeout, timeoutError);
+                subscribeReject(timeoutError);
+            }, this.options.subscribeTimeout.milliseconds);
+            // Initialize the subscription.
+            const subscription = this.cometClient.subscribe(this.options.channel, (message) => {
+                try {
+                    // The result of the stream processor determines the state of the outer promise.
+                    const result = this.options.streamProcessor(message);
+                    // The stream processor says it's complete. Clean up and resolve the outer promise.
+                    if (result?.completed) {
                         clearTimeout(timeout);
                         this.disconnectClient();
-                        subscribeReject(e);
-                    }
-                });
-                subscription.callback(() => {
-                    subscriptionResolve();
-                });
-                subscription.errback((error) => {
-                    subscriptionReject(error);
-                });
-            })
-                .then(() => {
-                // Now that we successfully have a subscription started up we are safe to initialize the function that
-                // will affect the streaming events. I.E. create an org or run apex tests.
-                return streamInit && streamInit();
-            })
-                .catch((error) => {
-                this.disconnect();
-                // Need to catch the subscription rejection or it will result in an unhandled rejection error.
-                clearTimeout(timeout);
-                // No subscription so we can reject the out promise as well.
-                subscribeReject(error);
+                        subscribeResolve(result.payload);
+                    } // This 'if' is intended to be evaluated until it's completed or until the timeout fires.
+                }
+                catch (e) {
+                    // it's completely valid for the stream processor to throw an error. If it does we will
+                    // reject the outer promise. Keep in mind if we are here the subscription was resolved.
+                    clearTimeout(timeout);
+                    this.disconnectClient();
+                    subscribeReject(e);
+                }
             });
-        });
+            subscription.callback(() => {
+                subscriptionResolve();
+            });
+            subscription.errback((error) => {
+                subscriptionReject(error);
+            });
+        })
+            .then(() => 
+        // Now that we successfully have a subscription started up we are safe to initialize the function that
+        // will affect the streaming events. I.E. create an org or run apex tests.
+        streamInit?.())
+            .catch((error) => {
+            this.disconnect();
+            // Need to catch the subscription rejection or it will result in an unhandled rejection error.
+            clearTimeout(timeout);
+            // No subscription so we can reject the out promise as well.
+            subscribeReject(error);
+        }));
     }
     /**
      * Handler for incoming streaming messages.
@@ -296,12 +294,17 @@ class StreamingClient extends lib_1.AsyncOptionalCreatable {
         // unauthenticated connections are being made to salesforce. Let's close the dispatcher if it exists and
         // has no clientId.
         // @ts-ignore
+        // eslint-disable-next-line no-underscore-dangle
         if (this.cometClient._dispatcher) {
             this.log('Closing the faye dispatcher');
             // @ts-ignore
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, no-underscore-dangle
             const dispatcher = this.cometClient._dispatcher;
+            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access
             this.log(`dispatcher.clientId: ${dispatcher.clientId}`);
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
             if (!dispatcher.clientId) {
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
                 dispatcher.close();
             }
             else {
@@ -363,10 +366,9 @@ exports.StreamingClient = StreamingClient;
             this.subscribeTimeout = StreamingClient.DefaultOptions.DEFAULT_SUBSCRIBE_TIMEOUT;
             this.handshakeTimeout = StreamingClient.DefaultOptions.DEFAULT_HANDSHAKE_TIMEOUT;
             this.streamingImpl = {
-                getCometClient: (url) => {
-                    // @ts-ignore
-                    return new Faye.Client(url);
-                },
+                getCometClient: (url) => 
+                // @ts-ignore
+                new Faye.Client(url),
                 setLogger: (logLine) => {
                     // @ts-ignore
                     Faye.logger = {};

package/lib/testSetup.d.ts

@@ -183,7 +183,7 @@ export interface TestContext {
     /**
      * Stub contents in the config file.
      */
-    stubConfig(config: Record<string, string>): void;
+    stubConfig(config: Record<string, string>): Promise<void>;
     /**
      * Stub the tokens in the global token config file.
      */
@@ -450,8 +450,10 @@ export declare class StreamingMockCometClient extends CometClient {
  * Mock class for Salesforce Orgs.
  *
  * @example
+ * ```
  * const testOrg = new MockTestOrgData();
  * await $$.stubAuths(testOrg)
+ * ```
  */
 export declare class MockTestOrgData {
     testId: string;
@@ -505,8 +507,10 @@ export declare class MockTestOrgData {
  * Mock class for Salesforce Sandboxes.
  *
  * @example
+ * ```
  * const testOrg = new MockTestSandboxData();
  * await $$.stubSandboxes(testOrg)
+ * ```
  */
 export declare class MockTestSandboxData {
     id: string;

package/lib/testSetup.js

@@ -1,6 +1,4 @@
 "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.testSetup = exports.restoreContext = exports.stubContext = exports.instantiateContext = exports.uniqid = void 0;
 /*
  * Copyright (c) 2020, salesforce.com, inc.
  * All rights reserved.
@@ -8,6 +6,12 @@ exports.MockTestSandboxData = exports.MockTestOrgData = exports.StreamingMockCom
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 /* eslint-disable @typescript-eslint/ban-ts-comment */
+/* eslint-disable class-methods-use-this */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MockTestSandboxData = exports.MockTestOrgData = exports.StreamingMockCometClient = exports.StreamingMockCometSubscription = exports.StreamingMockSubscriptionCall = exports.shouldThrowSync = exports.shouldThrow = exports.unexpectedResult = exports.testSetup = exports.restoreContext = exports.stubContext = exports.instantiateContext = exports.uniqid = void 0;
 const crypto_1 = require("crypto");
 const events_1 = require("events");
 const os_1 = require("os");
@@ -133,7 +137,7 @@ const instantiateContext = (sinon) => {
         fakeConnectionRequest: defaultFakeConnectionRequest,
         getConfigStubContents(name, group) {
             const stub = this.configStubs[name];
-            if (stub && stub.contents) {
+            if (stub?.contents) {
                 if (group && stub.contents[group]) {
                     return (0, ts_types_1.ensureJsonMap)(stub.contents[group]);
                 }
@@ -160,12 +164,10 @@ const instantiateContext = (sinon) => {
             }
         },
         async stubAuths(...orgs) {
-            const entries = (await Promise.all(orgs.map(async (org) => [org.username, await org.getConfig()])));
+            const entries = await Promise.all(orgs.map(async (org) => [org.username, await org.getConfig()]));
             const orgMap = new Map(entries);
-            (0, ts_sinon_1.stubMethod)(testContext.SANDBOX, stateAggregator_1.OrgAccessor.prototype, 'getAllFiles').returns([...orgMap.keys()].map((o) => `${o}.json`));
-            (0, ts_sinon_1.stubMethod)(testContext.SANDBOX, stateAggregator_1.OrgAccessor.prototype, 'hasFile').callsFake((username) => {
-                return orgMap.has(username);
-            });
+            (0, ts_sinon_1.stubMethod)(testContext.SANDBOX, stateAggregator_1.OrgAccessor.prototype, 'getAllFiles').resolves([...orgMap.keys()].map((o) => `${o}.json`));
+            (0, ts_sinon_1.stubMethod)(testContext.SANDBOX, stateAggregator_1.OrgAccessor.prototype, 'hasFile').callsFake((username) => orgMap.has(username));
             const retrieveContents = async function () {
                 const username = (0, path_1.basename)(this.path.replace('.json', ''));
                 return Promise.resolve(orgMap.get(username) ?? {});
@@ -175,7 +177,7 @@ const instantiateContext = (sinon) => {
         async stubSandboxes(...sandboxes) {
             const entries = (await Promise.all(sandboxes.map(async (sanbox) => [sanbox.username, await sanbox.getConfig()])));
             const sandboxMap = new Map(entries);
-            (0, ts_sinon_1.stubMethod)(testContext.SANDBOX, sandboxAccessor_1.SandboxAccessor.prototype, 'getAllFiles').returns([...sandboxMap.keys()].map((o) => `${o}.sandbox.json`));
+            (0, ts_sinon_1.stubMethod)(testContext.SANDBOX, sandboxAccessor_1.SandboxAccessor.prototype, 'getAllFiles').resolves([...sandboxMap.keys()].map((o) => `${o}.sandbox.json`));
             const retrieveContents = async function () {
                 const username = (0, path_1.basename)(this.path.replace('.sandbox.json', ''));
                 return Promise.resolve(sandboxMap.get(username) ?? {});
@@ -185,8 +187,11 @@ const instantiateContext = (sinon) => {
         stubAliases(aliases, group = aliasesConfig_1.AliasGroup.ORGS) {
             this.configStubs.AliasesConfig = { contents: { [group]: aliases } };
         },
-        stubConfig(config) {
+        async stubConfig(config) {
             this.configStubs.Config = { contents: config };
+            // configAggregator may have already loaded an instance.  We're not sure why this happens.
+            // This seems to solve the problem by forcing a load of the new stubbed config.
+            await configAggregator_1.ConfigAggregator.create();
         },
         stubTokens(tokens) {
             this.configStubs.TokensConfig = { contents: tokens };
@@ -225,14 +230,14 @@ const stubContext = (testContext) => {
     global_1.Global.SFDX_INTEROPERABILITY = false;
     const stubs = {};
     // Most core files create a child logger so stub this to return our test logger.
-    (0, ts_sinon_1.stubMethod)(testContext.SANDBOX, logger_1.Logger, 'child').returns(Promise.resolve(testContext.TEST_LOGGER));
+    (0, ts_sinon_1.stubMethod)(testContext.SANDBOX, logger_1.Logger, 'child').resolves(testContext.TEST_LOGGER);
     (0, ts_sinon_1.stubMethod)(testContext.SANDBOX, logger_1.Logger, 'childFromRoot').returns(testContext.TEST_LOGGER);
     testContext.inProject(true);
     testContext.SANDBOXES.CONFIG.stub(configFile_1.ConfigFile, 'resolveRootFolder').callsFake((isGlobal) => testContext.rootPathRetriever(isGlobal, testContext.id));
     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) => {
-        const stub = 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.
         configFile.getPath();
@@ -242,13 +247,13 @@ const stubContext = (testContext) => {
     };
     const readSync = function (newContents) {
         const stub = initStubForRead(this);
-        this.setContentsFromObject(newContents || stub.contents || {});
+        this.setContentsFromObject(newContents ?? stub.contents ?? {});
         return this.getContents();
     };
     const read = async function () {
         const stub = initStubForRead(this);
         if (stub.readFn) {
-            return await stub.readFn.call(this);
+            return stub.readFn.call(this);
         }
         if (stub.retrieveContents) {
             return readSync.call(this, await stub.retrieveContents.call(this));
@@ -268,7 +273,7 @@ const stubContext = (testContext) => {
         const stub = testContext.configStubs[this.constructor.name];
         if (!stub)
             return;
-        this.setContents(newContents || this.getContents());
+        this.setContents(newContents ?? this.getContents());
         stub.contents = this.toObject();
     };
     const write = async function (newContents) {
@@ -279,7 +284,7 @@ const stubContext = (testContext) => {
         if (!stub)
             return;
         if (stub.writeFn) {
-            return await stub.writeFn.call(this, newContents);
+            return stub.writeFn.call(this, newContents);
         }
         if (stub.updateContents) {
             writeSync.call(this, await stub.updateContents.call(this));
@@ -341,13 +346,14 @@ exports.stubContext = stubContext;
  */
 const restoreContext = (testContext) => {
     testContext.SANDBOX.restore();
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     Object.values(testContext.SANDBOXES).forEach((theSandbox) => theSandbox.restore());
     testContext.configStubs = {};
     // Give each test run a clean StateAggregator
     stateAggregator_1.StateAggregator.clearInstance();
 };
 exports.restoreContext = restoreContext;
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any, no-underscore-dangle
 const _testSetup = (sinon) => {
     const testContext = (0, exports.instantiateContext)(sinon);
     beforeEach(() => {
@@ -582,15 +588,17 @@ exports.StreamingMockCometClient = StreamingMockCometClient;
  * Mock class for Salesforce Orgs.
  *
  * @example
+ * ```
  * const testOrg = new MockTestOrgData();
  * await $$.stubAuths(testOrg)
+ * ```
  */
 class MockTestOrgData {
     constructor(id = uniqid(), options) {
         this.testId = id;
         this.userId = `user_id_${this.testId}`;
         this.orgId = `${this.testId}`;
-        this.username = options?.username || `admin_${this.testId}@gb.org`;
+        this.username = options?.username ?? `admin_${this.testId}@gb.org`;
         this.loginUrl = `https://login.${this.testId}.salesforce.com`;
         this.instanceUrl = `https://instance.${this.testId}.salesforce.com`;
         this.clientId = `${this.testId}/client_id`;
@@ -690,20 +698,23 @@ exports.MockTestOrgData = MockTestOrgData;
  * Mock class for Salesforce Sandboxes.
  *
  * @example
+ * ```
  * const testOrg = new MockTestSandboxData();
  * await $$.stubSandboxes(testOrg)
+ * ```
  */
 class MockTestSandboxData {
     constructor(id = uniqid(), options) {
         this.id = id;
         this.sandboxOrgId = id;
-        this.prodOrgUsername = options?.prodOrgUsername || `admin_${id}@gb.org`;
-        this.sandboxName = options?.name || `sandbox_${id}`;
-        this.username = options?.username || `${this.prodOrgUsername}.sandbox`;
+        this.prodOrgUsername = options?.prodOrgUsername ?? `admin_${id}@gb.org`;
+        this.sandboxName = options?.name ?? `sandbox_${id}`;
+        this.username = options?.username ?? `${this.prodOrgUsername}.sandbox`;
     }
     /**
      * Return the auth config file contents.
      */
+    // eslint-disable-next-line @typescript-eslint/require-await
     async getConfig() {
         return {
             sandboxOrgId: this.sandboxOrgId,

package/lib/util/cache.d.ts

@@ -1,11 +1,11 @@
 export declare class Cache extends Map {
     #private;
     private constructor();
+    static get hits(): number;
+    static get lookups(): number;
     static instance(): Cache;
     static set<V>(key: string, value: V): void;
     static get<V>(key: string): V | undefined;
     static disable(): void;
     static enable(): void;
-    static get hits(): number;
-    static get lookups(): number;
 }

package/lib/util/cache.js

@@ -28,6 +28,12 @@ class Cache extends Map {
         __classPrivateFieldSet(this, _Cache_hits, 0, "f");
         __classPrivateFieldSet(this, _Cache_lookups, 0, "f");
     }
+    static get hits() {
+        return __classPrivateFieldGet(Cache.instance(), _Cache_hits, "f");
+    }
+    static get lookups() {
+        return __classPrivateFieldGet(Cache.instance(), _Cache_lookups, "f");
+    }
     static instance() {
         if (!__classPrivateFieldGet(Cache, _a, "f", _Cache_instance)) {
             __classPrivateFieldSet(Cache, _a, true, "f", _Cache_enabled);
@@ -55,12 +61,6 @@ class Cache extends Map {
     static enable() {
         __classPrivateFieldSet(Cache, _a, true, "f", _Cache_enabled);
     }
-    static get hits() {
-        return __classPrivateFieldGet(Cache.instance(), _Cache_hits, "f");
-    }
-    static get lookups() {
-        return __classPrivateFieldGet(Cache.instance(), _Cache_lookups, "f");
-    }
 }
 exports.Cache = Cache;
 _a = Cache, _Cache_hits = new WeakMap(), _Cache_lookups = new WeakMap();

package/lib/util/directoryWriter.d.ts

@@ -1,11 +1,12 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Readable } from 'stream';
 import { StructuredWriter } from './structuredWriter';
 export declare class DirectoryWriter implements StructuredWriter {
     private readonly rootDestination?;
     constructor(rootDestination?: string | undefined);
+    get buffer(): Buffer;
     addToStore(contents: string | Readable | Buffer, targetPath: string): Promise<void>;
     finalize(): Promise<void>;
     getDestinationPath(): string | undefined;
-    get buffer(): Buffer;
 }

package/lib/util/directoryWriter.js

@@ -23,6 +23,10 @@ class DirectoryWriter {
             fs.mkdirSync(this.rootDestination, { recursive: true });
         }
     }
+    // eslint-disable-next-line class-methods-use-this
+    get buffer() {
+        throw new Error('Not implemented');
+    }
     async addToStore(contents, targetPath) {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const destPath = path.join(this.rootDestination, targetPath);
@@ -38,15 +42,13 @@ class DirectoryWriter {
             fs.writeFileSync(destPath, contents);
         }
     }
+    // eslint-disable-next-line class-methods-use-this
     finalize() {
         return Promise.resolve(undefined);
     }
     getDestinationPath() {
         return this.rootDestination;
     }
-    get buffer() {
-        throw new Error('Not implemented');
-    }
 }
 exports.DirectoryWriter = DirectoryWriter;
 //# sourceMappingURL=directoryWriter.js.map

package/lib/util/jsonXmlTools.js

@@ -21,12 +21,10 @@ exports.standardOptions = {
 };
 const writeJSONasXML = async ({ path, json, type, options = exports.standardOptions, }) => {
     const xml = jsToXml.parse(type, (0, exports.fixExistingDollarSign)(json), options);
-    return await fs_1.promises.writeFile(path, xml);
+    return fs_1.promises.writeFile(path, xml);
 };
 exports.writeJSONasXML = writeJSONasXML;
-const JsonAsXml = ({ json, type, options = exports.standardOptions }) => {
-    return jsToXml.parse(type, (0, exports.fixExistingDollarSign)(json), options);
-};
+const JsonAsXml = ({ json, type, options = exports.standardOptions }) => jsToXml.parse(type, (0, exports.fixExistingDollarSign)(json), options);
 exports.JsonAsXml = JsonAsXml;
 const fixExistingDollarSign = (existing) => {
     const existingCopy = { ...existing };

package/lib/util/mapKeys.d.ts

@@ -1,14 +1,14 @@
 /**
- *  Use mapKeys to convert object keys to another format using the specified conversion function.
+ * Use mapKeys to convert object keys to another format using the specified conversion function.
  *
- *  E.g., to deep convert all object keys to camelCase:  mapKeys(myObj, _.camelCase, true)
- *        to shallow convert object keys to lower case:  mapKeys(myObj, _.toLower)
+ * E.g., to deep convert all object keys to camelCase:  mapKeys(myObj, _.camelCase, true)
+ * to shallow convert object keys to lower case:  mapKeys(myObj, _.toLower)
  *
- *  NOTE: This mutates the object passed in for conversion.
+ * NOTE: This mutates the object passed in for conversion.
  *
- *  @param target - {Object} The object to convert the keys
- *  @param converter - {Function} The function that converts the object key
- *  @param deep - {boolean} Whether to do a deep object key conversion
- *  @return {Object} - the object with the converted keys
+ * @param target - {Object} The object to convert the keys
+ * @param converter - {Function} The function that converts the object key
+ * @param deep - {boolean} Whether to do a deep object key conversion
+ * @return {Object} - the object with the converted keys
  */
-export default function mapKeys(obj: any, converter: (key: string) => string, deep?: boolean): Record<string, unknown>;
+export default function mapKeys<T>(obj: T, converter: (key: string) => string, deep?: boolean): Record<string, unknown>;

package/lib/util/mapKeys.js

@@ -8,23 +8,26 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const ts_types_1 = require("@salesforce/ts-types");
 /**
- *  Use mapKeys to convert object keys to another format using the specified conversion function.
+ * Use mapKeys to convert object keys to another format using the specified conversion function.
  *
- *  E.g., to deep convert all object keys to camelCase:  mapKeys(myObj, _.camelCase, true)
- *        to shallow convert object keys to lower case:  mapKeys(myObj, _.toLower)
+ * E.g., to deep convert all object keys to camelCase:  mapKeys(myObj, _.camelCase, true)
+ * to shallow convert object keys to lower case:  mapKeys(myObj, _.toLower)
  *
- *  NOTE: This mutates the object passed in for conversion.
+ * NOTE: This mutates the object passed in for conversion.
  *
- *  @param target - {Object} The object to convert the keys
- *  @param converter - {Function} The function that converts the object key
- *  @param deep - {boolean} Whether to do a deep object key conversion
- *  @return {Object} - the object with the converted keys
+ * @param target - {Object} The object to convert the keys
+ * @param converter - {Function} The function that converts the object key
+ * @param deep - {boolean} Whether to do a deep object key conversion
+ * @return {Object} - the object with the converted keys
  */
 function mapKeys(
 // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
 obj, converter, deep) {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const target = Object.assign({}, obj);
-    return Object.fromEntries(Object.entries(target).map(([key, value]) => {
+    return Object.fromEntries(
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+    Object.entries(target).map(([key, value]) => {
         const k = converter.call(null, key);
         if (deep) {
             let v = value;
@@ -33,6 +36,7 @@ obj, converter, deep) {
                     if ((0, ts_types_1.isPlainObject)(v1)) {
                         return mapKeys(v1, converter, deep);
                     }
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
                     return v1;
                 });
             }

package/lib/util/sfdc.d.ts

@@ -5,7 +5,7 @@ export declare const sfdc: {
      *
      * @param id The id to convert.
      */
-    trimTo15: (id?: string | undefined) => Optional<string>;
+    trimTo15: (id?: string) => Optional<string>;
     /**
      * Tests whether an API version matches the format `i.0`.
      *
@@ -36,7 +36,7 @@ export declare const sfdc: {
      * @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`.
      */
-    findUpperCaseKeys: (data?: JsonMap | undefined, sectionBlocklist?: string[]) => Optional<string>;
+    findUpperCaseKeys: (data?: JsonMap, sectionBlocklist?: string[]) => Optional<string>;
     /**
      * Tests whether a given string is an access token
      *

package/lib/util/sfdc.js

@@ -17,7 +17,7 @@ exports.sfdc = {
      * @param id The id to convert.
      */
     trimTo15: (id) => {
-        if (id && id.length && id.length > 15) {
+        if (id?.length && id.length > 15) {
             id = id.substring(0, 15);
         }
         return id;
@@ -27,34 +27,27 @@ exports.sfdc = {
      *
      * @param value The API version as a string.
      */
-    validateApiVersion: (value) => {
-        return value == null || /^[1-9]\d\.0$/.test(value);
-    },
+    validateApiVersion: (value) => value == null || /^[1-9]\d\.0$/.test(value),
     /**
      * Tests whether an email matches the format `me@my.org`
      *
      * @param value The email as a string.
      */
-    validateEmail: (value) => {
-        return /^[^.][^@]*@[^.]+(\.[^.\s]+)+$/.test(value);
-    },
+    validateEmail: (value) => /^[^.][^@]*@[^.]+(\.[^.\s]+)+$/.test(value),
     /**
      * Tests whether a Salesforce ID is in the correct format, a 15- or 18-character length string with only letters and numbers
      *
      * @param value The ID as a string.
      */
-    validateSalesforceId: (value) => {
-        return /[a-zA-Z0-9]{18}|[a-zA-Z0-9]{15}/.test(value) && (value.length === 15 || value.length === 18);
-    },
+    validateSalesforceId: (value) => /[a-zA-Z0-9]{18}|[a-zA-Z0-9]{15}/.test(value) && (value.length === 15 || value.length === 18),
     /**
      * Tests whether a path is in the correct format; the value doesn't include the characters "[", "]", "?", "<", ">", "?", "|"
      *
      * @param value The path as a string.
      */
-    validatePathDoesNotContainInvalidChars: (value) => {
-        // eslint-disable-next-line no-useless-escape
-        return !/[\["\?<>\|\]]+/.test(value);
-    },
+    validatePathDoesNotContainInvalidChars: (value) => 
+    // eslint-disable-next-line no-useless-escape
+    !/[\["\?<>\|\]]+/.test(value),
     /**
      * Returns the first key within the object that has an upper case first letter.
      *
@@ -82,9 +75,7 @@ exports.sfdc = {
      *
      * @param value
      */
-    matchesAccessToken: (value) => {
-        return /^(00D\w{12,15})![.\w]*$/.test(value);
-    },
+    matchesAccessToken: (value) => /^(00D\w{12,15})![.\w]*$/.test(value),
     /**
      * Tests whether a given url is an internal Salesforce domain
      *