@salesforce/core 6.2.2 → 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.
      */
@@ -546,7 +553,7 @@ export declare namespace Org {
          */
         IS_SCRATCH = "isScratch",
         /**
-         * Is the current org a dev hub org. e.g. Organization has IsSandbox == true and TrialExpirationDate == null.
+         * Is the current org a sandbox (not a scratch org on a non-prod instance), but an actual Sandbox org). e.g. Organization has IsSandbox == true and TrialExpirationDate == null.
          */
         IS_SANDBOX = "isSandbox",
         /**

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) {
-            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) {
-            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;
         }
     }
     /**
@@ -698,11 +698,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
      * Returns a map of requested fields.
      */
     getFields(keys) {
-        const json = {};
-        return keys.reduce((map, key) => {
-            map[key] = this.getField(key);
-            return map;
-        }, json);
+        return Object.fromEntries(keys.map((key) => [key, this.getField(key)]));
     }
     /**
      * Returns the JSForce connection for the org.
@@ -1294,7 +1290,7 @@ exports.Org = Org;
          */
         Fields["IS_SCRATCH"] = "isScratch";
         /**
-         * Is the current org a dev hub org. e.g. Organization has IsSandbox == true and TrialExpirationDate == null.
+         * Is the current org a sandbox (not a scratch org on a non-prod instance), but an actual Sandbox org). e.g. Organization has IsSandbox == true and TrialExpirationDate == null.
          */
         Fields["IS_SANDBOX"] = "isSandbox";
         /**

package/lib/org/scratchOrgInfoApi.js

@@ -181,7 +181,11 @@ const authorizeScratchOrg = async (options) => {
         clientId: scratchOrgInfoComplete.ConnectedAppConsumerKey,
         createdOrgInstance: scratchOrgInfoComplete.SignupInstance,
         isDevHub: false,
-        snapshot: scratchOrgInfoComplete.Snapshot,
+        isScratch: true,
+        isSandbox: false,
+        // omit optional fields unless they are present
+        ...(scratchOrgInfoComplete.Namespace ? { namespacePrefix: scratchOrgInfoComplete.Namespace } : {}),
+        ...(scratchOrgInfoComplete.Snapshot ? { snapshot: scratchOrgInfoComplete.Snapshot } : {}),
     });
     return authInfo;
 };

package/package.json

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