Link/cut tree for internal DomSlot for faster traversal

.github/workflows/benchmark.yml

@@ -64,7 +64,7 @@ jobs:
       - name: Setup js-framework-benchmark
         working-directory: js-framework-benchmark
         run: |
-          npm ci
+          npm ci --legacy-peer-deps
           npm run install-server
           npm run install-webdriver-ts
 
@@ -79,16 +79,16 @@ jobs:
       - name: Build benchmark-struct app
         working-directory: yew/tools/benchmark-struct
         run: |
-          RUSTFLAGS='--cfg getrandom_backend="wasm_js"' wasm-pack build \
+          wasm-pack build \
             --release \
             --target web \
             --no-typescript \
             --out-name js-framework-benchmark-yew \
-            --out-dir $STRUCT_BUILD_DIR
+            --out-dir "$STRUCT_BUILD_DIR"
 
       - name: Show built benchmark-struct benchmark files
         run: |
-          ls -lauh js-framework-benchmark/frameworks/keyed/yew/bundled-dist/
+          ls -lauh "$STRUCT_BUILD_DIR"
 
       - name: Setup yew-hooks benchmark
         run: |
@@ -101,16 +101,16 @@ jobs:
       - name: Build benchmark-hooks app
         working-directory: yew/tools/benchmark-hooks
         run: |
-          RUSTFLAGS='--cfg getrandom_backend="wasm_js"' wasm-pack build \
+          wasm-pack build \
             --release \
             --target web \
             --no-typescript \
             --out-name js-framework-benchmark-yew-hooks \
-            --out-dir $HOOKS_BUILD_DIR
+            --out-dir "$HOOKS_BUILD_DIR"
 
       - name: Show built benchmark-hooks benchmark files
         run: |
-          ls -lauh js-framework-benchmark/frameworks/keyed/yew-hooks/bundled-dist/
+          ls -lauh "$HOOKS_BUILD_DIR"
 
       - name: Run js-framework-benchmark server
         working-directory: js-framework-benchmark

examples/async_clock/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/boids/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/communication_child_to_parent/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/communication_grandchild_with_grandparent/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/communication_grandparent_to_grandchild/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/communication_parent_to_child/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/contexts/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/counter/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/counter_functional/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/dyn_create_destroy_apps/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/file_upload/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/function_delayed_input/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/function_memory_game/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/function_router/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/function_todomvc/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/futures/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/game_of_life/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/immutable/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/inner_html/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/js_callback/Trunk.toml

@@ -1,5 +1,5 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"
 
 [[hooks]]
 stage = "pre_build"

examples/keyed_list/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/mount_point/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/nested_list/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/node_refs/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/password_strength/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/portals/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/router/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/suspense/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/timer/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/timer_functional/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/todomvc/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/two_apps/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/web_worker_fib/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/web_worker_prime/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

examples/webgl/Trunk.toml

@@ -1,2 +1,2 @@
 [tools]
-wasm_opt = "version_129"
+wasm_opt = "version_131"

packages/yew/src/app_handle.rs

@@ -87,7 +87,7 @@ fn clear_element(host: &Element) {
 #[cfg(feature = "hydration")]
 mod feat_hydration {
     use super::*;
-    use crate::dom_bundle::Fragment;
+    use crate::dom_bundle::{Fragment, SlotBulletin};
 
     impl<COMP> AppHandle<COMP>
     where
@@ -106,17 +106,13 @@ mod feat_hydration {
             let mut fragment = Fragment::collect_children(&host);
             let hosting_root = BSubtree::create_root(&host);
 
-            let mut previous_next_sibling = None;
             app.scope.hydrate_in_place(
                 hosting_root,
                 host.clone(),
                 &mut fragment,
                 Rc::clone(&props),
-                &mut previous_next_sibling,
+                &mut SlotBulletin::new(),
             );
-            if let Some(previous_next_sibling) = previous_next_sibling {
-                previous_next_sibling.reassign(DomSlot::at_end());
-            }
 
             // We remove all remaining nodes, this mimics the clear_element behaviour in
             // mount_with_props.

packages/yew/src/dom_bundle/bcomp.rs

@@ -6,7 +6,7 @@ use std::fmt;
 
 use web_sys::Element;
 
-use super::{BNode, BSubtree, DomSlot, DynamicDomSlot, Reconcilable, ReconcileTarget};
+use super::{BNode, BSubtree, DomSlot, Reconcilable, ReconcileTarget};
 use crate::html::{AnyScope, Scoped};
 use crate::virtual_dom::{Key, VComp};
 
@@ -16,7 +16,7 @@ pub(super) struct BComp {
     scope: Box<dyn Scoped>,
     /// An internal [`DomSlot`] passed around to track this components position. This
     /// will dynamically adjust when a lifecycle changes the render state of this component.
-    own_position: DynamicDomSlot,
+    own_position: DomSlot,
     key: Option<Key>,
 }
 
@@ -43,7 +43,7 @@ impl ReconcileTarget for BComp {
     fn shift(&self, next_parent: &Element, slot: DomSlot) -> DomSlot {
         self.scope.shift_node(next_parent.clone(), slot);
 
-        self.own_position.to_position()
+        self.own_position.clone()
     }
 }
 
@@ -64,14 +64,14 @@ impl Reconcilable for VComp {
             ..
         } = self;
 
-        let (scope, internal_ref) = mountable.mount(root, parent_scope, parent.to_owned(), slot);
+        let (scope, own_position) = mountable.mount(root, parent_scope, parent.to_owned(), slot);
 
         (
-            internal_ref.to_position(),
+            own_position.clone(),
             BComp {
                 type_id,
                 scope,
-                own_position: internal_ref,
+                own_position,
                 key,
             },
         )
@@ -106,14 +106,14 @@ impl Reconcilable for VComp {
 
         bcomp.key = key;
         mountable.reuse(bcomp.scope.borrow(), slot);
-        bcomp.own_position.to_position()
+        bcomp.own_position.clone()
     }
 }
 
 #[cfg(feature = "hydration")]
 mod feat_hydration {
     use super::*;
-    use crate::dom_bundle::{Fragment, Hydratable};
+    use crate::dom_bundle::{Fragment, Hydratable, SlotBulletin};
 
     impl Hydratable for VComp {
         fn hydrate(
@@ -122,7 +122,7 @@ mod feat_hydration {
             parent_scope: &AnyScope,
             parent: &Element,
             fragment: &mut Fragment,
-            prev_next_sibling: &mut Option<DynamicDomSlot>,
+            prev_next_sibling: &mut SlotBulletin<'_>,
         ) -> Self::Bundle {
             let VComp {
                 type_id,
@@ -207,19 +207,19 @@ mod tests {
 
     #[test]
     fn set_properties_to_component() {
-        html! {
+        let _ = html! {
             <Comp />
         };
 
-        html! {
+        let _ = html! {
             <Comp field_1=1 />
         };
 
-        html! {
+        let _ = html! {
             <Comp field_2=2 />
         };
 
-        html! {
+        let _ = html! {
             <Comp field_1=1 field_2=2 />
         };
 
@@ -228,7 +228,7 @@ mod tests {
             field_2: 1,
         };
 
-        html! {
+        let _ = html! {
             <Comp ..props />
         };
     }

packages/yew/src/dom_bundle/blist.rs

@@ -516,7 +516,7 @@ impl Reconcilable for VList {
 #[cfg(feature = "hydration")]
 mod feat_hydration {
     use super::*;
-    use crate::dom_bundle::{DynamicDomSlot, Fragment, Hydratable};
+    use crate::dom_bundle::{Fragment, Hydratable, SlotBulletin};
 
     impl Hydratable for VList {
         fn hydrate(
@@ -525,7 +525,7 @@ mod feat_hydration {
             parent_scope: &AnyScope,
             parent: &Element,
             fragment: &mut Fragment,
-            prev_next_sibling: &mut Option<DynamicDomSlot>,
+            prev_next_sibling: &mut SlotBulletin<'_>,
         ) -> Self::Bundle {
             let (key, fully_keyed, vchildren) = self.split_for_blist();
 

packages/yew/src/dom_bundle/bnode.rs

@@ -267,7 +267,7 @@ impl fmt::Debug for BNode {
 #[cfg(feature = "hydration")]
 mod feat_hydration {
     use super::*;
-    use crate::dom_bundle::{DynamicDomSlot, Fragment, Hydratable};
+    use crate::dom_bundle::{Fragment, Hydratable, SlotBulletin};
 
     impl Hydratable for VNode {
         fn hydrate(
@@ -276,7 +276,7 @@ mod feat_hydration {
             parent_scope: &AnyScope,
             parent: &Element,
             fragment: &mut Fragment,
-            prev_next_sibling: &mut Option<DynamicDomSlot>,
+            prev_next_sibling: &mut SlotBulletin<'_>,
         ) -> Self::Bundle {
             match self {
                 VNode::VTag(vtag) => RcExt::unwrap_or_clone(vtag)

packages/yew/src/dom_bundle/braw.rs

@@ -146,7 +146,7 @@ impl Reconcilable for VRaw {
 #[cfg(feature = "hydration")]
 mod feat_hydration {
     use super::*;
-    use crate::dom_bundle::{DynamicDomSlot, Fragment, Hydratable};
+    use crate::dom_bundle::{Fragment, Hydratable, SlotBulletin};
     use crate::virtual_dom::Collectable;
 
     impl Hydratable for VRaw {
@@ -156,17 +156,14 @@ mod feat_hydration {
             _parent_scope: &AnyScope,
             parent: &Element,
             fragment: &mut Fragment,
-            prev_next_sibling: &mut Option<DynamicDomSlot>,
+            prev_next_sibling: &mut SlotBulletin<'_>,
         ) -> Self::Bundle {
             let collectable = Collectable::Raw;
             let fallback_fragment = Fragment::collect_between(fragment, &collectable, parent);
             let first_child = fallback_fragment.iter().next().cloned();
 
-            if let (Some(first_child), prev_next_sibling) = (&first_child, prev_next_sibling) {
-                if let Some(prev_next_sibling) = prev_next_sibling {
-                    prev_next_sibling.reassign(DomSlot::at(first_child.clone()));
-                }
-                *prev_next_sibling = None;
+            if let Some(first_child) = &first_child {
+                prev_next_sibling.write_at_node(first_child.clone());
             }
 
             let Self { html } = self;