@aaronshaf/ger 1.2.11 → 2.0.0

package/src/utils/comment-formatters.ts

@@ -0,0 +1,153 @@
+import type { CommentInfo } from '@/schemas/gerrit'
+import { colors, formatDate } from './formatters'
+
+export interface CommentWithContext {
+  comment: CommentInfo
+  context?: {
+    before: string[]
+    line?: string
+    after: string[]
+  }
+}
+
+export const formatCommentsPretty = (comments: CommentWithContext[]): void => {
+  if (comments.length === 0) {
+    console.log('No comments found on this change')
+    return
+  }
+
+  console.log(`Found ${comments.length} comment${comments.length === 1 ? '' : 's'}:\n`)
+
+  let currentPath: string | undefined
+
+  for (const { comment, context } of comments) {
+    // Group by file
+    if (comment.path !== currentPath) {
+      currentPath = comment.path
+      console.log(`${colors.blue}═══ ${currentPath} ═══${colors.reset}`)
+    }
+
+    // Comment metadata
+    const author = comment.author?.name || 'Unknown'
+    const date = comment.updated ? formatDate(comment.updated) : ''
+    const status = comment.unresolved ? `${colors.yellow}[UNRESOLVED]${colors.reset} ` : ''
+
+    console.log(`\n${status}${colors.dim}${author} • ${date}${colors.reset}`)
+
+    if (comment.line) {
+      console.log(`${colors.dim}Line ${comment.line}:${colors.reset}`)
+
+      // Show context if available
+      if (context && (context.before.length > 0 || context.line || context.after.length > 0)) {
+        console.log(`${colors.dim}───────────────────${colors.reset}`)
+        for (const line of context.before) {
+          console.log(`${colors.dim}  ${line}${colors.reset}`)
+        }
+        if (context.line) {
+          console.log(`${colors.green}> ${context.line}${colors.reset}`)
+        }
+        for (const line of context.after) {
+          console.log(`${colors.dim}  ${line}${colors.reset}`)
+        }
+        console.log(`${colors.dim}───────────────────${colors.reset}`)
+      }
+    }
+
+    // Comment message (indent each line)
+    const messageLines = comment.message.split('\n')
+    for (const line of messageLines) {
+      console.log(`  ${line}`)
+    }
+  }
+}
+
+// Escape special XML characters to prevent XSS
+const escapeXml = (str: string): string => {
+  return str
+    .replace(/&/g, '&')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/"/g, '&quot;')
+    .replace(/'/g, '&apos;')
+}
+
+export const formatCommentsXml = (changeId: string, comments: CommentWithContext[]): void => {
+  console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
+  console.log(`<comments_result>`)
+  console.log(`  <change_id>${escapeXml(changeId)}</change_id>`)
+  console.log(`  <comment_count>${comments.length}</comment_count>`)
+  console.log(`  <comments>`)
+
+  for (const { comment, context } of comments) {
+    console.log(`    <comment>`)
+    console.log(`      <id>${escapeXml(comment.id)}</id>`)
+    if (comment.path) {
+      console.log(`      <path><![CDATA[${comment.path}]]></path>`)
+    }
+    if (comment.line) {
+      console.log(`      <line>${comment.line}</line>`)
+    }
+    if (comment.range) {
+      console.log(`      <range>`)
+      console.log(`        <start_line>${comment.range.start_line}</start_line>`)
+      console.log(`        <end_line>${comment.range.end_line}</end_line>`)
+      if (comment.range.start_character !== undefined) {
+        console.log(`        <start_character>${comment.range.start_character}</start_character>`)
+      }
+      if (comment.range.end_character !== undefined) {
+        console.log(`        <end_character>${comment.range.end_character}</end_character>`)
+      }
+      console.log(`      </range>`)
+    }
+    if (comment.author) {
+      console.log(`      <author>`)
+      if (comment.author.name) {
+        console.log(`        <name><![CDATA[${comment.author.name}]]></name>`)
+      }
+      if (comment.author.email) {
+        console.log(`        <email>${escapeXml(comment.author.email)}</email>`)
+      }
+      if (comment.author._account_id !== undefined) {
+        console.log(`        <account_id>${comment.author._account_id}</account_id>`)
+      }
+      console.log(`      </author>`)
+    }
+    if (comment.updated) {
+      console.log(`      <updated>${escapeXml(comment.updated)}</updated>`)
+    }
+    if (comment.unresolved !== undefined) {
+      console.log(`      <unresolved>${comment.unresolved}</unresolved>`)
+    }
+    if (comment.in_reply_to) {
+      console.log(`      <in_reply_to>${escapeXml(comment.in_reply_to)}</in_reply_to>`)
+    }
+    console.log(`      <message><![CDATA[${comment.message}]]></message>`)
+
+    if (context && (context.before.length > 0 || context.line || context.after.length > 0)) {
+      console.log(`      <diff_context>`)
+      if (context.before.length > 0) {
+        console.log(`        <before>`)
+        for (const line of context.before) {
+          console.log(`          <line><![CDATA[${line}]]></line>`)
+        }
+        console.log(`        </before>`)
+      }
+      if (context.line) {
+        console.log(`        <target_line><![CDATA[${context.line}]]></target_line>`)
+      }
+      if (context.after.length > 0) {
+        console.log(`        <after>`)
+        for (const line of context.after) {
+          console.log(`          <line><![CDATA[${line}]]></line>`)
+        }
+        console.log(`        </after>`)
+      }
+      console.log(`      </diff_context>`)
+    }
+
+    console.log(`    </comment>`)
+  }
+
+  console.log(`  </comments>`)
+  console.log(`</comments_result>`)
+}

package/src/utils/diff-context.ts

@@ -0,0 +1,103 @@
+import { Effect } from 'effect'
+import { type ApiError, GerritApiService } from '@/api/gerrit'
+import type { FileDiffContent } from '@/schemas/gerrit'
+
+export interface DiffContext {
+  before: string[]
+  line?: string
+  after: string[]
+}
+
+/**
+ * Extracts context around a specific line number from a diff.
+ * This is a more accurate implementation that properly tracks line numbers
+ * across different diff sections.
+ */
+export const extractDiffContext = (
+  diff: FileDiffContent,
+  targetLine: number,
+  contextLines: number = 2,
+): DiffContext => {
+  const context: DiffContext = {
+    before: [],
+    after: [],
+  }
+
+  let currentNewLine = 1
+  const _foundTarget = false
+  const collectedLines: Array<{ line: string; lineNum: number; type: 'context' | 'added' }> = []
+
+  for (const section of diff.content) {
+    // Context lines (present in both old and new)
+    if (section.ab) {
+      for (const line of section.ab) {
+        collectedLines.push({ line, lineNum: currentNewLine, type: 'context' })
+        currentNewLine++
+      }
+    }
+
+    // Added lines (only in new file)
+    if (section.b) {
+      for (const line of section.b) {
+        collectedLines.push({ line, lineNum: currentNewLine, type: 'added' })
+        currentNewLine++
+      }
+    }
+
+    // Skip lines (large unchanged sections)
+    if (section.skip) {
+      // If target is in skipped section, we can't show context
+      if (currentNewLine <= targetLine && targetLine < currentNewLine + section.skip) {
+        return context // Return empty context
+      }
+      currentNewLine += section.skip
+    }
+
+    // Removed lines don't affect new file line numbers
+    // section.a is ignored for line counting
+  }
+
+  // Find the target line and extract context
+  const targetIndex = collectedLines.findIndex((item) => item.lineNum === targetLine)
+  if (targetIndex !== -1) {
+    // Get before context
+    for (let i = Math.max(0, targetIndex - contextLines); i < targetIndex; i++) {
+      context.before.push(collectedLines[i].line)
+    }
+
+    // Get target line
+    context.line = collectedLines[targetIndex].line
+
+    // Get after context
+    for (
+      let i = targetIndex + 1;
+      i < Math.min(collectedLines.length, targetIndex + contextLines + 1);
+      i++
+    ) {
+      context.after.push(collectedLines[i].line)
+    }
+  }
+
+  return context
+}
+
+export const getDiffContext = (
+  changeId: string,
+  path: string,
+  line?: number,
+): Effect.Effect<DiffContext, ApiError, GerritApiService> =>
+  Effect.gen(function* () {
+    if (!line || path === 'Commit Message' || path === '/COMMIT_MSG') {
+      return { before: [], after: [] }
+    }
+
+    const gerritApi = yield* GerritApiService
+
+    try {
+      const diff = yield* gerritApi.getFileDiff(changeId, path)
+      return extractDiffContext(diff, line)
+    } catch {
+      // Return empty context on error
+      return { before: [], after: [] }
+    }
+  })

package/src/utils/diff-formatters.ts

@@ -0,0 +1,141 @@
+import { colors } from './formatters'
+
+interface DiffStats {
+  additions: number
+  deletions: number
+  files: number
+}
+
+/**
+ * Format a unified diff for pretty human-readable output
+ */
+export const formatDiffPretty = (diffContent: string): string => {
+  if (!diffContent || typeof diffContent !== 'string') {
+    const emptyStats = { additions: 0, deletions: 0, files: 0 }
+    return formatDiffSummary(emptyStats) + '\n\n' + 'No diff content available'
+  }
+
+  const lines = diffContent.split('\n')
+  const formattedLines: string[] = []
+  let stats: DiffStats = { additions: 0, deletions: 0, files: 0 }
+
+  for (const line of lines) {
+    if (line.startsWith('diff --git')) {
+      stats.files++
+      // File header with colors
+      formattedLines.push(`${colors.bold}${colors.blue}${line}${colors.reset}`)
+    } else if (line.startsWith('index ')) {
+      // Index line
+      formattedLines.push(`${colors.dim}${line}${colors.reset}`)
+    } else if (line.startsWith('---')) {
+      // Old file marker
+      formattedLines.push(`${colors.red}${line}${colors.reset}`)
+    } else if (line.startsWith('+++')) {
+      // New file marker
+      formattedLines.push(`${colors.green}${line}${colors.reset}`)
+    } else if (line.startsWith('@@')) {
+      // Hunk header
+      formattedLines.push(`${colors.cyan}${line}${colors.reset}`)
+    } else if (line.startsWith('+') && !line.startsWith('+++')) {
+      // Added lines
+      stats.additions++
+      formattedLines.push(`${colors.green}${line}${colors.reset}`)
+    } else if (line.startsWith('-') && !line.startsWith('---')) {
+      // Removed lines
+      stats.deletions++
+      formattedLines.push(`${colors.red}${line}${colors.reset}`)
+    } else if (line.startsWith(' ')) {
+      // Context lines
+      formattedLines.push(`${colors.dim}${line}${colors.reset}`)
+    } else {
+      // Other lines (usually empty or metadata)
+      formattedLines.push(line)
+    }
+  }
+
+  // Add summary at the top
+  const summary = formatDiffSummary(stats)
+
+  return summary + '\n\n' + formattedLines.join('\n')
+}
+
+/**
+ * Format diff summary statistics
+ */
+export const formatDiffSummary = (stats: DiffStats): string => {
+  const { additions, deletions, files } = stats
+  const total = additions + deletions
+
+  let summary = `${colors.bold}Changes summary:${colors.reset} `
+
+  if (files > 0) {
+    summary += `${files} file${files !== 1 ? 's' : ''} changed`
+  }
+
+  if (additions > 0 || deletions > 0) {
+    if (files > 0) summary += ', '
+
+    if (additions > 0) {
+      summary += `${colors.green}+${additions} addition${additions !== 1 ? 's' : ''}${colors.reset}`
+    }
+
+    if (additions > 0 && deletions > 0) {
+      summary += ', '
+    }
+
+    if (deletions > 0) {
+      summary += `${colors.red}-${deletions} deletion${deletions !== 1 ? 's' : ''}${colors.reset}`
+    }
+  }
+
+  if (total === 0 && files === 0) {
+    summary += 'No changes detected'
+  }
+
+  return summary
+}
+
+/**
+ * Format a list of changed files for pretty output
+ */
+export const formatFilesList = (files: string[]): string => {
+  if (!files || files.length === 0) {
+    return 'No files changed'
+  }
+
+  const header = `${colors.bold}Changed files (${files.length}):${colors.reset}\n`
+  const fileList = files
+    .map((file) => {
+      // Simple file status indicators - we could enhance this if we had status info
+      return `  ${colors.blue}•${colors.reset} ${file}`
+    })
+    .join('\n')
+
+  return header + fileList
+}
+
+/**
+ * Extract diff statistics from unified diff content
+ */
+export const extractDiffStats = (diffContent: string): DiffStats => {
+  if (!diffContent || typeof diffContent !== 'string') {
+    return { additions: 0, deletions: 0, files: 0 }
+  }
+
+  const lines = diffContent.split('\n')
+  let additions = 0
+  let deletions = 0
+  let files = 0
+
+  for (const line of lines) {
+    if (line.startsWith('diff --git')) {
+      files++
+    } else if (line.startsWith('+') && !line.startsWith('+++')) {
+      additions++
+    } else if (line.startsWith('-') && !line.startsWith('---')) {
+      deletions++
+    }
+  }
+
+  return { additions, deletions, files }
+}

package/src/utils/formatters.ts

@@ -0,0 +1,85 @@
+import type { ChangeInfo } from '@/schemas/gerrit'
+
+export const formatDate = (dateStr: string): string => {
+  const date = new Date(dateStr)
+  const now = new Date()
+
+  // Check if today
+  if (date.toDateString() === now.toDateString()) {
+    return date.toLocaleTimeString('en-US', {
+      hour: 'numeric',
+      minute: '2-digit',
+      hour12: true,
+    })
+  }
+
+  // Check if this year
+  if (date.getFullYear() === now.getFullYear()) {
+    return date.toLocaleDateString('en-US', {
+      month: 'short',
+      day: '2-digit',
+    })
+  }
+
+  // Otherwise show full date
+  return date.toLocaleDateString('en-US', {
+    month: 'short',
+    day: '2-digit',
+    year: 'numeric',
+  })
+}
+
+export const getStatusIndicator = (change: ChangeInfo): string => {
+  const indicators: string[] = []
+
+  // Check for labels only if they exist
+  if (change.labels) {
+    // Check for Code-Review
+    if (change.labels['Code-Review']) {
+      const cr = change.labels['Code-Review']
+      if (cr.approved || cr.value === 2) {
+        indicators.push(`${colors.green}✓${colors.reset}`)
+      } else if (cr.rejected || cr.value === -2) {
+        indicators.push(`${colors.red}✗${colors.reset}`)
+      } else if (cr.recommended || cr.value === 1) {
+        indicators.push(`${colors.cyan}↑${colors.reset}`)
+      } else if (cr.disliked || cr.value === -1) {
+        indicators.push(`${colors.yellow}↓${colors.reset}`)
+      }
+    }
+
+    // Check for Verified
+    if (change.labels.Verified) {
+      const v = change.labels.Verified
+      if (v.approved || v.value === 1) {
+        indicators.push(`${colors.green}✓${colors.reset}`)
+      } else if (v.rejected || v.value === -1) {
+        indicators.push(`${colors.red}✗${colors.reset}`)
+      }
+    }
+  }
+
+  // Check if submittable (regardless of labels)
+  if (change.submittable) {
+    indicators.push('🚀')
+  }
+
+  // Check if WIP (regardless of labels)
+  if (change.work_in_progress) {
+    indicators.push('🚧')
+  }
+
+  return indicators.length > 0 ? indicators.join('  ') : '' // Double space for proper alignment
+}
+
+export const colors = {
+  green: '\x1b[32m',
+  yellow: '\x1b[33m',
+  red: '\x1b[31m',
+  blue: '\x1b[34m',
+  cyan: '\x1b[36m',
+  gray: '\x1b[90m',
+  reset: '\x1b[0m',
+  bold: '\x1b[1m',
+  dim: '\x1b[2m',
+}