@hublo/sentinel 1.4.0-alpha.17 → 1.4.0-alpha.19

package/dist/bin/sentinel.js

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

package/dist/{chunk-I64KRL6O.js → chunk-AQGNE3UO.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 { isAbsolute as isAbsolute3, join as join37, resolve as resolve6 } from "path";
+import { isAbsolute as isAbsolute3, join as join38, resolve as resolve6 } from "path";
 
 // src/roles/test/presets/toolchain.json
 var toolchain_default2 = {
@@ -5481,9 +5481,9 @@ function testTarget(options) {
 }
 
 // src/roles/test/jest-migration.ts
-import { existsSync as existsSync29, readFileSync as readFileSync28, readdirSync as readdirSync8 } from "fs";
+import { existsSync as existsSync30, readFileSync as readFileSync28, readdirSync as readdirSync8 } from "fs";
 import { createRequire as createRequire6 } from "module";
-import { dirname as dirname7, join as join35, relative as relative7 } from "path";
+import { dirname as dirname8, join as join36, relative as relative7 } from "path";
 
 // src/roles/test/codemod/migrate-module.ts
 import { readdirSync as readdirSync6, readFileSync as readFileSync25, statSync as statSync6 } from "fs";
@@ -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;
@@ -8262,12 +8262,59 @@ function runModes(cwd, fallback) {
   );
 }
 
+// src/roles/test/written-file-formatter.ts
+import { existsSync as existsSync29 } from "fs";
+import { dirname as dirname7, join as join35 } from "path";
+var PRETTIER_CONFIGS = [
+  ".prettierrc",
+  ".prettierrc.json",
+  ".prettierrc.json5",
+  ".prettierrc.yaml",
+  ".prettierrc.yml",
+  ".prettierrc.js",
+  ".prettierrc.cjs",
+  ".prettierrc.mjs",
+  ".prettierrc.toml",
+  "prettier.config.js",
+  "prettier.config.cjs",
+  "prettier.config.mjs"
+];
+function prettierConfigFrom(cwd) {
+  let dir = cwd;
+  for (; ; ) {
+    for (const name of PRETTIER_CONFIGS) {
+      if (existsSync29(join35(dir, name))) return join35(dir, name);
+    }
+    const parent = dirname7(dir);
+    if (parent === dir) return void 0;
+    dir = parent;
+  }
+}
+function writtenFileFormatter(cwd) {
+  if (readFormatAdoption(cwd).configFile !== null) {
+    const oxfmt = resolveOxfmt(cwd);
+    if (oxfmt !== void 0) {
+      return { bin: oxfmt, args: ["--write"], origin: "this module's own oxfmt config" };
+    }
+  }
+  const config = prettierConfigFrom(cwd);
+  const prettier = resolveBin(cwd, "prettier");
+  if (config !== void 0 && prettier !== void 0) {
+    return {
+      bin: prettier,
+      args: ["--write", "--log-level", "warn"],
+      origin: `the workspace's Prettier`
+    };
+  }
+  return void 0;
+}
+
 // src/roles/test/jest-migration.ts
 var SPEC_TSCONFIG = "tsconfig.spec.json";
 var VITEST_GLOBAL_TYPES = "vitest/globals";
 function specTypesOperation(cwd) {
-  const path = join35(cwd, SPEC_TSCONFIG);
-  if (!existsSync29(path)) return void 0;
+  const path = join36(cwd, SPEC_TSCONFIG);
+  if (!existsSync30(path)) return void 0;
   let config;
   try {
     config = parseJsonc(
@@ -8291,9 +8338,9 @@ function specTypesOperation(cwd) {
 }
 function shippedTypesPath(cwd, declaration) {
   try {
-    const manifest = createRequire6(join35(cwd, "noop.cjs")).resolve("@hublo/sentinel/package.json");
-    const file = join35(dirname7(manifest), declaration);
-    if (existsSync29(file)) {
+    const manifest = createRequire6(join36(cwd, "noop.cjs")).resolve("@hublo/sentinel/package.json");
+    const file = join36(dirname8(manifest), declaration);
+    if (existsSync30(file)) {
       const path = relative7(cwd, file);
       return path.startsWith(".") ? path : `./${path}`;
     }
@@ -8313,7 +8360,7 @@ function tsconfigFileListOperations(cwd) {
     let config;
     try {
       config = parseJsonc(
-        readFileSync28(join35(cwd, name), "utf8"),
+        readFileSync28(join36(cwd, name), "utf8"),
         name
       );
     } catch {
@@ -8446,9 +8493,16 @@ 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.`
-  );
+  const formatter = writtenFileFormatter(context.cwd);
+  if (formatter !== void 0) {
+    notes.push(
+      `the files this rewrote were run through ${formatter.origin} 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. What no formatter does is ORDER imports, so if your lint enforces \`import/order\`, run its fixer too.`
+    );
+  } else {
+    notes.push(
+      `no style is declared here, by this module or its workspace, so what was written keeps the shape it was written in, and the Vitest type imports sit beside the existing ones rather than where your \`import/order\` wants them. 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.`
   );
@@ -8595,9 +8649,9 @@ function plan3(context) {
 // src/roles/test/reference.ts
 import { execFileSync } from "child_process";
 import { createHash } from "crypto";
-import { existsSync as existsSync30, mkdirSync, mkdtempSync, readFileSync as readFileSync29, rmSync as rmSync3, writeFileSync as writeFileSync3 } from "fs";
+import { existsSync as existsSync31, mkdirSync, mkdtempSync, readFileSync as readFileSync29, rmSync as rmSync3, writeFileSync as writeFileSync3 } from "fs";
 import { tmpdir } from "os";
-import { join as join36, resolve as resolve5 } from "path";
+import { join as join37, resolve as resolve5 } from "path";
 
 // src/roles/test/baseline.ts
 function readSnapshot(report) {
@@ -8841,22 +8895,22 @@ function describeComparison(comparison) {
 // src/roles/test/reference.ts
 function referencePath(cwd) {
   const key = createHash("sha256").update(resolve5(cwd)).digest("hex").slice(0, 16);
-  return join36(tmpdir(), "sentinel-test-reference", `${key}.json`);
+  return join37(tmpdir(), "sentinel-test-reference", `${key}.json`);
 }
 function runJest(cwd, config) {
   const bin = resolveBin(cwd, "jest");
   if (bin === void 0) return void 0;
   const root = findWorkspaceRoot(cwd) ?? cwd;
-  const out = join36(mkdtempSync(join36(tmpdir(), "sentinel-reference-")), "jest.json");
+  const out = join37(mkdtempSync(join37(tmpdir(), "sentinel-reference-")), "jest.json");
   try {
-    execFileSync(bin, ["-c", join36(cwd, config), "--json", `--outputFile=${out}`, "--silent"], {
+    execFileSync(bin, ["-c", join37(cwd, config), "--json", `--outputFile=${out}`, "--silent"], {
       cwd: root,
       stdio: ["ignore", "ignore", "ignore"],
       maxBuffer: 1 << 28
     });
   } catch {
   }
-  if (!existsSync30(out)) return void 0;
+  if (!existsSync31(out)) return void 0;
   try {
     return JSON.parse(readFileSync29(out, "utf8"));
   } catch {
@@ -8886,7 +8940,7 @@ function captureReference(cwd, config) {
     snapshot
   };
   const path = referencePath(cwd);
-  mkdirSync(join36(path, ".."), { recursive: true });
+  mkdirSync(join37(path, ".."), { recursive: true });
   writeFileSync3(path, `${JSON.stringify(stored, void 0, 2)}
 `);
   return {
@@ -8895,7 +8949,7 @@ function captureReference(cwd, config) {
   };
 }
 function hasReference(cwd) {
-  return existsSync30(referencePath(cwd));
+  return existsSync31(referencePath(cwd));
 }
 function compareAgainstReference(cwd, report) {
   const path = referencePath(cwd);
@@ -8923,6 +8977,7 @@ function resolveVitest(cwd) {
   return fromModule !== void 0 ? { bin: fromModule, origin: "module" } : { bin: void 0, origin: "module" };
 }
 var FORMATTABLE = /\.(m|c)?(j|t)sx?$|\.json$/;
+var FORMAT_BATCH = 25;
 var VitestAdapter = class extends BaseAdapter {
   target = "test";
   runner = "vitest";
@@ -8992,20 +9047,27 @@ var VitestAdapter = class extends BaseAdapter {
   async afterInit(ctx) {
     const written = (ctx.written ?? []).filter((file) => FORMATTABLE.test(file));
     if (written.length === 0) return Promise.resolve();
-    if (readFormatAdoption(ctx.cwd).configFile === null) {
+    const formatter = writtenFileFormatter(ctx.cwd);
+    if (formatter === void 0) {
       this.say(
-        `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.`
+        `no style is declared here, by this module or its workspace, 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 oxfmt = resolveOxfmt(ctx.cwd);
-    if (oxfmt === void 0) return Promise.resolve();
-    const pass = spawnSync5(oxfmt, ["--write", ...written], { cwd: ctx.cwd, encoding: "utf8" });
+    let failed = 0;
+    for (let at = 0; at < written.length; at += FORMAT_BATCH) {
+      const batch = written.slice(at, at + FORMAT_BATCH);
+      const pass = spawnSync5(formatter.bin, [...formatter.args, ...batch], {
+        cwd: ctx.cwd,
+        encoding: "utf8"
+      });
+      if (pass.status !== 0) failed += batch.length;
+    }
     this.say(
-      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.` : (
+      failed === 0 ? `formatted the ${written.length} file(s) this wrote with ${formatter.origin}, so a format check 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.`
+        `${formatter.origin} could not run over ${failed} of the ${written.length} file(s) this wrote. Adoption itself is applied; run your formatter before committing.`
       )
     );
     return Promise.resolve();
@@ -9060,7 +9122,7 @@ var VitestAdapter = class extends BaseAdapter {
     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 reportFile = proving ? join38(mkdtempSync2(join38(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: runFrom, stdio: "inherit" });
@@ -9125,9 +9187,9 @@ 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 { existsSync as existsSync32, readFileSync as readFileSync32 } from "fs";
 import { createRequire as createRequire7 } from "module";
-import { join as join39 } from "path";
+import { join as join40 } from "path";
 
 // src/roles/typescript/presets/nest.json
 var nest_default2 = {
@@ -9309,7 +9371,7 @@ function readTsconfigAdoption(cwd) {
 
 // src/roles/typescript/adapters/tsc/plan.ts
 import { readFileSync as readFileSync31 } from "fs";
-import { join as join38 } from "path";
+import { join as join39 } from "path";
 
 // src/roles/typescript/typecheck-script.ts
 var SENTINEL_TYPECHECK_COMMAND = "sentinel --run --typescript";
@@ -9402,7 +9464,7 @@ function planAdoption(context) {
     };
   }
   const existing = parseJsonc(
-    readFileSync31(join38(context.cwd, target.path), "utf8"),
+    readFileSync31(join39(context.cwd, target.path), "utf8"),
     target.path
   );
   const extendsChain = composeExtends(existing.extends, preset);
@@ -9540,7 +9602,7 @@ var TscAdapter = class _TscAdapter extends BaseAdapter {
     let chain;
     try {
       const parsed = parseJsonc(
-        readFileSync32(join39(cwd, target.path), "utf8"),
+        readFileSync32(join40(cwd, target.path), "utf8"),
         target.path
       );
       chain = parsed.extends;
@@ -9553,7 +9615,7 @@ var TscAdapter = class _TscAdapter extends BaseAdapter {
     );
     if (preset === void 0) return void 0;
     try {
-      createRequire7(join39(cwd, "noop.js")).resolve(preset);
+      createRequire7(join40(cwd, "noop.js")).resolve(preset);
       return void 0;
     } catch {
       return preset;
@@ -9649,7 +9711,7 @@ var TscAdapter = class _TscAdapter extends BaseAdapter {
   referencedProjects(cwd, config) {
     try {
       const parsed = parseJsonc(
-        readFileSync32(join39(cwd, config), "utf8"),
+        readFileSync32(join40(cwd, config), "utf8"),
         config
       );
       const referenced = (parsed.references ?? []).map((reference) => reference.path).filter((path) => typeof path === "string" && path.length > 0);
@@ -9665,7 +9727,7 @@ var TscAdapter = class _TscAdapter extends BaseAdapter {
    * check.
    */
   typecheckTarget(cwd) {
-    if (existsSync31(join39(cwd, "tsconfig.json"))) return "tsconfig.json";
+    if (existsSync32(join40(cwd, "tsconfig.json"))) return "tsconfig.json";
     const target = resolveTsconfigTarget(cwd);
     return target.reason === "none" ? null : target.path;
   }
@@ -9870,7 +9932,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 { existsSync as existsSync33, readFileSync as readFileSync33, renameSync, rmSync as rmSync4, writeFileSync as writeFileSync4 } from "fs";
 import { resolve as resolve7, sep } from "path";
 import { applyEdits as applyEdits3, findNodeAtLocation, modify, parseTree } from "jsonc-parser";
 
@@ -9889,7 +9951,7 @@ function resolveWithinRoot(cwd, relativePath) {
   return absolutePath;
 }
 function readIfExists(absolutePath) {
-  return existsSync32(absolutePath) ? readFileSync33(absolutePath, "utf8") : void 0;
+  return existsSync33(absolutePath) ? readFileSync33(absolutePath, "utf8") : void 0;
 }
 function* leaves(value, prefix = []) {
   for (const [key, keyValue] of Object.entries(value)) {
@@ -10007,8 +10069,8 @@ function applyPlan(cwd, plan4) {
 }
 
 // src/core/config/preset-evidence.ts
-import { existsSync as existsSync33, readdirSync as readdirSync9, readFileSync as readFileSync34 } from "fs";
-import { join as join40 } from "path";
+import { existsSync as existsSync34, readdirSync as readdirSync9, readFileSync as readFileSync34 } from "fs";
+import { join as join41 } from "path";
 var PATH_SIGNALS = [
   {
     preset: "nest",
@@ -10042,12 +10104,12 @@ function sourceImports(cwd, pattern) {
     }
     for (const entry of entries) {
       if (entry.isDirectory()) {
-        if (!NOT_SCANNED.has(entry.name)) stack.push(join40(dir, entry.name));
+        if (!NOT_SCANNED.has(entry.name)) stack.push(join41(dir, entry.name));
         continue;
       }
       if (!SOURCE_FILE2.test(entry.name)) continue;
       try {
-        if (pattern.test(readFileSync34(join40(dir, entry.name), "utf8"))) return true;
+        if (pattern.test(readFileSync34(join41(dir, entry.name), "utf8"))) return true;
       } catch {
         continue;
       }
@@ -10056,8 +10118,8 @@ function sourceImports(cwd, pattern) {
   return false;
 }
 function dependencyNames(cwd) {
-  const path = join40(cwd, "package.json");
-  if (!existsSync33(path)) return [];
+  const path = join41(cwd, "package.json");
+  if (!existsSync34(path)) return [];
   try {
     const manifest = parseJsonc(
       readFileSync34(path, "utf8"),
@@ -10083,7 +10145,7 @@ function declaresJsx(cwd) {
   for (const name of entries) {
     try {
       const config = parseJsonc(
-        readFileSync34(join40(cwd, name), "utf8"),
+        readFileSync34(join41(cwd, name), "utf8"),
         name
       );
       if (config.compilerOptions?.jsx !== void 0) return true;

package/dist/index.js

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

package/package.json

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