@vlandoss/clibuddy 0.5.1-git-f368be9.0 → 0.6.0

package/dist/index.d.mts

@@ -75,12 +75,16 @@ declare class ShellService {
 declare const cwd: string;
 declare function createShellService(options?: ShellOptions): ShellService;
 //#endregion
-//#region src/shell/resolve-bin.d.ts
-declare function resolveBinPath(pkg: string, options: {
+//#region src/shell/resolve-package-bin.d.ts
+type Options = {
   from: string;
-  binPath?: string;
   binName?: string;
-}): string;
+};
+declare function _resolvePackageBin(pkg: string, {
+  from,
+  binName
+}: Options): Promise<string>;
+declare const resolvePackageBin: typeof _resolvePackageBin;
 //#endregion
 //#region src/shell/utils.d.ts
 declare function isNonZeroExitError(value: unknown): value is NonZeroExitError;
@@ -91,4 +95,4 @@ declare const text: {
   version: (version: string) => string;
 };
 //#endregion
-export { NonZeroExitError, Pkg, type Project, RunOptions, ShellOptions, ShellService, colorize, createPkg, createShellService, cwd, dirnameOf, filenameOf, hasTTY, isCI, isNonZeroExitError, palette, resolveBinPath, run, text };
+export { NonZeroExitError, Pkg, type Project, RunOptions, ShellOptions, ShellService, colorize, createPkg, createShellService, cwd, dirnameOf, filenameOf, hasTTY, isCI, isNonZeroExitError, palette, resolvePackageBin, run, text };

package/dist/index.mjs

@@ -9,6 +9,7 @@ import { findPackages } from "@pnpm/fs.find-packages";
 import { readPackageJSON, resolvePackageJSON, writePackageJSON } from "pkg-types";
 import { parse } from "yaml";
 import { NonZeroExitError, x } from "tinyexec";
+import memoize from "memoize";
 //#region src/colors.ts
 const colorize = (hex) => ansis.hex(hex);
 const palette = {
@@ -203,34 +204,20 @@ function createShellService(options = {}) {
 	});
 }
 //#endregion
-//#region src/shell/resolve-bin.ts
-function resolveBinPath(pkg, options) {
-	const pkgRoot = findPackageRoot(createRequire(options.from), pkg);
-	if (options.binPath) return path.join(pkgRoot, options.binPath);
-	const bin = JSON.parse(fs.readFileSync(path.join(pkgRoot, "package.json"), "utf8")).bin;
-	if (!bin) throw new Error(`Package ${pkg} has no "bin" field`);
-	if (typeof bin === "string") return path.join(pkgRoot, bin);
-	const wantName = options.binName ?? pkg.replace(/^@[^/]+\//, "");
-	const rel = bin[wantName] ?? Object.values(bin)[0];
-	if (!rel) throw new Error(`No bin entry found for ${pkg} (asked for ${wantName})`);
-	return path.join(pkgRoot, rel);
-}
-function findPackageRoot(require, pkg) {
+//#region src/shell/resolve-package-bin.ts
+async function _resolvePackageBin(pkg, { from, binName }) {
+	let pkgJsonPath;
 	try {
-		return path.dirname(require.resolve(`${pkg}/package.json`));
-	} catch {}
-	const mainPath = require.resolve(pkg);
-	let dir = path.dirname(mainPath);
-	const fsRoot = path.parse(dir).root;
-	while (dir !== fsRoot) {
-		const pkgJsonPath = path.join(dir, "package.json");
-		if (fs.existsSync(pkgJsonPath)) try {
-			if (JSON.parse(fs.readFileSync(pkgJsonPath, "utf8")).name === pkg) return dir;
-		} catch {}
-		dir = path.dirname(dir);
-	}
-	throw new Error(`Could not find package root for ${pkg} from ${mainPath}`);
+		pkgJsonPath = await resolvePackageJSON(pkg, { from });
+	} catch {
+		pkgJsonPath = createRequire(from).resolve(`${pkg}/package.json`);
+	}
+	const { bin } = await readPackageJSON(pkgJsonPath);
+	const rel = typeof bin === "string" ? bin : bin?.[binName ?? pkg.replace(/^@[^/]+\//, "")];
+	if (!rel) throw new Error(`No bin "${binName ?? pkg}" in ${pkg}`);
+	return path.join(path.dirname(pkgJsonPath), rel);
 }
+const resolvePackageBin = memoize(_resolvePackageBin, { cacheKey: ([pkg, opts]) => `${pkg}|${opts.from}|${opts.binName ?? ""}` });
 //#endregion
 //#region src/text.ts
 const text = {
@@ -238,4 +225,4 @@ const text = {
 	version: (version) => palette.muted(`v${version}`)
 };
 //#endregion
-export { NonZeroExitError, Pkg, ShellService, colorize, createPkg, createShellService, cwd, dirnameOf, filenameOf, hasTTY, isCI, isNonZeroExitError, palette, resolveBinPath, run, text };
+export { NonZeroExitError, Pkg, ShellService, colorize, createPkg, createShellService, cwd, dirnameOf, filenameOf, hasTTY, isCI, isNonZeroExitError, palette, resolvePackageBin, run, text };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vlandoss/clibuddy",
-  "version": "0.5.1-git-f368be9.0",
+  "version": "0.6.0",
   "description": "A helper library to create CLIs in Variable Land",
   "homepage": "https://github.com/variableland/dx/tree/main/packages/clibuddy#readme",
   "bugs": {
@@ -30,6 +30,7 @@
     "@pnpm/fs.find-packages": "1000.0.24",
     "@pnpm/types": "1001.3.0",
     "ansis": "4.2.0",
+    "memoize": "10.2.0",
     "pkg-types": "2.3.0",
     "std-env": "3.9.0",
     "tinyexec": "1.1.2",

package/src/shell/index.ts

@@ -1,5 +1,5 @@
 export * from "./create.ts";
-export * from "./resolve-bin.ts";
+export * from "./resolve-package-bin.ts";
 export * from "./shell.ts";
 export * from "./types.ts";
 export * from "./utils.ts";

package/src/shell/resolve-package-bin.ts

@@ -0,0 +1,26 @@
+import { createRequire } from "node:module";
+import path from "node:path";
+import memoize from "memoize";
+import { readPackageJSON, resolvePackageJSON } from "pkg-types";
+
+type Options = { from: string; binName?: string };
+
+// pkg-types covers any package whose `.` entry is in `exports` (including
+// restrictive ones like oxlint). The fallback handles packages without
+// `main`/`exports` at all (e.g. @biomejs/biome).
+async function _resolvePackageBin(pkg: string, { from, binName }: Options): Promise<string> {
+  let pkgJsonPath: string;
+  try {
+    pkgJsonPath = await resolvePackageJSON(pkg, { from });
+  } catch {
+    pkgJsonPath = createRequire(from).resolve(`${pkg}/package.json`);
+  }
+  const { bin } = await readPackageJSON(pkgJsonPath);
+  const rel = typeof bin === "string" ? bin : bin?.[binName ?? pkg.replace(/^@[^/]+\//, "")];
+  if (!rel) throw new Error(`No bin "${binName ?? pkg}" in ${pkg}`);
+  return path.join(path.dirname(pkgJsonPath), rel);
+}
+
+export const resolvePackageBin = memoize(_resolvePackageBin, {
+  cacheKey: ([pkg, opts]) => `${pkg}|${opts.from}|${opts.binName ?? ""}`,
+});

package/src/shell/resolve-bin.ts

@@ -1,53 +0,0 @@
-import fs from "node:fs";
-import { createRequire } from "node:module";
-import path from "node:path";
-
-export function resolveBinPath(pkg: string, options: { from: string; binPath?: string; binName?: string }): string {
-  const require = createRequire(options.from);
-  const pkgRoot = findPackageRoot(require, pkg);
-
-  if (options.binPath) {
-    return path.join(pkgRoot, options.binPath);
-  }
-
-  const pkgJson = JSON.parse(fs.readFileSync(path.join(pkgRoot, "package.json"), "utf8")) as {
-    bin?: string | Record<string, string>;
-  };
-  const bin = pkgJson.bin;
-  if (!bin) throw new Error(`Package ${pkg} has no "bin" field`);
-
-  if (typeof bin === "string") return path.join(pkgRoot, bin);
-
-  const wantName = options.binName ?? pkg.replace(/^@[^/]+\//, "");
-  const rel = bin[wantName] ?? Object.values(bin)[0];
-  if (!rel) throw new Error(`No bin entry found for ${pkg} (asked for ${wantName})`);
-  return path.join(pkgRoot, rel);
-}
-
-// Two-step lookup tolerates packages that don't expose `./package.json` in
-// their `exports` map (e.g. oxlint) and packages with no `main`/`exports` at
-// all (e.g. @biomejs/biome) — `require.resolve(pkg)` fails for the latter.
-function findPackageRoot(require: NodeJS.Require, pkg: string): string {
-  try {
-    return path.dirname(require.resolve(`${pkg}/package.json`));
-  } catch {
-    // fall through to manual walk
-  }
-
-  const mainPath = require.resolve(pkg);
-  let dir = path.dirname(mainPath);
-  const fsRoot = path.parse(dir).root;
-  while (dir !== fsRoot) {
-    const pkgJsonPath = path.join(dir, "package.json");
-    if (fs.existsSync(pkgJsonPath)) {
-      try {
-        const data = JSON.parse(fs.readFileSync(pkgJsonPath, "utf8")) as { name?: string };
-        if (data.name === pkg) return dir;
-      } catch {
-        // not a valid package.json — keep walking
-      }
-    }
-    dir = path.dirname(dir);
-  }
-  throw new Error(`Could not find package root for ${pkg} from ${mainPath}`);
-}