@hublo/sentinel 1.4.0-alpha.52 → 1.4.0-alpha.54

package/dist/bin/sentinel.js

@@ -15,10 +15,10 @@ import {
   palette,
   registerAdapters,
   resolve
-} from "../chunk-XIHARZ3B.js";
+} from "../chunk-DEDLGEHF.js";
 import {
   resolveContext
-} from "../chunk-F762LVCS.js";
+} from "../chunk-WE2AU6M2.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-UCPRX3CN.js");
+  const { validateModuleTests } = await import("../validate-T2YQFHJA.js");
   const outcomes = modules.flatMap(
     (module) => validateModuleTests(module.name, module.root)
   );

package/dist/{chunk-XIHARZ3B.js → chunk-DEDLGEHF.js}

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

package/dist/{chunk-F762LVCS.js → chunk-WE2AU6M2.js}

@@ -980,17 +980,8 @@ function walk(node, visit) {
 }
 var MEMBER_TYPES = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
 
-// src/roles/test/codemod/edits.ts
-function applyEdits(source, edits) {
-  let result = source;
-  for (const edit of [...edits].sort((left, right) => right.start - left.start)) {
-    result = `${result.slice(0, edit.start)}${edit.text}${result.slice(edit.end)}`;
-  }
-  return result;
-}
-
 // src/roles/test/codemod/inherited-automocks.ts
-function bareModuleMocks(program) {
+function bareModuleCalls(program, method) {
   const found = [];
   walk(program, (node) => {
     if (node.type !== "CallExpression") return;
@@ -999,7 +990,7 @@ function bareModuleMocks(program) {
     const object = callee.object;
     const property = callee.property;
     if (object?.type !== "Identifier" || object.name !== "jest" && object.name !== "vi") return;
-    if (property?.type !== "Identifier" || property.name !== "mock") return;
+    if (property?.type !== "Identifier" || property.name !== method) return;
     const args = node.arguments ?? [];
     if (args.length !== 1) return;
     const [specifier] = args;
@@ -1009,7 +1000,7 @@ function bareModuleMocks(program) {
   });
   return found;
 }
-function inheritedAutomocks(cwd, setupFiles, parse5) {
+function inheritedAutomocks(cwd, setupFiles, parse6) {
   const found = /* @__PURE__ */ new Set();
   for (const named of setupFiles) {
     const path = resolve3(cwd, named.replace("<rootDir>/", "./"));
@@ -1021,41 +1012,27 @@ function inheritedAutomocks(cwd, setupFiles, parse5) {
     } catch {
       continue;
     }
-    const program = parse5(path, source);
+    const program = parse6(path, source);
     if (program === void 0) continue;
-    for (const specifier of bareModuleMocks(program)) found.add(specifier);
+    for (const specifier of bareModuleCalls(program, "mock")) found.add(specifier);
   }
   return [...found].sort();
 }
-function importsSpecifier(program, specifier) {
-  for (const statement2 of program.body ?? []) {
-    if (statement2.type !== "ImportDeclaration") continue;
-    const source = statement2.source;
-    if (source !== void 0 && String(source.value) === specifier) return true;
-  }
-  return false;
-}
-function declareInheritedAutomocks(source, program, specifiers) {
-  const alreadyMocked = new Set(bareModuleMocks(program));
-  const missing = specifiers.filter(
-    (specifier) => !alreadyMocked.has(specifier) && importsSpecifier(program, specifier)
-  );
-  if (missing.length === 0) return source;
-  const imports = (program.body ?? []).filter(
-    (node) => node.type === "ImportDeclaration"
-  );
-  const last = imports[imports.length - 1];
-  const at = last === void 0 ? 0 : last.end;
-  const semi = /^import\s[^\n]*;\s*$/m.test(source) ? ";" : "";
-  const block = missing.map((specifier) => `vi.mock('${specifier}')${semi}`).join("\n");
-  const edits = [
-    { start: at, end: at, text: last === void 0 ? `${block}
-
-` : `
+var INHERITED_MOCKS_SETUP = "vitest.setup.inherited-mocks.mts";
+function inheritedMocksSetup(specifiers) {
+  const lines = specifiers.map((specifier) => `vi.mock('${specifier}')`);
+  return `/**
+ * Module mocks the workspace's jest setup made for every suite, declared where you can see
+ * them.
+ *
+ * The root setup mocked these for every file of every module that named it, and this
+ * migration cuts that reach on purpose. A spec that wants the real module says
+ * \`vi.unmock('<specifier>')\`: a file beats a setup.
+ */
+import { vi } from 'vitest'
 
-${block}` }
-  ];
-  return applyEdits(source, edits);
+${lines.join("\n")}
+`;
 }
 
 // src/roles/test/codemod/inject-type-import.ts
@@ -1248,6 +1225,15 @@ ${source}`;
 import { dirname as dirname8 } from "node:path";
 import { parseSync as parseSync8 } from "oxc-parser";
 
+// src/roles/test/codemod/edits.ts
+function applyEdits(source, edits) {
+  let result = source;
+  for (const edit of [...edits].sort((left, right) => right.start - left.start)) {
+    result = `${result.slice(0, edit.start)}${edit.text}${result.slice(edit.end)}`;
+  }
+  return result;
+}
+
 // src/roles/test/codemod/assertion-return-value.ts
 function rootedAtExpect(node) {
   let current = node;
@@ -4390,11 +4376,6 @@ function defaultImportedSpecifiers(cwd) {
   walk2(cwd);
   return found;
 }
-function declaredInheritedMocks(fileName, source, inherited) {
-  if (inherited.length === 0) return source;
-  const program = parse4(fileName, source);
-  return program === void 0 ? source : declareInheritedAutomocks(source, program, inherited);
-}
 function migrateModuleTests(cwd, setupFiles = []) {
   const modulesOwnMsw = ownsMswLifecycle(cwd, setupFiles);
   const inherited = inheritedAutomocks(cwd, setupFiles, parse4);
@@ -4472,12 +4453,14 @@ function migrateModuleTests(cwd, setupFiles = []) {
     files++;
     renamed += migrated.renamed;
     if (migrated.hoisted.length > 0) hoisted++;
-    const withInheritedMocks = declaredInheritedMocks(
-      join18(cwd, relative8),
-      migrated.source,
-      inherited
-    );
-    operations.push({ kind: "write", path: relative8, contents: withInheritedMocks });
+    operations.push({ kind: "write", path: relative8, contents: migrated.source });
+  }
+  if (inherited.length > 0) {
+    operations.push({
+      kind: "write",
+      path: INHERITED_MOCKS_SETUP,
+      contents: inheritedMocksSetup(inherited)
+    });
   }
   const warnings = [...new Set(collected)];
   return blockers.length > 0 ? { operations: [], files, renamed, hoisted, blockers, warnings } : { operations, files, renamed, hoisted, blockers: [], warnings };
@@ -4486,6 +4469,7 @@ function migrateModuleTests(cwd, setupFiles = []) {
 // src/roles/test/nest/generate-config.ts
 import { readdirSync as readdirSync5, readFileSync as readFileSync17, statSync as statSync6 } from "node:fs";
 import { join as join19, relative as relative5 } from "node:path";
+import { parseSync as parseSync10 } from "oxc-parser";
 var NEST_TEST_PRESET_SPECIFIER = "@hublo/sentinel/test/nest";
 var REACT_TEST_PRESET_SPECIFIER = "@hublo/sentinel/test/react";
 function flavourOf(reading) {
@@ -4565,16 +4549,22 @@ var withoutRootDir = (value) => value.replaceAll("<rootDir>/", "./").replaceAll(
 function ownsMswLifecycle2(cwd, reading) {
   return ownsMswLifecycle(cwd, [...reading.setupFiles ?? [], ...reading.setupFilesAfterEnv ?? []]);
 }
+function parse5(fileName, source) {
+  const { program, errors } = parseSync10(fileName, source, { sourceType: "module" });
+  return errors.length > 0 ? void 0 : program;
+}
 function setupBlock(cwd, reading, msw) {
   const dom = flavourOf(reading) === "react";
   const declared = [...reading.setupFiles ?? [], ...reading.setupFilesAfterEnv ?? []];
   const namedTheRootSetup = declared.some((file) => file.endsWith("jest.setup.after.env.js"));
   const own = declared.filter((file) => !file.endsWith("jest.setup.after.env.js")).map((file) => `'${vitestSupportName(withoutRootDir(file))}'`);
+  const inheritedMocks = namedTheRootSetup && inheritedAutomocks(cwd, declared, parse5).length > 0 ? [`'./${INHERITED_MOCKS_SETUP}'`] : [];
   const sentinel = [
     `'${SENTINEL_TEST_SETUP}'`,
     ...dom ? [`'${SENTINEL_A11Y_SETUP}'`, `'${SENTINEL_W3C_SETUP}'`] : [],
     ...namedTheRootSetup ? [`'${SENTINEL_WORKSPACE_SETUP}'`] : [],
-    ...msw && namedTheRootSetup && !ownsMswLifecycle2(cwd, reading) ? [`'${SENTINEL_MSW_SETUP}'`] : []
+    ...msw && namedTheRootSetup && !ownsMswLifecycle2(cwd, reading) ? [`'${SENTINEL_MSW_SETUP}'`] : [],
+    ...inheritedMocks
   ];
   return `        setupFiles: [${[...sentinel, ...own].join(", ")}],`;
 }

package/dist/index.js

@@ -6,10 +6,10 @@ import {
   registerAdapters,
   resolve,
   setDefaultRunner
-} from "./chunk-XIHARZ3B.js";
+} from "./chunk-DEDLGEHF.js";
 import {
   BaseAdapter
-} from "./chunk-F762LVCS.js";
+} from "./chunk-WE2AU6M2.js";
 import "./chunk-O7REVMOC.js";
 import "./chunk-QXFCZON7.js";
 import "./chunk-KMKQDGI6.js";

package/dist/{validate-UCPRX3CN.js → validate-T2YQFHJA.js}

@@ -7,7 +7,7 @@ import {
   readTestAdoption,
   resolveVitest,
   suiteOf
-} from "./chunk-F762LVCS.js";
+} from "./chunk-WE2AU6M2.js";
 import "./chunk-O7REVMOC.js";
 import "./chunk-QXFCZON7.js";
 import "./chunk-KMKQDGI6.js";

package/package.json

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