@rtorcato/repo-tooling 3.8.1 → 3.8.3

package/dist/base/checks.js

@@ -24,13 +24,17 @@ export async function checkNestedLanguages(dir, rootLanguage) {
         hint: 'Run doctor with `--directory <path>` to audit a nested project on its own',
     };
 }
+/** Applies a `FileCheck` matcher of either form to a file's contents. */
+export function matches(matcher, contents) {
+    return typeof matcher === 'function' ? matcher(contents) : matcher.test(contents);
+}
 export async function checkFile(dir, spec) {
     for (const candidate of spec.candidates) {
         const filepath = path.join(dir, candidate);
         if (!(await fs.pathExists(filepath)))
             continue;
         const contents = await fs.readFile(filepath, 'utf-8');
-        if (spec.matcher.test(contents)) {
+        if (matches(spec.matcher, contents)) {
             return {
                 check: spec.check,
                 status: 'ok',

package/dist/languages/js/checks.js

@@ -42,6 +42,53 @@ export function evaluateNodeVersion(version) {
         detail: display,
     };
 }
+/**
+ * JSONC → object, or null when it genuinely won't parse. `biome.jsonc` is a
+ * declared candidate and the format allows comments and trailing commas, so
+ * bare `JSON.parse` would reject configs Biome itself accepts.
+ *
+ * The first alternative consumes whole string literals, so a `//` or `/*`
+ * inside one (a `$schema` URL, most obviously) is never mistaken for a comment.
+ */
+function parseJsonc(text) {
+    const withoutComments = text.replace(/("(?:\\.|[^"\\])*")|\/\/[^\n]*|\/\*[\s\S]*?\*\//g, (_, str) => str ?? '');
+    try {
+        return JSON.parse(withoutComments.replace(/,(\s*[}\]])/g, '$1'));
+    }
+    catch {
+        return null;
+    }
+}
+const BIOME_PRESET_REF = /@rtorcato\/(?:js|repo)-tooling\/biome/;
+/**
+ * Both shapes of a `biome.json` this package produces (#378): the thin
+ * `extends` pointer `fix biome` writes, and the whole preset inlined, which is
+ * what `copy biome` drops — it carries no `extends` at all, so matching only
+ * the first left every `copy biome` repo permanently drifted with no way out.
+ *
+ * Read structurally, not as text. Accepting the inline form on the presence of
+ * a `$schema` URL and a `preset` key alone would pass a config that keeps both
+ * markers and turns the linter off — the very drift this check exists to catch
+ * — and the markers could even sit in a `biome.jsonc` comment. So the config is
+ * parsed, `linter.enabled: false` disqualifies either shape, and anything
+ * unparseable counts as drift rather than being waved through.
+ */
+function matchesBiomeConfig(contents) {
+    const config = parseJsonc(contents);
+    if (!config)
+        return false;
+    const linter = config.linter;
+    if (linter?.enabled === false)
+        return false;
+    if (BIOME_PRESET_REF.test(JSON.stringify(config.extends ?? '')))
+        return true;
+    // The inlined preset: biome's own `$schema` plus the `linter.rules.preset`
+    // key the shipped `tooling/biome/biome.json` sets.
+    const schema = config.$schema;
+    return (typeof schema === 'string' &&
+        schema.includes('biomejs.dev/schemas/') &&
+        linter?.rules?.preset !== undefined);
+}
 export const FILE_CHECKS = [
     {
         check: 'TypeScript',
@@ -53,11 +100,9 @@ export const FILE_CHECKS = [
     {
         check: 'Biome',
         candidates: ['biome.json', 'biome.jsonc'],
-        expected: `extends "${PACKAGE}/biome"`,
-        matcher: /@rtorcato\/(?:js|repo)-tooling\/biome/,
+        expected: `extends "${PACKAGE}/biome" or inlines the preset, with the linter on`,
+        matcher: matchesBiomeConfig,
         optional: true,
-        // `fix biome`, not `copy biome`: copy drops the whole preset inline, which
-        // carries no `extends` for the matcher above to find (#365).
         hint: 'Run `npx @rtorcato/repo-tooling fix biome` to scaffold',
     },
     {

package/dist/languages/js/fixers.js

@@ -28,6 +28,22 @@ const ESLINT_SCRIPTS = {
 const PRETTIER_SCRIPTS = {
     format: 'prettier --write .',
 };
+/** Kept in step with the knip line of getScripts() in package-json.ts. */
+const KNIP_SCRIPTS = {
+    knip: 'knip',
+};
+/** Kept in step with the typescript branch of getScripts() in package-json.ts. */
+const TSCONFIG_SCRIPTS = {
+    typecheck: 'tsc --noEmit',
+};
+// getScripts() also emits `test:ui`, but only the browser/both environments
+// install @vitest/ui, so a fixed-up repo would get a script it can't run.
+/** Kept in step with the vitest branch of getScripts() in package-json.ts. */
+const VITEST_SCRIPTS = {
+    test: 'vitest',
+    'test:watch': 'vitest --watch',
+    coverage: 'vitest run --coverage',
+};
 import { WORKSPACE_FILE, dependsOnEsbuild, ensurePnpmSettings, familyGlob, } from '../../cli/generators/pnpm-workspace.js';
 import { generatePostcss } from '../../cli/generators/postcss.js';
 import { generateCypressConfig, generateVitestConfig } from '../../cli/generators/testing.js';
@@ -150,13 +166,19 @@ export const FIXERS = [
     },
     {
         target: 'tsconfig',
-        description: 'Scaffold tsconfig.json extending the @rtorcato/repo-tooling preset',
+        description: 'Scaffold tsconfig.json extending the @rtorcato/repo-tooling preset, plus the `typecheck` script',
         appliesTo: ['TypeScript'],
-        outputs: ['tsconfig.json'],
+        outputs: ['tsconfig.json', 'package.json (scripts)'],
         canFixDrift: true,
         async run({ targetDir }) {
             const result = await copyPreset('tsconfig', targetDir);
-            return { filesWritten: [result.target] };
+            const filesWritten = [result.target];
+            // Without `typecheck` the generated CI drops its typecheck job entirely
+            // (#377). Shared with non-JS paths, so this is a no-op when there's no
+            // package.json to add it to.
+            if (await ensureScripts(targetDir, TSCONFIG_SCRIPTS))
+                filesWritten.push('package.json');
+            return { filesWritten };
         },
     },
     {
@@ -191,9 +213,9 @@ export const FIXERS = [
     },
     {
         target: 'vitest',
-        description: 'Scaffold vitest.config.ts (preserves vitest.setup.ts if present)',
+        description: 'Scaffold vitest.config.ts (preserves vitest.setup.ts if present), plus the scripts that run it',
         appliesTo: ['Vitest'],
-        outputs: ['vitest.config.ts'],
+        outputs: ['vitest.config.ts', 'package.json (scripts)'],
         canFixDrift: true,
         async run({ targetDir, pkg }) {
             const setupPath = path.join(targetDir, 'vitest.setup.ts');
@@ -203,7 +225,12 @@ export const FIXERS = [
             if (hadSetup && savedSetup !== null) {
                 await fs.writeFile(setupPath, savedSetup);
             }
-            return { filesWritten: ['vitest.config.ts'] };
+            const filesWritten = ['vitest.config.ts'];
+            // Without `coverage`/`test` the generated CI drops the whole test job,
+            // Codecov upload included (#377).
+            if (await ensureScripts(targetDir, VITEST_SCRIPTS))
+                filesWritten.push('package.json');
+            return { filesWritten };
         },
     },
     {
@@ -497,13 +524,18 @@ export const FIXERS = [
     },
     {
         target: 'knip',
-        description: 'Scaffold knip.json (entry globs matched to the package.json build model)',
+        description: 'Scaffold knip.json (entry globs matched to the package.json build model), plus the `knip` script',
         appliesTo: ['knip'],
-        outputs: ['knip.json'],
+        outputs: ['knip.json', 'package.json (scripts)'],
         canFixDrift: true,
         async run({ targetDir }) {
             await generateKnipConfig(targetDir);
-            return { filesWritten: ['knip.json'] };
+            const filesWritten = ['knip.json'];
+            // Without `knip` the generated CI drops its unused-code step, and with no
+            // check/lint script either the whole lint job disappears (#377).
+            if (await ensureScripts(targetDir, KNIP_SCRIPTS))
+                filesWritten.push('package.json');
+            return { filesWritten };
         },
     },
     {

package/dist/languages/python/checks.js

@@ -18,7 +18,7 @@
  */
 import path from 'node:path';
 import fs from 'fs-extra';
-import { checkFile } from '../../base/checks.js';
+import { checkFile, matches } from '../../base/checks.js';
 import { PYTHON_GITIGNORE_SENTINELS } from './gitignore.js';
 import { PYTHON_HOOKS_DIR } from './git-hooks.js';
 const PYTHON_TOOL_CHECKS = [
@@ -68,7 +68,7 @@ async function checkPythonTool(dir, spec) {
         const filepath = path.join(dir, candidate);
         if (!(await fs.pathExists(filepath)))
             continue;
-        if (spec.dedicated.matcher.test(await fs.readFile(filepath, 'utf-8'))) {
+        if (matches(spec.dedicated.matcher, await fs.readFile(filepath, 'utf-8'))) {
             return {
                 check: spec.dedicated.check,
                 status: 'ok',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rtorcato/repo-tooling",
-	"version": "3.8.1",
+	"version": "3.8.3",
 	"description": "One CLI to scaffold, audit and fix your repo's whole toolchain — linting, tests, commits, releases & CI.",
 	"type": "module",
 	"keywords": [