typespec-rust-emitter 0.3.0 → 0.5.0

package/example/output-rust/src/generated/server.rs

@@ -1,6 +1,8 @@
 use super::types::*;
 use async_trait::async_trait;
 use axum::{http::StatusCode, Json};
+use axum::extract::Path;
+use axum::Extension;
 use eyre::Result;
 
 #[async_trait]
@@ -9,147 +11,42 @@ pub trait Server: Send + Sync {
 
 
     /// Retrieve a list of all groups for the current account (from view_learning_group).
-    async fn groups_list(&self, request: GroupsListRequest) -> Result<GroupsListResponse>;
+    async fn groups_list(&self) -> Result<GroupsListResponse>;
     /// Create a new group.
-    async fn groups_create(&self, claims: Self::Claims, request: GroupsCreateRequest) -> Result<GroupsCreateResponse>;
+    async fn groups_create(&self, claims: Self::Claims, body: CreateGroupBody) -> Result<GroupsCreateResponse>;
     /// Get the details of a group by its ID.
-    async fn groups_get_by_id(&self, request: GroupsGetByIdRequest) -> Result<GroupsGetByIdResponse>;
+    async fn groups_get_by_id(&self, id: i64) -> Result<GroupsGetByIdResponse>;
     /// Update a group. Only provide the fields that need to be changed.
-    async fn groups_update(&self, claims: Self::Claims, request: GroupsUpdateRequest) -> Result<GroupsUpdateResponse>;
+    async fn groups_update(&self, claims: Self::Claims, id: i64, body: UpdateGroupBody) -> Result<GroupsUpdateResponse>;
     /// Soft delete a group. All subjects within the group will also be soft deleted.
-    async fn groups_delete(&self, claims: Self::Claims, request: GroupsDeleteRequest) -> Result<GroupsDeleteResponse>;
+    async fn groups_delete(&self, claims: Self::Claims, id: i64) -> Result<GroupsDeleteResponse>;
     /// Retrieve a list of subjects for a group (from view_subject_statistics).
-    async fn subjects_list(&self, request: SubjectsListRequest) -> Result<SubjectsListResponse>;
+    async fn subjects_list(&self, group_id: i64) -> Result<SubjectsListResponse>;
     /// Create a new subject within the specified group.
-    async fn subjects_create(&self, claims: Self::Claims, request: SubjectsCreateRequest) -> Result<SubjectsCreateResponse>;
+    async fn subjects_create(&self, claims: Self::Claims, group_id: i64, body: CreateSubjectBody) -> Result<SubjectsCreateResponse>;
     /// Get the details of a subject by its ID.
-    async fn subjects_get_by_id(&self, request: SubjectsGetByIdRequest) -> Result<SubjectsGetByIdResponse>;
+    async fn subjects_get_by_id(&self, group_id: i64, id: i64) -> Result<SubjectsGetByIdResponse>;
     /// Update a subject. Only provide the fields that need to be changed.
-    async fn subjects_update(&self, claims: Self::Claims, request: SubjectsUpdateRequest) -> Result<SubjectsUpdateResponse>;
+    async fn subjects_update(&self, claims: Self::Claims, group_id: i64, id: i64, body: UpdateSubjectBody) -> Result<SubjectsUpdateResponse>;
     /// Soft delete a subject.
-    async fn subjects_delete(&self, claims: Self::Claims, request: SubjectsDeleteRequest) -> Result<SubjectsDeleteResponse>;
+    async fn subjects_delete(&self, claims: Self::Claims, group_id: i64, id: i64) -> Result<SubjectsDeleteResponse>;
     /// Start a new study session for the subject.
 /// The server creates a Log (status=Starting) and the first Timelog.
 /// Returns 409 if the subject already has a session in Starting or Paused status.
-    async fn sessions_start(&self, claims: Self::Claims, request: SessionsStartRequest) -> Result<SessionsStartResponse>;
+    async fn sessions_start(&self, claims: Self::Claims, subject_id: i64, body: SessionNoteBody) -> Result<SessionsStartResponse>;
     /// Pause the currently running session (transition from Starting to Paused).
 /// The server closes the current Timelog (sets stoppedAt and calculates durationInSeconds).
 /// Returns 409 if the session is not in the Starting state.
-    async fn sessions_pause(&self, claims: Self::Claims, request: SessionsPauseRequest) -> Result<SessionsPauseResponse>;
+    async fn sessions_pause(&self, claims: Self::Claims, subject_id: i64, log_id: i64) -> Result<SessionsPauseResponse>;
     /// Resume a paused session (transition from Paused to Starting).
 /// The server creates a new Timelog.
 /// Returns 409 if the session is not in the Paused state.
-    async fn sessions_resume(&self, claims: Self::Claims, request: SessionsResumeRequest) -> Result<SessionsResumeResponse>;
+    async fn sessions_resume(&self, claims: Self::Claims, subject_id: i64, log_id: i64) -> Result<SessionsResumeResponse>;
     /// End the session (transition from Starting or Paused to Stopped).
 /// The server closes the current Timelog if it is running, and updates Log.stoppedAt.
 /// Returns 409 if the session is already Stopped.
-    async fn sessions_stop(&self, claims: Self::Claims, request: SessionsStopRequest) -> Result<SessionsStopResponse>;
+    async fn sessions_stop(&self, claims: Self::Claims, subject_id: i64, log_id: i64, body: SessionNoteBody) -> Result<SessionsStopResponse>;
 }
-#[derive(Debug, Clone, serde::Deserialize)]
-pub struct GroupsListRequest {
-
-}
-
-#[derive(Debug, Clone, serde::Deserialize)]
-pub struct GroupsCreateRequest {
-  #[serde(rename = "body", flatten)]
-  pub body: CreateGroupBody,
-}
-
-#[derive(Debug, Clone, serde::Deserialize)]
-pub struct GroupsGetByIdRequest {
-  #[serde(rename = "id", flatten)]
-  pub id: i64,
-}
-
-#[derive(Debug, Clone, serde::Deserialize)]
-pub struct GroupsUpdateRequest {
-  #[serde(rename = "id", flatten)]
-  pub id: i64,
-  #[serde(rename = "body", flatten)]
-  pub body: UpdateGroupBody,
-}
-
-#[derive(Debug, Clone, serde::Deserialize)]
-pub struct GroupsDeleteRequest {
-  #[serde(rename = "id", flatten)]
-  pub id: i64,
-}
-
-#[derive(Debug, Clone, serde::Deserialize)]
-pub struct SubjectsListRequest {
-  #[serde(rename = "groupId", flatten)]
-  pub group_id: i64,
-}
-
-#[derive(Debug, Clone, serde::Deserialize)]
-pub struct SubjectsCreateRequest {
-  #[serde(rename = "groupId", flatten)]
-  pub group_id: i64,
-  #[serde(rename = "body", flatten)]
-  pub body: CreateSubjectBody,
-}
-
-#[derive(Debug, Clone, serde::Deserialize)]
-pub struct SubjectsGetByIdRequest {
-  #[serde(rename = "groupId", flatten)]
-  pub group_id: i64,
-  #[serde(rename = "id", flatten)]
-  pub id: i64,
-}
-
-#[derive(Debug, Clone, serde::Deserialize)]
-pub struct SubjectsUpdateRequest {
-  #[serde(rename = "groupId", flatten)]
-  pub group_id: i64,
-  #[serde(rename = "id", flatten)]
-  pub id: i64,
-  #[serde(rename = "body", flatten)]
-  pub body: UpdateSubjectBody,
-}
-
-#[derive(Debug, Clone, serde::Deserialize)]
-pub struct SubjectsDeleteRequest {
-  #[serde(rename = "groupId", flatten)]
-  pub group_id: i64,
-  #[serde(rename = "id", flatten)]
-  pub id: i64,
-}
-
-#[derive(Debug, Clone, serde::Deserialize)]
-pub struct SessionsStartRequest {
-  #[serde(rename = "subjectId", flatten)]
-  pub subject_id: i64,
-  #[serde(rename = "body", flatten)]
-  pub body: SessionNoteBody,
-}
-
-#[derive(Debug, Clone, serde::Deserialize)]
-pub struct SessionsPauseRequest {
-  #[serde(rename = "subjectId", flatten)]
-  pub subject_id: i64,
-  #[serde(rename = "logId", flatten)]
-  pub log_id: i64,
-}
-
-#[derive(Debug, Clone, serde::Deserialize)]
-pub struct SessionsResumeRequest {
-  #[serde(rename = "subjectId", flatten)]
-  pub subject_id: i64,
-  #[serde(rename = "logId", flatten)]
-  pub log_id: i64,
-}
-
-#[derive(Debug, Clone, serde::Deserialize)]
-pub struct SessionsStopRequest {
-  #[serde(rename = "subjectId", flatten)]
-  pub subject_id: i64,
-  #[serde(rename = "logId", flatten)]
-  pub log_id: i64,
-  #[serde(rename = "body", flatten)]
-  pub body: SessionNoteBody,
-}
-
 pub enum GroupsListResponse {
     Ok(Json<Vec<GroupStatistics>>),
     Unauthorized,
@@ -413,7 +310,7 @@ where
     S: Server + Clone + Send + Sync + 'static,
     S::Claims: Send + Sync + Clone + 'static,
 {
-    let result = service.groups_list(GroupsListRequest {}).await;
+    let result = service.groups_list().await;
     match result {
         Ok(response) => response.into_response(),
         Err(e) => (
@@ -426,14 +323,14 @@ where
 
 pub async fn groups_create_handler<S>(
     axum::extract::State(service): axum::extract::State<S>,
-    axum::extract::Query(query): axum::extract::Query<GroupsCreateRequest>,
-    axum::Extension(claims): axum::Extension<S::Claims>,
+    Extension(claims): Extension<S::Claims>,
+    Json(payload): Json<CreateGroupBody>,
 ) -> impl axum::response::IntoResponse
 where
     S: Server + Clone + Send + Sync + 'static,
     S::Claims: Send + Sync + Clone + 'static,
 {
-    let result = service.groups_create(claims, query).await;
+    let result = service.groups_create(claims, payload).await;
     match result {
         Ok(response) => response.into_response(),
         Err(e) => (
@@ -446,13 +343,13 @@ where
 
 pub async fn groups_get_by_id_handler<S>(
     axum::extract::State(service): axum::extract::State<S>,
-    axum::extract::Query(query): axum::extract::Query<GroupsGetByIdRequest>,
+    Path(id): Path<i64>,
 ) -> impl axum::response::IntoResponse
 where
     S: Server + Clone + Send + Sync + 'static,
     S::Claims: Send + Sync + Clone + 'static,
 {
-    let result = service.groups_get_by_id(query).await;
+    let result = service.groups_get_by_id(id).await;
     match result {
         Ok(response) => response.into_response(),
         Err(e) => (
@@ -465,14 +362,15 @@ where
 
 pub async fn groups_update_handler<S>(
     axum::extract::State(service): axum::extract::State<S>,
-    axum::extract::Query(query): axum::extract::Query<GroupsUpdateRequest>,
-    axum::Extension(claims): axum::Extension<S::Claims>,
+    Extension(claims): Extension<S::Claims>,
+    Path(id): Path<i64>,
+    Json(payload): Json<UpdateGroupBody>,
 ) -> impl axum::response::IntoResponse
 where
     S: Server + Clone + Send + Sync + 'static,
     S::Claims: Send + Sync + Clone + 'static,
 {
-    let result = service.groups_update(claims, query).await;
+    let result = service.groups_update(claims, id, payload).await;
     match result {
         Ok(response) => response.into_response(),
         Err(e) => (
@@ -485,14 +383,14 @@ where
 
 pub async fn groups_delete_handler<S>(
     axum::extract::State(service): axum::extract::State<S>,
-    axum::extract::Query(query): axum::extract::Query<GroupsDeleteRequest>,
-    axum::Extension(claims): axum::Extension<S::Claims>,
+    Extension(claims): Extension<S::Claims>,
+    Path(id): Path<i64>,
 ) -> impl axum::response::IntoResponse
 where
     S: Server + Clone + Send + Sync + 'static,
     S::Claims: Send + Sync + Clone + 'static,
 {
-    let result = service.groups_delete(claims, query).await;
+    let result = service.groups_delete(claims, id).await;
     match result {
         Ok(response) => response.into_response(),
         Err(e) => (
@@ -505,13 +403,13 @@ where
 
 pub async fn subjects_list_handler<S>(
     axum::extract::State(service): axum::extract::State<S>,
-    axum::extract::Query(query): axum::extract::Query<SubjectsListRequest>,
+    Path(group_id): Path<i64>,
 ) -> impl axum::response::IntoResponse
 where
     S: Server + Clone + Send + Sync + 'static,
     S::Claims: Send + Sync + Clone + 'static,
 {
-    let result = service.subjects_list(query).await;
+    let result = service.subjects_list(group_id).await;
     match result {
         Ok(response) => response.into_response(),
         Err(e) => (
@@ -524,14 +422,15 @@ where
 
 pub async fn subjects_create_handler<S>(
     axum::extract::State(service): axum::extract::State<S>,
-    axum::extract::Query(query): axum::extract::Query<SubjectsCreateRequest>,
-    axum::Extension(claims): axum::Extension<S::Claims>,
+    Extension(claims): Extension<S::Claims>,
+    Path(group_id): Path<i64>,
+    Json(payload): Json<CreateSubjectBody>,
 ) -> impl axum::response::IntoResponse
 where
     S: Server + Clone + Send + Sync + 'static,
     S::Claims: Send + Sync + Clone + 'static,
 {
-    let result = service.subjects_create(claims, query).await;
+    let result = service.subjects_create(claims, group_id, payload).await;
     match result {
         Ok(response) => response.into_response(),
         Err(e) => (
@@ -544,13 +443,13 @@ where
 
 pub async fn subjects_get_by_id_handler<S>(
     axum::extract::State(service): axum::extract::State<S>,
-    axum::extract::Query(query): axum::extract::Query<SubjectsGetByIdRequest>,
+    Path((group_id, id)): Path<(i64, i64)>,
 ) -> impl axum::response::IntoResponse
 where
     S: Server + Clone + Send + Sync + 'static,
     S::Claims: Send + Sync + Clone + 'static,
 {
-    let result = service.subjects_get_by_id(query).await;
+    let result = service.subjects_get_by_id(group_id, id).await;
     match result {
         Ok(response) => response.into_response(),
         Err(e) => (
@@ -563,14 +462,15 @@ where
 
 pub async fn subjects_update_handler<S>(
     axum::extract::State(service): axum::extract::State<S>,
-    axum::extract::Query(query): axum::extract::Query<SubjectsUpdateRequest>,
-    axum::Extension(claims): axum::Extension<S::Claims>,
+    Extension(claims): Extension<S::Claims>,
+    Path((group_id, id)): Path<(i64, i64)>,
+    Json(payload): Json<UpdateSubjectBody>,
 ) -> impl axum::response::IntoResponse
 where
     S: Server + Clone + Send + Sync + 'static,
     S::Claims: Send + Sync + Clone + 'static,
 {
-    let result = service.subjects_update(claims, query).await;
+    let result = service.subjects_update(claims, group_id, id, payload).await;
     match result {
         Ok(response) => response.into_response(),
         Err(e) => (
@@ -583,14 +483,14 @@ where
 
 pub async fn subjects_delete_handler<S>(
     axum::extract::State(service): axum::extract::State<S>,
-    axum::extract::Query(query): axum::extract::Query<SubjectsDeleteRequest>,
-    axum::Extension(claims): axum::Extension<S::Claims>,
+    Extension(claims): Extension<S::Claims>,
+    Path((group_id, id)): Path<(i64, i64)>,
 ) -> impl axum::response::IntoResponse
 where
     S: Server + Clone + Send + Sync + 'static,
     S::Claims: Send + Sync + Clone + 'static,
 {
-    let result = service.subjects_delete(claims, query).await;
+    let result = service.subjects_delete(claims, group_id, id).await;
     match result {
         Ok(response) => response.into_response(),
         Err(e) => (
@@ -603,14 +503,15 @@ where
 
 pub async fn sessions_start_handler<S>(
     axum::extract::State(service): axum::extract::State<S>,
-    axum::extract::Query(query): axum::extract::Query<SessionsStartRequest>,
-    axum::Extension(claims): axum::Extension<S::Claims>,
+    Extension(claims): Extension<S::Claims>,
+    Path(subject_id): Path<i64>,
+    Json(payload): Json<SessionNoteBody>,
 ) -> impl axum::response::IntoResponse
 where
     S: Server + Clone + Send + Sync + 'static,
     S::Claims: Send + Sync + Clone + 'static,
 {
-    let result = service.sessions_start(claims, query).await;
+    let result = service.sessions_start(claims, subject_id, payload).await;
     match result {
         Ok(response) => response.into_response(),
         Err(e) => (
@@ -623,14 +524,14 @@ where
 
 pub async fn sessions_pause_handler<S>(
     axum::extract::State(service): axum::extract::State<S>,
-    axum::extract::Query(query): axum::extract::Query<SessionsPauseRequest>,
-    axum::Extension(claims): axum::Extension<S::Claims>,
+    Extension(claims): Extension<S::Claims>,
+    Path((subject_id, log_id)): Path<(i64, i64)>,
 ) -> impl axum::response::IntoResponse
 where
     S: Server + Clone + Send + Sync + 'static,
     S::Claims: Send + Sync + Clone + 'static,
 {
-    let result = service.sessions_pause(claims, query).await;
+    let result = service.sessions_pause(claims, subject_id, log_id).await;
     match result {
         Ok(response) => response.into_response(),
         Err(e) => (
@@ -643,14 +544,14 @@ where
 
 pub async fn sessions_resume_handler<S>(
     axum::extract::State(service): axum::extract::State<S>,
-    axum::extract::Query(query): axum::extract::Query<SessionsResumeRequest>,
-    axum::Extension(claims): axum::Extension<S::Claims>,
+    Extension(claims): Extension<S::Claims>,
+    Path((subject_id, log_id)): Path<(i64, i64)>,
 ) -> impl axum::response::IntoResponse
 where
     S: Server + Clone + Send + Sync + 'static,
     S::Claims: Send + Sync + Clone + 'static,
 {
-    let result = service.sessions_resume(claims, query).await;
+    let result = service.sessions_resume(claims, subject_id, log_id).await;
     match result {
         Ok(response) => response.into_response(),
         Err(e) => (
@@ -663,14 +564,15 @@ where
 
 pub async fn sessions_stop_handler<S>(
     axum::extract::State(service): axum::extract::State<S>,
-    axum::extract::Query(query): axum::extract::Query<SessionsStopRequest>,
-    axum::Extension(claims): axum::Extension<S::Claims>,
+    Extension(claims): Extension<S::Claims>,
+    Path((subject_id, log_id)): Path<(i64, i64)>,
+    Json(payload): Json<SessionNoteBody>,
 ) -> impl axum::response::IntoResponse
 where
     S: Server + Clone + Send + Sync + 'static,
     S::Claims: Send + Sync + Clone + 'static,
 {
-    let result = service.sessions_stop(claims, query).await;
+    let result = service.sessions_stop(claims, subject_id, log_id, payload).await;
     match result {
         Ok(response) => response.into_response(),
         Err(e) => (

package/example/output-rust/src/generated/types.rs

@@ -49,9 +49,9 @@ pub struct Group {
   #[serde(rename = "accountId")]
   pub account_id: uuid::Uuid,
   #[serde(rename = "createdAt")]
-  pub created_at: String,
+  pub created_at: chrono::DateTime<chrono::Utc>,
   #[serde(rename = "deletedAt")]
-  pub deleted_at: Option<String>,
+  pub deleted_at: Option<chrono::DateTime<chrono::Utc>>,
   pub name: String,
   pub icon: String,
   #[serde(rename = "colorText")]
@@ -66,9 +66,9 @@ pub struct GroupStatistics {
   #[serde(rename = "accountId")]
   pub account_id: uuid::Uuid,
   #[serde(rename = "createdAt")]
-  pub created_at: String,
+  pub created_at: chrono::DateTime<chrono::Utc>,
   #[serde(rename = "deletedAt")]
-  pub deleted_at: Option<String>,
+  pub deleted_at: Option<chrono::DateTime<chrono::Utc>>,
   pub name: String,
   pub icon: String,
   #[serde(rename = "colorText")]
@@ -120,9 +120,9 @@ pub struct Subject {
   #[serde(rename = "groupId")]
   pub group_id: i64,
   #[serde(rename = "createdAt")]
-  pub created_at: String,
+  pub created_at: chrono::DateTime<chrono::Utc>,
   #[serde(rename = "deletedAt")]
-  pub deleted_at: Option<String>,
+  pub deleted_at: Option<chrono::DateTime<chrono::Utc>>,
   pub name: String,
   pub icon: String,
   #[serde(rename = "colorText")]
@@ -139,9 +139,9 @@ pub struct SubjectStatistics {
   #[serde(rename = "groupId")]
   pub group_id: i64,
   #[serde(rename = "createdAt")]
-  pub created_at: String,
+  pub created_at: chrono::DateTime<chrono::Utc>,
   #[serde(rename = "deletedAt")]
-  pub deleted_at: Option<String>,
+  pub deleted_at: Option<chrono::DateTime<chrono::Utc>>,
   pub name: String,
   pub icon: String,
   #[serde(rename = "colorText")]
@@ -191,9 +191,9 @@ pub struct Log {
   #[serde(rename = "subjectId")]
   pub subject_id: i64,
   #[serde(rename = "startedAt")]
-  pub started_at: String,
+  pub started_at: chrono::DateTime<chrono::Utc>,
   #[serde(rename = "stoppedAt")]
-  pub stopped_at: Option<String>,
+  pub stopped_at: Option<chrono::DateTime<chrono::Utc>>,
   #[serde(rename = "logContent")]
   pub log_content: Option<String>,
   pub status: StudyStatus,
@@ -209,9 +209,9 @@ pub struct Timelog {
   #[serde(rename = "subjectId")]
   pub subject_id: i64,
   #[serde(rename = "startedAt")]
-  pub started_at: String,
+  pub started_at: chrono::DateTime<chrono::Utc>,
   #[serde(rename = "stoppedAt")]
-  pub stopped_at: Option<String>,
+  pub stopped_at: Option<chrono::DateTime<chrono::Utc>>,
   #[serde(rename = "durationInSeconds")]
   pub duration_in_seconds: i64,
 }

package/example/package-lock.json

@@ -17,7 +17,7 @@
       }
     },
     "..": {
-      "version": "0.2.0",
+      "version": "0.5.0",
       "license": "MIT",
       "devDependencies": {
         "@types/node": "latest",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typespec-rust-emitter",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "description": "TypeSpec emitter that generates idiomatic Rust types and structs",
   "keywords": [
     "typespec",