<!-- Provide a brief summary of your changes --> ## Motivation and Context Currently there are a couple shortcomings I found in the server.schema.json: - It uses `https://json-schema.org/draft/2020-12/schema` which is unfortunately [not supported by VS Code](https://github.com/microsoft/vscode/issues/165219) - The Package schema does not require properties that are required by the service This means that need to round trip with the publish endpoint (perhaps spinning CI builds) to get the server.json right. It would be great if we could shift left and get indications in VS Code easier. I propose we downgrade the schema to `http://json-schema.org/draft-07/schema#`. The only difference for us is the name of `$def` pointers. I looked that [SchemaStore](https://github.com/SchemaStore/schemastore) and it looks like `draft-07` is by far the most popular. I believe the concession of using an older schema is worth it to get VS Code editor hints. Schema version | Count in SchemaStore -- | -- `http://json-schema.org/draft-04/schema#` | 292 `http://json-schema.org/draft-07/schema#` | 1972 `https://json-schema.org/draft/2019-09/schema` | 4 `https://json-schema.org/draft/2020-12/schema` | 4 <!-- Why is this change needed? What problem does it solve? --> ## Open questions - [ ] Should package `transport` actually be required? Or should `stdio` be assumed? - [ ] Should package `registry_base_url` be required? All of the examples have it it's not required by the publish endpoint. ## How Has This Been Tested? <!-- Have you tested this in a real application? Which scenarios were tested? --> I have tried the new schema inside VS Code and I get helpful warning. For example, these are the warnings for the old schema. <img width="1561" height="919" alt="image" src="https://github.com/user-attachments/assets/474170b8-acf8-4dca-a3d9-66c68c0d1902" /> I have run these: `go run .\tools\validate-examples\main.go` `go run .\tools\validate-schemas\main.go ` ## Breaking Changes I don't think these are breaking changes. I am expressing what the publish endpoint enforces at runtime. ## Types of changes <!-- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [x] Documentation update ## Checklist <!-- Go over all the following points, and put an `x` in all the boxes that apply. --> - [ ] I have read the [MCP Documentation](https://modelcontextprotocol.io) - [ ] My code follows the repository's style guidelines - [ ] New and existing tests pass locally - [ ] I have added appropriate error handling - [x] I have added or updated documentation as needed ## Additional context <!-- Add any other context, implementation notes, or design decisions -->
203 lines
5.8 KiB
Go
203 lines
5.8 KiB
Go
// validate-examples validates JSON examples in docs/server-json/examples.md
|
|
// against both schema.json and registry-schema.json.
|
|
//
|
|
// For more information, see docs/server-json/README.md
|
|
package main
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"fmt"
|
|
"log"
|
|
"os"
|
|
"path/filepath"
|
|
"regexp"
|
|
"strings"
|
|
|
|
"github.com/modelcontextprotocol/registry/internal/validators"
|
|
apiv0 "github.com/modelcontextprotocol/registry/pkg/api/v0"
|
|
jsonschema "github.com/santhosh-tekuri/jsonschema/v5"
|
|
)
|
|
|
|
const (
|
|
// expectedExampleCount is the number of JSON examples we expect to find in generic-server-json.md
|
|
// IMPORTANT: Only change this count if you have intentionally added or removed examples. This
|
|
// check prevents accidental formatting changes from causing examples to be skipped during validation.
|
|
expectedExampleCount = 13
|
|
)
|
|
|
|
func main() {
|
|
log.SetFlags(0) // Remove timestamp from logs
|
|
|
|
if err := runValidation(); err != nil {
|
|
log.Fatalf("Error: %v", err)
|
|
}
|
|
}
|
|
|
|
func runValidation() error {
|
|
basePath := filepath.Join("docs", "reference", "server-json")
|
|
|
|
examplesPath := filepath.Join(basePath, "generic-server-json.md")
|
|
schemaPath := filepath.Join(basePath, "server.schema.json")
|
|
|
|
examples, err := extractExamples(examplesPath)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to extract examples: %w", err)
|
|
}
|
|
|
|
log.Printf("Found %d examples in examples.md\n", len(examples))
|
|
|
|
if len(examples) != expectedExampleCount {
|
|
return fmt.Errorf("expected %d examples but found %d - if this is intentional, update expectedExampleCount in %s",
|
|
expectedExampleCount, len(examples), "tools/validate-examples/main.go")
|
|
}
|
|
|
|
log.Println()
|
|
|
|
baseSchema, err := compileSchema(schemaPath)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to compile server.schema.json: %w", err)
|
|
}
|
|
|
|
validatedCount := 0
|
|
|
|
for i, example := range examples {
|
|
log.Printf("Example %d:", i+1)
|
|
|
|
if validateExample(example, baseSchema) {
|
|
validatedCount++
|
|
}
|
|
|
|
log.Println()
|
|
}
|
|
|
|
if validatedCount != expectedExampleCount {
|
|
return fmt.Errorf("validation failed: expected %d examples to pass all validations but only %d did",
|
|
expectedExampleCount, validatedCount)
|
|
}
|
|
|
|
log.Printf("Successfully validated all %d examples!", validatedCount)
|
|
return nil
|
|
}
|
|
|
|
func validateExample(ex example, baseSchema *jsonschema.Schema) bool {
|
|
var data any
|
|
if err := json.Unmarshal([]byte(ex.content), &data); err != nil {
|
|
log.Printf(" ❌ Invalid JSON: %v", err)
|
|
return false
|
|
}
|
|
|
|
// Extract server portion if this is a PublishRequest format
|
|
serverData := data
|
|
publishRequestValid := true
|
|
if dataMap, ok := data.(map[string]any); ok {
|
|
if server, exists := dataMap["server"]; exists {
|
|
// This is a PublishRequest format - validate only expected properties exist
|
|
for key := range dataMap {
|
|
if key != "server" && key != "x-publisher" {
|
|
log.Printf(" Invalid PublishRequest property: ❌ %s (only 'server' and optional 'x-publisher' are allowed)", key)
|
|
publishRequestValid = false
|
|
}
|
|
}
|
|
serverData = server
|
|
}
|
|
}
|
|
|
|
baseValid := validateAgainstSchema(serverData, baseSchema, "server.schema.json")
|
|
goValidatorValid := validateWithObjectValidator(serverData)
|
|
|
|
// Only count as validated if all validations passed
|
|
return publishRequestValid && baseValid && goValidatorValid
|
|
}
|
|
|
|
func validateAgainstSchema(data any, schema *jsonschema.Schema, schemaName string) bool {
|
|
if err := schema.Validate(data); err != nil {
|
|
log.Printf(" Validating against %s: ❌", schemaName)
|
|
log.Printf(" Error: %v", err)
|
|
return false
|
|
}
|
|
log.Printf(" Validating against %s: ✅", schemaName)
|
|
return true
|
|
}
|
|
|
|
func validateWithObjectValidator(serverData any) bool {
|
|
var serverDetail apiv0.ServerJSON
|
|
serverDataBytes, err := json.Marshal(serverData)
|
|
if err != nil {
|
|
log.Printf(" Validating with Go Validator: ❌")
|
|
log.Printf(" Error marshaling server data: %v", err)
|
|
return false
|
|
}
|
|
|
|
if err := json.Unmarshal(serverDataBytes, &serverDetail); err != nil {
|
|
log.Printf(" Validating with Go Validator: ❌")
|
|
log.Printf(" Error unmarshaling to ServerDetail: %v", err)
|
|
return false
|
|
}
|
|
|
|
if err := validators.ValidateServerJSON(&serverDetail); err != nil {
|
|
log.Printf(" Validating with Go Validator: ❌")
|
|
log.Printf(" Error: %v", err)
|
|
return false
|
|
}
|
|
|
|
log.Printf(" Validating with Go Validator: ✅")
|
|
return true
|
|
}
|
|
|
|
type example struct {
|
|
content string
|
|
line int
|
|
}
|
|
|
|
func extractExamples(path string) ([]example, error) {
|
|
data, err := os.ReadFile(path)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
content := string(data)
|
|
|
|
// Regex to match JSON code blocks in markdown
|
|
// Captures everything between ```json and ```
|
|
re := regexp.MustCompile("(?s)```json\r?\n(.*?)\r?\n```")
|
|
matches := re.FindAllStringSubmatchIndex(content, -1)
|
|
|
|
var examples []example
|
|
for _, match := range matches {
|
|
if len(match) < 4 {
|
|
// should never happen
|
|
return nil, fmt.Errorf("invalid match - expected at least 4 indices but got %d", len(match))
|
|
}
|
|
start, end := match[2], match[3]
|
|
// line numbers start at 1
|
|
line := 1 + strings.Count(content[:start], "\n")
|
|
examples = append(examples, example{
|
|
content: content[start:end],
|
|
line: line,
|
|
})
|
|
}
|
|
|
|
return examples, nil
|
|
}
|
|
|
|
func compileSchema(path string) (*jsonschema.Schema, error) {
|
|
compiler := jsonschema.NewCompiler()
|
|
compiler.Draft = jsonschema.Draft7
|
|
|
|
// For registry-schema.json, we need to register the base schema it references
|
|
if strings.Contains(path, "registry-schema.json") {
|
|
basePath := filepath.Join(filepath.Dir(path), "server.schema.json")
|
|
baseData, err := os.ReadFile(basePath)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to read base schema: %w", err)
|
|
}
|
|
|
|
// Add the base schema to the compiler with the expected URL
|
|
if err := compiler.AddResource("https://static.modelcontextprotocol.io/schemas/2025-07-09/server.schema.json", bytes.NewReader(baseData)); err != nil {
|
|
return nil, fmt.Errorf("failed to add base schema resource: %w", err)
|
|
}
|
|
}
|
|
|
|
return compiler.Compile(path)
|
|
}
|