@hublo/sentinel 1.4.0-alpha.43 → 1.4.0-alpha.44

package/dist/bin/sentinel.js

@@ -15,10 +15,10 @@ import {
   palette,
   registerAdapters,
   resolve
-} from "../chunk-TAJD75KN.js";
+} from "../chunk-ZSPDXVQL.js";
 import {
   resolveContext
-} from "../chunk-TIOMI3YB.js";
+} from "../chunk-RO626QTL.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-EDNRJHTG.js");
+  const { validateModuleTests } = await import("../validate-UIOW5VEV.js");
   const outcomes = modules.flatMap(
     (module) => validateModuleTests(module.name, module.root)
   );

package/dist/{chunk-TIOMI3YB.js → chunk-RO626QTL.js}

@@ -367,9 +367,9 @@ function binFromOwnInstall(packageName, binName) {
   try {
     const manifest = require2.resolve(`${packageName}/package.json`);
     const bin = require2(manifest).bin;
-    const relative6 = typeof bin === "string" ? bin : bin?.[binName];
-    if (!relative6) return void 0;
-    const executable = join5(dirname(manifest), relative6);
+    const relative7 = typeof bin === "string" ? bin : bin?.[binName];
+    if (!relative7) return void 0;
+    const executable = join5(dirname(manifest), relative7);
     return existsSync4(executable) ? executable : void 0;
   } catch {
     return void 0;
@@ -748,7 +748,7 @@ function resolveVitest(cwd) {
 // src/roles/test/adapters/vitest/vitest.adapter.ts
 import { spawnSync } from "node:child_process";
 import { readFileSync as readFileSync24, writeFileSync as writeFileSync2 } from "node:fs";
-import { isAbsolute as isAbsolute2, join as join30, resolve as resolve9 } from "node:path";
+import { isAbsolute as isAbsolute2, join as join30, relative as relative6, resolve as resolve9 } from "node:path";
 
 // src/core/config/tool-args.ts
 import { existsSync as existsSync6 } from "node:fs";
@@ -769,11 +769,14 @@ function splitToolArgs(cwd, toolArgs = [], { valueFlags = [] } = {}) {
 }
 
 // src/roles/test/ordering-is-a-permutation.ts
+function isAnImport(line) {
+  return /^import\b/.test(line) || /^export\s+(?:\*|\{)[^;]*\bfrom\b/.test(line);
+}
 function lineCounts(source) {
   const counts = /* @__PURE__ */ new Map();
   for (const line of source.split("\n")) {
     const trimmed = line.trim();
-    if (trimmed === "") continue;
+    if (trimmed === "" || isAnImport(trimmed)) continue;
     counts.set(trimmed, (counts.get(trimmed) ?? 0) + 1);
   }
   return counts;
@@ -947,11 +950,11 @@ function ownsMswLifecycle(cwd, setupFiles) {
 // src/roles/test/support-file-name.ts
 var JEST_PREFIX = "jest.";
 var VITEST_PREFIX = "vitest.";
-function vitestSupportName(relative6) {
-  const cut = relative6.lastIndexOf("/");
-  const directory = cut === -1 ? "" : relative6.slice(0, cut + 1);
-  const base = relative6.slice(cut + 1);
-  if (!base.startsWith(JEST_PREFIX)) return relative6;
+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;
   return `${directory}${VITEST_PREFIX}${base.slice(JEST_PREFIX.length)}`;
 }
 
@@ -2121,8 +2124,8 @@ function reachesBack(fromFile, specifier) {
     } catch {
       continue;
     }
-    for (const relative6 of relativeSpecifiers(source)) {
-      const next = resolveRelative(file, relative6);
+    for (const relative7 of relativeSpecifiers(source)) {
+      const next = resolveRelative(file, relative7);
       if (next !== void 0) stack.push(next);
     }
   }
@@ -4000,14 +4003,14 @@ function migrateModuleTests(cwd, setupFiles = []) {
   let hoisted = 0;
   const defaultImported = defaultImportedSpecifiers(cwd);
   const asyncHelpers = /* @__PURE__ */ new Set();
-  for (const relative6 of listTestSupportFiles(cwd, setupFiles)) {
-    const source = read2(join17(cwd, relative6));
+  for (const relative7 of listTestSupportFiles(cwd, setupFiles)) {
+    const source = read2(join17(cwd, relative7));
     if (source === void 0) {
-      blockers.push({ file: relative6, reason: "this file could not be read" });
+      blockers.push({ file: relative7, reason: "this file could not be read" });
       continue;
     }
     const migrated = migrateTestFile(
-      join17(cwd, relative6),
+      join17(cwd, relative7),
       source,
       defaultImported,
       /* @__PURE__ */ new Set(),
@@ -4015,19 +4018,19 @@ function migrateModuleTests(cwd, setupFiles = []) {
     );
     for (const member of migrated.unhandled) {
       blockers.push({
-        file: `${relative6}:${member.line}`,
+        file: `${relative7}:${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: relative6, reason: refusal.reason });
+      blockers.push({ file: relative7, reason: refusal.reason });
     }
     collected.push(...migrated.warnings);
-    const renamedTo = vitestSupportName(relative6);
-    if (!migrated.changed && renamedTo === relative6) continue;
-    if (renamedTo !== relative6) operations.push({ kind: "delete", path: relative6 });
-    const before = parse3(join17(cwd, relative6), source);
-    const after = parse3(join17(cwd, relative6), migrated.source);
+    const renamedTo = vitestSupportName(relative7);
+    if (!migrated.changed && renamedTo === relative7) continue;
+    if (renamedTo !== relative7) operations.push({ kind: "delete", path: relative7 });
+    const before = parse3(join17(cwd, relative7), source);
+    const after = parse3(join17(cwd, relative7), migrated.source);
     if (before !== void 0 && after !== void 0) {
       const wasAsync = asyncFunctionNames(before);
       for (const name of asyncFunctionNames(after)) {
@@ -4039,14 +4042,14 @@ function migrateModuleTests(cwd, setupFiles = []) {
     const contents = /\bvi\./.test(migrated.source) ? injectViImport(join17(cwd, renamedTo), migrated.source) : migrated.source;
     operations.push({ kind: "write", path: renamedTo, contents });
   }
-  for (const relative6 of listTestFiles(cwd)) {
-    const source = read2(join17(cwd, relative6));
+  for (const relative7 of listTestFiles(cwd)) {
+    const source = read2(join17(cwd, relative7));
     if (source === void 0) {
-      blockers.push({ file: relative6, reason: "this file could not be read" });
+      blockers.push({ file: relative7, reason: "this file could not be read" });
       continue;
     }
     const migrated = migrateTestFile(
-      join17(cwd, relative6),
+      join17(cwd, relative7),
       source,
       defaultImported,
       asyncHelpers,
@@ -4054,24 +4057,24 @@ function migrateModuleTests(cwd, setupFiles = []) {
     );
     for (const member of migrated.unhandled) {
       blockers.push({
-        file: `${relative6}:${member.line}`,
+        file: `${relative7}:${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}`
       });
     }
     collected.push(...migrated.warnings);
     for (const refusal of migrated.refusals) {
-      blockers.push({ file: relative6, reason: refusal.reason });
+      blockers.push({ file: relative7, reason: refusal.reason });
     }
     if (!migrated.changed) continue;
     files++;
     renamed += migrated.renamed;
     if (migrated.hoisted.length > 0) hoisted++;
     const withInheritedMocks = declaredInheritedMocks(
-      join17(cwd, relative6),
+      join17(cwd, relative7),
       migrated.source,
       inherited
     );
-    operations.push({ kind: "write", path: relative6, contents: withInheritedMocks });
+    operations.push({ kind: "write", path: relative7, contents: withInheritedMocks });
   }
   const warnings = [...new Set(collected)];
   return blockers.length > 0 ? { operations: [], files, renamed, hoisted, blockers, warnings } : { operations, files, renamed, hoisted, blockers: [], warnings };
@@ -5673,13 +5676,15 @@ var VitestAdapter = class extends BaseAdapter {
   fixWithTheModulesLinter(ctx, written) {
     const linter = writtenFileLinter(ctx.cwd);
     if (linter === void 0) return;
+    const workspaceRoot = findWorkspaceRoot(ctx.cwd) ?? ctx.cwd;
+    const fromRoot = (file) => relative6(workspaceRoot, join30(ctx.cwd, file));
     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,
+      const pass = spawnSync(linter.bin, [...linter.args, ...batch.map(fromRoot)], {
+        cwd: workspaceRoot,
         encoding: "utf8"
       });
       if (pass.status !== 0) unsettled += 1;

package/dist/{chunk-TAJD75KN.js → chunk-ZSPDXVQL.js}

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

package/dist/index.js

@@ -6,10 +6,10 @@ import {
   registerAdapters,
   resolve,
   setDefaultRunner
-} from "./chunk-TAJD75KN.js";
+} from "./chunk-ZSPDXVQL.js";
 import {
   BaseAdapter
-} from "./chunk-TIOMI3YB.js";
+} from "./chunk-RO626QTL.js";
 import "./chunk-O7REVMOC.js";
 import "./chunk-QXFCZON7.js";
 import "./chunk-NW6UHNYX.js";

package/dist/{validate-EDNRJHTG.js → validate-UIOW5VEV.js}

@@ -7,7 +7,7 @@ import {
   readTestAdoption,
   resolveVitest,
   suiteOf
-} from "./chunk-TIOMI3YB.js";
+} from "./chunk-RO626QTL.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.43",
+  "version": "1.4.0-alpha.44",
   "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",