@hublo/sentinel 1.4.0-alpha.6 → 1.4.0-alpha.8

package/dist/bin/sentinel.js

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

package/dist/{chunk-B73S4RZP.js → chunk-QP37G2HO.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 = {
@@ -5481,7 +5481,7 @@ function testTarget(options) {
 }
 
 // src/roles/test/jest-migration.ts
-import { existsSync as existsSync29, readFileSync as readFileSync28 } from "fs";
+import { existsSync as existsSync29, readFileSync as readFileSync28, readdirSync as readdirSync8 } from "fs";
 import { join as join35 } from "path";
 
 // src/roles/test/codemod/migrate-module.ts
@@ -8188,31 +8188,56 @@ function specTypesOperation(cwd) {
     return void 0;
   }
   const types = config?.compilerOptions?.types;
-  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;
+  if (!Array.isArray(types) || !types.includes("jest")) return void 0;
   return {
     kind: "merge-json",
     path: SPEC_TSCONFIG,
     value: {
-      ...typesChanged ? {
-        compilerOptions: {
-          types: types.map(
-            (entry) => entry === "jest" ? VITEST_GLOBAL_TYPES : entry
-          )
-        }
-      } : {},
-      ...rewrittenInclude === void 0 ? {} : { include: rewrittenInclude }
+      compilerOptions: {
+        types: types.map((entry) => entry === "jest" ? VITEST_GLOBAL_TYPES : entry)
+      }
     }
   };
 }
-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]);
+function tsconfigFileListOperations(cwd) {
+  const operations = [];
+  let names;
+  try {
+    names = readdirSync8(cwd).filter((name) => TSCONFIG_FILE.test(name));
+  } catch {
+    return operations;
+  }
+  for (const name of names) {
+    let config;
+    try {
+      config = parseJsonc(
+        readFileSync28(join35(cwd, name), "utf8"),
+        name
+      );
+    } catch {
+      continue;
+    }
+    const include = Array.isArray(config?.include) ? rewriteFileList(config.include) : void 0;
+    const exclude = Array.isArray(config?.exclude) ? rewriteFileList(config.exclude) : void 0;
+    if (include === void 0 && exclude === void 0) continue;
+    operations.push({
+      kind: "merge-json",
+      path: name,
+      value: {
+        ...include === void 0 ? {} : { include },
+        ...exclude === void 0 ? {} : { exclude }
+      }
+    });
+  }
+  return operations;
+}
+function rewriteFileList(entries) {
+  const rewritten = entries.filter((entry) => typeof entry !== "string" || !JEST_CONFIG_ENTRY.test(entry)).map((entry) => typeof entry === "string" ? vitestSupportName(entry) : entry);
+  const unchanged = rewritten.length === entries.length && rewritten.every((entry, index) => entry === entries[index]);
   return unchanged ? void 0 : rewritten;
 }
 var JEST_CONFIG_ENTRY = /(^|\/)jest\.[\w.-]*config\.[cm]?[jt]s$/;
+var TSCONFIG_FILE = /^tsconfig[\w.-]*\.json$/;
 function siblingScriptRewrites(cwd) {
   const rewrites = {};
   for (const [name, command] of Object.entries(moduleScripts(cwd))) {
@@ -8278,6 +8303,7 @@ function planJestMigration(context, adoption) {
     })),
     ...migration.operations,
     ...specTypes === void 0 ? [] : [specTypes],
+    ...tsconfigFileListOperations(context.cwd),
     manifestOperation(context.cwd, { ...scripts, ...siblings }),
     ...prepared.flatMap(
       ({ mode }) => nxTargetOperations({
@@ -8847,13 +8873,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 });
@@ -8881,6 +8910,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() {
@@ -9636,7 +9690,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
@@ -9646,8 +9700,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}".`);
   }
@@ -9772,7 +9826,7 @@ function applyPlan(cwd, plan4) {
 }
 
 // src/core/config/preset-evidence.ts
-import { existsSync as existsSync33, readdirSync as readdirSync8, readFileSync as readFileSync34 } from "fs";
+import { existsSync as existsSync33, readdirSync as readdirSync9, readFileSync as readFileSync34 } from "fs";
 import { join as join40 } from "path";
 var PATH_SIGNALS = [
   {
@@ -9801,7 +9855,7 @@ function sourceImports(cwd, pattern) {
     const dir = stack.pop();
     let entries;
     try {
-      entries = readdirSync8(dir, { withFileTypes: true });
+      entries = readdirSync9(dir, { withFileTypes: true });
     } catch {
       continue;
     }
@@ -9839,7 +9893,7 @@ function dependencyNames(cwd) {
 function declaresJsx(cwd) {
   let entries;
   try {
-    entries = readdirSync8(cwd).filter(
+    entries = readdirSync9(cwd).filter(
       (name) => name.startsWith("tsconfig") && name.endsWith(".json")
     );
   } catch {

package/dist/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hublo/sentinel",
-  "version": "1.4.0-alpha.6",
+  "version": "1.4.0-alpha.8",
   "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",