@salesforce/core 6.2.0 → 6.2.2-qa.0

package/lib/org/org.d.ts

@@ -546,7 +546,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

@@ -485,7 +485,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
      */
     async determineIfScratch() {
         let cache = this.getField(Org.Fields.IS_SCRATCH);
-        if (!cache) {
+        if (cache === undefined) {
             await this.updateLocalInformation();
             cache = this.getField(Org.Fields.IS_SCRATCH);
         }
@@ -500,7 +500,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
      */
     async determineIfSandbox() {
         let cache = this.getField(Org.Fields.IS_SANDBOX);
-        if (!cache) {
+        if (cache === undefined) {
             await this.updateLocalInformation();
             cache = this.getField(Org.Fields.IS_SANDBOX);
         }
@@ -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.0",
+  "version": "6.2.2-qa.0",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -41,7 +41,7 @@
     "@salesforce/kit": "^3.0.15",
     "@salesforce/schemas": "^1.6.1",
     "@salesforce/ts-types": "^2.0.9",
-    "@types/semver": "^7.5.4",
+    "@types/semver": "^7.5.6",
     "ajv": "^8.12.0",
     "change-case": "^4.1.2",
     "faye": "^1.4.0",