@vlandoss/run-run 0.5.2 → 0.5.3-git-87ebfca.0

package/dist/cli.usage.kdl

@@ -1,7 +1,7 @@
 // @generated by @usage-spec/commander from Commander.js metadata
 name rr
 bin rr
-version "0.5.2"
+version "0.5.3-git-87ebfca.0"
 usage "[options] <command...>"
 flag --usage help="print KDL spec for this CLI (https://kdl.dev)"
 cmd completion help="print shell completion script 🐚 (usage)" {

package/dist/run.mjs

@@ -1,18 +1,14 @@
-import { createRequire } from "node:module";
 import path from "node:path";
-import { colorize, createPkg, createShellService, cwd, dirnameOf, isCI, palette, run, text } from "@vlandoss/clibuddy";
+import { colorize, createPkg, createShellService, cwd, dirnameOf, isCI, palette, resolveBinPath, run, text } from "@vlandoss/clibuddy";
 import { Argument, Option, createCommand } from "commander";
 import fs from "node:fs";
 import os from "node:os";
 import { lilconfig } from "lilconfig";
 import { createLoggy } from "@vlandoss/loggy";
-import memoize from "memoize";
 import { glob } from "glob";
 import { rimraf } from "rimraf";
+import memoize from "memoize";
 import { generateToStdout } from "@usage-spec/commander";
-//#region \0rolldown/runtime.js
-var __require = /* @__PURE__ */ createRequire(import.meta.url);
-//#endregion
 //#region src/services/logger.ts
 const logger = createLoggy({ namespace: "run-run" });
 //#endregion
@@ -68,10 +64,7 @@ async function createContext(binDir) {
 	if (!appPkg) throw new Error("Could not find app package.json");
 	debug("app pkg info: %O", appPkg.info());
 	debug("bin pkg info: %O", binPkg.info());
-	const shell = createShellService({
-		localBaseBinPath: [binDir],
-		stdio: "inherit"
-	});
+	const shell = createShellService();
 	debug("shell service options: %O", shell.options);
 	return {
 		appPkg,
@@ -130,38 +123,20 @@ var ToolService = class {
 		this.#ui = ui ?? bin;
 		this.#shellService = shellService;
 	}
-	async exec(args) {
-		const shell = this.#shell();
-		return this.#run(shell, args);
+	async exec(args = []) {
+		return this.#shellService.run(this.getBinDir(), args, { display: this.#bin });
 	}
 	async doctor() {
-		const shell = this.#shell().mute();
-		const output = await this.#run(shell, "--help");
+		const output = await this.#shellService.runCaptured(this.getBinDir(), ["--help"], { throwOnError: false });
 		return {
 			ok: output.exitCode === 0,
-			output
+			output: {
+				stdout: output.stdout,
+				stderr: output.stderr,
+				exitCode: output.exitCode
+			}
 		};
 	}
-	#shell = memoize((cwd) => {
-		const preferLocal = this.#getPreferLocal();
-		return this.#shellService.child({
-			...cwd && { cwd },
-			...preferLocal && { preferLocal }
-		});
-	});
-	#run(shell, args) {
-		if (!args) return shell.$`${this.#bin}`;
-		return shell.$`${this.#bin} ${typeof args === "string" ? args : args.join(" ")}`;
-	}
-	#getPreferLocal() {
-		if (!this.getBinDir) return;
-		try {
-			const binPath = this.getBinDir();
-			return fs.statSync(binPath).isDirectory() ? binPath : path.dirname(binPath);
-		} catch {
-			return;
-		}
-	}
 	get bin() {
 		return this.#bin;
 	}
@@ -179,6 +154,9 @@ var TsdownService = class extends ToolService {
 			shellService
 		});
 	}
+	getBinDir() {
+		return resolveBinPath("tsdown", { from: import.meta.url });
+	}
 	async buildLib() {
 		await this.exec();
 	}
@@ -263,6 +241,7 @@ function createConfigCommand(ctx) {
 }
 //#endregion
 //#region src/services/biome.ts
+const COMMON_FLAGS = ["--colors=force", "--no-errors-on-unmatched"];
 var BiomeService = class extends ToolService {
 	constructor(shellService) {
 		super({
@@ -272,23 +251,38 @@ var BiomeService = class extends ToolService {
 		});
 	}
 	getBinDir() {
-		return createRequire(import.meta.url).resolve("@biomejs/biome/bin/biome");
+		return resolveBinPath("@biomejs/biome", {
+			from: import.meta.url,
+			binName: "biome"
+		});
 	}
 	async format(options) {
-		const commonOptions = "format --colors=force --no-errors-on-unmatched";
-		if (options.fix) await this.exec(`${commonOptions} --fix`);
-		else await this.exec(`${commonOptions}`);
+		const args = ["format", ...COMMON_FLAGS];
+		if (options.fix) args.push("--fix");
+		await this.exec(args);
 	}
 	async lint(options) {
-		const commonOptions = "check --colors=force --no-errors-on-unmatched --formatter-enabled=false";
-		if (options.fix) await this.exec(`${commonOptions} --fix --unsafe`);
-		else await this.exec(`${commonOptions}`);
+		const args = [
+			"check",
+			...COMMON_FLAGS,
+			"--formatter-enabled=false"
+		];
+		if (options.fix) args.push("--fix", "--unsafe");
+		await this.exec(args);
 	}
 	async check(options) {
-		const commonOptions = (cmd = "check") => `${cmd} --colors=force --no-errors-on-unmatched`;
-		if (options.fix) await this.exec(`${commonOptions()} --fix`);
-		else if (options.fixStaged) await this.exec(`${commonOptions()}  --fix --staged`);
-		else await this.exec(`${commonOptions(isCI ? "ci" : "check")}`);
+		if (options.fix) await this.exec([
+			"check",
+			...COMMON_FLAGS,
+			"--fix"
+		]);
+		else if (options.fixStaged) await this.exec([
+			"check",
+			...COMMON_FLAGS,
+			"--fix",
+			"--staged"
+		]);
+		else await this.exec([isCI ? "ci" : "check", ...COMMON_FLAGS]);
 	}
 };
 //#endregion
@@ -302,12 +296,10 @@ var OxfmtService = class extends ToolService {
 		});
 	}
 	getBinDir() {
-		return __require.resolve("oxfmt/bin/oxfmt");
+		return resolveBinPath("oxfmt", { from: import.meta.url });
 	}
 	async format(options) {
-		const commonOptions = "--no-error-on-unmatched-pattern";
-		if (options.fix) await this.exec(`${commonOptions} --fix`);
-		else await this.exec(`${commonOptions} --check`);
+		await this.exec(["--no-error-on-unmatched-pattern", options.fix ? "--fix" : "--check"]);
 	}
 };
 //#endregion
@@ -342,12 +334,10 @@ var OxlintService = class extends ToolService {
 		});
 	}
 	getBinDir() {
-		return __require.resolve("oxlint/bin/oxlint");
+		return resolveBinPath("oxlint", { from: import.meta.url });
 	}
 	async lint(options) {
-		const commonOptions = "--report-unused-disable-directives";
-		if (options.fix) await this.exec(`${commonOptions} --fix`);
-		else await this.exec(`${commonOptions} --check`);
+		await this.exec(["--report-unused-disable-directives", options.fix ? "--fix" : "--check"]);
 	}
 };
 //#endregion
@@ -402,7 +392,11 @@ function createPkgsCommand(ctx) {
 //#region src/program/commands/test-static.ts
 function createTestStaticCommand(ctx) {
 	return createCommand("test:static").summary(`run static tests 🔬 (${TOOL_LABELS.RUN_RUN})`).description("Runs static tests, including linting, formatting checks, and TypeScript type checking, to ensure code quality and correctness without executing the code.").action(async function testStaticAction() {
-		await ctx.shell.$`rr x jscheck tscheck`;
+		await ctx.shell.run("rr", [
+			"x",
+			"jscheck",
+			"tscheck"
+		]);
 	});
 }
 //#endregion
@@ -435,6 +429,12 @@ var TscService = class extends ToolService {
 			shellService
 		});
 	}
+	getBinDir() {
+		return resolveBinPath("typescript", {
+			from: import.meta.url,
+			binName: "tsc"
+		});
+	}
 };
 //#endregion
 //#region src/program/commands/tscheck.ts
@@ -451,7 +451,7 @@ async function typecheckAt({ dir, scripts, log, shell, run }) {
 		const preScript = getPreScript(scripts);
 		if (preScript) {
 			log.start(`Running pre-script: ${preScript}`);
-			await shellAt.$`${preScript}`;
+			await shellAt.run(preScript, [], { shell: true });
 			log.success("Pre-script completed");
 		}
 		log.start("Type checking started");
@@ -469,8 +469,12 @@ function createTsCheckCommand(ctx) {
 	return createCommand("tsc").alias("tscheck").summary(`check typescript errors 📐 (${toolUi})`).description("Checks the TypeScript code for type errors, ensuring that the code adheres to the defined type constraints and helps catch potential issues before runtime.").addCommand(createDoctorSubcommand(doctorService)).addHelpText("afterAll", `\nUnder the hood, this command uses the ${toolUi} CLI to check the code.`).action(async function typecheckAction() {
 		const isTsProject = (dir) => appPkg.hasFile("tsconfig.json", dir);
 		const runTypecheck = async (shell) => {
-			if (config.future?.oxc) await new OxlintService(shell).exec(`--type-aware --type-check --report-unused-disable-directives`);
-			else await new TscService(shell).exec(`--noEmit`);
+			if (config.future?.oxc) await new OxlintService(shell).exec([
+				"--type-aware",
+				"--type-check",
+				"--report-unused-disable-directives"
+			]);
+			else await new TscService(shell).exec(["--noEmit"]);
 		};
 		if (!appPkg.isMonorepo()) {
 			if (!isTsProject(appPkg.dirPath)) {
@@ -515,8 +519,7 @@ function addUsage(program) {
 //#region src/program/commands/x.ts
 function createXCommand(ctx) {
 	return createCommand("x").summary("run multiple rr subcommands concurrently").description("Run multiple rr subcommands concurrently (e.g. `rr x jsc tsc`).").argument("<cmds...>", "rr subcommands to execute concurrently").action(async function runXAction(cmds) {
-		const { $ } = ctx.shell;
-		if ((await Promise.allSettled(cmds.map((cmd) => $`rr ${cmd}`))).some((r) => r.status === "rejected")) process.exitCode = 1;
+		if ((await Promise.allSettled(cmds.map((cmd) => ctx.shell.run("rr", [cmd])))).some((r) => r.status === "rejected")) process.exitCode = 1;
 	});
 }
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vlandoss/run-run",
-  "version": "0.5.2",
+  "version": "0.5.3-git-87ebfca.0",
   "description": "The CLI toolbox to fullstack common scripts in Variable Land",
   "homepage": "https://github.com/variableland/dx/tree/main/packages/run-run#readme",
   "bugs": {
@@ -63,8 +63,8 @@
     "rimraf": "6.1.3",
     "tsdown": "0.21.10",
     "typescript": "6.0.3",
-    "@vlandoss/loggy": "0.2.0",
-    "@vlandoss/clibuddy": "0.5.0"
+    "@vlandoss/clibuddy": "0.5.1-git-87ebfca.0",
+    "@vlandoss/loggy": "0.2.0"
   },
   "devDependencies": {
     "@vlandoss/tsdown-config": "^0.0.1"

package/src/program/commands/test-static.ts

@@ -9,6 +9,6 @@ export function createTestStaticCommand(ctx: Context) {
       "Runs static tests, including linting, formatting checks, and TypeScript type checking, to ensure code quality and correctness without executing the code.",
     )
     .action(async function testStaticAction() {
-      await ctx.shell.$`rr x jscheck tscheck`;
+      await ctx.shell.run("rr", ["x", "jscheck", "tscheck"]);
     });
 }

package/src/program/commands/tscheck.ts

@@ -34,7 +34,9 @@ async function typecheckAt({ dir, scripts, log, shell, run }: TypecheckAtOptions
     const preScript = getPreScript(scripts);
     if (preScript) {
       log.start(`Running pre-script: ${preScript}`);
-      await shellAt.$`${preScript}`;
+      // Pre-scripts come from package.json and may contain shell features
+      // (`&&`, pipes, env-var substitution) — run them through `/bin/sh -c`.
+      await shellAt.run(preScript, [], { shell: true });
       log.success("Pre-script completed");
     }
 
@@ -71,11 +73,10 @@ export function createTsCheckCommand(ctx: Context) {
       const runTypecheck = async (shell: ShellService) => {
         if (config.future?.oxc) {
           const oxlint = new OxlintService(shell);
-          await oxlint.exec(`--type-aware --type-check --report-unused-disable-directives`);
+          await oxlint.exec(["--type-aware", "--type-check", "--report-unused-disable-directives"]);
         } else {
           const tsc = new TscService(shell);
-          await tsc.exec(`--noEmit`);
-          // await shell.$`tsc --noEmit`;
+          await tsc.exec(["--noEmit"]);
         }
       };
 

package/src/program/commands/x.ts

@@ -7,8 +7,7 @@ export function createXCommand(ctx: Context) {
     .description("Run multiple rr subcommands concurrently (e.g. `rr x jsc tsc`).")
     .argument("<cmds...>", "rr subcommands to execute concurrently")
     .action(async function runXAction(cmds: string[]) {
-      const { $ } = ctx.shell;
-      const results = await Promise.allSettled(cmds.map((cmd) => $`rr ${cmd}`));
+      const results = await Promise.allSettled(cmds.map((cmd) => ctx.shell.run("rr", [cmd])));
       if (results.some((r) => r.status === "rejected")) {
         process.exitCode = 1;
       }

package/src/services/biome.ts

@@ -1,48 +1,38 @@
-import { createRequire } from "node:module";
-import { isCI, type ShellService } from "@vlandoss/clibuddy";
+import { isCI, resolveBinPath, type ShellService } from "@vlandoss/clibuddy";
 import { TOOL_LABELS } from "#src/program/ui.ts";
 import type { FormatOptions, Formatter, Linter, LintOptions, StaticChecker, StaticCheckerOptions } from "#src/types/tool.ts";
 import { ToolService } from "./tool.ts";
 
+const COMMON_FLAGS = ["--colors=force", "--no-errors-on-unmatched"];
+
 export class BiomeService extends ToolService implements Formatter, Linter, StaticChecker {
   constructor(shellService: ShellService) {
     super({ bin: "biome", ui: TOOL_LABELS.BIOME, shellService });
   }
 
   override getBinDir() {
-    const require = createRequire(import.meta.url);
-    return require.resolve("@biomejs/biome/bin/biome");
+    return resolveBinPath("@biomejs/biome", { from: import.meta.url, binName: "biome" });
   }
 
   async format(options: FormatOptions) {
-    const commonOptions = "format --colors=force --no-errors-on-unmatched";
-
-    if (options.fix) {
-      await this.exec(`${commonOptions} --fix`);
-    } else {
-      await this.exec(`${commonOptions}`);
-    }
+    const args = ["format", ...COMMON_FLAGS];
+    if (options.fix) args.push("--fix");
+    await this.exec(args);
   }
 
   async lint(options: LintOptions) {
-    const commonOptions = "check --colors=force --no-errors-on-unmatched --formatter-enabled=false";
-
-    if (options.fix) {
-      await this.exec(`${commonOptions} --fix --unsafe`);
-    } else {
-      await this.exec(`${commonOptions}`);
-    }
+    const args = ["check", ...COMMON_FLAGS, "--formatter-enabled=false"];
+    if (options.fix) args.push("--fix", "--unsafe");
+    await this.exec(args);
   }
 
   async check(options: StaticCheckerOptions): Promise<void> {
-    const commonOptions = (cmd = "check") => `${cmd} --colors=force --no-errors-on-unmatched`;
-
     if (options.fix) {
-      await this.exec(`${commonOptions()} --fix`);
+      await this.exec(["check", ...COMMON_FLAGS, "--fix"]);
     } else if (options.fixStaged) {
-      await this.exec(`${commonOptions()}  --fix --staged`);
+      await this.exec(["check", ...COMMON_FLAGS, "--fix", "--staged"]);
     } else {
-      await this.exec(`${commonOptions(isCI ? "ci" : "check")}`);
+      await this.exec([isCI ? "ci" : "check", ...COMMON_FLAGS]);
     }
   }
 }

package/src/services/ctx.ts

@@ -32,10 +32,7 @@ export async function createContext(binDir: string): Promise<Context> {
   debug("app pkg info: %O", appPkg.info());
   debug("bin pkg info: %O", binPkg.info());
 
-  const shell = createShellService({
-    localBaseBinPath: [binDir],
-    stdio: "inherit",
-  });
+  const shell = createShellService();
 
   debug("shell service options: %O", shell.options);
 

package/src/services/oxfmt.ts

@@ -1,4 +1,4 @@
-import type { ShellService } from "@vlandoss/clibuddy";
+import { resolveBinPath, type ShellService } from "@vlandoss/clibuddy";
 import { TOOL_LABELS } from "#src/program/ui.ts";
 import type { FormatOptions, Formatter } from "#src/types/tool.ts";
 import { ToolService } from "./tool.ts";
@@ -9,16 +9,10 @@ export class OxfmtService extends ToolService implements Formatter {
   }
 
   override getBinDir() {
-    return require.resolve("oxfmt/bin/oxfmt");
+    return resolveBinPath("oxfmt", { from: import.meta.url });
   }
 
   async format(options: FormatOptions) {
-    const commonOptions = "--no-error-on-unmatched-pattern";
-
-    if (options.fix) {
-      await this.exec(`${commonOptions} --fix`);
-    } else {
-      await this.exec(`${commonOptions} --check`);
-    }
+    await this.exec(["--no-error-on-unmatched-pattern", options.fix ? "--fix" : "--check"]);
   }
 }

package/src/services/oxlint.ts

@@ -1,4 +1,4 @@
-import type { ShellService } from "@vlandoss/clibuddy";
+import { resolveBinPath, type ShellService } from "@vlandoss/clibuddy";
 import { TOOL_LABELS } from "#src/program/ui.ts";
 import type { Linter, LintOptions } from "#src/types/tool.ts";
 import { ToolService } from "./tool.ts";
@@ -9,16 +9,10 @@ export class OxlintService extends ToolService implements Linter {
   }
 
   override getBinDir() {
-    return require.resolve("oxlint/bin/oxlint");
+    return resolveBinPath("oxlint", { from: import.meta.url });
   }
 
   async lint(options: LintOptions) {
-    const commonOptions = "--report-unused-disable-directives";
-
-    if (options.fix) {
-      await this.exec(`${commonOptions} --fix`);
-    } else {
-      await this.exec(`${commonOptions} --check`);
-    }
+    await this.exec(["--report-unused-disable-directives", options.fix ? "--fix" : "--check"]);
   }
 }

package/src/services/tool.ts

@@ -1,7 +1,4 @@
-import fs from "node:fs";
-import path from "node:path";
 import type { ShellService } from "@vlandoss/clibuddy";
-import memoize from "memoize";
 import type { DoctorResult } from "#src/types/tool.ts";
 
 type CreateOptions = {
@@ -21,51 +18,22 @@ export abstract class ToolService {
     this.#shellService = shellService;
   }
 
-  getBinDir?(): string;
+  // Must return an absolute path so we bypass the `node_modules/.bin/<bin>`
+  // shims that run-run itself publishes (`tools/biome`, etc) — otherwise
+  // calling the friendly name loops back through `rr tools <bin>`.
+  abstract getBinDir(): string;
 
-  async exec(args?: string | string[]) {
-    const shell = this.#shell();
-    return this.#run(shell, args);
+  async exec(args: string[] = []) {
+    return this.#shellService.run(this.getBinDir(), args, { display: this.#bin });
   }
 
   async doctor(): Promise<DoctorResult> {
-    const shell = this.#shell().mute();
-
-    const output = await this.#run(shell, "--help");
+    const output = await this.#shellService.runCaptured(this.getBinDir(), ["--help"], { throwOnError: false });
     const ok = output.exitCode === 0;
-
-    return { ok, output };
-  }
-
-  #shell = memoize((cwd?: string) => {
-    const preferLocal = this.#getPreferLocal();
-
-    return this.#shellService.child({
-      ...(cwd && { cwd }),
-      ...(preferLocal && { preferLocal }),
-    });
-  });
-
-  #run(shell: ShellService, args?: string | string[]) {
-    if (!args) {
-      return shell.$`${this.#bin}`;
-    }
-
-    return shell.$`${this.#bin} ${typeof args === "string" ? args : args.join(" ")}`;
-  }
-
-  #getPreferLocal() {
-    if (!this.getBinDir) {
-      return undefined;
-    }
-
-    try {
-      const binPath = this.getBinDir();
-      const isDir = fs.statSync(binPath).isDirectory();
-      return isDir ? binPath : path.dirname(binPath);
-    } catch {
-      return undefined;
-    }
+    return {
+      ok,
+      output: { stdout: output.stdout, stderr: output.stderr, exitCode: output.exitCode },
+    };
   }
 
   get bin() {

package/src/services/tsc.ts

@@ -1,4 +1,4 @@
-import type { ShellService } from "@vlandoss/clibuddy";
+import { resolveBinPath, type ShellService } from "@vlandoss/clibuddy";
 import { TOOL_LABELS } from "#src/program/ui.ts";
 import { ToolService } from "./tool.ts";
 
@@ -6,4 +6,8 @@ export class TscService extends ToolService {
   constructor(shellService: ShellService) {
     super({ bin: "tsc", ui: TOOL_LABELS.TSC, shellService });
   }
+
+  override getBinDir() {
+    return resolveBinPath("typescript", { from: import.meta.url, binName: "tsc" });
+  }
 }

package/src/services/tsdown.ts

@@ -1,4 +1,4 @@
-import type { ShellService } from "@vlandoss/clibuddy";
+import { resolveBinPath, type ShellService } from "@vlandoss/clibuddy";
 import { TOOL_LABELS } from "#src/program/ui.ts";
 import { ToolService } from "./tool.ts";
 
@@ -7,6 +7,10 @@ export class TsdownService extends ToolService {
     super({ bin: "tsdown", ui: TOOL_LABELS.TSDOWN, shellService });
   }
 
+  override getBinDir() {
+    return resolveBinPath("tsdown", { from: import.meta.url });
+  }
+
   async buildLib() {
     await this.exec();
   }

package/src/types/tool.ts

@@ -14,7 +14,7 @@ export type StaticCheckerOptions = {
 export type DoctorOutput = {
   stdout: string;
   stderr: string;
-  exitCode: number | null;
+  exitCode: number | undefined;
 };
 
 export type DoctorResult = {