Cleanup of recent changes to examples

Author: David-OConnor

README.md

@@ -127,7 +127,7 @@ enum Msg {
 }
 
 /// The sole source of updating the model; returns a fresh one.
-fn update(msg: Msg, model: Model) -> Model {
+fn update(history: &mut History<Model, Msg>,: Msg, model: Model) -> Model {
     match msg {
         Msg::Increment => Model {count: model.count + 1, ..model},
         Msg::Decrement => Model {count: model.count - 1, ..model},
@@ -189,7 +189,7 @@ fn view(model: Model) -> El<Msg> {
 
 #[wasm_bindgen]
 pub fn render() {
-    seed::run(Model::default(), update, view, "main");
+    seed::run(Model::default(), update, view, "main", None);
 }
 ```
 

examples/counter/pkg/counter.js

@@ -268,13 +268,15 @@ __exports.__widl_f_value_HTMLTextAreaElement = function(ret, arg0) {
 
 };
 
-const __widl_f_back_History_target = typeof History === 'undefined' ? null : History.prototype.back || function() {
-    throw new Error(`wasm-bindgen: History.back does not exist`);
-};
-
-__exports.__widl_f_back_History = function(arg0, exnptr) {
+__exports.__widl_f_href_Location = function(ret, arg0, exnptr) {
     try {
-        __widl_f_back_History_target.call(getObject(arg0));
+
+        const retptr = passStringToWasm(getObject(arg0).href);
+        const retlen = WASM_VECTOR_LEN;
+        const mem = getUint32Memory();
+        mem[ret / 4] = retptr;
+        mem[ret / 4 + 1] = retlen;
+
     } catch (e) {
         const view = getUint32Memory();
         view[exnptr / 4] = 1;
@@ -357,18 +359,6 @@ __exports.__widl_f_length_NodeList = function(arg0) {
     return __widl_f_length_NodeList_target.call(getObject(arg0));
 };
 
-__exports.__widl_instanceof_PopStateEvent = function(idx) {
-    return getObject(idx) instanceof PopStateEvent ? 1 : 0;
-};
-
-const __widl_f_state_PopStateEvent_target = GetOwnOrInheritedPropertyDescriptor(typeof PopStateEvent === 'undefined' ? null : PopStateEvent.prototype, 'state').get || function() {
-    throw new Error(`wasm-bindgen: PopStateEvent.state does not exist`);
-};
-
-__exports.__widl_f_state_PopStateEvent = function(arg0) {
-    return addHeapObject(__widl_f_state_PopStateEvent_target.call(getObject(arg0)));
-};
-
 __exports.__widl_instanceof_Window = function(idx) {
     return getObject(idx) instanceof Window ? 1 : 0;
 };
@@ -380,6 +370,10 @@ __exports.__widl_f_document_Window = function(arg0) {
 
 };
 
+__exports.__widl_f_location_Window = function(arg0) {
+    return addHeapObject(getObject(arg0).location);
+};
+
 __exports.__widl_f_history_Window = function(arg0, exnptr) {
     try {
         return addHeapObject(getObject(arg0).history);
@@ -475,9 +469,7 @@ __exports.__wbindgen_cb_drop = function(i) {
     return 0;
 };
 
-__exports.__wbindgen_cb_forget = dropObject;
-
-__exports.__wbindgen_closure_wrapper790 = function(a, b, _ignored) {
+__exports.__wbindgen_closure_wrapper931 = function(a, b, _ignored) {
     const f = wasm.__wbg_function_table.get(6);
     const d = wasm.__wbg_function_table.get(7);
     const cb = function(arg0) {

examples/counter/pkg/counter_bg.wasm

@@ -35,7 +35,7 @@ enum Msg {
 }
 
 /// The sole source of updating the model; returns a fresh one.
-fn update(history: &History<Model, Msg>, msg: Msg, model: Model) -> Model {
+fn update(history: &mut History<Model, Msg>, msg: Msg, model: Model) -> Model {
     match msg {
         Msg::Increment => Model {count: model.count + 1, ..model},
         Msg::Decrement => Model {count: model.count - 1, ..model},

examples/counter/src/lib.rs

@@ -1,4 +1,3 @@
 ## Communicating with a server
+## Does not work yet
 Using web-sys's Fetch, and Serde's [de]serializiation.
-
-Does not work yet.

examples/server_interaction/README.md

@@ -297,6 +297,23 @@ __exports.__widl_f_key_code_KeyboardEvent = function(arg0) {
     return __widl_f_key_code_KeyboardEvent_target.call(getObject(arg0));
 };
 
+__exports.__widl_f_href_Location = function(ret, arg0, exnptr) {
+    try {
+
+        const retptr = passStringToWasm(getObject(arg0).href);
+        const retlen = WASM_VECTOR_LEN;
+        const mem = getUint32Memory();
+        mem[ret / 4] = retptr;
+        mem[ret / 4 + 1] = retlen;
+
+    } catch (e) {
+        const view = getUint32Memory();
+        view[exnptr / 4] = 1;
+        view[exnptr / 4 + 1] = addHeapObject(e);
+
+    }
+};
+
 const __widl_f_append_child_Node_target = typeof Node === 'undefined' ? null : Node.prototype.appendChild || function() {
     throw new Error(`wasm-bindgen: Node.appendChild does not exist`);
 };
@@ -399,6 +416,21 @@ __exports.__widl_f_document_Window = function(arg0) {
 
 };
 
+__exports.__widl_f_location_Window = function(arg0) {
+    return addHeapObject(getObject(arg0).location);
+};
+
+__exports.__widl_f_history_Window = function(arg0, exnptr) {
+    try {
+        return addHeapObject(getObject(arg0).history);
+    } catch (e) {
+        const view = getUint32Memory();
+        view[exnptr / 4] = 1;
+        view[exnptr / 4 + 1] = addHeapObject(e);
+
+    }
+};
+
 __exports.__widl_f_local_storage_Window = function(arg0, exnptr) {
     try {
 
@@ -497,7 +529,7 @@ __exports.__wbindgen_cb_drop = function(i) {
     return 0;
 };
 
-__exports.__wbindgen_closure_wrapper452 = function(a, b, _ignored) {
+__exports.__wbindgen_closure_wrapper439 = function(a, b, _ignored) {
     const f = wasm.__wbg_function_table.get(4);
     const d = wasm.__wbg_function_table.get(5);
     const cb = function(arg0) {

examples/todomvc/pkg/todomvc.js

@@ -110,7 +110,7 @@ enum Msg {
     EditKeyDown(usize, u32),  // item position, keycode
 }
 
-fn update(history: &History<Model, Msg>, msg: Msg, model: Model) -> Model {
+fn update(history: &mut History<Model, Msg>, msg: Msg, model: Model) -> Model {
     // We take a verbose immutable-design/functional approach in this example.
     // Alternatively, you could re-declare model as mutable at the top, and mutate
     // what we need in each match leg. See the Update section of the guide for details.
@@ -187,7 +187,7 @@ fn update(history: &History<Model, Msg>, msg: Msg, model: Model) -> Model {
         },
         Msg::EditSubmit(posit) => {
             if model.edit_text.is_empty() {
-                update(Msg::Destroy(posit), model)
+                update(history, Msg::Destroy(posit), model)
             } else {
                 let mut todos = model.todos;
                 let mut todo = todos.remove(posit);
@@ -206,7 +206,7 @@ fn update(history: &History<Model, Msg>, msg: Msg, model: Model) -> Model {
                     .collect();
                 Model {todos, edit_text: model.todos[posit].title.clone(), ..model}
             } else if code == ENTER_KEY {
-                update(Msg::EditSubmit(posit), model)
+                update(history, Msg::EditSubmit(posit), model)
             } else {model}
         },
     }

examples/todomvc/pkg/todomvc_bg.wasm

@@ -301,7 +301,7 @@ impl Attrs {
     }
 
     /// Create an HTML-compatible string representation
-    pub fn to_string(&self) -> String {
+    pub fn as_str(&self) -> String {
         let mut result = String::new();
         for (key, val) in &self.vals {
             result += &format!(" {k}=\"{v}\"", k=key, v=val);
@@ -354,7 +354,7 @@ impl Style {
 
     /// Output style as a string, as would be set in the DOM as the attribute value
     /// for 'style'. Eg: "display: flex; font-size: 1.5em"
-    pub fn to_string(&self) -> String {
+    pub fn as_str(&self) -> String {
         let mut result = String::new();
         if self.vals.keys().len() > 0 {
             for (key, val) in &self.vals {
@@ -631,8 +631,8 @@ impl<Ms: Clone + 'static> El<Ms> {
     fn _html(&self) -> String {
         let text = self.text.clone().unwrap_or_default();
 
-        let opening = String::from("<") + self.tag.as_str() + &self.attrs.to_string() +
-            " style=\"" + &self.style.to_string() + ">\n";
+        let opening = String::from("<") + self.tag.as_str() + &self.attrs.as_str() +
+            " style=\"" + &self.style.as_str() + ">\n";
 
         let inner = self.children.iter().fold(String::new(), |result, child| result + &child._html());
 

examples/todomvc/src/lib.rs

@@ -44,7 +44,7 @@ pub fn make_websys_el<Ms: Clone>(el_vdom: &mut dom_types::El<Ms>, document: &web
     // Style is just an attribute in the actual Dom, but is handled specially in our vdom;
     // merge the different parts of style here.
     if el_vdom.style.vals.keys().len() > 0 {
-        el_ws.set_attribute("style", &el_vdom.style.to_string()).expect("Problem setting style");
+        el_ws.set_attribute("style", &el_vdom.style.as_str()).expect("Problem setting style");
     }
 
     // We store text as Option<String>, but set_text_content uses Option<&str>.
@@ -128,7 +128,7 @@ pub fn patch_el_details<Ms: Clone>(old: &mut dom_types::El<Ms>, new: &mut dom_ty
     // Patch style.
     if old.style != new.style {
         // We can't patch each part of style; rewrite the whole attribute.
-        old_el_ws.set_attribute("style", &new.style.to_string())
+        old_el_ws.set_attribute("style", &new.style.as_str())
             .expect("Setting style");
     }