New AppBuilderAPI

CHANGELOG.md

@@ -7,6 +7,14 @@
 - Fixed jumping cursor in inputs (#158) 
 - Added method `orders.after_next_render(Option<RenderTimestampDelta>)` (#207)
 - Fixed a bug with back/forward routing to the landing page (#296)
+- [BREAKING] Deprecated `Init` struct, replacing it with `BeforeMount` and `AfterMount` structs to
+better denote state before and after mounting the `App` occurs.
+- [BREAKING] Added a new function `builder` which replaces `build` as part of deprecating `Init`.
+- [BREAKING] Added a new function `build` which replaces `finish` as part of deprecating `Init`.
+- Added `IntoInit`, `IntoAfterMount`, and `IntoBeforeMount` traits. It is possible to use these
+in place of a closure or function to produce the corresponding `Init`, `AfterMount`, and
+`BeforeMount` structs.
+- Messages sent from `IntoAfterMount` will now be run after the routing message.
 
 ## v0.4.2
 - Added an `Init` struct, which can help with initial routing (Breaking)

examples/animation_frame/src/lib.rs

@@ -51,13 +51,13 @@ struct Model {
     car: Car,
 }
 
-// Init
+// AfterMount
 
-fn init(_: Url, orders: &mut impl Orders<Msg>) -> Init<Model> {
+fn after_mount(_: Url, orders: &mut impl Orders<Msg>) -> AfterMount<Model> {
     orders
         .send_msg(Msg::SetViewportWidth)
         .after_next_render(Msg::Rendered);
-    Init::new(Model::default())
+    AfterMount::default()
 }
 
 // Update
@@ -162,7 +162,8 @@ fn view_wheel(wheel_x: f64, car: &Car) -> Node<Msg> {
 
 #[wasm_bindgen(start)]
 pub fn render() {
-    seed::App::build(init, update, view)
+    seed::App::builder(update, view)
+        .after_mount(after_mount)
         .window_events(|_| vec![simple_ev(Ev::Resize, Msg::SetViewportWidth)])
         .build_and_start();
 }

examples/canvas/src/lib.rs

@@ -18,11 +18,11 @@ struct Model {
     fill_color: Color,
 }
 
-// Init
+// AfterMount
 
-fn init(_: Url, orders: &mut impl Orders<Msg>) -> Init<Model> {
+fn after_mount(_: Url, orders: &mut impl Orders<Msg>) -> AfterMount<Model> {
     orders.after_next_render(|_| Msg::Rendered);
-    Init::new(Model {
+    AfterMount::new(Model {
         fill_color: COLOR_A,
     })
 }
@@ -87,5 +87,7 @@ fn view(_model: &Model) -> impl View<Msg> {
 
 #[wasm_bindgen(start)]
 pub fn render() {
-    seed::App::build(init, update, view).build_and_start();
+    seed::App::builder(update, view)
+        .after_mount(after_mount)
+        .build_and_start();
 }

examples/counter/src/lib.rs

@@ -105,5 +105,5 @@ fn view(model: &Model) -> impl View<Msg> {
 
 #[wasm_bindgen(start)]
 pub fn render() {
-    seed::App::build(|_, _| Init::new(Model::default()), update, view).build_and_start();
+    seed::App::builder(update, view).build_and_start();
 }

examples/drop/README.md

@@ -1,11 +1,11 @@
 ## Drop example
 
-How to crate a drop-zone.
+How to create a drop-zone.
 
 ---
 
 ```bash
 cargo make start
 ```
 
-Open [127.0.0.1:8000](http://127.0.0.1:8000) in your browser.
+Open [127.0.0.1:8000](http://127.0.0.1:8000) in your browser.

examples/drop/src/lib.rs

@@ -11,15 +11,6 @@ struct Model {
     drop_zone_content: Vec<Node<Msg>>,
 }
 
-// Init
-
-fn init(_: Url, _: &mut impl Orders<Msg>) -> Init<Model> {
-    Init::new(Model {
-        drop_zone_active: false,
-        drop_zone_content: vec![div!["Drop files here"]],
-    })
-}
-
 // Update
 
 #[derive(Clone, Debug)]
@@ -117,5 +108,10 @@ fn view(model: &Model) -> impl View<Msg> {
 
 #[wasm_bindgen(start)]
 pub fn start() {
-    seed::App::build(init, update, view).build_and_start();
+    seed::App::builder(update, view)
+        .after_mount(AfterMount::new(Model {
+            drop_zone_active: false,
+            drop_zone_content: vec![div!["Drop files here"]],
+        }))
+        .build_and_start();
 }

examples/mathjax/src/lib.rs

@@ -226,13 +226,7 @@ fn view(model: &Model) -> impl View<Msg> {
     ]
 }
 
-// Init
-
-fn init(_: Url, _: &mut impl Orders<Msg>) -> Init<Model> {
-    Init::new(Model::default())
-}
-
 #[wasm_bindgen(start)]
 pub fn render() {
-    seed::App::build(init, update, view).build_and_start();
+    seed::App::builder(update, view).build_and_start();
 }

examples/orders/src/lib.rs

@@ -93,5 +93,5 @@ fn view(model: &Model) -> impl View<Msg> {
 
 #[wasm_bindgen(start)]
 pub fn start() {
-    seed::App::build(|_, _| Init::new(Model::default()), update, view).build_and_start();
+    seed::App::builder(update, view).build_and_start();
 }

examples/server_integration/client/src/lib.rs

@@ -107,5 +107,5 @@ fn view_example_introduction(title: &str, description: &str) -> Vec<Node<Msg>> {
 
 #[wasm_bindgen(start)]
 pub fn start() {
-    seed::App::build(|_, _| Init::new(Model::default()), update, view).build_and_start();
+    seed::App::builder(update, view).build_and_start();
 }

examples/server_interaction/src/lib.rs

@@ -128,12 +128,14 @@ fn view(model: &Model) -> Vec<Node<Msg>> {
 
 // Init
 
-fn init(_: Url, orders: &mut impl Orders<Msg>) -> Init<Model> {
+fn after_mount(_: Url, orders: &mut impl Orders<Msg>) -> AfterMount<Model> {
     orders.perform_cmd(fetch_repository_info());
-    Init::new(Model::default())
+    AfterMount::default()
 }
 
 #[wasm_bindgen(start)]
 pub fn render() {
-    seed::App::build(init, update, view).build_and_start();
+    seed::App::builder(update, view)
+        .after_mount(after_mount)
+        .build_and_start();
 }

examples/server_interaction_detailed/reports/src/lib.rs

@@ -304,9 +304,7 @@ fn view(model: &Model) -> Vec<El<Msg>> {
 
 #[wasm_bindgen]
 pub fn render() {
-    let state = seed::App::build(Model::default(), update, view)
-        .finish()
-        .run();
+    let state = seed::App::builder(update, view).build_and_start();
 
     state.update(Msg::GetData)
 }

examples/todomvc/src/lib.rs

@@ -361,7 +361,7 @@ fn routes(url: seed::Url) -> Option<Msg> {
 
 #[wasm_bindgen(start)]
 pub fn render() {
-    seed::App::build(|_, _| Init::new(Model::default()), update, view)
+    seed::App::builder(update, view)
         .routes(routes)
         .build_and_start();
 }

examples/update_from_js/src/lib.rs

@@ -12,12 +12,6 @@ struct Model {
     time_from_js: Option<String>,
 }
 
-// Init
-
-fn init(_: Url, _: &mut impl Orders<Msg>) -> Init<Model> {
-    Init::new(Model::default())
-}
-
 // Update
 
 #[derive(Clone)]
@@ -76,7 +70,7 @@ fn view(model: &Model) -> Node<Msg> {
 #[wasm_bindgen]
 // `wasm-bindgen` cannot transfer struct with public closures to JS (yet) so we have to send slice.
 pub fn start() -> Box<[JsValue]> {
-    let app = seed::App::build(init, update, view).build_and_start();
+    let app = seed::App::builder(update, view).build_and_start();
 
     create_closures_for_js(&app)
 }

examples/user_media/src/lib.rs

@@ -12,11 +12,11 @@ use web_sys::{HtmlMediaElement, MediaStream, MediaStreamConstraints};
 
 struct Model {}
 
-// Init
+// AfterMount
 
-fn init(_: Url, orders: &mut impl Orders<Msg>) -> Init<Model> {
+fn after_mount(_: Url, orders: &mut impl Orders<Msg>) -> AfterMount<Model> {
     orders.perform_cmd(user_media());
-    Init::new(Model {})
+    AfterMount::new(Model {})
 }
 
 fn user_media() -> impl Future<Item = Msg, Error = Msg> {
@@ -74,5 +74,7 @@ fn view(_: &Model) -> impl View<Msg> {
 
 #[wasm_bindgen(start)]
 pub fn start() {
-    seed::App::build(init, update, view).build_and_start();
+    seed::App::builder(update, view)
+        .after_mount(after_mount)
+        .build_and_start();
 }

examples/websocket/src/client.rs

@@ -23,15 +23,15 @@ struct Model {
 
 // Init
 
-fn init(_: Url, orders: &mut impl Orders<Msg>) -> Init<Model> {
+fn after_mount(_: Url, orders: &mut impl Orders<Msg>) -> AfterMount<Model> {
     let ws = WebSocket::new(WS_URL).unwrap();
 
     register_ws_handler(WebSocket::set_onopen, Msg::Connected, &ws, orders);
     register_ws_handler(WebSocket::set_onclose, Msg::Closed, &ws, orders);
     register_ws_handler(WebSocket::set_onmessage, Msg::ServerMessage, &ws, orders);
     register_ws_handler(WebSocket::set_onerror, Msg::Error, &ws, orders);
 
-    Init::new(Model {
+    AfterMount::new(Model {
         ws,
         connected: false,
         msg_rx_cnt: 0,
@@ -154,5 +154,7 @@ fn view(model: &Model) -> impl View<Msg> {
 
 #[wasm_bindgen(start)]
 pub fn start() {
-    App::build(init, update, view).build_and_start();
+    App::builder(update, view)
+        .after_mount(after_mount)
+        .build_and_start();
 }

examples/window_events/src/lib.rs

@@ -83,7 +83,7 @@ fn window_events(model: &Model) -> Vec<Listener<Msg>> {
 
 #[wasm_bindgen(start)]
 pub fn render() {
-    seed::App::build(|_, _| Init::new(Model::default()), update, view)
+    seed::App::builder(update, view)
         .window_events(window_events)
         .build_and_start();
 }

src/lib.rs

@@ -100,7 +100,7 @@ pub mod prelude {
             request_animation_frame, ClosureNew, RequestAnimationFrameHandle,
             RequestAnimationFrameTime,
         },
-        vdom::{Init, MountType, RenderTimestampDelta, UrlHandling},
+        vdom::{AfterMount, BeforeMount, Init, MountType, RenderTimestampDelta, UrlHandling},
     };
     pub use indexmap::IndexMap; // for attrs and style to work.
     pub use wasm_bindgen::prelude::*;

src/orders.rs

@@ -110,6 +110,11 @@ impl<Ms, Mdl, ElC: View<Ms>, GMs> OrdersContainer<Ms, Mdl, ElC, GMs> {
             app,
         }
     }
+
+    pub(crate) fn merge(&mut self, mut other: Self) {
+        self.should_render = other.should_render;
+        self.effects.append(&mut other.effects);
+    }
 }
 
 impl<Ms: 'static, Mdl, ElC: View<Ms> + 'static, GMs> Orders<Ms, GMs>