@hublo/sentinel 1.4.0-alpha.25 → 1.4.0-alpha.27

package/dist/bin/sentinel.js

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

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

@@ -5774,12 +5774,38 @@ function rewriteAssertionReturnValue(source, program) {
   return { source: result, rewritten: captures.length - refusals.length, refusals };
 }
 
-// src/roles/test/codemod/constructible-mocks.ts
+// src/roles/test/codemod/bare-mock-factory.ts
 var MEMBER_TYPES2 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
+function isMockFactory(node) {
+  if (node === void 0 || !MEMBER_TYPES2.has(node.type)) return false;
+  const object = node.object;
+  const property = node.property;
+  if (object?.type !== "Identifier") return false;
+  if (object.name !== "vi" && object.name !== "jest") return false;
+  return property?.type === "Identifier" && property.name === "fn";
+}
+function invokeBareMockFactories(source, program) {
+  const edits = [];
+  walk(program, (node) => {
+    if (node.type !== "CallExpression") return;
+    for (const argument of node.arguments ?? []) {
+      if (isMockFactory(argument)) edits.push(argument.end);
+    }
+  });
+  if (edits.length === 0) return { source, rewritten: 0 };
+  let result = source;
+  for (const end of [...edits].sort((left, right) => right - left)) {
+    result = `${result.slice(0, end)}()${result.slice(end)}`;
+  }
+  return { source: result, rewritten: edits.length };
+}
+
+// src/roles/test/codemod/constructible-mocks.ts
+var MEMBER_TYPES3 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
 function mockImplementationArrow(node) {
   if (node.type !== "CallExpression") return void 0;
   const callee = node.callee;
-  if (callee === void 0 || !MEMBER_TYPES2.has(callee.type)) return void 0;
+  if (callee === void 0 || !MEMBER_TYPES3.has(callee.type)) return void 0;
   const property = callee.property;
   if (property?.type !== "Identifier" || property.name !== "mockImplementation") return void 0;
   const [argument] = node.arguments ?? [];
@@ -5788,7 +5814,7 @@ function mockImplementationArrow(node) {
 function assertedMockedClass(source, node) {
   if (node.type !== "CallExpression") return false;
   const callee = node.callee;
-  if (callee === void 0 || !MEMBER_TYPES2.has(callee.type)) return false;
+  if (callee === void 0 || !MEMBER_TYPES3.has(callee.type)) return false;
   const object = callee.object;
   if (object === void 0) return false;
   return /\bMockedClass\b/.test(source.slice(object.start, object.end));
@@ -5864,16 +5890,16 @@ function normaliseDeepImports(source) {
 }
 
 // src/roles/test/codemod/each-table-rows.ts
-var MEMBER_TYPES3 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
+var MEMBER_TYPES4 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
 var RUNNERS = /* @__PURE__ */ new Set(["it", "test", "describe"]);
 function eachTable(node) {
   if (node.type !== "CallExpression") return void 0;
   const callee = node.callee;
-  if (callee === void 0 || !MEMBER_TYPES3.has(callee.type)) return void 0;
+  if (callee === void 0 || !MEMBER_TYPES4.has(callee.type)) return void 0;
   const property = callee.property;
   if (property?.type !== "Identifier" || property.name !== "each") return void 0;
   let object = callee.object;
-  while (object !== void 0 && MEMBER_TYPES3.has(object.type)) {
+  while (object !== void 0 && MEMBER_TYPES4.has(object.type)) {
     object = object.object;
   }
   if (object?.type !== "Identifier" || !RUNNERS.has(object.name)) return void 0;
@@ -5900,13 +5926,13 @@ function rewriteEachTableRows(source, program) {
 }
 
 // src/roles/test/codemod/each-title.ts
-var MEMBER_TYPES4 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
+var MEMBER_TYPES5 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
 function eachTitle(node) {
   if (node.type !== "CallExpression") return void 0;
   const inner = node.callee;
   if (inner?.type !== "CallExpression") return void 0;
   const member = inner.callee;
-  if (member === void 0 || !MEMBER_TYPES4.has(member.type)) return void 0;
+  if (member === void 0 || !MEMBER_TYPES5.has(member.type)) return void 0;
   const property = member.property;
   if (property?.type !== "Identifier" || property.name !== "each") return void 0;
   const [title] = node.arguments ?? [];
@@ -5959,14 +5985,14 @@ function rewriteEachTitles(source, program) {
 
 // src/roles/test/codemod/empty-mock-implementation.ts
 var METHODS = /* @__PURE__ */ new Set(["mockImplementation", "mockImplementationOnce"]);
-var MEMBER_TYPES5 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
+var MEMBER_TYPES6 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
 function rewriteEmptyMockImplementation(source, program) {
   const insertAt = [];
   walk(program, (node) => {
     if (node.type !== "CallExpression") return;
     if ((node.arguments ?? []).length > 0) return;
     const callee = node.callee;
-    if (callee === void 0 || !MEMBER_TYPES5.has(callee.type)) return;
+    if (callee === void 0 || !MEMBER_TYPES6.has(callee.type)) return;
     const property = callee.property;
     if (property?.type !== "Identifier" || !METHODS.has(property.name)) return;
     insertAt.push(node.end - 1);
@@ -5979,12 +6005,12 @@ function rewriteEmptyMockImplementation(source, program) {
 }
 
 // src/roles/test/codemod/fake-timer-options.ts
-var MEMBER_TYPES6 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
+var MEMBER_TYPES7 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
 var TIMER_CALLS = /* @__PURE__ */ new Set(["useFakeTimers"]);
 function timerOptions(node) {
   if (node.type !== "CallExpression") return void 0;
   const callee = node.callee;
-  if (callee === void 0 || !MEMBER_TYPES6.has(callee.type)) return void 0;
+  if (callee === void 0 || !MEMBER_TYPES7.has(callee.type)) return void 0;
   const object = callee.object;
   const property = callee.property;
   if (object?.type !== "Identifier") return void 0;
@@ -6328,7 +6354,7 @@ function hoistCapturedBindings(source, program, factories, bindings, imported) {
 
 // src/roles/test/codemod/hook-return-value.ts
 var HOOKS = /* @__PURE__ */ new Set(["beforeEach", "afterEach", "beforeAll", "afterAll"]);
-var MEMBER_TYPES7 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
+var MEMBER_TYPES8 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
 function hookCallback(node) {
   if (node.type !== "CallExpression") return void 0;
   const callee = node.callee;
@@ -6339,7 +6365,7 @@ function hookCallback(node) {
 function configuresAMock(body) {
   if (body.type !== "CallExpression") return false;
   const callee = body.callee;
-  if (callee === void 0 || !MEMBER_TYPES7.has(callee.type)) return false;
+  if (callee === void 0 || !MEMBER_TYPES8.has(callee.type)) return false;
   const property = callee.property;
   return property?.type === "Identifier" && /^mock[A-Z]/.test(property.name);
 }
@@ -6554,7 +6580,7 @@ function isCommonJsPackage(fromFile, specifier) {
   }
   return false;
 }
-var MEMBER_TYPES8 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
+var MEMBER_TYPES9 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
 var ASYNC_REPLACEMENTS = {
   requireActual: "importActual",
   requireMock: "importMock"
@@ -6564,7 +6590,7 @@ function mockedSpecifiers(program) {
   walk(program, (node) => {
     if (node.type !== "CallExpression") return;
     const callee = node.callee;
-    if (callee === void 0 || !MEMBER_TYPES8.has(callee.type)) return;
+    if (callee === void 0 || !MEMBER_TYPES9.has(callee.type)) return;
     const object = callee.object;
     const property = callee.property;
     if (object?.type !== "Identifier") return;
@@ -6601,7 +6627,7 @@ function bareRequire(node) {
 function mockFactoryReturn(node) {
   if (node.type !== "CallExpression") return void 0;
   const callee = node.callee;
-  if (callee === void 0 || !MEMBER_TYPES8.has(callee.type)) return void 0;
+  if (callee === void 0 || !MEMBER_TYPES9.has(callee.type)) return void 0;
   const object = callee.object;
   const property = callee.property;
   if (object?.type !== "Identifier") return void 0;
@@ -6711,7 +6737,7 @@ function applyNamedRules(source, program, fileName = "") {
       }
       return;
     }
-    if (!MEMBER_TYPES8.has(node.type)) return;
+    if (!MEMBER_TYPES9.has(node.type)) return;
     const object = node.object;
     if (object !== void 0) readsANameOffIt.add(object);
   });
@@ -6782,13 +6808,13 @@ function applyNamedRules(source, program, fileName = "") {
 }
 
 // src/roles/test/codemod/isolate-modules.ts
-var MEMBER_TYPES9 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
+var MEMBER_TYPES10 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
 var ISOLATORS = /* @__PURE__ */ new Set(["isolateModules", "isolateModulesAsync"]);
 var FUNCTIONS2 = /* @__PURE__ */ new Set(["ArrowFunctionExpression", "FunctionExpression"]);
 function isolatingCall(node) {
   if (node.type !== "CallExpression") return void 0;
   const callee = node.callee;
-  if (callee === void 0 || !MEMBER_TYPES9.has(callee.type)) return void 0;
+  if (callee === void 0 || !MEMBER_TYPES10.has(callee.type)) return void 0;
   const object = callee.object;
   const property = callee.property;
   if (object?.type !== "Identifier" || object.name !== "jest") return void 0;
@@ -6799,7 +6825,7 @@ function isolatingCall(node) {
 function unusableIsolatingCall(node) {
   if (node.type !== "CallExpression") return void 0;
   const callee = node.callee;
-  if (callee === void 0 || !MEMBER_TYPES9.has(callee.type)) return void 0;
+  if (callee === void 0 || !MEMBER_TYPES10.has(callee.type)) return void 0;
   const object = callee.object;
   const property = callee.property;
   if (object?.type !== "Identifier" || object.name !== "jest") return void 0;
@@ -6850,11 +6876,11 @@ ${indent}await (${callback})()`
 }
 
 // src/roles/test/codemod/mock-as-value.ts
-var MEMBER_TYPES10 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
+var MEMBER_TYPES11 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
 function isViMockCall(node) {
   if (node?.type !== "CallExpression") return false;
   const callee = node.callee;
-  if (callee === void 0 || !MEMBER_TYPES10.has(callee.type)) return false;
+  if (callee === void 0 || !MEMBER_TYPES11.has(callee.type)) return false;
   const object = callee.object;
   const property = callee.property;
   return object?.type === "Identifier" && object.name === "vi" && property?.type === "Identifier" && (property.name === "mock" || property.name === "doMock");
@@ -6879,7 +6905,7 @@ function rewriteMockAsValue(source, program) {
   const memberUses = /* @__PURE__ */ new Map();
   const otherUses = /* @__PURE__ */ new Map();
   walk(program, (node) => {
-    if (MEMBER_TYPES10.has(node.type)) {
+    if (MEMBER_TYPES11.has(node.type)) {
       const object = node.object;
       if (object?.type === "Identifier" && bindings.has(object.name)) {
         const list = memberUses.get(object.name) ?? [];
@@ -6925,12 +6951,12 @@ function rewriteMockAsValue(source, program) {
 }
 
 // src/roles/test/codemod/mock-factory-default.ts
-var MEMBER_TYPES11 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
+var MEMBER_TYPES12 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
 var BINDING = "sentinelMockedModule";
 function mockCall(node) {
   if (node.type !== "CallExpression") return void 0;
   const callee = node.callee;
-  if (callee === void 0 || !MEMBER_TYPES11.has(callee.type)) return void 0;
+  if (callee === void 0 || !MEMBER_TYPES12.has(callee.type)) return void 0;
   const property = callee.property;
   if (property?.type !== "Identifier" || property.name !== "mock") return void 0;
   const object = callee.object;
@@ -7043,7 +7069,7 @@ function rewriteMockFactoryDefault(source, program, defaultImported) {
 
 // src/roles/test/codemod/mock-promise-resolve.ts
 var MOCK_FACTORY = /* @__PURE__ */ new Set(["fn", "spyOn"]);
-function isMockFactory(source, node) {
+function isMockFactory2(source, node) {
   if (node.type !== "CallExpression") return false;
   const callee = node.callee;
   if (callee?.type !== "MemberExpression") return false;
@@ -7086,7 +7112,7 @@ function resolvedValue(source, executor) {
 function rewriteMockPromiseResolve(source, program) {
   const edits = [];
   walk(program, (node) => {
-    if (!isMockFactory(source, node)) return;
+    if (!isMockFactory2(source, node)) return;
     for (const argument of node.arguments ?? []) {
       walk(argument, (inner) => {
         if (inner.type !== "NewExpression") return;
@@ -7114,11 +7140,11 @@ function rewriteMockPromiseResolve(source, program) {
 }
 
 // src/roles/test/codemod/mocked-module-binding.ts
-var MEMBER_TYPES12 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
+var MEMBER_TYPES13 = /* @__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;
+  if (callee === void 0 || !MEMBER_TYPES13.has(callee.type)) return void 0;
   const object = callee.object;
   const property = callee.property;
   if (object?.type !== "Identifier") return void 0;
@@ -7176,7 +7202,7 @@ function annotateMockedBindings(source, program) {
 // src/roles/test/codemod/propagate-await.ts
 import { parseSync as parseSync5 } from "oxc-parser";
 var FUNCTIONS3 = /* @__PURE__ */ new Set(["ArrowFunctionExpression", "FunctionExpression", "FunctionDeclaration"]);
-var MEMBER_TYPES13 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
+var MEMBER_TYPES14 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
 var ALREADY_A_PROMISE = /* @__PURE__ */ new Set(["then", "catch", "finally"]);
 function asyncFunctionNames(program) {
   const names = /* @__PURE__ */ new Set();
@@ -7250,7 +7276,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_TYPES13.has(parent.type) && parent.object === call) {
+  if (MEMBER_TYPES14.has(parent.type) && parent.object === call) {
     const property = parent.property;
     return property?.type === "Identifier" && ALREADY_A_PROMISE.has(property.name);
   }
@@ -7303,7 +7329,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_TYPES14 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
+var MEMBER_TYPES15 = /* @__PURE__ */ new Set(["MemberExpression", "StaticMemberExpression"]);
 var PACKAGE_SUBPATH = /^(@[^/]+\/[^/]+|[^@.][^/]*)\/(.+)$/;
 var PURE_REEXPORT = /^module\.exports\s*=\s*require\(\s*(['"])([^'"]+)\1\s*\)\s*;?$/;
 function mockCalls(program) {
@@ -7311,7 +7337,7 @@ function mockCalls(program) {
   walk(program, (node) => {
     if (node.type !== "CallExpression") return;
     const callee = node.callee;
-    if (callee === void 0 || !MEMBER_TYPES14.has(callee.type)) return;
+    if (callee === void 0 || !MEMBER_TYPES15.has(callee.type)) return;
     const object = callee.object;
     const property = callee.property;
     if (object?.type !== "Identifier") return;
@@ -7804,7 +7830,10 @@ function migrateTestFile(fileName, source, defaultImported = /* @__PURE__ */ new
   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, [
+  const afterBindings = parse2(fileName, mockedBindings.source);
+  if (afterBindings === void 0) return unparsable("mocked module bindings");
+  const bareFactories = invokeBareMockFactories(mockedBindings.source, afterBindings);
+  const withImport = injectTypeImport(fileName, bareFactories.source, [
     ...renamed.typeImports,
     ...spyTypes.typeImports,
     ...mockedBindings.typeImports
@@ -7831,6 +7860,7 @@ function migrateTestFile(fileName, source, defaultImported = /* @__PURE__ */ new
       ...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"] : [],
+      ...bareFactories.rewritten > 0 ? ["vi.fn passed as a value, invoked"] : [],
       ...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-ATDETQX5.js";
+} from "./chunk-ABFNJZ6C.js";
 import "./chunk-NW6UHNYX.js";
 export {
   BaseAdapter,

package/package.json

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