Skip to content

Commit d32bc9f

Browse files
KKonstantinovKKonstantinov
committed
remove schemas from public exports
1 parent fa77d2e commit d32bc9f

19 files changed

Lines changed: 491 additions & 332 deletions

File tree

‎examples/client-quickstart/tsconfig.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"./node_modules/@modelcontextprotocol/client/node_modules/@modelcontextprotocol/core/src/index.ts"
1818
],
1919
"@modelcontextprotocol/core/public": [
20-
"./node_modules/@modelcontextprotocol/client/node_modules/@modelcontextprotocol/core/src/publicExports.ts"
20+
"./node_modules/@modelcontextprotocol/client/node_modules/@modelcontextprotocol/core/src/exports/public/index.ts"
2121
]
2222
}
2323
},

‎examples/client/tsconfig.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"./node_modules/@modelcontextprotocol/client/node_modules/@modelcontextprotocol/core/src/index.ts"
1212
],
1313
"@modelcontextprotocol/core/public": [
14-
"./node_modules/@modelcontextprotocol/client/node_modules/@modelcontextprotocol/core/src/publicExports.ts"
14+
"./node_modules/@modelcontextprotocol/client/node_modules/@modelcontextprotocol/core/src/exports/public/index.ts"
1515
],
1616
"@modelcontextprotocol/eslint-config": ["./node_modules/@modelcontextprotocol/eslint-config/tsconfig.json"],
1717
"@modelcontextprotocol/vitest-config": ["./node_modules/@modelcontextprotocol/vitest-config/tsconfig.json"],

‎examples/server-quickstart/tsconfig.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"./node_modules/@modelcontextprotocol/server/node_modules/@modelcontextprotocol/core/src/index.ts"
1717
],
1818
"@modelcontextprotocol/core/public": [
19-
"./node_modules/@modelcontextprotocol/server/node_modules/@modelcontextprotocol/core/src/publicExports.ts"
19+
"./node_modules/@modelcontextprotocol/server/node_modules/@modelcontextprotocol/core/src/exports/public/index.ts"
2020
]
2121
}
2222
},

‎examples/server/tsconfig.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"./node_modules/@modelcontextprotocol/server/node_modules/@modelcontextprotocol/core/src/index.ts"
1515
],
1616
"@modelcontextprotocol/core/public": [
17-
"./node_modules/@modelcontextprotocol/server/node_modules/@modelcontextprotocol/core/src/publicExports.ts"
17+
"./node_modules/@modelcontextprotocol/server/node_modules/@modelcontextprotocol/core/src/exports/public/index.ts"
1818
],
1919
"@modelcontextprotocol/examples-shared": ["./node_modules/@modelcontextprotocol/examples-shared/src/index.ts"],
2020
"@modelcontextprotocol/eslint-config": ["./node_modules/@modelcontextprotocol/eslint-config/tsconfig.json"],

‎examples/shared/tsconfig.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"./node_modules/@modelcontextprotocol/server/node_modules/@modelcontextprotocol/core/src/index.ts"
1414
],
1515
"@modelcontextprotocol/core/public": [
16-
"./node_modules/@modelcontextprotocol/server/node_modules/@modelcontextprotocol/core/src/publicExports.ts"
16+
"./node_modules/@modelcontextprotocol/server/node_modules/@modelcontextprotocol/core/src/exports/public/index.ts"
1717
],
1818
"@modelcontextprotocol/eslint-config": ["./node_modules/@modelcontextprotocol/eslint-config/tsconfig.json"],
1919
"@modelcontextprotocol/vitest-config": ["./node_modules/@modelcontextprotocol/vitest-config/tsconfig.json"],

‎packages/client/tsconfig.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +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"],
9+
"@modelcontextprotocol/core/public": ["./node_modules/@modelcontextprotocol/core/src/exports/public/index.ts"],
1010
"@modelcontextprotocol/test-helpers": ["./node_modules/@modelcontextprotocol/test-helpers/src/index.ts"],
1111
"@modelcontextprotocol/client/_shims": ["./src/shimsNode.ts"]
1212
}

‎packages/core/package.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,20 @@
2020
"mcp",
2121
"core"
2222
],
23+
"exports": {
24+
".": {
25+
"types": "./dist/index.d.ts",
26+
"import": "./dist/index.mjs"
27+
},
28+
"./types": {
29+
"types": "./src/exports/types/index.ts",
30+
"import": "./src/exports/types/index.ts"
31+
},
32+
"./public": {
33+
"types": "./src/exports/public/index.ts",
34+
"import": "./src/exports/public/index.ts"
35+
}
36+
},
2337
"scripts": {
2438
"typecheck": "tsgo -p tsconfig.json --noEmit",
2539
"lint": "eslint src/ && prettier --ignore-path ../../.prettierignore --check .",

packages/core/src/publicExports.ts renamed to packages/core/src/exports/public/index.ts

Lines changed: 22 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
*/
1111

1212
// Auth error classes
13-
export * from './auth/errors.js';
13+
export * from '../../auth/errors.js';
1414

1515
// SDK error types (local errors that never cross the wire)
16-
export { SdkError, SdkErrorCode } from './errors/sdkErrors.js';
16+
export { SdkError, SdkErrorCode } from '../../errors/sdkErrors.js';
1717

1818
// Auth TypeScript types (NOT Zod schemas like OAuthMetadataSchema)
1919
export type {
@@ -30,13 +30,13 @@ export type {
3030
OAuthTokens,
3131
OpenIdProviderDiscoveryMetadata,
3232
OpenIdProviderMetadata
33-
} from './shared/auth.js';
33+
} from '../../shared/auth.js';
3434

3535
// Auth utilities
36-
export { checkResourceAllowed, resourceUrlFromServerUrl } from './shared/authUtils.js';
36+
export { checkResourceAllowed, resourceUrlFromServerUrl } from '../../shared/authUtils.js';
3737

3838
// Metadata utilities
39-
export { getDisplayName } from './shared/metadataUtils.js';
39+
export { getDisplayName } from '../../shared/metadataUtils.js';
4040

4141
// Protocol types (NOT the Protocol class itself or mergeCapabilities)
4242
export type {
@@ -50,8 +50,8 @@ export type {
5050
ServerContext,
5151
TaskContext,
5252
TaskRequestOptions
53-
} from './shared/protocol.js';
54-
export { DEFAULT_REQUEST_TIMEOUT_MSEC } from './shared/protocol.js';
53+
} from '../../shared/protocol.js';
54+
export { DEFAULT_REQUEST_TIMEOUT_MSEC } from '../../shared/protocol.js';
5555

5656
// Response message types
5757
export type {
@@ -61,42 +61,36 @@ export type {
6161
ResultMessage,
6262
TaskCreatedMessage,
6363
TaskStatusMessage
64-
} from './shared/responseMessage.js';
65-
export { takeResult, toArrayAsync } from './shared/responseMessage.js';
64+
} from '../../shared/responseMessage.js';
65+
export { takeResult, toArrayAsync } from '../../shared/responseMessage.js';
6666

6767
// Transport types (NOT normalizeHeaders)
68-
export type { FetchLike, Transport, TransportSendOptions } from './shared/transport.js';
69-
export { createFetchWithInit } from './shared/transport.js';
68+
export type { FetchLike, Transport, TransportSendOptions } from '../../shared/transport.js';
69+
export { createFetchWithInit } from '../../shared/transport.js';
7070

7171
// URI Template
72-
export type { Variables } from './shared/uriTemplate.js';
73-
export { UriTemplate } from './shared/uriTemplate.js';
72+
export type { Variables } from '../../shared/uriTemplate.js';
73+
export { UriTemplate } from '../../shared/uriTemplate.js';
7474

7575
// Types — all TypeScript types (standalone interfaces + schema-derived)
76-
export * from './types/types.js';
76+
export * from '../../types/types.js';
7777

7878
// Constants
79-
export * from './types/constants.js';
79+
export * from '../../types/constants.js';
8080

8181
// Enums
82-
export * from './types/enums.js';
82+
export * from '../../types/enums.js';
8383

8484
// Error classes
85-
export * from './types/errors.js';
85+
export * from '../../types/errors.js';
8686

8787
// Type guards
88-
export * from './types/guards.js';
89-
90-
// Schemas — temporarily included. Will be removed after decoupling from Zod schemas.
91-
export * from './types/schemas.js';
92-
93-
// InMemoryTransport
94-
export { InMemoryTransport } from './util/inMemory.js';
88+
export * from '../../types/guards.js';
9589

9690
// Experimental task types and classes
97-
export * from './experimental/index.js';
91+
export * from '../../experimental/index.js';
9892

9993
// Validator types and classes
100-
export * from './validators/ajvProvider.js';
101-
export * from './validators/cfWorkerProvider.js';
102-
export type { JsonSchemaType, JsonSchemaValidator, jsonSchemaValidator, JsonSchemaValidatorResult } from './validators/types.js';
94+
export * from '../../validators/ajvProvider.js';
95+
export * from '../../validators/cfWorkerProvider.js';
96+
export type { JsonSchemaType, JsonSchemaValidator, jsonSchemaValidator, JsonSchemaValidatorResult } from '../../validators/types.js';

‎packages/core/src/types/errors.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ProtocolErrorCode } from './enums.js';
2-
import type { ElicitRequestURLParams } from './schemas.js';
2+
import type { ElicitRequestURLParams } from './types.js';
33

44
/**
55
* Protocol errors are JSON-RPC errors that cross the wire as error responses.

‎packages/core/src/types/guards.ts‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
import type {
2-
CompleteRequest,
3-
InitializedNotification,
4-
InitializeRequest,
5-
JSONRPCErrorResponse,
6-
JSONRPCNotification,
7-
JSONRPCRequest,
8-
JSONRPCResultResponse,
9-
TaskAugmentedRequestParams
10-
} from './schemas.js';
111
import {
122
InitializedNotificationSchema,
133
InitializeRequestSchema,
@@ -17,7 +7,18 @@ import {
177
JSONRPCResultResponseSchema,
188
TaskAugmentedRequestParamsSchema
199
} from './schemas.js';
20-
import type { CompleteRequestPrompt, CompleteRequestResourceTemplate } from './types.js';
10+
import type {
11+
CompleteRequest,
12+
CompleteRequestPrompt,
13+
CompleteRequestResourceTemplate,
14+
InitializedNotification,
15+
InitializeRequest,
16+
JSONRPCErrorResponse,
17+
JSONRPCNotification,
18+
JSONRPCRequest,
19+
JSONRPCResultResponse,
20+
TaskAugmentedRequestParams
21+
} from './types.js';
2122

2223
export const isJSONRPCRequest = (value: unknown): value is JSONRPCRequest => JSONRPCRequestSchema.safeParse(value).success;
2324

0 commit comments

Comments
 (0)