Refactor WordPress content ID types to use macros

wp_api/src/categories.rs

@@ -1,34 +1,17 @@
 use crate::{
-    WpApiParamOrder, impl_as_query_value_for_new_type, impl_as_query_value_from_to_string,
+    WpApiParamOrder, impl_as_query_value_from_to_string,
     posts::PostId,
     taxonomies::TaxonomyType,
     url_query::{
         AppendUrlQueryPairs, FromUrlQueryPairs, QueryPairs, QueryPairsExtension, UrlQueryPairsMap,
     },
+    wp_content_i64_id,
 };
 use serde::{Deserialize, Serialize};
-use std::{num::ParseIntError, str::FromStr};
 use strum_macros::IntoStaticStr;
 use wp_contextual::WpContextual;
 
-impl_as_query_value_for_new_type!(CategoryId);
-uniffi::custom_newtype!(CategoryId, i64);
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
-pub struct CategoryId(pub i64);
-
-impl FromStr for CategoryId {
-    type Err = ParseIntError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        s.parse().map(Self)
-    }
-}
-
-impl std::fmt::Display for CategoryId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
+wp_content_i64_id!(CategoryId);
 
 #[derive(
     Debug,

wp_api/src/comments.rs

@@ -1,14 +1,15 @@
 use crate::{
     AnyJson, UserAvatarSize, UserId, WpApiParamOrder, WpResponseString,
     date::WpGmtDateTime,
-    impl_as_query_value_for_new_type, impl_as_query_value_from_to_string,
+    impl_as_query_value_from_to_string,
     posts::PostId,
     url_query::{
         AppendUrlQueryPairs, FromUrlQueryPairs, QueryPairs, QueryPairsExtension, UrlQueryPairsMap,
     },
+    wp_content_i64_id,
 };
 use serde::{Deserialize, Serialize};
-use std::{collections::HashMap, num::ParseIntError, str::FromStr, sync::Arc};
+use std::{collections::HashMap, str::FromStr, sync::Arc};
 use strum_macros::IntoStaticStr;
 use wp_contextual::WpContextual;
 
@@ -37,24 +38,7 @@ pub enum WpApiParamCommentsOrderBy {
 
 impl_as_query_value_from_to_string!(WpApiParamCommentsOrderBy);
 
-impl_as_query_value_for_new_type!(CommentId);
-uniffi::custom_newtype!(CommentId, i64);
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
-pub struct CommentId(pub i64);
-
-impl FromStr for CommentId {
-    type Err = ParseIntError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        s.parse().map(Self)
-    }
-}
-
-impl std::fmt::Display for CommentId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
+wp_content_i64_id!(CommentId);
 
 #[derive(
     Debug,

wp_api/src/lib.rs

@@ -39,6 +39,7 @@ pub mod uuid;
 pub mod widget_types;
 pub mod widgets;
 pub mod wordpress_org;
+pub mod wp_content_macros;
 pub mod wp_site_health_tests;
 
 mod uniffi_serde;

wp_api/src/media.rs

@@ -1,40 +1,24 @@
 use crate::{
     UserId, WpApiParamOrder,
     date::WpGmtDateTime,
-    impl_as_query_value_for_new_type, impl_as_query_value_from_to_string,
+    impl_as_query_value_from_to_string,
     posts::{
         PostCommentStatus, PostId, PostPingStatus, PostStatus, WpApiParamPostsOrderBy,
         WpApiParamPostsSearchColumn,
     },
     url_query::{
         AppendUrlQueryPairs, FromUrlQueryPairs, QueryPairs, QueryPairsExtension, UrlQueryPairsMap,
     },
+    wp_content_i64_id,
 };
 use serde::{Deserialize, Serialize};
 use serde_json::value::RawValue;
+use std::collections::HashMap;
 use std::sync::Arc;
-use std::{collections::HashMap, num::ParseIntError, str::FromStr};
 use strum_macros::IntoStaticStr;
 use wp_contextual::WpContextual;
 
-impl_as_query_value_for_new_type!(MediaId);
-uniffi::custom_newtype!(MediaId, i64);
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
-pub struct MediaId(pub i64);
-
-impl FromStr for MediaId {
-    type Err = ParseIntError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        s.parse().map(Self)
-    }
-}
-
-impl std::fmt::Display for MediaId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
+wp_content_i64_id!(MediaId);
 
 #[derive(
     Debug,

wp_api/src/post_revisions.rs

@@ -1,35 +1,18 @@
 use crate::{
     UserId, WpApiParamOrder,
     date::WpGmtDateTime,
-    impl_as_query_value_for_new_type, impl_as_query_value_from_to_string,
+    impl_as_query_value_from_to_string,
     posts::PostId,
     url_query::{
         AppendUrlQueryPairs, FromUrlQueryPairs, QueryPairs, QueryPairsExtension, UrlQueryPairsMap,
     },
+    wp_content_i64_id,
 };
 use serde::{Deserialize, Serialize};
-use std::{num::ParseIntError, str::FromStr};
 use strum_macros::IntoStaticStr;
 use wp_contextual::WpContextual;
 
-impl_as_query_value_for_new_type!(PostRevisionId);
-uniffi::custom_newtype!(PostRevisionId, i64);
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
-pub struct PostRevisionId(pub i64);
-
-impl FromStr for PostRevisionId {
-    type Err = ParseIntError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        s.parse().map(Self)
-    }
-}
-
-impl std::fmt::Display for PostRevisionId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
+wp_content_i64_id!(PostRevisionId);
 
 #[derive(
     Debug,

wp_api/src/posts.rs

@@ -2,15 +2,15 @@ use crate::{
     UserId, WpApiParamOrder,
     categories::CategoryId,
     date::WpGmtDateTime,
-    impl_as_query_value_for_new_type, impl_as_query_value_from_to_string,
+    impl_as_query_value_from_to_string,
     media::MediaId,
     tags::TagId,
     url_query::{
         AppendUrlQueryPairs, FromUrlQueryPairs, QueryPairs, QueryPairsExtension, UrlQueryPairsMap,
     },
+    wp_content_i64_id,
 };
 use serde::{Deserialize, Serialize};
-use std::{num::ParseIntError, str::FromStr};
 use strum_macros::IntoStaticStr;
 use wp_contextual::WpContextual;
 use wp_serde_helper::{deserialize_from_string_of_json_array, serialize_as_json_string};
@@ -448,24 +448,7 @@ pub struct PostUpdateParams {
     pub tags: Vec<TagId>,
 }
 
-impl_as_query_value_for_new_type!(PostId);
-uniffi::custom_newtype!(PostId, i64);
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
-pub struct PostId(pub i64);
-
-impl FromStr for PostId {
-    type Err = ParseIntError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        s.parse().map(Self)
-    }
-}
-
-impl std::fmt::Display for PostId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
+wp_content_i64_id!(PostId);
 
 #[derive(Debug, Serialize, Deserialize, uniffi::Record, WpContextual)]
 pub struct SparsePost {

wp_api/src/prelude.rs

@@ -17,6 +17,7 @@ pub use crate::{
         endpoint::{ApiUrlResolver, WpOrgSiteApiUrlResolver, media_endpoint::MediaUploadRequest},
     },
     uuid::{WpUuid, WpUuidParseError},
+    wp_content_i64_id, wp_content_string_id,
 };
 
 #[cfg(feature = "reqwest-request-executor")]

wp_api/src/tags.rs

@@ -1,34 +1,17 @@
 use crate::{
-    WpApiParamOrder, impl_as_query_value_for_new_type, impl_as_query_value_from_to_string,
+    WpApiParamOrder, impl_as_query_value_from_to_string,
     posts::PostId,
     taxonomies::TaxonomyType,
     url_query::{
         AppendUrlQueryPairs, FromUrlQueryPairs, QueryPairs, QueryPairsExtension, UrlQueryPairsMap,
     },
+    wp_content_i64_id,
 };
 use serde::{Deserialize, Serialize};
-use std::{num::ParseIntError, str::FromStr};
 use strum_macros::IntoStaticStr;
 use wp_contextual::WpContextual;
 
-impl_as_query_value_for_new_type!(TagId);
-uniffi::custom_newtype!(TagId, i64);
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
-pub struct TagId(pub i64);
-
-impl FromStr for TagId {
-    type Err = ParseIntError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        s.parse().map(Self)
-    }
-}
-
-impl std::fmt::Display for TagId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
+wp_content_i64_id!(TagId);
 
 #[derive(
     Debug,

wp_api/src/users.rs

@@ -1,14 +1,13 @@
 use crate::{
     EnumFromStrParsingError, OptionFromStr, WpApiParamOrder, WpResponseString,
-    impl_as_query_value_for_new_type, impl_as_query_value_from_to_string,
+    impl_as_query_value_from_to_string,
     url_query::{
         AppendUrlQueryPairs, FromUrlQueryPairs, QueryPairs, QueryPairsExtension, UrlQueryPairsMap,
     },
+    wp_content_i64_id,
 };
 use serde::{Deserialize, Serialize};
-use std::{
-    collections::HashMap, convert::Infallible, fmt::Display, num::ParseIntError, str::FromStr,
-};
+use std::{collections::HashMap, convert::Infallible, fmt::Display, str::FromStr};
 use strum_macros::IntoStaticStr;
 use wp_contextual::WpContextual;
 
@@ -403,30 +402,7 @@ pub struct UserDeleteResponse {
     pub previous: UserWithEditContext,
 }
 
-impl_as_query_value_for_new_type!(UserId);
-uniffi::custom_newtype!(UserId, i64);
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
-pub struct UserId(pub i64);
-
-impl FromStr for UserId {
-    type Err = ParseIntError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        s.parse().map(Self)
-    }
-}
-
-impl std::fmt::Display for UserId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl From<i64> for UserId {
-    fn from(value: i64) -> Self {
-        Self(value)
-    }
-}
+wp_content_i64_id!(UserId);
 
 #[derive(Debug, Serialize, Deserialize, uniffi::Record, WpContextual)]
 pub struct SparseUser {