Merge branch 'master' of https://github.com/aclueless/js-framework-benchmark into aclueless-master

Author: krausest

frameworks/keyed/spair-qr/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-spair = { version = "0.0.6", features = ["queue-render"] }
+spair = { version = "0.0.8", features = ["queue-render"] }
 getrandom = { version = "0.2.6", features = ["js"] }
 rand = { version = "0.8.5", features = ["small_rng"] }
 

frameworks/keyed/spair-qr/bundled-dist/spair_qr_benchmark-fbaf7d3f677b548e.js renamed to frameworks/keyed/spair-qr/bundled-dist/spair_qr_benchmark-40beae1445fe1602.js

@@ -68,8 +68,8 @@ function makeClosure(arg0, arg1, dtor, f) {
 
     return real;
 }
-function __wbg_adapter_18(arg0, arg1, arg2) {
-    wasm._dyn_core__ops__function__Fn__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__he718341fba5a25e6(arg0, arg1, addHeapObject(arg2));
+function __wbg_adapter_22(arg0, arg1, arg2) {
+    wasm._dyn_core__ops__function__Fn__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h85333ec449a8cc22(arg0, arg1, addHeapObject(arg2));
 }
 
 function handleError(f, args) {
@@ -196,9 +196,6 @@ function getImports() {
     imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
         takeObject(arg0);
     };
-    imports.wbg.__wbg_removeEventListener_dd20475efce70084 = function() { return handleError(function (arg0, arg1, arg2, arg3) {
-        getObject(arg0).removeEventListener(getStringFromWasm0(arg1, arg2), getObject(arg3));
-    }, arguments) };
     imports.wbg.__wbindgen_cb_drop = function(arg0) {
         const obj = takeObject(arg0).original;
         if (obj.cnt-- == 1) {
@@ -277,55 +274,59 @@ function getImports() {
         getInt32Memory0()[arg0 / 4 + 1] = len0;
         getInt32Memory0()[arg0 / 4 + 0] = ptr0;
     }, arguments) };
-    imports.wbg.__wbg_process_0cc2ada8524d6f83 = function(arg0) {
-        const ret = getObject(arg0).process;
+    imports.wbg.__wbg_crypto_e1d53a1d73fb10b8 = function(arg0) {
+        const ret = getObject(arg0).crypto;
         return addHeapObject(ret);
     };
     imports.wbg.__wbindgen_is_object = function(arg0) {
         const val = getObject(arg0);
         const ret = typeof(val) === 'object' && val !== null;
         return ret;
     };
-    imports.wbg.__wbg_versions_c11acceab27a6c87 = function(arg0) {
+    imports.wbg.__wbg_process_038c26bf42b093f8 = function(arg0) {
+        const ret = getObject(arg0).process;
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbg_versions_ab37218d2f0b24a8 = function(arg0) {
         const ret = getObject(arg0).versions;
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_node_7ff1ce49caf23815 = function(arg0) {
+    imports.wbg.__wbg_node_080f4b19d15bc1fe = function(arg0) {
         const ret = getObject(arg0).node;
         return addHeapObject(ret);
     };
     imports.wbg.__wbindgen_is_string = function(arg0) {
         const ret = typeof(getObject(arg0)) === 'string';
         return ret;
     };
-    imports.wbg.__wbg_static_accessor_NODE_MODULE_cf6401cc1091279e = function() {
-        const ret = module;
+    imports.wbg.__wbg_msCrypto_6e7d3e1f92610cbb = function(arg0) {
+        const ret = getObject(arg0).msCrypto;
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_require_a746e79b322b9336 = function() { return handleError(function (arg0, arg1, arg2) {
-        const ret = getObject(arg0).require(getStringFromWasm0(arg1, arg2));
-        return addHeapObject(ret);
-    }, arguments) };
-    imports.wbg.__wbg_crypto_2036bed7c44c25e7 = function(arg0) {
-        const ret = getObject(arg0).crypto;
+    imports.wbg.__wbg_newwithlength_f5933855e4f48a19 = function(arg0) {
+        const ret = new Uint8Array(arg0 >>> 0);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_msCrypto_a21fc88caf1ecdc8 = function(arg0) {
-        const ret = getObject(arg0).msCrypto;
+    imports.wbg.__wbg_require_78a3dcfbdba9cbce = function() { return handleError(function () {
+        const ret = module.require;
         return addHeapObject(ret);
+    }, arguments) };
+    imports.wbg.__wbindgen_is_function = function(arg0) {
+        const ret = typeof(getObject(arg0)) === 'function';
+        return ret;
     };
-    imports.wbg.__wbg_newwithlength_f5933855e4f48a19 = function(arg0) {
-        const ret = new Uint8Array(arg0 >>> 0);
+    imports.wbg.__wbindgen_string_new = function(arg0, arg1) {
+        const ret = getStringFromWasm0(arg0, arg1);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_randomFillSync_065afffde01daa66 = function() { return handleError(function (arg0, arg1, arg2) {
+    imports.wbg.__wbg_randomFillSync_6894564c2c334c42 = function() { return handleError(function (arg0, arg1, arg2) {
         getObject(arg0).randomFillSync(getArrayU8FromWasm0(arg1, arg2));
     }, arguments) };
     imports.wbg.__wbg_subarray_58ad4efbb5bcb886 = function(arg0, arg1, arg2) {
         const ret = getObject(arg0).subarray(arg1 >>> 0, arg2 >>> 0);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_getRandomValues_b99eec4244a475bb = function() { return handleError(function (arg0, arg1) {
+    imports.wbg.__wbg_getRandomValues_805f1c3d65988a5a = function() { return handleError(function (arg0, arg1) {
         getObject(arg0).getRandomValues(getObject(arg1));
     }, arguments) };
     imports.wbg.__wbg_length_9e1ae1900cb0fbd5 = function(arg0) {
@@ -375,6 +376,10 @@ function getImports() {
         const ret = getObject(arg0).call(getObject(arg1));
         return addHeapObject(ret);
     }, arguments) };
+    imports.wbg.__wbg_call_168da88779e35f61 = function() { return handleError(function (arg0, arg1, arg2) {
+        const ret = getObject(arg0).call(getObject(arg1), getObject(arg2));
+        return addHeapObject(ret);
+    }, arguments) };
     imports.wbg.__wbg_cloneNode_27fa6913b5172820 = function() { return handleError(function (arg0, arg1) {
         const ret = getObject(arg0).cloneNode(arg1 !== 0);
         return addHeapObject(ret);
@@ -399,7 +404,7 @@ function getImports() {
         throw new Error(getStringFromWasm0(arg0, arg1));
     };
     imports.wbg.__wbindgen_closure_wrapper63 = function(arg0, arg1, arg2) {
-        const ret = makeClosure(arg0, arg1, 3, __wbg_adapter_18);
+        const ret = makeClosure(arg0, arg1, 3, __wbg_adapter_22);
         return addHeapObject(ret);
     };
 
@@ -436,7 +441,7 @@ function initSync(module) {
 
 async function init(input) {
     if (typeof input === 'undefined') {
-        input = new URL('spair_qr_benchmark-fbaf7d3f677b548e_bg.wasm', import.meta.url);
+        input = new URL('spair_qr_benchmark-40beae1445fe1602_bg.wasm', import.meta.url);
     }
     const imports = getImports();
 

frameworks/keyed/spair-qr/bundled-dist/spair_qr_benchmark-40beae1445fe1602_bg.wasm

@@ -2,10 +2,10 @@
     <meta charset="UTF-8">
     <title>Spair queue render</title>
     <link href="/css/currentStyle.css" rel="stylesheet">
-    <script type="module">import init from '/frameworks/keyed/spair-qr/bundled-dist/spair_qr_benchmark-fbaf7d3f677b548e.js';init('/frameworks/keyed/spair-qr/bundled-dist/spair_qr_benchmark-fbaf7d3f677b548e_bg.wasm');</script>
+    <script type="module">import init from '/frameworks/keyed/spair-qr/bundled-dist/spair_qr_benchmark-40beae1445fe1602.js';init('/frameworks/keyed/spair-qr/bundled-dist/spair_qr_benchmark-40beae1445fe1602_bg.wasm');</script>
 
-<link rel="preload" href="/frameworks/keyed/spair-qr/bundled-dist/spair_qr_benchmark-fbaf7d3f677b548e_bg.wasm" as="fetch" type="application/wasm" crossorigin="">
-<link rel="modulepreload" href="/frameworks/keyed/spair-qr/bundled-dist/spair_qr_benchmark-fbaf7d3f677b548e.js"></head>
+<link rel="preload" href="/frameworks/keyed/spair-qr/bundled-dist/spair_qr_benchmark-40beae1445fe1602_bg.wasm" as="fetch" type="application/wasm" crossorigin="">
+<link rel="modulepreload" href="/frameworks/keyed/spair-qr/bundled-dist/spair_qr_benchmark-40beae1445fe1602.js"></head>
 <body>
 <div id="main"></div>
 

frameworks/keyed/spair-qr/bundled-dist/spair_qr_benchmark-fbaf7d3f677b548e_bg.wasm

@@ -4,7 +4,7 @@
   "description": "Benchmark for Spair-qr",
   "license": "ISC",
   "js-framework-benchmark": {
-    "frameworkVersion": "0.0.6"
+    "frameworkVersion": "0.0.8"
   },
   "scripts": {
     "build-prod": "echo This is a no-op. && echo Due to heavy dependencies, the generated javascript is already provided. && echo If you really want to rebuild from source use: && echo npm run build-prod-force",

frameworks/keyed/spair-qr/index.html

@@ -14,7 +14,7 @@ struct RowData {
 struct App {
     last_id: u64,
     rows: spair::QrVec<RowData>,
-    selected_id: Option<u64>,
+    selected_id: spair::QrVal<Option<u64>>,
 }
 
 impl App {
@@ -50,7 +50,7 @@ impl App {
     }
 
     fn create(&mut self, count: usize) {
-        self.selected_id = None;
+        self.selected_id.set(None);
         self.append_rows(true, count);
     }
 
@@ -70,26 +70,22 @@ impl App {
 
     fn clear(&mut self) {
         self.rows.get_mut().clear();
-        self.selected_id = None;
+        self.selected_id.set(None);
     }
 
     fn set_selected_id(&mut self, id: u64) {
-        let mut rows = self.rows.get_mut();
-        let old_index = self.selected_id.and_then(|id| rows.iter().position(|rd| rd.id == id));
-        let new_index = rows.iter().position(|rd| rd.id == id);
-
-        self.selected_id = Some(id);
-        rows.request_render_at(old_index);
-        rows.request_render_at(new_index);
+        self.selected_id.set(Some(id));
     }
 }
 
 impl spair::Application for App {
     fn init(_: &spair::Comp<App>) -> Self {
+    	let rows: spair::QrVec<RowData> = Default::default();
+    	let selected_id = rows.create_optional_selected_id(|rd, id| rd.id == *id);
         Self {
             last_id: 0,
-            rows: Default::default(),
-            selected_id: None,
+            rows,
+            selected_id,
         }
     }
 }
@@ -199,7 +195,7 @@ impl spair::ElementRender<App> for RowData {
         let state = e.state();
         let comp = e.comp();
         let id = self.id;
-        let in_danger = state.selected_id == Some(self.id);
+        let in_danger = state.selected_id.get() == Some(self.id);
         e
             .class_if(in_danger, "danger")
             .td(|d| d.class("col-md-1").rupdate(self.id).done())

frameworks/keyed/spair-qr/package.json

@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-spair = { version = "0.0.6", features = ["keyed-list"] }
+spair = { version = "0.0.8", features = ["keyed-list"] }
 getrandom = { version = "0.2.6", features = ["js"] }
 rand = { version = "0.8.5", features = ["small_rng"] }