Skip to content

Remove zod inference and use explicit TypeScript types #612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ export default tseslint.config(
},
rules: {
"@typescript-eslint/no-unused-vars": ["error",
{ "argsIgnorePattern": "^_" }
{
"argsIgnorePattern": "^_",
"varsIgnorePattern": "^_Assert"
}
]
}
}
Expand Down
36 changes: 23 additions & 13 deletions src/client/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,41 @@ import {
import { Transport } from "../shared/transport.js";
import {
CallToolRequest,
CallToolResult,
CallToolResultSchema,
ClientCapabilities,
ClientNotification,
ClientRequest,
ClientResult,
CompatibilityCallToolResult,
CompatibilityCallToolResultSchema,
CompleteRequest,
CompleteResult,
CompleteResultSchema,
EmptyResult,
EmptyResultSchema,
GetPromptRequest,
GetPromptResult,
GetPromptResultSchema,
Implementation,
InitializeResultSchema,
LATEST_PROTOCOL_VERSION,
ListPromptsRequest,
ListPromptsResult,
ListPromptsResultSchema,
ListResourcesRequest,
ListResourcesResult,
ListResourcesResultSchema,
ListResourceTemplatesRequest,
ListResourceTemplatesResult,
ListResourceTemplatesResultSchema,
ListToolsRequest,
ListToolsResult,
ListToolsResultSchema,
LoggingLevel,
Notification,
ReadResourceRequest,
ReadResourceResult,
ReadResourceResultSchema,
Request,
Result,
Expand Down Expand Up @@ -317,19 +327,19 @@ export class Client<
}
}

async ping(options?: RequestOptions) {
async ping(options?: RequestOptions): Promise<EmptyResult> {
return this.request({ method: "ping" }, EmptyResultSchema, options);
}

async complete(params: CompleteRequest["params"], options?: RequestOptions) {
async complete(params: CompleteRequest["params"], options?: RequestOptions): Promise<CompleteResult> {
return this.request(
{ method: "completion/complete", params },
CompleteResultSchema,
options,
);
}

async setLoggingLevel(level: LoggingLevel, options?: RequestOptions) {
async setLoggingLevel(level: LoggingLevel, options?: RequestOptions): Promise<EmptyResult> {
return this.request(
{ method: "logging/setLevel", params: { level } },
EmptyResultSchema,
Expand All @@ -340,7 +350,7 @@ export class Client<
async getPrompt(
params: GetPromptRequest["params"],
options?: RequestOptions,
) {
): Promise<GetPromptResult> {
return this.request(
{ method: "prompts/get", params },
GetPromptResultSchema,
Expand All @@ -351,7 +361,7 @@ export class Client<
async listPrompts(
params?: ListPromptsRequest["params"],
options?: RequestOptions,
) {
): Promise<ListPromptsResult> {
return this.request(
{ method: "prompts/list", params },
ListPromptsResultSchema,
Expand All @@ -362,7 +372,7 @@ export class Client<
async listResources(
params?: ListResourcesRequest["params"],
options?: RequestOptions,
) {
): Promise<ListResourcesResult> {
return this.request(
{ method: "resources/list", params },
ListResourcesResultSchema,
Expand All @@ -373,7 +383,7 @@ export class Client<
async listResourceTemplates(
params?: ListResourceTemplatesRequest["params"],
options?: RequestOptions,
) {
): Promise<ListResourceTemplatesResult> {
return this.request(
{ method: "resources/templates/list", params },
ListResourceTemplatesResultSchema,
Expand All @@ -384,7 +394,7 @@ export class Client<
async readResource(
params: ReadResourceRequest["params"],
options?: RequestOptions,
) {
): Promise<ReadResourceResult> {
return this.request(
{ method: "resources/read", params },
ReadResourceResultSchema,
Expand All @@ -395,7 +405,7 @@ export class Client<
async subscribeResource(
params: SubscribeRequest["params"],
options?: RequestOptions,
) {
): Promise<EmptyResult> {
return this.request(
{ method: "resources/subscribe", params },
EmptyResultSchema,
Expand All @@ -406,7 +416,7 @@ export class Client<
async unsubscribeResource(
params: UnsubscribeRequest["params"],
options?: RequestOptions,
) {
): Promise<EmptyResult> {
return this.request(
{ method: "resources/unsubscribe", params },
EmptyResultSchema,
Expand All @@ -420,7 +430,7 @@ export class Client<
| typeof CallToolResultSchema
| typeof CompatibilityCallToolResultSchema = CallToolResultSchema,
options?: RequestOptions,
) {
): Promise<CallToolResult | CompatibilityCallToolResult> {
const result = await this.request(
{ method: "tools/call", params },
resultSchema,
Expand Down Expand Up @@ -488,7 +498,7 @@ export class Client<
async listTools(
params?: ListToolsRequest["params"],
options?: RequestOptions,
) {
): Promise<ListToolsResult> {
const result = await this.request(
{ method: "tools/list", params },
ListToolsResultSchema,
Expand All @@ -501,7 +511,7 @@ export class Client<
return result;
}

async sendRootsListChanged() {
async sendRootsListChanged(): Promise<void> {
return this.notification({ method: "notifications/roots/list_changed" });
}
}
Loading