@drzl/cli 4.14.3 → 4.15.0

package/dist/cli.js

@@ -3,8 +3,9 @@ import {
   computeGeneratorOutputDirs,
   computeWatchTargets,
   filterTables,
-  loadConfig
-} from "./chunk-HGD5CBM5.js";
+  loadConfig,
+  trpcOutDir
+} from "./chunk-FZNDWYBB.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 {
@@ -91,6 +111,30 @@ async function restoreSnapshot(before, after) {
   }
 }
 
+// src/generator-loader.ts
+var GeneratorNotInstalledError = class extends Error {
+  constructor(specifier, reason) {
+    super(`${specifier} is not installed`);
+    this.specifier = specifier;
+    this.reason = reason;
+    this.name = "GeneratorNotInstalledError";
+  }
+};
+function isPackageMissing(err, specifier) {
+  const code = err?.code;
+  if (code !== "ERR_MODULE_NOT_FOUND") return false;
+  const message = err?.message;
+  return typeof message === "string" && message.includes(`'${specifier}'`);
+}
+async function loadGenerator(specifier, load) {
+  try {
+    return await load();
+  } catch (e) {
+    if (isPackageMissing(e, specifier)) throw new GeneratorNotInstalledError(specifier, e);
+    throw e;
+  }
+}
+
 // src/sponsor.ts
 import chalk from "chalk";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
@@ -194,6 +238,17 @@ function readCliVersion() {
 var CLI_VERSION = readCliVersion();
 
 // src/cli.ts
+function reportGeneratorFailure(kind, e) {
+  if (e instanceof GeneratorNotInstalledError) {
+    console.error(
+      chalk2.red(`The ${kind} generator is not installed.`),
+      chalk2.yellow(`
+Install with: npm install ${e.specifier}`)
+    );
+    return;
+  }
+  console.error(chalk2.red(`The ${kind} generator failed:`), e?.message ?? e);
+}
 var program = new Command();
 program.name("drzl").description("DRZL - Drizzle Developer Toolkit").version(CLI_VERSION);
 program.addHelpText(
@@ -284,15 +339,40 @@ 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 import("@drzl/generator-service");
+          const { ServiceGenerator } = await loadGenerator(
+            "@drzl/generator-service",
+            () => import("@drzl/generator-service")
+          );
           const gen = new ServiceGenerator(analysis);
           const target = g.path ?? "src/services";
           const files = await gen.generate({
@@ -302,23 +382,27 @@ 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`));
           files.forEach((f) => console.log("  -", chalk2.cyan(f)));
         } catch (e) {
           progress.stop();
-          console.error(
-            chalk2.red("Service generator missing."),
-            chalk2.yellow("\nInstall with: npm install @drzl/generator-service")
-          );
-          console.error(chalk2.gray("Error details:"), e?.message ?? e);
+          reportGeneratorFailure(g.kind, e);
           process.exit(1);
         }
       } else if (g.kind === "zod") {
         try {
-          const { ZodGenerator } = await import("@drzl/generator-zod");
+          const { ZodGenerator } = await loadGenerator(
+            "@drzl/generator-zod",
+            () => import("@drzl/generator-zod")
+          );
           const gen = new ZodGenerator(analysis);
           const target = g.path ?? "src/validators/zod";
           const files = await gen.generate(
@@ -329,16 +413,15 @@ program.command("generate").description("Run configured generators (drzl.config.
           files.forEach((f) => console.log("  -", chalk2.cyan(f)));
         } catch (e) {
           progress.stop();
-          console.error(
-            chalk2.red("Zod generator missing."),
-            chalk2.yellow("\nInstall with: npm install @drzl/generator-zod")
-          );
-          console.error(chalk2.gray("Error details:"), e?.message ?? e);
+          reportGeneratorFailure(g.kind, e);
           process.exit(1);
         }
       } else if (g.kind === "valibot") {
         try {
-          const { ValibotGenerator } = await import("@drzl/generator-valibot");
+          const { ValibotGenerator } = await loadGenerator(
+            "@drzl/generator-valibot",
+            () => import("@drzl/generator-valibot")
+          );
           const gen = new ValibotGenerator(analysis);
           const target = g.path ?? "src/validators/valibot";
           const files = await gen.generate(
@@ -349,16 +432,15 @@ program.command("generate").description("Run configured generators (drzl.config.
           files.forEach((f) => console.log("  -", chalk2.cyan(f)));
         } catch (e) {
           progress.stop();
-          console.error(
-            chalk2.red("Valibot generator missing."),
-            chalk2.yellow("\nInstall with: npm install @drzl/generator-valibot")
-          );
-          console.error(chalk2.gray("Error details:"), e?.message ?? e);
+          reportGeneratorFailure(g.kind, e);
           process.exit(1);
         }
       } else if (g.kind === "arktype") {
         try {
-          const { ArkTypeGenerator } = await import("@drzl/generator-arktype");
+          const { ArkTypeGenerator } = await loadGenerator(
+            "@drzl/generator-arktype",
+            () => import("@drzl/generator-arktype")
+          );
           const gen = new ArkTypeGenerator(analysis);
           const target = g.path ?? "src/validators/arktype";
           const files = await gen.generate(
@@ -369,16 +451,15 @@ program.command("generate").description("Run configured generators (drzl.config.
           files.forEach((f) => console.log("  -", chalk2.cyan(f)));
         } catch (e) {
           progress.stop();
-          console.error(
-            chalk2.red("ArkType generator missing."),
-            chalk2.yellow("\nInstall with: npm install @drzl/generator-arktype")
-          );
-          console.error(chalk2.gray("Error details:"), e?.message ?? e);
+          reportGeneratorFailure(g.kind, e);
           process.exit(1);
         }
       } else if (g.kind === "json-schema") {
         try {
-          const { JsonSchemaGenerator } = await import("./dist-UE55LTXV.js");
+          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({
@@ -392,20 +473,15 @@ program.command("generate").description("Run configured generators (drzl.config.
           files.forEach((f) => console.log("  -", chalk2.cyan(f)));
         } catch (e) {
           progress.stop();
-          console.error(
-            chalk2.red("JSON Schema generator missing."),
-            chalk2.yellow("\nInstall with: npm install @drzl/generator-json-schema"),
-            // An optional dependency, unlike the other generators, until its npm trusted
-            // publisher exists. A missing optional dependency is skipped rather than failing
-            // the install, which is what keeps `npm i @drzl/cli` working meanwhile.
-            ""
-          );
-          console.error(chalk2.gray("Error details:"), e?.message ?? e);
+          reportGeneratorFailure(g.kind, e);
           process.exit(1);
         }
       } else if (g.kind === "typebox") {
         try {
-          const { TypeBoxGenerator } = await import("@drzl/generator-typebox");
+          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(
@@ -416,11 +492,7 @@ program.command("generate").description("Run configured generators (drzl.config.
           files.forEach((f) => console.log("  -", chalk2.cyan(f)));
         } catch (e) {
           progress.stop();
-          console.error(
-            chalk2.red("TypeBox generator missing."),
-            chalk2.yellow("\nInstall with: npm install @drzl/generator-typebox")
-          );
-          console.error(chalk2.gray("Error details:"), e?.message ?? e);
+          reportGeneratorFailure(g.kind, e);
           process.exit(1);
         }
       }
@@ -480,7 +552,37 @@ 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."));
@@ -580,8 +682,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") {
@@ -595,16 +702,38 @@ 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 import("@drzl/generator-service");
+            const { ServiceGenerator } = await loadGenerator(
+              "@drzl/generator-service",
+              () => import("@drzl/generator-service")
+            );
             const gen = new ServiceGenerator(analysis);
             const target = g.path ?? "src/services";
             const files = await gen.generate({
@@ -614,7 +743,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`),
@@ -622,16 +752,15 @@ program.command("watch").description("Watch schema and regenerate on changes").o
             );
             newFiles.push(...files);
           } catch (e) {
-            console.error(
-              chalk2.red("Service generator missing."),
-              chalk2.yellow("\nInstall with: npm install @drzl/generator-service")
-            );
-            console.error(chalk2.gray("Error details:"), e?.message ?? e);
+            reportGeneratorFailure(g.kind, e);
             return;
           }
         } else if (g.kind === "zod") {
           try {
-            const { ZodGenerator } = await import("@drzl/generator-zod");
+            const { ZodGenerator } = await loadGenerator(
+              "@drzl/generator-zod",
+              () => import("@drzl/generator-zod")
+            );
             const gen = new ZodGenerator(analysis);
             const target = g.path ?? "src/validators/zod";
             const files = await gen.generate({
@@ -649,16 +778,15 @@ program.command("watch").description("Watch schema and regenerate on changes").o
             );
             newFiles.push(...files);
           } catch (e) {
-            console.error(
-              chalk2.red("Zod generator missing."),
-              chalk2.yellow("\nInstall with: npm install @drzl/generator-zod")
-            );
-            console.error(chalk2.gray("Error details:"), e?.message ?? e);
+            reportGeneratorFailure(g.kind, e);
             return;
           }
         } else if (g.kind === "valibot") {
           try {
-            const { ValibotGenerator } = await import("@drzl/generator-valibot");
+            const { ValibotGenerator } = await loadGenerator(
+              "@drzl/generator-valibot",
+              () => import("@drzl/generator-valibot")
+            );
             const gen = new ValibotGenerator(analysis);
             const target = g.path ?? "src/validators/valibot";
             const files = await gen.generate({
@@ -676,16 +804,15 @@ program.command("watch").description("Watch schema and regenerate on changes").o
             );
             newFiles.push(...files);
           } catch (e) {
-            console.error(
-              chalk2.red("Valibot generator missing."),
-              chalk2.yellow("\nInstall with: npm install @drzl/generator-valibot")
-            );
-            console.error(chalk2.gray("Error details:"), e?.message ?? e);
+            reportGeneratorFailure(g.kind, e);
             return;
           }
         } else if (g.kind === "arktype") {
           try {
-            const { ArkTypeGenerator } = await import("@drzl/generator-arktype");
+            const { ArkTypeGenerator } = await loadGenerator(
+              "@drzl/generator-arktype",
+              () => import("@drzl/generator-arktype")
+            );
             const gen = new ArkTypeGenerator(analysis);
             const target = g.path ?? "src/validators/arktype";
             const files = await gen.generate({
@@ -703,11 +830,7 @@ program.command("watch").description("Watch schema and regenerate on changes").o
             );
             newFiles.push(...files);
           } catch (e) {
-            console.error(
-              chalk2.red("ArkType generator missing."),
-              chalk2.yellow("\nInstall with: npm install @drzl/generator-arktype")
-            );
-            console.error(chalk2.gray("Error details:"), e?.message ?? e);
+            reportGeneratorFailure(g.kind, e);
             return;
           }
         }
@@ -766,6 +889,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