Derive Macro for typespec_client_core::http::Model (#1772)

Author: analogrelay

Cargo.toml

@@ -3,6 +3,7 @@ resolver = "2"
 members = [
   "sdk/typespec",
   "sdk/typespec/typespec_client_core",
+  "sdk/typespec/typespec_derive",
   "sdk/core/azure_core",
   "sdk/core/azure_core_amqp",
   "sdk/identity/azure_identity",
@@ -27,6 +28,9 @@ default-features = false
 path = "sdk/typespec/typespec_client_core"
 default-features = false
 
+[workspace.dependencies.typespec_derive]
+path = "sdk/typespec/typespec_derive"
+
 [workspace.dependencies.azure_core]
 path = "sdk/core/azure_core"
 
@@ -49,6 +53,7 @@ async-stream = { version = "0.3.5" }
 async-trait = "0.1"
 base64 = "0.22"
 bytes = "1.0"
+cargo_metadata = "0.18.1"
 clap = { version = "4.4.16", features = ["derive"] }
 dyn-clone = "1.0"
 fe2o3-amqp = { version = "0.12", features = ["native-tls", "tracing", "uuid"] }
@@ -65,6 +70,7 @@ once_cell = "1.18"
 openssl = { version = "0.10.46" }
 paste = "1.0"
 pin-project = "1.0"
+proc-macro2 = "1.0.86"
 quick-xml = { version = "0.31", features = ["serialize", "serde-types"] }
 rand = "0.8"
 reqwest = { version = "0.12", features = [
@@ -79,6 +85,8 @@ serde_json = "1.0"
 serde_test = "1"
 serial_test = "3.0"
 sha2 = { version = "0.10" }
+syn = { version = "2.0.74", features = ["full"] }
+quote = "1.0.36"
 thiserror = "1.0"
 time = { version = "0.3.10", features = [
   "serde-well-known",

sdk/core/azure_core/src/lib.rs

@@ -42,9 +42,6 @@ pub use options::*;
 pub use pipeline::*;
 pub use policies::*;
 pub use typespec_client_core::http::{Model, PinnedStream, Response, ResponseBody};
-pub use typespec_client_core::json_model;
-#[cfg(feature = "xml")]
-pub use typespec_client_core::xml_model;
 
 // Re-export typespec types that are not specific to Azure.
 pub use typespec::{Error, Result};

sdk/identity/azure_identity/Cargo.toml

@@ -25,6 +25,7 @@ async-trait = { workspace = true }
 openssl = { workspace = true, optional = true }
 uuid = { workspace = true, features = ["v4"] }
 pin-project = { workspace = true }
+typespec_client_core = { workspace = true, features = ["derive"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 async-process = { workspace = true }

sdk/identity/azure_identity/src/federated_credentials_flow/login_response.rs

@@ -4,6 +4,7 @@
 use azure_core::auth::Secret;
 use serde::{Deserialize, Deserializer};
 use time::OffsetDateTime;
+use typespec_client_core::Model;
 
 #[derive(Debug, Clone, Deserialize)]
 struct RawLoginResponse {
@@ -16,7 +17,7 @@ struct RawLoginResponse {
     access_token: String,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Model, Debug, Clone)]
 pub struct LoginResponse {
     pub token_type: String,
     pub expires_in: u64,
@@ -37,8 +38,6 @@ impl<'de> Deserialize<'de> for LoginResponse {
     }
 }
 
-azure_core::json_model!(LoginResponse);
-
 impl LoginResponse {
     pub fn access_token(&self) -> &Secret {
         &self.access_token

sdk/identity/azure_identity/src/refresh_token.rs

@@ -14,6 +14,7 @@ use azure_core::{
 use serde::Deserialize;
 use std::fmt;
 use std::sync::Arc;
+use typespec_client_core::Model;
 use url::form_urlencoded;
 
 /// Exchange a refresh token for a new access token and refresh token
@@ -64,7 +65,7 @@ pub async fn exchange(
 }
 
 /// A refresh token
-#[derive(Debug, Clone, Deserialize)]
+#[derive(Model, Debug, Clone, Deserialize)]
 pub struct RefreshTokenResponse {
     token_type: String,
     #[serde(rename = "scope", deserialize_with = "deserialize::split")]
@@ -74,7 +75,6 @@ pub struct RefreshTokenResponse {
     access_token: Secret,
     refresh_token: Secret,
 }
-azure_core::json_model!(RefreshTokenResponse);
 
 impl RefreshTokenResponse {
     /// Returns the `token_type`. Always `Bearer` for Azure AD.

sdk/identity/azure_identity/src/token_credentials/client_certificate_credentials.rs

@@ -21,6 +21,7 @@ use openssl::{
 use serde::Deserialize;
 use std::{str, sync::Arc, time::Duration};
 use time::OffsetDateTime;
+use typespec_client_core::http::Model;
 use url::{form_urlencoded, Url};
 
 /// Refresh time to use in seconds
@@ -330,7 +331,7 @@ impl ClientCertificateCredential {
     }
 }
 
-#[derive(Deserialize, Debug, Default)]
+#[derive(Model, Deserialize, Debug, Default)]
 #[serde(default)]
 struct AadTokenResponse {
     token_type: String,
@@ -339,8 +340,6 @@ struct AadTokenResponse {
     access_token: String,
 }
 
-azure_core::json_model!(AadTokenResponse);
-
 fn get_encoded_cert(cert: &X509) -> azure_core::Result<String> {
     Ok(format!(
         "\"{}\"",

sdk/typespec/src/error/mod.rs

@@ -3,7 +3,9 @@
 
 //! Interfaces for working with errors.
 
+#[cfg(feature = "http")]
 use http_types::StatusCode;
+
 use std::borrow::Cow;
 use std::fmt::{Debug, Display};
 
@@ -51,6 +53,7 @@ impl ErrorKind {
 impl Display for ErrorKind {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
+            #[cfg(feature = "http")]
             ErrorKind::HttpResponse { status, error_code } => {
                 write!(
                     f,

sdk/typespec/typespec_client_core/Cargo.toml

@@ -27,6 +27,7 @@ time = { workspace = true }
 tokio = { workspace = true, optional = true }
 tracing = { workspace = true }
 typespec = { workspace = true, default-features = false }
+typespec_derive = { workspace = true, optional = true }
 url = { workspace = true }
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
@@ -39,6 +40,7 @@ tokio = { workspace = true, features = ["macros", "rt", "time"] }
 [dev-dependencies]
 once_cell = { workspace = true }
 tokio.workspace = true
+typespec_derive.workspace = true
 
 [features]
 default = [
@@ -49,6 +51,7 @@ default = [
   "reqwest_rustls",
   "tokio_sleep",
 ]
+derive = ["dep:typespec_derive"]
 http = ["dep:http-types", "typespec/http"]
 json = ["typespec/json"]
 reqwest = ["dep:reqwest", "reqwest/default-tls"]

sdk/typespec/typespec_client_core/src/http/mod.rs

@@ -25,6 +25,10 @@ pub use policies::*;
 pub use request::*;
 pub use response::*;
 
+// Re-export derive macro for Model.
+#[cfg(feature = "derive")]
+pub use typespec_derive::Model;
+
 // Re-export important types.
 pub use http_types::{Method, StatusCode};
 pub use url::Url;

sdk/typespec/typespec_client_core/src/http/pipeline.rs

@@ -95,11 +95,11 @@ mod tests {
     use super::*;
     use crate::{
         http::{headers::Headers, Method, PolicyResult, StatusCode, TransportOptions},
-        json_model,
         stream::BytesStream,
     };
     use bytes::Bytes;
     use serde::Deserialize;
+    use typespec_derive::Model;
 
     #[tokio::test]
     async fn deserializes_response() {
@@ -122,12 +122,12 @@ mod tests {
             }
         }
 
-        #[derive(Debug, Deserialize)]
+        #[derive(Model, Debug, Deserialize)]
+        #[typespec(crate = "crate")]
         struct Model {
             foo: i32,
             bar: String,
         }
-        json_model!(Model);
 
         let options =
             ClientOptions::new(TransportOptions::new_custom_policy(Arc::new(Responder {})));