chore: refactor

Author: EqualMa

packages/frender-style/src/style.rs

@@ -1,7 +1,5 @@
 //! See [`style!`](crate::style!).
 
-pub use frender_const_expr::{array_len, const_marker};
-
 /// Styles separated by comma.
 ///
 /// The macro input will be parsed as [style syntaxes](one) separated by comma.
@@ -23,57 +21,12 @@ pub use style as comma_separated;
 #[doc(hidden)]
 #[macro_export]
 macro_rules! style_const {
-    (const $($rest:tt)*) => {{
-        enum HasConstDeclarationList {}
-        $crate::style::r#const! {
-            #[const_marker(HasConstDeclarationList)]
-            const $($rest)*
-        }
-    }};
-    (
-        #[$const_marker:ident $const_marker_body:tt]
-        const $s:tt
-    ) => {
-        $crate::style::r#const! {
-            #[$const_marker $const_marker_body]
-            const $s as _
+    ($($t:tt)*) => {
+        $crate::style::__private::r#const! {
+            #[const_impl_mod($crate::style::__private::const_impl)]
+            $($t)*
         }
     };
-    (
-        #[$const_marker:ident $const_marker_body:tt]
-        const $s:tt as $($const_ty:tt)*
-    ) => {{
-        const CONST_EXPR: $crate::styles::constness::ConstDeclarationList::<
-            $crate::style::const_marker::$const_marker!$const_marker_body
-        > = {
-            $crate::impl_has_const_declaration_list_for! {
-                impl $crate::style::const_marker::$const_marker!$const_marker_body {
-                    const _: $crate::__style_infer_const_type![$s $($const_ty)*] = $s;
-                }
-            }
-
-            $crate::styles::constness::ConstDeclarationList()
-        };
-
-        CONST_EXPR
-    }};
-}
-
-#[doc(hidden)]
-#[macro_export]
-macro_rules! __style_infer_const_type {
-    ({ [$($array:tt)*] } _) => {
-        [$crate::styles::constness::StaticStr; $crate::style::array_len!([$($array)*])]
-    };
-    ({ [$($array:tt)*] } [$item_ty:ty; _]) => {
-        [$item_ty; $crate::__dom_tokens_array_len!([$($array)*])]
-    };
-    ($block:tt _) => {
-        $crate::styles::constness::StaticStr
-    };
-    ($block:tt $ty:ty) => {
-        $ty
-    };
 }
 
 /// ### Supported style syntaxes
@@ -150,6 +103,23 @@ pub mod syntax {
     }
 }
 
+#[doc(hidden)]
+pub mod __private {
+    #[doc(hidden)]
+    pub use frender_const_expr::{const_marker, r#const};
+
+    #[doc(hidden)]
+    pub mod const_impl {
+        #[doc(hidden)]
+        pub use crate::{
+            impl_has_const_declaration_list_for as impl_marker_for,
+            styles::constness::{
+                ConstDeclarationList as ConstValue, HasConstDeclarationList as HasConstValue,
+            },
+        };
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use crate::{

packages/frender-style/src/styles/constness.rs

@@ -270,6 +270,27 @@ impl DeclarationListInfo {
     }
 }
 
+#[doc(hidden)]
+#[macro_export]
+macro_rules! __style_infer_const_type {
+    ($Ty:tt {$($braced:tt)*} ;) => {
+        // unbrace
+        $crate::__style_infer_const_type![$Ty $($braced)* ;]
+    };
+    ([_] [$($array:tt)*] ;) => {
+        [$crate::styles::constness::StaticStr; $crate::styles::constness::__private::array_len!([$($array)*])]
+    };
+    ([[$item_ty:ty; _]] [$($array:tt)*] ;) => {
+        [$item_ty; $crate::__dom_tokens_array_len!([$($array)*])]
+    };
+    ([_] $($unbraced_or_unrecognized_and_semi:tt)*) => {
+        $crate::styles::constness::StaticStr
+    };
+    ([$Ty:ty] $($unbraced_and_semi:tt)*) => {
+        $Ty
+    };
+}
+
 #[macro_export]
 macro_rules! impl_has_const_declaration_list_for {
     (impl <$(__)?> $($rest:tt)*) => {
@@ -279,12 +300,13 @@ macro_rules! impl_has_const_declaration_list_for {
     };
     (
         impl $for_ty:ty {
-            const $NAME:tt: _ = $const_expr:expr;
+            const $NAME:tt: $Ty:tt = $($const_expr_and_semi:tt)*
         }
     ) => {
         $crate::impl_has_const_declaration_list_for! {
             impl $for_ty {
-                const $NAME: $crate::styles::constness::StaticStr = $const_expr;
+                const $NAME: $crate::__style_infer_const_type![[$Ty] $($const_expr_and_semi)*]
+                    = $($const_expr_and_semi)*
             }
         }
     };
@@ -586,8 +608,13 @@ pub type StaticStr = &'static str;
 
 #[doc(hidden)]
 pub mod __private {
+    #[doc(hidden)]
     pub use str;
 
+    #[doc(hidden)]
+    pub use frender_const_expr::array_len;
+
+    #[doc(hidden)]
     pub const fn from_utf8(v: &[u8]) -> &str {
         match core::str::from_utf8(v) {
             Ok(v) => v,