fix(common): handle deprecation booleans in registry response (#246)

Fixes: #244

crates/node-maintainer/src/resolver.rs

@@ -206,7 +206,7 @@ impl<'a> Resolver<'a> {
                         if let Some(deprecated) = deprecated {
                             tracing::warn!(
                                 "{} {}@{}: {}",
-                                "deprecated".magenta(),
+                                "deprecated".on_magenta(),
                                 manifest.name.as_ref().unwrap(),
                                 manifest
                                     .version

crates/oro-common/src/packument.rs

@@ -1,8 +1,8 @@
 use derive_builder::Builder;
 use node_semver::Version;
-use serde::{Deserialize, Deserializer, Serialize};
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use serde_json::Value;
-use std::collections::HashMap;
+use std::{collections::HashMap, fmt::Display};
 use url::Url;
 
 use crate::{CorgiManifest, Manifest, PersonField};
@@ -76,10 +76,10 @@ pub struct CorgiVersionMetadata {
     pub manifest: CorgiManifest,
     #[serde(
         default,
-        deserialize_with = "string_or_bool",
+        deserialize_with = "deserialize_deprecation_info",
         skip_serializing_if = "Option::is_none"
     )]
-    pub deprecated: Option<String>,
+    pub deprecated: Option<DeprecationInfo>,
 }
 
 /// A manifest for an individual package version.
@@ -95,10 +95,10 @@ pub struct VersionMetadata {
     pub has_shrinkwrap: Option<bool>,
     #[serde(
         default,
-        deserialize_with = "string_or_bool",
+        deserialize_with = "deserialize_deprecation_info",
         skip_serializing_if = "Option::is_none"
     )]
-    pub deprecated: Option<String>,
+    pub deprecated: Option<DeprecationInfo>,
 
     #[serde(flatten)]
     pub manifest: Manifest,
@@ -138,17 +138,11 @@ impl From<VersionMetadata> for Manifest {
     }
 }
 
-fn string_or_bool<'de, D, T>(deserializer: D) -> std::result::Result<Option<T>, D::Error>
-where
-    D: Deserializer<'de>,
-    T: std::cmp::PartialEq<&'de str> + Deserialize<'de>,
-{
-    let val: T = Deserialize::deserialize(deserializer)?;
-    if val != "false" {
-        Ok(Some(val))
-    } else {
-        Ok(None)
-    }
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(untagged)]
+enum StringOrBool {
+    String(String),
+    Bool(bool),
 }
 
 /// Representation for the `bin` field in package manifests.
@@ -166,6 +160,53 @@ pub struct NpmUser {
     pub email: Option<String>,
 }
 
+/// Represents the deprecation state of a package.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum DeprecationInfo {
+    Reason(String),
+    UnknownReason,
+}
+
+impl Display for DeprecationInfo {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::Reason(s) => write!(f, "{:?}", s),
+            Self::UnknownReason => write!(f, "Unknown Reason"),
+        }
+    }
+}
+
+impl Serialize for DeprecationInfo {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        match self {
+            DeprecationInfo::Reason(s) => serializer.serialize_str(s),
+            DeprecationInfo::UnknownReason => serializer.serialize_bool(true),
+        }
+    }
+}
+
+fn deserialize_deprecation_info<'de, D>(
+    deserializer: D,
+) -> std::result::Result<Option<DeprecationInfo>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    let val: StringOrBool = Deserialize::deserialize(deserializer)?;
+    Ok(match val {
+        StringOrBool::String(s) => Some(DeprecationInfo::Reason(s)),
+        StringOrBool::Bool(b) => {
+            if b {
+                Some(DeprecationInfo::UnknownReason)
+            } else {
+                None
+            }
+        }
+    })
+}
+
 /// Distribution information for a particular package version.
 ///
 /// This version is a reduced-size CorgiDist that only contains fields from

src/commands/view.rs

@@ -3,7 +3,7 @@ use clap::Args;
 use colored::*;
 use humansize::{file_size_opts, FileSize};
 use miette::{IntoDiagnostic, Result, WrapErr};
-use oro_common::{Bin, Manifest, NpmUser, Person, PersonField, VersionMetadata};
+use oro_common::{Bin, DeprecationInfo, Manifest, NpmUser, Person, PersonField, VersionMetadata};
 use term_grid::{Cell, Direction, Filling, Grid, GridOptions};
 
 use crate::commands::OroCommand;
@@ -97,8 +97,13 @@ impl OroCommand for ViewCmd {
             println!();
 
             // DEPRECATED - <deprecation message>
-            if let Some(msg) = deprecated.as_ref() {
-                println!("{} - {}\n", "DEPRECATED".bright_red(), msg);
+            if let Some(info) = deprecated.as_ref() {
+                let deprecated = "DEPRECATED".on_magenta();
+                if let DeprecationInfo::Reason(msg) = info {
+                    println!("{deprecated} {msg}\n");
+                } else {
+                    println!("{deprecated}\n");
+                }
             }
 
             // keywords: foo, bar, baz