@salesforce/core 3.30.7 → 3.30.9

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: PackageDir): void;
+    addPackageDirectory(packageDir: NamedPackageDir): void;
     private doesPackageExist;
     private validateKeys;
 }
@@ -285,6 +285,12 @@ export declare class SfProject {
      * @param packageName Name of the package directory.  E.g., 'force-app'
      */
     getPackage(packageName: string): Optional<NamedPackageDir>;
+    /**
+     * Returns the package directory.
+     *
+     * @param packageName Name of the package directory.  E.g., 'force-app'
+     */
+    findPackage(predicate: (packageDir: NamedPackageDir) => boolean): Optional<NamedPackageDir>;
     /**
      * Returns the absolute path of the package directory ending with the path separator.
      * E.g., /Users/jsmith/projects/ebikes-lwc/force-app/

package/lib/sfProject.js

@@ -220,12 +220,12 @@ class SfProjectJson extends configFile_1.ConfigFile {
      * for packaging operations that want to do something for each package entry.
      */
     getUniquePackageDirectories() {
-        const visited = {};
+        const visited = new Set();
         const uniqueValues = [];
         // Keep original order defined in sfdx-project.json
         this.getPackageDirectoriesSync().forEach((packageDir) => {
-            if (!visited[packageDir.name]) {
-                visited[packageDir.name] = true;
+            if (!visited.has(packageDir.name)) {
+                visited.add(packageDir.name);
                 uniqueValues.push(packageDir);
             }
         });
@@ -289,10 +289,19 @@ class SfProjectJson extends configFile_1.ConfigFile {
      * @param packageDir
      */
     addPackageDirectory(packageDir) {
-        const dirIndex = this.getContents().packageDirectories.findIndex((pkgDir) => {
-            return pkgDir.package === packageDir.package;
+        // there is no notion of uniqueness in package directory entries
+        // so an attempt of matching an existing entry is a bit convoluted
+        // an entry w/o a package or id is considered a directory entry for which a package has yet to be created
+        // so first attempt is to find a matching dir entry that where path is the same and id and package are not present
+        // if that fails, then find a matching dir entry package is present and is same as the new entry
+        const dirIndex = this.getContents().packageDirectories.findIndex((pd) => {
+            const withId = pd;
+            return ((withId.path === packageDir.path && !withId.id && !withId.package) ||
+                (!!packageDir.package && packageDir.package === withId.package));
         });
+        // merge new package dir with existing entry, if present
         const packageDirEntry = Object.assign({}, dirIndex > -1 ? this.getContents().packageDirectories[dirIndex] : packageDir, packageDir);
+        // update package dir entries
         if (dirIndex > -1) {
             this.getContents().packageDirectories[dirIndex] = packageDirEntry;
         }
@@ -489,7 +498,7 @@ class SfProject {
      */
     getPackageFromPath(path) {
         const packageDirs = this.getPackageDirectories();
-        const match = packageDirs.find((packageDir) => (0, path_1.basename)(path) === packageDir.name || path.includes(packageDir.fullPath));
+        const match = packageDirs.find((packageDir) => (0, path_1.basename)(path) === packageDir.path || path.includes(packageDir.fullPath));
         return match;
     }
     /**
@@ -499,7 +508,7 @@ class SfProject {
      */
     getPackageNameFromPath(path) {
         const packageDir = this.getPackageFromPath(path);
-        return packageDir ? packageDir.name : undefined;
+        return packageDir ? packageDir.package || packageDir.path : undefined;
     }
     /**
      * Returns the package directory.
@@ -510,6 +519,14 @@ class SfProject {
         const packageDirs = this.getPackageDirectories();
         return packageDirs.find((packageDir) => packageDir.name === packageName);
     }
+    /**
+     * Returns the package directory.
+     *
+     * @param packageName Name of the package directory.  E.g., 'force-app'
+     */
+    findPackage(predicate) {
+        return this.getPackageDirectories().find(predicate);
+    }
     /**
      * Returns the absolute path of the package directory ending with the path separator.
      * E.g., /Users/jsmith/projects/ebikes-lwc/force-app/
@@ -518,7 +535,7 @@ class SfProject {
      */
     getPackagePath(packageName) {
         const packageDir = this.getPackage(packageName);
-        return packageDir && packageDir.fullPath;
+        return packageDir?.fullPath;
     }
     /**
      * Has package directories defined in the project.
@@ -561,7 +578,7 @@ class SfProject {
         if (!this.hasPackages()) {
             throw new sfError_1.SfError('The sfdx-project.json does not have any packageDirectories defined.');
         }
-        const defaultPackage = this.getPackageDirectories().find((packageDir) => packageDir.default === true);
+        const defaultPackage = this.findPackage((packageDir) => packageDir.default === true);
         return defaultPackage || this.getPackageDirectories()[0];
     }
     /**

package/package.json

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