fix: bare enums serialize with their tags

Author: woodruffw

serde-sarif/src/lib.rs

@@ -34,7 +34,7 @@
 //! ```
 //!
 //! Because many of the [sarif::Sarif] structures contain a lot of optional fields, it is
-//! often convenient to use the builder pattern to contstruct these structs. Each
+//! often convenient to use the builder pattern to construct these structs. Each
 //! structure has a builder with a default.
 //!
 //! ## Example
@@ -57,7 +57,7 @@
 //!
 //! ## Crate Features
 //!
-//! This crate contains different features which may be enabled depndending on your
+//! This crate contains different features which may be enabled depending on your
 //! use case.
 //!
 //! ### Example

serde-sarif/src/sarif.rs

@@ -8,9 +8,9 @@ include!(concat!(env!("OUT_DIR"), "/sarif.rs"));
 
 #[doc = "The SARIF format version of this log file."]
 #[derive(Display, Debug, Serialize, Deserialize, EnumString)]
-#[serde(untagged)]
 pub enum Version {
   #[strum(serialize = "2.1.0")]
+  #[serde(rename = "2.1.0")]
   V2_1_0,
 }
 
@@ -20,185 +20,141 @@ pub static SCHEMA_URL: &str =
 
 #[doc = "The role or roles played by the artifact in the analysis."]
 #[derive(Display, Debug, Serialize, Deserialize, EnumString)]
-#[serde(untagged)]
+#[serde(rename_all = "camelCase")]
+#[strum(serialize_all = "camelCase")]
 pub enum ArtifactRoles {
-  #[strum(serialize = "analysisTarget")]
   AnalysisTarget,
-  #[strum(serialize = "attachment")]
   Attachment,
-  #[strum(serialize = "responseFile")]
   ResponseFile,
-  #[strum(serialize = "resultFile")]
   ResultFile,
-  #[strum(serialize = "standardStream")]
   StandardStream,
-  #[strum(serialize = "tracedFile")]
   TracedFile,
-  #[strum(serialize = "unmodified")]
   Unmodified,
-  #[strum(serialize = "modified")]
   Modified,
-  #[strum(serialize = "added")]
   Added,
-  #[strum(serialize = "deleted")]
   Deleted,
-  #[strum(serialize = "renamed")]
   Renamed,
-  #[strum(serialize = "uncontrolled")]
   Uncontrolled,
-  #[strum(serialize = "driver")]
   Driver,
-  #[strum(serialize = "extension")]
   Extension,
-  #[strum(serialize = "translation")]
   Translation,
-  #[strum(serialize = "taxonomy")]
   Taxonomy,
-  #[strum(serialize = "policy")]
   Policy,
-  #[strum(serialize = "referencedOnCommandLine")]
   ReferencedOnCommandLine,
-  #[strum(serialize = "memoryContents")]
   MemoryContents,
-  #[strum(serialize = "directory")]
   Directory,
-  #[strum(serialize = "userSpecifiedConfiguration")]
   UserSpecifiedConfiguration,
-  #[strum(serialize = "toolSpecifiedConfiguration")]
   ToolSpecifiedConfiguration,
-  #[strum(serialize = "debugOutputFile")]
   DebugOutputFile,
 }
 
 #[doc = "The SARIF format version of this external properties object."]
 #[derive(Display, Debug, Serialize, Deserialize, EnumString)]
-#[serde(untagged)]
 pub enum ExternalPropertiesVersion {
   #[strum(serialize = "2.1.0")]
+  #[serde(rename = "2.1.0")]
   V2_1_0,
 }
 
 #[doc = "A value specifying the severity level of the result."]
 #[derive(Display, Debug, Serialize, Deserialize, EnumString)]
-#[serde(untagged)]
+#[serde(rename_all = "camelCase")]
+#[strum(serialize_all = "camelCase")]
 pub enum NotificationLevel {
-  #[strum(serialize = "none")]
   None,
-  #[strum(serialize = "note")]
   Note,
-  #[strum(serialize = "warning")]
   Warning,
-  #[strum(serialize = "error")]
   Error,
 }
 
 #[doc = "Specifies the failure level for the report."]
 #[derive(Display, Debug, Serialize, Deserialize, EnumString)]
-#[serde(untagged)]
+#[serde(rename_all = "camelCase")]
+#[strum(serialize_all = "camelCase")]
 pub enum ReportingConfigurationLevel {
-  #[strum(serialize = "none")]
   None,
-  #[strum(serialize = "note")]
   Note,
-  #[strum(serialize = "warning")]
   Warning,
-  #[strum(serialize = "error")]
   Error,
 }
 
 #[doc = "A value that categorizes results by evaluation state."]
 #[derive(Display, Debug, Serialize, Deserialize, EnumString)]
-#[serde(untagged)]
+#[serde(rename_all = "camelCase")]
+#[strum(serialize_all = "camelCase")]
 pub enum ResultKind {
-  #[strum(serialize = "notApplicable")]
   NotApplicable,
-  #[strum(serialize = "pass")]
   Pass,
-  #[strum(serialize = "fail")]
   Fail,
-  #[strum(serialize = "review")]
   Review,
-  #[strum(serialize = "open")]
   Open,
-  #[strum(serialize = "informational")]
   Informational,
 }
 
 #[doc = "A value specifying the severity level of the result."]
 #[derive(Clone, Copy, Display, Debug, Serialize, Deserialize, EnumString)]
-#[serde(untagged)]
+#[serde(rename_all = "camelCase")]
+#[strum(serialize_all = "camelCase")]
 pub enum ResultLevel {
-  #[strum(serialize = "none")]
   None,
-  #[strum(serialize = "note")]
   Note,
-  #[strum(serialize = "warning")]
   Warning,
-  #[strum(serialize = "error")]
   Error,
 }
 
 #[doc = "The state of a result relative to a baseline of a previous run."]
 #[derive(Display, Debug, Serialize, Deserialize, EnumString)]
-#[serde(untagged)]
+#[serde(rename_all = "camelCase")]
+#[strum(serialize_all = "camelCase")]
 pub enum ResultBaselineState {
-  #[strum(serialize = "new")]
   New,
-  #[strum(serialize = "unchanged")]
   Unchanged,
-  #[strum(serialize = "updated")]
   Updated,
-  #[strum(serialize = "absent")]
   Absent,
 }
 
 #[doc = "Specifies the unit in which the tool measures columns."]
 #[derive(Display, Debug, Serialize, Deserialize, EnumString)]
-#[serde(untagged)]
+#[serde(rename_all = "camelCase")]
+#[strum(serialize_all = "camelCase")]
 pub enum ResultColumnKind {
-  #[strum(serialize = "utf16CodeUnits")]
   Utf16CodeUnits,
-  #[strum(serialize = "unicodeCodePoints")]
   UnicodeCodePoints,
 }
 
 #[doc = "A string that indicates where the suppression is persisted."]
 #[derive(Display, Debug, Serialize, Deserialize, EnumString)]
-#[serde(untagged)]
+#[serde(rename_all = "camelCase")]
+#[strum(serialize_all = "camelCase")]
 pub enum SupressionKind {
-  #[strum(serialize = "inSource")]
   InSource,
-  #[strum(serialize = "external")]
   External,
 }
 
 #[doc = "A string that indicates the review status of the suppression."]
 #[derive(Display, Debug, Serialize, Deserialize, EnumString)]
-#[serde(untagged)]
+#[serde(rename_all = "camelCase")]
+#[strum(serialize_all = "camelCase")]
 pub enum SupressionStatus {
-  #[strum(serialize = "accepted")]
   Accepted,
-  #[strum(serialize = "underReview")]
   UnderReview,
 }
 
 #[doc = "Specifies the importance of this location in understanding the code flow in which it occurs. The order from most to least important is \"essential\", \"important\", \"unimportant\". Default: \"important\"."]
 #[derive(Display, Debug, Serialize, Deserialize, EnumString)]
-#[serde(untagged)]
+#[serde(rename_all = "camelCase")]
+#[strum(serialize_all = "camelCase")]
 pub enum ThreadFlowLocationImportance {
-  #[strum(serialize = "important")]
   Important,
-  #[strum(serialize = "essential")]
   Essential,
 }
 
 #[doc = "The kinds of data contained in this object."]
 #[derive(Display, Debug, Serialize, Deserialize, EnumString)]
-#[serde(untagged)]
+#[serde(rename_all = "camelCase")]
+#[strum(serialize_all = "camelCase")]
 pub enum ToolComponentContents {
-  #[strum(serialize = "localizedData")]
   LocalizedData,
-  #[strum(serialize = "nonLocalizedData")]
   NonLocalizedData,
 }
 
@@ -239,6 +195,8 @@ impl From<ToolComponent> for Tool {
 
 #[cfg(test)]
 mod tests {
+  use std::str::FromStr;
+
   use super::*;
   macro_rules! map {
     ($( $key: expr => $val: expr ),*) => {{
@@ -287,4 +245,18 @@ mod tests {
       .build();
     assert_eq!(property_bag, property_bag_expected);
   }
+
+  #[test]
+  fn test_serialize_resultkind() {
+    assert_eq!(
+      serde_json::to_string(&ResultKind::Fail).unwrap(),
+      "\"fail\""
+    );
+  }
+
+  #[test]
+  fn test_parse_utf16codeunits() {
+    let v = ResultColumnKind::from_str("utf16CodeUnits").unwrap();
+    assert!(matches!(v, ResultColumnKind::Utf16CodeUnits));
+  }
 }