@hublo/sentinel 1.4.0-alpha.16 → 1.4.0-alpha.18

package/dist/bin/sentinel.js

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

package/dist/{chunk-XGC2KK5J.js → chunk-ICGZ3HCR.js}

@@ -5738,7 +5738,7 @@ function rewriteAssertionReturnValue(source, program) {
     for (const reading of readings) {
       const from = reading.start;
       let to = reading.end;
-      while (to < source.length && /[\s;]/.test(source[to])) to += 1;
+      while (to < source.length && /[ \t;]/.test(source[to])) to += 1;
       let head = from;
       while (head > 0 && /[ \t]/.test(source[head - 1])) head -= 1;
       if (head > 0 && source[head - 1] === "\n") head -= 1;
@@ -8446,9 +8446,15 @@ function planJestMigration(context, adoption) {
       `${SPEC_TSCONFIG} now declares \`${VITEST_GLOBAL_TYPES}\` instead of \`jest\`. Without it the module keeps depending on @types/jest and \`jest.Mock\` still resolves, so the migration would look finished while the dependency it cuts is still declared.`
     );
   }
-  notes.push(
-    `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.`
-  );
+  if (readFormatAdoption(context.cwd).configFile !== null) {
+    notes.push(
+      `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.`
+    );
+  } else {
+    notes.push(
+      `this module has no formatter config, so what was written keeps the shape it was written in, and the Vitest type imports sit beside the existing ones rather than in the position your \`import/order\` wants. That rule is classified by a prefix list this package cannot read, so it is left to the tool that owns it: run your module's own lint fixer (\`nx run <module>:lint --fix\` here) and its formatter before committing.`
+    );
+  }
   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.`
   );
@@ -8922,6 +8928,7 @@ function resolveVitest(cwd) {
   const fromModule = resolveBin(cwd, "vitest");
   return fromModule !== void 0 ? { bin: fromModule, origin: "module" } : { bin: void 0, origin: "module" };
 }
+var FORMATTABLE = /\.(m|c)?(j|t)sx?$|\.json$/;
 var VitestAdapter = class extends BaseAdapter {
   target = "test";
   runner = "vitest";
@@ -8960,21 +8967,48 @@ var VitestAdapter = class extends BaseAdapter {
    * 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.
+   * The same delegation the build role asks a human to do by hand, done.
+   *
+   * ## ⚠️ Two boundaries, both learned by crossing them
+   *
+   * ### Only a module that has a formatter CONFIG
+   *
+   * The question is not "can a formatter be found". It always can: sentinel depends on oxfmt and
+   * ships the binary, so `resolveOxfmt` falls back to its own install and never returns undefined
+   * once sentinel is installed. Asking it that way meant a module with no oxfmt config was
+   * formatted with oxfmt's DEFAULTS, which is a style nobody here chose.
+   *
+   * So the CONFIG is read. A module that wrote its own `.oxfmtrc.json` without adopting the role
+   * has still stated a style, and running it is delegation; running oxfmt with no config is us
+   * choosing one.
+   *
+   * Measured on `apps/nest/microservices/institution`, which has not adopted format and whose lint
+   * forbids semicolons: `institution:lint` went from green to failing, thousands of `semi`, on a
+   * module whose 2958 tests pass. So the adoption is read, not the binary.
+   *
+   * ### Only the files this just WROTE
+   *
+   * `--write .` is a whole-directory pass, and that is not a tidy-up. Same measurement: 1813 files
+   * changed, 47333 insertions, 55506 deletions, in a module whose migration touched 268. A
+   * migration diff is read by a person.
+   *
+   * A module that has not adopted format keeps what was written exactly as written, and is told so.
+   * The codemod rewrites tokens in place, so those files keep the shape they already had.
    */
   async afterInit(ctx) {
-    const oxfmt = resolveOxfmt(ctx.cwd);
-    if (oxfmt === void 0) {
+    const written = (ctx.written ?? []).filter((file) => FORMATTABLE.test(file));
+    if (written.length === 0) return Promise.resolve();
+    if (readFormatAdoption(ctx.cwd).configFile === null) {
       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.`
+        `no formatter configured here, so the ${written.length} file(s) this wrote keep the shape they were written in. Run your own formatter over them before committing.`
       );
       return Promise.resolve();
     }
-    const pass = spawnSync5(oxfmt, ["--write", "."], { cwd: ctx.cwd, encoding: "utf8" });
+    const oxfmt = resolveOxfmt(ctx.cwd);
+    if (oxfmt === void 0) return Promise.resolve();
+    const pass = spawnSync5(oxfmt, ["--write", ...written], { 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.` : (
+      pass.status === 0 ? `formatted the ${written.length} file(s) 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.`
@@ -10209,9 +10243,11 @@ async function dispatch(opts) {
       fix: false
     });
   }
+  const written = [];
   for (const change of applyPlan(opts.cwd, plan4)) {
     process.stderr.write(`  ${change.deleted ? "removed" : "wrote"} ${change.path}
 `);
+    if (!change.deleted) written.push(change.path);
   }
   for (const note of plan4.notes ?? []) process.stderr.write(`  ${note}
 `);
@@ -10223,7 +10259,8 @@ async function dispatch(opts) {
       cwd: opts.cwd,
       preset,
       ci: false,
-      fix: true
+      fix: true,
+      written
     });
   }
   return 0;

package/dist/index.d.ts

@@ -66,6 +66,16 @@ interface RunContext {
     ci: boolean;
     /** Apply auto-fixes where the tool supports it. */
     fix: boolean;
+    /**
+     * The files `--init` just wrote, relative to `cwd`, for an `afterInit` that tidies up after
+     * itself.
+     *
+     * ⚠️ It exists because the alternative is a whole-directory pass, and that is not a tidy-up.
+     * Measured on `apps/nest/microservices/institution`: an `afterInit` running its formatter over
+     * `.` reformatted 1813 files, 47333 insertions and 55506 deletions, in a module whose migration
+     * touched 268. Only set by the `--init` path, so an adapter must treat it as optional.
+     */
+    written?: string[];
     /**
      * Cap on the number of structured diagnostics a `--report` embeds per module (the
      * full count still lives in `errors`, so nothing is hidden silently). `0` means no

package/dist/index.js

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

package/package.json

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