Explict imports & exports with type modifier (#3774)

2025-12-20 16:57:46 +00:00 · 2025-08-26 00:04:53 +02:00
parent 71c090c696
commit 0f031a7f89
332 changed files with 1086 additions and 1105 deletions
--- a/packages/core/src/utils/bfsFileSearch.ts
+++ b/packages/core/src/utils/bfsFileSearch.ts
@@ -6,8 +6,8 @@

 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
-import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import { FileFilteringOptions } from '../config/config.js';
+import type { FileDiscoveryService } from '../services/fileDiscoveryService.js';
+import type { FileFilteringOptions } from '../config/config.js';
 // Simple console logger for now.
 // TODO: Integrate with a more robust server-side logger.
 const logger = {
--- a/packages/core/src/utils/editCorrector.test.ts
+++ b/packages/core/src/utils/editCorrector.test.ts
@@ -5,15 +5,8 @@
 */

 /* eslint-disable @typescript-eslint/no-explicit-any */
-import {
-  vi,
-  describe,
-  it,
-  expect,
-  beforeEach,
-  Mock,
-  type Mocked,
-} from 'vitest';
+import type { Mock } from 'vitest';
+import { vi, describe, it, expect, beforeEach, type Mocked } from 'vitest';
 import * as fs from 'node:fs';
 import { EditTool } from '../tools/edit.js';

--- a/packages/core/src/utils/editCorrector.ts
+++ b/packages/core/src/utils/editCorrector.ts
@@ -4,9 +4,10 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-import { Content, GenerateContentConfig } from '@google/genai';
-import { GeminiClient } from '../core/client.js';
-import { EditToolParams, EditTool } from '../tools/edit.js';
+import type { Content, GenerateContentConfig } from '@google/genai';
+import type { GeminiClient } from '../core/client.js';
+import type { EditToolParams } from '../tools/edit.js';
+import { EditTool } from '../tools/edit.js';
 import { WriteFileTool } from '../tools/write-file.js';
 import { ReadFileTool } from '../tools/read-file.js';
 import { ReadManyFilesTool } from '../tools/read-many-files.js';
--- a/packages/core/src/utils/environmentContext.test.ts
+++ b/packages/core/src/utils/environmentContext.test.ts
@@ -17,7 +17,7 @@ import {
  getEnvironmentContext,
  getDirectoryContextString,
 } from './environmentContext.js';
-import { Config } from '../config/config.js';
+import type { Config } from '../config/config.js';
 import { getFolderStructure } from './getFolderStructure.js';

 vi.mock('../config/config.js');
--- a/packages/core/src/utils/environmentContext.ts
+++ b/packages/core/src/utils/environmentContext.ts
@@ -4,8 +4,8 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-import { Part } from '@google/genai';
-import { Config } from '../config/config.js';
+import type { Part } from '@google/genai';
+import type { Config } from '../config/config.js';
 import { getFolderStructure } from './getFolderStructure.js';

 /**
--- a/packages/core/src/utils/errorParsing.test.ts
+++ b/packages/core/src/utils/errorParsing.test.ts
@@ -10,7 +10,7 @@ import { isProQuotaExceededError } from './quotaErrorDetection.js';
 import { DEFAULT_GEMINI_FLASH_MODEL } from '../config/models.js';
 import { UserTierId } from '../code_assist/types.js';
 import { AuthType } from '../core/contentGenerator.js';
-import { StructuredError } from '../core/turn.js';
+import type { StructuredError } from '../core/turn.js';

 describe('parseAndFormatApiError', () => {
  const vertexMessage = 'request a quota increase through Vertex';
--- a/packages/core/src/utils/errorReporting.ts
+++ b/packages/core/src/utils/errorReporting.ts
@@ -7,7 +7,7 @@
 import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
-import { Content } from '@google/genai';
+import type { Content } from '@google/genai';

 interface ErrorReportData {
  error: { message: string; stack?: string } | { message: string };
--- a/packages/core/src/utils/fileUtils.ts
+++ b/packages/core/src/utils/fileUtils.ts
@@ -6,9 +6,9 @@

 import fs from 'node:fs';
 import path from 'node:path';
-import { PartUnion } from '@google/genai';
+import type { PartUnion } from '@google/genai';
 import mime from 'mime-types';
-import { FileSystemService } from '../services/fileSystemService.js';
+import type { FileSystemService } from '../services/fileSystemService.js';
 import { ToolErrorType } from '../tools/tool-error.js';
 import { BINARY_EXTENSIONS } from './ignorePatterns.js';

--- a/packages/core/src/utils/filesearch/crawler.test.ts
+++ b/packages/core/src/utils/filesearch/crawler.test.ts
@@ -10,7 +10,8 @@ import * as path from 'node:path';
 import * as cache from './crawlCache.js';
 import { crawl } from './crawler.js';
 import { createTmpDir, cleanupTmpDir } from '@google/gemini-cli-test-utils';
-import { Ignore, loadIgnoreRules } from './ignore.js';
+import type { Ignore } from './ignore.js';
+import { loadIgnoreRules } from './ignore.js';

 describe('crawler', () => {
  let tmpDir: string;
--- a/packages/core/src/utils/filesearch/crawler.ts
+++ b/packages/core/src/utils/filesearch/crawler.ts
@@ -6,7 +6,7 @@

 import path from 'node:path';
 import { fdir } from 'fdir';
-import { Ignore } from './ignore.js';
+import type { Ignore } from './ignore.js';
 import * as cache from './crawlCache.js';

 export interface CrawlOptions {
--- a/packages/core/src/utils/filesearch/fileSearch.ts
+++ b/packages/core/src/utils/filesearch/fileSearch.ts
@@ -6,10 +6,12 @@

 import path from 'node:path';
 import picomatch from 'picomatch';
-import { Ignore, loadIgnoreRules } from './ignore.js';
+import type { Ignore } from './ignore.js';
+import { loadIgnoreRules } from './ignore.js';
 import { ResultCache } from './result-cache.js';
 import { crawl } from './crawler.js';
-import { AsyncFzf, FzfResultItem } from 'fzf';
+import type { FzfResultItem } from 'fzf';
+import { AsyncFzf } from 'fzf';
 import { unescapePath } from '../paths.js';

 export interface FileSearchOptions {
--- a/packages/core/src/utils/generateContentResponseUtilities.test.ts
+++ b/packages/core/src/utils/generateContentResponseUtilities.test.ts
@@ -15,12 +15,12 @@ import {
  getStructuredResponse,
  getStructuredResponseFromParts,
 } from './generateContentResponseUtilities.js';
-import {
+import type {
  GenerateContentResponse,
  Part,
-  FinishReason,
  SafetyRating,
 } from '@google/genai';
+import { FinishReason } from '@google/genai';

 const mockTextPart = (text: string): Part => ({ text });
 const mockFunctionCallPart = (
--- a/packages/core/src/utils/generateContentResponseUtilities.ts
+++ b/packages/core/src/utils/generateContentResponseUtilities.ts
@@ -4,7 +4,11 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-import { GenerateContentResponse, Part, FunctionCall } from '@google/genai';
+import type {
+  GenerateContentResponse,
+  Part,
+  FunctionCall,
+} from '@google/genai';

 export function getResponseText(
  response: GenerateContentResponse,
--- a/packages/core/src/utils/getFolderStructure.ts
+++ b/packages/core/src/utils/getFolderStructure.ts
@@ -5,11 +5,11 @@
 */

 import * as fs from 'node:fs/promises';
-import { Dirent } from 'node:fs';
+import type { Dirent } from 'node:fs';
 import * as path from 'node:path';
 import { getErrorMessage, isNodeError } from './errors.js';
-import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import { FileFilteringOptions } from '../config/config.js';
+import type { FileDiscoveryService } from '../services/fileDiscoveryService.js';
+import type { FileFilteringOptions } from '../config/config.js';
 import { DEFAULT_FILE_FILTERING_OPTIONS } from '../config/config.js';

 const MAX_ITEMS = 200;
--- a/packages/core/src/utils/ignorePatterns.test.ts
+++ b/packages/core/src/utils/ignorePatterns.test.ts
@@ -10,7 +10,7 @@ import {
  BINARY_EXTENSIONS,
  extractExtensionsFromPatterns,
 } from './ignorePatterns.js';
-import { Config } from '../config/config.js';
+import type { Config } from '../config/config.js';

 // Mock the memoryTool module
 vi.mock('../tools/memoryTool.js', () => ({
--- a/packages/core/src/utils/ignorePatterns.ts
+++ b/packages/core/src/utils/ignorePatterns.ts
@@ -5,7 +5,7 @@
 */

 import path from 'node:path';
-import { Config } from '../config/config.js';
+import type { Config } from '../config/config.js';
 import { getCurrentGeminiMdFilename } from '../tools/memoryTool.js';

 /**
--- a/packages/core/src/utils/installationManager.test.ts
+++ b/packages/core/src/utils/installationManager.test.ts
@@ -4,7 +4,8 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-import { vi, describe, it, expect, beforeEach, afterEach, Mock } from 'vitest';
+import type { Mock } from 'vitest';
+import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
 import { InstallationManager } from './installationManager.js';
 import * as fs from 'node:fs';
 import * as os from 'node:os';
--- a/packages/core/src/utils/memoryDiscovery.ts
+++ b/packages/core/src/utils/memoryDiscovery.ts
@@ -13,12 +13,10 @@ import {
  GEMINI_CONFIG_DIR,
  getAllGeminiMdFilenames,
 } from '../tools/memoryTool.js';
-import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
+import type { FileDiscoveryService } from '../services/fileDiscoveryService.js';
 import { processImports } from './memoryImportProcessor.js';
-import {
-  DEFAULT_MEMORY_FILE_FILTERING_OPTIONS,
-  FileFilteringOptions,
-} from '../config/config.js';
+import type { FileFilteringOptions } from '../config/config.js';
+import { DEFAULT_MEMORY_FILE_FILTERING_OPTIONS } from '../config/config.js';

 // Simple console logger, similar to the one previously in CLI's config.ts
 // TODO: Integrate with a more robust server-side logger if available/appropriate.
--- a/packages/core/src/utils/messageInspectors.ts
+++ b/packages/core/src/utils/messageInspectors.ts
@@ -4,7 +4,7 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-import { Content } from '@google/genai';
+import type { Content } from '@google/genai';

 export function isFunctionResponse(content: Content): boolean {
  return (
--- a/packages/core/src/utils/nextSpeakerChecker.test.ts
+++ b/packages/core/src/utils/nextSpeakerChecker.test.ts
@@ -4,12 +4,14 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-import { describe, it, expect, vi, beforeEach, Mock, afterEach } from 'vitest';
-import { Content, GoogleGenAI, Models } from '@google/genai';
+import type { Mock } from 'vitest';
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import type { Content, GoogleGenAI, Models } from '@google/genai';
 import { DEFAULT_GEMINI_FLASH_MODEL } from '../config/models.js';
 import { GeminiClient } from '../core/client.js';
 import { Config } from '../config/config.js';
-import { checkNextSpeaker, NextSpeakerResponse } from './nextSpeakerChecker.js';
+import type { NextSpeakerResponse } from './nextSpeakerChecker.js';
+import { checkNextSpeaker } from './nextSpeakerChecker.js';
 import { GeminiChat } from '../core/geminiChat.js';

 // Mock GeminiClient and Config constructor
--- a/packages/core/src/utils/nextSpeakerChecker.ts
+++ b/packages/core/src/utils/nextSpeakerChecker.ts
@@ -4,10 +4,10 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-import { Content } from '@google/genai';
+import type { Content } from '@google/genai';
 import { DEFAULT_GEMINI_FLASH_MODEL } from '../config/models.js';
-import { GeminiClient } from '../core/client.js';
-import { GeminiChat } from '../core/geminiChat.js';
+import type { GeminiClient } from '../core/client.js';
+import type { GeminiChat } from '../core/geminiChat.js';
 import { isFunctionResponse } from './messageInspectors.js';

 const CHECK_PROMPT = `Analyze *only* the content and structure of your immediately preceding response (your last turn in the conversation history). Based *strictly* on that response, determine who should logically speak next: the 'user' or the 'model' (you).
--- a/packages/core/src/utils/partUtils.test.ts
+++ b/packages/core/src/utils/partUtils.test.ts
@@ -6,7 +6,7 @@

 import { describe, it, expect } from 'vitest';
 import { partToString, getResponseText } from './partUtils.js';
-import { GenerateContentResponse, Part } from '@google/genai';
+import type { GenerateContentResponse, Part } from '@google/genai';

 const mockResponse = (
  parts?: Array<{ text?: string; functionCall?: unknown }>,
--- a/packages/core/src/utils/partUtils.ts
+++ b/packages/core/src/utils/partUtils.ts
@@ -4,7 +4,11 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-import { GenerateContentResponse, PartListUnion, Part } from '@google/genai';
+import type {
+  GenerateContentResponse,
+  PartListUnion,
+  Part,
+} from '@google/genai';

 /**
 * Converts a PartListUnion into a string.
--- a/packages/core/src/utils/quotaErrorDetection.ts
+++ b/packages/core/src/utils/quotaErrorDetection.ts
@@ -4,7 +4,7 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-import { StructuredError } from '../core/turn.js';
+import type { StructuredError } from '../core/turn.js';

 export interface ApiError {
  error: {
--- a/packages/core/src/utils/retry.test.ts
+++ b/packages/core/src/utils/retry.test.ts
@@ -6,7 +6,8 @@

 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { retryWithBackoff, HttpError } from './retry.js';
+import type { HttpError } from './retry.js';
+import { retryWithBackoff } from './retry.js';
 import { setSimulate429 } from './testUtils.js';

 // Helper to create a mock function that fails a certain number of times
--- a/packages/core/src/utils/shell-utils.test.ts
+++ b/packages/core/src/utils/shell-utils.test.ts
@@ -13,7 +13,7 @@ import {
  isCommandAllowed,
  stripShellWrapper,
 } from './shell-utils.js';
-import { Config } from '../config/config.js';
+import type { Config } from '../config/config.js';

 const mockPlatform = vi.hoisted(() => vi.fn());
 vi.mock('os', () => ({
--- a/packages/core/src/utils/shell-utils.ts
+++ b/packages/core/src/utils/shell-utils.ts
@@ -4,7 +4,7 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-import { Config } from '../config/config.js';
+import type { Config } from '../config/config.js';
 import os from 'node:os';
 import { quote } from 'shell-quote';

--- a/packages/core/src/utils/summarizer.test.ts
+++ b/packages/core/src/utils/summarizer.test.ts
@@ -4,7 +4,8 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-import { describe, it, expect, vi, beforeEach, afterEach, Mock } from 'vitest';
+import type { Mock } from 'vitest';
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { GeminiClient } from '../core/client.js';
 import { Config } from '../config/config.js';
 import {
@@ -12,7 +13,7 @@ import {
  llmSummarizer,
  defaultSummarizer,
 } from './summarizer.js';
-import { ToolResult } from '../tools/tools.js';
+import type { ToolResult } from '../tools/tools.js';

 // Mock GeminiClient and Config constructor
 vi.mock('../core/client.js');
--- a/packages/core/src/utils/summarizer.ts
+++ b/packages/core/src/utils/summarizer.ts
@@ -4,13 +4,13 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-import { ToolResult } from '../tools/tools.js';
-import {
+import type { ToolResult } from '../tools/tools.js';
+import type {
  Content,
  GenerateContentConfig,
  GenerateContentResponse,
 } from '@google/genai';
-import { GeminiClient } from '../core/client.js';
+import type { GeminiClient } from '../core/client.js';
 import { DEFAULT_GEMINI_FLASH_LITE_MODEL } from '../config/models.js';
 import { getResponseText, partToString } from './partUtils.js';

--- a/packages/core/src/utils/userAccountManager.test.ts
+++ b/packages/core/src/utils/userAccountManager.test.ts
@@ -4,7 +4,8 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-import { vi, describe, it, expect, beforeEach, afterEach, Mock } from 'vitest';
+import type { Mock } from 'vitest';
+import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
 import { UserAccountManager } from './userAccountManager.js';
 import * as fs from 'node:fs';
 import * as os from 'node:os';