Add utoipa support and refactor Language traits

- Add `utoipa` as an optional dependency and implement `ToSchema`.
- Replace `FromStr` with `TryFrom<&str>` for `Language`.
- Split `fmt` task in `Makefile.toml` into `fmt-rust` and `fmt-taplo`.
- Bump version to 0.4.1.

Author: aurexav

Cargo.lock

@@ -10,7 +10,7 @@ name        = "language"
 readme      = "README.md"
 repository  = "https://github.com/hack-ink/language"
 resolver    = "3"
-version     = "0.4.0"
+version     = "0.4.1"
 
 [package.metadata.docs.rs]
 all-features = true
@@ -54,6 +54,7 @@ scraper         = { version = "0.25", optional = true }
 serde           = { version = "1.0", optional = true, features = ["derive"] }
 sqlx            = { version = "0.8", optional = true, default-features = false }
 thiserror       = { version = "2.0" }
+utoipa          = { version = "5", optional = true }
 whatlang        = { version = "0.18", optional = true }
 
 [dev-dependencies]

Cargo.toml

@@ -22,12 +22,25 @@ args = [
 
 [tasks.fmt]
 workspace = false
-command = "bash"
+dependencies = [
+	"fmt-rust",
+	"fmt-taplo",
+]
+
+[tasks.fmt-rust]
+workspace = false
+command = "cargo"
+toolchain = "nightly"
 args = [
-	"-lc",
-	"taplo fmt && cargo +nightly fmt --all",
+	"fmt",
+	"--all",
 ]
 
+[tasks.fmt-taplo]
+workspace = false
+command = "taplo"
+args = ["fmt"]
+
 [tasks.nextest]
 workspace = false
 command = "cargo"

Makefile.toml

@@ -200,7 +200,7 @@ fn render(specs: &[TagSpec]) -> String {
 	out.push_str(
 		"\
 // std
-use std::{convert::TryFrom, str::FromStr};
+use std::convert::TryFrom;
 // self
 use crate::prelude::*;
 use Language::*;
@@ -302,10 +302,10 @@ impl Language {
 		"		}
 	}
 }
-impl FromStr for Language {
-	type Err = Error;
+impl TryFrom<&str> for Language {
+	type Error = Error;
 
-	fn from_str(tag: &str) -> Result<Self, Self::Err> {
+	fn try_from(tag: &str) -> Result<Self, Self::Error> {
 		let this = match tag {
 ",
 	);
@@ -325,18 +325,11 @@ impl FromStr for Language {
 		Ok(this)
 	}
 }
-impl TryFrom<&str> for Language {
-	type Error = Error;
-
-	fn try_from(value: &str) -> Result<Self, Self::Error> {
-		Self::from_str(value)
-	}
-}
 impl TryFrom<String> for Language {
 	type Error = Error;
 
 	fn try_from(value: String) -> Result<Self, Self::Error> {
-		Self::from_str(&value)
+		Language::try_from(value.as_str())
 	}
 }
 #[cfg(feature = \"serde\")]
@@ -356,9 +349,26 @@ impl<'de> serde::Deserialize<'de> for Language {
 	{
 		let tag = String::deserialize(deserializer)?;
 
-		Language::from_str(&tag).map_err(|_| serde::de::Error::unknown_variant(&tag, &[]))
+		Language::try_from(tag.as_str()).map_err(|_| serde::de::Error::unknown_variant(&tag, &[]))
+	}
+}
+#[cfg(feature = \"utoipa\")]
+impl utoipa::PartialSchema for Language {
+	fn schema() -> utoipa::openapi::RefOr<utoipa::openapi::schema::Schema> {
+		let enum_values =
+			Language::all().iter().map(|language| language.tag().to_string()).collect::<Vec<_>>();
+		let object = utoipa::openapi::schema::ObjectBuilder::new()
+			.schema_type(utoipa::openapi::schema::SchemaType::Type(
+				utoipa::openapi::schema::Type::String,
+			))
+			.enum_values(Some(enum_values))
+			.build();
+
+		utoipa::openapi::RefOr::T(utoipa::openapi::schema::Schema::Object(object))
 	}
 }
+#[cfg(feature = \"utoipa\")]
+impl utoipa::ToSchema for Language {}
 ",
 	);
 

build/codegen.rs

@@ -1,5 +1,5 @@
 // std
-use std::{convert::TryFrom, str::FromStr};
+use std::convert::TryFrom;
 // self
 use crate::prelude::*;
 use Language::*;
@@ -1492,10 +1492,10 @@ impl Language {
 		}
 	}
 }
-impl FromStr for Language {
-	type Err = Error;
+impl TryFrom<&str> for Language {
+	type Error = Error;
 
-	fn from_str(tag: &str) -> Result<Self, Self::Err> {
+	fn try_from(tag: &str) -> Result<Self, Self::Error> {
 		let this = match tag {
 			"af" => Af,
 			"ak" => Ak,
@@ -1746,18 +1746,11 @@ impl FromStr for Language {
 		Ok(this)
 	}
 }
-impl TryFrom<&str> for Language {
-	type Error = Error;
-
-	fn try_from(value: &str) -> Result<Self, Self::Error> {
-		Self::from_str(value)
-	}
-}
 impl TryFrom<String> for Language {
 	type Error = Error;
 
 	fn try_from(value: String) -> Result<Self, Self::Error> {
-		Self::from_str(&value)
+		Language::try_from(value.as_str())
 	}
 }
 #[cfg(feature = "serde")]
@@ -1777,6 +1770,23 @@ impl<'de> serde::Deserialize<'de> for Language {
 	{
 		let tag = String::deserialize(deserializer)?;
 
-		Language::from_str(&tag).map_err(|_| serde::de::Error::unknown_variant(&tag, &[]))
+		Language::try_from(tag.as_str()).map_err(|_| serde::de::Error::unknown_variant(&tag, &[]))
+	}
+}
+#[cfg(feature = "utoipa")]
+impl utoipa::PartialSchema for Language {
+	fn schema() -> utoipa::openapi::RefOr<utoipa::openapi::schema::Schema> {
+		let enum_values =
+			Language::all().iter().map(|language| language.tag().to_string()).collect::<Vec<_>>();
+		let object = utoipa::openapi::schema::ObjectBuilder::new()
+			.schema_type(utoipa::openapi::schema::SchemaType::Type(
+				utoipa::openapi::schema::Type::String,
+			))
+			.enum_values(Some(enum_values))
+			.build();
+
+		utoipa::openapi::RefOr::T(utoipa::openapi::schema::Schema::Object(object))
 	}
 }
+#[cfg(feature = "utoipa")]
+impl utoipa::ToSchema for Language {}

src/generated.rs

@@ -0,0 +1,21 @@
+#![cfg(feature = "utoipa")]
+
+// crates.io
+use utoipa::PartialSchema;
+// self
+use language::prelude::*;
+
+#[test]
+fn utoipa_schema_should_include_language_tags() {
+	let schema = Language::schema();
+	let value = serde_json::to_value(schema).unwrap();
+	let enum_values = value
+		.get("enum")
+		.and_then(|values| values.as_array())
+		.expect("Language schema should include enum values.");
+
+	let has_tag = |tag: &str| enum_values.iter().any(|value| value.as_str() == Some(tag));
+
+	assert!(has_tag("en"), "Language schema should include the 'en' tag.");
+	assert!(has_tag("zh-Hans"), "Language schema should include the 'zh-Hans' tag.");
+}