@salesforce/core 4.3.5 → 4.3.6

package/lib/org/authInfo.d.ts

@@ -192,6 +192,11 @@ export declare class AuthInfo extends AsyncOptionalCreatable<AuthInfo.Options> {
      * Find all dev hubs available in the local environment.
      */
     static getDevHubAuthInfos(): Promise<OrgAuthorization[]>;
+    /**
+     * Checks active scratch orgs to match by the ScratchOrg field (the 15-char org id)
+     * if you pass an 18-char scratchOrgId, it will be trimmed to 15-char for query purposes
+     * Throws is no matching scratch org is found
+     */
     private static queryScratchOrg;
     /**
      * Get the username.

package/lib/org/authInfo.js

@@ -270,11 +270,22 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
     static async getDevHubAuthInfos() {
         return AuthInfo.listAllAuthorizations((possibleHub) => possibleHub?.isDevHub ?? false);
     }
+    /**
+     * Checks active scratch orgs to match by the ScratchOrg field (the 15-char org id)
+     * if you pass an 18-char scratchOrgId, it will be trimmed to 15-char for query purposes
+     * Throws is no matching scratch org is found
+     */
     static async queryScratchOrg(devHubUsername, scratchOrgId) {
         const devHubOrg = await org_1.Org.create({ aliasOrUsername: devHubUsername });
+        const trimmedId = (0, sfdc_1.trimTo15)(scratchOrgId);
         const conn = devHubOrg.getConnection();
-        const data = await conn.singleRecordQuery(`select Id, ExpirationDate from ScratchOrgInfo where ScratchOrg = '${(0, sfdc_1.trimTo15)(scratchOrgId)}'`);
-        return data;
+        const data = await conn.query(`select Id, ExpirationDate, ScratchOrg from ScratchOrgInfo where ScratchOrg = '${trimmedId}' and Status = 'Active'`);
+        // where ScratchOrg='00DDE00000485Lg' will return a record for both 00DDE00000485Lg and 00DDE00000485LG.
+        // this is our way of enforcing case sensitivity on a 15-char Id (which is unfortunately how ScratchOrgInfo stores it)
+        const result = data.records.filter((r) => r.ScratchOrg === trimmedId)[0];
+        if (result)
+            return result;
+        throw new sfError_1.SfError(`DevHub ${devHubUsername} has no active scratch orgs that match ${trimmedId}`, 'NoActiveScratchOrgFound');
     }
     /**
      * Get the username.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "4.3.5",
+  "version": "4.3.6",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -68,8 +68,8 @@
     "@types/lodash": "^4.14.195",
     "@types/proper-lockfile": "^4.1.2",
     "@types/shelljs": "0.8.12",
-    "@typescript-eslint/eslint-plugin": "^5.59.9",
-    "@typescript-eslint/parser": "^5.59.11",
+    "@typescript-eslint/eslint-plugin": "^5.60.1",
+    "@typescript-eslint/parser": "^5.60.1",
     "benchmark": "^2.1.4",
     "chai": "^4.3.7",
     "chai-string": "^1.5.0",