generated from nhcarrigan/template
Compare commits
16 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1bdae2d342 | |||
| 4643e99447 | |||
| 9bdefdb030 | |||
| d9f959d115 | |||
|
2bb7208bab
|
|||
|
f81acbac47
|
|||
|
6da707f1e6
|
|||
|
b6fb12ae9f
|
|||
|
d0bf95cb6d
|
|||
|
4a8973a6e8
|
|||
|
565581570c
|
|||
|
0dbedfe546
|
|||
|
df608370a4
|
|||
|
d435b9da47
|
|||
|
a1bb6b791c
|
|||
|
bc572cdf76
|
+3
-3
@@ -20,11 +20,11 @@
|
|||||||
"@types/node": "25.2.0",
|
"@types/node": "25.2.0",
|
||||||
"@types/node-cron": "3.0.11",
|
"@types/node-cron": "3.0.11",
|
||||||
"@types/semver": "7.7.1",
|
"@types/semver": "7.7.1",
|
||||||
"@vitest/coverage-istanbul": "^4.0.18",
|
"@vitest/coverage-istanbul": "4.1.0",
|
||||||
"@vitest/coverage-v8": "^4.0.18",
|
"@vitest/coverage-v8": "4.0.18",
|
||||||
"eslint": "9.39.2",
|
"eslint": "9.39.2",
|
||||||
"typescript": "5.9.3",
|
"typescript": "5.9.3",
|
||||||
"vitest": "^4.0.18"
|
"vitest": "4.0.18"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@nhcarrigan/logger": "1.1.1",
|
"@nhcarrigan/logger": "1.1.1",
|
||||||
|
|||||||
Generated
+19
-24
@@ -37,10 +37,10 @@ importers:
|
|||||||
specifier: 7.7.1
|
specifier: 7.7.1
|
||||||
version: 7.7.1
|
version: 7.7.1
|
||||||
'@vitest/coverage-istanbul':
|
'@vitest/coverage-istanbul':
|
||||||
specifier: ^4.0.18
|
specifier: 4.1.0
|
||||||
version: 4.0.18(vitest@4.0.18(@types/node@25.2.0))
|
version: 4.1.0(vitest@4.0.18(@types/node@25.2.0))
|
||||||
'@vitest/coverage-v8':
|
'@vitest/coverage-v8':
|
||||||
specifier: ^4.0.18
|
specifier: 4.0.18
|
||||||
version: 4.0.18(vitest@4.0.18(@types/node@25.2.0))
|
version: 4.0.18(vitest@4.0.18(@types/node@25.2.0))
|
||||||
eslint:
|
eslint:
|
||||||
specifier: 9.39.2
|
specifier: 9.39.2
|
||||||
@@ -49,7 +49,7 @@ importers:
|
|||||||
specifier: 5.9.3
|
specifier: 5.9.3
|
||||||
version: 5.9.3
|
version: 5.9.3
|
||||||
vitest:
|
vitest:
|
||||||
specifier: ^4.0.18
|
specifier: 4.0.18
|
||||||
version: 4.0.18(@types/node@25.2.0)
|
version: 4.0.18(@types/node@25.2.0)
|
||||||
|
|
||||||
packages:
|
packages:
|
||||||
@@ -692,10 +692,10 @@ packages:
|
|||||||
resolution: {integrity: sha512-VFlhGSl4opC0bprJiItPQ1RfUhGDIBokcPwaFH4yiBCaNPeld/9VeXbiPO1cLyorQi1G1vL+ecBk1x8o1axORA==}
|
resolution: {integrity: sha512-VFlhGSl4opC0bprJiItPQ1RfUhGDIBokcPwaFH4yiBCaNPeld/9VeXbiPO1cLyorQi1G1vL+ecBk1x8o1axORA==}
|
||||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||||
|
|
||||||
'@vitest/coverage-istanbul@4.0.18':
|
'@vitest/coverage-istanbul@4.1.0':
|
||||||
resolution: {integrity: sha512-0OhjP30owEDihYTZGWuq20rNtV1RjjJs1Mv4MaZIKcFBmiLUXX7HJLX4fU7wE+Mrc3lQxI2HKq6WrSXi5FGuCQ==}
|
resolution: {integrity: sha512-0+67gA94YToxd+Pc3XgIA/2c8HN2hXNSg3T+1FI4HW7W/2gPitYCtktsY6Ke7vrt5caboMq3TUf0/vwbHRb0og==}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
vitest: 4.0.18
|
vitest: 4.1.0
|
||||||
|
|
||||||
'@vitest/coverage-v8@4.0.18':
|
'@vitest/coverage-v8@4.0.18':
|
||||||
resolution: {integrity: sha512-7i+N2i0+ME+2JFZhfuz7Tg/FqKtilHjGyGvoHYQ6iLV0zahbsJ9sljC9OcFcPDbhYKCet+sG8SsVqlyGvPflZg==}
|
resolution: {integrity: sha512-7i+N2i0+ME+2JFZhfuz7Tg/FqKtilHjGyGvoHYQ6iLV0zahbsJ9sljC9OcFcPDbhYKCet+sG8SsVqlyGvPflZg==}
|
||||||
@@ -1472,10 +1472,6 @@ packages:
|
|||||||
resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==}
|
resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==}
|
||||||
engines: {node: '>=8'}
|
engines: {node: '>=8'}
|
||||||
|
|
||||||
istanbul-lib-instrument@6.0.3:
|
|
||||||
resolution: {integrity: sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==}
|
|
||||||
engines: {node: '>=10'}
|
|
||||||
|
|
||||||
istanbul-lib-report@3.0.1:
|
istanbul-lib-report@3.0.1:
|
||||||
resolution: {integrity: sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==}
|
resolution: {integrity: sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==}
|
||||||
engines: {node: '>=10'}
|
engines: {node: '>=10'}
|
||||||
@@ -1570,6 +1566,9 @@ packages:
|
|||||||
magicast@0.5.1:
|
magicast@0.5.1:
|
||||||
resolution: {integrity: sha512-xrHS24IxaLrvuo613F719wvOIv9xPHFWQHuvGUBmPnCA/3MQxKI3b+r7n1jAoDHmsbC5bRhTZYR77invLAxVnw==}
|
resolution: {integrity: sha512-xrHS24IxaLrvuo613F719wvOIv9xPHFWQHuvGUBmPnCA/3MQxKI3b+r7n1jAoDHmsbC5bRhTZYR77invLAxVnw==}
|
||||||
|
|
||||||
|
magicast@0.5.2:
|
||||||
|
resolution: {integrity: sha512-E3ZJh4J3S9KfwdjZhe2afj6R9lGIN5Pher1pF39UGrXRqq/VDaGVIGN13BjHd2u8B61hArAGOnso7nBOouW3TQ==}
|
||||||
|
|
||||||
make-dir@4.0.0:
|
make-dir@4.0.0:
|
||||||
resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==}
|
resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==}
|
||||||
engines: {node: '>=10'}
|
engines: {node: '>=10'}
|
||||||
@@ -2800,16 +2799,16 @@ snapshots:
|
|||||||
'@typescript-eslint/types': 8.54.0
|
'@typescript-eslint/types': 8.54.0
|
||||||
eslint-visitor-keys: 4.2.1
|
eslint-visitor-keys: 4.2.1
|
||||||
|
|
||||||
'@vitest/coverage-istanbul@4.0.18(vitest@4.0.18(@types/node@25.2.0))':
|
'@vitest/coverage-istanbul@4.1.0(vitest@4.0.18(@types/node@25.2.0))':
|
||||||
dependencies:
|
dependencies:
|
||||||
|
'@babel/core': 7.29.0
|
||||||
'@istanbuljs/schema': 0.1.3
|
'@istanbuljs/schema': 0.1.3
|
||||||
'@jridgewell/gen-mapping': 0.3.13
|
'@jridgewell/gen-mapping': 0.3.13
|
||||||
'@jridgewell/trace-mapping': 0.3.31
|
'@jridgewell/trace-mapping': 0.3.31
|
||||||
istanbul-lib-coverage: 3.2.2
|
istanbul-lib-coverage: 3.2.2
|
||||||
istanbul-lib-instrument: 6.0.3
|
|
||||||
istanbul-lib-report: 3.0.1
|
istanbul-lib-report: 3.0.1
|
||||||
istanbul-reports: 3.2.0
|
istanbul-reports: 3.2.0
|
||||||
magicast: 0.5.1
|
magicast: 0.5.2
|
||||||
obug: 2.1.1
|
obug: 2.1.1
|
||||||
tinyrainbow: 3.0.3
|
tinyrainbow: 3.0.3
|
||||||
vitest: 4.0.18(@types/node@25.2.0)
|
vitest: 4.0.18(@types/node@25.2.0)
|
||||||
@@ -3797,16 +3796,6 @@ snapshots:
|
|||||||
|
|
||||||
istanbul-lib-coverage@3.2.2: {}
|
istanbul-lib-coverage@3.2.2: {}
|
||||||
|
|
||||||
istanbul-lib-instrument@6.0.3:
|
|
||||||
dependencies:
|
|
||||||
'@babel/core': 7.29.0
|
|
||||||
'@babel/parser': 7.29.0
|
|
||||||
'@istanbuljs/schema': 0.1.3
|
|
||||||
istanbul-lib-coverage: 3.2.2
|
|
||||||
semver: 7.7.3
|
|
||||||
transitivePeerDependencies:
|
|
||||||
- supports-color
|
|
||||||
|
|
||||||
istanbul-lib-report@3.0.1:
|
istanbul-lib-report@3.0.1:
|
||||||
dependencies:
|
dependencies:
|
||||||
istanbul-lib-coverage: 3.2.2
|
istanbul-lib-coverage: 3.2.2
|
||||||
@@ -3901,6 +3890,12 @@ snapshots:
|
|||||||
'@babel/types': 7.29.0
|
'@babel/types': 7.29.0
|
||||||
source-map-js: 1.2.1
|
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:
|
make-dir@4.0.0:
|
||||||
dependencies:
|
dependencies:
|
||||||
semver: 7.7.3
|
semver: 7.7.3
|
||||||
|
|||||||
+1
-3
@@ -4,14 +4,12 @@
|
|||||||
* @author Naomi Carrigan
|
* @author Naomi Carrigan
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { Logger } from "@nhcarrigan/logger";
|
|
||||||
import cron from "node-cron";
|
import cron from "node-cron";
|
||||||
import { config, validateConfig } from "./config.js";
|
import { config, validateConfig } from "./config.js";
|
||||||
import {
|
import {
|
||||||
UpdateOrchestratorService,
|
UpdateOrchestratorService,
|
||||||
} from "./services/updateOrchestratorService.js";
|
} from "./services/updateOrchestratorService.js";
|
||||||
|
import { logger } from "./utils/logger.js";
|
||||||
const logger = new Logger("Minori", process.env.LOG_TOKEN ?? "");
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Main entry point for the application.
|
* Main entry point for the application.
|
||||||
|
|||||||
@@ -4,17 +4,15 @@
|
|||||||
* @author Naomi Carrigan
|
* @author Naomi Carrigan
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { Logger } from "@nhcarrigan/logger";
|
|
||||||
import semver from "semver";
|
import semver from "semver";
|
||||||
import type { NpmService } from "./npmService.js";
|
import { logger } from "../utils/logger.js";
|
||||||
|
import { NpmService } from "./npmService.js";
|
||||||
import type {
|
import type {
|
||||||
DependencyType,
|
DependencyType,
|
||||||
DependencyUpdate,
|
DependencyUpdate,
|
||||||
PackageJson,
|
PackageJson,
|
||||||
} from "../types/package.types.js";
|
} from "../types/package.types.js";
|
||||||
|
|
||||||
const logger = new Logger("DependencyAnalyzer", process.env.LOG_TOKEN ?? "");
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks if a version string is a valid semver range.
|
* Checks if a version string is a valid semver range.
|
||||||
* @param version - The version string to validate.
|
* @param version - The version string to validate.
|
||||||
@@ -44,12 +42,14 @@ const isValidSemverRange = (version: string): boolean => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Removes version prefixes for comparison.
|
* Removes version prefixes and coerces to valid semver.
|
||||||
* @param version - The version string to sanitise.
|
* @param version - The version string to sanitise.
|
||||||
* @returns The cleaned version string.
|
* @returns The cleaned version string, or null if invalid.
|
||||||
*/
|
*/
|
||||||
const cleanVersion = (version: string): string => {
|
const cleanVersion = (version: string): string | null => {
|
||||||
return version.replace(/^[<=>^~]/, "");
|
const stripped = version.replace(/^[<=>^~]+/, "");
|
||||||
|
const coerced = semver.coerce(stripped);
|
||||||
|
return coerced?.version ?? null;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -68,6 +68,8 @@ const shouldUpdate = (
|
|||||||
}
|
}
|
||||||
|
|
||||||
return semver.lt(currentVersion, latestVersion);
|
return semver.lt(currentVersion, latestVersion);
|
||||||
|
// eslint-disable-next-line capitalized-comments -- v8 coverage ignore directive must be lowercase
|
||||||
|
/* v8 ignore start -- @preserve */
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
void logger.error(
|
void logger.error(
|
||||||
`Error comparing versions: ${currentVersion} vs ${latestVersion}`,
|
`Error comparing versions: ${currentVersion} vs ${latestVersion}`,
|
||||||
@@ -76,6 +78,8 @@ const shouldUpdate = (
|
|||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
// eslint-disable-next-line capitalized-comments -- v8 coverage ignore directive must be lowercase
|
||||||
|
/* v8 ignore stop -- @preserve */
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -151,8 +155,19 @@ class DependencyAnalyzerService {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
const latestVersion = packageInfo["dist-tags"].latest;
|
// Use mature version (at least 10 days old) instead of dist-tags.latest
|
||||||
|
const latestVersion = NpmService.getLatestMatureVersion(
|
||||||
|
packageInfo,
|
||||||
|
10,
|
||||||
|
);
|
||||||
|
if (latestVersion === null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
const cleanCurrentVersion = cleanVersion(currentVersion);
|
const cleanCurrentVersion = cleanVersion(currentVersion);
|
||||||
|
if (cleanCurrentVersion === null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
if (shouldUpdate(cleanCurrentVersion, latestVersion)) {
|
if (shouldUpdate(cleanCurrentVersion, latestVersion)) {
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -212,20 +212,84 @@ const cloneRepository = async(
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Deletes a stale local branch if it exists.
|
||||||
|
* @param logger - The logger instance.
|
||||||
|
* @param repoPath - Path to the repository.
|
||||||
|
* @param branchName - Name of the branch to delete.
|
||||||
|
*/
|
||||||
|
const deleteStaleLocalBranch = async(
|
||||||
|
logger: Logger,
|
||||||
|
repoPath: string,
|
||||||
|
branchName: string,
|
||||||
|
): Promise<void> => {
|
||||||
|
const localBranchOutput = await runGitCommand(logger, repoPath, "git branch");
|
||||||
|
const localBranchNames = localBranchOutput.
|
||||||
|
split("\n").
|
||||||
|
map((line) => {
|
||||||
|
return line.replace(/^\*?\s*/, "").trim();
|
||||||
|
}).
|
||||||
|
filter((name) => {
|
||||||
|
return name.length > 0;
|
||||||
|
});
|
||||||
|
if (localBranchNames.includes(branchName)) {
|
||||||
|
await runGitCommand(logger, repoPath, `git branch -D ${branchName}`);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fetches and checks out an existing remote branch.
|
||||||
|
* @param logger - The logger instance.
|
||||||
|
* @param repoPath - The repository path.
|
||||||
|
* @param branchName - The branch name to fetch and checkout.
|
||||||
|
* @returns True if successful, false if the branch no longer exists on remote.
|
||||||
|
*/
|
||||||
|
const fetchAndCheckoutRemoteBranch = async(
|
||||||
|
logger: Logger,
|
||||||
|
repoPath: string,
|
||||||
|
branchName: string,
|
||||||
|
): Promise<boolean> => {
|
||||||
|
try {
|
||||||
|
await runGitCommand(
|
||||||
|
logger,
|
||||||
|
repoPath,
|
||||||
|
`git fetch origin ${branchName}:refs/remotes/origin/${branchName}`,
|
||||||
|
);
|
||||||
|
await runGitCommand(
|
||||||
|
logger,
|
||||||
|
repoPath,
|
||||||
|
`git checkout -b ${branchName} origin/${branchName}`,
|
||||||
|
);
|
||||||
|
return true;
|
||||||
|
} catch {
|
||||||
|
// Branch may have been deleted between check and fetch
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handles updating an existing branch with a newer version.
|
* Handles updating an existing branch with a newer version.
|
||||||
* @param options - The branch update options.
|
* @param options - The branch update options.
|
||||||
* @returns The update result.
|
* @returns The update result, or null if branch no longer exists.
|
||||||
*/
|
*/
|
||||||
const handleExistingBranch = async(
|
const handleExistingBranch = async(
|
||||||
options: BranchUpdateOptions,
|
options: BranchUpdateOptions,
|
||||||
): Promise<UpdateResult> => {
|
): Promise<UpdateResult | null> => {
|
||||||
const { branchName, clonedRepo, logger, packageName, targetVersion }
|
const { branchName, clonedRepo, logger, packageName, targetVersion }
|
||||||
= options;
|
= options;
|
||||||
const { path: repoPath } = clonedRepo;
|
const { path: repoPath } = clonedRepo;
|
||||||
|
|
||||||
await runGitCommand(logger, repoPath, `git checkout ${branchName}`);
|
await deleteStaleLocalBranch(logger, repoPath, branchName);
|
||||||
await runGitCommand(logger, repoPath, `git pull origin ${branchName}`);
|
|
||||||
|
const checkedOut = await fetchAndCheckoutRemoteBranch(
|
||||||
|
logger,
|
||||||
|
repoPath,
|
||||||
|
branchName,
|
||||||
|
);
|
||||||
|
if (!checkedOut) {
|
||||||
|
// Branch was deleted on remote, fall back to creating new branch
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
const currentVersion = await getCurrentVersionOnBranch(repoPath, packageName);
|
const currentVersion = await getCurrentVersionOnBranch(repoPath, packageName);
|
||||||
|
|
||||||
@@ -269,19 +333,20 @@ const handleNewBranch = async(
|
|||||||
const { path: repoPath } = clonedRepo;
|
const { path: repoPath } = clonedRepo;
|
||||||
|
|
||||||
await runGitCommand(logger, repoPath, "git checkout main");
|
await runGitCommand(logger, repoPath, "git checkout main");
|
||||||
await runGitCommand(logger, repoPath, `git checkout -b ${branchName}`);
|
|
||||||
|
|
||||||
|
// Check if package exists before creating branch
|
||||||
const currentVersion = await getCurrentVersionOnBranch(repoPath, packageName);
|
const currentVersion = await getCurrentVersionOnBranch(repoPath, packageName);
|
||||||
if (currentVersion === null) {
|
if (currentVersion === null) {
|
||||||
void logger.log("warn", `Package ${packageName} not found in package.json`);
|
void logger.log("warn", `Package ${packageName} not found in package.json`);
|
||||||
await runGitCommand(logger, repoPath, "git checkout main");
|
|
||||||
await runGitCommand(logger, repoPath, `git branch -D ${branchName}`);
|
|
||||||
return {
|
return {
|
||||||
error: `Package ${packageName} not found in package.json`,
|
error: `Package ${packageName} not found in package.json`,
|
||||||
status: "failed",
|
status: "failed",
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Only create branch if package exists
|
||||||
|
await runGitCommand(logger, repoPath, `git checkout -b ${branchName}`);
|
||||||
|
|
||||||
await updatePackageAndCommit({
|
await updatePackageAndCommit({
|
||||||
logger,
|
logger,
|
||||||
packageName,
|
packageName,
|
||||||
@@ -308,7 +373,8 @@ const createOrUpdateBranch = async(
|
|||||||
const { path: repoPath } = clonedRepo;
|
const { path: repoPath } = clonedRepo;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await runGitCommand(logger, repoPath, "git fetch origin");
|
// Use --prune to remove stale remote-tracking refs that no longer exist
|
||||||
|
await runGitCommand(logger, repoPath, "git fetch origin --prune");
|
||||||
const remoteBranches = await runGitCommand(
|
const remoteBranches = await runGitCommand(
|
||||||
logger,
|
logger,
|
||||||
repoPath,
|
repoPath,
|
||||||
@@ -317,7 +383,11 @@ const createOrUpdateBranch = async(
|
|||||||
const branchExists = remoteBranches.includes(`origin/${branchName}`);
|
const branchExists = remoteBranches.includes(`origin/${branchName}`);
|
||||||
|
|
||||||
if (branchExists) {
|
if (branchExists) {
|
||||||
return await handleExistingBranch(options);
|
const result = await handleExistingBranch(options);
|
||||||
|
// If null, branch was deleted on remote between check and fetch
|
||||||
|
if (result !== null) {
|
||||||
|
return result;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return await handleNewBranch(options);
|
return await handleNewBranch(options);
|
||||||
|
|||||||
@@ -6,7 +6,9 @@
|
|||||||
|
|
||||||
import axios, { isAxiosError, type AxiosInstance } from "axios";
|
import axios, { isAxiosError, type AxiosInstance } from "axios";
|
||||||
import { config } from "../config.js";
|
import { config } from "../config.js";
|
||||||
|
import { logger } from "../utils/logger.js";
|
||||||
import type {
|
import type {
|
||||||
|
GiteaCombinedStatus,
|
||||||
GiteaFile,
|
GiteaFile,
|
||||||
GiteaPullRequest,
|
GiteaPullRequest,
|
||||||
GiteaRepository,
|
GiteaRepository,
|
||||||
@@ -142,6 +144,87 @@ class GiteaService {
|
|||||||
);
|
);
|
||||||
return data;
|
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 };
|
export { GiteaService };
|
||||||
|
|||||||
@@ -4,13 +4,12 @@
|
|||||||
* @author Naomi Carrigan
|
* @author Naomi Carrigan
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { Logger } from "@nhcarrigan/logger";
|
|
||||||
import axios, { isAxiosError, type AxiosInstance } from "axios";
|
import axios, { isAxiosError, type AxiosInstance } from "axios";
|
||||||
|
import semver from "semver";
|
||||||
import { config } from "../config.js";
|
import { config } from "../config.js";
|
||||||
|
import { logger } from "../utils/logger.js";
|
||||||
import type { NpmPackageInfo } from "../types/package.types.js";
|
import type { NpmPackageInfo } from "../types/package.types.js";
|
||||||
|
|
||||||
const logger = new Logger("NpmService", process.env.LOG_TOKEN ?? "");
|
|
||||||
|
|
||||||
/* eslint-disable @typescript-eslint/naming-convention -- GitHub API response types use snake_case property names */
|
/* eslint-disable @typescript-eslint/naming-convention -- GitHub API response types use snake_case property names */
|
||||||
interface GitHubRelease {
|
interface GitHubRelease {
|
||||||
body?: string;
|
body?: string;
|
||||||
@@ -148,6 +147,50 @@ class NpmService {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the latest version that is at least minimumAgeDays old.
|
||||||
|
* @param packageInfo - The package information from npm.
|
||||||
|
* @param minimumAgeDays - Minimum days since publication (default 10).
|
||||||
|
* @returns The latest mature version, or null if none found.
|
||||||
|
*/
|
||||||
|
public static getLatestMatureVersion(
|
||||||
|
packageInfo: NpmPackageInfo,
|
||||||
|
minimumAgeDays = 10,
|
||||||
|
): string | null {
|
||||||
|
const now = Date.now();
|
||||||
|
const minimumAgeMs = minimumAgeDays * 24 * 60 * 60 * 1000;
|
||||||
|
const cutoffDate = now - minimumAgeMs;
|
||||||
|
|
||||||
|
const versions = Object.keys(packageInfo.versions);
|
||||||
|
const matureVersions = versions.filter((version) => {
|
||||||
|
// Skip prerelease versions (e.g., 1.0.0-rc.1, 1.0.0-alpha, 1.0.0-beta.2)
|
||||||
|
const prereleaseComponents = semver.prerelease(version);
|
||||||
|
if (prereleaseComponents !== null && prereleaseComponents.length > 0) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const publishedAt = packageInfo.time[version];
|
||||||
|
if (publishedAt === undefined) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
const publishedDate = new Date(publishedAt).getTime();
|
||||||
|
return publishedDate <= cutoffDate;
|
||||||
|
});
|
||||||
|
|
||||||
|
if (matureVersions.length === 0) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sort by semver (descending) to get the latest mature version
|
||||||
|
matureVersions.sort((version1, version2) => {
|
||||||
|
return version2.localeCompare(version1, undefined, { numeric: true });
|
||||||
|
});
|
||||||
|
|
||||||
|
// eslint-disable-next-line capitalized-comments -- v8 coverage ignore directive must be lowercase
|
||||||
|
/* v8 ignore next -- @preserve */
|
||||||
|
return matureVersions[0] ?? null;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Fetches changelog information for a package update.
|
* Fetches changelog information for a package update.
|
||||||
* @param options - The changelog fetch options.
|
* @param options - The changelog fetch options.
|
||||||
|
|||||||
@@ -4,8 +4,12 @@
|
|||||||
* @author Naomi Carrigan
|
* @author Naomi Carrigan
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { Logger } from "@nhcarrigan/logger";
|
|
||||||
import { config } from "../config.js";
|
import { config } from "../config.js";
|
||||||
|
import { logger } from "../utils/logger.js";
|
||||||
|
import {
|
||||||
|
isMajorVersionBump,
|
||||||
|
stripVersionPrefix,
|
||||||
|
} from "../utils/versionComparison.js";
|
||||||
import { DependencyAnalyzerService } from "./dependencyAnalyzerService.js";
|
import { DependencyAnalyzerService } from "./dependencyAnalyzerService.js";
|
||||||
import { GiteaService } from "./giteaService.js";
|
import { GiteaService } from "./giteaService.js";
|
||||||
import {
|
import {
|
||||||
@@ -17,17 +21,6 @@ import { NpmService } from "./npmService.js";
|
|||||||
import type { GiteaRepository } from "../types/gitea.types.js";
|
import type { GiteaRepository } from "../types/gitea.types.js";
|
||||||
import type { DependencyUpdate, PackageJson } from "../types/package.types.js";
|
import type { DependencyUpdate, PackageJson } from "../types/package.types.js";
|
||||||
|
|
||||||
const logger = new Logger("UpdateOrchestrator", process.env.LOG_TOKEN ?? "");
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 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.
|
* Generates the body content for a PR.
|
||||||
* @param update - The dependency update information.
|
* @param update - The dependency update information.
|
||||||
@@ -144,6 +137,103 @@ class UpdateOrchestratorService {
|
|||||||
await logger.log("info", "Dependency update check complete!");
|
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.
|
* Creates or updates a PR for a dependency update.
|
||||||
* @param repo - The repository information.
|
* @param repo - The repository information.
|
||||||
@@ -159,6 +249,16 @@ class UpdateOrchestratorService {
|
|||||||
= `${config.prBranchPrefix}${update.packageName.replaceAll(/[/@]/g, "-")}`;
|
= `${config.prBranchPrefix}${update.packageName.replaceAll(/[/@]/g, "-")}`;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
const existingPRMerged = await this.checkAndMergeExistingPR(
|
||||||
|
repo,
|
||||||
|
update,
|
||||||
|
branchName,
|
||||||
|
);
|
||||||
|
|
||||||
|
if (existingPRMerged) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const result = await createOrUpdateBranch({
|
const result = await createOrUpdateBranch({
|
||||||
branchName: branchName,
|
branchName: branchName,
|
||||||
clonedRepo: clonedRepo,
|
clonedRepo: clonedRepo,
|
||||||
|
|||||||
@@ -39,6 +39,33 @@ interface GiteaPullRequest {
|
|||||||
state: "closed" | "open";
|
state: "closed" | "open";
|
||||||
title: string;
|
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 */
|
/* eslint-enable @typescript-eslint/naming-convention -- End Gitea API types */
|
||||||
|
|
||||||
export type { GiteaFile, GiteaPullRequest, GiteaRepository };
|
export type {
|
||||||
|
GiteaCombinedStatus,
|
||||||
|
GiteaCommitStatus,
|
||||||
|
GiteaFile,
|
||||||
|
GiteaPullRequest,
|
||||||
|
GiteaRepository,
|
||||||
|
};
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ interface NpmPackageInfo {
|
|||||||
latest: string;
|
latest: string;
|
||||||
};
|
};
|
||||||
"name": string;
|
"name": string;
|
||||||
|
"time": Record<string, string>;
|
||||||
"versions": Record<
|
"versions": Record<
|
||||||
string,
|
string,
|
||||||
{
|
{
|
||||||
|
|||||||
+16
-2
@@ -4,8 +4,22 @@
|
|||||||
* @author Naomi Carrigan
|
* @author Naomi Carrigan
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { Logger } from "@nhcarrigan/logger";
|
import type { Logger } from "@nhcarrigan/logger";
|
||||||
|
|
||||||
const logger = new Logger("Minori", process.env.LOG_TOKEN ?? "");
|
// Import { Logger } from "@nhcarrigan/logger";
|
||||||
|
|
||||||
|
// 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);
|
||||||
|
},
|
||||||
|
log: (level: string, message: string) => {
|
||||||
|
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 };
|
export { logger };
|
||||||
|
|||||||
@@ -0,0 +1,64 @@
|
|||||||
|
/**
|
||||||
|
* @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,11 +6,17 @@
|
|||||||
|
|
||||||
/* eslint-disable vitest/valid-expect -- Test expectations don't need messages */
|
/* 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-per-function -- Test suites require many test cases */
|
||||||
|
/* eslint-disable max-lines -- Test suites require many test cases */
|
||||||
/* eslint-disable @typescript-eslint/naming-convention -- Test data uses npm package names and destructured imports */
|
/* eslint-disable @typescript-eslint/naming-convention -- Test data uses npm package names and destructured imports */
|
||||||
/* eslint-disable @typescript-eslint/consistent-type-assertions -- Required for mocking */
|
/* eslint-disable @typescript-eslint/consistent-type-assertions -- Required for mocking */
|
||||||
|
|
||||||
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
||||||
|
|
||||||
|
const getDaysAgoIso = (days: number): string => {
|
||||||
|
const msPerDay = 24 * 60 * 60 * 1000;
|
||||||
|
const ageMs = days * msPerDay;
|
||||||
|
return new Date(Date.now() - ageMs).toISOString();
|
||||||
|
};
|
||||||
|
|
||||||
vi.mock("@nhcarrigan/logger", () => {
|
vi.mock("@nhcarrigan/logger", () => {
|
||||||
return {
|
return {
|
||||||
|
|
||||||
@@ -57,10 +63,13 @@ describe("dependencyAnalyzerService", () => {
|
|||||||
it("should find updates for dependencies", async() => {
|
it("should find updates for dependencies", async() => {
|
||||||
expect.assertions(2);
|
expect.assertions(2);
|
||||||
const mockNpmService = createMockNpmService();
|
const mockNpmService = createMockNpmService();
|
||||||
|
// Include time field with a date >10 days ago for the mature version check
|
||||||
|
const oldDate = getDaysAgoIso(15);
|
||||||
mockNpmService.getPackageInfo.mockResolvedValue({
|
mockNpmService.getPackageInfo.mockResolvedValue({
|
||||||
"dist-tags": { latest: "2.0.0" },
|
"dist-tags": { latest: "2.0.0" },
|
||||||
"name": "test-package",
|
"name": "test-package",
|
||||||
"versions": {},
|
"time": { "2.0.0": oldDate },
|
||||||
|
"versions": { "2.0.0": { version: "2.0.0" } },
|
||||||
});
|
});
|
||||||
const { DependencyAnalyzerService }
|
const { DependencyAnalyzerService }
|
||||||
= await import("../../src/services/dependencyAnalyzerService.js");
|
= await import("../../src/services/dependencyAnalyzerService.js");
|
||||||
@@ -197,10 +206,12 @@ describe("dependencyAnalyzerService", () => {
|
|||||||
it("should not include packages that are already up-to-date", async() => {
|
it("should not include packages that are already up-to-date", async() => {
|
||||||
expect.assertions(1);
|
expect.assertions(1);
|
||||||
const mockNpmService = createMockNpmService();
|
const mockNpmService = createMockNpmService();
|
||||||
|
const oldDate = getDaysAgoIso(15);
|
||||||
mockNpmService.getPackageInfo.mockResolvedValue({
|
mockNpmService.getPackageInfo.mockResolvedValue({
|
||||||
"dist-tags": { latest: "1.0.0" },
|
"dist-tags": { latest: "1.0.0" },
|
||||||
"name": "test-package",
|
"name": "test-package",
|
||||||
"versions": {},
|
"time": { "1.0.0": oldDate },
|
||||||
|
"versions": { "1.0.0": { version: "1.0.0" } },
|
||||||
});
|
});
|
||||||
const { DependencyAnalyzerService }
|
const { DependencyAnalyzerService }
|
||||||
= await import("../../src/services/dependencyAnalyzerService.js");
|
= await import("../../src/services/dependencyAnalyzerService.js");
|
||||||
@@ -235,10 +246,12 @@ describe("dependencyAnalyzerService", () => {
|
|||||||
it("should handle version prefixes like ^", async() => {
|
it("should handle version prefixes like ^", async() => {
|
||||||
expect.assertions(2);
|
expect.assertions(2);
|
||||||
const mockNpmService = createMockNpmService();
|
const mockNpmService = createMockNpmService();
|
||||||
|
const oldDate = getDaysAgoIso(15);
|
||||||
mockNpmService.getPackageInfo.mockResolvedValue({
|
mockNpmService.getPackageInfo.mockResolvedValue({
|
||||||
"dist-tags": { latest: "2.0.0" },
|
"dist-tags": { latest: "2.0.0" },
|
||||||
"name": "test-package",
|
"name": "test-package",
|
||||||
"versions": {},
|
"time": { "2.0.0": oldDate },
|
||||||
|
"versions": { "2.0.0": { version: "2.0.0" } },
|
||||||
});
|
});
|
||||||
const { DependencyAnalyzerService }
|
const { DependencyAnalyzerService }
|
||||||
= await import("../../src/services/dependencyAnalyzerService.js");
|
= await import("../../src/services/dependencyAnalyzerService.js");
|
||||||
@@ -254,6 +267,54 @@ describe("dependencyAnalyzerService", () => {
|
|||||||
expect(result[0]?.currentVersion).toBe("^1.0.0");
|
expect(result[0]?.currentVersion).toBe("^1.0.0");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("should handle multi-character version prefixes like >=", async() => {
|
||||||
|
expect.assertions(2);
|
||||||
|
const mockNpmService = createMockNpmService();
|
||||||
|
const oldDate = getDaysAgoIso(15);
|
||||||
|
mockNpmService.getPackageInfo.mockResolvedValue({
|
||||||
|
"dist-tags": { latest: "2.0.0" },
|
||||||
|
"name": "test-package",
|
||||||
|
"time": { "2.0.0": oldDate },
|
||||||
|
"versions": { "2.0.0": { version: "2.0.0" } },
|
||||||
|
});
|
||||||
|
const { DependencyAnalyzerService }
|
||||||
|
= await import("../../src/services/dependencyAnalyzerService.js");
|
||||||
|
const analyzerService = new DependencyAnalyzerService(
|
||||||
|
mockNpmService as Parameters<typeof DependencyAnalyzerService>[0],
|
||||||
|
);
|
||||||
|
const result = await analyzerService.analyzePackageJson({
|
||||||
|
dependencies: {
|
||||||
|
"test-package": ">=1.0.0",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
expect(result).toHaveLength(1);
|
||||||
|
expect(result[0]?.currentVersion).toBe(">=1.0.0");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should handle partial version numbers like '2'", async() => {
|
||||||
|
expect.assertions(2);
|
||||||
|
const mockNpmService = createMockNpmService();
|
||||||
|
const oldDate = getDaysAgoIso(15);
|
||||||
|
mockNpmService.getPackageInfo.mockResolvedValue({
|
||||||
|
"dist-tags": { latest: "3.0.0" },
|
||||||
|
"name": "test-package",
|
||||||
|
"time": { "3.0.0": oldDate },
|
||||||
|
"versions": { "3.0.0": { version: "3.0.0" } },
|
||||||
|
});
|
||||||
|
const { DependencyAnalyzerService }
|
||||||
|
= await import("../../src/services/dependencyAnalyzerService.js");
|
||||||
|
const analyzerService = new DependencyAnalyzerService(
|
||||||
|
mockNpmService as Parameters<typeof DependencyAnalyzerService>[0],
|
||||||
|
);
|
||||||
|
const result = await analyzerService.analyzePackageJson({
|
||||||
|
dependencies: {
|
||||||
|
"test-package": "2",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
expect(result).toHaveLength(1);
|
||||||
|
expect(result[0]?.currentVersion).toBe("2");
|
||||||
|
});
|
||||||
|
|
||||||
it("should handle npm errors gracefully", async() => {
|
it("should handle npm errors gracefully", async() => {
|
||||||
expect.assertions(1);
|
expect.assertions(1);
|
||||||
const mockNpmService = createMockNpmService();
|
const mockNpmService = createMockNpmService();
|
||||||
@@ -274,10 +335,12 @@ describe("dependencyAnalyzerService", () => {
|
|||||||
it("should handle semver comparison errors", async() => {
|
it("should handle semver comparison errors", async() => {
|
||||||
expect.assertions(1);
|
expect.assertions(1);
|
||||||
const mockNpmService = createMockNpmService();
|
const mockNpmService = createMockNpmService();
|
||||||
|
const oldDate = getDaysAgoIso(15);
|
||||||
mockNpmService.getPackageInfo.mockResolvedValue({
|
mockNpmService.getPackageInfo.mockResolvedValue({
|
||||||
"dist-tags": { latest: "invalid-version" },
|
"dist-tags": { latest: "invalid-version" },
|
||||||
"name": "test-package",
|
"name": "test-package",
|
||||||
"versions": {},
|
"time": { "invalid-version": oldDate },
|
||||||
|
"versions": { "invalid-version": { version: "invalid-version" } },
|
||||||
});
|
});
|
||||||
const { DependencyAnalyzerService }
|
const { DependencyAnalyzerService }
|
||||||
= await import("../../src/services/dependencyAnalyzerService.js");
|
= await import("../../src/services/dependencyAnalyzerService.js");
|
||||||
@@ -291,4 +354,28 @@ describe("dependencyAnalyzerService", () => {
|
|||||||
});
|
});
|
||||||
expect(result).toStrictEqual([]);
|
expect(result).toStrictEqual([]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("should return null when no mature version exists", async() => {
|
||||||
|
expect.assertions(1);
|
||||||
|
const mockNpmService = createMockNpmService();
|
||||||
|
// Use a very recent date (2 days ago) so getLatestMatureVersion returns null
|
||||||
|
const recentDate = getDaysAgoIso(2);
|
||||||
|
mockNpmService.getPackageInfo.mockResolvedValue({
|
||||||
|
"dist-tags": { latest: "2.0.0" },
|
||||||
|
"name": "test-package",
|
||||||
|
"time": { "2.0.0": recentDate },
|
||||||
|
"versions": { "2.0.0": { version: "2.0.0" } },
|
||||||
|
});
|
||||||
|
const { DependencyAnalyzerService }
|
||||||
|
= await import("../../src/services/dependencyAnalyzerService.js");
|
||||||
|
const analyzerService = new DependencyAnalyzerService(
|
||||||
|
mockNpmService as Parameters<typeof DependencyAnalyzerService>[0],
|
||||||
|
);
|
||||||
|
const result = await analyzerService.analyzePackageJson({
|
||||||
|
dependencies: {
|
||||||
|
"test-package": "1.0.0",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
expect(result).toStrictEqual([]);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -203,6 +203,44 @@ describe("gitService", () => {
|
|||||||
expect(result.status).toBe("up-to-date");
|
expect(result.status).toBe("up-to-date");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("should delete stale local branch before checking out remote", async() => {
|
||||||
|
expect.assertions(2);
|
||||||
|
const branchDeleteCalls: Array<string> = [];
|
||||||
|
mockExecAsync.mockImplementation((command: string) => {
|
||||||
|
if (command.includes("git branch -r")) {
|
||||||
|
return Promise.resolve({
|
||||||
|
stderr: "",
|
||||||
|
stdout: " origin/dependencies/update-test-package\n",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (command.includes("git branch") && !command.includes("-")) {
|
||||||
|
// Return local branches including the stale one
|
||||||
|
return Promise.resolve({
|
||||||
|
stderr: "",
|
||||||
|
stdout: "* main\n dependencies/update-test-package\n",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (command.includes("git branch -D")) {
|
||||||
|
branchDeleteCalls.push(command);
|
||||||
|
}
|
||||||
|
return Promise.resolve({ stderr: "", stdout: "" });
|
||||||
|
});
|
||||||
|
vi.mocked(readFile).mockResolvedValue(JSON.stringify({
|
||||||
|
dependencies: { "test-package": "2.0.0" },
|
||||||
|
}));
|
||||||
|
const { createOrUpdateBranch } = await import("../../src/services/gitService.js");
|
||||||
|
const mockClonedRepo = createMockClonedRepo();
|
||||||
|
const result = await createOrUpdateBranch({
|
||||||
|
branchName: "dependencies/update-test-package",
|
||||||
|
clonedRepo: mockClonedRepo,
|
||||||
|
logger: mockLogger,
|
||||||
|
packageName: "test-package",
|
||||||
|
targetVersion: "2.0.0",
|
||||||
|
});
|
||||||
|
expect(result.status).toBe("up-to-date");
|
||||||
|
expect(branchDeleteCalls).toHaveLength(1);
|
||||||
|
});
|
||||||
|
|
||||||
it("should fail when package is not found", async() => {
|
it("should fail when package is not found", async() => {
|
||||||
expect.assertions(2);
|
expect.assertions(2);
|
||||||
mockExecAsync.mockResolvedValue({ stderr: "", stdout: "" });
|
mockExecAsync.mockResolvedValue({ stderr: "", stdout: "" });
|
||||||
@@ -364,6 +402,44 @@ describe("gitService", () => {
|
|||||||
expect(writtenContent.devDependencies["test-package"]).toBe("2.0.0");
|
expect(writtenContent.devDependencies["test-package"]).toBe("2.0.0");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("should fall back to new branch when remote branch fetch fails", async() => {
|
||||||
|
expect.assertions(2);
|
||||||
|
mockExecAsync.mockImplementation((command: string) => {
|
||||||
|
if (command.includes("git branch -r")) {
|
||||||
|
// Report branch as existing
|
||||||
|
return Promise.resolve({
|
||||||
|
stderr: "",
|
||||||
|
stdout: " origin/dependencies/update-test-package\n",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (command.includes("git fetch origin dependencies/update-test-package")) {
|
||||||
|
// But fail when trying to fetch it (deleted between check and fetch)
|
||||||
|
const error = new Error("Git command failed") as Error & { stderr: string };
|
||||||
|
error.stderr = "fatal: couldn't find remote ref dependencies/update-test-package";
|
||||||
|
return Promise.reject(error);
|
||||||
|
}
|
||||||
|
return Promise.resolve({ stderr: "", stdout: "" });
|
||||||
|
});
|
||||||
|
vi.mocked(readFile).mockResolvedValue(JSON.stringify({
|
||||||
|
dependencies: { "test-package": "1.0.0" },
|
||||||
|
}));
|
||||||
|
vi.mocked(writeFile).mockResolvedValue(undefined);
|
||||||
|
const { createOrUpdateBranch } = await import("../../src/services/gitService.js");
|
||||||
|
const mockClonedRepo = createMockClonedRepo();
|
||||||
|
const result = await createOrUpdateBranch({
|
||||||
|
branchName: "dependencies/update-test-package",
|
||||||
|
clonedRepo: mockClonedRepo,
|
||||||
|
logger: mockLogger,
|
||||||
|
packageName: "test-package",
|
||||||
|
targetVersion: "2.0.0",
|
||||||
|
});
|
||||||
|
// Should fall back to creating a new branch
|
||||||
|
expect(result.status).toBe("created");
|
||||||
|
if (result.status === "created") {
|
||||||
|
expect(result.branchName).toBe("dependencies/update-test-package");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
it("should log pnpm error details when install fails", async() => {
|
it("should log pnpm error details when install fails", async() => {
|
||||||
expect.assertions(2);
|
expect.assertions(2);
|
||||||
mockExecAsync.mockImplementation((command: string) => {
|
mockExecAsync.mockImplementation((command: string) => {
|
||||||
|
|||||||
@@ -6,11 +6,16 @@
|
|||||||
|
|
||||||
/* eslint-disable vitest/valid-expect -- Test expectations don't need messages */
|
/* 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-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-assertions -- Required for mocking */
|
||||||
/* eslint-disable @typescript-eslint/consistent-type-imports -- Dynamic imports */
|
/* eslint-disable @typescript-eslint/consistent-type-imports -- Dynamic imports */
|
||||||
/* eslint-disable @typescript-eslint/naming-convention -- Environment variables and Gitea API format */
|
/* eslint-disable @typescript-eslint/naming-convention -- Environment variables and Gitea API format */
|
||||||
/* eslint-disable max-nested-callbacks -- Vitest structure requires nested callbacks */
|
/* eslint-disable max-nested-callbacks -- Vitest structure requires nested callbacks */
|
||||||
/* eslint-disable vitest/require-to-throw-message -- Generic throw assertion */
|
/* 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 axios, { AxiosError, type AxiosResponse } from "axios";
|
||||||
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
||||||
@@ -24,8 +29,9 @@ vi.mock("axios", async() => {
|
|||||||
default: {
|
default: {
|
||||||
create: vi.fn(() => {
|
create: vi.fn(() => {
|
||||||
return {
|
return {
|
||||||
get: vi.fn(),
|
delete: vi.fn(),
|
||||||
post: vi.fn(),
|
get: vi.fn(),
|
||||||
|
post: vi.fn(),
|
||||||
};
|
};
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
@@ -69,6 +75,8 @@ describe("giteaService", () => {
|
|||||||
let mockGet: ReturnType<typeof vi.fn>;
|
let mockGet: ReturnType<typeof vi.fn>;
|
||||||
// eslint-disable-next-line @typescript-eslint/init-declarations -- Reassigned in beforeEach
|
// eslint-disable-next-line @typescript-eslint/init-declarations -- Reassigned in beforeEach
|
||||||
let mockPost: ReturnType<typeof vi.fn>;
|
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;
|
const originalEnvironment = process.env;
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
@@ -77,9 +85,11 @@ describe("giteaService", () => {
|
|||||||
|
|
||||||
mockGet = vi.fn();
|
mockGet = vi.fn();
|
||||||
mockPost = vi.fn();
|
mockPost = vi.fn();
|
||||||
|
mockDelete = vi.fn();
|
||||||
vi.mocked(axios.create).mockReturnValue({
|
vi.mocked(axios.create).mockReturnValue({
|
||||||
get: mockGet,
|
delete: mockDelete,
|
||||||
post: mockPost,
|
get: mockGet,
|
||||||
|
post: mockPost,
|
||||||
} as unknown as ReturnType<typeof axios.create>);
|
} as unknown as ReturnType<typeof axios.create>);
|
||||||
|
|
||||||
giteaService = new GiteaService();
|
giteaService = new GiteaService();
|
||||||
@@ -306,4 +316,69 @@ describe("giteaService", () => {
|
|||||||
{ params: { state: "closed" } },
|
{ 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);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -11,11 +11,19 @@
|
|||||||
/* eslint-disable @typescript-eslint/consistent-type-imports -- Dynamic imports */
|
/* eslint-disable @typescript-eslint/consistent-type-imports -- Dynamic imports */
|
||||||
/* eslint-disable vitest/require-to-throw-message -- Generic throw assertion */
|
/* eslint-disable vitest/require-to-throw-message -- Generic throw assertion */
|
||||||
/* eslint-disable stylistic/max-len -- Test files have long URLs */
|
/* eslint-disable stylistic/max-len -- Test files have long URLs */
|
||||||
|
/* eslint-disable max-lines -- Test files have many test cases */
|
||||||
|
/* eslint-disable max-statements -- Test describe blocks have many statements */
|
||||||
|
|
||||||
import axios, { AxiosError, type AxiosResponse } from "axios";
|
import axios, { AxiosError, type AxiosResponse } from "axios";
|
||||||
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
||||||
import { NpmService } from "../../src/services/npmService.js";
|
import { NpmService } from "../../src/services/npmService.js";
|
||||||
|
|
||||||
|
const getDaysAgoIso = (days: number): string => {
|
||||||
|
const msPerDay = 24 * 60 * 60 * 1000;
|
||||||
|
const ageMs = days * msPerDay;
|
||||||
|
return new Date(Date.now() - ageMs).toISOString();
|
||||||
|
};
|
||||||
|
|
||||||
vi.mock("axios", async() => {
|
vi.mock("axios", async() => {
|
||||||
const actualAxios = await vi.importActual<typeof import("axios")>("axios");
|
const actualAxios = await vi.importActual<typeof import("axios")>("axios");
|
||||||
return {
|
return {
|
||||||
@@ -331,4 +339,131 @@ describe("npmService", () => {
|
|||||||
});
|
});
|
||||||
expect(result).toBe("Updated from 1.0.0 to 2.0.0");
|
expect(result).toBe("Updated from 1.0.0 to 2.0.0");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("should return latest mature version when versions are old enough", () => {
|
||||||
|
expect.assertions(1);
|
||||||
|
const oldDate = getDaysAgoIso(15);
|
||||||
|
const packageInfo = {
|
||||||
|
"dist-tags": { latest: "2.0.0" },
|
||||||
|
"name": "test-package",
|
||||||
|
"time": { "1.0.0": oldDate, "2.0.0": oldDate },
|
||||||
|
"versions": {
|
||||||
|
"1.0.0": { version: "1.0.0" },
|
||||||
|
"2.0.0": { version: "2.0.0" },
|
||||||
|
},
|
||||||
|
};
|
||||||
|
const result = NpmService.getLatestMatureVersion(packageInfo);
|
||||||
|
expect(result).toBe("2.0.0");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should return null when no mature versions exist", () => {
|
||||||
|
expect.assertions(1);
|
||||||
|
const recentDate = getDaysAgoIso(2);
|
||||||
|
const packageInfo = {
|
||||||
|
"dist-tags": { latest: "2.0.0" },
|
||||||
|
"name": "test-package",
|
||||||
|
"time": { "2.0.0": recentDate },
|
||||||
|
"versions": { "2.0.0": { version: "2.0.0" } },
|
||||||
|
};
|
||||||
|
const result = NpmService.getLatestMatureVersion(packageInfo);
|
||||||
|
expect(result).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should skip versions without time data", () => {
|
||||||
|
expect.assertions(1);
|
||||||
|
const oldDate = getDaysAgoIso(15);
|
||||||
|
const packageInfo = {
|
||||||
|
"dist-tags": { latest: "2.0.0" },
|
||||||
|
"name": "test-package",
|
||||||
|
"time": { "1.0.0": oldDate },
|
||||||
|
"versions": {
|
||||||
|
"1.0.0": { version: "1.0.0" },
|
||||||
|
"2.0.0": { version: "2.0.0" },
|
||||||
|
},
|
||||||
|
};
|
||||||
|
const result = NpmService.getLatestMatureVersion(packageInfo);
|
||||||
|
expect(result).toBe("1.0.0");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should sort versions correctly and return the latest", () => {
|
||||||
|
expect.assertions(1);
|
||||||
|
const oldDate = getDaysAgoIso(15);
|
||||||
|
const packageInfo = {
|
||||||
|
"dist-tags": { latest: "3.0.0" },
|
||||||
|
"name": "test-package",
|
||||||
|
"time": { "1.0.0": oldDate, "2.0.0": oldDate, "3.0.0": oldDate },
|
||||||
|
"versions": {
|
||||||
|
"1.0.0": { version: "1.0.0" },
|
||||||
|
"2.0.0": { version: "2.0.0" },
|
||||||
|
"3.0.0": { version: "3.0.0" },
|
||||||
|
},
|
||||||
|
};
|
||||||
|
const result = NpmService.getLatestMatureVersion(packageInfo);
|
||||||
|
expect(result).toBe("3.0.0");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should use custom minimumAgeDays parameter", () => {
|
||||||
|
expect.assertions(1);
|
||||||
|
const fiveDaysAgo = getDaysAgoIso(5);
|
||||||
|
const packageInfo = {
|
||||||
|
"dist-tags": { latest: "2.0.0" },
|
||||||
|
"name": "test-package",
|
||||||
|
"time": { "2.0.0": fiveDaysAgo },
|
||||||
|
"versions": { "2.0.0": { version: "2.0.0" } },
|
||||||
|
};
|
||||||
|
// Default is 10 days, so 5 days old should be null
|
||||||
|
const resultDefault = NpmService.getLatestMatureVersion(packageInfo);
|
||||||
|
expect(resultDefault).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should return mature version with custom minimumAgeDays", () => {
|
||||||
|
expect.assertions(1);
|
||||||
|
const fiveDaysAgo = getDaysAgoIso(5);
|
||||||
|
const packageInfo = {
|
||||||
|
"dist-tags": { latest: "2.0.0" },
|
||||||
|
"name": "test-package",
|
||||||
|
"time": { "2.0.0": fiveDaysAgo },
|
||||||
|
"versions": { "2.0.0": { version: "2.0.0" } },
|
||||||
|
};
|
||||||
|
// With 3 days minimum, 5 days old should be valid
|
||||||
|
const resultCustom = NpmService.getLatestMatureVersion(packageInfo, 3);
|
||||||
|
expect(resultCustom).toBe("2.0.0");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should skip prerelease versions like rc, alpha, beta", () => {
|
||||||
|
expect.assertions(1);
|
||||||
|
const oldDate = getDaysAgoIso(15);
|
||||||
|
const packageInfo = {
|
||||||
|
"dist-tags": { latest: "3.0.0-rc.1" },
|
||||||
|
"name": "test-package",
|
||||||
|
"time": {
|
||||||
|
"2.0.0": oldDate,
|
||||||
|
"3.0.0-alpha": oldDate,
|
||||||
|
"3.0.0-beta.1": oldDate,
|
||||||
|
"3.0.0-rc.1": oldDate,
|
||||||
|
},
|
||||||
|
"versions": {
|
||||||
|
"2.0.0": { version: "2.0.0" },
|
||||||
|
"3.0.0-alpha": { version: "3.0.0-alpha" },
|
||||||
|
"3.0.0-beta.1": { version: "3.0.0-beta.1" },
|
||||||
|
"3.0.0-rc.1": { version: "3.0.0-rc.1" },
|
||||||
|
},
|
||||||
|
};
|
||||||
|
// Should return 2.0.0 since all 3.0.0 versions are prereleases
|
||||||
|
const result = NpmService.getLatestMatureVersion(packageInfo);
|
||||||
|
expect(result).toBe("2.0.0");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should return null when only prerelease versions exist", () => {
|
||||||
|
expect.assertions(1);
|
||||||
|
const oldDate = getDaysAgoIso(15);
|
||||||
|
const packageInfo = {
|
||||||
|
"dist-tags": { latest: "1.0.0-rc.1" },
|
||||||
|
"name": "test-package",
|
||||||
|
"time": { "1.0.0-rc.1": oldDate },
|
||||||
|
"versions": { "1.0.0-rc.1": { version: "1.0.0-rc.1" } },
|
||||||
|
};
|
||||||
|
const result = NpmService.getLatestMatureVersion(packageInfo);
|
||||||
|
expect(result).toBeNull();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -18,6 +18,8 @@ const mockGiteaGetFileContent = vi.fn();
|
|||||||
const mockGiteaListOrgRepositories = vi.fn();
|
const mockGiteaListOrgRepositories = vi.fn();
|
||||||
const mockGiteaCreatePullRequest = vi.fn();
|
const mockGiteaCreatePullRequest = vi.fn();
|
||||||
const mockGiteaListPullRequests = vi.fn();
|
const mockGiteaListPullRequests = vi.fn();
|
||||||
|
const mockGiteaGetCommitStatus = vi.fn();
|
||||||
|
const mockGiteaMergePullRequest = vi.fn();
|
||||||
const mockNpmGetPackageChangelog = vi.fn();
|
const mockNpmGetPackageChangelog = vi.fn();
|
||||||
const mockNpmGetPackageInfo = vi.fn();
|
const mockNpmGetPackageInfo = vi.fn();
|
||||||
const mockAnalyzePackageJson = vi.fn();
|
const mockAnalyzePackageJson = vi.fn();
|
||||||
@@ -39,9 +41,11 @@ vi.mock("../../src/services/giteaService.js", () => {
|
|||||||
|
|
||||||
GiteaService: class MockGiteaService {
|
GiteaService: class MockGiteaService {
|
||||||
public createPullRequest = mockGiteaCreatePullRequest;
|
public createPullRequest = mockGiteaCreatePullRequest;
|
||||||
|
public getCommitStatus = mockGiteaGetCommitStatus;
|
||||||
public getFileContent = mockGiteaGetFileContent;
|
public getFileContent = mockGiteaGetFileContent;
|
||||||
public listOrgRepositories = mockGiteaListOrgRepositories;
|
public listOrgRepositories = mockGiteaListOrgRepositories;
|
||||||
public listPullRequests = mockGiteaListPullRequests;
|
public listPullRequests = mockGiteaListPullRequests;
|
||||||
|
public mergePullRequest = mockGiteaMergePullRequest;
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
@@ -221,6 +225,7 @@ describe("updateOrchestratorService", () => {
|
|||||||
const mockUpdates = [ createMockUpdate() ];
|
const mockUpdates = [ createMockUpdate() ];
|
||||||
mockGiteaListOrgRepositories.mockResolvedValue(mockRepos);
|
mockGiteaListOrgRepositories.mockResolvedValue(mockRepos);
|
||||||
mockGiteaGetFileContent.mockResolvedValue(mockFileContent);
|
mockGiteaGetFileContent.mockResolvedValue(mockFileContent);
|
||||||
|
mockGiteaListPullRequests.mockResolvedValue([]);
|
||||||
mockAnalyzePackageJson.mockResolvedValue(mockUpdates);
|
mockAnalyzePackageJson.mockResolvedValue(mockUpdates);
|
||||||
mockNpmGetPackageChangelog.mockResolvedValue("## Changelog");
|
mockNpmGetPackageChangelog.mockResolvedValue("## Changelog");
|
||||||
mockCloneRepository.mockResolvedValue(createMockClonedRepo());
|
mockCloneRepository.mockResolvedValue(createMockClonedRepo());
|
||||||
@@ -267,6 +272,7 @@ describe("updateOrchestratorService", () => {
|
|||||||
const mockUpdates = [ createMockUpdate() ];
|
const mockUpdates = [ createMockUpdate() ];
|
||||||
mockGiteaListOrgRepositories.mockResolvedValue(mockRepos);
|
mockGiteaListOrgRepositories.mockResolvedValue(mockRepos);
|
||||||
mockGiteaGetFileContent.mockResolvedValue(mockFileContent);
|
mockGiteaGetFileContent.mockResolvedValue(mockFileContent);
|
||||||
|
mockGiteaListPullRequests.mockResolvedValue([]);
|
||||||
mockAnalyzePackageJson.mockResolvedValue(mockUpdates);
|
mockAnalyzePackageJson.mockResolvedValue(mockUpdates);
|
||||||
mockCloneRepository.mockResolvedValue(createMockClonedRepo());
|
mockCloneRepository.mockResolvedValue(createMockClonedRepo());
|
||||||
mockCreateOrUpdateBranch.mockResolvedValue({
|
mockCreateOrUpdateBranch.mockResolvedValue({
|
||||||
@@ -289,6 +295,7 @@ describe("updateOrchestratorService", () => {
|
|||||||
const mockUpdates = [ createMockUpdate() ];
|
const mockUpdates = [ createMockUpdate() ];
|
||||||
mockGiteaListOrgRepositories.mockResolvedValue(mockRepos);
|
mockGiteaListOrgRepositories.mockResolvedValue(mockRepos);
|
||||||
mockGiteaGetFileContent.mockResolvedValue(mockFileContent);
|
mockGiteaGetFileContent.mockResolvedValue(mockFileContent);
|
||||||
|
mockGiteaListPullRequests.mockResolvedValue([]);
|
||||||
mockAnalyzePackageJson.mockResolvedValue(mockUpdates);
|
mockAnalyzePackageJson.mockResolvedValue(mockUpdates);
|
||||||
mockCloneRepository.mockResolvedValue(createMockClonedRepo());
|
mockCloneRepository.mockResolvedValue(createMockClonedRepo());
|
||||||
mockCreateOrUpdateBranch.mockResolvedValue({
|
mockCreateOrUpdateBranch.mockResolvedValue({
|
||||||
@@ -312,6 +319,7 @@ describe("updateOrchestratorService", () => {
|
|||||||
const mockUpdates = [ createMockUpdate() ];
|
const mockUpdates = [ createMockUpdate() ];
|
||||||
mockGiteaListOrgRepositories.mockResolvedValue(mockRepos);
|
mockGiteaListOrgRepositories.mockResolvedValue(mockRepos);
|
||||||
mockGiteaGetFileContent.mockResolvedValue(mockFileContent);
|
mockGiteaGetFileContent.mockResolvedValue(mockFileContent);
|
||||||
|
mockGiteaListPullRequests.mockResolvedValue([]);
|
||||||
mockAnalyzePackageJson.mockResolvedValue(mockUpdates);
|
mockAnalyzePackageJson.mockResolvedValue(mockUpdates);
|
||||||
mockCloneRepository.mockResolvedValue(createMockClonedRepo());
|
mockCloneRepository.mockResolvedValue(createMockClonedRepo());
|
||||||
mockCreateOrUpdateBranch.mockResolvedValue({
|
mockCreateOrUpdateBranch.mockResolvedValue({
|
||||||
@@ -354,6 +362,7 @@ describe("updateOrchestratorService", () => {
|
|||||||
const mockUpdates = [ createMockUpdate() ];
|
const mockUpdates = [ createMockUpdate() ];
|
||||||
mockGiteaListOrgRepositories.mockResolvedValue(mockRepos);
|
mockGiteaListOrgRepositories.mockResolvedValue(mockRepos);
|
||||||
mockGiteaGetFileContent.mockResolvedValue(mockFileContent);
|
mockGiteaGetFileContent.mockResolvedValue(mockFileContent);
|
||||||
|
mockGiteaListPullRequests.mockResolvedValue([]);
|
||||||
mockAnalyzePackageJson.mockResolvedValue(mockUpdates);
|
mockAnalyzePackageJson.mockResolvedValue(mockUpdates);
|
||||||
mockCloneRepository.mockResolvedValue(createMockClonedRepo());
|
mockCloneRepository.mockResolvedValue(createMockClonedRepo());
|
||||||
mockCreateOrUpdateBranch.mockResolvedValue({
|
mockCreateOrUpdateBranch.mockResolvedValue({
|
||||||
@@ -377,6 +386,7 @@ describe("updateOrchestratorService", () => {
|
|||||||
const mockUpdates = [ createMockUpdate() ];
|
const mockUpdates = [ createMockUpdate() ];
|
||||||
mockGiteaListOrgRepositories.mockResolvedValue(mockRepos);
|
mockGiteaListOrgRepositories.mockResolvedValue(mockRepos);
|
||||||
mockGiteaGetFileContent.mockResolvedValue(mockFileContent);
|
mockGiteaGetFileContent.mockResolvedValue(mockFileContent);
|
||||||
|
mockGiteaListPullRequests.mockResolvedValue([]);
|
||||||
mockAnalyzePackageJson.mockResolvedValue(mockUpdates);
|
mockAnalyzePackageJson.mockResolvedValue(mockUpdates);
|
||||||
mockNpmGetPackageChangelog.mockResolvedValue("## Changelog");
|
mockNpmGetPackageChangelog.mockResolvedValue("## Changelog");
|
||||||
mockCloneRepository.mockResolvedValue(createMockClonedRepo());
|
mockCloneRepository.mockResolvedValue(createMockClonedRepo());
|
||||||
@@ -426,6 +436,7 @@ describe("updateOrchestratorService", () => {
|
|||||||
const mockCleanup = vi.fn();
|
const mockCleanup = vi.fn();
|
||||||
mockGiteaListOrgRepositories.mockResolvedValue(mockRepos);
|
mockGiteaListOrgRepositories.mockResolvedValue(mockRepos);
|
||||||
mockGiteaGetFileContent.mockResolvedValue(mockFileContent);
|
mockGiteaGetFileContent.mockResolvedValue(mockFileContent);
|
||||||
|
mockGiteaListPullRequests.mockResolvedValue([]);
|
||||||
mockAnalyzePackageJson.mockResolvedValue(mockUpdates);
|
mockAnalyzePackageJson.mockResolvedValue(mockUpdates);
|
||||||
mockCloneRepository.mockResolvedValue(createMockClonedRepo(mockCleanup));
|
mockCloneRepository.mockResolvedValue(createMockClonedRepo(mockCleanup));
|
||||||
mockCreateOrUpdateBranch.mockResolvedValue({
|
mockCreateOrUpdateBranch.mockResolvedValue({
|
||||||
|
|||||||
@@ -0,0 +1,108 @@
|
|||||||
|
/**
|
||||||
|
* @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