@drzl/cli 4.16.0 → 4.18.0

package/dist/cli.js

@@ -5,37 +5,18 @@ import {
   filterTables,
   loadConfig,
   trpcOutDir
-} from "./chunk-K4J4XIFO.js";
+} from "./chunk-I4KMDCQR.js";
 
 // src/cli.ts
 import { SchemaAnalyzer } from "@drzl/analyzer";
 import { ORPCGenerator } from "@drzl/generator-orpc";
-import chalk2 from "chalk";
+import chalk3 from "chalk";
 import chokidar from "chokidar";
 import cliProgress from "cli-progress";
 import { Command } from "commander";
 import * as path4 from "path";
 import ora from "ora";
 
-// src/trpc-options.ts
-function trpcOptions(g, cfg, servicesDir) {
-  return {
-    outputDir: trpcOutDir(g, cfg),
-    template: g.template,
-    includeRelations: g.includeRelations,
-    naming: g.naming,
-    outputHeader: g.outputHeader,
-    format: g.format,
-    importExtension: g.importExtension,
-    validation: g.validation,
-    databaseInjection: g.databaseInjection,
-    // Where the service generator is actually writing, so `template: 'service'` emits an import
-    // of a module that exists. The generator defaults this to `src/services`, which is right only
-    // by coincidence for a config that puts them elsewhere.
-    servicesDir
-  };
-}
-
 // src/validation-options.ts
 function validationOptions(g, cfg, outDir, caps = {}) {
   return {
@@ -62,6 +43,297 @@ function validationOptions(g, cfg, outDir, caps = {}) {
   };
 }
 
+// src/json-schema-options.ts
+function jsonSchemaOptions(g, cfg, outDir) {
+  return {
+    // JSON Schema is data, so nothing it emits references a type from the schema module.
+    ...validationOptions(g, cfg, outDir, { schemaTypes: false }),
+    target: g.target,
+    components: g.components,
+    document: g.document,
+    // Read only while emitting a document, where it adds `/users/{id}/posts`. The per-table
+    // schemas are flat whatever it says.
+    includeRelations: g.includeRelations
+  };
+}
+
+// src/trpc-options.ts
+function trpcOptions(g, cfg, servicesDir) {
+  return {
+    outputDir: trpcOutDir(g, cfg),
+    template: g.template,
+    includeRelations: g.includeRelations,
+    naming: g.naming,
+    outputHeader: g.outputHeader,
+    format: g.format,
+    importExtension: g.importExtension,
+    validation: g.validation,
+    databaseInjection: g.databaseInjection,
+    // Where the service generator is actually writing, so `template: 'service'` emits an import
+    // of a module that exists. The generator defaults this to `src/services`, which is right only
+    // by coincidence for a config that puts them elsewhere.
+    servicesDir
+  };
+}
+
+// src/doctor.ts
+import { parseCheck } from "@drzl/validation-core";
+import chalk from "chalk";
+var HANDLED_CODES = /* @__PURE__ */ new Set(["DRZL_ANL_UNKNOWN_COLUMN"]);
+function splitPath(path5) {
+  if (!path5) return {};
+  const dot = path5.lastIndexOf(".");
+  if (dot <= 0) return { table: path5 };
+  return { table: path5.slice(0, dot), column: path5.slice(dot + 1) };
+}
+function namedColumns(parsed) {
+  const out = [];
+  for (const c of parsed.checks) out.push({ column: c.column, scalar: true });
+  for (const s of parsed.sets ?? []) out.push({ column: s.column, scalar: true });
+  for (const l of parsed.lengths ?? []) out.push({ column: l.column, scalar: false });
+  for (const c of parsed.cardinalities ?? []) out.push({ column: c.column, scalar: false });
+  for (const r of parsed.rows ?? []) {
+    out.push({ column: r.left, scalar: false });
+    out.push({ column: r.right, scalar: false });
+  }
+  return out;
+}
+function describeShape(c) {
+  if (c.arrayDimensions) return "an array";
+  switch (c.shape?.kind) {
+    case "json":
+      return "a JSON";
+    case "buffer":
+      return "a binary";
+    case "tuple":
+    case "numberObject":
+      return "a structured";
+    case "numberVector":
+      return "a vector";
+    case "bitstring":
+      return "a bit-string";
+    case "byteString":
+      return "a byte-string";
+    case "custom":
+      return "a customType";
+    default:
+      return "a structured";
+  }
+}
+function checkFindings(table) {
+  const out = [];
+  const byName = new Map(table.columns.map((c) => [c.name, c]));
+  for (const k of table.checks ?? []) {
+    const label = k.name ? `"${k.name}"` : "an unnamed constraint";
+    const raw = k.expression ?? "";
+    const expr = raw.trim() ? raw : "(empty)";
+    const parsed = parseCheck(raw, k.name);
+    if (!parsed.ok) {
+      out.push({
+        kind: "check-declined",
+        level: "warn",
+        table: table.tsName,
+        constraint: k.name,
+        message: `CHECK ${label} on "${table.tsName}" is not translated: ${parsed.reason}. Expression: ${expr}`,
+        hint: "Only constraints whose meaning is unambiguous are translated, because a validator enforcing a guess rejects rows the database accepts. Your database still enforces this one; nothing DRZL emits does."
+      });
+      continue;
+    }
+    const seen = /* @__PURE__ */ new Set();
+    for (const { column, scalar } of namedColumns(parsed)) {
+      if (seen.has(column)) continue;
+      seen.add(column);
+      const col = byName.get(column);
+      if (!col) {
+        out.push({
+          kind: "check-unknown-column",
+          level: "warn",
+          table: table.tsName,
+          column,
+          constraint: k.name,
+          message: `CHECK ${label} on "${table.tsName}" names "${column}", which is not a column of that table, so nothing enforces it. Expression: ${expr}`,
+          hint: "A constraint is attached to the field it names. Check the spelling, or move a constraint spanning two tables out of the schema."
+        });
+        continue;
+      }
+      if (scalar && (col.arrayDimensions || col.shape)) {
+        out.push({
+          kind: "check-not-scalar",
+          level: "warn",
+          table: table.tsName,
+          column,
+          constraint: k.name,
+          message: `CHECK ${label} on "${table.tsName}" compares ${describeShape(col)} column "${column}" against a scalar literal, which does not describe it, so it is not translated. Expression: ${expr}`,
+          hint: "On an array column only cardinality(col) is read, since it is the one comparison that is about the array rather than about an element."
+        });
+      }
+    }
+  }
+  return out;
+}
+function primaryKeyFindings(table) {
+  if (table.readOnly) return [];
+  const pk = table.primaryKey?.columns ?? [];
+  if (!pk.length) {
+    const hasId = table.columns.some((c) => c.name === "id");
+    return [
+      {
+        kind: "no-primary-key",
+        level: "warn",
+        table: table.tsName,
+        message: hasId ? `Table "${table.tsName}" declares no primary key. The service and router generators fall back to a column named "id", which this table happens to have, so they work by coincidence.` : `Table "${table.tsName}" declares no primary key. The service and router generators fall back to a column named "id", which this table does not have, so the generated service will not compile.`,
+        hint: "Declare a primary key, or leave this table out with the config table filter."
+      }
+    ];
+  }
+  if (pk.length > 1) {
+    return [
+      {
+        kind: "partial-primary-key",
+        level: "warn",
+        table: table.tsName,
+        message: `Table "${table.tsName}" has a composite primary key (${pk.join(", ")}). The service and router generators key getById, update and delete on "${pk[0]}" alone, so those operations match on part of the key.`,
+        hint: "Treat the generated service as a starting point for this table and widen the key by hand."
+      }
+    ];
+  }
+  return [];
+}
+function buildDoctorReport(analysis, schemaPath) {
+  const findings = [];
+  const errors = analysis.issues.filter((i) => i.level === "error");
+  for (const i of errors) {
+    findings.push({
+      kind: "analyzer",
+      level: "error",
+      ...splitPath(i.path),
+      message: i.message,
+      hint: i.hint
+    });
+  }
+  for (const i of analysis.issues) {
+    if (i.code !== "DRZL_ANL_UNKNOWN_COLUMN") continue;
+    findings.push({
+      kind: "unknown-column",
+      level: "warn",
+      ...splitPath(i.path),
+      message: i.message,
+      hint: i.hint
+    });
+  }
+  for (const t of analysis.tables) findings.push(...checkFindings(t));
+  for (const t of analysis.tables) findings.push(...primaryKeyFindings(t));
+  for (const i of analysis.issues) {
+    if (i.level === "error" || HANDLED_CODES.has(i.code)) continue;
+    findings.push({
+      kind: "analyzer",
+      level: "warn",
+      ...splitPath(i.path),
+      message: i.message,
+      hint: i.hint
+    });
+  }
+  const columns = analysis.tables.reduce((n, t) => n + t.columns.length, 0);
+  const checks = analysis.tables.reduce((n, t) => n + (t.checks?.length ?? 0), 0);
+  return {
+    schema: schemaPath,
+    dialect: analysis.dialect,
+    ok: findings.length === 0,
+    counts: { tables: analysis.tables.length, columns, checks, findings: findings.length },
+    findings
+  };
+}
+var SECTIONS = [
+  {
+    kinds: ["unknown-column"],
+    title: "Columns DRZL cannot type",
+    why: "These get a validator that accepts any value."
+  },
+  {
+    kinds: ["check-declined", "check-unknown-column", "check-not-scalar"],
+    title: "CHECK constraints DRZL does not enforce",
+    why: "Your database still enforces these. Nothing DRZL generates does."
+  },
+  {
+    kinds: ["no-primary-key", "partial-primary-key"],
+    title: "Primary keys the generators cannot use",
+    why: "The generated getById, update and delete are keyed on one column."
+  },
+  {
+    kinds: ["analyzer"],
+    title: "Other findings",
+    why: "Reported by the analyzer while reading the schema."
+  }
+];
+function wrap(text, indent, first = indent, width = 96) {
+  const lines = [];
+  let line = "";
+  for (const word of text.split(/\s+/)) {
+    if (line && `${line} ${word}`.length + indent.length > width) {
+      lines.push(line);
+      line = word;
+    } else {
+      line = line ? `${line} ${word}` : word;
+    }
+  }
+  if (line) lines.push(line);
+  return lines.map((l, i) => (i === 0 ? first : indent) + l).join("\n");
+}
+function renderDoctorReport(report) {
+  const out = [];
+  const plural = (n, one) => `${n} ${one}${n === 1 ? "" : "s"}`;
+  out.push(chalk.bold(`DRZL doctor  ${report.schema}`));
+  out.push(
+    chalk.dim(
+      `${report.dialect}, ${plural(report.counts.tables, "table")}, ${plural(report.counts.columns, "column")}, ${plural(report.counts.checks, "CHECK constraint")}`
+    )
+  );
+  out.push("");
+  if (report.ok) {
+    out.push(chalk.green("Nothing to report."));
+    out.push(chalk.dim("  Every column has a type DRZL can describe."));
+    out.push(chalk.dim("  Every CHECK constraint is translated into the generated validators."));
+    out.push(chalk.dim("  Every table has a primary key the generators can use."));
+    return out.join("\n");
+  }
+  const fatal = report.findings.filter((f) => f.level === "error");
+  if (fatal.length) {
+    out.push(chalk.red("DRZL could not read this schema"));
+    out.push(chalk.dim("  Nothing else could be checked."));
+    out.push("");
+    for (const f of fatal) {
+      out.push(wrap(f.message, "    ", `  ${chalk.dim("-")} `));
+      if (f.hint) out.push(chalk.dim(wrap(f.hint, "    ")));
+    }
+    out.push("");
+  }
+  for (const section of SECTIONS) {
+    const mine = report.findings.filter(
+      (f) => f.level !== "error" && section.kinds.includes(f.kind)
+    );
+    if (!mine.length) continue;
+    out.push(chalk.yellow(`${section.title}  (${mine.length})`));
+    out.push(chalk.dim(`  ${section.why}`));
+    out.push("");
+    const groups = /* @__PURE__ */ new Map();
+    for (const f of mine) {
+      const key = f.hint ?? "";
+      groups.set(key, [...groups.get(key) ?? [], f]);
+    }
+    for (const [hint, items] of groups) {
+      for (const f of items) out.push(wrap(f.message, "    ", `  ${chalk.dim("-")} `));
+      if (hint) out.push(chalk.dim(wrap(hint, "    ")));
+      out.push("");
+    }
+  }
+  out.push(
+    chalk.bold(`${plural(report.counts.findings, "finding")} in ${report.schema}.`) + chalk.dim(
+      fatal.length ? " Fix the error above and run this again." : " None of these stop DRZL generating; they are what it will not check for you."
+    )
+  );
+  return out.join("\n");
+}
+
 // src/drift.ts
 import { promises as fs } from "fs";
 import path from "path";
@@ -138,7 +410,7 @@ async function loadGenerator(specifier, load) {
 }
 
 // src/sponsor.ts
-import chalk from "chalk";
+import chalk2 from "chalk";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
 import path2 from "path";
 var CACHE_DIR = path2.join(process.cwd(), "node_modules", ".cache", "@drzl");
@@ -152,9 +424,9 @@ var tips = [
   "Need JSON Schema or OpenAPI? The json-schema generator emits both, with no runtime dependency.",
   "Use output headers to track generated files and trim noisy diffs."
 ];
-var green = (msg) => chalk.hex("#6ee7b7")(msg);
-var cyan = (msg) => chalk.cyan(msg);
-var gray = (msg) => chalk.gray(msg);
+var green = (msg) => chalk2.hex("#6ee7b7")(msg);
+var cyan = (msg) => chalk2.cyan(msg);
+var gray = (msg) => chalk2.gray(msg);
 function maybeShowSponsorMessage({
   reason = "generate",
   minIntervalMs = DEFAULT_INTERVAL_MS,
@@ -243,13 +515,13 @@ var CLI_VERSION = readCliVersion();
 function reportGeneratorFailure(kind, e) {
   if (e instanceof GeneratorNotInstalledError) {
     console.error(
-      chalk2.red(`The ${kind} generator is not installed.`),
-      chalk2.yellow(`
+      chalk3.red(`The ${kind} generator is not installed.`),
+      chalk3.yellow(`
 Install with: npm install ${e.specifier}`)
     );
     return;
   }
-  console.error(chalk2.red(`The ${kind} generator failed:`), e?.message ?? e);
+  console.error(chalk3.red(`The ${kind} generator failed:`), e?.message ?? e);
 }
 var program = new Command();
 program.name("drzl").description("DRZL - Drizzle Developer Toolkit").version(CLI_VERSION);
@@ -276,9 +548,9 @@ program.command("analyze").argument("<schema>", "path to drizzle schema (TS)").o
     } else if (opts.out) {
       const fs2 = await import("fs/promises");
       await fs2.writeFile(opts.out, json, "utf8");
-      spinner?.succeed(chalk2.green(`Analysis written to ${opts.out} in ${ms}ms`));
+      spinner?.succeed(chalk3.green(`Analysis written to ${opts.out} in ${ms}ms`));
     } else {
-      spinner?.succeed(chalk2.green(`Analyzed in ${ms}ms`));
+      spinner?.succeed(chalk3.green(`Analyzed in ${ms}ms`));
       console.log(json);
     }
     process.exit(res.issues.some((i) => i.level === "error") ? 2 : 0);
@@ -288,7 +560,48 @@ program.command("analyze").argument("<schema>", "path to drizzle schema (TS)").o
       console.log(JSON.stringify({ event: "error", code: "DRZL_CLI_ANALYZE", message: msg }));
     else
       console.error(
-        chalk2.red("Analyze failed (DRZL_CLI_ANALYZE):"),
+        chalk3.red("Analyze failed (DRZL_CLI_ANALYZE):"),
+        msg,
+        "\nTip: run with --json for structured output."
+      );
+    process.exit(1);
+  }
+});
+program.command("doctor").description("Report what DRZL cannot type or enforce in your schema, and why").argument("[schema]", "path to drizzle schema (TS); defaults to the schema in drzl.config").option("-c, --config <path>", "path to drzl.config, read when no schema argument is given").option("--json", "print the report as JSON instead of prose", false).option("--strict", "exit 2 when anything is reported", false).action(async (schema, opts) => {
+  try {
+    let target = schema;
+    if (!target) {
+      const cfg = await loadConfig(opts.config);
+      target = cfg?.schema;
+    }
+    if (!target) {
+      const msg = "No schema given. Pass a path, or run from a directory with a drzl.config.";
+      if (opts.json)
+        console.log(JSON.stringify({ event: "error", code: "DRZL_CLI_DOCTOR", message: msg }));
+      else console.error(chalk3.red("Doctor failed (DRZL_CLI_DOCTOR):"), msg);
+      process.exit(1);
+      return;
+    }
+    const analyzer = new SchemaAnalyzer(target);
+    const analysis = await analyzer.analyze({
+      includeRelations: true,
+      validateConstraints: true
+    });
+    const report = buildDoctorReport(analysis, target);
+    if (opts.json) console.log(JSON.stringify(report, null, 2));
+    else console.log(renderDoctorReport(report));
+    if (report.findings.some((f) => f.level === "error")) {
+      process.exit(1);
+      return;
+    }
+    process.exit(opts.strict && report.findings.length ? 2 : 0);
+  } catch (e) {
+    const msg = e?.message ?? String(e);
+    if (opts.json)
+      console.log(JSON.stringify({ event: "error", code: "DRZL_CLI_DOCTOR", message: msg }));
+    else
+      console.error(
+        chalk3.red("Doctor failed (DRZL_CLI_DOCTOR):"),
         msg,
         "\nTip: run with --json for structured output."
       );
@@ -303,7 +616,7 @@ program.command("generate").description("Run configured generators (drzl.config.
     const cfg = await loadConfig(opts.config);
     if (!cfg) {
       console.error(
-        chalk2.red("No config found (DRZL_CFG_001). Create drzl.config.ts or pass --config.")
+        chalk3.red("No config found (DRZL_CFG_001). Create drzl.config.ts or pass --config.")
       );
       process.exit(2);
       return;
@@ -348,8 +661,8 @@ program.command("generate").description("Run configured generators (drzl.config.
           onProgress: ({ index }) => progress.update(index)
         });
         progress.stop();
-        ora().succeed(chalk2.green(`Generated (${g.kind}): ${files.length} files`));
-        files.forEach((f) => console.log("  -", chalk2.cyan(f)));
+        ora().succeed(chalk3.green(`Generated (${g.kind}): ${files.length} files`));
+        files.forEach((f) => console.log("  -", chalk3.cyan(f)));
       } else if (g.kind === "trpc") {
         try {
           const { TRPCGenerator } = await loadGenerator(
@@ -362,8 +675,8 @@ program.command("generate").description("Run configured generators (drzl.config.
             onProgress: ({ index }) => progress.update(index)
           });
           progress.stop();
-          ora().succeed(chalk2.green(`Generated (trpc): ${files.length} files`));
-          files.forEach((f) => console.log("  -", chalk2.cyan(f)));
+          ora().succeed(chalk3.green(`Generated (trpc): ${files.length} files`));
+          files.forEach((f) => console.log("  -", chalk3.cyan(f)));
         } catch (e) {
           progress.stop();
           reportGeneratorFailure(g.kind, e);
@@ -392,8 +705,8 @@ program.command("generate").description("Run configured generators (drzl.config.
             databaseInjection: g.databaseInjection
           });
           progress.stop();
-          ora().succeed(chalk2.green(`Generated (service): ${files.length} files`));
-          files.forEach((f) => console.log("  -", chalk2.cyan(f)));
+          ora().succeed(chalk3.green(`Generated (service): ${files.length} files`));
+          files.forEach((f) => console.log("  -", chalk3.cyan(f)));
         } catch (e) {
           progress.stop();
           reportGeneratorFailure(g.kind, e);
@@ -411,8 +724,8 @@ program.command("generate").description("Run configured generators (drzl.config.
             validationOptions(g, cfg, target, { schemaTypes: true })
           );
           progress.stop();
-          ora().succeed(chalk2.green(`Generated (zod): ${files.length} files`));
-          files.forEach((f) => console.log("  -", chalk2.cyan(f)));
+          ora().succeed(chalk3.green(`Generated (zod): ${files.length} files`));
+          files.forEach((f) => console.log("  -", chalk3.cyan(f)));
         } catch (e) {
           progress.stop();
           reportGeneratorFailure(g.kind, e);
@@ -430,8 +743,8 @@ program.command("generate").description("Run configured generators (drzl.config.
             validationOptions(g, cfg, target, { schemaTypes: true })
           );
           progress.stop();
-          ora().succeed(chalk2.green(`Generated (valibot): ${files.length} files`));
-          files.forEach((f) => console.log("  -", chalk2.cyan(f)));
+          ora().succeed(chalk3.green(`Generated (valibot): ${files.length} files`));
+          files.forEach((f) => console.log("  -", chalk3.cyan(f)));
         } catch (e) {
           progress.stop();
           reportGeneratorFailure(g.kind, e);
@@ -449,8 +762,8 @@ program.command("generate").description("Run configured generators (drzl.config.
             validationOptions(g, cfg, target, { schemaTypes: false })
           );
           progress.stop();
-          ora().succeed(chalk2.green(`Generated (arktype): ${files.length} files`));
-          files.forEach((f) => console.log("  -", chalk2.cyan(f)));
+          ora().succeed(chalk3.green(`Generated (arktype): ${files.length} files`));
+          files.forEach((f) => console.log("  -", chalk3.cyan(f)));
         } catch (e) {
           progress.stop();
           reportGeneratorFailure(g.kind, e);
@@ -460,19 +773,14 @@ program.command("generate").description("Run configured generators (drzl.config.
         try {
           const { JsonSchemaGenerator } = await loadGenerator(
             "@drzl/generator-json-schema",
-            () => import("./dist-UE55LTXV.js")
+            () => import("./dist-TRJLPIWT.js")
           );
           const gen = new JsonSchemaGenerator(analysis);
           const target = g.path ?? "src/validators/json-schema";
-          const files = await gen.generate({
-            // JSON Schema is data, so nothing here references a type from the schema module.
-            ...validationOptions(g, cfg, target, { schemaTypes: false }),
-            target: g.target,
-            components: g.components
-          });
+          const files = await gen.generate(jsonSchemaOptions(g, cfg, target));
           progress.stop();
-          ora().succeed(chalk2.green(`Generated (json-schema): ${files.length} files`));
-          files.forEach((f) => console.log("  -", chalk2.cyan(f)));
+          ora().succeed(chalk3.green(`Generated (json-schema): ${files.length} files`));
+          files.forEach((f) => console.log("  -", chalk3.cyan(f)));
         } catch (e) {
           progress.stop();
           reportGeneratorFailure(g.kind, e);
@@ -490,8 +798,8 @@ program.command("generate").description("Run configured generators (drzl.config.
             validationOptions(g, cfg, target, { schemaTypes: true })
           );
           progress.stop();
-          ora().succeed(chalk2.green(`Generated (typebox): ${files.length} files`));
-          files.forEach((f) => console.log("  -", chalk2.cyan(f)));
+          ora().succeed(chalk3.green(`Generated (typebox): ${files.length} files`));
+          files.forEach((f) => console.log("  -", chalk3.cyan(f)));
         } catch (e) {
           progress.stop();
           reportGeneratorFailure(g.kind, e);
@@ -504,22 +812,22 @@ program.command("generate").description("Run configured generators (drzl.config.
       const drift = diffSnapshots(driftBefore, after);
       await restoreSnapshot(driftBefore, after);
       if (drift.length) {
-        console.error(chalk2.red(`
+        console.error(chalk3.red(`
 Generated output is out of date (${drift.length} file(s)):`));
         for (const d of drift) {
           const mark = d.status === "added" ? "+" : d.status === "removed" ? "-" : "~";
           console.error(
-            `  ${mark} ${chalk2.yellow(d.status.padEnd(8))} ${path4.relative(process.cwd(), d.file)}`
+            `  ${mark} ${chalk3.yellow(d.status.padEnd(8))} ${path4.relative(process.cwd(), d.file)}`
           );
         }
         console.error(
-          chalk2.dim(
+          chalk3.dim(
             "\nRun `drzl generate` and commit the result. Nothing was written by this check."
           )
         );
         process.exit(1);
       }
-      console.log(chalk2.green("Generated output is up to date."));
+      console.log(chalk3.green("Generated output is up to date."));
       return;
     }
     if (cfg.generators.length) {
@@ -527,7 +835,7 @@ Generated output is out of date (${drift.length} file(s)):`));
     }
   } catch (e) {
     console.error(
-      chalk2.red("Generate failed (DRZL_GEN_001):"),
+      chalk3.red("Generate failed (DRZL_GEN_001):"),
       e?.message ?? e,
       "\nTip: check your drzl.config.ts and template path."
     );
@@ -547,10 +855,10 @@ program.command("generate:orpc").argument("<schema>", "path to drizzle schema (T
       template: opts.template,
       includeRelations: !!opts.includeRelations
     });
-    console.log(chalk2.green(`Generated:`), files.map((f) => chalk2.cyan(f)).join(", "));
+    console.log(chalk3.green(`Generated:`), files.map((f) => chalk3.cyan(f)).join(", "));
     maybeShowSponsorMessage({ reason: "generate:orpc" });
   } catch (e) {
-    console.error(chalk2.red("Generate orpc failed:"), e?.message ?? e);
+    console.error(chalk3.red("Generate orpc failed:"), e?.message ?? e);
     process.exit(1);
   }
 });
@@ -574,7 +882,7 @@ program.command("generate:trpc").argument("<schema>", "path to drizzle schema (T
       // cannot become the branch that forgets it.
       servicesDir: opts.servicesDir
     });
-    console.log(chalk2.green(`Generated:`), files.map((f) => chalk2.cyan(f)).join(", "));
+    console.log(chalk3.green(`Generated:`), files.map((f) => chalk3.cyan(f)).join(", "));
     maybeShowSponsorMessage({ reason: "generate:trpc" });
   } catch (e) {
     reportGeneratorFailure("trpc", e);
@@ -584,7 +892,7 @@ program.command("generate:trpc").argument("<schema>", "path to drizzle schema (T
 program.command("watch").description("Watch schema and regenerate on changes").option("-c, --config <path>", "path to drzl.config").option("--pipeline <name>", "all | analyze | generate-orpc | generate-trpc", "all").option("--debounce <ms>", "debounce ms", "200").option("--json", "emit JSON logs", false).option("--poll", "force polling (helps WSL/Docker/remote FS)", false).action(async (opts) => {
   let cfg = await loadConfig(opts.config);
   if (!cfg) {
-    console.error(chalk2.red("No config found. Create drzl.config.ts or pass --config."));
+    console.error(chalk3.red("No config found. Create drzl.config.ts or pass --config."));
     process.exit(2);
     return;
   }
@@ -676,7 +984,7 @@ program.command("watch").description("Watch schema and regenerate on changes").o
             })
           );
         } else {
-          console.log(chalk2.green("Analyze complete."));
+          console.log(chalk3.green("Analyze complete."));
         }
         return;
       }
@@ -706,8 +1014,8 @@ program.command("watch").description("Watch schema and regenerate on changes").o
             servicesDir
           });
           opts.json ? console.log(JSON.stringify({ event: "generate_complete", kind: g.kind, files })) : console.log(
-            chalk2.green(`Generated (${g.kind}):`),
-            files.map((f) => chalk2.cyan(f)).join(", ")
+            chalk3.green(`Generated (${g.kind}):`),
+            files.map((f) => chalk3.cyan(f)).join(", ")
           );
           newFiles.push(...files);
         } else if (g.kind === "trpc") {
@@ -719,8 +1027,8 @@ program.command("watch").description("Watch schema and regenerate on changes").o
             const gen = new TRPCGenerator(analysis);
             const { files } = await gen.generate(trpcOptions(g, cfg, servicesDir));
             opts.json ? console.log(JSON.stringify({ event: "generate_complete", kind: g.kind, files })) : console.log(
-              chalk2.green(`Generated (trpc): ${files.length} files`),
-              files.map((f) => chalk2.cyan(f)).join(", ")
+              chalk3.green(`Generated (trpc): ${files.length} files`),
+              files.map((f) => chalk3.cyan(f)).join(", ")
             );
             newFiles.push(...files);
           } catch (e) {
@@ -746,8 +1054,8 @@ program.command("watch").description("Watch schema and regenerate on changes").o
               databaseInjection: g.databaseInjection
             });
             opts.json ? console.log(JSON.stringify({ event: "generate_complete", kind: g.kind, files })) : console.log(
-              chalk2.green(`Generated (service): ${files.length} files`),
-              files.map((f) => chalk2.cyan(f)).join(", ")
+              chalk3.green(`Generated (service): ${files.length} files`),
+              files.map((f) => chalk3.cyan(f)).join(", ")
             );
             newFiles.push(...files);
           } catch (e) {
@@ -766,8 +1074,8 @@ program.command("watch").description("Watch schema and regenerate on changes").o
               validationOptions(g, cfg, target, { schemaTypes: true })
             );
             opts.json ? console.log(JSON.stringify({ event: "generate_complete", kind: g.kind, files })) : console.log(
-              chalk2.green(`Generated (zod): ${files.length} files`),
-              files.map((f) => chalk2.cyan(f)).join(", ")
+              chalk3.green(`Generated (zod): ${files.length} files`),
+              files.map((f) => chalk3.cyan(f)).join(", ")
             );
             newFiles.push(...files);
           } catch (e) {
@@ -786,8 +1094,8 @@ program.command("watch").description("Watch schema and regenerate on changes").o
               validationOptions(g, cfg, target, { schemaTypes: true })
             );
             opts.json ? console.log(JSON.stringify({ event: "generate_complete", kind: g.kind, files })) : console.log(
-              chalk2.green(`Generated (valibot): ${files.length} files`),
-              files.map((f) => chalk2.cyan(f)).join(", ")
+              chalk3.green(`Generated (valibot): ${files.length} files`),
+              files.map((f) => chalk3.cyan(f)).join(", ")
             );
             newFiles.push(...files);
           } catch (e) {
@@ -806,8 +1114,8 @@ program.command("watch").description("Watch schema and regenerate on changes").o
               validationOptions(g, cfg, target, { schemaTypes: false })
             );
             opts.json ? console.log(JSON.stringify({ event: "generate_complete", kind: g.kind, files })) : console.log(
-              chalk2.green(`Generated (arktype): ${files.length} files`),
-              files.map((f) => chalk2.cyan(f)).join(", ")
+              chalk3.green(`Generated (arktype): ${files.length} files`),
+              files.map((f) => chalk3.cyan(f)).join(", ")
             );
             newFiles.push(...files);
           } catch (e) {
@@ -826,8 +1134,8 @@ program.command("watch").description("Watch schema and regenerate on changes").o
               validationOptions(g, cfg, target, { schemaTypes: true })
             );
             opts.json ? console.log(JSON.stringify({ event: "generate_complete", kind: g.kind, files })) : console.log(
-              chalk2.green(`Generated (typebox): ${files.length} files`),
-              files.map((f) => chalk2.cyan(f)).join(", ")
+              chalk3.green(`Generated (typebox): ${files.length} files`),
+              files.map((f) => chalk3.cyan(f)).join(", ")
             );
             newFiles.push(...files);
           } catch (e) {
@@ -838,19 +1146,14 @@ program.command("watch").description("Watch schema and regenerate on changes").o
           try {
             const { JsonSchemaGenerator } = await loadGenerator(
               "@drzl/generator-json-schema",
-              () => import("./dist-UE55LTXV.js")
+              () => import("./dist-TRJLPIWT.js")
             );
             const gen = new JsonSchemaGenerator(analysis);
             const target = g.path ?? "src/validators/json-schema";
-            const files = await gen.generate({
-              // JSON Schema is data, so nothing here references a type from the schema module.
-              ...validationOptions(g, cfg, target, { schemaTypes: false }),
-              target: g.target,
-              components: g.components
-            });
+            const files = await gen.generate(jsonSchemaOptions(g, cfg, target));
             opts.json ? console.log(JSON.stringify({ event: "generate_complete", kind: g.kind, files })) : console.log(
-              chalk2.green(`Generated (json-schema): ${files.length} files`),
-              files.map((f) => chalk2.cyan(f)).join(", ")
+              chalk3.green(`Generated (json-schema): ${files.length} files`),
+              files.map((f) => chalk3.cyan(f)).join(", ")
             );
             newFiles.push(...files);
           } catch (e) {
@@ -862,8 +1165,8 @@ program.command("watch").description("Watch schema and regenerate on changes").o
       const added = newFiles.filter((f) => !lastFiles.includes(f));
       const removed = lastFiles.filter((f) => !newFiles.includes(f));
       opts.json ? console.log(JSON.stringify({ event: "diff", added, removed })) : (() => {
-        if (added.length) console.log(chalk2.blue(`Added: ${added.join(", ")}`));
-        if (removed.length) console.log(chalk2.yellow(`Removed: ${removed.join(", ")}`));
+        if (added.length) console.log(chalk3.blue(`Added: ${added.join(", ")}`));
+        if (removed.length) console.log(chalk3.yellow(`Removed: ${removed.join(", ")}`));
       })();
       if (newFiles.length && !opts.json) {
         const reason = opts.pipeline && opts.pipeline !== "all" ? `watch:${opts.pipeline}` : "watch";
@@ -871,7 +1174,7 @@ program.command("watch").description("Watch schema and regenerate on changes").o
       }
       lastFiles = newFiles;
     } catch (e) {
-      opts.json ? console.log(JSON.stringify({ event: "error", message: String(e?.message ?? e) })) : console.error(chalk2.red("Watch pipeline failed:"), e?.message ?? e);
+      opts.json ? console.log(JSON.stringify({ event: "error", message: String(e?.message ?? e) })) : console.error(chalk3.red("Watch pipeline failed:"), e?.message ?? e);
     }
   };
   const debounced = Number(opts.debounce) || 200;
@@ -896,12 +1199,12 @@ program.command("watch").description("Watch schema and regenerate on changes").o
     );
   } else {
     console.log(
-      chalk2.gray(
+      chalk3.gray(
         "Watching:\n  " + Array.from(currentTargets).map((p) => path4.relative(process.cwd(), p)).join("\n  ")
       )
     );
   }
-  watcher.on("add", (p) => trigger(p)).on("change", (p) => trigger(p)).on("unlink", (p) => trigger(p)).on("error", (err) => console.error(chalk2.red("Watcher error:"), err));
+  watcher.on("add", (p) => trigger(p)).on("change", (p) => trigger(p)).on("unlink", (p) => trigger(p)).on("error", (err) => console.error(chalk3.red("Watcher error:"), err));
   await run();
 });
 program.command("init").description("Scaffold a drzl.config.ts").option("-y, --yes", "accept defaults").action(async (_opts) => {
@@ -921,9 +1224,9 @@ program.command("init").description("Scaffold a drzl.config.ts").option("-y, --y
 `;
   try {
     await fs2.writeFile(target, template, { flag: "wx" });
-    console.log(chalk2.green(`Created ${target}`));
+    console.log(chalk3.green(`Created ${target}`));
   } catch (e) {
-    console.error(chalk2.red("Init failed:"), e?.message ?? e);
+    console.error(chalk3.red("Init failed:"), e?.message ?? e);
     process.exit(1);
   }
 });
@@ -931,13 +1234,14 @@ function reportWideColumns(issues) {
   const wide = issues.filter((i) => i.code === "DRZL_ANL_UNKNOWN_COLUMN");
   if (!wide.length) return;
   console.warn(
-    chalk2.yellow(`
+    chalk3.yellow(`
 ${wide.length} column${wide.length === 1 ? "" : "s"} could not be typed:`)
   );
-  for (const i of wide.slice(0, 10)) console.warn(chalk2.gray(`  - ${i.message}`));
-  if (wide.length > 10) console.warn(chalk2.gray(`  ... and ${wide.length - 10} more`));
+  for (const i of wide.slice(0, 10)) console.warn(chalk3.gray(`  - ${i.message}`));
+  if (wide.length > 10) console.warn(chalk3.gray(`  ... and ${wide.length - 10} more`));
   const hints = [...new Set(wide.map((i) => i.hint).filter(Boolean))];
-  for (const h of hints) console.warn(chalk2.gray(`  ${h}`));
+  for (const h of hints) console.warn(chalk3.gray(`  ${h}`));
+  console.warn(chalk3.gray("  Run `drzl doctor` for the full report."));
 }
 program.parseAsync(process.argv);
 //# sourceMappingURL=cli.js.map