feat: more tests working

packages/core/tests/boolattrs.rs

@@ -0,0 +1,15 @@
+use dioxus::core::{ElementId, Mutation::*};
+use dioxus::prelude::*;
+
+#[test]
+fn bool_test() {
+    let mut app = VirtualDom::new(|cx| cx.render(rsx!(div { hidden: false })));
+    assert_eq!(
+        app.rebuild().santize().edits,
+        [
+            LoadTemplate { name: "template", index: 0, id: ElementId(1) },
+            SetBoolAttribute { name: "hidden", value: false, id: ElementId(1,) },
+            AppendChildren { m: 1 },
+        ]
+    )
+}

packages/core/tests/borrowedstate.rs

@@ -0,0 +1,55 @@
+#![allow(non_snake_case)]
+
+use dioxus::core::{ElementId, Mutation::*};
+use dioxus::prelude::*;
+
+#[test]
+fn test_borrowed_state() {
+    let mut dom = VirtualDom::new(Parent);
+
+    assert_eq!(
+        dom.rebuild().santize().edits,
+        [
+            LoadTemplate { name: "template", index: 0, id: ElementId(1,) },
+            LoadTemplate { name: "template", index: 0, id: ElementId(2,) },
+            LoadTemplate { name: "template", index: 0, id: ElementId(3,) },
+            HydrateText { path: &[0,], value: "Hello w1!", id: ElementId(4,) },
+            ReplacePlaceholder { path: &[1,], m: 1 },
+            ReplacePlaceholder { path: &[0,], m: 1 },
+            AppendChildren { m: 1 },
+        ]
+    )
+}
+
+fn Parent(cx: Scope) -> Element {
+    let w1 = cx.use_hook(|| String::from("w1"));
+
+    cx.render(rsx! {
+        div {
+            Child { name: w1 }
+        }
+    })
+}
+
+#[derive(Props)]
+struct ChildProps<'a> {
+    name: &'a str,
+}
+
+fn Child<'a>(cx: Scope<'a, ChildProps<'a>>) -> Element {
+    cx.render(rsx! {
+        div {
+            h1 { "it's nested" }
+            Child2 { name: cx.props.name }
+        }
+    })
+}
+
+#[derive(Props)]
+struct Grandchild<'a> {
+    name: &'a str,
+}
+
+fn Child2<'a>(cx: Scope<'a, Grandchild<'a>>) -> Element {
+    cx.render(rsx!(div { "Hello {cx.props.name}!" }))
+}

packages/core/tests/create_dom.rs

@@ -0,0 +1,217 @@
+#![allow(unused, non_upper_case_globals, non_snake_case)]
+
+//! Prove that the dom works normally through virtualdom methods.
+//!
+//! This methods all use "rebuild" which completely bypasses the scheduler.
+//! Hard rebuilds don't consume any events from the event queue.
+
+use dioxus::core::Mutation::*;
+use dioxus::prelude::*;
+use dioxus_core::ElementId;
+
+#[test]
+fn test_original_diff() {
+    let mut dom = VirtualDom::new(|cx| {
+        cx.render(rsx! {
+            div {
+                div {
+                    "Hello, world!"
+                }
+            }
+        })
+    });
+
+    let edits = dom.rebuild().santize();
+    assert_eq!(
+        edits.template_mutations,
+        [
+            // create template
+            CreateElement { name: "div" },
+            CreateElement { name: "div" },
+            CreateStaticText { value: "Hello, world!" },
+            AppendChildren { m: 1 },
+            AppendChildren { m: 1 },
+            SaveTemplate { name: "template", m: 1 },
+        ]
+    );
+
+    assert_eq!(
+        edits.edits,
+        [
+            // add to root
+            LoadTemplate { name: "template", index: 0, id: ElementId(1) },
+            AppendChildren { m: 1 }
+        ]
+    )
+}
+
+#[test]
+fn create() {
+    let mut dom = VirtualDom::new(|cx| {
+        cx.render(rsx! {
+            div {
+                div {
+                    "Hello, world!"
+                    div {
+                        div {
+                            Fragment {
+                                "hello"
+                                "world"
+                            }
+                        }
+                    }
+                }
+            }
+        })
+    });
+
+    let edits = dom.rebuild().santize();
+    assert_eq!(
+        edits.template_mutations,
+        [
+            // create template
+            CreateElement { name: "div" },
+            CreateElement { name: "div" },
+            CreateStaticText { value: "Hello, world!" },
+            CreateElement { name: "div" },
+            CreateElement { name: "div" },
+            CreateStaticPlaceholder {},
+            AppendChildren { m: 1 },
+            AppendChildren { m: 1 },
+            AppendChildren { m: 2 },
+            AppendChildren { m: 1 },
+            SaveTemplate { name: "template", m: 1 },
+            // The fragment child template
+            CreateStaticText { value: "hello" },
+            CreateStaticText { value: "world" },
+            SaveTemplate { name: "template", m: 2 },
+        ]
+    );
+}
+
+#[test]
+fn create_list() {
+    let mut dom = VirtualDom::new(|cx| {
+        cx.render(rsx! {
+            (0..3).map(|f| rsx!( div { "hello" } ))
+        })
+    });
+
+    let edits = dom.rebuild().santize();
+    assert_eq!(
+        edits.template_mutations,
+        [
+            // create template
+            CreateElement { name: "div" },
+            CreateStaticText { value: "hello" },
+            AppendChildren { m: 1 },
+            SaveTemplate { name: "template", m: 1 }
+        ]
+    );
+}
+
+#[test]
+fn create_simple() {
+    let mut dom = VirtualDom::new(|cx| {
+        cx.render(rsx! {
+            div {}
+            div {}
+            div {}
+            div {}
+        })
+    });
+
+    let edits = dom.rebuild().santize();
+    assert_eq!(
+        edits.template_mutations,
+        [
+            // create template
+            CreateElement { name: "div" },
+            CreateElement { name: "div" },
+            CreateElement { name: "div" },
+            CreateElement { name: "div" },
+            // add to root
+            SaveTemplate { name: "template", m: 4 }
+        ]
+    );
+}
+#[test]
+fn create_components() {
+    let mut dom = VirtualDom::new(|cx| {
+        cx.render(rsx! {
+            Child { "abc1" }
+            Child { "abc2" }
+            Child { "abc3" }
+        })
+    });
+
+    #[derive(Props)]
+    struct ChildProps<'a> {
+        children: Element<'a>,
+    }
+
+    fn Child<'a>(cx: Scope<'a, ChildProps<'a>>) -> Element {
+        cx.render(rsx! {
+            h1 {}
+            div { &cx.props.children }
+            p {}
+        })
+    }
+
+    let edits = dom.rebuild().santize();
+    assert_eq!(
+        edits.template_mutations,
+        [
+            // The "child" template
+            CreateElement { name: "h1" },
+            CreateElement { name: "div" },
+            CreateStaticPlaceholder {},
+            AppendChildren { m: 1 },
+            CreateElement { name: "p" },
+            SaveTemplate { name: "template", m: 3 },
+            // Sub template for component children
+            CreateStaticText { value: "abc1" },
+            SaveTemplate { name: "template", m: 1 },
+            CreateStaticText { value: "abc2" },
+            SaveTemplate { name: "template", m: 1 },
+            CreateStaticText { value: "abc3" },
+            SaveTemplate { name: "template", m: 1 }
+        ]
+    );
+}
+
+#[test]
+fn anchors() {
+    let mut dom = VirtualDom::new(|cx| {
+        cx.render(rsx! {
+            if true {
+                rsx!( div { "hello" } )
+            }
+            if false {
+                rsx!( div { "goodbye" } )
+            }
+        })
+    });
+
+    // note that the template under "false" doesn't show up since it's not loaded
+    let edits = dom.rebuild().santize();
+    assert_eq!(
+        edits.template_mutations,
+        [
+            // create each template
+            CreateElement { name: "div" },
+            CreateStaticText { value: "hello" },
+            AppendChildren { m: 1 },
+            SaveTemplate { m: 1, name: "template" },
+        ]
+    );
+
+    assert_eq!(
+        edits.edits,
+        [
+            LoadTemplate { name: "template", index: 0, id: ElementId(1) },
+            CreatePlaceholder { id: ElementId(2) },
+            AppendChildren { m: 2 }
+        ]
+    )
+}

packages/core/tests/create_lists.rs

@@ -31,18 +31,18 @@ fn list_renders() {
         edits.template_mutations,
         [
             // Create the outer div
-            CreateElement { name: "div", namespace: None, id: ElementId(0) },
+            CreateElement { name: "div" },
             // todo: since this is the only child, we should just use
             // append when modify the values (IE no need for a placeholder)
             CreatePlaceholder { id: ElementId(0) },
             AppendChildren { m: 1 },
             SaveTemplate { name: "template", m: 1 },
             // Create the inner template div
-            CreateElement { name: "div", namespace: None, id: ElementId(0) },
-            CreateElement { name: "h1", namespace: None, id: ElementId(0) },
+            CreateElement { name: "div" },
+            CreateElement { name: "h1" },
             CreateStaticText { value: "hello world! " },
             AppendChildren { m: 1 },
-            CreateElement { name: "p", namespace: None, id: ElementId(0) },
+            CreateElement { name: "p" },
             CreateStaticText { value: "d" },
             AppendChildren { m: 1 },
             AppendChildren { m: 2 },

packages/core/tests/diff_unkeyed_list.rs

@@ -73,10 +73,7 @@ fn list_creates_one_by_one() {
 #[test]
 fn removes_one_by_one() {
     let mut dom = VirtualDom::new(|cx| {
-        let gen = 3 - cx.generation();
-
-        println!("gen: {:?}", gen);
-        println!("range: {:?}", 0..gen);
+        let gen = 3 - cx.generation() % 4;
 
         cx.render(rsx! {
             div {
@@ -123,12 +120,154 @@ fn removes_one_by_one() {
     );
 
     // Remove div(1) and replace with a placeholder
+    // todo: this should just be a remove with no placeholder
     dom.mark_dirty_scope(ScopeId(0));
-    assert_eq!(dom.render_immediate().santize().edits, []);
+    assert_eq!(
+        dom.render_immediate().santize().edits,
+        [
+            CreatePlaceholder { id: ElementId(8) },
+            ReplaceWith { id: ElementId(2), m: 1 }
+        ]
+    );
 
-    // dom.mark_dirty_scope(ScopeId(0));
-    // assert_eq!(
-    //     dom.render_immediate().santize().edits,
-    //     [Remove { id: ElementId(4) }]
-    // );
+    // load the 3 and replace the placeholder
+    // todo: this should actually be append to, but replace placeholder is fine for now
+    dom.mark_dirty_scope(ScopeId(0));
+    assert_eq!(
+        dom.render_immediate().santize().edits,
+        [
+            LoadTemplate { name: "template", index: 0, id: ElementId(9) },
+            HydrateText { path: &[0], value: "0", id: ElementId(10) },
+            LoadTemplate { name: "template", index: 0, id: ElementId(11) },
+            HydrateText { path: &[0], value: "1", id: ElementId(12) },
+            LoadTemplate { name: "template", index: 0, id: ElementId(13) },
+            HydrateText { path: &[0], value: "2", id: ElementId(14) },
+            ReplaceWith { id: ElementId(8), m: 3 }
+        ]
+    );
+}
+
+#[test]
+fn list_shrink_multiroot() {
+    let mut dom = VirtualDom::new(|cx| {
+        let gen = cx.generation();
+        cx.render(rsx! {
+            div {
+                (0..gen).map(|i| rsx! {
+                    div { "{i}" }
+                    div { "{i}" }
+                })
+            }
+        })
+    });
+
+    assert_eq!(
+        dom.rebuild().santize().edits,
+        [
+            LoadTemplate { name: "template", index: 0, id: ElementId(1,) },
+            AssignId { path: &[0,], id: ElementId(2,) },
+            AppendChildren { m: 1 }
+        ]
+    );
+
+    dom.mark_dirty_scope(ScopeId(0));
+    assert_eq!(
+        dom.render_immediate().santize().edits,
+        [
+            LoadTemplate { name: "template", index: 0, id: ElementId(3) },
+            HydrateText { path: &[0], value: "0", id: ElementId(4) },
+            LoadTemplate { name: "template", index: 1, id: ElementId(5) },
+            HydrateText { path: &[0], value: "0", id: ElementId(6) },
+            ReplaceWith { id: ElementId(2), m: 2 }
+        ]
+    );
+
+    dom.mark_dirty_scope(ScopeId(0));
+    assert_eq!(
+        dom.render_immediate().santize().edits,
+        [
+            LoadTemplate { name: "template", index: 0, id: ElementId(7) },
+            HydrateText { path: &[0], value: "1", id: ElementId(8) },
+            LoadTemplate { name: "template", index: 1, id: ElementId(9) },
+            HydrateText { path: &[0], value: "1", id: ElementId(10) },
+            InsertAfter { id: ElementId(5), m: 2 }
+        ]
+    );
+
+    dom.mark_dirty_scope(ScopeId(0));
+    assert_eq!(
+        dom.render_immediate().santize().edits,
+        [
+            LoadTemplate { name: "template", index: 0, id: ElementId(11) },
+            HydrateText { path: &[0], value: "2", id: ElementId(12) },
+            LoadTemplate { name: "template", index: 1, id: ElementId(13) },
+            HydrateText { path: &[0], value: "2", id: ElementId(14) },
+            InsertAfter { id: ElementId(9), m: 2 }
+        ]
+    );
+}
+
+#[test]
+fn removes_one_by_one_multiroot() {
+    let mut dom = VirtualDom::new(|cx| {
+        let gen = 3 - cx.generation() % 4;
+
+        cx.render(rsx! {
+            div {
+                (0..gen).map(|i| rsx! {
+                    div { "{i}" }
+                    div { "{i}" }
+                })
+            }
+        })
+    });
+
+    // load the div and then assign the empty fragment as a placeholder
+    assert_eq!(
+        dom.rebuild().santize().edits,
+        [
+            LoadTemplate { name: "template", index: 0, id: ElementId(1) },
+            //
+            LoadTemplate { name: "template", index: 0, id: ElementId(2) },
+            HydrateText { path: &[0], value: "0", id: ElementId(3) },
+            LoadTemplate { name: "template", index: 1, id: ElementId(4) },
+            HydrateText { path: &[0], value: "0", id: ElementId(5) },
+            //
+            LoadTemplate { name: "template", index: 0, id: ElementId(6) },
+            HydrateText { path: &[0], value: "1", id: ElementId(7) },
+            LoadTemplate { name: "template", index: 1, id: ElementId(8) },
+            HydrateText { path: &[0], value: "1", id: ElementId(9) },
+            //
+            LoadTemplate { name: "template", index: 0, id: ElementId(10) },
+            HydrateText { path: &[0], value: "2", id: ElementId(11) },
+            LoadTemplate { name: "template", index: 1, id: ElementId(12) },
+            HydrateText { path: &[0], value: "2", id: ElementId(13) },
+            //
+            ReplacePlaceholder { path: &[0], m: 6 },
+            //
+            AppendChildren { m: 1 }
+        ]
+    );
+
+    dom.mark_dirty_scope(ScopeId(0));
+    assert_eq!(
+        dom.render_immediate().santize().edits,
+        [Remove { id: ElementId(10) }, Remove { id: ElementId(12) }]
+    );
+
+    dom.mark_dirty_scope(ScopeId(0));
+    assert_eq!(
+        dom.render_immediate().santize().edits,
+        [Remove { id: ElementId(6) }, Remove { id: ElementId(8) }]
+    );
+
+    dom.mark_dirty_scope(ScopeId(0));
+    assert_eq!(
+        dom.render_immediate().santize().edits,
+        [
+            Remove { id: ElementId(4) },
+            CreatePlaceholder { id: ElementId(14) },
+            ReplaceWith { id: ElementId(2), m: 1 }
+        ]
+    );
 }

packages/core/tests/suspend.rs

@@ -14,7 +14,7 @@ async fn it_works() {
     assert_eq!(
         mutations.template_mutations,
         [
-            CreateElement { name: "div", namespace: None, id: ElementId(0) },
+            CreateElement { name: "div" },
             CreateStaticText { value: "Waiting for child..." },
             CreatePlaceholder { id: ElementId(0) },
             AppendChildren { m: 2 },