difit 2.0.0 → 2.0.3

package/dist/types/diff.d.ts

@@ -39,10 +39,11 @@ export interface DiffResponse {
     baseCommitish?: string;
     targetCommitish?: string;
 }
+export type LineNumber = number | [number, number];
 export interface Comment {
     id: string;
     file: string;
-    line: number;
+    line: LineNumber;
     body: string;
     timestamp: string;
     codeContent?: string;

package/dist/utils/gitUtils.d.ts

@@ -0,0 +1,4 @@
+import type { SimpleGit } from 'simple-git';
+export declare function shortHash(hash: string): string;
+export declare function createCommitRangeString(baseHash: string, targetHash: string): string;
+export declare function resolveCommitDisplayString(baseCommitish: string, targetCommitish: string, git: SimpleGit): Promise<string>;

package/dist/utils/gitUtils.js

@@ -0,0 +1,29 @@
+export function shortHash(hash) {
+    return hash.substring(0, 7);
+}
+export function createCommitRangeString(baseHash, targetHash) {
+    return `${baseHash}...${targetHash}`;
+}
+export async function resolveCommitDisplayString(baseCommitish, targetCommitish, git) {
+    // Handle target special chars (base is always a regular commit)
+    if (targetCommitish === 'working') {
+        // Show unstaged changes (working vs staged)
+        return 'Working Directory (unstaged changes)';
+    }
+    else if (targetCommitish === 'staged') {
+        // Show staged changes against base commit
+        const baseHash = await git.revparse([baseCommitish]);
+        return `${shortHash(baseHash)} vs Staging Area (staged changes)`;
+    }
+    else if (targetCommitish === '.') {
+        // Show all uncommitted changes against base commit
+        const baseHash = await git.revparse([baseCommitish]);
+        return `${shortHash(baseHash)} vs Working Directory (all uncommitted changes)`;
+    }
+    else {
+        // Both are regular commits: standard commit-to-commit comparison
+        const targetHash = await git.revparse([targetCommitish]);
+        const baseHash = await git.revparse([baseCommitish]);
+        return createCommitRangeString(shortHash(baseHash), shortHash(targetHash));
+    }
+}

package/dist/utils/gitUtils.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/utils/gitUtils.test.js

@@ -0,0 +1,63 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { shortHash, createCommitRangeString, resolveCommitDisplayString } from './gitUtils';
+describe('Git Utils', () => {
+    describe('shortHash', () => {
+        it('should return first 7 characters of hash', () => {
+            expect(shortHash('a1b2c3d4e5f6789012345678901234567890abcd')).toBe('a1b2c3d');
+            expect(shortHash('1234567890abcdef')).toBe('1234567');
+            expect(shortHash('abc123')).toBe('abc123');
+        });
+        it('should handle short hashes', () => {
+            expect(shortHash('abc')).toBe('abc');
+            expect(shortHash('')).toBe('');
+            expect(shortHash('a')).toBe('a');
+        });
+    });
+    describe('createCommitRangeString', () => {
+        it('should create commit range string with triple dots', () => {
+            expect(createCommitRangeString('abc1234', 'def5678')).toBe('abc1234...def5678');
+            expect(createCommitRangeString('a1b2c3d', '4e5f6g7')).toBe('a1b2c3d...4e5f6g7');
+        });
+        it('should handle empty strings', () => {
+            expect(createCommitRangeString('', '')).toBe('...');
+            expect(createCommitRangeString('abc123', '')).toBe('abc123...');
+            expect(createCommitRangeString('', 'def456')).toBe('...def456');
+        });
+    });
+    describe('resolveCommitDisplayString', () => {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const mockGit = {
+            revparse: vi.fn(),
+        };
+        beforeEach(() => {
+            vi.clearAllMocks();
+        });
+        it('should handle working directory target', async () => {
+            const result = await resolveCommitDisplayString('main', 'working', mockGit);
+            expect(result).toBe('Working Directory (unstaged changes)');
+            expect(mockGit.revparse).not.toHaveBeenCalled();
+        });
+        it('should handle staged target', async () => {
+            mockGit.revparse.mockResolvedValue('a1b2c3d4e5f6789012345678901234567890abcd');
+            const result = await resolveCommitDisplayString('main', 'staged', mockGit);
+            expect(result).toBe('a1b2c3d vs Staging Area (staged changes)');
+            expect(mockGit.revparse).toHaveBeenCalledWith(['main']);
+        });
+        it('should handle dot (.) target', async () => {
+            mockGit.revparse.mockResolvedValue('a1b2c3d4e5f6789012345678901234567890abcd');
+            const result = await resolveCommitDisplayString('main', '.', mockGit);
+            expect(result).toBe('a1b2c3d vs Working Directory (all uncommitted changes)');
+            expect(mockGit.revparse).toHaveBeenCalledWith(['main']);
+        });
+        it('should handle regular commit to commit comparison', async () => {
+            mockGit.revparse
+                .mockResolvedValueOnce('def4567890abcdef1234567890abcdef12345678') // target (called first)
+                .mockResolvedValueOnce('a1b2c3d4e5f6789012345678901234567890abcd'); // base (called second)
+            const result = await resolveCommitDisplayString('main', 'develop', mockGit);
+            expect(result).toBe('a1b2c3d...def4567');
+            expect(mockGit.revparse).toHaveBeenCalledWith(['develop']);
+            expect(mockGit.revparse).toHaveBeenCalledWith(['main']);
+            expect(mockGit.revparse).toHaveBeenCalledTimes(2);
+        });
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "difit",
-  "version": "2.0.0",
+  "version": "2.0.3",
   "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": {
@@ -51,6 +51,8 @@
   },
   "devDependencies": {
     "@eslint/eslintrc": "^3.3.1",
+    "@eslint/js": "^9.30.1",
+    "@prettier/plugin-oxc": "^0.0.4",
     "@tailwindcss/forms": "^0.5.10",
     "@tailwindcss/postcss": "^4.1.11",
     "@tailwindcss/typography": "^0.5.16",
@@ -73,6 +75,7 @@
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-unused-imports": "^4.1.4",
+    "globals": "^16.3.0",
     "happy-dom": "^18.0.1",
     "lefthook": "^1.11.14",
     "postcss": "^8.5.6",