feat: added method value validation and more strickt restriction on const values (#91)

* feat: update schema with strict const validations

* chore: add validators and tests

* clippy fix

* chore: update tests to support draft version

* chore: typo

Author: hashemix

CHANGELOG.md

@@ -143,7 +143,7 @@
 
 ### Bug Fixes
 
-* custom result deserialization conflic with rust_mcp_schema::Result ([#44](https://github.com/rust-mcp-stack/rust-mcp-schema/issues/44)) ([f141060](https://github.com/rust-mcp-stack/rust-mcp-schema/commit/f14106047ee6fdc499f0915ea2029954cf06d634))
+* custom result deserialization conflict with rust_mcp_schema::Result ([#44](https://github.com/rust-mcp-stack/rust-mcp-schema/issues/44)) ([f141060](https://github.com/rust-mcp-stack/rust-mcp-schema/commit/f14106047ee6fdc499f0915ea2029954cf06d634))
 
 ## [0.1.9](https://github.com/rust-mcp-stack/rust-mcp-schema/compare/v0.1.8...v0.1.9) (2025-03-02)
 

README.md

@@ -86,7 +86,7 @@ Multiple schema versions may be enabled concurrently if needed. Non-default vers
 - rust_mcp_schema::mcp_2024_11_05
 - rust_mcp_schema::mcp_draft"
 
-Example: enable `2024_11_05` version of the shema:
+Example: enable `2024_11_05` version of the schema:
 
 <!-- x-release-please-start-version -->
 
@@ -95,7 +95,7 @@ Example: enable `2024_11_05` version of the shema:
 rust-mcp-schema = { version: 0.7.4 , default-features = false, features=["2024_11_05"] }
 ```
 
-Example: enable `draft`` version of the shema (2024_11_05) :
+Example: enable `draft`` version of the schema (2024_11_05) :
 
 ```toml
 #Cargo.toml

src/generated_schema.rs

@@ -4,6 +4,7 @@ macro_rules! define_schema_version {
         $mod_name:ident,
         $schema_path:literal,
         $utils_path:literal,
+        $validators_path:literal,
         $schema_mod:ident,
         $utils_mod:ident
     ) => {
@@ -15,6 +16,9 @@ macro_rules! define_schema_version {
         #[path = $utils_path]
         mod $utils_mod;
 
+        #[path = $validators_path]
+        mod validators;
+
         #[cfg(feature = $feature)]
         pub mod $mod_name {
             pub use super::$schema_mod::*;
@@ -37,6 +41,7 @@ define_schema_version!(
     mcp_2025_06_18,
     "generated_schema/2025_06_18/mcp_schema.rs",
     "generated_schema/2025_06_18/schema_utils.rs",
+    "generated_schema/2025_06_18/validators.rs",
     __int_2025_06_18,
     __int_utils_2025_06_18
 );
@@ -47,6 +52,7 @@ define_schema_version!(
     mcp_2025_03_26,
     "generated_schema/2025_03_26/mcp_schema.rs",
     "generated_schema/2025_03_26/schema_utils.rs",
+    "generated_schema/2025_03_26/validators.rs",
     __int_2025_03_26,
     __int_utils_2025_03_26
 );
@@ -57,6 +63,7 @@ define_schema_version!(
     mcp_2024_11_05,
     "generated_schema/2024_11_05/mcp_schema.rs",
     "generated_schema/2024_11_05/schema_utils.rs",
+    "generated_schema/2024_11_05/validators.rs",
     __int_2024_11_05,
     __int_utils_2024_11_05
 );
@@ -67,6 +74,7 @@ define_schema_version!(
     mcp_draft,
     "generated_schema/draft/mcp_schema.rs",
     "generated_schema/draft/schema_utils.rs",
+    "generated_schema/draft/validators.rs",
     __int_draft,
     __int_utils_draft
 );

src/generated_schema/2024_11_05/mcp_schema.rs

@@ -1,14 +1,15 @@
 /// ----------------------------------------------------------------------------
-/// This file is auto-generated by mcp-schema-gen v0.4.2.
+/// This file is auto-generated by mcp-schema-gen v0.4.4.
 /// WARNING:
 /// It is not recommended to modify this file directly. You are free to
 /// modify or extend the implementations as needed, but please do so at your own risk.
 ///
 /// Generated from : <https://github.com/modelcontextprotocol/specification.git>
-/// Hash : 3473e6e72b222f44163b41eab8d4b0973ac106b6
-/// Generated at : 2025-09-17 19:15:48
+/// Hash : 71204c22f8e062795dca00a87d31070033572ba2
+/// Generated at : 2025-10-03 15:17:01
 /// ----------------------------------------------------------------------------
 ///
+use super::validators as validate;
 /// MCP Protocol Version
 pub const LATEST_PROTOCOL_VERSION: &str = "2024-11-05";
 /// JSON-RPC Version
@@ -171,6 +172,7 @@ pub struct BlobResourceContents {
 /// </details>
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 pub struct CallToolRequest {
+    #[serde(deserialize_with = "validate::call_tool_request_method")]
     method: ::std::string::String,
     pub params: CallToolRequestParams,
 }
@@ -359,6 +361,7 @@ A client MUST NOT attempt to cancel its initialize request.*/
 /// </details>
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 pub struct CancelledNotification {
+    #[serde(deserialize_with = "validate::cancelled_notification_method")]
     method: ::std::string::String,
     pub params: CancelledNotificationParams,
 }
@@ -766,6 +769,7 @@ impl ::std::convert::From<Result> for ClientResult {
 /// </details>
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 pub struct CompleteRequest {
+    #[serde(deserialize_with = "validate::complete_request_method")]
     method: ::std::string::String,
     pub params: CompleteRequestParams,
 }
@@ -1063,6 +1067,7 @@ pub struct CompleteResultCompletion {
 /// </details>
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 pub struct CreateMessageRequest {
+    #[serde(deserialize_with = "validate::create_message_request_method")]
     method: ::std::string::String,
     pub params: CreateMessageRequestParams,
 }
@@ -1358,7 +1363,7 @@ pub struct EmbeddedResource {
     #[serde(default, skip_serializing_if = "::std::option::Option::is_none")]
     pub annotations: ::std::option::Option<EmbeddedResourceAnnotations>,
     pub resource: EmbeddedResourceResource,
-    #[serde(rename = "type")]
+    #[serde(rename = "type", deserialize_with = "validate::embedded_resource_type_")]
     type_: ::std::string::String,
 }
 impl EmbeddedResource {
@@ -1498,6 +1503,7 @@ pub struct EmptyResult(pub Result);
 /// </details>
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 pub struct GetPromptRequest {
+    #[serde(deserialize_with = "validate::get_prompt_request_method")]
     method: ::std::string::String,
     pub params: GetPromptRequestParams,
 }
@@ -1648,7 +1654,7 @@ pub struct ImageContent {
     ///The MIME type of the image. Different providers may support different image types.
     #[serde(rename = "mimeType")]
     pub mime_type: ::std::string::String,
-    #[serde(rename = "type")]
+    #[serde(rename = "type", deserialize_with = "validate::image_content_type_")]
     type_: ::std::string::String,
 }
 impl ImageContent {
@@ -1776,6 +1782,7 @@ pub struct Implementation {
 /// </details>
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 pub struct InitializeRequest {
+    #[serde(deserialize_with = "validate::initialize_request_method")]
     method: ::std::string::String,
     pub params: InitializeRequestParams,
 }
@@ -1915,6 +1922,7 @@ pub struct InitializeResult {
 /// </details>
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 pub struct InitializedNotification {
+    #[serde(deserialize_with = "validate::initialized_notification_method")]
     method: ::std::string::String,
     #[serde(default, skip_serializing_if = "::std::option::Option::is_none")]
     pub params: ::std::option::Option<InitializedNotificationParams>,
@@ -2008,6 +2016,7 @@ pub struct InitializedNotificationParams {
 pub struct JsonrpcError {
     pub error: RpcError,
     pub id: RequestId,
+    #[serde(deserialize_with = "validate::jsonrpc_error_jsonrpc")]
     jsonrpc: ::std::string::String,
 }
 impl JsonrpcError {
@@ -2110,6 +2119,7 @@ impl ::std::convert::From<JsonrpcError> for JsonrpcMessage {
 /// </details>
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 pub struct JsonrpcNotification {
+    #[serde(deserialize_with = "validate::jsonrpc_notification_jsonrpc")]
     jsonrpc: ::std::string::String,
     pub method: ::std::string::String,
     #[serde(default, skip_serializing_if = "::std::option::Option::is_none")]
@@ -2199,6 +2209,7 @@ pub struct JsonrpcNotificationParams {
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 pub struct JsonrpcRequest {
     pub id: RequestId,
+    #[serde(deserialize_with = "validate::jsonrpc_request_jsonrpc")]
     jsonrpc: ::std::string::String,
     pub method: ::std::string::String,
     #[serde(default, skip_serializing_if = "::std::option::Option::is_none")]
@@ -2299,6 +2310,7 @@ pub struct JsonrpcRequestParamsMeta {
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 pub struct JsonrpcResponse {
     pub id: RequestId,
+    #[serde(deserialize_with = "validate::jsonrpc_response_jsonrpc")]
     jsonrpc: ::std::string::String,
     pub result: Result,
 }
@@ -2345,6 +2357,7 @@ impl JsonrpcResponse {
 /// </details>
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 pub struct ListPromptsRequest {
+    #[serde(deserialize_with = "validate::list_prompts_request_method")]
     method: ::std::string::String,
     #[serde(default, skip_serializing_if = "::std::option::Option::is_none")]
     pub params: ::std::option::Option<ListPromptsRequestParams>,
@@ -2459,6 +2472,7 @@ pub struct ListPromptsResult {
 /// </details>
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 pub struct ListResourceTemplatesRequest {
+    #[serde(deserialize_with = "validate::list_resource_templates_request_method")]
     method: ::std::string::String,
     #[serde(default, skip_serializing_if = "::std::option::Option::is_none")]
     pub params: ::std::option::Option<ListResourceTemplatesRequestParams>,
@@ -2574,6 +2588,7 @@ pub struct ListResourceTemplatesResult {
 /// </details>
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 pub struct ListResourcesRequest {
+    #[serde(deserialize_with = "validate::list_resources_request_method")]
     method: ::std::string::String,
     #[serde(default, skip_serializing_if = "::std::option::Option::is_none")]
     pub params: ::std::option::Option<ListResourcesRequestParams>,
@@ -2699,6 +2714,7 @@ structure or access specific locations that the client has permission to read fr
 /// </details>
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 pub struct ListRootsRequest {
+    #[serde(deserialize_with = "validate::list_roots_request_method")]
     method: ::std::string::String,
     #[serde(default, skip_serializing_if = "::std::option::Option::is_none")]
     pub params: ::std::option::Option<ListRootsRequestParams>,
@@ -2835,6 +2851,7 @@ pub struct ListRootsResult {
 /// </details>
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 pub struct ListToolsRequest {
+    #[serde(deserialize_with = "validate::list_tools_request_method")]
     method: ::std::string::String,
     #[serde(default, skip_serializing_if = "::std::option::Option::is_none")]
     pub params: ::std::option::Option<ListToolsRequestParams>,
@@ -3017,6 +3034,7 @@ impl ::std::fmt::Display for LoggingLevel {
 /// </details>
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 pub struct LoggingMessageNotification {
+    #[serde(deserialize_with = "validate::logging_message_notification_method")]
     method: ::std::string::String,
     pub params: LoggingMessageNotificationParams,
 }
@@ -3353,6 +3371,7 @@ pub struct PaginatedResult {
 /// </details>
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 pub struct PingRequest {
+    #[serde(deserialize_with = "validate::ping_request_method")]
     method: ::std::string::String,
     #[serde(default, skip_serializing_if = "::std::option::Option::is_none")]
     pub params: ::std::option::Option<PingRequestParams>,
@@ -3466,6 +3485,7 @@ pub struct PingRequestParamsMeta {
 /// </details>
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 pub struct ProgressNotification {
+    #[serde(deserialize_with = "validate::progress_notification_method")]
     method: ::std::string::String,
     pub params: ProgressNotificationParams,
 }
@@ -3659,6 +3679,7 @@ pub struct PromptArgument {
 /// </details>
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 pub struct PromptListChangedNotification {
+    #[serde(deserialize_with = "validate::prompt_list_changed_notification_method")]
     method: ::std::string::String,
     #[serde(default, skip_serializing_if = "::std::option::Option::is_none")]
     pub params: ::std::option::Option<PromptListChangedNotificationParams>,
@@ -3814,7 +3835,7 @@ impl ::std::convert::From<EmbeddedResource> for PromptMessageContent {
 pub struct PromptReference {
     ///The name of the prompt or prompt template
     pub name: ::std::string::String,
-    #[serde(rename = "type")]
+    #[serde(rename = "type", deserialize_with = "validate::prompt_reference_type_")]
     type_: ::std::string::String,
 }
 impl PromptReference {
@@ -3867,6 +3888,7 @@ impl PromptReference {
 /// </details>
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 pub struct ReadResourceRequest {
+    #[serde(deserialize_with = "validate::read_resource_request_method")]
     method: ::std::string::String,
     pub params: ReadResourceRequestParams,
 }
@@ -4275,6 +4297,7 @@ pub struct ResourceContents {
 /// </details>
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 pub struct ResourceListChangedNotification {
+    #[serde(deserialize_with = "validate::resource_list_changed_notification_method")]
     method: ::std::string::String,
     #[serde(default, skip_serializing_if = "::std::option::Option::is_none")]
     pub params: ::std::option::Option<ResourceListChangedNotificationParams>,
@@ -4347,7 +4370,7 @@ pub struct ResourceListChangedNotificationParams {
 /// </details>
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 pub struct ResourceReference {
-    #[serde(rename = "type")]
+    #[serde(rename = "type", deserialize_with = "validate::resource_reference_type_")]
     type_: ::std::string::String,
     ///The URI or URI template of the resource.
     pub uri: ::std::string::String,
@@ -4506,6 +4529,7 @@ pub struct ResourceTemplateAnnotations {
 /// </details>
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 pub struct ResourceUpdatedNotification {
+    #[serde(deserialize_with = "validate::resource_updated_notification_method")]
     method: ::std::string::String,
     pub params: ResourceUpdatedNotificationParams,
 }
@@ -4676,6 +4700,7 @@ The server should then request an updated list of roots using the ListRootsReque
 /// </details>
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 pub struct RootsListChangedNotification {
+    #[serde(deserialize_with = "validate::roots_list_changed_notification_method")]
     method: ::std::string::String,
     #[serde(default, skip_serializing_if = "::std::option::Option::is_none")]
     pub params: ::std::option::Option<RootsListChangedNotificationParams>,
@@ -5078,6 +5103,7 @@ impl ::std::convert::From<LoggingMessageNotification> for ServerNotification {
 /// </details>
 #[derive(::serde::Serialize, Clone, Debug)]
 #[serde(untagged)]
+#[allow(clippy::large_enum_variant)]
 pub enum ServerRequest {
     PingRequest(PingRequest),
     CreateMessageRequest(CreateMessageRequest),
@@ -5141,6 +5167,7 @@ impl ::std::convert::From<ListRootsRequest> for ServerRequest {
 /// </details>
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 #[serde(untagged)]
+#[allow(clippy::large_enum_variant)]
 pub enum ServerResult {
     InitializeResult(InitializeResult),
     ListResourcesResult(ListResourcesResult),
@@ -5238,6 +5265,7 @@ impl ::std::convert::From<Result> for ServerResult {
 /// </details>
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 pub struct SetLevelRequest {
+    #[serde(deserialize_with = "validate::set_level_request_method")]
     method: ::std::string::String,
     pub params: SetLevelRequestParams,
 }
@@ -5315,6 +5343,7 @@ pub struct SetLevelRequestParams {
 /// </details>
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 pub struct SubscribeRequest {
+    #[serde(deserialize_with = "validate::subscribe_request_method")]
     method: ::std::string::String,
     pub params: SubscribeRequestParams,
 }
@@ -5406,7 +5435,7 @@ pub struct TextContent {
     pub annotations: ::std::option::Option<TextContentAnnotations>,
     ///The text content of the message.
     pub text: ::std::string::String,
-    #[serde(rename = "type")]
+    #[serde(rename = "type", deserialize_with = "validate::text_content_type_")]
     type_: ::std::string::String,
 }
 impl TextContent {
@@ -5599,7 +5628,7 @@ pub struct ToolInputSchema {
     >,
     #[serde(default, skip_serializing_if = "::std::vec::Vec::is_empty")]
     pub required: ::std::vec::Vec<::std::string::String>,
-    #[serde(rename = "type")]
+    #[serde(rename = "type", deserialize_with = "validate::tool_input_schema_type_")]
     type_: ::std::string::String,
 }
 impl ToolInputSchema {
@@ -5658,6 +5687,7 @@ impl ToolInputSchema {
 /// </details>
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 pub struct ToolListChangedNotification {
+    #[serde(deserialize_with = "validate::tool_list_changed_notification_method")]
     method: ::std::string::String,
     #[serde(default, skip_serializing_if = "::std::option::Option::is_none")]
     pub params: ::std::option::Option<ToolListChangedNotificationParams>,
@@ -5738,6 +5768,7 @@ pub struct ToolListChangedNotificationParams {
 /// </details>
 #[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
 pub struct UnsubscribeRequest {
+    #[serde(deserialize_with = "validate::unsubscribe_request_method")]
     method: ::std::string::String,
     pub params: UnsubscribeRequestParams,
 }