Skip to content

Commit fa77d2e

Browse files
KKonstantinovKKonstantinov
committed
initial draft: limit public exports
1 parent 5405172 commit fa77d2e

43 files changed

Lines changed: 2926 additions & 2681 deletions

Some content is hidden

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

‎examples/client-quickstart/tsconfig.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
"@modelcontextprotocol/client/_shims": ["./node_modules/@modelcontextprotocol/client/src/shimsNode.ts"],
1616
"@modelcontextprotocol/core": [
1717
"./node_modules/@modelcontextprotocol/client/node_modules/@modelcontextprotocol/core/src/index.ts"
18+
],
19+
"@modelcontextprotocol/core/public": [
20+
"./node_modules/@modelcontextprotocol/client/node_modules/@modelcontextprotocol/core/src/publicExports.ts"
1821
]
1922
}
2023
},

‎examples/client/tsconfig.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
"@modelcontextprotocol/core": [
1111
"./node_modules/@modelcontextprotocol/client/node_modules/@modelcontextprotocol/core/src/index.ts"
1212
],
13+
"@modelcontextprotocol/core/public": [
14+
"./node_modules/@modelcontextprotocol/client/node_modules/@modelcontextprotocol/core/src/publicExports.ts"
15+
],
1316
"@modelcontextprotocol/eslint-config": ["./node_modules/@modelcontextprotocol/eslint-config/tsconfig.json"],
1417
"@modelcontextprotocol/vitest-config": ["./node_modules/@modelcontextprotocol/vitest-config/tsconfig.json"],
1518
"@modelcontextprotocol/examples-shared": ["./node_modules/@modelcontextprotocol/examples-shared/src/index.ts"]

‎examples/server-quickstart/tsconfig.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
"@modelcontextprotocol/server/_shims": ["./node_modules/@modelcontextprotocol/server/src/shimsNode.ts"],
1515
"@modelcontextprotocol/core": [
1616
"./node_modules/@modelcontextprotocol/server/node_modules/@modelcontextprotocol/core/src/index.ts"
17+
],
18+
"@modelcontextprotocol/core/public": [
19+
"./node_modules/@modelcontextprotocol/server/node_modules/@modelcontextprotocol/core/src/publicExports.ts"
1720
]
1821
}
1922
},

‎examples/server/tsconfig.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
"@modelcontextprotocol/core": [
1414
"./node_modules/@modelcontextprotocol/server/node_modules/@modelcontextprotocol/core/src/index.ts"
1515
],
16+
"@modelcontextprotocol/core/public": [
17+
"./node_modules/@modelcontextprotocol/server/node_modules/@modelcontextprotocol/core/src/publicExports.ts"
18+
],
1619
"@modelcontextprotocol/examples-shared": ["./node_modules/@modelcontextprotocol/examples-shared/src/index.ts"],
1720
"@modelcontextprotocol/eslint-config": ["./node_modules/@modelcontextprotocol/eslint-config/tsconfig.json"],
1821
"@modelcontextprotocol/vitest-config": ["./node_modules/@modelcontextprotocol/vitest-config/tsconfig.json"]

‎examples/shared/tsconfig.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
"@modelcontextprotocol/core": [
1313
"./node_modules/@modelcontextprotocol/server/node_modules/@modelcontextprotocol/core/src/index.ts"
1414
],
15+
"@modelcontextprotocol/core/public": [
16+
"./node_modules/@modelcontextprotocol/server/node_modules/@modelcontextprotocol/core/src/publicExports.ts"
17+
],
1518
"@modelcontextprotocol/eslint-config": ["./node_modules/@modelcontextprotocol/eslint-config/tsconfig.json"],
1619
"@modelcontextprotocol/vitest-config": ["./node_modules/@modelcontextprotocol/vitest-config/tsconfig.json"],
1720
"@modelcontextprotocol/test-helpers": ["./node_modules/@modelcontextprotocol/test-helpers/src/index.ts"],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export type SSEClientTransportOptions = {
2626
* When an `authProvider` is specified and the SSE connection is started:
2727
* 1. The connection is attempted with any existing access token from the `authProvider`.
2828
* 2. If the access token has expired, the `authProvider` is used to refresh the token.
29-
* 3. If token refresh fails or no access token exists, and auth is required, {@linkcode OAuthClientProvider.redirectToAuthorization} is called, and an {@linkcode UnauthorizedError} will be thrown from {@linkcode index.Protocol.connect | connect}/{@linkcode SSEClientTransport.start | start}.
29+
* 3. If token refresh fails or no access token exists, and auth is required, {@linkcode OAuthClientProvider.redirectToAuthorization} is called, and an {@linkcode UnauthorizedError} will be thrown from {@linkcode client/client.Client.connect | connect}/{@linkcode SSEClientTransport.start | start}.
3030
*
3131
* After the user has finished authorizing via their user agent, and is redirected back to the MCP client application, call {@linkcode SSEClientTransport.finishAuth} with the authorization code before retrying the connection.
3232
*

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ export type StreamableHTTPClientTransportOptions = {
8888
* When an `authProvider` is specified and the connection is started:
8989
* 1. The connection is attempted with any existing access token from the `authProvider`.
9090
* 2. If the access token has expired, the `authProvider` is used to refresh the token.
91-
* 3. If token refresh fails or no access token exists, and auth is required, {@linkcode OAuthClientProvider.redirectToAuthorization} is called, and an {@linkcode UnauthorizedError} will be thrown from {@linkcode index.Protocol.connect | connect}/{@linkcode StreamableHTTPClientTransport.start | start}.
91+
* 3. If token refresh fails or no access token exists, and auth is required, {@linkcode OAuthClientProvider.redirectToAuthorization} is called, and an {@linkcode UnauthorizedError} will be thrown from {@linkcode client/client.Client.connect | connect}/{@linkcode StreamableHTTPClientTransport.start | start}.
9292
*
9393
* After the user has finished authorizing via their user agent, and is redirected back to the MCP client application, call {@linkcode StreamableHTTPClientTransport.finishAuth} with the authorization code before retrying the connection.
9494
*

‎packages/client/src/index.ts‎

Lines changed: 55 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,59 @@
1-
export * from './client/auth.js';
2-
export * from './client/authExtensions.js';
3-
export * from './client/client.js';
4-
export * from './client/middleware.js';
5-
export * from './client/sse.js';
6-
export * from './client/stdio.js';
7-
export * from './client/streamableHttp.js';
8-
export * from './client/websocket.js';
1+
// Client-specific exports
2+
export type {
3+
AddClientAuthentication,
4+
AuthResult,
5+
ClientAuthMethod,
6+
OAuthClientProvider,
7+
OAuthDiscoveryState,
8+
OAuthServerInfo
9+
} from './client/auth.js';
10+
export {
11+
auth,
12+
buildDiscoveryUrls,
13+
discoverAuthorizationServerMetadata,
14+
discoverOAuthMetadata,
15+
discoverOAuthProtectedResourceMetadata,
16+
discoverOAuthServerInfo,
17+
exchangeAuthorization,
18+
extractResourceMetadataUrl,
19+
extractWWWAuthenticateParams,
20+
fetchToken,
21+
isHttpsUrl,
22+
parseErrorResponse,
23+
prepareAuthorizationCodeRequest,
24+
refreshAuthorization,
25+
registerClient,
26+
selectClientAuthMethod,
27+
selectResourceURL,
28+
startAuthorization,
29+
UnauthorizedError
30+
} from './client/auth.js';
31+
export type {
32+
ClientCredentialsProviderOptions,
33+
PrivateKeyJwtProviderOptions,
34+
StaticPrivateKeyJwtProviderOptions
35+
} from './client/authExtensions.js';
36+
export {
37+
ClientCredentialsProvider,
38+
createPrivateKeyJwtAuth,
39+
PrivateKeyJwtProvider,
40+
StaticPrivateKeyJwtProvider
41+
} from './client/authExtensions.js';
42+
export type { ClientOptions } from './client/client.js';
43+
export { Client } from './client/client.js';
44+
export { getSupportedElicitationModes } from './client/client.js';
45+
export type { LoggingOptions, Middleware, RequestLogger } from './client/middleware.js';
46+
export { applyMiddlewares, createMiddleware, withLogging, withOAuth } from './client/middleware.js';
47+
export type { SSEClientTransportOptions } from './client/sse.js';
48+
export { SSEClientTransport, SseError } from './client/sse.js';
49+
export type { StdioServerParameters } from './client/stdio.js';
50+
export { DEFAULT_INHERITED_ENV_VARS, getDefaultEnvironment, StdioClientTransport } from './client/stdio.js';
51+
export type { StartSSEOptions, StreamableHTTPClientTransportOptions, StreamableHTTPReconnectionOptions } from './client/streamableHttp.js';
52+
export { StreamableHTTPClientTransport } from './client/streamableHttp.js';
53+
export { WebSocketClientTransport } from './client/websocket.js';
954

1055
// experimental exports
1156
export * from './experimental/index.js';
1257

13-
// re-export shared types
14-
export * from '@modelcontextprotocol/core';
58+
// re-export curated public API from core
59+
export * from '@modelcontextprotocol/core/public';

‎packages/client/tsconfig.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"paths": {
77
"*": ["./*"],
88
"@modelcontextprotocol/core": ["./node_modules/@modelcontextprotocol/core/src/index.ts"],
9+
"@modelcontextprotocol/core/public": ["./node_modules/@modelcontextprotocol/core/src/publicExports.ts"],
910
"@modelcontextprotocol/test-helpers": ["./node_modules/@modelcontextprotocol/test-helpers/src/index.ts"],
1011
"@modelcontextprotocol/client/_shims": ["./src/shimsNode.ts"]
1112
}

‎packages/core/src/experimental/tasks/interfaces.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import type {
1414
Result,
1515
Task,
1616
ToolExecution
17-
} from '../../types/types.js';
17+
} from '../../types/index.js';
1818

1919
// ============================================================================
2020
// Task Handler Types (for registerToolTask)

0 commit comments

Comments
 (0)