Skip to content

fix: keep validator providers off root declarations#2425

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.

Sign up for GitHub

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

Merged
mattzcarey merged 3 commits into from
Jul 6, 2026
Merged

fix: keep validator providers off root declarations #2425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23f03f0
fix: keep validator providers off root declarations
Sehlani042 Jul 2, 2026
5758757
chore: add validator declarations changeset
Sehlani042 Jul 2, 2026
412bddd
test: update dist type smoke for validator subpaths
Sehlani042 Jul 2, 2026
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
6 changes: 6 additions & 0 deletions .changeset/silent-validators-wave.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@modelcontextprotocol/client': patch
'@modelcontextprotocol/server': patch
---

Stop advertising validator provider classes from the root client/server type declarations. The provider classes remain available from the explicit validator subpaths.
16 changes: 16 additions & 0 deletions packages/client/test/client/barrelClean.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ const requireDist = createRequire(join(pkgDir, 'package.json'));
const NODE_ONLY = /\b(child_process|cross-spawn|node:stream|node:child_process)\b/;
// Anchored at start-of-line so JSDoc-example `from 'ajv'` strings in vendored chunks don't match.
const VALIDATOR_BACKEND_IMPORT = /^import[^\n]*?from\s+["'](?:ajv|ajv-formats|@cfworker\/json-schema)["']/m;
const ROOT_VALIDATOR_EXPORTS = ['AjvJsonSchemaValidator', 'CfWorkerJsonSchemaValidator', 'CfWorkerSchemaDraft'];

function chunkImportsOf(entryPath: string): string[] {
const visited = new Set<string>();
Expand All@@ -29,6 +30,12 @@ function chunkImportsOf(entryPath: string): string[] {
return [...visited];
}

function rootExportBlockOf(content: string): string {
const blocks = content.match(/(?:^|\n)export \{[\s\S]*?\};/g);
expect(blocks).toBeTruthy();
return blocks!.at(-1)!;
}

describe('@modelcontextprotocol/client root entry is browser-safe', () => {
beforeAll(() => {
if (!existsSync(join(distDir, 'index.mjs')) || !existsSync(join(distDir, 'stdio.mjs'))) {
Expand DownExpand Up@@ -80,4 +87,13 @@ describe('@modelcontextprotocol/client root entry is browser-safe', () => {

expect(new AjvJsonSchemaValidator(ajv)).toBeInstanceOf(AjvJsonSchemaValidator);
});

test('root declarations do not advertise validator provider classes', () => {
for (const declaration of ['index.d.mts', 'index.d.cts']) {
const rootExportBlock = rootExportBlockOf(readFileSync(join(distDir, declaration), 'utf8'));
for (const symbol of ROOT_VALIDATOR_EXPORTS) {
expect(rootExportBlock).not.toMatch(new RegExp(`\\b(?:type\\s+)?${symbol}\\b`));
}
}
});
});
7 changes: 3 additions & 4 deletions packages/core-internal/src/exports/public/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -131,10 +131,9 @@ export {
export type { SpecTypeName, SpecTypes } from '../../types/specTypeSchema';
export { isSpecType, specTypeSchemas } from '../../types/specTypeSchema';
export type { StandardSchemaV1, StandardSchemaV1Sync, StandardSchemaWithJSON } from '../../util/standardSchema';
// Validator providers are type-only here — import the runtime classes from the explicit
// `@modelcontextprotocol/{client,server}/validators/{ajv,cf-worker}` subpaths to customise.
export type { AjvJsonSchemaValidator } from '../../validators/ajvProvider';
export type { CfWorkerJsonSchemaValidator, CfWorkerSchemaDraft } from '../../validators/cfWorkerProvider';
// Validator provider classes stay subpath-only. Re-exporting them here, even as
// `type`, can make generated root declarations advertise runtime-shaped root
// exports that the package root does not provide.
// fromJsonSchema is intentionally NOT exported here — the server and client packages
// provide runtime-aware wrappers that default to the appropriate validator via _shims.
export type { JsonSchemaType, JsonSchemaValidator, jsonSchemaValidator, JsonSchemaValidatorResult } from '../../validators/types';
7 changes: 3 additions & 4 deletions packages/core-internal/src/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,9 +33,8 @@ export * from './util/standardSchema';
export * from './util/zodCompat';
export { codecForVersion, MODERN_WIRE_REVISION } from './wire/codec';

// Validator providers are type-only here — import the runtime classes from the explicit
// `@modelcontextprotocol/{client,server}/validators/{ajv,cf-worker}` subpaths to customise.
export type { AjvJsonSchemaValidator } from './validators/ajvProvider';
export type { CfWorkerJsonSchemaValidator, CfWorkerSchemaDraft } from './validators/cfWorkerProvider';
// Validator provider classes stay subpath-only. Re-exporting them here, even as
// `type`, can make generated client/server root declarations advertise
// runtime-shaped root exports that the package root does not provide.
export * from './validators/fromJsonSchema';
export type { JsonSchemaType, JsonSchemaValidator, jsonSchemaValidator, JsonSchemaValidatorResult } from './validators/types';
16 changes: 16 additions & 0 deletions packages/server/test/server/barrelClean.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ const requireDist = createRequire(join(pkgDir, 'package.json'));
const NODE_ONLY = /\b(child_process|cross-spawn|node:stream|node:child_process)\b/;
// Anchored at start-of-line so JSDoc-example `from 'ajv'` strings in vendored chunks don't match.
const VALIDATOR_BACKEND_IMPORT = /^import[^\n]*?from\s+["'](?:ajv|ajv-formats|@cfworker\/json-schema)["']/m;
const ROOT_VALIDATOR_EXPORTS = ['AjvJsonSchemaValidator', 'CfWorkerJsonSchemaValidator', 'CfWorkerSchemaDraft'];

function chunkImportsOf(entryPath: string): string[] {
const visited = new Set<string>();
Expand All@@ -29,6 +30,12 @@ function chunkImportsOf(entryPath: string): string[] {
return [...visited];
}

function rootExportBlockOf(content: string): string {
const blocks = content.match(/(?:^|\n)export \{[\s\S]*?\};/g);
expect(blocks).toBeTruthy();
return blocks!.at(-1)!;
}

describe('@modelcontextprotocol/server root entry is browser-safe', () => {
beforeAll(() => {
if (!existsSync(join(distDir, 'index.mjs')) || !existsSync(join(distDir, 'stdio.mjs'))) {
Expand DownExpand Up@@ -81,4 +88,13 @@ describe('@modelcontextprotocol/server root entry is browser-safe', () => {

expect(new AjvJsonSchemaValidator(ajv)).toBeInstanceOf(AjvJsonSchemaValidator);
});

test('root declarations do not advertise validator provider classes', () => {
for (const declaration of ['index.d.mts', 'index.d.cts']) {
const rootExportBlock = rootExportBlockOf(readFileSync(join(distDir, declaration), 'utf8'));
for (const symbol of ROOT_VALIDATOR_EXPORTS) {
expect(rootExportBlock).not.toMatch(new RegExp(`\\b(?:type\\s+)?${symbol}\\b`));
}
}
});
});
4 changes: 2 additions & 2 deletions scripts/smoke-dist-types.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ try {
path.join(dir, 'consumer.ts'),
[
"import { Client } from '@modelcontextprotocol/client';",
"import type { AjvJsonSchemaValidator as ClientAjv } from '@modelcontextprotocol/client';",
"import type { JsonSchemaType as ClientSchema } from '@modelcontextprotocol/client';",
"import { AjvJsonSchemaValidator } from '@modelcontextprotocol/client/validators/ajv';",
"import { CfWorkerJsonSchemaValidator as ClientCf } from '@modelcontextprotocol/client/validators/cf-worker';",
"import { StdioClientTransport } from '@modelcontextprotocol/client/stdio';",
Expand All@@ -24,7 +24,7 @@ try {
"import { StdioServerTransport } from '@modelcontextprotocol/server/stdio';",
"export const c = new Client({ name: 'smoke', version: '1.0.0' });",
"export const s = new McpServer({ name: 'smoke', version: '1.0.0' });",
'export type T = ClientAjv;',
'export type T = ClientSchema;',
'export { AjvJsonSchemaValidator, ServerAjv, ClientCf, ServerCf, StdioClientTransport, StdioServerTransport };',
''
].join('\n')
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix: keep validator providers off root declarations by Sehlani042 · Pull Request #2425 · modelcontextprotocol/typescript-sdk · GitHub
Skip to content
fix: keep validator providers off root declarations#2425

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.

 Sign up for GitHub

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

 Merged

mattzcarey
merged 3 commits into

from

Jul 6, 2026
 Merged


fix: keep validator providers off root declarations
#2425
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
23f03f0

fix: keep validator providers off root declarations


Sehlani042 Jul 2, 2026
5758757

chore: add validator declarations changeset


Sehlani042 Jul 2, 2026
412bddd

test: update dist type smoke for validator subpaths


Sehlani042 Jul 2, 2026

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


6 changes: 6 additions & 0 deletions
.changeset/silent-validators-wave.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@modelcontextprotocol/client': patch
'@modelcontextprotocol/server': patch
---

Stop advertising validator provider classes from the root client/server type declarations. The provider classes remain available from the explicit validator subpaths.

16 changes: 16 additions & 0 deletions
packages/client/test/client/barrelClean.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ const requireDist = createRequire(join(pkgDir, 'package.json'));
const NODE_ONLY = /\b(child_process|cross-spawn|node:stream|node:child_process)\b/;
// Anchored at start-of-line so JSDoc-example `from 'ajv'` strings in vendored chunks don't match.
const VALIDATOR_BACKEND_IMPORT = /^import[^\n]*?from\s+["'](?:ajv|ajv-formats|@cfworker\/json-schema)["']/m;
const ROOT_VALIDATOR_EXPORTS = ['AjvJsonSchemaValidator', 'CfWorkerJsonSchemaValidator', 'CfWorkerSchemaDraft'];

function chunkImportsOf(entryPath: string): string[] {
 const visited = new Set<string>();
Expand All@@ -29,6 +30,12 @@ function chunkImportsOf(entryPath: string): string[] {
 return [...visited];
}

function rootExportBlockOf(content: string): string {
 const blocks = content.match(/(?:^|\n)export \{[\s\S]*?\};/g);
 expect(blocks).toBeTruthy();
 return blocks!.at(-1)!;
}

describe('@modelcontextprotocol/client root entry is browser-safe', () => {
 beforeAll(() => {
 if (!existsSync(join(distDir, 'index.mjs')) || !existsSync(join(distDir, 'stdio.mjs'))) {
Expand DownExpand Up@@ -80,4 +87,13 @@ describe('@modelcontextprotocol/client root entry is browser-safe', () => {

 expect(new AjvJsonSchemaValidator(ajv)).toBeInstanceOf(AjvJsonSchemaValidator);
 });

 test('root declarations do not advertise validator provider classes', () => {
 for (const declaration of ['index.d.mts', 'index.d.cts']) {
 const rootExportBlock = rootExportBlockOf(readFileSync(join(distDir, declaration), 'utf8'));
 for (const symbol of ROOT_VALIDATOR_EXPORTS) {
 expect(rootExportBlock).not.toMatch(new RegExp(`\\b(?:type\\s+)?${symbol}\\b`));
 }
 }
 });
});

7 changes: 3 additions & 4 deletions
packages/core-internal/src/exports/public/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,10 +131,9 @@ export {
export type { SpecTypeName, SpecTypes } from '../../types/specTypeSchema';
export { isSpecType, specTypeSchemas } from '../../types/specTypeSchema';
export type { StandardSchemaV1, StandardSchemaV1Sync, StandardSchemaWithJSON } from '../../util/standardSchema';
// Validator providers are type-only here — import the runtime classes from the explicit
// `@modelcontextprotocol/{client,server}/validators/{ajv,cf-worker}` subpaths to customise.
export type { AjvJsonSchemaValidator } from '../../validators/ajvProvider';
export type { CfWorkerJsonSchemaValidator, CfWorkerSchemaDraft } from '../../validators/cfWorkerProvider';
// Validator provider classes stay subpath-only. Re-exporting them here, even as
// `type`, can make generated root declarations advertise runtime-shaped root
// exports that the package root does not provide.
// fromJsonSchema is intentionally NOT exported here — the server and client packages
// provide runtime-aware wrappers that default to the appropriate validator via _shims.
export type { JsonSchemaType, JsonSchemaValidator, jsonSchemaValidator, JsonSchemaValidatorResult } from '../../validators/types';

7 changes: 3 additions & 4 deletions
packages/core-internal/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,9 +33,8 @@ export * from './util/standardSchema';
export * from './util/zodCompat';
export { codecForVersion, MODERN_WIRE_REVISION } from './wire/codec';

// Validator providers are type-only here — import the runtime classes from the explicit
// `@modelcontextprotocol/{client,server}/validators/{ajv,cf-worker}` subpaths to customise.
export type { AjvJsonSchemaValidator } from './validators/ajvProvider';
export type { CfWorkerJsonSchemaValidator, CfWorkerSchemaDraft } from './validators/cfWorkerProvider';
// Validator provider classes stay subpath-only. Re-exporting them here, even as
// `type`, can make generated client/server root declarations advertise
// runtime-shaped root exports that the package root does not provide.
export * from './validators/fromJsonSchema';
export type { JsonSchemaType, JsonSchemaValidator, jsonSchemaValidator, JsonSchemaValidatorResult } from './validators/types';

16 changes: 16 additions & 0 deletions
packages/server/test/server/barrelClean.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ const requireDist = createRequire(join(pkgDir, 'package.json'));
const NODE_ONLY = /\b(child_process|cross-spawn|node:stream|node:child_process)\b/;
// Anchored at start-of-line so JSDoc-example `from 'ajv'` strings in vendored chunks don't match.
const VALIDATOR_BACKEND_IMPORT = /^import[^\n]*?from\s+["'](?:ajv|ajv-formats|@cfworker\/json-schema)["']/m;
const ROOT_VALIDATOR_EXPORTS = ['AjvJsonSchemaValidator', 'CfWorkerJsonSchemaValidator', 'CfWorkerSchemaDraft'];

function chunkImportsOf(entryPath: string): string[] {
 const visited = new Set<string>();
Expand All@@ -29,6 +30,12 @@ function chunkImportsOf(entryPath: string): string[] {
 return [...visited];
}

function rootExportBlockOf(content: string): string {
 const blocks = content.match(/(?:^|\n)export \{[\s\S]*?\};/g);
 expect(blocks).toBeTruthy();
 return blocks!.at(-1)!;
}

describe('@modelcontextprotocol/server root entry is browser-safe', () => {
 beforeAll(() => {
 if (!existsSync(join(distDir, 'index.mjs')) || !existsSync(join(distDir, 'stdio.mjs'))) {
Expand DownExpand Up@@ -81,4 +88,13 @@ describe('@modelcontextprotocol/server root entry is browser-safe', () => {

 expect(new AjvJsonSchemaValidator(ajv)).toBeInstanceOf(AjvJsonSchemaValidator);
 });

 test('root declarations do not advertise validator provider classes', () => {
 for (const declaration of ['index.d.mts', 'index.d.cts']) {
 const rootExportBlock = rootExportBlockOf(readFileSync(join(distDir, declaration), 'utf8'));
 for (const symbol of ROOT_VALIDATOR_EXPORTS) {
 expect(rootExportBlock).not.toMatch(new RegExp(`\\b(?:type\\s+)?${symbol}\\b`));
 }
 }
 });
});

4 changes: 2 additions & 2 deletions
scripts/smoke-dist-types.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ try {
 path.join(dir, 'consumer.ts'),
 [
 "import { Client } from '@modelcontextprotocol/client';",
 "import type { AjvJsonSchemaValidator as ClientAjv } from '@modelcontextprotocol/client';",
 "import type { JsonSchemaType as ClientSchema } from '@modelcontextprotocol/client';",
 "import { AjvJsonSchemaValidator } from '@modelcontextprotocol/client/validators/ajv';",
 "import { CfWorkerJsonSchemaValidator as ClientCf } from '@modelcontextprotocol/client/validators/cf-worker';",
 "import { StdioClientTransport } from '@modelcontextprotocol/client/stdio';",
Expand All@@ -24,7 +24,7 @@ try {
 "import { StdioServerTransport } from '@modelcontextprotocol/server/stdio';",
 "export const c = new Client({ name: 'smoke', version: '1.0.0' });",
 "export const s = new McpServer({ name: 'smoke', version: '1.0.0' });",
 'export type T = ClientAjv;',
 'export type T = ClientSchema;',
 'export { AjvJsonSchemaValidator, ServerAjv, ClientCf, ServerCf, StdioClientTransport, StdioServerTransport };',
 ''
 ].join('\n')
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: keep validator providers off root declarations by Sehlani042 · Pull Request #2425 · modelcontextprotocol/typescript-sdk · GitHub
Skip to content
fix: keep validator providers off root declarations#2425

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.

 Sign up for GitHub

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

 Merged

mattzcarey
merged 3 commits into

from

Jul 6, 2026
 Merged


fix: keep validator providers off root declarations
#2425
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
23f03f0

fix: keep validator providers off root declarations


Sehlani042 Jul 2, 2026
5758757

chore: add validator declarations changeset


Sehlani042 Jul 2, 2026
412bddd

test: update dist type smoke for validator subpaths


Sehlani042 Jul 2, 2026

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


6 changes: 6 additions & 0 deletions
.changeset/silent-validators-wave.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@modelcontextprotocol/client': patch
'@modelcontextprotocol/server': patch
---

Stop advertising validator provider classes from the root client/server type declarations. The provider classes remain available from the explicit validator subpaths.

16 changes: 16 additions & 0 deletions
packages/client/test/client/barrelClean.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ const requireDist = createRequire(join(pkgDir, 'package.json'));
const NODE_ONLY = /\b(child_process|cross-spawn|node:stream|node:child_process)\b/;
// Anchored at start-of-line so JSDoc-example `from 'ajv'` strings in vendored chunks don't match.
const VALIDATOR_BACKEND_IMPORT = /^import[^\n]*?from\s+["'](?:ajv|ajv-formats|@cfworker\/json-schema)["']/m;
const ROOT_VALIDATOR_EXPORTS = ['AjvJsonSchemaValidator', 'CfWorkerJsonSchemaValidator', 'CfWorkerSchemaDraft'];

function chunkImportsOf(entryPath: string): string[] {
 const visited = new Set<string>();
Expand All@@ -29,6 +30,12 @@ function chunkImportsOf(entryPath: string): string[] {
 return [...visited];
}

function rootExportBlockOf(content: string): string {
 const blocks = content.match(/(?:^|\n)export \{[\s\S]*?\};/g);
 expect(blocks).toBeTruthy();
 return blocks!.at(-1)!;
}

describe('@modelcontextprotocol/client root entry is browser-safe', () => {
 beforeAll(() => {
 if (!existsSync(join(distDir, 'index.mjs')) || !existsSync(join(distDir, 'stdio.mjs'))) {
Expand DownExpand Up@@ -80,4 +87,13 @@ describe('@modelcontextprotocol/client root entry is browser-safe', () => {

 expect(new AjvJsonSchemaValidator(ajv)).toBeInstanceOf(AjvJsonSchemaValidator);
 });

 test('root declarations do not advertise validator provider classes', () => {
 for (const declaration of ['index.d.mts', 'index.d.cts']) {
 const rootExportBlock = rootExportBlockOf(readFileSync(join(distDir, declaration), 'utf8'));
 for (const symbol of ROOT_VALIDATOR_EXPORTS) {
 expect(rootExportBlock).not.toMatch(new RegExp(`\\b(?:type\\s+)?${symbol}\\b`));
 }
 }
 });
});

7 changes: 3 additions & 4 deletions
packages/core-internal/src/exports/public/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,10 +131,9 @@ export {
export type { SpecTypeName, SpecTypes } from '../../types/specTypeSchema';
export { isSpecType, specTypeSchemas } from '../../types/specTypeSchema';
export type { StandardSchemaV1, StandardSchemaV1Sync, StandardSchemaWithJSON } from '../../util/standardSchema';
// Validator providers are type-only here — import the runtime classes from the explicit
// `@modelcontextprotocol/{client,server}/validators/{ajv,cf-worker}` subpaths to customise.
export type { AjvJsonSchemaValidator } from '../../validators/ajvProvider';
export type { CfWorkerJsonSchemaValidator, CfWorkerSchemaDraft } from '../../validators/cfWorkerProvider';
// Validator provider classes stay subpath-only. Re-exporting them here, even as
// `type`, can make generated root declarations advertise runtime-shaped root
// exports that the package root does not provide.
// fromJsonSchema is intentionally NOT exported here — the server and client packages
// provide runtime-aware wrappers that default to the appropriate validator via _shims.
export type { JsonSchemaType, JsonSchemaValidator, jsonSchemaValidator, JsonSchemaValidatorResult } from '../../validators/types';

7 changes: 3 additions & 4 deletions
packages/core-internal/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,9 +33,8 @@ export * from './util/standardSchema';
export * from './util/zodCompat';
export { codecForVersion, MODERN_WIRE_REVISION } from './wire/codec';

// Validator providers are type-only here — import the runtime classes from the explicit
// `@modelcontextprotocol/{client,server}/validators/{ajv,cf-worker}` subpaths to customise.
export type { AjvJsonSchemaValidator } from './validators/ajvProvider';
export type { CfWorkerJsonSchemaValidator, CfWorkerSchemaDraft } from './validators/cfWorkerProvider';
// Validator provider classes stay subpath-only. Re-exporting them here, even as
// `type`, can make generated client/server root declarations advertise
// runtime-shaped root exports that the package root does not provide.
export * from './validators/fromJsonSchema';
export type { JsonSchemaType, JsonSchemaValidator, jsonSchemaValidator, JsonSchemaValidatorResult } from './validators/types';

16 changes: 16 additions & 0 deletions
packages/server/test/server/barrelClean.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ const requireDist = createRequire(join(pkgDir, 'package.json'));
const NODE_ONLY = /\b(child_process|cross-spawn|node:stream|node:child_process)\b/;
// Anchored at start-of-line so JSDoc-example `from 'ajv'` strings in vendored chunks don't match.
const VALIDATOR_BACKEND_IMPORT = /^import[^\n]*?from\s+["'](?:ajv|ajv-formats|@cfworker\/json-schema)["']/m;
const ROOT_VALIDATOR_EXPORTS = ['AjvJsonSchemaValidator', 'CfWorkerJsonSchemaValidator', 'CfWorkerSchemaDraft'];

function chunkImportsOf(entryPath: string): string[] {
 const visited = new Set<string>();
Expand All@@ -29,6 +30,12 @@ function chunkImportsOf(entryPath: string): string[] {
 return [...visited];
}

function rootExportBlockOf(content: string): string {
 const blocks = content.match(/(?:^|\n)export \{[\s\S]*?\};/g);
 expect(blocks).toBeTruthy();
 return blocks!.at(-1)!;
}

describe('@modelcontextprotocol/server root entry is browser-safe', () => {
 beforeAll(() => {
 if (!existsSync(join(distDir, 'index.mjs')) || !existsSync(join(distDir, 'stdio.mjs'))) {
Expand DownExpand Up@@ -81,4 +88,13 @@ describe('@modelcontextprotocol/server root entry is browser-safe', () => {

 expect(new AjvJsonSchemaValidator(ajv)).toBeInstanceOf(AjvJsonSchemaValidator);
 });

 test('root declarations do not advertise validator provider classes', () => {
 for (const declaration of ['index.d.mts', 'index.d.cts']) {
 const rootExportBlock = rootExportBlockOf(readFileSync(join(distDir, declaration), 'utf8'));
 for (const symbol of ROOT_VALIDATOR_EXPORTS) {
 expect(rootExportBlock).not.toMatch(new RegExp(`\\b(?:type\\s+)?${symbol}\\b`));
 }
 }
 });
});

4 changes: 2 additions & 2 deletions
scripts/smoke-dist-types.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ try {
 path.join(dir, 'consumer.ts'),
 [
 "import { Client } from '@modelcontextprotocol/client';",
 "import type { AjvJsonSchemaValidator as ClientAjv } from '@modelcontextprotocol/client';",
 "import type { JsonSchemaType as ClientSchema } from '@modelcontextprotocol/client';",
 "import { AjvJsonSchemaValidator } from '@modelcontextprotocol/client/validators/ajv';",
 "import { CfWorkerJsonSchemaValidator as ClientCf } from '@modelcontextprotocol/client/validators/cf-worker';",
 "import { StdioClientTransport } from '@modelcontextprotocol/client/stdio';",
Expand All@@ -24,7 +24,7 @@ try {
 "import { StdioServerTransport } from '@modelcontextprotocol/server/stdio';",
 "export const c = new Client({ name: 'smoke', version: '1.0.0' });",
 "export const s = new McpServer({ name: 'smoke', version: '1.0.0' });",
 'export type T = ClientAjv;',
 'export type T = ClientSchema;',
 'export { AjvJsonSchemaValidator, ServerAjv, ClientCf, ServerCf, StdioClientTransport, StdioServerTransport };',
 ''
 ].join('\n')
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: keep validator providers off root declarations by Sehlani042 · Pull Request #2425 · modelcontextprotocol/typescript-sdk · GitHub
Skip to content
fix: keep validator providers off root declarations#2425

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.

 Sign up for GitHub

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

 Merged

mattzcarey
merged 3 commits into

from

Jul 6, 2026
 Merged


fix: keep validator providers off root declarations
#2425
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
23f03f0

fix: keep validator providers off root declarations


Sehlani042 Jul 2, 2026
5758757

chore: add validator declarations changeset


Sehlani042 Jul 2, 2026
412bddd

test: update dist type smoke for validator subpaths


Sehlani042 Jul 2, 2026

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


6 changes: 6 additions & 0 deletions
.changeset/silent-validators-wave.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@modelcontextprotocol/client': patch
'@modelcontextprotocol/server': patch
---

Stop advertising validator provider classes from the root client/server type declarations. The provider classes remain available from the explicit validator subpaths.

16 changes: 16 additions & 0 deletions
packages/client/test/client/barrelClean.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ const requireDist = createRequire(join(pkgDir, 'package.json'));
const NODE_ONLY = /\b(child_process|cross-spawn|node:stream|node:child_process)\b/;
// Anchored at start-of-line so JSDoc-example `from 'ajv'` strings in vendored chunks don't match.
const VALIDATOR_BACKEND_IMPORT = /^import[^\n]*?from\s+["'](?:ajv|ajv-formats|@cfworker\/json-schema)["']/m;
const ROOT_VALIDATOR_EXPORTS = ['AjvJsonSchemaValidator', 'CfWorkerJsonSchemaValidator', 'CfWorkerSchemaDraft'];

function chunkImportsOf(entryPath: string): string[] {
 const visited = new Set<string>();
Expand All@@ -29,6 +30,12 @@ function chunkImportsOf(entryPath: string): string[] {
 return [...visited];
}

function rootExportBlockOf(content: string): string {
 const blocks = content.match(/(?:^|\n)export \{[\s\S]*?\};/g);
 expect(blocks).toBeTruthy();
 return blocks!.at(-1)!;
}

describe('@modelcontextprotocol/client root entry is browser-safe', () => {
 beforeAll(() => {
 if (!existsSync(join(distDir, 'index.mjs')) || !existsSync(join(distDir, 'stdio.mjs'))) {
Expand DownExpand Up@@ -80,4 +87,13 @@ describe('@modelcontextprotocol/client root entry is browser-safe', () => {

 expect(new AjvJsonSchemaValidator(ajv)).toBeInstanceOf(AjvJsonSchemaValidator);
 });

 test('root declarations do not advertise validator provider classes', () => {
 for (const declaration of ['index.d.mts', 'index.d.cts']) {
 const rootExportBlock = rootExportBlockOf(readFileSync(join(distDir, declaration), 'utf8'));
 for (const symbol of ROOT_VALIDATOR_EXPORTS) {
 expect(rootExportBlock).not.toMatch(new RegExp(`\\b(?:type\\s+)?${symbol}\\b`));
 }
 }
 });
});

7 changes: 3 additions & 4 deletions
packages/core-internal/src/exports/public/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,10 +131,9 @@ export {
export type { SpecTypeName, SpecTypes } from '../../types/specTypeSchema';
export { isSpecType, specTypeSchemas } from '../../types/specTypeSchema';
export type { StandardSchemaV1, StandardSchemaV1Sync, StandardSchemaWithJSON } from '../../util/standardSchema';
// Validator providers are type-only here — import the runtime classes from the explicit
// `@modelcontextprotocol/{client,server}/validators/{ajv,cf-worker}` subpaths to customise.
export type { AjvJsonSchemaValidator } from '../../validators/ajvProvider';
export type { CfWorkerJsonSchemaValidator, CfWorkerSchemaDraft } from '../../validators/cfWorkerProvider';
// Validator provider classes stay subpath-only. Re-exporting them here, even as
// `type`, can make generated root declarations advertise runtime-shaped root
// exports that the package root does not provide.
// fromJsonSchema is intentionally NOT exported here — the server and client packages
// provide runtime-aware wrappers that default to the appropriate validator via _shims.
export type { JsonSchemaType, JsonSchemaValidator, jsonSchemaValidator, JsonSchemaValidatorResult } from '../../validators/types';

7 changes: 3 additions & 4 deletions
packages/core-internal/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,9 +33,8 @@ export * from './util/standardSchema';
export * from './util/zodCompat';
export { codecForVersion, MODERN_WIRE_REVISION } from './wire/codec';

// Validator providers are type-only here — import the runtime classes from the explicit
// `@modelcontextprotocol/{client,server}/validators/{ajv,cf-worker}` subpaths to customise.
export type { AjvJsonSchemaValidator } from './validators/ajvProvider';
export type { CfWorkerJsonSchemaValidator, CfWorkerSchemaDraft } from './validators/cfWorkerProvider';
// Validator provider classes stay subpath-only. Re-exporting them here, even as
// `type`, can make generated client/server root declarations advertise
// runtime-shaped root exports that the package root does not provide.
export * from './validators/fromJsonSchema';
export type { JsonSchemaType, JsonSchemaValidator, jsonSchemaValidator, JsonSchemaValidatorResult } from './validators/types';

16 changes: 16 additions & 0 deletions
packages/server/test/server/barrelClean.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ const requireDist = createRequire(join(pkgDir, 'package.json'));
const NODE_ONLY = /\b(child_process|cross-spawn|node:stream|node:child_process)\b/;
// Anchored at start-of-line so JSDoc-example `from 'ajv'` strings in vendored chunks don't match.
const VALIDATOR_BACKEND_IMPORT = /^import[^\n]*?from\s+["'](?:ajv|ajv-formats|@cfworker\/json-schema)["']/m;
const ROOT_VALIDATOR_EXPORTS = ['AjvJsonSchemaValidator', 'CfWorkerJsonSchemaValidator', 'CfWorkerSchemaDraft'];

function chunkImportsOf(entryPath: string): string[] {
 const visited = new Set<string>();
Expand All@@ -29,6 +30,12 @@ function chunkImportsOf(entryPath: string): string[] {
 return [...visited];
}

function rootExportBlockOf(content: string): string {
 const blocks = content.match(/(?:^|\n)export \{[\s\S]*?\};/g);
 expect(blocks).toBeTruthy();
 return blocks!.at(-1)!;
}

describe('@modelcontextprotocol/server root entry is browser-safe', () => {
 beforeAll(() => {
 if (!existsSync(join(distDir, 'index.mjs')) || !existsSync(join(distDir, 'stdio.mjs'))) {
Expand DownExpand Up@@ -81,4 +88,13 @@ describe('@modelcontextprotocol/server root entry is browser-safe', () => {

 expect(new AjvJsonSchemaValidator(ajv)).toBeInstanceOf(AjvJsonSchemaValidator);
 });

 test('root declarations do not advertise validator provider classes', () => {
 for (const declaration of ['index.d.mts', 'index.d.cts']) {
 const rootExportBlock = rootExportBlockOf(readFileSync(join(distDir, declaration), 'utf8'));
 for (const symbol of ROOT_VALIDATOR_EXPORTS) {
 expect(rootExportBlock).not.toMatch(new RegExp(`\\b(?:type\\s+)?${symbol}\\b`));
 }
 }
 });
});

4 changes: 2 additions & 2 deletions
scripts/smoke-dist-types.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ try {
 path.join(dir, 'consumer.ts'),
 [
 "import { Client } from '@modelcontextprotocol/client';",
 "import type { AjvJsonSchemaValidator as ClientAjv } from '@modelcontextprotocol/client';",
 "import type { JsonSchemaType as ClientSchema } from '@modelcontextprotocol/client';",
 "import { AjvJsonSchemaValidator } from '@modelcontextprotocol/client/validators/ajv';",
 "import { CfWorkerJsonSchemaValidator as ClientCf } from '@modelcontextprotocol/client/validators/cf-worker';",
 "import { StdioClientTransport } from '@modelcontextprotocol/client/stdio';",
Expand All@@ -24,7 +24,7 @@ try {
 "import { StdioServerTransport } from '@modelcontextprotocol/server/stdio';",
 "export const c = new Client({ name: 'smoke', version: '1.0.0' });",
 "export const s = new McpServer({ name: 'smoke', version: '1.0.0' });",
 'export type T = ClientAjv;',
 'export type T = ClientSchema;',
 'export { AjvJsonSchemaValidator, ServerAjv, ClientCf, ServerCf, StdioClientTransport, StdioServerTransport };',
 ''
 ].join('\n')
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
fix: keep validator providers off root declarations by Sehlani042 · Pull Request #2425 · modelcontextprotocol/typescript-sdk · GitHub
Skip to content
fix: keep validator providers off root declarations#2425

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.

 Sign up for GitHub

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

 Merged

mattzcarey
merged 3 commits into

from

Jul 6, 2026
 Merged


fix: keep validator providers off root declarations
#2425
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
23f03f0

fix: keep validator providers off root declarations


Sehlani042 Jul 2, 2026
5758757

chore: add validator declarations changeset


Sehlani042 Jul 2, 2026
412bddd

test: update dist type smoke for validator subpaths


Sehlani042 Jul 2, 2026

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


6 changes: 6 additions & 0 deletions
.changeset/silent-validators-wave.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@modelcontextprotocol/client': patch
'@modelcontextprotocol/server': patch
---

Stop advertising validator provider classes from the root client/server type declarations. The provider classes remain available from the explicit validator subpaths.

16 changes: 16 additions & 0 deletions
packages/client/test/client/barrelClean.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ const requireDist = createRequire(join(pkgDir, 'package.json'));
const NODE_ONLY = /\b(child_process|cross-spawn|node:stream|node:child_process)\b/;
// Anchored at start-of-line so JSDoc-example `from 'ajv'` strings in vendored chunks don't match.
const VALIDATOR_BACKEND_IMPORT = /^import[^\n]*?from\s+["'](?:ajv|ajv-formats|@cfworker\/json-schema)["']/m;
const ROOT_VALIDATOR_EXPORTS = ['AjvJsonSchemaValidator', 'CfWorkerJsonSchemaValidator', 'CfWorkerSchemaDraft'];

function chunkImportsOf(entryPath: string): string[] {
 const visited = new Set<string>();
Expand All@@ -29,6 +30,12 @@ function chunkImportsOf(entryPath: string): string[] {
 return [...visited];
}

function rootExportBlockOf(content: string): string {
 const blocks = content.match(/(?:^|\n)export \{[\s\S]*?\};/g);
 expect(blocks).toBeTruthy();
 return blocks!.at(-1)!;
}

describe('@modelcontextprotocol/client root entry is browser-safe', () => {
 beforeAll(() => {
 if (!existsSync(join(distDir, 'index.mjs')) || !existsSync(join(distDir, 'stdio.mjs'))) {
Expand DownExpand Up@@ -80,4 +87,13 @@ describe('@modelcontextprotocol/client root entry is browser-safe', () => {

 expect(new AjvJsonSchemaValidator(ajv)).toBeInstanceOf(AjvJsonSchemaValidator);
 });

 test('root declarations do not advertise validator provider classes', () => {
 for (const declaration of ['index.d.mts', 'index.d.cts']) {
 const rootExportBlock = rootExportBlockOf(readFileSync(join(distDir, declaration), 'utf8'));
 for (const symbol of ROOT_VALIDATOR_EXPORTS) {
 expect(rootExportBlock).not.toMatch(new RegExp(`\\b(?:type\\s+)?${symbol}\\b`));
 }
 }
 });
});

7 changes: 3 additions & 4 deletions
packages/core-internal/src/exports/public/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,10 +131,9 @@ export {
export type { SpecTypeName, SpecTypes } from '../../types/specTypeSchema';
export { isSpecType, specTypeSchemas } from '../../types/specTypeSchema';
export type { StandardSchemaV1, StandardSchemaV1Sync, StandardSchemaWithJSON } from '../../util/standardSchema';
// Validator providers are type-only here — import the runtime classes from the explicit
// `@modelcontextprotocol/{client,server}/validators/{ajv,cf-worker}` subpaths to customise.
export type { AjvJsonSchemaValidator } from '../../validators/ajvProvider';
export type { CfWorkerJsonSchemaValidator, CfWorkerSchemaDraft } from '../../validators/cfWorkerProvider';
// Validator provider classes stay subpath-only. Re-exporting them here, even as
// `type`, can make generated root declarations advertise runtime-shaped root
// exports that the package root does not provide.
// fromJsonSchema is intentionally NOT exported here — the server and client packages
// provide runtime-aware wrappers that default to the appropriate validator via _shims.
export type { JsonSchemaType, JsonSchemaValidator, jsonSchemaValidator, JsonSchemaValidatorResult } from '../../validators/types';

7 changes: 3 additions & 4 deletions
packages/core-internal/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,9 +33,8 @@ export * from './util/standardSchema';
export * from './util/zodCompat';
export { codecForVersion, MODERN_WIRE_REVISION } from './wire/codec';

// Validator providers are type-only here — import the runtime classes from the explicit
// `@modelcontextprotocol/{client,server}/validators/{ajv,cf-worker}` subpaths to customise.
export type { AjvJsonSchemaValidator } from './validators/ajvProvider';
export type { CfWorkerJsonSchemaValidator, CfWorkerSchemaDraft } from './validators/cfWorkerProvider';
// Validator provider classes stay subpath-only. Re-exporting them here, even as
// `type`, can make generated client/server root declarations advertise
// runtime-shaped root exports that the package root does not provide.
export * from './validators/fromJsonSchema';
export type { JsonSchemaType, JsonSchemaValidator, jsonSchemaValidator, JsonSchemaValidatorResult } from './validators/types';

16 changes: 16 additions & 0 deletions
packages/server/test/server/barrelClean.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ const requireDist = createRequire(join(pkgDir, 'package.json'));
const NODE_ONLY = /\b(child_process|cross-spawn|node:stream|node:child_process)\b/;
// Anchored at start-of-line so JSDoc-example `from 'ajv'` strings in vendored chunks don't match.
const VALIDATOR_BACKEND_IMPORT = /^import[^\n]*?from\s+["'](?:ajv|ajv-formats|@cfworker\/json-schema)["']/m;
const ROOT_VALIDATOR_EXPORTS = ['AjvJsonSchemaValidator', 'CfWorkerJsonSchemaValidator', 'CfWorkerSchemaDraft'];

function chunkImportsOf(entryPath: string): string[] {
 const visited = new Set<string>();
Expand All@@ -29,6 +30,12 @@ function chunkImportsOf(entryPath: string): string[] {
 return [...visited];
}

function rootExportBlockOf(content: string): string {
 const blocks = content.match(/(?:^|\n)export \{[\s\S]*?\};/g);
 expect(blocks).toBeTruthy();
 return blocks!.at(-1)!;
}

describe('@modelcontextprotocol/server root entry is browser-safe', () => {
 beforeAll(() => {
 if (!existsSync(join(distDir, 'index.mjs')) || !existsSync(join(distDir, 'stdio.mjs'))) {
Expand DownExpand Up@@ -81,4 +88,13 @@ describe('@modelcontextprotocol/server root entry is browser-safe', () => {

 expect(new AjvJsonSchemaValidator(ajv)).toBeInstanceOf(AjvJsonSchemaValidator);
 });

 test('root declarations do not advertise validator provider classes', () => {
 for (const declaration of ['index.d.mts', 'index.d.cts']) {
 const rootExportBlock = rootExportBlockOf(readFileSync(join(distDir, declaration), 'utf8'));
 for (const symbol of ROOT_VALIDATOR_EXPORTS) {
 expect(rootExportBlock).not.toMatch(new RegExp(`\\b(?:type\\s+)?${symbol}\\b`));
 }
 }
 });
});

4 changes: 2 additions & 2 deletions
scripts/smoke-dist-types.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ try {
 path.join(dir, 'consumer.ts'),
 [
 "import { Client } from '@modelcontextprotocol/client';",
 "import type { AjvJsonSchemaValidator as ClientAjv } from '@modelcontextprotocol/client';",
 "import type { JsonSchemaType as ClientSchema } from '@modelcontextprotocol/client';",
 "import { AjvJsonSchemaValidator } from '@modelcontextprotocol/client/validators/ajv';",
 "import { CfWorkerJsonSchemaValidator as ClientCf } from '@modelcontextprotocol/client/validators/cf-worker';",
 "import { StdioClientTransport } from '@modelcontextprotocol/client/stdio';",
Expand All@@ -24,7 +24,7 @@ try {
 "import { StdioServerTransport } from '@modelcontextprotocol/server/stdio';",
 "export const c = new Client({ name: 'smoke', version: '1.0.0' });",
 "export const s = new McpServer({ name: 'smoke', version: '1.0.0' });",
 'export type T = ClientAjv;',
 'export type T = ClientSchema;',
 'export { AjvJsonSchemaValidator, ServerAjv, ClientCf, ServerCf, StdioClientTransport, StdioServerTransport };',
 ''
 ].join('\n')
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: keep validator providers off root declarations by Sehlani042 · Pull Request #2425 · modelcontextprotocol/typescript-sdk · GitHub
Skip to content
fix: keep validator providers off root declarations#2425

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.

 Sign up for GitHub

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

 Merged

mattzcarey
merged 3 commits into

from

Jul 6, 2026
 Merged


fix: keep validator providers off root declarations
#2425
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
23f03f0

fix: keep validator providers off root declarations


Sehlani042 Jul 2, 2026
5758757

chore: add validator declarations changeset


Sehlani042 Jul 2, 2026
412bddd

test: update dist type smoke for validator subpaths


Sehlani042 Jul 2, 2026

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


6 changes: 6 additions & 0 deletions
.changeset/silent-validators-wave.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@modelcontextprotocol/client': patch
'@modelcontextprotocol/server': patch
---

Stop advertising validator provider classes from the root client/server type declarations. The provider classes remain available from the explicit validator subpaths.

16 changes: 16 additions & 0 deletions
packages/client/test/client/barrelClean.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ const requireDist = createRequire(join(pkgDir, 'package.json'));
const NODE_ONLY = /\b(child_process|cross-spawn|node:stream|node:child_process)\b/;
// Anchored at start-of-line so JSDoc-example `from 'ajv'` strings in vendored chunks don't match.
const VALIDATOR_BACKEND_IMPORT = /^import[^\n]*?from\s+["'](?:ajv|ajv-formats|@cfworker\/json-schema)["']/m;
const ROOT_VALIDATOR_EXPORTS = ['AjvJsonSchemaValidator', 'CfWorkerJsonSchemaValidator', 'CfWorkerSchemaDraft'];

function chunkImportsOf(entryPath: string): string[] {
 const visited = new Set<string>();
Expand All@@ -29,6 +30,12 @@ function chunkImportsOf(entryPath: string): string[] {
 return [...visited];
}

function rootExportBlockOf(content: string): string {
 const blocks = content.match(/(?:^|\n)export \{[\s\S]*?\};/g);
 expect(blocks).toBeTruthy();
 return blocks!.at(-1)!;
}

describe('@modelcontextprotocol/client root entry is browser-safe', () => {
 beforeAll(() => {
 if (!existsSync(join(distDir, 'index.mjs')) || !existsSync(join(distDir, 'stdio.mjs'))) {
Expand DownExpand Up@@ -80,4 +87,13 @@ describe('@modelcontextprotocol/client root entry is browser-safe', () => {

 expect(new AjvJsonSchemaValidator(ajv)).toBeInstanceOf(AjvJsonSchemaValidator);
 });

 test('root declarations do not advertise validator provider classes', () => {
 for (const declaration of ['index.d.mts', 'index.d.cts']) {
 const rootExportBlock = rootExportBlockOf(readFileSync(join(distDir, declaration), 'utf8'));
 for (const symbol of ROOT_VALIDATOR_EXPORTS) {
 expect(rootExportBlock).not.toMatch(new RegExp(`\\b(?:type\\s+)?${symbol}\\b`));
 }
 }
 });
});

7 changes: 3 additions & 4 deletions
packages/core-internal/src/exports/public/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,10 +131,9 @@ export {
export type { SpecTypeName, SpecTypes } from '../../types/specTypeSchema';
export { isSpecType, specTypeSchemas } from '../../types/specTypeSchema';
export type { StandardSchemaV1, StandardSchemaV1Sync, StandardSchemaWithJSON } from '../../util/standardSchema';
// Validator providers are type-only here — import the runtime classes from the explicit
// `@modelcontextprotocol/{client,server}/validators/{ajv,cf-worker}` subpaths to customise.
export type { AjvJsonSchemaValidator } from '../../validators/ajvProvider';
export type { CfWorkerJsonSchemaValidator, CfWorkerSchemaDraft } from '../../validators/cfWorkerProvider';
// Validator provider classes stay subpath-only. Re-exporting them here, even as
// `type`, can make generated root declarations advertise runtime-shaped root
// exports that the package root does not provide.
// fromJsonSchema is intentionally NOT exported here — the server and client packages
// provide runtime-aware wrappers that default to the appropriate validator via _shims.
export type { JsonSchemaType, JsonSchemaValidator, jsonSchemaValidator, JsonSchemaValidatorResult } from '../../validators/types';

7 changes: 3 additions & 4 deletions
packages/core-internal/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,9 +33,8 @@ export * from './util/standardSchema';
export * from './util/zodCompat';
export { codecForVersion, MODERN_WIRE_REVISION } from './wire/codec';

// Validator providers are type-only here — import the runtime classes from the explicit
// `@modelcontextprotocol/{client,server}/validators/{ajv,cf-worker}` subpaths to customise.
export type { AjvJsonSchemaValidator } from './validators/ajvProvider';
export type { CfWorkerJsonSchemaValidator, CfWorkerSchemaDraft } from './validators/cfWorkerProvider';
// Validator provider classes stay subpath-only. Re-exporting them here, even as
// `type`, can make generated client/server root declarations advertise
// runtime-shaped root exports that the package root does not provide.
export * from './validators/fromJsonSchema';
export type { JsonSchemaType, JsonSchemaValidator, jsonSchemaValidator, JsonSchemaValidatorResult } from './validators/types';

16 changes: 16 additions & 0 deletions
packages/server/test/server/barrelClean.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ const requireDist = createRequire(join(pkgDir, 'package.json'));
const NODE_ONLY = /\b(child_process|cross-spawn|node:stream|node:child_process)\b/;
// Anchored at start-of-line so JSDoc-example `from 'ajv'` strings in vendored chunks don't match.
const VALIDATOR_BACKEND_IMPORT = /^import[^\n]*?from\s+["'](?:ajv|ajv-formats|@cfworker\/json-schema)["']/m;
const ROOT_VALIDATOR_EXPORTS = ['AjvJsonSchemaValidator', 'CfWorkerJsonSchemaValidator', 'CfWorkerSchemaDraft'];

function chunkImportsOf(entryPath: string): string[] {
 const visited = new Set<string>();
Expand All@@ -29,6 +30,12 @@ function chunkImportsOf(entryPath: string): string[] {
 return [...visited];
}

function rootExportBlockOf(content: string): string {
 const blocks = content.match(/(?:^|\n)export \{[\s\S]*?\};/g);
 expect(blocks).toBeTruthy();
 return blocks!.at(-1)!;
}

describe('@modelcontextprotocol/server root entry is browser-safe', () => {
 beforeAll(() => {
 if (!existsSync(join(distDir, 'index.mjs')) || !existsSync(join(distDir, 'stdio.mjs'))) {
Expand DownExpand Up@@ -81,4 +88,13 @@ describe('@modelcontextprotocol/server root entry is browser-safe', () => {

 expect(new AjvJsonSchemaValidator(ajv)).toBeInstanceOf(AjvJsonSchemaValidator);
 });

 test('root declarations do not advertise validator provider classes', () => {
 for (const declaration of ['index.d.mts', 'index.d.cts']) {
 const rootExportBlock = rootExportBlockOf(readFileSync(join(distDir, declaration), 'utf8'));
 for (const symbol of ROOT_VALIDATOR_EXPORTS) {
 expect(rootExportBlock).not.toMatch(new RegExp(`\\b(?:type\\s+)?${symbol}\\b`));
 }
 }
 });
});

4 changes: 2 additions & 2 deletions
scripts/smoke-dist-types.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ try {
 path.join(dir, 'consumer.ts'),
 [
 "import { Client } from '@modelcontextprotocol/client';",
 "import type { AjvJsonSchemaValidator as ClientAjv } from '@modelcontextprotocol/client';",
 "import type { JsonSchemaType as ClientSchema } from '@modelcontextprotocol/client';",
 "import { AjvJsonSchemaValidator } from '@modelcontextprotocol/client/validators/ajv';",
 "import { CfWorkerJsonSchemaValidator as ClientCf } from '@modelcontextprotocol/client/validators/cf-worker';",
 "import { StdioClientTransport } from '@modelcontextprotocol/client/stdio';",
Expand All@@ -24,7 +24,7 @@ try {
 "import { StdioServerTransport } from '@modelcontextprotocol/server/stdio';",
 "export const c = new Client({ name: 'smoke', version: '1.0.0' });",
 "export const s = new McpServer({ name: 'smoke', version: '1.0.0' });",
 'export type T = ClientAjv;',
 'export type T = ClientSchema;',
 'export { AjvJsonSchemaValidator, ServerAjv, ClientCf, ServerCf, StdioClientTransport, StdioServerTransport };',
 ''
 ].join('\n')
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: keep validator providers off root declarations by Sehlani042 · Pull Request #2425 · modelcontextprotocol/typescript-sdk · GitHub
Skip to content
fix: keep validator providers off root declarations#2425

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.

 Sign up for GitHub

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

 Merged

mattzcarey
merged 3 commits into

from

Jul 6, 2026
 Merged


fix: keep validator providers off root declarations
#2425
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
23f03f0

fix: keep validator providers off root declarations


Sehlani042 Jul 2, 2026
5758757

chore: add validator declarations changeset


Sehlani042 Jul 2, 2026
412bddd

test: update dist type smoke for validator subpaths


Sehlani042 Jul 2, 2026

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


6 changes: 6 additions & 0 deletions
.changeset/silent-validators-wave.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@modelcontextprotocol/client': patch
'@modelcontextprotocol/server': patch
---

Stop advertising validator provider classes from the root client/server type declarations. The provider classes remain available from the explicit validator subpaths.

16 changes: 16 additions & 0 deletions
packages/client/test/client/barrelClean.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ const requireDist = createRequire(join(pkgDir, 'package.json'));
const NODE_ONLY = /\b(child_process|cross-spawn|node:stream|node:child_process)\b/;
// Anchored at start-of-line so JSDoc-example `from 'ajv'` strings in vendored chunks don't match.
const VALIDATOR_BACKEND_IMPORT = /^import[^\n]*?from\s+["'](?:ajv|ajv-formats|@cfworker\/json-schema)["']/m;
const ROOT_VALIDATOR_EXPORTS = ['AjvJsonSchemaValidator', 'CfWorkerJsonSchemaValidator', 'CfWorkerSchemaDraft'];

function chunkImportsOf(entryPath: string): string[] {
 const visited = new Set<string>();
Expand All@@ -29,6 +30,12 @@ function chunkImportsOf(entryPath: string): string[] {
 return [...visited];
}

function rootExportBlockOf(content: string): string {
 const blocks = content.match(/(?:^|\n)export \{[\s\S]*?\};/g);
 expect(blocks).toBeTruthy();
 return blocks!.at(-1)!;
}

describe('@modelcontextprotocol/client root entry is browser-safe', () => {
 beforeAll(() => {
 if (!existsSync(join(distDir, 'index.mjs')) || !existsSync(join(distDir, 'stdio.mjs'))) {
Expand DownExpand Up@@ -80,4 +87,13 @@ describe('@modelcontextprotocol/client root entry is browser-safe', () => {

 expect(new AjvJsonSchemaValidator(ajv)).toBeInstanceOf(AjvJsonSchemaValidator);
 });

 test('root declarations do not advertise validator provider classes', () => {
 for (const declaration of ['index.d.mts', 'index.d.cts']) {
 const rootExportBlock = rootExportBlockOf(readFileSync(join(distDir, declaration), 'utf8'));
 for (const symbol of ROOT_VALIDATOR_EXPORTS) {
 expect(rootExportBlock).not.toMatch(new RegExp(`\\b(?:type\\s+)?${symbol}\\b`));
 }
 }
 });
});

7 changes: 3 additions & 4 deletions
packages/core-internal/src/exports/public/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,10 +131,9 @@ export {
export type { SpecTypeName, SpecTypes } from '../../types/specTypeSchema';
export { isSpecType, specTypeSchemas } from '../../types/specTypeSchema';
export type { StandardSchemaV1, StandardSchemaV1Sync, StandardSchemaWithJSON } from '../../util/standardSchema';
// Validator providers are type-only here — import the runtime classes from the explicit
// `@modelcontextprotocol/{client,server}/validators/{ajv,cf-worker}` subpaths to customise.
export type { AjvJsonSchemaValidator } from '../../validators/ajvProvider';
export type { CfWorkerJsonSchemaValidator, CfWorkerSchemaDraft } from '../../validators/cfWorkerProvider';
// Validator provider classes stay subpath-only. Re-exporting them here, even as
// `type`, can make generated root declarations advertise runtime-shaped root
// exports that the package root does not provide.
// fromJsonSchema is intentionally NOT exported here — the server and client packages
// provide runtime-aware wrappers that default to the appropriate validator via _shims.
export type { JsonSchemaType, JsonSchemaValidator, jsonSchemaValidator, JsonSchemaValidatorResult } from '../../validators/types';

7 changes: 3 additions & 4 deletions
packages/core-internal/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,9 +33,8 @@ export * from './util/standardSchema';
export * from './util/zodCompat';
export { codecForVersion, MODERN_WIRE_REVISION } from './wire/codec';

// Validator providers are type-only here — import the runtime classes from the explicit
// `@modelcontextprotocol/{client,server}/validators/{ajv,cf-worker}` subpaths to customise.
export type { AjvJsonSchemaValidator } from './validators/ajvProvider';
export type { CfWorkerJsonSchemaValidator, CfWorkerSchemaDraft } from './validators/cfWorkerProvider';
// Validator provider classes stay subpath-only. Re-exporting them here, even as
// `type`, can make generated client/server root declarations advertise
// runtime-shaped root exports that the package root does not provide.
export * from './validators/fromJsonSchema';
export type { JsonSchemaType, JsonSchemaValidator, jsonSchemaValidator, JsonSchemaValidatorResult } from './validators/types';

16 changes: 16 additions & 0 deletions
packages/server/test/server/barrelClean.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ const requireDist = createRequire(join(pkgDir, 'package.json'));
const NODE_ONLY = /\b(child_process|cross-spawn|node:stream|node:child_process)\b/;
// Anchored at start-of-line so JSDoc-example `from 'ajv'` strings in vendored chunks don't match.
const VALIDATOR_BACKEND_IMPORT = /^import[^\n]*?from\s+["'](?:ajv|ajv-formats|@cfworker\/json-schema)["']/m;
const ROOT_VALIDATOR_EXPORTS = ['AjvJsonSchemaValidator', 'CfWorkerJsonSchemaValidator', 'CfWorkerSchemaDraft'];

function chunkImportsOf(entryPath: string): string[] {
 const visited = new Set<string>();
Expand All@@ -29,6 +30,12 @@ function chunkImportsOf(entryPath: string): string[] {
 return [...visited];
}

function rootExportBlockOf(content: string): string {
 const blocks = content.match(/(?:^|\n)export \{[\s\S]*?\};/g);
 expect(blocks).toBeTruthy();
 return blocks!.at(-1)!;
}

describe('@modelcontextprotocol/server root entry is browser-safe', () => {
 beforeAll(() => {
 if (!existsSync(join(distDir, 'index.mjs')) || !existsSync(join(distDir, 'stdio.mjs'))) {
Expand DownExpand Up@@ -81,4 +88,13 @@ describe('@modelcontextprotocol/server root entry is browser-safe', () => {

 expect(new AjvJsonSchemaValidator(ajv)).toBeInstanceOf(AjvJsonSchemaValidator);
 });

 test('root declarations do not advertise validator provider classes', () => {
 for (const declaration of ['index.d.mts', 'index.d.cts']) {
 const rootExportBlock = rootExportBlockOf(readFileSync(join(distDir, declaration), 'utf8'));
 for (const symbol of ROOT_VALIDATOR_EXPORTS) {
 expect(rootExportBlock).not.toMatch(new RegExp(`\\b(?:type\\s+)?${symbol}\\b`));
 }
 }
 });
});

4 changes: 2 additions & 2 deletions
scripts/smoke-dist-types.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ try {
 path.join(dir, 'consumer.ts'),
 [
 "import { Client } from '@modelcontextprotocol/client';",
 "import type { AjvJsonSchemaValidator as ClientAjv } from '@modelcontextprotocol/client';",
 "import type { JsonSchemaType as ClientSchema } from '@modelcontextprotocol/client';",
 "import { AjvJsonSchemaValidator } from '@modelcontextprotocol/client/validators/ajv';",
 "import { CfWorkerJsonSchemaValidator as ClientCf } from '@modelcontextprotocol/client/validators/cf-worker';",
 "import { StdioClientTransport } from '@modelcontextprotocol/client/stdio';",
Expand All@@ -24,7 +24,7 @@ try {
 "import { StdioServerTransport } from '@modelcontextprotocol/server/stdio';",
 "export const c = new Client({ name: 'smoke', version: '1.0.0' });",
 "export const s = new McpServer({ name: 'smoke', version: '1.0.0' });",
 'export type T = ClientAjv;',
 'export type T = ClientSchema;',
 'export { AjvJsonSchemaValidator, ServerAjv, ClientCf, ServerCf, StdioClientTransport, StdioServerTransport };',
 ''
 ].join('\n')
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
fix: keep validator providers off root declarations by Sehlani042 · Pull Request #2425 · modelcontextprotocol/typescript-sdk · GitHub
Skip to content
fix: keep validator providers off root declarations#2425

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.

 Sign up for GitHub

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

 Merged

mattzcarey
merged 3 commits into

from

Jul 6, 2026
 Merged


fix: keep validator providers off root declarations
#2425
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
23f03f0

fix: keep validator providers off root declarations


Sehlani042 Jul 2, 2026
5758757

chore: add validator declarations changeset


Sehlani042 Jul 2, 2026
412bddd

test: update dist type smoke for validator subpaths


Sehlani042 Jul 2, 2026

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


6 changes: 6 additions & 0 deletions
.changeset/silent-validators-wave.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@modelcontextprotocol/client': patch
'@modelcontextprotocol/server': patch
---

Stop advertising validator provider classes from the root client/server type declarations. The provider classes remain available from the explicit validator subpaths.

16 changes: 16 additions & 0 deletions
packages/client/test/client/barrelClean.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ const requireDist = createRequire(join(pkgDir, 'package.json'));
const NODE_ONLY = /\b(child_process|cross-spawn|node:stream|node:child_process)\b/;
// Anchored at start-of-line so JSDoc-example `from 'ajv'` strings in vendored chunks don't match.
const VALIDATOR_BACKEND_IMPORT = /^import[^\n]*?from\s+["'](?:ajv|ajv-formats|@cfworker\/json-schema)["']/m;
const ROOT_VALIDATOR_EXPORTS = ['AjvJsonSchemaValidator', 'CfWorkerJsonSchemaValidator', 'CfWorkerSchemaDraft'];

function chunkImportsOf(entryPath: string): string[] {
 const visited = new Set<string>();
Expand All@@ -29,6 +30,12 @@ function chunkImportsOf(entryPath: string): string[] {
 return [...visited];
}

function rootExportBlockOf(content: string): string {
 const blocks = content.match(/(?:^|\n)export \{[\s\S]*?\};/g);
 expect(blocks).toBeTruthy();
 return blocks!.at(-1)!;
}

describe('@modelcontextprotocol/client root entry is browser-safe', () => {
 beforeAll(() => {
 if (!existsSync(join(distDir, 'index.mjs')) || !existsSync(join(distDir, 'stdio.mjs'))) {
Expand DownExpand Up@@ -80,4 +87,13 @@ describe('@modelcontextprotocol/client root entry is browser-safe', () => {

 expect(new AjvJsonSchemaValidator(ajv)).toBeInstanceOf(AjvJsonSchemaValidator);
 });

 test('root declarations do not advertise validator provider classes', () => {
 for (const declaration of ['index.d.mts', 'index.d.cts']) {
 const rootExportBlock = rootExportBlockOf(readFileSync(join(distDir, declaration), 'utf8'));
 for (const symbol of ROOT_VALIDATOR_EXPORTS) {
 expect(rootExportBlock).not.toMatch(new RegExp(`\\b(?:type\\s+)?${symbol}\\b`));
 }
 }
 });
});

7 changes: 3 additions & 4 deletions
packages/core-internal/src/exports/public/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,10 +131,9 @@ export {
export type { SpecTypeName, SpecTypes } from '../../types/specTypeSchema';
export { isSpecType, specTypeSchemas } from '../../types/specTypeSchema';
export type { StandardSchemaV1, StandardSchemaV1Sync, StandardSchemaWithJSON } from '../../util/standardSchema';
// Validator providers are type-only here — import the runtime classes from the explicit
// `@modelcontextprotocol/{client,server}/validators/{ajv,cf-worker}` subpaths to customise.
export type { AjvJsonSchemaValidator } from '../../validators/ajvProvider';
export type { CfWorkerJsonSchemaValidator, CfWorkerSchemaDraft } from '../../validators/cfWorkerProvider';
// Validator provider classes stay subpath-only. Re-exporting them here, even as
// `type`, can make generated root declarations advertise runtime-shaped root
// exports that the package root does not provide.
// fromJsonSchema is intentionally NOT exported here — the server and client packages
// provide runtime-aware wrappers that default to the appropriate validator via _shims.
export type { JsonSchemaType, JsonSchemaValidator, jsonSchemaValidator, JsonSchemaValidatorResult } from '../../validators/types';

7 changes: 3 additions & 4 deletions
packages/core-internal/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,9 +33,8 @@ export * from './util/standardSchema';
export * from './util/zodCompat';
export { codecForVersion, MODERN_WIRE_REVISION } from './wire/codec';

// Validator providers are type-only here — import the runtime classes from the explicit
// `@modelcontextprotocol/{client,server}/validators/{ajv,cf-worker}` subpaths to customise.
export type { AjvJsonSchemaValidator } from './validators/ajvProvider';
export type { CfWorkerJsonSchemaValidator, CfWorkerSchemaDraft } from './validators/cfWorkerProvider';
// Validator provider classes stay subpath-only. Re-exporting them here, even as
// `type`, can make generated client/server root declarations advertise
// runtime-shaped root exports that the package root does not provide.
export * from './validators/fromJsonSchema';
export type { JsonSchemaType, JsonSchemaValidator, jsonSchemaValidator, JsonSchemaValidatorResult } from './validators/types';

16 changes: 16 additions & 0 deletions
packages/server/test/server/barrelClean.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ const requireDist = createRequire(join(pkgDir, 'package.json'));
const NODE_ONLY = /\b(child_process|cross-spawn|node:stream|node:child_process)\b/;
// Anchored at start-of-line so JSDoc-example `from 'ajv'` strings in vendored chunks don't match.
const VALIDATOR_BACKEND_IMPORT = /^import[^\n]*?from\s+["'](?:ajv|ajv-formats|@cfworker\/json-schema)["']/m;
const ROOT_VALIDATOR_EXPORTS = ['AjvJsonSchemaValidator', 'CfWorkerJsonSchemaValidator', 'CfWorkerSchemaDraft'];

function chunkImportsOf(entryPath: string): string[] {
 const visited = new Set<string>();
Expand All@@ -29,6 +30,12 @@ function chunkImportsOf(entryPath: string): string[] {
 return [...visited];
}

function rootExportBlockOf(content: string): string {
 const blocks = content.match(/(?:^|\n)export \{[\s\S]*?\};/g);
 expect(blocks).toBeTruthy();
 return blocks!.at(-1)!;
}

describe('@modelcontextprotocol/server root entry is browser-safe', () => {
 beforeAll(() => {
 if (!existsSync(join(distDir, 'index.mjs')) || !existsSync(join(distDir, 'stdio.mjs'))) {
Expand DownExpand Up@@ -81,4 +88,13 @@ describe('@modelcontextprotocol/server root entry is browser-safe', () => {

 expect(new AjvJsonSchemaValidator(ajv)).toBeInstanceOf(AjvJsonSchemaValidator);
 });

 test('root declarations do not advertise validator provider classes', () => {
 for (const declaration of ['index.d.mts', 'index.d.cts']) {
 const rootExportBlock = rootExportBlockOf(readFileSync(join(distDir, declaration), 'utf8'));
 for (const symbol of ROOT_VALIDATOR_EXPORTS) {
 expect(rootExportBlock).not.toMatch(new RegExp(`\\b(?:type\\s+)?${symbol}\\b`));
 }
 }
 });
});

4 changes: 2 additions & 2 deletions
scripts/smoke-dist-types.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ try {
 path.join(dir, 'consumer.ts'),
 [
 "import { Client } from '@modelcontextprotocol/client';",
 "import type { AjvJsonSchemaValidator as ClientAjv } from '@modelcontextprotocol/client';",
 "import type { JsonSchemaType as ClientSchema } from '@modelcontextprotocol/client';",
 "import { AjvJsonSchemaValidator } from '@modelcontextprotocol/client/validators/ajv';",
 "import { CfWorkerJsonSchemaValidator as ClientCf } from '@modelcontextprotocol/client/validators/cf-worker';",
 "import { StdioClientTransport } from '@modelcontextprotocol/client/stdio';",
Expand All@@ -24,7 +24,7 @@ try {
 "import { StdioServerTransport } from '@modelcontextprotocol/server/stdio';",
 "export const c = new Client({ name: 'smoke', version: '1.0.0' });",
 "export const s = new McpServer({ name: 'smoke', version: '1.0.0' });",
 'export type T = ClientAjv;',
 'export type T = ClientSchema;',
 'export { AjvJsonSchemaValidator, ServerAjv, ClientCf, ServerCf, StdioClientTransport, StdioServerTransport };',
 ''
 ].join('\n')
Expand Down
Loading