imports fix

Author: KKonstantinov

.github/workflows/main.yml

@@ -29,7 +29,6 @@ jobs:
                   cache: pnpm
                   cache-dependency-path: pnpm-lock.yaml
 
-
             - run: pnpm install
             - run: pnpm run check:all
             - run: pnpm run build:all

common/eslint-config/eslint.config.mjs

@@ -35,14 +35,14 @@ export default tseslint.config(
                     // while the actual file is "./foo.ts"
                     extensions: ['.js', '.jsx', '.ts', '.tsx', '.d.ts'],
                     // Use the tsconfig in each package root (when running ESLint from that package)
-                    project: 'tsconfig.json',
-                },
-            },
+                    project: 'tsconfig.json'
+                }
+            }
         },
         rules: {
             '@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: '^_' }],
             'n/prefer-node-protocol': 'error',
-            '@typescript-eslint/consistent-type-imports': ['error', { disallowTypeAnnotations: false }],
+            '@typescript-eslint/consistent-type-imports': ['error', { disallowTypeAnnotations: false }]
         }
     },
     {

packages/client/src/client/client.ts

@@ -7,43 +7,51 @@ import type {
     AnyObjectSchema,
     SchemaOutput,
     RequestHandlerExtra,
+    ProtocolOptions,
+    RequestOptions,
+    CallToolRequest,
+    ClientCapabilities,
+    ClientNotification,
+    ClientRequest,
+    ClientResult,
+    CompatibilityCallToolResultSchema,
+    CompleteRequest,
+    GetPromptRequest,
+    Implementation,
+    ListPromptsRequest,
+    ListResourcesRequest,
+    ListResourceTemplatesRequest,
+    ListToolsRequest,
+    LoggingLevel,
+    ReadResourceRequest,
+    ServerCapabilities,
+    SubscribeRequest,
+    Tool,
+    UnsubscribeRequest,
+    ListChangedHandlers,
+    Request,
+    Notification,
+    Result,
+    ZodV3Internal,
+    ZodV4Internal
+} from '@modelcontextprotocol/sdk-core';
+import {
     mergeCapabilities,
     Protocol,
-    type ProtocolOptions,
-    type RequestOptions,
-    type CallToolRequest,
     CallToolResultSchema,
-    type ClientCapabilities,
-    type ClientNotification,
-    type ClientRequest,
-    type ClientResult,
-    type CompatibilityCallToolResultSchema,
-    type CompleteRequest,
     CompleteResultSchema,
     EmptyResultSchema,
     ErrorCode,
-    type GetPromptRequest,
     GetPromptResultSchema,
-    type Implementation,
     InitializeResultSchema,
     LATEST_PROTOCOL_VERSION,
-    type ListPromptsRequest,
     ListPromptsResultSchema,
-    type ListResourcesRequest,
     ListResourcesResultSchema,
-    type ListResourceTemplatesRequest,
     ListResourceTemplatesResultSchema,
-    type ListToolsRequest,
     ListToolsResultSchema,
-    type LoggingLevel,
     McpError,
-    type ReadResourceRequest,
     ReadResourceResultSchema,
-    type ServerCapabilities,
     SUPPORTED_PROTOCOL_VERSIONS,
-    type SubscribeRequest,
-    type Tool,
-    type UnsubscribeRequest,
     ElicitResultSchema,
     ElicitRequestSchema,
     CreateTaskResultSchema,
@@ -53,18 +61,14 @@ import type {
     PromptListChangedNotificationSchema,
     ResourceListChangedNotificationSchema,
     ListChangedOptionsBaseSchema,
-    type ListChangedHandlers,
-    type Request,
-    type Notification,
-    type Result,
     getObjectShape,
     isZ4Schema,
     safeParse,
-    type ZodV3Internal,
-    type ZodV4Internal
+    AjvJsonSchemaValidator,
+    assertToolsCallTaskCapability,
+    assertClientRequestTaskCapability
 } from '@modelcontextprotocol/sdk-core';
 
-import { AjvJsonSchemaValidator, assertToolsCallTaskCapability, assertClientRequestTaskCapability } from '@modelcontextprotocol/sdk-core';
 import { ExperimentalClientTasks } from '../experimental/tasks/client.js';
 
 /**

packages/client/src/experimental/tasks/client.ts

@@ -16,14 +16,12 @@ import type {
     Notification,
     Request,
     Result,
-    CallToolResultSchema,
-    type CompatibilityCallToolResultSchema,
-    McpError,
-    ErrorCode,
+    CompatibilityCallToolResultSchema,
     GetTaskResult,
     ListTasksResult,
     CancelTaskResult
 } from '@modelcontextprotocol/sdk-core';
+import { CallToolResultSchema, McpError, ErrorCode } from '@modelcontextprotocol/sdk-core';
 
 /**
  * Internal interface for accessing Client's private methods.

packages/examples/shared/src/demoInMemoryOAuthProvider.ts

@@ -6,14 +6,9 @@ import type {
     OAuthClientInformationFull,
     OAuthMetadata,
     OAuthTokens,
-    AuthInfo,
-} from '@modelcontextprotocol/sdk-server';
-import {
-    createOAuthMetadata,
-    mcpAuthRouter,
-    resourceUrlFromServerUrl,
-    InvalidRequestError
+    AuthInfo
 } from '@modelcontextprotocol/sdk-server';
+import { createOAuthMetadata, mcpAuthRouter, resourceUrlFromServerUrl, InvalidRequestError } from '@modelcontextprotocol/sdk-server';
 import type { Request, Response } from 'express';
 import express from 'express';
 

packages/integration/test/server.test.ts

@@ -1,9 +1,18 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import supertest from 'supertest';
 import { Client } from '@modelcontextprotocol/sdk-client';
-import { InMemoryTransport, CallToolRequestSchema, CallToolResultSchema } from '@modelcontextprotocol/sdk-core';
 import type {
     Transport,
+    LoggingMessageNotification,
+    JsonSchemaType,
+    JsonSchemaValidator,
+    jsonSchemaValidator,
+    AnyObjectSchema
+} from '@modelcontextprotocol/sdk-core';
+import {
+    InMemoryTransport,
+    CallToolRequestSchema,
+    CallToolResultSchema,
     CreateMessageRequestSchema,
     CreateMessageResultSchema,
     ElicitRequestSchema,
@@ -14,18 +23,13 @@ import type {
     ListPromptsRequestSchema,
     ListResourcesRequestSchema,
     ListToolsRequestSchema,
-    type LoggingMessageNotification,
     McpError,
     NotificationSchema,
     RequestSchema,
     ResultSchema,
     SetLevelRequestSchema,
     SUPPORTED_PROTOCOL_VERSIONS,
-    CreateTaskResultSchema,
-    JsonSchemaType,
-    JsonSchemaValidator,
-    jsonSchemaValidator,
-    AnyObjectSchema
+    CreateTaskResultSchema
 } from '@modelcontextprotocol/sdk-core';
 import { Server, McpServer, InMemoryTaskStore, InMemoryTaskMessageQueue, createMcpExpressApp } from '@modelcontextprotocol/sdk-server';
 import * as z3 from 'zod/v3';