@drzl/cli 4.14.1 → 4.14.3

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+"use strict";var __drzlModuleUrl = require("node:url").pathToFileURL(__filename).href;
 "use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -55,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",
@@ -67,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);
@@ -81,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;
     }
@@ -101,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);
@@ -278,15 +293,15 @@ var init_dist = __esm({
       }
       async generate(opts) {
         const fs3 = await import("fs/promises");
-        const path5 = await import("path");
-        const out = path5.resolve(process.cwd(), opts.outDir);
+        const path6 = await import("path");
+        const out = path6.resolve(process.cwd(), opts.outDir);
         const files = [];
         await fs3.mkdir(out, { recursive: true });
         const affix = (0, import_validation_core2.resolveAffix)(opts);
         const fileSuffix = opts.fileSuffix ?? DEFAULT_FILE_SUFFIX;
         const target = opts.target ?? "draft-2020-12";
         for (const table of this.analysis.tables) {
-          const filePath = path5.join(out, (0, import_validation_core2.moduleFileName)(table.tsName, fileSuffix));
+          const filePath = path6.join(out, (0, import_validation_core2.moduleFileName)(table.tsName, fileSuffix));
           const code = renderTableModule(table, affix, target, !!opts.applyDefaults);
           const formatted = await (0, import_validation_core2.formatCode)(
             buildHeader(opts.outputHeader) + code,
@@ -301,7 +316,7 @@ var init_dist = __esm({
             target,
             applyDefaults: !!opts.applyDefaults
           });
-          const componentsPath = path5.join(out, "components.ts");
+          const componentsPath = path6.join(out, "components.ts");
           const code = `export const components = ${JSON.stringify(doc, null, 2)} as const;
 `;
           await fs3.writeFile(
@@ -311,7 +326,7 @@ var init_dist = __esm({
           );
           files.push(componentsPath);
         }
-        const indexPath = path5.join(out, "index.ts");
+        const indexPath = path6.join(out, "index.ts");
         const index = this.analysis.tables.map((t) => `export * from '${(0, import_validation_core2.moduleSpecifier)(t.tsName, fileSuffix, opts.importExtension)}';`).concat(
           opts.components ? [`export * from './components${opts.importExtension === "none" ? "" : ".js"}';`] : []
         ).join("\n") + "\n";
@@ -344,7 +359,7 @@ var import_chalk2 = __toESM(require("chalk"), 1);
 var import_chokidar = __toESM(require("chokidar"), 1);
 var import_cli_progress = __toESM(require("cli-progress"), 1);
 var import_commander = require("commander");
-var path4 = __toESM(require("path"), 1);
+var path5 = __toESM(require("path"), 1);
 var import_ora = __toESM(require("ora"), 1);
 
 // src/validation-options.ts
@@ -836,9 +851,42 @@ function writeCache(payload) {
   (0, import_node_fs2.writeFileSync)(CACHE_FILE, JSON.stringify(payload, null, 2), "utf8");
 }
 
+// src/version.ts
+var import_node_fs3 = require("fs");
+var path4 = __toESM(require("path"), 1);
+var import_node_url = require("url");
+var PACKAGE_NAME = "@drzl/cli";
+function moduleDir() {
+  return path4.dirname((0, import_node_url.fileURLToPath)(__drzlModuleUrl));
+}
+function readVersionFrom(manifestPath) {
+  let raw;
+  try {
+    raw = (0, import_node_fs3.readFileSync)(manifestPath, "utf8");
+  } catch (e) {
+    throw new Error(
+      `${PACKAGE_NAME} cannot read its own version: no manifest at ${manifestPath} (${e?.message ?? String(e)}).`
+    );
+  }
+  const manifest = JSON.parse(raw);
+  if (manifest.name !== PACKAGE_NAME) {
+    throw new Error(
+      `${PACKAGE_NAME} looked for its own version in ${manifestPath} and found ${JSON.stringify(manifest.name)}, so this build is not sitting where it thinks it is.`
+    );
+  }
+  if (typeof manifest.version !== "string" || manifest.version.length === 0) {
+    throw new Error(`${manifestPath} declares no version, so there is nothing to report.`);
+  }
+  return manifest.version;
+}
+function readCliVersion() {
+  return readVersionFrom(path4.join(moduleDir(), "..", "package.json"));
+}
+var CLI_VERSION = readCliVersion();
+
 // src/cli.ts
 var program = new import_commander.Command();
-program.name("drzl").description("DRZL - Drizzle Developer Toolkit").version("0.0.1");
+program.name("drzl").description("DRZL - Drizzle Developer Toolkit").version(CLI_VERSION);
 program.addHelpText(
   "afterAll",
   `
@@ -1078,7 +1126,7 @@ 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} ${import_chalk2.default.yellow(d.status.padEnd(8))} ${path4.relative(process.cwd(), d.file)}`
+            `  ${mark} ${import_chalk2.default.yellow(d.status.padEnd(8))} ${path5.relative(process.cwd(), d.file)}`
           );
         }
         console.error(
@@ -1130,10 +1178,10 @@ program.command("watch").description("Watch schema and regenerate on changes").o
     process.exit(2);
     return;
   }
-  const abs = (p) => path4.resolve(process.cwd(), p);
+  const abs = (p) => path5.resolve(process.cwd(), p);
   const isInside = (child, parent) => {
-    const rel = path4.relative(parent, child);
-    return !!rel && !rel.startsWith("..") && !path4.isAbsolute(rel);
+    const rel = path5.relative(parent, child);
+    return !!rel && !rel.startsWith("..") && !path5.isAbsolute(rel);
   };
   const ignoredOutDirs = new Set(computeGeneratorOutputDirs(cfg).map(abs));
   const currentTargets = new Set(computeWatchTargets(cfg).map(abs));
@@ -1158,7 +1206,7 @@ program.command("watch").description("Watch schema and regenerate on changes").o
       if (full === dir || isInside(full, dir)) return true;
     }
     if (stats?.isDirectory()) return false;
-    const ext = path4.extname(full);
+    const ext = path5.extname(full);
     if (!ext) return false;
     return !WATCHED_EXTENSIONS.has(ext);
   };
@@ -1393,7 +1441,7 @@ program.command("watch").description("Watch schema and regenerate on changes").o
   } else {
     console.log(
       import_chalk2.default.gray(
-        "Watching:\n  " + Array.from(currentTargets).map((p) => path4.relative(process.cwd(), p)).join("\n  ")
+        "Watching:\n  " + Array.from(currentTargets).map((p) => path5.relative(process.cwd(), p)).join("\n  ")
       )
     );
   }
@@ -1402,8 +1450,8 @@ program.command("watch").description("Watch schema and regenerate on changes").o
 });
 program.command("init").description("Scaffold a drzl.config.ts").option("-y, --yes", "accept defaults").action(async (_opts) => {
   const fs3 = await import("fs/promises");
-  const path5 = await import("path");
-  const target = path5.resolve(process.cwd(), "drzl.config.ts");
+  const path6 = await import("path");
+  const target = path6.resolve(process.cwd(), "drzl.config.ts");
   const template = `export default {
   schema: 'src/db/schema.ts',
   outDir: 'src/api',