chore(js/plugins/mcp): cleanup imports for esm compatibility (#3217)

Author: pavelgj

js/plugins/mcp/src/client/client.ts

@@ -23,12 +23,12 @@ import {
   Root,
 } from '@modelcontextprotocol/sdk/types.js';
 import {
-  DynamicResourceAction,
-  ExecutablePrompt,
-  Genkit,
   GenkitError,
-  PromptGenerateOptions,
-  ToolAction,
+  type DynamicResourceAction,
+  type ExecutablePrompt,
+  type Genkit,
+  type PromptGenerateOptions,
+  type ToolAction,
 } from 'genkit';
 import { logger } from 'genkit/logging';
 import {

js/plugins/mcp/src/client/host.ts

@@ -16,11 +16,11 @@
 
 import { Root } from '@modelcontextprotocol/sdk/types.js';
 import {
-  DynamicResourceAction,
-  ExecutablePrompt,
-  Genkit,
-  PromptGenerateOptions,
-  ToolAction,
+  type DynamicResourceAction,
+  type ExecutablePrompt,
+  type Genkit,
+  type PromptGenerateOptions,
+  type ToolAction,
 } from 'genkit';
 import { logger } from 'genkit/logging';
 import { GenkitMcpClient, McpServerConfig } from './client.js';

js/plugins/mcp/src/server.ts

@@ -14,17 +14,6 @@
  * limitations under the License.
  */
 
-import {
-  GenkitError,
-  Message,
-  Part,
-  type Genkit,
-  type MessageData,
-  type PromptAction,
-  type ResourceAction,
-} from 'genkit';
-import type { McpServerOptions } from './index.js';
-
 import type { Server } from '@modelcontextprotocol/sdk/server/index.js' with { 'resolution-mode': 'import' };
 import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js' with { 'resolution-mode': 'import' };
 import type {
@@ -50,9 +39,19 @@ import {
   Resource,
   ResourceTemplate,
 } from '@modelcontextprotocol/sdk/types.js';
+import {
+  GenkitError,
+  Message,
+  type Genkit,
+  type MessageData,
+  type Part,
+  type PromptAction,
+  type ResourceAction,
+} from 'genkit';
 import { logger } from 'genkit/logging';
 import { toJsonSchema } from 'genkit/schema';
-import { ToolAction, toToolDefinition } from 'genkit/tool';
+import { toToolDefinition, type ToolAction } from 'genkit/tool';
+import type { McpServerOptions } from './index.js';
 
 /**
  * Represents an MCP (Model Context Protocol) server that exposes Genkit tools

js/plugins/mcp/src/util/prompts.ts

@@ -17,16 +17,16 @@
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import type { Prompt } from '@modelcontextprotocol/sdk/types.js';
 import {
-  ExecutablePrompt,
-  GenerateOptions,
-  GenerateResponse,
-  GenerateStreamResponse,
-  Genkit,
   GenkitError,
-  JSONSchema,
-  ToolAction,
   z,
+  type ExecutablePrompt,
+  type GenerateOptions,
+  type GenerateResponse,
+  type GenerateStreamResponse,
+  type Genkit,
+  type JSONSchema,
   type PromptGenerateOptions,
+  type ToolAction,
 } from 'genkit';
 import { logger } from 'genkit/logging';
 import { fromMcpPromptMessage } from './message.js';

js/plugins/mcp/src/util/resource.ts

@@ -21,11 +21,11 @@ import {
   ResourceTemplate,
 } from '@modelcontextprotocol/sdk/types.js';
 import {
-  DynamicResourceAction,
-  Genkit,
   GenkitError,
-  Part,
   dynamicResource,
+  type DynamicResourceAction,
+  type Genkit,
+  type Part,
 } from 'genkit';
 import { logger } from 'genkit/logging';
 

js/plugins/mcp/src/util/tools.ts

@@ -19,7 +19,7 @@ import type {
   CallToolResult,
   Tool,
 } from '@modelcontextprotocol/sdk/types.js' with { 'resolution-mode': 'import' };
-import { Genkit, JSONSchema7, ToolAction, z } from 'genkit';
+import { JSONSchema7, z, type Genkit, type ToolAction } from 'genkit';
 import { logger } from 'genkit/logging';
 
 const toText = (c: CallToolResult['content']) =>