@hublo/sentinel 1.4.0-alpha.10 → 1.4.0-alpha.12

package/dist/bin/sentinel.js

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

package/dist/{chunk-L7WS36XV.js → chunk-KGI2F2QK.js}

@@ -561,9 +561,9 @@ function binFromOwnInstall(packageName, binName) {
   try {
     const manifest = require2.resolve(`${packageName}/package.json`);
     const bin = require2(manifest).bin;
-    const relative7 = typeof bin === "string" ? bin : bin?.[binName];
-    if (!relative7) return void 0;
-    const executable = join5(dirname(manifest), relative7);
+    const relative8 = typeof bin === "string" ? bin : bin?.[binName];
+    if (!relative8) return void 0;
+    const executable = join5(dirname(manifest), relative8);
     return existsSync6(executable) ? executable : void 0;
   } catch {
     return void 0;
@@ -5482,7 +5482,8 @@ function testTarget(options) {
 
 // src/roles/test/jest-migration.ts
 import { existsSync as existsSync29, readFileSync as readFileSync28, readdirSync as readdirSync8 } from "fs";
-import { join as join35 } from "path";
+import { createRequire as createRequire6 } from "module";
+import { dirname as dirname7, join as join35, relative as relative7 } from "path";
 
 // src/roles/test/codemod/migrate-module.ts
 import { readdirSync as readdirSync6, readFileSync as readFileSync25, statSync as statSync6 } from "fs";
@@ -5614,11 +5615,11 @@ 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;
+function vitestSupportName(relative8) {
+  const cut = relative8.lastIndexOf("/");
+  const directory = cut === -1 ? "" : relative8.slice(0, cut + 1);
+  const base = relative8.slice(cut + 1);
+  if (!base.startsWith(JEST_PREFIX)) return relative8;
   return `${directory}${VITEST_PREFIX}${base.slice(JEST_PREFIX.length)}`;
 }
 
@@ -7272,7 +7273,7 @@ function rewriteSpyInstanceType(source, program) {
     if (args === void 0 || args.length === 0) return;
     const text = (argument) => source.slice(argument.start, argument.end);
     const returns = text(args[0]);
-    const parameters = args.length > 1 ? `...args: ${text(args[1])}` : "...args: any[]";
+    const parameters = args.length > 1 ? `...args: ${text(args[1])}` : "...args: never[]";
     edits.push({
       start: node.start,
       end: node.end,
@@ -7583,16 +7584,16 @@ function migrateModuleTests(cwd, setupFiles = []) {
   let hoisted = 0;
   const defaultImported = defaultImportedSpecifiers(cwd);
   const asyncHelpers = /* @__PURE__ */ new Set();
-  for (const relative7 of listTestSupportFiles(cwd, setupFiles)) {
-    const source = read2(join31(cwd, relative7));
+  for (const relative8 of listTestSupportFiles(cwd, setupFiles)) {
+    const source = read2(join31(cwd, relative8));
     if (source === void 0) {
-      blockers.push({ file: relative7, reason: "this file could not be read" });
+      blockers.push({ file: relative8, reason: "this file could not be read" });
       continue;
     }
-    const migrated = migrateTestFile(join31(cwd, relative7), source, defaultImported);
-    const renamedTo = vitestSupportName(relative7);
-    if (!migrated.changed && renamedTo === relative7) continue;
-    if (renamedTo !== relative7) operations.push({ kind: "delete", path: relative7 });
+    const migrated = migrateTestFile(join31(cwd, relative8), source, defaultImported);
+    const renamedTo = vitestSupportName(relative8);
+    if (!migrated.changed && renamedTo === relative8) continue;
+    if (renamedTo !== relative8) operations.push({ kind: "delete", path: relative8 });
     const before = parse3(source);
     const after = parse3(migrated.source);
     if (before !== void 0 && after !== void 0) {
@@ -7605,27 +7606,27 @@ function migrateModuleTests(cwd, setupFiles = []) {
     renamed += migrated.renamed;
     operations.push({ kind: "write", path: renamedTo, contents: migrated.source });
   }
-  for (const relative7 of listTestFiles(cwd)) {
-    const source = read2(join31(cwd, relative7));
+  for (const relative8 of listTestFiles(cwd)) {
+    const source = read2(join31(cwd, relative8));
     if (source === void 0) {
-      blockers.push({ file: relative7, reason: "this file could not be read" });
+      blockers.push({ file: relative8, reason: "this file could not be read" });
       continue;
     }
-    const migrated = migrateTestFile(join31(cwd, relative7), source, defaultImported, asyncHelpers);
+    const migrated = migrateTestFile(join31(cwd, relative8), source, defaultImported, asyncHelpers);
     for (const member of migrated.unhandled) {
       blockers.push({
-        file: `${relative7}:${member.line}`,
+        file: `${relative8}:${member.line}`,
         reason: member.rule === void 0 ? `${member.member} has no rule, and guessing one is how a suite goes green for the wrong reason` : `${member.member} needs ${member.rule}`
       });
     }
     for (const refusal of migrated.refusals) {
-      blockers.push({ file: relative7, reason: refusal.reason });
+      blockers.push({ file: relative8, reason: refusal.reason });
     }
     if (!migrated.changed) continue;
     files++;
     renamed += migrated.renamed;
     if (migrated.hoisted.length > 0) hoisted++;
-    operations.push({ kind: "write", path: relative7, contents: migrated.source });
+    operations.push({ kind: "write", path: relative8, contents: migrated.source });
   }
   return blockers.length > 0 ? { operations: [], files, renamed, hoisted, blockers } : { operations, files, renamed, hoisted, blockers: [] };
 }
@@ -8207,6 +8208,17 @@ function specTypesOperation(cwd) {
     }
   };
 }
+function mockExtendedTypesPath(cwd) {
+  try {
+    const manifest = createRequire6(join35(cwd, "noop.cjs")).resolve("@hublo/sentinel/package.json");
+    const file = join35(dirname7(manifest), "types", "mock-extended.d.ts");
+    if (!existsSync29(file)) return void 0;
+    const path = relative7(cwd, file);
+    return path.startsWith(".") ? path : `./${path}`;
+  } catch {
+    return void 0;
+  }
+}
 function tsconfigFileListOperations(cwd) {
   const operations = [];
   let names;
@@ -8227,12 +8239,13 @@ function tsconfigFileListOperations(cwd) {
     }
     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;
+    const withTypes = name === SPEC_TSCONFIG ? withMockExtendedTypes(cwd, include ?? config?.include) : void 0;
+    if (include === void 0 && exclude === void 0 && withTypes === void 0) continue;
     operations.push({
       kind: "merge-json",
       path: name,
       value: {
-        ...include === void 0 ? {} : { include },
+        ...withTypes === void 0 ? include === void 0 ? {} : { include } : { include: withTypes },
         ...exclude === void 0 ? {} : { exclude }
       }
     });
@@ -8244,6 +8257,13 @@ function rewriteFileList(entries) {
   const unchanged = rewritten.length === entries.length && rewritten.every((entry, index) => entry === entries[index]);
   return unchanged ? void 0 : rewritten;
 }
+function withMockExtendedTypes(cwd, include) {
+  const path = mockExtendedTypesPath(cwd);
+  if (path === void 0 || !Array.isArray(include)) return void 0;
+  const entries = include;
+  if (entries.some((entry) => entry.endsWith("types/mock-extended.d.ts"))) return void 0;
+  return [...entries, path];
+}
 var JEST_CONFIG_ENTRY = /(^|\/)jest\.[\w.-]*config\.[cm]?[jt]s$/;
 var TSCONFIG_FILE = /^tsconfig[\w.-]*\.json$/;
 function siblingScriptRewrites(cwd) {
@@ -8340,7 +8360,7 @@ function planJestMigration(context, adoption) {
     );
   }
   notes.push(
-    `run this module's own formatter (or lint --fix) on what this wrote, after installing. Two things need it: the Vitest type imports are written beside the existing ones, and a rewritten call is often SHORTER than the one it replaced, so the line breaks around it are no longer the ones your formatter would pick. Neither is a defect, and both fail a format check. Layout is a repository setting, so sentinel leaves it to the tool that owns it.`
+    `the files this rewrote were run through this module's own formatter afterwards. Two things needed it: the Vitest type imports land beside the existing ones, and a rewritten call is often SHORTER than the one it replaced, so the line breaks around it are no longer the ones your config would pick. Neither is a defect, and both would have failed your format check.`
   );
   notes.push(
     `then run this module's TYPECHECK, not only its tests. The migration rewrites types as well as calls, and a wrong type is invisible to a green suite: measured on a real module, \`--run --test\` passed while \`--run --typescript\` reported ten errors it had not had before.`
@@ -8837,6 +8857,44 @@ var VitestAdapter = class extends BaseAdapter {
     this.say(captureReference(ctx.cwd, config).message);
     return Promise.resolve();
   }
+  /**
+   * Hand what was just written to the module's OWN formatter.
+   *
+   * ⚠️ Not a style sentinel imposes: the module adopted `.oxfmtrc.json`, and this runs that
+   * config over the files this role created. Without it, `--init --test` leaves a module whose
+   * own `--run --format` fails on a file the module never wrote.
+   *
+   * Measured on `apps/nest/microservices/agency`, in this repository's CI:
+   *
+   *     agency:format   12 files, including vitest.config.mts and
+   *                     vitest.integration.config.mts, both generated here
+   *
+   * The generator cannot avoid it by wrapping at a fixed width, because the width is the
+   * MODULE's decision: `printWidth` lives in its own config, and 12 modules already set their
+   * own. Guessing it is how a tool starts owning a setting it does not own.
+   *
+   * The same delegation the build role asks a human to do by hand, done. A module that has not
+   * adopted the format role has no formatter to invoke, and this says nothing rather than
+   * choosing one for it.
+   */
+  async afterInit(ctx) {
+    const oxfmt = resolveOxfmt(ctx.cwd);
+    if (oxfmt === void 0) {
+      this.say(
+        `no formatter adopted here, so what was written keeps the shape it was written in. Run your own formatter over it before committing.`
+      );
+      return Promise.resolve();
+    }
+    const pass = spawnSync5(oxfmt, ["--write", "."], { cwd: ctx.cwd, encoding: "utf8" });
+    this.say(
+      pass.status === 0 ? `formatted what this wrote with the module's own oxfmt config, so its \`--run --format\` passes on files it did not write itself.` : (
+        // Adoption SUCCEEDED; only the tidy-up did not. Failing here would revert a migration
+        // over a formatting pass, which is the wrong trade.
+        `the module's formatter could not run over what this wrote (${pass.status ?? "no exit code"}). Adoption itself is applied; run \`sentinel --run --format --fix\` before committing.`
+      )
+    );
+    return Promise.resolve();
+  }
   plan(context) {
     return plan3(context);
   }
@@ -8953,7 +9011,7 @@ function registerTest() {
 // src/roles/typescript/adapters/tsc/tsc.adapter.ts
 import { spawnSync as spawnSync6 } from "child_process";
 import { existsSync as existsSync31, readFileSync as readFileSync32 } from "fs";
-import { createRequire as createRequire6 } from "module";
+import { createRequire as createRequire7 } from "module";
 import { join as join39 } from "path";
 
 // src/roles/typescript/presets/nest.json
@@ -9380,7 +9438,7 @@ var TscAdapter = class _TscAdapter extends BaseAdapter {
     );
     if (preset === void 0) return void 0;
     try {
-      createRequire6(join39(cwd, "noop.js")).resolve(preset);
+      createRequire7(join39(cwd, "noop.js")).resolve(preset);
       return void 0;
     } catch {
       return preset;

package/dist/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hublo/sentinel",
-  "version": "1.4.0-alpha.10",
+  "version": "1.4.0-alpha.12",
   "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",
@@ -77,6 +77,7 @@
   },
   "files": [
     "dist",
+    "types",
     "docs",
     "lint",
     "oxlint",

package/types/mock-extended.d.ts

@@ -0,0 +1,35 @@
+/**
+ * The type-level half of the `jest-mock-extended` alias.
+ *
+ * The generated Vitest config aliases `jest-mock-extended` to the fork sentinel ships, so at RUN
+ * time a migrated module has ONE copy. TypeScript does not read Vite's aliases, so it keeps
+ * resolving the jest package and a migrated spec ends up compiling two worlds at once:
+ *
+ *     the value    typeof mockDeep<Db>()   -> CalledWithMock<…> extends jest.Mock
+ *     the spec     let spy: MockInstance    -> vitest's own type
+ *     TS2322       not assignable
+ *
+ * Measured on `apps/nest/microservices/agency`: one error, on a module whose typecheck was clean
+ * before it migrated. 34 files under `libs/` export a type built this way.
+ *
+ * ## Why here, and not in the module
+ *
+ * The declaration REPLACES the module's types with whatever it re-exports, so it has to name a
+ * package that resolves from wherever the file sits. `vitest-mock-extended` is sentinel's
+ * dependency, so a copy of this file placed in an adopting module would resolve nothing and empty
+ * the module out: measured, `Module '"jest-mock-extended"' has no exported member 'mockDeep'`.
+ *
+ * ## Why it does not couple modules to each other
+ *
+ * An ambient declaration applies to the PROGRAM that includes it, and nothing else. A module that
+ * includes it compiles against the Vitest types; a module still on jest, consuming the very same
+ * shared helper, keeps compiling against the jest ones. Proved on an isolated fixture: both
+ * programs green, over one unmodified shared lib.
+ *
+ * That is the whole point. Héla, 2026-09-24, on tying a module's migration to a library's:
+ * "ça crée des couplages et bloquent les migrations". lint, format and typescript each migrate one
+ * module at a time; this keeps the test role the same.
+ */
+declare module 'jest-mock-extended' {
+  export * from 'vitest-mock-extended'
+}