Merge pull request #766 from forcedotcom/t/packaging-distribution/W-19170618/Bug-Fixes

feat: version ovveride

Author: dawson-david-salesforce

scripts/Icon

@@ -184,15 +184,14 @@ export class PackageBundleVersion {
     id: string
   ): Promise<PackagingSObjects.SubscriberPackageVersion[]> {
     const query =
-      'SELECT Component.Id, Component.Name, Component.Description, Component.PublisherName, Component.MajorVersion, Component.MinorVersion, Component.PatchVersion, Component.BuildNumber, Component.ReleaseState, Component.IsManaged, Component.IsDeprecated, Component.IsPasswordProtected, Component.IsBeta, Component.Package2ContainerOptions, Component.IsSecurityReviewed, Component.IsOrgDependent, Component.AppExchangePackageName, Component.AppExchangeDescription, Component.AppExchangePublisherName, Component.AppExchangeLogoUrl, Component.ReleaseNotesUrl, Component.PostInstallUrl, Component.RemoteSiteSettings, Component.CspTrustedSites, Component.Profiles, Component.Dependencies, Component.InstallValidationStatus, Component.SubscriberPackageId ' +
+      'SELECT Component.Id, Component.Description, Component.PublisherName, Component.MajorVersion, Component.MinorVersion, Component.PatchVersion, Component.BuildNumber, Component.ReleaseState, Component.IsManaged, Component.IsDeprecated, Component.IsPasswordProtected, Component.IsBeta, Component.Package2ContainerOptions, Component.IsSecurityReviewed, Component.IsOrgDependent, Component.AppExchangePackageName, Component.AppExchangeDescription, Component.AppExchangePublisherName, Component.AppExchangeLogoUrl, Component.ReleaseNotesUrl, Component.PostInstallUrl, Component.RemoteSiteSettings, Component.CspTrustedSites, Component.Profiles, Component.Dependencies, Component.InstallValidationStatus, Component.SubscriberPackageId ' +
       "FROM PkgBundleVersionComponent WHERE PackageBundleVersion.Id = '" +
       id +
       "' ORDER BY CreatedDate";
     const queryResult = await connection.autoFetchQuery<
       Schema & {
         Component?: {
           Id: string;
-          Name: string;
           Description: string;
           PublisherName: string;
           MajorVersion: number;
@@ -222,15 +221,58 @@ export class PackageBundleVersion {
         };
       }
     >(query, { tooling: true });
+
+    // Get unique SubscriberPackageIds to query for Names
+    const subscriberPackageIds = [
+      ...new Set(
+        queryResult.records
+          .map((record) => record.Component?.SubscriberPackageId)
+          .filter((packageId): packageId is string => !!packageId)
+      ),
+    ];
+
+    // Query SubscriberPackage to get Names (one by one due to implementation restriction)
+    const subscriberPackageNames = new Map<string, string>();
+    const packageQueries = subscriberPackageIds.map(async (packageId) => {
+      try {
+        const packageQuery = `SELECT Id, Name FROM SubscriberPackage WHERE Id='${packageId}'`;
+        const packageQueryResult = await connection.autoFetchQuery<
+          Schema & {
+            Id: string;
+            Name: string;
+          }
+        >(packageQuery, { tooling: true });
+
+        return {
+          packageId,
+          name: packageQueryResult.records.length > 0 ? packageQueryResult.records[0].Name : '',
+        };
+      } catch (error) {
+        // If individual query fails, return empty name for this package
+        return {
+          packageId,
+          name: '',
+        };
+      }
+    });
+
+    const packageResults = await Promise.allSettled(packageQueries);
+    packageResults.forEach((result) => {
+      if (result.status === 'fulfilled') {
+        subscriberPackageNames.set(result.value.packageId, result.value.name);
+      }
+    });
+
     return queryResult.records.map((record) => {
       const component = record.Component;
       if (!component) {
         throw new Error(bundleVersionMessages.getMessage('componentRecordMissing'));
       }
+      const packageName = subscriberPackageNames.get(component.SubscriberPackageId) ?? '';
       return {
         Id: component.Id,
         SubscriberPackageId: component.SubscriberPackageId,
-        Name: component.Name,
+        Name: packageName,
         Description: component.Description,
         PublisherName: component.PublisherName,
         MajorVersion: component.MajorVersion,

src/package/packageBundleVersion.ts

@@ -75,7 +75,12 @@ export class PackageBundleVersionCreate {
       project
     );
     const packageBundleId = PackageBundleVersionCreate.parsePackageBundleId(options.PackageBundle, project);
-    const version = await PackageBundleVersionCreate.getPackageVersion(options, project, connection);
+
+    // Use provided MajorVersion and MinorVersion if they are not empty strings, otherwise get from bundle configuration
+    const version =
+      options.MajorVersion && options.MinorVersion
+        ? { MajorVersion: options.MajorVersion, MinorVersion: options.MinorVersion }
+        : await PackageBundleVersionCreate.getPackageVersion(options, project, connection);
 
     const request: BundleSObjects.PkgBundleVersionCreateReq = {
       PackageBundleId: packageBundleId,

src/package/packageBundleVersionCreate.ts

@@ -355,6 +355,26 @@ describe('PackageBundleVersion', () => {
             totalSize: 2,
             records: mockComponentPackages,
           });
+        } else if (
+          request &&
+          ensureString(requestMap.url).includes('SubscriberPackage') &&
+          ensureString(requestMap.url).includes('0330000000000001')
+        ) {
+          return Promise.resolve({
+            done: true,
+            totalSize: 1,
+            records: [{ Id: '0330000000000001', Name: 'Test Package 1' }],
+          });
+        } else if (
+          request &&
+          ensureString(requestMap.url).includes('SubscriberPackage') &&
+          ensureString(requestMap.url).includes('0330000000000002')
+        ) {
+          return Promise.resolve({
+            done: true,
+            totalSize: 1,
+            records: [{ Id: '0330000000000002', Name: 'Test Package 2' }],
+          });
         } else {
           return Promise.reject(new SfError(`Unexpected request: ${String(requestMap.url)}`));
         }