@vlandoss/run-run 0.0.6-git-3835394.0 → 0.0.6-git-290164e.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vlandoss/run-run",
-  "version": "0.0.6-git-3835394.0",
+  "version": "0.0.6-git-290164e.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": {
@@ -17,7 +17,7 @@
   "bin": {
     "rr": "./bin.ts",
     "run-run": "./bin.ts",
-    "rr:biome": "./tools/biome"
+    "biome": "./tools/biome"
   },
   "files": [
     "bin",
@@ -33,8 +33,8 @@
     "is-ci": "4.1.0",
     "rimraf": "6.0.1",
     "typescript": "5.8.2",
-    "@vlandoss/clibuddy": "0.0.4-git-3835394.0",
-    "@vlandoss/loggy": "0.0.3"
+    "@vlandoss/loggy": "0.0.3",
+    "@vlandoss/clibuddy": "0.0.4-git-290164e.0"
   },
   "publishConfig": {
     "access": "public"

package/src/program/__tests__/__snapshots__/snapshots.test.ts.snap

@@ -156,8 +156,6 @@ Options:
 
 Commands:
   biome
-  tsc
-  rimraf
   help [command]  display help for command
 "
 `;

package/src/program/commands/format.ts

@@ -1,4 +1,5 @@
 import { createCommand } from "commander";
+import { BiomeService } from "~/services/biome";
 import type { Context } from "~/services/ctx";
 
 export function createFormatCommand(ctx: Context) {
@@ -8,7 +9,7 @@ export function createFormatCommand(ctx: Context) {
     .option("-c, --check", "check if the code is formatted", true)
     .option("-f, --fix", "format all the code")
     .action(async function formatAction(options) {
-      const $ = ctx.shell.$;
+      const { $ } = new BiomeService(ctx.shell);
       const toolCmd = "biome format --no-errors-on-unmatched --colors=force";
 
       if (options.fix) {

package/src/program/commands/lint.ts

@@ -1,4 +1,5 @@
 import { createCommand } from "commander";
+import { BiomeService } from "~/services/biome";
 import type { Context } from "~/services/ctx";
 
 export function createLintCommand(ctx: Context) {
@@ -7,7 +8,7 @@ export function createLintCommand(ctx: Context) {
     .option("-c, --check", "check if the code is valid", true)
     .option("-f, --fix", "try to fix all the code")
     .action(async function lintAction(options) {
-      const $ = ctx.shell.$;
+      const { $ } = new BiomeService(ctx.shell);
       const toolCmd = "biome check --colors=force --formatter-enabled=false";
 
       if (options.fix) {

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

@@ -1,5 +1,6 @@
 import { createCommand } from "commander";
 import isCI from "is-ci";
+import { BiomeService } from "~/services/biome";
 import type { Context } from "~/services/ctx";
 
 export function createTestStaticCommand(ctx: Context) {
@@ -9,7 +10,7 @@ export function createTestStaticCommand(ctx: Context) {
     .option("-f, --fix", "try to fix issues automatically")
     .option("--fix-staged", "try to fix staged files only")
     .action(async function testStaticAction(options) {
-      const $ = ctx.shell.$;
+      const { $ } = new BiomeService(ctx.shell);
       const toolCmd = (cmd = "check") => `biome ${cmd} --colors=force`;
 
       if (options.fix) {

package/src/program/commands/tools.ts

@@ -1,25 +1,23 @@
 import { createCommand } from "commander";
+import { BiomeService } from "~/services/biome";
 import type { Context } from "~/services/ctx";
 
-export function createToolsCommand(ctx: Context) {
-  function createToolCommandAction(toolBin: string) {
-    return async function toolAction(_: unknown, { args }: { args: string[] }) {
-      await ctx.shell.$`${toolBin} ${args.join(" ")}`;
-    };
-  }
-
-  function createToolCommand(toolBin: string) {
-    return createCommand(toolBin)
-      .helpCommand(false)
-      .helpOption(false)
-      .allowExcessArguments(true)
-      .allowUnknownOption(true)
-      .action(createToolCommandAction(toolBin));
-  }
+function createToolCommand(toolBin: string) {
+  // biome-ignore format: I prefer multi-line
+  return createCommand(toolBin)
+    .helpCommand(false)
+    .helpOption(false)
+    .allowExcessArguments(true)
+    .allowUnknownOption(true);
+}
 
+export function createToolsCommand(ctx: Context) {
   return createCommand("tools")
     .description("expose the internal tools 🛠️")
-    .addCommand(createToolCommand("biome"))
-    .addCommand(createToolCommand("tsc"))
-    .addCommand(createToolCommand("rimraf"));
+    .addCommand(
+      createToolCommand("biome").action((_: unknown, { args }: { args: string[] }) => {
+        const biomeService = new BiomeService(ctx.shell);
+        biomeService.execute(args);
+      }),
+    );
 }

package/src/services/biome.ts

@@ -0,0 +1,25 @@
+import type { ShellService } from "@vlandoss/clibuddy";
+import { gracefullBinDir } from "~/utils/gracefullBinDir";
+import type { ToolService } from "./models";
+
+export class BiomeService implements ToolService {
+  #shellService: ShellService;
+
+  constructor(shellService: ShellService) {
+    this.#shellService = shellService;
+  }
+
+  get $() {
+    return this.#shellService.child({
+      preferLocal: this.#getBinDir(),
+    }).$;
+  }
+
+  async execute(args: string[]): Promise<void> {
+    this.$`biome ${args.join(" ")}`;
+  }
+
+  #getBinDir() {
+    return gracefullBinDir(() => require.resolve("@biomejs/biome/bin/biome"));
+  }
+}

package/src/services/models.ts

@@ -0,0 +1,6 @@
+import type { Shell } from "@vlandoss/clibuddy";
+
+export interface ToolService {
+  $: Shell;
+  execute(args: string[]): Promise<void>;
+}

package/src/utils/gracefullBinDir.ts

@@ -0,0 +1,14 @@
+import fs from "node:fs";
+import path from "node:path";
+import { logger } from "~/services/logger";
+
+export function gracefullBinDir(binPathResolver: () => string) {
+  try {
+    const binPath = binPathResolver();
+    const isDir = fs.statSync(binPath).isDirectory();
+    return isDir ? binPath : path.dirname(binPath);
+  } catch (error) {
+    logger.error("Error getting bin directory:", error);
+    process.exit(1);
+  }
+}