@salesforce/core 3.33.7 → 3.33.9

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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "3.33.7",
+  "version": "3.33.9",
   "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": {