Preserve server spec extensions

Author: andyscott

crates/oas3/src/spec/server.rs

@@ -2,6 +2,8 @@ use std::collections::BTreeMap;
 
 use serde::{Deserialize, Serialize};
 
+use super::spec_extensions;
+
 /// An object representing a Server.
 ///
 /// See <https://spec.openapis.org/oas/v3.1.1#server-object>.
@@ -25,6 +27,14 @@ pub struct Server {
     /// The value is used for substitution in the server's URL template.
     #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
     pub variables: BTreeMap<String, ServerVariable>,
+
+    /// Specification extensions.
+    ///
+    /// Only "x-" prefixed keys are collected, and the prefix is stripped.
+    ///
+    /// See <https://spec.openapis.org/oas/v3.1.1#specification-extensions>.
+    #[serde(flatten, with = "spec_extensions")]
+    pub extensions: BTreeMap<String, serde_json::Value>,
 }
 
 /// An object representing a Server Variable for server URL template substitution.
@@ -49,4 +59,49 @@ pub struct ServerVariable {
     /// [CommonMark]: https://spec.commonmark.org/
     #[serde(skip_serializing_if = "Option::is_none")]
     pub description: Option<String>,
+
+    /// Specification extensions.
+    ///
+    /// Only "x-" prefixed keys are collected, and the prefix is stripped.
+    ///
+    /// See <https://spec.openapis.org/oas/v3.1.1#specification-extensions>.
+    #[serde(flatten, with = "spec_extensions")]
+    pub extensions: BTreeMap<String, serde_json::Value>,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{Server, ServerVariable};
+    use serde_json::json;
+
+    #[test]
+    fn server_extensions_round_trip() {
+        let payload = r#"{
+            "url": "https://example.com",
+            "x-test": "alpha"
+        }"#;
+
+        let server: Server = serde_json::from_str(payload).expect("server parses");
+        assert_eq!(server.extensions.get("test"), Some(&json!("alpha")));
+
+        let value = serde_json::to_value(server).expect("server serializes");
+        assert_eq!(value.get("x-test"), Some(&json!("alpha")));
+    }
+
+    #[test]
+    fn server_variable_extensions_round_trip() {
+        let payload = r#"{
+            "default": "example",
+            "x-meta": {"enabled": true}
+        }"#;
+
+        let variable: ServerVariable = serde_json::from_str(payload).expect("variable parses");
+        assert_eq!(
+            variable.extensions.get("meta"),
+            Some(&json!({"enabled": true}))
+        );
+
+        let value = serde_json::to_value(variable).expect("variable serializes");
+        assert_eq!(value.get("x-meta"), Some(&json!({"enabled": true})));
+    }
 }