diffstalker 0.2.0 → 0.2.2

package/dist/ui/widgets/CompareListView.js

@@ -1,6 +1,17 @@
 import { formatDate } from '../../utils/formatDate.js';
 import { formatCommitDisplay } from '../../utils/commitFormat.js';
-import { shortenPath } from '../../utils/formatPath.js';
+import { buildFileTree, flattenTree, buildTreePrefix } from '../../utils/fileTree.js';
+// ANSI escape codes for raw terminal output (avoids blessed tag escaping issues)
+const ANSI_RESET = '\x1b[0m';
+const ANSI_BOLD = '\x1b[1m';
+const ANSI_GRAY = '\x1b[90m';
+const ANSI_CYAN = '\x1b[36m';
+const ANSI_YELLOW = '\x1b[33m';
+const ANSI_GREEN = '\x1b[32m';
+const ANSI_RED = '\x1b[31m';
+const ANSI_BLUE = '\x1b[34m';
+const ANSI_MAGENTA = '\x1b[35m';
+const ANSI_INVERSE = '\x1b[7m';
 /**
  * Build the list of row items for the compare list view.
  */
@@ -15,26 +26,29 @@ export function buildCompareListRows(commits, files, commitsExpanded = true, fil
             });
         }
     }
-    // Files section
+    // Files section with tree view
     if (files.length > 0) {
         if (commits.length > 0) {
             result.push({ type: 'spacer' });
         }
         result.push({ type: 'section-header', sectionType: 'files' });
         if (filesExpanded) {
-            files.forEach((file, i) => {
-                result.push({ type: 'file', fileIndex: i, file });
-            });
+            // Build tree from files
+            const tree = buildFileTree(files);
+            const treeRows = flattenTree(tree);
+            for (const treeRow of treeRows) {
+                if (treeRow.type === 'directory') {
+                    result.push({ type: 'directory', treeRow });
+                }
+                else {
+                    const file = files[treeRow.fileIndex];
+                    result.push({ type: 'file', fileIndex: treeRow.fileIndex, file, treeRow });
+                }
+            }
         }
     }
     return result;
 }
-/**
- * Escape blessed tags in content.
- */
-function escapeContent(content) {
-    return content.replace(/\{/g, '{{').replace(/\}/g, '}}');
-}
 /**
  * Format a commit row.
  */
@@ -45,63 +59,122 @@ function formatCommitRow(commit, isSelected, isFocused, width) {
     const baseWidth = 2 + 7 + 4 + dateStr.length + 2;
     const remainingWidth = Math.max(10, width - baseWidth);
     const { displayMessage, displayRefs } = formatCommitDisplay(commit.message, commit.refs, remainingWidth);
-    let line = ' ';
-    line += `{yellow-fg}${commit.shortHash}{/yellow-fg} `;
+    let line = ` ${ANSI_YELLOW}${commit.shortHash}${ANSI_RESET} `;
     if (isHighlighted) {
-        line += `{cyan-fg}{inverse}${escapeContent(displayMessage)}{/inverse}{/cyan-fg}`;
+        line += `${ANSI_CYAN}${ANSI_INVERSE}${displayMessage}${ANSI_RESET}`;
     }
     else {
-        line += escapeContent(displayMessage);
+        line += displayMessage;
     }
-    line += ` {gray-fg}(${dateStr}){/gray-fg}`;
+    line += ` ${ANSI_GRAY}(${dateStr})${ANSI_RESET}`;
     if (displayRefs) {
-        line += ` {green-fg}${escapeContent(displayRefs)}{/green-fg}`;
+        line += ` ${ANSI_GREEN}${displayRefs}${ANSI_RESET}`;
     }
-    return line;
+    return `{escape}${line}{/escape}`;
 }
 /**
- * Format a file row.
+ * Format a directory row in tree view.
  */
-function formatFileRow(file, isSelected, isFocused, maxPathLength) {
+function formatDirectoryRow(treeRow, width) {
+    const prefix = buildTreePrefix(treeRow);
+    const icon = '▸ '; // Collapsed folder icon (we don't support expanding individual folders yet)
+    // Truncate name if needed
+    const maxNameLen = width - prefix.length - icon.length - 2;
+    let name = treeRow.name;
+    if (name.length > maxNameLen) {
+        name = name.slice(0, maxNameLen - 1) + '…';
+    }
+    const line = `${ANSI_GRAY}${prefix}${ANSI_RESET}${ANSI_BLUE}${icon}${name}${ANSI_RESET}`;
+    return `{escape}${line}{/escape}`;
+}
+/**
+ * Format a file row in tree view.
+ */
+function formatFileRow(file, treeRow, isSelected, isFocused, width) {
     const isHighlighted = isSelected && isFocused;
     const isUncommitted = file.isUncommitted ?? false;
+    const prefix = buildTreePrefix(treeRow);
     const statusColors = {
-        added: 'green',
-        modified: 'yellow',
-        deleted: 'red',
-        renamed: 'blue',
+        added: ANSI_GREEN,
+        modified: ANSI_YELLOW,
+        deleted: ANSI_RED,
+        renamed: ANSI_BLUE,
     };
-    const statusChars = {
-        added: 'A',
-        modified: 'M',
-        deleted: 'D',
-        renamed: 'R',
+    // File icon based on status
+    const statusIcons = {
+        added: '+',
+        modified: '●',
+        deleted: '−',
+        renamed: '→',
     };
-    // Account for stats: " (+123 -456)" and possible "*" for uncommitted
-    const statsLength = 5 + String(file.additions).length + String(file.deletions).length;
-    const uncommittedLength = isUncommitted ? 14 : 0;
-    const availableForPath = Math.max(10, maxPathLength - statsLength - uncommittedLength);
-    let line = ' ';
-    if (isUncommitted) {
-        line += '{magenta-fg}{bold}*{/bold}{/magenta-fg}';
+    const statusColor = isUncommitted ? ANSI_MAGENTA : statusColors[file.status];
+    const icon = statusIcons[file.status];
+    // Calculate available width for filename
+    const statsStr = `(+${file.additions} -${file.deletions})`;
+    const uncommittedStr = isUncommitted ? ' [uncommitted]' : '';
+    const fixedWidth = prefix.length + 2 + statsStr.length + uncommittedStr.length + 2;
+    const maxNameLen = Math.max(5, width - fixedWidth);
+    let name = treeRow.name;
+    if (name.length > maxNameLen) {
+        name = name.slice(0, maxNameLen - 1) + '…';
     }
-    const statusColor = isUncommitted ? 'magenta' : statusColors[file.status];
-    line += `{${statusColor}-fg}{bold}${statusChars[file.status]}{/bold}{/${statusColor}-fg} `;
-    const displayPath = shortenPath(file.path, availableForPath);
+    let line = `${ANSI_GRAY}${prefix}${ANSI_RESET}`;
+    line += `${statusColor}${icon}${ANSI_RESET} `;
     if (isHighlighted) {
-        line += `{cyan-fg}{inverse}${escapeContent(displayPath)}{/inverse}{/cyan-fg}`;
+        line += `${ANSI_CYAN}${ANSI_INVERSE}${name}${ANSI_RESET}`;
     }
     else if (isUncommitted) {
-        line += `{magenta-fg}${escapeContent(displayPath)}{/magenta-fg}`;
+        line += `${ANSI_MAGENTA}${name}${ANSI_RESET}`;
     }
     else {
-        line += escapeContent(displayPath);
+        line += name;
     }
-    line += ` {gray-fg}({/gray-fg}{green-fg}+${file.additions}{/green-fg} {red-fg}-${file.deletions}{/red-fg}{gray-fg}){/gray-fg}`;
+    line += ` ${ANSI_GRAY}(${ANSI_GREEN}+${file.additions}${ANSI_RESET} ${ANSI_RED}-${file.deletions}${ANSI_GRAY})${ANSI_RESET}`;
     if (isUncommitted) {
-        line += ' {magenta-fg}[uncommitted]{/magenta-fg}';
+        line += ` ${ANSI_MAGENTA}[uncommitted]${ANSI_RESET}`;
     }
-    return line;
+    return `{escape}${line}{/escape}`;
+}
+/**
+ * Check if a row is currently selected.
+ */
+function isRowSelected(row, selectedItem) {
+    if (!selectedItem)
+        return false;
+    if (row.type === 'commit' && row.commitIndex !== undefined) {
+        return selectedItem.type === 'commit' && selectedItem.index === row.commitIndex;
+    }
+    if (row.type === 'file' && row.fileIndex !== undefined) {
+        return selectedItem.type === 'file' && selectedItem.index === row.fileIndex;
+    }
+    return false;
+}
+/**
+ * Format a section header line (e.g. "▼ Commits (5)").
+ */
+function formatSectionHeader(label, count) {
+    return `{escape}${ANSI_CYAN}${ANSI_BOLD}▼ ${label}${ANSI_RESET} ${ANSI_GRAY}(${count})${ANSI_RESET}{/escape}`;
+}
+/**
+ * Format a single compare list row, returning null for unrenderable rows.
+ */
+function formatCompareRow(row, selectedItem, isFocused, commits, files, width) {
+    if (row.type === 'section-header') {
+        const isCommits = row.sectionType === 'commits';
+        return formatSectionHeader(isCommits ? 'Commits' : 'Files', isCommits ? commits.length : files.length);
+    }
+    if (row.type === 'spacer')
+        return '';
+    if (row.type === 'directory' && row.treeRow)
+        return formatDirectoryRow(row.treeRow, width);
+    const selected = isRowSelected(row, selectedItem);
+    if (row.type === 'commit' && row.commit && row.commitIndex !== undefined) {
+        return formatCommitRow(row.commit, selected, isFocused, width);
+    }
+    if (row.type === 'file' && row.file && row.fileIndex !== undefined && row.treeRow) {
+        return formatFileRow(row.file, row.treeRow, selected, isFocused, width);
+    }
+    return null;
 }
 /**
  * Format the compare list view as blessed-compatible tagged string.
@@ -115,50 +188,20 @@ export function formatCompareListView(commits, files, selectedItem, isFocused, w
     const visibleRows = maxHeight
         ? rows.slice(scrollOffset, scrollOffset + maxHeight)
         : rows.slice(scrollOffset);
-    const lines = [];
-    for (const row of visibleRows) {
-        if (row.type === 'section-header') {
-            const isCommits = row.sectionType === 'commits';
-            const count = isCommits ? commits.length : files.length;
-            const label = isCommits ? 'Commits' : 'Files';
-            lines.push(`{cyan-fg}{bold}▼ ${label}{/bold}{/cyan-fg} {gray-fg}(${count}){/gray-fg}`);
-        }
-        else if (row.type === 'spacer') {
-            lines.push('');
-        }
-        else if (row.type === 'commit' && row.commit && row.commitIndex !== undefined) {
-            const isSelected = selectedItem?.type === 'commit' && selectedItem.index === row.commitIndex;
-            lines.push(formatCommitRow(row.commit, isSelected, isFocused, width));
-        }
-        else if (row.type === 'file' && row.file && row.fileIndex !== undefined) {
-            const isSelected = selectedItem?.type === 'file' && selectedItem.index === row.fileIndex;
-            lines.push(formatFileRow(row.file, isSelected, isFocused, width - 5));
-        }
-    }
+    const lines = visibleRows
+        .map((row) => formatCompareRow(row, selectedItem, isFocused, commits, files, width))
+        .filter((line) => line !== null);
     return lines.join('\n');
 }
 /**
  * Get the total number of rows in the compare list view (for scroll calculation).
  */
 export function getCompareListTotalRows(commits, files, commitsExpanded = true, filesExpanded = true) {
-    let count = 0;
-    if (commits.length > 0) {
-        count += 1; // header
-        if (commitsExpanded)
-            count += commits.length;
-    }
-    if (files.length > 0) {
-        if (commits.length > 0)
-            count += 1; // spacer
-        count += 1; // header
-        if (filesExpanded)
-            count += files.length;
-    }
-    return count;
+    return buildCompareListRows(commits, files, commitsExpanded, filesExpanded).length;
 }
 /**
  * Map a row index to a selection.
- * Returns null if the row is a header or spacer.
+ * Returns null if the row is a header, spacer, or directory.
  */
 export function getCompareSelectionFromRow(rowIndex, commits, files, commitsExpanded = true, filesExpanded = true) {
     const rows = buildCompareListRows(commits, files, commitsExpanded, filesExpanded);