@salesforce/core 3.30.4 → 3.30.8

package/lib/org/scratchOrgCreate.js

@@ -12,6 +12,7 @@ const ts_types_1 = require("@salesforce/ts-types");
 const messages_1 = require("../messages");
 const logger_1 = require("../logger");
 const configAggregator_1 = require("../config/configAggregator");
+const orgConfigProperties_1 = require("../org/orgConfigProperties");
 const sfProject_1 = require("../sfProject");
 const stateAggregator_1 = require("../stateAggregator");
 const org_1 = require("./org");
@@ -79,13 +80,14 @@ const scratchOrgResume = async (jobId) => {
             retry: 0,
         });
     const scratchOrg = await org_1.Org.create({ aliasOrUsername: username });
+    const configAggregator = await configAggregator_1.ConfigAggregator.create();
     await (0, scratchOrgLifecycleEvents_1.emit)({ stage: 'deploy settings', scratchOrgInfo: soi });
     const settingsGenerator = new scratchOrgSettingsGenerator_1.default();
     settingsGenerator.extract({ ...soi, ...definitionjson });
     const [authInfo] = await Promise.all([
         (0, scratchOrgInfoApi_1.resolveUrl)(scratchOrgAuthInfo),
         (0, scratchOrgInfoApi_1.deploySettings)(scratchOrg, settingsGenerator, apiVersion ??
-            new configAggregator_1.ConfigAggregator().getPropertyValue('apiVersion') ??
+            configAggregator.getPropertyValue(orgConfigProperties_1.OrgConfigProperties.ORG_API_VERSION) ??
             (await scratchOrg.retrieveMaxApiVersion())),
     ]);
     await scratchOrgAuthInfo.handleAliasAndDefaultSettings({
@@ -174,10 +176,11 @@ const scratchOrgCreate = async (options) => {
     const username = scratchOrg.getUsername();
     logger.debug(`scratch org username ${username}`);
     await (0, scratchOrgLifecycleEvents_1.emit)({ stage: 'deploy settings', scratchOrgInfo: soi });
+    const configAggregator = await configAggregator_1.ConfigAggregator.create();
     const [authInfo] = await Promise.all([
         (0, scratchOrgInfoApi_1.resolveUrl)(scratchOrgAuthInfo),
         (0, scratchOrgInfoApi_1.deploySettings)(scratchOrg, settingsGenerator, apiversion ??
-            new configAggregator_1.ConfigAggregator().getPropertyValue('org-api-version') ??
+            configAggregator.getPropertyValue(orgConfigProperties_1.OrgConfigProperties.ORG_API_VERSION) ??
             (await scratchOrg.retrieveMaxApiVersion())),
     ]);
     await scratchOrgAuthInfo.handleAliasAndDefaultSettings({

package/lib/sfProject.d.ts

@@ -150,7 +150,7 @@ export declare class SfProjectJson extends ConfigFile {
      *
      * @param packageDir
      */
-    addPackageDirectory(packageDir: NamedPackageDir): void;
+    addPackageDirectory(packageDir: PackageDir): void;
     private doesPackageExist;
     private validateKeys;
 }

package/lib/sfProject.js

@@ -224,8 +224,8 @@ class SfProjectJson extends configFile_1.ConfigFile {
         const uniqueValues = [];
         // Keep original order defined in sfdx-project.json
         this.getPackageDirectoriesSync().forEach((packageDir) => {
-            if (!visited[packageDir.path]) {
-                visited[packageDir.path] = true;
+            if (!visited[packageDir.name]) {
+                visited[packageDir.name] = true;
                 uniqueValues.push(packageDir);
             }
         });
@@ -236,7 +236,7 @@ class SfProjectJson extends configFile_1.ConfigFile {
      * for data other than the names.
      */
     getUniquePackageNames() {
-        return this.getUniquePackageDirectories().map((pkgDir) => pkgDir.package || pkgDir.path);
+        return this.getUniquePackageDirectories().map((pkgDir) => pkgDir.name);
     }
     /**
      * Has package directories defined in the project.
@@ -489,7 +489,7 @@ class SfProject {
      */
     getPackageFromPath(path) {
         const packageDirs = this.getPackageDirectories();
-        const match = packageDirs.find((packageDir) => (0, path_1.basename)(path) === packageDir.path || path.includes(packageDir.fullPath));
+        const match = packageDirs.find((packageDir) => (0, path_1.basename)(path) === packageDir.name || path.includes(packageDir.fullPath));
         return match;
     }
     /**
@@ -499,7 +499,7 @@ class SfProject {
      */
     getPackageNameFromPath(path) {
         const packageDir = this.getPackageFromPath(path);
-        return packageDir ? packageDir.package || packageDir.path : undefined;
+        return packageDir ? packageDir.name : undefined;
     }
     /**
      * Returns the package directory.
@@ -508,7 +508,7 @@ class SfProject {
      */
     getPackage(packageName) {
         const packageDirs = this.getPackageDirectories();
-        return packageDirs.find((packageDir) => packageDir.package === packageName || packageDir.path === packageName);
+        return packageDirs.find((packageDir) => packageDir.name === packageName);
     }
     /**
      * Returns the absolute path of the package directory ending with the path separator.
@@ -518,7 +518,7 @@ class SfProject {
      */
     getPackagePath(packageName) {
         const packageDir = this.getPackage(packageName);
-        return packageDir?.fullPath;
+        return packageDir && packageDir.fullPath;
     }
     /**
      * Has package directories defined in the project.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "3.30.4",
+  "version": "3.30.8",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",