diffwatch 1.1.2 → 2.0.0

package/src/utils/git.ts

@@ -1,185 +0,0 @@
-import { simpleGit, SimpleGit, StatusResult } from 'simple-git';
-import fs from 'fs/promises';
-
-export interface FileStatus {
-  path: string;
-  status: 'modified' | 'added' | 'deleted' | 'unstaged' | 'unknown' | 'unchanged';
-  mtime?: Date;
-}
-
-export class GitHandler {
-  private git: SimpleGit;
-
-  constructor(workingDir: string = process.cwd()) {
-    this.git = simpleGit(workingDir);
-  }
-
-  async isRepo(): Promise<boolean> {
-    try {
-      return await this.git.checkIsRepo();
-    } catch {
-      return false;
-    }
-  }
-
-  async getBranch(): Promise<string> {
-    try {
-      const status = await this.git.status();
-      return status.current || 'HEAD';
-    } catch {
-      return 'HEAD';
-    }
-  }
-
-  async getStatus(): Promise<FileStatus[]> {
-    const status: StatusResult = await this.git.status();
-    const uniqueFiles = new Map<string, FileStatus>();
-
-    // Process each status category and add to map (which prevents duplicates)
-    status.modified.forEach(path => {
-      uniqueFiles.set(path, { path, status: 'modified' });
-    });
-
-    status.deleted.forEach(path => {
-      // Only add if not already in the map
-      if (!uniqueFiles.has(path)) {
-        uniqueFiles.set(path, { path, status: 'deleted' });
-      }
-    });
-
-    status.created.forEach(path => {
-      // Only add if not already in the map
-      if (!uniqueFiles.has(path)) {
-        uniqueFiles.set(path, { path, status: 'added' });
-      }
-    });
-
-    status.not_added.forEach(path => {
-      // Only add if not already in the map
-      if (!uniqueFiles.has(path)) {
-        uniqueFiles.set(path, { path, status: 'unstaged' });
-      }
-    });
-
-    status.renamed.forEach(r => {
-      // Only add if not already in the map
-      if (!uniqueFiles.has(r.to)) {
-        uniqueFiles.set(r.to, { path: r.to, status: 'added' });
-      }
-    });
-
-    // Add last modified time for sorting
-    const fileArray = Array.from(uniqueFiles.values());
-    await Promise.all(fileArray.map(async (f) => {
-      try {
-        const stat = await fs.stat(f.path);
-        f.mtime = stat.mtime;
-      } catch (error) {
-        // For deleted or inaccessible files, use epoch time
-        f.mtime = new Date(0);
-      }
-    }));
-
-    // Sort by last modified descending, then by filename
-    return fileArray.sort((a, b) => {
-      const mtimeA = a.mtime || new Date(0);
-      const mtimeB = b.mtime || new Date(0);
-      const timeDiff = mtimeB.getTime() - mtimeA.getTime();
-      if (timeDiff !== 0) {
-        return timeDiff;
-      }
-      return a.path.localeCompare(b.path);
-    });
-  }
-
-  async searchFiles(term: string): Promise<FileStatus[]> {
-    if (!term || !term.trim()) return [];
-
-    try {
-      // Use git grep to find files containing the term
-      // -i: ignore case
-      // -l: list filenames only
-      // -F: interpret pattern as a fixed string
-      // --untracked: include untracked files
-      const result = await this.git.raw(['grep', '-i', '-l', '-F', '--untracked', term.trim()]);
-      const matchedPaths = [...new Set(result.split('\n').map(p => p.trim()).filter(p => p !== ''))];
-      
-      if (matchedPaths.length === 0) return [];
-
-      // Get current status to identify which matched files are changed
-      const changedFiles = await this.getStatus();
-      const changedMap = new Map<string, FileStatus>();
-      changedFiles.forEach(f => changedMap.set(f.path, f));
-
-      const finalResults: FileStatus[] = [];
-      
-      for (const path of matchedPaths) {
-        if (changedMap.has(path)) {
-          finalResults.push(changedMap.get(path)!);
-        } else {
-          // It's an unchanged file
-          let mtime = new Date(0);
-          try {
-            const stat = await fs.stat(path);
-            mtime = stat.mtime;
-          } catch {}
-          
-          finalResults.push({
-            path,
-            status: 'unchanged',
-            mtime
-          });
-        }
-      }
-
-      // Sort results by mtime descending
-      return finalResults.sort((a, b) => {
-        const mtimeA = a.mtime || new Date(0);
-        const mtimeB = b.mtime || new Date(0);
-        const timeDiff = mtimeB.getTime() - mtimeA.getTime();
-        if (timeDiff !== 0) return timeDiff;
-        return a.path.localeCompare(b.path);
-      });
-    } catch (error: any) {
-      // git grep returns exit code 1 if no matches are found, which simple-git might throw as an error
-      if (error.message && (error.message.includes('exit code 1') || error.exitCode === 1)) {
-        return [];
-      }
-      throw error;
-    }
-  }
-
-  async getDiff(filePath: string): Promise<string> {
-    try {
-      const isUntracked = (await this.git.status()).not_added.includes(filePath);
-      
-      if (isUntracked) {
-        return await this.git.raw(['diff', '--no-index', '--', '/dev/null', filePath]).catch(() => {
-          return `New file: ${filePath}`;
-        });
-      }
-
-      const diff = await this.git.diff(['HEAD', '--', filePath]);
-      return diff || '';
-    } catch (error) {
-      return `Error getting diff: ${error}`;
-    }
-  }
-
-  async getFileContent(filePath: string): Promise<string> {
-    try {
-      return await fs.readFile(filePath, 'utf8');
-    } catch (error) {
-      return `Error reading file: ${error}`;
-    }
-  }
-
-  async revertFile(filePath: string): Promise<void> {
-    try {
-      // Restore the specific file to HEAD version
-      await this.git.raw(['restore', filePath]);
-    } catch (error) {
-      throw new Error(`Could not revert file: ${error}`);
-    }
-  }
-}

package/tests/git.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=git.test.d.ts.map

package/tests/git.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"git.test.d.ts","sourceRoot":"","sources":["git.test.ts"],"names":[],"mappings":""}

package/tests/git.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"git.test.js","sourceRoot":"","sources":["git.test.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,0CAA8C;AAC9C,2CAAuC;AAEvC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AAExB,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IAC1B,IAAI,UAAsB,CAAC;IAC3B,IAAI,OAAY,CAAC;IAEjB,UAAU,CAAC,GAAG,EAAE;QACd,OAAO,GAAG;YACR,WAAW,EAAE,IAAI,CAAC,EAAE,EAAE;YACtB,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE;YACjB,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;YACf,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;SAChB,CAAC;QACD,sBAAuB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QAClD,UAAU,GAAG,IAAI,gBAAU,EAAE,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,GAAS,EAAE;QACzD,OAAO,CAAC,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC;QACzC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,GAAS,EAAE;QAC9D,OAAO,CAAC,WAAW,CAAC,iBAAiB,CAAC,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;QAC/D,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC;QACzC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,GAAS,EAAE;QACnD,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC;YAC/B,QAAQ,EAAE,CAAC,UAAU,CAAC;YACtB,OAAO,EAAE,CAAC,UAAU,CAAC;YACrB,OAAO,EAAE,CAAC,UAAU,CAAC;YACrB,SAAS,EAAE,CAAC,UAAU,CAAC;YACvB,OAAO,EAAE,EAAE;SACZ,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,EAAE,CAAC;QAC5C,MAAM,CAAC,MAAM,CAAC,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;QACxE,MAAM,CAAC,MAAM,CAAC,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;QACvE,MAAM,CAAC,MAAM,CAAC,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;QACrE,MAAM,CAAC,MAAM,CAAC,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;IAC1E,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,8BAA8B,EAAE,GAAS,EAAE;QAC5C,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,8BAA8B,CAAC,CAAC;QAC/D,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAClD,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;IACpD,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/tests/git.test.ts

@@ -1,148 +0,0 @@
-jest.mock('simple-git', () => ({
-  simpleGit: jest.fn(),
-}));
-jest.mock('fs/promises', () => ({
-  stat: jest.fn(),
-  readFile: jest.fn(),
-}));
-
-import { simpleGit } from 'simple-git';
-import fs from 'fs/promises';
-import { GitHandler, FileStatus } from '../src/utils/git';
-
-describe('GitHandler', () => {
-  let gitHandler: GitHandler;
-  let mockGit: any;
-
-  beforeEach(() => {
-    mockGit = {
-      checkIsRepo: jest.fn(),
-      status: jest.fn(),
-      diff: jest.fn(),
-      show: jest.fn(),
-    };
-    (simpleGit as jest.Mock).mockReturnValue(mockGit);
-    (fs.stat as jest.Mock).mockResolvedValue({ mtime: new Date() });
-    (fs.readFile as jest.Mock).mockResolvedValue('');
-    gitHandler = new GitHandler();
-  });
-
-  it('should return true if directory is a repo', async () => {
-    mockGit.checkIsRepo.mockResolvedValue(true);
-    const result = await gitHandler.isRepo();
-    expect(result).toBe(true);
-  });
-
-  it('should return false if directory is not a repo', async () => {
-    mockGit.checkIsRepo.mockRejectedValue(new Error('not a repo'));
-    const result = await gitHandler.isRepo();
-    expect(result).toBe(false);
-  });
-
-  it('should return file status correctly', async () => {
-    mockGit.status.mockResolvedValue({
-      modified: ['file1.ts'],
-      deleted: ['file2.ts'],
-      created: ['file3.ts'],
-      not_added: ['file4.ts'],
-      renamed: [],
-    });
-
-    const status = await gitHandler.getStatus();
-    expect(status).toEqual(expect.arrayContaining([
-      expect.objectContaining({ path: 'file1.ts', status: 'modified' }),
-      expect.objectContaining({ path: 'file2.ts', status: 'deleted' }),
-      expect.objectContaining({ path: 'file3.ts', status: 'added' }),
-      expect.objectContaining({ path: 'file4.ts', status: 'unstaged' }),
-    ]));
-  });
-
-  it('should return diff correctly', async () => {
-    mockGit.status.mockResolvedValue({ not_added: [] });
-    mockGit.diff.mockResolvedValue('+ added line\n- removed line');
-    const diff = await gitHandler.getDiff('file1.ts');
-    expect(diff).toBe('+ added line\n- removed line');
-  });
-
-  it('should return empty string if no diff', async () => {
-    mockGit.status.mockResolvedValue({ not_added: [] });
-    mockGit.diff.mockResolvedValue('');
-    const diff = await gitHandler.getDiff('file1.ts');
-    expect(diff).toBe('');
-  });
-
-  it('should sort files by last modified descending then filename', async () => {
-    // Mock fs.stat to return different mtimes
-    const mockStat = jest.fn();
-    (fs.stat as jest.Mock) = mockStat;
-    mockStat.mockImplementation((path: string) => {
-      const mtimes: Record<string, Date> = {
-        'z-file.ts': new Date('2024-01-03'),
-        'a-file.ts': new Date('2024-01-01'),
-        'z-deleted.ts': new Date('2024-01-02'),
-        'z-added.ts': new Date('2024-01-04'),
-        'a-added.ts': new Date('2024-01-05'),
-        'z-unstaged.ts': new Date('2024-01-06'),
-        'a-unstaged.ts': new Date('2024-01-07'),
-      };
-      return Promise.resolve({ mtime: mtimes[path] || new Date(0) });
-    });
-
-    mockGit.status.mockResolvedValue({
-      modified: ['z-file.ts', 'a-file.ts'],
-      deleted: ['z-deleted.ts'],
-      created: ['z-added.ts', 'a-added.ts'],
-      not_added: ['z-unstaged.ts', 'a-unstaged.ts'],
-      renamed: [],
-    });
-
-    const status = await gitHandler.getStatus();
-    expect(status.map(f => f.path)).toEqual([
-      'a-unstaged.ts', // newest
-      'z-unstaged.ts',
-      'a-added.ts',
-      'z-added.ts',
-      'z-file.ts',
-      'z-deleted.ts',
-      'a-file.ts', // oldest
-    ]);
-  });
-
-  it('should search files correctly', async () => {
-    mockGit.raw = jest.fn().mockResolvedValue('match.ts\nunchanged.ts');
-    mockGit.status.mockResolvedValue({
-      modified: ['match.ts'],
-      deleted: [],
-      created: [],
-      not_added: [],
-      renamed: [],
-    });
-
-    const results = await gitHandler.searchFiles('match');
-    
-    expect(results).toHaveLength(2);
-    expect(results).toEqual(expect.arrayContaining([
-      expect.objectContaining({ path: 'match.ts', status: 'modified' }),
-      expect.objectContaining({ path: 'unchanged.ts', status: 'unchanged' }),
-    ]));
-    expect(mockGit.raw).toHaveBeenCalledWith(['grep', '-i', '-l', '-F', '--untracked', 'match']);
-  });
-
-  it('should deduplicate search results', async () => {
-    // Return duplicate paths
-    mockGit.raw = jest.fn().mockResolvedValue('match.ts\nmatch.ts\nother.ts\nother.ts');
-    mockGit.status.mockResolvedValue({
-      modified: [],
-      deleted: [],
-      created: [],
-      not_added: [],
-      renamed: [],
-    });
-
-    const results = await gitHandler.searchFiles('term');
-    
-    expect(results).toHaveLength(2);
-    const paths = results.map(r => r.path).sort();
-    expect(paths).toEqual(['match.ts', 'other.ts']);
-  });
-});

package/tsconfig.json

@@ -1,16 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES6",
-    "module": "commonjs",
-    "rootDir": "src",
-    "outDir": "dist",
-    "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "skipLibCheck": true,
-    "sourceMap": true,
-    "declaration": true
-  },
-  "include": ["src/**/*"],
-  "exclude": ["node_modules", "dist", "sample-tui", "tests"]
-}