difit 2.2.5 → 2.2.7

package/dist/server/git-diff.test.js

@@ -129,6 +129,7 @@ describe('GitDiffParser', () => {
                 additions: 0,
                 deletions: 0,
                 chunks: [], // Binary files should have empty chunks
+                isGenerated: false,
             });
         });
         it('parses deleted binary file correctly', () => {
@@ -154,6 +155,7 @@ describe('GitDiffParser', () => {
                 additions: 0,
                 deletions: 0,
                 chunks: [],
+                isGenerated: false,
             });
         });
         it('parses modified binary file correctly', () => {
@@ -178,6 +180,7 @@ describe('GitDiffParser', () => {
                 additions: 0,
                 deletions: 0,
                 chunks: [],
+                isGenerated: false,
             });
         });
         it('parses renamed binary file correctly', () => {
@@ -202,6 +205,7 @@ describe('GitDiffParser', () => {
                 additions: 0,
                 deletions: 0,
                 chunks: [],
+                isGenerated: false,
             });
         });
         it('handles non-binary files normally', () => {
@@ -229,6 +233,7 @@ describe('GitDiffParser', () => {
                 additions: 1,
                 deletions: 0,
                 chunks: expect.any(Array), // Should have parsed chunks
+                isGenerated: false,
             });
             // Verify chunks were parsed
             expect(result.chunks).toHaveLength(1);
@@ -259,6 +264,7 @@ describe('GitDiffParser', () => {
                 additions: 0,
                 deletions: 1,
                 chunks: expect.any(Array),
+                isGenerated: false,
             });
         });
         it('detects added files using /dev/null indicator', () => {
@@ -279,6 +285,7 @@ describe('GitDiffParser', () => {
             };
             const result = parser.parseFileBlock(diffLines.join('\n'), summary);
             expect(result.status).toBe('added');
+            expect(result.isGenerated).toBe(false);
         });
         it('detects deleted files using /dev/null indicator', () => {
             const diffLines = [
@@ -298,6 +305,7 @@ describe('GitDiffParser', () => {
             };
             const result = parser.parseFileBlock(diffLines.join('\n'), summary);
             expect(result.status).toBe('deleted');
+            expect(result.isGenerated).toBe(false);
         });
     });
     describe('parseFileBlock with quoted paths', () => {
@@ -317,6 +325,7 @@ describe('GitDiffParser', () => {
             expect(result.status).toBe('added');
             expect(result.additions).toBe(1);
             expect(result.deletions).toBe(0);
+            expect(result.isGenerated).toBe(false);
         });
         it('parses summary-provided filenames with escaped spaces', () => {
             const diffLines = [
@@ -337,6 +346,7 @@ describe('GitDiffParser', () => {
             const result = parser.parseFileBlock(diffLines.join('\n'), summary);
             expect(result?.path).toBe('templates/test file.py');
             expect(result?.oldPath).toBeUndefined();
+            expect(result?.isGenerated).toBe(false);
         });
         it('parses file paths with Jinja template brackets correctly', () => {
             const diffLines = [
@@ -352,6 +362,7 @@ describe('GitDiffParser', () => {
             expect(result).toBeDefined();
             expect(result.path).toBe('templates/test_000_{{ package_name }}/__.py');
             expect(result.status).toBe('added');
+            expect(result.isGenerated).toBe(false);
         });
         it('parses file paths with escaped characters correctly', () => {
             const diffLines = [
@@ -367,6 +378,7 @@ describe('GitDiffParser', () => {
             expect(result).toBeDefined();
             expect(result.path).toBe('file\twith\ttabs.txt');
             expect(result.status).toBe('added');
+            expect(result.isGenerated).toBe(false);
         });
         it('parses renamed files with spaces correctly', () => {
             const diffLines = [
@@ -380,6 +392,7 @@ describe('GitDiffParser', () => {
             expect(result.path).toBe('new folder/new name.txt');
             expect(result.oldPath).toBe('old folder/old name.txt');
             expect(result.status).toBe('renamed');
+            expect(result.isGenerated).toBe(false);
         });
         it('still handles unquoted paths correctly', () => {
             const diffLines = [
@@ -399,6 +412,7 @@ describe('GitDiffParser', () => {
             expect(result.status).toBe('modified');
             expect(result.additions).toBe(1);
             expect(result.deletions).toBe(1);
+            expect(result.isGenerated).toBe(false);
         });
         it('handles unquoted paths with spaces when core.quotePath=false', () => {
             const diffLines = [
@@ -416,6 +430,7 @@ describe('GitDiffParser', () => {
             expect(result.status).toBe('modified');
             expect(result.additions).toBe(1);
             expect(result.deletions).toBe(1);
+            expect(result.isGenerated).toBe(false);
         });
         it('decodes unquoted octal escapes in diff headers', () => {
             const diffLines = [
@@ -430,6 +445,7 @@ describe('GitDiffParser', () => {
             const result = parser.parseFileBlock(diffLines.join('\n'), null);
             expect(result?.path).toBe('some folder/file name.ts');
             expect(result?.oldPath).toBeUndefined();
+            expect(result?.isGenerated).toBe(false);
         });
         it('handles unquoted paths containing "b/" in filename', () => {
             const diffLines = [
@@ -446,6 +462,7 @@ describe('GitDiffParser', () => {
             expect(result.path).toBe('dir b/sub/file');
             expect(result.oldPath).toBeUndefined();
             expect(result.status).toBe('modified');
+            expect(result.isGenerated).toBe(false);
         });
         it('handles renamed files with "b/" in the path', () => {
             const diffLines = [
@@ -459,6 +476,7 @@ describe('GitDiffParser', () => {
             expect(result.path).toBe('new b/path/file');
             expect(result.oldPath).toBe('old b/path/file');
             expect(result.status).toBe('renamed');
+            expect(result.isGenerated).toBe(false);
         });
         it('handles alternative git diff prefixes for working tree comparisons', () => {
             const diffLines = [
@@ -481,6 +499,7 @@ describe('GitDiffParser', () => {
             expect(result.path).toBe('a/test.txt');
             expect(result.oldPath).toBeUndefined();
             expect(result.status).toBe('modified');
+            expect(result.isGenerated).toBe(false);
         });
         it('handles rename metadata with alternative git prefixes', () => {
             const diffLines = [
@@ -501,6 +520,7 @@ describe('GitDiffParser', () => {
             expect(result.path).toBe('new/name.txt');
             expect(result.oldPath).toBe('old/name.txt');
             expect(result.status).toBe('renamed');
+            expect(result.isGenerated).toBe(false);
         });
         it('ignores trailing metadata separators in diff path lines', () => {
             const diffLines = [
@@ -522,6 +542,7 @@ describe('GitDiffParser', () => {
             expect(result).toBeDefined();
             expect(result.path).toBe('foo bar.txt');
             expect(result.status).toBe('modified');
+            expect(result.isGenerated).toBe(false);
         });
         it('prefers header paths over summary paths when they differ', () => {
             const diffLines = [
@@ -543,6 +564,7 @@ describe('GitDiffParser', () => {
             expect(result).toBeDefined();
             expect(result?.path).toBe('a/test.txt');
             expect(result?.status).toBe('added');
+            expect(result?.isGenerated).toBe(false);
         });
         it('does not treat added files as renamed even if summary includes from path', () => {
             const diffLines = [
@@ -565,6 +587,7 @@ describe('GitDiffParser', () => {
             expect(result).toBeDefined();
             expect(result?.status).toBe('added');
             expect(result?.oldPath).toBeUndefined();
+            expect(result?.isGenerated).toBe(false);
         });
         it('parses file paths with octal escape sequences correctly', () => {
             const diffLines = [
@@ -580,6 +603,7 @@ describe('GitDiffParser', () => {
             expect(result).toBeDefined();
             expect(result.path).toBe('fileä.txt');
             expect(result.status).toBe('added');
+            expect(result.isGenerated).toBe(false);
         });
         it('parses file paths with mixed escape sequences correctly', () => {
             const diffLines = [
@@ -595,6 +619,7 @@ describe('GitDiffParser', () => {
             expect(result).toBeDefined();
             expect(result.path).toBe('diré/file\twith\nmixed.txt');
             expect(result.status).toBe('added');
+            expect(result.isGenerated).toBe(false);
         });
     });
     describe('File status detection improvements', () => {
@@ -614,6 +639,7 @@ describe('GitDiffParser', () => {
             };
             const result = parser.parseFileBlock(diffLines.join('\n'), summary);
             expect(result.status).toBe('added');
+            expect(result.isGenerated).toBe(false);
         });
         it('prioritizes deleted file mode over other indicators', () => {
             const diffLines = [
@@ -631,6 +657,7 @@ describe('GitDiffParser', () => {
             };
             const result = parser.parseFileBlock(diffLines.join('\n'), summary);
             expect(result.status).toBe('deleted');
+            expect(result.isGenerated).toBe(false);
         });
     });
     describe('parseStdinDiff', () => {
@@ -655,6 +682,7 @@ index abc123..def456 100644
                         additions: 1,
                         deletions: 1,
                         chunks: expect.any(Array),
+                        isGenerated: false,
                     },
                 ],
             });
@@ -685,12 +713,14 @@ index 0000000..1234567
                 status: 'modified',
                 additions: 1,
                 deletions: 1,
+                isGenerated: false,
             });
             expect(result.files[1]).toMatchObject({
                 path: 'file2.js',
                 status: 'added',
                 additions: 3,
                 deletions: 0,
+                isGenerated: false,
             });
         });
         it('should handle deleted files', async () => {
@@ -708,6 +738,7 @@ index abc123..0000000
                 status: 'deleted',
                 additions: 0,
                 deletions: 2,
+                isGenerated: false,
             });
         });
         it('should handle renamed files', async () => {
@@ -722,6 +753,7 @@ rename to new-name.txt`;
                 status: 'renamed',
                 additions: 0,
                 deletions: 0,
+                isGenerated: false,
             });
         });
         it('should handle empty diff', async () => {
@@ -750,6 +782,7 @@ index abc123..def456 100644
             expect(result.files[0]).toMatchObject({
                 additions: 3,
                 deletions: 2,
+                isGenerated: false,
             });
         });
         it('should handle diffs with multiple chunks', async () => {
@@ -772,6 +805,7 @@ index abc123..def456 100644
             expect(result.files[0]).toMatchObject({
                 additions: 2,
                 deletions: 1,
+                isGenerated: false,
             });
         });
         it('should handle binary files', async () => {
@@ -786,6 +820,7 @@ Binary files /dev/null and b/image.png differ`;
                 additions: 0,
                 deletions: 0,
                 chunks: [],
+                isGenerated: false,
             });
         });
         it('should handle diffs with context lines', async () => {
@@ -842,4 +877,166 @@ index abc123..def456 100644
             expect(result).toEqual({ additions: 2, deletions: 1 });
         });
     });
+    describe('Generated file detection', () => {
+        const lockFiles = [
+            'package-lock.json',
+            'yarn.lock',
+            'pnpm-lock.yaml',
+            'Cargo.lock',
+            'Gemfile.lock',
+            'poetry.lock',
+            'composer.lock',
+            'Pipfile.lock',
+            'go.sum',
+            'go.mod',
+            'pubspec.lock',
+            'flake.lock',
+        ];
+        it.each(lockFiles)('detects %s as generated', (file) => {
+            const diffLines = [
+                `diff --git a/${file} b/${file}`,
+                `index abc123..def456 100644`,
+                `--- a/${file}`,
+                `+++ b/${file}`,
+                `@@ -1 +1 @@`,
+                `-old`,
+                `+new`,
+            ];
+            const summary = {
+                file,
+                insertions: 1,
+                deletions: 1,
+                binary: false,
+            };
+            const result = parser.parseFileBlock(diffLines.join('\n'), summary);
+            expect(result.isGenerated).toBe(true);
+        });
+        it('detects generated files by content (integration)', async () => {
+            const file = 'src/query.ts';
+            const diffLines = [
+                `diff --git a/${file} b/${file}`,
+                `index abc123..def456 100644`,
+                `--- a/${file}`,
+                `+++ b/${file}`,
+                `@@ -1 +1 @@`,
+                `-old`,
+                `+new`,
+            ];
+            const summary = {
+                file,
+                insertions: 1,
+                deletions: 1,
+                binary: false,
+            };
+            // Mock git.diff and git.diffSummary
+            const gitDiff = parser.git.diff;
+            const gitDiffSummary = parser.git.diffSummary;
+            // Check if revparse is already mocked by vi.mock('simple-git') structure, if not we add it.
+            // Actually (parser as any).git is the mock object returned by simpleGit().
+            // In line 8 of git-diff.test.ts: simpleGit: vi.fn(() => ({ revparse: vi.fn(), ... }))
+            // So revparse IS a mock.
+            gitDiff.mockResolvedValue(diffLines.join('\n'));
+            gitDiffSummary.mockResolvedValue({
+                files: [summary],
+                insertions: 1,
+                deletions: 1,
+            });
+            parser.git.revparse.mockResolvedValue('abc1234567890abcdef1234567890abcdef12');
+            // Mock getBlobContent to return generated content
+            // We need to spy on the prototype or the instance method?
+            // parser is instance.
+            // parser.getBlobContent is the method.
+            // But getBlobContent is on the class.
+            // modifying the instance method is easiest if it's not private (it is public-ish in TS but private in class def?)
+            // It is defined as `async getBlobContent(...)`.
+            // Since it's on the class, we can spy on it if we cast to any.
+            const getBlobContentSpy = vi.spyOn(parser, 'getBlobContent');
+            getBlobContentSpy.mockResolvedValue(Buffer.from('// @generated\nconst x = 1;'));
+            const response = await parser.parseDiff('HEAD', 'HEAD~1');
+            expect(response.files[0].path).toBe(file);
+            expect(response.files[0].isGenerated).toBe(true);
+        });
+        it('detects minified files as generated', () => {
+            const minFiles = ['script.min.js', 'style.min.css', 'vendor/lib.min.js'];
+            for (const file of minFiles) {
+                const diffLines = [
+                    `diff --git a/${file} b/${file}`,
+                    `index abc123..def456 100644`,
+                    `--- a/${file}`,
+                    `+++ b/${file}`,
+                    `@@ -1 +1 @@`,
+                    `-old`,
+                    `+new`,
+                ];
+                const summary = {
+                    file,
+                    insertions: 1,
+                    deletions: 1,
+                    binary: false,
+                };
+                const result = parser.parseFileBlock(diffLines.join('\n'), summary);
+                expect(result.isGenerated).toBe(true);
+            }
+        });
+        it('detects source maps as generated', () => {
+            const file = 'main.js.map';
+            const diffLines = [
+                `diff --git a/${file} b/${file}`,
+                `index abc123..def456 100644`,
+                `--- a/${file}`,
+                `+++ b/${file}`,
+                `@@ -1 +1 @@`,
+                `-old`,
+                `+new`,
+            ];
+            const summary = {
+                file,
+                insertions: 1,
+                deletions: 1,
+                binary: false,
+            };
+            const result = parser.parseFileBlock(diffLines.join('\n'), summary);
+            expect(result.isGenerated).toBe(true);
+        });
+        it('does not mark normal files as generated', () => {
+            const normalFiles = ['script.js', 'style.css', 'README.md', 'package.json'];
+            for (const file of normalFiles) {
+                const diffLines = [
+                    `diff --git a/${file} b/${file}`,
+                    `index abc123..def456 100644`,
+                    `--- a/${file}`,
+                    `+++ b/${file}`,
+                    `@@ -1 +1 @@`,
+                    `-old`,
+                    `+new`,
+                ];
+                const summary = {
+                    file,
+                    insertions: 1,
+                    deletions: 1,
+                    binary: false,
+                };
+                const result = parser.parseFileBlock(diffLines.join('\n'), summary);
+                expect(result.isGenerated).toBe(false);
+            }
+        });
+        it('detects binary lock files as generated', () => {
+            const file = 'yarn.lock';
+            const diffLines = [
+                `diff --git a/${file} b/${file}`,
+                `index abc123..def456 100644`,
+                `--- a/${file}`,
+                `+++ b/${file}`,
+                `Binary files a/${file} and b/${file} differ`,
+            ];
+            const summary = {
+                file,
+                insertions: 0,
+                deletions: 0,
+                binary: true,
+            };
+            const result = parser.parseFileBlock(diffLines.join('\n'), summary);
+            expect(result.isGenerated).toBe(true);
+        });
+    });
 });

package/dist/types/diff.d.ts

@@ -5,6 +5,7 @@ export interface DiffFile {
     additions: number;
     deletions: number;
     chunks: DiffChunk[];
+    isGenerated?: boolean;
 }
 export interface FileDiff {
     path: string;
@@ -31,6 +32,7 @@ export interface ParsedDiff {
     chunks: DiffChunk[];
 }
 export type DiffViewMode = 'side-by-side' | 'inline';
+export type DiffSide = 'old' | 'new';
 export interface DiffResponse {
     commit: string;
     files: DiffFile[];
@@ -49,9 +51,10 @@ export interface Comment {
     body: string;
     timestamp: string;
     codeContent?: string;
+    side?: DiffSide;
 }
 export interface LineSelection {
-    side: 'old' | 'new';
+    side: DiffSide;
     lineNumber: number;
 }
 export interface DiffComment {
@@ -62,7 +65,7 @@ export interface DiffComment {
     updatedAt: string;
     chunkHeader: string;
     position: {
-        side: 'old' | 'new';
+        side: DiffSide;
         line: number | {
             start: number;
             end: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "difit",
-  "version": "2.2.5",
+  "version": "2.2.7",
   "description": "A lightweight command-line tool that spins up a local web server to display Git commit diffs in a GitHub-like Files changed view",
   "type": "module",
   "engines": {
@@ -46,7 +46,7 @@
     "diff": "^8.0.2",
     "express": "^5.1.0",
     "ink": "^6.0.1",
-    "lucide-react": "^0.554.0",
+    "lucide-react": "^0.555.0",
     "open": "^11.0.0",
     "prism-react-renderer": "^2.4.1",
     "prismjs": "^1.30.0",
@@ -57,7 +57,7 @@
   },
   "devDependencies": {
     "@eslint/js": "^9.30.1",
-    "@prettier/plugin-oxc": "^0.0.5",
+    "@prettier/plugin-oxc": "^0.1.0",
     "@tailwindcss/forms": "^0.5.10",
     "@tailwindcss/postcss": "^4.1.11",
     "@tailwindcss/typography": "^0.5.16",
@@ -113,5 +113,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "packageManager": "pnpm@10.22.0"
+  "packageManager": "pnpm@10.24.0"
 }