Skip to content

Commit 8cdb4bb

Browse files
richarda23richardiwfelixweinberger
authored
rename 'validation' folder->'validators' (modelcontextprotocol#1340)
Co-authored-by: richarda23 <richard.c.adams@infinityworks.com> Co-authored-by: Felix Weinberger <fweinberger@anthropic.com>
1 parent 108f2f3 commit 8cdb4bb

File tree

10 files changed

+18
-18
lines changed

10 files changed

+18
-18
lines changed

CLAUDE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ The SDK uses `zod/v4` internally. Schema utilities live in:
102102

103103
### Validation
104104

105-
Pluggable JSON Schema validation (`packages/core/src/validation/`):
105+
Pluggable JSON Schema validation (`packages/core/src/validators/`):
106106

107-
- `ajv-provider.ts` - Default Ajv-based validator
108-
- `cfworker-provider.ts` - Cloudflare Workers-compatible alternative
107+
- `ajvProvider.ts` - Default Ajv-based validator
108+
- `cfWorkerProvider.ts` - Cloudflare Workers-compatible alternative
109109

110110
### Examples
111111

packages/core/src/index.examples.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
* @module
88
*/
99

10-
import { AjvJsonSchemaValidator } from './validation/ajvProvider.js';
11-
import { CfWorkerJsonSchemaValidator } from './validation/cfWorkerProvider.js';
10+
import { AjvJsonSchemaValidator } from './validators/ajvProvider.js';
11+
import { CfWorkerJsonSchemaValidator } from './validators/cfWorkerProvider.js';
1212

1313
/**
1414
* Example: AJV validator for Node.js.

packages/core/src/index.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@ export * from './util/schema.js';
1515

1616
// experimental exports
1717
export * from './experimental/index.js';
18-
export * from './validation/ajvProvider.js';
19-
export * from './validation/cfWorkerProvider.js';
18+
export * from './validators/ajvProvider.js';
19+
export * from './validators/cfWorkerProvider.js';
2020
/**
2121
* JSON Schema validation
2222
*
2323
* This module provides configurable JSON Schema validation for the MCP SDK.
2424
* Choose a validator based on your runtime environment:
2525
*
2626
* - {@linkcode AjvJsonSchemaValidator}: Best for Node.js (default, fastest)
27-
* Import from: @modelcontextprotocol/sdk/validation/ajv
27+
* Import from: @modelcontextprotocol/sdk/validators/ajv
2828
* Requires peer dependencies: ajv, ajv-formats
2929
*
3030
* - {@linkcode CfWorkerJsonSchemaValidator}: Best for edge runtimes
31-
* Import from: @modelcontextprotocol/sdk/validation/cfworker
31+
* Import from: @modelcontextprotocol/sdk/validators/cfworker
3232
* Requires peer dependency: @cfworker/json-schema
3333
*
3434
* @example For Node.js with AJV
@@ -45,4 +45,4 @@ export * from './validation/cfWorkerProvider.js';
4545
*/
4646

4747
// Core types only - implementations are exported via separate entry points
48-
export type { JsonSchemaType, JsonSchemaValidator, jsonSchemaValidator, JsonSchemaValidatorResult } from './validation/types.js';
48+
export type { JsonSchemaType, JsonSchemaValidator, jsonSchemaValidator, JsonSchemaValidatorResult } from './validators/types.js';
File renamed without changes.
File renamed without changes.

packages/core/src/validation/cfWorkerProvider.examples.ts renamed to packages/core/src/validators/cfWorkerProvider.examples.ts

File renamed without changes.
File renamed without changes.
File renamed without changes.

packages/core/test/validation/validation.test.ts renamed to packages/core/test/validators/validators.test.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import path from 'node:path';
99

1010
import { vi } from 'vitest';
1111

12-
import { AjvJsonSchemaValidator } from '../../src/validation/ajvProvider.js';
13-
import { CfWorkerJsonSchemaValidator } from '../../src/validation/cfWorkerProvider.js';
14-
import type { JsonSchemaType } from '../../src/validation/types.js';
12+
import { AjvJsonSchemaValidator } from '../../src/validators/ajvProvider.js';
13+
import { CfWorkerJsonSchemaValidator } from '../../src/validators/cfWorkerProvider.js';
14+
import type { JsonSchemaType } from '../../src/validators/types.js';
1515

1616
// Test with both AJV and CfWorker validators
1717
// AJV validator will use default configuration with format validation enabled
@@ -554,7 +554,7 @@ describe('Missing dependencies', () => {
554554
});
555555

556556
// Attempting to import ajv-provider should fail
557-
await expect(import('../../src/validation/ajvProvider.js')).rejects.toThrow();
557+
await expect(import('../../src/validators/ajvProvider.js')).rejects.toThrow();
558558
});
559559

560560
it('should be able to import cfWorkerProvider when ajv is missing', async () => {
@@ -568,7 +568,7 @@ describe('Missing dependencies', () => {
568568
});
569569

570570
// But cfWorkerProvider should import successfully
571-
const cfworkerModule = await import('../../src/validation/cfWorkerProvider.js');
571+
const cfworkerModule = await import('../../src/validators/cfWorkerProvider.js');
572572
expect(cfworkerModule.CfWorkerJsonSchemaValidator).toBeDefined();
573573

574574
// And should work correctly
@@ -595,7 +595,7 @@ describe('Missing dependencies', () => {
595595
});
596596

597597
// Attempting to import cfWorkerProvider should fail
598-
await expect(import('../../src/validation/cfWorkerProvider.js')).rejects.toThrow();
598+
await expect(import('../../src/validators/cfWorkerProvider.js')).rejects.toThrow();
599599
});
600600

601601
it('should be able to import ajv-provider when @cfworker/json-schema is missing', async () => {
@@ -605,7 +605,7 @@ describe('Missing dependencies', () => {
605605
});
606606

607607
// But ajv-provider should import successfully
608-
const ajvModule = await import('../../src/validation/ajvProvider.js');
608+
const ajvModule = await import('../../src/validators/ajvProvider.js');
609609
expect(ajvModule.AjvJsonSchemaValidator).toBeDefined();
610610

611611
// And should work correctly
@@ -616,7 +616,7 @@ describe('Missing dependencies', () => {
616616
});
617617

618618
it('should document that @cfworker/json-schema is required', () => {
619-
const cfworkerProviderPath = path.join(__dirname, '../../src/validation/cfWorkerProvider.ts');
619+
const cfworkerProviderPath = path.join(__dirname, '../../src/validators/cfWorkerProvider.ts');
620620
const content = readFileSync(cfworkerProviderPath, 'utf8');
621621

622622
expect(content).toContain('@cfworker/json-schema');

0 commit comments

Comments
 (0)