@hublo/sentinel 1.4.0-alpha.13 → 1.4.0-alpha.15

package/dist/bin/sentinel.js

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

package/dist/{chunk-YHGCBMKJ.js → chunk-BIDHDUUZ.js}

@@ -7256,6 +7256,8 @@ function repointMswServer(fileName, source) {
 
 // src/roles/test/codemod/spy-instance-type.ts
 var SPY_TYPES = /* @__PURE__ */ new Set(["SpyInstance"]);
+var QUALIFIED_ONLY = /* @__PURE__ */ new Set(["Mock"]);
+var VITEST_NAME = { SpyInstance: "MockInstance", Mock: "Mock" };
 function typeNameOf(source, node) {
   const name = node.typeName;
   if (name === void 0) return void 0;
@@ -7267,17 +7269,20 @@ function rewriteSpyInstanceType(source, program) {
     if (node.type !== "TSTypeReference") return;
     const written = typeNameOf(source, node);
     if (written === void 0) return;
-    const bare = written.startsWith("jest.") ? written.slice("jest.".length) : written;
-    if (!SPY_TYPES.has(bare)) return;
+    const qualified = written.startsWith("jest.");
+    const bare = qualified ? written.slice("jest.".length) : written;
+    if (!SPY_TYPES.has(bare) && !(qualified && QUALIFIED_ONLY.has(bare))) return;
     const args = (node.typeArguments ?? node.typeParameters)?.params;
     if (args === void 0 || args.length === 0) return;
     const text = (argument) => source.slice(argument.start, argument.end);
     const returns = text(args[0]);
     const parameters = args.length > 1 ? `...args: ${text(args[1])}` : "...args: never[]";
+    const target = VITEST_NAME[bare];
     edits.push({
       start: node.start,
       end: node.end,
-      text: `MockInstance<(${parameters}) => ${returns}>`
+      text: `${target}<(${parameters}) => ${returns}>`,
+      imports: target
     });
   });
   let result = source;
@@ -7287,7 +7292,8 @@ function rewriteSpyInstanceType(source, program) {
   return {
     source: result,
     rewritten: edits.length,
-    typeImports: edits.length > 0 ? ["MockInstance"] : []
+    // Only the names actually written, so a file does not import a type it never uses.
+    typeImports: [...new Set(edits.map((edit) => edit.imports))]
   };
 }
 
@@ -8208,17 +8214,17 @@ function specTypesOperation(cwd) {
     }
   };
 }
-function mockExtendedTypesPath(cwd) {
+function shippedTypesPath(cwd, declaration) {
   try {
     const manifest = createRequire6(join35(cwd, "noop.cjs")).resolve("@hublo/sentinel/package.json");
-    const file = join35(dirname7(manifest), MOCK_EXTENDED_TYPES);
+    const file = join35(dirname7(manifest), declaration);
     if (existsSync29(file)) {
       const path = relative7(cwd, file);
       return path.startsWith(".") ? path : `./${path}`;
     }
   } catch {
   }
-  return `./node_modules/@hublo/sentinel/${MOCK_EXTENDED_TYPES}`;
+  return `./node_modules/@hublo/sentinel/${declaration}`;
 }
 function tsconfigFileListOperations(cwd) {
   const operations = [];
@@ -8241,7 +8247,7 @@ function tsconfigFileListOperations(cwd) {
     const include = Array.isArray(config?.include) ? rewriteFileList(config.include) : void 0;
     const exclude = Array.isArray(config?.exclude) ? rewriteFileList(config.exclude) : void 0;
     const files = Array.isArray(config?.files) ? rewriteFileList(config.files) : void 0;
-    const withTypes = name === SPEC_TSCONFIG ? withMockExtendedTypes(cwd, files ?? config?.files) : void 0;
+    const withTypes = name === SPEC_TSCONFIG ? withShippedTypes(cwd, files ?? config?.files) : void 0;
     if (include === void 0 && exclude === void 0 && files === void 0 && withTypes === void 0)
       continue;
     operations.push({
@@ -8261,12 +8267,15 @@ function rewriteFileList(entries) {
   const unchanged = rewritten.length === entries.length && rewritten.every((entry, index) => entry === entries[index]);
   return unchanged ? void 0 : rewritten;
 }
-function withMockExtendedTypes(cwd, files) {
+function withShippedTypes(cwd, files) {
   const entries = Array.isArray(files) ? files : [];
-  if (entries.some((entry) => entry.endsWith(MOCK_EXTENDED_TYPES))) return void 0;
-  return [...entries, mockExtendedTypesPath(cwd)];
+  const missing = SHIPPED_TYPES.filter(
+    (declaration) => !entries.some((entry) => entry.endsWith(declaration))
+  );
+  if (missing.length === 0) return void 0;
+  return [...entries, ...missing.map((declaration) => shippedTypesPath(cwd, declaration))];
 }
-var MOCK_EXTENDED_TYPES = "types/mock-extended.d.ts";
+var SHIPPED_TYPES = ["types/mock-extended.d.ts", "types/jest-global.d.ts"];
 var JEST_CONFIG_ENTRY = /(^|\/)jest\.[\w.-]*config\.[cm]?[jt]s$/;
 var TSCONFIG_FILE = /^tsconfig[\w.-]*\.json$/;
 function siblingScriptRewrites(cwd) {

package/dist/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hublo/sentinel",
-  "version": "1.4.0-alpha.13",
+  "version": "1.4.0-alpha.15",
   "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",
@@ -66,6 +66,10 @@
       "types": "./dist/roles/test/tools/msw.d.ts",
       "import": "./dist/roles/test/tools/msw.js"
     },
+    "./test/tools/mock-extended": {
+      "types": "./dist/roles/test/setup/mock-extended.d.ts",
+      "import": "./dist/roles/test/setup/mock-extended.js"
+    },
     "./test/setup/msw-lifecycle": {
       "types": "./dist/roles/test/setup/msw-lifecycle.d.ts",
       "import": "./dist/roles/test/setup/msw-lifecycle.js"

package/types/jest-global.d.ts

@@ -0,0 +1,41 @@
+/**
+ * The type-level half of the `jest` global the setup installs.
+ *
+ * ## What it pairs with
+ *
+ * The migration rewrites SPEC files and deliberately leaves helpers alone, because the setup puts
+ * Vitest's `vi` on `globalThis` under the name `jest`:
+ *
+ *     // setup/jest-global.ts
+ *     ;(globalThis as Record<string, unknown>).jest = vi
+ *
+ * That is what lets a module migrate on its own while a shared helper still calls `jest.fn()`, and
+ * it is why the suite of a migrated module is green with untouched helpers.
+ *
+ * The shim answers the RUNTIME. It says nothing to TypeScript, and the migration also replaces
+ * `"jest"` with `"vitest/globals"` in the module's `tsconfig.spec.json`, so the name stops being a
+ * value at compile time while it still is one at run time.
+ *
+ * Measured on `apps/nest/microservices/institution` with alpha.14, a module whose typecheck was
+ * green before it migrated and whose 2958 tests all pass after:
+ *
+ *     src/app/institution.test-wrapper.ts(83,22)
+ *       error TS2708: Cannot use namespace 'jest' as a value.
+ *     tests/support/institution-prisma.test-wrapper.ts(58,22)
+ *       error TS2708: Cannot use namespace 'jest' as a value.
+ *
+ * Both are helpers, neither is a spec, and both run correctly. This file states, for the type
+ * checker, exactly what the setup states for the runtime.
+ *
+ * ## Why `typeof vi` and not a hand-written subset
+ *
+ * The shim assigns the whole `vi`, so anything narrower would describe something the module does
+ * not run. Writing the truth costs one line and cannot drift.
+ *
+ * ## In a program that still carries `@types/jest`
+ *
+ * No conflict, and this one wins: measured on a fixture holding both, `jest.hoisted(() => 1)`
+ * compiles, and `hoisted` exists only on `vi`. So a module part-way through its migration gets the
+ * type of what actually executes rather than the type of the runner it is leaving.
+ */
+declare const jest: (typeof import('vitest'))['vi']

package/types/mock-extended.d.ts

@@ -5,19 +5,36 @@
  * time a migrated module has ONE copy. TypeScript does not read Vite's aliases, so it keeps
  * resolving the jest package and a migrated spec ends up compiling two worlds at once:
  *
- *     the value    typeof mockDeep<Db>()   -> CalledWithMock<…> extends jest.Mock
+ *     the value    typeof mockDeep<Db>()    -> CalledWithMock<…> extends jest.Mock
  *     the spec     let spy: MockInstance    -> vitest's own type
  *     TS2322       not assignable
  *
  * Measured on `apps/nest/microservices/agency`: one error, on a module whose typecheck was clean
  * before it migrated. 34 files under `libs/` export a type built this way.
  *
- * ## Why here, and not in the module
+ * ## Why it re-exports a SUBPATH of sentinel rather than `vitest-mock-extended`
  *
- * The declaration REPLACES the module's types with whatever it re-exports, so it has to name a
- * package that resolves from wherever the file sits. `vitest-mock-extended` is sentinel's
- * dependency, so a copy of this file placed in an adopting module would resolve nothing and empty
- * the module out: measured, `Module '"jest-mock-extended"' has no exported member 'mockDeep'`.
+ * Because a bare `vitest-mock-extended` does not resolve from here, which was measured with
+ * `--traceResolution` after the first attempt emptied the module out:
+ *
+ *     Resolving module 'vitest-mock-extended' from '…/agency/node_modules/@hublo/sentinel/types/…'
+ *     Module name 'vitest-mock-extended' was not resolved.
+ *
+ * The module's `tsconfig.spec.json` names this file by PATH, so TypeScript keeps the symlink path
+ * pnpm installed and walks up from there: `…/sentinel/node_modules`, then the module's, then the
+ * workspace's. Sentinel's own dependency sits in the store beside its real directory, and none of
+ * those three is it. A file reached by RESOLUTION is realpathed into the store instead, and its
+ * dependencies are found: same trace, `@hublo/sentinel/test/tools/msw` → `msw` resolved.
+ *
+ * `skipLibCheck` is on in every module here, so the failed `export *` was silent and what surfaced
+ * was an empty module: 18 × `Module '"jest-mock-extended"' has no exported member 'mockDeep'`.
+ *
+ * ## Why THIS subpath
+ *
+ * `@hublo/sentinel/test/tools/mock-extended` is the very module the runtime alias points at, so the
+ * types a spec compiles against are the ones it runs against, down to the lifecycle helpers the
+ * fork adds. Re-exporting `vitest-mock-extended` directly would describe something adjacent to what
+ * executes.
  *
  * ## Why it does not couple modules to each other
  *
@@ -31,5 +48,5 @@
  * module at a time; this keeps the test role the same.
  */
 declare module 'jest-mock-extended' {
-  export * from 'vitest-mock-extended'
+  export * from '@hublo/sentinel/test/tools/mock-extended'
 }