diffstalker 0.2.0 → 0.2.2

package/dist/core/ExplorerStateManager.js

@@ -18,14 +18,17 @@ function isBinaryContent(buffer) {
 }
 /**
  * ExplorerStateManager manages file explorer state independent of React.
- * It handles directory loading, file selection, and navigation.
+ * It handles directory loading, file selection, and navigation with tree view support.
  */
 export class ExplorerStateManager extends EventEmitter {
     repoPath;
     options;
+    expandedPaths = new Set();
+    gitStatusMap = { files: new Map(), directories: new Set() };
     _state = {
         currentPath: '',
-        items: [],
+        tree: null,
+        displayRows: [],
         selectedIndex: 0,
         selectedFile: null,
         isLoading: false,
@@ -34,7 +37,13 @@ export class ExplorerStateManager extends EventEmitter {
     constructor(repoPath, options) {
         super();
         this.repoPath = repoPath;
-        this.options = options;
+        this.options = {
+            hideHidden: options.hideHidden ?? true,
+            hideGitignored: options.hideGitignored ?? true,
+            showOnlyChanges: options.showOnlyChanges ?? false,
+        };
+        // Expand root by default
+        this.expandedPaths.add('');
     }
     get state() {
         return this._state;
@@ -44,77 +53,279 @@ export class ExplorerStateManager extends EventEmitter {
         this.emit('state-change', this._state);
     }
     /**
-     * Set filtering options and reload directory.
+     * Set filtering options and reload tree.
      */
     async setOptions(options) {
         this.options = { ...this.options, ...options };
-        await this.loadDirectory(this._state.currentPath);
+        await this.loadTree();
     }
     /**
-     * Load a directory's contents.
+     * Update git status map and refresh display.
      */
-    async loadDirectory(relativePath) {
-        this.updateState({ isLoading: true, error: null, currentPath: relativePath });
+    setGitStatus(statusMap) {
+        this.gitStatusMap = statusMap;
+        // Refresh display to show updated status
+        if (this._state.tree) {
+            this.applyGitStatusToTree(this._state.tree);
+            this.refreshDisplayRows();
+        }
+    }
+    /**
+     * Toggle showOnlyChanges filter.
+     */
+    async toggleShowOnlyChanges() {
+        this.options.showOnlyChanges = !this.options.showOnlyChanges;
+        this.refreshDisplayRows();
+    }
+    /**
+     * Check if showOnlyChanges is enabled.
+     */
+    get showOnlyChanges() {
+        return this.options.showOnlyChanges;
+    }
+    /**
+     * Load the full tree structure.
+     */
+    async loadTree() {
+        this.updateState({ isLoading: true, error: null });
+        try {
+            const tree = await this.buildTreeNode('', 0);
+            if (tree) {
+                tree.expanded = true; // Root is always expanded
+                this.applyGitStatusToTree(tree);
+                const displayRows = this.flattenTree(tree);
+                this.updateState({
+                    tree,
+                    displayRows,
+                    selectedIndex: 0,
+                    selectedFile: null,
+                    isLoading: false,
+                });
+            }
+            else {
+                this.updateState({
+                    tree: null,
+                    displayRows: [],
+                    isLoading: false,
+                    error: 'Failed to load directory',
+                });
+            }
+        }
+        catch (err) {
+            this.updateState({
+                error: err instanceof Error ? err.message : 'Failed to read directory',
+                tree: null,
+                displayRows: [],
+                isLoading: false,
+            });
+        }
+    }
+    /**
+     * Build a tree node for a directory path.
+     */
+    async buildTreeNode(relativePath, _depth) {
         try {
             const fullPath = path.join(this.repoPath, relativePath);
+            const stats = await fs.promises.stat(fullPath);
+            if (!stats.isDirectory()) {
+                // It's a file
+                return {
+                    name: path.basename(relativePath) || this.getRepoName(),
+                    path: relativePath,
+                    isDirectory: false,
+                    expanded: false,
+                    children: [],
+                    childrenLoaded: true,
+                };
+            }
+            const isExpanded = this.expandedPaths.has(relativePath);
+            const node = {
+                name: path.basename(relativePath) || this.getRepoName(),
+                path: relativePath,
+                isDirectory: true,
+                expanded: isExpanded,
+                children: [],
+                childrenLoaded: false,
+            };
+            // Always load children for root, or if expanded
+            if (relativePath === '' || isExpanded) {
+                await this.loadChildrenForNode(node);
+            }
+            return node;
+        }
+        catch {
+            return null;
+        }
+    }
+    /**
+     * Load children for a directory node.
+     */
+    async loadChildrenForNode(node) {
+        if (node.childrenLoaded)
+            return;
+        try {
+            const fullPath = path.join(this.repoPath, node.path);
             const entries = await fs.promises.readdir(fullPath, { withFileTypes: true });
             // Build list of paths for gitignore check
-            const pathsToCheck = entries.map((e) => relativePath ? path.join(relativePath, e.name) : e.name);
-            // Get ignored files (only if we need to filter them)
+            const pathsToCheck = entries.map((e) => (node.path ? path.join(node.path, e.name) : e.name));
+            // Get ignored files
             const ignoredFiles = this.options.hideGitignored
                 ? await getIgnoredFiles(this.repoPath, pathsToCheck)
                 : new Set();
-            // Filter and map entries
-            const explorerItems = entries
-                .filter((entry) => {
+            const children = [];
+            for (const entry of entries) {
                 // Filter dot-prefixed hidden files
                 if (this.options.hideHidden && entry.name.startsWith('.')) {
-                    return false;
+                    continue;
                 }
+                const entryPath = node.path ? path.join(node.path, entry.name) : entry.name;
                 // Filter gitignored files
-                if (this.options.hideGitignored) {
-                    const entryPath = relativePath ? path.join(relativePath, entry.name) : entry.name;
-                    if (ignoredFiles.has(entryPath)) {
-                        return false;
-                    }
+                if (this.options.hideGitignored && ignoredFiles.has(entryPath)) {
+                    continue;
                 }
-                return true;
-            })
-                .map((entry) => ({
-                name: entry.name,
-                path: relativePath ? path.join(relativePath, entry.name) : entry.name,
-                isDirectory: entry.isDirectory(),
-            }));
-            // Sort: directories first (alphabetical), then files (alphabetical)
-            explorerItems.sort((a, b) => {
+                const isDir = entry.isDirectory();
+                const isExpanded = this.expandedPaths.has(entryPath);
+                const childNode = {
+                    name: entry.name,
+                    path: entryPath,
+                    isDirectory: isDir,
+                    expanded: isExpanded,
+                    children: [],
+                    childrenLoaded: !isDir,
+                };
+                // Recursively load if expanded
+                if (isDir && isExpanded) {
+                    await this.loadChildrenForNode(childNode);
+                }
+                children.push(childNode);
+            }
+            // Sort: directories first, then alphabetically
+            children.sort((a, b) => {
                 if (a.isDirectory && !b.isDirectory)
                     return -1;
                 if (!a.isDirectory && b.isDirectory)
                     return 1;
                 return a.name.localeCompare(b.name);
             });
-            // Add ".." at the beginning if not at root
-            if (relativePath) {
-                explorerItems.unshift({
-                    name: '..',
-                    path: path.dirname(relativePath) || '',
-                    isDirectory: true,
-                });
+            // Collapse single-child directory chains
+            this.collapseNode(node, children);
+            node.childrenLoaded = true;
+        }
+        catch {
+            node.childrenLoaded = true;
+            node.children = [];
+        }
+    }
+    /**
+     * Collapse single-child directory chains.
+     * e.g., a -> b -> c -> file becomes "a/b/c" -> file
+     */
+    collapseNode(parent, children) {
+        for (const child of children) {
+            if (child.isDirectory && child.childrenLoaded) {
+                // Collapse if: single child that is also a directory
+                while (child.children.length === 1 &&
+                    child.children[0].isDirectory &&
+                    child.children[0].childrenLoaded) {
+                    const grandchild = child.children[0];
+                    child.name = `${child.name}/${grandchild.name}`;
+                    child.path = grandchild.path;
+                    child.children = grandchild.children;
+                    // Inherit expanded state from the collapsed path
+                    child.expanded = this.expandedPaths.has(child.path);
+                }
             }
-            this.updateState({
-                items: explorerItems,
-                selectedIndex: 0,
-                selectedFile: null,
-                isLoading: false,
-            });
         }
-        catch (err) {
-            this.updateState({
-                error: err instanceof Error ? err.message : 'Failed to read directory',
-                items: [],
-                isLoading: false,
-            });
+        parent.children = children;
+    }
+    /**
+     * Apply git status to tree nodes.
+     */
+    applyGitStatusToTree(node) {
+        if (!node.isDirectory) {
+            const status = this.gitStatusMap.files.get(node.path);
+            if (status) {
+                node.gitStatus = status.status;
+            }
+            else {
+                node.gitStatus = undefined;
+            }
         }
+        else {
+            // Check if directory contains any changed files
+            node.hasChangedChildren = this.gitStatusMap.directories.has(node.path);
+            for (const child of node.children) {
+                this.applyGitStatusToTree(child);
+            }
+        }
+    }
+    /**
+     * Flatten tree into display rows.
+     */
+    shouldIncludeNode(node) {
+        if (!this.options.showOnlyChanges)
+            return true;
+        if (node.isDirectory)
+            return !!node.hasChangedChildren;
+        return !!node.gitStatus;
+    }
+    flattenTree(root) {
+        const rows = [];
+        const traverseChildren = (node, depth, parentIsLast) => {
+            for (let i = 0; i < node.children.length; i++) {
+                const child = node.children[i];
+                const isLast = i === node.children.length - 1;
+                if (!this.shouldIncludeNode(child))
+                    continue;
+                rows.push({
+                    node: child,
+                    depth,
+                    isLast,
+                    parentIsLast: [...parentIsLast],
+                });
+                if (child.isDirectory && child.expanded) {
+                    traverseChildren(child, depth + 1, [...parentIsLast, isLast]);
+                }
+            }
+        };
+        // Start from root's children at depth 0 (root itself is not displayed)
+        traverseChildren(root, 0, []);
+        return rows;
+    }
+    /**
+     * Refresh display rows without reloading tree.
+     * Maintains selection by path, not by index.
+     */
+    refreshDisplayRows() {
+        if (!this._state.tree)
+            return;
+        // Remember the currently selected path
+        const currentSelectedPath = this._state.displayRows[this._state.selectedIndex]?.node.path ?? null;
+        const displayRows = this.flattenTree(this._state.tree);
+        // Find the same path in the new rows
+        let selectedIndex = 0;
+        if (currentSelectedPath !== null) {
+            const foundIndex = displayRows.findIndex((row) => row.node.path === currentSelectedPath);
+            if (foundIndex >= 0) {
+                selectedIndex = foundIndex;
+            }
+        }
+        // Clamp to valid range
+        selectedIndex = Math.min(selectedIndex, Math.max(0, displayRows.length - 1));
+        this.updateState({ displayRows, selectedIndex });
+    }
+    /**
+     * Get repo name from path.
+     */
+    getRepoName() {
+        return path.basename(this.repoPath) || 'repo';
+    }
+    /**
+     * Load a directory's contents (legacy method, now wraps loadTree).
+     */
+    async loadDirectory(relativePath) {
+        this._state.currentPath = relativePath;
+        await this.loadTree();
     }
     /**
      * Load a file's contents.
@@ -149,7 +360,7 @@ export class ExplorerStateManager extends EventEmitter {
             let truncated = false;
             // Warn about large files
             if (stats.size > WARN_FILE_SIZE) {
-                const warning = `⚠ Large file (${(stats.size / 1024).toFixed(1)} KB)\n\n`;
+                const warning = `Warning: Large file (${(stats.size / 1024).toFixed(1)} KB)\n\n`;
                 content = warning + content;
             }
             // Truncate if needed
@@ -182,12 +393,13 @@ export class ExplorerStateManager extends EventEmitter {
      * Select an item by index.
      */
     async selectIndex(index) {
-        if (index < 0 || index >= this._state.items.length)
+        const rows = this._state.displayRows;
+        if (index < 0 || index >= rows.length)
             return;
-        const selected = this._state.items[index];
+        const row = rows[index];
         this.updateState({ selectedIndex: index });
-        if (selected && !selected.isDirectory) {
-            await this.loadFile(selected.path);
+        if (row && !row.node.isDirectory) {
+            await this.loadFile(row.node.path);
         }
         else {
             this.updateState({ selectedFile: null });
@@ -195,15 +407,12 @@ export class ExplorerStateManager extends EventEmitter {
     }
     /**
      * Navigate to previous item.
-     * Returns the new scroll offset if scrolling is needed, or null if not.
      */
     navigateUp(currentScrollOffset) {
         const newIndex = Math.max(0, this._state.selectedIndex - 1);
         if (newIndex === this._state.selectedIndex)
             return null;
-        // Don't await - fire and forget for responsiveness
         this.selectIndex(newIndex);
-        // Return new scroll offset if we need to scroll up
         if (newIndex < currentScrollOffset) {
             return newIndex;
         }
@@ -211,16 +420,13 @@ export class ExplorerStateManager extends EventEmitter {
     }
     /**
      * Navigate to next item.
-     * Returns the new scroll offset if scrolling is needed, or null if not.
      */
     navigateDown(currentScrollOffset, visibleHeight) {
-        const newIndex = Math.min(this._state.items.length - 1, this._state.selectedIndex + 1);
+        const newIndex = Math.min(this._state.displayRows.length - 1, this._state.selectedIndex + 1);
         if (newIndex === this._state.selectedIndex)
             return null;
-        // Don't await - fire and forget for responsiveness
         this.selectIndex(newIndex);
-        // Calculate visible area accounting for scroll indicators
-        const needsScrolling = this._state.items.length > visibleHeight;
+        const needsScrolling = this._state.displayRows.length > visibleHeight;
         const availableHeight = needsScrolling ? visibleHeight - 2 : visibleHeight;
         const visibleEnd = currentScrollOffset + availableHeight;
         if (newIndex >= visibleEnd) {
@@ -229,33 +435,172 @@ export class ExplorerStateManager extends EventEmitter {
         return null;
     }
     /**
-     * Enter the selected directory or go to parent if ".." is selected.
+     * Toggle expand/collapse for selected directory, or go to parent if ".." would be selected.
      */
-    async enterDirectory() {
-        const selected = this._state.items[this._state.selectedIndex];
-        if (!selected)
+    async toggleExpand() {
+        const rows = this._state.displayRows;
+        const index = this._state.selectedIndex;
+        if (index < 0 || index >= rows.length)
             return;
-        if (selected.isDirectory) {
-            if (selected.name === '..') {
-                const parent = path.dirname(this._state.currentPath);
-                // path.dirname returns "." for top-level paths, normalize to ""
-                await this.loadDirectory(parent === '.' ? '' : parent);
-            }
-            else {
-                await this.loadDirectory(selected.path);
+        const row = rows[index];
+        if (!row.node.isDirectory)
+            return;
+        const node = row.node;
+        if (node.expanded) {
+            // Collapse
+            this.expandedPaths.delete(node.path);
+            node.expanded = false;
+        }
+        else {
+            // Expand
+            this.expandedPaths.add(node.path);
+            node.expanded = true;
+            // Load children if not loaded
+            if (!node.childrenLoaded) {
+                await this.loadChildrenForNode(node);
+                this.applyGitStatusToTree(node);
             }
         }
-        // If it's a file, do nothing (file content is already shown)
+        this.refreshDisplayRows();
+    }
+    /**
+     * Enter the selected directory (expand) or open parent directory.
+     * This is called when Enter is pressed.
+     */
+    async enterDirectory() {
+        const rows = this._state.displayRows;
+        const index = this._state.selectedIndex;
+        if (index < 0 || index >= rows.length)
+            return;
+        const row = rows[index];
+        if (row.node.isDirectory) {
+            await this.toggleExpand();
+        }
+        // For files, do nothing (file content is already shown)
     }
     /**
-     * Go to parent directory (backspace navigation).
+     * Go to parent directory - navigate up and collapse the directory we left.
      */
     async goUp() {
-        if (this._state.currentPath) {
-            const parent = path.dirname(this._state.currentPath);
-            // path.dirname returns "." for top-level paths, normalize to ""
-            await this.loadDirectory(parent === '.' ? '' : parent);
+        const rows = this._state.displayRows;
+        const index = this._state.selectedIndex;
+        if (index < 0 || index >= rows.length)
+            return;
+        const row = rows[index];
+        const currentPath = row.node.path;
+        // Find the parent directory path
+        const parentPath = path.dirname(currentPath);
+        if (parentPath === '.' || parentPath === '') {
+            // Already at root level - nothing to do
+            return;
+        }
+        // If we're inside an expanded directory, collapse it
+        // The "inside" directory is the first expanded ancestor of our current selection
+        const pathParts = currentPath.split('/');
+        for (let i = pathParts.length - 1; i > 0; i--) {
+            const ancestorPath = pathParts.slice(0, i).join('/');
+            if (this.expandedPaths.has(ancestorPath)) {
+                // Collapse this ancestor and select it
+                this.expandedPaths.delete(ancestorPath);
+                // Find this ancestor in the tree and set expanded = false
+                const ancestor = this.findNodeByPath(ancestorPath);
+                if (ancestor) {
+                    ancestor.expanded = false;
+                }
+                this.refreshDisplayRows();
+                // Select the collapsed ancestor (use selectIndex to clear file preview)
+                const newRows = this._state.displayRows;
+                const ancestorIndex = newRows.findIndex((r) => r.node.path === ancestorPath);
+                if (ancestorIndex >= 0) {
+                    // Update selected index and clear file preview since we're selecting a directory
+                    this.updateState({ selectedIndex: ancestorIndex, selectedFile: null });
+                }
+                return;
+            }
+        }
+    }
+    /**
+     * Find a node by its path in the tree.
+     */
+    findNodeByPath(targetPath) {
+        if (!this._state.tree)
+            return null;
+        const search = (node) => {
+            if (node.path === targetPath)
+                return node;
+            for (const child of node.children) {
+                const found = search(child);
+                if (found)
+                    return found;
+            }
+            return null;
+        };
+        return search(this._state.tree);
+    }
+    /**
+     * Get all file paths in the repo (for file finder).
+     * Scans the filesystem directly to get all files, not just expanded ones.
+     */
+    async getAllFilePaths() {
+        const paths = [];
+        const scanDir = async (dirPath) => {
+            try {
+                const fullPath = path.join(this.repoPath, dirPath);
+                const entries = await fs.promises.readdir(fullPath, { withFileTypes: true });
+                // Build list of paths for gitignore check
+                const pathsToCheck = entries.map((e) => (dirPath ? path.join(dirPath, e.name) : e.name));
+                // Get ignored files
+                const ignoredFiles = this.options.hideGitignored
+                    ? await getIgnoredFiles(this.repoPath, pathsToCheck)
+                    : new Set();
+                for (const entry of entries) {
+                    // Filter dot-prefixed hidden files
+                    if (this.options.hideHidden && entry.name.startsWith('.')) {
+                        continue;
+                    }
+                    const entryPath = dirPath ? path.join(dirPath, entry.name) : entry.name;
+                    // Filter gitignored files
+                    if (this.options.hideGitignored && ignoredFiles.has(entryPath)) {
+                        continue;
+                    }
+                    if (entry.isDirectory()) {
+                        await scanDir(entryPath);
+                    }
+                    else {
+                        paths.push(entryPath);
+                    }
+                }
+            }
+            catch {
+                // Ignore errors for individual directories
+            }
+        };
+        await scanDir('');
+        return paths;
+    }
+    /**
+     * Navigate to a specific file path in the tree.
+     * Expands parent directories as needed.
+     */
+    async navigateToPath(filePath) {
+        if (!this._state.tree)
+            return false;
+        // Expand all parent directories
+        const parts = filePath.split('/');
+        let currentPath = '';
+        for (let i = 0; i < parts.length - 1; i++) {
+            currentPath = currentPath ? `${currentPath}/${parts[i]}` : parts[i];
+            this.expandedPaths.add(currentPath);
+        }
+        // Reload tree with new expanded state
+        await this.loadTree();
+        // Find the file in display rows
+        const index = this._state.displayRows.findIndex((r) => r.node.path === filePath);
+        if (index >= 0) {
+            await this.selectIndex(index);
+            return true;
         }
+        return false;
     }
     /**
      * Clean up resources.