From ecccf5eef0daa079b9cdee79872241b7180d0246 Mon Sep 17 00:00:00 2001 From: lanyuanxiaoyao Date: Thu, 11 Jun 2026 23:06:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9F=BA=E4=BA=8E=20process.argv=20?= =?UTF-8?q?=E6=8E=A8=E6=96=AD=E5=91=BD=E4=BB=A4=E5=89=8D=E7=BC=80=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20bunx=20=E8=AF=AF=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + src/core/pm.ts | 24 ++++++---- tests/core/pm.test.ts | 102 ++++++++++++++++++++++++++++++++++++------ 3 files changed, 106 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 7b5f702..dc607a2 100644 --- a/.gitignore +++ b/.gitignore @@ -404,3 +404,4 @@ temp .worktrees !src/**/* docs/superpowers +tests/**/__tmp* diff --git a/src/core/pm.ts b/src/core/pm.ts index 0fb53a3..69d7a22 100644 --- a/src/core/pm.ts +++ b/src/core/pm.ts @@ -2,14 +2,24 @@ import type { RuneConfig } from "../types.ts"; export const DEFAULT_PREFIX = "bunx @lanyuanxiaoyao/rune"; -export function inferFromEnvironment( - execPath: string, - userAgent: string | undefined, -): string | null { - if (execPath.includes("bun")) return "bunx @lanyuanxiaoyao/rune"; +export function inferFromProcess(argv: string[], userAgent: string | undefined): string | null { + const scriptPath = argv[1]?.replace(/\\/g, "/") ?? ""; + + if (scriptPath.includes(".bun") && scriptPath.includes("cache")) { + return "bunx @lanyuanxiaoyao/rune"; + } + if (scriptPath.includes("_npx") || scriptPath.includes("npm-cache")) { + return "npx @lanyuanxiaoyao/rune"; + } + if (scriptPath.includes(".pnpm") || scriptPath.includes("pnpm-store")) { + return "pnpx @lanyuanxiaoyao/rune"; + } + + if (userAgent?.includes("bun")) return "bunx @lanyuanxiaoyao/rune"; if (userAgent?.includes("pnpm")) return "pnpx @lanyuanxiaoyao/rune"; if (userAgent?.includes("yarn")) return "yarn dlx @lanyuanxiaoyao/rune"; if (userAgent?.includes("npm")) return "npx @lanyuanxiaoyao/rune"; + return null; } @@ -28,9 +38,7 @@ export async function checkCommandAvailable(command: string): Promise { } export async function detectCommandPrefix(): Promise { - if (await checkCommandAvailable("rune")) return "rune"; - - const inferred = inferFromEnvironment(process.execPath, process.env.npm_config_user_agent); + const inferred = inferFromProcess(process.argv, process.env.npm_config_user_agent); if (inferred) return inferred; for (const pm of ["bunx", "pnpx", "npx"]) { diff --git a/tests/core/pm.test.ts b/tests/core/pm.test.ts index 3e0374c..4878989 100644 --- a/tests/core/pm.test.ts +++ b/tests/core/pm.test.ts @@ -1,6 +1,6 @@ import { describe, it, expect } from "bun:test"; import { - inferFromEnvironment, + inferFromProcess, getPmPrefix, DEFAULT_PREFIX, getFallbackNote, @@ -8,29 +8,105 @@ import { } from "../../src/core/pm.ts"; import type { RuneConfig } from "../../src/types.ts"; -describe("inferFromEnvironment", () => { - it("execPath 包含 bun 时返回 bunx 前缀", () => { - const result = inferFromEnvironment("/home/user/.bun/bin/bun", undefined); +describe("inferFromProcess", () => { + it("argv 包含 bun 缓存路径时返回 bunx 前缀", () => { + const result = inferFromProcess( + ["/usr/local/bin/bun", "/home/user/.bun/cache/@lanyuanxiaoyao-rune/bin/rune.ts"], + undefined, + ); expect(result).toBe("bunx @lanyuanxiaoyao/rune"); }); - it("npm_config_user_agent 包含 pnpm 时返回 pnpx 前缀", () => { - const result = inferFromEnvironment("/usr/bin/node", "pnpm/9.0.0"); - expect(result).toBe("pnpx @lanyuanxiaoyao/rune"); + it("argv Windows 风格 bun 缓存路径时返回 bunx 前缀", () => { + const result = inferFromProcess( + [ + "C:\\Users\\user\\.bun\\bin\\bun.exe", + "C:\\Users\\user\\.bun\\cache\\@lanyuanxiaoyao-rune\\bin\\rune.ts", + ], + undefined, + ); + expect(result).toBe("bunx @lanyuanxiaoyao/rune"); }); - it("npm_config_user_agent 包含 npm 时返回 npx 前缀", () => { - const result = inferFromEnvironment("/usr/bin/node", "npm/10.0.0"); + it("argv 包含 _npx 路径时返回 npx 前缀", () => { + const result = inferFromProcess( + ["/usr/local/bin/node", "/home/user/.npm/_npx/abc123/node_modules/.bin/rune"], + undefined, + ); expect(result).toBe("npx @lanyuanxiaoyao/rune"); }); - it("pnpm 优先于 npm（userAgent 同时包含两者时）", () => { - const result = inferFromEnvironment("/usr/bin/node", "pnpm/9.0.0 npm/10.0.0"); + it("argv 包含 npm-cache 路径时返回 npx 前缀", () => { + const result = inferFromProcess( + ["/usr/local/bin/node", "/home/user/.npm-cache/_npx/abc123/bin/rune"], + undefined, + ); + expect(result).toBe("npx @lanyuanxiaoyao/rune"); + }); + + it("argv 包含 .pnpm 路径时返回 pnpx 前缀", () => { + const result = inferFromProcess( + ["/usr/local/bin/node", "/home/user/.pnpm/store/@lanyuanxiaoyao-rune/bin/rune"], + undefined, + ); expect(result).toBe("pnpx @lanyuanxiaoyao/rune"); }); - it("无法推断时返回 null", () => { - const result = inferFromEnvironment("/usr/bin/node", undefined); + it("argv 无法推断但 userAgent 包含 bun 时返回 bunx 前缀", () => { + const result = inferFromProcess( + ["/usr/local/bin/bun", "/home/user/projects/app/run.ts"], + "bun/1.0.0", + ); + expect(result).toBe("bunx @lanyuanxiaoyao/rune"); + }); + + it("argv 无法推断但 userAgent 包含 pnpm 时返回 pnpx 前缀", () => { + const result = inferFromProcess( + ["/usr/local/bin/node", "/home/user/projects/app/run.ts"], + "pnpm/9.0.0", + ); + expect(result).toBe("pnpx @lanyuanxiaoyao/rune"); + }); + + it("argv 无法推断但 userAgent 包含 yarn 时返回 yarn dlx 前缀", () => { + const result = inferFromProcess( + ["/usr/local/bin/node", "/home/user/projects/app/run.ts"], + "yarn/4.0.0", + ); + expect(result).toBe("yarn dlx @lanyuanxiaoyao/rune"); + }); + + it("argv 无法推断但 userAgent 包含 npm 时返回 npx 前缀", () => { + const result = inferFromProcess( + ["/usr/local/bin/node", "/home/user/projects/app/run.ts"], + "npm/10.0.0", + ); + expect(result).toBe("npx @lanyuanxiaoyao/rune"); + }); + + it("userAgent 同时包含 pnpm 和 npm 时 pnpm 优先", () => { + const result = inferFromProcess( + ["/usr/local/bin/node", "/home/user/projects/app/run.ts"], + "pnpm/9.0.0 npm/10.0.0", + ); + expect(result).toBe("pnpx @lanyuanxiaoyao/rune"); + }); + + it("argv 和 userAgent 都无法推断时返回 null", () => { + const result = inferFromProcess( + ["/usr/local/bin/node", "/home/user/projects/app/run.ts"], + undefined, + ); + expect(result).toBeNull(); + }); + + it("argv 为空数组且无 userAgent 时返回 null", () => { + const result = inferFromProcess([], undefined); + expect(result).toBeNull(); + }); + + it("argv 只有一个元素且无 userAgent 时返回 null", () => { + const result = inferFromProcess(["/usr/local/bin/node"], undefined); expect(result).toBeNull(); }); });