@hublo/sentinel 1.2.0-alpha.30 → 1.2.0-alpha.32

package/dist/bin/sentinel.js

@@ -22,7 +22,7 @@ import {
   registerAdapters,
   resolve,
   resolveBin
-} from "../chunk-37Y7RALA.js";
+} from "../chunk-UULHGNMK.js";
 
 // bin/sentinel.ts
 import { program } from "commander";

package/dist/{chunk-37Y7RALA.js → chunk-UULHGNMK.js}

@@ -1037,14 +1037,15 @@ var movedSpecifiers = (toolchain) => new Set(toolchain.owned.map((entry) => entr
 var defaultExportNames = (toolchain) => Object.fromEntries(
   toolchain.owned.filter((entry) => entry.default !== void 0).map((entry) => [entry.specifier, entry.default])
 );
-function renderImport(bindings, presetSpecifier) {
+function renderImport(bindings, presetSpecifier, semi) {
   const render = (list) => list.map((b) => b.exported === b.local ? b.exported : `${b.exported} as ${b.local}`).sort((left, right) => left.localeCompare(right)).join(", ");
+  const end = semi ? ";" : "";
   const values = bindings.filter((b) => !b.typeOnly);
   const types = bindings.filter((b) => b.typeOnly);
   const lines = [];
-  if (values.length > 0) lines.push(`import { ${render(values)} } from '${presetSpecifier}'`);
+  if (values.length > 0) lines.push(`import { ${render(values)} } from '${presetSpecifier}'${end}`);
   if (types.length > 0) {
-    lines.push(`import type { ${render(types)} } from '${presetSpecifier}'`);
+    lines.push(`import type { ${render(types)} } from '${presetSpecifier}'${end}`);
   }
   return lines.join("\n");
 }
@@ -1113,7 +1114,8 @@ function rewriteToolchainImports(toolchain, source, fileName) {
     const after = out.slice(span.end).match(/^\r?\n/)?.[0].length ?? 0;
     out = out.slice(0, span.start) + out.slice(span.end + after);
   }
-  out = out.slice(0, first.start) + renderImport(bindings, toolchain.presetSpecifier) + out.slice(first.end);
+  const semi = source.slice(first.start, first.end).trimEnd().endsWith(";");
+  out = out.slice(0, first.start) + renderImport(bindings, toolchain.presetSpecifier, semi) + out.slice(first.end);
   return {
     kind: "rewritten",
     source: out,
@@ -5584,8 +5586,6 @@ function registerLint() {
 
 // src/roles/test/adapters/vitest/vitest.adapter.ts
 import { spawnSync as spawnSync5 } from "child_process";
-import { existsSync as existsSync26 } from "fs";
-import { join as join30 } from "path";
 
 // src/roles/test/presets/toolchain.json
 var toolchain_default2 = {
@@ -5846,12 +5846,10 @@ function plan3(context) {
 
 // src/roles/test/adapters/vitest/vitest.adapter.ts
 function resolveVitest(cwd) {
-  const fromSentinel = join30(
-    new URL("../../../../../node_modules/.bin/vitest", import.meta.url).pathname
-  );
-  if (existsSync26(fromSentinel)) return { bin: fromSentinel, origin: "sentinel" };
-  const fromModule = join30(cwd, "node_modules", ".bin", "vitest");
-  return existsSync26(fromModule) ? { bin: fromModule, origin: "module" } : { bin: void 0, origin: "module" };
+  const fromSentinel = binFromOwnInstall("vitest", "vitest");
+  if (fromSentinel !== void 0) return { bin: fromSentinel, origin: "sentinel" };
+  const fromModule = resolveBin(cwd, "vitest");
+  return fromModule !== void 0 ? { bin: fromModule, origin: "module" } : { bin: void 0, origin: "module" };
 }
 var VitestAdapter = class extends BaseAdapter {
   target = "test";
@@ -5928,9 +5926,9 @@ function registerTest() {
 
 // src/roles/typescript/adapters/tsc/tsc.adapter.ts
 import { spawnSync as spawnSync6 } from "child_process";
-import { existsSync as existsSync27, readFileSync as readFileSync25 } from "fs";
+import { existsSync as existsSync26, readFileSync as readFileSync25 } from "fs";
 import { createRequire as createRequire4 } from "module";
-import { join as join32 } from "path";
+import { join as join31 } from "path";
 
 // src/roles/typescript/presets/nest.json
 var nest_default2 = {
@@ -6112,7 +6110,7 @@ function readTsconfigAdoption(cwd) {
 
 // src/roles/typescript/adapters/tsc/plan.ts
 import { readFileSync as readFileSync24 } from "fs";
-import { join as join31 } from "path";
+import { join as join30 } from "path";
 
 // src/roles/typescript/typecheck-script.ts
 var SENTINEL_TYPECHECK_COMMAND = "sentinel --run --typescript";
@@ -6205,7 +6203,7 @@ function planAdoption(context) {
     };
   }
   const existing = parseJsonc(
-    readFileSync24(join31(context.cwd, target.path), "utf8"),
+    readFileSync24(join30(context.cwd, target.path), "utf8"),
     target.path
   );
   const extendsChain = composeExtends(existing.extends, preset);
@@ -6343,7 +6341,7 @@ var TscAdapter = class _TscAdapter extends BaseAdapter {
     let chain;
     try {
       const parsed = parseJsonc(
-        readFileSync25(join32(cwd, target.path), "utf8"),
+        readFileSync25(join31(cwd, target.path), "utf8"),
         target.path
       );
       chain = parsed.extends;
@@ -6356,7 +6354,7 @@ var TscAdapter = class _TscAdapter extends BaseAdapter {
     );
     if (preset === void 0) return void 0;
     try {
-      createRequire4(join32(cwd, "noop.js")).resolve(preset);
+      createRequire4(join31(cwd, "noop.js")).resolve(preset);
       return void 0;
     } catch {
       return preset;
@@ -6452,7 +6450,7 @@ var TscAdapter = class _TscAdapter extends BaseAdapter {
   referencedProjects(cwd, config) {
     try {
       const parsed = parseJsonc(
-        readFileSync25(join32(cwd, config), "utf8"),
+        readFileSync25(join31(cwd, config), "utf8"),
         config
       );
       const referenced = (parsed.references ?? []).map((reference) => reference.path).filter((path) => typeof path === "string" && path.length > 0);
@@ -6468,7 +6466,7 @@ var TscAdapter = class _TscAdapter extends BaseAdapter {
    * check.
    */
   typecheckTarget(cwd) {
-    if (existsSync27(join32(cwd, "tsconfig.json"))) return "tsconfig.json";
+    if (existsSync26(join31(cwd, "tsconfig.json"))) return "tsconfig.json";
     const target = resolveTsconfigTarget(cwd);
     return target.reason === "none" ? null : target.path;
   }
@@ -6673,7 +6671,7 @@ function replaceLines(current, replacements) {
 }
 
 // src/core/apply-plan.ts
-import { existsSync as existsSync28, readFileSync as readFileSync26, renameSync, rmSync as rmSync3, writeFileSync as writeFileSync4 } from "fs";
+import { existsSync as existsSync27, readFileSync as readFileSync26, renameSync, rmSync as rmSync3, writeFileSync as writeFileSync4 } from "fs";
 import { resolve as resolve4, sep } from "path";
 import { applyEdits, findNodeAtLocation, modify, parseTree } from "jsonc-parser";
 
@@ -6692,7 +6690,7 @@ function resolveWithinRoot(cwd, relativePath) {
   return absolutePath;
 }
 function readIfExists(absolutePath) {
-  return existsSync28(absolutePath) ? readFileSync26(absolutePath, "utf8") : void 0;
+  return existsSync27(absolutePath) ? readFileSync26(absolutePath, "utf8") : void 0;
 }
 function* leaves(value, prefix = []) {
   for (const [key, keyValue] of Object.entries(value)) {
@@ -6810,8 +6808,8 @@ function applyPlan(cwd, plan4) {
 }
 
 // src/core/config/preset-evidence.ts
-import { existsSync as existsSync29, readdirSync as readdirSync4, readFileSync as readFileSync27 } from "fs";
-import { join as join33 } from "path";
+import { existsSync as existsSync28, readdirSync as readdirSync4, readFileSync as readFileSync27 } from "fs";
+import { join as join32 } from "path";
 var PATH_SIGNALS = [
   {
     preset: "nest",
@@ -6825,8 +6823,8 @@ var DEPENDENCY_SIGNALS = [
   { preset: "nest", pattern: /^@nestjs\// }
 ];
 function dependencyNames(cwd) {
-  const path = join33(cwd, "package.json");
-  if (!existsSync29(path)) return [];
+  const path = join32(cwd, "package.json");
+  if (!existsSync28(path)) return [];
   try {
     const manifest = parseJsonc(
       readFileSync27(path, "utf8"),
@@ -6852,7 +6850,7 @@ function declaresJsx(cwd) {
   for (const name of entries) {
     try {
       const config = parseJsonc(
-        readFileSync27(join33(cwd, name), "utf8"),
+        readFileSync27(join32(cwd, name), "utf8"),
         name
       );
       if (config.compilerOptions?.jsx !== void 0) return true;
@@ -7032,4 +7030,4 @@ export {
   detectFramework,
   dispatch
 };
-//# sourceMappingURL=chunk-37Y7RALA.js.map
+//# sourceMappingURL=chunk-UULHGNMK.js.map

package/dist/index.js

@@ -7,7 +7,7 @@ import {
   registerAdapters,
   resolve,
   setDefaultRunner
-} from "./chunk-37Y7RALA.js";
+} from "./chunk-UULHGNMK.js";
 export {
   BaseAdapter,
   all,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hublo/sentinel",
-  "version": "1.2.0-alpha.30",
+  "version": "1.2.0-alpha.32",
   "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",