@drzl/validation-core 3.15.1 → 3.16.1

package/dist/index.cjs

@@ -60,6 +60,11 @@ __export(index_exports, {
   validateAffix: () => validateAffix
 });
 module.exports = __toCommonJS(index_exports);
+var import_node_child_process = require("child_process");
+var import_node_fs2 = require("fs");
+var import_node_module = require("module");
+var import_node_path2 = __toESM(require("path"), 1);
+var import_node_url = require("url");
 
 // src/checks.ts
 var COMPARISON = /^\s*([A-Za-z_][A-Za-z0-9_]*)\s*(>=|<=|<>|!=|>|<|=)\s*(.+?)\s*$/;
@@ -394,12 +399,12 @@ var SUFFIX_RE = /^[A-Za-z0-9_$]+$/;
 function validateAffix(affix, schemaSuffix) {
   const issues = [];
   if (!affix) return issues;
-  const checkOne = (value, path, kind) => {
+  const checkOne = (value, path2, kind) => {
     if (value === "") return;
     const ok = kind === "prefix" ? PREFIX_RE.test(value) : SUFFIX_RE.test(value);
     if (ok) return;
     issues.push({
-      path,
+      path: path2,
       message: `${JSON.stringify(value)} cannot appear in a TypeScript identifier. Use only letters, digits, "_" and "$"` + (kind === "prefix" ? ", and do not start with a digit." : ".")
     });
   };
@@ -513,32 +518,98 @@ function updateColumns(table) {
 function selectColumns(table) {
   return table.columns;
 }
+var reportedEngines = /* @__PURE__ */ new Set();
+var ENGINE_PACKAGE = { prettier: "prettier", biome: "@biomejs/biome" };
+function reportUnusableFormatter(engine, cause) {
+  if (reportedEngines.has(engine)) return;
+  reportedEngines.add(engine);
+  const pkg = ENGINE_PACKAGE[engine];
+  const remedy = engine === "prettier" ? 'Install prettier, which is an optional peer of @drzl/validation-core, or set format.engine to "auto" to accept whatever formatter is present.' : 'Install @biomejs/biome in the project being generated into, or set format.engine to "auto" or "prettier".';
+  const reason = cause instanceof Error ? cause.message : String(cause);
+  console.warn(
+    `[drzl] format.engine is "${engine}" but ${pkg} could not be used, so the generated files were left unformatted. ${remedy} Reason: ${reason}`
+  );
+}
+function nearestExistingDir(from) {
+  let dir = import_node_path2.default.dirname(import_node_path2.default.resolve(from));
+  for (; ; ) {
+    try {
+      if ((0, import_node_fs2.statSync)(dir).isDirectory()) return dir;
+    } catch {
+    }
+    const parent = import_node_path2.default.dirname(dir);
+    if (parent === dir) return dir;
+    dir = parent;
+  }
+}
+function biomeBinary(startDir) {
+  const require_ = (0, import_node_module.createRequire)((0, import_node_url.pathToFileURL)(import_node_path2.default.join(startDir, "noop.js")));
+  const manifestPath = require_.resolve("@biomejs/biome/package.json", {
+    paths: [startDir, process.cwd()]
+  });
+  const manifest = JSON.parse((0, import_node_fs2.readFileSync)(manifestPath, "utf8"));
+  const relative = typeof manifest.bin === "string" ? manifest.bin : manifest.bin?.biome;
+  if (typeof relative !== "string") {
+    throw new Error(`@biomejs/biome at ${manifestPath} declares no biome binary`);
+  }
+  const binary = import_node_path2.default.resolve(import_node_path2.default.dirname(manifestPath), relative);
+  if (!(0, import_node_fs2.existsSync)(binary)) {
+    throw new Error(`@biomejs/biome declares a binary at ${relative}, and there is nothing there`);
+  }
+  return binary;
+}
+function formatBiome(code, filePath, configAnchor) {
+  const cwd = nearestExistingDir(configAnchor);
+  const binary = biomeBinary(nearestExistingDir(filePath));
+  return new Promise((resolve, reject) => {
+    const child = (0, import_node_child_process.spawn)(
+      process.execPath,
+      [binary, "format", `--stdin-file-path=${import_node_path2.default.basename(filePath)}`],
+      { cwd, stdio: ["pipe", "pipe", "pipe"] }
+    );
+    let out = "";
+    let err = "";
+    child.stdout.setEncoding("utf8");
+    child.stdout.on("data", (chunk) => out += chunk);
+    child.stderr.setEncoding("utf8");
+    child.stderr.on("data", (chunk) => err += chunk);
+    child.on("error", reject);
+    child.stdin.on("error", () => {
+    });
+    child.on("close", (status) => {
+      if (status !== 0) {
+        const detail = err.trim().split("\n")[0] || out.trim().split("\n")[0] || "no output";
+        reject(new Error(`biome format exited with ${status}: ${detail}`));
+        return;
+      }
+      if (out === "" && code !== "") {
+        reject(new Error("biome format exited 0 but returned nothing"));
+        return;
+      }
+      resolve(out);
+    });
+    child.stdin.end(code);
+  });
+}
 async function formatCode(code, filePath, fmt) {
   if (fmt && fmt.enabled === false) return code;
   const engine = fmt?.engine ?? "auto";
-  try {
-    if (engine === "prettier" || engine === "auto") {
+  if (engine === "prettier" || engine === "auto") {
+    try {
       const prettier = await import("prettier");
       const cfgRef = fmt?.configPath ?? filePath;
       const cfg = await prettier.resolveConfig(cfgRef).catch(() => null);
       return prettier.format(code, { ...cfg ?? {}, parser: "typescript", filepath: filePath });
+    } catch (err) {
+      if (engine === "prettier") reportUnusableFormatter("prettier", err);
     }
-  } catch {
   }
-  try {
-    if (engine === "biome" || engine === "auto") {
-      const dynamicImport = Function("s", "return import(s)");
-      const biome = await dynamicImport("@biomejs/biome").catch(() => null);
-      if (biome?.formatContent) {
-        const res = await biome.formatContent(code, { filePath });
-        return (res && (res.content || res.formatted)) ?? code;
-      }
-      if (biome?.format) {
-        const res = await biome.format(code, { filePath });
-        return res ?? code;
-      }
+  if (engine === "biome" || engine === "auto") {
+    try {
+      return await formatBiome(code, filePath, fmt?.configPath ?? filePath);
+    } catch (err) {
+      if (engine === "biome") reportUnusableFormatter("biome", err);
     }
-  } catch {
   }
   return code;
 }

package/dist/index.d.cts

@@ -512,9 +512,21 @@ declare function selectColumns(table: Table): Column[];
  * anyone installing @drzl/cli. It is `--external` in every build script that can reach it, and
  * no-bundled-formatter.spec.ts builds those scripts and checks.
  *
- * Neither absence is an error. A consumer with no formatter gets the code as rendered, which is
- * valid TypeScript that merely looks worse, and losing generated files at the last step would be
- * a far worse trade than losing their whitespace.
+ * An absent formatter is never fatal. A consumer with no formatter gets the code as rendered,
+ * which is valid TypeScript that merely looks worse, and losing generated files at the last step
+ * would be a far worse trade than losing their whitespace.
+ *
+ * Whether it is worth saying so depends on what was asked for, which is the difference between the
+ * two branches below. `engine: 'auto'` asked for whatever happens to be installed, so finding
+ * nothing is an outcome and the code comes back unchanged in silence. Naming an engine is a
+ * request, and an unmet request that produces neither formatted output nor a message reads as
+ * "this is fine" when it is not: the consumer configured something, it did not happen, and nothing
+ * in the run says which. So a named engine that cannot be loaded warns on stderr and still returns
+ * the code, rather than throwing. Throwing would lose a whole generation over whitespace, which is
+ * a bad trade even now that the CLI reports the reason faithfully: it used to answer any throw at
+ * all with "<name> generator missing. Install with: npm install @drzl/generator-<name>", naming a
+ * package the consumer already had, and it now separates an unresolvable package from a generator
+ * that ran and failed.
  */
 declare function formatCode(code: string, filePath: string, fmt?: FormatOptions): Promise<any>;
 

package/dist/index.d.ts

@@ -512,9 +512,21 @@ declare function selectColumns(table: Table): Column[];
  * anyone installing @drzl/cli. It is `--external` in every build script that can reach it, and
  * no-bundled-formatter.spec.ts builds those scripts and checks.
  *
- * Neither absence is an error. A consumer with no formatter gets the code as rendered, which is
- * valid TypeScript that merely looks worse, and losing generated files at the last step would be
- * a far worse trade than losing their whitespace.
+ * An absent formatter is never fatal. A consumer with no formatter gets the code as rendered,
+ * which is valid TypeScript that merely looks worse, and losing generated files at the last step
+ * would be a far worse trade than losing their whitespace.
+ *
+ * Whether it is worth saying so depends on what was asked for, which is the difference between the
+ * two branches below. `engine: 'auto'` asked for whatever happens to be installed, so finding
+ * nothing is an outcome and the code comes back unchanged in silence. Naming an engine is a
+ * request, and an unmet request that produces neither formatted output nor a message reads as
+ * "this is fine" when it is not: the consumer configured something, it did not happen, and nothing
+ * in the run says which. So a named engine that cannot be loaded warns on stderr and still returns
+ * the code, rather than throwing. Throwing would lose a whole generation over whitespace, which is
+ * a bad trade even now that the CLI reports the reason faithfully: it used to answer any throw at
+ * all with "<name> generator missing. Install with: npm install @drzl/generator-<name>", naming a
+ * package the consumer already had, and it now separates an unresolvable package from a generator
+ * that ran and failed.
  */
 declare function formatCode(code: string, filePath: string, fmt?: FormatOptions): Promise<any>;
 

package/dist/index.js

@@ -1,3 +1,10 @@
+// src/index.ts
+import { spawn } from "child_process";
+import { existsSync, readFileSync, statSync } from "fs";
+import { createRequire } from "module";
+import path from "path";
+import { pathToFileURL } from "url";
+
 // src/checks.ts
 var COMPARISON = /^\s*([A-Za-z_][A-Za-z0-9_]*)\s*(>=|<=|<>|!=|>|<|=)\s*(.+?)\s*$/;
 var IN_LIST = /^\s*([A-Za-z_][A-Za-z0-9_]*)\s+IN\s*\((.+)\)\s*$/i;
@@ -331,12 +338,12 @@ var SUFFIX_RE = /^[A-Za-z0-9_$]+$/;
 function validateAffix(affix, schemaSuffix) {
   const issues = [];
   if (!affix) return issues;
-  const checkOne = (value, path, kind) => {
+  const checkOne = (value, path2, kind) => {
     if (value === "") return;
     const ok = kind === "prefix" ? PREFIX_RE.test(value) : SUFFIX_RE.test(value);
     if (ok) return;
     issues.push({
-      path,
+      path: path2,
       message: `${JSON.stringify(value)} cannot appear in a TypeScript identifier. Use only letters, digits, "_" and "$"` + (kind === "prefix" ? ", and do not start with a digit." : ".")
     });
   };
@@ -450,32 +457,98 @@ function updateColumns(table) {
 function selectColumns(table) {
   return table.columns;
 }
+var reportedEngines = /* @__PURE__ */ new Set();
+var ENGINE_PACKAGE = { prettier: "prettier", biome: "@biomejs/biome" };
+function reportUnusableFormatter(engine, cause) {
+  if (reportedEngines.has(engine)) return;
+  reportedEngines.add(engine);
+  const pkg = ENGINE_PACKAGE[engine];
+  const remedy = engine === "prettier" ? 'Install prettier, which is an optional peer of @drzl/validation-core, or set format.engine to "auto" to accept whatever formatter is present.' : 'Install @biomejs/biome in the project being generated into, or set format.engine to "auto" or "prettier".';
+  const reason = cause instanceof Error ? cause.message : String(cause);
+  console.warn(
+    `[drzl] format.engine is "${engine}" but ${pkg} could not be used, so the generated files were left unformatted. ${remedy} Reason: ${reason}`
+  );
+}
+function nearestExistingDir(from) {
+  let dir = path.dirname(path.resolve(from));
+  for (; ; ) {
+    try {
+      if (statSync(dir).isDirectory()) return dir;
+    } catch {
+    }
+    const parent = path.dirname(dir);
+    if (parent === dir) return dir;
+    dir = parent;
+  }
+}
+function biomeBinary(startDir) {
+  const require_ = createRequire(pathToFileURL(path.join(startDir, "noop.js")));
+  const manifestPath = require_.resolve("@biomejs/biome/package.json", {
+    paths: [startDir, process.cwd()]
+  });
+  const manifest = JSON.parse(readFileSync(manifestPath, "utf8"));
+  const relative = typeof manifest.bin === "string" ? manifest.bin : manifest.bin?.biome;
+  if (typeof relative !== "string") {
+    throw new Error(`@biomejs/biome at ${manifestPath} declares no biome binary`);
+  }
+  const binary = path.resolve(path.dirname(manifestPath), relative);
+  if (!existsSync(binary)) {
+    throw new Error(`@biomejs/biome declares a binary at ${relative}, and there is nothing there`);
+  }
+  return binary;
+}
+function formatBiome(code, filePath, configAnchor) {
+  const cwd = nearestExistingDir(configAnchor);
+  const binary = biomeBinary(nearestExistingDir(filePath));
+  return new Promise((resolve, reject) => {
+    const child = spawn(
+      process.execPath,
+      [binary, "format", `--stdin-file-path=${path.basename(filePath)}`],
+      { cwd, stdio: ["pipe", "pipe", "pipe"] }
+    );
+    let out = "";
+    let err = "";
+    child.stdout.setEncoding("utf8");
+    child.stdout.on("data", (chunk) => out += chunk);
+    child.stderr.setEncoding("utf8");
+    child.stderr.on("data", (chunk) => err += chunk);
+    child.on("error", reject);
+    child.stdin.on("error", () => {
+    });
+    child.on("close", (status) => {
+      if (status !== 0) {
+        const detail = err.trim().split("\n")[0] || out.trim().split("\n")[0] || "no output";
+        reject(new Error(`biome format exited with ${status}: ${detail}`));
+        return;
+      }
+      if (out === "" && code !== "") {
+        reject(new Error("biome format exited 0 but returned nothing"));
+        return;
+      }
+      resolve(out);
+    });
+    child.stdin.end(code);
+  });
+}
 async function formatCode(code, filePath, fmt) {
   if (fmt && fmt.enabled === false) return code;
   const engine = fmt?.engine ?? "auto";
-  try {
-    if (engine === "prettier" || engine === "auto") {
+  if (engine === "prettier" || engine === "auto") {
+    try {
       const prettier = await import("prettier");
       const cfgRef = fmt?.configPath ?? filePath;
       const cfg = await prettier.resolveConfig(cfgRef).catch(() => null);
       return prettier.format(code, { ...cfg ?? {}, parser: "typescript", filepath: filePath });
+    } catch (err) {
+      if (engine === "prettier") reportUnusableFormatter("prettier", err);
     }
-  } catch {
   }
-  try {
-    if (engine === "biome" || engine === "auto") {
-      const dynamicImport = Function("s", "return import(s)");
-      const biome = await dynamicImport("@biomejs/biome").catch(() => null);
-      if (biome?.formatContent) {
-        const res = await biome.formatContent(code, { filePath });
-        return (res && (res.content || res.formatted)) ?? code;
-      }
-      if (biome?.format) {
-        const res = await biome.format(code, { filePath });
-        return res ?? code;
-      }
+  if (engine === "biome" || engine === "auto") {
+    try {
+      return await formatBiome(code, filePath, fmt?.configPath ?? filePath);
+    } catch (err) {
+      if (engine === "biome") reportUnusableFormatter("biome", err);
     }
-  } catch {
   }
   return code;
 }

package/package.json

@@ -1,17 +1,30 @@
 {
   "name": "@drzl/validation-core",
-  "version": "3.15.1",
+  "version": "3.16.1",
   "private": false,
   "license": "Apache-2.0",
   "type": "module",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      },
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
+      }
+    }
+  },
   "files": [
     "dist"
   ],
   "sideEffects": false,
   "dependencies": {
-    "@drzl/analyzer": "^1.15.0"
+    "@drzl/analyzer": "^1.17.1"
   },
   "peerDependencies": {
     "prettier": ">=3"