@drzl/cli 4.14.2 → 4.14.4

package/README.md

@@ -56,3 +56,7 @@ Notes
   DRZL uses whichever it finds in your project, with your config. With neither installed the
   generated files are written exactly as rendered, which is the same valid TypeScript with worse
   whitespace. Add `prettier` as a dev dependency if you want it formatted.
+- Naming an engine instead, `format.engine: 'prettier'` or `'biome'`, is a request rather than a
+  preference, so an engine that cannot be loaded is reported on stderr with the reason. The files
+  are still written, unformatted; nothing fails. `'auto'` stays silent, because it asked for
+  whatever happened to be installed and no formatter is a legitimate answer to that.

package/dist/cli.cjs

@@ -56,6 +56,12 @@ function baseSchema(c, mode, target, checks, sets, lengths) {
           minItems: s.length,
           maxItems: s.length
         };
+      case "numberObject":
+        return {
+          type: "object",
+          properties: Object.fromEntries(s.fields.map((f) => [f, { type: "number" }])),
+          required: [...s.fields]
+        };
       case "numberVector":
         return {
           type: "array",
@@ -68,6 +74,8 @@ function baseSchema(c, mode, target, checks, sets, lengths) {
           pattern: "^[01]*$",
           ...s.length ? s.exact ? { minLength: s.length, maxLength: s.length } : { maxLength: s.length } : {}
         };
+      case "byteString":
+        return { type: "string", ...s.length ? { maxLength: s.length } : {} };
     }
   }
   const set = sets.find((x) => x.column === c.name);
@@ -82,6 +90,7 @@ function baseSchema(c, mode, target, checks, sets, lengths) {
       if (c.format === "uuid") out.format = UUID_FORMAT;
       else if (c.format && import_validation_core2.COLUMN_FORMATS[c.format]) out.pattern = import_validation_core2.COLUMN_FORMATS[c.format];
       if (c.maxLength !== void 0) out.maxLength = c.maxLength;
+      applyByteCap(out, c);
       applyLengths(out, c, lengths);
       return out;
     }
@@ -102,6 +111,11 @@ function baseSchema(c, mode, target, checks, sets, lengths) {
       return {};
   }
 }
+function applyByteCap(out, c) {
+  if (!c.maxBytes) return;
+  out.maxLength = Math.min(Number(out.maxLength ?? Infinity), c.maxBytes);
+  out.description = `At most ${c.maxBytes} bytes of UTF-8, which JSON Schema has no keyword for. maxLength counts characters: it refuses nothing the column accepts, and a string of multi-byte characters can satisfy it and still be too long for the column.`;
+}
 function applyLengths(out, c, lengths) {
   for (const k of lengths.filter((x) => x.column === c.name)) {
     const n = Number(k.value);
@@ -768,6 +782,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
 var import_chalk = __toESM(require("chalk"), 1);
 var import_node_fs2 = require("fs");
@@ -871,6 +909,17 @@ function readCliVersion() {
 var CLI_VERSION = readCliVersion();
 
 // src/cli.ts
+function reportGeneratorFailure(kind, e) {
+  if (e instanceof GeneratorNotInstalledError) {
+    console.error(
+      import_chalk2.default.red(`The ${kind} generator is not installed.`),
+      import_chalk2.default.yellow(`
+Install with: npm install ${e.specifier}`)
+    );
+    return;
+  }
+  console.error(import_chalk2.default.red(`The ${kind} generator failed:`), e?.message ?? e);
+}
 var program = new import_commander.Command();
 program.name("drzl").description("DRZL - Drizzle Developer Toolkit").version(CLI_VERSION);
 program.addHelpText(
@@ -969,7 +1018,10 @@ program.command("generate").description("Run configured generators (drzl.config.
         files.forEach((f) => console.log("  -", import_chalk2.default.cyan(f)));
       } 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({
@@ -986,16 +1038,15 @@ program.command("generate").description("Run configured generators (drzl.config.
           files.forEach((f) => console.log("  -", import_chalk2.default.cyan(f)));
         } catch (e) {
           progress.stop();
-          console.error(
-            import_chalk2.default.red("Service generator missing."),
-            import_chalk2.default.yellow("\nInstall with: npm install @drzl/generator-service")
-          );
-          console.error(import_chalk2.default.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(
@@ -1006,16 +1057,15 @@ program.command("generate").description("Run configured generators (drzl.config.
           files.forEach((f) => console.log("  -", import_chalk2.default.cyan(f)));
         } catch (e) {
           progress.stop();
-          console.error(
-            import_chalk2.default.red("Zod generator missing."),
-            import_chalk2.default.yellow("\nInstall with: npm install @drzl/generator-zod")
-          );
-          console.error(import_chalk2.default.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(
@@ -1026,16 +1076,15 @@ program.command("generate").description("Run configured generators (drzl.config.
           files.forEach((f) => console.log("  -", import_chalk2.default.cyan(f)));
         } catch (e) {
           progress.stop();
-          console.error(
-            import_chalk2.default.red("Valibot generator missing."),
-            import_chalk2.default.yellow("\nInstall with: npm install @drzl/generator-valibot")
-          );
-          console.error(import_chalk2.default.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(
@@ -1046,16 +1095,15 @@ program.command("generate").description("Run configured generators (drzl.config.
           files.forEach((f) => console.log("  -", import_chalk2.default.cyan(f)));
         } catch (e) {
           progress.stop();
-          console.error(
-            import_chalk2.default.red("ArkType generator missing."),
-            import_chalk2.default.yellow("\nInstall with: npm install @drzl/generator-arktype")
-          );
-          console.error(import_chalk2.default.gray("Error details:"), e?.message ?? e);
+          reportGeneratorFailure(g.kind, e);
           process.exit(1);
         }
       } else if (g.kind === "json-schema") {
         try {
-          const { JsonSchemaGenerator: JsonSchemaGenerator2 } = await Promise.resolve().then(() => (init_dist(), dist_exports));
+          const { JsonSchemaGenerator: JsonSchemaGenerator2 } = await loadGenerator(
+            "@drzl/generator-json-schema",
+            () => Promise.resolve().then(() => (init_dist(), dist_exports))
+          );
           const gen = new JsonSchemaGenerator2(analysis);
           const target = g.path ?? "src/validators/json-schema";
           const files = await gen.generate({
@@ -1069,20 +1117,15 @@ program.command("generate").description("Run configured generators (drzl.config.
           files.forEach((f) => console.log("  -", import_chalk2.default.cyan(f)));
         } catch (e) {
           progress.stop();
-          console.error(
-            import_chalk2.default.red("JSON Schema generator missing."),
-            import_chalk2.default.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(import_chalk2.default.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(
@@ -1093,11 +1136,7 @@ program.command("generate").description("Run configured generators (drzl.config.
           files.forEach((f) => console.log("  -", import_chalk2.default.cyan(f)));
         } catch (e) {
           progress.stop();
-          console.error(
-            import_chalk2.default.red("TypeBox generator missing."),
-            import_chalk2.default.yellow("\nInstall with: npm install @drzl/generator-typebox")
-          );
-          console.error(import_chalk2.default.gray("Error details:"), e?.message ?? e);
+          reportGeneratorFailure(g.kind, e);
           process.exit(1);
         }
       }
@@ -1281,7 +1320,10 @@ program.command("watch").description("Watch schema and regenerate on changes").o
           newFiles.push(...files);
         } 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({
@@ -1299,16 +1341,15 @@ program.command("watch").description("Watch schema and regenerate on changes").o
             );
             newFiles.push(...files);
           } catch (e) {
-            console.error(
-              import_chalk2.default.red("Service generator missing."),
-              import_chalk2.default.yellow("\nInstall with: npm install @drzl/generator-service")
-            );
-            console.error(import_chalk2.default.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({
@@ -1326,16 +1367,15 @@ program.command("watch").description("Watch schema and regenerate on changes").o
             );
             newFiles.push(...files);
           } catch (e) {
-            console.error(
-              import_chalk2.default.red("Zod generator missing."),
-              import_chalk2.default.yellow("\nInstall with: npm install @drzl/generator-zod")
-            );
-            console.error(import_chalk2.default.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({
@@ -1353,16 +1393,15 @@ program.command("watch").description("Watch schema and regenerate on changes").o
             );
             newFiles.push(...files);
           } catch (e) {
-            console.error(
-              import_chalk2.default.red("Valibot generator missing."),
-              import_chalk2.default.yellow("\nInstall with: npm install @drzl/generator-valibot")
-            );
-            console.error(import_chalk2.default.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({
@@ -1380,11 +1419,7 @@ program.command("watch").description("Watch schema and regenerate on changes").o
             );
             newFiles.push(...files);
           } catch (e) {
-            console.error(
-              import_chalk2.default.red("ArkType generator missing."),
-              import_chalk2.default.yellow("\nInstall with: npm install @drzl/generator-arktype")
-            );
-            console.error(import_chalk2.default.gray("Error details:"), e?.message ?? e);
+            reportGeneratorFailure(g.kind, e);
             return;
           }
         }