@salesforce/core 6.2.2-qa.0 → 6.2.3-qa.0

package/lib/org/org.d.ts

@@ -284,7 +284,14 @@ export declare class Org extends AsyncOptionalCreatable<Org.Options> {
      * Some organization information is locally cached, such as if the org name or if it is a scratch org.
      * This method populates/updates the filesystem from information retrieved from the org.
      */
-    updateLocalInformation(): Promise<void>;
+    updateLocalInformation(): Promise<{
+        name: string;
+        instanceName: string;
+        namespacePrefix: string | null;
+        isSandbox: boolean;
+        isScratch: boolean;
+        trailExpirationDate: string | null;
+    } | undefined>;
     /**
      * Refreshes the auth for this org's instance by calling HTTP GET on the baseUrl of the connection object.
      */

package/lib/org/org.js

@@ -484,12 +484,12 @@ class Org extends kit_1.AsyncOptionalCreatable {
      * using {@link Org.retrieveOrganizationInformation}.
      */
     async determineIfScratch() {
-        let cache = this.getField(Org.Fields.IS_SCRATCH);
-        if (cache === undefined) {
-            await this.updateLocalInformation();
-            cache = this.getField(Org.Fields.IS_SCRATCH);
+        const cache = this.getField(Org.Fields.IS_SCRATCH);
+        if (cache !== undefined) {
+            return cache;
         }
-        return cache;
+        const updated = await this.updateLocalInformation();
+        return updated?.isScratch === true;
     }
     /**
      * Returns `true` if the org is a sandbox.
@@ -499,12 +499,12 @@ class Org extends kit_1.AsyncOptionalCreatable {
      * using {@link Org.retrieveOrganizationInformation}.
      */
     async determineIfSandbox() {
-        let cache = this.getField(Org.Fields.IS_SANDBOX);
-        if (cache === undefined) {
-            await this.updateLocalInformation();
-            cache = this.getField(Org.Fields.IS_SANDBOX);
+        const cache = this.getField(Org.Fields.IS_SANDBOX);
+        if (cache !== undefined) {
+            return cache;
         }
-        return cache;
+        const updated = await this.updateLocalInformation();
+        return updated?.isSandbox === true;
     }
     /**
      * Retrieve a handful of fields from the Organization table in Salesforce. If this does not have the
@@ -523,18 +523,18 @@ class Org extends kit_1.AsyncOptionalCreatable {
         const username = this.getUsername();
         if (username) {
             const organization = await this.retrieveOrganizationInformation();
-            const isScratch = organization.IsSandbox && Boolean(organization.TrialExpirationDate);
-            const isSandbox = organization.IsSandbox && !organization.TrialExpirationDate;
-            const stateAggregator = await stateAggregator_1.StateAggregator.getInstance();
-            stateAggregator.orgs.update(username, {
+            const updateFields = {
                 [Org.Fields.NAME]: organization.Name,
                 [Org.Fields.INSTANCE_NAME]: organization.InstanceName,
                 [Org.Fields.NAMESPACE_PREFIX]: organization.NamespacePrefix,
-                [Org.Fields.IS_SANDBOX]: isSandbox,
-                [Org.Fields.IS_SCRATCH]: isScratch,
+                [Org.Fields.IS_SANDBOX]: organization.IsSandbox && Boolean(organization.TrialExpirationDate),
+                [Org.Fields.IS_SCRATCH]: organization.IsSandbox && !organization.TrialExpirationDate,
                 [Org.Fields.TRIAL_EXPIRATION_DATE]: organization.TrialExpirationDate,
-            });
+            };
+            const stateAggregator = await stateAggregator_1.StateAggregator.getInstance();
+            stateAggregator.orgs.update(username, updateFields);
             await stateAggregator.orgs.write(username);
+            return updateFields;
         }
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "6.2.2-qa.0",
+  "version": "6.2.3-qa.0",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -47,7 +47,7 @@
     "faye": "^1.4.0",
     "form-data": "^4.0.0",
     "js2xmlparser": "^4.0.1",
-    "jsforce": "^2.0.0-beta.28",
+    "jsforce": "^2.0.0-beta.29",
     "jsonwebtoken": "9.0.2",
     "jszip": "3.10.1",
     "pino": "^8.16.2",