added file for list functions

Author: togglebyte

Cargo.toml

@@ -13,21 +13,25 @@ repository = "https://github.com/togglebyte/anathema"
 publish = true
 
 [dependencies]
-anathema-default-widgets = { path = "./anathema-default-widgets", version = "0.2.2" }
-anathema-backend = { path = "./anathema-backend", version = "0.2.2" }
-anathema-runtime = { path = "./anathema-runtime", version = "0.2.2" }
-anathema-state = { path = "./anathema-state", version = "0.2.2" }
-anathema-state-derive = { path = "./anathema-state-derive", version = "0.2.2" }
-anathema-store = { path = "./anathema-store", version = "0.2.2" }
-anathema-templates = { path = "./anathema-templates", version = "0.2.2" }
-anathema-widgets = { path = "./anathema-widgets", version = "0.2.2" }
-anathema-geometry = { path = "./anathema-geometry", version = "0.2.2" }
-anathema-value-resolver = { path = "./anathema-value-resolver", version = "0.2.2" }
+anathema-backend = { workspace = true }
+anathema-default-widgets = { workspace = true }
+anathema-geometry = { workspace = true }
+anathema-runtime = { workspace = true }
+anathema-state = { workspace = true }
+anathema-state-derive = { workspace = true }
+anathema-store = { workspace = true }
+anathema-templates = { workspace = true }
+anathema-value-resolver = { workspace = true }
+anathema-widgets = { workspace = true }
+
+[dev-dependencies]
+# anathema-debug = { path = "anathema-debug" }
+anathema-testutils = { path = "anathema-testutils" }
 
 [features]
 default = []
-profile = ["anathema-runtime/profile", "anathema-widgets/profile", "anathema-backend/profile"]
-# filelog = ["anathema-debug/filelog"]
+# profile = ["anathema-runtime/profile", "anathema-widgets/profile", "anathema-backend/profile"]
+# filelog = ["anathema-debug/filelog", "anathema-widgets/filelog", "anathema-runtime/filelog"]
 
 [lints]
 workspace = true
@@ -42,13 +46,21 @@ crossterm = "0.28.1"
 unicode-width = "0.1.11"
 flume = "0.11.0"
 notify = "6.1.1"
-anathema-debug = { path = "anathema-testutils" }
+anathema-default-widgets = { path = "./anathema-default-widgets", version = "0.2.2" }
+anathema-backend = { path = "./anathema-backend", version = "0.2.2" }
+anathema-runtime = { path = "./anathema-runtime", version = "0.2.2" }
+anathema-state = { path = "./anathema-state", version = "0.2.2" }
+anathema-state-derive = { path = "./anathema-state-derive", version = "0.2.2" }
+anathema-store = { path = "./anathema-store", version = "0.2.2" }
+anathema-templates = { path = "./anathema-templates", version = "0.2.2" }
+anathema-widgets = { path = "./anathema-widgets", version = "0.2.2" }
+anathema-geometry = { path = "./anathema-geometry", version = "0.2.2" }
+anathema-value-resolver = { path = "./anathema-value-resolver", version = "0.2.2" }
 
 [workspace]
 members = [
     "anathema-backend", 
     "anathema-runtime", 
-    "anathema-debug", 
     "anathema-default-widgets", 
     "anathema-geometry", 
     "anathema-state",
@@ -71,9 +83,6 @@ type_complexity = "allow"
 too_many_arguments = "allow"
 wrong_self_convention = "allow"
 
-[dev-dependencies]
-anathema-testutils = { path = "anathema-testutils" }
-
 [package.metadata.release]
 shared-version = true
 dependent-version = "upgrade"

anathema-backend/Cargo.toml

@@ -9,13 +9,12 @@ homepage = "https://github.com/togglebyte/anathema"
 repository = "https://github.com/togglebyte/anathema"
 
 [dependencies]
-anathema-geometry = { path = "../anathema-geometry", version = "0.2.2" }
-anathema-state = { path = "../anathema-state", version = "0.2.2" }
-anathema-store = { path = "../anathema-store", version = "0.2.2" }
-anathema-strings = { path = "../anathema-strings", version = "0.2.2" }
-anathema-templates = { path = "../anathema-templates", version = "0.2.2" }
-anathema-value-resolver = { path = "../anathema-value-resolver", version = "0.2.2" }
-anathema-widgets = { path = "../anathema-widgets", version = "0.2.2" }
+anathema-geometry = { workspace = true }
+anathema-state = { workspace = true }
+anathema-store = { workspace = true }
+anathema-templates = { workspace = true }
+anathema-value-resolver = { workspace = true }
+anathema-widgets = { workspace = true }
 crossterm = { workspace = true }
 unicode-width = { workspace = true }
 bitflags = { workspace = true }

anathema-backend/src/testing/events.rs

@@ -12,6 +12,13 @@ impl EventsMut<'_> {
         self
     }
 
+    pub fn next_frames(self, count: usize) -> Self {
+        for _ in 0..count {
+            self.event_queue.push_back(None);
+        }
+        self
+    }
+
     pub fn stop(self) -> Self {
         self.event_queue.push_back(Some(Event::Stop));
         self

anathema-debug/src/lib.rs

@@ -54,7 +54,7 @@ pub mod macros {
     #[macro_export]
     macro_rules! debug_tree {
         ($tree:expr) => {
-            let mut d = $crate::tree::debug::DebugTree::new();
+            let mut d = anathema_widgets::tree::debug::DebugTree::new();
             $tree.apply_visitor(&mut d);
             $crate::debug_to_file!("{}", d.output);
         };

anathema-default-widgets/Cargo.toml

@@ -9,13 +9,13 @@ homepage = "https://github.com/togglebyte/anathema"
 repository = "https://github.com/togglebyte/anathema"
 
 [dependencies]
-anathema-backend = { path = "../anathema-backend", version = "0.2.2" }
-anathema-geometry = { path = "../anathema-geometry", version = "0.2.2" }
-anathema-state = { path = "../anathema-state", version = "0.2.2" }
-anathema-store = { path = "../anathema-store", version = "0.2.2" }
-anathema-templates = { path = "../anathema-templates", version = "0.2.2" }
-anathema-value-resolver = { path = "../anathema-value-resolver", version = "0.2.2" }
-anathema-widgets = { path = "../anathema-widgets", version = "0.2.2" }
+anathema-backend = { workspace = true }
+anathema-geometry = { workspace = true }
+anathema-state = { workspace = true }
+anathema-store = { workspace = true }
+anathema-templates = { workspace = true }
+anathema-value-resolver = { workspace = true }
+anathema-widgets = { workspace = true }
 bitflags = { workspace = true }
 unicode-width = { workspace = true }
 

anathema-runtime/Cargo.toml

@@ -9,16 +9,14 @@ homepage = "https://github.com/togglebyte/anathema"
 repository = "https://github.com/togglebyte/anathema"
 
 [dependencies]
-anathema-geometry = { path = "../anathema-geometry", version = "0.2.2" }
-anathema-debug = { path = "../anathema-debug", version = "0.2.2" }
-anathema-default-widgets = { path = "../anathema-default-widgets", version = "0.2.2" }
-anathema-backend = { path = "../anathema-backend", version = "0.2.2" }
-anathema-state = { path = "../anathema-state", version = "0.2.2" }
-anathema-store = { path = "../anathema-store", version = "0.2.2" }
-anathema-strings = { path = "../anathema-strings", version = "0.2.2" }
-anathema-templates = { path = "../anathema-templates", version = "0.2.2" }
-anathema-widgets = { path = "../anathema-widgets", version = "0.2.2" }
-anathema-value-resolver = { path = "../anathema-value-resolver", version = "0.2.2" }
+anathema-geometry = { workspace = true }
+anathema-default-widgets = { workspace = true }
+anathema-backend = { workspace = true }
+anathema-state = { workspace = true }
+anathema-store = { workspace = true }
+anathema-templates = { workspace = true }
+anathema-widgets = { workspace = true }
+anathema-value-resolver = { workspace = true }
 flume = { workspace = true }
 notify = { workspace = true }
 puffin = { version = "0.19.1", features = ["web"], optional = true }
@@ -27,6 +25,7 @@ puffin_http = { version = "0.16.1", optional = true }
 [features]
 default = []
 profile = ["puffin", "puffin_http"]
+filelog = []
 
 [lints]
 workspace = true

anathema-runtime/src/runtime/mod.rs

@@ -138,7 +138,7 @@ impl<G: GlobalEventHandler> Runtime<G> {
 
             loop {
                 frame.tick(backend)?;
-                if frame.stop {
+                if frame.layout_ctx.stop_runtime {
                     return Err(Error::Stop);
                 }
 
@@ -191,7 +191,6 @@ impl<G: GlobalEventHandler> Runtime<G> {
 
             dt: &mut self.dt,
             needs_layout: true,
-            stop: false,
 
             global_event_handler: &self.global_event_handler,
             tabindex: None,
@@ -231,7 +230,6 @@ pub struct Frame<'rt, 'bp, G> {
     message_receiver: &'rt flume::Receiver<ViewMessage>,
     dt: &'rt mut Instant,
     needs_layout: bool,
-    stop: bool,
     global_event_handler: &'rt G,
     pub tabindex: Option<Index>,
 }
@@ -280,7 +278,7 @@ impl<'rt, 'bp, G: GlobalEventHandler> Frame<'rt, 'bp, G> {
 
         let Some(event) = self.handle_global_event(event) else { return };
         if let Event::Stop = event {
-            self.stop = true;
+            self.layout_ctx.stop_runtime = true;
             return;
         }
 
@@ -327,18 +325,21 @@ impl<'rt, 'bp, G: GlobalEventHandler> Frame<'rt, 'bp, G> {
         puffin::GlobalProfiler::lock().new_frame();
 
         let now = Instant::now();
-        self.cycle(backend)?;
         self.init_new_components();
-        self.tick_components(self.dt.elapsed());
         let elapsed = self.handle_messages(now);
         self.poll_events(elapsed, now, backend);
         self.drain_deferred_commands();
         self.drain_assoc_events();
+
+        // TODO:
+        // this secondary call is here to deal with changes causing changes
+        // which happens when values are removed or inserted and indices needs updating
         self.apply_changes()?;
-        // TODO: this secondary call is here to deal with changes causing changes
-        //       which happens when values are removed or inserted and indices needs updating
         self.apply_changes()?;
 
+        self.tick_components(self.dt.elapsed());
+        self.cycle(backend)?;
+
         *self.dt = Instant::now();
 
         match self.layout_ctx.stop_runtime {
@@ -405,6 +406,11 @@ impl<'rt, 'bp, G: GlobalEventHandler> Frame<'rt, 'bp, G> {
                 backend.resize(size, self.layout_ctx.glyph_map);
             }
 
+            if let Event::Stop = event {
+                self.layout_ctx.stop_runtime = true;
+                break;
+            }
+
             self.event(event);
 
             // Make sure event handling isn't holding up the rest of the event loop.
@@ -491,8 +497,8 @@ impl<'rt, 'bp, G: GlobalEventHandler> Frame<'rt, 'bp, G> {
                     self.with_component(widget_id, state_id, |comp, children, ctx| {
                         comp.dyn_component.any_message(children, ctx, msg);
                     });
+                    break;
                 }
-                break;
             }
         }
     }
@@ -564,16 +570,6 @@ impl<'rt, 'bp, G: GlobalEventHandler> Frame<'rt, 'bp, G> {
                 let widget_id = value_id.key();
 
                 if let Some(widget) = tree.get_mut(widget_id) {
-                    let kind = &widget.kind;
-                    match kind {
-                        WidgetKind::Element(_element) => {}
-                        WidgetKind::For(_forloop) => {}
-                        WidgetKind::Iteration(_) => {}
-                        _ => (), // WidgetKind::ControlFlow(control_flow) => todo!(),
-                                 // WidgetKind::ControlFlowContainer(_) => todo!(),
-                                 // WidgetKind::Component(component) => todo!(),
-                                 // WidgetKind::Slot => todo!(),
-                    }
                     if let WidgetKind::Element(element) = &mut widget.kind {
                         element.invalidate_cache();
                     }

anathema-state/Cargo.toml

@@ -9,9 +9,8 @@ homepage = "https://github.com/togglebyte/anathema"
 repository = "https://github.com/togglebyte/anathema"
 
 [dependencies]
-anathema-debug = { path = "../anathema-debug", version = "0.2.2" }
-anathema-state-derive = { path = "../anathema-state-derive", version = "0.2.2" }
-anathema-store = { path = "../anathema-store", version = "0.2.2" }
+anathema-state-derive = { workspace = true }
+anathema-store = { workspace = true }
 
 [lints]
 workspace = true

anathema-state/src/states.rs

@@ -159,13 +159,13 @@ impl State for Box<dyn State> {
     }
 }
 
-pub trait AnyMap {
+pub trait AnyMap: 'static {
     fn lookup(&self, key: &str) -> Option<PendingValue>;
 
     fn is_empty(&self) -> bool;
 }
 
-pub trait AnyList {
+pub trait AnyList: 'static {
     fn lookup(&self, index: usize) -> Option<PendingValue>;
 
     fn len(&self) -> usize;
@@ -175,6 +175,13 @@ pub trait AnyList {
     }
 }
 
+impl dyn AnyList {
+    pub fn iter(&self) -> impl Iterator<Item = PendingValue> {
+        let len = self.len();
+        (0..len).filter_map(|i| self.lookup(i))
+    }
+}
+
 pub trait AnyMaybe {
     fn get(&self) -> Option<PendingValue>;
 }

anathema-state/src/value/mod.rs

@@ -443,7 +443,7 @@ impl PendingValue {
     /// Try to get access to the underlying value as a `dyn AnyState`.
     /// This will return `None` if the `Value<T>` behind this `ValueRef` has
     /// been dropped.
-    pub fn as_state(&self) -> Option<SharedState<'_>> {
+    pub fn as_state<'a>(&'a self) -> Option<SharedState<'a>> {
         let (key, value) = try_make_shared(self.0.owned())?;
         let shared = SharedState::new(key, value);
         Some(shared)
@@ -469,6 +469,75 @@ impl PendingValue {
     pub fn key(&self) -> ValueKey {
         self.0
     }
+
+    pub fn pending_eq(&self, rhs: PendingValue) -> bool {
+        let lhs = self;
+        // -----------------------------------------------------------------------------
+        //   - Composite -
+        //   If two keys are the same it's the same value.
+        //   This is mostly for composite values
+        // -----------------------------------------------------------------------------
+        if lhs.key() == rhs.key() {
+            return true;
+        }
+
+        let lhs_type = lhs.type_info();
+        let rhs_type = rhs.type_info();
+
+        // -----------------------------------------------------------------------------
+        //   - Maybe -
+        // -----------------------------------------------------------------------------
+        if let Type::Maybe = lhs_type {
+            let Some(lhs) = lhs.as_state() else { return false };
+            let lhs = lhs.as_maybe().expect("type checked");
+            if let Some(lhs) = lhs.get() {
+                return lhs.pending_eq(rhs);
+            }
+        }
+
+        if let Type::Maybe = rhs_type {
+            let Some(rhs) = rhs.as_state() else { return false };
+            let rhs = rhs.as_maybe().expect("type checked");
+
+            if let Some(rhs) = rhs.get() {
+                return lhs.pending_eq(rhs);
+            }
+        }
+
+        let Some(lhs) = lhs.as_state() else { return false };
+        let Some(rhs) = rhs.as_state() else { return false };
+
+        match (lhs_type, rhs_type) {
+            (Type::Int, Type::Int) => lhs.as_int() == rhs.as_int(),
+            (Type::Float, Type::Float) => lhs.as_float() == rhs.as_float(),
+            (Type::Char, Type::Char) => lhs.as_char() == rhs.as_char(),
+            (Type::String, Type::String) => lhs.as_str() == rhs.as_str(),
+            (Type::Bool, Type::Bool) => lhs.as_bool() == rhs.as_bool(),
+            (Type::Hex, Type::Hex) => lhs.as_hex() == rhs.as_hex(),
+            (Type::Map, Type::Map) => false,
+            (Type::Unit, Type::Unit) => true,
+            (Type::List, Type::List) => {
+                let lhs = lhs.as_any_list().expect("type checked");
+                let rhs = rhs.as_any_list().expect("type checked");
+
+                if lhs.len() != rhs.len() {
+                    return false;
+                }
+
+                for (lhs, rhs) in lhs.iter().zip(rhs.iter()) {
+                    if !lhs.pending_eq(rhs) {
+                        return false;
+                    }
+                }
+
+                true
+            }
+            (Type::Color, Type::Color) => lhs.as_color() == rhs.as_color(),
+            (Type::Maybe, Type::Maybe) => true, // both are None
+
+            _ => false,
+        }
+    }
 }
 
 #[derive(Debug, Copy, Clone)]