Merge branch 'main' of github.com:rust-mcp-stack/rust-mcp-schema

Author: hashemix

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.6.0](https://github.com/rust-mcp-stack/rust-mcp-schema/compare/v0.5.2...v0.6.0) (2025-06-17)
+
+
+### ⚠ BREAKING CHANGES
+
+* add support for multiple active schema versions with versioned module access ([#73](https://github.com/rust-mcp-stack/rust-mcp-schema/issues/73))
+
+### Features
+
+* add support for multiple active schema versions with versioned module access ([#73](https://github.com/rust-mcp-stack/rust-mcp-schema/issues/73)) ([2570c2b](https://github.com/rust-mcp-stack/rust-mcp-schema/commit/2570c2ba4c5f0f166b5d41158cbb2769a3fe399b))
+
 ## [0.5.2](https://github.com/rust-mcp-stack/rust-mcp-schema/compare/v0.5.1...v0.5.2) (2025-05-28)
 
 

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "rust-mcp-schema"
-version = "0.5.2"
+version = "0.6.0"
 authors = ["Ali Hashemi"]
 categories = ["data-structures", "parser-implementations", "parsing"]
 description = "Type-safe implementation of the Model Context Protocol in Rust, designed to reduce errors and accelerate development with powerful utilities."
@@ -36,13 +36,12 @@ features = ["2025_03_26", "schema_utils"]
 [features]
 
 # defalt features
-default = ["2025_03_26", "schema_utils"] # Default features
+default = ["latest", "schema_utils"] # Default features
 
 # activates the latest MCP schema version, this will be updated once a new version of schema is published
 latest = ["2025_03_26"]
-
 # enabled mcp schema version 2025_03_26
-2025_03_26 = []
+2025_03_26 = ["latest"]
 # enabled mcp schema version 2024_11_05
 2024_11_05 = []
 # enabled draft mcp schema

Cargo.toml

@@ -76,30 +76,29 @@ This repository provides all official released versions the schema , including d
 
 ### How to switch between different schema versions?
 
+By default, the latest version of the MCP Protocol schema is enabled.
+
 Each schema version has a corresponding Cargo feature that can be enabled in your project's Cargo.toml.
-By default, the version `2025_03_26` of the schema is active.
+
+Multiple schema versions may be enabled concurrently if needed. Non-default versions are available under explicitly named modules, for example:
+
+- rust_mcp_schema::mcp_2024_11_05
+- rust_mcp_schema::mcp_draft"
 
 Example: enable `2024_11_05` version of the shema:
 
 <!-- x-release-please-start-version -->
 
 ```toml
 # Cargo.toml
-rust-mcp-schema = { version: 0.5.2 , features=["2024_11_05"] }
-```
-
-Example: enable `latest` version of the shema:
-
-```toml
-#Cargo.toml
-rust-mcp-schema = { version: 0.5.2 , features=["latest"] }
+rust-mcp-schema = { version: 0.6.0 , default-features = false, features=["2024_11_05"] }
 ```
 
 Example: enable `draft`` version of the shema (2024_11_05) :
 
 ```toml
 #Cargo.toml
-rust-mcp-schema = { version: 0.5.2 , features=["draft"] }
+rust-mcp-schema = { version: 0.6.0 , default-features = false, features=["draft"] }
 ```
 
 <!-- x-release-please-end -->

README.md

@@ -1,5 +1,18 @@
+#[cfg(feature = "latest")]
 use rust_mcp_schema::schema_utils::*;
+#[cfg(feature = "latest")]
 use rust_mcp_schema::*;
+
+#[cfg(feature = "2024_11_05")]
+use rust_mcp_schema::mcp_2024_11_05::schema_utils::*;
+#[cfg(feature = "2024_11_05")]
+use rust_mcp_schema::mcp_2024_11_05::*;
+
+#[cfg(feature = "draft")]
+use rust_mcp_schema::mcp_draft::schema_utils::*;
+#[cfg(feature = "draft")]
+use rust_mcp_schema::mcp_draft::*;
+
 use std::str::FromStr;
 
 type AppError = RpcError;

examples/mcp_client_handle_message.rs

@@ -1,5 +1,18 @@
+#[cfg(feature = "latest")]
 use rust_mcp_schema::schema_utils::*;
+#[cfg(feature = "latest")]
 use rust_mcp_schema::*;
+
+#[cfg(feature = "2024_11_05")]
+use rust_mcp_schema::mcp_2024_11_05::schema_utils::*;
+#[cfg(feature = "2024_11_05")]
+use rust_mcp_schema::mcp_2024_11_05::*;
+
+#[cfg(feature = "draft")]
+use rust_mcp_schema::mcp_draft::schema_utils::*;
+#[cfg(feature = "draft")]
+use rust_mcp_schema::mcp_draft::*;
+
 use std::str::FromStr;
 
 type AppError = RpcError;

examples/mcp_server_handle_message.rs

@@ -1,12 +1,12 @@
 #!/bin/bash
 
 # common features (always included in the tests)
-COMMON_FEATURES=("schema_utils")  
+COMMON_FEATURES=("schema_utils")
 
 # schema versions features (tested one at a time)
 SCHEMA_VERSION_FEATURES=("2025_03_26", "2024_11_05", "draft")
 
-# space-separated string 
+# space-separated string
 COMMON_FEATURES_STR="${COMMON_FEATURES[*]}"
 
 for FEATURE in "${SCHEMA_VERSION_FEATURES[@]}"; do
@@ -18,10 +18,6 @@ for FEATURE in "${SCHEMA_VERSION_FEATURES[@]}"; do
         echo "❌ Tests failed for: --features \"$COMMON_FEATURES_STR $FEATURE\""
         exit 1
     fi
-    
-    echo
-    echo "🚀 Running documentation tests with: --features \"$COMMON_FEATURES_STR $FEATURE\""
-    cargo test --doc --no-default-features --features "$COMMON_FEATURES_STR $FEATURE"
 
     # stop on failure
     if [ $? -ne 0 ]; then
@@ -30,4 +26,10 @@ for FEATURE in "${SCHEMA_VERSION_FEATURES[@]}"; do
     fi
 done
 
-echo "✅ All tests passed!"
+# Get the first feature from the array
+FEATURE="${SCHEMA_VERSION_FEATURES[0]}"
+echo
+echo "🚀 Running documentation tests with: --features \"$COMMON_FEATURES_STR $FEATURE\""
+cargo test --doc --no-default-features --features "$COMMON_FEATURES_STR $FEATURE"
+
+echo "✅ All tests passed!"

scripts/run_test.sh

@@ -1,38 +1,65 @@
-/// Schema Version: 2024_11_05
-#[cfg(feature = "2024_11_05")]
-#[path = "generated_schema/2024_11_05/mcp_schema.rs"]
-mod mcp_schema;
+macro_rules! define_schema_version {
+    (
+        $feature:literal,
+        $mod_name:ident,
+        $schema_path:literal,
+        $utils_path:literal,
+        $schema_mod:ident,
+        $utils_mod:ident
+    ) => {
+        #[cfg(feature = $feature)]
+        #[path = $schema_path]
+        mod $schema_mod;
 
-#[cfg(feature = "2024_11_05")]
-pub use mcp_schema::*;
+        #[cfg(all(feature = "schema_utils", feature = $feature))]
+        #[path = $utils_path]
+        mod $utils_mod;
 
-#[cfg(all(feature = "schema_utils", feature = "2024_11_05"))]
-#[path = "generated_schema/2024_11_05/schema_utils.rs"]
-pub mod schema_utils;
+        #[cfg(feature = $feature)]
+        pub mod $mod_name {
+            pub use super::$schema_mod::*;
 
-/// Schema Version: 2025_03_26
-#[cfg(feature = "2025_03_26")]
-#[path = "generated_schema/2025_03_26/mcp_schema.rs"]
-mod mcp_schema;
+            #[cfg(feature = "schema_utils")]
+            pub mod schema_utils {
+                pub use super::super::$utils_mod::*;
+            }
+        }
+    };
+}
 
+/// Latest MCP Protocol 2025_03_26
 #[cfg(feature = "2025_03_26")]
-pub use mcp_schema::*;
+pub use mcp_2025_03_26::*;
 
-#[cfg(all(feature = "schema_utils", feature = "2025_03_26"))]
-#[path = "generated_schema/2025_03_26/schema_utils.rs"]
-pub mod schema_utils;
+#[cfg(feature = "2025_03_26")]
+define_schema_version!(
+    "2025_03_26",
+    mcp_2025_03_26,
+    "generated_schema/2025_03_26/mcp_schema.rs",
+    "generated_schema/2025_03_26/schema_utils.rs",
+    __int_2025_03_26,
+    __int_utils_2025_03_26
+);
 
-/// Schema Version: draft
-#[cfg(feature = "draft")]
-#[path = "generated_schema/draft/mcp_schema.rs"]
-mod mcp_schema;
+#[cfg(feature = "2024_11_05")]
+define_schema_version!(
+    "2024_11_05",
+    mcp_2024_11_05,
+    "generated_schema/2024_11_05/mcp_schema.rs",
+    "generated_schema/2024_11_05/schema_utils.rs",
+    __int_2024_11_05,
+    __int_utils_2024_11_05
+);
 
 #[cfg(feature = "draft")]
-pub use mcp_schema::*;
-
-#[cfg(all(feature = "schema_utils", feature = "draft"))]
-#[path = "generated_schema/draft/schema_utils.rs"]
-pub mod schema_utils;
+define_schema_version!(
+    "draft",
+    mcp_draft,
+    "generated_schema/draft/mcp_schema.rs",
+    "generated_schema/draft/schema_utils.rs",
+    __int_draft,
+    __int_utils_draft
+);
 
 #[path = "generated_schema/protocol_version.rs"]
 mod protocol_version;

src/generated_schema.rs

@@ -1,4 +1,4 @@
-use crate::generated_schema::*;
+use crate::generated_schema::mcp_2024_11_05::*;
 use serde::ser::SerializeStruct;
 use serde_json::{json, Value};
 use std::hash::{Hash, Hasher};

src/generated_schema/2024_11_05/schema_utils.rs

@@ -1,4 +1,4 @@
-use crate::generated_schema::*;
+use crate::generated_schema::mcp_draft::*;
 use serde::ser::SerializeStruct;
 use serde_json::{json, Value};
 use std::hash::{Hash, Hasher};