@lovrabet/cli-framework 1.0.1-beta.1 → 1.0.2

package/lib/framework/output.d.ts

@@ -6,8 +6,8 @@
  * - `compress` — Single-line JSON envelope (default).
  * - `pretty`  — Human-readable plain-text layout.
  *
- * Supports `--jq` post-filtering in `json` / `compress` modes via the
- * bundled `node-jq` executable (or a `jq` binary on PATH).
+ * Supports `--jq` post-filtering in `json` / `compress` modes via a jq binary
+ * resolved from `JQ_PATH` or the system `PATH`.
  */
 import type { CommandResult, OutputFormat, Risk } from "./types.js";
 /** Shared options passed through every internal print function. */

package/lib/framework/output.js

@@ -6,8 +6,8 @@
  * - `compress` — Single-line JSON envelope (default).
  * - `pretty`  — Human-readable plain-text layout.
  *
- * Supports `--jq` post-filtering in `json` / `compress` modes via the
- * bundled `node-jq` executable (or a `jq` binary on PATH).
+ * Supports `--jq` post-filtering in `json` / `compress` modes via a jq binary
+ * resolved from `JQ_PATH` or the system `PATH`.
  */
 import chalk from "chalk";
 import { createJqFilter } from "../utils/apply-jq-filter.js";

package/lib/utils/apply-jq-filter.d.ts

@@ -7,12 +7,66 @@
  * or `--format compress`.
  *
  * The jq binary is resolved in this order:
- * 1. Bundled `jq` shipped with the `node-jq` npm package (platform-specific).
- * 2. A `jq` executable found on `PATH`.
+ * 1. `JQ_PATH` when explicitly provided.
+ * 2. An optional bundled jq candidate path injected by the host CLI.
+ * 3. A `jq` executable found on `PATH`.
  *
  * @module apply-jq-filter
  */
 import type { CliErrorsShape } from "../errors.js";
+/** Source used to resolve the jq binary. */
+export type JqBinarySource = "env" | "bundled" | "path";
+/**
+ * Options controlling how a jq executable is discovered.
+ */
+export interface JqBinaryResolverOptions {
+    /**
+     * Explicit bundled jq candidates supplied by the host CLI.
+     *
+     * The first existing path wins.
+     */
+    bundledJqPaths?: readonly string[];
+    /**
+     * Environment map used for resolution.
+     *
+     * Defaults to `process.env`; exposed for tests.
+     */
+    env?: NodeJS.ProcessEnv;
+}
+/**
+ * Result returned by jq binary resolution.
+ */
+export interface ResolvedJqBinary {
+    /** Command or absolute file path passed to `execFileSync`. */
+    command: string;
+    /** Resolution source used for the command. */
+    source: JqBinarySource;
+}
+/**
+ * Thrown when `JQ_PATH` is present but does not point to an existing file.
+ */
+export declare class JqBinaryResolutionError extends Error {
+    readonly jqPath: string;
+    /** Stable machine-readable error code. */
+    code: string;
+    /**
+     * @param jqPath - Invalid path supplied through `JQ_PATH`.
+     */
+    constructor(jqPath: string);
+}
+/**
+ * Resolves the jq executable for the current process.
+ *
+ * Resolution order:
+ * 1. `JQ_PATH`
+ * 2. injected bundled jq candidates
+ * 3. `jq` on `PATH`
+ *
+ * @param options - Resolution options including env overrides and bundled paths.
+ * @returns The command/path to execute and its source.
+ * @throws {@link JqBinaryResolutionError} if `JQ_PATH` is set but missing.
+ */
+export declare function resolveJqBinary(options?: JqBinaryResolverOptions): ResolvedJqBinary;
 /**
  * Creates a jq filter function bound to a specific error factory.
  *
@@ -21,6 +75,7 @@ import type { CliErrorsShape } from "../errors.js";
  * throws a typed {@link CliError} with code `"validation_error"`.
  *
  * @param cliErrors - Error factory providing `validation` for error reporting.
+ * @param options - Optional jq binary resolution customizations.
  * @returns An `applyJqFilter(jsonInput, expr)` function.
  *
  * @example
@@ -30,4 +85,4 @@ import type { CliErrorsShape } from "../errors.js";
  * // filtered === "1\n"
  * ```
  */
-export declare function createJqFilter(cliErrors: Pick<CliErrorsShape, "validation">): (jsonInput: string, expr: string) => string;
+export declare function createJqFilter(cliErrors: Pick<CliErrorsShape, "validation">, options?: JqBinaryResolverOptions): (jsonInput: string, expr: string) => string;

package/lib/utils/apply-jq-filter.js

@@ -7,17 +7,62 @@
  * or `--format compress`.
  *
  * The jq binary is resolved in this order:
- * 1. Bundled `jq` shipped with the `node-jq` npm package (platform-specific).
- * 2. A `jq` executable found on `PATH`.
+ * 1. `JQ_PATH` when explicitly provided.
+ * 2. An optional bundled jq candidate path injected by the host CLI.
+ * 3. A `jq` executable found on `PATH`.
  *
  * @module apply-jq-filter
  */
 import { execFileSync } from "node:child_process";
 import { existsSync } from "node:fs";
-import { createRequire } from "node:module";
-import path from "node:path";
 /** Maximum stdout buffer for the jq process (50 MB). */
 const MAX_BUFFER = 50 * 1024 * 1024;
+/** Error code used when `JQ_PATH` points to a missing executable. */
+const INVALID_JQ_PATH_CODE = "jq_path_invalid";
+/**
+ * Thrown when `JQ_PATH` is present but does not point to an existing file.
+ */
+export class JqBinaryResolutionError extends Error {
+    jqPath;
+    /** Stable machine-readable error code. */
+    code = INVALID_JQ_PATH_CODE;
+    /**
+     * @param jqPath - Invalid path supplied through `JQ_PATH`.
+     */
+    constructor(jqPath) {
+        super(`JQ_PATH points to a missing jq executable: ${jqPath}`);
+        this.jqPath = jqPath;
+        this.name = "JqBinaryResolutionError";
+    }
+}
+/**
+ * Resolves the jq executable for the current process.
+ *
+ * Resolution order:
+ * 1. `JQ_PATH`
+ * 2. injected bundled jq candidates
+ * 3. `jq` on `PATH`
+ *
+ * @param options - Resolution options including env overrides and bundled paths.
+ * @returns The command/path to execute and its source.
+ * @throws {@link JqBinaryResolutionError} if `JQ_PATH` is set but missing.
+ */
+export function resolveJqBinary(options = {}) {
+    const env = options.env ?? process.env;
+    const jqPath = readJqPath(env);
+    if (jqPath) {
+        if (!existsSync(jqPath)) {
+            throw new JqBinaryResolutionError(jqPath);
+        }
+        return { command: jqPath, source: "env" };
+    }
+    for (const candidate of options.bundledJqPaths ?? []) {
+        if (candidate && existsSync(candidate)) {
+            return { command: candidate, source: "bundled" };
+        }
+    }
+    return { command: "jq", source: "path" };
+}
 /**
  * Creates a jq filter function bound to a specific error factory.
  *
@@ -26,6 +71,7 @@ const MAX_BUFFER = 50 * 1024 * 1024;
  * throws a typed {@link CliError} with code `"validation_error"`.
  *
  * @param cliErrors - Error factory providing `validation` for error reporting.
+ * @param options - Optional jq binary resolution customizations.
  * @returns An `applyJqFilter(jsonInput, expr)` function.
  *
  * @example
@@ -35,7 +81,7 @@ const MAX_BUFFER = 50 * 1024 * 1024;
  * // filtered === "1\n"
  * ```
  */
-export function createJqFilter(cliErrors) {
+export function createJqFilter(cliErrors, options = {}) {
     /**
      * Applies a jq expression filter to a JSON input string.
      *
@@ -48,7 +94,17 @@ export function createJqFilter(cliErrors) {
      *          - The input is not valid JSON.
      */
     return function applyJqFilter(jsonInput, expr) {
-        const jqCmd = resolveJqBinary();
+        const env = options.env ?? process.env;
+        let jqCmd = "jq";
+        try {
+            jqCmd = resolveJqBinary(options).command;
+        }
+        catch (err) {
+            if (err instanceof JqBinaryResolutionError) {
+                throw cliErrors.validation(err.message, "Point JQ_PATH to a valid jq executable, unset it, or rely on the bundled/system jq.");
+            }
+            throw err;
+        }
         try {
             return execFileSync(jqCmd, [expr], {
                 input: jsonInput,
@@ -59,11 +115,11 @@ export function createJqFilter(cliErrors) {
         }
         catch (err) {
             const e = err;
-            // jq binary not found
             if (e.code === "ENOENT") {
-                throw cliErrors.validation("--jq needs a jq binary. Bundled path (from node-jq) was not found and `jq` is not on PATH. " +
-                    "Reinstall dependencies (allow install scripts), set JQ_PATH to a jq executable, " +
-                    "or install jq: https://jqlang.org/", "e.g. `brew install jq` — or `npm install` with scripts enabled so node-jq can download jq");
+                throw cliErrors.validation(`--jq needs a jq binary. Checked ${describeResolutionTargets(env, options.bundledJqPaths)}.`, describeMissingBinaryHint(options.bundledJqPaths));
+            }
+            if (e.code === "EACCES") {
+                throw cliErrors.validation(`jq binary is not executable: ${jqCmd}`, "Fix the file permissions, point JQ_PATH to an executable jq binary, or install jq on PATH.");
             }
             const stderr = e.stderr?.toString?.().trim() ?? "";
             const fallback = (e.message ?? String(err)).trim();
@@ -74,26 +130,48 @@ export function createJqFilter(cliErrors) {
     };
 }
 /**
- * Resolves the path to the jq executable.
+ * Reads a normalized `JQ_PATH` value from the provided environment.
  *
- * Resolution order:
- * 1. Bundled `jq` from the `node-jq` npm package (platform-specific binary).
- * 2. `jq` / `jq.exe` found on `PATH` via the `which` equivalent.
+ * @param env - Environment variables to inspect.
+ * @returns Trimmed `JQ_PATH` when set; otherwise `undefined`.
+ */
+function readJqPath(env) {
+    const raw = env.JQ_PATH;
+    if (typeof raw !== "string")
+        return undefined;
+    const trimmed = raw.trim();
+    return trimmed.length > 0 ? trimmed : undefined;
+}
+/**
+ * Builds a user-facing description of the jq binary search order.
  *
- * @returns Absolute path to the jq executable.
+ * @param env - Environment variables used for this resolution.
+ * @param bundledJqPaths - Bundled jq candidates supplied by the host CLI.
+ * @returns Human-readable search target description.
  */
-function resolveJqBinary() {
-    try {
-        const require = createRequire(import.meta.url);
-        const pkgDir = path.dirname(require.resolve("node-jq/package.json"));
-        const binDir = path.join(pkgDir, "bin");
-        const name = process.platform === "win32" ? "jq.exe" : "jq";
-        const bundled = path.join(binDir, name);
-        if (existsSync(bundled))
-            return bundled;
+function describeResolutionTargets(env, bundledJqPaths) {
+    const targets = ["`jq` on PATH"];
+    if ((bundledJqPaths?.length ?? 0) > 0) {
+        targets.unshift("the bundled jq shipped with this CLI");
     }
-    catch {
-        // node-jq not installed or resolution failed — fall through to PATH
+    if (!readJqPath(env)) {
+        targets.unshift("`JQ_PATH`");
+    }
+    if (targets.length === 1)
+        return targets[0] ?? "`jq` on PATH";
+    if (targets.length === 2)
+        return `${targets[0]} and ${targets[1]}`;
+    return `${targets.slice(0, -1).join(", ")}, and ${targets.at(-1)}`;
+}
+/**
+ * Builds the remediation hint shown when jq cannot be found.
+ *
+ * @param bundledJqPaths - Bundled jq candidates supplied by the host CLI.
+ * @returns Human-readable remediation hint.
+ */
+function describeMissingBinaryHint(bundledJqPaths) {
+    if ((bundledJqPaths?.length ?? 0) > 0) {
+        return "Set JQ_PATH to a valid jq executable, reinstall the CLI if its bundled jq is missing, or install jq on PATH.";
     }
-    return "jq";
+    return "Set JQ_PATH to a valid jq executable or install jq on PATH.";
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lovrabet/cli-framework",
-  "version": "1.0.1-beta.1",
+  "version": "1.0.2",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -24,12 +24,11 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "chalk": "^5.6.2",
-    "node-jq": "^6.3.1"
+    "chalk": "^5.6.2"
   },
   "devDependencies": {
     "@types/node": "^24.5.2",
     "typescript": "latest",
     "vitest": "^4.1.2"
   }
-}
+}