@salesforce/core 3.32.12 → 3.32.13

package/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2022, Salesforce.com, Inc.
+Copyright (c) 2023, Salesforce.com, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

package/lib/config/config.js

@@ -150,7 +150,7 @@ exports.SFDX_ALLOWED_PROPERTIES = [
         hidden: true,
         input: {
             // If a value is provided validate it otherwise no value is unset.
-            validator: (value) => value == null || ((0, ts_types_1.isString)(value) && sfdc_1.sfdc.validateApiVersion(value)),
+            validator: (value) => value == null || ((0, ts_types_1.isString)(value) && (0, sfdc_1.validateApiVersion)(value)),
             failedMessage: messages.getMessage('invalidApiVersion'),
         },
     },

package/lib/org/authInfo.js

@@ -282,7 +282,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
     static async queryScratchOrg(devHubUsername, scratchOrgId) {
         const devHubOrg = await org_1.Org.create({ aliasOrUsername: devHubUsername });
         const conn = devHubOrg.getConnection();
-        const data = await conn.query(`select Id from ScratchOrgInfo where ScratchOrg = '${sfdc_1.sfdc.trimTo15(scratchOrgId)}'`);
+        const data = await conn.query(`select Id from ScratchOrgInfo where ScratchOrg = '${(0, sfdc_1.trimTo15)(scratchOrgId)}'`);
         return data;
     }
     /**
@@ -326,7 +326,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
     async save(authData) {
         this.update(authData);
         const username = (0, ts_types_1.ensure)(this.getUsername());
-        if (sfdc_1.sfdc.matchesAccessToken(username)) {
+        if ((0, sfdc_1.matchesAccessToken)(username)) {
             this.logger.debug('Username is an accesstoken. Skip saving authinfo to disk.');
             return this;
         }
@@ -519,7 +519,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
             await this.stateAggregator.orgs.read(oauthUsername, false, false);
         } // Else it will be set in initAuthOptions below.
         // If the username is an access token, use that for auth and don't persist
-        if ((0, ts_types_1.isString)(oauthUsername) && sfdc_1.sfdc.matchesAccessToken(oauthUsername)) {
+        if ((0, ts_types_1.isString)(oauthUsername) && (0, sfdc_1.matchesAccessToken)(oauthUsername)) {
             // Need to initAuthOptions the logger and authInfoCrypto since we don't call init()
             this.logger = await logger_1.Logger.child('AuthInfo');
             const aggregator = await configAggregator_1.ConfigAggregator.create();

package/lib/org/connection.js

@@ -258,7 +258,7 @@ class Connection extends jsforce_1.Connection {
      * @param version The API version.
      */
     setApiVersion(version) {
-        if (!sfdc_1.sfdc.validateApiVersion(version)) {
+        if (!(0, sfdc_1.validateApiVersion)(version)) {
             throw messages.createError('incorrectAPIVersionError', [version]);
         }
         this.version = version;

package/lib/org/org.js

@@ -288,7 +288,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
         }
         const devHubConnection = (await Org.create({ aliasOrUsername })).getConnection();
         const thisOrgAuthConfig = this.getConnection().getAuthInfoFields();
-        const trimmedId = sfdc_1.sfdc.trimTo15(thisOrgAuthConfig.orgId);
+        const trimmedId = (0, sfdc_1.trimTo15)(thisOrgAuthConfig.orgId);
         const DEV_HUB_SOQL = `SELECT CreatedDate,Edition,ExpirationDate FROM ActiveScratchOrg WHERE ScratchOrg='${trimmedId}'`;
         try {
             const results = await devHubConnection.query(DEV_HUB_SOQL);
@@ -880,7 +880,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
             }
             catch {
                 // if an error is thrown, don't panic yet. we'll try querying by orgId
-                const trimmedId = sfdc_1.sfdc.trimTo15(this.getOrgId());
+                const trimmedId = (0, sfdc_1.trimTo15)(this.getOrgId());
                 this.logger.debug(`defaulting to trimming id from ${this.getOrgId()} to ${trimmedId}`);
                 try {
                     result = await this.queryProduction(prodOrg, 'SandboxOrganization', trimmedId);

package/lib/org/orgConfigProperties.js

@@ -100,7 +100,7 @@ exports.ORG_CONFIG_ALLOWED_PROPERTIES = [
         hidden: true,
         input: {
             // If a value is provided validate it otherwise no value is unset.
-            validator: (value) => value == null || ((0, ts_types_1.isString)(value) && sfdc_1.sfdc.validateApiVersion(value)),
+            validator: (value) => value == null || ((0, ts_types_1.isString)(value) && (0, sfdc_1.validateApiVersion)(value)),
             failedMessage: messages.getMessage('invalidApiVersion'),
         },
     },

package/lib/org/user.js

@@ -71,7 +71,7 @@ async function retrieveUserFields(logger, username) {
     const connection = await connection_1.Connection.create({
         authInfo: await authInfo_1.AuthInfo.create({ username }),
     });
-    if (sfdc_1.sfdc.matchesAccessToken(username)) {
+    if ((0, sfdc_1.matchesAccessToken)(username)) {
         logger.debug('received an accessToken for the username.  Converting...');
         username = (await connection.identity()).username;
         logger.debug(`accessToken converted to ${username}`);
@@ -111,7 +111,7 @@ async function retrieveUserFields(logger, username) {
  * @param connection The connection for the query.
  */
 async function retrieveProfileId(name, connection) {
-    if (!sfdc_1.sfdc.validateSalesforceId(name)) {
+    if (!(0, sfdc_1.validateSalesforceId)(name)) {
         const profileQuery = `SELECT Id FROM Profile WHERE name='${name}'`;
         const result = await connection.query(profileQuery);
         if (result.records.length > 0) {

package/lib/sfProject.js

@@ -309,7 +309,7 @@ class SfProjectJson extends configFile_1.ConfigFile {
     }
     validateKeys() {
         // Verify that the configObject does not have upper case keys; throw if it does.  Must be heads down camel case.
-        const upperCaseKey = sfdc_1.sfdc.findUpperCaseKeys(this.toObject(), SfProjectJson.BLOCKLIST);
+        const upperCaseKey = (0, sfdc_1.findUpperCaseKeys)(this.toObject(), SfProjectJson.BLOCKLIST);
         if (upperCaseKey) {
             throw coreMessages.createError('invalidJsonCasing', [upperCaseKey, this.getPath()]);
         }

package/lib/testSetup.d.ts

@@ -514,7 +514,7 @@ export declare class MockTestOrgData {
     clientSecret: string;
     authcode: string;
     accessToken: string;
-    refreshToken: string;
+    refreshToken: string | undefined;
     tracksSource: boolean | undefined;
     userId: string;
     redirectUri: string;

package/lib/testSetup.js

@@ -850,13 +850,13 @@ class MockTestOrgData {
         const crypto = await crypto_2.Crypto.create();
         const config = {};
         config.orgId = this.orgId;
+        config.clientId = this.clientId;
         const accessToken = crypto.encrypt(this.accessToken);
         if (accessToken) {
             config.accessToken = accessToken;
         }
-        const refreshToken = crypto.encrypt(this.refreshToken);
-        if (refreshToken) {
-            config.refreshToken = refreshToken;
+        if (this.refreshToken) {
+            config.refreshToken = crypto.encrypt(this.refreshToken);
         }
         config.instanceUrl = this.instanceUrl;
         config.loginUrl = this.loginUrl;

package/lib/util/checkLightningDomain.js

@@ -14,7 +14,7 @@ async function checkLightningDomain(url) {
     const domain = `https://${/https?:\/\/([^.]*)/.exec(url)?.slice(1, 2).pop()}.lightning.force.com`;
     const quantity = new kit_1.Env().getNumber('SFDX_DOMAIN_RETRY', 240) ?? 0;
     const timeout = new kit_1.Duration(quantity, kit_1.Duration.Unit.SECONDS);
-    if (sfdc_1.sfdc.isInternalUrl(url) || timeout.seconds === 0) {
+    if ((0, sfdc_1.isInternalUrl)(url) || timeout.seconds === 0) {
         return true;
     }
     const resolver = await myDomainResolver_1.MyDomainResolver.create({

package/lib/util/sfdc.d.ts

@@ -1,52 +1,63 @@
 import { JsonMap, Optional } from '@salesforce/ts-types';
+/**
+ * Converts an 18 character Salesforce ID to 15 characters.
+ *
+ * @param id The id to convert.
+ */
+export declare function trimTo15(id: string): string;
+export declare function trimTo15(id?: undefined): undefined;
+export declare function trimTo15(id: string | undefined): string | undefined;
+/**
+ * Tests whether an API version matches the format `i.0`.
+ *
+ * @param value The API version as a string.
+ */
+export declare const validateApiVersion: (value: string) => boolean;
+/**
+ * Tests whether an email matches the format `me@my.org`
+ *
+ * @param value The email as a string.
+ */
+export declare const validateEmail: (value: string) => boolean;
+/**
+ * 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
+ *
+ * @param value The ID as a string.
+ */
+export declare const validateSalesforceId: (value: string) => boolean;
+/**
+ * Tests whether a path is in the correct format; the value doesn't include the characters "[", "]", "?", "<", ">", "?", "|"
+ *
+ * @param value The path as a string.
+ */
+export declare const validatePathDoesNotContainInvalidChars: (value: string) => boolean;
+/**
+ * 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>;
+/**
+ * Tests whether a given string is an access token
+ *
+ * @param value
+ */
+export declare const matchesAccessToken: (value: string) => boolean;
+/** @deprecated import the individual functions instead of the whole object */
 export declare const sfdc: {
-    /**
-     * Converts an 18 character Salesforce ID to 15 characters.
-     *
-     * @param id The id to convert.
-     */
-    trimTo15: (id?: string) => Optional<string>;
-    /**
-     * Tests whether an API version matches the format `i.0`.
-     *
-     * @param value The API version as a string.
-     */
+    trimTo15: typeof trimTo15;
     validateApiVersion: (value: string) => boolean;
-    /**
-     * Tests whether an email matches the format `me@my.org`
-     *
-     * @param value The email as a string.
-     */
     validateEmail: (value: string) => boolean;
-    /**
-     * 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.
-     */
+    isInternalUrl: (url: string) => boolean;
+    matchesAccessToken: (value: string) => boolean;
     validateSalesforceId: (value: string) => boolean;
-    /**
-     * 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: string) => boolean;
-    /**
-     * 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`.
-     */
     findUpperCaseKeys: (data?: JsonMap, sectionBlocklist?: string[]) => Optional<string>;
-    /**
-     * Tests whether a given string is an access token
-     *
-     * @param value
-     */
-    matchesAccessToken: (value: string) => boolean;
-    /**
-     * Tests whether a given url is an internal Salesforce domain
-     *
-     * @param url
-     */
-    isInternalUrl: (url: string) => boolean;
 };

package/lib/util/sfdc.js

@@ -6,81 +6,96 @@
  * 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.sfdc = void 0;
+exports.sfdc = exports.matchesAccessToken = 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");
 const sfdcUrl_1 = require("./sfdcUrl");
-exports.sfdc = {
-    /**
-     * Converts an 18 character Salesforce ID to 15 characters.
-     *
-     * @param id The id to convert.
-     */
-    trimTo15: (id) => {
-        if (id?.length && id.length > 15) {
-            id = id.substring(0, 15);
+function trimTo15(id) {
+    if (!id) {
+        return undefined;
+    }
+    if (id.length && id.length > 15) {
+        id = id.substring(0, 15);
+    }
+    return id;
+}
+exports.trimTo15 = trimTo15;
+/**
+ * Tests whether an API version matches the format `i.0`.
+ *
+ * @param value The API version as a string.
+ */
+const validateApiVersion = (value) => value == null || /^[1-9]\d\.0$/.test(value);
+exports.validateApiVersion = validateApiVersion;
+/**
+ * Tests whether an email matches the format `me@my.org`
+ *
+ * @param value The email as a string.
+ */
+const validateEmail = (value) => /^[^.][^@]*@[^.]+(\.[^.\s]+)+$/.test(value);
+exports.validateEmail = validateEmail;
+/**
+ * Tests whether a given url is an internal Salesforce domain
+ *
+ * @param url
+ */
+const isInternalUrl = (url) => new sfdcUrl_1.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
+ *
+ * @param value The ID as a string.
+ */
+const validateSalesforceId = (value) => /[a-zA-Z0-9]{18}|[a-zA-Z0-9]{15}/.test(value) && (value.length === 15 || value.length === 18);
+exports.validateSalesforceId = validateSalesforceId;
+/**
+ * Tests whether a path is in the correct format; the value doesn't include the characters "[", "]", "?", "<", ">", "?", "|"
+ *
+ * @param value The path as a string.
+ */
+const validatePathDoesNotContainInvalidChars = (value) => 
+// eslint-disable-next-line no-useless-escape
+!/[\["\?<>\|\]]+/.test(value);
+exports.validatePathDoesNotContainInvalidChars = validatePathDoesNotContainInvalidChars;
+/**
+ * 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;
         }
-        return id;
-    },
-    /**
-     * Tests whether an API version matches the format `i.0`.
-     *
-     * @param value The API version as a string.
-     */
-    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) => /^[^.][^@]*@[^.]+(\.[^.\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) => /[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
-    !/[\["\?<>\|\]]+/.test(value),
-    /**
-     * 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`.
-     */
-    findUpperCaseKeys: (data, sectionBlocklist = []) => {
-        let key;
-        (0, kit_1.findKey)(data, (val, k) => {
-            if (k.substr(0, 1) === k.substr(0, 1).toUpperCase()) {
-                key = k;
-            }
-            else if ((0, ts_types_1.isJsonMap)(val)) {
-                if (sectionBlocklist.includes(k)) {
-                    return key;
-                }
-                key = exports.sfdc.findUpperCaseKeys((0, ts_types_1.asJsonMap)(val));
+        else if ((0, ts_types_1.isJsonMap)(val)) {
+            if (sectionBlocklist.includes(k)) {
+                return key;
             }
-            return key;
-        });
+            key = (0, exports.findUpperCaseKeys)((0, ts_types_1.asJsonMap)(val));
+        }
         return key;
-    },
-    /**
-     * Tests whether a given string is an access token
-     *
-     * @param value
-     */
-    matchesAccessToken: (value) => /^(00D\w{12,15})![.\w]*$/.test(value),
-    /**
-     * Tests whether a given url is an internal Salesforce domain
-     *
-     * @param url
-     */
-    isInternalUrl: (url) => new sfdcUrl_1.SfdcUrl(url).isInternalUrl(),
+    });
+    return key;
+};
+exports.findUpperCaseKeys = findUpperCaseKeys;
+/**
+ * Tests whether a given string is an access token
+ *
+ * @param value
+ */
+const matchesAccessToken = (value) => /^(00D\w{12,15})![.\w]*$/.test(value);
+exports.matchesAccessToken = matchesAccessToken;
+/** @deprecated import the individual functions instead of the whole object */
+exports.sfdc = {
+    trimTo15,
+    validateApiVersion: exports.validateApiVersion,
+    validateEmail: exports.validateEmail,
+    isInternalUrl: exports.isInternalUrl,
+    matchesAccessToken: exports.matchesAccessToken,
+    validateSalesforceId: exports.validateSalesforceId,
+    validatePathDoesNotContainInvalidChars: exports.validatePathDoesNotContainInvalidChars,
+    findUpperCaseKeys: exports.findUpperCaseKeys,
 };
 //# sourceMappingURL=sfdc.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "3.32.12",
+  "version": "3.32.13",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -37,7 +37,7 @@
     "@salesforce/bunyan": "^2.0.0",
     "@salesforce/kit": "^1.8.0",
     "@salesforce/schemas": "^1.4.0",
-    "@salesforce/ts-types": "^1.5.21",
+    "@salesforce/ts-types": "^1.7.2",
     "@types/graceful-fs": "^4.1.5",
     "@types/semver": "^7.3.13",
     "ajv": "^8.11.2",
@@ -65,11 +65,11 @@
     "@types/lodash": "^4.14.191",
     "@types/shelljs": "0.8.11",
     "@typescript-eslint/eslint-plugin": "^5.41.0",
-    "@typescript-eslint/parser": "^5.46.1",
+    "@typescript-eslint/parser": "^5.47.1",
     "chai": "^4.3.7",
     "chai-string": "^1.5.0",
     "commitizen": "^3.1.2",
-    "eslint": "^8.29.0",
+    "eslint": "^8.31.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-config-salesforce": "^1.1.0",
     "eslint-config-salesforce-license": "^0.1.6",