handle default values for fields represented as NonZeroU{8,16,32} (#608)

oxidecomputer · Jun 12, 2024 · d36f65e · d36f65e
1 parent e6905e0
commit d36f65e
Show file tree

Hide file tree

Showing 4 changed files with 85 additions and 3 deletions.
diff --git a/typify-impl/src/defaults.rs b/typify-impl/src/defaults.rs
@@ -43,6 +43,17 @@ impl From<&DefaultImpl> for TokenStream {
  T::try_from(V).unwrap()
  }
  },
+ DefaultImpl::NZU64 => quote! {
+ pub(super) fn default_nzu64<T, const V: u64>() -> T
+ where
+ T: std::convert::TryFrom<std::num::NonZeroU64>,
+ <T as std::convert::TryFrom<std::num::NonZeroU64>>::Error:
+ std::fmt::Debug,
+ {
+ T::try_from(std::num::NonZeroU64::try_from(V).unwrap())
+ .unwrap()
+ }
+ },
  }
  }
 }
@@ -272,11 +283,17 @@ impl TypeEntry {
  },
  // Note that min and max values are handled already by the
  // conversion routines since we have those close at hand.
- TypeEntryDetails::Integer(_) => match (default.as_u64(), default.as_i64()) {
+ TypeEntryDetails::Integer(itype) => match (default.as_u64(), default.as_i64()) {
  (None, None) => Err(Error::invalid_value()),
  (Some(0), _) => Ok(DefaultKind::Intrinsic),
  (_, Some(0)) => unreachable!(),
- (Some(_), _) => Ok(DefaultKind::Generic(DefaultImpl::U64)),
+ (Some(_), _) => {
+ if itype.starts_with("std::num::NonZero") {
+ Ok(DefaultKind::Generic(DefaultImpl::NZU64))
+ } else {
+ Ok(DefaultKind::Generic(DefaultImpl::U64))
+ }
+ }
  (_, Some(_)) => Ok(DefaultKind::Generic(DefaultImpl::I64)),
  },
  TypeEntryDetails::Float(_) => {
@@ -319,7 +336,11 @@ impl TypeEntry {
  TypeEntryDetails::Boolean => Some("defaults::default_bool::<true>".to_string()),
  TypeEntryDetails::Integer(name) => {
  if let Some(value) = default.as_u64() {
- Some(format!("defaults::default_u64::<{}, {}>", name, value))
+ if name.starts_with("std::num::NonZero") {
+ Some(format!("defaults::default_nzu64::<{}, {}>", name, value))
+ } else {
+ Some(format!("defaults::default_u64::<{}, {}>", name, value))
+ }
  } else if let Some(value) = default.as_i64() {
  Some(format!("defaults::default_i64::<{}, {}>", name, value))
  } else {

diff --git a/typify-impl/src/lib.rs b/typify-impl/src/lib.rs
@@ -234,6 +234,7 @@ pub(crate) enum DefaultImpl {
  Boolean,
  I64,
  U64,
+ NZU64,
 }
 
 /// Settings that alter type generation.

diff --git a/typify/tests/schemas/types-with-defaults.json b/typify/tests/schemas/types-with-defaults.json
@@ -59,6 +59,23 @@
  "default": "1970-01-01T00:00:00Z"
  }
  }
+ },
+ "MrDefaultNumbers": {
+ "type": "object",
+ "properties": {
+ "little_u8": {
+ "type": "integer",
+ "format": "uint8",
+ "minimum": 1,
+ "default": 2
+ },
+ "little_u16": {
+ "type": "integer",
+ "format": "uint16",
+ "minimum": 1,
+ "default": 3
+ }
+ }
  }
  }
 }
diff --git a/typify/tests/schemas/types-with-defaults.rs b/typify/tests/schemas/types-with-defaults.rs
@@ -53,6 +53,42 @@ impl From<&Doodad> for Doodad {
  value.clone()
  }
 }
+#[doc = "MrDefaultNumbers"]
+#[doc = r""]
+#[doc = r" <details><summary>JSON schema</summary>"]
+#[doc = r""]
+#[doc = r" ```json"]
+#[doc = "{"]
+#[doc = " \"type\": \"object\","]
+#[doc = " \"properties\": {"]
+#[doc = " \"little_u16\": {"]
+#[doc = " \"default\": 3,"]
+#[doc = " \"type\": \"integer\","]
+#[doc = " \"format\": \"uint16\","]
+#[doc = " \"minimum\": 1.0"]
+#[doc = " },"]
+#[doc = " \"little_u8\": {"]
+#[doc = " \"default\": 2,"]
+#[doc = " \"type\": \"integer\","]
+#[doc = " \"format\": \"uint8\","]
+#[doc = " \"minimum\": 1.0"]
+#[doc = " }"]
+#[doc = " }"]
+#[doc = "}"]
+#[doc = r" ```"]
+#[doc = r" </details>"]
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct MrDefaultNumbers {
+ #[serde(default = "defaults::default_nzu64::<std::num::NonZeroU16, 3>")]
+ pub little_u16: std::num::NonZeroU16,
+ #[serde(default = "defaults::default_nzu64::<std::num::NonZeroU8, 2>")]
+ pub little_u8: std::num::NonZeroU8,
+}
+impl From<&MrDefaultNumbers> for MrDefaultNumbers {
+ fn from(value: &MrDefaultNumbers) -> Self {
+ value.clone()
+ }
+}
 #[doc = "OuterThing"]
 #[doc = r""]
 #[doc = r" <details><summary>JSON schema</summary>"]
@@ -183,6 +219,13 @@ impl Default for ThingWithDefaults {
 }
 #[doc = r" Generation of default values for serde."]
 pub mod defaults {
+ pub(super) fn default_nzu64<T, const V: u64>() -> T
+ where
+ T: std::convert::TryFrom<std::num::NonZeroU64>,
+ <T as std::convert::TryFrom<std::num::NonZeroU64>>::Error: std::fmt::Debug,
+ {
+ T::try_from(std::num::NonZeroU64::try_from(V).unwrap()).unwrap()
+ }
  pub(super) fn doodad_when() -> chrono::DateTime<chrono::offset::Utc> {
  serde_json::from_str::<chrono::DateTime<chrono::offset::Utc>>("\"1970-01-01T00:00:00Z\"")
  .unwrap()