@hublo/sentinel 1.4.0-alpha.24 → 1.4.0-alpha.26

package/dist/bin/sentinel.js

@@ -16,7 +16,7 @@ import {
   registerAdapters,
   resolve,
   resolveContext
-} from "../chunk-U744PK2U.js";
+} from "../chunk-ATDETQX5.js";
 import {
   ensureWorkspacePrep,
   findWorkspaceRoot,

package/dist/{chunk-U744PK2U.js → chunk-ATDETQX5.js}

@@ -6515,7 +6515,7 @@ function injectTypeImport(fileName, source, typeNames) {
     if (merged.length === alreadyImported(existing).length) return source;
     return source.slice(0, existing.start) + renderTypeImport(merged, semi) + source.slice(existing.end);
   }
-  const line = renderTypeImport([...typeNames].sort(), semi);
+  const line = renderTypeImport([...new Set(typeNames)].sort(), semi);
   const first = imports[0];
   if (first === void 0) return `${line}
 
@@ -7113,10 +7113,70 @@ function rewriteMockPromiseResolve(source, program) {
   return { source: result, rewritten: edits.length };
 }
 
+// src/roles/test/codemod/mocked-module-binding.ts
+var MEMBER_TYPES12 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
+function mockedSpecifier(source, node) {
+  if (node.type !== "CallExpression") return void 0;
+  const callee = node.callee;
+  if (callee === void 0 || !MEMBER_TYPES12.has(callee.type)) return void 0;
+  const object = callee.object;
+  const property = callee.property;
+  if (object?.type !== "Identifier") return void 0;
+  if (object.name !== "vi" && object.name !== "jest") return void 0;
+  if (property?.type !== "Identifier" || property.name !== "mock") return void 0;
+  const [first] = node.arguments ?? [];
+  if (first?.type !== "Literal") return void 0;
+  return source.slice(first.start, first.end).slice(1, -1);
+}
+function awaitedImport(source, node) {
+  if (node?.type !== "AwaitExpression") return void 0;
+  const call = node.argument;
+  if (call?.type !== "ImportExpression") return void 0;
+  const specifier = call.source ?? call.arguments?.[0];
+  if (specifier?.type !== "Literal") return void 0;
+  return source.slice(specifier.start, specifier.end).slice(1, -1);
+}
+function annotateMockedBindings(source, program) {
+  const mocked = /* @__PURE__ */ new Set();
+  walk(program, (node) => {
+    const specifier = mockedSpecifier(source, node);
+    if (specifier !== void 0) mocked.add(specifier);
+  });
+  if (mocked.size === 0) return { source, rewritten: 0, typeImports: [] };
+  const edits = [];
+  for (const statement2 of program.body ?? []) {
+    if (statement2.type !== "VariableDeclaration") continue;
+    const declarations = statement2.declarations ?? [];
+    if (declarations.length !== 1) continue;
+    const [only] = declarations;
+    if (only === void 0) continue;
+    if (only.id?.type !== "Identifier") continue;
+    const init = only.init;
+    const specifier = awaitedImport(source, init);
+    if (specifier === void 0 || !mocked.has(specifier)) continue;
+    const start = init?.start;
+    const end = init?.end;
+    const expression = source.slice(start, end);
+    if (source.slice(end, end + 4).trimStart().startsWith("as"))
+      continue;
+    edits.push({
+      start,
+      end,
+      text: `(${expression}) as unknown as Record<string, Mock>`
+    });
+  }
+  if (edits.length === 0) return { source, rewritten: 0, typeImports: [] };
+  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 { source: result, rewritten: edits.length, typeImports: ["Mock"] };
+}
+
 // src/roles/test/codemod/propagate-await.ts
 import { parseSync as parseSync5 } from "oxc-parser";
 var FUNCTIONS3 = /* @__PURE__ */ new Set(["ArrowFunctionExpression", "FunctionExpression", "FunctionDeclaration"]);
-var MEMBER_TYPES12 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
+var MEMBER_TYPES13 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
 var ALREADY_A_PROMISE = /* @__PURE__ */ new Set(["then", "catch", "finally"]);
 function asyncFunctionNames(program) {
   const names = /* @__PURE__ */ new Set();
@@ -7190,7 +7250,7 @@ function alreadyHandled(call, parent) {
   if (parent === void 0) return false;
   if (parent.type === "AwaitExpression") return true;
   if (parent.type === "ReturnStatement" || parent.type === "ArrowFunctionExpression") return true;
-  if (MEMBER_TYPES12.has(parent.type) && parent.object === call) {
+  if (MEMBER_TYPES13.has(parent.type) && parent.object === call) {
     const property = parent.property;
     return property?.type === "Identifier" && ALREADY_A_PROMISE.has(property.name);
   }
@@ -7243,7 +7303,7 @@ function propagateAwait(fileName, source, original, elsewhere = /* @__PURE__ */
 import { readFileSync as readFileSync24, readdirSync as readdirSync4, statSync as statSync4 } from "node:fs";
 import { createRequire as createRequire5 } from "node:module";
 import { dirname as dirname5, join as join30 } from "node:path";
-var MEMBER_TYPES13 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
+var MEMBER_TYPES14 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
 var PACKAGE_SUBPATH = /^(@[^/]+\/[^/]+|[^@.][^/]*)\/(.+)$/;
 var PURE_REEXPORT = /^module\.exports\s*=\s*require\(\s*(['"])([^'"]+)\1\s*\)\s*;?$/;
 function mockCalls(program) {
@@ -7251,7 +7311,7 @@ function mockCalls(program) {
   walk(program, (node) => {
     if (node.type !== "CallExpression") return;
     const callee = node.callee;
-    if (callee === void 0 || !MEMBER_TYPES13.has(callee.type)) return;
+    if (callee === void 0 || !MEMBER_TYPES14.has(callee.type)) return;
     const object = callee.object;
     const property = callee.property;
     if (object?.type !== "Identifier") return;
@@ -7741,9 +7801,13 @@ function migrateTestFile(fileName, source, defaultImported = /* @__PURE__ */ new
     moduleBindings(program),
     importedNames(program)
   );
-  const withImport = injectTypeImport(fileName, hoist.source, [
+  const afterHoist = parse2(fileName, hoist.source);
+  if (afterHoist === void 0) return unparsable("hoisting captured bindings");
+  const mockedBindings = annotateMockedBindings(hoist.source, afterHoist);
+  const withImport = injectTypeImport(fileName, mockedBindings.source, [
     ...renamed.typeImports,
-    ...spyTypes.typeImports
+    ...spyTypes.typeImports,
+    ...mockedBindings.typeImports
   ]);
   const deep = normaliseDeepImports(withImport);
   const repointed = modulesOwnMsw ? { source: deep.source, repointed: false } : repointMswServer(fileName, deep.source);
@@ -7766,6 +7830,7 @@ function migrateTestFile(fileName, source, defaultImported = /* @__PURE__ */ new
       ...emptyImplementations.rewritten > 0 ? ["empty mockImplementation"] : [],
       ...hooks.rewritten > 0 ? ["hook body, so it does not return its mock"] : [],
       ...spyTypes.rewritten > 0 ? ["SpyInstance<T> as a signature, not a return type"] : [],
+      ...mockedBindings.rewritten > 0 ? ["a mocked module binding, typed as mocked"] : [],
       ...awaited.rewritten > 0 ? ["await propagated to a helper that became async"] : [],
       ...barrels.added.map((alias) => `mock carried to ${alias}, which re-exports the mocked file`),
       ...fakeTimers.translated

package/dist/index.js

@@ -7,7 +7,7 @@ import {
   registerAdapters,
   resolve,
   setDefaultRunner
-} from "./chunk-U744PK2U.js";
+} from "./chunk-ATDETQX5.js";
 import "./chunk-NW6UHNYX.js";
 export {
   BaseAdapter,

package/package.json

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

package/types/jest-global.d.ts

@@ -61,6 +61,14 @@ declare const jest: (typeof import('vitest'))['vi']
  *
  * A type-only namespace declares no value, which is why it merges with the const above instead of
  * colliding with it.
+ *
+ * ## Alongside a program that still carries `@types/jest`
+ *
+ * No collision either, and it was measured rather than assumed: a fixture with
+ * `types: ["jest", "vitest/globals"]` plus this file compiles clean, and the same fixture WITHOUT
+ * this file also compiles, which is what proves `@types/jest` was really loaded. Declaration
+ * merging applies to the namespace the way it already applies to the const, so a module part-way
+ * through its migration is not broken by carrying both.
  */
 declare namespace jest {
   type Mock<T = any, Y extends any[] = any[]> = import('vitest').Mock<(...args: Y) => T>