@vlandoss/run-run 0.5.3-git-f368be9.0 → 0.5.3-git-137024d.0

package/README.md

@@ -4,7 +4,7 @@ CLI toolbox to fullstack common scripts in [Variable Land](https://variable.land
 
 ## Prerequisites
 
-- Node.js >= 24.0.0
+- Node.js >= 20.0.0
 
 ## Toolbox
 

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.3-git-f368be9.0"
+version "0.5.3-git-137024d.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,5 +1,5 @@
 import path from "node:path";
-import { colorize, createPkg, createShellService, cwd, dirnameOf, isCI, palette, resolveBinPath, run, text } from "@vlandoss/clibuddy";
+import { colorize, createPkg, createShellService, cwd, dirnameOf, isCI, palette, resolvePackageBin, run, text } from "@vlandoss/clibuddy";
 import { Argument, Option, createCommand } from "commander";
 import fs from "node:fs";
 import os from "node:os";
@@ -116,18 +116,35 @@ ${runRunColor(`
 //#region src/services/tool.ts
 var ToolService = class {
 	#shellService;
+	#pkg;
 	#bin;
 	#ui;
-	constructor({ bin, ui, shellService }) {
-		this.#bin = bin;
-		this.#ui = ui ?? bin;
+	get bin() {
+		return this.#bin;
+	}
+	get ui() {
+		return this.#ui;
+	}
+	get pkg() {
+		return this.#pkg;
+	}
+	constructor({ pkg, bin, ui, shellService }) {
+		this.#pkg = pkg;
+		this.#bin = bin ?? pkg;
+		this.#ui = ui;
 		this.#shellService = shellService;
 	}
+	async getBinDir() {
+		return resolvePackageBin(this.#pkg, {
+			from: import.meta.url,
+			binName: this.#bin
+		});
+	}
 	async exec(args = []) {
-		return this.#shellService.run(this.getBinDir(), args, { display: this.#bin });
+		return this.#shellService.run(await this.getBinDir(), args, { display: this.#bin });
 	}
 	async doctor() {
-		const output = await this.#shellService.runCaptured(this.getBinDir(), ["--help"], { throwOnError: false });
+		const output = await this.#shellService.runCaptured(await this.getBinDir(), ["--help"], { throwOnError: false });
 		return {
 			ok: output.exitCode === 0,
 			output: {
@@ -137,26 +154,17 @@ var ToolService = class {
 			}
 		};
 	}
-	get bin() {
-		return this.#bin;
-	}
-	get ui() {
-		return this.#ui;
-	}
 };
 //#endregion
 //#region src/services/tsdown.ts
 var TsdownService = class extends ToolService {
 	constructor(shellService) {
 		super({
-			bin: "tsdown",
+			pkg: "tsdown",
 			ui: TOOL_LABELS.TSDOWN,
 			shellService
 		});
 	}
-	getBinDir() {
-		return resolveBinPath("tsdown", { from: import.meta.url });
-	}
 	async buildLib() {
 		await this.exec();
 	}
@@ -245,17 +253,12 @@ const COMMON_FLAGS = ["--colors=force", "--no-errors-on-unmatched"];
 var BiomeService = class extends ToolService {
 	constructor(shellService) {
 		super({
+			pkg: "@biomejs/biome",
 			bin: "biome",
 			ui: TOOL_LABELS.BIOME,
 			shellService
 		});
 	}
-	getBinDir() {
-		return resolveBinPath("@biomejs/biome", {
-			from: import.meta.url,
-			binName: "biome"
-		});
-	}
 	async format(options) {
 		const args = ["format", ...COMMON_FLAGS];
 		if (options.fix) args.push("--fix");
@@ -290,14 +293,11 @@ var BiomeService = class extends ToolService {
 var OxfmtService = class extends ToolService {
 	constructor(shellService) {
 		super({
-			bin: "oxfmt",
+			pkg: "oxfmt",
 			ui: TOOL_LABELS.OXFMT,
 			shellService
 		});
 	}
-	getBinDir() {
-		return resolveBinPath("oxfmt", { from: import.meta.url });
-	}
 	async format(options) {
 		await this.exec(["--no-error-on-unmatched-pattern", options.fix ? "--fix" : "--check"]);
 	}
@@ -328,14 +328,11 @@ function createJsCheckCommand(ctx) {
 var OxlintService = class extends ToolService {
 	constructor(shellService) {
 		super({
-			bin: "oxlint",
+			pkg: "oxlint",
 			ui: TOOL_LABELS.OXLINT,
 			shellService
 		});
 	}
-	getBinDir() {
-		return resolveBinPath("oxlint", { from: import.meta.url });
-	}
 	async lint(options) {
 		await this.exec(["--report-unused-disable-directives", options.fix ? "--fix" : "--check"]);
 	}
@@ -424,17 +421,12 @@ function createToolsCommand(ctx) {
 var TscService = class extends ToolService {
 	constructor(shellService) {
 		super({
+			pkg: "typescript",
 			bin: "tsc",
 			ui: TOOL_LABELS.TSC,
 			shellService
 		});
 	}
-	getBinDir() {
-		return resolveBinPath("typescript", {
-			from: import.meta.url,
-			binName: "tsc"
-		});
-	}
 };
 //#endregion
 //#region src/program/commands/tscheck.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vlandoss/run-run",
-  "version": "0.5.3-git-f368be9.0",
+  "version": "0.5.3-git-137024d.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": {
@@ -61,10 +61,10 @@
     "oxlint": "1.50.0",
     "oxlint-tsgolint": "0.15.0",
     "rimraf": "6.1.3",
-    "tsdown": "0.21.10",
+    "tsdown": "0.22.0",
     "typescript": "6.0.3",
-    "@vlandoss/clibuddy": "0.5.1-git-f368be9.0",
-    "@vlandoss/loggy": "0.2.0"
+    "@vlandoss/loggy": "0.2.0",
+    "@vlandoss/clibuddy": "0.5.1-git-137024d.0"
   },
   "devDependencies": {
     "@vlandoss/tsdown-config": "^0.0.1"

package/src/services/biome.ts

@@ -1,4 +1,4 @@
-import { isCI, resolveBinPath, type ShellService } from "@vlandoss/clibuddy";
+import { isCI, 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";
@@ -7,11 +7,7 @@ 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() {
-    return resolveBinPath("@biomejs/biome", { from: import.meta.url, binName: "biome" });
+    super({ pkg: "@biomejs/biome", bin: "biome", ui: TOOL_LABELS.BIOME, shellService });
   }
 
   async format(options: FormatOptions) {

package/src/services/oxfmt.ts

@@ -1,15 +1,11 @@
-import { resolveBinPath, type ShellService } from "@vlandoss/clibuddy";
+import 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";
 
 export class OxfmtService extends ToolService implements Formatter {
   constructor(shellService: ShellService) {
-    super({ bin: "oxfmt", ui: TOOL_LABELS.OXFMT, shellService });
-  }
-
-  override getBinDir() {
-    return resolveBinPath("oxfmt", { from: import.meta.url });
+    super({ pkg: "oxfmt", ui: TOOL_LABELS.OXFMT, shellService });
   }
 
   async format(options: FormatOptions) {

package/src/services/oxlint.ts

@@ -1,15 +1,11 @@
-import { resolveBinPath, type ShellService } from "@vlandoss/clibuddy";
+import 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";
 
 export class OxlintService extends ToolService implements Linter {
   constructor(shellService: ShellService) {
-    super({ bin: "oxlint", ui: TOOL_LABELS.OXLINT, shellService });
-  }
-
-  override getBinDir() {
-    return resolveBinPath("oxlint", { from: import.meta.url });
+    super({ pkg: "oxlint", ui: TOOL_LABELS.OXLINT, shellService });
   }
 
   async lint(options: LintOptions) {

package/src/services/tool.ts

@@ -1,46 +1,60 @@
-import type { ShellService } from "@vlandoss/clibuddy";
+import { resolvePackageBin, type ShellService } from "@vlandoss/clibuddy";
 import type { DoctorResult } from "#src/types/tool.ts";
 
 type CreateOptions = {
-  bin: string;
-  ui?: string;
+  pkg: string;
+  bin?: string;
+  ui: string;
   shellService: ShellService;
 };
 
-export abstract class ToolService {
+export class ToolService {
   #shellService: ShellService;
+  #pkg: string;
   #bin: string;
   #ui: string;
 
-  constructor({ bin, ui, shellService }: CreateOptions) {
-    this.#bin = bin;
-    this.#ui = ui ?? bin;
+  get bin() {
+    return this.#bin;
+  }
+
+  get ui() {
+    return this.#ui;
+  }
+
+  get pkg() {
+    return this.#pkg;
+  }
+
+  constructor({ pkg, bin, ui, shellService }: CreateOptions) {
+    this.#pkg = pkg;
+    this.#bin = bin ?? pkg;
+    this.#ui = ui;
     this.#shellService = shellService;
   }
 
-  // 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 getBinDir() {
+    return resolvePackageBin(this.#pkg, {
+      from: import.meta.url,
+      binName: this.#bin,
+    });
+  }
 
   async exec(args: string[] = []) {
-    return this.#shellService.run(this.getBinDir(), args, { display: this.#bin });
+    return this.#shellService.run(await this.getBinDir(), args, { display: this.#bin });
   }
 
   async doctor(): Promise<DoctorResult> {
-    const output = await this.#shellService.runCaptured(this.getBinDir(), ["--help"], { throwOnError: false });
+    const output = await this.#shellService.runCaptured(await this.getBinDir(), ["--help"], { throwOnError: false });
     const ok = output.exitCode === 0;
+
     return {
       ok,
-      output: { stdout: output.stdout, stderr: output.stderr, exitCode: output.exitCode },
+      output: {
+        stdout: output.stdout,
+        stderr: output.stderr,
+        exitCode: output.exitCode,
+      },
     };
   }
-
-  get bin() {
-    return this.#bin;
-  }
-
-  get ui() {
-    return this.#ui;
-  }
 }

package/src/services/tsc.ts

@@ -1,13 +1,9 @@
-import { resolveBinPath, type ShellService } from "@vlandoss/clibuddy";
+import type { ShellService } from "@vlandoss/clibuddy";
 import { TOOL_LABELS } from "#src/program/ui.ts";
 import { ToolService } from "./tool.ts";
 
 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" });
+    super({ pkg: "typescript", bin: "tsc", ui: TOOL_LABELS.TSC, shellService });
   }
 }

package/src/services/tsdown.ts

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