tina4-nodejs 3.13.133 → 3.13.134

package/packages/cli/src/commands/generate.ts

@@ -416,22 +416,7 @@ function captureEditHints(absPath: string, content: string): void {
   }
 }
 
-/**
- * Emit the resolution — as JSON on STDOUT for `--json`, otherwise as a human
- * block on STDERR (stderr so a caller piping stdout for other output isn't
- * polluted). Called from `generate()` BEFORE the files are written on the
- * human path so an operator sees WHY the tool made its choices before disk
- * changes; the JSON path prints after collection so the envelope carries the
- * completed `actions_taken`.
- */
-function printResolution(): void {
-  if (__resolution.jsonMode) {
-    process.stdout.write(JSON.stringify(currentResolution(), null, 2) + "\n");
-    return;
-  }
-  // Human block on STDERR, so `command | jq …` on stdout works cleanly.
-  const b = __resolution.body;
-  const lines: string[] = [];
+function addResolutionSummary(lines: string[], b: ResolutionBody): void {
   lines.push("");
   lines.push(`Generated ${__resolution.target} ${__resolution.input.name}`);
   if (b.class_name || b.file_path) {
@@ -449,13 +434,18 @@ function printResolution(): void {
   if (b.migration_path) {
     lines.push(`  migration  ${b.migration_path}`);
   }
+}
+
+function addReservedWordGuidance(lines: string[], b: ResolutionBody): void {
   const reserved = b.transformations.find((t) => t.kind === "reserved_word_pluralize");
-  if (reserved && reserved.from) {
-    lines.push("");
-    lines.push(`  To set the table name yourself:`);
-    lines.push(`    tina4nodejs generate ${__resolution.target} ${__resolution.input.name} --table-name <name>`);
-    lines.push(`  Tina4 interpolates table names unquoted; if you force the reserved '${reserved.from}', you own the quoting in raw SQL.`);
-  }
+  if (!reserved?.from) return;
+  lines.push("");
+  lines.push(`  To set the table name yourself:`);
+  lines.push(`    tina4nodejs generate ${__resolution.target} ${__resolution.input.name} --table-name <name>`);
+  lines.push(`  Tina4 interpolates table names unquoted; if you force the reserved '${reserved.from}', you own the quoting in raw SQL.`);
+}
+
+function addResolutionLists(lines: string[], b: ResolutionBody): void {
   // v1.1 (ADR-0063): surface the already-populated test_paths[], and the two
   // new arrays (edit_hints, next) when either is non-empty. Sections stay
   // absent when the corresponding array is empty — a listener/service
@@ -478,6 +468,27 @@ function printResolution(): void {
     lines.push("  Next:");
     for (const step of b.next) lines.push(`    ${step}`);
   }
+}
+
+/**
+ * Emit the resolution — as JSON on STDOUT for `--json`, otherwise as a human
+ * block on STDERR (stderr so a caller piping stdout for other output isn't
+ * polluted). Called from `generate()` BEFORE the files are written on the
+ * human path so an operator sees WHY the tool made its choices before disk
+ * changes; the JSON path prints after collection so the envelope carries the
+ * completed `actions_taken`.
+ */
+function printResolution(): void {
+  if (__resolution.jsonMode) {
+    process.stdout.write(JSON.stringify(currentResolution(), null, 2) + "\n");
+    return;
+  }
+  // Human block on STDERR, so `command | jq …` on stdout works cleanly.
+  const lines: string[] = [];
+  const b = __resolution.body;
+  addResolutionSummary(lines, b);
+  addReservedWordGuidance(lines, b);
+  addResolutionLists(lines, b);
   lines.push("");
   process.stderr.write(lines.join("\n"));
 }

package/packages/cli/src/commands/lint.ts

@@ -223,138 +223,104 @@ function resolveNpm(): string | null {
   return null;
 }
 
-/**
- * Lint the project's source. Exits 0 = clean, 1 = findings (parity with the
- * Python master and with `tina4nodejs test`'s exit-code contract).
- */
-export function runLint(args: string[]): void {
-  const fix = args.includes("--fix");
-  const noInstall = args.includes("--no-install");
-  const cwd = process.cwd();
+interface EslintSetup {
+  bin: string | null;
+  config: string | null;
+}
 
-  const files = collectAppFiles(cwd);
-  if (files.length === 0) {
-    console.log("  lint: nothing to lint (no src/ or app.ts).");
-    process.exit(0);
+function bootstrapEslint(cwd: string, noInstall: boolean): EslintSetup {
+  let bin = resolveEslintBin(cwd);
+  let config = findEslintConfig(cwd);
+  if (noInstall || (bin && config)) return { bin, config };
+  const npm = resolveNpm();
+  if (!npm) {
+    console.log("  · npm not found — using the zero-dependency baseline.");
+    return { bin, config };
   }
-
-  let eslintBin = resolveEslintBin(cwd);
-  let eslintConfig = findEslintConfig(cwd);
-
-  // ── Silent on-demand bootstrap ──────────────────────────────────────
-  // Running `tina4 lint` is the consent to add eslint as a DEV dependency of the
-  // PROJECT and scaffold a minimal flat config. --no-install opts out (CI /
-  // offline) and falls through to the zero-dependency baseline. We only bootstrap
-  // what is missing, and only scaffold a config once eslint is actually available
-  // to use it (so a failed install never leaves a stray eslint.config.js).
-  if (!noInstall && (!eslintBin || !eslintConfig)) {
-    const npm = resolveNpm();
-    if (!npm) {
-      console.log("  · npm not found — using the zero-dependency baseline.");
-    } else {
-      if (!eslintBin) {
-        console.log("  · installing eslint (npm i -D eslint @eslint/js typescript-eslint)...");
-        const rc = spawnSync(npm, ["install", "-D", "eslint", "@eslint/js", "typescript-eslint"], {
-          cwd,
-          stdio: "inherit",
-        }).status;
-        if (rc === 0) {
-          eslintBin = resolveEslintBin(cwd);
-        } else {
-          console.log("  · could not install eslint — using the zero-dependency baseline.");
-        }
-      }
-      // Scaffold ONLY once all three the config imports are on disk (eslint bin +
-      // @eslint/js + typescript-eslint), so a partial/failed install never leaves
-      // an eslint.config.js that cannot load.
-      if (
-        eslintBin && !eslintConfig &&
-        hasPackage(cwd, "@eslint/js") && hasPackage(cwd, "typescript-eslint")
-      ) {
-        const scaffold = join(cwd, ESLINT_SCAFFOLD_FILE);
-        try {
-          writeFileSync(scaffold, ESLINT_SCAFFOLD, "utf-8");
-          eslintConfig = scaffold;
-          console.log(`  · scaffolded ${ESLINT_SCAFFOLD_FILE} (@eslint/js + typescript-eslint recommended).`);
-        } catch (err) {
-          console.log(
-            `  · could not scaffold ${ESLINT_SCAFFOLD_FILE} (${err instanceof Error ? err.message : String(err)}).`,
-          );
-        }
-      }
-    }
+  if (!bin) {
+    console.log("  · installing eslint (npm i -D eslint @eslint/js typescript-eslint)...");
+    const rc = spawnSync(npm, ["install", "-D", "eslint", "@eslint/js", "typescript-eslint"], { cwd, stdio: "inherit" }).status;
+    if (rc === 0) bin = resolveEslintBin(cwd);
+    else console.log("  · could not install eslint — using the zero-dependency baseline.");
   }
-
-  // ── eslint: the project's own linter (installed dev-only on demand) ──
-  // Only when a config exists AND eslint resolves from the project. eslint reports
-  // syntax errors too, so when present it is the entire pass.
-  if (eslintBin && eslintConfig) {
-    const label = fix ? "eslint --fix" : "eslint";
-    const eslintArgs = [eslintBin, ...files, ...(fix ? ["--fix"] : [])];
-    const code = spawnSync(process.execPath, eslintArgs, { cwd, stdio: "inherit" }).status ?? 1;
-    if (code !== 0) {
-      console.log(`  ✗ lint failed — ${files.length} file(s) [${label}]`);
-      process.exit(1);
+  if (bin && !config && hasPackage(cwd, "@eslint/js") && hasPackage(cwd, "typescript-eslint")) {
+    const scaffold = join(cwd, ESLINT_SCAFFOLD_FILE);
+    try {
+      writeFileSync(scaffold, ESLINT_SCAFFOLD, "utf-8");
+      config = scaffold;
+      console.log(`  · scaffolded ${ESLINT_SCAFFOLD_FILE} (@eslint/js + typescript-eslint recommended).`);
+    } catch (err) {
+      console.log(`  · could not scaffold ${ESLINT_SCAFFOLD_FILE} (${err instanceof Error ? err.message : String(err)}).`);
     }
-    console.log(`  ✓ lint clean — ${files.length} file(s) [${label}]`);
-    process.exit(0);
   }
+  return { bin, config };
+}
 
-  // From here on nothing can autofix — say so once when --fix was asked for.
-  if (fix) {
-    console.log("  · --fix needs eslint — the baseline check has no autofix.");
+function runEslint(cwd: string, files: string[], fix: boolean, bin: string): void {
+  const label = fix ? "eslint --fix" : "eslint";
+  const eslintArgs = [bin, ...files, ...(fix ? ["--fix"] : [])];
+  const code = spawnSync(process.execPath, eslintArgs, { cwd, stdio: "inherit" }).status ?? 1;
+  if (code !== 0) {
+    console.log(`  ✗ lint failed — ${files.length} file(s) [${label}]`);
+    process.exit(1);
   }
+  console.log(`  ✓ lint clean — ${files.length} file(s) [${label}]`);
+  process.exit(0);
+}
 
-  // ── Baseline (TypeScript): the project's own `tsc --noEmit` ──────────
-  // Every tina4-nodejs project ships tsconfig.json + typescript. `--noEmit` forces
-  // a type+syntax check that writes NOTHING (the project's tsconfig may set outDir,
-  // so this must never emit). tsc reports syntax errors too. Run from cwd so tsc
-  // reads THIS tsconfig.json; diagnostics stream straight through.
-  const hasTsconfig = existsSync(join(cwd, "tsconfig.json"));
-  const tscBin = hasTsconfig ? resolvePackageBin(cwd, "typescript", "bin/tsc") : null;
-  if (tscBin) {
-    const code = spawnSync(process.execPath, [tscBin, "--noEmit"], { cwd, stdio: "inherit" }).status ?? 1;
-    if (code !== 0) {
-      console.log(`  ✗ lint failed — ${files.length} file(s) [tsc]`);
-      process.exit(1);
-    }
-    console.log(`  ✓ lint clean — ${files.length} file(s) [tsc]`);
-    process.exit(0);
+function runTypescript(cwd: string, files: string[]): boolean {
+  const tscBin = resolvePackageBin(cwd, "typescript", "bin/tsc");
+  if (!tscBin) return false;
+  const code = spawnSync(process.execPath, [tscBin, "--noEmit"], { cwd, stdio: "inherit" }).status ?? 1;
+  if (code !== 0) {
+    console.log(`  ✗ lint failed — ${files.length} file(s) [tsc]`);
+    process.exit(1);
   }
+  console.log(`  ✓ lint clean — ${files.length} file(s) [tsc]`);
+  process.exit(0);
+}
 
-  // ── Baseline (plain JS): stdlib `node --check` over .js/.mjs/.cjs ────
-  // Ships with node — zero dependency. A full syntax parse that never runs the
-  // code. TypeScript files are out of its reach (they belong to the tsc path).
+function runJavaScript(cwd: string, files: string[]): void {
   const jsFiles = files.filter((f) => JS_EXTENSIONS.some((ext) => f.endsWith(ext)));
   if (jsFiles.length === 0) {
-    console.log(
-      "  lint: no JavaScript files to check — add tsconfig.json + typescript to type-check .ts files.",
-    );
+    console.log("  lint: no JavaScript files to check — add tsconfig.json + typescript to type-check .ts files.");
     process.exit(0);
   }
-
   let syntaxErrors = 0;
   for (const file of jsFiles) {
     const result = spawnSync(process.execPath, ["--check", file], { cwd, encoding: "utf-8" });
-    if ((result.status ?? 1) !== 0) {
-      const stderr = (result.stderr || "").trim();
-      // node --check ends its stderr with a `SyntaxError: ...` line — surface it.
-      const detail =
-        stderr
-          .split("\n")
-          .reverse()
-          .find((line) => line.includes("Error:")) || "syntax error";
-      console.log(`  ✗ ${relative(cwd, file)}: ${detail.trim()}`);
-      syntaxErrors++;
-    }
+    if ((result.status ?? 1) === 0) continue;
+    const stderr = (result.stderr || "").trim();
+    const detail = stderr.split("\n").reverse().find((line) => line.includes("Error:")) || "syntax error";
+    console.log(`  ✗ ${relative(cwd, file)}: ${detail.trim()}`);
+    syntaxErrors++;
   }
-
   if (syntaxErrors > 0) {
-    console.log(
-      `  ✗ lint failed — ${syntaxErrors} syntax error(s) in ${jsFiles.length} file(s) [node --check]`,
-    );
+    console.log(`  ✗ lint failed — ${syntaxErrors} syntax error(s) in ${jsFiles.length} file(s) [node --check]`);
     process.exit(1);
   }
   console.log(`  ✓ lint clean — ${jsFiles.length} file(s) [node --check]`);
   process.exit(0);
 }
+
+/**
+ * Lint the project's source. Exits 0 = clean, 1 = findings (parity with the
+ * Python master and with `tina4nodejs test`'s exit-code contract).
+ */
+export function runLint(args: string[]): void {
+  const fix = args.includes("--fix");
+  const noInstall = args.includes("--no-install");
+  const cwd = process.cwd();
+  const files = collectAppFiles(cwd);
+  if (files.length === 0) {
+    console.log("  lint: nothing to lint (no src/ or app.ts).");
+    process.exit(0);
+  }
+  const eslint = bootstrapEslint(cwd, noInstall);
+  if (eslint.bin && eslint.config) return runEslint(cwd, files, fix, eslint.bin);
+  if (fix) {
+    console.log("  · --fix needs eslint — the baseline check has no autofix.");
+  }
+  if (existsSync(join(cwd, "tsconfig.json")) && runTypescript(cwd, files)) return;
+  runJavaScript(cwd, files);
+}