@salesforce/core 3.30.8 → 3.30.10

package/lib/org/connection.js

@@ -26,6 +26,7 @@ const messages = messages_1.Messages.load('@salesforce/core', 'connection', [
     'incorrectAPIVersionError',
     'domainNotFoundError',
     'noInstanceUrlError',
+    'noApiVersionsError',
 ]);
 const clientId = `sfdx toolbelt:${process.env.SFDX_SET_CLIENT_IDS || ''}`;
 exports.SFDX_HTTP_HEADERS = {
@@ -178,6 +179,11 @@ class Connection extends jsforce_1.Connection {
     async retrieveMaxApiVersion() {
         await this.isResolvable();
         const versions = await this.request(`${this.instanceUrl}/services/data`);
+        // if the server doesn't return a list of versions, it's possibly a instanceUrl issue where the local file is out of date.
+        if (!Array.isArray(versions)) {
+            this.logger.debug(`server response for retrieveMaxApiVersion: ${versions}`);
+            throw messages.createError('noApiVersionsError');
+        }
         this.logger.debug(`response for org versions: ${versions.map((item) => item.version).join(',')}`);
         const max = (0, ts_types_1.ensure)((0, kit_1.maxBy)(versions, (version) => version.version));
         return max.version;

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/messages/connection.md

@@ -20,3 +20,11 @@ Connection has no instanceUrl.
 # noInstanceUrlError.actions
 
 Make sure the instanceUrl is set in your command or config.
+
+# noApiVersionsError
+
+Org failed to respond with its list of API versions. This is usually the result of domain changes like activating MyDomain or Enhanced Domains
+
+# noApiVersionsError.actions
+
+Re-authenticate to the org.

package/package.json

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