@drzl/cli 4.19.0 → 4.21.0

package/dist/cli.js

@@ -1,11 +1,18 @@
 #!/usr/bin/env node
 import {
+  addressableName,
+  ambiguousPatternWarnings,
   computeGeneratorOutputDirs,
   computeWatchTargets,
+  displayTableName,
   filterTables,
+  hasNamedSchemas,
   loadConfig,
+  matchesAny,
+  matchesTable,
+  tableFilterWarnings,
   trpcOutDir
-} from "./chunk-V2IXXAC2.js";
+} from "./chunk-XNNKHBGV.js";
 
 // src/cli.ts
 import { SchemaAnalyzer } from "@drzl/analyzer";
@@ -32,6 +39,11 @@ function validationOptions(g, cfg, outDir, caps = {}) {
     duplicateFinder: g.duplicateFinder,
     nestedSchemas: g.nestedSchemas,
     nestedDepth: g.nestedDepth,
+    // Every validation generator can express a brand, including TypeBox, which has no brand
+    // helper and gets one from `TUnsafe` instead. So this needs no capability flag: an option
+    // that reached only four of the five would be the class of defect this file exists to
+    // remove.
+    branded: g.branded,
     // Only where the generator can act on them, so an unsupported option is absent rather than
     // present and ignored.
     ...caps.schemaTypes ? {
@@ -39,7 +51,9 @@ function validationOptions(g, cfg, outDir, caps = {}) {
       schemaPath: cfg.schema,
       typedJson: g.typedJson,
       typedColumns: g.typedColumns
-    } : {}
+    } : {},
+    ...caps.standardSchema ? { standardSchema: g.standardSchema } : {},
+    ...caps.meta ? { meta: g.meta } : {}
   };
 }
 
@@ -76,6 +90,9 @@ function trpcOptions(g, cfg, servicesDir) {
   };
 }
 
+// src/column-filter.ts
+import { parseCheck as parseCheck2 } from "@drzl/validation-core";
+
 // src/doctor.ts
 import { parseCheck } from "@drzl/validation-core";
 import chalk from "chalk";
@@ -334,6 +351,99 @@ function renderDoctorReport(report) {
   return out.join("\n");
 }
 
+// src/column-filter.ts
+function checkedColumns(expression, name) {
+  const parsed = parseCheck2(expression, name);
+  if (!parsed.ok) return [];
+  return [...new Set(namedColumns(parsed).map((n) => n.column))];
+}
+function filterColumns(tables, spec) {
+  const entries = Object.entries(spec ?? {});
+  if (!entries.length) return { tables, warnings: [] };
+  const errors = [];
+  const warnings = [];
+  const nameForConfig = hasNamedSchemas(tables) ? addressableName : displayTableName;
+  for (const [tablePattern, rules] of entries) {
+    const matched = tables.filter((t) => matchesTable([tablePattern], t));
+    if (!matched.length) {
+      errors.push(
+        `columns[${JSON.stringify(tablePattern)}] matches no table. The schema declares: ${tables.map(nameForConfig).join(", ") || "(no tables)"}.`
+      );
+      continue;
+    }
+    const available = [...new Set(matched.flatMap((t) => t.columns.map((c) => c.name)))];
+    for (const which of ["pick", "omit"]) {
+      for (const pattern of rules[which] ?? []) {
+        if (available.some((name) => matchesAny([pattern], name))) continue;
+        errors.push(
+          `columns[${JSON.stringify(tablePattern)}].${which} names ${JSON.stringify(pattern)}, which matches no column of ${matched.map(nameForConfig).join(", ")}. Available: ${available.join(", ")}.`
+        );
+      }
+    }
+  }
+  warnings.push(
+    ...ambiguousPatternWarnings(
+      entries.map(([p]) => p),
+      tables,
+      "columns"
+    )
+  );
+  const out = tables.map((table) => {
+    const mine = entries.filter(([pattern]) => matchesTable([pattern], table));
+    if (!mine.length) return table;
+    let keep = table.columns;
+    for (const [, rules] of mine) {
+      if (rules.pick?.length) keep = keep.filter((c) => matchesAny(rules.pick, c.name));
+      if (rules.omit?.length) keep = keep.filter((c) => !matchesAny(rules.omit, c.name));
+    }
+    if (keep.length === table.columns.length) return table;
+    const kept = new Set(keep.map((c) => c.name));
+    const dropped = table.columns.filter((c) => !kept.has(c.name));
+    if (!keep.length) {
+      errors.push(
+        `columns leaves table "${displayTableName(table)}" with no columns at all. An empty schema describes no row, so this is never a narrower API. Exclude the table instead, with the top-level "exclude" option.`
+      );
+      return table;
+    }
+    const lostKey = (table.primaryKey?.columns ?? []).filter((n) => !kept.has(n));
+    if (lostKey.length) {
+      errors.push(
+        `columns drops ${lostKey.map((n) => JSON.stringify(n)).join(", ")} from table "${displayTableName(table)}", which is part of its primary key (${table.primaryKey?.columns.join(", ")}). The generated getById, update and delete address rows by that key, so the emitted schemas would describe a row nothing can address. Keep the key, or leave the whole table out with the top-level "exclude" option.`
+      );
+      return table;
+    }
+    for (const c of dropped) {
+      if (c.nullable || c.hasDefault || c.isGenerated || table.readOnly) continue;
+      warnings.push(
+        `drzl config: the "columns" option drops "${c.name}" from table "${displayTableName(table)}", and the database requires it: NOT NULL with no default. The emitted insert schema therefore describes a payload that is not a complete row, so whatever calls db.insert has to supply "${c.name}" itself.`
+      );
+    }
+    for (const k of table.checks ?? []) {
+      const lost = checkedColumns(k.expression, k.name).filter(
+        (n) => !kept.has(n) && table.columns.some((c) => c.name === n)
+      );
+      if (!lost.length) continue;
+      warnings.push(
+        `drzl config: CHECK ${k.name ? `"${k.name}"` : "(unnamed)"} on table "${displayTableName(table)}" names ${lost.map((n) => JSON.stringify(n)).join(", ")}, which the "columns" option drops, so nothing DRZL emits enforces it. Your database still does.`
+      );
+    }
+    return {
+      ...table,
+      columns: keep,
+      unique: (table.unique ?? []).filter((k) => k.columns.every((n) => kept.has(n))),
+      indexes: (table.indexes ?? []).filter((i) => i.columns.every((n) => kept.has(n))),
+      ...table.foreignKeys ? { foreignKeys: table.foreignKeys.filter((f) => f.columns.every((n) => kept.has(n))) } : {}
+    };
+  });
+  if (errors.length) {
+    throw new Error(
+      `drzl config: the "columns" option cannot be honoured.
+` + errors.map((e) => `  - ${e}`).join("\n")
+    );
+  }
+  return { tables: out, warnings };
+}
+
 // src/drift.ts
 import { promises as fs } from "fs";
 import path from "path";
@@ -629,8 +739,11 @@ program.command("generate").description("Run configured generators (drzl.config.
       validateConstraints: cfg.analyzer.validateConstraints,
       includeHeuristicRelations: cfg.analyzer.includeHeuristicRelations
     });
-    analysis.tables = filterTables(analysis.tables, cfg);
     spinner.succeed(`Analysis complete in ${Date.now() - t0}ms`);
+    const narrowed = filterColumns(analysis.tables, cfg.columns);
+    const filterWarnings = tableFilterWarnings(narrowed.tables, cfg);
+    analysis.tables = filterTables(narrowed.tables, cfg);
+    for (const w of [...narrowed.warnings, ...filterWarnings]) console.warn(chalk3.yellow(w));
     reportWideColumns(analysis.issues);
     const driftDirs = computeGeneratorOutputDirs(cfg);
     const driftBefore = opts.check ? await snapshotAll(driftDirs) : null;
@@ -721,7 +834,7 @@ program.command("generate").description("Run configured generators (drzl.config.
           const gen = new ZodGenerator(analysis);
           const target = g.path ?? "src/validators/zod";
           const files = await gen.generate(
-            validationOptions(g, cfg, target, { schemaTypes: true })
+            validationOptions(g, cfg, target, { schemaTypes: true, meta: true })
           );
           progress.stop();
           ora().succeed(chalk3.green(`Generated (zod): ${files.length} files`));
@@ -773,7 +886,7 @@ program.command("generate").description("Run configured generators (drzl.config.
         try {
           const { JsonSchemaGenerator } = await loadGenerator(
             "@drzl/generator-json-schema",
-            () => import("./dist-TRJLPIWT.js")
+            () => import("./dist-K6N4F3XW.js")
           );
           const gen = new JsonSchemaGenerator(analysis);
           const target = g.path ?? "src/validators/json-schema";
@@ -795,7 +908,10 @@ program.command("generate").description("Run configured generators (drzl.config.
           const gen = new TypeBoxGenerator(analysis);
           const target = g.path ?? "src/validators/typebox";
           const files = await gen.generate(
-            validationOptions(g, cfg, target, { schemaTypes: true })
+            validationOptions(g, cfg, target, {
+              schemaTypes: true,
+              standardSchema: true
+            })
           );
           progress.stop();
           ora().succeed(chalk3.green(`Generated (typebox): ${files.length} files`));
@@ -809,7 +925,7 @@ program.command("generate").description("Run configured generators (drzl.config.
         try {
           const { EffectGenerator } = await loadGenerator(
             "@drzl/generator-effect",
-            () => import("./dist-CZDVFYFW.js")
+            () => import("./dist-WHAW3AMQ.js")
           );
           const gen = new EffectGenerator(analysis);
           const target = g.path ?? "src/validators/effect";
@@ -991,7 +1107,11 @@ program.command("watch").description("Watch schema and regenerate on changes").o
         validateConstraints: cfg.analyzer.validateConstraints,
         includeHeuristicRelations: cfg.analyzer.includeHeuristicRelations
       });
-      analysis.tables = filterTables(analysis.tables, cfg);
+      const narrowed = filterColumns(analysis.tables, cfg.columns);
+      const filterWarnings = tableFilterWarnings(narrowed.tables, cfg);
+      analysis.tables = filterTables(narrowed.tables, cfg);
+      if (!opts.json)
+        for (const w of [...narrowed.warnings, ...filterWarnings]) console.warn(chalk3.yellow(w));
       if (!opts.json) reportWideColumns(analysis.issues);
       if (opts.pipeline === "analyze") {
         if (opts.json) {
@@ -1090,7 +1210,7 @@ program.command("watch").description("Watch schema and regenerate on changes").o
             const gen = new ZodGenerator(analysis);
             const target = g.path ?? "src/validators/zod";
             const files = await gen.generate(
-              validationOptions(g, cfg, target, { schemaTypes: true })
+              validationOptions(g, cfg, target, { schemaTypes: true, meta: true })
             );
             opts.json ? console.log(JSON.stringify({ event: "generate_complete", kind: g.kind, files })) : console.log(
               chalk3.green(`Generated (zod): ${files.length} files`),
@@ -1150,7 +1270,10 @@ program.command("watch").description("Watch schema and regenerate on changes").o
             const gen = new TypeBoxGenerator(analysis);
             const target = g.path ?? "src/validators/typebox";
             const files = await gen.generate(
-              validationOptions(g, cfg, target, { schemaTypes: true })
+              validationOptions(g, cfg, target, {
+                schemaTypes: true,
+                standardSchema: true
+              })
             );
             opts.json ? console.log(JSON.stringify({ event: "generate_complete", kind: g.kind, files })) : console.log(
               chalk3.green(`Generated (typebox): ${files.length} files`),
@@ -1165,7 +1288,7 @@ program.command("watch").description("Watch schema and regenerate on changes").o
           try {
             const { EffectGenerator } = await loadGenerator(
               "@drzl/generator-effect",
-              () => import("./dist-CZDVFYFW.js")
+              () => import("./dist-WHAW3AMQ.js")
             );
             const gen = new EffectGenerator(analysis);
             const target = g.path ?? "src/validators/effect";
@@ -1185,7 +1308,7 @@ program.command("watch").description("Watch schema and regenerate on changes").o
           try {
             const { JsonSchemaGenerator } = await loadGenerator(
               "@drzl/generator-json-schema",
-              () => import("./dist-TRJLPIWT.js")
+              () => import("./dist-K6N4F3XW.js")
             );
             const gen = new JsonSchemaGenerator(analysis);
             const target = g.path ?? "src/validators/json-schema";