@salesforce/core 3.33.8 → 3.34.0

package/lib/config/ttlConfig.js

@@ -38,13 +38,8 @@ class TTLConfig extends configFile_1.ConfigFile {
     }
     async init() {
         const contents = await this.read(this.options.throwOnNotFound);
-        const purged = {};
         const date = new Date().getTime();
-        for (const [key, opts] of Object.entries(contents)) {
-            if (!this.isExpired(date, opts))
-                purged[key] = opts;
-        }
-        this.setContents(purged);
+        this.setContents(Object.fromEntries(Object.entries(contents).filter(([, value]) => !this.isExpired(date, value))));
     }
     // eslint-disable-next-line class-methods-use-this
     timestamp(value) {

package/lib/crypto/keyChainImpl.js

@@ -277,7 +277,7 @@ const darwinImpl = {
         // stdout. Reference: http://blog.macromates.com/2006/keychain-access-from-shell/
         if (stderr.includes('password')) {
             const match = RegExp(/"(.*)"/).exec(stderr);
-            if (!match || !match[1]) {
+            if (!match?.[1]) {
                 fn(messages.createError('passwordNotFoundError', [`${stdout} - ${stderr}`]));
             }
             else {

package/lib/messages.d.ts

@@ -80,7 +80,7 @@ export type StoredMessageMap = Map<string, StoredMessage>;
  *
  * // Now you can use the messages from anywhere in your code or file.
  * // If using importMessageDirectory, the bundle name is the file name.
- * const messages: Messages = Messages.load(packageName, bundleName);
+ * const messages: Messages = Messages.loadMessages(packageName, bundleName);
  *
  * // Messages now contains all the message in the bundleName file.
  * messages.getMessage('authInfoCreationError');
@@ -101,7 +101,7 @@ export declare class Messages<T extends string> {
     /**
      * Create a new messages bundle.
      *
-     * **Note:** Use {Messages.load} unless you are writing your own loader function.
+     * **Note:** Use {Messages.loadMessages} unless you are writing your own loader function.
      *
      * @param bundleName The bundle name.
      * @param locale The locale.
@@ -122,7 +122,7 @@ export declare class Messages<T extends string> {
      */
     static getLocale(): string;
     /**
-     * Set a custom loader function for a package and bundle that will be called on {@link Messages.load}.
+     * Set a custom loader function for a package and bundle that will be called on {@link Messages.loadMessages}.
      *
      * @param packageName The npm package name.
      * @param bundle The name of the bundle.
@@ -148,7 +148,7 @@ export declare class Messages<T extends string> {
     static importMessageFile(packageName: string, filePath: string): void;
     /**
      * Import all json and js files in a messages directory. Use the file name as the bundle key when
-     * {@link Messages.load} is called. By default, we're assuming the moduleDirectoryPart is a
+     * {@link Messages.loadMessages} is called. By default, we're assuming the moduleDirectoryPart is a
      * typescript project and will truncate to root path (where the package.json file is). If your messages
      * directory is in another spot or you are not using typescript, pass in false for truncateToProjectPath.
      *
@@ -167,11 +167,9 @@ export declare class Messages<T extends string> {
      * Load messages for a given package and bundle. If the bundle is not already cached, use the loader function
      * created from {@link Messages.setLoaderFunction} or {@link Messages.importMessagesDirectory}.
      *
-     * **NOTE: Use {@link Messages.load} instead for safe message validation and usage.**
-     *
      * ```typescript
      * Messages.importMessagesDirectory(__dirname);
-     * const messages = Messages.load('packageName', 'bundleName');
+     * const messages = Messages.loadMessages('packageName', 'bundleName');
      * ```
      *
      * @param packageName The name of the npm package.
@@ -179,21 +177,8 @@ export declare class Messages<T extends string> {
      */
     static loadMessages(packageName: string, bundleName: string): Messages<string>;
     /**
-     * Load messages for a given package and bundle. If the bundle is not already cached, use the loader function
-     * created from {@link Messages.setLoaderFunction} or {@link Messages.importMessagesDirectory}.
-     *
-     * The message keys that will be used must be passed in for validation. This prevents runtime errors if messages are used but not defined.
-     *
-     * **NOTE: This should be defined at the top of the file so validation is done at load time rather than runtime.**
-     *
-     * ```typescript
-     * Messages.importMessagesDirectory(__dirname);
-     * const messages = Messages.load('packageName', 'bundleName', [
-     *   'messageKey1',
-     *   'messageKey2',
-     * ]);
-     * ```
      *
+     * @deprecated Use {@link Messages.loadMessages} instead.
      * @param packageName The name of the npm package.
      * @param bundleName The name of the bundle to load.
      * @param keys The message keys that will be used.

package/lib/messages.js

@@ -140,7 +140,7 @@ const jsAndJsonLoader = (filePath, fileContents) => {
  *
  * // Now you can use the messages from anywhere in your code or file.
  * // If using importMessageDirectory, the bundle name is the file name.
- * const messages: Messages = Messages.load(packageName, bundleName);
+ * const messages: Messages = Messages.loadMessages(packageName, bundleName);
  *
  * // Messages now contains all the message in the bundleName file.
  * messages.getMessage('authInfoCreationError');
@@ -150,7 +150,7 @@ class Messages {
     /**
      * Create a new messages bundle.
      *
-     * **Note:** Use {Messages.load} unless you are writing your own loader function.
+     * **Note:** Use {Messages.loadMessages} unless you are writing your own loader function.
      *
      * @param bundleName The bundle name.
      * @param locale The locale.
@@ -169,7 +169,7 @@ class Messages {
         return 'en_US';
     }
     /**
-     * Set a custom loader function for a package and bundle that will be called on {@link Messages.load}.
+     * Set a custom loader function for a package and bundle that will be called on {@link Messages.loadMessages}.
      *
      * @param packageName The npm package name.
      * @param bundle The name of the bundle.
@@ -231,7 +231,7 @@ class Messages {
     }
     /**
      * Import all json and js files in a messages directory. Use the file name as the bundle key when
-     * {@link Messages.load} is called. By default, we're assuming the moduleDirectoryPart is a
+     * {@link Messages.loadMessages} is called. By default, we're assuming the moduleDirectoryPart is a
      * typescript project and will truncate to root path (where the package.json file is). If your messages
      * directory is in another spot or you are not using typescript, pass in false for truncateToProjectPath.
      *
@@ -296,11 +296,9 @@ class Messages {
      * Load messages for a given package and bundle. If the bundle is not already cached, use the loader function
      * created from {@link Messages.setLoaderFunction} or {@link Messages.importMessagesDirectory}.
      *
-     * **NOTE: Use {@link Messages.load} instead for safe message validation and usage.**
-     *
      * ```typescript
      * Messages.importMessagesDirectory(__dirname);
-     * const messages = Messages.load('packageName', 'bundleName');
+     * const messages = Messages.loadMessages('packageName', 'bundleName');
      * ```
      *
      * @param packageName The name of the npm package.
@@ -327,21 +325,8 @@ class Messages {
         throw new kit_1.NamedError('MissingBundleError', `Missing bundle ${key} for locale ${Messages.getLocale()}.`);
     }
     /**
-     * Load messages for a given package and bundle. If the bundle is not already cached, use the loader function
-     * created from {@link Messages.setLoaderFunction} or {@link Messages.importMessagesDirectory}.
-     *
-     * The message keys that will be used must be passed in for validation. This prevents runtime errors if messages are used but not defined.
-     *
-     * **NOTE: This should be defined at the top of the file so validation is done at load time rather than runtime.**
-     *
-     * ```typescript
-     * Messages.importMessagesDirectory(__dirname);
-     * const messages = Messages.load('packageName', 'bundleName', [
-     *   'messageKey1',
-     *   'messageKey2',
-     * ]);
-     * ```
      *
+     * @deprecated Use {@link Messages.loadMessages} instead.
      * @param packageName The name of the npm package.
      * @param bundleName The name of the bundle to load.
      * @param keys The message keys that will be used.

package/lib/org/authInfo.js

@@ -243,17 +243,20 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         // ask all those orgs if they know this orgId
         await Promise.all(hubAuthInfos.map(async (hubAuthInfo) => {
             try {
-                const data = await AuthInfo.queryScratchOrg(hubAuthInfo.username, fields.orgId);
-                if (data.totalSize > 0) {
-                    // if any return a result
-                    logger.debug(`found orgId ${fields.orgId} in devhub ${hubAuthInfo.username}`);
-                    try {
-                        await orgAuthInfo.save({ ...fields, devHubUsername: hubAuthInfo.username });
-                        logger.debug(`set ${hubAuthInfo.username} as devhub for scratch org ${orgAuthInfo.getUsername()}`);
-                    }
-                    catch (error) {
-                        logger.debug(`error updating auth file for ${orgAuthInfo.getUsername()}`, error);
-                    }
+                const soi = await AuthInfo.queryScratchOrg(hubAuthInfo.username, fields.orgId);
+                // if any return a result
+                logger.debug(`found orgId ${fields.orgId} in devhub ${hubAuthInfo.username}`);
+                try {
+                    await orgAuthInfo.save({
+                        ...fields,
+                        devHubUsername: hubAuthInfo.username,
+                        expirationDate: soi.ExpirationDate,
+                        isScratch: true,
+                    });
+                    logger.debug(`set ${hubAuthInfo.username} as devhub and expirationDate ${soi.ExpirationDate} for scratch org ${orgAuthInfo.getUsername()}`);
+                }
+                catch (error) {
+                    logger.debug(`error updating auth file for ${orgAuthInfo.getUsername()}`, error);
                 }
             }
             catch (error) {
@@ -270,7 +273,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 = '${(0, sfdc_1.trimTo15)(scratchOrgId)}'`);
+        const data = await conn.singleRecordQuery(`select Id, ExpirationDate from ScratchOrgInfo where ScratchOrg = '${(0, sfdc_1.trimTo15)(scratchOrgId)}'`);
         return data;
     }
     /**

package/lib/org/scratchOrgErrorCodes.js

@@ -32,7 +32,7 @@ const optionalErrorCodeMessage = (errorCode, args) => {
     }
 };
 const validateScratchOrgInfoForResume = async ({ jobId, scratchOrgInfo, cache, hubUsername, }) => {
-    if (!scratchOrgInfo || !scratchOrgInfo.Id || scratchOrgInfo.Status === 'Deleted') {
+    if (!scratchOrgInfo?.Id || scratchOrgInfo.Status === 'Deleted') {
         // 1. scratch org info does not exist in that dev hub or has been deleted
         cache.unset(jobId);
         await cache.write();
@@ -48,7 +48,7 @@ const validateScratchOrgInfoForResume = async ({ jobId, scratchOrgInfo, cache, h
 };
 exports.validateScratchOrgInfoForResume = validateScratchOrgInfoForResume;
 const checkScratchOrgInfoForErrors = async (orgInfo, hubUsername) => {
-    if (!orgInfo || !orgInfo.Id) {
+    if (!orgInfo?.Id) {
         throw new sfError_1.SfError('No scratch org info found.', 'ScratchOrgInfoNotFound');
     }
     if (orgInfo.Status === 'Active') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "3.33.8",
+  "version": "3.34.0",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -37,12 +37,12 @@
   ],
   "dependencies": {
     "@salesforce/bunyan": "^2.0.0",
-    "@salesforce/kit": "^1.9.0",
+    "@salesforce/kit": "^1.9.2",
     "@salesforce/schemas": "^1.5.0",
     "@salesforce/ts-types": "^1.7.2",
     "@types/graceful-fs": "^4.1.6",
     "@types/semver": "^7.3.13",
-    "ajv": "^8.11.2",
+    "ajv": "^8.12.0",
     "archiver": "^5.3.0",
     "change-case": "^4.1.2",
     "debug": "^3.2.7",
@@ -58,7 +58,7 @@
     "@salesforce/dev-config": "^3.0.1",
     "@salesforce/dev-scripts": "^4.0.0-beta.7",
     "@salesforce/prettier-config": "^0.0.2",
-    "@salesforce/ts-sinon": "^1.4.4",
+    "@salesforce/ts-sinon": "^1.4.6",
     "@types/archiver": "^5.3.1",
     "@types/chai-string": "^1.4.2",
     "@types/debug": "0.0.31",
@@ -66,30 +66,30 @@
     "@types/jsonwebtoken": "9.0.1",
     "@types/lodash": "^4.14.191",
     "@types/shelljs": "0.8.11",
-    "@typescript-eslint/eslint-plugin": "^5.53.0",
+    "@typescript-eslint/eslint-plugin": "^5.54.1",
     "@typescript-eslint/parser": "^5.54.1",
     "chai": "^4.3.7",
     "chai-string": "^1.5.0",
     "commitizen": "^3.1.2",
-    "eslint": "^8.32.0",
-    "eslint-config-prettier": "^8.6.0",
-    "eslint-config-salesforce": "^1.1.0",
+    "eslint": "^8.35.0",
+    "eslint-config-prettier": "^8.7.0",
+    "eslint-config-salesforce": "^1.1.1",
     "eslint-config-salesforce-license": "^0.2.0",
     "eslint-config-salesforce-typescript": "^1.1.1",
     "eslint-plugin-header": "^3.1.1",
-    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-jsdoc": "^39.6.4",
     "husky": "^7.0.4",
     "lodash": "^4.17.21",
     "mocha": "^9.1.3",
     "nyc": "^15.1.0",
-    "prettier": "^2.8.1",
+    "prettier": "^2.8.4",
     "pretty-quick": "^3.1.3",
     "shelljs": "0.8.5",
     "sinon": "^14.0.2",
     "ts-node": "^10.4.0",
     "ttypescript": "^1.5.15",
-    "typescript": "^4.9.4",
+    "typescript": "^4.9.5",
     "wireit": "^0.9.3"
   },
   "repository": {