Format and make Result properties public again

Author: ajevans99

Sources/MCP/Base/Lifecycle.swift

@@ -42,12 +42,12 @@ public enum Initialize: Method {
     }
 
     public struct Result: Hashable, Codable, Sendable {
-        let protocolVersion: String
-        let capabilities: Server.Capabilities
-        let serverInfo: Server.Info
-        let instructions: String?
-        var _meta: [String: Value]?
-        var extraFields: [String: Value]?
+        public let protocolVersion: String
+        public let capabilities: Server.Capabilities
+        public let serverInfo: Server.Info
+        public let instructions: String?
+        public var _meta: [String: Value]?
+        public var extraFields: [String: Value]?
 
         public init(
             protocolVersion: String,
@@ -78,7 +78,9 @@ public enum Initialize: Method {
 
             var dynamicContainer = encoder.container(keyedBy: DynamicCodingKey.self)
             try encodeMeta(_meta, to: &dynamicContainer)
-            try encodeExtraFields(extraFields, to: &dynamicContainer, excluding: Set(CodingKeys.allCases.map(\.rawValue)))
+            try encodeExtraFields(
+                extraFields, to: &dynamicContainer,
+                excluding: Set(CodingKeys.allCases.map(\.rawValue)))
         }
 
         public init(from decoder: Decoder) throws {
@@ -90,7 +92,8 @@ public enum Initialize: Method {
 
             let dynamicContainer = try decoder.container(keyedBy: DynamicCodingKey.self)
             _meta = try decodeMeta(from: dynamicContainer)
-            extraFields = try decodeExtraFields(from: dynamicContainer, excluding: Set(CodingKeys.allCases.map(\.rawValue)))
+            extraFields = try decodeExtraFields(
+                from: dynamicContainer, excluding: Set(CodingKeys.allCases.map(\.rawValue)))
         }
     }
 }

Sources/MCP/Base/Messages.swift

@@ -123,11 +123,12 @@ public struct Request<M: Method>: Hashable, Identifiable, Codable, Sendable {
         try container.encode(id, forKey: .id)
         try container.encode(method, forKey: .method)
         try container.encode(params, forKey: .params)
-        
+
         // Encode _meta and extra fields, excluding JSON-RPC protocol fields
         var dynamicContainer = encoder.container(keyedBy: DynamicCodingKey.self)
         try encodeMeta(_meta, to: &dynamicContainer)
-        try encodeExtraFields(extraFields, to: &dynamicContainer, excluding: Set(CodingKeys.allCases.map(\.rawValue)))
+        try encodeExtraFields(
+            extraFields, to: &dynamicContainer, excluding: Set(CodingKeys.allCases.map(\.rawValue)))
     }
 }
 
@@ -172,7 +173,8 @@ extension Request {
 
         let dynamicContainer = try decoder.container(keyedBy: DynamicCodingKey.self)
         _meta = try decodeMeta(from: dynamicContainer)
-        extraFields = try decodeExtraFields(from: dynamicContainer, excluding: Set(CodingKeys.allCases.map(\.rawValue)))
+        extraFields = try decodeExtraFields(
+            from: dynamicContainer, excluding: Set(CodingKeys.allCases.map(\.rawValue)))
     }
 }
 
@@ -254,17 +256,17 @@ public struct Response<M: Method>: Hashable, Identifiable, Codable, Sendable {
     }
 
     public init(
-        id: ID, 
-        result: M.Result, 
+        id: ID,
+        result: M.Result,
         _meta: [String: Value]? = nil,
         extraFields: [String: Value]? = nil
     ) {
         self.init(id: id, result: .success(result), _meta: _meta, extraFields: extraFields)
     }
 
     public init(
-        id: ID, 
-        error: MCPError, 
+        id: ID,
+        error: MCPError,
         _meta: [String: Value]? = nil,
         extraFields: [String: Value]? = nil
     ) {
@@ -285,11 +287,12 @@ public struct Response<M: Method>: Hashable, Identifiable, Codable, Sendable {
         case .failure(let error):
             try container.encode(error, forKey: .error)
         }
-        
+
         // Encode _meta and extra fields, excluding JSON-RPC protocol fields
         var dynamicContainer = encoder.container(keyedBy: DynamicCodingKey.self)
         try encodeMeta(_meta, to: &dynamicContainer)
-        try encodeExtraFields(extraFields, to: &dynamicContainer, excluding: Set(CodingKeys.allCases.map(\.rawValue)))
+        try encodeExtraFields(
+            extraFields, to: &dynamicContainer, excluding: Set(CodingKeys.allCases.map(\.rawValue)))
     }
 
     public init(from decoder: Decoder) throws {
@@ -313,7 +316,8 @@ public struct Response<M: Method>: Hashable, Identifiable, Codable, Sendable {
 
         let dynamicContainer = try decoder.container(keyedBy: DynamicCodingKey.self)
         _meta = try decodeMeta(from: dynamicContainer)
-        extraFields = try decodeExtraFields(from: dynamicContainer, excluding: Set(CodingKeys.allCases.map(\.rawValue)))
+        extraFields = try decodeExtraFields(
+            from: dynamicContainer, excluding: Set(CodingKeys.allCases.map(\.rawValue)))
     }
 }
 

Sources/MCP/Client/Sampling.swift

@@ -256,19 +256,23 @@ public enum CreateSamplingMessage: Method {
 
             var dynamicContainer = encoder.container(keyedBy: DynamicCodingKey.self)
             try encodeMeta(_meta, to: &dynamicContainer)
-            try encodeExtraFields(extraFields, to: &dynamicContainer, excluding: Set(CodingKeys.allCases.map(\.rawValue)))
+            try encodeExtraFields(
+                extraFields, to: &dynamicContainer,
+                excluding: Set(CodingKeys.allCases.map(\.rawValue)))
         }
 
         public init(from decoder: Decoder) throws {
             let container = try decoder.container(keyedBy: CodingKeys.self)
             model = try container.decode(String.self, forKey: .model)
-            stopReason = try container.decodeIfPresent(Sampling.StopReason.self, forKey: .stopReason)
+            stopReason = try container.decodeIfPresent(
+                Sampling.StopReason.self, forKey: .stopReason)
             role = try container.decode(Sampling.Message.Role.self, forKey: .role)
             content = try container.decode(Sampling.Message.Content.self, forKey: .content)
 
             let dynamicContainer = try decoder.container(keyedBy: DynamicCodingKey.self)
             _meta = try decodeMeta(from: dynamicContainer)
-            extraFields = try decodeExtraFields(from: dynamicContainer, excluding: Set(CodingKeys.allCases.map(\.rawValue)))
+            extraFields = try decodeExtraFields(
+                from: dynamicContainer, excluding: Set(CodingKeys.allCases.map(\.rawValue)))
         }
     }
 }