@google/gemini-cli-core 0.1.0-development.1

package/dist/src/utils/bfsFileSearch.test.js

@@ -0,0 +1,129 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as fs from 'fs';
+import { vi, describe, it, expect, beforeEach } from 'vitest';
+import * as fsPromises from 'fs/promises';
+import * as gitUtils from './gitUtils.js';
+import { bfsFileSearch } from './bfsFileSearch.js';
+import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
+vi.mock('fs');
+vi.mock('fs/promises');
+vi.mock('./gitUtils.js');
+const createMockDirent = (name, isFile) => {
+    const dirent = new fs.Dirent();
+    dirent.name = name;
+    dirent.isFile = () => isFile;
+    dirent.isDirectory = () => !isFile;
+    return dirent;
+};
+describe('bfsFileSearch', () => {
+    beforeEach(() => {
+        vi.resetAllMocks();
+    });
+    it('should find a file in the root directory', async () => {
+        const mockFs = vi.mocked(fsPromises);
+        const mockReaddir = mockFs.readdir;
+        vi.mocked(mockReaddir).mockResolvedValue([
+            createMockDirent('file1.txt', true),
+            createMockDirent('file2.txt', true),
+        ]);
+        const result = await bfsFileSearch('/test', { fileName: 'file1.txt' });
+        expect(result).toEqual(['/test/file1.txt']);
+    });
+    it('should find a file in a subdirectory', async () => {
+        const mockFs = vi.mocked(fsPromises);
+        const mockReaddir = mockFs.readdir;
+        vi.mocked(mockReaddir).mockImplementation(async (dir) => {
+            if (dir === '/test') {
+                return [createMockDirent('subdir', false)];
+            }
+            if (dir === '/test/subdir') {
+                return [createMockDirent('file1.txt', true)];
+            }
+            return [];
+        });
+        const result = await bfsFileSearch('/test', { fileName: 'file1.txt' });
+        expect(result).toEqual(['/test/subdir/file1.txt']);
+    });
+    it('should ignore specified directories', async () => {
+        const mockFs = vi.mocked(fsPromises);
+        const mockReaddir = mockFs.readdir;
+        vi.mocked(mockReaddir).mockImplementation(async (dir) => {
+            if (dir === '/test') {
+                return [
+                    createMockDirent('subdir1', false),
+                    createMockDirent('subdir2', false),
+                ];
+            }
+            if (dir === '/test/subdir1') {
+                return [createMockDirent('file1.txt', true)];
+            }
+            if (dir === '/test/subdir2') {
+                return [createMockDirent('file1.txt', true)];
+            }
+            return [];
+        });
+        const result = await bfsFileSearch('/test', {
+            fileName: 'file1.txt',
+            ignoreDirs: ['subdir2'],
+        });
+        expect(result).toEqual(['/test/subdir1/file1.txt']);
+    });
+    it('should respect maxDirs limit', async () => {
+        const mockFs = vi.mocked(fsPromises);
+        const mockReaddir = mockFs.readdir;
+        vi.mocked(mockReaddir).mockImplementation(async (dir) => {
+            if (dir === '/test') {
+                return [
+                    createMockDirent('subdir1', false),
+                    createMockDirent('subdir2', false),
+                ];
+            }
+            if (dir === '/test/subdir1') {
+                return [createMockDirent('file1.txt', true)];
+            }
+            if (dir === '/test/subdir2') {
+                return [createMockDirent('file1.txt', true)];
+            }
+            return [];
+        });
+        const result = await bfsFileSearch('/test', {
+            fileName: 'file1.txt',
+            maxDirs: 2,
+        });
+        expect(result).toEqual(['/test/subdir1/file1.txt']);
+    });
+    it('should respect .gitignore files', async () => {
+        const mockFs = vi.mocked(fsPromises);
+        const mockGitUtils = vi.mocked(gitUtils);
+        mockGitUtils.isGitRepository.mockReturnValue(true);
+        const mockReaddir = mockFs.readdir;
+        vi.mocked(mockReaddir).mockImplementation(async (dir) => {
+            if (dir === '/test') {
+                return [
+                    createMockDirent('.gitignore', true),
+                    createMockDirent('subdir1', false),
+                    createMockDirent('subdir2', false),
+                ];
+            }
+            if (dir === '/test/subdir1') {
+                return [createMockDirent('file1.txt', true)];
+            }
+            if (dir === '/test/subdir2') {
+                return [createMockDirent('file1.txt', true)];
+            }
+            return [];
+        });
+        vi.mocked(fs).readFileSync.mockReturnValue('subdir2');
+        const fileService = new FileDiscoveryService('/test');
+        const result = await bfsFileSearch('/test', {
+            fileName: 'file1.txt',
+            fileService,
+        });
+        expect(result).toEqual(['/test/subdir1/file1.txt']);
+    });
+});
+//# sourceMappingURL=bfsFileSearch.test.js.map

package/dist/src/utils/bfsFileSearch.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bfsFileSearch.test.js","sourceRoot":"","sources":["../../../src/utils/bfsFileSearch.test.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/editCorrector.d.ts

@@ -0,0 +1,53 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { GeminiClient } from '../core/client.js';
+import { EditToolParams } from '../tools/edit.js';
+/**
+ * Defines the structure of the parameters within CorrectedEditResult
+ */
+interface CorrectedEditParams {
+    file_path: string;
+    old_string: string;
+    new_string: string;
+}
+/**
+ * Defines the result structure for ensureCorrectEdit.
+ */
+export interface CorrectedEditResult {
+    params: CorrectedEditParams;
+    occurrences: number;
+}
+/**
+ * Attempts to correct edit parameters if the original old_string is not found.
+ * It tries unescaping, and then LLM-based correction.
+ * Results are cached to avoid redundant processing.
+ *
+ * @param currentContent The current content of the file.
+ * @param originalParams The original EditToolParams
+ * @param client The GeminiClient for LLM calls.
+ * @returns A promise resolving to an object containing the (potentially corrected)
+ *          EditToolParams (as CorrectedEditParams) and the final occurrences count.
+ */
+export declare function ensureCorrectEdit(filePath: string, currentContent: string, originalParams: EditToolParams, // This is the EditToolParams from edit.ts, without \'corrected\'
+client: GeminiClient, abortSignal: AbortSignal): Promise<CorrectedEditResult>;
+export declare function ensureCorrectFileContent(content: string, client: GeminiClient, abortSignal: AbortSignal): Promise<string>;
+export declare function correctOldStringMismatch(geminiClient: GeminiClient, fileContent: string, problematicSnippet: string, abortSignal: AbortSignal): Promise<string>;
+/**
+ * Adjusts the new_string to align with a corrected old_string, maintaining the original intent.
+ */
+export declare function correctNewString(geminiClient: GeminiClient, originalOldString: string, correctedOldString: string, originalNewString: string, abortSignal: AbortSignal): Promise<string>;
+export declare function correctNewStringEscaping(geminiClient: GeminiClient, oldString: string, potentiallyProblematicNewString: string, abortSignal: AbortSignal): Promise<string>;
+export declare function correctStringEscaping(potentiallyProblematicString: string, client: GeminiClient, abortSignal: AbortSignal): Promise<string>;
+/**
+ * Unescapes a string that might have been overly escaped by an LLM.
+ */
+export declare function unescapeStringForGeminiBug(inputString: string): string;
+/**
+ * Counts occurrences of a substring in a string
+ */
+export declare function countOccurrences(str: string, substr: string): number;
+export declare function resetEditCorrectorCaches_TEST_ONLY(): void;
+export {};