fix: respect executablePath in standalone mode

Author: Oliver Cvetkovski (ocv)

src/index.ts

@@ -307,8 +307,8 @@ export const execCompose = (
     let executablePath: string
     let executableArgs: string[] = []
 
-    if (executable?.standalone && !executable.executablePath) {
-      executablePath = 'docker-compose'
+    if (executable?.standalone) {
+      executablePath = executable.executablePath || 'docker-compose'
     } else {
       executablePath = executable?.executablePath || 'docker'
       const executableOptions = executable?.options || []

test/compose.test.ts

@@ -5,10 +5,12 @@ import {
   beforeEach,
   afterEach,
   vi,
-  beforeAll
+  beforeAll,
+  MockInstance
 } from 'vitest'
 import Docker, { ContainerInfo } from 'dockerode'
 import * as compose from '../src'
+import childProcess from 'child_process'
 import * as path from 'path'
 import { readFile } from 'fs'
 import { mapPsOutput, mapImListOutput } from '../src'
@@ -1202,3 +1204,68 @@ describe('when upAll is called', () => {
     })
   })
 })
+
+describe('executable path resolution', (): void => {
+  let spawnSpy: MockInstance<typeof childProcess.spawn>
+
+  beforeEach((): void => {
+    const mockProc = {
+      on: vi.fn(),
+      stdout: { on: vi.fn(), pipe: vi.fn() },
+      stderr: { on: vi.fn(), pipe: vi.fn() },
+      stdin: { write: vi.fn(), end: vi.fn() }
+    }
+
+    mockProc.on.mockImplementation((event, cb) => {
+      if (event === 'exit') {
+        setTimeout(() => cb(0), 0)
+      }
+    })
+
+    spawnSpy = vi
+      .spyOn(childProcess, 'spawn')
+      .mockReturnValue((mockProc as unknown) as childProcess.ChildProcess)
+  })
+
+  afterEach((): void => {
+    spawnSpy.mockRestore()
+  })
+
+  // spawn is always called with a third argument ({ cwd, env }) so we use
+  // expect.objectContaining({}) to match it without being brittle about its contents.
+  it('uses custom executablePath in standalone mode without appending compose', async (): Promise<void> => {
+    await compose.execCompose('up', [], {
+      executable: {
+        standalone: true,
+        executablePath: '/custom/path/docker-compose'
+      }
+    })
+    expect(spawnSpy).toHaveBeenCalledWith(
+      '/custom/path/docker-compose',
+      ['up'],
+      expect.objectContaining({})
+    )
+  })
+
+  it('defaults to docker-compose in standalone mode when no executablePath is provided', async (): Promise<void> => {
+    await compose.execCompose('up', [], {
+      executable: { standalone: true }
+    })
+    expect(spawnSpy).toHaveBeenCalledWith(
+      'docker-compose',
+      ['up'],
+      expect.objectContaining({})
+    )
+  })
+
+  it('appends compose subcommand when not in standalone mode', async (): Promise<void> => {
+    await compose.execCompose('up', [], {
+      executable: { executablePath: '/custom/docker' }
+    })
+    expect(spawnSpy).toHaveBeenCalledWith(
+      '/custom/docker',
+      ['compose', 'up'],
+      expect.objectContaining({})
+    )
+  })
+})