@hublo/sentinel 1.4.0-alpha.40 → 1.4.0-alpha.42

package/dist/bin/sentinel.js

@@ -15,10 +15,10 @@ import {
   palette,
   registerAdapters,
   resolve
-} from "../chunk-USVNSL76.js";
+} from "../chunk-BF5SF6HQ.js";
 import {
   resolveContext
-} from "../chunk-TDQGNNCV.js";
+} from "../chunk-YHNQONE2.js";
 import "../chunk-O7REVMOC.js";
 import "../chunk-QXFCZON7.js";
 import {
@@ -145,7 +145,7 @@ async function runValidate(ctx) {
     );
   }
   if (!ctx.targets.includes("test")) return 1;
-  const { validateModuleTests } = await import("../validate-JUMFX4ZF.js");
+  const { validateModuleTests } = await import("../validate-AUKAA6EG.js");
   const outcomes = modules.flatMap(
     (module) => validateModuleTests(module.name, module.root)
   );

package/dist/{chunk-USVNSL76.js → chunk-BF5SF6HQ.js}

@@ -53,7 +53,7 @@ import {
   selfCommand,
   splitToolArgs,
   walk
-} from "./chunk-TDQGNNCV.js";
+} from "./chunk-YHNQONE2.js";
 import {
   parseJsonc
 } from "./chunk-QXFCZON7.js";

package/dist/{chunk-TDQGNNCV.js → chunk-YHNQONE2.js}

@@ -747,7 +747,8 @@ function resolveVitest(cwd) {
 
 // src/roles/test/adapters/vitest/vitest.adapter.ts
 import { spawnSync } from "node:child_process";
-import { isAbsolute as isAbsolute2, resolve as resolve9 } from "node:path";
+import { readFileSync as readFileSync24, writeFileSync as writeFileSync2 } from "node:fs";
+import { isAbsolute as isAbsolute2, join as join30, resolve as resolve9 } from "node:path";
 
 // src/core/config/tool-args.ts
 import { existsSync as existsSync6 } from "node:fs";
@@ -767,6 +768,25 @@ function splitToolArgs(cwd, toolArgs = [], { valueFlags = [] } = {}) {
   return { options, paths };
 }
 
+// src/roles/test/ordering-is-a-permutation.ts
+function lineCounts(source) {
+  const counts = /* @__PURE__ */ new Map();
+  for (const line of source.split("\n")) {
+    const trimmed = line.trim();
+    if (trimmed === "") continue;
+    counts.set(trimmed, (counts.get(trimmed) ?? 0) + 1);
+  }
+  return counts;
+}
+function lineLostByTheFixer(before, after) {
+  const had = lineCounts(before);
+  const has = lineCounts(after);
+  for (const [line, count] of had) {
+    if ((has.get(line) ?? 0) < count) return line;
+  }
+  return void 0;
+}
+
 // src/core/config/nx-target.ts
 import { existsSync as existsSync7 } from "node:fs";
 import { join as join7 } from "node:path";
@@ -1963,6 +1983,25 @@ function rewriteHookReturnValue(source, program) {
   return { source: result, rewritten: edits.length };
 }
 
+// src/roles/test/codemod/asyncify.ts
+function alreadyAPromise(text) {
+  return /^(?:Promise|PromiseLike)\s*</.test(text.trim());
+}
+function asyncifyEdits(source, fn) {
+  const edits = [{ start: fn.start, end: fn.start, text: "async " }];
+  const annotation = fn.returnType;
+  const declared = annotation?.typeAnnotation;
+  if (declared?.start === void 0 || declared.end === void 0) return edits;
+  const text = source.slice(declared.start, declared.end);
+  if (alreadyAPromise(text)) return edits;
+  edits.push({
+    start: declared.start,
+    end: declared.end,
+    text: `Promise<${text}>`
+  });
+  return edits;
+}
+
 // src/roles/test/codemod/named-rules.ts
 import { existsSync as existsSync11, readFileSync as readFileSync10 } from "node:fs";
 import { createRequire as createRequire2 } from "node:module";
@@ -2474,7 +2513,7 @@ function applyNamedRules(source, program, fileName = "") {
     }
   });
   for (const fn of asyncify) {
-    edits.push({ start: fn.start, end: fn.start, text: "async " });
+    edits.push(...asyncifyEdits(source, fn));
   }
   const namespaceLines = namespaces.planned().map(
     ({ specifier, binding }) => `import * as ${binding} from '${specifier}'${fileUsesSemicolons(source) ? ";" : ""}`
@@ -2545,6 +2584,12 @@ function rewriteIsolateModules(source, program) {
   const refusals = [];
   const asyncify = /* @__PURE__ */ new Set();
   let rewritten = 0;
+  const awaitedCall = /* @__PURE__ */ new Map();
+  walkWithEnclosingFunction(program, void 0, (node) => {
+    if (node.type !== "AwaitExpression") return;
+    const argument = node.argument;
+    if (argument !== void 0) awaitedCall.set(argument, node);
+  });
   walkWithEnclosingFunction(program, void 0, (node, enclosing) => {
     const unusable = unusableIsolatingCall(node);
     if (unusable !== void 0) {
@@ -2558,10 +2603,11 @@ function rewriteIsolateModules(source, program) {
     if (found === void 0) return;
     const callbackText = source.slice(found.callback.start, found.callback.end);
     const callback = found.callback.async === true ? callbackText : `async ${callbackText}`;
-    const indent = indentationAt(source, found.call.start);
+    const replaced = awaitedCall.get(found.call) ?? found.call;
+    const indent = indentationAt(source, replaced.start);
     edits.push({
-      start: found.call.start,
-      end: found.call.end,
+      start: replaced.start,
+      end: replaced.end,
       text: `vi.resetModules()
 ${indent}await (${callback})()`
     });
@@ -2569,7 +2615,7 @@ ${indent}await (${callback})()`
     if (enclosing !== void 0 && enclosing.async !== true) asyncify.add(enclosing);
   });
   for (const fn of asyncify) {
-    edits.push({ start: fn.start, end: fn.start, text: "async " });
+    edits.push(...asyncifyEdits(source, fn));
   }
   const result = applyEdits(source, edits);
   return { source: result, rewritten, refusals };
@@ -5329,6 +5375,13 @@ function writtenFileLinter(cwd) {
 // src/roles/test/adapters/vitest/vitest.adapter.ts
 var FORMATTABLE = /\.(m|c)?(j|t)sx?$|\.json$/;
 var FORMAT_BATCH = 25;
+function readIfPossible(path) {
+  try {
+    return readFileSync24(path, "utf8");
+  } catch {
+    return void 0;
+  }
+}
 var VitestAdapter = class extends BaseAdapter {
   target = "test";
   runner = "vitest";
@@ -5450,13 +5503,30 @@ var VitestAdapter = class extends BaseAdapter {
     const linter = writtenFileLinter(ctx.cwd);
     if (linter === void 0) return;
     let unsettled = 0;
+    const reverted = [];
     for (let at = 0; at < written.length; at += FORMAT_BATCH) {
       const batch = written.slice(at, at + FORMAT_BATCH);
+      const before = new Map(batch.map((file) => [file, readIfPossible(join30(ctx.cwd, file))]));
       const pass = spawnSync(linter.bin, [...linter.args, ...batch], {
         cwd: ctx.cwd,
         encoding: "utf8"
       });
       if (pass.status !== 0) unsettled += 1;
+      for (const file of batch) {
+        const was = before.get(file);
+        if (was === void 0) continue;
+        const now = readIfPossible(join30(ctx.cwd, file));
+        if (now === void 0 || now === was) continue;
+        const lost = lineLostByTheFixer(was, now);
+        if (lost === void 0) continue;
+        writeFileSync2(join30(ctx.cwd, file), was);
+        reverted.push(`${file}: \`${lost.slice(0, 80)}\``);
+      }
+    }
+    if (reverted.length > 0) {
+      this.say(
+        `${linter.origin} did not only reorder: it removed ${reverted.length} line(s) it was given, so those file(s) were restored to what this migration wrote and their imports are left for your own lint to order. Reordering imports moves lines, it does not delete them. Measured on this repository, the rules that do this are \`prefer-arrow-callback\`, which un-does the function expression a mocked CLASS needs to be constructible, and unused-directive removal, which deletes a suppression for a rule your real lint target does run. First: ${reverted.slice(0, 3).join("; ")}`
+      );
     }
     this.say(
       unsettled === 0 ? `ran ${linter.origin} with its fixer over the ${written.length} file(s) this wrote, so the import this migration adds is ordered the way your rules ask. Without it, \`import/order\` alone put 19 modules of this repository in the red.` : `ran ${linter.origin} with its fixer over the ${written.length} file(s) this wrote, and it still reports something it cannot fix. Adoption itself is applied. Run your own lint to see what: it may be rules this module already failed, which are not this migration's to settle.`

package/dist/index.js

@@ -6,10 +6,10 @@ import {
   registerAdapters,
   resolve,
   setDefaultRunner
-} from "./chunk-USVNSL76.js";
+} from "./chunk-BF5SF6HQ.js";
 import {
   BaseAdapter
-} from "./chunk-TDQGNNCV.js";
+} from "./chunk-YHNQONE2.js";
 import "./chunk-O7REVMOC.js";
 import "./chunk-QXFCZON7.js";
 import "./chunk-NW6UHNYX.js";

package/dist/{validate-JUMFX4ZF.js → validate-AUKAA6EG.js}

@@ -7,7 +7,7 @@ import {
   readTestAdoption,
   resolveVitest,
   suiteOf
-} from "./chunk-TDQGNNCV.js";
+} from "./chunk-YHNQONE2.js";
 import "./chunk-O7REVMOC.js";
 import "./chunk-QXFCZON7.js";
 import "./chunk-NW6UHNYX.js";

package/package.json

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