diffstalker 0.1.5 → 0.1.7

package/dist/utils/rowCalculations.js

@@ -1,3 +1,209 @@
-import{isDisplayableDiffLine as s}from"./diffFilters.js";import{formatDateAbsolute as f}from"./formatDate.js";export function getCommitIndexFromRow(e,t,n,i=0){const o=e+i;return o<0||o>=t.length?-1:o}export function getHistoryTotalRows(e,t){return e.length}export function getHistoryRowOffset(e,t,n){return t}export function buildHistoryDiffRows(e,t){const n=[];if(e){n.push({type:"commit-header",content:`commit ${e.hash}`}),n.push({type:"commit-header",content:`Author: ${e.author}`}),n.push({type:"commit-header",content:`Date:   ${f(e.date)}`}),n.push({type:"spacer"});const i=e.message.split(`
-`);for(const o of i)n.push({type:"commit-message",content:`    ${o}`});n.push({type:"spacer"})}if(t)for(const i of t.lines)s(i)&&n.push({type:"diff-line",diffLine:i});return n}export function getHistoryDiffTotalRows(e,t){return buildHistoryDiffRows(e,t).length}export function buildCombinedCompareDiff(e){if(!e||e.files.length===0)return{raw:"",lines:[]};const t=[],n=[];for(const i of e.files){for(const o of i.diff.lines)t.push(o);n.push(i.diff.raw)}return{raw:n.join(`
-`),lines:t}}export function getCompareDiffTotalRows(e){return buildCombinedCompareDiff(e).lines.filter(s).length}export function getFileScrollOffset(e,t){if(!e||t<0||t>=e.files.length)return 0;const n=buildCombinedCompareDiff(e);let i=0,o=0;for(const r of n.lines){if(r.type==="header"&&r.content.startsWith("diff --git")){if(o===t)return i;o++}s(r)&&i++}return 0}export function getCompareItemIndexFromRow(e,t,n,i=!0,o=!0){let r=0;if(t>0){if(e===r)return-1;if(r++,i){if(e<r+t)return e-r;r+=t}}if(n>0){if(t>0){if(e===r)return-1;r++}if(e===r)return-1;if(r++,o&&e<r+n)return t+(e-r)}return-1}
+import { isDisplayableDiffLine } from './diffFilters.js';
+import { formatDateAbsolute } from './formatDate.js';
+import { getDiffTotalRows, getDiffLineRowCount } from './diffRowCalculations.js';
+// ============================================================================
+// History View Row Calculations
+// ============================================================================
+/**
+ * Map a visual row index to the commit index in HistoryView.
+ * Since each commit takes 1 row, this is simply visualRow + scrollOffset.
+ */
+export function getCommitIndexFromRow(visualRow, commits, _terminalWidth, scrollOffset = 0) {
+    const index = visualRow + scrollOffset;
+    if (index < 0 || index >= commits.length) {
+        return -1;
+    }
+    return index;
+}
+/**
+ * Get the total number of visual rows for all commits in HistoryView.
+ * Since each commit takes 1 row, this equals commits.length.
+ */
+export function getHistoryTotalRows(commits, _terminalWidth) {
+    return commits.length;
+}
+/**
+ * Get the visual row offset for a given commit index in HistoryView.
+ * Since each commit takes 1 row, this equals commitIndex.
+ */
+export function getHistoryRowOffset(_commits, commitIndex, _terminalWidth) {
+    return commitIndex;
+}
+/**
+ * Build all displayable rows for the history diff view.
+ * This includes commit metadata, message, and diff lines.
+ * Single source of truth for both rendering and row counting.
+ */
+export function buildHistoryDiffRows(commit, diff) {
+    const rows = [];
+    if (commit) {
+        // Commit header: hash, author, date
+        rows.push({
+            type: 'commit-header',
+            content: `commit ${commit.hash}`,
+        });
+        rows.push({
+            type: 'commit-header',
+            content: `Author: ${commit.author}`,
+        });
+        rows.push({
+            type: 'commit-header',
+            content: `Date:   ${formatDateAbsolute(commit.date)}`,
+        });
+        // Blank line before message
+        rows.push({ type: 'spacer' });
+        // Commit message (can be multi-line)
+        const messageLines = commit.message.split('\n');
+        for (const line of messageLines) {
+            rows.push({
+                type: 'commit-message',
+                content: `    ${line}`,
+            });
+        }
+        // Blank line after message, before diff
+        rows.push({ type: 'spacer' });
+    }
+    // Diff lines (filter same as DiffView)
+    if (diff) {
+        for (const line of diff.lines) {
+            if (isDisplayableDiffLine(line)) {
+                rows.push({ type: 'diff-line', diffLine: line });
+            }
+        }
+    }
+    return rows;
+}
+/**
+ * Get the visual row count for a single HistoryDiffRow.
+ * Headers, spacers, and commit messages are always 1 row.
+ * Diff lines may wrap based on terminal width.
+ */
+export function getHistoryDiffRowHeight(row, lineNumWidth, terminalWidth) {
+    if (row.type !== 'diff-line' || !row.diffLine) {
+        return 1; // Headers, spacers, commit messages don't wrap
+    }
+    return getDiffLineRowCount(row.diffLine, lineNumWidth, terminalWidth);
+}
+/**
+ * Get total displayable rows for history diff scroll calculation.
+ * Uses getDiffTotalRows for the diff portion to account for line wrapping.
+ */
+export function getHistoryDiffTotalRows(commit, diff, terminalWidth) {
+    // Count header rows (these don't wrap - they're short metadata)
+    let headerRows = 0;
+    if (commit) {
+        headerRows += 3; // hash, author, date
+        headerRows += 1; // spacer before message
+        headerRows += commit.message.split('\n').length; // message lines
+        headerRows += 1; // spacer after message
+    }
+    // Use getDiffTotalRows for diff portion (handles line wrapping)
+    const diffRows = getDiffTotalRows(diff, terminalWidth);
+    return headerRows + diffRows;
+}
+// ============================================================================
+// Compare View Row Calculations
+// ============================================================================
+/**
+ * Build a combined DiffResult from all compare files.
+ * This is the single source of truth for compare diff content.
+ */
+export function buildCombinedCompareDiff(compareDiff) {
+    if (!compareDiff || compareDiff.files.length === 0) {
+        return { raw: '', lines: [] };
+    }
+    const allLines = [];
+    const rawParts = [];
+    for (const file of compareDiff.files) {
+        // Include all lines from each file's diff (including headers)
+        for (const line of file.diff.lines) {
+            allLines.push(line);
+        }
+        rawParts.push(file.diff.raw);
+    }
+    return {
+        raw: rawParts.join('\n'),
+        lines: allLines,
+    };
+}
+/**
+ * Calculate the total number of displayable lines in the compare diff.
+ * This accounts for header filtering done by DiffView.
+ */
+export function getCompareDiffTotalRows(compareDiff) {
+    const combined = buildCombinedCompareDiff(compareDiff);
+    return combined.lines.filter(isDisplayableDiffLine).length;
+}
+/**
+ * Calculate the row offset to scroll to a specific file in the compare diff.
+ * Returns the row index where the file's diff --git header starts.
+ */
+export function getFileScrollOffset(compareDiff, fileIndex) {
+    if (!compareDiff || fileIndex < 0 || fileIndex >= compareDiff.files.length)
+        return 0;
+    const combined = buildCombinedCompareDiff(compareDiff);
+    let displayableRow = 0;
+    let currentFileIndex = 0;
+    for (const line of combined.lines) {
+        // Check if this is a file boundary
+        if (line.type === 'header' && line.content.startsWith('diff --git')) {
+            if (currentFileIndex === fileIndex) {
+                return displayableRow;
+            }
+            currentFileIndex++;
+        }
+        // Skip lines that DiffView filters out
+        if (!isDisplayableDiffLine(line)) {
+            continue;
+        }
+        displayableRow++;
+    }
+    return 0;
+}
+// ============================================================================
+// Compare List View Row Calculations
+// ============================================================================
+/**
+ * Map a visual row index to the item index in CompareListView.
+ * Returns the commit index for commits, or commitCount + fileIndex for files.
+ * Returns -1 if the row is a header, spacer, or out of bounds.
+ *
+ * Row structure (when both commits and files exist, both expanded):
+ *   Row 0:    "▼ Commits" header
+ *   Row 1..N: commits
+ *   Row N+1:  spacer
+ *   Row N+2:  "▼ Files" header
+ *   Rows N+3..: files
+ */
+export function getCompareItemIndexFromRow(row, commitCount, fileCount, commitsExpanded = true, filesExpanded = true) {
+    let currentRow = 0;
+    // Commits section
+    if (commitCount > 0) {
+        if (row === currentRow)
+            return -1; // "▼ Commits" header
+        currentRow++;
+        if (commitsExpanded) {
+            if (row < currentRow + commitCount) {
+                return row - currentRow; // Commit index
+            }
+            currentRow += commitCount;
+        }
+    }
+    // Files section
+    if (fileCount > 0) {
+        if (commitCount > 0) {
+            if (row === currentRow)
+                return -1; // Spacer
+            currentRow++;
+        }
+        if (row === currentRow)
+            return -1; // "▼ Files" header
+        currentRow++;
+        if (filesExpanded) {
+            if (row < currentRow + fileCount) {
+                return commitCount + (row - currentRow); // File index (offset by commit count)
+            }
+        }
+    }
+    return -1; // Out of bounds
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "diffstalker",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Terminal application that displays git diff/status for directories",
   "author": "yogh-io",
   "license": "MIT",
@@ -18,19 +18,19 @@
     "diffstalker": "bin/diffstalker"
   },
   "scripts": {
-    "dev": "tsx src/index.tsx",
+    "dev": "bun --watch src/index.tsx",
     "build": "tsc",
-    "build:prod": "tsc && node scripts/minify.js",
-    "bundle": "npm run build:prod && ncc build dist/index.js -o dist/bundle && node scripts/minify.js ../dist/bundle",
-    "start": "node dist/index.js",
-    "start:bundle": "node dist/bundle/index.js",
+    "build:prod": "tsc && bun build dist/index.js --outfile dist/index.js --minify --target node --packages external",
+    "bundle": "bun run build:prod && bun build dist/index.js --outdir dist/bundle --minify --target node --external react-devtools-core",
+    "start": "bun dist/index.js",
+    "start:bundle": "bun dist/bundle/index.js",
     "test": "vitest run",
     "test:watch": "vitest",
     "lint": "eslint src/",
     "lint:fix": "eslint src/ --fix",
     "format": "prettier --write src/",
     "format:check": "prettier --check src/",
-    "prepublishOnly": "npm run build:prod"
+    "prepublishOnly": "bun run build:prod"
   },
   "keywords": [
     "git",
@@ -56,13 +56,10 @@
     "@eslint/js": "^9.39.2",
     "@types/node": "^22.10.7",
     "@types/react": "^19.2.0",
-    "@vercel/ncc": "^0.38.4",
-    "esbuild": "^0.27.2",
     "eslint": "^9.39.2",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-react-hooks": "^7.0.1",
     "prettier": "^3.8.0",
-    "tsx": "^4.19.2",
     "typescript": "^5.7.3",
     "typescript-eslint": "^8.53.1",
     "vitest": "^2.1.0"

package/dist/components/CompareView.js

@@ -1 +0,0 @@
-import{jsx as r,jsxs as a}from"react/jsx-runtime";import{useMemo as h}from"react";import{Box as e,Text as o}from"ink";import{DiffView as c}from"./DiffView.js";import{buildCombinedCompareDiff as u}from"../utils/rowCalculations.js";export{buildCombinedCompareDiff,getCompareDiffTotalRows,getFileScrollOffset}from"../utils/rowCalculations.js";export function CompareView({compareDiff:i,isLoading:d,error:n,scrollOffset:t,maxHeight:f,theme:m="dark",width:l}){const s=h(()=>u(i),[i]);return d?r(e,{paddingX:1,children:r(o,{dimColor:!0,children:"Loading diff..."})}):n?r(e,{paddingX:1,children:r(o,{color:"red",children:n})}):i?i.files.length===0?r(e,{paddingX:1,children:a(o,{dimColor:!0,children:["No changes compared to ",i.baseBranch]})}):r(c,{diff:s,maxHeight:f,scrollOffset:t,theme:m,width:l}):r(e,{paddingX:1,children:r(o,{dimColor:!0,children:"No base branch found (no origin/main or origin/master)"})})}

package/dist/components/DiffView.js

@@ -1 +0,0 @@
-import{jsx as a,jsxs as f}from"react/jsx-runtime";import{useMemo as I}from"react";import{Box as p,Text as u}from"ink";import{createEmphasize as R,common as z}from"emphasize";import L from"fast-diff";import{getTheme as G}from"../themes.js";import{ScrollableList as U}from"./ScrollableList.js";import{isDisplayableDiffLine as W}from"../utils/diffFilters.js";const X=R(z);function b(t,e){return e<=0||t.length<=e?t:e<=1?"\u2026":t.slice(0,e-1)+"\u2026"}const q={ts:"typescript",tsx:"typescript",js:"javascript",jsx:"javascript",mjs:"javascript",cjs:"javascript",py:"python",rb:"ruby",rs:"rust",go:"go",java:"java",c:"c",cpp:"cpp",h:"c",hpp:"cpp",cs:"csharp",php:"php",sh:"bash",bash:"bash",zsh:"bash",json:"json",yaml:"yaml",yml:"yaml",md:"markdown",html:"html",htm:"html",css:"css",scss:"scss",sass:"scss",less:"less",sql:"sql",xml:"xml",toml:"ini",ini:"ini",dockerfile:"dockerfile",makefile:"makefile",lua:"lua",vim:"vim",swift:"swift",kt:"kotlin",kts:"kotlin",scala:"scala",r:"r",pl:"perl",ex:"elixir",exs:"elixir",erl:"erlang",hs:"haskell",clj:"clojure",ml:"ocaml",fs:"fsharp",vue:"xml",svelte:"xml"};function O(t){if(!t)return;const e=t.split("/").pop()?.toLowerCase()??"";if(e==="dockerfile")return"dockerfile";if(e==="makefile"||e==="gnumakefile")return"makefile";const n=e.split(".").pop()?.toLowerCase();return n?q[n]||n:void 0}function P(t,e){if(!e||!t.trim())return t;try{return X.highlight(e,t).value}catch{return t}}function Q(t){let e=0;for(const n of t)n.oldLineNum&&n.oldLineNum>e&&(e=n.oldLineNum),n.newLineNum&&n.newLineNum>e&&(e=n.newLineNum);return Math.max(3,String(e).length)}function N(t){return t.type==="addition"||t.type==="deletion"||t.type==="context"&&t.content.startsWith(" ")?t.content.slice(1):t.content}const F=3;function $(t){if(t.length===0)return t;const e=[];for(let n=0;n<t.length;n++){const r=t[n];if(!r.isChange&&r.text.length<F){const o=n>0&&e[e.length-1]?.isChange,s=n<t.length-1&&t[n+1]?.isChange;if(o||s){o&&e.length>0?e[e.length-1].text+=r.text:e.push({text:r.text,isChange:!0});continue}}e.length>0&&e[e.length-1].isChange===r.isChange?e[e.length-1].text+=r.text:e.push({...r})}return e}function K(t,e){const n=L(t,e);let r=[],o=[];for(const[s,i]of n)s===L.EQUAL?(r.push({text:i,isChange:!1}),o.push({text:i,isChange:!1})):s===L.DELETE?r.push({text:i,isChange:!0}):s===L.INSERT&&o.push({text:i,isChange:!0});return r=$(r),o=$(o),{oldSegments:r,newSegments:o}}function V(t,e){if(t.length===0&&e.length===0)return 1;if(t.length===0||e.length===0)return 0;const n=L(t,e);let r=0,o=0;for(const[s,i]of n)s===L.EQUAL&&(r+=i.length),o+=i.length;return o>0?r/o:0}const Y=.35;function J(t){const e=new Map;for(let n=0;n<t.length-1;n++){const r=t[n],o=t[n+1];if(r.type==="deletion"&&o.type==="addition"){const s=N(r),i=N(o);if(V(s,i)>=Y){const d={deletion:r,addition:o,deletionIndex:n,additionIndex:n+1};e.set(n,d),e.set(n+1,d)}}}return e}function Z(t,e){const n=[];let r=e;for(const o of t){if(r<=0)break;if(o.text.length<=r)n.push(o),r-=o.text.length;else{const s=o.text.slice(0,r-1)+"\u2026";n.push({...o,text:s});break}}return n}function M({segments:t,isAddition:e,theme:n,maxWidth:r}){const{colors:o}=n,s=e?o.addBg:o.delBg,i=e?o.addHighlight:o.delHighlight,d=r?Z(t,r):t;return a(u,{backgroundColor:s,children:d.map((x,g)=>a(u,{color:o.text,backgroundColor:x.isChange?i:s,children:x.text||(g===d.length-1?" ":"")},g))})}function tt({line:t,lineNumWidth:e,language:n,wordDiffSegments:r,theme:o,maxWidth:s}){const{colors:i}=o,d=s?s-2:void 0;if(t.type==="header"){const c=t.content;if(c.startsWith("diff --git")){const m=c.match(/diff --git a\/.+ b\/(.+)$/);if(m){const C=d?d-6:void 0,y=C?b(m[1],C):m[1];return a(p,{children:f(u,{color:"cyan",bold:!0,children:["\u2500\u2500 ",y," \u2500\u2500"]})})}}const k=d?b(c,d):c;return a(p,{children:a(u,{dimColor:!0,children:k})})}if(t.type==="hunk"){const c=t.content.match(/^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@(.*)$/);if(c){const m=parseInt(c[1],10),C=c[2]?parseInt(c[2],10):1,y=parseInt(c[3],10),v=c[4]?parseInt(c[4],10):1,E=c[5].trim(),T=m+C-1,H=y+v-1,A=C===1?`${m}`:`${m}-${T}`,_=v===1?`${y}`:`${y}-${H}`,B=`Lines ${A} \u2192 ${_}`,S=d?d-B.length-1:void 0,D=E&&S&&S>3?b(E,S):"";return f(p,{children:[a(u,{color:"cyan",dimColor:!0,children:B}),D&&f(u,{color:"gray",children:[" ",D]})]})}const k=d?b(t.content,d):t.content;return a(u,{color:"cyan",dimColor:!0,children:k})}const x=t.type==="addition"?t.newLineNum:t.type==="deletion"?t.oldLineNum:t.oldLineNum??t.newLineNum,g=x!==void 0?String(x).padStart(e," "):" ".repeat(e),w=N(t),l=s?s-e-5:void 0,h=l?b(w,l):w;if(t.type==="addition")return f(p,{children:[f(u,{backgroundColor:i.addBg,color:i.addLineNum,children:[g," "]}),f(u,{backgroundColor:i.addBg,color:i.addSymbol,bold:!0,children:["+"," "]}),r?a(M,{segments:r,isAddition:!0,theme:o,maxWidth:l}):a(u,{backgroundColor:i.addBg,color:i.text,children:h||" "})]});if(t.type==="deletion")return f(p,{children:[f(u,{backgroundColor:i.delBg,color:i.delLineNum,children:[g," "]}),f(u,{backgroundColor:i.delBg,color:i.delSymbol,bold:!0,children:["-"," "]}),r?a(M,{segments:r,isAddition:!1,theme:o,maxWidth:l}):a(u,{backgroundColor:i.delBg,color:i.text,children:h||" "})]});const j=P(h,n);return f(p,{children:[f(u,{color:i.contextLineNum,children:[g," "]}),a(u,{children:j})]})}export function DiffView({diff:t,filePath:e,maxHeight:n=20,scrollOffset:r=0,theme:o="dark",width:s}){const i=I(()=>G(o),[o]),d=I(()=>O(e),[e]),x=I(()=>{if(!t)return new Map;const l=J(t.lines),h=new Map;for(const[j,c]of l)if(j===c.deletionIndex){const k=N(c.deletion),m=N(c.addition),{oldSegments:C,newSegments:y}=K(k,m);h.set(c.deletionIndex,C),h.set(c.additionIndex,y)}return h},[t]),g=I(()=>t?.lines.map((l,h)=>({line:l,originalIndex:h})).filter(({line:l})=>W(l))??[],[t]);if(!t||g.length===0)return a(p,{paddingX:1,children:a(u,{dimColor:!0,children:"No diff to display"})});const w=Q(g.map(l=>l.line));return a(p,{flexDirection:"column",paddingX:1,overflowX:"hidden",children:a(U,{items:g,maxHeight:n,scrollOffset:r,getKey:l=>`${l.originalIndex}`,renderItem:l=>{const h=x.get(l.originalIndex);return a(tt,{line:l.line,lineNumWidth:w,language:d,wordDiffSegments:h,theme:i,maxWidth:s})}})})}

package/dist/components/HistoryDiffView.js

@@ -1 +0,0 @@
-import{jsx as i,jsxs as w}from"react/jsx-runtime";import{useMemo as x}from"react";import{Box as r,Text as n}from"ink";import{DiffView as g}from"./DiffView.js";import{buildHistoryDiffRows as R}from"../utils/rowCalculations.js";import{isDisplayableDiffLine as b}from"../utils/diffFilters.js";export{buildHistoryDiffRows,getHistoryDiffTotalRows}from"../utils/rowCalculations.js";export function HistoryDiffView({commit:s,diff:t,scrollOffset:l,maxHeight:d,theme:m="dark",width:a}){const c=x(()=>R(s,t),[s,t]),u=x(()=>{for(let e=0;e<c.length;e++)if(c[e].type==="diff-line")return e;return c.length},[c]),f=c.slice(l,l+d);if(!s)return i(r,{paddingX:1,children:i(n,{dimColor:!0,children:"Select a commit to view its diff"})});if(!t||t.lines.length===0)return w(r,{flexDirection:"column",children:[f.map((e,h)=>{const o=`row-${l+h}`;return e.type==="commit-header"?i(r,{children:i(n,{color:"yellow",children:e.content})},o):e.type==="commit-message"?i(r,{children:i(n,{children:e.content})},o):e.type==="spacer"?i(r,{children:i(n,{children:" "})},o):null}),i(r,{children:i(n,{dimColor:!0,children:"No changes in this commit"})})]});const p=t.lines.filter(b);if(l>=u)return i(g,{diff:{raw:t.raw,lines:p},maxHeight:d,scrollOffset:l-u,theme:m,width:a});const D=f.filter(e=>e.type!=="diff-line"),y=d-D.length;return w(r,{flexDirection:"column",overflowX:"hidden",children:[f.map((e,h)=>{const o=`row-${l+h}`;return e.type==="commit-header"?i(r,{children:i(n,{color:"yellow",children:e.content})},o):e.type==="commit-message"?i(r,{children:i(n,{children:e.content})},o):e.type==="spacer"?i(r,{children:i(n,{children:" "})},o):null}),y>0&&i(g,{diff:{raw:t.raw,lines:p},maxHeight:y,scrollOffset:0,theme:m,width:a})]})}