Skip to content

Commit cfa0615

Browse files
committed
barrel exports, imports
1 parent be2e264 commit cfa0615

Some content is hidden

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

68 files changed

+483
-732
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import type { JWK } from 'jose';
9-
import { OAuthClientInformation, OAuthClientMetadata, OAuthTokens } from '../shared/auth.js';
9+
import { OAuthClientInformation, OAuthClientMetadata, OAuthTokens } from '@modelcontextprotocol/shared';
1010
import { AddClientAuthentication, OAuthClientProvider } from './auth.js';
1111

1212
/**

packages/client/src/client/auth.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import pkceChallenge from 'pkce-challenge';
2-
import { LATEST_PROTOCOL_VERSION } from '../types.js';
2+
import { LATEST_PROTOCOL_VERSION } from '@modelcontextprotocol/shared';
33
import {
44
OAuthClientMetadata,
55
OAuthClientInformation,
@@ -11,14 +11,14 @@ import {
1111
OAuthErrorResponseSchema,
1212
AuthorizationServerMetadata,
1313
OpenIdProviderDiscoveryMetadataSchema
14-
} from '../shared/auth.js';
14+
} from '@modelcontextprotocol/shared';
1515
import {
1616
OAuthClientInformationFullSchema,
1717
OAuthMetadataSchema,
1818
OAuthProtectedResourceMetadataSchema,
1919
OAuthTokensSchema
20-
} from '../shared/auth.js';
21-
import { checkResourceAllowed, resourceUrlFromServerUrl } from '../shared/auth-utils.js';
20+
} from '@modelcontextprotocol/shared';
21+
import { checkResourceAllowed, resourceUrlFromServerUrl } from '@modelcontextprotocol/shared';
2222
import {
2323
InvalidClientError,
2424
InvalidClientMetadataError,
@@ -27,8 +27,8 @@ import {
2727
OAuthError,
2828
ServerError,
2929
UnauthorizedClientError
30-
} from '../server/auth/errors.js';
31-
import { FetchLike } from '../shared/transport.js';
30+
} from '@modelcontextprotocol/shared';
31+
import { FetchLike } from '@modelcontextprotocol/shared';
3232

3333
/**
3434
* Function type for adding client authentication to token requests.
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { mergeCapabilities, Protocol, type ProtocolOptions, type RequestOptions } from '../shared/protocol.js';
2-
import type { Transport } from '../shared/transport.js';
1+
import { mergeCapabilities, Protocol, type ProtocolOptions, type RequestOptions } from '@modelcontextprotocol/shared';
2+
import type { Transport } from '@modelcontextprotocol/shared';
33

44
import {
55
type CallToolRequest,
@@ -49,9 +49,9 @@ import {
4949
type Request,
5050
type Notification,
5151
type Result
52-
} from '../types.js';
53-
import { AjvJsonSchemaValidator } from '../validation/ajv-provider.js';
54-
import type { JsonSchemaType, JsonSchemaValidator, jsonSchemaValidator } from '../validation/types.js';
52+
} from '@modelcontextprotocol/shared';
53+
import { AjvJsonSchemaValidator } from '@modelcontextprotocol/shared';
54+
import type { JsonSchemaType, JsonSchemaValidator, jsonSchemaValidator } from '@modelcontextprotocol/shared';
5555
import {
5656
AnyObjectSchema,
5757
SchemaOutput,
@@ -60,10 +60,10 @@ import {
6060
safeParse,
6161
type ZodV3Internal,
6262
type ZodV4Internal
63-
} from '../server/zod-compat.js';
64-
import type { RequestHandlerExtra } from '../shared/protocol.js';
63+
} from '@modelcontextprotocol/shared';
64+
import type { RequestHandlerExtra } from '@modelcontextprotocol/shared';
6565
import { ExperimentalClientTasks } from '../experimental/tasks/client.js';
66-
import { assertToolsCallTaskCapability, assertClientRequestTaskCapability } from '../experimental/tasks/helpers.js';
66+
import { assertToolsCallTaskCapability, assertClientRequestTaskCapability } from '@modelcontextprotocol/shared';
6767

6868
/**
6969
* Elicitation default application helper. Applies defaults to the data based on the schema.

packages/client/src/client/middleware.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { auth, extractWWWAuthenticateParams, OAuthClientProvider, UnauthorizedError } from './auth.js';
2-
import { FetchLike } from '../shared/transport.js';
2+
import { FetchLike } from '@modelcontextprotocol/shared';
33

44
/**
55
* Middleware function that wraps and enhances fetch functionality.

packages/client/src/client/sse.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { EventSource, type ErrorEvent, type EventSourceInit } from 'eventsource';
2-
import { Transport, FetchLike, createFetchWithInit, normalizeHeaders } from '../shared/transport.js';
3-
import { JSONRPCMessage, JSONRPCMessageSchema } from '../types.js';
2+
import { Transport, FetchLike, createFetchWithInit, normalizeHeaders } from '@modelcontextprotocol/shared';
3+
import { JSONRPCMessage, JSONRPCMessageSchema } from '@modelcontextprotocol/shared';
44
import { auth, AuthResult, extractWWWAuthenticateParams, OAuthClientProvider, UnauthorizedError } from './auth.js';
55

66
export class SseError extends Error {

packages/client/src/client/stdio.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import { ChildProcess, IOType } from 'node:child_process';
22
import spawn from 'cross-spawn';
33
import process from 'node:process';
44
import { Stream, PassThrough } from 'node:stream';
5-
import { ReadBuffer, serializeMessage } from '../shared/stdio.js';
6-
import { Transport } from '../shared/transport.js';
7-
import { JSONRPCMessage } from '../types.js';
5+
import { ReadBuffer, serializeMessage } from '@modelcontextprotocol/shared';
6+
import { Transport } from '@modelcontextprotocol/shared';
7+
import { JSONRPCMessage } from '@modelcontextprotocol/shared';
88

99
export type StdioServerParameters = {
1010
/**

packages/client/src/client/streamableHttp.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Transport, FetchLike, createFetchWithInit, normalizeHeaders } from '../shared/transport.js';
2-
import { isInitializedNotification, isJSONRPCRequest, isJSONRPCResultResponse, JSONRPCMessage, JSONRPCMessageSchema } from '../types.js';
1+
import { Transport, FetchLike, createFetchWithInit, normalizeHeaders } from '@modelcontextprotocol/shared';
2+
import { isInitializedNotification, isJSONRPCRequest, isJSONRPCResultResponse, JSONRPCMessage, JSONRPCMessageSchema } from '@modelcontextprotocol/shared';
33
import { auth, AuthResult, extractWWWAuthenticateParams, OAuthClientProvider, UnauthorizedError } from './auth.js';
44
import { EventSourceParserStream } from 'eventsource-parser/stream';
55

packages/client/src/client/websocket.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Transport } from '../shared/transport.js';
2-
import { JSONRPCMessage, JSONRPCMessageSchema } from '../types.js';
1+
import { Transport } from '@modelcontextprotocol/shared';
2+
import { JSONRPCMessage, JSONRPCMessageSchema } from '@modelcontextprotocol/shared';
33

44
const SUBPROTOCOL = 'mcp';
55

packages/client/src/experimental/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
* @experimental
1111
*/
1212

13-
export * from './tasks/index.js';
13+
export * from './tasks/client.js';

0 commit comments

Comments
 (0)