@salesforce/core 4.3.4 → 4.3.6

package/README.md

@@ -69,3 +69,13 @@ In your plugin or library,
   }
 
 ```
+
+## Performance Testing
+
+There are some benchmark.js checks to get a baseline for Logger performance.
+https://forcedotcom.github.io/sfdx-core/perf-Linux
+https://forcedotcom.github.io/sfdx-core/perf-Windows
+
+You can add more test cases in test/perf/logger/main.js
+
+If you add tests for new parts of sfdx-core outside of Logger, add new test Suites and create new jobs in the GHA `perf.yml`

package/lib/config/configAggregator.d.ts

@@ -57,8 +57,8 @@ export declare class ConfigAggregator extends AsyncOptionalCreatable<ConfigAggre
     protected static instance: AsyncOptionalCreatable;
     protected static encrypted: boolean;
     private allowedProperties;
-    private localConfig?;
-    private globalConfig;
+    private readonly localConfig?;
+    private readonly globalConfig;
     private envVars;
     /**
      * **Do not directly construct instances of this class -- use {@link ConfigAggregator.create} instead.**
@@ -161,6 +161,7 @@ export declare class ConfigAggregator extends AsyncOptionalCreatable<ConfigAggre
      * Get the resolved config object from the local, global and environment config instances.
      */
     getConfig(): JsonMap;
+    unsetByValue(key: string): Promise<void>;
     /**
      * Get the config properties that are environment variables.
      */

package/lib/config/configAggregator.js

@@ -260,6 +260,20 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
     getConfig() {
         return this.config;
     }
+    async unsetByValue(key) {
+        const hasLocalWrites = this.localConfig
+            ?.getKeysByValue(key)
+            .map((k) => this.localConfig?.unset(k))
+            .some(Boolean);
+        if (hasLocalWrites)
+            await this.localConfig?.write();
+        const hasGlobalWrites = this.globalConfig
+            ?.getKeysByValue(key)
+            .map((k) => this.globalConfig?.unset(k))
+            .some(Boolean);
+        if (hasGlobalWrites)
+            await this.globalConfig?.write();
+    }
     /**
      * Get the config properties that are environment variables.
      */
@@ -328,8 +342,7 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
         }
         configs.push(this.envVars);
         const json = {};
-        const reduced = configs.filter(ts_types_1.isJsonMap).reduce((acc, el) => (0, kit_1.merge)(acc, el), json);
-        return reduced;
+        return configs.filter(ts_types_1.isJsonMap).reduce((acc, el) => (0, kit_1.merge)(acc, el), json);
     }
 }
 exports.ConfigAggregator = ConfigAggregator;

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/lib/org/org.js

@@ -355,6 +355,13 @@ class Org extends kit_1.AsyncOptionalCreatable {
      * Will delete 'this' instance remotely and any files locally
      */
     async delete() {
+        const username = (0, ts_types_1.ensureString)(this.getUsername());
+        // unset any aliases referencing this org
+        const stateAgg = await stateAggregator_1.StateAggregator.getInstance();
+        const existingAliases = stateAgg.aliases.getAll(username);
+        await stateAgg.aliases.unsetValuesAndSave(existingAliases);
+        // unset any configs referencing this org
+        [...existingAliases, username].flatMap((name) => this.configAggregator.unsetByValue(name));
         if (await this.isSandbox()) {
             await this.deleteSandbox();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "4.3.4",
+  "version": "4.3.6",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -22,7 +22,8 @@
     "prepack": "sf-prepack",
     "prepare": "sf-install",
     "test": "wireit",
-    "test:only": "wireit"
+    "test:only": "wireit",
+    "test:perf": "ts-node test/perf/logger/main.test.ts"
   },
   "keywords": [
     "force",
@@ -60,14 +61,16 @@
     "@salesforce/dev-scripts": "^5.4.2",
     "@salesforce/prettier-config": "^0.0.3",
     "@salesforce/ts-sinon": "^1.4.8",
+    "@types/benchmark": "^2.1.2",
     "@types/chai-string": "^1.4.2",
     "@types/debug": "0.0.31",
     "@types/jsonwebtoken": "9.0.2",
     "@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",
     "eslint": "^8.43.0",