@rtorcato/repo-tooling 3.8.2 → 3.8.4

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,22 +42,69 @@ 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',
         candidates: ['tsconfig.json'],
         expected: `extends "${PACKAGE}/typescript/*"`,
         matcher: /@rtorcato\/(?:js|repo)-tooling\/typescript\//,
-        hint: 'Set `"extends": "@rtorcato/repo-tooling/typescript/base"` in tsconfig.json',
+        // `fix tsconfig`, not `copy tsconfig`: copy drops the whole preset inline,
+        // which carries no `extends` for the matcher above to find (#381).
+        hint: 'Run `npx @rtorcato/repo-tooling fix tsconfig` to scaffold',
     },
     {
         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

@@ -48,6 +48,7 @@ import { WORKSPACE_FILE, dependsOnEsbuild, ensurePnpmSettings, familyGlob, } fro
 import { generatePostcss } from '../../cli/generators/postcss.js';
 import { generateCypressConfig, generateVitestConfig } from '../../cli/generators/testing.js';
 import { generateTreeshakeCheck, inferSubpathsFromExports } from '../../cli/generators/treeshake.js';
+import { generateTSConfig } from '../../cli/generators/tsconfig.js';
 import { generateTailwind } from '../../cli/generators/tailwind.js';
 import { generateTurborepo } from '../../cli/generators/turborepo.js';
 import { generateNx } from '../../cli/generators/nx.js';
@@ -70,7 +71,12 @@ export function inferProjectConfig(pkg) {
     return {
         projectName: pkg?.name ?? 'project',
         projectType,
-        typescript: { enabled: true, config: projectType === 'nextjs-app' ? 'next' : 'base' },
+        typescript: {
+            enabled: true,
+            // Same mapping the react-app/nextjs-app setup presets use — a react-app on
+            // the base preset has no DOM libs, so `document`/`window` don't typecheck.
+            config: projectType === 'nextjs-app' ? 'next' : projectType === 'react-app' ? 'react' : 'base',
+        },
         linting: {
             tool: 'biome',
             eslintConfig: projectType === 'nextjs-app' ? 'nextjs' : 'base',
@@ -170,9 +176,18 @@ export const FIXERS = [
         appliesTo: ['TypeScript'],
         outputs: ['tsconfig.json', 'package.json (scripts)'],
         canFixDrift: true,
-        async run({ targetDir }) {
-            const result = await copyPreset('tsconfig', targetDir);
-            const filesWritten = [result.target];
+        async run({ targetDir, pkg }) {
+            // Shares generateTSConfig with the setup path — copyPreset used to inline
+            // the whole base preset, which carries no `extends` for doctor's matcher
+            // and threw away the project-type settings setup emits (#381).
+            const config = inferProjectConfig(pkg);
+            // Bun leaves no package.json trace, so inferProjectConfig can't see it; a
+            // bunfig.toml is the signal, and without it this would strip `types: ['bun']`
+            // off a Bun repo by dropping it back onto the base preset.
+            if (await fs.pathExists(path.join(targetDir, 'bunfig.toml')))
+                config.bun = true;
+            await generateTSConfig(config, targetDir);
+            const filesWritten = ['tsconfig.json'];
             // 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.

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.2",
+	"version": "3.8.4",
 	"description": "One CLI to scaffold, audit and fix your repo's whole toolchain — linting, tests, commits, releases & CI.",
 	"type": "module",
 	"keywords": [