typespec-rust-emitter 0.2.0 → 0.4.0

package/dist/test/hello.test.js

@@ -136,5 +136,83 @@ describe("Rust emitter", () => {
         const output = results["types.rs"];
         strictEqual(output.includes("#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]"), true);
     });
+    it("emits custom rustDerive on enum", async () => {
+        const results = await emit(`
+      import "typespec-rust-emitter";
+
+      @rustDerive("strum::Display")
+      enum Status {
+        active,
+        inactive,
+      }
+    `);
+        const output = results["types.rs"];
+        strictEqual(output.includes("#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize, strum::Display)]"), true);
+    });
+    it("emits multiple rustDerive macros on enum via $rustDerives", async () => {
+        const results = await emit(`
+      import "typespec-rust-emitter";
+
+      @rustDerives("strum::Display", "strum::EnumString")
+      enum Priority {
+        low,
+        high,
+      }
+    `);
+        const output = results["types.rs"];
+        strictEqual(output.includes("#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize, strum::Display, strum::EnumString)]"), true);
+    });
+    it("emits custom rustAttr on model", async () => {
+        const results = await emit(`
+      import "typespec-rust-emitter";
+
+      @rustAttr("sqlx(type_name = \\"user\\")")
+      model User {
+        name: string;
+      }
+    `);
+        const output = results["types.rs"];
+        strictEqual(output.includes('#[sqlx(type_name = "user")]'), true);
+    });
+    it("emits multiple rustAttrs on model via $rustAttrs", async () => {
+        const results = await emit(`
+      import "typespec-rust-emitter";
+
+      @rustAttrs("sqlx(type_name = \\"user\\")", "cfg_attr(feature = \\"test\\", derive(Debug))")
+      model Person {
+        name: string;
+      }
+    `);
+        const output = results["types.rs"];
+        strictEqual(output.includes('#[sqlx(type_name = "user")]'), true);
+        strictEqual(output.includes('#[cfg_attr(feature = "test", derive(Debug))]'), true);
+    });
+    it("emits custom rustAttr on enum", async () => {
+        const results = await emit(`
+      import "typespec-rust-emitter";
+
+      @rustAttr("sqlx(type_name = \\"study_status\\")")
+      enum Status {
+        active,
+        inactive,
+      }
+    `);
+        const output = results["types.rs"];
+        strictEqual(output.includes('#[sqlx(type_name = "study_status")]'), true);
+    });
+    it("emits multiple rustAttrs on enum via $rustAttrs", async () => {
+        const results = await emit(`
+      import "typespec-rust-emitter";
+
+      @rustAttrs("sqlx(type_name = \\"priority\\")", "cfg_attr(feature = \\"test\\", derive(Debug))")
+      enum Priority {
+        low,
+        high,
+      }
+    `);
+        const output = results["types.rs"];
+        strictEqual(output.includes('#[sqlx(type_name = "priority")]'), true);
+        strictEqual(output.includes('#[cfg_attr(feature = "test", derive(Debug))]'), true);
+    });
 });
 //# sourceMappingURL=hello.test.js.map

package/dist/test/hello.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"hello.test.js","sourceRoot":"","sources":["../../test/hello.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hello.test.js","sourceRoot":"","sources":["../../test/hello.test.ts"],"names":[],"mappings":"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"}

package/example/lib/learning/models.tsp

@@ -30,6 +30,8 @@ namespace Mtlkms.Learning.Models {
   @pattern("^#[0-9A-Fa-f]{6}$")
   scalar HexColor extends string;
 
+  @rustDerive("sqlx::Type")
+  @rustAttr("sqlx(type_name = \"study_status\")")
   enum StudyStatus {
     Starting: "Starting",
     Paused: "Paused",

package/example/output-rust/Cargo.lock

@@ -983,6 +983,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sqlx",
+ "strum",
  "thiserror",
  "tokio",
  "tower",
@@ -1615,6 +1616,27 @@ dependencies = [
  "unicode-properties",
 ]
 
+[[package]]
+name = "strum"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
+dependencies = [
+ "strum_macros",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "subtle"
 version = "2.6.1"

package/example/output-rust/Cargo.toml

@@ -17,3 +17,4 @@ tokio = { version = "1.50.0", features = ["full"] }
 chrono = { version = "0.4.44", features = ["serde"] }
 tower = "0.5"
 tower-http = { version = "0.6", features = ["auth"] }
+strum = { version = "0.27", features = ["derive"] }

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

@@ -235,7 +235,8 @@ pub struct SessionNoteBody {
   pub log_content: Option<String>,
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize, sqlx::Type)]
+#[sqlx(type_name = "study_status")]
 pub enum StudyStatus {
   #[serde(rename = "Starting")]
   Starting,

package/example/package-lock.json

@@ -17,8 +17,7 @@
       }
     },
     "..": {
-      "name": "typespec-rust-emitter",
-      "version": "0.1.0",
+      "version": "0.4.0",
       "license": "MIT",
       "devDependencies": {
         "@types/node": "latest",

package/package.json

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