unify edn_view entrypoint

output/src/edn_view.rs

@@ -1,11 +1,42 @@
 use crate::*;
 use std::marker::PhantomData;
 use EdnItem::*;
+
+#[macro_export] macro_rules! edn_view {
+    ($Output:ty: |$self:ident: $App:ty| $content:expr; {
+        $( $type:ty { $($sym:literal => $value:expr),* } );*
+    }) => {
+        impl Content<$Output> for $App {
+            fn content(&$self) -> impl Render<$Output> { $content }
+        }
+        $(
+            impl<'a> EdnProvide<'a, $type> for $App {
+                fn get <S: AsRef<str>> (&'a $self, edn: &'a EdnItem<S>) -> Option<$type> {
+                    Some(match edn.to_ref() {
+                        $(EdnItem::Sym($sym) => $value,)*
+                        _ => return None
+                    })
+                }
+            }
+        )*
+    }
+}
+
 /// Implements `EdnProvide` for content components and expressions
 #[macro_export] macro_rules! edn_provide_content {
-    (|$self:ident:$Stat:ty|{ $($pat:pat => $expr:expr),* $(,)? }) => {
-        impl<'a> EdnProvide<'a, Box<dyn Render<TuiOut> + 'a>> for $State {
-            fn get <S: AsRef<str>> (&'a $self, edn: &'a EdnItem<S>) -> Option<Box<dyn Render<TuiOut> + 'a>> {
+    (|$self:ident:$State:ty|{ $($pat:pat => $expr:expr),* $(,)? }) => {
+        impl<'a, E: Output> EdnProvide<'a, Box<dyn Render<E> + 'a>> for $State {
+            fn get <S: AsRef<str>> (&'a $self, edn: &'a EdnItem<S>) -> Option<Box<dyn Render<E> + 'a>> {
+                Some(match edn.to_ref() {
+                    $(EdnItem::Sym($pat) => $expr),*,
+                    _ => return None
+                })
+            }
+        }
+    };
+    ($Output:ty: |$self:ident:$State:ty|{ $($pat:pat => $expr:expr),* $(,)? }) => {
+        impl<'a> EdnProvide<'a, Box<dyn Render<$Output> + 'a>> for $State {
+            fn get <S: AsRef<str>> (&'a $self, edn: &'a EdnItem<S>) -> Option<Box<dyn Render<$Output> + 'a>> {
                 Some(match edn.to_ref() {
                     $(EdnItem::Sym($pat) => $expr),*,
                     _ => return None
@@ -15,21 +46,23 @@ use EdnItem::*;
     }
 }
 /// Renders from EDN source and context.
-#[derive(Default)]
-pub enum EdnView<'a, E: Output, T: EdnViewData<'a, E> + std::fmt::Debug> {
-    #[default]
-    Inert,
-    _Unused(PhantomData<&'a E>),
+#[derive(Default)] pub enum EdnView<'a, E: Output, T: EdnViewData<'a, E> + std::fmt::Debug> {
+    #[default] Inert,
     Ok(T, EdnItem<&'a str>),
     //render: Box<dyn Fn(&'a T)->Box<dyn Render<E> + Send + Sync + 'a> + Send + Sync + 'a>
-    Err(String)
+    Err(String),
+    _Unused(PhantomData<&'a E>),
 }
 impl<'a, E: Output, T: EdnViewData<'a, E> + std::fmt::Debug> std::fmt::Debug for EdnView<'a, E, T> {
     fn fmt (&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
         match self {
-            Self::Inert | Self::_Unused(_) => write!(f, "EdnView::Inert"),
-            Self::Ok(state, view) => write!(f, "EdnView::Ok(state={state:?} view={view:?}"),
-            Self::Err(error) => write!(f, "EdnView::Err({error})"),
+            Self::Inert | Self::_Unused(_) =>
+                write!(f, "EdnView::Inert"),
+            Self::Ok(state, view) =>
+                write!(f, "EdnView::Ok(state={state:?} view={view:?}"),
+            Self::Err(error) =>
+                write!(f, "EdnView::Err({error})"),
+            _ => unreachable!()
         }
     }
 }