@rtorcato/js-tooling 2.4.0 → 2.5.1

package/README.md

@@ -9,7 +9,7 @@ JavaScript and TypeScript tooling for Node.js, React, Next.js, and Vitest.
 [![Coverage](https://codecov.io/gh/rtorcato/js-tooling/branch/main/graph/badge.svg)](https://codecov.io/gh/rtorcato/js-tooling)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
-Most tooling libraries give you one piece — just TypeScript configs, or just an ESLint preset. **js-tooling** covers the entire lifecycle: TypeScript, Biome/ESLint, Vitest/Jest, Commitlint, Husky, Semantic Release, and GitHub Actions CI — all wired together. The interactive `setup` wizard scaffolds everything in one shot; `doctor` checks an existing project for drift.
+Most tooling libraries give you one piece — just TypeScript configs, or just an ESLint preset. **js-tooling** covers the entire lifecycle: TypeScript, Biome/ESLint, Vitest/Jest, Commitlint, Husky, Semantic Release, GitHub Actions CI, and supply-chain security (Dependabot + CodeQL) — all wired together. The interactive `setup` wizard scaffolds everything in one shot; `doctor` checks an existing project for drift; `fix` applies the missing pieces incrementally.
 
 **[Full documentation →](https://rtorcato.github.io/js-tooling/)**
 
@@ -23,6 +23,8 @@ npx @rtorcato/js-tooling setup
 
 See [CHANGELOG.md](CHANGELOG.md) for the full history.
 
+**v2.4.0** — New `fix` command applies scaffolders for items `doctor` flags, with `--yes` and `--dry-run` flags. Drift never auto-overwrites — every existing file you'd lose is confirmed first. Doctor grew checks for `engines.node`, `.editorconfig`, `.nvmrc`, Husky, `lint-staged`, semantic-release, knip, GitHub Actions, GitLab CI, Dependabot, and CodeQL — plus a `Next steps:` footer that names the exact `fix` command to run for each finding. Setup wizard adds a "Include security automation?" prompt for Dependabot + CodeQL.
+
 **v2.0.0** — All 39 tool packages moved from `dependencies` to `peerDependencies`. Add them to your own `devDependencies`. Also ships: `doctor` subcommand, generator unit tests, Dependabot, CI matrix (Node 22 + 24).
 
 **v1.1.0** — Stricter commitlint limits, fix for CLI path resolution when copying configs.

package/dist/cli/commands/fix.js

@@ -124,9 +124,10 @@ const FIXERS = [
     },
     {
         target: 'husky',
-        description: 'Set up Husky + lint-staged (deep-merges existing lint-staged field)',
+        description: 'Set up Husky + lint-staged',
         appliesTo: ['Husky', 'lint-staged'],
         outputs: ['.husky/pre-commit', 'package.json (lint-staged field)'],
+        riskLevel: 'safe-merge',
         canFixDrift: true,
         async run({ targetDir, pkg }) {
             const pkgPath = path.join(targetDir, 'package.json');
@@ -209,9 +210,10 @@ const FIXERS = [
     },
     {
         target: 'engines',
-        description: 'Add engines.node to package.json (never overwrites)',
+        description: 'Add engines.node to package.json',
         appliesTo: ['engines.node'],
         outputs: ['package.json (engines.node field)'],
+        riskLevel: 'safe-merge',
         canFixDrift: true,
         async run({ targetDir }) {
             const result = await ensureEnginesNode(targetDir);
@@ -234,6 +236,7 @@ const FIXERS = [
         description: 'Add @rtorcato/js-tooling to devDependencies',
         appliesTo: ['package.json'],
         outputs: ['package.json (devDependencies)'],
+        riskLevel: 'safe-merge',
         canFixDrift: true,
         async run({ targetDir, pkg }) {
             const pkgPath = path.join(targetDir, 'package.json');
@@ -269,38 +272,74 @@ function logTargets() {
         console.log(`  ${chalk.green('●')} ${chalk.bold(f.target)}: ${chalk.gray(f.description)}`);
     }
 }
-async function applyFixer(fixer, result, targetDir, pkg, dryRun) {
+async function applyFixer(fixer, result, targetDir, pkg, dryRun, silent) {
     if (dryRun) {
-        console.log(chalk.cyan(`  [dry-run] would write: ${fixer.outputs.join(', ')}`));
-        return { applied: true, written: [] };
+        if (!silent) {
+            console.log(chalk.cyan(`  [dry-run] would write: ${fixer.outputs.join(', ')}`));
+        }
+        return { filesWritten: [], dryRun: true };
     }
     const { filesWritten } = await fixer.run({ targetDir, pkg, result });
-    if (filesWritten.length > 0) {
+    if (!silent && filesWritten.length > 0) {
         console.log(chalk.green(`  ✅ wrote ${filesWritten.join(', ')}`));
     }
-    return { applied: true, written: filesWritten };
+    return { filesWritten, dryRun: false };
+}
+function promptMessageFor(fixer, result) {
+    const risk = fixer.riskLevel ?? 'destructive';
+    if (risk === 'safe-merge') {
+        return { message: `${fixer.description} (existing fields preserved)?`, default: true };
+    }
+    if (risk === 'safe-add') {
+        return { message: `${fixer.description}?`, default: true };
+    }
+    // destructive
+    if (result.status === 'drift') {
+        return {
+            message: `⚠️  ${fixer.description} — overwrite existing file? user customizations will be lost`,
+            default: false,
+        };
+    }
+    return { message: `Apply ${fixer.description}?`, default: true };
 }
 async function confirmApply(fixer, result, assumeYes) {
     if (assumeYes)
         return true;
-    const isDrift = result.status === 'drift';
-    const message = isDrift
-        ? `⚠️  ${fixer.description} — overwrite existing file? user customizations will be lost`
-        : `Apply ${fixer.description}?`;
+    const { message, default: defaultValue } = promptMessageFor(fixer, result);
     const { confirm } = await inquirer.prompt([
-        { type: 'confirm', name: 'confirm', message, default: !isDrift },
+        { type: 'confirm', name: 'confirm', message, default: defaultValue },
     ]);
     return confirm === true;
 }
+function recordFor(target, check, doctorStatus, status, filesWritten) {
+    return { target, check, status, doctorStatus, filesWritten };
+}
 export async function fixCommand(target, options = {}) {
     const targetDir = path.resolve(options.directory ?? process.cwd());
-    const assumeYes = options.yes === true;
     const dryRun = options.dryRun === true;
+    const json = options.json === true;
+    // JSON mode implies --yes so prompts don't corrupt the output stream.
+    const assumeYes = options.yes === true || json;
+    const silent = json;
     const pkg = await readPackageJson(targetDir);
     const results = await runDoctor(targetDir);
+    const actions = [];
+    const emitJson = (resolvedTarget) => {
+        const payload = { directory: targetDir, target: resolvedTarget, actions };
+        console.log(JSON.stringify(payload, null, 2));
+    };
     if (target) {
         const fixer = findFixer(target);
         if (!fixer) {
+            if (json) {
+                console.log(JSON.stringify({
+                    directory: targetDir,
+                    error: 'unknown-target',
+                    target,
+                    available: FIXERS.map((f) => f.target),
+                }, null, 2));
+                process.exit(1);
+            }
             console.error(chalk.red(`\n❌ Unknown fix target: ${target}\n`));
             logTargets();
             console.log();
@@ -309,46 +348,69 @@ export async function fixCommand(target, options = {}) {
         const result = results.find((r) => fixer.appliesTo.includes(r.check)) ??
             { check: fixer.appliesTo[0] ?? fixer.target, status: 'missing', detail: '' };
         if (result.status === 'ok') {
+            actions.push(recordFor(fixer.target, result.check, 'ok', 'already-ok', []));
+            if (json)
+                return emitJson(fixer.target);
             console.log(chalk.green(`\n✅ ${result.check} is already configured\n`));
             return;
         }
-        console.log(chalk.cyan(`\n🔧 ${fixer.target} — ${chalk.bold(result.check)} is ${result.status}\n`));
+        if (!silent) {
+            console.log(chalk.cyan(`\n🔧 ${fixer.target} — ${chalk.bold(result.check)} is ${result.status}\n`));
+        }
         const ok = await confirmApply(fixer, result, assumeYes);
         if (!ok) {
+            actions.push(recordFor(fixer.target, result.check, result.status, 'skipped', []));
+            if (json)
+                return emitJson(fixer.target);
             console.log(chalk.gray('   skipped\n'));
             return;
         }
-        await applyFixer(fixer, result, targetDir, pkg, dryRun);
+        const outcome = await applyFixer(fixer, result, targetDir, pkg, dryRun, silent);
+        actions.push(recordFor(fixer.target, result.check, result.status, outcome.dryRun ? 'dry-run' : 'applied', outcome.filesWritten));
+        if (json)
+            return emitJson(fixer.target);
         console.log();
         return;
     }
-    // No target — walk all non-ok results
     const fixable = results.filter((r) => r.status !== 'ok');
     if (fixable.length === 0) {
+        if (json)
+            return emitJson(null);
         console.log(chalk.green('\n✅ All checks pass — nothing to fix\n'));
         return;
     }
-    console.log(chalk.cyan(`\n🔧 ${fixable.length} item(s) to address\n`));
-    let applied = 0;
-    let skipped = 0;
-    let unsupported = 0;
+    if (!silent) {
+        console.log(chalk.cyan(`\n🔧 ${fixable.length} item(s) to address\n`));
+    }
+    let appliedCount = 0;
+    let skippedCount = 0;
+    let unsupportedCount = 0;
     for (const result of fixable) {
         const fixer = findFixerForCheck(result.check);
         if (!fixer) {
-            console.log(chalk.gray(`  — ${result.check}: no fixer registered`));
-            unsupported++;
+            actions.push(recordFor(null, result.check, result.status, 'unsupported', []));
+            if (!silent)
+                console.log(chalk.gray(`  — ${result.check}: no fixer registered`));
+            unsupportedCount++;
             continue;
         }
-        console.log(`  ${chalk.bold(result.check)} (${result.status}) → ${fixer.target}`);
+        if (!silent) {
+            console.log(`  ${chalk.bold(result.check)} (${result.status}) → ${fixer.target}`);
+        }
         const ok = await confirmApply(fixer, result, assumeYes);
         if (!ok) {
-            console.log(chalk.gray('    skipped'));
-            skipped++;
+            actions.push(recordFor(fixer.target, result.check, result.status, 'skipped', []));
+            if (!silent)
+                console.log(chalk.gray('    skipped'));
+            skippedCount++;
             continue;
         }
-        await applyFixer(fixer, result, targetDir, pkg, dryRun);
-        applied++;
+        const outcome = await applyFixer(fixer, result, targetDir, pkg, dryRun, silent);
+        actions.push(recordFor(fixer.target, result.check, result.status, outcome.dryRun ? 'dry-run' : 'applied', outcome.filesWritten));
+        appliedCount++;
     }
+    if (json)
+        return emitJson(null);
     console.log();
-    console.log(`  Summary: ${chalk.green(`${applied} applied`)}, ${chalk.gray(`${skipped} skipped`)}, ${chalk.yellow(`${unsupported} unsupported`)}\n`);
+    console.log(`  Summary: ${chalk.green(`${appliedCount} applied`)}, ${chalk.gray(`${skippedCount} skipped`)}, ${chalk.yellow(`${unsupportedCount} unsupported`)}\n`);
 }

package/dist/cli/commands/setup.js

@@ -220,6 +220,36 @@ function showNextSteps(config, _targetDir) {
     steps.forEach((step, index) => {
         console.log(`  ${index + 1}. ${step}`);
     });
-    console.log(chalk.dim('\n💡 All configuration files have been generated in your project directory.'));
+    const skipped = collectSkippedFixSuggestions(config);
+    if (skipped.length > 0) {
+        console.log(chalk.bold('\n💡 Want to add something you skipped?\n'));
+        for (const s of skipped) {
+            console.log(`  ${chalk.gray('-')} ${s}`);
+        }
+    }
+    console.log(chalk.dim('\n📁 All configuration files have been generated in your project directory.'));
     console.log(chalk.dim('   You can modify them to suit your specific needs.\n'));
 }
+function collectSkippedFixSuggestions(config) {
+    const suggestions = [];
+    if (!config.gitHooks) {
+        suggestions.push('Run `npx @rtorcato/js-tooling fix husky` to add git hooks later');
+    }
+    if (!config.commitLint) {
+        suggestions.push('Run `npx @rtorcato/js-tooling fix commitlint` to add conventional-commit linting');
+    }
+    if (!config.semanticRelease && config.projectType === 'library') {
+        suggestions.push('Run `npx @rtorcato/js-tooling fix semantic-release` to add automated releases');
+    }
+    if (!config.securityAutomation) {
+        suggestions.push('Run `npx @rtorcato/js-tooling fix dependabot` and `fix codeql` for security automation');
+    }
+    if (config.linting.tool === 'none') {
+        suggestions.push('Run `npx @rtorcato/js-tooling fix biome` or `fix eslint` to add linting');
+    }
+    if (config.testing.framework === 'none') {
+        suggestions.push('Run `npx @rtorcato/js-tooling fix vitest` to add a test runner');
+    }
+    suggestions.push('Run `npx @rtorcato/js-tooling doctor` any time to audit drift');
+    return suggestions;
+}

package/dist/cli/generators/build.js

@@ -53,32 +53,17 @@ console.log('Build completed!')
 `;
     await fs.writeFile(esbuildConfigPath, esbuildConfig);
 }
-async function generateViteConfig(config, targetDir) {
+export async function generateViteConfig(config, targetDir) {
     const viteConfigPath = path.join(targetDir, 'vite.config.ts');
-    let viteConfig = `import { defineConfig } from 'vite'
-`;
-    if (config.projectType === 'react-app') {
-        viteConfig += `import react from '@vitejs/plugin-react'
-`;
-    }
-    viteConfig += `
-export default defineConfig({
-  plugins: [${config.projectType === 'react-app' ? 'react()' : ''}],
-  resolve: {
-    alias: {
-      '@': '/src',
-      '~': '/src'
-    }
-  },
-  build: {
-    outDir: 'dist',
-    sourcemap: true,
-  },
-  server: {
-    port: 3000,
-    open: true
-  }
-})
+    // React apps need the plugin; we layer it on top of the shipped preset.
+    const viteConfig = config.projectType === 'react-app'
+        ? `import preset from '@rtorcato/js-tooling/vite'
+import react from '@vitejs/plugin-react'
+import { defineConfig, mergeConfig } from 'vite'
+
+export default mergeConfig(preset, defineConfig({ plugins: [react()] }))
+`
+        : `export { default } from '@rtorcato/js-tooling/vite'
 `;
     await fs.writeFile(viteConfigPath, viteConfig);
 }

package/dist/cli/generators/testing.js

@@ -38,41 +38,9 @@ async function generateJestConfig(config, targetDir) {
 `;
     await fs.writeFile(jestConfigPath, jestConfig);
 }
-async function generatePlaywrightConfig(targetDir) {
+export async function generatePlaywrightConfig(targetDir) {
     const playwrightConfigPath = path.join(targetDir, 'playwright.config.ts');
-    const playwrightConfig = `import { defineConfig } from '@playwright/test'
-
-export default defineConfig({
-  testDir: './tests/e2e',
-  fullyParallel: true,
-  forbidOnly: !!process.env.CI,
-  retries: process.env.CI ? 2 : 0,
-  workers: process.env.CI ? 1 : undefined,
-  reporter: 'html',
-  use: {
-    baseURL: 'http://localhost:3000',
-    trace: 'on-first-retry',
-  },
-  projects: [
-    {
-      name: 'chromium',
-      use: { ...devices['Desktop Chrome'] },
-    },
-    {
-      name: 'firefox',
-      use: { ...devices['Desktop Firefox'] },
-    },
-    {
-      name: 'webkit',
-      use: { ...devices['Desktop Safari'] },
-    },
-  ],
-  webServer: {
-    command: 'npm run dev',
-    url: 'http://localhost:3000',
-    reuseExistingServer: !process.env.CI,
-  },
-})
+    const playwrightConfig = `export { default } from '@rtorcato/js-tooling/playwright'
 `;
     await fs.writeFile(playwrightConfigPath, playwrightConfig);
 }

package/dist/cli/index.js

@@ -74,14 +74,21 @@ program
         { name: 'Playwright', desc: 'End-to-end testing configuration' },
         { name: 'Commitlint', desc: 'Conventional commit linting' },
         { name: 'Husky', desc: 'Git hooks for pre-commit validation' },
+        { name: 'lint-staged', desc: 'Run linters on staged files (pairs with Husky)' },
         { name: 'Semantic Release', desc: 'Automated versioning and publishing' },
         { name: 'tsup', desc: 'TypeScript bundler configuration' },
         { name: 'esbuild', desc: 'Fast JavaScript bundler configuration' },
+        { name: 'EditorConfig', desc: 'Cross-editor formatting consistency (.editorconfig)' },
+        { name: '.nvmrc', desc: 'Pin Node version per repository' },
+        { name: 'knip', desc: 'Find unused files, exports, and dependencies' },
+        { name: 'Dependabot', desc: 'Weekly automated dependency updates' },
+        { name: 'CodeQL', desc: 'GitHub security scanning workflow' },
     ];
     configs.forEach(({ name, desc }) => {
         console.log(`  ${chalk.green('●')} ${chalk.bold(name)}: ${chalk.gray(desc)}`);
     });
-    console.log(chalk.dim('\n💡 Run "js-tooling setup" to configure your project\n'));
+    console.log(chalk.dim('\n💡 Run `js-tooling setup` for a new project'));
+    console.log(chalk.dim('   or `js-tooling fix` to apply missing pieces to an existing one\n'));
 });
 program
     .command('doctor')
@@ -95,10 +102,12 @@ program
     .option('-d, --directory <path>', 'Target directory', process.cwd())
     .option('--yes', 'Assume yes to all prompts (including drift overwrites)')
     .option('--dry-run', 'Print what would change without writing files')
+    .option('--json', 'Emit machine-readable JSON output (implies --yes)')
     .action((target, options) => fixCommand(target, {
     directory: options.directory,
     yes: options.yes,
     dryRun: options.dryRun,
+    json: options.json,
 }));
 program.hook('preAction', async (_, actionCommand) => {
     const name = actionCommand.name();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rtorcato/js-tooling",
-	"version": "2.4.0",
+	"version": "2.5.1",
 	"description": "JavaScript and TypeScript tooling for Node.js, React, Next.js, and Vitest.",
 	"type": "module",
 	"keywords": [
@@ -47,10 +47,14 @@
 		"tooling/eslint/*.d.mts",
 		"tooling/eslint/types.d.ts",
 		"tooling/jest-presets/**",
+		"tooling/playwright/playwright.config.mjs",
+		"tooling/playwright/playwright.config.d.mts",
 		"tooling/prettier/index.mjs",
 		"tooling/prettier/index.d.mts",
 		"tooling/typescript/*.json",
 		"tooling/typescript/reset.d.ts",
+		"tooling/vite/vite.config.mjs",
+		"tooling/vite/vite.config.d.mts",
 		"tooling/vitest/vitest.config.mjs",
 		"tooling/vitest/vitest.config.d.mts",
 		"tooling/vitest/vitest.config.react.mjs",
@@ -88,6 +92,10 @@
 			"types": "./tooling/jest-presets/node/jest-preset.d.mts",
 			"import": "./tooling/jest-presets/node/jest-preset.mjs"
 		},
+		"./playwright": {
+			"types": "./tooling/playwright/playwright.config.d.mts",
+			"import": "./tooling/playwright/playwright.config.mjs"
+		},
 		"./prettier": {
 			"types": "./tooling/prettier/index.d.mts",
 			"import": "./tooling/prettier/index.mjs"
@@ -99,6 +107,10 @@
 		"./typescript/react": "./tooling/typescript/tsconfig.react.json",
 		"./typescript/test": "./tooling/typescript/tsconfig.test.json",
 		"./typescript/reset": "./tooling/typescript/reset.d.ts",
+		"./vite": {
+			"types": "./tooling/vite/vite.config.d.mts",
+			"import": "./tooling/vite/vite.config.mjs"
+		},
 		"./vitest/config": {
 			"types": "./tooling/vitest/vitest.config.d.mts",
 			"import": "./tooling/vitest/vitest.config.mjs"

package/tooling/commitlint/commitlint.mjs

@@ -20,8 +20,9 @@ export default {
 				"test",
 			],
 		],
-		// Enforce length limits (strict)
-		"header-max-length": [2, "always", 50],
+		// Enforce length limits: 72 chars matches the conventional-commits
+		// recommendation and git's default email format
+		"header-max-length": [2, "always", 72],
 		"body-max-line-length": [2, "always", 72],
 		"footer-max-line-length": [2, "always", 72],
 		// Enforce case rules (allow common patterns)

package/tooling/playwright/playwright.config.d.mts

@@ -0,0 +1,4 @@
+import type { PlaywrightTestConfig } from '@playwright/test'
+
+declare const config: PlaywrightTestConfig
+export default config

package/tooling/playwright/playwright.config.mjs

@@ -0,0 +1,19 @@
+import { defineConfig, devices } from '@playwright/test'
+
+export default defineConfig({
+	testDir: './tests/e2e',
+	fullyParallel: true,
+	forbidOnly: !!process.env.CI,
+	retries: process.env.CI ? 2 : 0,
+	workers: process.env.CI ? 1 : undefined,
+	reporter: 'html',
+	use: {
+		baseURL: process.env.PLAYWRIGHT_BASE_URL ?? 'http://localhost:3000',
+		trace: 'on-first-retry',
+	},
+	projects: [
+		{ name: 'chromium', use: { ...devices['Desktop Chrome'] } },
+		{ name: 'firefox', use: { ...devices['Desktop Firefox'] } },
+		{ name: 'webkit', use: { ...devices['Desktop Safari'] } },
+	],
+})

package/tooling/vite/vite.config.d.mts

@@ -0,0 +1,4 @@
+import type { UserConfig } from 'vite'
+
+declare const config: UserConfig
+export default config

package/tooling/vite/vite.config.mjs

@@ -0,0 +1,18 @@
+import { defineConfig } from 'vite'
+
+export default defineConfig({
+	resolve: {
+		alias: {
+			'@': '/src',
+			'~': '/src',
+		},
+	},
+	build: {
+		outDir: 'dist',
+		sourcemap: true,
+	},
+	server: {
+		port: 3000,
+		open: true,
+	},
+})

package/tooling/eslint/README.md

@@ -1,3 +0,0 @@
-# `@turbo/eslint-config`
-
-Collection of internal eslint configurations.