@drzl/cli 4.14.4 → 4.16.0

package/dist/cli.js

@@ -3,8 +3,9 @@ import {
   computeGeneratorOutputDirs,
   computeWatchTargets,
   filterTables,
-  loadConfig
-} from "./chunk-HGD5CBM5.js";
+  loadConfig,
+  trpcOutDir
+} from "./chunk-K4J4XIFO.js";
 
 // src/cli.ts
 import { SchemaAnalyzer } from "@drzl/analyzer";
@@ -16,6 +17,25 @@ 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 {
@@ -29,6 +49,8 @@ function validationOptions(g, cfg, outDir, caps = {}) {
     coerceDates: g.coerceDates,
     applyDefaults: g.applyDefaults,
     duplicateFinder: g.duplicateFinder,
+    nestedSchemas: g.nestedSchemas,
+    nestedDepth: g.nestedDepth,
     // Only where the generator can act on them, so an unsupported option is absent rather than
     // present and ignored.
     ...caps.schemaTypes ? {
@@ -319,12 +341,34 @@ program.command("generate").description("Run configured generators (drzl.config.
           templateOptions: g.templateOptions,
           importExtension: g.importExtension,
           validation: g.validation,
+          // Documented on this generator since it was added and never reachable from a config
+          // file, because the config schema had no such key and zod stripped it in silence.
+          databaseInjection: g.databaseInjection,
           servicesDir,
           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)));
+      } else if (g.kind === "trpc") {
+        try {
+          const { TRPCGenerator } = await loadGenerator(
+            "@drzl/generator-trpc",
+            () => import("./dist-XBGVORL3.js")
+          );
+          const gen = new TRPCGenerator(analysis);
+          const { files } = await gen.generate({
+            ...trpcOptions(g, cfg, servicesDir),
+            onProgress: ({ index }) => progress.update(index)
+          });
+          progress.stop();
+          ora().succeed(chalk2.green(`Generated (trpc): ${files.length} files`));
+          files.forEach((f) => console.log("  -", chalk2.cyan(f)));
+        } catch (e) {
+          progress.stop();
+          reportGeneratorFailure(g.kind, e);
+          process.exit(1);
+        }
       } else if (g.kind === "service") {
         try {
           const { ServiceGenerator } = await loadGenerator(
@@ -340,7 +384,12 @@ program.command("generate").description("Run configured generators (drzl.config.
             dataAccess: g.dataAccess,
             dbImportPath: g.dbImportPath,
             schemaImportPath: g.schemaImportPath,
-            importExtension: g.importExtension
+            importExtension: g.importExtension,
+            // The other half of `databaseInjection`. A router generator in injection mode
+            // emits `Service.getById(ctx.db, id)`, and only a service generated in the same
+            // mode has a `db` parameter to receive it. This branch never passed the option, so
+            // the two halves of one generated project disagreed about the signature.
+            databaseInjection: g.databaseInjection
           });
           progress.stop();
           ora().succeed(chalk2.green(`Generated (service): ${files.length} files`));
@@ -505,7 +554,34 @@ program.command("generate:orpc").argument("<schema>", "path to drizzle schema (T
     process.exit(1);
   }
 });
-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", "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) => {
+program.command("generate:trpc").argument("<schema>", "path to drizzle schema (TS)").option("-o, --outDir <dir>", "output directory", "src/api").option("--template <name>", "standard | service", "standard").option("--includeRelations", "include relation endpoints").option("--servicesDir <dir>", "where the service generator writes", "src/services").action(async (schema, opts) => {
+  try {
+    const analyzer = new SchemaAnalyzer(schema);
+    const analysis = await analyzer.analyze({
+      includeRelations: !!opts.includeRelations,
+      validateConstraints: true
+    });
+    const { TRPCGenerator } = await loadGenerator(
+      "@drzl/generator-trpc",
+      () => import("./dist-XBGVORL3.js")
+    );
+    const gen = new TRPCGenerator(analysis);
+    const { files } = await gen.generate({
+      outputDir: opts.outDir,
+      template: opts.template,
+      includeRelations: !!opts.includeRelations,
+      // Only consulted by `--template service`, and passed unconditionally so this command
+      // cannot become the branch that forgets it.
+      servicesDir: opts.servicesDir
+    });
+    console.log(chalk2.green(`Generated:`), files.map((f) => chalk2.cyan(f)).join(", "));
+    maybeShowSponsorMessage({ reason: "generate:trpc" });
+  } catch (e) {
+    reportGeneratorFailure("trpc", e);
+    process.exit(1);
+  }
+});
+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."));
@@ -605,8 +681,13 @@ program.command("watch").description("Watch schema and regenerate on changes").o
         return;
       }
       const newFiles = [];
+      const servicesDir = cfg.generators.find((x) => x.kind === "service")?.path ?? "src/services";
+      const PIPELINE_KINDS = {
+        "generate-orpc": "orpc",
+        "generate-trpc": "trpc"
+      };
       for (const g of cfg.generators) {
-        if (opts.pipeline !== "all" && !(opts.pipeline === "generate-orpc" && g.kind === "orpc")) {
+        if (opts.pipeline !== "all" && PIPELINE_KINDS[opts.pipeline] !== g.kind) {
           continue;
         }
         if (g.kind === "orpc") {
@@ -620,13 +701,32 @@ program.command("watch").description("Watch schema and regenerate on changes").o
             format: g.format,
             templateOptions: g.templateOptions,
             importExtension: g.importExtension,
-            validation: g.validation
+            validation: g.validation,
+            databaseInjection: g.databaseInjection,
+            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(", ")
           );
           newFiles.push(...files);
+        } else if (g.kind === "trpc") {
+          try {
+            const { TRPCGenerator } = await loadGenerator(
+              "@drzl/generator-trpc",
+              () => import("./dist-XBGVORL3.js")
+            );
+            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(", ")
+            );
+            newFiles.push(...files);
+          } catch (e) {
+            reportGeneratorFailure(g.kind, e);
+            return;
+          }
         } else if (g.kind === "service") {
           try {
             const { ServiceGenerator } = await loadGenerator(
@@ -642,7 +742,8 @@ program.command("watch").description("Watch schema and regenerate on changes").o
               dataAccess: g.dataAccess,
               dbImportPath: g.dbImportPath,
               schemaImportPath: g.schemaImportPath,
-              importExtension: g.importExtension
+              importExtension: g.importExtension,
+              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`),
@@ -661,15 +762,9 @@ 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({
-              outDir: target,
-              outputHeader: g.outputHeader,
-              format: g.format,
-              schemaSuffix: g.schemaSuffix,
-              fileSuffix: g.fileSuffix,
-              importExtension: g.importExtension,
-              affix: g.affix
-            });
+            const files = await gen.generate(
+              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(", ")
@@ -687,15 +782,9 @@ program.command("watch").description("Watch schema and regenerate on changes").o
             );
             const gen = new ValibotGenerator(analysis);
             const target = g.path ?? "src/validators/valibot";
-            const files = await gen.generate({
-              outDir: target,
-              outputHeader: g.outputHeader,
-              format: g.format,
-              schemaSuffix: g.schemaSuffix,
-              fileSuffix: g.fileSuffix,
-              importExtension: g.importExtension,
-              affix: g.affix
-            });
+            const files = await gen.generate(
+              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(", ")
@@ -713,17 +802,54 @@ program.command("watch").description("Watch schema and regenerate on changes").o
             );
             const gen = new ArkTypeGenerator(analysis);
             const target = g.path ?? "src/validators/arktype";
+            const files = await gen.generate(
+              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(", ")
+            );
+            newFiles.push(...files);
+          } catch (e) {
+            reportGeneratorFailure(g.kind, e);
+            return;
+          }
+        } else if (g.kind === "typebox") {
+          try {
+            const { TypeBoxGenerator } = await loadGenerator(
+              "@drzl/generator-typebox",
+              () => import("@drzl/generator-typebox")
+            );
+            const gen = new TypeBoxGenerator(analysis);
+            const target = g.path ?? "src/validators/typebox";
+            const files = await gen.generate(
+              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(", ")
+            );
+            newFiles.push(...files);
+          } catch (e) {
+            reportGeneratorFailure(g.kind, e);
+            return;
+          }
+        } else if (g.kind === "json-schema") {
+          try {
+            const { JsonSchemaGenerator } = await loadGenerator(
+              "@drzl/generator-json-schema",
+              () => import("./dist-UE55LTXV.js")
+            );
+            const gen = new JsonSchemaGenerator(analysis);
+            const target = g.path ?? "src/validators/json-schema";
             const files = await gen.generate({
-              outDir: target,
-              outputHeader: g.outputHeader,
-              format: g.format,
-              schemaSuffix: g.schemaSuffix,
-              fileSuffix: g.fileSuffix,
-              importExtension: g.importExtension,
-              affix: g.affix
+              // 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
             });
             opts.json ? console.log(JSON.stringify({ event: "generate_complete", kind: g.kind, files })) : console.log(
-              chalk2.green(`Generated (arktype): ${files.length} files`),
+              chalk2.green(`Generated (json-schema): ${files.length} files`),
               files.map((f) => chalk2.cyan(f)).join(", ")
             );
             newFiles.push(...files);
@@ -787,6 +913,8 @@ program.command("init").description("Scaffold a drzl.config.ts").option("-y, --y
   outDir: 'src/api',
   analyzer: { includeRelations: true, validateConstraints: true },
   generators: [
+    // For tRPC instead: { kind: 'trpc', template: 'standard', includeRelations: true }
+    // To run both, give one of them its own \`path\`; they share \`outDir\` otherwise.
     { kind: 'orpc', template: 'standard', includeRelations: true }
   ]
 } as const