fix(cli): rename resolveViteBin to resolveViteBinFromPackageJsonPath and update related usages

Author: Romakita

packages/cli/src/bin/tsed-build.spec.ts

@@ -1,11 +1,10 @@
 import {mkdtemp, rm, writeFile} from "node:fs/promises";
 import {tmpdir} from "node:os";
 import path from "node:path";
-import {pathToFileURL} from "node:url";
 
 import {describe, expect, it} from "vitest";
 
-import {resolveViteBin} from "./tsed-build.js";
+import {resolveViteBinFromPackageJsonPath} from "./tsed-build.js";
 
 async function withTempDir(run: (cwd: string) => Promise<void>) {
   const cwd = await mkdtemp(path.join(tmpdir(), "tsed-build-"));
@@ -23,7 +22,7 @@ describe("tsed-build", () => {
       const packageJsonPath = path.join(cwd, "package.json");
       await writeFile(packageJsonPath, JSON.stringify({bin: {vite: "bin/vite.js"}}));
 
-      const viteBin = await resolveViteBin(async () => pathToFileURL(packageJsonPath).href);
+      const viteBin = await resolveViteBinFromPackageJsonPath(packageJsonPath);
 
       expect(viteBin).toEqual(path.join(cwd, "bin/vite.js"));
     });
@@ -34,7 +33,7 @@ describe("tsed-build", () => {
       const packageJsonPath = path.join(cwd, "package.json");
       await writeFile(packageJsonPath, JSON.stringify({bin: "bin/vite.js"}));
 
-      const viteBin = await resolveViteBin(async () => pathToFileURL(packageJsonPath).href);
+      const viteBin = await resolveViteBinFromPackageJsonPath(packageJsonPath);
 
       expect(viteBin).toEqual(path.join(cwd, "bin/vite.js"));
     });
@@ -45,7 +44,7 @@ describe("tsed-build", () => {
       const packageJsonPath = path.join(cwd, "package.json");
       await writeFile(packageJsonPath, JSON.stringify({name: "vite"}));
 
-      await expect(resolveViteBin(async () => pathToFileURL(packageJsonPath).href)).rejects.toThrowError(
+      await expect(resolveViteBinFromPackageJsonPath(packageJsonPath)).rejects.toThrowError(
         "Unable to resolve Vite CLI binary from vite/package.json"
       );
     });

packages/cli/src/bin/tsed-build.ts

@@ -23,10 +23,15 @@ function runNode(cmd: string, args: string[]) {
   });
 }
 
-type ResolveFn = (specifier: string) => string | Promise<string>;
+function toPath(value: string) {
+  if (value.startsWith("file://")) {
+    return fileURLToPath(value);
+  }
+
+  return value;
+}
 
-export async function resolveViteBin(resolve: ResolveFn = import.meta.resolve) {
-  const packageJsonPath = fileURLToPath(await resolve("vite/package.json"));
+export async function resolveViteBinFromPackageJsonPath(packageJsonPath: string) {
   const packageJson = JSON.parse(await readFile(packageJsonPath, "utf-8")) as {
     bin?: string | Record<string, string>;
   };
@@ -39,6 +44,12 @@ export async function resolveViteBin(resolve: ResolveFn = import.meta.resolve) {
   return path.resolve(path.dirname(packageJsonPath), binRelativePath);
 }
 
+export async function resolveViteBin() {
+  const packageJsonPath = toPath(await import.meta.resolve("vite/package.json"));
+
+  return resolveViteBinFromPackageJsonPath(packageJsonPath);
+}
+
 export async function build(rawArgs: string[] = process.argv.slice(2)) {
   const viteBin = await resolveViteBin();
   await runNode(process.execPath, [viteBin, "build", ...rawArgs]);