feat: update

src/index.ts

@@ -1,3 +1,6 @@
+export * from 'package-manager-detector/constants'
+export * from 'package-manager-detector/commands'
+
 export * from './config'
 export * from './detect'
 export * from './parse'

src/parse.ts

@@ -1,7 +1,7 @@
 import type { Agent, Command, ResolvedCommand } from 'package-manager-detector'
-import { resolveCommand } from 'package-manager-detector'
 import { exclude } from './utils'
 import type { Runner } from './runner'
+import { COMMANDS, constructCommand } from '.'
 
 export class UnsupportedCommand extends Error {
   constructor({ agent, command }: { agent: Agent, command: Command }) {
@@ -14,11 +14,12 @@ export function getCommand(
   command: Command,
   args: string[] = [],
 ): ResolvedCommand {
-  const result = resolveCommand(agent, command, args)
+  if (!COMMANDS[agent])
+    throw new Error(`Unsupported agent "${agent}"`)
+  if (!COMMANDS[agent][command])
+    throw new UnsupportedCommand({ agent, command })
 
-  if (!result)
-    throw new Error(`Unsupported agent or command "${agent} ${command}"`)
-  return result
+  return constructCommand(COMMANDS[agent][command], args)!
 }
 
 export const parseNi = <Runner>((agent, args, ctx) => {
@@ -47,12 +48,20 @@ export const parseNr = <Runner>((agent, args) => {
   if (args.length === 0)
     args.push('start')
 
+  let hasIfPresent = false
   if (args.includes('--if-present')) {
     args = exclude(args, '--if-present')
-    args[0] = `--if-present ${args[0]}`
+    hasIfPresent = true
   }
 
-  return getCommand(agent, 'run', args)
+  const cmd = getCommand(agent, 'run', args)
+  if (!cmd)
+    return cmd
+
+  if (hasIfPresent)
+    cmd.args.splice(1, 0, '--if-present')
+
+  return cmd
 })
 
 export const parseNu = <Runner>((agent, args) => {
@@ -75,3 +84,11 @@ export const parseNlx = <Runner>((agent, args) => {
 export const parseNa = <Runner>((agent, args) => {
   return getCommand(agent, 'agent', args)
 })
+
+export function serializeCommand(command?: ResolvedCommand) {
+  if (!command)
+    return undefined
+  if (command.args.length === 0)
+    return command.command
+  return `${command.command} ${command.args.map(i => i.includes(' ') ? `"${i}"` : i).join(' ')}`
+}

test/na/bun.spec.ts

@@ -1,11 +1,11 @@
 import { expect, it } from 'vitest'
-import { parseNa } from '../../src/commands'
+import { parseNa, serializeCommand } from '../../src/commands'
 
 const agent = 'bun'
 function _(arg: string, expected: string) {
-  return () => {
+  return async () => {
     expect(
-      parseNa(agent, arg.split(' ').filter(Boolean)),
+      serializeCommand(await parseNa(agent, arg.split(' ').filter(Boolean))),
     ).toBe(
       expected,
     )

test/na/npm.spec.ts

@@ -1,11 +1,11 @@
 import { expect, it } from 'vitest'
-import { parseNa } from '../../src/commands'
+import { parseNa, serializeCommand } from '../../src/commands'
 
 const agent = 'npm'
 function _(arg: string, expected: string) {
-  return () => {
+  return async () => {
     expect(
-      parseNa(agent, arg.split(' ').filter(Boolean)),
+      serializeCommand(await parseNa(agent, arg.split(' ').filter(Boolean))),
     ).toBe(
       expected,
     )

test/na/pnpm.spec.ts

@@ -1,11 +1,11 @@
 import { expect, it } from 'vitest'
-import { parseNa } from '../../src/commands'
+import { parseNa, serializeCommand } from '../../src/commands'
 
 const agent = 'pnpm'
 function _(arg: string, expected: string) {
-  return () => {
+  return async () => {
     expect(
-      parseNa(agent, arg.split(' ').filter(Boolean)),
+      serializeCommand(await parseNa(agent, arg.split(' ').filter(Boolean))),
     ).toBe(
       expected,
     )

test/na/yarn.spec.ts

@@ -1,11 +1,11 @@
 import { expect, it } from 'vitest'
-import { parseNa } from '../../src/commands'
+import { parseNa, serializeCommand } from '../../src/commands'
 
 const agent = 'yarn'
 function _(arg: string, expected: string) {
-  return () => {
+  return async () => {
     expect(
-      parseNa(agent, arg.split(' ').filter(Boolean)),
+      serializeCommand(await parseNa(agent, arg.split(' ').filter(Boolean))),
     ).toBe(
       expected,
     )

test/na/yarn@berry.spec.ts

@@ -1,11 +1,11 @@
 import { expect, it } from 'vitest'
-import { parseNa } from '../../src/commands'
+import { parseNa, serializeCommand } from '../../src/commands'
 
 const agent = 'yarn@berry'
 function _(arg: string, expected: string) {
-  return () => {
+  return async () => {
     expect(
-      parseNa(agent, arg.split(' ').filter(Boolean)),
+      serializeCommand(await parseNa(agent, arg.split(' ').filter(Boolean))),
     ).toBe(
       expected,
     )

test/ni/bun.spec.ts

@@ -1,11 +1,11 @@
 import { expect, it } from 'vitest'
-import { parseNi } from '../../src/commands'
+import { parseNi, serializeCommand } from '../../src/commands'
 
 const agent = 'bun'
 function _(arg: string, expected: string) {
-  return () => {
+  return async () => {
     expect(
-      parseNi(agent, arg.split(' ').filter(Boolean)),
+      serializeCommand(await parseNi(agent, arg.split(' ').filter(Boolean))),
     ).toBe(
       expected,
     )

test/ni/npm.spec.ts

@@ -1,11 +1,11 @@
 import { expect, it } from 'vitest'
-import { parseNi } from '../../src/commands'
+import { parseNi, serializeCommand } from '../../src/commands'
 
 const agent = 'npm'
 function _(arg: string, expected: string) {
-  return () => {
+  return async () => {
     expect(
-      parseNi(agent, arg.split(' ').filter(Boolean)),
+      serializeCommand(await parseNi(agent, arg.split(' ').filter(Boolean))),
     ).toBe(
       expected,
     )

test/ni/pnpm.spec.ts

@@ -1,11 +1,11 @@
 import { expect, it } from 'vitest'
-import { parseNi } from '../../src/commands'
+import { parseNi, serializeCommand } from '../../src/commands'
 
 const agent = 'pnpm'
 function _(arg: string, expected: string) {
-  return () => {
+  return async () => {
     expect(
-      parseNi(agent, arg.split(' ').filter(Boolean)),
+      serializeCommand(await parseNi(agent, arg.split(' ').filter(Boolean))),
     ).toBe(
       expected,
     )

test/ni/yarn.spec.ts

@@ -1,11 +1,11 @@
 import { expect, it } from 'vitest'
-import { parseNi } from '../../src/commands'
+import { parseNi, serializeCommand } from '../../src/commands'
 
 const agent = 'yarn'
 function _(arg: string, expected: string) {
-  return () => {
+  return async () => {
     expect(
-      parseNi(agent, arg.split(' ').filter(Boolean)),
+      serializeCommand(await parseNi(agent, arg.split(' ').filter(Boolean))),
     ).toBe(
       expected,
     )

test/ni/yarn@berry.spec.ts

@@ -1,11 +1,11 @@
 import { expect, it } from 'vitest'
-import { parseNi } from '../../src/commands'
+import { parseNi, serializeCommand } from '../../src/commands'
 
 const agent = 'yarn@berry'
 function _(arg: string, expected: string) {
-  return () => {
+  return async () => {
     expect(
-      parseNi(agent, arg.split(' ').filter(Boolean)),
+      serializeCommand(await parseNi(agent, arg.split(' ').filter(Boolean))),
     ).toBe(
       expected,
     )

test/nlx/bun.spec.ts

@@ -1,11 +1,11 @@
 import { expect, it } from 'vitest'
-import { parseNlx } from '../../src/commands'
+import { parseNlx, serializeCommand } from '../../src/commands'
 
 const agent = 'bun'
 function _(arg: string, expected: string) {
-  return () => {
+  return async () => {
     expect(
-      parseNlx(agent, arg.split(' ').filter(Boolean)),
+      serializeCommand(await parseNlx(agent, arg.split(' ').filter(Boolean))),
     ).toBe(
       expected,
     )

test/nlx/npm.spec.ts

@@ -1,11 +1,11 @@
 import { expect, it } from 'vitest'
-import { parseNlx } from '../../src/commands'
+import { parseNlx, serializeCommand } from '../../src/commands'
 
 const agent = 'npm'
 function _(arg: string, expected: string) {
-  return () => {
+  return async () => {
     expect(
-      parseNlx(agent, arg.split(' ').filter(Boolean)),
+      serializeCommand(await parseNlx(agent, arg.split(' ').filter(Boolean))),
     ).toBe(
       expected,
     )

test/nlx/pnpm.spec.ts

@@ -1,11 +1,11 @@
 import { expect, it } from 'vitest'
-import { parseNlx } from '../../src/commands'
+import { parseNlx, serializeCommand } from '../../src/commands'
 
 const agent = 'pnpm'
 function _(arg: string, expected: string) {
-  return () => {
+  return async () => {
     expect(
-      parseNlx(agent, arg.split(' ').filter(Boolean)),
+      serializeCommand(await parseNlx(agent, arg.split(' ').filter(Boolean))),
     ).toBe(
       expected,
     )

test/nlx/yarn.spec.ts

@@ -1,11 +1,11 @@
 import { expect, it } from 'vitest'
-import { parseNlx } from '../../src/commands'
+import { parseNlx, serializeCommand } from '../../src/commands'
 
 const agent = 'yarn'
 function _(arg: string, expected: string) {
-  return () => {
+  return async () => {
     expect(
-      parseNlx(agent, arg.split(' ').filter(Boolean)),
+      serializeCommand(await parseNlx(agent, arg.split(' ').filter(Boolean))),
     ).toBe(
       expected,
     )

test/nlx/yarn@berry.spec.ts

@@ -1,11 +1,11 @@
 import { expect, it } from 'vitest'
-import { parseNlx } from '../../src/commands'
+import { parseNlx, serializeCommand } from '../../src/commands'
 
 const agent = 'yarn@berry'
 function _(arg: string, expected: string) {
-  return () => {
+  return async () => {
     expect(
-      parseNlx(agent, arg.split(' ').filter(Boolean)),
+      serializeCommand(await parseNlx(agent, arg.split(' ').filter(Boolean))),
     ).toBe(
       expected,
     )

test/nr/bun.spec.ts

@@ -1,11 +1,11 @@
 import { expect, it } from 'vitest'
-import { parseNr } from '../../src/commands'
+import { parseNr, serializeCommand } from '../../src/commands'
 
 const agent = 'bun'
 function _(arg: string, expected: string) {
-  return () => {
+  return async () => {
     expect(
-      parseNr(agent, arg.split(' ').filter(Boolean)),
+      serializeCommand(await parseNr(agent, arg.split(' ').filter(Boolean))),
     ).toBe(
       expected,
     )

test/nr/npm.spec.ts

@@ -1,11 +1,11 @@
 import { expect, it } from 'vitest'
-import { parseNr } from '../../src/commands'
+import { parseNr, serializeCommand } from '../../src/commands'
 
 const agent = 'npm'
 function _(arg: string, expected: string) {
-  return () => {
+  return async () => {
     expect(
-      parseNr(agent, arg.split(' ').filter(Boolean)),
+      serializeCommand(await parseNr(agent, arg.split(' ').filter(Boolean))),
     ).toBe(
       expected,
     )

test/nr/pnpm.spec.ts

@@ -1,11 +1,11 @@
 import { expect, it } from 'vitest'
-import { parseNr } from '../../src/commands'
+import { parseNr, serializeCommand } from '../../src/commands'
 
 const agent = 'pnpm'
 function _(arg: string, expected: string) {
-  return () => {
+  return async () => {
     expect(
-      parseNr(agent, arg.split(' ').filter(Boolean)),
+      serializeCommand(await parseNr(agent, arg.split(' ').filter(Boolean))),
     ).toBe(
       expected,
     )

test/nr/yarn.spec.ts

@@ -1,11 +1,11 @@
 import { expect, it } from 'vitest'
-import { parseNr } from '../../src/commands'
+import { parseNr, serializeCommand } from '../../src/commands'
 
 const agent = 'yarn'
 function _(arg: string, expected: string) {
-  return () => {
+  return async () => {
     expect(
-      parseNr(agent, arg.split(' ').filter(Boolean)),
+      serializeCommand(await parseNr(agent, arg.split(' ').filter(Boolean))),
     ).toBe(
       expected,
     )

test/nr/yarn@berry.spec.ts

@@ -1,11 +1,11 @@
 import { expect, it } from 'vitest'
-import { parseNr } from '../../src/commands'
+import { parseNr, serializeCommand } from '../../src/commands'
 
 const agent = 'yarn@berry'
 function _(arg: string, expected: string) {
-  return () => {
+  return async () => {
     expect(
-      parseNr(agent, arg.split(' ').filter(Boolean)),
+      serializeCommand(await parseNr(agent, arg.split(/\s/g).filter(Boolean))),
     ).toBe(
       expected,
     )

test/nu/bun.spec.ts

@@ -1,11 +1,11 @@
 import { expect, it } from 'vitest'
-import { parseNu } from '../../src/commands'
+import { parseNu, serializeCommand } from '../../src/commands'
 
 const agent = 'bun'
 function _(arg: string, expected: string | null) {
-  return () => {
+  return async () => {
     expect(
-      parseNu(agent, arg.split(' ').filter(Boolean)),
+      serializeCommand(await parseNu(agent, arg.split(' ').filter(Boolean))),
     ).toBe(
       expected,
     )

test/nu/npm.spec.ts

@@ -1,11 +1,11 @@
 import { expect, it } from 'vitest'
-import { parseNu } from '../../src/commands'
+import { parseNu, serializeCommand } from '../../src/commands'
 
 const agent = 'npm'
 function _(arg: string, expected: string) {
-  return () => {
+  return async () => {
     expect(
-      parseNu(agent, arg.split(' ').filter(Boolean)),
+      serializeCommand(await parseNu(agent, arg.split(' ').filter(Boolean))),
     ).toBe(
       expected,
     )