generated from nhcarrigan/template
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 minori
|
2da0c7fe17 |
+4
-4
@@ -20,16 +20,16 @@
|
||||
"@types/node": "25.2.0",
|
||||
"@types/node-cron": "3.0.11",
|
||||
"@types/semver": "7.7.1",
|
||||
"@vitest/coverage-istanbul": "4.0.18",
|
||||
"@vitest/coverage-v8": "4.1.0",
|
||||
"@vitest/coverage-istanbul": "^4.0.18",
|
||||
"@vitest/coverage-v8": "^4.0.18",
|
||||
"eslint": "9.39.2",
|
||||
"typescript": "5.9.3",
|
||||
"vitest": "4.0.18"
|
||||
"vitest": "^4.0.18"
|
||||
},
|
||||
"dependencies": {
|
||||
"@nhcarrigan/logger": "1.1.1",
|
||||
"axios": "1.13.4",
|
||||
"node-cron": "4.2.1",
|
||||
"semver": "7.7.3"
|
||||
"semver": "7.7.4"
|
||||
}
|
||||
}
|
||||
|
||||
Generated
+28
-58
@@ -18,8 +18,8 @@ importers:
|
||||
specifier: 4.2.1
|
||||
version: 4.2.1
|
||||
semver:
|
||||
specifier: 7.7.3
|
||||
version: 7.7.3
|
||||
specifier: 7.7.4
|
||||
version: 7.7.4
|
||||
devDependencies:
|
||||
'@nhcarrigan/eslint-config':
|
||||
specifier: 5.2.0
|
||||
@@ -37,11 +37,11 @@ importers:
|
||||
specifier: 7.7.1
|
||||
version: 7.7.1
|
||||
'@vitest/coverage-istanbul':
|
||||
specifier: 4.0.18
|
||||
specifier: ^4.0.18
|
||||
version: 4.0.18(vitest@4.0.18(@types/node@25.2.0))
|
||||
'@vitest/coverage-v8':
|
||||
specifier: 4.1.0
|
||||
version: 4.1.0(vitest@4.0.18(@types/node@25.2.0))
|
||||
specifier: ^4.0.18
|
||||
version: 4.0.18(vitest@4.0.18(@types/node@25.2.0))
|
||||
eslint:
|
||||
specifier: 9.39.2
|
||||
version: 9.39.2
|
||||
@@ -49,7 +49,7 @@ importers:
|
||||
specifier: 5.9.3
|
||||
version: 5.9.3
|
||||
vitest:
|
||||
specifier: 4.0.18
|
||||
specifier: ^4.0.18
|
||||
version: 4.0.18(@types/node@25.2.0)
|
||||
|
||||
packages:
|
||||
@@ -697,11 +697,11 @@ packages:
|
||||
peerDependencies:
|
||||
vitest: 4.0.18
|
||||
|
||||
'@vitest/coverage-v8@4.1.0':
|
||||
resolution: {integrity: sha512-nDWulKeik2bL2Va/Wl4x7DLuTKAXa906iRFooIRPR+huHkcvp9QDkPQ2RJdmjOFrqOqvNfoSQLF68deE3xC3CQ==}
|
||||
'@vitest/coverage-v8@4.0.18':
|
||||
resolution: {integrity: sha512-7i+N2i0+ME+2JFZhfuz7Tg/FqKtilHjGyGvoHYQ6iLV0zahbsJ9sljC9OcFcPDbhYKCet+sG8SsVqlyGvPflZg==}
|
||||
peerDependencies:
|
||||
'@vitest/browser': 4.1.0
|
||||
vitest: 4.1.0
|
||||
'@vitest/browser': 4.0.18
|
||||
vitest: 4.0.18
|
||||
peerDependenciesMeta:
|
||||
'@vitest/browser':
|
||||
optional: true
|
||||
@@ -736,9 +736,6 @@ packages:
|
||||
'@vitest/pretty-format@4.0.18':
|
||||
resolution: {integrity: sha512-P24GK3GulZWC5tz87ux0m8OADrQIUVDPIjjj65vBXYG17ZeU3qD7r+MNZ1RNv4l8CGU2vtTRqixrOi9fYk/yKw==}
|
||||
|
||||
'@vitest/pretty-format@4.1.0':
|
||||
resolution: {integrity: sha512-3RZLZlh88Ib0J7NQTRATfc/3ZPOnSUn2uDBUoGNn5T36+bALixmzphN26OUD3LRXWkJu4H0s5vvUeqBiw+kS0A==}
|
||||
|
||||
'@vitest/runner@4.0.18':
|
||||
resolution: {integrity: sha512-rpk9y12PGa22Jg6g5M3UVVnTS7+zycIGk9ZNGN+m6tZHKQb7jrP7/77WfZy13Y/EUDd52NDsLRQhYKtv7XfPQw==}
|
||||
|
||||
@@ -751,9 +748,6 @@ packages:
|
||||
'@vitest/utils@4.0.18':
|
||||
resolution: {integrity: sha512-msMRKLMVLWygpK3u2Hybgi4MNjcYJvwTb0Ru09+fOyCXIgT5raYP041DRRdiJiI3k/2U6SEbAETB3YtBrUkCFA==}
|
||||
|
||||
'@vitest/utils@4.1.0':
|
||||
resolution: {integrity: sha512-XfPXT6a8TZY3dcGY8EdwsBulFCIw+BeeX0RZn2x/BtiY/75YGh8FeWGG8QISN/WhaqSrE2OrlDgtF8q5uhOTmw==}
|
||||
|
||||
acorn-jsx@5.3.2:
|
||||
resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
|
||||
peerDependencies:
|
||||
@@ -823,8 +817,8 @@ packages:
|
||||
resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==}
|
||||
engines: {node: '>=12'}
|
||||
|
||||
ast-v8-to-istanbul@1.0.0:
|
||||
resolution: {integrity: sha512-1fSfIwuDICFA4LKkCzRPO7F0hzFf0B7+Xqrl27ynQaa+Rh0e1Es0v6kWHPott3lU10AyAr7oKHa65OppjLn3Rg==}
|
||||
ast-v8-to-istanbul@0.3.11:
|
||||
resolution: {integrity: sha512-Qya9fkoofMjCBNVdWINMjB5KZvkYfaO9/anwkWnjxibpWUxo5iHl2sOdP7/uAqaRuUYuoo8rDwnbaaKVFxoUvw==}
|
||||
|
||||
async-function@1.0.0:
|
||||
resolution: {integrity: sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==}
|
||||
@@ -1576,9 +1570,6 @@ packages:
|
||||
magicast@0.5.1:
|
||||
resolution: {integrity: sha512-xrHS24IxaLrvuo613F719wvOIv9xPHFWQHuvGUBmPnCA/3MQxKI3b+r7n1jAoDHmsbC5bRhTZYR77invLAxVnw==}
|
||||
|
||||
magicast@0.5.2:
|
||||
resolution: {integrity: sha512-E3ZJh4J3S9KfwdjZhe2afj6R9lGIN5Pher1pF39UGrXRqq/VDaGVIGN13BjHd2u8B61hArAGOnso7nBOouW3TQ==}
|
||||
|
||||
make-dir@4.0.0:
|
||||
resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==}
|
||||
engines: {node: '>=10'}
|
||||
@@ -1861,8 +1852,8 @@ packages:
|
||||
resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
|
||||
hasBin: true
|
||||
|
||||
semver@7.7.3:
|
||||
resolution: {integrity: sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==}
|
||||
semver@7.7.4:
|
||||
resolution: {integrity: sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==}
|
||||
engines: {node: '>=10'}
|
||||
hasBin: true
|
||||
|
||||
@@ -1937,9 +1928,6 @@ packages:
|
||||
std-env@3.10.0:
|
||||
resolution: {integrity: sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg==}
|
||||
|
||||
std-env@4.0.0:
|
||||
resolution: {integrity: sha512-zUMPtQ/HBY3/50VbpkupYHbRroTRZJPRLvreamgErJVys0ceuzMkD44J/QjqhHjOzK42GQ3QZIeFG1OYfOtKqQ==}
|
||||
|
||||
stop-iteration-iterator@1.1.0:
|
||||
resolution: {integrity: sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==}
|
||||
engines: {node: '>= 0.4'}
|
||||
@@ -2728,7 +2716,7 @@ snapshots:
|
||||
globby: 11.1.0
|
||||
is-glob: 4.0.3
|
||||
minimatch: 9.0.5
|
||||
semver: 7.7.3
|
||||
semver: 7.7.4
|
||||
ts-api-utils: 1.4.3(typescript@5.9.3)
|
||||
optionalDependencies:
|
||||
typescript: 5.9.3
|
||||
@@ -2743,7 +2731,7 @@ snapshots:
|
||||
fast-glob: 3.3.3
|
||||
is-glob: 4.0.3
|
||||
minimatch: 9.0.5
|
||||
semver: 7.7.3
|
||||
semver: 7.7.4
|
||||
ts-api-utils: 1.4.3(typescript@5.9.3)
|
||||
typescript: 5.9.3
|
||||
transitivePeerDependencies:
|
||||
@@ -2757,7 +2745,7 @@ snapshots:
|
||||
'@typescript-eslint/visitor-keys': 8.54.0
|
||||
debug: 4.4.3
|
||||
minimatch: 9.0.5
|
||||
semver: 7.7.3
|
||||
semver: 7.7.4
|
||||
tinyglobby: 0.2.15
|
||||
ts-api-utils: 2.4.0(typescript@5.9.3)
|
||||
typescript: 5.9.3
|
||||
@@ -2828,17 +2816,17 @@ snapshots:
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
'@vitest/coverage-v8@4.1.0(vitest@4.0.18(@types/node@25.2.0))':
|
||||
'@vitest/coverage-v8@4.0.18(vitest@4.0.18(@types/node@25.2.0))':
|
||||
dependencies:
|
||||
'@bcoe/v8-coverage': 1.0.2
|
||||
'@vitest/utils': 4.1.0
|
||||
ast-v8-to-istanbul: 1.0.0
|
||||
'@vitest/utils': 4.0.18
|
||||
ast-v8-to-istanbul: 0.3.11
|
||||
istanbul-lib-coverage: 3.2.2
|
||||
istanbul-lib-report: 3.0.1
|
||||
istanbul-reports: 3.2.0
|
||||
magicast: 0.5.2
|
||||
magicast: 0.5.1
|
||||
obug: 2.1.1
|
||||
std-env: 4.0.0
|
||||
std-env: 3.10.0
|
||||
tinyrainbow: 3.0.3
|
||||
vitest: 4.0.18(@types/node@25.2.0)
|
||||
|
||||
@@ -2871,10 +2859,6 @@ snapshots:
|
||||
dependencies:
|
||||
tinyrainbow: 3.0.3
|
||||
|
||||
'@vitest/pretty-format@4.1.0':
|
||||
dependencies:
|
||||
tinyrainbow: 3.0.3
|
||||
|
||||
'@vitest/runner@4.0.18':
|
||||
dependencies:
|
||||
'@vitest/utils': 4.0.18
|
||||
@@ -2893,12 +2877,6 @@ snapshots:
|
||||
'@vitest/pretty-format': 4.0.18
|
||||
tinyrainbow: 3.0.3
|
||||
|
||||
'@vitest/utils@4.1.0':
|
||||
dependencies:
|
||||
'@vitest/pretty-format': 4.1.0
|
||||
convert-source-map: 2.0.0
|
||||
tinyrainbow: 3.0.3
|
||||
|
||||
acorn-jsx@5.3.2(acorn@7.4.1):
|
||||
dependencies:
|
||||
acorn: 7.4.1
|
||||
@@ -2997,7 +2975,7 @@ snapshots:
|
||||
|
||||
assertion-error@2.0.1: {}
|
||||
|
||||
ast-v8-to-istanbul@1.0.0:
|
||||
ast-v8-to-istanbul@0.3.11:
|
||||
dependencies:
|
||||
'@jridgewell/trace-mapping': 0.3.31
|
||||
estree-walker: 3.0.3
|
||||
@@ -3374,7 +3352,7 @@ snapshots:
|
||||
espree: 10.4.0
|
||||
esquery: 1.7.0
|
||||
parse-imports: 2.2.1
|
||||
semver: 7.7.3
|
||||
semver: 7.7.4
|
||||
spdx-expression-parse: 4.0.0
|
||||
synckit: 0.9.3
|
||||
transitivePeerDependencies:
|
||||
@@ -3431,7 +3409,7 @@ snapshots:
|
||||
read-pkg-up: 7.0.1
|
||||
regexp-tree: 0.1.27
|
||||
regjsparser: 0.10.0
|
||||
semver: 7.7.3
|
||||
semver: 7.7.4
|
||||
strip-indent: 3.0.0
|
||||
|
||||
eslint-scope@8.4.0:
|
||||
@@ -3825,7 +3803,7 @@ snapshots:
|
||||
'@babel/parser': 7.29.0
|
||||
'@istanbuljs/schema': 0.1.3
|
||||
istanbul-lib-coverage: 3.2.2
|
||||
semver: 7.7.3
|
||||
semver: 7.7.4
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
@@ -3923,15 +3901,9 @@ snapshots:
|
||||
'@babel/types': 7.29.0
|
||||
source-map-js: 1.2.1
|
||||
|
||||
magicast@0.5.2:
|
||||
dependencies:
|
||||
'@babel/parser': 7.29.0
|
||||
'@babel/types': 7.29.0
|
||||
source-map-js: 1.2.1
|
||||
|
||||
make-dir@4.0.0:
|
||||
dependencies:
|
||||
semver: 7.7.3
|
||||
semver: 7.7.4
|
||||
|
||||
math-intrinsics@1.1.0: {}
|
||||
|
||||
@@ -4237,7 +4209,7 @@ snapshots:
|
||||
|
||||
semver@6.3.1: {}
|
||||
|
||||
semver@7.7.3: {}
|
||||
semver@7.7.4: {}
|
||||
|
||||
set-function-length@1.2.2:
|
||||
dependencies:
|
||||
@@ -4326,8 +4298,6 @@ snapshots:
|
||||
|
||||
std-env@3.10.0: {}
|
||||
|
||||
std-env@4.0.0: {}
|
||||
|
||||
stop-iteration-iterator@1.1.0:
|
||||
dependencies:
|
||||
es-errors: 1.3.0
|
||||
|
||||
@@ -6,9 +6,7 @@
|
||||
|
||||
import axios, { isAxiosError, type AxiosInstance } from "axios";
|
||||
import { config } from "../config.js";
|
||||
import { logger } from "../utils/logger.js";
|
||||
import type {
|
||||
GiteaCombinedStatus,
|
||||
GiteaFile,
|
||||
GiteaPullRequest,
|
||||
GiteaRepository,
|
||||
@@ -144,87 +142,6 @@ class GiteaService {
|
||||
);
|
||||
return data;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the combined commit status for a specific commit by querying the Gitea API for all status checks.
|
||||
* @param owner - The repository owner.
|
||||
* @param repo - The repository name.
|
||||
* @param sha - The commit SHA to check.
|
||||
* @returns The combined status of all checks (pending, success, error, or failure).
|
||||
*/
|
||||
public async getCommitStatus(
|
||||
owner: string,
|
||||
repo: string,
|
||||
sha: string,
|
||||
): Promise<GiteaCombinedStatus> {
|
||||
const { data } = await this.client.get<GiteaCombinedStatus>(
|
||||
`/repos/${owner}/${repo}/commits/${sha}/status`,
|
||||
);
|
||||
return data;
|
||||
}
|
||||
|
||||
/**
|
||||
* Merges a pull request.
|
||||
* @param owner - The repository owner.
|
||||
* @param repo - The repository name.
|
||||
* @param index - The pull request index number.
|
||||
* @returns True if the merge was successful, false otherwise.
|
||||
*/
|
||||
public async mergePullRequest(
|
||||
owner: string,
|
||||
repo: string,
|
||||
index: number,
|
||||
): Promise<boolean> {
|
||||
try {
|
||||
await this.client.post(
|
||||
`/repos/${owner}/${repo}/pulls/${String(index)}/merge`,
|
||||
{
|
||||
/* eslint-disable @typescript-eslint/naming-convention -- Gitea API uses snake_case */
|
||||
Do: "merge",
|
||||
MergeMessageField: "",
|
||||
MergeTitleField: "",
|
||||
delete_branch_after_merge: true,
|
||||
force_merge: true,
|
||||
head_commit_id: "",
|
||||
merge_when_checks_succeed: false,
|
||||
/* eslint-enable @typescript-eslint/naming-convention -- End Gitea API */
|
||||
},
|
||||
);
|
||||
return true;
|
||||
} catch (error) {
|
||||
if (isAxiosError(error)) {
|
||||
await logger.log(
|
||||
"warn",
|
||||
`Merge failed with status ${String(error.response?.status)}: ${JSON.stringify(error.response?.data)}`,
|
||||
);
|
||||
return false;
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Deletes a repository branch by name.
|
||||
* @param owner - The repository owner.
|
||||
* @param repo - The repository name.
|
||||
* @param branch - The branch name to remove.
|
||||
* @returns True if successful, false otherwise.
|
||||
*/
|
||||
public async deleteBranch(
|
||||
owner: string,
|
||||
repo: string,
|
||||
branch: string,
|
||||
): Promise<boolean> {
|
||||
try {
|
||||
await this.client.delete(`/repos/${owner}/${repo}/branches/${branch}`);
|
||||
return true;
|
||||
} catch (error) {
|
||||
if (isAxiosError(error)) {
|
||||
return false;
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export { GiteaService };
|
||||
|
||||
@@ -6,10 +6,6 @@
|
||||
|
||||
import { config } from "../config.js";
|
||||
import { logger } from "../utils/logger.js";
|
||||
import {
|
||||
isMajorVersionBump,
|
||||
stripVersionPrefix,
|
||||
} from "../utils/versionComparison.js";
|
||||
import { DependencyAnalyzerService } from "./dependencyAnalyzerService.js";
|
||||
import { GiteaService } from "./giteaService.js";
|
||||
import {
|
||||
@@ -21,6 +17,15 @@ import { NpmService } from "./npmService.js";
|
||||
import type { GiteaRepository } from "../types/gitea.types.js";
|
||||
import type { DependencyUpdate, PackageJson } from "../types/package.types.js";
|
||||
|
||||
/**
|
||||
* Strips version prefix characters from a version string.
|
||||
* @param version - The version string with potential prefixes.
|
||||
* @returns The version without prefix characters.
|
||||
*/
|
||||
const stripVersionPrefix = (version: string): string => {
|
||||
return version.replace(/^[<=>^~]*/, "");
|
||||
};
|
||||
|
||||
/**
|
||||
* Generates the body content for a PR.
|
||||
* @param update - The dependency update information.
|
||||
@@ -137,103 +142,6 @@ class UpdateOrchestratorService {
|
||||
await logger.log("info", "Dependency update check complete!");
|
||||
}
|
||||
|
||||
/**
|
||||
* Attempts to merge an existing PR after checking CI status.
|
||||
* @param repo - The repository information.
|
||||
* @param update - The dependency update details.
|
||||
* @param matchingPR - The existing PR with head SHA and number.
|
||||
* @param matchingPR.head - The PR head information.
|
||||
* @param matchingPR.head.sha - The commit SHA to check.
|
||||
* @param matchingPR.number - The PR number for merging.
|
||||
* @returns True if merge was attempted, false otherwise.
|
||||
*/
|
||||
private async attemptPRMerge(
|
||||
repo: GiteaRepository,
|
||||
update: DependencyUpdate,
|
||||
matchingPR: { head: { sha: string }; number: number },
|
||||
): Promise<boolean> {
|
||||
const commitStatus = await this.giteaService.getCommitStatus(
|
||||
config.giteaOrg,
|
||||
repo.name,
|
||||
matchingPR.head.sha,
|
||||
);
|
||||
|
||||
if (commitStatus.state !== "success") {
|
||||
await logger.log(
|
||||
"info",
|
||||
` PR exists for ${update.packageName} but CI status is ${commitStatus.state}, skipping auto-merge...`,
|
||||
);
|
||||
return true;
|
||||
}
|
||||
|
||||
await logger.log(
|
||||
"info",
|
||||
` Auto-merging PR for ${update.packageName} (CI passed, non-major bump)...`,
|
||||
);
|
||||
|
||||
const merged = await this.giteaService.mergePullRequest(
|
||||
config.giteaOrg,
|
||||
repo.name,
|
||||
matchingPR.number,
|
||||
);
|
||||
|
||||
if (merged) {
|
||||
await logger.log(
|
||||
"info",
|
||||
` Successfully merged PR for ${update.packageName}`,
|
||||
);
|
||||
return true;
|
||||
}
|
||||
|
||||
await logger.log(
|
||||
"warn",
|
||||
` Failed to merge PR for ${update.packageName}`,
|
||||
);
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if an existing PR can be auto-merged based on CI status and version bump type.
|
||||
* @param repo - The repository information.
|
||||
* @param update - The dependency update details.
|
||||
* @param branchName - The branch name for the PR.
|
||||
* @returns True if the PR exists and was handled, false otherwise.
|
||||
*/
|
||||
private async checkAndMergeExistingPR(
|
||||
repo: GiteaRepository,
|
||||
update: DependencyUpdate,
|
||||
branchName: string,
|
||||
): Promise<boolean> {
|
||||
const existingPRs = await this.giteaService.listPullRequests(
|
||||
config.giteaOrg,
|
||||
repo.name,
|
||||
"open",
|
||||
);
|
||||
|
||||
const matchingPR = existingPRs.find((pr) => {
|
||||
return pr.head.ref === branchName;
|
||||
});
|
||||
|
||||
if (matchingPR === undefined) {
|
||||
return false;
|
||||
}
|
||||
|
||||
const isMajorBump = isMajorVersionBump(
|
||||
update.currentVersion,
|
||||
update.latestVersion,
|
||||
);
|
||||
|
||||
if (isMajorBump) {
|
||||
await logger.log(
|
||||
"info",
|
||||
` PR exists for ${update.packageName} but is a major version bump, skipping auto-merge...`,
|
||||
);
|
||||
return true;
|
||||
}
|
||||
|
||||
return await this.attemptPRMerge(repo, update, matchingPR);
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates or updates a PR for a dependency update.
|
||||
* @param repo - The repository information.
|
||||
@@ -249,16 +157,6 @@ class UpdateOrchestratorService {
|
||||
= `${config.prBranchPrefix}${update.packageName.replaceAll(/[/@]/g, "-")}`;
|
||||
|
||||
try {
|
||||
const existingPRMerged = await this.checkAndMergeExistingPR(
|
||||
repo,
|
||||
update,
|
||||
branchName,
|
||||
);
|
||||
|
||||
if (existingPRMerged) {
|
||||
return;
|
||||
}
|
||||
|
||||
const result = await createOrUpdateBranch({
|
||||
branchName: branchName,
|
||||
clonedRepo: clonedRepo,
|
||||
|
||||
@@ -39,33 +39,6 @@ interface GiteaPullRequest {
|
||||
state: "closed" | "open";
|
||||
title: string;
|
||||
}
|
||||
|
||||
interface GiteaCommitStatus {
|
||||
context: string;
|
||||
created_at: string;
|
||||
description: string;
|
||||
id: number;
|
||||
state: "error" | "failure" | "pending" | "success" | "warning";
|
||||
target_url: string;
|
||||
updated_at: string;
|
||||
url: string;
|
||||
}
|
||||
|
||||
interface GiteaCombinedStatus {
|
||||
commit_url: string;
|
||||
repository: GiteaRepository;
|
||||
sha: string;
|
||||
state: "error" | "failure" | "pending" | "success" | "warning";
|
||||
statuses: Array<GiteaCommitStatus>;
|
||||
total_count: number;
|
||||
url: string;
|
||||
}
|
||||
/* eslint-enable @typescript-eslint/naming-convention -- End Gitea API types */
|
||||
|
||||
export type {
|
||||
GiteaCombinedStatus,
|
||||
GiteaCommitStatus,
|
||||
GiteaFile,
|
||||
GiteaPullRequest,
|
||||
GiteaRepository,
|
||||
};
|
||||
export type { GiteaFile, GiteaPullRequest, GiteaRepository };
|
||||
|
||||
+3
-6
@@ -4,14 +4,12 @@
|
||||
* @author Naomi Carrigan
|
||||
*/
|
||||
|
||||
import type { Logger } from "@nhcarrigan/logger";
|
||||
import { Logger } from "@nhcarrigan/logger";
|
||||
|
||||
// Import { Logger } from "@nhcarrigan/logger";
|
||||
// import { Logger } from "@nhcarrigan/logger";
|
||||
|
||||
// Const logger = new Logger("Minori", process.env.LOG_TOKEN ?? "");
|
||||
// const logger = new Logger("Minori", process.env.LOG_TOKEN ?? "");
|
||||
|
||||
/* eslint-disable no-console -- Temporary mock logger for development */
|
||||
/* eslint-disable @typescript-eslint/consistent-type-assertions -- Mock logger requires type assertion */
|
||||
const logger = {
|
||||
error: (message: string, error: Error) => {
|
||||
console.error(message, error);
|
||||
@@ -20,6 +18,5 @@ const logger = {
|
||||
console.log(level, message);
|
||||
},
|
||||
} as unknown as Logger;
|
||||
/* eslint-enable no-console, @typescript-eslint/consistent-type-assertions -- Re-enable rules after mock logger */
|
||||
|
||||
export { logger };
|
||||
|
||||
@@ -1,64 +0,0 @@
|
||||
/**
|
||||
* @copyright NHCarrigan
|
||||
* @license Naomi's Public License
|
||||
* @author Naomi Carrigan
|
||||
*/
|
||||
|
||||
/**
|
||||
* Strips version prefix characters from a version string.
|
||||
* @param version - The version string with potential prefixes.
|
||||
* @returns The version without prefix characters.
|
||||
*/
|
||||
const stripVersionPrefix = (version: string): string => {
|
||||
return version.replace(/^[<=>^~]*/, "");
|
||||
};
|
||||
|
||||
/**
|
||||
* Parses a semantic version string into its components.
|
||||
* @param version - The version string to parse (e.g., "1.2.3").
|
||||
* @returns An object with major, minor, and patch numbers, or null if invalid.
|
||||
*/
|
||||
const parseVersion = (
|
||||
version: string,
|
||||
): { major: number; minor: number; patch: number } | null => {
|
||||
const cleaned = stripVersionPrefix(version);
|
||||
const parts = cleaned.split(".");
|
||||
|
||||
if (parts.length < 3) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const major = Number.parseInt(parts[0] ?? "0", 10);
|
||||
const minor = Number.parseInt(parts[1] ?? "0", 10);
|
||||
const patchPart = parts[2] ?? "0";
|
||||
const patch = Number.parseInt(patchPart.split("-")[0] ?? "0", 10);
|
||||
|
||||
if (Number.isNaN(major) || Number.isNaN(minor) || Number.isNaN(patch)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return { major, minor, patch };
|
||||
};
|
||||
|
||||
/**
|
||||
* Determines if a version update is a major version bump.
|
||||
* A major bump occurs when the major version number increases.
|
||||
* @param fromVersion - The current version.
|
||||
* @param toVersion - The target version.
|
||||
* @returns True if this is a major version bump, false otherwise.
|
||||
*/
|
||||
const isMajorVersionBump = (
|
||||
fromVersion: string,
|
||||
toVersion: string,
|
||||
): boolean => {
|
||||
const from = parseVersion(fromVersion);
|
||||
const to = parseVersion(toVersion);
|
||||
|
||||
if (from === null || to === null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return to.major > from.major;
|
||||
};
|
||||
|
||||
export { isMajorVersionBump, stripVersionPrefix };
|
||||
@@ -6,16 +6,11 @@
|
||||
|
||||
/* eslint-disable vitest/valid-expect -- Test expectations don't need messages */
|
||||
/* eslint-disable max-lines-per-function -- Test suites require many test cases */
|
||||
/* eslint-disable max-lines -- Test suites naturally have many cases */
|
||||
/* eslint-disable max-statements -- Test suites naturally have many statements */
|
||||
/* eslint-disable @typescript-eslint/consistent-type-assertions -- Required for mocking */
|
||||
/* eslint-disable @typescript-eslint/consistent-type-imports -- Dynamic imports */
|
||||
/* eslint-disable @typescript-eslint/naming-convention -- Environment variables and Gitea API format */
|
||||
/* eslint-disable max-nested-callbacks -- Vitest structure requires nested callbacks */
|
||||
/* eslint-disable vitest/require-to-throw-message -- Generic throw assertion */
|
||||
/* eslint-disable vitest/prefer-to-be-truthy -- toBe(true) is clearer for boolean functions */
|
||||
/* eslint-disable vitest/prefer-to-be-falsy -- toBe(false) is clearer for boolean functions */
|
||||
/* eslint-disable stylistic/max-len -- Test files have long object literals */
|
||||
|
||||
import axios, { AxiosError, type AxiosResponse } from "axios";
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
||||
@@ -29,7 +24,6 @@ vi.mock("axios", async() => {
|
||||
default: {
|
||||
create: vi.fn(() => {
|
||||
return {
|
||||
delete: vi.fn(),
|
||||
get: vi.fn(),
|
||||
post: vi.fn(),
|
||||
};
|
||||
@@ -75,8 +69,6 @@ describe("giteaService", () => {
|
||||
let mockGet: ReturnType<typeof vi.fn>;
|
||||
// eslint-disable-next-line @typescript-eslint/init-declarations -- Reassigned in beforeEach
|
||||
let mockPost: ReturnType<typeof vi.fn>;
|
||||
// eslint-disable-next-line @typescript-eslint/init-declarations -- Reassigned in beforeEach
|
||||
let mockDelete: ReturnType<typeof vi.fn>;
|
||||
const originalEnvironment = process.env;
|
||||
|
||||
beforeEach(() => {
|
||||
@@ -85,9 +77,7 @@ describe("giteaService", () => {
|
||||
|
||||
mockGet = vi.fn();
|
||||
mockPost = vi.fn();
|
||||
mockDelete = vi.fn();
|
||||
vi.mocked(axios.create).mockReturnValue({
|
||||
delete: mockDelete,
|
||||
get: mockGet,
|
||||
post: mockPost,
|
||||
} as unknown as ReturnType<typeof axios.create>);
|
||||
@@ -316,69 +306,4 @@ describe("giteaService", () => {
|
||||
{ params: { state: "closed" } },
|
||||
);
|
||||
});
|
||||
|
||||
it("should get commit status", async() => {
|
||||
expect.assertions(2);
|
||||
const mockStatus = {
|
||||
commit_url: "https://git.nhcarrigan.com/api/v1/repos/owner/repo/commits/abc123",
|
||||
repository: createMockRepository({ id: 1, name: "test-repo" }),
|
||||
sha: "abc123",
|
||||
state: "success",
|
||||
statuses: [],
|
||||
total_count: 0,
|
||||
url: "https://git.nhcarrigan.com/api/v1/repos/owner/repo/commits/abc123/status",
|
||||
};
|
||||
mockGet.mockResolvedValueOnce({ data: mockStatus });
|
||||
const result = await giteaService.getCommitStatus("owner", "repo", "abc123");
|
||||
expect(result).toStrictEqual(mockStatus);
|
||||
expect(mockGet).toHaveBeenCalledWith("/repos/owner/repo/commits/abc123/status");
|
||||
});
|
||||
|
||||
it("should merge a pull request successfully", async() => {
|
||||
expect.assertions(2);
|
||||
mockPost.mockResolvedValueOnce({ data: {} });
|
||||
const result = await giteaService.mergePullRequest("owner", "repo", 1);
|
||||
expect(result).toBe(true);
|
||||
expect(mockPost).toHaveBeenCalledWith("/repos/owner/repo/pulls/1/merge", {
|
||||
Do: "merge",
|
||||
MergeMessageField: "",
|
||||
MergeTitleField: "",
|
||||
delete_branch_after_merge: true,
|
||||
force_merge: false,
|
||||
head_commit_id: "",
|
||||
merge_when_checks_succeed: false,
|
||||
});
|
||||
});
|
||||
|
||||
it("should return false when merge fails", async() => {
|
||||
expect.assertions(1);
|
||||
const axiosError = new AxiosError("Merge conflict");
|
||||
mockPost.mockRejectedValueOnce(axiosError);
|
||||
const result = await giteaService.mergePullRequest("owner", "repo", 1);
|
||||
expect(result).toBe(false);
|
||||
});
|
||||
|
||||
it("should delete a branch successfully", async() => {
|
||||
expect.assertions(2);
|
||||
mockDelete.mockResolvedValueOnce({ data: {} });
|
||||
const result = await giteaService.deleteBranch(
|
||||
"owner",
|
||||
"repo",
|
||||
"feature-branch",
|
||||
);
|
||||
expect(result).toBe(true);
|
||||
expect(mockDelete).toHaveBeenCalledWith("/repos/owner/repo/branches/feature-branch");
|
||||
});
|
||||
|
||||
it("should return false when branch deletion fails", async() => {
|
||||
expect.assertions(1);
|
||||
const axiosError = new AxiosError("Branch not found");
|
||||
mockDelete.mockRejectedValueOnce(axiosError);
|
||||
const result = await giteaService.deleteBranch(
|
||||
"owner",
|
||||
"repo",
|
||||
"nonexistent-branch",
|
||||
);
|
||||
expect(result).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -18,8 +18,6 @@ const mockGiteaGetFileContent = vi.fn();
|
||||
const mockGiteaListOrgRepositories = vi.fn();
|
||||
const mockGiteaCreatePullRequest = vi.fn();
|
||||
const mockGiteaListPullRequests = vi.fn();
|
||||
const mockGiteaGetCommitStatus = vi.fn();
|
||||
const mockGiteaMergePullRequest = vi.fn();
|
||||
const mockNpmGetPackageChangelog = vi.fn();
|
||||
const mockNpmGetPackageInfo = vi.fn();
|
||||
const mockAnalyzePackageJson = vi.fn();
|
||||
@@ -41,11 +39,9 @@ vi.mock("../../src/services/giteaService.js", () => {
|
||||
|
||||
GiteaService: class MockGiteaService {
|
||||
public createPullRequest = mockGiteaCreatePullRequest;
|
||||
public getCommitStatus = mockGiteaGetCommitStatus;
|
||||
public getFileContent = mockGiteaGetFileContent;
|
||||
public listOrgRepositories = mockGiteaListOrgRepositories;
|
||||
public listPullRequests = mockGiteaListPullRequests;
|
||||
public mergePullRequest = mockGiteaMergePullRequest;
|
||||
},
|
||||
};
|
||||
});
|
||||
@@ -225,7 +221,6 @@ describe("updateOrchestratorService", () => {
|
||||
const mockUpdates = [ createMockUpdate() ];
|
||||
mockGiteaListOrgRepositories.mockResolvedValue(mockRepos);
|
||||
mockGiteaGetFileContent.mockResolvedValue(mockFileContent);
|
||||
mockGiteaListPullRequests.mockResolvedValue([]);
|
||||
mockAnalyzePackageJson.mockResolvedValue(mockUpdates);
|
||||
mockNpmGetPackageChangelog.mockResolvedValue("## Changelog");
|
||||
mockCloneRepository.mockResolvedValue(createMockClonedRepo());
|
||||
@@ -272,7 +267,6 @@ describe("updateOrchestratorService", () => {
|
||||
const mockUpdates = [ createMockUpdate() ];
|
||||
mockGiteaListOrgRepositories.mockResolvedValue(mockRepos);
|
||||
mockGiteaGetFileContent.mockResolvedValue(mockFileContent);
|
||||
mockGiteaListPullRequests.mockResolvedValue([]);
|
||||
mockAnalyzePackageJson.mockResolvedValue(mockUpdates);
|
||||
mockCloneRepository.mockResolvedValue(createMockClonedRepo());
|
||||
mockCreateOrUpdateBranch.mockResolvedValue({
|
||||
@@ -295,7 +289,6 @@ describe("updateOrchestratorService", () => {
|
||||
const mockUpdates = [ createMockUpdate() ];
|
||||
mockGiteaListOrgRepositories.mockResolvedValue(mockRepos);
|
||||
mockGiteaGetFileContent.mockResolvedValue(mockFileContent);
|
||||
mockGiteaListPullRequests.mockResolvedValue([]);
|
||||
mockAnalyzePackageJson.mockResolvedValue(mockUpdates);
|
||||
mockCloneRepository.mockResolvedValue(createMockClonedRepo());
|
||||
mockCreateOrUpdateBranch.mockResolvedValue({
|
||||
@@ -319,7 +312,6 @@ describe("updateOrchestratorService", () => {
|
||||
const mockUpdates = [ createMockUpdate() ];
|
||||
mockGiteaListOrgRepositories.mockResolvedValue(mockRepos);
|
||||
mockGiteaGetFileContent.mockResolvedValue(mockFileContent);
|
||||
mockGiteaListPullRequests.mockResolvedValue([]);
|
||||
mockAnalyzePackageJson.mockResolvedValue(mockUpdates);
|
||||
mockCloneRepository.mockResolvedValue(createMockClonedRepo());
|
||||
mockCreateOrUpdateBranch.mockResolvedValue({
|
||||
@@ -362,7 +354,6 @@ describe("updateOrchestratorService", () => {
|
||||
const mockUpdates = [ createMockUpdate() ];
|
||||
mockGiteaListOrgRepositories.mockResolvedValue(mockRepos);
|
||||
mockGiteaGetFileContent.mockResolvedValue(mockFileContent);
|
||||
mockGiteaListPullRequests.mockResolvedValue([]);
|
||||
mockAnalyzePackageJson.mockResolvedValue(mockUpdates);
|
||||
mockCloneRepository.mockResolvedValue(createMockClonedRepo());
|
||||
mockCreateOrUpdateBranch.mockResolvedValue({
|
||||
@@ -386,7 +377,6 @@ describe("updateOrchestratorService", () => {
|
||||
const mockUpdates = [ createMockUpdate() ];
|
||||
mockGiteaListOrgRepositories.mockResolvedValue(mockRepos);
|
||||
mockGiteaGetFileContent.mockResolvedValue(mockFileContent);
|
||||
mockGiteaListPullRequests.mockResolvedValue([]);
|
||||
mockAnalyzePackageJson.mockResolvedValue(mockUpdates);
|
||||
mockNpmGetPackageChangelog.mockResolvedValue("## Changelog");
|
||||
mockCloneRepository.mockResolvedValue(createMockClonedRepo());
|
||||
@@ -436,7 +426,6 @@ describe("updateOrchestratorService", () => {
|
||||
const mockCleanup = vi.fn();
|
||||
mockGiteaListOrgRepositories.mockResolvedValue(mockRepos);
|
||||
mockGiteaGetFileContent.mockResolvedValue(mockFileContent);
|
||||
mockGiteaListPullRequests.mockResolvedValue([]);
|
||||
mockAnalyzePackageJson.mockResolvedValue(mockUpdates);
|
||||
mockCloneRepository.mockResolvedValue(createMockClonedRepo(mockCleanup));
|
||||
mockCreateOrUpdateBranch.mockResolvedValue({
|
||||
|
||||
@@ -1,108 +0,0 @@
|
||||
/**
|
||||
* @copyright NHCarrigan
|
||||
* @license Naomi's Public License
|
||||
* @author Naomi Carrigan
|
||||
*/
|
||||
|
||||
/* eslint-disable vitest/valid-expect -- Test expectations don't need messages */
|
||||
/* eslint-disable max-lines-per-function -- Test suites naturally have many cases */
|
||||
/* eslint-disable max-nested-callbacks -- Vitest structure requires nesting */
|
||||
/* eslint-disable vitest/prefer-to-be-truthy -- toBe(true) is clearer for boolean functions */
|
||||
/* eslint-disable vitest/prefer-to-be-falsy -- toBe(false) is clearer for boolean functions */
|
||||
|
||||
import { describe, expect, it } from "vitest";
|
||||
import {
|
||||
isMajorVersionBump,
|
||||
stripVersionPrefix,
|
||||
} from "../../src/utils/versionComparison.js";
|
||||
|
||||
describe("versionComparison", () => {
|
||||
describe("stripVersionPrefix", () => {
|
||||
it("should strip caret prefix", () => {
|
||||
expect.assertions(1);
|
||||
expect(stripVersionPrefix("^1.2.3")).toBe("1.2.3");
|
||||
});
|
||||
|
||||
it("should strip tilde prefix", () => {
|
||||
expect.assertions(1);
|
||||
expect(stripVersionPrefix("~1.2.3")).toBe("1.2.3");
|
||||
});
|
||||
|
||||
it("should strip greater than prefix", () => {
|
||||
expect.assertions(1);
|
||||
expect(stripVersionPrefix(">1.2.3")).toBe("1.2.3");
|
||||
});
|
||||
|
||||
it("should strip less than prefix", () => {
|
||||
expect.assertions(1);
|
||||
expect(stripVersionPrefix("<1.2.3")).toBe("1.2.3");
|
||||
});
|
||||
|
||||
it("should strip equals prefix", () => {
|
||||
expect.assertions(1);
|
||||
expect(stripVersionPrefix("=1.2.3")).toBe("1.2.3");
|
||||
});
|
||||
|
||||
it("should strip multiple prefix characters", () => {
|
||||
expect.assertions(1);
|
||||
expect(stripVersionPrefix(">=1.2.3")).toBe("1.2.3");
|
||||
});
|
||||
|
||||
it("should return version without prefix unchanged", () => {
|
||||
expect.assertions(1);
|
||||
expect(stripVersionPrefix("1.2.3")).toBe("1.2.3");
|
||||
});
|
||||
});
|
||||
|
||||
describe("isMajorVersionBump", () => {
|
||||
it("should detect major version bump", () => {
|
||||
expect.assertions(1);
|
||||
expect(isMajorVersionBump("1.2.3", "2.0.0")).toBe(true);
|
||||
});
|
||||
|
||||
it("should detect major version bump with prefixes", () => {
|
||||
expect.assertions(1);
|
||||
expect(isMajorVersionBump("^1.2.3", "^2.0.0")).toBe(true);
|
||||
});
|
||||
|
||||
it("should not detect minor version bump as major", () => {
|
||||
expect.assertions(1);
|
||||
expect(isMajorVersionBump("1.2.3", "1.3.0")).toBe(false);
|
||||
});
|
||||
|
||||
it("should not detect patch version bump as major", () => {
|
||||
expect.assertions(1);
|
||||
expect(isMajorVersionBump("1.2.3", "1.2.4")).toBe(false);
|
||||
});
|
||||
|
||||
it("should handle version with pre-release tags", () => {
|
||||
expect.assertions(1);
|
||||
expect(isMajorVersionBump("1.2.3", "2.0.0-beta.1")).toBe(true);
|
||||
});
|
||||
|
||||
it("should return false for invalid from version", () => {
|
||||
expect.assertions(1);
|
||||
expect(isMajorVersionBump("invalid", "2.0.0")).toBe(false);
|
||||
});
|
||||
|
||||
it("should return false for invalid to version", () => {
|
||||
expect.assertions(1);
|
||||
expect(isMajorVersionBump("1.2.3", "invalid")).toBe(false);
|
||||
});
|
||||
|
||||
it("should return false for both invalid versions", () => {
|
||||
expect.assertions(1);
|
||||
expect(isMajorVersionBump("invalid", "also-invalid")).toBe(false);
|
||||
});
|
||||
|
||||
it("should handle 0.x.x to 1.x.x as major bump", () => {
|
||||
expect.assertions(1);
|
||||
expect(isMajorVersionBump("0.9.5", "1.0.0")).toBe(true);
|
||||
});
|
||||
|
||||
it("should not detect same version as major bump", () => {
|
||||
expect.assertions(1);
|
||||
expect(isMajorVersionBump("1.2.3", "1.2.3")).toBe(false);
|
||||
});
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user