feat(util/template): add prettyVersion field

lib/config/options/index.ts

@@ -1639,7 +1639,7 @@ const options: RenovateOptions[] = [
       'Extra description used after the commit message topic - typically the version.',
     type: 'string',
     default:
-      'to {{#if isPinDigest}}{{{newDigestShort}}}{{else}}{{#if isMajor}}v{{{newMajor}}}{{else}}{{#if isSingleVersion}}v{{{newVersion}}}{{else}}{{#if newValue}}{{{newValue}}}{{else}}{{{newDigestShort}}}{{/if}}{{/if}}{{/if}}{{/if}}',
+      'to {{#if isPinDigest}}{{{newDigestShort}}}{{else}}{{#if isMajor}}v{{{newMajor}}}{{else}}{{#if isSingleVersion}}{{prettyVersion}}{{else}}{{#if newValue}}{{{newValue}}}{{else}}{{{newDigestShort}}}{{/if}}{{/if}}{{/if}}{{/if}}',
     cli: false,
   },
   {

lib/modules/manager/types.ts

@@ -112,6 +112,8 @@ export interface Package<T> extends ManagerData<T> {
   currentRawValue?: string;
   major?: { enabled?: boolean };
   prettyDepType?: string;
+
+  prettyVersion?: string;
 }
 
 export interface LookupUpdate {

lib/util/template/index.ts

@@ -117,6 +117,7 @@ export const allowedFields = {
     'The name of the directory that the dependency was found in, without full path',
   platform: 'VCS platform in use, e.g. "github", "gitlab", etc.',
   prettyDepType: 'Massaged depType',
+  prettyVersion: 'The new version value with v prepended to it.',
   project: 'ChangeLogProject object',
   recreateClosed: 'If true, this PR will be recreated if closed',
   references: 'A list of references for the upgrade',

lib/workers/repository/updates/__snapshots__/generate.spec.ts.snap

@@ -156,6 +156,7 @@ Object {
       "newVersion": "0.5.8",
       "prTitle": "some-title",
       "prettyDepType": "dependency",
+      "prettyVersion": "v0.5.8",
     },
   ],
 }
@@ -221,6 +222,7 @@ Object {
   "prBodyColumns": Array [],
   "prTitle": "some-title",
   "prettyDepType": "dependency",
+  "prettyVersion": "v1.0.1",
   "releaseTimestamp": undefined,
   "reuseLockFiles": true,
   "upgrades": Array [
@@ -240,6 +242,7 @@ Object {
       "newVersion": "1.0.1",
       "prTitle": "some-title",
       "prettyDepType": "dependency",
+      "prettyVersion": "v1.0.1",
     },
   ],
 }

lib/workers/repository/updates/generate.spec.ts

@@ -80,6 +80,7 @@ describe('workers/repository/updates/generate', () => {
         newValue: '^1.0.0',
         newVersion: '1.0.1',
         reuseLockFiles: true,
+        prettyVersion: 'v1.0.1',
         upgrades: [
           {
             branchName: 'some-branch',
@@ -90,6 +91,7 @@ describe('workers/repository/updates/generate', () => {
             lockedVersion: '1.0.0',
             newValue: '^1.0.0',
             newVersion: '1.0.1',
+            prettyVersion: 'v1.0.1',
           },
         ],
       });
@@ -564,6 +566,95 @@ describe('workers/repository/updates/generate', () => {
       );
     });
 
+    it('use prettyVersion in pr title when there is a v', () => {
+      const branch: BranchUpgradeConfig[] = [
+        {
+          ...defaultConfig,
+          manager: 'some-manager',
+          depName: 'some-dep',
+          packageFile: 'foo/bar/package.json',
+          packageFileDir: 'foo/bar',
+          semanticCommits: 'enabled',
+          semanticCommitType: 'chore',
+          semanticCommitScope: '{{packageFileDir}}',
+          commitMessageExtra: '{{prettyVersion}}',
+          newValue: 'v1.2.0',
+          isSingleVersion: true,
+          newVersion: 'v1.2.0',
+        } as BranchUpgradeConfig,
+      ];
+      const res = generateBranchConfig(branch);
+      expect(res.prTitle).toBe(
+        'chore(foo/bar): update dependency some-dep v1.2.0'
+      );
+    });
+
+    it('use prettyVersion in pr title there is no v', () => {
+      const branch: BranchUpgradeConfig[] = [
+        {
+          ...defaultConfig,
+          manager: 'some-manager',
+          depName: 'some-dep',
+          packageFile: 'foo/bar/package.json',
+          packageFileDir: 'foo/bar',
+          semanticCommits: 'enabled',
+          semanticCommitType: 'chore',
+          semanticCommitScope: '{{packageFileDir}}',
+          commitMessageExtra: '{{prettyVersion}}',
+          newValue: '3.2.0',
+          newVersion: '3.2.0',
+          newMajor: 3,
+        } as BranchUpgradeConfig,
+      ];
+      const res = generateBranchConfig(branch);
+      expect(res.prTitle).toBe(
+        'chore(foo/bar): update dependency some-dep v3.2.0'
+      );
+    });
+
+    it('use newMajor in pr title with v', () => {
+      const branch: BranchUpgradeConfig[] = [
+        {
+          ...defaultConfig,
+          manager: 'some-manager',
+          depName: 'some-dep',
+          packageFile: 'foo/bar/package.json',
+          packageFileDir: 'foo/bar',
+          semanticCommits: 'enabled',
+          semanticCommitType: 'chore',
+          semanticCommitScope: '{{packageFileDir}}',
+          commitMessageExtra: 'v{{newMajor}}',
+          newValue: '3.2.0',
+          newVersion: '3.2.0',
+          newMajor: 3,
+        } as BranchUpgradeConfig,
+      ];
+      const res = generateBranchConfig(branch);
+      expect(res.prTitle).toBe('chore(foo/bar): update dependency some-dep v3');
+    });
+
+    it('Default commitMessageExtra pr title', () => {
+      const branch: BranchUpgradeConfig[] = [
+        {
+          ...defaultConfig,
+          manager: 'some-manager',
+          depName: 'some-dep',
+          packageFile: 'foo/bar/package.json',
+          packageFileDir: 'foo/bar',
+          semanticCommits: 'enabled',
+          semanticCommitType: 'chore',
+          semanticCommitScope: '{{packageFileDir}}',
+          newValue: 'v1.2.0',
+          isSingleVersion: true,
+          newVersion: 'v1.2.0',
+        } as BranchUpgradeConfig,
+      ];
+      const res = generateBranchConfig(branch);
+      expect(res.prTitle).toBe(
+        'chore(foo/bar): update dependency some-dep to v1.2.0'
+      );
+    });
+
     it('adds commit message body', () => {
       // TODO #7154 incompatible types
       const branch: BranchUpgradeConfig[] = [

lib/workers/repository/updates/generate.ts

@@ -182,6 +182,12 @@ export function generateBranchConfig(
         regEx(/[A-Z]/).exec(upgrade.semanticCommitType!) === null &&
         !upgrade.semanticCommitType!.startsWith(':');
     }
+    // prettify version for printing
+    if (upgrade.newVersion) {
+      upgrade.prettyVersion = upgrade.newVersion.startsWith('v')
+        ? upgrade.newVersion
+        : `v${upgrade.newVersion}`;
+    }
     // Compile a few times in case there are nested templates
     upgrade.commitMessage = template.compile(
       upgrade.commitMessage ?? '',