@aaronshaf/ger 0.1.11 → 0.2.0

package/tests/show-auto-detect.test.ts

@@ -0,0 +1,306 @@
+import { describe, test, expect, beforeAll, afterAll, afterEach, mock, spyOn } from 'bun:test'
+import { setupServer } from 'msw/node'
+import { http, HttpResponse } from 'msw'
+import { Effect, Layer } from 'effect'
+import { showCommand } from '@/cli/commands/show'
+import { GerritApiServiceLive } from '@/api/gerrit'
+import { ConfigService } from '@/services/config'
+import { generateMockChange } from '@/test-utils/mock-generator'
+import { createMockConfigService } from './helpers/config-mock'
+import * as childProcess from 'node:child_process'
+import { EventEmitter } from 'node:events'
+
+/**
+ * Integration tests for auto-detecting Change-ID from HEAD commit
+ */
+
+const mockChange = generateMockChange({
+  _number: 392385,
+  change_id: 'If5a3ae8cb5a107e187447802358417f311d0c4b1',
+  subject: 'WIP: test',
+  status: 'NEW',
+  project: 'canvas-lms',
+  branch: 'master',
+  created: '2024-01-15 10:00:00.000000000',
+  updated: '2024-01-15 12:00:00.000000000',
+  owner: {
+    _account_id: 1001,
+    name: 'Test User',
+    email: 'test@example.com',
+  },
+})
+
+const mockDiff = `--- a/test.txt
++++ b/test.txt
+@@ -1,1 +1,2 @@
+ original line
++new line`
+
+const server = setupServer(
+  http.get('*/a/accounts/self', () => {
+    return HttpResponse.json({
+      _account_id: 1000,
+      name: 'Test User',
+      email: 'test@example.com',
+    })
+  }),
+
+  // Handler that matches the auto-detected Change-ID
+  http.get('*/a/changes/:changeId', ({ params }) => {
+    const { changeId } = params
+    if (changeId === 'If5a3ae8cb5a107e187447802358417f311d0c4b1') {
+      return HttpResponse.text(`)]}'
+${JSON.stringify(mockChange)}`)
+    }
+    return HttpResponse.text('Not Found', { status: 404 })
+  }),
+
+  http.get('*/a/changes/:changeId/revisions/current/patch', ({ params }) => {
+    const { changeId } = params
+    if (changeId === 'If5a3ae8cb5a107e187447802358417f311d0c4b1') {
+      return HttpResponse.text(btoa(mockDiff))
+    }
+    return HttpResponse.text('Not Found', { status: 404 })
+  }),
+
+  http.get('*/a/changes/:changeId/revisions/current/comments', ({ params }) => {
+    const { changeId } = params
+    if (changeId === 'If5a3ae8cb5a107e187447802358417f311d0c4b1') {
+      return HttpResponse.text(`)]}'
+{}`)
+    }
+    return HttpResponse.text('Not Found', { status: 404 })
+  }),
+)
+
+let capturedLogs: string[] = []
+let capturedErrors: string[] = []
+
+const mockConsoleLog = mock((...args: any[]) => {
+  capturedLogs.push(args.join(' '))
+})
+const mockConsoleError = mock((...args: any[]) => {
+  capturedErrors.push(args.join(' '))
+})
+
+const originalConsoleLog = console.log
+const originalConsoleError = console.error
+
+let spawnSpy: ReturnType<typeof spyOn>
+
+beforeAll(() => {
+  server.listen({ onUnhandledRequest: 'bypass' })
+  // @ts-ignore
+  console.log = mockConsoleLog
+  // @ts-ignore
+  console.error = mockConsoleError
+})
+
+afterAll(() => {
+  server.close()
+  console.log = originalConsoleLog
+  console.error = originalConsoleError
+})
+
+afterEach(() => {
+  server.resetHandlers()
+  mockConsoleLog.mockClear()
+  mockConsoleError.mockClear()
+  capturedLogs = []
+  capturedErrors = []
+
+  if (spawnSpy) {
+    spawnSpy.mockRestore()
+  }
+})
+
+const createMockConfigLayer = (): Layer.Layer<ConfigService, never, never> =>
+  Layer.succeed(ConfigService, createMockConfigService())
+
+describe('show command with auto-detection', () => {
+  test('auto-detects Change-ID from HEAD commit when no argument provided', async () => {
+    const commitMessage = `feat: add feature
+
+Change-Id: If5a3ae8cb5a107e187447802358417f311d0c4b1`
+
+    // Mock git log command
+    const mockChildProcess = new EventEmitter()
+    // @ts-ignore
+    mockChildProcess.stdout = new EventEmitter()
+    // @ts-ignore
+    mockChildProcess.stderr = new EventEmitter()
+
+    spawnSpy = spyOn(childProcess, 'spawn')
+    spawnSpy.mockReturnValue(mockChildProcess as any)
+
+    const effect = showCommand(undefined, {}).pipe(
+      Effect.provide(GerritApiServiceLive),
+      Effect.provide(createMockConfigLayer()),
+    )
+
+    const resultPromise = Effect.runPromise(effect)
+
+    // Simulate git log success
+    setImmediate(() => {
+      // @ts-ignore
+      mockChildProcess.stdout.emit('data', Buffer.from(commitMessage))
+      mockChildProcess.emit('close', 0)
+    })
+
+    await resultPromise
+
+    const output = capturedLogs.join('\n')
+    expect(output).toContain('Change 392385')
+    expect(output).toContain('WIP: test')
+    expect(capturedErrors.length).toBe(0)
+  })
+
+  test('auto-detects Change-ID with --xml flag', async () => {
+    const commitMessage = `feat: add feature
+
+Change-Id: If5a3ae8cb5a107e187447802358417f311d0c4b1`
+
+    const mockChildProcess = new EventEmitter()
+    // @ts-ignore
+    mockChildProcess.stdout = new EventEmitter()
+    // @ts-ignore
+    mockChildProcess.stderr = new EventEmitter()
+
+    spawnSpy = spyOn(childProcess, 'spawn')
+    spawnSpy.mockReturnValue(mockChildProcess as any)
+
+    const effect = showCommand(undefined, { xml: true }).pipe(
+      Effect.provide(GerritApiServiceLive),
+      Effect.provide(createMockConfigLayer()),
+    )
+
+    const resultPromise = Effect.runPromise(effect)
+
+    setImmediate(() => {
+      // @ts-ignore
+      mockChildProcess.stdout.emit('data', Buffer.from(commitMessage))
+      mockChildProcess.emit('close', 0)
+    })
+
+    await resultPromise
+
+    const output = capturedLogs.join('\n')
+    expect(output).toContain('<?xml version="1.0" encoding="UTF-8"?>')
+    expect(output).toContain('<show_result>')
+    expect(output).toContain('<status>success</status>')
+    expect(output).toContain('392385')
+    expect(capturedErrors.length).toBe(0)
+  })
+
+  test('shows error when no Change-ID in HEAD commit', async () => {
+    const commitMessage = `feat: add feature without Change-ID
+
+This commit has no Change-ID footer.`
+
+    const mockChildProcess = new EventEmitter()
+    // @ts-ignore
+    mockChildProcess.stdout = new EventEmitter()
+    // @ts-ignore
+    mockChildProcess.stderr = new EventEmitter()
+
+    spawnSpy = spyOn(childProcess, 'spawn')
+    spawnSpy.mockReturnValue(mockChildProcess as any)
+
+    const effect = showCommand(undefined, {}).pipe(
+      Effect.provide(GerritApiServiceLive),
+      Effect.provide(createMockConfigLayer()),
+    )
+
+    const resultPromise = Effect.runPromise(effect)
+
+    setImmediate(() => {
+      // @ts-ignore
+      mockChildProcess.stdout.emit('data', Buffer.from(commitMessage))
+      mockChildProcess.emit('close', 0)
+    })
+
+    await resultPromise
+
+    const output = capturedErrors.join('\n')
+    expect(output).toContain('No Change-ID found in HEAD commit')
+    expect(capturedLogs.length).toBe(0)
+  })
+
+  test('shows error when not in git repository', async () => {
+    const mockChildProcess = new EventEmitter()
+    // @ts-ignore
+    mockChildProcess.stdout = new EventEmitter()
+    // @ts-ignore
+    mockChildProcess.stderr = new EventEmitter()
+
+    spawnSpy = spyOn(childProcess, 'spawn')
+    spawnSpy.mockReturnValue(mockChildProcess as any)
+
+    const effect = showCommand(undefined, {}).pipe(
+      Effect.provide(GerritApiServiceLive),
+      Effect.provide(createMockConfigLayer()),
+    )
+
+    const resultPromise = Effect.runPromise(effect)
+
+    setImmediate(() => {
+      // @ts-ignore
+      mockChildProcess.stderr.emit('data', Buffer.from('fatal: not a git repository'))
+      mockChildProcess.emit('close', 128)
+    })
+
+    await resultPromise
+
+    const output = capturedErrors.join('\n')
+    expect(output).toContain('fatal: not a git repository')
+  })
+
+  test('still works with explicit change-id argument', async () => {
+    // Don't mock git - should not be called when changeId is provided
+    const effect = showCommand('If5a3ae8cb5a107e187447802358417f311d0c4b1', {}).pipe(
+      Effect.provide(GerritApiServiceLive),
+      Effect.provide(createMockConfigLayer()),
+    )
+
+    await Effect.runPromise(effect)
+
+    const output = capturedLogs.join('\n')
+    expect(output).toContain('Change 392385')
+    expect(output).toContain('WIP: test')
+    expect(capturedErrors.length).toBe(0)
+  })
+
+  test('shows XML error when no Change-ID in commit with --xml flag', async () => {
+    const commitMessage = `feat: no change id`
+
+    const mockChildProcess = new EventEmitter()
+    // @ts-ignore
+    mockChildProcess.stdout = new EventEmitter()
+    // @ts-ignore
+    mockChildProcess.stderr = new EventEmitter()
+
+    spawnSpy = spyOn(childProcess, 'spawn')
+    spawnSpy.mockReturnValue(mockChildProcess as any)
+
+    const effect = showCommand(undefined, { xml: true }).pipe(
+      Effect.provide(GerritApiServiceLive),
+      Effect.provide(createMockConfigLayer()),
+    )
+
+    const resultPromise = Effect.runPromise(effect)
+
+    setImmediate(() => {
+      // @ts-ignore
+      mockChildProcess.stdout.emit('data', Buffer.from(commitMessage))
+      mockChildProcess.emit('close', 0)
+    })
+
+    await resultPromise
+
+    const output = capturedLogs.join('\n')
+    expect(output).toContain('<?xml version="1.0" encoding="UTF-8"?>')
+    expect(output).toContain('<show_result>')
+    expect(output).toContain('<status>error</status>')
+    expect(output).toContain('No Change-ID found in HEAD commit')
+  })
+})

package/tests/show.test.ts

@@ -238,7 +238,9 @@ describe('show command', () => {
     await Effect.runPromise(program)
 
     const output = capturedErrors.join('\n')
-    expect(output).toContain('✗ Failed to fetch change details')
+    expect(output).toContain('✗ Error:')
+    // The error message will be from the network layer
+    expect(output.length).toBeGreaterThan(0)
   })
 
   test('should handle API errors gracefully in XML format', async () => {
@@ -436,4 +438,158 @@ describe('show command', () => {
     // Should filter out autogenerated messages
     expect(output).not.toContain('Uploaded patch set')
   })
+
+  test('should output JSON format when --json flag is used', async () => {
+    setupMockHandlers()
+
+    const mockConfigLayer = createMockConfigLayer()
+    const program = showCommand('12345', { json: true }).pipe(
+      Effect.provide(GerritApiServiceLive),
+      Effect.provide(mockConfigLayer),
+    )
+
+    await Effect.runPromise(program)
+
+    const output = capturedLogs.join('\n')
+
+    // Parse JSON to verify it's valid
+    const parsed = JSON.parse(output)
+
+    expect(parsed.status).toBe('success')
+    expect(parsed.change.id).toBe('I123abc456def')
+    expect(parsed.change.number).toBe(12345)
+    expect(parsed.change.subject).toBe('Fix authentication bug')
+    expect(parsed.change.status).toBe('NEW')
+    expect(parsed.change.project).toBe('test-project')
+    expect(parsed.change.branch).toBe('main')
+    expect(parsed.change.owner.name).toBe('John Doe')
+    expect(parsed.change.owner.email).toBe('john@example.com')
+
+    // Check diff is present
+    expect(parsed.diff).toContain('src/auth.js')
+    expect(parsed.diff).toContain('authenticate(user)')
+
+    // Check comments array
+    expect(Array.isArray(parsed.comments)).toBe(true)
+    expect(parsed.comments.length).toBe(3)
+    expect(parsed.comments[0].message).toContain('Clear commit message')
+    expect(parsed.comments[1].message).toBe('Good improvement!')
+    expect(parsed.comments[2].message).toBe('Consider adding JSDoc')
+
+    // Check messages array (should be empty for this test)
+    expect(Array.isArray(parsed.messages)).toBe(true)
+  })
+
+  test('should handle API errors gracefully in JSON format', async () => {
+    server.use(
+      http.get('*/a/changes/:changeId', () => {
+        return HttpResponse.json({ error: 'Change not found' }, { status: 404 })
+      }),
+    )
+
+    const mockConfigLayer = createMockConfigLayer()
+    const program = showCommand('12345', { json: true }).pipe(
+      Effect.provide(GerritApiServiceLive),
+      Effect.provide(mockConfigLayer),
+    )
+
+    await Effect.runPromise(program)
+
+    const output = capturedLogs.join('\n')
+
+    // Parse JSON to verify it's valid
+    const parsed = JSON.parse(output)
+
+    expect(parsed.status).toBe('error')
+    expect(parsed.error).toBeDefined()
+    expect(typeof parsed.error).toBe('string')
+  })
+
+  test('should sort comments by date in ascending order in XML output', async () => {
+    setupMockHandlers()
+
+    const mockConfigLayer = createMockConfigLayer()
+    const program = showCommand('12345', { xml: true }).pipe(
+      Effect.provide(GerritApiServiceLive),
+      Effect.provide(mockConfigLayer),
+    )
+
+    await Effect.runPromise(program)
+
+    const output = capturedLogs.join('\n')
+
+    // Extract comment sections to verify order
+    const commentMatches = output.matchAll(
+      /<comment>[\s\S]*?<updated>(.*?)<\/updated>[\s\S]*?<message><!\[CDATA\[(.*?)\]\]><\/message>[\s\S]*?<\/comment>/g,
+    )
+    const comments = Array.from(commentMatches).map((match) => ({
+      updated: match[1],
+      message: match[2],
+    }))
+
+    // Should have 3 comments
+    expect(comments.length).toBe(3)
+
+    // Comments should be in ascending date order (oldest first)
+    expect(comments[0].updated).toBe('2024-01-15 11:00:00.000000000')
+    expect(comments[0].message).toBe('Clear commit message')
+
+    expect(comments[1].updated).toBe('2024-01-15 11:30:00.000000000')
+    expect(comments[1].message).toBe('Good improvement!')
+
+    expect(comments[2].updated).toBe('2024-01-15 11:45:00.000000000')
+    expect(comments[2].message).toBe('Consider adding JSDoc')
+  })
+
+  test('should include messages in JSON output', async () => {
+    const mockChange = generateMockChange({
+      _number: 12345,
+      subject: 'Fix authentication bug',
+    })
+
+    const mockMessages: MessageInfo[] = [
+      {
+        id: 'msg1',
+        message: 'Patch Set 2: Verified-1\\n\\nBuild Failed https://jenkins.example.com/job/123',
+        author: { _account_id: 1001, name: 'Jenkins Bot' },
+        date: '2024-01-15 11:30:00.000000000',
+        _revision_number: 2,
+      },
+    ]
+
+    server.use(
+      http.get('*/a/changes/:changeId', ({ request }) => {
+        const url = new URL(request.url)
+        if (url.searchParams.get('o') === 'MESSAGES') {
+          return HttpResponse.text(`)]}'\n${JSON.stringify({ messages: mockMessages })}`)
+        }
+        return HttpResponse.text(`)]}'\n${JSON.stringify(mockChange)}`)
+      }),
+      http.get('*/a/changes/:changeId/revisions/current/patch', () => {
+        return HttpResponse.text('diff content')
+      }),
+      http.get('*/a/changes/:changeId/revisions/current/comments', () => {
+        return HttpResponse.text(`)]}'\n{}`)
+      }),
+    )
+
+    const mockConfigLayer = createMockConfigLayer()
+    const program = showCommand('12345', { json: true }).pipe(
+      Effect.provide(GerritApiServiceLive),
+      Effect.provide(mockConfigLayer),
+    )
+
+    await Effect.runPromise(program)
+
+    const output = capturedLogs.join('\n')
+    const parsed = JSON.parse(output)
+
+    expect(parsed.messages).toBeDefined()
+    expect(Array.isArray(parsed.messages)).toBe(true)
+    expect(parsed.messages.length).toBe(1)
+    expect(parsed.messages[0].message).toContain('Build Failed')
+    expect(parsed.messages[0].message).toContain('https://jenkins.example.com')
+    expect(parsed.messages[0].author.name).toBe('Jenkins Bot')
+    expect(parsed.messages[0].revision).toBe(2)
+  })
 })

package/tests/unit/git-worktree.test.ts

@@ -21,7 +21,8 @@ describe('GitWorktreeService Types and Structure', () => {
 
   test('should create service tag correctly', () => {
     expect(GitWorktreeService).toBeDefined()
-    expect(typeof GitWorktreeService).toBe('function')
+    expect(typeof GitWorktreeService).toBe('object')
+    expect(GitWorktreeService.key).toBe('GitWorktreeService')
   })
 
   test('should be able to create mock service implementation', async () => {

package/tsconfig.json

@@ -18,7 +18,8 @@
     "types": [
       "bun-types"
     ],
-    "isolatedDeclarations": false,
+    "declaration": true,
+    "isolatedDeclarations": true,
     "noImplicitAny": true,
     "strictNullChecks": true,
     "strictFunctionTypes": true,