diffstalker 0.2.1 → 0.2.2

package/dist/utils/flatFileList.js

@@ -0,0 +1,67 @@
+/**
+ * Build a deduplicated, alphabetically sorted flat file list.
+ * Files that appear in both staged and unstaged are merged into one entry
+ * with stagingState 'partial'.
+ */
+export function buildFlatFileList(files, hunkCounts) {
+    // Group by path
+    const byPath = new Map();
+    for (const file of files) {
+        const existing = byPath.get(file.path) ?? { staged: null, unstaged: null };
+        if (file.staged) {
+            existing.staged = file;
+        }
+        else {
+            existing.unstaged = file;
+        }
+        byPath.set(file.path, existing);
+    }
+    const result = [];
+    for (const [filePath, { staged, unstaged }] of byPath) {
+        const stagedHunks = hunkCounts?.staged.get(filePath) ?? 0;
+        const unstagedHunks = hunkCounts?.unstaged.get(filePath) ?? 0;
+        const totalHunks = stagedHunks + unstagedHunks;
+        let stagingState;
+        if (staged && unstaged) {
+            stagingState = 'partial';
+        }
+        else if (staged) {
+            stagingState = 'staged';
+        }
+        else {
+            stagingState = 'unstaged';
+        }
+        // Use the unstaged entry as primary (for status), fall back to staged
+        const primary = unstaged ?? staged;
+        // Combine insertions/deletions from both entries
+        let insertions;
+        let deletions;
+        if (staged?.insertions !== undefined || unstaged?.insertions !== undefined) {
+            insertions = (staged?.insertions ?? 0) + (unstaged?.insertions ?? 0);
+        }
+        if (staged?.deletions !== undefined || unstaged?.deletions !== undefined) {
+            deletions = (staged?.deletions ?? 0) + (unstaged?.deletions ?? 0);
+        }
+        result.push({
+            path: filePath,
+            status: primary.status,
+            stagingState,
+            stagedHunks,
+            totalHunks,
+            insertions,
+            deletions,
+            originalPath: primary.originalPath,
+            stagedEntry: staged,
+            unstagedEntry: unstaged,
+        });
+    }
+    // Sort alphabetically by path
+    result.sort((a, b) => a.path.localeCompare(b.path));
+    return result;
+}
+export function getFlatFileAtIndex(flatFiles, index) {
+    return flatFiles[index] ?? null;
+}
+export function getFlatFileIndexByPath(flatFiles, path) {
+    return flatFiles.findIndex((f) => f.path === path);
+}

package/dist/utils/layoutCalculations.js

@@ -32,11 +32,13 @@ export function getFileListTotalRows(files) {
  *
  * The top pane grows to fit files up to 40% of content height.
  * The bottom pane gets the remaining space.
+ *
+ * When flatRowCount is provided (flat view mode), uses that directly instead
+ * of computing row count from categorized file list.
  */
-export function calculatePaneHeights(files, contentHeight, maxTopRatio = 0.4) {
+export function calculatePaneHeights(files, contentHeight, maxTopRatio = 0.4, flatRowCount) {
     // Calculate content rows needed for staging area
-    // Uses getFileListTotalRows for consistency with FileList rendering
-    const neededRows = getFileListTotalRows(files);
+    const neededRows = flatRowCount !== undefined ? flatRowCount : getFileListTotalRows(files);
     // Minimum height of 3 (header + 2 lines for empty state)
     const minHeight = 3;
     // Maximum is maxTopRatio of content area

package/eslint.metrics.js

@@ -9,7 +9,6 @@ export default [
     rules: {
       complexity: ['warn', { max: 1 }],
       'sonarjs/cognitive-complexity': ['warn', 1],
-      'max-depth': ['warn', { max: 1 }],
       'max-lines-per-function': ['warn', { max: 1 }],
     },
   },

package/metrics/v0.2.2.json

@@ -0,0 +1,229 @@
+{
+  "timestamp": "2026-02-01T21:09:51.898Z",
+  "gitRef": "v0.2.2",
+  "gitSha": "b349fdc",
+  "summary": {
+    "files": 77,
+    "lines": 14894,
+    "functions": 1046,
+    "avgCyclomaticComplexity": 5.3,
+    "maxCyclomaticComplexity": {
+      "value": 42,
+      "function": "buildDiffDisplayRows",
+      "file": "src/utils/displayRows.ts:112"
+    },
+    "avgCognitiveComplexity": 6.4,
+    "maxCognitiveComplexity": {
+      "value": 68,
+      "function": "buildDiffDisplayRows",
+      "file": "src/utils/displayRows.ts:112"
+    },
+    "smells": 0
+  },
+  "hotspots": [
+    {
+      "file": "src/utils/displayRows.ts",
+      "lines": 567,
+      "cyclomaticMax": 42,
+      "cognitiveMax": 68,
+      "smells": 0
+    },
+    {
+      "file": "src/utils/flatFileList.ts",
+      "lines": 100,
+      "cyclomaticMax": 29,
+      "cognitiveMax": 14,
+      "smells": 0
+    },
+    {
+      "file": "src/git/diff.ts",
+      "lines": 656,
+      "cyclomaticMax": 26,
+      "cognitiveMax": 41,
+      "smells": 0
+    },
+    {
+      "file": "src/App.ts",
+      "lines": 1391,
+      "cyclomaticMax": 23,
+      "cognitiveMax": 13,
+      "smells": 0
+    },
+    {
+      "file": "src/git/status.ts",
+      "lines": 268,
+      "cyclomaticMax": 22,
+      "cognitiveMax": 25,
+      "smells": 0
+    },
+    {
+      "file": "src/ui/PaneRenderers.ts",
+      "lines": 224,
+      "cyclomaticMax": 20,
+      "cognitiveMax": 8,
+      "smells": 0
+    },
+    {
+      "file": "src/ui/widgets/ExplorerContent.ts",
+      "lines": 130,
+      "cyclomaticMax": 20,
+      "cognitiveMax": 24,
+      "smells": 0
+    },
+    {
+      "file": "src/MouseHandlers.ts",
+      "lines": 257,
+      "cyclomaticMax": 17,
+      "cognitiveMax": 15,
+      "smells": 0
+    },
+    {
+      "file": "src/ipc/CommandServer.ts",
+      "lines": 266,
+      "cyclomaticMax": 17,
+      "cognitiveMax": 6,
+      "smells": 0
+    },
+    {
+      "file": "src/index.ts",
+      "lines": 178,
+      "cyclomaticMax": 16,
+      "cognitiveMax": 17,
+      "smells": 0
+    },
+    {
+      "file": "src/ui/widgets/ExplorerView.ts",
+      "lines": 245,
+      "cyclomaticMax": 16,
+      "cognitiveMax": 21,
+      "smells": 0
+    },
+    {
+      "file": "src/utils/ansiTruncate.ts",
+      "lines": 123,
+      "cyclomaticMax": 16,
+      "cognitiveMax": 24,
+      "smells": 0
+    },
+    {
+      "file": "src/ui/widgets/DiffView.ts",
+      "lines": 511,
+      "cyclomaticMax": 15,
+      "cognitiveMax": 12,
+      "smells": 0
+    },
+    {
+      "file": "src/ui/widgets/CompareListView.ts",
+      "lines": 383,
+      "cyclomaticMax": 14,
+      "cognitiveMax": 16,
+      "smells": 0
+    },
+    {
+      "file": "src/ui/widgets/CommitPanel.ts",
+      "lines": 83,
+      "cyclomaticMax": 13,
+      "cognitiveMax": 11,
+      "smells": 0
+    },
+    {
+      "file": "src/utils/diffRowCalculations.ts",
+      "lines": 136,
+      "cyclomaticMax": 13,
+      "cognitiveMax": 24,
+      "smells": 0
+    },
+    {
+      "file": "src/core/ExplorerStateManager.ts",
+      "lines": 750,
+      "cyclomaticMax": 12,
+      "cognitiveMax": 15,
+      "smells": 0
+    },
+    {
+      "file": "src/ui/widgets/FileList.ts",
+      "lines": 215,
+      "cyclomaticMax": 12,
+      "cognitiveMax": 12,
+      "smells": 0
+    },
+    {
+      "file": "src/utils/lineBreaking.ts",
+      "lines": 114,
+      "cyclomaticMax": 12,
+      "cognitiveMax": 17,
+      "smells": 0
+    },
+    {
+      "file": "src/ui/widgets/Header.ts",
+      "lines": 98,
+      "cyclomaticMax": 11,
+      "cognitiveMax": 13,
+      "smells": 0
+    },
+    {
+      "file": "src/config.ts",
+      "lines": 107,
+      "cyclomaticMax": 10,
+      "cognitiveMax": 13,
+      "smells": 0
+    },
+    {
+      "file": "src/state/UIState.ts",
+      "lines": 307,
+      "cyclomaticMax": 10,
+      "cognitiveMax": 12,
+      "smells": 0
+    },
+    {
+      "file": "src/KeyBindings.ts",
+      "lines": 289,
+      "cyclomaticMax": 9,
+      "cognitiveMax": 15,
+      "smells": 0
+    },
+    {
+      "file": "src/core/GitStateManager.ts",
+      "lines": 815,
+      "cyclomaticMax": 9,
+      "cognitiveMax": 12,
+      "smells": 0
+    },
+    {
+      "file": "src/ui/widgets/HistoryView.ts",
+      "lines": 97,
+      "cyclomaticMax": 9,
+      "cognitiveMax": 12,
+      "smells": 0
+    },
+    {
+      "file": "src/utils/formatPath.ts",
+      "lines": 72,
+      "cyclomaticMax": 9,
+      "cognitiveMax": 11,
+      "smells": 0
+    },
+    {
+      "file": "src/utils/explorerDisplayRows.ts",
+      "lines": 206,
+      "cyclomaticMax": 8,
+      "cognitiveMax": 15,
+      "smells": 0
+    },
+    {
+      "file": "src/ui/modals/FileFinder.ts",
+      "lines": 226,
+      "cyclomaticMax": 7,
+      "cognitiveMax": 13,
+      "smells": 0
+    },
+    {
+      "file": "src/ui/modals/BaseBranchPicker.ts",
+      "lines": 134,
+      "cyclomaticMax": 6,
+      "cognitiveMax": 13,
+      "smells": 0
+    }
+  ],
+  "smellsByRule": {}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "diffstalker",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Terminal application that displays git diff/status for directories",
   "author": "yogh-io",
   "license": "MIT",
@@ -19,6 +19,7 @@
   },
   "scripts": {
     "postinstall": "node scripts/patch-neo-blessed.cjs",
+    "prepare": "git config core.hooksPath .githooks",
     "dev": "bun --watch src/index.ts",
     "build": "tsc",
     "build:prod": "tsc && bun build dist/index.js --outfile dist/index.js --minify --target node --packages external",
@@ -27,10 +28,11 @@
     "start:bundle": "bun dist/bundle/index.js",
     "test": "bun test src/*.test.ts src/**/*.test.ts",
     "test:watch": "bun test --watch src/*.test.ts src/**/*.test.ts",
-    "lint": "eslint src/",
+    "lint": "eslint src/ && depcruise src/ --config .dependency-cruiser.cjs",
     "lint:fix": "eslint src/ --fix",
     "format": "prettier --write src/",
     "format:check": "prettier --check src/",
+    "deps": "depcruise src/ --config .dependency-cruiser.cjs",
     "metrics": "bun scripts/collect-metrics.ts",
     "metrics:snapshot": "bun scripts/collect-metrics.ts --save",
     "prepublishOnly": "bun run build:prod"
@@ -49,6 +51,7 @@
     "chokidar": "^4.0.3",
     "emphasize": "^7.0.0",
     "fast-diff": "^1.3.0",
+    "fzf": "^0.5.2",
     "ignore": "^7.0.5",
     "neo-blessed": "^0.2.0",
     "simple-git": "^3.27.0",
@@ -58,6 +61,7 @@
     "@eslint/js": "^9.39.2",
     "@types/blessed": "^0.1.27",
     "@types/node": "^22.10.7",
+    "dependency-cruiser": "^17.3.7",
     "eslint": "^9.39.2",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-sonarjs": "^3.0.6",