@vistta/cli 1.2.1 → 1.2.3

package/README.md

@@ -34,12 +34,12 @@ npm install @vistta/cli
   type checking still covers the whole configured project.
 
 - `vistta lint [patterns] [--fix]`
-  Runs project-local ESLint against the configured files or supplied patterns.
+  Runs ESLint against the configured files or supplied patterns.
   `--fix` applies available fixes. Errors and warnings produce a nonzero exit
   status.
 
 - `vistta fmt [patterns] [--check|--write]`
-  Checks formatting with project-local Prettier without changing files by
+  Checks formatting with Prettier without changing files by
   default. `--check` makes that mode explicit; `--write` formats files in place.
   `--fix` is also accepted as a write alias. Check and write modes cannot be
   combined.
@@ -116,7 +116,9 @@ Comments and trailing commas are supported. If both files exist, `tsconfig.json`
 takes precedence. The existing `cliOptions` block remains supported; `cli` wins
 when both specify the same setting.
 
-Install the tools you want to use locally:
+ESLint, Prettier, and TypeScript are included with the CLI; no separate tool
+installation is required. To use project-specific versions, optionally install
+them locally:
 
 ```sh
 npm install --save-dev eslint prettier typescript
@@ -172,8 +174,11 @@ vistta run validate
   exit code. Lint warnings also fail the check.
 - Checks are read-only unless `--fix` or `fmt --write` is supplied. Fix mode
   applies Prettier formatting and ESLint fixes; type checking never emits files.
-- Tools are resolved from the current project, not downloaded automatically.
-  Only enabled tools need to be installed. ESLint 9+ and Prettier 3 are supported.
+- Tools are resolved from the current project first, falling back to the
+  CLI-bundled versions when absent. Commands never download tools at runtime.
+  Broken project installations report their errors instead of silently falling
+  back. ESLint 9+ and Prettier 3 are supported. Plugins and custom parsers must
+  still be installed in the project.
 - `format.include` and `lint.include` override top-level `include`. Explicit
   command-line patterns override both and are relative to the working directory.
   The corresponding `exclude` settings, `compilerOptions.outDir`, dependencies,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vistta/cli",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "type": "module",
   "main": "index.js",
   "exports": {
@@ -35,8 +35,11 @@
     "@vistta/fs": "^1.1.0",
     "@vistta/utils": "^1.1.0",
     "esbuild": "^0.28.2",
+    "eslint": "^9.39.5",
     "jsonc-parser": "^3.3.1",
-    "semver": "^7.8.5"
+    "prettier": "^3.9.9",
+    "semver": "^7.8.5",
+    "typescript": "^6.0.3"
   },
   "author": "Tiago Terenas Almeida",
   "license": "GPL-3.0-only",

package/tests/config.test.js

@@ -1,11 +1,12 @@
 import assert from "node:assert/strict";
 import { spawnSync } from "node:child_process";
 import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { createRequire } from "node:module";
 import { tmpdir } from "node:os";
 import { dirname, join, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import { loadProjectConfig } from "../config.js";
-import { planTasks, runChecks, runTasks, toolFiles } from "../tools.js";
+import { planTasks, projectTool, runChecks, runTasks, toolFiles } from "../tools.js";
 
 function fixture(files) {
   const cwd = mkdtempSync(join(tmpdir(), "vistta-config-"));
@@ -129,6 +130,51 @@ suite("CLI configuration", async () => {
 });
 
 suite("CLI tool adapters", async () => {
+  await test("uses bundled tools when the project does not install them", async () => {
+    const cwd = fixture({
+      "package.json": { name: "fixture", type: "module" },
+      "tsconfig.json": {
+        include: ["src/*.js"],
+        compilerOptions: { allowJs: true, checkJs: true, noEmit: true, types: [], target: "ES2022" },
+        cli: { lint: { rules: { "no-unused-vars": "error" } } },
+      },
+      "src/main.js": "export const value = 1;\n",
+    });
+    try {
+      for (const name of ["eslint", "prettier", "typescript"]) {
+        const bundled = await import(pathToFileURL(createRequire(import.meta.url).resolve(name)).href);
+        assert.equal(await projectTool(name, cwd), bundled.default || bundled);
+      }
+      assert.equal(await runChecks(["format", "lint", "types"], loadProjectConfig(cwd), { cwd }), 0);
+      const check = spawnSync(process.execPath, [fileURLToPath(new URL("../bin.js", import.meta.url)), "check"], {
+        cwd,
+        encoding: "utf8",
+      });
+      assert.equal(check.status, 0, check.stdout + check.stderr);
+    } finally {
+      rmSync(cwd, { recursive: true, force: true });
+    }
+  });
+
+  await test("prefers project tools and does not hide broken project installations", async () => {
+    const cwd = fixture({
+      "node_modules/prettier/package.json": { main: "index.cjs" },
+      "node_modules/prettier/index.cjs": 'module.exports = { version: "project-prettier" };',
+      "node_modules/eslint/package.json": { main: "index.cjs" },
+      "node_modules/eslint/index.cjs": 'throw new Error("Broken project ESLint");',
+      "node_modules/typescript/package.json": { exports: { "./internal": "./index.cjs" } },
+      "broken/node_modules/prettier/package.json": { main: "missing.cjs" },
+    });
+    try {
+      assert.equal((await projectTool("prettier", cwd)).version, "project-prettier");
+      await assert.rejects(projectTool("eslint", cwd), /Broken project ESLint/);
+      await assert.rejects(projectTool("typescript", cwd), { code: "ERR_PACKAGE_PATH_NOT_EXPORTED" });
+      await assert.rejects(projectTool("prettier", join(cwd, "broken")), { code: "MODULE_NOT_FOUND" });
+    } finally {
+      rmSync(cwd, { recursive: true, force: true });
+    }
+  });
+
   await test("formats and lints temporary files with project-local tools and checks types without emitting", async () => {
     const root = resolve(import.meta.dirname, "../../..");
     const cwd = fixture({

package/tools.js

@@ -9,8 +9,18 @@ export async function projectTool(name, cwd) {
   let entry;
   try {
     entry = require.resolve(name);
-  } catch {
-    throw new Error(`Missing project tool "${name}". Install it locally: npm install --save-dev ${name}`);
+  } catch (error) {
+    if (
+      error.code !== "MODULE_NOT_FOUND" ||
+      require.resolve.paths(name)?.some((path) => existsSync(resolve(path, name, "package.json")))
+    )
+      throw error;
+    try {
+      entry = createRequire(import.meta.url).resolve(name);
+    } catch (error) {
+      if (error.code !== "MODULE_NOT_FOUND") throw error;
+      throw new Error(`Missing tool "${name}". Reinstall @vistta/cli or install it locally: npm install --save-dev ${name}`);
+    }
   }
   const module = await import(pathToFileURL(entry).href);
   return module.default || module;