new border style and feature

Author: togglebyte

CHANGES.md

@@ -1,3 +1,7 @@
+* 0.2.9
+    * New border style: "rounded"
+    * Hex and Color can now be serialized / deserialized if the `serde` feature
+      is enabled.
 * 0.2.8
     * An emitter can be created before the runtime
     * Messages can be emitted to both widget ids and component ids

anathema-default-widgets/src/border.rs

@@ -131,6 +131,17 @@ pub const DEFAULT_THICK_EDGES: [Glyph; 8] = [
     Glyph::from_char('║', 1),
 ];
 
+pub const DEFAULT_ROUNDED_EDGES: [Glyph; 8] = [
+    Glyph::from_char('╭', 1),
+    Glyph::from_char('─', 1),
+    Glyph::from_char('╮', 1),
+    Glyph::from_char('│', 1),
+    Glyph::from_char('╯', 1),
+    Glyph::from_char('─', 1),
+    Glyph::from_char('╰', 1),
+    Glyph::from_char('│', 1),
+];
+
 /// The style of the border.
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Default)]
 pub enum BorderStyle {
@@ -152,6 +163,7 @@ pub enum BorderStyle {
     /// 7hello3
     /// 6555554
     /// ```
+    Rounded,
     Custom([Glyph; 8]),
 }
 
@@ -160,6 +172,7 @@ impl BorderStyle {
         match self {
             BorderStyle::Thin => DEFAULT_SLIM_EDGES,
             BorderStyle::Thick => DEFAULT_THICK_EDGES,
+            BorderStyle::Rounded => DEFAULT_ROUNDED_EDGES,
             BorderStyle::Custom(edges) => *edges,
         }
     }
@@ -429,6 +442,7 @@ impl Widget for Border {
                 match s {
                     Some("thin") | None => BorderStyle::default(),
                     Some("thick") => BorderStyle::Thick,
+                    Some("rounded") => BorderStyle::Rounded,
                     Some(s) => {
                         let mut glyphs = Glyphs::new(s);
                         while let Some(g) = glyphs.next(ctx.glyph_map) {

anathema-state/Cargo.toml

@@ -11,6 +11,11 @@ repository = "https://github.com/togglebyte/anathema"
 [dependencies]
 anathema-state-derive = { workspace = true }
 anathema-store = { workspace = true }
+serde = { version = "1.0", optional = true, features = ["derive"] }
+
+[features]
+default = []
+serde = ["dep:serde"]
 
 [lints]
 workspace = true

anathema-state/src/colors.rs

@@ -11,6 +11,7 @@ pub trait FromColor {
 ///
 /// [ANSI color table](https://en.wikipedia.org/wiki/ANSI_escape_code#Colors)
 #[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Eq, Default)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum Color {
     #[default]
     Reset,

anathema-state/src/lib.rs

@@ -45,6 +45,7 @@ impl<'a> From<&'a str> for Path<'a> {
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, PartialOrd)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct Hex {
     pub r: u8,
     pub g: u8,

anathema-templates/src/components.rs

@@ -219,26 +219,26 @@ impl ComponentTemplates {
 
     pub(crate) fn load(
         &mut self,
-        parent_id: ComponentBlueprintId,
+        component_id: ComponentBlueprintId,
         variables: &mut Variables,
         slots: SmallMap<StringId, Vec<Blueprint>>,
         strings: &mut Strings,
     ) -> Result<Vec<Blueprint>> {
-        let ticket = self.components.checkout(parent_id);
+        let ticket = self.components.checkout(component_id);
         let (_, component_src) = &*ticket;
 
-        if self.dependencies.contains(&parent_id) {
+        if self.dependencies.contains(&component_id) {
             let path = component_src.path();
             self.components.restore(ticket);
             return Err(Error::new(path, ErrorKind::CircularDependency));
         }
 
-        self.dependencies.push(parent_id);
+        self.dependencies.push(component_id);
 
         // NOTE
         // The ticket has to be restored to the component store,
         // this is why the error is returned rather than using `?` on `self.compile`.
-        let ret = self.compile(component_src, variables, slots, strings, parent_id);
+        let ret = self.compile(component_src, variables, slots, strings, component_id);
         self.components.restore(ticket);
         self.dependencies.pop();
         ret

anathema-templates/src/statements/eval.rs

@@ -222,17 +222,19 @@ impl Scope {
 
         // If the next statement is NOT a slot id then assume $children
         // and still try to take the scope
-        if !scope.is_next_slot() {
-            let slot_id = ctx.strings.children();
-            let scope = Scope::new(scope);
-            let body = scope.eval(ctx)?;
-            slots.set(slot_id, body);
-        } else {
-            // for each slot take the scope and associate it with the slot id
-            while let Some(slot_id) = scope.next_slot() {
-                let scope = Scope::new(scope.take_scope());
+        if !scope.is_empty() {
+            if !scope.is_next_slot() {
+                let slot_id = ctx.strings.children();
+                let scope = Scope::new(scope);
                 let body = scope.eval(ctx)?;
                 slots.set(slot_id, body);
+            } else {
+                // for each slot take the scope and associate it with the slot id
+                while let Some(slot_id) = scope.next_slot() {
+                    let scope = Scope::new(scope.take_scope());
+                    let body = scope.eval(ctx)?;
+                    slots.set(slot_id, body);
+                }
             }
         }
 

anathema-templates/src/statements/mod.rs

@@ -52,11 +52,10 @@ impl Context<'_> {
 
     fn load_component(
         &mut self,
-        parent_component_id: ComponentBlueprintId,
+        component_id: ComponentBlueprintId,
         slots: SmallMap<StringId, Vec<Blueprint>>,
     ) -> Result<Vec<Blueprint>> {
-        self.components
-            .load(parent_component_id, self.variables, slots, self.strings)
+        self.components.load(component_id, self.variables, slots, self.strings)
     }
 }