@hublo/sentinel 1.4.0-alpha.5 → 1.4.0-alpha.7

package/dist/bin/sentinel.js

@@ -16,7 +16,7 @@ import {
   registerAdapters,
   resolve,
   resolveBin
-} from "../chunk-ASBZQAXV.js";
+} from "../chunk-KDKOKRS2.js";
 import {
   WORKSPACE_ROOT_MARKER,
   ensureWorkspacePrep,

package/dist/{chunk-ASBZQAXV.js → chunk-KDKOKRS2.js}

@@ -5404,7 +5404,7 @@ function registerLint() {
 import { spawnSync as spawnSync5 } from "child_process";
 import { mkdtempSync as mkdtempSync2, readFileSync as readFileSync30 } from "fs";
 import { tmpdir as tmpdir2 } from "os";
-import { join as join37 } from "path";
+import { isAbsolute as isAbsolute3, join as join37, resolve as resolve6 } from "path";
 
 // src/roles/test/presets/toolchain.json
 var toolchain_default2 = {
@@ -5611,6 +5611,17 @@ function readTestAdoption(cwd) {
   };
 }
 
+// src/roles/test/support-file-name.ts
+var JEST_PREFIX = "jest.";
+var VITEST_PREFIX = "vitest.";
+function vitestSupportName(relative7) {
+  const cut = relative7.lastIndexOf("/");
+  const directory = cut === -1 ? "" : relative7.slice(0, cut + 1);
+  const base = relative7.slice(cut + 1);
+  if (!base.startsWith(JEST_PREFIX)) return relative7;
+  return `${directory}${VITEST_PREFIX}${base.slice(JEST_PREFIX.length)}`;
+}
+
 // src/roles/test/codemod/migrate-file.ts
 import { parseSync as parseSync7 } from "oxc-parser";
 
@@ -7571,7 +7582,9 @@ function migrateModuleTests(cwd, setupFiles = []) {
       continue;
     }
     const migrated = migrateTestFile(join31(cwd, relative7), source, defaultImported);
-    if (!migrated.changed) continue;
+    const renamedTo = vitestSupportName(relative7);
+    if (!migrated.changed && renamedTo === relative7) continue;
+    if (renamedTo !== relative7) operations.push({ kind: "delete", path: relative7 });
     const before = parse3(source);
     const after = parse3(migrated.source);
     if (before !== void 0 && after !== void 0) {
@@ -7582,7 +7595,7 @@ function migrateModuleTests(cwd, setupFiles = []) {
     }
     files++;
     renamed += migrated.renamed;
-    operations.push({ kind: "write", path: relative7, contents: migrated.source });
+    operations.push({ kind: "write", path: renamedTo, contents: migrated.source });
   }
   for (const relative7 of listTestFiles(cwd)) {
     const source = read2(join31(cwd, relative7));
@@ -7704,11 +7717,11 @@ function ownsMswLifecycle(cwd, reading) {
 function setupBlock(cwd, reading, msw) {
   const declared = [...reading.setupFiles ?? [], ...reading.setupFilesAfterEnv ?? []];
   const namedTheRootSetup = declared.some((file) => file.endsWith("jest.setup.after.env.js"));
-  const own = declared.filter((file) => !file.endsWith("jest.setup.after.env.js")).map((file) => `'${withoutRootDir(file)}'`);
+  const own = declared.filter((file) => !file.endsWith("jest.setup.after.env.js")).map((file) => `'${vitestSupportName(withoutRootDir(file))}'`);
   const sentinel = [
     `'${SENTINEL_TEST_SETUP}'`,
     ...namedTheRootSetup ? [`'${SENTINEL_WORKSPACE_SETUP}'`] : [],
-    ...msw && !ownsMswLifecycle(cwd, reading) ? [`'${SENTINEL_MSW_SETUP}'`] : []
+    ...msw && namedTheRootSetup && !ownsMswLifecycle(cwd, reading) ? [`'${SENTINEL_MSW_SETUP}'`] : []
   ];
   return `        setupFiles: [${[...sentinel, ...own].join(", ")}],`;
 }
@@ -7735,7 +7748,7 @@ function timeoutBlock(reading) {
 }
 function globalSetupBlock(reading) {
   if (reading.globalSetup === void 0) return "";
-  const files = reading.globalSetup.map((file) => `'${withoutRootDir(file)}'`).join(", ");
+  const files = reading.globalSetup.map((file) => `'${vitestSupportName(withoutRootDir(file))}'`).join(", ");
   return `        globalSetup: [${files}],`;
 }
 function includeBlock(reading) {
@@ -8175,17 +8188,31 @@ function specTypesOperation(cwd) {
     return void 0;
   }
   const types = config?.compilerOptions?.types;
-  if (!Array.isArray(types) || !types.includes("jest")) return void 0;
+  const include = config?.include;
+  const rewrittenInclude = Array.isArray(include) ? rewriteSpecInclude(include) : void 0;
+  const typesChanged = Array.isArray(types) && types.includes("jest");
+  if (!typesChanged && rewrittenInclude === void 0) return void 0;
   return {
     kind: "merge-json",
     path: SPEC_TSCONFIG,
     value: {
-      compilerOptions: {
-        types: types.map((entry) => entry === "jest" ? VITEST_GLOBAL_TYPES : entry)
-      }
+      ...typesChanged ? {
+        compilerOptions: {
+          types: types.map(
+            (entry) => entry === "jest" ? VITEST_GLOBAL_TYPES : entry
+          )
+        }
+      } : {},
+      ...rewrittenInclude === void 0 ? {} : { include: rewrittenInclude }
     }
   };
 }
+function rewriteSpecInclude(include) {
+  const rewritten = include.filter((entry) => typeof entry !== "string" || !JEST_CONFIG_ENTRY.test(entry)).map((entry) => typeof entry === "string" ? vitestSupportName(entry) : entry);
+  const unchanged = rewritten.length === include.length && rewritten.every((entry, index) => entry === include[index]);
+  return unchanged ? void 0 : rewritten;
+}
+var JEST_CONFIG_ENTRY = /(^|\/)jest\.[\w.-]*config\.[cm]?[jt]s$/;
 function siblingScriptRewrites(cwd) {
   const rewrites = {};
   for (const [name, command] of Object.entries(moduleScripts(cwd))) {
@@ -8820,13 +8847,16 @@ var VitestAdapter = class extends BaseAdapter {
         `using the MODULE's vitest, not sentinel's. An adopted config gets its plugins from sentinel, and two copies fail in ways that never mention a version. Remove vitest from this module's package.json.`
       );
     }
-    const { options, paths } = splitToolArgs(ctx.cwd, ctx.toolArgs, { valueFlags: [] });
+    const { options: typedOptions, paths: typedPaths } = splitToolArgs(ctx.cwd, ctx.toolArgs, {
+      valueFlags: ["--config", "-c"]
+    });
+    const { cwd: runFrom, options, paths } = fromWorkspaceRoot(ctx.cwd, typedOptions, typedPaths);
     const watching = options.includes("--watch") || options.includes("-w");
     const proving = !watching && hasReference(ctx.cwd);
     const reportFile = proving ? join37(mkdtempSync2(join37(tmpdir2(), "sentinel-run-")), "vitest.json") : void 0;
     const reporters = reportFile === void 0 ? [] : ["--reporter=default", "--reporter=json", `--outputFile=${reportFile}`];
     const argv = watching ? [...options, ...paths] : ["run", ...reporters, ...options, ...paths];
-    const result = spawnSync5(bin, argv, { cwd: ctx.cwd, stdio: "inherit" });
+    const result = spawnSync5(bin, argv, { cwd: runFrom, stdio: "inherit" });
     if (result.error) {
       this.say(`could not run vitest (${result.error.message})`);
       return Promise.resolve({ ok: false, code: 1 });
@@ -8854,6 +8884,31 @@ var VitestAdapter = class extends BaseAdapter {
 `);
   }
 };
+function fromWorkspaceRoot(moduleDir, options, paths) {
+  const root = findWorkspaceRoot(moduleDir);
+  if (root === void 0 || root === moduleDir) {
+    return { cwd: moduleDir, options: [...options], paths: [...paths] };
+  }
+  const absolute = (value) => isAbsolute3(value) ? value : resolve6(moduleDir, value);
+  const moved = [];
+  let previousWasConfig = false;
+  for (const option of options) {
+    if (previousWasConfig) {
+      moved.push(absolute(option));
+      previousWasConfig = false;
+      continue;
+    }
+    if (option.startsWith("--config=")) moved.push(`--config=${absolute(option.slice(9))}`);
+    else moved.push(option);
+    previousWasConfig = option === "--config" || option === "-c";
+  }
+  return {
+    cwd: root,
+    // `--root` LAST, so a caller cannot be silently overridden by our own flag.
+    options: [...moved, "--root", moduleDir],
+    paths: paths.map((path) => absolute(path))
+  };
+}
 
 // src/roles/test/register.ts
 function registerTest() {
@@ -9609,7 +9664,7 @@ function replaceLines(current, replacements) {
 
 // src/core/apply-plan.ts
 import { existsSync as existsSync32, readFileSync as readFileSync33, renameSync, rmSync as rmSync4, writeFileSync as writeFileSync4 } from "fs";
-import { resolve as resolve6, sep } from "path";
+import { resolve as resolve7, sep } from "path";
 import { applyEdits as applyEdits3, findNodeAtLocation, modify, parseTree } from "jsonc-parser";
 
 // src/shared/deep-merge.ts
@@ -9619,8 +9674,8 @@ function isPlainObject(value) {
 
 // src/core/apply-plan.ts
 function resolveWithinRoot(cwd, relativePath) {
-  const root = resolve6(cwd);
-  const absolutePath = resolve6(root, relativePath);
+  const root = resolve7(cwd);
+  const absolutePath = resolve7(root, relativePath);
   if (absolutePath !== root && !absolutePath.startsWith(root + sep)) {
     throw new Error(`Refusing to write outside the module root: "${relativePath}".`);
   }

package/dist/index.js

@@ -7,7 +7,7 @@ import {
   registerAdapters,
   resolve,
   setDefaultRunner
-} from "./chunk-ASBZQAXV.js";
+} from "./chunk-KDKOKRS2.js";
 import "./chunk-WLFE5RUU.js";
 export {
   BaseAdapter,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hublo/sentinel",
-  "version": "1.4.0-alpha.5",
+  "version": "1.4.0-alpha.7",
   "description": "One CLI that guards code health across Hublo repos: shared lint/typescript/build/test presets, static & dynamic analysis, and architecture checks.",
   "type": "module",
   "license": "MIT",