Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions examples/reports/workspace-api-discount.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ FixMap found 3 context files and generated 3 test routes.

## Test Route

- `pnpm --dir apps/api run test`: nearest package (apps/api) script named test. Related: `apps/api/test/orders.test.ts`, `packages/utils/test/currency.test.ts`.
- `pnpm --dir packages/utils run test`: nearest package (packages/utils) script named test. Related: `apps/api/test/orders.test.ts`, `packages/utils/test/currency.test.ts`.
- `pnpm --dir apps/api run typecheck`: nearest package (apps/api) script named typecheck. Related: `apps/api/src/orders.ts`, `packages/utils/src/currency.ts`.
- `pnpm --dir apps/api run test`: nearest package (apps/api) script named test. Related: `apps/api/test/orders.test.ts`.
- `pnpm --dir packages/utils run test`: nearest package (packages/utils) script named test. Related: `packages/utils/test/currency.test.ts`.
- `pnpm --dir apps/api run typecheck`: nearest package (apps/api) script named typecheck. Related: `apps/api/src/orders.ts`.

## Risk Map

Expand Down
9 changes: 8 additions & 1 deletion packages/action/dist/index.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -1046,6 +1046,13 @@ function isNearbyChangedFile(path, changedFiles) {
}

// packages/core/dist/report.js
function scopeToPackage(paths, packageDir) {
if (!packageDir) {
return paths;
}
const prefix = `${packageDir}/`;
return paths.filter((path) => path.startsWith(prefix));
}
function buildTestRoutes(repo, contextPaths) {
const codeContextPaths = contextPaths.filter((path) => repo.files.find((file) => file.path === path)?.kind === "code");
if (codeContextPaths.length === 0) {
Expand All @@ -1068,7 +1075,7 @@ function buildTestRoutes(repo, contextPaths) {
routes.push({
command,
reason: `${script.packageDir ? `nearest package (${script.packageDir})` : "repository root"} script named ${script.name}`,
relatedFiles: script.name === "test" ? relatedTests : codeContextPaths
relatedFiles: scopeToPackage(script.name === "test" ? relatedTests : codeContextPaths, script.packageDir)
});
if (routes.length === 3)
break;
Expand Down
17 changes: 16 additions & 1 deletion packages/core/src/report.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
import { tokenizePath } from "./signals.js";
import type { FixMapReport, RepoMap, RiskNote, TestRoute } from "./types.js";

// A route runs one package's script, so it can only exercise files inside that package.
// Listing a sibling package's tests beneath it claims something the command cannot do:
// `npm --prefix packages/core run test` never reaches packages/action/test. A root
// script has no such boundary and legitimately covers everything.
function scopeToPackage(paths: string[], packageDir: string): string[] {
if (!packageDir) {
return paths;
}
const prefix = `${packageDir}/`;
return paths.filter((path) => path.startsWith(prefix));
}

export function buildTestRoutes(repo: RepoMap, contextPaths: string[]): TestRoute[] {
const codeContextPaths = contextPaths.filter((path) => repo.files.find((file) => file.path === path)?.kind === "code");
if (codeContextPaths.length === 0) {
Expand Down Expand Up @@ -28,7 +40,10 @@ export function buildTestRoutes(repo: RepoMap, contextPaths: string[]): TestRout
routes.push({
command,
reason: `${script.packageDir ? `nearest package (${script.packageDir})` : "repository root"} script named ${script.name}`,
relatedFiles: script.name === "test" ? relatedTests : codeContextPaths
relatedFiles: scopeToPackage(
script.name === "test" ? relatedTests : codeContextPaths,
script.packageDir
)
});
if (routes.length === 3) break;
}
Expand Down
53 changes: 53 additions & 0 deletions packages/core/test/report.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -140,4 +140,57 @@ describe("report rendering", () => {
expect(routes[0]?.command).toBe("pnpm --dir apps/api run test");
expect(buildTestRoutes(repo, ["README.md"])).toEqual([]);
});

it("lists only the tests each package command can actually reach", () => {
// Every route previously carried the same repository-wide list, so a core
// route advertised action tests that `--prefix packages/core` never runs.
const source = (path: string) => ({
path, extension: ".ts", sizeBytes: 10, isSource: true, isTest: false, kind: "code" as const, textSample: ""
});
const test = (path: string) => ({ ...source(path), isTest: true });
const repo: RepoMap = {
root: "/repo",
packageManager: "npm",
changedFiles: [],
diffText: "",
diagnostics: [],
packageScripts: [
{ name: "test", command: "vitest run", packageDir: "packages/core" },
{ name: "test", command: "vitest run", packageDir: "packages/action" }
],
files: [
source("packages/core/src/rank.ts"),
source("packages/action/src/runner.ts"),
test("packages/core/test/rank.test.ts"),
test("packages/action/test/runner.test.ts")
]
};

const routes = buildTestRoutes(repo, ["packages/core/src/rank.ts", "packages/action/src/runner.ts"]);
const core = routes.find((route) => route.command.includes("packages/core"));
const action = routes.find((route) => route.command.includes("packages/action"));

expect(core?.relatedFiles).toEqual(["packages/core/test/rank.test.ts"]);
expect(action?.relatedFiles).toEqual(["packages/action/test/runner.test.ts"]);
});

it("lets a repository-root command keep every related test", () => {
const repo: RepoMap = {
root: "/repo",
packageManager: "npm",
changedFiles: [],
diffText: "",
diagnostics: [],
packageScripts: [{ name: "test", command: "vitest run", packageDir: "" }],
files: [
{ path: "packages/core/src/rank.ts", extension: ".ts", sizeBytes: 10, isSource: true, isTest: false, kind: "code", textSample: "" },
{ path: "packages/core/test/rank.test.ts", extension: ".ts", sizeBytes: 10, isSource: true, isTest: true, kind: "code", textSample: "" }
]
};

const routes = buildTestRoutes(repo, ["packages/core/src/rank.ts"]);

expect(routes[0]?.command).toBe("npm run test");
expect(routes[0]?.relatedFiles).toContain("packages/core/test/rank.test.ts");
});
});