@useblacksmith/vitest 0.3.0 → 0.4.0

package/dist/affected.d.ts

@@ -2,7 +2,7 @@ import { BloomFilter } from './bloom.js';
 import type { Reporter, TestModule, TestRunEndReason, TestSpecification, VCSProvider, VCSProviderOptions, Vitest } from 'vitest/node';
 import { type Tree } from './git.js';
 export declare const SNAPSHOT_FILE = "blacksmith.json";
-declare const SNAPSHOT_VERSION = 4;
+declare const SNAPSHOT_VERSION = 5;
 /** A `dependencies` entry, compiled: test files matching `tests` depend on files matching `deps`; both root-relative. */
 export interface DependencyRule {
     tests: (file: string) => boolean;
@@ -20,6 +20,8 @@ export interface Shard {
 export interface Snapshot {
     version: typeof SNAPSHOT_VERSION;
     head: string;
+    /** Vitest's root relative to the repository, so one package's snapshot never vouches for another's. */
+    root: string;
     shard: Shard | null;
     /** Names of the projects the run covered (`--project` narrows them). */
     projects: string[];

package/dist/affected.js

@@ -11,7 +11,7 @@ import { shardOwner } from './sequencer.js';
 export const SNAPSHOT_FILE = 'blacksmith.json';
 // Bumped whenever the snapshot's shape changes or the records an anchor
 // vouches for gain a kind of dependency, so an older snapshot is not trusted.
-const SNAPSHOT_VERSION = 4;
+const SNAPSHOT_VERSION = 5;
 export function compileDependencies(dependencies) {
     return Object.entries(dependencies ?? {}).map(([tests, deps]) => ({
         tests: picomatch(tests, { dot: true }),
@@ -138,10 +138,11 @@ async function readSnapshot(file) {
     }
     if (typeof parsed !== 'object' || parsed === null)
         return null;
-    const { version, head, shard, projects, tree, tests } = parsed;
+    const { version, head, root, shard, projects, tree, tests } = parsed;
     const covered = BloomFilter.parse(tests);
     if (version !== SNAPSHOT_VERSION ||
         typeof head !== 'string' ||
+        typeof root !== 'string' ||
         !isShard(shard) ||
         !Array.isArray(projects) ||
         !projects.every((name) => typeof name === 'string') ||
@@ -152,6 +153,7 @@ async function readSnapshot(file) {
     return {
         version: SNAPSHOT_VERSION,
         head,
+        root,
         shard,
         projects: projects,
         tree,
@@ -213,6 +215,12 @@ export class TreeSnapshotProvider {
             log(`no dependency snapshot, running every test of the ${describeShard(shard)}`);
             return null;
         }
+        const repo = await repoRoot(root);
+        const here = repoRelative(repo, this.vitest.config.root);
+        if (snapshot.root !== here) {
+            log(`dependency snapshot is for ${snapshot.root || 'the repository root'}, this run is for ${here || 'the repository root'}, running every test of the ${describeShard(shard)}`);
+            return null;
+        }
         if (!sameShard(snapshot.shard, shard)) {
             log(`dependency snapshot is for ${describeShard(snapshot.shard)}, running every test of the ${describeShard(shard)}`);
             return null;
@@ -222,7 +230,6 @@ export class TreeSnapshotProvider {
             log(`dependency snapshot covers projects [${snapshot.projects.join(', ')}], this run covers [${projects.join(', ')}], running every test of the ${describeShard(shard)}`);
             return null;
         }
-        const repo = await repoRoot(root);
         const tree = await anchorTree(repo, await anchoredPaths(this.vitest, repo, dir, this.dependencies));
         const changedPaths = diffTrees(snapshot.tree, tree);
         const owns = await shardOwner(this.vitest);
@@ -307,6 +314,7 @@ export class ShadowAnalysis {
         const repo = await repoRoot(vitest.config.root);
         const key = cacheKey({
             snapshotVersion: SNAPSHOT_VERSION,
+            root: repoRelative(repo, vitest.config.root),
             projects: projectNames(vitest),
             shard: vitest.config.shard ?? null,
             head: process.env.GITHUB_SHA || (await headSha(repo)),
@@ -480,6 +488,7 @@ export class SnapshotRecorder {
         const snapshot = {
             version: SNAPSHOT_VERSION,
             head: await headSha(repo),
+            root: repoRelative(repo, root),
             shard: shard ?? null,
             projects: projectNames(this.vitest),
             tree: await anchorTree(repo, await anchoredPaths(this.vitest, repo, cacheDir, this.provider.dependencies)),
@@ -499,6 +508,7 @@ export class SnapshotRecorder {
             return;
         const key = cacheKey({
             snapshotVersion: snapshot.version,
+            root: snapshot.root,
             projects: snapshot.projects,
             shard: snapshot.shard,
             head: snapshot.head,
@@ -554,6 +564,7 @@ export async function restoreDependencyCache(vitest) {
     const repo = await repoRoot(vitest.config.root);
     const key = cacheKey({
         snapshotVersion: SNAPSHOT_VERSION,
+        root: repoRelative(repo, vitest.config.root),
         projects: projectNames(vitest),
         shard: vitest.config.shard ?? null,
         head: process.env.GITHUB_SHA || (await headSha(repo)),

package/dist/cache.d.ts

@@ -21,6 +21,8 @@ export interface CacheKey {
 export declare const DEFAULT_CACHE_PREFIX = "blacksmith-vitest";
 export declare function cacheKey(input: {
     snapshotVersion: number;
+    /** Vitest's root relative to the repository: each package of a monorepo keeps its own entries. */
+    root: string;
     projects: string[];
     shard: {
         index: number;

package/dist/cache.js

@@ -21,9 +21,9 @@ export const DEFAULT_CACHE_PREFIX = 'blacksmith-vitest';
 export function cacheKey(input) {
     const scope = [
         `v${input.snapshotVersion}`,
-        input.projects.some(Boolean)
+        input.root !== '' || input.projects.some(Boolean)
             ? createHash('sha1')
-                .update(input.projects.join('\n'))
+                .update([input.root, ...input.projects].join('\n'))
                 .digest('hex')
                 .slice(0, 12)
             : 'all',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@useblacksmith/vitest",
-	"version": "0.3.0",
+	"version": "0.4.0",
 	"description": "Runs only the Vitest tests affected since the last successful run, with Blacksmith-backed caching",
 	"type": "module",
 	"license": "MIT",
@@ -21,7 +21,8 @@
 		"build": "tsc -p tsconfig.build.json",
 		"prepack": "npm run build",
 		"check:types": "tsc --noEmit",
-		"test": "vitest run"
+		"test": "vitest run",
+		"release": "scripts/release.sh"
 	},
 	"peerDependencies": {
 		"vitest": ">=5.1.0"