Skip to content

Commit

Permalink
feat: expose branch depTypes for templating (#27948)
Browse files Browse the repository at this point in the history
  • Loading branch information
rarkins committed Mar 15, 2024
1 parent 5f4af40 commit 55205fb
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 0 deletions.
2 changes: 2 additions & 0 deletions lib/util/template/index.ts
Expand Up @@ -88,6 +88,8 @@ export const allowedFields = {
depNameSanitized:
'The depName field sanitized for use in branches after removing spaces and special characters',
depType: 'The dependency type (if extracted - manager-dependent)',
depTypes:
'A deduplicated array of dependency types (if extracted - manager-dependent) in a branch',
displayFrom: 'The current value, formatted for display',
displayPending: 'Latest pending update, if internalChecksFilter is in use',
displayTo: 'The to value, formatted for display',
Expand Down
25 changes: 25 additions & 0 deletions lib/workers/repository/updates/generate.spec.ts
Expand Up @@ -1443,5 +1443,30 @@ describe('workers/repository/updates/generate', () => {
const res = generateBranchConfig(upgrades);
expect(res.additionalReviewers).toEqual(['foo', 'bar']);
});

it('merges depTypes', () => {
const upgrades = [
{
...requiredDefaultOptions,
branchName: 'some-branch',
manager: 'some-manager',
depType: 'devDependencies',
},
{
...requiredDefaultOptions,
branchName: 'some-branch',
manager: 'some-manager',
depType: 'dependencies',
},
{
...requiredDefaultOptions,
branchName: 'some-branch',
manager: 'some-manager',
depType: 'devDependencies',
},
] satisfies BranchUpgradeConfig[];
const res = generateBranchConfig(upgrades);
expect(res.depTypes).toEqual(['dependencies', 'devDependencies']);
});
});
});
7 changes: 7 additions & 0 deletions lib/workers/repository/updates/generate.ts
Expand Up @@ -83,6 +83,7 @@ export function generateBranchConfig(
const newValue: string[] = [];
const toVersions: string[] = [];
const toValues = new Set<string>();
const depTypes = new Set<string>();
for (const upg of branchUpgrades) {
upg.recreateClosed = upg.recreateWhen === 'always';

Expand Down Expand Up @@ -119,6 +120,9 @@ export function generateBranchConfig(
toVersions.push(upg.newVersion!);
}
toValues.add(upg.newValue!);
if (upg.depType) {
depTypes.add(upg.depType);
}
// prettify newVersion and newMajor for printing
if (upg.newVersion) {
upg.prettyNewVersion = prettifyVersion(upg.newVersion);
Expand Down Expand Up @@ -425,5 +429,8 @@ export function generateBranchConfig(
if (additionalReviewers.length > 0) {
config.additionalReviewers = additionalReviewers;
}
if (depTypes.size) {
config.depTypes = Array.from(depTypes).sort();
}
return config;
}

0 comments on commit 55205fb

Please sign in to comment.