Skip to content

Commit f057363

Browse files
KKonstantinovKKonstantinov
committed
import sorting
1 parent d9cd7fe commit f057363

File tree

84 files changed

+529
-460
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+529
-460
lines changed

‎common/eslint-config/eslint.config.mjs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import nodePlugin from 'eslint-plugin-n';
77
import importPlugin from 'eslint-plugin-import';
88
import { fileURLToPath } from 'node:url';
99
import path from 'node:path';
10+
import simpleImportSortPlugin from 'eslint-plugin-simple-import-sort';
1011

1112
const __dirname = path.dirname(fileURLToPath(import.meta.url));
1213

@@ -26,7 +27,8 @@ export default tseslint.config(
2627
reportUnusedDisableDirectives: false
2728
},
2829
plugins: {
29-
n: nodePlugin
30+
n: nodePlugin,
31+
'simple-import-sort': simpleImportSortPlugin
3032
},
3133
settings: {
3234
'import/resolver': {
@@ -42,7 +44,9 @@ export default tseslint.config(
4244
rules: {
4345
'@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: '^_' }],
4446
'n/prefer-node-protocol': 'error',
45-
'@typescript-eslint/consistent-type-imports': ['error', { disallowTypeAnnotations: false }]
47+
'@typescript-eslint/consistent-type-imports': ['error', { disallowTypeAnnotations: false }],
48+
'simple-import-sort/imports': 'warn',
49+
'simple-import-sort/exports': 'warn'
4650
}
4751
},
4852
{

‎common/eslint-config/package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@
2525
"@eslint/js": "^9.39.1",
2626
"eslint": "^9.8.0",
2727
"eslint-config-prettier": "^10.1.8",
28+
"eslint-import-resolver-typescript": "^4.4.4",
2829
"eslint-plugin-import": "^2.32.0",
2930
"eslint-plugin-n": "^17.23.1",
31+
"eslint-plugin-simple-import-sort": "^12.1.1",
3032
"prettier": "3.6.2",
3133
"typescript": "^5.5.4",
32-
"typescript-eslint": "^8.48.1",
33-
"eslint-import-resolver-typescript": "^4.4.4"
34+
"typescript-eslint": "^8.48.1"
3435
}
3536
}

‎packages/client/src/client/auth-extensions.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
* for common machine-to-machine authentication scenarios.
66
*/
77

8-
import type { CryptoKey, JWK } from 'jose';
98
import type { OAuthClientInformation, OAuthClientMetadata, OAuthTokens } from '@modelcontextprotocol/sdk-core';
9+
import type { CryptoKey, JWK } from 'jose';
10+
1011
import type { AddClientAuthentication, OAuthClientProvider } from './auth.js';
1112

1213
/**

‎packages/client/src/client/auth.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
import pkceChallenge from 'pkce-challenge';
21
import type {
3-
OAuthClientMetadata,
2+
AuthorizationServerMetadata,
3+
FetchLike,
44
OAuthClientInformation,
5+
OAuthClientInformationFull,
56
OAuthClientInformationMixed,
6-
OAuthTokens,
7+
OAuthClientMetadata,
78
OAuthMetadata,
8-
OAuthClientInformationFull,
99
OAuthProtectedResourceMetadata,
10-
AuthorizationServerMetadata,
11-
FetchLike
10+
OAuthTokens
1211
} from '@modelcontextprotocol/sdk-core';
1312
import {
14-
LATEST_PROTOCOL_VERSION,
15-
OAuthErrorResponseSchema,
16-
OpenIdProviderDiscoveryMetadataSchema,
17-
OAuthClientInformationFullSchema,
18-
OAuthMetadataSchema,
19-
OAuthProtectedResourceMetadataSchema,
20-
OAuthTokensSchema,
2113
checkResourceAllowed,
22-
resourceUrlFromServerUrl,
2314
InvalidClientError,
2415
InvalidClientMetadataError,
2516
InvalidGrantError,
17+
LATEST_PROTOCOL_VERSION,
2618
OAUTH_ERRORS,
19+
OAuthClientInformationFullSchema,
2720
OAuthError,
21+
OAuthErrorResponseSchema,
22+
OAuthMetadataSchema,
23+
OAuthProtectedResourceMetadataSchema,
24+
OAuthTokensSchema,
25+
OpenIdProviderDiscoveryMetadataSchema,
26+
resourceUrlFromServerUrl,
2827
ServerError,
2928
UnauthorizedClientError
3029
} from '@modelcontextprotocol/sdk-core';
30+
import pkceChallenge from 'pkce-challenge';
3131

3232
/**
3333
* Function type for adding client authentication to token requests.

‎packages/client/src/client/client.ts‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
import type {
2-
Transport,
3-
ListChangedOptions,
4-
JsonSchemaType,
5-
JsonSchemaValidator,
6-
jsonSchemaValidator,
72
AnyObjectSchema,
8-
SchemaOutput,
9-
RequestHandlerExtra,
10-
ProtocolOptions,
11-
RequestOptions,
123
CallToolRequest,
134
ClientCapabilities,
145
ClientNotification,
@@ -18,55 +9,64 @@ import type {
189
CompleteRequest,
1910
GetPromptRequest,
2011
Implementation,
12+
JsonSchemaType,
13+
JsonSchemaValidator,
14+
jsonSchemaValidator,
15+
ListChangedHandlers,
16+
ListChangedOptions,
2117
ListPromptsRequest,
2218
ListResourcesRequest,
2319
ListResourceTemplatesRequest,
2420
ListToolsRequest,
2521
LoggingLevel,
22+
Notification,
23+
ProtocolOptions,
2624
ReadResourceRequest,
25+
Request,
26+
RequestHandlerExtra,
27+
RequestOptions,
28+
Result,
29+
SchemaOutput,
2730
ServerCapabilities,
2831
SubscribeRequest,
2932
Tool,
33+
Transport,
3034
UnsubscribeRequest,
31-
ListChangedHandlers,
32-
Request,
33-
Notification,
34-
Result,
3535
ZodV3Internal,
3636
ZodV4Internal
3737
} from '@modelcontextprotocol/sdk-core';
3838
import {
39-
mergeCapabilities,
40-
Protocol,
39+
AjvJsonSchemaValidator,
40+
assertClientRequestTaskCapability,
41+
assertToolsCallTaskCapability,
4142
CallToolResultSchema,
4243
CompleteResultSchema,
44+
CreateMessageRequestSchema,
45+
CreateMessageResultSchema,
46+
CreateTaskResultSchema,
47+
ElicitRequestSchema,
48+
ElicitResultSchema,
4349
EmptyResultSchema,
4450
ErrorCode,
51+
getObjectShape,
4552
GetPromptResultSchema,
4653
InitializeResultSchema,
54+
isZ4Schema,
4755
LATEST_PROTOCOL_VERSION,
56+
ListChangedOptionsBaseSchema,
4857
ListPromptsResultSchema,
4958
ListResourcesResultSchema,
5059
ListResourceTemplatesResultSchema,
5160
ListToolsResultSchema,
5261
McpError,
53-
ReadResourceResultSchema,
54-
SUPPORTED_PROTOCOL_VERSIONS,
55-
ElicitResultSchema,
56-
ElicitRequestSchema,
57-
CreateTaskResultSchema,
58-
CreateMessageRequestSchema,
59-
CreateMessageResultSchema,
60-
ToolListChangedNotificationSchema,
62+
mergeCapabilities,
6163
PromptListChangedNotificationSchema,
64+
Protocol,
65+
ReadResourceResultSchema,
6266
ResourceListChangedNotificationSchema,
63-
ListChangedOptionsBaseSchema,
64-
getObjectShape,
65-
isZ4Schema,
6667
safeParse,
67-
AjvJsonSchemaValidator,
68-
assertToolsCallTaskCapability,
69-
assertClientRequestTaskCapability
68+
SUPPORTED_PROTOCOL_VERSIONS,
69+
ToolListChangedNotificationSchema
7070
} from '@modelcontextprotocol/sdk-core';
7171

7272
import { ExperimentalClientTasks } from '../experimental/tasks/client.js';

‎packages/client/src/client/middleware.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
import type { FetchLike } from '@modelcontextprotocol/sdk-core';
2+
13
import type { OAuthClientProvider } from './auth.js';
24
import { auth, extractWWWAuthenticateParams, UnauthorizedError } from './auth.js';
3-
import type { FetchLike } from '@modelcontextprotocol/sdk-core';
45

56
/**
67
* Middleware function that wraps and enhances fetch functionality.

‎packages/client/src/client/sse.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import { EventSource, type ErrorEvent, type EventSourceInit } from 'eventsource';
2-
import type { Transport, FetchLike, JSONRPCMessage } from '@modelcontextprotocol/sdk-core';
3-
import { createFetchWithInit, normalizeHeaders, JSONRPCMessageSchema } from '@modelcontextprotocol/sdk-core';
1+
import type { FetchLike, JSONRPCMessage, Transport } from '@modelcontextprotocol/sdk-core';
2+
import { createFetchWithInit, JSONRPCMessageSchema, normalizeHeaders } from '@modelcontextprotocol/sdk-core';
3+
import { type ErrorEvent, EventSource, type EventSourceInit } from 'eventsource';
4+
45
import type { AuthResult, OAuthClientProvider } from './auth.js';
56
import { auth, extractWWWAuthenticateParams, UnauthorizedError } from './auth.js';
67

‎packages/client/src/client/stdio.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import type { ChildProcess, IOType } from 'node:child_process';
2-
import spawn from 'cross-spawn';
32
import process from 'node:process';
43
import type { Stream } from 'node:stream';
54
import { PassThrough } from 'node:stream';
6-
import type { Transport, JSONRPCMessage } from '@modelcontextprotocol/sdk-core';
5+
6+
import type { JSONRPCMessage, Transport } from '@modelcontextprotocol/sdk-core';
77
import { ReadBuffer, serializeMessage } from '@modelcontextprotocol/sdk-core';
8+
import spawn from 'cross-spawn';
89

910
export type StdioServerParameters = {
1011
/**

‎packages/client/src/client/streamableHttp.ts‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
import type { Transport, FetchLike, JSONRPCMessage } from '@modelcontextprotocol/sdk-core';
1+
import type { ReadableWritablePair } from 'node:stream/web';
2+
3+
import type { FetchLike, JSONRPCMessage, Transport } from '@modelcontextprotocol/sdk-core';
24
import {
35
createFetchWithInit,
4-
normalizeHeaders,
56
isInitializedNotification,
67
isJSONRPCRequest,
78
isJSONRPCResultResponse,
8-
JSONRPCMessageSchema
9+
JSONRPCMessageSchema,
10+
normalizeHeaders
911
} from '@modelcontextprotocol/sdk-core';
12+
import { EventSourceParserStream } from 'eventsource-parser/stream';
13+
1014
import type { AuthResult, OAuthClientProvider } from './auth.js';
1115
import { auth, extractWWWAuthenticateParams, UnauthorizedError } from './auth.js';
12-
import { EventSourceParserStream } from 'eventsource-parser/stream';
13-
import type { ReadableWritablePair } from 'node:stream/web';
1416

1517
// Default reconnection options for StreamableHTTP connections
1618
const DEFAULT_STREAMABLE_HTTP_RECONNECTION_OPTIONS: StreamableHTTPReconnectionOptions = {

‎packages/client/src/client/websocket.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { Transport, JSONRPCMessage } from '@modelcontextprotocol/sdk-core';
1+
import type { JSONRPCMessage, Transport } from '@modelcontextprotocol/sdk-core';
22
import { JSONRPCMessageSchema } from '@modelcontextprotocol/sdk-core';
33

44
const SUBPROTOCOL = 'mcp';

0 commit comments

Comments
 (0)