@salesforce/packaging 4.27.6 → 4.27.7

package/lib/package/packageVersionCreate.js

@@ -121,20 +121,40 @@ class PackageVersionCreate {
         const branch = dependency.branch ?? this.options.branch;
         const branchString = !branch ? 'null' : `'${branch}'`;
         // resolve a build number keyword to an actual number, if needed
-        const resolvedBuildNumber = await this.resolveBuildNumber(versionNumber, dependency.packageId, branch);
+        let resolvedBuildNumber;
+        let effectiveBranchString = branchString;
+        try {
+            resolvedBuildNumber = await this.resolveBuildNumber(versionNumber, dependency.packageId, branch);
+        }
+        catch (e) {
+            // when --branch was inherited (not set on the dependency itself) and LATEST resolution fails
+            // specifically because no version exists on that branch, fall back to null branch
+            if (e instanceof Error &&
+                e.name === 'NoReleaseVersionFoundForBranchError' &&
+                dependency.branch === undefined &&
+                this.options.branch &&
+                buildNumber === versionNumber_1.BuildNumberToken.LATEST_BUILD_NUMBER_TOKEN) {
+                this.logger.info(`Dependency ${dependency.package ?? dependency.packageId} has no versions on branch '${String(branch)}'. Falling back to unscoped (no branch) resolution.`);
+                effectiveBranchString = 'null';
+                resolvedBuildNumber = await this.resolveBuildNumber(versionNumber, dependency.packageId, undefined);
+            }
+            else {
+                throw e;
+            }
+        }
         // now that we have a full build number, query for the associated 04t.
         // because the build number may not be unique across versions, add in conditionals for
         // the branch or the RELEASED token (if used)
         const branchOrReleasedCondition = buildNumber === versionNumber_1.BuildNumberToken.RELEASED_BUILD_NUMBER_TOKEN
             ? 'AND IsReleased = true'
-            : `AND Branch = ${branchString}`;
+            : `AND Branch = ${effectiveBranchString}`;
         const query = `SELECT SubscriberPackageVersionId FROM Package2Version WHERE Package2Id = '${dependency.packageId}' AND MajorVersion = ${versionNumber.major} AND MinorVersion = ${versionNumber.minor} AND PatchVersion = ${versionNumber.patch} AND BuildNumber = ${resolvedBuildNumber} ${branchOrReleasedCondition}`;
         const pkgVerQueryResult = await this.connection.tooling.query(query);
         const subRecords = pkgVerQueryResult.records;
         if (!subRecords || subRecords.length !== 1) {
             throw messages.createError('versionNumberNotFoundInDevHub', [
                 dependency.packageId,
-                branchString,
+                effectiveBranchString,
                 versionNumber.toString(),
                 resolvedBuildNumber,
             ]);
@@ -146,7 +166,7 @@ class PackageVersionCreate {
                 this.logger.info(messages.getMessage('buildNumberResolvedForLatest', [
                     dependency.package,
                     versionNumber.toString(),
-                    branchString,
+                    effectiveBranchString,
                     dependency.subscriberPackageVersionId,
                 ]));
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/packaging",
-  "version": "4.27.6",
+  "version": "4.27.7",
   "description": "Packaging library for the Salesforce packaging platform",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",