modelcontextprotocol/typescript-sdk
Watch
1
0
Fork
You've already forked typescript-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

feat(client,server): bundle default validators, expose customisation via subpaths (#2088)

Browse source
This commit is contained in:
Matt 2026-05-29 19:39:32 +01:00 • committed by GitHub
commit 16d13abf78
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 749 additions and 314 deletions
Download patch file Download diff file Expand all files Collapse all files

81
packages/codemod/test/v1-to-v2/transforms/importPaths.test.ts
View file

@ -448,4 +448,85 @@ describe('import-paths transform', () => {
expect(result).toContain(`from "@modelcontextprotocol/client"`);
expect(result).toContain('InMemoryTransport');
});
describe('validator subpath rewrites', () => {
it('rewrites CfWorkerJsonSchemaValidator from v1 cfworker-provider to client subpath', () => {
const input = [
`import { Client } from '@modelcontextprotocol/sdk/client/index.js';`,
`import { CfWorkerJsonSchemaValidator } from '@modelcontextprotocol/sdk/validation/cfworker-provider.js';`,
''
].join('\n');
const result = applyTransform(input, { projectType: 'client' });
expect(result).toContain(`from "@modelcontextprotocol/client/validators/cf-worker"`);
expect(result).toContain('CfWorkerJsonSchemaValidator');
expect(result).not.toContain('@modelcontextprotocol/sdk');
});
it('rewrites CfWorkerJsonSchemaValidator from v1 cfworker short alias to server subpath', () => {
const input = [
`import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';`,
`import { CfWorkerJsonSchemaValidator } from '@modelcontextprotocol/sdk/validation/cfworker';`,
''
].join('\n');
const result = applyTransform(input, { projectType: 'server' });
expect(result).toContain(`from "@modelcontextprotocol/server/validators/cf-worker"`);
expect(result).toContain('CfWorkerJsonSchemaValidator');
});
it('rewrites AjvJsonSchemaValidator from v1 ajv-provider to server subpath', () => {
const input = [
`import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';`,
`import { AjvJsonSchemaValidator } from '@modelcontextprotocol/sdk/validation/ajv-provider.js';`,
''
].join('\n');
const result = applyTransform(input, { projectType: 'server' });
expect(result).toContain(`from "@modelcontextprotocol/server/validators/ajv"`);
expect(result).toContain('AjvJsonSchemaValidator');
});
it('rewrites AjvJsonSchemaValidator from v1 ajv short alias to server subpath', () => {
const input = [
`import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';`,
`import { AjvJsonSchemaValidator } from '@modelcontextprotocol/sdk/validation/ajv';`,
''
].join('\n');
const result = applyTransform(input, { projectType: 'server' });
expect(result).toContain(`from "@modelcontextprotocol/server/validators/ajv"`);
expect(result).toContain('AjvJsonSchemaValidator');
});
it('routes validator subpath to client when only client siblings exist', () => {
const input = [
`import { Client } from '@modelcontextprotocol/sdk/client/index.js';`,
`import { AjvJsonSchemaValidator } from '@modelcontextprotocol/sdk/validation/ajv-provider.js';`,
''
].join('\n');
const result = applyTransform(input, { projectType: 'both' });
expect(result).toContain(`from "@modelcontextprotocol/client/validators/ajv"`);
});
it('routes validator subpath via project type when no SDK siblings', () => {
const input = `import { CfWorkerJsonSchemaValidator } from '@modelcontextprotocol/sdk/validation/cfworker-provider.js';\n`;
const result = applyTransform(input, { projectType: 'server' });
expect(result).toContain(`from "@modelcontextprotocol/server/validators/cf-worker"`);
});
it('includes the validator subpath in usedPackages', () => {
const project = new Project({ useInMemoryFileSystem: true });
const sourceFile = project.createSourceFile(
'test.ts',
`import { CfWorkerJsonSchemaValidator } from '@modelcontextprotocol/sdk/validation/cfworker-provider.js';\n`
);
const result = importPathsTransform.apply(sourceFile, { projectType: 'client' });
expect(result.usedPackages).toBeDefined();
expect(result.usedPackages!.has('@modelcontextprotocol/client/validators/cf-worker')).toBe(true);
});
it('rewrites the validation/index type-only import to the resolved base package', () => {
const input = `import type { jsonSchemaValidator } from '@modelcontextprotocol/sdk/validation/index.js';\n`;
const result = applyTransform(input, { projectType: 'server' });
expect(result).toContain(`from "@modelcontextprotocol/server"`);
expect(result).toContain('jsonSchemaValidator');
});
});
});

47
packages/codemod/test/v1-to-v2/transforms/mockPaths.test.ts
View file

@ -315,4 +315,51 @@ describe('mock-paths transform', () => {
expect(result).toContain('new MyError(');
});
});
describe('validator subpath rewrites', () => {
it('rewrites vi.mock of validator provider to the subpath', () => {
const input = [
`vi.mock('@modelcontextprotocol/sdk/validation/cfworker-provider.js', () => ({`,
` CfWorkerJsonSchemaValidator: vi.fn()`,
`}));`,
''
].join('\n');
const result = applyTransform(input);
expect(result).toContain(`'@modelcontextprotocol/server/validators/cf-worker'`);
expect(result).not.toContain('@modelcontextprotocol/sdk');
});
it('rewrites vi.doMock of ajv provider with sibling client import', () => {
const input = [
`import { Client } from '@modelcontextprotocol/sdk/client/index.js';`,
`vi.doMock('@modelcontextprotocol/sdk/validation/ajv-provider.js', () => ({`,
` AjvJsonSchemaValidator: vi.fn()`,
`}));`,
''
].join('\n');
const result = applyTransform(input, { projectType: 'both' });
expect(result).toContain(`'@modelcontextprotocol/client/validators/ajv'`);
});
it('rewrites dynamic import of validator provider to the subpath', () => {
const input = [
`const { AjvJsonSchemaValidator } = await import('@modelcontextprotocol/sdk/validation/ajv-provider.js');`,
''
].join('\n');
const result = applyTransform(input);
expect(result).toContain(`'@modelcontextprotocol/server/validators/ajv'`);
expect(result).toContain('AjvJsonSchemaValidator');
});
it('rewrites jest.mock of validator short alias to the subpath', () => {
const input = [
`jest.mock('@modelcontextprotocol/sdk/validation/cfworker', () => ({`,
` CfWorkerJsonSchemaValidator: jest.fn()`,
`}));`,
''
].join('\n');
const result = applyTransform(input);
expect(result).toContain(`'@modelcontextprotocol/server/validators/cf-worker'`);
});
});
});