git.iko.soy/dodrio
on master help sign in
swap
f1ba4fd174 ahead, 0 behind
72 files changed+5329−2190
since splitsnapshots
unifiedsplit
.travis.yml+19−9 Cargo.lock+507−499 Cargo.toml+36−18 README.md+13−6 benches/benches.rs+17−25 build.sh+2−2 crates/js-api/Cargo.toml+6−7 crates/js-api/src/lib.rs+14−11 examples/counter/Cargo.toml+5−5 examples/counter/README.md+1−1 examples/counter/index.html+3−3 examples/counter/src/lib.rs+5−4 examples/game-of-life/Cargo.toml+5−6 examples/game-of-life/README.md+1−1 examples/game-of-life/index.html+3−6 examples/game-of-life/src/lib.rs+18−13 examples/hello-world/Cargo.toml+3−3 examples/hello-world/README.md+1−1 examples/hello-world/index.html+3−3 examples/hello-world/src/lib.rs+2−2 examples/input-form/Cargo.toml+3−3 examples/input-form/README.md+1−1 examples/input-form/index.html+3−3 examples/input-form/src/lib.rs+2−2 examples/js-component/Cargo.toml+3−3 examples/js-component/README.md+1−1 examples/js-component/index.html+3−3 examples/js-component/src/lib.rs+3−3 examples/moire/Cargo.toml+8−9 examples/moire/README.md+1−1 examples/moire/index.html+3−3 examples/moire/src/lib.rs+18−28 examples/sierpinski-triangle/Cargo.toml+5−6 examples/sierpinski-triangle/README.md+2−2 examples/sierpinski-triangle/index.html+4−4 examples/sierpinski-triangle/src/lib.rs+11−22 examples/todomvc/Cargo.toml+11−12 examples/todomvc/README.md+1−1 examples/todomvc/index.html+3−3 examples/todomvc/src/router.rs+23−21 examples/todomvc/src/todo.rs+77−21 examples/todomvc/src/todos.rs+11−12 js/change-list-interpreter.js+377 js/change-list.js−289 js/package-lock.json−5 js/package.json−11 js/strace.js+80 src/builder.rs+64−5 src/cached.rs+229 src/cached_set.rs+186 src/change_list.rs−480 src/change_list/emitter.rs+292 src/change_list/js.rs+40 src/change_list/mod.rs+353 src/change_list/strings.rs+66 src/change_list/traversal.rs+344 src/diff.rs+1125 src/events.rs+36−15 src/lib.rs+46−5 src/node.rs+135−87 src/render.rs+43−16 src/render_context.rs+69−17 src/strace.rs+22 src/vdom.rs+136−326 tests/web/cached.js+11 tests/web/cached.rs+289 tests/web/events.rs+56−73 tests/web/js_api.rs+30−37 tests/web/keyed.js+25 tests/web/keyed.rs+269 tests/web/main.rs+56−33 tests/web/render.rs+89−2
.travis.yml+19−9
@@ -25,20 +25,30 @@ matrix:
2525 - name: "build (beta)"
2626 rust: beta
2727 script: INSTALL=1 ./build.sh
28− - name: "build (nightly)"
29− rust: nightly
30− script: INSTALL=1 ./build.sh
3128 - name: "headless browser tests (firefox)"
3229 rust: stable
3330 addons:
3431 firefox: latest
35− script: wasm-pack test --firefox --headless
36− - name: "headless browser tests (chrome)"
37− rust: stable
38− addons:
39− chrome: stable
40− script: wasm-pack test --chrome --headless
32+ script: wasm-pack test --firefox --headless -- --features xxx-unstable-internal-use-only
4133 - name: "native tests"
4234 rust: stable
4335 install: echo "no install"
4436 script: cargo test --all
37+
38+ # TODO: A bug in `rustc` is making `js-sys` broken on nightly:
39+ # https://github.com/rust-lang/rust/issues/69315
40+ # - name: "build (nightly)"
41+ # rust: nightly
42+ # script: INSTALL=1 ./build.sh
43+ # - name: "check native benches"
44+ # rust: nightly
45+ # install: echo "no install"
46+ # script: cargo check --benches --features xxx-unstable-internal-use-only
47+
48+ # TODO: `chromedriver` is complaining about ports or something. Temporarily
49+ # disable in CI until we figure it out.
50+ # - name: "headless browser tests (chrome)"
51+ # rust: stable
52+ # addons:
53+ # chrome: stable
54+ # script: wasm-pack test --chrome --headless -- --features xxx-unstable-internal-use-only
Cargo.lock+507−499
@@ -1,102 +1,71 @@
1+# This file is automatically @generated by Cargo.
2+# It is not intended for manual editing.
13[[package]]
2−name = "aho-corasick"
3−version = "0.7.3"
4+name = "anyhow"
5+version = "1.0.25"
46source = "registry+https://github.com/rust-lang/crates.io-index"
5−dependencies = [
6− "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
7−]
8−
9−[[package]]
10−name = "arrayvec"
11−version = "0.4.10"
12−source = "registry+https://github.com/rust-lang/crates.io-index"
13−dependencies = [
14− "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
15−]
167
178[[package]]
189name = "atty"
19−version = "0.2.11"
10+version = "0.2.13"
2011source = "registry+https://github.com/rust-lang/crates.io-index"
2112dependencies = [
22− "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
23− "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
24− "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
13+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
14+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
2515]
2616
2717[[package]]
2818name = "autocfg"
29−version = "0.1.2"
19+version = "0.1.7"
3020source = "registry+https://github.com/rust-lang/crates.io-index"
3121
3222[[package]]
33−name = "backtrace"
34−version = "0.3.14"
23+name = "bitflags"
24+version = "1.2.1"
3525source = "registry+https://github.com/rust-lang/crates.io-index"
36−dependencies = [
37− "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
38− "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
39− "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
40− "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
41− "rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
42− "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
43−]
4426
4527[[package]]
46−name = "backtrace-sys"
47−version = "0.1.28"
28+name = "bstr"
29+version = "0.2.8"
4830source = "registry+https://github.com/rust-lang/crates.io-index"
4931dependencies = [
50− "cc 1.0.32 (registry+https://github.com/rust-lang/crates.io-index)",
51− "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
32+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
33+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
34+ "regex-automata 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
35+ "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
5236]
5337
54−[[package]]
55−name = "bitflags"
56−version = "1.0.4"
57−source = "registry+https://github.com/rust-lang/crates.io-index"
58−
5938[[package]]
6039name = "bumpalo"
61−version = "2.3.0"
40+version = "2.6.0"
6241source = "registry+https://github.com/rust-lang/crates.io-index"
6342
6443[[package]]
6544name = "byteorder"
66−version = "1.3.1"
45+version = "1.3.2"
6746source = "registry+https://github.com/rust-lang/crates.io-index"
6847
6948[[package]]
7049name = "cast"
71−version = "0.2.2"
72−source = "registry+https://github.com/rust-lang/crates.io-index"
73−
74−[[package]]
75−name = "cc"
76−version = "1.0.32"
50+version = "0.2.3"
7751source = "registry+https://github.com/rust-lang/crates.io-index"
52+dependencies = [
53+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
54+]
7855
7956[[package]]
8057name = "cfg-if"
81−version = "0.1.7"
58+version = "0.1.10"
8259source = "registry+https://github.com/rust-lang/crates.io-index"
8360
8461[[package]]
8562name = "clap"
86−version = "2.32.0"
63+version = "2.33.0"
8764source = "registry+https://github.com/rust-lang/crates.io-index"
8865dependencies = [
89− "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
90− "textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
91− "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
92−]
93−
94−[[package]]
95−name = "cloudabi"
96−version = "0.0.3"
97−source = "registry+https://github.com/rust-lang/crates.io-index"
98−dependencies = [
99− "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
66+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
67+ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
68+ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
10069]
10170
10271[[package]]
@@ -104,118 +73,132 @@ name = "console_error_panic_hook"
10473version = "0.1.6"
10574source = "registry+https://github.com/rust-lang/crates.io-index"
10675dependencies = [
107− "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
108− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
76+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
77+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
10978]
11079
11180[[package]]
11281name = "console_log"
113−version = "0.1.2"
82+version = "0.2.0"
11483source = "registry+https://github.com/rust-lang/crates.io-index"
11584dependencies = [
116− "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
117− "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
85+ "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
86+ "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
11887]
11988
12089[[package]]
12190name = "criterion"
122−version = "0.2.10"
91+version = "0.3.3"
12392source = "registry+https://github.com/rust-lang/crates.io-index"
12493dependencies = [
125− "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
126− "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
127− "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
128− "criterion-plot 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
129− "csv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
130− "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
131− "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
132− "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
133− "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
134− "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
135− "rand_xoshiro 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
136− "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
137− "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
138− "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
139− "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
140− "tinytemplate 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
141− "walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
94+ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
95+ "cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
96+ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
97+ "criterion-plot 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
98+ "csv 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
99+ "itertools 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
100+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
101+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
102+ "oorandom 11.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
103+ "plotters 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
104+ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
105+ "regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
106+ "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
107+ "serde_cbor 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
108+ "serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
109+ "serde_json 1.0.57 (registry+https://github.com/rust-lang/crates.io-index)",
110+ "tinytemplate 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
111+ "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
142112]
143113
144114[[package]]
145115name = "criterion-plot"
146−version = "0.3.0"
116+version = "0.4.3"
147117source = "registry+https://github.com/rust-lang/crates.io-index"
148118dependencies = [
149− "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
150− "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
151− "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
119+ "cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
120+ "itertools 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
152121]
153122
154123[[package]]
155124name = "crossbeam-deque"
156−version = "0.2.0"
125+version = "0.7.2"
157126source = "registry+https://github.com/rust-lang/crates.io-index"
158127dependencies = [
159− "crossbeam-epoch 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
160− "crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
128+ "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
129+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
161130]
162131
163132[[package]]
164133name = "crossbeam-epoch"
165−version = "0.3.1"
134+version = "0.8.0"
135+source = "registry+https://github.com/rust-lang/crates.io-index"
136+dependencies = [
137+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
138+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
139+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
140+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
141+ "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
142+ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
143+]
144+
145+[[package]]
146+name = "crossbeam-queue"
147+version = "0.2.0"
166148source = "registry+https://github.com/rust-lang/crates.io-index"
167149dependencies = [
168− "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
169− "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
170− "crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
171− "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
172− "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
173− "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
174− "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
150+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
175151]
176152
177153[[package]]
178154name = "crossbeam-utils"
179−version = "0.2.2"
155+version = "0.7.0"
180156source = "registry+https://github.com/rust-lang/crates.io-index"
181157dependencies = [
182− "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
158+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
159+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
160+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
183161]
184162
185163[[package]]
186164name = "csv"
187−version = "1.0.5"
165+version = "1.1.1"
188166source = "registry+https://github.com/rust-lang/crates.io-index"
189167dependencies = [
190− "csv-core 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
191− "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
168+ "bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
169+ "csv-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
170+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
171+ "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
172+ "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
192173]
193174
194175[[package]]
195176name = "csv-core"
196−version = "0.1.5"
177+version = "0.1.6"
197178source = "registry+https://github.com/rust-lang/crates.io-index"
198179dependencies = [
199− "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
180+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
200181]
201182
202183[[package]]
203184name = "dodrio"
204−version = "0.1.0"
185+version = "0.2.0"
205186dependencies = [
206− "bumpalo 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
207− "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
208− "console_log 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
209− "criterion 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
210− "dodrio-js-api 0.1.0",
211− "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
187+ "bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
188+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
189+ "console_log 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
190+ "criterion 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
191+ "dodrio-js-api 0.2.0",
192+ "futures 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
212193 "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
213− "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
214− "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
215− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
216− "wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
217− "wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
218− "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
194+ "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
195+ "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
196+ "longest-increasing-subsequence 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
197+ "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
198+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
199+ "wasm-bindgen-futures 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
200+ "wasm-bindgen-test 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
201+ "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
219202]
220203
221204[[package]]
@@ -223,12 +206,12 @@ name = "dodrio-counter"
223206version = "0.1.0"
224207dependencies = [
225208 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
226− "console_log 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
227− "dodrio 0.1.0",
228− "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
229− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
230− "wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
231− "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
209+ "console_log 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
210+ "dodrio 0.2.0",
211+ "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
212+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
213+ "wasm-bindgen-test 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
214+ "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
232215]
233216
234217[[package]]
@@ -236,13 +219,12 @@ name = "dodrio-game-of-life"
236219version = "0.1.0"
237220dependencies = [
238221 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
239− "dodrio 0.1.0",
240− "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
241− "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
242− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
243− "wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
244− "wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
245− "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
222+ "dodrio 0.2.0",
223+ "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
224+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
225+ "wasm-bindgen-futures 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
226+ "wasm-bindgen-test 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
227+ "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
246228]
247229
248230[[package]]
@@ -250,10 +232,10 @@ name = "dodrio-hello-world"
250232version = "0.1.0"
251233dependencies = [
252234 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
253− "dodrio 0.1.0",
254− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
255− "wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
256− "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
235+ "dodrio 0.2.0",
236+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
237+ "wasm-bindgen-test 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
238+ "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
257239]
258240
259241[[package]]
@@ -261,22 +243,21 @@ name = "dodrio-input-form"
261243version = "0.1.0"
262244dependencies = [
263245 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
264− "dodrio 0.1.0",
265− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
266− "wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
267− "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
246+ "dodrio 0.2.0",
247+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
248+ "wasm-bindgen-test 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
249+ "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
268250]
269251
270252[[package]]
271253name = "dodrio-js-api"
272−version = "0.1.0"
254+version = "0.2.0"
273255dependencies = [
274− "dodrio 0.1.0",
275− "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
276− "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
277− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
278− "wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
279− "wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
256+ "dodrio 0.2.0",
257+ "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
258+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
259+ "wasm-bindgen-futures 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
260+ "wasm-bindgen-test 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
280261]
281262
282263[[package]]
@@ -284,28 +265,27 @@ name = "dodrio-js-component"
284265version = "0.1.0"
285266dependencies = [
286267 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
287− "dodrio 0.1.0",
288− "dodrio-js-api 0.1.0",
289− "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
290− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
291− "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
268+ "dodrio 0.2.0",
269+ "dodrio-js-api 0.2.0",
270+ "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
271+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
272+ "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
292273]
293274
294275[[package]]
295276name = "dodrio-moire"
296277version = "0.1.0"
297278dependencies = [
298− "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
279+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
299280 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
300− "console_log 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
301− "dodrio 0.1.0",
302− "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
303− "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
304− "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
305− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
306− "wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
307− "wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
308− "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
281+ "console_log 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
282+ "dodrio 0.2.0",
283+ "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
284+ "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
285+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
286+ "wasm-bindgen-futures 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
287+ "wasm-bindgen-test 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
288+ "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
309289]
310290
311291[[package]]
@@ -313,315 +293,372 @@ name = "dodrio-sierpinski"
313293version = "0.1.0"
314294dependencies = [
315295 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
316− "dodrio 0.1.0",
317− "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
318− "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
319− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
320− "wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
321− "wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
322− "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
296+ "dodrio 0.2.0",
297+ "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
298+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
299+ "wasm-bindgen-futures 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
300+ "wasm-bindgen-test 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
301+ "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
323302]
324303
325304[[package]]
326305name = "dodrio-todomvc"
327306version = "0.1.0"
328307dependencies = [
329− "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
308+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
330309 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
331− "console_log 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
332− "dodrio 0.1.0",
333− "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
334− "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
335− "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
336− "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
337− "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
338− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
339− "wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
340− "wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
341− "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
310+ "console_log 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
311+ "dodrio 0.2.0",
312+ "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
313+ "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
314+ "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
315+ "serde_json 1.0.57 (registry+https://github.com/rust-lang/crates.io-index)",
316+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
317+ "wasm-bindgen-futures 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
318+ "wasm-bindgen-test 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
319+ "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
342320]
343321
344322[[package]]
345323name = "either"
346−version = "1.5.1"
324+version = "1.5.3"
347325source = "registry+https://github.com/rust-lang/crates.io-index"
348326
349327[[package]]
350−name = "env_logger"
351−version = "0.6.1"
328+name = "futures"
329+version = "0.3.5"
352330source = "registry+https://github.com/rust-lang/crates.io-index"
353331dependencies = [
354− "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
355− "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
356− "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
357− "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
358− "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
332+ "futures-channel 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
333+ "futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
334+ "futures-executor 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
335+ "futures-io 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
336+ "futures-sink 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
337+ "futures-task 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
338+ "futures-util 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
359339]
360340
361341[[package]]
362−name = "failure"
363−version = "0.1.5"
342+name = "futures-channel"
343+version = "0.3.5"
364344source = "registry+https://github.com/rust-lang/crates.io-index"
365345dependencies = [
366− "backtrace 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
367− "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
346+ "futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
347+ "futures-sink 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
368348]
369349
370350[[package]]
371−name = "failure_derive"
372−version = "0.1.5"
351+name = "futures-core"
352+version = "0.3.5"
353+source = "registry+https://github.com/rust-lang/crates.io-index"
354+
355+[[package]]
356+name = "futures-executor"
357+version = "0.3.5"
373358source = "registry+https://github.com/rust-lang/crates.io-index"
374359dependencies = [
375− "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
376− "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
377− "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
378− "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
360+ "futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
361+ "futures-task 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
362+ "futures-util 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
379363]
380364
381365[[package]]
382−name = "fuchsia-cprng"
383−version = "0.1.1"
366+name = "futures-io"
367+version = "0.3.5"
384368source = "registry+https://github.com/rust-lang/crates.io-index"
385369
386370[[package]]
387−name = "futures"
388−version = "0.1.26"
371+name = "futures-macro"
372+version = "0.3.5"
389373source = "registry+https://github.com/rust-lang/crates.io-index"
374+dependencies = [
375+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
376+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
377+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
378+ "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
379+]
380+
381+[[package]]
382+name = "futures-sink"
383+version = "0.3.5"
384+source = "registry+https://github.com/rust-lang/crates.io-index"
385+
386+[[package]]
387+name = "futures-task"
388+version = "0.3.5"
389+source = "registry+https://github.com/rust-lang/crates.io-index"
390+dependencies = [
391+ "once_cell 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
392+]
393+
394+[[package]]
395+name = "futures-util"
396+version = "0.3.5"
397+source = "registry+https://github.com/rust-lang/crates.io-index"
398+dependencies = [
399+ "futures-channel 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
400+ "futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
401+ "futures-io 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
402+ "futures-macro 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
403+ "futures-sink 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
404+ "futures-task 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
405+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
406+ "pin-project 0.4.16 (registry+https://github.com/rust-lang/crates.io-index)",
407+ "pin-utils 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
408+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
409+ "proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
410+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
411+]
390412
391413[[package]]
392414name = "fxhash"
393415version = "0.2.1"
394416source = "registry+https://github.com/rust-lang/crates.io-index"
395417dependencies = [
396− "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
418+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
397419]
398420
421+[[package]]
422+name = "half"
423+version = "1.6.0"
424+source = "registry+https://github.com/rust-lang/crates.io-index"
425+
399426[[package]]
400427name = "heck"
401428version = "0.3.1"
402429source = "registry+https://github.com/rust-lang/crates.io-index"
403430dependencies = [
404− "unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
431+ "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
405432]
406433
407434[[package]]
408−name = "humantime"
409−version = "1.2.0"
435+name = "hermit-abi"
436+version = "0.1.3"
410437source = "registry+https://github.com/rust-lang/crates.io-index"
411438dependencies = [
412− "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
439+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
413440]
414441
415442[[package]]
416443name = "itertools"
417−version = "0.8.0"
444+version = "0.9.0"
418445source = "registry+https://github.com/rust-lang/crates.io-index"
419446dependencies = [
420− "either 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
447+ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
421448]
422449
423450[[package]]
424451name = "itoa"
425−version = "0.4.3"
452+version = "0.4.4"
426453source = "registry+https://github.com/rust-lang/crates.io-index"
427454
428455[[package]]
429456name = "js-sys"
430−version = "0.3.17"
457+version = "0.3.32"
431458source = "registry+https://github.com/rust-lang/crates.io-index"
432459dependencies = [
433− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
460+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
434461]
435462
436463[[package]]
437464name = "lazy_static"
438−version = "1.3.0"
465+version = "1.4.0"
439466source = "registry+https://github.com/rust-lang/crates.io-index"
440467
441468[[package]]
442469name = "libc"
443−version = "0.2.51"
470+version = "0.2.66"
444471source = "registry+https://github.com/rust-lang/crates.io-index"
445472
446473[[package]]
447474name = "log"
448−version = "0.4.6"
475+version = "0.4.11"
449476source = "registry+https://github.com/rust-lang/crates.io-index"
450477dependencies = [
451− "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
478+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
452479]
453480
481+[[package]]
482+name = "longest-increasing-subsequence"
483+version = "0.1.0"
484+source = "registry+https://github.com/rust-lang/crates.io-index"
485+
454486[[package]]
455487name = "memchr"
456−version = "2.2.0"
488+version = "2.2.1"
457489source = "registry+https://github.com/rust-lang/crates.io-index"
458490dependencies = [
459− "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
491+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
460492]
461493
462494[[package]]
463495name = "memoffset"
464−version = "0.2.1"
465−source = "registry+https://github.com/rust-lang/crates.io-index"
466−
467−[[package]]
468−name = "nodrop"
469−version = "0.1.13"
496+version = "0.5.3"
470497source = "registry+https://github.com/rust-lang/crates.io-index"
498+dependencies = [
499+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
500+]
471501
472502[[package]]
473503name = "nom"
474504version = "4.2.3"
475505source = "registry+https://github.com/rust-lang/crates.io-index"
476506dependencies = [
477− "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
507+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
478508 "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
479509]
480510
481511[[package]]
482512name = "num-traits"
483−version = "0.2.6"
513+version = "0.2.10"
484514source = "registry+https://github.com/rust-lang/crates.io-index"
515+dependencies = [
516+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
517+]
485518
486519[[package]]
487520name = "num_cpus"
488−version = "1.10.0"
521+version = "1.11.1"
489522source = "registry+https://github.com/rust-lang/crates.io-index"
490523dependencies = [
491− "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
524+ "hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
525+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
492526]
493527
494528[[package]]
495−name = "proc-macro2"
496−version = "0.4.27"
529+name = "once_cell"
530+version = "1.3.1"
497531source = "registry+https://github.com/rust-lang/crates.io-index"
498−dependencies = [
499− "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
500−]
501532
502533[[package]]
503−name = "quick-error"
504−version = "1.2.2"
534+name = "oorandom"
535+version = "11.1.0"
505536source = "registry+https://github.com/rust-lang/crates.io-index"
506537
507538[[package]]
508−name = "quote"
509−version = "0.6.11"
539+name = "pin-project"
540+version = "0.4.16"
510541source = "registry+https://github.com/rust-lang/crates.io-index"
511542dependencies = [
512− "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
543+ "pin-project-internal 0.4.16 (registry+https://github.com/rust-lang/crates.io-index)",
513544]
514545
515546[[package]]
516−name = "rand_core"
517−version = "0.3.1"
547+name = "pin-project-internal"
548+version = "0.4.16"
518549source = "registry+https://github.com/rust-lang/crates.io-index"
519550dependencies = [
520− "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
551+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
552+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
553+ "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
521554]
522555
523556[[package]]
524−name = "rand_core"
525−version = "0.4.0"
557+name = "pin-utils"
558+version = "0.1.0"
526559source = "registry+https://github.com/rust-lang/crates.io-index"
527560
528561[[package]]
529−name = "rand_os"
530−version = "0.1.3"
562+name = "plotters"
563+version = "0.2.12"
531564source = "registry+https://github.com/rust-lang/crates.io-index"
532565dependencies = [
533− "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
534− "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
535− "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
536− "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
537− "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
538− "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
566+ "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
567+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
568+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
569+ "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
539570]
540571
541572[[package]]
542−name = "rand_xoshiro"
543−version = "0.1.0"
573+name = "proc-macro-hack"
574+version = "0.5.11"
544575source = "registry+https://github.com/rust-lang/crates.io-index"
545576dependencies = [
546− "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
547− "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
577+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
578+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
579+ "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
548580]
549581
550582[[package]]
551−name = "rayon"
552−version = "1.0.3"
583+name = "proc-macro-nested"
584+version = "0.1.3"
553585source = "registry+https://github.com/rust-lang/crates.io-index"
554−dependencies = [
555− "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
556− "either 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
557− "rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
558−]
559586
560587[[package]]
561−name = "rayon-core"
562−version = "1.4.1"
588+name = "proc-macro2"
589+version = "1.0.18"
563590source = "registry+https://github.com/rust-lang/crates.io-index"
564591dependencies = [
565− "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
566− "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
567− "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
568− "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
592+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
569593]
570594
571595[[package]]
572−name = "rdrand"
573−version = "0.4.0"
596+name = "quote"
597+version = "1.0.2"
574598source = "registry+https://github.com/rust-lang/crates.io-index"
575599dependencies = [
576− "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
600+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
577601]
578602
579603[[package]]
580−name = "redox_syscall"
581−version = "0.1.52"
604+name = "rayon"
605+version = "1.3.0"
582606source = "registry+https://github.com/rust-lang/crates.io-index"
607+dependencies = [
608+ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
609+ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
610+ "rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
611+]
583612
584613[[package]]
585−name = "redox_termios"
586−version = "0.1.1"
614+name = "rayon-core"
615+version = "1.7.0"
587616source = "registry+https://github.com/rust-lang/crates.io-index"
588617dependencies = [
589− "redox_syscall 0.1.52 (registry+https://github.com/rust-lang/crates.io-index)",
618+ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
619+ "crossbeam-queue 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
620+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
621+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
622+ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
590623]
591624
592625[[package]]
593626name = "regex"
594−version = "1.1.5"
627+version = "1.3.3"
595628source = "registry+https://github.com/rust-lang/crates.io-index"
596629dependencies = [
597− "aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
598− "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
599− "regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
600− "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
601− "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
630+ "regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
602631]
603632
604633[[package]]
605−name = "regex-syntax"
606−version = "0.6.6"
634+name = "regex-automata"
635+version = "0.1.8"
607636source = "registry+https://github.com/rust-lang/crates.io-index"
608637dependencies = [
609− "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
638+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
610639]
611640
612641[[package]]
613−name = "rustc-demangle"
614−version = "0.1.13"
642+name = "regex-syntax"
643+version = "0.6.13"
615644source = "registry+https://github.com/rust-lang/crates.io-index"
616645
646+[[package]]
647+name = "rustc_version"
648+version = "0.2.3"
649+source = "registry+https://github.com/rust-lang/crates.io-index"
650+dependencies = [
651+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
652+]
653+
617654[[package]]
618655name = "ryu"
619−version = "0.2.7"
656+version = "1.0.2"
620657source = "registry+https://github.com/rust-lang/crates.io-index"
621658
622659[[package]]
623660name = "same-file"
624−version = "1.0.4"
661+version = "1.0.5"
625662source = "registry+https://github.com/rust-lang/crates.io-index"
626663dependencies = [
627664 "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -634,129 +671,109 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
634671
635672[[package]]
636673name = "scopeguard"
637−version = "0.3.3"
674+version = "1.0.0"
638675source = "registry+https://github.com/rust-lang/crates.io-index"
639676
640677[[package]]
641−name = "serde"
642−version = "1.0.89"
678+name = "semver"
679+version = "0.9.0"
643680source = "registry+https://github.com/rust-lang/crates.io-index"
644681dependencies = [
645− "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
682+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
646683]
647684
648685[[package]]
649−name = "serde_derive"
650−version = "1.0.89"
686+name = "semver-parser"
687+version = "0.7.0"
651688source = "registry+https://github.com/rust-lang/crates.io-index"
652−dependencies = [
653− "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
654− "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
655− "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
656−]
657689
658690[[package]]
659−name = "serde_json"
660−version = "1.0.39"
691+name = "serde"
692+version = "1.0.114"
661693source = "registry+https://github.com/rust-lang/crates.io-index"
662694dependencies = [
663− "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
664− "ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
665− "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
695+ "serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
666696]
667697
668698[[package]]
669−name = "sourcefile"
670−version = "0.1.4"
699+name = "serde_cbor"
700+version = "0.11.1"
671701source = "registry+https://github.com/rust-lang/crates.io-index"
702+dependencies = [
703+ "half 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
704+ "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
705+]
672706
673707[[package]]
674−name = "syn"
675−version = "0.15.30"
708+name = "serde_derive"
709+version = "1.0.114"
676710source = "registry+https://github.com/rust-lang/crates.io-index"
677711dependencies = [
678− "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
679− "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
680− "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
712+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
713+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
714+ "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
681715]
682716
683717[[package]]
684−name = "synstructure"
685−version = "0.10.1"
718+name = "serde_json"
719+version = "1.0.57"
686720source = "registry+https://github.com/rust-lang/crates.io-index"
687721dependencies = [
688− "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
689− "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
690− "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
691− "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
722+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
723+ "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
724+ "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
692725]
693726
694727[[package]]
695−name = "termcolor"
696−version = "1.0.4"
728+name = "slab"
729+version = "0.4.2"
697730source = "registry+https://github.com/rust-lang/crates.io-index"
698−dependencies = [
699− "wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
700−]
701731
702732[[package]]
703−name = "termion"
704−version = "1.5.1"
733+name = "sourcefile"
734+version = "0.1.4"
705735source = "registry+https://github.com/rust-lang/crates.io-index"
706−dependencies = [
707− "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
708− "redox_syscall 0.1.52 (registry+https://github.com/rust-lang/crates.io-index)",
709− "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
710−]
711736
712737[[package]]
713−name = "textwrap"
714−version = "0.10.0"
738+name = "syn"
739+version = "1.0.33"
715740source = "registry+https://github.com/rust-lang/crates.io-index"
716741dependencies = [
717− "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
742+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
743+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
744+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
718745]
719746
720747[[package]]
721−name = "thread_local"
722−version = "0.3.6"
748+name = "textwrap"
749+version = "0.11.0"
723750source = "registry+https://github.com/rust-lang/crates.io-index"
724751dependencies = [
725− "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
752+ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
726753]
727754
728755[[package]]
729756name = "tinytemplate"
730−version = "1.0.1"
757+version = "1.1.0"
731758source = "registry+https://github.com/rust-lang/crates.io-index"
732759dependencies = [
733− "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
734− "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
760+ "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
761+ "serde_json 1.0.57 (registry+https://github.com/rust-lang/crates.io-index)",
735762]
736763
737−[[package]]
738−name = "ucd-util"
739−version = "0.1.3"
740−source = "registry+https://github.com/rust-lang/crates.io-index"
741−
742764[[package]]
743765name = "unicode-segmentation"
744−version = "1.2.1"
766+version = "1.6.0"
745767source = "registry+https://github.com/rust-lang/crates.io-index"
746768
747769[[package]]
748770name = "unicode-width"
749−version = "0.1.5"
771+version = "0.1.6"
750772source = "registry+https://github.com/rust-lang/crates.io-index"
751773
752774[[package]]
753775name = "unicode-xid"
754−version = "0.1.0"
755−source = "registry+https://github.com/rust-lang/crates.io-index"
756−
757−[[package]]
758−name = "utf8-ranges"
759−version = "1.0.2"
776+version = "0.2.0"
760777source = "registry+https://github.com/rust-lang/crates.io-index"
761778
762779[[package]]
@@ -766,126 +783,126 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
766783
767784[[package]]
768785name = "walkdir"
769−version = "2.2.7"
786+version = "2.3.1"
770787source = "registry+https://github.com/rust-lang/crates.io-index"
771788dependencies = [
772− "same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
773− "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
789+ "same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
790+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
774791 "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
775792]
776793
777794[[package]]
778795name = "wasm-bindgen"
779−version = "0.2.40"
796+version = "0.2.55"
780797source = "registry+https://github.com/rust-lang/crates.io-index"
781798dependencies = [
782− "wasm-bindgen-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
799+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
800+ "wasm-bindgen-macro 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
783801]
784802
785803[[package]]
786804name = "wasm-bindgen-backend"
787−version = "0.2.40"
805+version = "0.2.55"
788806source = "registry+https://github.com/rust-lang/crates.io-index"
789807dependencies = [
790− "bumpalo 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
791− "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
792− "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
793− "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
794− "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
795− "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
796− "wasm-bindgen-shared 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
808+ "bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
809+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
810+ "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
811+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
812+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
813+ "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
814+ "wasm-bindgen-shared 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
797815]
798816
799817[[package]]
800818name = "wasm-bindgen-futures"
801−version = "0.3.17"
819+version = "0.4.5"
802820source = "registry+https://github.com/rust-lang/crates.io-index"
803821dependencies = [
804− "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
805− "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
806− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
822+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
823+ "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
824+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
825+ "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
807826]
808827
809828[[package]]
810829name = "wasm-bindgen-macro"
811−version = "0.2.40"
830+version = "0.2.55"
812831source = "registry+https://github.com/rust-lang/crates.io-index"
813832dependencies = [
814− "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
815− "wasm-bindgen-macro-support 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
833+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
834+ "wasm-bindgen-macro-support 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
816835]
817836
818837[[package]]
819838name = "wasm-bindgen-macro-support"
820−version = "0.2.40"
839+version = "0.2.55"
821840source = "registry+https://github.com/rust-lang/crates.io-index"
822841dependencies = [
823− "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
824− "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
825− "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
826− "wasm-bindgen-backend 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
827− "wasm-bindgen-shared 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
842+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
843+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
844+ "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
845+ "wasm-bindgen-backend 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
846+ "wasm-bindgen-shared 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
828847]
829848
830849[[package]]
831850name = "wasm-bindgen-shared"
832−version = "0.2.40"
851+version = "0.2.55"
833852source = "registry+https://github.com/rust-lang/crates.io-index"
834853
835854[[package]]
836855name = "wasm-bindgen-test"
837−version = "0.2.40"
856+version = "0.3.5"
838857source = "registry+https://github.com/rust-lang/crates.io-index"
839858dependencies = [
840859 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
841− "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
842− "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
860+ "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
843861 "scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
844− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
845− "wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
846− "wasm-bindgen-test-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
862+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
863+ "wasm-bindgen-futures 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
864+ "wasm-bindgen-test-macro 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
847865]
848866
849867[[package]]
850868name = "wasm-bindgen-test-macro"
851−version = "0.2.40"
869+version = "0.3.5"
852870source = "registry+https://github.com/rust-lang/crates.io-index"
853871dependencies = [
854− "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
855− "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
872+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
873+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
856874]
857875
858876[[package]]
859877name = "wasm-bindgen-webidl"
860−version = "0.2.40"
878+version = "0.2.55"
861879source = "registry+https://github.com/rust-lang/crates.io-index"
862880dependencies = [
863− "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
881+ "anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
864882 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
865− "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
866− "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
867− "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
868− "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
869− "wasm-bindgen-backend 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
870− "weedle 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
883+ "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
884+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
885+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
886+ "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
887+ "wasm-bindgen-backend 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
888+ "weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
871889]
872890
873891[[package]]
874892name = "web-sys"
875−version = "0.3.17"
893+version = "0.3.32"
876894source = "registry+https://github.com/rust-lang/crates.io-index"
877895dependencies = [
878− "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
879− "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
880− "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
896+ "anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
897+ "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
881898 "sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
882− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
883− "wasm-bindgen-webidl 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
899+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
900+ "wasm-bindgen-webidl 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
884901]
885902
886903[[package]]
887904name = "weedle"
888−version = "0.8.0"
905+version = "0.10.0"
889906source = "registry+https://github.com/rust-lang/crates.io-index"
890907dependencies = [
891908 "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -893,7 +910,7 @@ dependencies = [
893910
894911[[package]]
895912name = "winapi"
896−version = "0.3.6"
913+version = "0.3.8"
897914source = "registry+https://github.com/rust-lang/crates.io-index"
898915dependencies = [
899916 "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -910,7 +927,7 @@ name = "winapi-util"
910927version = "0.1.2"
911928source = "registry+https://github.com/rust-lang/crates.io-index"
912929dependencies = [
913− "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
930+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
914931]
915932
916933[[package]]
@@ -918,110 +935,101 @@ name = "winapi-x86_64-pc-windows-gnu"
918935version = "0.4.0"
919936source = "registry+https://github.com/rust-lang/crates.io-index"
920937
921−[[package]]
922−name = "wincolor"
923−version = "1.0.1"
924−source = "registry+https://github.com/rust-lang/crates.io-index"
925−dependencies = [
926− "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
927− "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
928−]
929−
930938[metadata]
931−"checksum aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f484ae0c99fec2e858eb6134949117399f222608d84cadb3f58c1f97c2364c"
932−"checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
933−"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
934−"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"
935−"checksum backtrace 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "cd5a90e2b463010cd0e0ce9a11d4a9d5d58d9f41d4a6ba3dcaf9e68b466e88b4"
936−"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
937−"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
938−"checksum bumpalo 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f6a6bc2ba935b1e2f810787ceba8dfe86cbc164cee55925cae715541186673c4"
939−"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb"
940−"checksum cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "926013f2860c46252efceabb19f4a6b308197505082c609025aa6706c011d427"
941−"checksum cc 1.0.32 (registry+https://github.com/rust-lang/crates.io-index)" = "ad0daef304fa0b4238f5f7ed7178774b43b06f6a9b6509f6642bef4ff1f7b9b2"
942−"checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4"
943−"checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e"
944−"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
939+"checksum anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "9267dff192e68f3399525901e709a48c1d3982c9c072fa32f2127a0cb0babf14"
940+"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
941+"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
942+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
943+"checksum bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245"
944+"checksum bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad807f2fc2bf185eeb98ff3a901bd46dc5ad58163d0fa4577ba0d25674d71708"
945+"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
946+"checksum cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0"
947+"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
948+"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
945949"checksum console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
946−"checksum console_log 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1e7871d2947441b0fdd8e2bd1ce2a2f75304f896582c0d572162d48290683c48"
947−"checksum criterion 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "1c6e5ee5b9652d4f851418c448af105642e1f99e9a2741a8ff45c0d2c911b1e0"
948−"checksum criterion-plot 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4107e4a5abb94267e0149922b8ff49dc70a87cc202820fdbfc0d3e1edbdc4b16"
949−"checksum crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f739f8c5363aca78cfb059edf753d8f0d36908c348f3d8d1503f03d8b75d9cf3"
950−"checksum crossbeam-epoch 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "927121f5407de9956180ff5e936fe3cf4324279280001cd56b669d28ee7e9150"
951−"checksum crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2760899e32a1d58d5abb31129f8fae5de75220bc2176e77ff7c627ae45c918d9"
952−"checksum csv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "9fd1c44c58078cfbeaf11fbb3eac9ae5534c23004ed770cc4bfb48e658ae4f04"
953−"checksum csv-core 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa5cdef62f37e6ffe7d1f07a381bc0db32b7a3ff1cac0de56cb0d81e71f53d65"
954−"checksum either 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c67353c641dc847124ea1902d69bd753dee9bb3beff9aa3662ecf86c971d1fac"
955−"checksum env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b61fa891024a945da30a9581546e8cfaf5602c7b3f4c137a2805cf388f92075a"
956−"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
957−"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
958−"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
959−"checksum futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "62941eff9507c8177d448bd83a44d9b9760856e184081d8cd79ba9f03dd24981"
950+"checksum console_log 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "501a375961cef1a0d44767200e66e4a559283097e91d0730b1d75dfb2f8a1494"
951+"checksum criterion 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "70daa7ceec6cf143990669a04c7df13391d55fb27bd4079d252fca774ba244d8"
952+"checksum criterion-plot 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d"
953+"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca"
954+"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac"
955+"checksum crossbeam-queue 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dfd6515864a82d2f877b42813d4553292c6659498c9a2aa31bab5a15243c2700"
956+"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
957+"checksum csv 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "37519ccdfd73a75821cac9319d4fce15a81b9fcf75f951df5b9988aa3a0af87d"
958+"checksum csv-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9b5cadb6b25c77aeff80ba701712494213f4a8418fcda2ee11b6560c3ad0bf4c"
959+"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
960+"checksum futures 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613"
961+"checksum futures-channel 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5"
962+"checksum futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399"
963+"checksum futures-executor 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314"
964+"checksum futures-io 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789"
965+"checksum futures-macro 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39"
966+"checksum futures-sink 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc"
967+"checksum futures-task 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626"
968+"checksum futures-util 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6"
960969"checksum fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
970+"checksum half 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d36fab90f82edc3c747f9d438e06cf0a491055896f2a279638bb5beed6c40177"
961971"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
962−"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114"
963−"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358"
964−"checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
965−"checksum js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "d4bda84b98977341bb6ba1086ecbd9eab8bc929de0f2923c118baf76c21dd0c8"
966−"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
967−"checksum libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)" = "bedcc7a809076656486ffe045abeeac163da1b558e963a31e29fbfbeba916917"
968−"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
969−"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39"
970−"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
971−"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
972+"checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120"
973+"checksum itertools 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
974+"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
975+"checksum js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)" = "1c840fdb2167497b0bd0db43d6dfe61e91637fa72f9d061f8bd17ddc44ba6414"
976+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
977+"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
978+"checksum log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
979+"checksum longest-increasing-subsequence 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3bd0dd2cd90571056fdb71f6275fada10131182f84899f4b2a916e565d81d86"
980+"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
981+"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9"
972982"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
973−"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
974−"checksum num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba"
975−"checksum proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915"
976−"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
977−"checksum quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cdd8e04bd9c52e0342b406469d494fcb033be4bdbe5c606016defbb1681411e1"
978−"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
979−"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
980−"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
981−"checksum rand_xoshiro 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "03b418169fb9c46533f326efd6eed2576699c44ca92d3052a066214a8d828929"
982−"checksum rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "373814f27745b2686b350dd261bfd24576a6fb0e2c5919b3a2b6005f820b0473"
983−"checksum rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b055d1e92aba6877574d8fe604a63c8b5df60f60e5982bf7ccbb1338ea527356"
984−"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
985−"checksum redox_syscall 0.1.52 (registry+https://github.com/rust-lang/crates.io-index)" = "d32b3053e5ced86e4bc0411fec997389532bf56b000e66cb4884eeeb41413d69"
986−"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
987−"checksum regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "559008764a17de49a3146b234641644ed37d118d1ef641a0bb573d146edc6ce0"
988−"checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96"
989−"checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
990−"checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
991−"checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267"
983+"checksum num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c81ffc11c212fa327657cb19dd85eb7419e163b5b076bede2bdb5c974c07e4"
984+"checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72"
985+"checksum once_cell 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b1c601810575c99596d4afc46f78a678c80105117c379eb3650cf99b8a21ce5b"
986+"checksum oorandom 11.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ebcec7c9c2a95cacc7cd0ecb89d8a8454eca13906f6deb55258ffff0adeb9405"
987+"checksum pin-project 0.4.16 (registry+https://github.com/rust-lang/crates.io-index)" = "81d480cb4e89522ccda96d0eed9af94180b7a5f93fb28f66e1fd7d68431663d1"
988+"checksum pin-project-internal 0.4.16 (registry+https://github.com/rust-lang/crates.io-index)" = "a82996f11efccb19b685b14b5df818de31c1edcee3daa256ab5775dd98e72feb"
989+"checksum pin-utils 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
990+"checksum plotters 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "4e3bb8da247d27ae212529352020f3e5ee16e83c0c258061d27b08ab92675eeb"
991+"checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5"
992+"checksum proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e"
993+"checksum proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
994+"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
995+"checksum rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098"
996+"checksum rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9"
997+"checksum regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b5508c1941e4e7cb19965abef075d35a9a8b5cdf0846f30b4050e9b55dc55e87"
998+"checksum regex-automata 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "92b73c2a1770c255c240eaa4ee600df1704a38dc3feaa6e949e7fcd4f8dc09f9"
999+"checksum regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e734e891f5b408a29efbf8309e656876276f49ab6a6ac208600b4419bd893d90"
1000+"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
1001+"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
1002+"checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421"
9921003"checksum scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
993−"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
994−"checksum serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)" = "92514fb95f900c9b5126e32d020f5c6d40564c27a5ea6d1d7d9f157a96623560"
995−"checksum serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)" = "bb6eabf4b5914e88e24eea240bb7c9f9a2cbc1bbbe8d961d381975ec3c6b806c"
996−"checksum serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)" = "5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d"
1004+"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
1005+"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
1006+"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
1007+"checksum serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)" = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3"
1008+"checksum serde_cbor 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622"
1009+"checksum serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)" = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e"
1010+"checksum serde_json 1.0.57 (registry+https://github.com/rust-lang/crates.io-index)" = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c"
1011+"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
9971012"checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
998−"checksum syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)" = "66c8865bf5a7cbb662d8b011950060b3c8743dca141b054bf7195b20d314d8e2"
999−"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
1000−"checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f"
1001−"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
1002−"checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6"
1003−"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
1004−"checksum tinytemplate 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7655088894274afb52b807bd3c87072daa1fedd155068b8705cabfd628956115"
1005−"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86"
1006−"checksum unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa6024fc12ddfd1c6dbc14a80fa2324d4568849869b779f6bd37e5e4c03344d1"
1007−"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"
1008−"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
1009−"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737"
1013+"checksum syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)" = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd"
1014+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
1015+"checksum tinytemplate 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d3dc76004a03cec1c5932bca4cdc2e39aaa798e3f82363dd94f9adf6098c12f"
1016+"checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
1017+"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20"
1018+"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
10101019"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
1011−"checksum walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "9d9d7ed3431229a144296213105a390676cc49c9b6a72bd19f3176c98e129fa1"
1012−"checksum wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "9742fc4860f47bede1090a5e4b0cfc33afcd70cfdf45dd28f2cfb02d4662b0dd"
1013−"checksum wasm-bindgen-backend 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "c6d7f35ecbb4180513cdb9b298543321bcb278670730415cbb3205ff2c66a477"
1014−"checksum wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "67bfbec85e48e8915b6acfa1c4d90b770ce033c96dc2067688f3bccd00d3b9e1"
1015−"checksum wasm-bindgen-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "e3c86b06bcd28e92e87d2c2ad208889b2f69ea33f79810b91ef660cc3de65a4c"
1016−"checksum wasm-bindgen-macro-support 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "81d7338dd8c67e193d8ef18e5802dc03d8710456baa792c1c2e66847e57fd389"
1017−"checksum wasm-bindgen-shared 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "0d57c3b66f2f3e4d96b50f49b7b7e2f4cfcddc88b15744433c98c5c105b26672"
1018−"checksum wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "85bbc3ad78a8d59a63a02d59345e8da9a3e0c1617f79e77fd1c3da6e047db63e"
1019−"checksum wasm-bindgen-test-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "114dfdf01bd3659dd79db05480fbd2751759d1c79cd9edc22f2fe611c866e932"
1020−"checksum wasm-bindgen-webidl 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "fc7052a577eefce17a439edfce5c2eedc8432fe7457bbe949624cdf946233fa7"
1021−"checksum web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "72d02003924c77af871ad74216f828b6e32af776cbb3f5dab3dcde2f2713c012"
1022−"checksum weedle 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "26a4c67f132386d965390b8a734d5d10adbcd30eb5cc74bd9229af8b83f10044"
1023−"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
1020+"checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
1021+"checksum wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "29ae32af33bacd663a9a28241abecf01f2be64e6a185c6139b04f18b6385c5f2"
1022+"checksum wasm-bindgen-backend 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "1845584bd3593442dc0de6e6d9f84454a59a057722f36f005e44665d6ab19d85"
1023+"checksum wasm-bindgen-futures 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1458706aa1b8fe6898d19433c9f110d93a05d1f22ae6adf55810409a94df34b4"
1024+"checksum wasm-bindgen-macro 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "87fcc747e6b73c93d22c947a6334644d22cfec5abd8b66238484dc2b0aeb9fe4"
1025+"checksum wasm-bindgen-macro-support 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "3dc4b3f2c4078c8c4a5f363b92fcf62604c5913cbd16c6ff5aaf0f74ec03f570"
1026+"checksum wasm-bindgen-shared 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "ca0b78d6d3be8589b95d1d49cdc0794728ca734adf36d7c9f07e6459508bb53d"
1027+"checksum wasm-bindgen-test 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ed5833682054e941db0b7e2b4877b61bbaafd680608e40d268e070d34558b305"
1028+"checksum wasm-bindgen-test-macro 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "9c5dcf70d21d0ff0ea5cdb97dba9a9b56ddad4a9bd10c8912eedc55618be022f"
1029+"checksum wasm-bindgen-webidl 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "3126356474ceb717c8fb5549ae387c9fbf4872818454f4d87708bee997214bb5"
1030+"checksum web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)" = "98405c0a2e722ed3db341b4c5b70eb9fe0021621f7350bab76df93b09b649bbf"
1031+"checksum weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3bb43f70885151e629e2a19ce9e50bd730fd436cfd4b666894c9ce4de9141164"
1032+"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
10241033"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
10251034"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
10261035"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
1027−"checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba"
Cargo.toml+36−18
@@ -8,11 +8,20 @@ license = "MPL-2.0"
88name = "dodrio"
99readme = "./README.md"
1010repository = "https://github.com/fitzgen/dodrio"
11−version = "0.1.0"
11+version = "0.2.0"
1212
1313[badges]
1414travis-ci = { repository = "fitzgen/dodrio" }
1515
16+[lib]
17+path = "src/lib.rs"
18+bench = false
19+
20+[[test]]
21+name = "web"
22+path = "tests/web/main.rs"
23+required-features = ["xxx-unstable-internal-use-only"]
24+
1625[[bench]]
1726name = "benches"
1827path = "benches/benches.rs"
@@ -20,22 +29,31 @@ harness = false
2029required-features = ["xxx-unstable-internal-use-only"]
2130
2231[features]
32+# Don't rely on this feature! Its behavior will change and it could go away at
33+# any time. This enables monkey-patching DOM methods so that we wrap them and
34+# trace what DOM methods are used and how many times they are invoked when
35+# applying our emitted change lists to the physical DOM. This is useful for
36+# evaluating the differences between how Dodrio applies changes from virtual
37+# nodes to the physical DOM versus how other virtual DOM libraries do the same.
38+xxx-unstable-strace = []
39+
2340# Don't use this feature! It only exists for exposing otherwise-internal APIs
2441# for testing and benchmarks.
2542xxx-unstable-internal-use-only = []
2643
2744[dependencies]
28−bumpalo = "2.3.0"
29−cfg-if = "0.1.7"
30−futures = "0.1.26"
31−wasm-bindgen = "0.2.39"
32−wasm-bindgen-futures = "0.3.16"
33−js-sys = "0.3.16"
45+bumpalo = "2.6.0"
46+cfg-if = "0.1.10"
3447fxhash = "0.2.1"
35−log = { version = "0.4.6", optional = true }
48+js-sys = "0.3.32"
49+log = { version = "0.4.11", optional = true }
50+longest-increasing-subsequence = "0.1.0"
51+serde = { version = "1.0.114", optional = true }
52+wasm-bindgen = "0.2.55"
53+wasm-bindgen-futures = "0.4.5"
3654
3755[dependencies.web-sys]
38−version = "0.3.16"
56+version = "0.3.32"
3957features = [
4058 "console",
4159 "Document",
@@ -46,13 +64,14 @@ features = [
4664]
4765
4866[dev-dependencies]
49−console_log = "0.1.2"
50−dodrio-js-api = { version = "=0.1.0", path = "./crates/js-api" }
51−log = "0.4.6"
52−wasm-bindgen-test = "0.2.39"
67+console_log = "0.2.0"
68+dodrio-js-api = { version = "=0.2.0", path = "./crates/js-api" }
69+futures = "0.3.5"
70+log = "0.4.11"
71+wasm-bindgen-test = "0.3.5"
5372
5473[dev-dependencies.web-sys]
55−version = "0.3.16"
74+version = "0.3.32"
5675features = [
5776 "Attr",
5877 "EventTarget",
@@ -62,11 +81,10 @@ features = [
6281]
6382
6483[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
65−criterion = "0.2.10"
84+criterion = "0.3.3"
6685
67−[lib]
68−path = "src/lib.rs"
69−bench = false
86+[profile.bench]
87+debug = true
7088
7189[profile.release]
7290incremental = false
README.md+13−6
@@ -31,12 +31,10 @@ struct Hello {
3131}
3232
3333impl Render for Hello {
34− fn render<'a, 'bump>(&'a self, cx: &mut RenderContext<'bump>) -> Node<'bump>
35− where
36− 'a: 'bump,
37− {
38− span(cx)
39− .children([text("Hello, "), text(&self.who), text("!")])
34+ fn render<'a>(&self, cx: &mut RenderContext<a>) -> Node<'a> {
35+ let who = bumpalo::format!(in cx.bump, "Hello, {}!", self.who);
36+ div(cx)
37+ .children([text(who.into_bump_str())])
4038 .finish()
4139 }
4240}
@@ -59,6 +57,15 @@ directory](https://github.com/fitzgen/dodrio/tree/master/examples), including:
5957* [`js-component`](https://github.com/fitzgen/dodrio/tree/master/examples/js-component):
6058 Defines a rendering component in JavaScript with the `dodrio-js-api` crate.
6159
60+## Cargo Features
61+
62+* `log` &mdash; enable debugging-oriented log messages with the `log` crate's
63+ facade. You still have to initialize a logger for the messages to go anywhere,
64+ such as [`console_log`](https://github.com/iamcodemaker/console_log).
65+
66+* `serde` &mdash; enable `serde::{Serialize, Deserialize}` implementations for
67+ `Cached<R>` where `R` is serializable and deserializable.
68+
6269## Design
6370
6471### Bump Allocation
benches/benches.rs+17−25
@@ -10,21 +10,23 @@ use criterion::{
1010use dodrio::{
1111 builder::*,
1212 bumpalo::{self, Bump},
13− Node, Render, RenderContext, Vdom,
13+ CachedSet, Node, Render, RenderContext, Vdom,
1414};
15+use std::cell::RefCell;
16+use std::convert::TryInto;
1517
1618/// The simplest thing we can render: `<div/>`.
1719struct Empty;
18−impl Render for Empty {
19− fn render<'bump>(&self, cx: &mut RenderContext<'bump>) -> Node<'bump> {
20+impl<'a> Render<'a> for Empty {
21+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
2022 div(&cx).finish()
2123 }
2224}
2325
2426/// Render a list that is `self.0` items long, has attributes and listeners.
2527struct SimpleList(usize);
26−impl Render for SimpleList {
27− fn render<'bump>(&self, cx: &mut RenderContext<'bump>) -> Node<'bump> {
28+impl<'a> Render<'a> for SimpleList {
29+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
2830 let mut children = bumpalo::collections::Vec::with_capacity_in(self.0, cx.bump);
2931 children.extend((0..self.0).map(|_| {
3032 li(&cx)
@@ -44,9 +46,11 @@ fn criterion_benchmark(c: &mut Criterion) {
4446 "render",
4547 Benchmark::new("empty", {
4648 let mut bump = Bump::new();
49+ let cached_set = RefCell::new(CachedSet::default());
50+ let mut templates = Default::default();
4751 move |b| {
4852 bump.reset();
49− let mut cx = RenderContext::new(&bump);
53+ let mut cx = RenderContext::new(&bump, &cached_set, &mut templates);
5054 b.iter(|| {
5155 black_box(Empty.render(&mut cx));
5256 })
@@ -60,24 +64,19 @@ fn criterion_benchmark(c: &mut Criterion) {
6064 "list",
6165 {
6266 let mut bump = Bump::new();
67+ let cached_set = RefCell::new(CachedSet::default());
68+ let mut templates = Default::default();
6369 move |b, n| {
6470 bump.reset();
65− let mut cx = RenderContext::new(&bump);
71+ let mut cx = RenderContext::new(&bump, &cached_set, &mut templates);
6672 b.iter(|| {
6773 black_box(SimpleList(*n).render(&mut cx));
6874 })
6975 }
7076 },
71− vec![
72− // TODO: Only test one `n` value until
73− // https://github.com/bheisler/criterion.rs/issues/269 is fixed.
74− //
75− // 100,
76− // 1_000,
77− 10_000,
78− ],
77+ vec![100, 1_000, 10_000],
7978 )
80− .throughput(|n| Throughput::Elements(*n as u32)),
79+ .throughput(|n| Throughput::Elements((*n).try_into().unwrap())),
8180 );
8281
8382 c.bench(
@@ -91,14 +90,7 @@ fn criterion_benchmark(c: &mut Criterion) {
9190 black_box(&vdom);
9291 })
9392 },
94− vec![
95− // TODO: Only test one `n` value until
96− // https://github.com/bheisler/criterion.rs/issues/269 is fixed.
97− //
98− // 100,
99− // 1_000,
100− 10_000,
101− ],
93+ vec![100, 1_000, 10_000],
10294 )
10395 .with_function("empty-to-full-list-to-empty", |b, &n| {
10496 b.iter(|| {
@@ -118,7 +110,7 @@ fn criterion_benchmark(c: &mut Criterion) {
118110 black_box(&vdom);
119111 })
120112 })
121− .throughput(|n| Throughput::Elements(*n as u32)),
113+ .throughput(|n| Throughput::Elements((*n).try_into().unwrap())),
122114 );
123115}
124116
build.sh+2−2
@@ -4,8 +4,8 @@ cd $(dirname $0)
44set -eux
55
66cargo fmt --all || true
7−cargo check --all --target wasm32-unknown-unknown
7+cargo build --all --target wasm32-unknown-unknown
88
99for x in ./examples/*; do
10− wasm-pack build --target no-modules "$x"
10+ wasm-pack build --target web "$x"
1111done
crates/js-api/Cargo.toml+6−7
@@ -7,17 +7,16 @@ keywords = ["javascript", "js", "vdom", "virtual-dom"]
77license = "MPL-2.0"
88name = "dodrio-js-api"
99repository = "https://github.com/fitzgen/dodrio"
10−version = "0.1.0"
10+version = "0.2.0"
1111
1212[badges]
1313travis-ci = { repository = "fitzgen/dodrio" }
1414
1515[dependencies]
16−dodrio = { version = "=0.1.0", path = "../.." }
17−wasm-bindgen = "0.2.39"
18−js-sys = "0.3.16"
19−wasm-bindgen-futures = "0.3.16"
20−futures = "0.1.26"
16+dodrio = { version = "=0.2.0", path = "../.." }
17+wasm-bindgen = "0.2.55"
18+js-sys = "0.3.32"
19+wasm-bindgen-futures = "0.4.5"
2120
2221[dev-dependencies]
23−wasm-bindgen-test = "0.2.39"
22+wasm-bindgen-test = "0.3.5"
crates/js-api/src/lib.rs+14−11
@@ -99,8 +99,8 @@ impl GreetingViaJs {
9999
100100/// And finally the `Render` implementation! This adds a `<p>` element and some
101101/// text around whatever the inner JS `Greeting` component renders.
102−impl Render for GreetingViaJs {
103− fn render<'bump>(&self, cx: &mut RenderContext<'bump>) -> Node<'bump> {
102+impl<'a> Render<'a> for GreetingViaJs {
103+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
104104 use dodrio::builder::*;
105105 p(&cx)
106106 .children([
@@ -116,7 +116,6 @@ impl Render for GreetingViaJs {
116116#![deny(missing_docs, missing_debug_implementations)]
117117
118118use dodrio::{builder, bumpalo, Node, Render, RenderContext};
119−use futures::prelude::*;
120119use js_sys::{Object, Promise, Reflect};
121120use wasm_bindgen::prelude::*;
122121use wasm_bindgen::JsCast;
@@ -185,12 +184,16 @@ impl VdomWeak {
185184 /// Schedule re-rendering of the virtual DOM. A promise is returned that is
186185 /// resolved after the rendering has happened.
187186 pub fn render(&self) -> Promise {
188− wasm_bindgen_futures::future_to_promise(
189− self.inner.render().map(|_| JsValue::null()).map_err(|e| {
187+ let future = self.inner.render();
188+
189+ wasm_bindgen_futures::future_to_promise(async move {
190+ if let Err(e) = future.await {
190191 let msg = e.to_string();
191− js_sys::Error::new(&msg).into()
192− }),
193− )
192+ Err(js_sys::Error::new(&msg).into())
193+ } else {
194+ Ok(JsValue::null())
195+ }
196+ })
194197 }
195198}
196199
@@ -213,8 +216,8 @@ impl JsRender {
213216 }
214217}
215218
216−impl Render for JsRender {
217− fn render<'bump>(&self, cx: &mut RenderContext<'bump>) -> Node<'bump> {
219+impl<'a> Render<'a> for JsRender {
220+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
218221 create(cx, self.render())
219222 }
220223}
@@ -223,7 +226,7 @@ fn has_property(obj: &Object, property: &str) -> bool {
223226 Reflect::has(obj, &property.into()).unwrap_or_default()
224227}
225228
226−fn create<'bump>(cx: &mut RenderContext<'bump>, val: JsValue) -> Node<'bump> {
229+fn create<'a>(cx: &mut RenderContext<'a>, val: JsValue) -> Node<'a> {
227230 if let Some(txt) = val.as_string() {
228231 let text = bumpalo::collections::String::from_str_in(&txt, cx.bump);
229232 return builder::text(text.into_bump_str());
examples/counter/Cargo.toml+5−5
@@ -11,13 +11,13 @@ crate-type = ["cdylib"]
1111
1212[dependencies]
1313console_error_panic_hook = "0.1.6"
14−console_log = "0.1.2"
14+console_log = "0.2.0"
1515dodrio = { path = "../.." }
16−log = "0.4.6"
17−wasm-bindgen = "0.2.39"
16+log = "0.4.11"
17+wasm-bindgen = "0.2.55"
1818
1919[dependencies.web-sys]
20−version = "0.3.16"
20+version = "0.3.32"
2121features = [
2222 "console",
2323 "Document",
@@ -30,4 +30,4 @@ features = [
3030]
3131
3232[dev-dependencies]
33−wasm-bindgen-test = "0.2.39"
33+wasm-bindgen-test = "0.3.5"
examples/counter/README.md+1−1
@@ -9,7 +9,7 @@ See `src/lib.rs`.
99## Build
1010
1111```
12−wasm-pack build --target no-modules
12+wasm-pack build --target web
1313```
1414
1515## Serve
examples/counter/index.html+3−3
@@ -5,9 +5,9 @@
55 <title>Counter</title>
66 </head>
77 <body>
8− <script src="pkg/dodrio_counter.js"></script>
9− <script>
10− wasm_bindgen("pkg/dodrio_counter_bg.wasm");
8+ <script type="module">
9+ import init from "./pkg/dodrio_counter.js";
10+ init("./pkg/dodrio_counter_bg.wasm");
1111 </script>
1212 </body>
1313</html>
examples/counter/src/lib.rsmode 100644 → 100755+5−4
@@ -1,4 +1,4 @@
1−use dodrio::{bumpalo, Render, RenderContext};
1+use dodrio::{bumpalo, Node, Render, RenderContext};
22use log::*;
33use wasm_bindgen::prelude::*;
44
@@ -26,8 +26,8 @@ impl Counter {
2626
2727// The `Render` implementation for `Counter`s displays the current count and has
2828// buttons to increment and decrement the count.
29−impl Render for Counter {
30− fn render<'bump>(&self, cx: &mut RenderContext<'bump>) -> dodrio::Node<'bump> {
29+impl<'a> Render<'a> for Counter {
30+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
3131 use dodrio::builder::*;
3232
3333 // Stringify the count as a bump-allocated string.
@@ -54,7 +54,8 @@ impl Render for Counter {
5454 button(&cx)
5555 .on("click", |root, vdom, _event| {
5656 // Same as above, but decrementing instead of incrementing.
57− root.unwrap_mut::<Counter>().decrement();
57+ let counter = root.unwrap_mut::<Counter>();
58+ counter.decrement();
5859 vdom.schedule_render();
5960 })
6061 .children([text("-")])
examples/game-of-life/Cargo.toml+5−6
@@ -11,14 +11,13 @@ crate-type = ["cdylib"]
1111
1212[dependencies]
1313dodrio = { path = "../.." }
14−wasm-bindgen = "0.2.39"
14+wasm-bindgen = "0.2.55"
1515console_error_panic_hook = "0.1.6"
16−js-sys = "0.3.16"
17−wasm-bindgen-futures = "0.3.16"
18−futures = "0.1.26"
16+js-sys = "0.3.32"
17+wasm-bindgen-futures = "0.4.5"
1918
2019[dependencies.web-sys]
21−version = "0.3.16"
20+version = "0.3.32"
2221features = [
2322 "Document",
2423 "HtmlElement",
@@ -27,4 +26,4 @@ features = [
2726]
2827
2928[dev-dependencies]
30−wasm-bindgen-test = "0.2.39"
29+wasm-bindgen-test = "0.3.5"
examples/game-of-life/README.md+1−1
@@ -11,7 +11,7 @@ See `src/lib.rs`.
1111## Build
1212
1313```
14−wasm-pack build --target no-modules
14+wasm-pack build --target web
1515```
1616
1717## Serve
examples/game-of-life/index.htmlmode 100644 → 100755+3−6
@@ -19,9 +19,6 @@
1919 padding: 0;
2020 }
2121
22− .universe {
23− }
24−
2522 body {
2623 width: 100vw;
2724 height: 100vh;
@@ -39,9 +36,9 @@
3936 </style>
4037 </head>
4138 <body>
42− <script src="pkg/dodrio_game_of_life.js"></script>
43− <script>
44− wasm_bindgen("pkg/dodrio_game_of_life_bg.wasm");
39+ <script type="module">
40+ import init from "./pkg/dodrio_game_of_life.js";
41+ init("./pkg/dodrio_game_of_life_bg.wasm");
4542 </script>
4643 </body>
4744</html>
examples/game-of-life/src/lib.rs+18−13
@@ -1,5 +1,4 @@
11use dodrio::{bumpalo, Node, Render, RenderContext, Vdom};
2−use futures::prelude::*;
32use std::cell::RefCell;
43use std::rc::Rc;
54use wasm_bindgen::{prelude::*, JsCast};
@@ -127,8 +126,8 @@ impl Universe {
127126}
128127
129128/// The rendering implementation for our Game of Life.
130−impl Render for Universe {
131− fn render<'bump>(&self, cx: &mut RenderContext<'bump>) -> Node<'bump> {
129+impl<'a> Render<'a> for Universe {
130+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
132131 use dodrio::builder::*;
133132
134133 let mut rows = bumpalo::collections::Vec::with_capacity_in(self.height as usize, cx.bump);
@@ -172,26 +171,32 @@ pub fn run() {
172171 // Create a new Game of Life `Universe` render component.
173172 let universe = Universe::new();
174173
175− // Create a virtual DOM and mount it and the `Hello` render component to the
174+ // Create a virtual DOM and mount it and the `Universe` render component to the
176175 // `<body>`.
177176 let vdom = Vdom::new(body.as_ref(), universe);
178177
179178 // Kick off a loop that keeps computing a tick of the universe and then
180179 // re-rendering on every animation frame.
181− let rc: Rc<RefCell<Option<Closure<FnMut()>>>> = Rc::new(RefCell::new(None));
180+ let rc = <Rc<RefCell<Option<Closure<dyn FnMut()>>>>>::default();
182181 let rc2 = rc.clone();
183182 let window2 = window.clone();
184183 let weak = vdom.weak();
185184 let f = Closure::wrap(Box::new(move || {
186185 weak.schedule_render();
187186
188− wasm_bindgen_futures::spawn_local(
189− weak.with_component(|root| {
190− let universe = root.unwrap_mut::<Universe>();
191− universe.tick();
192− })
193− .map_err(|_| wasm_bindgen::throw_str("impossible, we always keep the vdom alive")),
194− );
187+ wasm_bindgen_futures::spawn_local({
188+ let weak = weak.clone();
189+ async move {
190+ let fut = weak.with_component(|root| {
191+ let universe = root.unwrap_mut::<Universe>();
192+ universe.tick();
193+ });
194+
195+ if fut.await.is_err() {
196+ wasm_bindgen::throw_str("impossible, we always keep the vdom alive");
197+ }
198+ }
199+ });
195200
196201 window
197202 .request_animation_frame(
@@ -202,7 +207,7 @@ pub fn run() {
202207 .unchecked_ref::<js_sys::Function>(),
203208 )
204209 .unwrap_throw();
205− }) as Box<FnMut()>);
210+ }) as Box<dyn FnMut()>);
206211 window2
207212 .request_animation_frame(f.as_ref().unchecked_ref::<js_sys::Function>())
208213 .unwrap_throw();
examples/hello-world/Cargo.toml+3−3
@@ -11,11 +11,11 @@ crate-type = ["cdylib"]
1111
1212[dependencies]
1313dodrio = { path = "../.." }
14−wasm-bindgen = "0.2.39"
14+wasm-bindgen = "0.2.55"
1515console_error_panic_hook = "0.1.6"
1616
1717[dependencies.web-sys]
18−version = "0.3.16"
18+version = "0.3.32"
1919features = [
2020 "Document",
2121 "HtmlElement",
@@ -24,4 +24,4 @@ features = [
2424]
2525
2626[dev-dependencies]
27−wasm-bindgen-test = "0.2.39"
27+wasm-bindgen-test = "0.3.5"
examples/hello-world/README.md+1−1
@@ -9,7 +9,7 @@ See `src/lib.rs`.
99## Build
1010
1111```
12−wasm-pack build --target no-modules
12+wasm-pack build --target web
1313```
1414
1515## Serve
examples/hello-world/index.html+3−3
@@ -5,9 +5,9 @@
55 <title>Hello, World!</title>
66 </head>
77 <body>
8− <script src="pkg/dodrio_hello_world.js"></script>
9− <script>
10− wasm_bindgen("pkg/dodrio_hello_world_bg.wasm");
8+ <script type="module">
9+ import init from "./pkg/dodrio_hello_world.js";
10+ init("./pkg/dodrio_hello_world_bg.wasm");
1111 </script>
1212 </body>
1313</html>
examples/hello-world/src/lib.rs+2−2
@@ -10,8 +10,8 @@ struct Hello {
1010
1111// The `Render` implementation describes how to render a `Hello` component into
1212// HTML.
13−impl Render for Hello {
14− fn render<'bump>(&self, cx: &mut RenderContext<'bump>) -> Node<'bump> {
13+impl<'a> Render<'a> for Hello {
14+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
1515 let msg = bumpalo::format!(in cx.bump, "Hello, {}!", self.who);
1616 let msg = msg.into_bump_str();
1717 p(&cx).children([text(msg)]).finish()
examples/input-form/Cargo.toml+3−3
@@ -11,11 +11,11 @@ crate-type = ["cdylib"]
1111
1212[dependencies]
1313dodrio = { path = "../.." }
14−wasm-bindgen = "0.2.39"
14+wasm-bindgen = "0.2.55"
1515console_error_panic_hook = "0.1.6"
1616
1717[dependencies.web-sys]
18−version = "0.3.16"
18+version = "0.3.32"
1919features = [
2020 "console",
2121 "Document",
@@ -29,4 +29,4 @@ features = [
2929]
3030
3131[dev-dependencies]
32−wasm-bindgen-test = "0.2.39"
32+wasm-bindgen-test = "0.3.5"
examples/input-form/README.md+1−1
@@ -10,7 +10,7 @@ See `src/lib.rs`.
1010## Build
1111
1212```
13−wasm-pack build --target no-modules
13+wasm-pack build --target web
1414```
1515
1616## Serve
examples/input-form/index.html+3−3
@@ -5,9 +5,9 @@
55 <title>Input Form</title>
66 </head>
77 <body>
8− <script src="pkg/dodrio_input_form.js"></script>
9− <script>
10− wasm_bindgen("pkg/dodrio_input_form_bg.wasm");
8+ <script type="module">
9+ import init from "./pkg/dodrio_input_form.js";
10+ init("./pkg/dodrio_input_form_bg.wasm");
1111 </script>
1212 </body>
1313</html>
examples/input-form/src/lib.rs+2−2
@@ -23,8 +23,8 @@ impl SayHelloTo {
2323
2424// The `Render` implementation has a text `<input>` and a `<div>` that shows a
2525// greeting to the `<input>`'s value.
26−impl Render for SayHelloTo {
27− fn render<'bump>(&self, cx: &mut RenderContext<'bump>) -> Node<'bump> {
26+impl<'a> Render<'a> for SayHelloTo {
27+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
2828 use dodrio::builder::*;
2929
3030 div(&cx)
examples/js-component/Cargo.toml+3−3
@@ -12,12 +12,12 @@ crate-type = ["cdylib"]
1212[dependencies]
1313dodrio = { path = "../.." }
1414dodrio-js-api = { path = "../../crates/js-api" }
15−wasm-bindgen = "0.2.39"
15+wasm-bindgen = "0.2.55"
1616console_error_panic_hook = "0.1.6"
17−js-sys = "0.3.16"
17+js-sys = "0.3.32"
1818
1919[dependencies.web-sys]
20−version = "0.3.16"
20+version = "0.3.32"
2121features = [
2222 "Document",
2323 "HtmlElement",
examples/js-component/README.md+1−1
@@ -11,7 +11,7 @@ See `src/lib.rs` for the Rust code.
1111## Build
1212
1313```
14−wasm-pack build --target no-modules
14+wasm-pack build --target web
1515```
1616
1717## Serve
examples/js-component/index.html+3−3
@@ -6,9 +6,9 @@
66 </head>
77 <body>
88 <script src="greeting.js"></script>
9− <script src="pkg/dodrio_js_component.js"></script>
10− <script>
11− wasm_bindgen("pkg/dodrio_js_component_bg.wasm");
9+ <script type="module">
10+ import init from "./pkg/dodrio_js_component.js";
11+ init("./pkg/dodrio_js_component_bg.wasm");
1212 </script>
1313 </body>
1414</html>
examples/js-component/src/lib.rs+3−3
@@ -31,8 +31,8 @@ impl GreetingViaJs {
3131
3232/// Here's the `Render` implementation! This adds a `<p>` element and some text
3333/// around whatever the inner JS `Greeting` component renders.
34−impl Render for GreetingViaJs {
35− fn render<'bump>(&self, cx: &mut RenderContext<'bump>) -> Node<'bump> {
34+impl<'a> Render<'a> for GreetingViaJs {
35+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
3636 use dodrio::builder::*;
3737 p(&cx)
3838 .children([text("JavaScript says: "), self.js.render(cx)])
@@ -54,7 +54,7 @@ pub fn run() {
5454 // Create a new `GreetingViaJs` render component.
5555 let component = GreetingViaJs::new("World");
5656
57− // Create a virtual DOM and mount it and the `Hello` render component to the
57+ // Create a virtual DOM and mount it and the `GreetingViaJs` render component to the
5858 // `<body>`.
5959 let vdom = Vdom::new(body.as_ref(), component);
6060
examples/moire/Cargo.toml+8−9
@@ -8,20 +8,19 @@ edition = "2018"
88crate-type = ["cdylib"]
99
1010[dependencies]
11−cfg-if = "0.1.7"
11+cfg-if = "0.1.10"
1212dodrio = { path = "../.." }
13−futures = "0.1.26"
14−log = "0.4.6"
15−wasm-bindgen = "0.2.39"
16−wasm-bindgen-futures = "0.3.16"
13+log = "0.4.11"
14+wasm-bindgen = "0.2.55"
15+wasm-bindgen-futures = "0.4.5"
1716
1817# Optional dependencies for logging.
1918console_error_panic_hook = { optional = true, version = "0.1.6" }
20−console_log = { optional = true, version = "0.1.2" }
21−js-sys = "0.3.16"
19+console_log = { optional = true, version = "0.2.0" }
20+js-sys = "0.3.32"
2221
2322[dependencies.web-sys]
24−version = "0.3.16"
23+version = "0.3.32"
2524features = [
2625 "Document",
2726 "Element",
@@ -35,7 +34,7 @@ features = [
3534]
3635
3736[dev-dependencies]
38−wasm-bindgen-test = "0.2.39"
37+wasm-bindgen-test = "0.3.5"
3938
4039[features]
4140logging = [
examples/moire/README.md+1−1
@@ -14,7 +14,7 @@ conversion and other color utilities.
1414## Build
1515
1616```
17−wasm-pack build --target no-modules
17+wasm-pack build --target web
1818```
1919
2020## Serve
examples/moire/index.html+3−3
@@ -42,9 +42,9 @@
4242 <body>
4343 <code>FPS: <output id="fps"></code></code>
4444 <div id="scene"></div>
45− <script src="pkg/dodrio_moire.js"></script>
46− <script>
47− wasm_bindgen("pkg/dodrio_moire_bg.wasm");
45+ <script type="module">
46+ import init from "./pkg/dodrio_moire.js";
47+ init("./pkg/dodrio_moire_bg.wasm");
4848 </script>
4949 <script>
5050 let lastTime = 0
examples/moire/src/lib.rs+18−28
@@ -5,8 +5,7 @@ use dodrio::{bumpalo, Node, Render, RenderContext, Vdom};
55use std::cell::RefCell;
66use std::rc::Rc;
77use std::str;
8−use wasm_bindgen::prelude::*;
9−use wasm_bindgen::JsCast;
8+use wasm_bindgen::{prelude::*, JsCast};
109
1110/// This is the main function that is automatically invoked when the wasm module
1211/// is loaded.
@@ -23,12 +22,12 @@ pub fn run() {
2322 // Create a new `Moire` render component.
2423 let component = Moire::new();
2524
26− // Create a virtual DOM and mount it and the `Hello` render component to the
25+ // Create a virtual DOM and mount it and the `Moire` render component to the
2726 // scene.
2827 let vdom = Vdom::new(&scene, component);
2928
3029 // Kick off a loop that keeps re-rendering on every animation frame.
31− let rc: Rc<RefCell<Option<Closure<FnMut()>>>> = Rc::new(RefCell::new(None));
30+ let rc = <Rc<RefCell<Option<Closure<dyn FnMut()>>>>>::default();
3231 let rc2 = rc.clone();
3332 let window2 = window.clone();
3433 let weak = vdom.weak();
@@ -43,7 +42,7 @@ pub fn run() {
4342 .unchecked_ref::<js_sys::Function>(),
4443 )
4544 .unwrap_throw();
46− }) as Box<FnMut()>);
45+ }) as Box<dyn FnMut()>);
4746 window2
4847 .request_animation_frame(f.as_ref().unchecked_ref::<js_sys::Function>())
4948 .unwrap_throw();
@@ -105,8 +104,8 @@ impl Moire {
105104 }
106105}
107106
108−impl Render for Moire {
109− fn render<'bump>(&self, cx: &mut RenderContext<'bump>) -> Node<'bump> {
107+impl<'a> Render<'a> for Moire {
108+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
110109 use dodrio::builder::*;
111110
112111 let elapsed = web_sys::window()
@@ -150,7 +149,7 @@ impl Render for Moire {
150149/// Rendering helper methods.
151150impl Moire {
152151 /// Generate the main Moire element's inline CSS styles.
153− fn moire_style<'bump>(&self, cx: &mut RenderContext<'bump>, elapsed: f64) -> &'bump str {
152+ fn moire_style<'a>(&self, cx: &mut RenderContext<'a>, elapsed: f64) -> &'a str {
154153 let elapsed = elapsed / 3.0;
155154 let color = colors::get_interpolated_color(|(_, bg)| bg, elapsed % 1.0);
156155 let style = bumpalo::format!(
@@ -164,7 +163,7 @@ impl Moire {
164163 }
165164
166165 /// Generate the orbiting circle objects.
167− fn orbiting_objects<'bump>(&self, cx: &mut RenderContext<'bump>, elapsed: f64) -> Node<'bump> {
166+ fn orbiting_objects<'a>(&self, cx: &mut RenderContext<'a>, elapsed: f64) -> Node<'a> {
168167 const D: f64 = 200.0;
169168 let x = elapsed.sin() * D;
170169 let y = elapsed.cos() * D;
@@ -173,24 +172,20 @@ impl Moire {
173172
174173 /// Generate the lemniscate circle objects that interact with the orbiting
175174 /// circle objects to form Moire patterns.
176− fn lemniscate_objects<'bump>(
177− &self,
178− cx: &mut RenderContext<'bump>,
179− elapsed: f64,
180− ) -> Node<'bump> {
175+ fn lemniscate_objects<'a>(&self, cx: &mut RenderContext<'a>, elapsed: f64) -> Node<'a> {
181176 const A: f64 = 150.0;
182177 let x = elapsed.sin() * A;
183178 let y = elapsed.sin() * elapsed.cos() * A;
184179 self.moving_object(cx, elapsed, x, y)
185180 }
186181
187− fn moving_object<'a, 'bump>(
188− &'a self,
189− cx: &mut RenderContext<'bump>,
182+ fn moving_object<'a>(
183+ &self,
184+ cx: &mut RenderContext<'a>,
190185 elapsed: f64,
191186 x: f64,
192187 y: f64,
193− ) -> Node<'bump> {
188+ ) -> Node<'a> {
194189 use dodrio::builder::*;
195190 div(&cx)
196191 .attr("class", "object")
@@ -200,17 +195,12 @@ impl Moire {
200195 }
201196
202197 /// Generate inline CSS styles for a moving object.
203− fn moving_object_style<'bump>(
204− &self,
205− cx: &mut RenderContext<'bump>,
206− x: f64,
207− y: f64,
208− ) -> &'bump str {
198+ fn moving_object_style<'a>(&self, cx: &mut RenderContext<'a>, x: f64, y: f64) -> &'a str {
209199 bumpalo::format!(in cx.bump, "left: {}px; top: {}px;", x, y).into_bump_str()
210200 }
211201
212202 /// Recursively generate `self.count` concentric circles.
213− fn circle<'bump>(&self, cx: &mut RenderContext<'bump>, elapsed: f64, n: u32) -> Node<'bump> {
203+ fn circle<'a>(&self, cx: &mut RenderContext<'a>, elapsed: f64, n: u32) -> Node<'a> {
214204 use dodrio::builder::*;
215205
216206 let r = n * 16;
@@ -231,13 +221,13 @@ impl Moire {
231221 }
232222
233223 /// Generate inline CSS styles for a circle.
234− fn circle_style<'bump>(
224+ fn circle_style<'a>(
235225 &self,
236− cx: &mut RenderContext<'bump>,
226+ cx: &mut RenderContext<'a>,
237227 elapsed: f64,
238228 n: u32,
239229 r: u32,
240− ) -> &'bump str {
230+ ) -> &'a str {
241231 let (border, alpha) = self.circle_color(elapsed, n);
242232 let margin = r / 2 + 3;
243233 let style = bumpalo::format!(
examples/sierpinski-triangle/Cargo.toml+5−6
@@ -9,14 +9,13 @@ crate-type = ["cdylib"]
99
1010[dependencies]
1111dodrio = { path = "../.." }
12−wasm-bindgen = "0.2.39"
12+wasm-bindgen = "0.2.55"
1313console_error_panic_hook = "0.1.6"
14−js-sys = "0.3.16"
15−wasm-bindgen-futures = "0.3.16"
16−futures = "0.1.26"
14+js-sys = "0.3.32"
15+wasm-bindgen-futures = "0.4.5"
1716
1817[dependencies.web-sys]
19−version = "0.3.16"
18+version = "0.3.32"
2019features = [
2120 "Document",
2221 "HtmlElement",
@@ -26,4 +25,4 @@ features = [
2625]
2726
2827[dev-dependencies]
29−wasm-bindgen-test = "0.2.39"
28+wasm-bindgen-test = "0.3.5"
examples/sierpinski-triangle/README.mdmode 100644 → 100755+2−2
@@ -12,7 +12,7 @@ See `src/lib.rs`.
1212## Build
1313
1414```
15−wasm-pack build --target no-modules
15+wasm-pack build --target web
1616```
1717
1818## Serve
@@ -20,5 +20,5 @@ wasm-pack build --target no-modules
2020Use any HTTP server, for example:
2121
2222```
23−python -m http.server
23+python -m SimpleHTTPServer
2424```
examples/sierpinski-triangle/index.html+4−4
@@ -39,9 +39,9 @@
3939 <code>FPS: <output id="fps">...</output></code>
4040 <div id="scene"></div>
4141
42− <script src="pkg/dodrio_sierpinski.js"></script>
43− <script>
44− wasm_bindgen("pkg/dodrio_sierpinski_bg.wasm");
42+ <script type="module">
43+ import init from "./pkg/dodrio_sierpinski.js";
44+ init("./pkg/dodrio_sierpinski_bg.wasm");
4545 </script>
4646
4747 <script>
@@ -66,4 +66,4 @@
6666 </script>
6767</body>
6868
69−</html>
69+</html>
examples/sierpinski-triangle/src/lib.rs+11−22
@@ -1,8 +1,7 @@
11use dodrio::{bumpalo, Node, Render, RenderContext, Vdom};
22use std::cell::RefCell;
33use std::rc::Rc;
4−use wasm_bindgen::prelude::*;
5−use wasm_bindgen::JsCast;
4+use wasm_bindgen::{prelude::*, JsCast};
65use web_sys::Window;
76
87// Triangle container defining target size.
@@ -17,11 +16,7 @@ impl Container {
1716 }
1817
1918 // Generate the container style to fluctuate triangle width.
20− fn container_transform<'bump>(
21− &self,
22− cx: &mut RenderContext<'bump>,
23− elapsed: f64,
24− ) -> &'bump str {
19+ fn container_transform<'a>(&self, cx: &mut RenderContext<'a>, elapsed: f64) -> &'a str {
2520 let t = elapsed % 10.0;
2621 let scale = 0.45 + (if t > 5.0 { 10.0 - t } else { t }) / 40.0;
2722 let transform = bumpalo::format!(
@@ -33,7 +28,7 @@ impl Container {
3328 }
3429
3530 // Generate the dot's position on the grid.
36− fn dot_style<'bump>(&self, cx: &mut RenderContext<'bump>, x: f64, y: f64) -> &'bump str {
31+ fn dot_style<'a>(&self, cx: &mut RenderContext<'a>, x: f64, y: f64) -> &'a str {
3732 let s = self.size * 1.3;
3833 let radius = s / 2.0;
3934 let styles = bumpalo::format!(
@@ -52,13 +47,7 @@ impl Container {
5247 }
5348
5449 // Create a dot node.
55− fn dot<'bump>(
56− &self,
57− cx: &mut RenderContext<'bump>,
58− x: f64,
59− y: f64,
60− content: u32,
61− ) -> Node<'bump> {
50+ fn dot<'a>(&self, cx: &mut RenderContext<'a>, x: f64, y: f64, content: u32) -> Node<'a> {
6251 use dodrio::builder::{div, text};
6352
6453 div(&cx)
@@ -71,14 +60,14 @@ impl Container {
7160 }
7261
7362 // Create a flattened vector of dot nodes (arranged in recursive triangles)
74− fn triangle<'bump>(
63+ fn triangle<'a>(
7564 &self,
76− cx: &mut RenderContext<'bump>,
65+ cx: &mut RenderContext<'a>,
7766 x: f64,
7867 y: f64,
7968 s: f64,
8069 content: u32,
81− children: &mut bumpalo::collections::Vec<Node<'bump>>,
70+ children: &mut bumpalo::collections::Vec<Node<'a>>,
8271 ) {
8372 if s <= self.size {
8473 children.push(self.dot(cx, x, y, content));
@@ -96,8 +85,8 @@ impl Container {
9685 }
9786}
9887
99−impl Render for Container {
100− fn render<'bump>(&self, cx: &mut RenderContext<'bump>) -> Node<'bump> {
88+impl<'a> Render<'a> for Container {
89+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
10190 use dodrio::builder::div;
10291
10392 let elapsed = web_sys::window()
@@ -122,7 +111,7 @@ impl Render for Container {
122111
123112// Kick off a loop that keeps re-rendering on every animation frame.
124113fn animate(window: Window, vdom: Vdom) {
125− let rc: Rc<RefCell<Option<Closure<FnMut()>>>> = Rc::new(RefCell::new(None));
114+ let rc = <Rc<RefCell<Option<Closure<dyn FnMut()>>>>>::default();
126115 let rc2 = rc.clone();
127116 let window2 = window.clone();
128117 let weak = vdom.weak();
@@ -137,7 +126,7 @@ fn animate(window: Window, vdom: Vdom) {
137126 .unchecked_ref::<js_sys::Function>(),
138127 )
139128 .unwrap_throw();
140− }) as Box<FnMut()>);
129+ }) as Box<dyn FnMut()>);
141130 window2
142131 .request_animation_frame(f.as_ref().unchecked_ref::<js_sys::Function>())
143132 .unwrap_throw();
examples/todomvc/Cargo.toml+11−12
@@ -5,22 +5,21 @@ name = "dodrio-todomvc"
55version = "0.1.0"
66
77[dependencies]
8−cfg-if = "0.1.7"
9−dodrio = { path = "../.." }
10−futures = "0.1.26"
11−js-sys = "0.3.16"
12−serde = { features = ["derive"], version = "1.0.89" }
13−serde_json = "1.0.39"
14−wasm-bindgen = "0.2.39"
15−wasm-bindgen-futures = "0.3.16"
8+cfg-if = "0.1.10"
9+dodrio = { path = "../..", features = ["serde"] }
10+js-sys = "0.3.32"
11+serde = { features = ["derive"], version = "1.0.114" }
12+serde_json = "1.0.57"
13+wasm-bindgen = "0.2.55"
14+wasm-bindgen-futures = "0.4.5"
1615
1716# Optional dependencies for logging.
1817console_error_panic_hook = { optional = true, version = "0.1.6" }
19−console_log = { optional = true, version = "0.1.2" }
20−log = { optional = true, version = "0.4.6" }
18+console_log = { optional = true, version = "0.2.0" }
19+log = { optional = true, version = "0.4.11" }
2120
2221[dependencies.web-sys]
23−version = "0.3.16"
22+version = "0.3.32"
2423features = [
2524 "Document",
2625 "Event",
@@ -35,7 +34,7 @@ features = [
3534]
3635
3736[dev-dependencies]
38−wasm-bindgen-test = "0.2.39"
37+wasm-bindgen-test = "0.3.5"
3938
4039[features]
4140logging = [
examples/todomvc/README.md+1−1
@@ -21,7 +21,7 @@ most important are:
2121## Build
2222
2323```
24−wasm-pack build --target no-modules
24+wasm-pack build --target web
2525```
2626
2727## Serve
examples/todomvc/index.html+3−3
@@ -13,9 +13,9 @@
1313 <footer class="info">
1414 <p>Double-click to edit a todo</p>
1515 </footer>
16− <script src="pkg/dodrio_todomvc.js"></script>
17− <script>
18− wasm_bindgen("pkg/dodrio_todomvc_bg.wasm");
16+ <script type="module">
17+ import init from "./pkg/dodrio_todomvc.js";
18+ init("./pkg/dodrio_todomvc_bg.wasm");
1919 </script>
2020 </body>
2121</html>
examples/todomvc/src/router.rsmode 100644 → 100755+23−21
@@ -4,10 +4,8 @@ use crate::todos::Todos;
44use crate::utils;
55use crate::visibility::Visibility;
66use dodrio::VdomWeak;
7−use futures::prelude::*;
87use std::str::FromStr;
9−use wasm_bindgen::prelude::*;
10−use wasm_bindgen::JsCast;
8+use wasm_bindgen::{prelude::*, JsCast};
119
1210/// Start the router.
1311pub fn start(vdom: VdomWeak) {
@@ -30,23 +28,27 @@ pub fn start(vdom: VdomWeak) {
3028 v
3129 });
3230
33− wasm_bindgen_futures::spawn_local(
34− vdom.with_component({
35− let vdom = vdom.clone();
36− move |root| {
37− let todos = root.unwrap_mut::<Todos>();
38− // If the todos' visibility already matches the event's
39− // visibility, then there is nothing to do (ha). If they
40− // don't match, then we need to update the todos' visibility
41− // and re-render.
42− if todos.visibility() != new_vis {
43− todos.set_visibility(new_vis);
44− vdom.schedule_render();
45− }
46− }
47− })
48− .map_err(|_| ()),
49− );
31+ wasm_bindgen_futures::spawn_local({
32+ let vdom = vdom.clone();
33+ async move {
34+ let _ = vdom
35+ .with_component({
36+ let vdom = vdom.clone();
37+ move |root| {
38+ let todos = root.unwrap_mut::<Todos>();
39+ // If the todos' visibility already matches the event's
40+ // visibility, then there is nothing to do (ha). If they
41+ // don't match, then we need to update the todos' visibility
42+ // and re-render.
43+ if todos.visibility() != new_vis {
44+ todos.set_visibility(new_vis);
45+ vdom.schedule_render();
46+ }
47+ }
48+ })
49+ .await;
50+ }
51+ });
5052 };
5153
5254 // Call it once to handle the initial `#` fragment.
@@ -57,7 +59,7 @@ pub fn start(vdom: VdomWeak) {
5759 // Note that if we ever intended to unmount our todos app, we would want to
5860 // provide a method for removing this router's event listener and cleaning
5961 // up after ourselves.
60− let on_hash_change = Closure::wrap(Box::new(on_hash_change) as Box<FnMut()>);
62+ let on_hash_change = Closure::wrap(Box::new(on_hash_change) as Box<dyn FnMut()>);
6163 let window = utils::window();
6264 window
6365 .add_event_listener_with_callback("hashchange", on_hash_change.as_ref().unchecked_ref())
examples/todomvc/src/todo.rs+77−21
@@ -1,14 +1,19 @@
11//! Type definition and `dodrio::Render` implementation for a single todo item.
22
33use crate::keys;
4−use dodrio::{Node, Render, RenderContext, RootRender, VdomWeak};
4+use dodrio::{Cached, Node, Render, RenderContext, RootRender, VdomWeak};
55use serde::{Deserialize, Serialize};
66use std::marker::PhantomData;
77use wasm_bindgen::{prelude::*, JsCast};
88
99/// A single todo item.
10−#[derive(Serialize, Deserialize)]
10+#[derive(Default)]
1111pub struct Todo<C> {
12+ inner: Cached<TodoInner<C>>,
13+}
14+
15+#[derive(Serialize, Deserialize)]
16+struct TodoInner<C> {
1217 id: usize,
1318 title: String,
1419 completed: bool,
@@ -48,68 +53,87 @@ impl<C> Todo<C> {
4853 let completed = false;
4954 let edits = None;
5055 Todo {
51− id,
52− title,
53− completed,
54− edits,
55− _controller: PhantomData,
56+ inner: Cached::new(TodoInner {
57+ id,
58+ title,
59+ completed,
60+ edits,
61+ _controller: PhantomData,
62+ }),
5663 }
5764 }
5865
5966 /// Set this todo item's id.
6067 pub fn set_id(&mut self, id: usize) {
61− self.id = id;
68+ if id != self.inner.id {
69+ Cached::invalidate(&self.inner);
70+ }
71+ self.inner.id = id;
6272 }
6373
6474 /// Is this `Todo` complete?
6575 pub fn is_complete(&self) -> bool {
66− self.completed
76+ self.inner.completed
6777 }
6878
6979 /// Mark the `Todo` as complete or not.
7080 pub fn set_complete(&mut self, to: bool) {
71− self.completed = to;
81+ if to != self.inner.completed {
82+ Cached::invalidate(&self.inner);
83+ }
84+ self.inner.completed = to;
7285 }
7386
7487 /// Get this todo's title.
7588 pub fn title(&self) -> &str {
76− &self.title
89+ &self.inner.title
7790 }
7891
7992 /// Set this todo item's title.
8093 pub fn set_title<S: Into<String>>(&mut self, title: S) {
81− self.title = title.into();
94+ let title = title.into();
95+ if title != self.inner.title {
96+ Cached::invalidate(&self.inner);
97+ }
98+ self.inner.title = title;
8299 }
83100
84101 /// Set the edits for this todo.
85102 pub fn set_edits<S: Into<String>>(&mut self, edits: Option<S>) {
86− self.edits = edits.map(Into::into);
103+ let edits = edits.map(Into::into);
104+ if edits != self.inner.edits {
105+ Cached::invalidate(&self.inner);
106+ }
107+ self.inner.edits = edits;
87108 }
88109
89110 /// Take this todo's edits, leaving `None` in their place.
90111 pub fn take_edits(&mut self) -> Option<String> {
91− self.edits.take()
112+ if self.inner.edits.is_some() {
113+ Cached::invalidate(&self.inner);
114+ }
115+ self.inner.edits.take()
92116 }
93117}
94118
95−impl<C: TodoActions> Render for Todo<C> {
96− fn render<'bump>(&self, cx: &mut RenderContext<'bump>) -> Node<'bump> {
119+impl<'a, C: TodoActions> Render<'a> for Todo<C> {
120+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
97121 use dodrio::{
98122 builder::*,
99123 bumpalo::{self, collections::String},
100124 };
101125
102− let id = self.id;
103− let title = self.edits.as_ref().unwrap_or(&self.title);
126+ let id = self.inner.id;
127+ let title = self.inner.edits.as_ref().unwrap_or(&self.inner.title);
104128 let title = bumpalo::format!(in cx.bump, "{}", title).into_bump_str();
105129
106130 li(&cx)
107131 .attr("class", {
108132 let mut class = String::new_in(cx.bump);
109− if self.completed {
133+ if self.inner.completed {
110134 class.push_str("completed ");
111135 }
112− if self.edits.is_some() {
136+ if self.inner.edits.is_some() {
113137 class.push_str("editing");
114138 }
115139 class.into_bump_str()
@@ -121,7 +145,7 @@ impl<C: TodoActions> Render for Todo<C> {
121145 input(&cx)
122146 .attr("class", "toggle")
123147 .attr("type", "checkbox")
124− .bool_attr("checked", self.completed)
148+ .bool_attr("checked", self.inner.completed)
125149 .on("click", move |root, vdom, _event| {
126150 C::toggle_completed(root, vdom, id);
127151 })
@@ -171,3 +195,35 @@ impl<C: TodoActions> Render for Todo<C> {
171195 .finish()
172196 }
173197}
198+
199+impl<C> Default for TodoInner<C> {
200+ fn default() -> Self {
201+ TodoInner {
202+ id: Default::default(),
203+ title: Default::default(),
204+ completed: Default::default(),
205+ edits: Default::default(),
206+ _controller: PhantomData,
207+ }
208+ }
209+}
210+
211+impl<C> serde::Serialize for Todo<C> {
212+ fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
213+ where
214+ S: serde::Serializer,
215+ {
216+ self.inner.serialize(serializer)
217+ }
218+}
219+
220+impl<'de, C> Deserialize<'de> for Todo<C> {
221+ fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
222+ where
223+ D: serde::Deserializer<'de>,
224+ {
225+ Ok(Todo {
226+ inner: <Cached<TodoInner<C>>>::deserialize(deserializer)?,
227+ })
228+ }
229+}
examples/todomvc/src/todos.rsmode 100644 → 100755+11−12
@@ -9,8 +9,7 @@ use dodrio::{bumpalo, Node, Render, RenderContext, RootRender, VdomWeak};
99use serde::{Deserialize, Serialize};
1010use std::marker::PhantomData;
1111use std::mem;
12−use wasm_bindgen::prelude::*;
13−use wasm_bindgen::JsCast;
12+use wasm_bindgen::{prelude::*, JsCast};
1413
1514/// A collection of todos.
1615#[derive(Default, Serialize, Deserialize)]
@@ -29,7 +28,7 @@ pub struct Todos<C = Controller> {
2928}
3029
3130/// Actions for `Todos` that can be triggered by UI interactions.
32−pub trait TodosActions: TodoActions {
31+pub trait TodosActions: 'static + TodoActions {
3332 /// Toggle the completion state of all todo items.
3433 fn toggle_all(root: &mut dyn RootRender, vdom: VdomWeak);
3534
@@ -50,7 +49,7 @@ pub trait TodosActions: TodoActions {
5049impl<C> Todos<C> {
5150 /// Construct a new todos set.
5251 ///
53− /// If an existing set is available in local storage, then us that,
52+ /// If an existing set is available in local storage, then use that,
5453 /// otherwise create a new set.
5554 pub fn new() -> Self
5655 where
@@ -133,7 +132,7 @@ impl<C> Todos<C> {
133132
134133/// Rendering helpers.
135134impl<C: TodosActions> Todos<C> {
136− fn header<'bump>(&self, cx: &mut RenderContext<'bump>) -> Node<'bump> {
135+ fn header<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
137136 use dodrio::builder::*;
138137
139138 header(&cx)
@@ -166,7 +165,7 @@ impl<C: TodosActions> Todos<C> {
166165 .finish()
167166 }
168167
169− fn todos_list<'bump>(&self, cx: &mut RenderContext<'bump>) -> Node<'bump> {
168+ fn todos_list<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
170169 use dodrio::{builder::*, bumpalo::collections::Vec};
171170
172171 let mut todos = Vec::with_capacity_in(self.todos.len(), cx.bump);
@@ -211,7 +210,7 @@ impl<C: TodosActions> Todos<C> {
211210 .finish()
212211 }
213212
214− fn footer<'bump>(&self, cx: &mut RenderContext<'bump>) -> Node<'bump> {
213+ fn footer<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
215214 use dodrio::builder::*;
216215
217216 let completed_count = self.todos.iter().filter(|t| t.is_complete()).count();
@@ -262,12 +261,12 @@ impl<C: TodosActions> Todos<C> {
262261 .finish()
263262 }
264263
265− fn visibility_swap<'bump>(
264+ fn visibility_swap<'a>(
266265 &self,
267− cx: &mut RenderContext<'bump>,
266+ cx: &mut RenderContext<'a>,
268267 url: &'static str,
269268 target_vis: Visibility,
270− ) -> Node<'bump> {
269+ ) -> Node<'a> {
271270 use dodrio::builder::*;
272271
273272 li(&cx)
@@ -290,8 +289,8 @@ impl<C: TodosActions> Todos<C> {
290289 }
291290}
292291
293−impl<C: TodosActions> Render for Todos<C> {
294− fn render<'bump>(&self, cx: &mut RenderContext<'bump>) -> Node<'bump> {
292+impl<'a, C: TodosActions> Render<'a> for Todos<C> {
293+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
295294 use dodrio::builder::*;
296295
297296 div(&cx)
js/change-list-interpreter.jsnew file+377
@@ -0,0 +1,377 @@
1+const decoder = new TextDecoder();
2+
3+function top(stack) {
4+ return stack[stack.length - 1];
5+}
6+
7+function string(mem, pointer, length) {
8+ const buf = mem.subarray(pointer, pointer + length);
9+ return decoder.decode(buf);
10+}
11+
12+const OP_TABLE = [
13+ // 0
14+ function setText(interpreter, mem8, mem32, i) {
15+ const pointer = mem32[i++];
16+ const length = mem32[i++];
17+ const str = string(mem8, pointer, length);
18+ top(interpreter.stack).textContent = str;
19+ return i;
20+ },
21+
22+ // 1
23+ function removeSelfAndNextSiblings(interpreter, mem8, mem32, i) {
24+ const node = interpreter.stack.pop();
25+ let sibling = node.nextSibling;
26+ while (sibling) {
27+ const temp = sibling.nextSibling;
28+ sibling.remove();
29+ sibling = temp;
30+ }
31+ node.remove();
32+ return i;
33+ },
34+
35+ // 2
36+ function replaceWith(interpreter, mem8, mem32, i) {
37+ const newNode = interpreter.stack.pop();
38+ const oldNode = interpreter.stack.pop();
39+ oldNode.replaceWith(newNode);
40+ interpreter.stack.push(newNode);
41+ return i;
42+ },
43+
44+ // 3
45+ function setAttribute(interpreter, mem8, mem32, i) {
46+ const nameId = mem32[i++];
47+ const valueId = mem32[i++];
48+ const name = interpreter.getCachedString(nameId);
49+ const value = interpreter.getCachedString(valueId);
50+ const node = top(interpreter.stack);
51+ node.setAttribute(name, value);
52+
53+ // Some attributes are "volatile" and don't work through `setAttribute`.
54+ if (name === "value") {
55+ node.value = value;
56+ }
57+ if (name === "checked") {
58+ node.checked = true;
59+ }
60+ if (name === "selected") {
61+ node.selected = true;
62+ }
63+
64+ return i;
65+ },
66+
67+ // 4
68+ function removeAttribute(interpreter, mem8, mem32, i) {
69+ const nameId = mem32[i++];
70+ const name = interpreter.getCachedString(nameId);
71+ const node = top(interpreter.stack);
72+ node.removeAttribute(name);
73+
74+ // Some attributes are "volatile" and don't work through `removeAttribute`.
75+ if (name === "value") {
76+ node.value = null;
77+ }
78+ if (name === "checked") {
79+ node.checked = false;
80+ }
81+ if (name === "selected") {
82+ node.selected = false;
83+ }
84+
85+ return i;
86+ },
87+
88+ // 5
89+ function pushReverseChild(interpreter, mem8, mem32, i) {
90+ const n = mem32[i++];
91+ const parent = top(interpreter.stack);
92+ const children = parent.childNodes;
93+ const child = children[children.length - n - 1];
94+ interpreter.stack.push(child);
95+ return i;
96+ },
97+
98+ // 6
99+ function popPushChild(interpreter, mem8, mem32, i) {
100+ const n = mem32[i++];
101+ interpreter.stack.pop();
102+ const parent = top(interpreter.stack);
103+ const children = parent.childNodes;
104+ const child = children[n];
105+ interpreter.stack.push(child);
106+ return i;
107+ },
108+
109+ // 7
110+ function pop(interpreter, mem8, mem32, i) {
111+ interpreter.stack.pop();
112+ return i;
113+ },
114+
115+ // 8
116+ function appendChild(interpreter, mem8, mem32, i) {
117+ const child = interpreter.stack.pop();
118+ top(interpreter.stack).appendChild(child);
119+ return i;
120+ },
121+
122+ // 9
123+ function createTextNode(interpreter, mem8, mem32, i) {
124+ const pointer = mem32[i++];
125+ const length = mem32[i++];
126+ const text = string(mem8, pointer, length);
127+ interpreter.stack.push(document.createTextNode(text));
128+ return i;
129+ },
130+
131+ // 10
132+ function createElement(interpreter, mem8, mem32, i) {
133+ const tagNameId = mem32[i++];
134+ const tagName = interpreter.getCachedString(tagNameId);
135+ interpreter.stack.push(document.createElement(tagName));
136+ return i;
137+ },
138+
139+ // 11
140+ function newEventListener(interpreter, mem8, mem32, i) {
141+ const eventId = mem32[i++];
142+ const eventType = interpreter.getCachedString(eventId);
143+ const a = mem32[i++];
144+ const b = mem32[i++];
145+ const el = top(interpreter.stack);
146+ el.addEventListener(eventType, interpreter.eventHandler);
147+ el[`dodrio-a-${eventType}`] = a;
148+ el[`dodrio-b-${eventType}`] = b;
149+ return i;
150+ },
151+
152+ // 12
153+ function updateEventListener(interpreter, mem8, mem32, i) {
154+ const eventId = mem32[i++];
155+ const eventType = interpreter.getCachedString(eventId);
156+ const el = top(interpreter.stack);
157+ el[`dodrio-a-${eventType}`] = mem32[i++];
158+ el[`dodrio-b-${eventType}`] = mem32[i++];
159+ return i;
160+ },
161+
162+ // 13
163+ function removeEventListener(interpreter, mem8, mem32, i) {
164+ const eventId = mem32[i++];
165+ const eventType = interpreter.getCachedString(eventId);
166+ const el = top(interpreter.stack);
167+ el.removeEventListener(eventType, interpreter.eventHandler);
168+ return i;
169+ },
170+
171+ // 14
172+ function addCachedString(interpreter, mem8, mem32, i) {
173+ const pointer = mem32[i++];
174+ const length = mem32[i++];
175+ const id = mem32[i++];
176+ const str = string(mem8, pointer, length);
177+ interpreter.addCachedString(str, id);
178+ return i;
179+ },
180+
181+ // 15
182+ function dropCachedString(interpreter, mem8, mem32, i) {
183+ const id = mem32[i++];
184+ interpreter.dropCachedString(id);
185+ return i;
186+ },
187+
188+ // 16
189+ function createElementNS(interpreter, mem8, mem32, i) {
190+ const tagNameId = mem32[i++];
191+ const tagName = interpreter.getCachedString(tagNameId);
192+ const nsId = mem32[i++];
193+ const ns = interpreter.getCachedString(nsId);
194+ interpreter.stack.push(document.createElementNS(ns, tagName));
195+ return i;
196+ },
197+
198+ // 17
199+ function saveChildrenToTemporaries(interpreter, mem8, mem32, i) {
200+ let temp = mem32[i++];
201+ const start = mem32[i++];
202+ const end = mem32[i++];
203+ const parent = top(interpreter.stack);
204+ const children = parent.childNodes;
205+ for (let i = start; i < end; i++) {
206+ interpreter.temporaries[temp++] = children[i];
207+ }
208+ return i;
209+ },
210+
211+ // 18
212+ function pushChild(interpreter, mem8, mem32, i) {
213+ const parent = top(interpreter.stack);
214+ const n = mem32[i++];
215+ const child = parent.childNodes[n];
216+ interpreter.stack.push(child);
217+ return i;
218+ },
219+
220+ // 19
221+ function pushTemporary(interpreter, mem8, mem32, i) {
222+ const temp = mem32[i++];
223+ interpreter.stack.push(interpreter.temporaries[temp]);
224+ return i;
225+ },
226+
227+ // 20
228+ function insertBefore(interpreter, mem8, mem32, i) {
229+ const before = interpreter.stack.pop();
230+ const after = interpreter.stack.pop();
231+ after.parentNode.insertBefore(before, after);
232+ interpreter.stack.push(before);
233+ return i;
234+ },
235+
236+ // 21
237+ function popPushReverseChild(interpreter, mem8, mem32, i) {
238+ const n = mem32[i++];
239+ interpreter.stack.pop();
240+ const parent = top(interpreter.stack);
241+ const children = parent.childNodes;
242+ const child = children[children.length - n - 1];
243+ interpreter.stack.push(child);
244+ return i;
245+ },
246+
247+ // 22
248+ function removeChild(interpreter, mem8, mem32, i) {
249+ const n = mem32[i++];
250+ const parent = top(interpreter.stack);
251+ const child = parent.childNodes[n];
252+ child.remove();
253+ return i;
254+ },
255+
256+ // 23
257+ function setClass(interpreter, mem8, mem32, i) {
258+ const classId = mem32[i++];
259+ const className = interpreter.getCachedString(classId);
260+ top(interpreter.stack).className = className;
261+ return i;
262+ },
263+
264+ // 24
265+ function saveTemplate(interpreter, mem8, mem32, i) {
266+ const id = mem32[i++];
267+ const template = top(interpreter.stack);
268+ interpreter.saveTemplate(id, template.cloneNode(true));
269+ return i;
270+ },
271+
272+ // 25
273+ function pushTemplate(interpreter, mem8, mem32, i) {
274+ const id = mem32[i++];
275+ const template = interpreter.getTemplate(id);
276+ interpreter.stack.push(template.cloneNode(true));
277+ return i;
278+ }
279+];
280+
281+export class ChangeListInterpreter {
282+ constructor(container) {
283+ this.trampoline = null;
284+ this.container = container;
285+ this.ranges = [];
286+ this.stack = [];
287+ this.strings = new Map();
288+ this.temporaries = [];
289+ this.templates = new Map();
290+ }
291+
292+ unmount() {
293+ this.trampoline.mounted = false;
294+
295+ // Null out all of our properties just to ensure that if we mistakenly ever
296+ // call a method on this instance again, it will throw.
297+ this.trampoline = null;
298+ this.container = null;
299+ this.ranges = null;
300+ this.stack = null;
301+ this.strings = null;
302+ this.temporaries = null;
303+ this.templates = null;
304+ }
305+
306+ addChangeListRange(start, len) {
307+ this.ranges.push(start);
308+ this.ranges.push(len);
309+ }
310+
311+ applyChanges(memory) {
312+ if (this.ranges.length == 0) {
313+ return;
314+ }
315+
316+ this.stack.push(this.container.firstChild);
317+ const mem8 = new Uint8Array(memory.buffer);
318+ const mem32 = new Uint32Array(memory.buffer);
319+
320+ for (let i = 0; i < this.ranges.length; i += 2) {
321+ const start = this.ranges[i];
322+ const len = this.ranges[i + 1];
323+ this.applyChangeRange(mem8, mem32, start, len);
324+ }
325+
326+ this.ranges.length = 0;
327+ this.stack.length = 0;
328+ this.temporaries.length = 0;
329+ }
330+
331+ applyChangeRange(mem8, mem32, start, len) {
332+ const end = (start + len) / 4;
333+ for (let i = start / 4; i < end; ) {
334+ const op = mem32[i++];
335+ i = OP_TABLE[op](this, mem8, mem32, i);
336+ }
337+ }
338+
339+ addCachedString(str, id) {
340+ this.strings.set(id, str);
341+ }
342+
343+ dropCachedString(id) {
344+ this.strings.delete(id);
345+ }
346+
347+ getCachedString(id) {
348+ return this.strings.get(id);
349+ }
350+
351+ saveTemplate(id, template) {
352+ this.templates.set(id, template);
353+ }
354+
355+ getTemplate(id) {
356+ return this.templates.get(id);
357+ }
358+
359+ initEventsTrampoline(trampoline) {
360+ this.trampoline = trampoline;
361+ trampoline.mounted = true;
362+ this.eventHandler = function(event) {
363+ if (!trampoline.mounted) {
364+ throw new Error("invocation of listener after VDOM has been unmounted");
365+ }
366+
367+ // `this` always refers to the element the handler was added to.
368+ // Since we're adding the handler to all elements our content wants
369+ // to listen for events on, this ensures that we always get the right
370+ // values for `a` and `b`.
371+ const type = event.type;
372+ const a = this[`dodrio-a-${type}`];
373+ const b = this[`dodrio-b-${type}`];
374+ trampoline(event, a, b);
375+ }
376+ }
377+}
js/change-list.jsdeleted−289
@@ -1,289 +0,0 @@
1−const decoder = new TextDecoder();
2−
3−function top(stack) {
4− return stack[stack.length - 1];
5−}
6−
7−function string(mem, pointer, length) {
8− const buf = mem.subarray(pointer, pointer + length);
9− return decoder.decode(buf);
10−}
11−
12−const OP_TABLE = [
13− // 0
14− function setText(changeList, mem8, mem32, i) {
15− const pointer = mem32[i++];
16− const length = mem32[i++];
17− const str = string(mem8, pointer, length);
18− top(changeList.stack).textContent = str;
19− return i;
20− },
21−
22− // 1
23− function removeSelfAndNextSiblings(changeList, mem8, mem32, i) {
24− const node = changeList.stack.pop();
25− let sibling = node.nextSibling;
26− while (sibling) {
27− const temp = sibling.nextSibling;
28− sibling.remove();
29− sibling = temp;
30− }
31− node.remove();
32− return i;
33− },
34−
35− // 2
36− function replaceWith(changeList, mem8, mem32, i) {
37− const newNode = changeList.stack.pop();
38− const oldNode = changeList.stack.pop();
39− oldNode.replaceWith(newNode);
40− changeList.stack.push(newNode);
41− return i;
42− },
43−
44− // 3
45− function setAttribute(changeList, mem8, mem32, i) {
46− const nameId = mem32[i++];
47− const valueId = mem32[i++];
48− const name = changeList.getString(nameId);
49− const value = changeList.getString(valueId);
50− const node = top(changeList.stack);
51− node.setAttribute(name, value);
52−
53− // Some attributes are "volatile" and don't work through `setAttribute`.
54− if (name === "value") {
55− node.value = value;
56− }
57− if (name === "checked") {
58− node.checked = true;
59− }
60− if (name === "selected") {
61− node.selected = true;
62− }
63−
64− return i;
65− },
66−
67− // 4
68− function removeAttribute(changeList, mem8, mem32, i) {
69− const nameId = mem32[i++];
70− const name = changeList.getString(nameId);
71− const node = top(changeList.stack);
72− node.removeAttribute(name);
73−
74− // Some attributes are "volatile" and don't work through `removeAttribute`.
75− if (name === "value") {
76− node.value = null;
77− }
78− if (name === "checked") {
79− node.checked = false;
80− }
81− if (name === "selected") {
82− node.selected = false;
83− }
84−
85− return i;
86− },
87−
88− // 5
89− function pushFirstChild(changeList, mem8, mem32, i) {
90− changeList.stack.push(top(changeList.stack).firstChild);
91− return i;
92− },
93−
94− // 6
95− function popPushNextSibling(changeList, mem8, mem32, i) {
96− const node = changeList.stack.pop();
97− changeList.stack.push(node.nextSibling);
98− return i;
99− },
100−
101− // 7
102− function pop(changeList, mem8, mem32, i) {
103− changeList.stack.pop();
104− return i;
105− },
106−
107− // 8
108− function appendChild(changeList, mem8, mem32, i) {
109− const child = changeList.stack.pop();
110− top(changeList.stack).appendChild(child);
111− return i;
112− },
113−
114− // 9
115− function createTextNode(changeList, mem8, mem32, i) {
116− const pointer = mem32[i++];
117− const length = mem32[i++];
118− const text = string(mem8, pointer, length);
119− changeList.stack.push(document.createTextNode(text));
120− return i;
121− },
122−
123− // 10
124− function createElement(changeList, mem8, mem32, i) {
125− const tagNameId = mem32[i++];
126− const tagName = changeList.getString(tagNameId);
127− changeList.stack.push(document.createElement(tagName));
128− return i;
129− },
130−
131− // 11
132− function newEventListener(changeList, mem8, mem32, i) {
133− const eventId = mem32[i++];
134− const eventType = changeList.getString(eventId);
135− const a = mem32[i++];
136− const b = mem32[i++];
137− const el = top(changeList.stack);
138− el.addEventListener(eventType, changeList.eventHandler);
139− el[`dodrio-a-${eventType}`] = a;
140− el[`dodrio-b-${eventType}`] = b;
141− return i;
142− },
143−
144− // 12
145− function updateEventListener(changeList, mem8, mem32, i) {
146− const eventId = mem32[i++];
147− const eventType = changeList.getString(eventId);
148− const el = top(changeList.stack);
149− el[`dodrio-a-${eventType}`] = mem32[i++];
150− el[`dodrio-b-${eventType}`] = mem32[i++];
151− return i;
152− },
153−
154− // 13
155− function removeEventListener(changeList, mem8, mem32, i) {
156− const eventId = mem32[i++];
157− const eventType = changeList.getString(eventId);
158− const el = top(changeList.stack);
159− el.removeEventListener(eventType, changeList.eventHandler);
160− return i;
161− },
162−
163− // 14
164− function addString(changeList, mem8, mem32, i) {
165− const pointer = mem32[i++];
166− const length = mem32[i++];
167− const id = mem32[i++];
168− const str = string(mem8, pointer, length);
169− changeList.addString(str, id);
170− return i;
171− },
172−
173− // 15
174− function dropString(changeList, mem8, mem32, i) {
175− const id = mem32[i++];
176− changeList.dropString(id);
177− return i;
178− },
179−
180− // 16
181− function createElementNS(changeList, mem8, mem32, i) {
182− const tagNameId = mem32[i++];
183− const tagName = changeList.getString(tagNameId);
184− const nsId = mem32[i++];
185− const ns = changeList.getString(nsId);
186− changeList.stack.push(document.createElementNS(ns, tagName));
187− return i;
188− },
189−
190− // 17
191− function setAttributeNS(changeList, mem8, mem32, i) {
192− const nameId = mem32[i++];
193− const valueId = mem32[i++];
194− const name = changeList.getString(nameId);
195− const value = changeList.getString(valueId);
196− const node = top(changeList.stack);
197− node.setAttributeNS(null, name, value);
198− return i;
199− }
200−];
201−
202−// export
203−class ChangeList {
204− constructor(container) {
205− this.trampoline = null;
206− this.container = container;
207− this.ranges = [];
208− this.stack = [];
209− this.strings = new Map();
210− }
211−
212− unmount() {
213− this.trampoline.mounted = false;
214−
215− // Null out all of our properties just to ensure that if we mistakenly ever
216− // call a method on this instance again, it will throw.
217− this.trampoline = null;
218− this.container = null;
219− this.ranges = null;
220− this.stack = null;
221− this.strings = null;
222− }
223−
224− addChangeListRange(start, len) {
225− this.ranges.push(start);
226− this.ranges.push(len);
227− }
228−
229− applyChanges(memory) {
230− if (this.ranges.length == 0) {
231− return;
232− }
233−
234− this.stack.push(this.container.firstChild);
235− const mem8 = new Uint8Array(memory.buffer);
236− const mem32 = new Uint32Array(memory.buffer);
237−
238− for (let i = 0; i < this.ranges.length; i += 2) {
239− const start = this.ranges[i];
240− const len = this.ranges[i + 1];
241− this.applyChangeRange(mem8, mem32, start, len);
242− }
243−
244− this.ranges.length = 0;
245− this.stack.length = 0;
246− }
247−
248− applyChangeRange(mem8, mem32, start, len) {
249− const end = (start + len) / 4;
250− for (let i = start / 4; i < end; ) {
251− const op = mem32[i++];
252− i = OP_TABLE[op](this, mem8, mem32, i);
253− }
254− }
255−
256− addString(str, id) {
257− this.strings.set(id, str);
258− }
259−
260− dropString(id) {
261− this.strings.delete(id);
262− }
263−
264− getString(id) {
265− return this.strings.get(id);
266− }
267−
268− initEventsTrampoline(trampoline) {
269− this.trampoline = trampoline;
270− trampoline.mounted = true;
271− this.eventHandler = function(event) {
272− if (!trampoline.mounted) {
273− throw new Error("invocation of listener after VDOM has been unmounted");
274− }
275−
276− // `this` always refers to the element the handler was added to.
277− // Since we're adding the handler to all elements our content wants
278− // to listen for events on, this ensures that we always get the right
279− // values for `a` and `b`.
280− const type = event.type;
281− const a = this[`dodrio-a-${type}`];
282− const b = this[`dodrio-b-${type}`];
283− trampoline(event, a, b);
284− }
285− }
286−}
287−window.ChangeList = ChangeList;
288−
289−//# sourceURL=dodrio/change-list.js
js/package-lock.jsondeleted−5
@@ -1,5 +0,0 @@
1−{
2− "name": "dodrio",
3− "version": "0.1.0",
4− "lockfileVersion": 1
5−}
js/package.jsondeleted−11
@@ -1,11 +0,0 @@
1−{
2− "name": "dodrio",
3− "version": "0.1.0",
4− "description": "Dodrio",
5− "main": "dodrio.js",
6− "scripts": {
7− "test": "echo \"Error: no test specified\" && exit 1"
8− },
9− "author": "Nick Fitzgerald <fitzgen@gmail.com>",
10− "license": "MPL-2.0"
11−}
js/strace.jsnew file+80
@@ -0,0 +1,80 @@
1+export function initStrace() {
2+ instrumentAll(Element.prototype);
3+ instrumentAll(Document.prototype);
4+ instrumentAll(Node.prototype);
5+ instrumentAll(EventTarget.prototype);
6+}
7+
8+const counts = new Map;
9+counts.total = 0;
10+
11+let timer = null;
12+
13+function log(ctorName, kind, key) {
14+ counts.total += 1;
15+
16+ const entry = `${kind} ${ctorName}#${key}`
17+ const count = counts.get(entry);
18+ if (count === undefined) {
19+ counts.set(entry, 1);
20+ } else {
21+ counts.set(entry, count + 1);
22+ }
23+
24+ if (timer !== null) {
25+ clearTimeout(timer);
26+ }
27+ timer = setTimeout(dumpAndReset, 100);
28+}
29+
30+function dumpAndReset() {
31+ const data = [...counts]
32+ .sort((a, b) => b[1] - a[1])
33+ .map(a => ({ "DOM Method": a[0], "Count": a[1] }));
34+
35+ data.push({ "DOM Method": "<total>", "Count": counts.total });
36+
37+ console.table(data, ["DOM Method", "Count"]);
38+
39+ counts.clear();
40+ counts.total = 0;
41+}
42+
43+function instrument(proto, key, desc) {
44+ const ctorName = proto.constructor.name;
45+
46+ if (typeof desc.value == "function") {
47+ const f = desc.value;
48+ desc.value = function (...args) {
49+ log(ctorName, "call", key);
50+ return f.apply(this, args);
51+ };
52+ }
53+
54+ if (typeof desc.get == "function") {
55+ const get = desc.get;
56+ desc.get = function (...args) {
57+ log(ctorName, "get", key);
58+ return get.apply(this, args);
59+ };
60+ }
61+
62+ if (typeof desc.set == "function") {
63+ const set = desc.set;
64+ desc.set = function (...args) {
65+ log(ctorName, "set", key);
66+ return set.apply(this, args);
67+ };
68+ }
69+
70+ Object.defineProperty(proto, key, desc);
71+}
72+
73+function instrumentAll(proto) {
74+ for (const key of Object.keys(proto)) {
75+ const desc = Object.getOwnPropertyDescriptor(proto, key);
76+ if (desc.configurable) {
77+ instrument(proto, key, desc);
78+ }
79+ }
80+}
src/builder.rs+64−5
@@ -1,6 +1,6 @@
11//! Helpers for building virtual DOM nodes.
22
3−use crate::{Attribute, Listener, Node, RootRender, VdomWeak};
3+use crate::{node::NodeKey, Attribute, Listener, Node, RootRender, VdomWeak};
44use bumpalo::Bump;
55
66/// A virtual DOM element builder.
@@ -16,6 +16,7 @@ where
1616 Children: 'a + AsRef<[Node<'a>]>,
1717{
1818 bump: &'a Bump,
19+ key: NodeKey,
1920 tag_name: &'a str,
2021 listeners: Listeners,
2122 attributes: Attributes,
@@ -61,6 +62,7 @@ impl<'a>
6162 let bump = bump.into();
6263 ElementBuilder {
6364 bump,
65+ key: NodeKey::NONE,
6466 tag_name,
6567 listeners: bumpalo::collections::Vec::new_in(bump),
6668 attributes: bumpalo::collections::Vec::new_in(bump),
@@ -110,6 +112,7 @@ where
110112 {
111113 ElementBuilder {
112114 bump: self.bump,
115+ key: self.key,
113116 tag_name: self.tag_name,
114117 listeners,
115118 attributes: self.attributes,
@@ -148,6 +151,7 @@ where
148151 {
149152 ElementBuilder {
150153 bump: self.bump,
154+ key: self.key,
151155 tag_name: self.tag_name,
152156 listeners: self.listeners,
153157 attributes,
@@ -186,6 +190,7 @@ where
186190 {
187191 ElementBuilder {
188192 bump: self.bump,
193+ key: self.key,
189194 tag_name: self.tag_name,
190195 listeners: self.listeners,
191196 attributes: self.attributes,
@@ -204,7 +209,7 @@ where
204209 /// let b = Bump::new();
205210 ///
206211 /// // Create a `<td>` tag with an xhtml namespace
207− /// let my_div = td(&b)
212+ /// let my_td = td(&b)
208213 /// .namespace(Some("http://www.w3.org/1999/xhtml"))
209214 /// .finish();
210215 /// ```
@@ -212,6 +217,7 @@ where
212217 pub fn namespace(self, namespace: Option<&'a str>) -> Self {
213218 ElementBuilder {
214219 bump: self.bump,
220+ key: self.key,
215221 tag_name: self.tag_name,
216222 listeners: self.listeners,
217223 attributes: self.attributes,
@@ -220,6 +226,45 @@ where
220226 }
221227 }
222228
229+ /// Set this element's key.
230+ ///
231+ /// When diffing sets of siblings, if an old sibling and new sibling share a
232+ /// key, then they will always reuse the same physical DOM node. This is
233+ /// important when using CSS animations, web components, third party JS, or
234+ /// anything else that makes the diffing implementation observable.
235+ ///
236+ /// Do not use keys if such a scenario does not apply. Keyed diffing is
237+ /// generally more expensive than not, since it is putting greater
238+ /// constraints on the diffing algorithm.
239+ ///
240+ /// # Invariants You Must Uphold
241+ ///
242+ /// The key may not be `u32::MAX`, which is a reserved key value.
243+ ///
244+ /// Keys must be unique among siblings.
245+ ///
246+ /// All sibling nodes must be keyed, or they must all not be keyed. You may
247+ /// not mix keyed and unkeyed siblings.
248+ ///
249+ /// # Example
250+ ///
251+ /// ```no_run
252+ /// use dodrio::{builder::*, bumpalo::Bump};
253+ ///
254+ /// let b = Bump::new();
255+ ///
256+ /// let my_li = li(&b)
257+ /// .key(1337)
258+ /// .finish();
259+ /// ```
260+ #[inline]
261+ pub fn key(mut self, key: u32) -> Self {
262+ use std::u32;
263+ debug_assert!(key != u32::MAX);
264+ self.key = NodeKey(key);
265+ self
266+ }
267+
223268 /// Create the virtual DOM node described by this builder.
224269 ///
225270 /// # Example
@@ -237,12 +282,22 @@ where
237282 /// ```
238283 #[inline]
239284 pub fn finish(self) -> Node<'a> {
285+ let children: &'a Children = self.bump.alloc(self.children);
286+ let children: &'a [Node<'a>] = children.as_ref();
287+
288+ let listeners: &'a Listeners = self.bump.alloc(self.listeners);
289+ let listeners: &'a [Listener<'a>] = listeners.as_ref();
290+
291+ let attributes: &'a Attributes = self.bump.alloc(self.attributes);
292+ let attributes: &'a [Attribute<'a>] = attributes.as_ref();
293+
240294 Node::element(
241295 self.bump,
296+ self.key,
242297 self.tag_name,
243− self.listeners,
244− self.attributes,
245− self.children,
298+ listeners,
299+ attributes,
300+ children,
246301 self.namespace,
247302 )
248303 }
@@ -955,6 +1010,10 @@ builder_constructors! {
9551010 /// [`<rect>`](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/rect)
9561011 /// element.
9571012 rect <> "http://www.w3.org/2000/svg";
1013+ /// Build a
1014+ /// [`<image>`](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/image)
1015+ /// element.
1016+ image <> "http://www.w3.org/2000/svg";
9581017}
9591018
9601019/// Construct a text node.
src/cached.rsnew file+229
@@ -0,0 +1,229 @@
1+use crate::{
2+ cached_set::CachedSet,
3+ node::{CachedNode, NodeKey},
4+ Node, Render, RenderContext,
5+};
6+use std::any::TypeId;
7+use std::cell::Cell;
8+use std::ops::{Deref, DerefMut};
9+
10+/// A renderable that supports caching for when rendering is expensive but can
11+/// generate the same DOM tree.
12+///
13+/// # Example
14+///
15+/// The [TodoMVC
16+/// example](https://github.com/fitzgen/dodrio/blob/master/examples/todomvc/src/todo.rs)
17+/// caches individual todo items.
18+#[derive(Clone, Debug, Default)]
19+pub struct Cached<R>
20+where
21+ R: Default,
22+{
23+ inner: R,
24+ cached: Cell<Option<CachedNode>>,
25+}
26+
27+pub_unstable_internal! {
28+ #[derive(Clone, Copy, PartialEq, Eq, Debug, Hash)]
29+ pub(crate) struct TemplateId(TypeId);
30+}
31+
32+impl<R> Cached<R>
33+where
34+ R: Default,
35+{
36+ /// Construct a new `Cached<R>` of an inner `R`.
37+ ///
38+ /// # Example
39+ ///
40+ /// ```
41+ /// use dodrio::{Cached, Node, Render, RenderContext};
42+ ///
43+ /// #[derive(Default)]
44+ /// pub struct Counter {
45+ /// count: u32,
46+ /// }
47+ ///
48+ /// impl<'a> Render<'a> for Counter {
49+ /// fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
50+ /// // ...
51+ /// # unimplemented!()
52+ /// }
53+ /// }
54+ ///
55+ /// // Create a render-able counter.
56+ /// let counter = Counter { count: 0 };
57+ ///
58+ /// // And cache its rendering!
59+ /// let cached_counter = Cached::new(counter);
60+ /// ```
61+ #[inline]
62+ pub fn new(inner: R) -> Cached<R> {
63+ let cached = Cell::new(None);
64+ Cached { inner, cached }
65+ }
66+
67+ /// Invalidate the cached rendering.
68+ ///
69+ /// This method should be called whenever the inner `R` must be re-rendered,
70+ /// and the cached `Node` from the last time `R::render` was invoked can no
71+ /// longer be re-used.
72+ ///
73+ /// # Example
74+ ///
75+ /// The `Cached<Hello>` component must have its cache invalidated whenever
76+ /// the `who` string is changed, or else the cached rendering will keep
77+ /// displaying greetings to old `who`s.
78+ ///
79+ /// ```
80+ /// use dodrio::{bumpalo, Cached, Node, Render, RenderContext};
81+ ///
82+ /// /// A component that renders to "<p>Hello, {who}!</p>"
83+ /// #[derive(Default)]
84+ /// pub struct Hello {
85+ /// who: String
86+ /// }
87+ ///
88+ /// impl<'a> Render<'a> for Hello {
89+ /// fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
90+ /// use dodrio::builder::*;
91+ /// let greeting = bumpalo::format!(in cx.bump, "Hello, {}!", self.who);
92+ /// p(&cx)
93+ /// .children([text(greeting.into_bump_str())])
94+ /// .finish()
95+ /// }
96+ /// }
97+ ///
98+ /// /// Whenever a `Cached<Hello>`'s `who` is updated, we need to invalidate the
99+ /// /// cache so that we don't keep displaying greetings to old `who`s.
100+ /// pub fn set_who(hello: &mut Cached<Hello>, who: String) {
101+ /// hello.who = who;
102+ /// Cached::invalidate(hello);
103+ /// }
104+ /// ```
105+ #[inline]
106+ pub fn invalidate(cached: &Self) {
107+ cached.cached.set(None);
108+ }
109+
110+ /// Convert a `Cached<R>` back into a plain `R`.
111+ #[inline]
112+ pub fn into_inner(cached: Self) -> R {
113+ cached.inner
114+ }
115+}
116+
117+impl<R> Cached<R>
118+where
119+ R: 'static + Default,
120+{
121+ pub(crate) fn template_id() -> TemplateId {
122+ TemplateId(TypeId::of::<R>())
123+ }
124+}
125+
126+impl<R> Deref for Cached<R>
127+where
128+ R: Default,
129+{
130+ type Target = R;
131+
132+ fn deref(&self) -> &R {
133+ &self.inner
134+ }
135+}
136+
137+impl<R> DerefMut for Cached<R>
138+where
139+ R: Default,
140+{
141+ fn deref_mut(&mut self) -> &mut R {
142+ &mut self.inner
143+ }
144+}
145+
146+impl<'a, R> Render<'a> for Cached<R>
147+where
148+ R: 'static + Default + for<'b> Render<'b>,
149+{
150+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
151+ let template = cx.template::<R>();
152+ let cached = match self.cached.get() {
153+ // This does-the-cache-contain-this-id check is necessary because
154+ // the same `Cached<R>` instance can be rendered into vdom A, which
155+ // will save the results into A's cached set and yield id X. Then,
156+ // it can be rendered *again* into a second vdom B, and B's cached
157+ // set does not have the saved results for id X. If we didn't have
158+ // this check, instead of a cache miss, we would have a panic.
159+ //
160+ // This scenario should basically never happen in the real world,
161+ // however. If we ever find that it is worth sharing a cached render
162+ // component between multiple vdoms, and want to avoid these
163+ // "unnecessary" cache misses, we can do this:
164+ //
165+ // * Make each `Cached<R>` have an instance id and generation
166+ // counter.
167+ //
168+ // * On invalidation, bump the generation counter.
169+ //
170+ // * Add a generation member to the `CacheEntry`.
171+ //
172+ // * Each vdom maintains a map from `Cached<R>` instance id to
173+ // `CacheEntry`s.
174+ //
175+ // * We only re-use the cached results if the `Cached<R>`'s
176+ // generation counter matches the entry in the vdom's cached set.
177+ //
178+ // This is all do-able but is a bit more book keeping than we really
179+ // want to do unless it is well motivated.
180+ Some(cached)
181+ if {
182+ let cached_set = cx.cached_set.borrow();
183+ cached_set.contains(cached.id)
184+ } =>
185+ {
186+ cached
187+ }
188+ _ => {
189+ let mut key = NodeKey::NONE;
190+ let id = CachedSet::insert(cx, false, template, |nested_cx| {
191+ let node = self.inner.render(nested_cx);
192+ key = node.key();
193+ node
194+ });
195+ let cached = CachedNode { id, key };
196+ self.cached.set(Some(cached));
197+ cached
198+ }
199+ };
200+
201+ cached.into()
202+ }
203+}
204+
205+#[cfg(feature = "serde")]
206+impl<R> serde::Serialize for Cached<R>
207+where
208+ R: Default + serde::Serialize,
209+{
210+ fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
211+ where
212+ S: serde::Serializer,
213+ {
214+ self.inner.serialize(serializer)
215+ }
216+}
217+
218+#[cfg(feature = "serde")]
219+impl<'de, R> serde::Deserialize<'de> for Cached<R>
220+where
221+ R: Default + serde::Deserialize<'de>,
222+{
223+ fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
224+ where
225+ D: serde::Deserializer<'de>,
226+ {
227+ R::deserialize(deserializer).map(Cached::new)
228+ }
229+}
src/cached_set.rsnew file+186
@@ -0,0 +1,186 @@
1+use crate::{
2+ events::EventsRegistry,
3+ node::{Node, NodeKind},
4+ render_context::RenderContext,
5+};
6+use bumpalo::Bump;
7+use fxhash::{FxHashMap, FxHashSet};
8+use std::sync::atomic::{AtomicUsize, Ordering};
9+use std::u32;
10+use wasm_bindgen::prelude::*;
11+
12+static ID_COUNTER: AtomicUsize = AtomicUsize::new(0);
13+
14+pub_unstable_internal! {
15+ #[derive(Debug, Default)]
16+ pub(crate) struct CachedSet {
17+ items: FxHashMap<CacheId, CacheEntry>,
18+ }
19+}
20+
21+pub_unstable_internal! {
22+ #[derive(Clone, Copy, PartialEq, Eq, Debug, Hash)]
23+ pub(crate) struct CacheId(u32);
24+}
25+
26+#[derive(Debug)]
27+pub(crate) struct CacheEntry {
28+ bump: Bump,
29+
30+ // Actually a reference into `bump`.
31+ node: *const Node<'static>,
32+
33+ // All the other cached entries that `node` references (including transitive
34+ // edges). By eagerly following transitive edges and recording them the
35+ // once, we don't have to repeat the tracing every time we want to garbage
36+ // collect cache entries.
37+ edges: FxHashSet<CacheId>,
38+
39+ // The template for this cached virtual subtree.
40+ //
41+ // When a cache entry has a template, that means that the `ChangeList` will
42+ // lazily build a physical DOM subtree based on the template, and when we
43+ // create new versions of this cached result, we clone the template's
44+ // physical DOM subtree and then modify it, rather than building the cached
45+ // result up from scratch. This is a nice win because we bounce between JS
46+ // and DOM methods less often, and get the C++ DOM implementation to do most
47+ // of the subtree construction for us.
48+ template: Option<CacheId>,
49+
50+ // Whether this entry should never be garbage collected. Typically only
51+ // templates are pinned.
52+ pinned: bool,
53+}
54+
55+impl From<CacheId> for u32 {
56+ #[inline]
57+ fn from(id: CacheId) -> u32 {
58+ id.0
59+ }
60+}
61+
62+impl CachedSet {
63+ pub(crate) fn new_roots_set(&self) -> FxHashSet<CacheId> {
64+ let mut roots = FxHashSet::default();
65+ roots.reserve(self.items.len());
66+ roots
67+ }
68+
69+ pub(crate) fn gc(&mut self, registry: &mut EventsRegistry, roots: FxHashSet<CacheId>) {
70+ let mut marked = FxHashSet::default();
71+ marked.reserve(self.items.len());
72+
73+ for root in roots {
74+ if marked.insert(root) {
75+ let entry = self
76+ .items
77+ .get(&root)
78+ .expect_throw("CachedSet::gc: should have root in cached set");
79+
80+ // NB: no need to recurse here because `edges` already contains
81+ // transitive edges!
82+ marked.extend(entry.edges.iter().cloned());
83+ }
84+ }
85+
86+ self.items.retain(|id, entry| {
87+ let keep = entry.pinned || marked.contains(id);
88+ if !keep {
89+ let node: &Node = unsafe { &*entry.node };
90+ registry.remove_subtree(node);
91+ }
92+ keep
93+ });
94+ }
95+
96+ // Trace all the transitive edges to other cached entries that the given
97+ // node has.
98+ fn trace(&self, node: &Node) -> FxHashSet<CacheId> {
99+ let mut edges = FxHashSet::default();
100+ self.trace_recursive(&mut edges, node);
101+ edges
102+ }
103+
104+ fn trace_recursive(&self, edges: &mut FxHashSet<CacheId>, node: &Node) {
105+ match &node.kind {
106+ NodeKind::Text(_) => return,
107+ NodeKind::Cached(c) => {
108+ debug_assert!(self.items.contains_key(&c.id));
109+ edges.insert(c.id);
110+ edges.extend(
111+ self.items
112+ .get(&c.id)
113+ .expect_throw("CachedSet::trace: should have c.id in cached set")
114+ .edges
115+ .iter()
116+ .cloned(),
117+ );
118+ }
119+ NodeKind::Element(el) => {
120+ for child in el.children {
121+ self.trace_recursive(edges, child);
122+ }
123+ }
124+ }
125+ }
126+
127+ fn next_id(&mut self) -> CacheId {
128+ let next = ID_COUNTER.fetch_add(1, Ordering::AcqRel) as u32;
129+ let next = if next == u32::MAX { None } else { Some(next) };
130+ CacheId(next.expect_throw("ID_COUNTER overflowed"))
131+ }
132+
133+ pub(crate) fn insert<F>(
134+ cx: &mut RenderContext,
135+ pinned: bool,
136+ template: Option<CacheId>,
137+ f: F,
138+ ) -> CacheId
139+ where
140+ F: for<'a> FnOnce(&mut RenderContext<'a>) -> Node<'a>,
141+ {
142+ let set = cx.cached_set;
143+ let bump = Bump::new();
144+ let (node, edges) = {
145+ let mut nested_cx = RenderContext::new(&bump, cx.cached_set, cx.templates);
146+ let node = f(&mut nested_cx);
147+ let node = bump.alloc(node);
148+ let edges = {
149+ let set = set.borrow();
150+ set.trace(node)
151+ };
152+ (
153+ node as *mut Node<'_> as usize as *const Node<'static>,
154+ edges,
155+ )
156+ };
157+
158+ let entry = CacheEntry {
159+ bump,
160+ node,
161+ edges,
162+ template,
163+ pinned,
164+ };
165+
166+ let mut set = set.borrow_mut();
167+ let id = set.next_id();
168+ set.items.insert(id, entry);
169+ id
170+ }
171+
172+ /// Does the cached set contain a cached node with the given id?
173+ pub fn contains(&self, id: CacheId) -> bool {
174+ self.items.contains_key(&id)
175+ }
176+
177+ /// Get the cached node and its template (if any) for the given cache id.
178+ pub fn get(&self, id: CacheId) -> (&Node, Option<CacheId>) {
179+ let entry = self
180+ .items
181+ .get(&id)
182+ .expect_throw("CachedSet::get: should have id in set");
183+ let node: &Node = unsafe { &*entry.node };
184+ (node, entry.template)
185+ }
186+}
src/change_list.rsdeleted−480
@@ -1,480 +0,0 @@
1−use crate::Listener;
2−use bumpalo::Bump;
3−use fxhash::FxHashMap;
4−use std::fmt;
5−
6−pub mod js {
7− cfg_if::cfg_if! {
8− if #[cfg(feature = "xxx-unstable-internal-use-only")] {
9− #[derive(Clone, Debug)]
10− pub struct ChangeList {}
11− impl ChangeList {
12− pub fn new(_container: &crate::Element) -> ChangeList {
13− ChangeList {}
14− }
15− pub fn unmount(&self) {}
16− pub fn add_change_list_range(&self, _start: usize, _len: usize) {}
17− pub fn init_events_trampoline(&self, _trampoline: &crate::EventsTrampoline) {}
18− }
19−
20− pub fn eval_change_list() {}
21− } else {
22− use wasm_bindgen::prelude::*;
23−
24− #[wasm_bindgen]
25− extern "C" {
26− #[derive(Clone, Debug)]
27− pub type ChangeList;
28−
29− #[wasm_bindgen(constructor)]
30− pub fn new(container: &web_sys::Element) -> ChangeList;
31−
32− #[wasm_bindgen(structural, method)]
33− pub fn unmount(this: &ChangeList);
34−
35− #[wasm_bindgen(structural, method, js_name = addChangeListRange)]
36− pub fn add_change_list_range(this: &ChangeList, start: usize, len: usize);
37−
38− #[wasm_bindgen(structural, method, js_name = applyChanges)]
39− pub fn apply_changes(this: &ChangeList, memory: JsValue);
40−
41− #[wasm_bindgen(structural, method, js_name = initEventsTrampoline)]
42− pub fn init_events_trampoline(
43− this: &ChangeList,
44− trampoline: &crate::EventsTrampoline,
45− );
46− }
47−
48− pub fn eval_change_list() {
49− use std::sync::Once;
50− // XXX: Because wasm-bindgen-test doesn't support third party JS
51− // dependencies, we can't use `wasm_bindgen(module = "...")` for our
52− // `ChangeList` JS import. Instead, this *should* be a local JS snippet,
53− // but that isn't implemented yet:
54− // https://github.com/rustwasm/rfcs/pull/6
55− static EVAL: Once = Once::new();
56− EVAL.call_once(|| {
57− js_sys::eval(include_str!("../js/change-list.js"))
58− .expect_throw("should eval change-list.js OK");
59− });
60− }
61− }
62− }
63−}
64−
65−struct StringsCacheEntry {
66− key: u32,
67− used: bool,
68−}
69−
70−pub(crate) struct ChangeList {
71− bump: Bump,
72− strings_cache: FxHashMap<String, StringsCacheEntry>,
73− next_string_key: u32,
74− js: js::ChangeList,
75− events_trampoline: Option<crate::EventsTrampoline>,
76−}
77−
78−impl Drop for ChangeList {
79− fn drop(&mut self) {
80− debug!("Dropping ChangeList");
81− self.js.unmount();
82− }
83−}
84−
85−impl fmt::Debug for ChangeList {
86− fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
87− f.debug_struct("ChangeList")
88− .field("bump", &self.bump)
89− .field("js", &self.js)
90− .field("events_trampoline", &"..")
91− .finish()
92− }
93−}
94−
95−impl ChangeList {
96− pub(crate) fn new(container: &crate::Element) -> ChangeList {
97− js::eval_change_list();
98− let bump = Bump::new();
99− let strings_cache = FxHashMap::default();
100− let js = js::ChangeList::new(container);
101− ChangeList {
102− bump,
103− strings_cache,
104− next_string_key: 0,
105− js,
106− events_trampoline: None,
107− }
108− }
109−
110− #[cfg(feature = "xxx-unstable-internal-use-only")]
111− pub(crate) fn apply_changes(&mut self) {
112− // Do nothing...
113− }
114−
115− #[cfg(not(feature = "xxx-unstable-internal-use-only"))]
116− pub(crate) fn apply_changes(&mut self) {
117− let js = &self.js;
118− unsafe {
119− self.bump.each_allocated_chunk(|ch| {
120− js.add_change_list_range(ch.as_ptr() as usize, ch.len());
121− });
122− }
123− js.apply_changes(wasm_bindgen::memory());
124− self.bump.reset();
125− }
126−
127− pub(crate) fn init_events_trampoline(&mut self, trampoline: crate::EventsTrampoline) {
128− debug_assert!(self.events_trampoline.is_none());
129− self.js.init_events_trampoline(&trampoline);
130− self.events_trampoline = Some(trampoline);
131− }
132−}
133−
134−#[repr(u32)]
135−#[derive(Clone, Copy, Debug)]
136−enum ChangeDiscriminant {
137− /// Immediates: `(pointer, length)`
138− ///
139− /// Stack: `[... TextNode] -> [... TextNode]`
140− ///
141− /// ```text
142− /// stack.top().textContent = String(pointer, length)
143− /// ```
144− SetText = 0,
145−
146− /// Immediates: `()`
147− ///
148− /// Stack: `[... Node] -> [...]`
149− ///
150− /// ```text
151− /// node = stack.pop()
152− /// while (node.nextSibling) {
153− /// node.nextSibling.remove();
154− /// }
155− /// node.remove()
156− /// ```
157− RemoveSelfAndNextSiblings = 1,
158−
159− /// Immediates: `()`
160− ///
161− /// Stack: `[... Node Node] -> [... Node]`
162− ///
163− /// ```text
164− /// new = stack.pop()
165− /// old = stack.pop()
166− /// old.replaceWith(new)
167− /// stack.push(new)
168− /// ```
169− ReplaceWith = 2,
170−
171− /// Immediates: `(id1, id2)`
172− ///
173− /// Stack: `[... Node] -> [... Node]`
174− ///
175− /// ```text
176− /// stack.top().setAttribute(String(id1), String(id2))
177− /// ```
178− SetAttribute = 3,
179−
180− /// Immediates: (id)
181− ///
182− /// Stack: `[... Node] -> [... Node]`
183− ///
184− /// ```text
185− /// stack.top().removeAttribute(String(id))
186− /// ```
187− RemoveAttribute = 4,
188−
189− /// Immediates: `()`
190− ///
191− /// Stack: `[... Node] -> [... Node node]`
192− ///
193− /// ```text
194− /// stack.push(stack.top().firstChild)
195− /// ```
196− PushFirstChild = 5,
197−
198− /// Immediates: `()`
199− ///
200− /// Stack: `[... Node] -> [... Node]`
201− ///
202− /// ```text
203− /// stack.push(stack.pop().nextSibling)
204− /// ```
205− PopPushNextSibling = 6,
206−
207− /// Immediates: `()`
208− ///
209− /// Stack: `[... T] -> [...]`
210− ///
211− /// ```text
212− /// stack.pop()
213− /// ```
214− Pop = 7,
215−
216− /// Immediates: `()`
217− ///
218− /// Stack: `[... Node Node] -> [... Node]`
219− ///
220− /// ```text
221− /// child = stack.pop()
222− /// stack.top().appendChild(child)
223− /// ```
224− AppendChild = 8,
225−
226− /// Immediates: `(pointer, length)`
227− ///
228− /// Stack: `[...] -> [... Node]`
229− ///
230− /// ```text
231− /// stack.push(createTextNode(String(pointer, length)))
232− /// ```
233− CreateTextNode = 9,
234−
235− /// Immediates: `(id)`
236− ///
237− /// Stack: `[...] -> [... Node]`
238− ///
239− /// ```text
240− /// stack.push(createElement(String(id))
241− /// ```
242− CreateElement = 10,
243−
244− /// Immediates: `(id, A, B)`
245− ///
246− /// Stack: `[... Node] -> [... Node]`
247− ///
248− /// ```text
249− /// event = String(id)
250− /// callback = ProxyToRustCallback(A, B)
251− /// stack.top().addEventListener(event, callback)
252− /// ```
253− NewEventListener = 11,
254−
255− /// Immediates: `(id, A, B)`
256− ///
257− /// Stack: `[... Node] -> [... Node]`
258− ///
259− /// ```text
260− /// event = String(id)
261− /// new_callback = ProxyToRustCallback(A, B);
262− /// stack.top().updateEventlistener(new_callback)
263− /// ```
264− UpdateEventListener = 12,
265−
266− /// Immediates: `(id)`
267− ///
268− /// Stack: `[... Node] -> [... Node]`
269− ///
270− /// ```text
271− /// stack.top().removeEventListener(String(id));
272− /// ```
273− RemoveEventListener = 13,
274−
275− /// Immediates: `(pointer, length, id)`
276− ///
277− /// Stack: `[...] -> [...]`
278− ///
279− /// ```text
280− /// addString(String(pointer, length), id);
281− /// ```
282− AddString = 14,
283−
284− /// Immediates: `(id)`
285− ///
286− /// Stack: `[...] -> [...]`
287− ///
288− /// ```text
289− /// dropString(id);
290− /// ```
291− DropString = 15,
292−
293− /// Immediates: `(id1, id2)`
294− ///
295− /// Stack: `[...] -> [... Node]`
296− ///
297− /// ```text
298− /// stack.push(createElementNS(String(id1), String(id2))
299− /// ```
300− CreateElementNS = 16,
301−
302− /// Immediates: `(id1, id2, id3)`
303− ///
304− /// Stack: `[... Node] -> [... Node]`
305− ///
306− /// ```text
307− /// stack.top().setAttributeNS(String(id1), String(id2), String(id3))
308− /// ```
309− SetAttributeNS = 17,
310−}
311−
312−// Allocation utilities to ensure that we only allocation sequences of `u32`s
313−// into the change list's bump arena without any padding. This helps maintain
314−// the invariants required for `Bump::each_allocated_chunk`'s safety.
315−impl ChangeList {
316− // Allocate an opcode with zero immediates.
317− fn op0(&self, discriminant: ChangeDiscriminant) {
318− self.bump.alloc(discriminant as u32);
319− }
320−
321− // Allocate an opcode with one immediate.
322− fn op1(&self, discriminant: ChangeDiscriminant, a: u32) {
323− self.bump.alloc([discriminant as u32, a]);
324− }
325−
326− // Allocate an opcode with two immediates.
327− fn op2(&self, discriminant: ChangeDiscriminant, a: u32, b: u32) {
328− self.bump.alloc([discriminant as u32, a, b]);
329− }
330−
331− // Allocate an opcode with three immediates.
332− fn op3(&self, discriminant: ChangeDiscriminant, a: u32, b: u32, c: u32) {
333− self.bump.alloc([discriminant as u32, a, b, c]);
334− }
335−
336− // Note: no 4-immediate opcodes at this time.
337−}
338−
339−impl ChangeList {
340− fn ensure_string(&mut self, string: &str) -> u32 {
341− if let Some(entry) = self.strings_cache.get_mut(string) {
342− entry.used = true;
343− entry.key
344− } else {
345− let key = self.next_string_key;
346− self.next_string_key += 1;
347− let entry = StringsCacheEntry { key, used: true };
348− self.strings_cache.insert(string.to_string(), entry);
349− self.op3(
350− ChangeDiscriminant::AddString,
351− string.as_ptr() as u32,
352− string.len() as u32,
353− key,
354− );
355− key
356− }
357− }
358−
359− pub(crate) fn drop_unused_strings(&mut self) {
360− debug!("drop_unused_strings()");
361− let mut new_cache = FxHashMap::default();
362− for (key, val) in self.strings_cache.iter() {
363− if val.used {
364− new_cache.insert(
365− key.clone(),
366− StringsCacheEntry {
367− key: val.key,
368− used: false,
369− },
370− );
371− } else {
372− self.op1(ChangeDiscriminant::DropString, val.key);
373− }
374− }
375− self.strings_cache = new_cache;
376− }
377−
378− pub(crate) fn emit_set_text(&self, text: &str) {
379− debug!("emit_set_text({:?})", text);
380− self.op2(
381− ChangeDiscriminant::SetText,
382− text.as_ptr() as u32,
383− text.len() as u32,
384− );
385− }
386−
387− pub(crate) fn emit_remove_self_and_next_siblings(&self) {
388− debug!("emit_remove_self_and_next_siblings()");
389− self.op0(ChangeDiscriminant::RemoveSelfAndNextSiblings);
390− }
391−
392− pub(crate) fn emit_replace_with(&self) {
393− debug!("emit_replace_with()");
394− self.op0(ChangeDiscriminant::ReplaceWith);
395− }
396−
397− pub(crate) fn emit_set_attribute(&mut self, name: &str, value: &str) {
398− debug!("emit_set_attribute({:?}, {:?})", name, value);
399− let name_id = self.ensure_string(name);
400− let value_id = self.ensure_string(value);
401− self.op2(ChangeDiscriminant::SetAttribute, name_id, value_id);
402− }
403−
404− pub(crate) fn emit_set_attribute_ns(&mut self, name: &str, value: &str) {
405− debug!("emit_set_attribute_ns({:?}, {:?}", name, value);
406− let name_id = self.ensure_string(name);
407− let value_id = self.ensure_string(value);
408− self.op2(ChangeDiscriminant::SetAttributeNS, name_id, value_id);
409− }
410−
411− pub(crate) fn emit_remove_attribute(&mut self, name: &str) {
412− debug!("emit_remove_attribute({:?})", name);
413− let name_id = self.ensure_string(name);
414− self.op1(ChangeDiscriminant::RemoveAttribute, name_id);
415− }
416−
417− pub(crate) fn emit_push_first_child(&self) {
418− debug!("emit_push_first_child()");
419− self.op0(ChangeDiscriminant::PushFirstChild);
420− }
421−
422− pub(crate) fn emit_pop_push_next_sibling(&self) {
423− debug!("emit_pop_push_next_sibling()");
424− self.op0(ChangeDiscriminant::PopPushNextSibling);
425− }
426−
427− pub(crate) fn emit_pop(&self) {
428− debug!("emit_pop()");
429− self.op0(ChangeDiscriminant::Pop);
430− }
431−
432− pub(crate) fn emit_append_child(&self) {
433− debug!("emit_append_child()");
434− self.op0(ChangeDiscriminant::AppendChild);
435− }
436−
437− pub(crate) fn emit_create_text_node(&self, text: &str) {
438− debug!("emit_create_text_node({:?})", text);
439− self.op2(
440− ChangeDiscriminant::CreateTextNode,
441− text.as_ptr() as u32,
442− text.len() as u32,
443− );
444− }
445−
446− pub(crate) fn emit_create_element(&mut self, tag_name: &str) {
447− debug!("emit_create_element({:?})", tag_name);
448− let tag_name_id = self.ensure_string(tag_name);
449− self.op1(ChangeDiscriminant::CreateElement, tag_name_id);
450− }
451−
452− pub(crate) fn emit_create_element_ns(&mut self, tag_name: &str, ns: &str) {
453− debug!("emit_create_element_ns({:?}, {:?})", tag_name, ns);
454− let tag_name_id = self.ensure_string(tag_name);
455− let ns_id = self.ensure_string(ns);
456− self.op2(ChangeDiscriminant::CreateElementNS, tag_name_id, ns_id);
457− }
458−
459− pub(crate) fn emit_new_event_listener(&mut self, listener: &Listener) {
460− debug!("emit_new_event_listener({:?})", listener);
461− let (a, b) = listener.get_callback_parts();
462− debug_assert!(a != 0);
463− let event_id = self.ensure_string(listener.event);
464− self.op3(ChangeDiscriminant::NewEventListener, event_id, a, b);
465− }
466−
467− pub(crate) fn emit_update_event_listener(&mut self, listener: &Listener) {
468− debug!("emit_update_event_listener({:?})", listener);
469− let (a, b) = listener.get_callback_parts();
470− debug_assert!(a != 0);
471− let event_id = self.ensure_string(listener.event);
472− self.op3(ChangeDiscriminant::UpdateEventListener, event_id, a, b);
473− }
474−
475− pub(crate) fn emit_remove_event_listener(&mut self, event: &str) {
476− debug!("emit_remove_event_listener({:?})", event);
477− let event_id = self.ensure_string(event);
478− self.op1(ChangeDiscriminant::RemoveEventListener, event_id);
479− }
480−}
src/change_list/emitter.rsnew file+292
@@ -0,0 +1,292 @@
1+//! The `InstructionEmitter` is responsible for encoding change list
2+//! instructions and ensuring that each instruction has the correct number of
3+//! immediates. It ensures that the resulting change list instruction stream is
4+//! *syntactically* correct (opcodes have the correct arity of immediate
5+//! arguments, etc), while `ChangeListBuilder` wraps an emitter and additionally
6+//! ensures that the resulting change list program is *semantically* correct
7+//! (doesn't reference cached strings before they've been added to the cache,
8+//! etc).
9+//!
10+//! We encode the instructions directly into a dedicated bump arena. We
11+//! eventually pass the bump arena's chunks to the interpreter in JS, so it is
12+//! critical that nothing other than change list instructions are allocated
13+//! inside this bump, and that the instructions themselves do not contain any
14+//! padding or uninitialized memory. See the documentation for the the
15+//! `Bump::each_allocated_chunk` method for details.
16+
17+use bumpalo::Bump;
18+
19+#[derive(Debug)]
20+pub(crate) struct InstructionEmitter {
21+ bump: Bump,
22+}
23+
24+impl InstructionEmitter {
25+ /// Construct a new `InstructionEmitter` with its own bump arena.
26+ pub fn new() -> InstructionEmitter {
27+ let bump = Bump::new();
28+ InstructionEmitter { bump }
29+ }
30+
31+ /// Invoke the given function with each of the allocated instruction
32+ /// sequences that this emitter has built up.
33+ #[cfg_attr(feature = "xxx-unstable-internal-use-only", allow(dead_code))]
34+ pub fn each_instruction_sequence<F>(&mut self, f: F)
35+ where
36+ F: FnMut(&[u8]),
37+ {
38+ // Note: the safety invariants required for `each_allocated_chunk` are
39+ // maintained by the fact that everything we encode as allocations in
40+ // the bump arena are in the form of `u32`s, and therefore we don't have
41+ // any uninitialized memory padding in the arena.
42+ unsafe {
43+ self.bump.each_allocated_chunk(f);
44+ }
45+ }
46+
47+ /// Reset to an empty sequence of instructions.
48+ pub fn reset(&mut self) {
49+ self.bump.reset();
50+ }
51+}
52+
53+macro_rules! define_change_list_instructions {
54+ ( $(
55+ $( #[$attr:meta] )*
56+ $name:ident (
57+ $($immediate:ident),*
58+ ) = $discriminant:expr,
59+ )* ) => {
60+ impl InstructionEmitter {
61+ $(
62+ $( #[$attr] )*
63+ #[inline]
64+ pub fn $name(&self $(, $immediate: u32)*) {
65+ self.bump.alloc_with(|| [$discriminant $(, $immediate )* ]);
66+ }
67+ )*
68+ }
69+ }
70+}
71+
72+define_change_list_instructions! {
73+ /// Stack: `[... TextNode] -> [... TextNode]`
74+ ///
75+ /// ```text
76+ /// stack.top().textContent = readString(pointer, length)
77+ /// ```
78+ set_text(pointer, length) = 0,
79+
80+ /// Stack: `[... Node] -> [...]`
81+ ///
82+ /// ```text
83+ /// node = stack.pop()
84+ /// while (node.nextSibling) {
85+ /// node.nextSibling.remove();
86+ /// }
87+ /// node.remove()
88+ /// ```
89+ remove_self_and_next_siblings() = 1,
90+
91+ /// Stack: `[... Node Node] -> [... Node]`
92+ ///
93+ /// ```text
94+ /// new = stack.pop()
95+ /// old = stack.pop()
96+ /// old.replaceWith(new)
97+ /// stack.push(new)
98+ /// ```
99+ replace_with() = 2,
100+
101+ /// Stack: `[... Node] -> [... Node]`
102+ ///
103+ /// ```text
104+ /// stack.top().setAttribute(getCachedString(attribute_key), getCachedString(value_key))
105+ /// ```
106+ set_attribute(attribute_key, value_key) = 3,
107+
108+ /// Stack: `[... Node] -> [... Node]`
109+ ///
110+ /// ```text
111+ /// stack.top().removeAttribute(getCachedString(attribute_key))
112+ /// ```
113+ remove_attribute(attribute_key) = 4,
114+
115+ /// Stack: `[... Node] -> [... Node Node]`
116+ ///
117+ /// ```text
118+ /// parent = stack.top()
119+ /// child = parent.childNodes[parent.childNodes.length - n - 1]
120+ /// stack.push(child)
121+ /// ```
122+ push_reverse_child(n) = 5,
123+
124+ /// Stack: `[... Node Node] -> [... Node Node]`
125+ ///
126+ /// ```text
127+ /// stack.pop();
128+ /// parent = stack.top();
129+ /// child = parent.childNodes[n]
130+ /// stack.push(child)
131+ /// ```
132+ pop_push_child(n) = 6,
133+
134+ /// Stack: `[... T] -> [...]`
135+ ///
136+ /// ```text
137+ /// stack.pop()
138+ /// ```
139+ pop() = 7,
140+
141+ /// Stack: `[... Node Node] -> [... Node]`
142+ ///
143+ /// ```text
144+ /// child = stack.pop()
145+ /// stack.top().appendChild(child)
146+ /// ```
147+ append_child() = 8,
148+
149+ /// Stack: `[...] -> [... Node]`
150+ ///
151+ /// ```text
152+ /// stack.push(document.createTextNode(readString(pointer, length)))
153+ /// ```
154+ create_text_node(pointer, length) = 9,
155+
156+ /// Stack: `[...] -> [... Node]`
157+ ///
158+ /// ```text
159+ /// stack.push(document.createElement(getCachedString(tag_name_key))
160+ /// ```
161+ create_element(tag_name_key) = 10,
162+
163+ /// Stack: `[... Node] -> [... Node]`
164+ ///
165+ /// ```text
166+ /// event = getCachedString(event_key)
167+ /// callback = createProxyToRustCallback(a, b)
168+ /// stack.top().addEventListener(event, callback)
169+ /// ```
170+ new_event_listener(event_key, a, b) = 11,
171+
172+ /// Stack: `[... Node] -> [... Node]`
173+ ///
174+ /// ```text
175+ /// event = getCachedString(event_key)
176+ /// new_callback = createProxyToRustCallback(a, b);
177+ /// stack.top().updateEventlistener(new_callback)
178+ /// ```
179+ update_event_listener(event_key, a, b) = 12,
180+
181+ /// Stack: `[... Node] -> [... Node]`
182+ ///
183+ /// ```text
184+ /// stack.top().removeEventListener(getCachedString(event_key));
185+ /// ```
186+ remove_event_listener(event_key) = 13,
187+
188+ /// Stack: `[...] -> [...]`
189+ ///
190+ /// ```text
191+ /// addCachedString(readString(pointer, length), key);
192+ /// ```
193+ add_cached_string(pointer, length, key) = 14,
194+
195+ /// Stack: `[...] -> [...]`
196+ ///
197+ /// ```text
198+ /// dropCachedString(key);
199+ /// ```
200+ drop_cached_string(key) = 15,
201+
202+ /// Stack: `[...] -> [... Node]`
203+ ///
204+ /// ```text
205+ /// tag_name = getCachedString(tag_name_key)
206+ /// namespace = getCachedString(tag_name_key)
207+ /// stack.push(document.createElementNS(tag_name, namespace))
208+ /// ```
209+ create_element_ns(tag_name_key, namespace_key) = 16,
210+
211+ /// Stack: `[...] -> [...]`
212+ ///
213+ /// ```text
214+ /// parent = stack.top()
215+ /// children = parent.childNodes
216+ /// temp = temp_base
217+ /// for i in start .. end:
218+ /// temporaries[temp] = children[i]
219+ /// temp += 1
220+ /// ```
221+ save_children_to_temporaries(temp_base, start, end) = 17,
222+
223+ /// Stack: `[... Node] -> [... Node Node]`
224+ ///
225+ /// ```text
226+ /// parent = stack.top()
227+ /// child = parent.childNodes[n]
228+ /// stack.push(child)
229+ /// ```
230+ push_child(n) = 18,
231+
232+ /// Stack: `[...] -> [... Node]`
233+ ///
234+ /// ```text
235+ /// stack.push(temporaries[temp])
236+ /// ```
237+ push_temporary(temp) = 19,
238+
239+ /// Stack: `[... Node Node] -> [... Node]`
240+ ///
241+ /// ```text
242+ /// before = stack.pop()
243+ /// after = stack.pop()
244+ /// after.insertBefore(before)
245+ /// stack.push(before)
246+ /// ```
247+ insert_before() = 20,
248+
249+ /// Stack: `[... Node Node] -> [... Node Node]`
250+ ///
251+ /// ```text
252+ /// stack.pop()
253+ /// parent = stack.top()
254+ /// child = parent.childNodes[parent.childNodes.length - n - 1]
255+ /// stack.push(child)
256+ /// ```
257+ pop_push_reverse_child(n) = 21,
258+
259+ /// Stack: `[... Node] -> [... Node]`
260+ ///
261+ /// ```text
262+ /// parent = stack.top()
263+ /// child = parent.childNodes[n]
264+ /// child.remove()
265+ /// ```
266+ remove_child(n) = 22,
267+
268+ /// Stack: `[... Node] -> [... Node]`
269+ ///
270+ /// ```text
271+ /// class = getCachedString(class)
272+ /// node = stack.top()
273+ /// node.className = class
274+ /// ```
275+ set_class(class) = 23,
276+
277+ /// Stack: `[... Node] -> [... Node]`
278+ ///
279+ /// ```text
280+ /// template = stack.top()
281+ /// saveTemplate(id, template)
282+ /// ```
283+ save_template(id) = 24,
284+
285+ /// Stack: `[...] -> [... Node]`
286+ ///
287+ /// ```text
288+ /// template = getTemplate(id)
289+ /// stack.push(template.cloneNode(true))
290+ /// ```
291+ push_template(id) = 25,
292+}
src/change_list/js.rsnew file+40
@@ -0,0 +1,40 @@
1+cfg_if::cfg_if! {
2+ if #[cfg(all(feature = "xxx-unstable-internal-use-only", not(target_arch = "wasm32")))] {
3+ #[derive(Clone, Debug)]
4+ pub struct ChangeListInterpreter {}
5+ impl ChangeListInterpreter {
6+ pub fn new(_container: &crate::Element) -> ChangeListInterpreter {
7+ ChangeListInterpreter {}
8+ }
9+ pub fn unmount(&self) {}
10+ pub fn add_change_list_range(&self, _start: usize, _len: usize) {}
11+ pub fn init_events_trampoline(&self, _trampoline: &crate::EventsTrampoline) {}
12+ }
13+ } else {
14+ use wasm_bindgen::prelude::*;
15+
16+ #[wasm_bindgen(module = "/js/change-list-interpreter.js")]
17+ extern "C" {
18+ #[derive(Clone, Debug)]
19+ pub type ChangeListInterpreter;
20+
21+ #[wasm_bindgen(constructor)]
22+ pub fn new(container: &web_sys::Element) -> ChangeListInterpreter;
23+
24+ #[wasm_bindgen(structural, method)]
25+ pub fn unmount(this: &ChangeListInterpreter);
26+
27+ #[wasm_bindgen(structural, method, js_name = addChangeListRange)]
28+ pub fn add_change_list_range(this: &ChangeListInterpreter, start: usize, len: usize);
29+
30+ #[wasm_bindgen(structural, method, js_name = applyChanges)]
31+ pub fn apply_changes(this: &ChangeListInterpreter, memory: JsValue);
32+
33+ #[wasm_bindgen(structural, method, js_name = initEventsTrampoline)]
34+ pub fn init_events_trampoline(
35+ this: &ChangeListInterpreter,
36+ trampoline: &crate::EventsTrampoline,
37+ );
38+ }
39+ }
40+}
src/change_list/mod.rsnew file+353
@@ -0,0 +1,353 @@
1+pub(crate) mod emitter;
2+pub(crate) mod strings;
3+pub(crate) mod traversal;
4+
5+// Note: has to be `pub` because of `wasm-bindgen` visibility restrictions.
6+pub mod js;
7+
8+use self::emitter::InstructionEmitter;
9+use self::strings::{StringKey, StringsCache};
10+use self::traversal::{MoveTo, Traversal};
11+use crate::{cached_set::CacheId, Listener};
12+use fxhash::FxHashSet;
13+
14+#[derive(Debug)]
15+pub(crate) struct ChangeListPersistentState {
16+ strings: StringsCache,
17+ emitter: InstructionEmitter,
18+ traversal: Traversal,
19+ interpreter: js::ChangeListInterpreter,
20+ templates: FxHashSet<CacheId>,
21+}
22+
23+pub(crate) struct ChangeListBuilder<'a> {
24+ state: &'a mut ChangeListPersistentState,
25+ next_temporary: u32,
26+ forcing_new_listeners: bool,
27+}
28+
29+impl Drop for ChangeListPersistentState {
30+ fn drop(&mut self) {
31+ self.interpreter.unmount();
32+ }
33+}
34+
35+impl ChangeListPersistentState {
36+ pub(crate) fn new(container: &crate::Element) -> ChangeListPersistentState {
37+ let strings = StringsCache::new();
38+ let emitter = InstructionEmitter::new();
39+ let traversal = Traversal::new();
40+ let interpreter = js::ChangeListInterpreter::new(container);
41+ let templates = Default::default();
42+ ChangeListPersistentState {
43+ strings,
44+ emitter,
45+ traversal,
46+ interpreter,
47+ templates,
48+ }
49+ }
50+
51+ pub(crate) fn init_events_trampoline(&mut self, trampoline: &crate::EventsTrampoline) {
52+ self.interpreter.init_events_trampoline(trampoline);
53+ }
54+
55+ pub(crate) fn builder<'a>(&'a mut self) -> ChangeListBuilder<'a> {
56+ ChangeListBuilder {
57+ state: self,
58+ next_temporary: 0,
59+ forcing_new_listeners: false,
60+ }
61+ }
62+}
63+
64+cfg_if::cfg_if! {
65+ if #[cfg(all(feature = "xxx-unstable-internal-use-only", not(target_arch = "wasm32")))] {
66+ impl ChangeListBuilder<'_> {
67+ pub(crate) fn finish(self) {
68+ self.state.strings.drop_unused_strings(&self.state.emitter);
69+
70+ // Nothing to actually apply the changes to.
71+
72+ self.state.emitter.reset();
73+ self.state.traversal.reset();
74+ }
75+ }
76+ } else {
77+ impl ChangeListBuilder<'_> {
78+ pub(crate) fn finish(self) {
79+ self.state.strings.drop_unused_strings(&self.state.emitter);
80+
81+ // Apply the changes.
82+ let interpreter = &self.state.interpreter;
83+ self.state.emitter.each_instruction_sequence(|seq| {
84+ interpreter.add_change_list_range(seq.as_ptr() as usize, seq.len());
85+ });
86+ interpreter.apply_changes(wasm_bindgen::memory());
87+
88+ self.state.emitter.reset();
89+ self.state.traversal.reset();
90+ }
91+ }
92+ }
93+}
94+
95+/// Traversal methods.
96+impl ChangeListBuilder<'_> {
97+ pub fn go_down(&mut self) {
98+ self.state.traversal.down();
99+ }
100+
101+ pub fn go_down_to_child(&mut self, index: usize) {
102+ self.state.traversal.down();
103+ self.state.traversal.sibling(index);
104+ }
105+
106+ pub fn go_down_to_reverse_child(&mut self, index: usize) {
107+ self.state.traversal.down();
108+ self.state.traversal.reverse_sibling(index);
109+ }
110+
111+ pub fn go_up(&mut self) {
112+ self.state.traversal.up();
113+ }
114+
115+ pub fn go_to_sibling(&mut self, index: usize) {
116+ self.state.traversal.sibling(index);
117+ }
118+
119+ pub fn go_to_temp_sibling(&mut self, temp: u32) {
120+ self.state.traversal.up();
121+ self.state.traversal.down_to_temp(temp);
122+ }
123+
124+ pub fn go_down_to_temp_child(&mut self, temp: u32) {
125+ self.state.traversal.down_to_temp(temp);
126+ }
127+
128+ pub fn commit_traversal(&mut self) {
129+ if self.state.traversal.is_committed() {
130+ return;
131+ }
132+
133+ for mv in self.state.traversal.commit() {
134+ match mv {
135+ MoveTo::Parent => {
136+ debug!("emit: pop");
137+ self.state.emitter.pop();
138+ }
139+ MoveTo::Child(n) => {
140+ debug!("emit: push_child({})", n);
141+ self.state.emitter.push_child(n);
142+ }
143+ MoveTo::ReverseChild(n) => {
144+ debug!("emit: push_reverse_child({})", n);
145+ self.state.emitter.push_reverse_child(n);
146+ }
147+ MoveTo::Sibling(n) => {
148+ debug!("emit: pop_push_child({})", n);
149+ self.state.emitter.pop_push_child(n);
150+ }
151+ MoveTo::ReverseSibling(n) => {
152+ debug!("emit: pop_push_reverse_child({})", n);
153+ self.state.emitter.pop_push_reverse_child(n);
154+ }
155+ MoveTo::TempChild(temp) => {
156+ debug!("emit: push_temporary({})", temp);
157+ self.state.emitter.push_temporary(temp);
158+ }
159+ }
160+ }
161+ }
162+
163+ pub fn traversal_is_committed(&self) -> bool {
164+ self.state.traversal.is_committed()
165+ }
166+}
167+
168+impl ChangeListBuilder<'_> {
169+ pub fn next_temporary(&self) -> u32 {
170+ self.next_temporary
171+ }
172+
173+ pub fn set_next_temporary(&mut self, next_temporary: u32) {
174+ self.next_temporary = next_temporary;
175+ }
176+
177+ pub fn save_children_to_temporaries(&mut self, start: usize, end: usize) -> u32 {
178+ debug_assert!(self.traversal_is_committed());
179+ debug_assert!(start < end);
180+ let temp_base = self.next_temporary;
181+ debug!(
182+ "emit: save_children_to_temporaries({}, {}, {})",
183+ temp_base, start, end
184+ );
185+ self.next_temporary = temp_base + (end - start) as u32;
186+ self.state
187+ .emitter
188+ .save_children_to_temporaries(temp_base, start as u32, end as u32);
189+ temp_base
190+ }
191+
192+ pub fn push_temporary(&self, temp: u32) {
193+ debug_assert!(self.traversal_is_committed());
194+ debug!("emit: push_temporary({})", temp);
195+ self.state.emitter.push_temporary(temp);
196+ }
197+
198+ pub fn remove_child(&self, child: usize) {
199+ debug_assert!(self.traversal_is_committed());
200+ debug!("emit: remove_child({})", child);
201+ self.state.emitter.remove_child(child as u32);
202+ }
203+
204+ pub fn insert_before(&self) {
205+ debug_assert!(self.traversal_is_committed());
206+ debug!("emit: insert_before()");
207+ self.state.emitter.insert_before();
208+ }
209+
210+ pub fn ensure_string(&mut self, string: &str) -> StringKey {
211+ self.state
212+ .strings
213+ .ensure_string(string, &self.state.emitter)
214+ }
215+
216+ pub fn set_text(&self, text: &str) {
217+ debug_assert!(self.traversal_is_committed());
218+ debug!("emit: set_text({:?})", text);
219+ self.state
220+ .emitter
221+ .set_text(text.as_ptr() as u32, text.len() as u32);
222+ }
223+
224+ pub fn remove_self_and_next_siblings(&self) {
225+ debug_assert!(self.traversal_is_committed());
226+ debug!("emit: remove_self_and_next_siblings()");
227+ self.state.emitter.remove_self_and_next_siblings();
228+ }
229+
230+ pub fn replace_with(&self) {
231+ debug_assert!(self.traversal_is_committed());
232+ debug!("emit: replace_with()");
233+ self.state.emitter.replace_with();
234+ }
235+
236+ pub fn set_attribute(&mut self, name: &str, value: &str, is_namespaced: bool) {
237+ debug_assert!(self.traversal_is_committed());
238+ if name == "class" && !is_namespaced {
239+ let class_id = self.ensure_string(value);
240+ debug!("emit: set_class({:?})", value);
241+ self.state.emitter.set_class(class_id.into());
242+ } else {
243+ let name_id = self.ensure_string(name);
244+ let value_id = self.ensure_string(value);
245+ debug!("emit: set_attribute({:?}, {:?})", name, value);
246+ self.state
247+ .emitter
248+ .set_attribute(name_id.into(), value_id.into());
249+ }
250+ }
251+
252+ pub fn remove_attribute(&mut self, name: &str) {
253+ debug_assert!(self.traversal_is_committed());
254+ debug!("emit: remove_attribute({:?})", name);
255+ let name_id = self.ensure_string(name);
256+ self.state.emitter.remove_attribute(name_id.into());
257+ }
258+
259+ pub fn append_child(&self) {
260+ debug_assert!(self.traversal_is_committed());
261+ debug!("emit: append_child()");
262+ self.state.emitter.append_child();
263+ }
264+
265+ pub fn create_text_node(&self, text: &str) {
266+ debug_assert!(self.traversal_is_committed());
267+ debug!("emit: create_text_node({:?})", text);
268+ self.state
269+ .emitter
270+ .create_text_node(text.as_ptr() as u32, text.len() as u32);
271+ }
272+
273+ pub fn create_element(&mut self, tag_name: &str) {
274+ debug_assert!(self.traversal_is_committed());
275+ debug!("emit: create_element({:?})", tag_name);
276+ let tag_name_id = self.ensure_string(tag_name);
277+ self.state.emitter.create_element(tag_name_id.into());
278+ }
279+
280+ pub fn create_element_ns(&mut self, tag_name: &str, ns: &str) {
281+ debug_assert!(self.traversal_is_committed());
282+ debug!("emit: create_element_ns({:?}, {:?})", tag_name, ns);
283+ let tag_name_id = self.ensure_string(tag_name);
284+ let ns_id = self.ensure_string(ns);
285+ self.state
286+ .emitter
287+ .create_element_ns(tag_name_id.into(), ns_id.into());
288+ }
289+
290+ pub fn push_force_new_listeners(&mut self) -> bool {
291+ let old = self.forcing_new_listeners;
292+ self.forcing_new_listeners = true;
293+ old
294+ }
295+
296+ pub fn pop_force_new_listeners(&mut self, previous: bool) {
297+ debug_assert!(self.forcing_new_listeners);
298+ self.forcing_new_listeners = previous;
299+ }
300+
301+ pub fn new_event_listener(&mut self, listener: &Listener) {
302+ debug_assert!(self.traversal_is_committed());
303+ debug!("emit: new_event_listener({:?})", listener);
304+ let (a, b) = listener.get_callback_parts();
305+ debug_assert!(a != 0);
306+ let event_id = self.ensure_string(listener.event);
307+ self.state.emitter.new_event_listener(event_id.into(), a, b);
308+ }
309+
310+ pub fn update_event_listener(&mut self, listener: &Listener) {
311+ debug_assert!(self.traversal_is_committed());
312+
313+ if self.forcing_new_listeners {
314+ self.new_event_listener(listener);
315+ return;
316+ }
317+
318+ debug!("emit: update_event_listener({:?})", listener);
319+ let (a, b) = listener.get_callback_parts();
320+ debug_assert!(a != 0);
321+ let event_id = self.ensure_string(listener.event);
322+ self.state
323+ .emitter
324+ .update_event_listener(event_id.into(), a, b);
325+ }
326+
327+ pub fn remove_event_listener(&mut self, event: &str) {
328+ debug_assert!(self.traversal_is_committed());
329+ debug!("emit: remove_event_listener({:?})", event);
330+ let event_id = self.ensure_string(event);
331+ self.state.emitter.remove_event_listener(event_id.into());
332+ }
333+
334+ #[inline]
335+ pub fn has_template(&mut self, id: CacheId) -> bool {
336+ self.state.templates.contains(&id)
337+ }
338+
339+ pub fn save_template(&mut self, id: CacheId) {
340+ debug_assert!(self.traversal_is_committed());
341+ debug_assert!(!self.has_template(id));
342+ debug!("emit: save_template({:?})", id);
343+ self.state.templates.insert(id);
344+ self.state.emitter.save_template(id.into());
345+ }
346+
347+ pub fn push_template(&mut self, id: CacheId) {
348+ debug_assert!(self.traversal_is_committed());
349+ debug_assert!(self.has_template(id));
350+ debug!("emit: push_template({:?})", id);
351+ self.state.emitter.push_template(id.into());
352+ }
353+}
src/change_list/strings.rsnew file+66
@@ -0,0 +1,66 @@
1+use crate::change_list::emitter::InstructionEmitter;
2+use fxhash::FxHashMap;
3+
4+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
5+pub struct StringKey(u32);
6+
7+impl From<StringKey> for u32 {
8+ #[inline]
9+ fn from(key: StringKey) -> u32 {
10+ key.0
11+ }
12+}
13+
14+#[derive(Debug)]
15+struct StringsCacheEntry {
16+ key: StringKey,
17+ used: bool,
18+}
19+
20+#[derive(Debug, Default)]
21+pub(crate) struct StringsCache {
22+ entries: FxHashMap<String, StringsCacheEntry>,
23+ next_string_key: u32,
24+}
25+
26+impl StringsCache {
27+ /// Create a new, empty strings cache.
28+ pub fn new() -> StringsCache {
29+ Default::default()
30+ }
31+
32+ /// Ensure that the given string is cached, and get its key.
33+ pub fn ensure_string(&mut self, string: &str, emitter: &InstructionEmitter) -> StringKey {
34+ if let Some(entry) = self.entries.get_mut(string) {
35+ entry.used = true;
36+ entry.key
37+ } else {
38+ let key = StringKey(self.next_string_key);
39+ self.next_string_key += 1;
40+ let entry = StringsCacheEntry { key, used: true };
41+ self.entries.insert(string.to_string(), entry);
42+ emitter.add_cached_string(string.as_ptr() as u32, string.len() as u32, key.into());
43+ key
44+ }
45+ }
46+
47+ pub fn drop_unused_strings(&mut self, emitter: &InstructionEmitter) {
48+ self.entries.retain(|string, entry| {
49+ if entry.used {
50+ // Since this entry was used during while rendering this frame,
51+ // it is likely going to be used for the next frame as well. So
52+ // we keep it in the cache so that we don't have to repopulate
53+ // and resync the cache next frame (assuming it is reused), but
54+ // we set the `used` flag to false so that if it is not used
55+ // next frame, it will be cleaned up.
56+ entry.used = false;
57+ true
58+ } else {
59+ let key = entry.key.into();
60+ debug!("emit: drop_cached_string({}) = {:?}", key, string);
61+ emitter.drop_cached_string(key);
62+ false
63+ }
64+ });
65+ }
66+}
src/change_list/traversal.rsnew file+344
@@ -0,0 +1,344 @@
1+//! Keeps track of where we are moving in a DOM tree, and shortens traversal
2+//! paths between mutations to their minimal number of operations.
3+
4+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
5+pub enum MoveTo {
6+ /// Move from the current node up to its parent.
7+ Parent,
8+
9+ /// Move to the current node's n^th child.
10+ Child(u32),
11+
12+ /// Move to the current node's n^th from last child.
13+ ReverseChild(u32),
14+
15+ /// Move to the n^th sibling. Not relative from the current
16+ /// location. Absolute indexed within all of the current siblings.
17+ Sibling(u32),
18+
19+ /// Move to the n^th from last sibling. Not relative from the current
20+ /// location. Absolute indexed within all of the current siblings.
21+ ReverseSibling(u32),
22+
23+ /// Move down to the given saved temporary child.
24+ TempChild(u32),
25+}
26+
27+#[derive(Debug)]
28+pub struct Traversal {
29+ uncommitted: Vec<MoveTo>,
30+}
31+
32+impl Traversal {
33+ /// Construct a new `Traversal` with its internal storage backed by the
34+ /// given bump arena.
35+ pub fn new() -> Traversal {
36+ Traversal {
37+ uncommitted: Vec::with_capacity(32),
38+ }
39+ }
40+
41+ /// Move the traversal up in the tree.
42+ pub fn up(&mut self) {
43+ match self.uncommitted.last() {
44+ Some(MoveTo::Sibling(_)) | Some(MoveTo::ReverseSibling(_)) => {
45+ self.uncommitted.pop();
46+ self.uncommitted.push(MoveTo::Parent);
47+ }
48+ Some(MoveTo::TempChild(_)) | Some(MoveTo::Child(_)) | Some(MoveTo::ReverseChild(_)) => {
49+ self.uncommitted.pop();
50+ // And we're back at the parent.
51+ }
52+ _ => {
53+ self.uncommitted.push(MoveTo::Parent);
54+ }
55+ }
56+ }
57+
58+ /// Move the traversal down in the tree to the first child of the current
59+ /// node.
60+ pub fn down(&mut self) {
61+ if let Some(&MoveTo::Parent) = self.uncommitted.last() {
62+ self.uncommitted.pop();
63+ self.sibling(0);
64+ } else {
65+ self.uncommitted.push(MoveTo::Child(0));
66+ }
67+ }
68+
69+ /// Move the traversal to the n^th sibling.
70+ pub fn sibling(&mut self, index: usize) {
71+ let index = index as u32;
72+ match self.uncommitted.last_mut() {
73+ Some(MoveTo::Sibling(ref mut n)) | Some(MoveTo::Child(ref mut n)) => {
74+ *n = index;
75+ }
76+ Some(MoveTo::ReverseSibling(_)) => {
77+ self.uncommitted.pop();
78+ self.uncommitted.push(MoveTo::Sibling(index));
79+ }
80+ Some(MoveTo::TempChild(_)) | Some(MoveTo::ReverseChild(_)) => {
81+ self.uncommitted.pop();
82+ self.uncommitted.push(MoveTo::Child(index))
83+ }
84+ _ => {
85+ self.uncommitted.push(MoveTo::Sibling(index));
86+ }
87+ }
88+ }
89+
90+ /// Move the the n^th from last sibling.
91+ pub fn reverse_sibling(&mut self, index: usize) {
92+ let index = index as u32;
93+ match self.uncommitted.last_mut() {
94+ Some(MoveTo::ReverseSibling(ref mut n)) | Some(MoveTo::ReverseChild(ref mut n)) => {
95+ *n = index;
96+ }
97+ Some(MoveTo::Sibling(_)) => {
98+ self.uncommitted.pop();
99+ self.uncommitted.push(MoveTo::ReverseSibling(index));
100+ }
101+ Some(MoveTo::TempChild(_)) | Some(MoveTo::Child(_)) => {
102+ self.uncommitted.pop();
103+ self.uncommitted.push(MoveTo::ReverseChild(index))
104+ }
105+ _ => {
106+ self.uncommitted.push(MoveTo::ReverseSibling(index));
107+ }
108+ }
109+ }
110+
111+ /// Go to the given saved temporary.
112+ pub fn down_to_temp(&mut self, temp: u32) {
113+ match self.uncommitted.last() {
114+ Some(MoveTo::Sibling(_)) | Some(MoveTo::ReverseSibling(_)) => {
115+ self.uncommitted.pop();
116+ }
117+ Some(MoveTo::Parent)
118+ | Some(MoveTo::TempChild(_))
119+ | Some(MoveTo::Child(_))
120+ | Some(MoveTo::ReverseChild(_))
121+ | None => {
122+ // Can't remove moves to parents since we rely on their stack
123+ // pops.
124+ }
125+ }
126+ self.uncommitted.push(MoveTo::TempChild(temp));
127+ }
128+
129+ /// Are all the traversal's moves committed? That is, are there no moves
130+ /// that have *not* been committed yet?
131+ #[inline]
132+ pub fn is_committed(&self) -> bool {
133+ self.uncommitted.is_empty()
134+ }
135+
136+ /// Commit this traversals moves and return the optimized path from the last
137+ /// commit.
138+ #[inline]
139+ pub fn commit(&mut self) -> Moves {
140+ Moves {
141+ inner: self.uncommitted.drain(..),
142+ }
143+ }
144+
145+ #[inline]
146+ pub fn reset(&mut self) {
147+ self.uncommitted.clear();
148+ }
149+}
150+
151+pub struct Moves<'a> {
152+ inner: std::vec::Drain<'a, MoveTo>,
153+}
154+
155+impl Iterator for Moves<'_> {
156+ type Item = MoveTo;
157+
158+ #[inline]
159+ fn next(&mut self) -> Option<MoveTo> {
160+ self.inner.next()
161+ }
162+}
163+
164+#[cfg(test)]
165+mod tests {
166+ use super::*;
167+
168+ #[test]
169+ fn test_traversal() {
170+ fn t<F>(f: F) -> Box<dyn FnMut(&mut Traversal)>
171+ where
172+ F: 'static + FnMut(&mut Traversal),
173+ {
174+ Box::new(f) as _
175+ }
176+
177+ for (mut traverse, expected_moves) in vec![
178+ (
179+ t(|t| {
180+ t.down();
181+ }),
182+ vec![MoveTo::Child(0)],
183+ ),
184+ (
185+ t(|t| {
186+ t.up();
187+ }),
188+ vec![MoveTo::Parent],
189+ ),
190+ (
191+ t(|t| {
192+ t.sibling(42);
193+ }),
194+ vec![MoveTo::Sibling(42)],
195+ ),
196+ (
197+ t(|t| {
198+ t.down();
199+ t.up();
200+ }),
201+ vec![],
202+ ),
203+ (
204+ t(|t| {
205+ t.down();
206+ t.sibling(2);
207+ t.up();
208+ }),
209+ vec![],
210+ ),
211+ (
212+ t(|t| {
213+ t.down();
214+ t.sibling(3);
215+ }),
216+ vec![MoveTo::Child(3)],
217+ ),
218+ (
219+ t(|t| {
220+ t.down();
221+ t.sibling(4);
222+ t.sibling(8);
223+ }),
224+ vec![MoveTo::Child(8)],
225+ ),
226+ (
227+ t(|t| {
228+ t.sibling(1);
229+ t.sibling(1);
230+ }),
231+ vec![MoveTo::Sibling(1)],
232+ ),
233+ (
234+ t(|t| {
235+ t.reverse_sibling(3);
236+ }),
237+ vec![MoveTo::ReverseSibling(3)],
238+ ),
239+ (
240+ t(|t| {
241+ t.down();
242+ t.reverse_sibling(3);
243+ }),
244+ vec![MoveTo::ReverseChild(3)],
245+ ),
246+ (
247+ t(|t| {
248+ t.down();
249+ t.reverse_sibling(3);
250+ t.up();
251+ }),
252+ vec![],
253+ ),
254+ (
255+ t(|t| {
256+ t.down();
257+ t.reverse_sibling(3);
258+ t.reverse_sibling(6);
259+ }),
260+ vec![MoveTo::ReverseChild(6)],
261+ ),
262+ (
263+ t(|t| {
264+ t.up();
265+ t.reverse_sibling(3);
266+ t.reverse_sibling(6);
267+ }),
268+ vec![MoveTo::Parent, MoveTo::ReverseSibling(6)],
269+ ),
270+ (
271+ t(|t| {
272+ t.up();
273+ t.sibling(3);
274+ t.sibling(6);
275+ }),
276+ vec![MoveTo::Parent, MoveTo::Sibling(6)],
277+ ),
278+ (
279+ t(|t| {
280+ t.sibling(3);
281+ t.sibling(6);
282+ t.up();
283+ }),
284+ vec![MoveTo::Parent],
285+ ),
286+ (
287+ t(|t| {
288+ t.reverse_sibling(3);
289+ t.reverse_sibling(6);
290+ t.up();
291+ }),
292+ vec![MoveTo::Parent],
293+ ),
294+ (
295+ t(|t| {
296+ t.down();
297+ t.down_to_temp(3);
298+ }),
299+ vec![MoveTo::Child(0), MoveTo::TempChild(3)],
300+ ),
301+ (
302+ t(|t| {
303+ t.down_to_temp(3);
304+ t.sibling(5);
305+ }),
306+ vec![MoveTo::Child(5)],
307+ ),
308+ (
309+ t(|t| {
310+ t.down_to_temp(3);
311+ t.reverse_sibling(5);
312+ }),
313+ vec![MoveTo::ReverseChild(5)],
314+ ),
315+ (
316+ t(|t| {
317+ t.down_to_temp(3);
318+ t.up();
319+ }),
320+ vec![],
321+ ),
322+ (
323+ t(|t| {
324+ t.sibling(2);
325+ t.up();
326+ t.down_to_temp(3);
327+ }),
328+ vec![MoveTo::Parent, MoveTo::TempChild(3)],
329+ ),
330+ (
331+ t(|t| {
332+ t.up();
333+ t.down_to_temp(3);
334+ }),
335+ vec![MoveTo::Parent, MoveTo::TempChild(3)],
336+ ),
337+ ] {
338+ let mut traversal = Traversal::new();
339+ traverse(&mut traversal);
340+ let actual_moves: Vec<_> = traversal.commit().collect();
341+ assert_eq!(actual_moves, expected_moves);
342+ }
343+ }
344+}
src/diff.rsnew file+1125
@@ -0,0 +1,1125 @@
1+use crate::{
2+ cached_set::{CacheId, CachedSet},
3+ change_list::ChangeListBuilder,
4+ events::EventsRegistry,
5+ node::{Attribute, ElementNode, Listener, Node, NodeKind, TextNode},
6+};
7+use fxhash::{FxHashMap, FxHashSet};
8+use std::cmp::Ordering;
9+use std::u32;
10+use wasm_bindgen::UnwrapThrowExt;
11+
12+// Diff the `old` node with the `new` node. Emits instructions to modify a
13+// physical DOM node that reflects `old` into something that reflects `new`.
14+//
15+// Upon entry to this function, the physical DOM node must be on the top of the
16+// change list stack:
17+//
18+// [... node]
19+//
20+// The change list stack is in the same state when this function exits.
21+pub(crate) fn diff(
22+ cached_set: &CachedSet,
23+ change_list: &mut ChangeListBuilder,
24+ registry: &mut EventsRegistry,
25+ old: &Node,
26+ new: &Node,
27+ cached_roots: &mut FxHashSet<CacheId>,
28+) {
29+ match (&new.kind, &old.kind) {
30+ (
31+ &NodeKind::Text(TextNode { text: new_text }),
32+ &NodeKind::Text(TextNode { text: old_text }),
33+ ) => {
34+ if new_text != old_text {
35+ change_list.commit_traversal();
36+ change_list.set_text(new_text);
37+ }
38+ }
39+
40+ (&NodeKind::Text(_), &NodeKind::Element(_)) => {
41+ change_list.commit_traversal();
42+ create(cached_set, change_list, registry, new, cached_roots);
43+ registry.remove_subtree(&old);
44+ change_list.replace_with();
45+ }
46+
47+ (&NodeKind::Element(_), &NodeKind::Text(_)) => {
48+ change_list.commit_traversal();
49+ create(cached_set, change_list, registry, new, cached_roots);
50+ // Note: text nodes cannot have event listeners, so we don't need to
51+ // remove the old node's listeners from our registry her.
52+ change_list.replace_with();
53+ }
54+
55+ (
56+ &NodeKind::Element(ElementNode {
57+ key: _,
58+ tag_name: new_tag_name,
59+ listeners: new_listeners,
60+ attributes: new_attributes,
61+ children: new_children,
62+ namespace: new_namespace,
63+ }),
64+ &NodeKind::Element(ElementNode {
65+ key: _,
66+ tag_name: old_tag_name,
67+ listeners: old_listeners,
68+ attributes: old_attributes,
69+ children: old_children,
70+ namespace: old_namespace,
71+ }),
72+ ) => {
73+ if new_tag_name != old_tag_name || new_namespace != old_namespace {
74+ change_list.commit_traversal();
75+ create(cached_set, change_list, registry, new, cached_roots);
76+ registry.remove_subtree(&old);
77+ change_list.replace_with();
78+ return;
79+ }
80+ diff_listeners(change_list, registry, old_listeners, new_listeners);
81+ diff_attributes(change_list, old_attributes, new_attributes, new_namespace.is_some());
82+ diff_children(
83+ cached_set,
84+ change_list,
85+ registry,
86+ old_children,
87+ new_children,
88+ cached_roots,
89+ );
90+ }
91+
92+ // Both the new and old nodes are cached.
93+ (&NodeKind::Cached(ref new), &NodeKind::Cached(ref old)) => {
94+ cached_roots.insert(new.id);
95+
96+ if new.id == old.id {
97+ // This is the same cached node, so nothing has changed!
98+ return;
99+ }
100+
101+ let (new, new_template) = cached_set.get(new.id);
102+ let (old, old_template) = cached_set.get(old.id);
103+ if new_template == old_template {
104+ // If they are both using the same template, then just diff the
105+ // subtrees.
106+ diff(cached_set, change_list, registry, old, new, cached_roots);
107+ } else {
108+ // Otherwise, they are probably different enough that
109+ // re-constructing the subtree from scratch should be faster.
110+ // This doubly holds true if we have a new template.
111+ change_list.commit_traversal();
112+ create_and_replace(
113+ cached_set,
114+ change_list,
115+ registry,
116+ new_template,
117+ old,
118+ new,
119+ cached_roots,
120+ );
121+ }
122+ }
123+
124+ // New cached node when the old node was not cached. In this scenario,
125+ // we assume that they are pretty different, and it isn't worth diffing
126+ // the subtrees, so we just create the new cached node afresh.
127+ (&NodeKind::Cached(ref c), _) => {
128+ change_list.commit_traversal();
129+ cached_roots.insert(c.id);
130+ let (new, new_template) = cached_set.get(c.id);
131+ create_and_replace(
132+ cached_set,
133+ change_list,
134+ registry,
135+ new_template,
136+ old,
137+ new,
138+ cached_roots,
139+ );
140+ }
141+
142+ // Old cached node and new non-cached node. Again, assume that they are
143+ // probably pretty different and create the new non-cached node afresh.
144+ (_, &NodeKind::Cached(_)) => {
145+ change_list.commit_traversal();
146+ create(cached_set, change_list, registry, new, cached_roots);
147+ registry.remove_subtree(&old);
148+ change_list.replace_with();
149+ }
150+ }
151+}
152+
153+// Diff event listeners between `old` and `new`.
154+//
155+// The listeners' node must be on top of the change list stack:
156+//
157+// [... node]
158+//
159+// The change list stack is left unchanged.
160+fn diff_listeners(
161+ change_list: &mut ChangeListBuilder,
162+ registry: &mut EventsRegistry,
163+ old: &[Listener],
164+ new: &[Listener],
165+) {
166+ if !old.is_empty() || !new.is_empty() {
167+ change_list.commit_traversal();
168+ }
169+
170+ 'outer1: for new_l in new {
171+ unsafe {
172+ // Safety relies on removing `new_l` from the registry manually at
173+ // the end of its lifetime. This happens below in the `'outer2`
174+ // loop, and elsewhere in diffing when removing old dom trees.
175+ registry.add(new_l);
176+ }
177+
178+ for old_l in old {
179+ if new_l.event == old_l.event {
180+ change_list.update_event_listener(new_l);
181+ continue 'outer1;
182+ }
183+ }
184+
185+ change_list.new_event_listener(new_l);
186+ }
187+
188+ 'outer2: for old_l in old {
189+ registry.remove(old_l);
190+
191+ for new_l in new {
192+ if new_l.event == old_l.event {
193+ continue 'outer2;
194+ }
195+ }
196+ change_list.remove_event_listener(old_l.event);
197+ }
198+}
199+
200+// Diff a node's attributes.
201+//
202+// The attributes' node must be on top of the change list stack:
203+//
204+// [... node]
205+//
206+// The change list stack is left unchanged.
207+fn diff_attributes(change_list: &mut ChangeListBuilder, old: &[Attribute], new: &[Attribute], is_namespaced: bool) {
208+ // Do O(n^2) passes to add/update and remove attributes, since
209+ // there are almost always very few attributes.
210+ 'outer: for new_attr in new {
211+ if new_attr.is_volatile() {
212+ change_list.commit_traversal();
213+ change_list.set_attribute(new_attr.name, new_attr.value, is_namespaced);
214+ } else {
215+ for old_attr in old {
216+ if old_attr.name == new_attr.name {
217+ if old_attr.value != new_attr.value {
218+ change_list.commit_traversal();
219+ change_list.set_attribute(new_attr.name, new_attr.value, is_namespaced);
220+ }
221+ continue 'outer;
222+ }
223+ }
224+
225+ change_list.commit_traversal();
226+ change_list.set_attribute(new_attr.name, new_attr.value, is_namespaced);
227+ }
228+ }
229+
230+ 'outer2: for old_attr in old {
231+ for new_attr in new {
232+ if old_attr.name == new_attr.name {
233+ continue 'outer2;
234+ }
235+ }
236+
237+ change_list.commit_traversal();
238+ change_list.remove_attribute(old_attr.name);
239+ }
240+}
241+
242+// Diff the given set of old and new children.
243+//
244+// The parent must be on top of the change list stack when this function is
245+// entered:
246+//
247+// [... parent]
248+//
249+// the change list stack is in the same state when this function returns.
250+fn diff_children(
251+ cached_set: &CachedSet,
252+ change_list: &mut ChangeListBuilder,
253+ registry: &mut EventsRegistry,
254+ old: &[Node],
255+ new: &[Node],
256+ cached_roots: &mut FxHashSet<CacheId>,
257+) {
258+ if new.is_empty() {
259+ if !old.is_empty() {
260+ change_list.commit_traversal();
261+ remove_all_children(change_list, registry, old);
262+ }
263+ return;
264+ }
265+
266+ if new.len() == 1 {
267+ match (old.first(), &new[0]) {
268+ (
269+ Some(&Node {
270+ kind: NodeKind::Text(TextNode { text: old_text }),
271+ }),
272+ &Node {
273+ kind: NodeKind::Text(TextNode { text: new_text }),
274+ },
275+ ) if old_text == new_text => {
276+ // Don't take this fast path...
277+ }
278+ (
279+ _,
280+ &Node {
281+ kind: NodeKind::Text(TextNode { text }),
282+ },
283+ ) => {
284+ change_list.commit_traversal();
285+ change_list.set_text(text);
286+ for o in old {
287+ registry.remove_subtree(o);
288+ }
289+ return;
290+ }
291+ (_, _) => {}
292+ }
293+ }
294+
295+ if old.is_empty() {
296+ if !new.is_empty() {
297+ change_list.commit_traversal();
298+ create_and_append_children(cached_set, change_list, registry, new, cached_roots);
299+ }
300+ return;
301+ }
302+
303+ let new_is_keyed = new[0].key().is_some();
304+ let old_is_keyed = old[0].key().is_some();
305+
306+ debug_assert!(
307+ new.iter().all(|n| n.key().is_some() == new_is_keyed),
308+ "all siblings must be keyed or all siblings must be non-keyed"
309+ );
310+ debug_assert!(
311+ old.iter().all(|o| o.key().is_some() == old_is_keyed),
312+ "all siblings must be keyed or all siblings must be non-keyed"
313+ );
314+
315+ if new_is_keyed && old_is_keyed {
316+ let t = change_list.next_temporary();
317+ diff_keyed_children(cached_set, change_list, registry, old, new, cached_roots);
318+ change_list.set_next_temporary(t);
319+ } else {
320+ diff_non_keyed_children(cached_set, change_list, registry, old, new, cached_roots);
321+ }
322+}
323+
324+// Diffing "keyed" children.
325+//
326+// With keyed children, we care about whether we delete, move, or create nodes
327+// versus mutate existing nodes in place. Presumably there is some sort of CSS
328+// transition animation that makes the virtual DOM diffing algorithm
329+// observable. By specifying keys for nodes, we know which virtual DOM nodes
330+// must reuse (or not reuse) the same physical DOM nodes.
331+//
332+// This is loosely based on Inferno's keyed patching implementation. However, we
333+// have to modify the algorithm since we are compiling the diff down into change
334+// list instructions that will be executed later, rather than applying the
335+// changes to the DOM directly as we compare virtual DOMs.
336+//
337+// https://github.com/infernojs/inferno/blob/36fd96/packages/inferno/src/DOM/patching.ts#L530-L739
338+//
339+// When entering this function, the parent must be on top of the change list
340+// stack:
341+//
342+// [... parent]
343+//
344+// Upon exiting, the change list stack is in the same state.
345+fn diff_keyed_children(
346+ cached_set: &CachedSet,
347+ change_list: &mut ChangeListBuilder,
348+ registry: &mut EventsRegistry,
349+ old: &[Node],
350+ new: &[Node],
351+ cached_roots: &mut FxHashSet<CacheId>,
352+) {
353+ if cfg!(debug_assertions) {
354+ let mut keys = FxHashSet::default();
355+ let mut assert_unique_keys = |children: &[Node]| {
356+ keys.clear();
357+ for child in children {
358+ let key = child.key();
359+ debug_assert!(
360+ key.is_some(),
361+ "if any sibling is keyed, all siblings must be keyed"
362+ );
363+ keys.insert(key);
364+ }
365+ debug_assert_eq!(
366+ children.len(),
367+ keys.len(),
368+ "keyed siblings must each have a unique key"
369+ );
370+ };
371+ assert_unique_keys(old);
372+ assert_unique_keys(new);
373+ }
374+
375+ // First up, we diff all the nodes with the same key at the beginning of the
376+ // children.
377+ //
378+ // `shared_prefix_count` is the count of how many nodes at the start of
379+ // `new` and `old` share the same keys.
380+ let shared_prefix_count =
381+ match diff_keyed_prefix(cached_set, change_list, registry, old, new, cached_roots) {
382+ KeyedPrefixResult::Finished => return,
383+ KeyedPrefixResult::MoreWorkToDo(count) => count,
384+ };
385+
386+ // Next, we find out how many of the nodes at the end of the children have
387+ // the same key. We do _not_ diff them yet, since we want to emit the change
388+ // list instructions such that they can be applied in a single pass over the
389+ // DOM. Instead, we just save this information for later.
390+ //
391+ // `shared_suffix_count` is the count of how many nodes at the end of `new`
392+ // and `old` share the same keys.
393+ let shared_suffix_count = old[shared_prefix_count..]
394+ .iter()
395+ .rev()
396+ .zip(new[shared_prefix_count..].iter().rev())
397+ .take_while(|&(old, new)| old.key() == new.key())
398+ .count();
399+
400+ let old_shared_suffix_start = old.len() - shared_suffix_count;
401+ let new_shared_suffix_start = new.len() - shared_suffix_count;
402+
403+ // Ok, we now hopefully have a smaller range of children in the middle
404+ // within which to re-order nodes with the same keys, remove old nodes with
405+ // now-unused keys, and create new nodes with fresh keys.
406+ diff_keyed_middle(
407+ cached_set,
408+ change_list,
409+ registry,
410+ &old[shared_prefix_count..old_shared_suffix_start],
411+ &new[shared_prefix_count..new_shared_suffix_start],
412+ cached_roots,
413+ shared_prefix_count,
414+ shared_suffix_count,
415+ old_shared_suffix_start,
416+ );
417+
418+ // Finally, diff the nodes at the end of `old` and `new` that share keys.
419+ let old_suffix = &old[old_shared_suffix_start..];
420+ let new_suffix = &new[new_shared_suffix_start..];
421+ debug_assert_eq!(old_suffix.len(), new_suffix.len());
422+ if !old_suffix.is_empty() {
423+ diff_keyed_suffix(
424+ cached_set,
425+ change_list,
426+ registry,
427+ old_suffix,
428+ new_suffix,
429+ cached_roots,
430+ new_shared_suffix_start,
431+ );
432+ }
433+}
434+
435+enum KeyedPrefixResult {
436+ // Fast path: we finished diffing all the children just by looking at the
437+ // prefix of shared keys!
438+ Finished,
439+ // There is more diffing work to do. Here is a count of how many children at
440+ // the beginning of `new` and `old` we already processed.
441+ MoreWorkToDo(usize),
442+}
443+
444+// Diff the prefix of children in `new` and `old` that share the same keys in
445+// the same order.
446+//
447+// Upon entry of this function, the change list stack must be:
448+//
449+// [... parent]
450+//
451+// Upon exit, the change list stack is the same.
452+fn diff_keyed_prefix(
453+ cached_set: &CachedSet,
454+ change_list: &mut ChangeListBuilder,
455+ registry: &mut EventsRegistry,
456+ old: &[Node],
457+ new: &[Node],
458+ cached_roots: &mut FxHashSet<CacheId>,
459+) -> KeyedPrefixResult {
460+ change_list.go_down();
461+ let mut shared_prefix_count = 0;
462+
463+ for (i, (old, new)) in old.iter().zip(new.iter()).enumerate() {
464+ if old.key() != new.key() {
465+ break;
466+ }
467+
468+ change_list.go_to_sibling(i);
469+ diff(cached_set, change_list, registry, old, new, cached_roots);
470+ shared_prefix_count += 1;
471+ }
472+
473+ // If that was all of the old children, then create and append the remaining
474+ // new children and we're finished.
475+ if shared_prefix_count == old.len() {
476+ change_list.go_up();
477+ change_list.commit_traversal();
478+ create_and_append_children(
479+ cached_set,
480+ change_list,
481+ registry,
482+ &new[shared_prefix_count..],
483+ cached_roots,
484+ );
485+ return KeyedPrefixResult::Finished;
486+ }
487+
488+ // And if that was all of the new children, then remove all of the remaining
489+ // old children and we're finished.
490+ if shared_prefix_count == new.len() {
491+ change_list.go_to_sibling(shared_prefix_count);
492+ change_list.commit_traversal();
493+ remove_self_and_next_siblings(change_list, registry, &old[shared_prefix_count..]);
494+ return KeyedPrefixResult::Finished;
495+ }
496+
497+ change_list.go_up();
498+ KeyedPrefixResult::MoreWorkToDo(shared_prefix_count)
499+}
500+
501+// The most-general, expensive code path for keyed children diffing.
502+//
503+// We find the longest subsequence within `old` of children that are relatively
504+// ordered the same way in `new` (via finding a longest-increasing-subsequence
505+// of the old child's index within `new`). The children that are elements of
506+// this subsequence will remain in place, minimizing the number of DOM moves we
507+// will have to do.
508+//
509+// Upon entry to this function, the change list stack must be:
510+//
511+// [... parent]
512+//
513+// Upon exit from this function, it will be restored to that same state.
514+fn diff_keyed_middle(
515+ cached_set: &CachedSet,
516+ change_list: &mut ChangeListBuilder,
517+ registry: &mut EventsRegistry,
518+ old: &[Node],
519+ mut new: &[Node],
520+ cached_roots: &mut FxHashSet<CacheId>,
521+ shared_prefix_count: usize,
522+ shared_suffix_count: usize,
523+ old_shared_suffix_start: usize,
524+) {
525+ // Should have already diffed the shared-key prefixes and suffixes.
526+ debug_assert_ne!(new.first().map(|n| n.key()), old.first().map(|o| o.key()));
527+ debug_assert_ne!(new.last().map(|n| n.key()), old.last().map(|o| o.key()));
528+
529+ // The algorithm below relies upon using `u32::MAX` as a sentinel
530+ // value, so if we have that many new nodes, it won't work. This
531+ // check is a bit academic (hence only enabled in debug), since
532+ // wasm32 doesn't have enough address space to hold that many nodes
533+ // in memory.
534+ debug_assert!(new.len() < u32::MAX as usize);
535+
536+ // Map from each `old` node's key to its index within `old`.
537+ let mut old_key_to_old_index = FxHashMap::default();
538+ old_key_to_old_index.reserve(old.len());
539+ old_key_to_old_index.extend(old.iter().enumerate().map(|(i, o)| (o.key(), i)));
540+
541+ // The set of shared keys between `new` and `old`.
542+ let mut shared_keys = FxHashSet::default();
543+ // Map from each index in `new` to the index of the node in `old` that
544+ // has the same key.
545+ let mut new_index_to_old_index = Vec::with_capacity(new.len());
546+ new_index_to_old_index.extend(new.iter().map(|n| {
547+ let key = n.key();
548+ if let Some(&i) = old_key_to_old_index.get(&key) {
549+ shared_keys.insert(key);
550+ i
551+ } else {
552+ u32::MAX as usize
553+ }
554+ }));
555+
556+ // If none of the old keys are reused by the new children, then we
557+ // remove all the remaining old children and create the new children
558+ // afresh.
559+ if shared_suffix_count == 0 && shared_keys.is_empty() {
560+ if shared_prefix_count == 0 {
561+ change_list.commit_traversal();
562+ remove_all_children(change_list, registry, old);
563+ } else {
564+ change_list.go_down_to_child(shared_prefix_count);
565+ change_list.commit_traversal();
566+ remove_self_and_next_siblings(change_list, registry, &old[shared_prefix_count..]);
567+ }
568+ create_and_append_children(cached_set, change_list, registry, new, cached_roots);
569+ return;
570+ }
571+
572+ // Save each of the old children whose keys are reused in the new
573+ // children.
574+ let mut old_index_to_temp = vec![u32::MAX; old.len()];
575+ let mut start = 0;
576+ loop {
577+ let end = (start..old.len())
578+ .find(|&i| {
579+ let key = old[i].key();
580+ !shared_keys.contains(&key)
581+ })
582+ .unwrap_or(old.len());
583+
584+ if end - start > 0 {
585+ change_list.commit_traversal();
586+ let mut t = change_list.save_children_to_temporaries(
587+ shared_prefix_count + start,
588+ shared_prefix_count + end,
589+ );
590+ for i in start..end {
591+ old_index_to_temp[i] = t;
592+ t += 1;
593+ }
594+ }
595+
596+ debug_assert!(end <= old.len());
597+ if end == old.len() {
598+ break;
599+ } else {
600+ start = end + 1;
601+ }
602+ }
603+
604+ // Remove any old children whose keys were not reused in the new
605+ // children. Remove from the end first so that we don't mess up indices.
606+ let mut removed_count = 0;
607+ for (i, old_child) in old.iter().enumerate().rev() {
608+ if !shared_keys.contains(&old_child.key()) {
609+ registry.remove_subtree(old_child);
610+ change_list.commit_traversal();
611+ change_list.remove_child(i + shared_prefix_count);
612+ removed_count += 1;
613+ }
614+ }
615+
616+ // If there aren't any more new children, then we are done!
617+ if new.is_empty() {
618+ return;
619+ }
620+
621+ // The longest increasing subsequence within `new_index_to_old_index`. This
622+ // is the longest sequence on DOM nodes in `old` that are relatively ordered
623+ // correctly within `new`. We will leave these nodes in place in the DOM,
624+ // and only move nodes that are not part of the LIS. This results in the
625+ // maximum number of DOM nodes left in place, AKA the minimum number of DOM
626+ // nodes moved.
627+ let mut new_index_is_in_lis = FxHashSet::default();
628+ new_index_is_in_lis.reserve(new_index_to_old_index.len());
629+ let mut predecessors = vec![0; new_index_to_old_index.len()];
630+ let mut starts = vec![0; new_index_to_old_index.len()];
631+ longest_increasing_subsequence::lis_with(
632+ &new_index_to_old_index,
633+ &mut new_index_is_in_lis,
634+ |a, b| a < b,
635+ &mut predecessors,
636+ &mut starts,
637+ );
638+
639+ // Now we will iterate from the end of the new children back to the
640+ // beginning, diffing old children we are reusing and if they aren't in the
641+ // LIS moving them to their new destination, or creating new children. Note
642+ // that iterating in reverse order lets us use `Node.prototype.insertBefore`
643+ // to move/insert children.
644+ //
645+ // But first, we ensure that we have a child on the change list stack that
646+ // we can `insertBefore`. We handle this once before looping over `new`
647+ // children, so that we don't have to keep checking on every loop iteration.
648+ if shared_suffix_count > 0 {
649+ // There is a shared suffix after these middle children. We will be
650+ // inserting before that shared suffix, so add the first child of that
651+ // shared suffix to the change list stack.
652+ //
653+ // [... parent]
654+ change_list.go_down_to_child(old_shared_suffix_start - removed_count);
655+ // [... parent first_child_of_shared_suffix]
656+ } else {
657+ // There is no shared suffix coming after these middle children.
658+ // Therefore we have to process the last child in `new` and move it to
659+ // the end of the parent's children if it isn't already there.
660+ let last_index = new.len() - 1;
661+ let last = new.last().unwrap_throw();
662+ new = &new[..new.len() - 1];
663+ if shared_keys.contains(&last.key()) {
664+ let old_index = new_index_to_old_index[last_index];
665+ let temp = old_index_to_temp[old_index];
666+ // [... parent]
667+ change_list.go_down_to_temp_child(temp);
668+ // [... parent last]
669+ diff(
670+ cached_set,
671+ change_list,
672+ registry,
673+ &old[old_index],
674+ last,
675+ cached_roots,
676+ );
677+ if new_index_is_in_lis.contains(&last_index) {
678+ // Don't move it, since it is already where it needs to be.
679+ } else {
680+ change_list.commit_traversal();
681+ // [... parent last]
682+ change_list.append_child();
683+ // [... parent]
684+ change_list.go_down_to_temp_child(temp);
685+ // [... parent last]
686+ }
687+ } else {
688+ change_list.commit_traversal();
689+ // [... parent]
690+ create(cached_set, change_list, registry, last, cached_roots);
691+ // [... parent last]
692+ change_list.append_child();
693+ // [... parent]
694+ change_list.go_down_to_reverse_child(0);
695+ // [... parent last]
696+ }
697+ }
698+
699+ for (new_index, new_child) in new.iter().enumerate().rev() {
700+ let old_index = new_index_to_old_index[new_index];
701+ if old_index == u32::MAX as usize {
702+ debug_assert!(!shared_keys.contains(&new_child.key()));
703+ change_list.commit_traversal();
704+ // [... parent successor]
705+ create(cached_set, change_list, registry, new_child, cached_roots);
706+ // [... parent successor new_child]
707+ change_list.insert_before();
708+ // [... parent new_child]
709+ } else {
710+ debug_assert!(shared_keys.contains(&new_child.key()));
711+ let temp = old_index_to_temp[old_index];
712+ debug_assert_ne!(temp, u32::MAX);
713+
714+ if new_index_is_in_lis.contains(&new_index) {
715+ // [... parent successor]
716+ change_list.go_to_temp_sibling(temp);
717+ // [... parent new_child]
718+ } else {
719+ change_list.commit_traversal();
720+ // [... parent successor]
721+ change_list.push_temporary(temp);
722+ // [... parent successor new_child]
723+ change_list.insert_before();
724+ // [... parent new_child]
725+ }
726+
727+ diff(
728+ cached_set,
729+ change_list,
730+ registry,
731+ &old[old_index],
732+ new_child,
733+ cached_roots,
734+ );
735+ }
736+ }
737+
738+ // [... parent child]
739+ change_list.go_up();
740+ // [... parent]
741+}
742+
743+// Diff the suffix of keyed children that share the same keys in the same order.
744+//
745+// The parent must be on the change list stack when we enter this function:
746+//
747+// [... parent]
748+//
749+// When this function exits, the change list stack remains the same.
750+fn diff_keyed_suffix(
751+ cached_set: &CachedSet,
752+ change_list: &mut ChangeListBuilder,
753+ registry: &mut EventsRegistry,
754+ old: &[Node],
755+ new: &[Node],
756+ cached_roots: &mut FxHashSet<CacheId>,
757+ new_shared_suffix_start: usize,
758+) {
759+ debug_assert_eq!(old.len(), new.len());
760+ debug_assert!(!old.is_empty());
761+
762+ // [... parent]
763+ change_list.go_down();
764+ // [... parent new_child]
765+
766+ for (i, (old_child, new_child)) in old.iter().zip(new.iter()).enumerate() {
767+ change_list.go_to_sibling(new_shared_suffix_start + i);
768+ diff(
769+ cached_set,
770+ change_list,
771+ registry,
772+ old_child,
773+ new_child,
774+ cached_roots,
775+ );
776+ }
777+
778+ // [... parent]
779+ change_list.go_up();
780+}
781+
782+// Diff children that are not keyed.
783+//
784+// The parent must be on the top of the change list stack when entering this
785+// function:
786+//
787+// [... parent]
788+//
789+// the change list stack is in the same state when this function returns.
790+fn diff_non_keyed_children(
791+ cached_set: &CachedSet,
792+ change_list: &mut ChangeListBuilder,
793+ registry: &mut EventsRegistry,
794+ old: &[Node],
795+ new: &[Node],
796+ cached_roots: &mut FxHashSet<CacheId>,
797+) {
798+ // Handled these cases in `diff_children` before calling this function.
799+ debug_assert!(!new.is_empty());
800+ debug_assert!(!old.is_empty());
801+
802+ // [... parent]
803+ change_list.go_down();
804+ // [... parent child]
805+
806+ for (i, (new_child, old_child)) in new.iter().zip(old.iter()).enumerate() {
807+ // [... parent prev_child]
808+ change_list.go_to_sibling(i);
809+ // [... parent this_child]
810+ diff(
811+ cached_set,
812+ change_list,
813+ registry,
814+ old_child,
815+ new_child,
816+ cached_roots,
817+ );
818+ }
819+
820+ match old.len().cmp(&new.len()) {
821+ Ordering::Greater => {
822+ // [... parent prev_child]
823+ change_list.go_to_sibling(new.len());
824+ // [... parent first_child_to_remove]
825+ change_list.commit_traversal();
826+ remove_self_and_next_siblings(change_list, registry, &old[new.len()..]);
827+ // [... parent]
828+ }
829+ Ordering::Less => {
830+ // [... parent last_child]
831+ change_list.go_up();
832+ // [... parent]
833+ change_list.commit_traversal();
834+ create_and_append_children(
835+ cached_set,
836+ change_list,
837+ registry,
838+ &new[old.len()..],
839+ cached_roots,
840+ );
841+ }
842+ Ordering::Equal => {
843+ // [... parent child]
844+ change_list.go_up();
845+ // [... parent]
846+ }
847+ }
848+}
849+
850+// Create the given children and append them to the parent node.
851+//
852+// The parent node must currently be on top of the change list stack:
853+//
854+// [... parent]
855+//
856+// When this function returns, the change list stack is in the same state.
857+fn create_and_append_children(
858+ cached_set: &CachedSet,
859+ change_list: &mut ChangeListBuilder,
860+ registry: &mut EventsRegistry,
861+ new: &[Node],
862+ cached_roots: &mut FxHashSet<CacheId>,
863+) {
864+ debug_assert!(change_list.traversal_is_committed());
865+ for child in new {
866+ create(cached_set, change_list, registry, child, cached_roots);
867+ change_list.append_child();
868+ }
869+}
870+
871+// Remove all of a node's children.
872+//
873+// The change list stack must have this shape upon entry to this function:
874+//
875+// [... parent]
876+//
877+// When this function returns, the change list stack is in the same state.
878+fn remove_all_children(
879+ change_list: &mut ChangeListBuilder,
880+ registry: &mut EventsRegistry,
881+ old: &[Node],
882+) {
883+ debug_assert!(change_list.traversal_is_committed());
884+ for child in old {
885+ registry.remove_subtree(child);
886+ }
887+ // Fast way to remove all children: set the node's textContent to an empty
888+ // string.
889+ change_list.set_text("");
890+}
891+
892+// Remove the current child and all of its following siblings.
893+//
894+// The change list stack must have this shape upon entry to this function:
895+//
896+// [... parent child]
897+//
898+// After the function returns, the child is no longer on the change list stack:
899+//
900+// [... parent]
901+fn remove_self_and_next_siblings(
902+ change_list: &mut ChangeListBuilder,
903+ registry: &mut EventsRegistry,
904+ old: &[Node],
905+) {
906+ debug_assert!(change_list.traversal_is_committed());
907+ for child in old {
908+ registry.remove_subtree(child);
909+ }
910+ change_list.remove_self_and_next_siblings();
911+}
912+
913+// Emit instructions to create the given virtual node.
914+//
915+// The change list stack may have any shape upon entering this function:
916+//
917+// [...]
918+//
919+// When this function returns, the new node is on top of the change list stack:
920+//
921+// [... node]
922+fn create(
923+ cached_set: &CachedSet,
924+ change_list: &mut ChangeListBuilder,
925+ registry: &mut EventsRegistry,
926+ node: &Node,
927+ cached_roots: &mut FxHashSet<CacheId>,
928+) {
929+ debug_assert!(change_list.traversal_is_committed());
930+ match node.kind {
931+ NodeKind::Text(TextNode { text }) => {
932+ change_list.create_text_node(text);
933+ }
934+ NodeKind::Element(&ElementNode {
935+ key: _,
936+ tag_name,
937+ listeners,
938+ attributes,
939+ children,
940+ namespace,
941+ }) => {
942+ if let Some(namespace) = namespace {
943+ change_list.create_element_ns(tag_name, namespace);
944+ } else {
945+ change_list.create_element(tag_name);
946+ }
947+
948+ for l in listeners {
949+ unsafe {
950+ registry.add(l);
951+ }
952+ change_list.new_event_listener(l);
953+ }
954+
955+ for attr in attributes {
956+ change_list.set_attribute(&attr.name, &attr.value, namespace.is_some());
957+ }
958+
959+ // Fast path: if there is a single text child, it is faster to
960+ // create-and-append the text node all at once via setting the
961+ // parent's `textContent` in a single change list instruction than
962+ // to emit three instructions to (1) create a text node, (2) set its
963+ // text content, and finally (3) append the text node to this
964+ // parent.
965+ if children.len() == 1 {
966+ if let Node {
967+ kind: NodeKind::Text(TextNode { text }),
968+ } = children[0]
969+ {
970+ change_list.set_text(text);
971+ return;
972+ }
973+ }
974+
975+ for child in children {
976+ create(cached_set, change_list, registry, child, cached_roots);
977+ change_list.append_child();
978+ }
979+ }
980+ NodeKind::Cached(ref c) => {
981+ cached_roots.insert(c.id);
982+ let (node, template) = cached_set.get(c.id);
983+ if let Some(template) = template {
984+ create_with_template(
985+ cached_set,
986+ change_list,
987+ registry,
988+ template,
989+ node,
990+ cached_roots,
991+ );
992+ } else {
993+ create(cached_set, change_list, registry, node, cached_roots);
994+ }
995+ }
996+ }
997+}
998+
999+// Get or create the template.
1000+//
1001+// Upon entering this function the change list stack may be in any shape:
1002+//
1003+// [...]
1004+//
1005+// When this function returns, it leaves a freshly cloned copy of the template
1006+// on the top of the change list stack:
1007+//
1008+// [... template]
1009+#[inline]
1010+fn get_or_create_template<'a>(
1011+ cached_set: &'a CachedSet,
1012+ change_list: &mut ChangeListBuilder,
1013+ registry: &mut EventsRegistry,
1014+ cached_roots: &mut FxHashSet<CacheId>,
1015+ template_id: CacheId,
1016+) -> (&'a Node<'a>, bool) {
1017+ let (template, template_template) = cached_set.get(template_id);
1018+ debug_assert!(
1019+ template_template.is_none(),
1020+ "templates should not be templated themselves"
1021+ );
1022+
1023+ // If we haven't already created and saved the physical DOM subtree for this
1024+ // template, do that now.
1025+ if change_list.has_template(template_id) {
1026+ // Clone the template and push it onto the stack.
1027+ //
1028+ // [...]
1029+ change_list.push_template(template_id);
1030+ // [... template]
1031+
1032+ (template, true)
1033+ } else {
1034+ // [...]
1035+ create(cached_set, change_list, registry, template, cached_roots);
1036+ // [... template]
1037+ change_list.save_template(template_id);
1038+ // [... template]
1039+
1040+ (template, false)
1041+ }
1042+}
1043+
1044+fn create_and_replace(
1045+ cached_set: &CachedSet,
1046+ change_list: &mut ChangeListBuilder,
1047+ registry: &mut EventsRegistry,
1048+ new_template: Option<CacheId>,
1049+ old: &Node,
1050+ new: &Node,
1051+ cached_roots: &mut FxHashSet<CacheId>,
1052+) {
1053+ debug_assert!(change_list.traversal_is_committed());
1054+
1055+ if let Some(template_id) = new_template {
1056+ let (template, needs_listeners) =
1057+ get_or_create_template(cached_set, change_list, registry, cached_roots, template_id);
1058+ change_list.replace_with();
1059+
1060+ let mut old_forcing = None;
1061+ if needs_listeners {
1062+ old_forcing = Some(change_list.push_force_new_listeners());
1063+ }
1064+
1065+ diff(
1066+ cached_set,
1067+ change_list,
1068+ registry,
1069+ template,
1070+ new,
1071+ cached_roots,
1072+ );
1073+
1074+ if let Some(old) = old_forcing {
1075+ change_list.pop_force_new_listeners(old);
1076+ }
1077+
1078+ change_list.commit_traversal();
1079+ } else {
1080+ create(cached_set, change_list, registry, new, cached_roots);
1081+ change_list.replace_with();
1082+ }
1083+ registry.remove_subtree(old);
1084+}
1085+
1086+fn create_with_template(
1087+ cached_set: &CachedSet,
1088+ change_list: &mut ChangeListBuilder,
1089+ registry: &mut EventsRegistry,
1090+ template_id: CacheId,
1091+ node: &Node,
1092+ cached_roots: &mut FxHashSet<CacheId>,
1093+) {
1094+ debug_assert!(change_list.traversal_is_committed());
1095+
1096+ // [...]
1097+ let (template, needs_listeners) =
1098+ get_or_create_template(cached_set, change_list, registry, cached_roots, template_id);
1099+ // [... template]
1100+
1101+ // Now diff the node with its template.
1102+ //
1103+ // We must force adding new listeners instead of updating existing ones,
1104+ // since listeners don't get cloned in `cloneNode`.
1105+ let mut old_forcing = None;
1106+ if needs_listeners {
1107+ old_forcing = Some(change_list.push_force_new_listeners());
1108+ }
1109+
1110+ diff(
1111+ cached_set,
1112+ change_list,
1113+ registry,
1114+ template,
1115+ node,
1116+ cached_roots,
1117+ );
1118+
1119+ if let Some(old) = old_forcing {
1120+ change_list.pop_force_new_listeners(old);
1121+ }
1122+
1123+ // Make sure that we come back up to the level we were at originally.
1124+ change_list.commit_traversal();
1125+}
src/events.rs+36−15
@@ -1,10 +1,9 @@
1−use crate::vdom::VdomInner;
2−use crate::Listener;
1+use crate::{node::Node, vdom::VdomInner, Listener};
32use std::cell::RefCell;
43use std::rc::{Rc, Weak};
54
65cfg_if::cfg_if! {
7− if #[cfg(feature = "xxx-unstable-internal-use-only")] {
6+ if #[cfg(all(feature = "xxx-unstable-internal-use-only", not(target_arch = "wasm32")))] {
87 #[derive(Debug)]
98 pub(crate) struct EventsRegistry {}
109 impl EventsRegistry {
@@ -14,12 +13,17 @@ cfg_if::cfg_if! {
1413 ) {
1514 (Rc::new(RefCell::new(EventsRegistry {})), ())
1615 }
16+ pub(crate) fn remove(&mut self, _listener: &Listener) {}
17+ pub(crate) fn remove_subtree(&mut self, _node: &Node) {}
1718 pub(crate) unsafe fn add<'a>(&mut self, _listener: &'a Listener<'a>) {}
1819 pub(crate) fn clear_active_listeners(&mut self) {}
1920 }
2021 } else {
21− use crate::{ListenerCallback, vdom::VdomWeak};
22− use std::collections::HashMap;
22+ use crate::{
23+ node::{ElementNode, ListenerCallback, NodeKind},
24+ vdom::VdomWeak,
25+ };
26+ use fxhash::FxHashMap;
2327 use std::fmt;
2428 use std::mem;
2529 use wasm_bindgen::closure::Closure;
@@ -31,7 +35,7 @@ cfg_if::cfg_if! {
3135 /// buffering.
3236 pub(crate) struct EventsRegistry {
3337 vdom: Weak<VdomInner>,
34− active: HashMap<(u32, u32), ListenerCallback<'static>>,
38+ active: FxHashMap<(u32, u32), ListenerCallback<'static>>,
3539 }
3640
3741 impl fmt::Debug for EventsRegistry {
@@ -54,12 +58,11 @@ cfg_if::cfg_if! {
5458 ) {
5559 let registry = Rc::new(RefCell::new(EventsRegistry {
5660 vdom,
57− active: HashMap::new(),
61+ active: FxHashMap::default(),
5862 }));
5963
6064 let weak_registry = Rc::downgrade(&registry);
6165 let closure = Closure::wrap(Box::new(move |event, a, b| {
62− debug!("Events trampoline invoked with (0x{:x}, 0x{:x})", a, b);
6366 debug_assert!(a != 0);
6467
6568 // if the VdomInnerExclusive is keeping this closure alive, then the
@@ -83,22 +86,41 @@ cfg_if::cfg_if! {
8386 callback(component, vdom_weak, event);
8487 }
8588 }
86− }) as Box<Fn(web_sys::Event, u32, u32)>);
89+ }) as Box<dyn Fn(web_sys::Event, u32, u32)>);
8790
8891 (registry, closure)
8992 }
9093
94+ pub(crate) fn remove(&mut self, listener: &Listener) {
95+ let id = listener.get_callback_parts();
96+ debug_assert!(id.0 != 0);
97+ self.active.remove(&id);
98+ }
99+
100+ pub(crate) fn remove_subtree(&mut self, node: &Node) {
101+ match node.kind {
102+ NodeKind::Cached(_) | NodeKind::Text(_) => {},
103+ NodeKind::Element(&ElementNode {listeners, children, ..}) => {
104+ for l in listeners {
105+ self.remove(l);
106+ }
107+ for child in children {
108+ self.remove_subtree(child)
109+ }
110+ }
111+ }
112+ }
113+
91114 /// Add an event listener to the registry, exposing to JS.
92115 ///
93116 /// # Unsafety
94117 ///
95− /// The listener's lifetime is extended to `'static` and it is the caller's
96− /// responsibility to ensure that the listener is not kept in the registry
97− /// after it is dropped. This is typically done via clearing the whole
98− /// registry on each render and repopulating it during diffing.
118+ /// The listener's lifetime is extended to `'static` and it is the
119+ /// caller's responsibility to ensure that the listener is not kept
120+ /// in the registry after it is dropped. This is maintained during
121+ /// diffing.
99122 pub(crate) unsafe fn add<'a>(&mut self, listener: &'a Listener<'a>) {
100123 let id = listener.get_callback_parts();
101− debug!("EventsRegistry::add(0x{:x}, 0x{:x})", id.0, id.1);
102124 debug_assert!(id.0 != 0);
103125
104126 let callback =
@@ -109,7 +131,6 @@ cfg_if::cfg_if! {
109131
110132 /// Clear all event listeners from the registry.
111133 pub(crate) fn clear_active_listeners(&mut self) {
112− debug!("EventsRegistry::clear_active_listeners()");
113134 self.active.clear();
114135 }
115136 }
src/lib.rs+46−5
@@ -18,8 +18,8 @@
1818//! }
1919//! }
2020//!
21−//! impl<'who> Render for Hello<'who> {
22−//! fn render<'bump>(&self, cx: &mut RenderContext<'bump>) -> Node<'bump> {
21+//! impl<'a, 'who> Render<'a> for Hello<'who> {
22+//! fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
2323//! use dodrio::builder::*;
2424//!
2525//! let id = bumpalo::format!(in cx.bump, "hello-{}", self.who);
@@ -61,26 +61,60 @@ cfg_if::cfg_if! {
6161 }
6262}
6363
64+// A macro to expose items unstably, only for internal/testing usage.
65+cfg_if::cfg_if! {
66+ if #[cfg(feature = "xxx-unstable-internal-use-only")] {
67+ macro_rules! pub_unstable_internal {
68+ ( $(#[$attr:meta])* pub(crate) $( $thing:tt )* ) => {
69+ #[doc(hidden)]
70+ $( #[$attr] )*
71+ pub $( $thing )*
72+ }
73+ }
74+ } else {
75+ macro_rules! pub_unstable_internal {
76+ ( $(#[$attr:meta])* pub(crate) $( $thing:tt )* ) => {
77+ $( #[$attr] )*
78+ pub(crate) $( $thing )*
79+ }
80+ }
81+ }
82+}
83+
6484// Only `pub` so that the wasm-bindgen bindings work.
6585#[doc(hidden)]
6686pub mod change_list;
6787
88+mod cached;
89+mod cached_set;
90+mod diff;
6891mod events;
6992mod node;
7093mod render;
7194mod render_context;
95+mod strace;
7296mod vdom;
7397
7498pub mod builder;
7599
76100// Re-export items at the top level.
77−pub use self::node::{Attribute, ElementNode, Listener, ListenerCallback, Node, TextNode};
101+pub use self::cached::Cached;
102+pub use self::node::{Attribute, Listener, Node, NodeKey};
78103pub use self::render::{Render, RootRender};
79104pub use self::render_context::RenderContext;
80105pub use self::vdom::{Vdom, VdomWeak};
81106
82107cfg_if::cfg_if! {
83− if #[cfg(feature = "xxx-unstable-internal-use-only")] {
108+ if #[cfg(all(target_arch = "wasm32", not(feature = "xxx-unstable-internal-use-only")))] {
109+ use wasm_bindgen::__rt::WasmRefCell as RefCell;
110+ } else {
111+ use std::cell::RefCell;
112+ }
113+}
114+
115+// Polyfill some Web stuff for benchmarking...
116+cfg_if::cfg_if! {
117+ if #[cfg(all(feature = "xxx-unstable-internal-use-only", not(target_arch = "wasm32")))] {
84118 /// An element node in the physical DOM.
85119 pub type Element = ();
86120
@@ -89,6 +123,13 @@ cfg_if::cfg_if! {
89123 /// An element node in the physical DOM.
90124 pub type Element = web_sys::Element;
91125
92− pub(crate) type EventsTrampoline = wasm_bindgen::closure::Closure<Fn(web_sys::Event, u32, u32)>;
126+ pub(crate) type EventsTrampoline = wasm_bindgen::closure::Closure<dyn Fn(web_sys::Event, u32, u32)>;
127+ }
128+}
129+
130+cfg_if::cfg_if! {
131+ if #[cfg(feature = "xxx-unstable-internal-use-only")] {
132+ pub use self::cached_set::{CachedSet};
133+ pub use self::node::{ElementNode, NodeKind, TextNode};
93134 }
94135}
src/node.rs+135−87
@@ -1,35 +1,111 @@
1−use crate::{RootRender, VdomWeak};
1+use crate::{cached_set::CacheId, RootRender, VdomWeak};
22use bumpalo::Bump;
33use std::fmt;
44use std::iter;
55use std::mem;
6+use std::u32;
67
7−/// A node is either a text node or an element.
8+/// A virtual DOM node.
89#[derive(Debug, Clone)]
9−pub enum Node<'a> {
10− /// A text node.
11− Text(TextNode<'a>),
10+pub struct Node<'a> {
11+ #[cfg(feature = "xxx-unstable-internal-use-only")]
12+ #[doc(hidden)]
13+ pub kind: NodeKind<'a>,
1214
13− /// An element potentially with attributes and children.
14− Element(ElementNode<'a>),
15+ #[cfg(not(feature = "xxx-unstable-internal-use-only"))]
16+ pub(crate) kind: NodeKind<'a>,
1517}
1618
17−/// Text nodes are just a string of text. They cannot have attributes or
18−/// children.
19−#[derive(Debug, Clone)]
20−pub struct TextNode<'a> {
21− pub(crate) text: &'a str,
19+pub_unstable_internal! {
20+ /// A node is either a text node or an element.
21+ #[derive(Debug, Clone)]
22+ pub(crate) enum NodeKind<'a> {
23+ /// A text node.
24+ Text(TextNode<'a>),
25+
26+ /// An element potentially with attributes and children.
27+ Element(&'a ElementNode<'a>),
28+
29+ /// A node in the vdom's `CachedSet`. This allows us to avoid
30+ /// re-rendering and re-diffing subtrees.
31+ Cached(CachedNode),
32+ }
2233}
2334
24−/// Elements have a tag name, zero or more attributes, and zero or more
25−/// children.
26−#[derive(Debug, Clone)]
27−pub struct ElementNode<'a> {
28− pub(crate) tag_name: &'a str,
29− pub(crate) listeners: &'a [Listener<'a>],
30− pub(crate) attributes: &'a [Attribute<'a>],
31− pub(crate) children: &'a [Node<'a>],
32− pub(crate) namespace: Option<&'a str>,
35+pub_unstable_internal! {
36+ /// Text nodes are just a string of text. They cannot have attributes or
37+ /// children.
38+ #[derive(Debug, Clone)]
39+ pub(crate) struct TextNode<'a> {
40+ pub text: &'a str,
41+ }
42+}
43+
44+pub_unstable_internal! {
45+ /// Elements have a tag name, zero or more attributes, and zero or more
46+ /// children.
47+ #[derive(Debug, Clone)]
48+ pub(crate) struct ElementNode<'a> {
49+ pub key: NodeKey,
50+ pub tag_name: &'a str,
51+ pub listeners: &'a [Listener<'a>],
52+ pub attributes: &'a [Attribute<'a>],
53+ pub children: &'a [Node<'a>],
54+ pub namespace: Option<&'a str>,
55+ }
56+}
57+
58+pub_unstable_internal! {
59+ /// A cached node exists in an arena that is internal to the `Vdom`. It
60+ /// allows us to avoid both re-rendering a sub-tree and re-diffing
61+ /// it. `CachedNode`s cannot contain cycles, since they can only contain
62+ /// other `CachedNode`s that already exist when they are being constructed.
63+ #[derive(Debug, Clone, Copy)]
64+ pub(crate) struct CachedNode {
65+ pub id: CacheId,
66+ // Always a copy of the inner cached node's key.
67+ pub key: NodeKey,
68+ }
69+}
70+
71+/// The key for keyed children.
72+///
73+/// Keys must be unique among siblings.
74+///
75+/// If any sibling is keyed, then they all must be keyed.
76+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
77+pub struct NodeKey(pub(crate) u32);
78+
79+impl Default for NodeKey {
80+ fn default() -> NodeKey {
81+ NodeKey::NONE
82+ }
83+}
84+
85+impl NodeKey {
86+ /// The default, lack of a key.
87+ pub const NONE: NodeKey = NodeKey(u32::MAX);
88+
89+ /// Is this key `NodeKey::NONE`?
90+ #[inline]
91+ pub fn is_none(&self) -> bool {
92+ *self == Self::NONE
93+ }
94+
95+ /// Is this key not `NodeKey::NONE`?
96+ #[inline]
97+ pub fn is_some(&self) -> bool {
98+ !self.is_none()
99+ }
100+
101+ /// Create a new `NodeKey`.
102+ ///
103+ /// `key` must not be `u32::MAX`.
104+ #[inline]
105+ pub fn new(key: u32) -> Self {
106+ debug_assert_ne!(key, u32::MAX);
107+ NodeKey(key)
108+ }
33109}
34110
35111/// An event listener callback function.
@@ -39,7 +115,7 @@ pub struct ElementNode<'a> {
39115/// 1. The virtual DOM's root rendering component.
40116/// 2. A capability to scheduler virtual DOM re-rendering.
41117/// 3. The event that occurred.
42−pub type ListenerCallback<'a> =
118+pub(crate) type ListenerCallback<'a> =
43119 &'a (dyn Fn(&mut dyn RootRender, VdomWeak, web_sys::Event) + 'static);
44120
45121/// An event listener.
@@ -58,6 +134,15 @@ pub struct Attribute<'a> {
58134 pub(crate) value: &'a str,
59135}
60136
137+impl<'a> From<CachedNode> for Node<'a> {
138+ #[inline]
139+ fn from(c: CachedNode) -> Self {
140+ Node {
141+ kind: NodeKind::Cached(c),
142+ }
143+ }
144+}
145+
61146impl fmt::Debug for Listener<'_> {
62147 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
63148 let (a, b) = self.get_callback_parts();
@@ -97,59 +182,51 @@ impl<'a> Attribute<'a> {
97182}
98183
99184impl<'a> Node<'a> {
100− /// Construct a new Node of type element with given tag name and children
185+ /// Low-level constructor for making a new `Node` of type element with given
186+ /// parts.
187+ ///
188+ /// This is primarily intended for JSX and templating proc-macros to compile
189+ /// down into. If you are building nodes by-hand, prefer using the
190+ /// `dodrio::builder::*` APIs.
101191 #[inline]
102− pub(crate) fn element<Listeners, Attributes, Children>(
192+ pub fn element(
103193 bump: &'a Bump,
194+ key: NodeKey,
104195 tag_name: &'a str,
105− listeners: Listeners,
106− attributes: Attributes,
107− children: Children,
196+ listeners: &'a [Listener<'a>],
197+ attributes: &'a [Attribute<'a>],
198+ children: &'a [Node<'a>],
108199 namespace: Option<&'a str>,
109− ) -> Node<'a>
110− where
111− Listeners: 'a + AsRef<[Listener<'a>]>,
112− Attributes: 'a + AsRef<[Attribute<'a>]>,
113− Children: 'a + AsRef<[Node<'a>]>,
114− {
115− let children: &'a Children = bump.alloc(children);
116− let children: &'a [Node<'a>] = children.as_ref();
117−
118− let listeners: &'a Listeners = bump.alloc(listeners);
119− let listeners: &'a [Listener<'a>] = listeners.as_ref();
120−
121− let attributes: &'a Attributes = bump.alloc(attributes);
122− let attributes: &'a [Attribute<'a>] = attributes.as_ref();
123−
124− Node::Element(ElementNode {
200+ ) -> Node<'a> {
201+ let element = bump.alloc_with(|| ElementNode {
202+ key,
125203 tag_name,
126204 listeners,
127205 attributes,
128206 children,
129207 namespace,
130− })
131− }
208+ });
132209
133− /// Is this node a text node?
134− pub fn is_text(&self) -> bool {
135− match self {
136− Node::Text(_) => true,
137− _ => false,
210+ Node {
211+ kind: NodeKind::Element(element),
138212 }
139213 }
140214
141− /// Is this node an element?
142− pub fn is_element(&self) -> bool {
143− match self {
144− Node::Element { .. } => true,
145− _ => false,
215+ /// Construct a new text node with the given text.
216+ #[inline]
217+ pub(crate) fn text(text: &'a str) -> Node<'a> {
218+ Node {
219+ kind: NodeKind::Text(TextNode { text }),
146220 }
147221 }
148222
149− /// Construct a new text node with the given text.
150223 #[inline]
151− pub(crate) fn text(text: &'a str) -> Node<'a> {
152− Node::Text(TextNode { text })
224+ pub(crate) fn key(&self) -> NodeKey {
225+ match &self.kind {
226+ NodeKind::Text(_) => NodeKey::NONE,
227+ NodeKind::Element(e) => e.key,
228+ NodeKind::Cached(c) => c.key,
229+ }
153230 }
154231}
155232
@@ -169,35 +246,6 @@ impl<'a> IntoIterator for Node<'a> {
169246 }
170247}
171248
172−impl<'a> TextNode<'a> {
173− /// Get this text node's text content.
174− pub fn text(&self) -> &'a str {
175− self.text
176− }
177−}
178−
179−impl<'a> ElementNode<'a> {
180− /// Get this element's tag name.
181− pub fn tag_name(&self) -> &'a str {
182− self.tag_name
183− }
184−
185− /// Get this element's attributes.
186− pub fn attributes(&self) -> &'a [Attribute<'a>] {
187− self.attributes
188− }
189−
190− /// Get this element's attributes.
191− pub fn children(&self) -> &'a [Node<'a>] {
192− self.children
193− }
194−
195− /// Get this element's namespace.
196− pub fn namespace(&self) -> Option<&'a str> {
197− self.namespace
198− }
199−}
200−
201249union CallbackFatPtr<'a> {
202250 callback: ListenerCallback<'a>,
203251 parts: (u32, u32),
src/render.rs+43−16
@@ -21,8 +21,8 @@ use wasm_bindgen::UnwrapThrowExt;
2121///
2222/// pub struct MyComponent;
2323///
24−/// impl Render for MyComponent {
25−/// fn render<'bump>(&self, cx: &mut RenderContext<'bump>) -> Node<'bump> {
24+/// impl<'a> Render<'a> for MyComponent {
25+/// fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
2626/// use dodrio::builder::*;
2727///
2828/// p(&cx)
@@ -35,26 +35,26 @@ use wasm_bindgen::UnwrapThrowExt;
3535/// }
3636/// }
3737/// ```
38−pub trait Render {
38+pub trait Render<'a> {
3939 /// Render `self` as a virtual DOM. Use the given context's `Bump` for
4040 /// temporary allocations.
41− fn render<'bump>(&self, cx: &mut RenderContext<'bump>) -> Node<'bump>;
41+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a>;
4242}
4343
44−impl<'r, R> Render for &'r R
44+impl<'a, 'r, R> Render<'a> for &'r R
4545where
46− R: Render,
46+ R: Render<'a>,
4747{
48− fn render<'bump>(&self, cx: &mut RenderContext<'bump>) -> Node<'bump> {
48+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
4949 (**self).render(cx)
5050 }
5151}
5252
53−impl<R> Render for Rc<R>
53+impl<'a, R> Render<'a> for Rc<R>
5454where
55− R: Render,
55+ R: Render<'a>,
5656{
57− fn render<'bump>(&self, cx: &mut RenderContext<'bump>) -> Node<'bump> {
57+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
5858 (**self).render(cx)
5959 }
6060}
@@ -69,24 +69,24 @@ where
6969/// You do not need to implement this trait by hand: there is a blanket
7070/// implementation for all `Render` types that fulfill the `RootRender`
7171/// requirements.
72−pub trait RootRender: Any + Render {
72+pub trait RootRender: Any + for<'a> Render<'a> {
7373 /// Get this `&RootRender` trait object as an `&Any` trait object reference.
74− fn as_any(&self) -> &Any;
74+ fn as_any(&self) -> &dyn Any;
7575
7676 /// Get this `&mut RootRender` trait object as an `&mut Any` trait object
7777 /// reference.
78− fn as_any_mut(&mut self) -> &mut Any;
78+ fn as_any_mut(&mut self) -> &mut dyn Any;
7979}
8080
8181impl<T> RootRender for T
8282where
83− T: Any + Render,
83+ T: Any + for<'a> Render<'a>,
8484{
85− fn as_any(&self) -> &Any {
85+ fn as_any(&self) -> &dyn Any {
8686 self
8787 }
8888
89− fn as_any_mut(&mut self) -> &mut Any {
89+ fn as_any_mut(&mut self) -> &mut dyn Any {
9090 self
9191 }
9292}
@@ -138,4 +138,31 @@ mod tests {
138138 #[allow(dead_code)]
139139 fn takes_dyn_render(_: &dyn super::RootRender) {}
140140 }
141+
142+ #[test]
143+ fn render_bump_scoped_child() {
144+ use crate::{builder::*, bumpalo::collections::String, Node, Render, RenderContext};
145+
146+ struct Child<'a> {
147+ name: &'a str,
148+ }
149+
150+ impl<'a> Render<'a> for Child<'a> {
151+ fn render(&self, _cx: &mut RenderContext<'a>) -> Node<'a> {
152+ text(self.name)
153+ }
154+ }
155+
156+ struct Parent;
157+
158+ impl<'a> Render<'a> for Parent {
159+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
160+ let child_name = String::from_str_in("child", cx.bump).into_bump_str();
161+
162+ div(&cx)
163+ .children([Child { name: child_name }.render(cx)])
164+ .finish()
165+ }
166+ }
167+ }
141168}
src/render_context.rs+69−17
@@ -1,11 +1,17 @@
1+use crate::{
2+ cached::{Cached, TemplateId},
3+ cached_set::{CacheId, CachedSet},
4+ Node, Render,
5+};
16use bumpalo::Bump;
7+use fxhash::FxHashMap;
8+use std::fmt;
29
310/// Common context available to all `Render` implementations.
411///
512/// Notably, the `RenderContext` gives access to the bump arena that the virtual
613/// DOM should be allocated within. This is available via the `bump` field.
7−#[derive(Debug)]
8−pub struct RenderContext<'bump> {
14+pub struct RenderContext<'a> {
915 /// The underlying bump arena that virtual DOMs are rendered into.
1016 ///
1117 /// ## Example
@@ -18,35 +24,81 @@ pub struct RenderContext<'bump> {
1824 /// cx.bump.alloc(42)
1925 /// }
2026 /// ```
21− pub bump: &'bump Bump,
27+ pub bump: &'a Bump,
2228
23− // Prevent exhaustive matching on the rendering context, so we can add more
24− // members in a semver-compatible way.
29+ pub(crate) cached_set: &'a crate::RefCell<CachedSet>,
30+
31+ pub(crate) templates: &'a mut FxHashMap<TemplateId, Option<CacheId>>,
32+
33+ // Prevent exhaustive matching on the rendering context, so we can always
34+ // add more members in a semver-compatible way.
2535 _non_exhaustive: (),
2636}
2737
28−impl<'bump> RenderContext<'bump> {
29− // Don't use this! For internal use only! Subject to change in breaking ways
30− // without a breaking version bump!
31− #[doc(hidden)]
32− pub fn new(bump: &'bump Bump) -> Self {
33− RenderContext {
34− bump,
35− _non_exhaustive: (),
38+impl fmt::Debug for RenderContext<'_> {
39+ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
40+ f.debug_struct("RenderContext")
41+ .field("bump", &self.bump)
42+ .finish()
43+ }
44+}
45+
46+impl<'a> RenderContext<'a> {
47+ pub_unstable_internal! {
48+ pub(crate) fn new(
49+ bump: &'a Bump,
50+ cached_set: &'a crate::RefCell<CachedSet>,
51+ templates: &'a mut FxHashMap<TemplateId, Option<CacheId>>
52+ ) -> Self {
53+ RenderContext {
54+ bump,
55+ cached_set,
56+ templates,
57+ _non_exhaustive: (),
58+ }
59+ }
60+ }
61+
62+ pub(crate) fn cache<F>(&mut self, pinned: bool, template: Option<CacheId>, f: F) -> CacheId
63+ where
64+ F: for<'b> FnOnce(&mut RenderContext<'b>) -> Node<'b>,
65+ {
66+ CachedSet::insert(self, pinned, template, f)
67+ }
68+
69+ /// Get or create the cached template for `Cached<R>`.
70+ pub(crate) fn template<R>(&mut self) -> Option<CacheId>
71+ where
72+ R: 'static + Default + for<'b> Render<'b>,
73+ {
74+ let template_id = Cached::<R>::template_id();
75+ if let Some(cache_id) = self.templates.get(&template_id).cloned() {
76+ return cache_id;
3677 }
78+
79+ // Prevent re-entrancy from infinite looping. Any attempts to get `R`'s
80+ // template while constructing the template will simply fail to use the
81+ // templated fast path.
82+ self.templates.insert(template_id, None);
83+
84+ // Render the default `R` and save that as the template for all
85+ // `Cached<R>`s.
86+ let cache_id = self.cache(true, None, |nested_cx| R::default().render(nested_cx));
87+ self.templates.insert(template_id, Some(cache_id));
88+ Some(cache_id)
3789 }
3890}
3991
40−impl<'a, 'bump> From<&'a RenderContext<'bump>> for &'bump Bump {
92+impl<'a, 'b> From<&'b RenderContext<'a>> for &'a Bump {
4193 #[inline]
42− fn from(cx: &'a RenderContext<'bump>) -> &'bump Bump {
94+ fn from(cx: &'b RenderContext<'a>) -> &'a Bump {
4395 cx.bump
4496 }
4597}
4698
47−impl<'a, 'b, 'bump> From<&'a &'b mut RenderContext<'bump>> for &'bump Bump {
99+impl<'a, 'b, 'c> From<&'c &'b mut RenderContext<'a>> for &'a Bump {
48100 #[inline]
49− fn from(cx: &'a &'b mut RenderContext<'bump>) -> &'bump Bump {
101+ fn from(cx: &'c &'b mut RenderContext<'a>) -> &'a Bump {
50102 cx.bump
51103 }
52104}
src/strace.rsnew file+22
@@ -0,0 +1,22 @@
1+cfg_if::cfg_if! {
2+ if #[cfg(feature = "xxx-unstable-strace")] {
3+ use wasm_bindgen::prelude::*;
4+
5+ #[wasm_bindgen(module = "/js/strace.js")]
6+ extern "C" {
7+ #[wasm_bindgen(js_name = initStrace)]
8+ fn really_init_strace();
9+ }
10+
11+ pub fn init_strace() {
12+ use std::sync::Once;
13+ static STRACE: Once = Once::new();
14+ STRACE.call_once(|| {
15+ really_init_strace();
16+ });
17+ }
18+ } else {
19+ #[inline]
20+ pub fn init_strace() {}
21+ }
22+}
src/vdom.rs+136−326
@@ -1,14 +1,16 @@
1−use super::change_list::ChangeList;
2−use super::node::{Attribute, ElementNode, Listener, Node, TextNode};
1+use super::change_list::ChangeListPersistentState;
32use super::RootRender;
3+use crate::cached::TemplateId;
4+use crate::cached_set::{CacheId, CachedSet};
45use crate::events::EventsRegistry;
6+use crate::node::{Node, NodeKey};
57use crate::RenderContext;
68use bumpalo::Bump;
7−use futures::future::Future;
9+use fxhash::FxHashMap;
810use std::cell::Cell;
911use std::cell::RefCell;
10−use std::cmp;
1112use std::fmt;
13+use std::future::Future;
1214use std::mem;
1315use std::mem::ManuallyDrop;
1416use std::rc::{Rc, Weak};
@@ -53,12 +55,15 @@ pub(crate) struct VdomInnerExclusive {
5355 // Always `Some` except just before we drop. Just an option so that
5456 // `unmount` can take the component out but we can still have a Drop
5557 // implementation.
56− component: Option<Box<RootRender>>,
58+ component: Option<Box<dyn RootRender>>,
5759
58− dom_buffers: [Bump; 2],
59− change_list: ManuallyDrop<ChangeList>,
60+ dom_buffers: Option<[Bump; 2]>,
61+ change_list: ManuallyDrop<ChangeListPersistentState>,
6062 container: crate::Element,
6163 events_registry: Option<Rc<RefCell<EventsRegistry>>>,
64+ events_trampoline: Option<crate::EventsTrampoline>,
65+ cached_set: crate::RefCell<CachedSet>,
66+ templates: FxHashMap<TemplateId, Option<CacheId>>,
6267
6368 // Actually a reference into `self.dom_buffers[0]` or if `self.component` is
6469 // caching renders, into `self.component`'s bump.
@@ -91,6 +96,7 @@ impl fmt::Debug for VdomInnerExclusive {
9196 .field("change_list", &self.change_list)
9297 .field("container", &self.container)
9398 .field("events_registry", &self.events_registry)
99+ .field("events_trampoline", &"..")
94100 .field("current_root", &self.current_root)
95101 .finish()
96102 }
@@ -115,7 +121,7 @@ impl Drop for VdomInnerExclusive {
115121}
116122
117123cfg_if::cfg_if! {
118− if #[cfg(feature = "xxx-unstable-internal-use-only")] {
124+ if #[cfg(all(feature = "xxx-unstable-internal-use-only", not(target_arch = "wasm32")))] {
119125 fn empty_container(_container: &crate::Element) {}
120126 fn initialize_container(_container: &crate::Element) {}
121127 } else {
@@ -152,21 +158,24 @@ impl Vdom {
152158 where
153159 R: RootRender,
154160 {
155− Self::with_boxed_root_render(container, Box::new(component) as Box<RootRender>)
161+ Self::with_boxed_root_render(container, Box::new(component) as Box<dyn RootRender>)
156162 }
157163
158164 /// Construct a `Vdom` with the already-boxed-as-a-trait-object root
159165 /// rendering component.
160− pub fn with_boxed_root_render<'a, 'bump>(
166+ pub fn with_boxed_root_render(
161167 container: &crate::Element,
162− component: Box<RootRender>,
168+ component: Box<dyn RootRender>,
163169 ) -> Vdom {
170+ crate::strace::init_strace();
171+
164172 let dom_buffers = [Bump::new(), Bump::new()];
165− let change_list = ManuallyDrop::new(ChangeList::new(container));
173+ let change_list = ManuallyDrop::new(ChangeListPersistentState::new(container));
166174
167175 // Create a dummy `<div/>` in our container.
168176 initialize_container(container);
169− let current_root = Node::element(&dom_buffers[0], "div", [], [], [], None);
177+ let current_root =
178+ Node::element(&dom_buffers[0], NodeKey::NONE, "div", &[], &[], &[], None);
170179 let current_root = Some(unsafe { extend_node_lifetime(current_root) });
171180
172181 let container = container.clone();
@@ -176,11 +185,14 @@ impl Vdom {
176185 },
177186 exclusive: RefCell::new(VdomInnerExclusive {
178187 component: Some(component),
179− dom_buffers,
188+ dom_buffers: Some(dom_buffers),
180189 change_list,
181190 container,
182191 current_root,
183192 events_registry: None,
193+ events_trampoline: None,
194+ cached_set: crate::RefCell::new(Default::default()),
195+ templates: Default::default(),
184196 }),
185197 });
186198
@@ -189,7 +201,9 @@ impl Vdom {
189201 {
190202 let mut inner = inner.exclusive.borrow_mut();
191203 inner.events_registry = Some(events_registry);
192− inner.change_list.init_events_trampoline(events_trampoline);
204+ inner.change_list.init_events_trampoline(&events_trampoline);
205+ debug_assert!(inner.events_trampoline.is_none());
206+ inner.events_trampoline = Some(events_trampoline);
193207
194208 // Diff and apply the `contents` against our dummy `<div/>`.
195209 inner.render();
@@ -206,7 +220,7 @@ impl Vdom {
206220 R: RootRender,
207221 {
208222 let mut exclusive = self.inner.exclusive.borrow_mut();
209− let component = Box::new(component) as Box<RootRender>;
223+ let component = Box::new(component) as Box<dyn RootRender>;
210224 exclusive.component = Some(component);
211225 exclusive.render();
212226 }
@@ -226,7 +240,7 @@ impl Vdom {
226240 /// Unmount this virtual DOM, unregister its event listeners, and return its
227241 /// root render component.
228242 #[inline]
229− pub fn unmount(self) -> Box<RootRender> {
243+ pub fn unmount(self) -> Box<dyn RootRender> {
230244 Rc::try_unwrap(self.inner.clone())
231245 .map_err(|_| ())
232246 .unwrap_throw()
@@ -250,273 +264,69 @@ impl VdomInnerExclusive {
250264 pub(crate) fn render(&mut self) {
251265 unsafe {
252266 let events_registry = self.events_registry.take().unwrap();
253−
254267 {
255− // All the old listeners are no longer active. We will build a new
256− // set of active listeners when diffing.
257− //
258− // NB: if we end up avoiding diffing cached renders (instead of just
259− // avoiding re-rendering them) then we will need to maintain cached
260− // active listeners, and can't just clear all active listeners and
261− // rebuild them here.
262268 let mut registry = events_registry.borrow_mut();
263− registry.clear_active_listeners();
264269
265270 // Reset the inactive bump arena's pointer.
266− self.dom_buffers[1].reset();
271+ let mut dom_buffers = self.dom_buffers.take().unwrap_throw();
272+ dom_buffers[1].reset();
267273
268274 // Render the new current contents into the inactive bump arena.
269− let mut cx = RenderContext::new(&self.dom_buffers[1]);
275+ let mut cx =
276+ RenderContext::new(&dom_buffers[1], &self.cached_set, &mut self.templates);
270277 let new_contents = self.component.as_ref().unwrap_throw().render(&mut cx);
271278 let new_contents = extend_node_lifetime(new_contents);
272279
273280 // Diff the old contents with the new contents.
274281 let old_contents = self.current_root.take().unwrap();
275− self.diff(&mut registry, old_contents, new_contents.clone());
282+ let mut cache_roots;
283+ {
284+ let cached_set = self.cached_set.borrow();
285+ cache_roots = cached_set.new_roots_set();
286+ let mut change_list = self.change_list.builder();
287+ crate::diff::diff(
288+ &cached_set,
289+ &mut change_list,
290+ &mut registry,
291+ &old_contents,
292+ &new_contents,
293+ &mut cache_roots,
294+ );
295+
296+ // Tell JS to apply our diff-generated changes to the physical DOM!
297+ change_list.finish();
298+ }
299+
300+ {
301+ // Clean up unused cached renders.
302+ let mut cached_set = self.cached_set.borrow_mut();
303+ cached_set.gc(&mut registry, cache_roots);
304+ }
276305
277306 // Swap the buffers to make the bump arena with the new contents the
278307 // active arena, and the old one into the inactive arena.
279− self.swap_buffers();
308+ self.swap_buffers(dom_buffers);
280309 self.set_current_root(new_contents);
281310 }
282311
283312 self.events_registry = Some(events_registry);
284−
285− // Find and drop cached strings that aren't in use anymore.
286− self.change_list.drop_unused_strings();
287−
288− // Tell JS to apply our diff-generated changes to the physical DOM!
289− self.change_list.apply_changes();
290313 }
291314 }
292315
293− fn swap_buffers(&mut self) {
294− let (first, second) = self.dom_buffers.as_mut().split_at_mut(1);
316+ fn swap_buffers(&mut self, mut dom_buffers: [Bump; 2]) {
317+ debug_assert!(self.dom_buffers.is_none());
318+ let (first, second) = dom_buffers.as_mut().split_at_mut(1);
295319 mem::swap(&mut first[0], &mut second[0]);
320+ self.dom_buffers = Some(dom_buffers);
296321 }
297322
298323 unsafe fn set_current_root(&mut self, current: Node<'static>) {
299324 debug_assert!(self.current_root.is_none());
300325 self.current_root = Some(current);
301326 }
302−
303− fn diff<'a>(&mut self, registry: &mut EventsRegistry, old: Node<'a>, new: Node<'a>) {
304− match (&new, old) {
305− (&Node::Text(TextNode { text: new_text }), Node::Text(TextNode { text: old_text })) => {
306− debug!(" both are text nodes");
307− if new_text != old_text {
308− debug!(" text needs updating");
309− self.change_list.emit_set_text(new_text);
310− }
311− }
312− (&Node::Text(_), Node::Element(_)) => {
313− debug!(" replacing a text node with an element");
314− self.create(registry, new);
315− self.change_list.emit_replace_with();
316− }
317− (&Node::Element(_), Node::Text(_)) => {
318− debug!(" replacing an element with a text node");
319− self.create(registry, new);
320− self.change_list.emit_replace_with();
321− }
322− (
323− &Node::Element(ElementNode {
324− tag_name: new_tag_name,
325− listeners: new_listeners,
326− attributes: new_attributes,
327− children: new_children,
328− namespace: new_namespace,
329− }),
330− Node::Element(ElementNode {
331− tag_name: old_tag_name,
332− listeners: old_listeners,
333− attributes: old_attributes,
334− children: old_children,
335− namespace: old_namespace,
336− }),
337− ) => {
338− debug!(" updating an element");
339− if new_tag_name != old_tag_name || new_namespace != old_namespace {
340− debug!(" different tag names or namespaces; creating new element and replacing old element");
341− self.create(registry, new);
342− self.change_list.emit_replace_with();
343− return;
344− }
345− self.diff_listeners(registry, old_listeners, new_listeners);
346− self.diff_attributes(old_attributes, new_attributes);
347− self.diff_children(registry, old_children, new_children);
348− }
349− }
350− }
351−
352− fn diff_listeners<'a>(
353− &mut self,
354− registry: &mut EventsRegistry,
355− old: &'a [Listener<'a>],
356− new: &'a [Listener<'a>],
357− ) {
358− debug!(" updating event listeners");
359−
360− 'outer1: for new_l in new {
361− unsafe {
362− // Safety relies on removing `new_l` from the registry manually
363− // at the end of its lifetime. This happens when we invoke
364− // `clear_active_listeners` at the start of a new rendering
365− // phase.
366− registry.add(new_l);
367− }
368− for old_l in old {
369− if new_l.event == old_l.event {
370− self.change_list.emit_update_event_listener(new_l);
371− continue 'outer1;
372− }
373− }
374− self.change_list.emit_new_event_listener(new_l);
375− }
376−
377− 'outer2: for old_l in old {
378− for new_l in new {
379− if new_l.event == old_l.event {
380− continue 'outer2;
381− }
382− }
383− self.change_list.emit_remove_event_listener(old_l.event);
384− }
385− }
386−
387− fn diff_attributes(&mut self, old: &[Attribute], new: &[Attribute]) {
388− debug!(" updating attributes");
389−
390− // Do O(n^2) passes to add/update and remove attributes, since
391− // there are almost always very few attributes.
392− 'outer: for new_attr in new {
393− if new_attr.is_volatile() {
394− self.change_list
395− .emit_set_attribute(new_attr.name, new_attr.value);
396− } else {
397− for old_attr in old {
398− if old_attr.name == new_attr.name {
399− if old_attr.value != new_attr.value {
400− self.change_list
401− .emit_set_attribute(new_attr.name, new_attr.value);
402− }
403− continue 'outer;
404− }
405− }
406− self.change_list
407− .emit_set_attribute(new_attr.name, new_attr.value);
408− }
409− }
410−
411− 'outer2: for old_attr in old {
412− for new_attr in new {
413− if old_attr.name == new_attr.name {
414− continue 'outer2;
415− }
416− }
417− self.change_list.emit_remove_attribute(old_attr.name);
418− }
419− }
420−
421− fn diff_children<'a>(
422− &mut self,
423− registry: &mut EventsRegistry,
424− old: &'a [Node<'a>],
425− new: &'a [Node<'a>],
426− ) {
427− debug!(" updating children shared by old and new");
428−
429− let num_children_to_diff = cmp::min(new.len(), old.len());
430− let mut new_children = new.iter();
431− let mut old_children = old.iter();
432− let mut pushed = false;
433−
434− for (i, (new_child, old_child)) in new_children
435− .by_ref()
436− .zip(old_children.by_ref())
437− .take(num_children_to_diff)
438− .enumerate()
439− {
440− if i == 0 {
441− self.change_list.emit_push_first_child();
442− pushed = true;
443− } else {
444− debug_assert!(pushed);
445− self.change_list.emit_pop_push_next_sibling();
446− }
447−
448− self.diff(registry, old_child.clone(), new_child.clone());
449− }
450−
451− if old_children.next().is_some() {
452− debug!(" removing extra old children");
453− debug_assert!(new_children.next().is_none());
454− if !pushed {
455− self.change_list.emit_push_first_child();
456− } else {
457− self.change_list.emit_pop_push_next_sibling();
458− }
459− self.change_list.emit_remove_self_and_next_siblings();
460− pushed = false;
461− } else {
462− debug!(" creating new children");
463− for (i, new_child) in new_children.enumerate() {
464− if i == 0 && pushed {
465− self.change_list.emit_pop();
466− pushed = false;
467− }
468− self.create(registry, new_child.clone());
469− self.change_list.emit_append_child();
470− }
471− }
472−
473− debug!(" done updating children");
474− if pushed {
475− self.change_list.emit_pop();
476− }
477− }
478−
479− fn create<'a>(&mut self, registry: &mut EventsRegistry, node: Node<'a>) {
480− match node {
481− Node::Text(TextNode { text }) => {
482− self.change_list.emit_create_text_node(text);
483− }
484− Node::Element(ElementNode {
485− tag_name,
486− listeners,
487− attributes,
488− children,
489− namespace,
490− }) => {
491− if let Some(namespace) = namespace {
492− self.change_list.emit_create_element_ns(tag_name, namespace);
493− } else {
494− self.change_list.emit_create_element(tag_name);
495− }
496− for l in listeners {
497− unsafe {
498− registry.add(l);
499− }
500− self.change_list.emit_new_event_listener(l);
501− }
502− for attr in attributes {
503− if namespace.is_none() || attr.name.starts_with("xmlns") {
504− self.change_list.emit_set_attribute(&attr.name, &attr.value);
505− } else {
506− self.change_list
507− .emit_set_attribute_ns(&attr.name, &attr.value);
508− }
509− }
510− for child in children {
511− self.create(registry, child.clone());
512− self.change_list.emit_append_child();
513− }
514− }
515− }
516− }
517327}
518328
519−fn request_animation_frame(f: &Closure<FnMut()>) {
329+fn request_animation_frame(f: &Closure<dyn FnMut()>) {
520330 web_sys::window()
521331 .expect_throw("should have a window")
522332 .request_animation_frame(f.as_ref().unchecked_ref())
@@ -533,7 +343,7 @@ where
533343 let f = Closure::wrap(Box::new(move || {
534344 *g.borrow_mut() = None;
535345 f();
536− }) as Box<FnMut()>);
346+ }) as Box<dyn FnMut()>);
537347 request_animation_frame(&f);
538348
539349 *h.borrow_mut() = Some(f);
@@ -564,25 +374,23 @@ impl VdomWeak {
564374 /// Replace the root rendering component with the new `root`.
565375 ///
566376 /// Returns a future that resolves to the *old* root component.
567− pub fn set_component(
377+ pub async fn set_component(
568378 self,
569379 root: Box<dyn RootRender>,
570− ) -> impl Future<Item = Box<dyn RootRender + 'static>, Error = VdomDroppedError> {
571− futures::future::ok(self.inner.upgrade())
572− .and_then(|inner| inner.ok_or(()))
573− .map_err(|_| VdomDroppedError {})
574− .and_then(|inner| {
575− let promise = js_sys::Promise::resolve(&JsValue::null());
576− JsFuture::from(promise)
577− .map_err(|_| VdomDroppedError {})
578− .and_then(move |_| {
579− let old = {
580− let mut exclusive = inner.exclusive.borrow_mut();
581− mem::replace(&mut *exclusive.component.as_mut().unwrap_throw(), root)
582− };
583− VdomWeak::new(&inner).render().map(|_| old)
584− })
585− })
380+ ) -> Result<Box<dyn RootRender + 'static>, VdomDroppedError> {
381+ let inner = self.inner.upgrade().ok_or(VdomDroppedError {})?;
382+
383+ // Wait for a new tick of the micro-task queue
384+ let _ = JsFuture::from(js_sys::Promise::resolve(&JsValue::null())).await;
385+
386+ let old = {
387+ let mut exclusive = inner.exclusive.borrow_mut();
388+ mem::replace(&mut *exclusive.component.as_mut().unwrap_throw(), root)
389+ };
390+
391+ VdomWeak::new(&inner).render().await?;
392+
393+ Ok(old)
586394 }
587395
588396 /// Execute `f` with a reference to this virtual DOM's root rendering
@@ -590,24 +398,18 @@ impl VdomWeak {
590398 ///
591399 /// To ensure exclusive access to the root rendering component, the
592400 /// invocation takes place on a new tick of the micro-task queue.
593− pub fn with_component<F, T>(&self, f: F) -> impl Future<Item = T, Error = VdomDroppedError>
401+ pub async fn with_component<F, T>(&self, f: F) -> Result<T, VdomDroppedError>
594402 where
595403 F: 'static + FnOnce(&mut dyn RootRender) -> T,
596404 {
597− futures::future::ok(self.inner.upgrade())
598− .and_then(|inner| inner.ok_or(()))
599− .map_err(|_| VdomDroppedError {})
600− .and_then(|inner| {
601− let mut f = Some(f);
602− let promise = js_sys::Promise::resolve(&JsValue::null());
603− JsFuture::from(promise)
604− .map_err(|_| VdomDroppedError {})
605− .map(move |_| {
606− let f = f.take().unwrap_throw();
607− let mut exclusive = inner.exclusive.borrow_mut();
608− f(exclusive.component_raw_mut())
609− })
610− })
405+ let inner = self.inner.upgrade().ok_or(VdomDroppedError {})?;
406+
407+ // Wait for a new tick of the micro-task queue
408+ let _ = JsFuture::from(js_sys::Promise::resolve(&JsValue::null())).await;
409+
410+ let mut exclusive = inner.exclusive.borrow_mut();
411+
412+ Ok(f(exclusive.component_raw_mut()))
611413 }
612414
613415 /// Schedule a render to occur during the next animation frame.
@@ -616,7 +418,12 @@ impl VdomWeak {
616418 /// `render` instead.
617419 pub fn schedule_render(&self) {
618420 debug!("VdomWeak::schedule_render");
619− wasm_bindgen_futures::spawn_local(self.render().map_err(|_| ()));
421+
422+ let future = self.render();
423+
424+ wasm_bindgen_futures::spawn_local(async move {
425+ let _ = future.await;
426+ });
620427 }
621428
622429 /// Schedule a render to occur during the next animation frame and return a
@@ -624,43 +431,46 @@ impl VdomWeak {
624431 ///
625432 /// If you don't want to do more things after the render completes, then use
626433 /// `schedule_render` instead of `render`.
627− pub fn render(&self) -> impl Future<Item = (), Error = VdomDroppedError> {
628− debug!("VdomWeak::render: initiating render in new animation frame");
629− futures::future::ok(self.inner.upgrade())
630− .and_then(|inner| inner.ok_or(()))
631− .map_err(|_| VdomDroppedError {})
632− .and_then(|inner| {
633− let promise = inner.shared.render_scheduled.take().unwrap_or_else(|| {
634− js_sys::Promise::new(&mut |resolve, reject| {
635− let vdom = VdomWeak {
636− inner: Rc::downgrade(&inner),
637− };
638− with_animation_frame(move || match vdom.inner.upgrade() {
639− None => {
640− warn!("VdomWeak::render: vdom unmounted before we could render");
641− let r = reject.call0(&JsValue::null());
642− debug_assert!(r.is_ok());
643− }
644− Some(inner) => {
645− let mut exclusive = inner.exclusive.borrow_mut();
646− exclusive.render();
647−
648− // We did the render, so take the promise away
649− // and let future `render` calls request new
650− // animation frames.
651− let _ = inner.shared.render_scheduled.take();
652−
653− debug!("VdomWeak::render: finished rendering");
654− let r = resolve.call0(&JsValue::null());
655− debug_assert!(r.is_ok());
656− }
657− });
658− })
659− });
660− inner.shared.render_scheduled.set(Some(promise.clone()));
661− JsFuture::from(promise)
662− .map(|_| ())
663− .map_err(|_| VdomDroppedError {})
664− })
434+ pub fn render(&self) -> impl Future<Output = Result<(), VdomDroppedError>> {
435+ let inner = self.inner.upgrade();
436+
437+ async move {
438+ let inner = inner.ok_or(VdomDroppedError {})?;
439+
440+ let promise = inner.shared.render_scheduled.take().unwrap_or_else(|| {
441+ js_sys::Promise::new(&mut |resolve, reject| {
442+ let vdom = VdomWeak {
443+ inner: Rc::downgrade(&inner),
444+ };
445+
446+ with_animation_frame(move || match vdom.inner.upgrade() {
447+ None => {
448+ warn!("VdomWeak::render: vdom unmounted before we could render");
449+ let r = reject.call0(&JsValue::null());
450+ debug_assert!(r.is_ok());
451+ }
452+ Some(inner) => {
453+ let mut exclusive = inner.exclusive.borrow_mut();
454+ exclusive.render();
455+
456+ // We did the render, so take the promise away
457+ // and let future `render` calls request new
458+ // animation frames.
459+ let _ = inner.shared.render_scheduled.take();
460+
461+ let r = resolve.call0(&JsValue::null());
462+ debug_assert!(r.is_ok());
463+ }
464+ });
465+ })
466+ });
467+
468+ inner.shared.render_scheduled.set(Some(promise.clone()));
469+
470+ JsFuture::from(promise)
471+ .await
472+ .map(drop)
473+ .map_err(|_| VdomDroppedError {})
474+ }
665475 }
666476}
tests/web/cached.jsnew file+11
@@ -0,0 +1,11 @@
1+let cloneNodeCount = 0;
2+
3+const origCloneNode = Node.prototype.cloneNode;
4+Node.prototype.cloneNode = function (...args) {
5+ cloneNodeCount += 1;
6+ return origCloneNode.apply(this, args);
7+};
8+
9+export function getCloneNodeCount() {
10+ return cloneNodeCount;
11+}
tests/web/cached.rsnew file+289
@@ -0,0 +1,289 @@
1+use super::{assert_rendered, before_after, create_element, RenderFn};
2+use dodrio::{builder::*, bumpalo, Cached, Node, Render, RenderContext, RootRender, Vdom};
3+use std::cell::Cell;
4+use std::rc::Rc;
5+use wasm_bindgen::prelude::*;
6+use wasm_bindgen_test::*;
7+
8+#[derive(Default)]
9+pub struct CountRenders {
10+ render_count: Cell<usize>,
11+}
12+
13+impl CountRenders {
14+ pub fn new() -> CountRenders {
15+ CountRenders {
16+ render_count: Cell::new(0),
17+ }
18+ }
19+}
20+
21+impl<'a> Render<'a> for CountRenders {
22+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
23+ let count = self.render_count.get() + 1;
24+ self.render_count.set(count);
25+
26+ let s = bumpalo::format!(in cx.bump, "{}", count);
27+ text(s.into_bump_str())
28+ }
29+}
30+
31+#[wasm_bindgen_test]
32+async fn uses_cached_render() {
33+ use dodrio::builder::*;
34+
35+ let cached = Cached::new(CountRenders::new());
36+
37+ let container0 = create_element("div");
38+ let container1 = container0.clone();
39+ let container2 = container0.clone();
40+ let container3 = container0.clone();
41+ let container4 = container0.clone();
42+
43+ let vdom0 = Rc::new(Vdom::new(&container0, cached));
44+ let vdom1 = vdom0.clone();
45+ let vdom2 = vdom0.clone();
46+ let vdom3 = vdom0.clone();
47+ let vdom4 = vdom0.clone();
48+ let vdom5 = vdom0.clone();
49+ let vdom6 = vdom0.clone();
50+ let vdom7 = vdom0.clone();
51+
52+ // We render, populate the cache, and get "1".
53+ vdom0.weak().render().await.unwrap();
54+ vdom0
55+ .weak()
56+ .with_component(move |comp| {
57+ let comp = comp.unwrap_mut::<Cached<CountRenders>>();
58+ assert_eq!(comp.render_count.get(), 1);
59+ assert_rendered(&container1, &RenderFn(|_| text("1")));
60+ })
61+ .await
62+ .unwrap();
63+
64+ // We re-render, re-use the cached node, and get "1" again.
65+ vdom1.weak().render().await.unwrap();
66+ vdom2
67+ .weak()
68+ .with_component(move |comp| {
69+ let comp = comp.unwrap_mut::<Cached<CountRenders>>();
70+ assert_eq!(comp.render_count.get(), 1);
71+ assert_rendered(&container2, &RenderFn(|_| text("1")));
72+ })
73+ .await
74+ .unwrap();
75+
76+ // We invalidate the cache, re-render, re-populate the cache, and should now have "2".
77+ vdom3
78+ .weak()
79+ .with_component(move |comp| {
80+ let comp = comp.unwrap_mut::<Cached<CountRenders>>();
81+ Cached::invalidate(comp);
82+ })
83+ .await
84+ .unwrap();
85+ vdom4.weak().render().await.unwrap();
86+ vdom5
87+ .weak()
88+ .with_component(move |comp| {
89+ let comp = comp.unwrap_mut::<Cached<CountRenders>>();
90+ assert_eq!(comp.render_count.get(), 2);
91+ assert_rendered(&container3, &RenderFn(|_| text("2")));
92+ })
93+ .await
94+ .unwrap();
95+
96+ // We re-render, re-use the cached node, and get "2" again.
97+ vdom6.weak().render().await.unwrap();
98+ vdom7
99+ .weak()
100+ .with_component(move |comp| {
101+ let comp = comp.unwrap_mut::<Cached<CountRenders>>();
102+ assert_eq!(comp.render_count.get(), 2);
103+ assert_rendered(&container4, &RenderFn(|_| text("2")));
104+ })
105+ .await
106+ .unwrap();
107+}
108+
109+#[wasm_bindgen(module = "/tests/web/cached.js")]
110+extern "C" {
111+ #[wasm_bindgen(js_name = getCloneNodeCount)]
112+ fn get_clone_node_count() -> u32;
113+}
114+
115+#[wasm_bindgen_test]
116+async fn creating_cached_nodes_uses_clone_node() {
117+ use dodrio::builder::*;
118+
119+ let container = create_element("div");
120+
121+ // The initial vdom render should populate the cache and save a template.
122+ let vdom0 = Rc::new(Vdom::new(&container, Cached::new(CountRenders::new())));
123+ let vdom1 = vdom0.clone();
124+ let _vdom2 = vdom0.clone();
125+
126+ let clone_node_count_before = get_clone_node_count();
127+
128+ // Render something entirely different...
129+ vdom0
130+ .weak()
131+ .set_component(Box::new(RenderFn(|_| text("hi"))) as Box<dyn RootRender>)
132+ .await
133+ .unwrap();
134+
135+ // Re-render our cached node. Since we are creating it from scratch,
136+ // and already have a template from the earlier render, we should
137+ // call `cloneNode` here.
138+ vdom1
139+ .weak()
140+ .set_component(Box::new(Cached::new(CountRenders::new())) as Box<dyn RootRender>)
141+ .await
142+ .unwrap();
143+
144+ let clone_node_count_after = get_clone_node_count();
145+ assert_eq!(clone_node_count_after, clone_node_count_before + 1);
146+}
147+
148+struct Id(&'static str);
149+
150+impl Default for Id {
151+ fn default() -> Id {
152+ Id("")
153+ }
154+}
155+
156+impl<'a> Render<'a> for Id {
157+ fn render(&self, _cx: &mut RenderContext<'a>) -> Node<'a> {
158+ text(self.0)
159+ }
160+}
161+
162+thread_local! {
163+ static WARM_CHEESE: Rc<Cached<Id>> = Rc::new(Cached::new(Id("cheese")));
164+ static WARM_CHEESIER: Rc<Cached<Id>> = Rc::new(Cached::new(Id("cheesier")));
165+}
166+
167+fn warm_cheese<'a>(cx: &mut RenderContext<'a>) -> Node<'a> {
168+ WARM_CHEESE.with(|c| {
169+ let _ = c.render(cx);
170+ c.render(cx)
171+ })
172+}
173+
174+fn warm_cheesier<'a>(cx: &mut RenderContext<'a>) -> Node<'a> {
175+ WARM_CHEESIER.with(|c| {
176+ let _ = c.render(cx);
177+ c.render(cx)
178+ })
179+}
180+
181+before_after! {
182+ cold_cache_and_not_cached {
183+ before(cx) {
184+ Cached::new(Id("cheese")).render(cx)
185+ }
186+ after(cx) {
187+ Id("ravioli").render(cx)
188+ }
189+ }
190+
191+ not_cached_and_cold_cache {
192+ before(cx) {
193+ Id("ravioli").render(cx)
194+ }
195+ after(cx) {
196+ Cached::new(Id("cheese")).render(cx)
197+ }
198+ }
199+
200+ cold_cache_and_cold_cache_same {
201+ before(cx) {
202+ Cached::new(Id("cheese")).render(cx)
203+ }
204+ after(cx) {
205+ Cached::new(Id("cheese")).render(cx)
206+ }
207+ }
208+
209+ cold_cache_and_cold_cache_different {
210+ before(cx) {
211+ Cached::new(Id("cheese")).render(cx)
212+ }
213+ after(cx) {
214+ Cached::new(Id("ravioli")).render(cx)
215+ }
216+ }
217+
218+ warm_cache_and_not_cached {
219+ before(cx) {
220+ warm_cheese(cx)
221+ }
222+ after(cx) {
223+ Id("ravioli").render(cx)
224+ }
225+ }
226+
227+ not_cached_and_warm_cache {
228+ before(cx) {
229+ Id("ravioli").render(cx)
230+ }
231+ after(cx) {
232+ warm_cheese(cx)
233+ }
234+ }
235+
236+ warm_cache_and_warm_cache_same {
237+ before(cx) {
238+ warm_cheese(cx)
239+ }
240+ after(cx) {
241+ warm_cheese(cx)
242+ }
243+ }
244+
245+ warm_cache_and_warm_cache_different {
246+ before(cx) {
247+ warm_cheese(cx)
248+ }
249+ after(cx) {
250+ warm_cheesier(cx)
251+ }
252+ }
253+
254+ cold_cache_and_warm_cache_same {
255+ before(cx) {
256+ Cached::new(Id("cheese")).render(cx)
257+ }
258+ after(cx) {
259+ warm_cheese(cx)
260+ }
261+ }
262+
263+ cold_cache_and_warm_cache_different {
264+ before(cx) {
265+ Cached::new(Id("cheese")).render(cx)
266+ }
267+ after(cx) {
268+ warm_cheesier(cx)
269+ }
270+ }
271+
272+ warm_cache_and_cold_cache_same {
273+ before(cx) {
274+ warm_cheese(cx)
275+ }
276+ after(cx) {
277+ Cached::new(Id("cheese")).render(cx)
278+ }
279+ }
280+
281+ warm_cache_and_cold_cache_different {
282+ before(cx) {
283+ warm_cheesier(cx)
284+ }
285+ after(cx) {
286+ Cached::new(Id("cheese")).render(cx)
287+ }
288+ }
289+}
tests/web/events.rs+56−73
@@ -1,6 +1,6 @@
11use super::create_element;
22use dodrio::{Node, Render, RenderContext, Vdom};
3−use futures::Future;
3+use futures::future::{select, Either};
44use std::cell::{Cell, RefCell};
55use std::rc::Rc;
66use wasm_bindgen::prelude::*;
@@ -9,7 +9,7 @@ use wasm_bindgen_test::*;
99
1010struct EventContainer {
1111 event: &'static str,
12− on_event: Box<FnMut()>,
12+ on_event: Box<dyn FnMut()>,
1313}
1414
1515impl EventContainer {
@@ -24,8 +24,8 @@ impl EventContainer {
2424 }
2525}
2626
27−impl Render for EventContainer {
28− fn render<'bump>(&self, cx: &mut RenderContext<'bump>) -> Node<'bump> {
27+impl<'a> Render<'a> for EventContainer {
28+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
2929 use dodrio::builder::*;
3030 div(&cx)
3131 .attr("id", "target")
@@ -44,14 +44,14 @@ fn target(container: &web_sys::Element) -> web_sys::HtmlElement {
4444 .unchecked_into()
4545}
4646
47−#[wasm_bindgen_test(async)]
48−fn click() -> impl Future<Item = (), Error = JsValue> {
47+#[wasm_bindgen_test]
48+async fn click() {
4949 let container = create_element("div");
5050
51− let (sender, receiver) = futures::sync::oneshot::channel();
51+ let (sender, receiver) = futures::channel::oneshot::channel();
5252 let mut sender = Some(sender);
5353
54− let vdom = Vdom::new(
54+ let _vdom = Vdom::new(
5555 &container,
5656 EventContainer::new("click", move || {
5757 sender
@@ -64,18 +64,14 @@ fn click() -> impl Future<Item = (), Error = JsValue> {
6464
6565 target(&container).click();
6666
67− receiver
68− .map(|_| {
69− drop(vdom);
70− })
71− .map_err(|e| JsValue::from(e.to_string()))
67+ receiver.await.unwrap();
7268}
7369
74−#[wasm_bindgen_test(async)]
75−fn updated_listener_is_called() -> impl Future<Item = (), Error = JsValue> {
70+#[wasm_bindgen_test]
71+async fn updated_listener_is_called() {
7672 let container = create_element("div");
7773
78− let (first_sender, first_receiver) = futures::sync::oneshot::channel();
74+ let (first_sender, first_receiver) = futures::channel::oneshot::channel();
7975 let mut first_sender = Some(first_sender);
8076
8177 let vdom = Vdom::new(
@@ -89,7 +85,7 @@ fn updated_listener_is_called() -> impl Future<Item = (), Error = JsValue> {
8985 }),
9086 );
9187
92− let (second_sender, second_receiver) = futures::sync::oneshot::channel();
88+ let (second_sender, second_receiver) = futures::channel::oneshot::channel();
9389 let mut second_sender = Some(second_sender);
9490
9591 vdom.weak()
@@ -100,25 +96,22 @@ fn updated_listener_is_called() -> impl Future<Item = (), Error = JsValue> {
10096 .send("second")
10197 .expect_throw("should not have dropped the receiver");
10298 })))
103− .map_err(|e| JsValue::from(e.to_string()))
104− .and_then(move |_| {
105− target(&container).click();
106−
107− first_receiver
108− .select(second_receiver)
109− .map(|(which, _other)| which)
110− .or_else(|(_error, other)| other)
111− .map(|which| {
112− assert_eq!(which, "second");
113− drop(vdom);
114− })
115− .map_err(|e| JsValue::from(e.to_string()))
116− })
99+ .await
100+ .unwrap();
101+
102+ target(&container).click();
103+
104+ match select(first_receiver, second_receiver).await {
105+ Either::Left((Ok(_), _)) => panic!(),
106+ Either::Left((Err(_), second)) => assert_eq!(second.await, Ok("second")),
107+ Either::Right((Ok(msg), _)) => assert_eq!(msg, "second"),
108+ Either::Right((Err(_), _)) => panic!(),
109+ }
117110}
118111
119112struct ListensOnlyOnFirstRender {
120113 count: Cell<usize>,
121− callback: Box<FnMut()>,
114+ callback: Box<dyn FnMut()>,
122115}
123116
124117impl ListensOnlyOnFirstRender {
@@ -133,8 +126,8 @@ impl ListensOnlyOnFirstRender {
133126 }
134127}
135128
136−impl Render for ListensOnlyOnFirstRender {
137− fn render<'bump>(&self, cx: &mut RenderContext<'bump>) -> Node<'bump> {
129+impl<'a> Render<'a> for ListensOnlyOnFirstRender {
130+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
138131 use dodrio::builder::*;
139132
140133 let count = self.count.get();
@@ -150,11 +143,11 @@ impl Render for ListensOnlyOnFirstRender {
150143 }
151144}
152145
153−#[wasm_bindgen_test(async)]
154−fn removed_listener_is_not_called() -> impl Future<Item = (), Error = JsValue> {
146+#[wasm_bindgen_test]
147+async fn removed_listener_is_not_called() {
155148 let container = create_element("div");
156149
157− let (outer_sender, outer_receiver) = futures::sync::oneshot::channel();
150+ let (outer_sender, outer_receiver) = futures::channel::oneshot::channel();
158151 let outer_sender = Rc::new(RefCell::new(Some(outer_sender)));
159152 let outer_listener = Closure::wrap(Box::new(move |_| {
160153 outer_sender
@@ -163,13 +156,13 @@ fn removed_listener_is_not_called() -> impl Future<Item = (), Error = JsValue> {
163156 .expect_throw("should only invoke outer_listener once")
164157 .send("outer")
165158 .expect_throw("should not have dropped receiver");
166− }) as Box<FnMut(web_sys::Event)>);
159+ }) as Box<dyn FnMut(web_sys::Event)>);
167160
168161 container
169162 .add_event_listener_with_callback("click", outer_listener.as_ref().unchecked_ref())
170163 .unwrap();
171164
172− let (vdom_sender, vdom_receiver) = futures::sync::oneshot::channel();
165+ let (vdom_sender, vdom_receiver) = futures::channel::oneshot::channel();
173166 let mut vdom_sender = Some(vdom_sender);
174167
175168 // Render a vdom with a listener into container.
@@ -184,33 +177,26 @@ fn removed_listener_is_not_called() -> impl Future<Item = (), Error = JsValue> {
184177 }),
185178 );
186179
187− vdom.weak()
188− // Re-render, so we aren't listening anymore.
189− .render()
190− .map_err(|e| JsValue::from(e.to_string()))
191− .and_then(move |_| {
192− target(&container).click();
193−
194− // We should get our container's event handler fired, and not the unmounted
195− // vdom's event handler.
196− outer_receiver
197− .select(vdom_receiver)
198− .map(|(which, _other)| which)
199− .or_else(|(_error, other)| other)
200− .map(|which| {
201− assert_eq!(which, "outer");
202− drop(outer_listener);
203− drop(vdom)
204− })
205− .map_err(|e| JsValue::from(e.to_string()))
206− })
180+ // Re-render, so we aren't listening anymore.
181+ vdom.weak().render().await.unwrap();
182+
183+ target(&container).click();
184+
185+ // We should get our container's event handler fired, and not the unmounted
186+ // vdom's event handler.
187+ match select(outer_receiver, vdom_receiver).await {
188+ Either::Left((Ok(msg), _)) => assert_eq!(msg, ("outer")),
189+ Either::Left((Err(_), _)) => panic!(),
190+ Either::Right((Ok(_), _)) => panic!(),
191+ Either::Right((Err(_), outer)) => assert_eq!(outer.await, Ok("outer")),
192+ }
207193}
208194
209−#[wasm_bindgen_test(async)]
210−fn event_does_not_fire_after_unmounting() -> impl Future<Item = (), Error = JsValue> {
195+#[wasm_bindgen_test]
196+async fn event_does_not_fire_after_unmounting() {
211197 let container = create_element("div");
212198
213− let (outer_sender, outer_receiver) = futures::sync::oneshot::channel();
199+ let (outer_sender, outer_receiver) = futures::channel::oneshot::channel();
214200 let outer_sender = Rc::new(RefCell::new(Some(outer_sender)));
215201 let outer_listener = Closure::wrap(Box::new(move |_| {
216202 outer_sender
@@ -219,13 +205,13 @@ fn event_does_not_fire_after_unmounting() -> impl Future<Item = (), Error = JsVa
219205 .expect_throw("should only invoke outer_listener once")
220206 .send("outer")
221207 .expect_throw("should not have dropped receiver");
222− }) as Box<FnMut(web_sys::Event)>);
208+ }) as Box<dyn FnMut(web_sys::Event)>);
223209
224210 container
225211 .add_event_listener_with_callback("click", outer_listener.as_ref().unchecked_ref())
226212 .unwrap();
227213
228− let (vdom_sender, vdom_receiver) = futures::sync::oneshot::channel();
214+ let (vdom_sender, vdom_receiver) = futures::channel::oneshot::channel();
229215 let mut vdom_sender = Some(vdom_sender);
230216
231217 // Render a vdom with a listener into container.
@@ -255,13 +241,10 @@ fn event_does_not_fire_after_unmounting() -> impl Future<Item = (), Error = JsVa
255241
256242 // We should get our container's event handler fired, and not the unmounted
257243 // vdom's event handler.
258− outer_receiver
259− .select(vdom_receiver)
260− .map(|(which, _other)| which)
261− .or_else(|(_error, other)| other)
262− .map(|which| {
263− assert_eq!(which, "outer");
264− drop(outer_listener);
265− })
266− .map_err(|e| JsValue::from(e.to_string()))
244+ match select(outer_receiver, vdom_receiver).await {
245+ Either::Left((Ok(msg), _)) => assert_eq!(msg, ("outer")),
246+ Either::Left((Err(_), _)) => panic!(),
247+ Either::Right((Ok(_), _)) => panic!(),
248+ Either::Right((Err(_), outer)) => assert_eq!(outer.await, Ok("outer")),
249+ }
267250}
tests/web/js_api.rs+30−37
@@ -1,8 +1,7 @@
11use super::{assert_rendered, create_element, RenderFn};
22use dodrio::{builder::*, Node, Render, RenderContext, Vdom};
33use dodrio_js_api::JsRender;
4−use futures::prelude::*;
5−use futures::sync::oneshot;
4+use futures::channel::oneshot;
65use js_sys::Object;
76use std::rc::Rc;
87use wasm_bindgen::prelude::*;
@@ -14,7 +13,7 @@ pub struct WrapJs {
1413}
1514
1615impl WrapJs {
17− pub fn new() -> (WrapJs, oneshot::Receiver<()>, Closure<FnMut()>) {
16+ pub fn new() -> (WrapJs, oneshot::Receiver<()>, Closure<dyn FnMut()>) {
1817 let (sender, receiver) = oneshot::channel();
1918
2019 let on_after_render = Closure::wrap(Box::new({
@@ -26,7 +25,7 @@ impl WrapJs {
2625 .send(())
2726 .expect_throw("receiver should not have been dropped");
2827 }
29− }) as Box<FnMut()>);
28+ }) as Box<dyn FnMut()>);
3029
3130 let component = WrapJs {
3231 inner: JsRender::new(JsComponent::new(&on_after_render)),
@@ -36,8 +35,8 @@ impl WrapJs {
3635 }
3736}
3837
39−impl Render for WrapJs {
40− fn render<'bump>(&self, cx: &mut RenderContext<'bump>) -> Node<'bump> {
38+impl<'a> Render<'a> for WrapJs {
39+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
4140 div(&cx)
4241 .attr("class", "wrap-js")
4342 .children([self.inner.render(cx)])
@@ -52,7 +51,7 @@ extern "C" {
5251 type JsComponent;
5352
5453 #[wasm_bindgen(constructor)]
55− fn new(on_after_render: &Closure<FnMut()>) -> JsComponent;
54+ fn new(on_after_render: &Closure<dyn FnMut()>) -> JsComponent;
5655}
5756
5857fn eval_js_rendering_component() {
@@ -96,14 +95,14 @@ fn eval_js_rendering_component() {
9695 });
9796}
9897
99−#[wasm_bindgen_test(async)]
100−fn can_use_js_rendering_components() -> impl Future<Item = (), Error = JsValue> {
98+#[wasm_bindgen_test]
99+async fn can_use_js_rendering_components() {
101100 eval_js_rendering_component();
102101
103102 let container = create_element("div");
104− let (component, receiver, closure) = WrapJs::new();
103+ let (component, receiver, _closure) = WrapJs::new();
104+ let _vdom = Rc::new(Vdom::new(&container, component));
105105
106− let vdom = Rc::new(Vdom::new(&container, component));
107106 assert_rendered(
108107 &container,
109108 &RenderFn(|cx| {
@@ -131,30 +130,24 @@ fn can_use_js_rendering_components() -> impl Future<Item = (), Error = JsValue>
131130 .expect_throw("should be an `HTMLElement` object")
132131 .click();
133132
134− receiver
135− .map(move |_| {
136− assert_rendered(
137− &container,
138− &RenderFn(|cx| {
139− div(&cx)
140− .attr("class", "wrap-js")
141− .children([span(&cx)
142− .attr("class", "js-component")
143− .children([
144− text("Here is some plain text"),
145− b(&cx)
146− .children([text("...and here is some bold text")])
147− .finish(),
148− text("1"),
149− ])
150− .finish()])
151− .finish()
152− }),
153− );
154−
155− drop(vdom);
156− drop(container);
157− drop(closure);
158− })
159− .map_err(|e| e.to_string().into())
133+ receiver.await.unwrap();
134+
135+ assert_rendered(
136+ &container,
137+ &RenderFn(|cx| {
138+ div(&cx)
139+ .attr("class", "wrap-js")
140+ .children([span(&cx)
141+ .attr("class", "js-component")
142+ .children([
143+ text("Here is some plain text"),
144+ b(&cx)
145+ .children([text("...and here is some bold text")])
146+ .finish(),
147+ text("1"),
148+ ])
149+ .finish()])
150+ .finish()
151+ }),
152+ );
160153}
tests/web/keyed.jsnew file+25
@@ -0,0 +1,25 @@
1+export function saveKeyedElements(container) {
2+ const saved = new Map;
3+ const children = container.querySelectorAll(".keyed");
4+ for (const child of children) {
5+ saved.set(child.id, child);
6+ }
7+ return saved;
8+}
9+
10+function assertEq(a, b, msg) {
11+ if (a !== b) {
12+ throw new Error(`assertEq failed: ${a} !== ${b}; ${msg}`);
13+ }
14+}
15+
16+export function checkKeyedElements(container, saved) {
17+ const children = container.querySelectorAll(".keyed");
18+ for (const child of children) {
19+ console.log(`checking child=${child.outerHTML}`);
20+ const original = saved.get(child.id);
21+ if (original) {
22+ assertEq(original, child, `did not preserve child with key=${child.id}`);
23+ }
24+ }
25+}
tests/web/keyed.rsnew file+269
@@ -0,0 +1,269 @@
1+use crate::{assert_rendered, create_element};
2+use dodrio::{builder::*, bumpalo, Node, Render, RenderContext, Vdom};
3+use log::*;
4+use std::rc::Rc;
5+use wasm_bindgen::prelude::*;
6+use wasm_bindgen_test::*;
7+
8+struct Keyed(u16);
9+
10+impl<'a> Render<'a> for Keyed {
11+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
12+ let key = bumpalo::format!(in cx.bump, "{}", self.0).into_bump_str();
13+ div(&cx)
14+ .attr("class", "keyed")
15+ .attr("id", key)
16+ .key(self.0 as u32)
17+ .finish()
18+ }
19+}
20+
21+fn keyed<'a, Keys>(cx: &mut RenderContext<'a>, keys: Keys) -> Node<'a>
22+where
23+ Keys: AsRef<[u16]>,
24+{
25+ let mut parent = div(&cx).attr("class", "parent");
26+
27+ for &k in keys.as_ref() {
28+ parent = parent.child(Keyed(k).render(cx));
29+ }
30+
31+ parent.finish()
32+}
33+
34+async fn assert_keyed<Before, After>(before: Before, after: After) -> Result<(), JsValue>
35+where
36+ Before: 'static + for<'a> Render<'a>,
37+ After: 'static + for<'a> Render<'a>,
38+{
39+ #[wasm_bindgen(module = "/tests/web/keyed.js")]
40+ extern "C" {
41+ #[wasm_bindgen(js_name = saveKeyedElements)]
42+ fn save_keyed_elements(container: &web_sys::Element) -> JsValue;
43+
44+ #[wasm_bindgen(js_name = checkKeyedElements)]
45+ fn check_keyed_elements(container: &web_sys::Element, saved: JsValue);
46+ }
47+
48+ let container = create_element("div");
49+
50+ let before = Rc::new(before);
51+ let after = Rc::new(after);
52+
53+ debug!("====== Rendering the *before* DOM into the physical DOM ======");
54+ let vdom1 = Rc::new(Vdom::new(&container, before.clone()));
55+ let _vdom2 = vdom1.clone();
56+ let saved = save_keyed_elements(&container);
57+
58+ debug!("====== Checking the *before* DOM against the physical DOM ======");
59+ assert_rendered(&container, &before);
60+
61+ debug!("====== Rendering the *after* DOM into the physical DOM ======");
62+ let weak = vdom1.weak();
63+ weak.set_component(Box::new(after.clone()))
64+ .await
65+ .map_err(|e| e.to_string())?;
66+
67+ debug!("====== Checking the *after* DOM against the physical DOM ======");
68+ assert_rendered(&container, &after);
69+ check_keyed_elements(&container, saved);
70+
71+ Ok(())
72+}
73+
74+macro_rules! keyed_tests {
75+ ( $(
76+ $name:ident {
77+ before($before_cx:ident) {
78+ $( $before:tt )*
79+ }
80+ after($after_cx:ident) {
81+ $( $after:tt )*
82+ }
83+ }
84+ )* ) => {
85+ $(
86+ #[wasm_bindgen_test]
87+ async fn $name() {
88+ use crate::RenderFn;
89+ log::debug!("############### {} ###############", stringify!($name));
90+ assert_keyed(
91+ RenderFn(|$before_cx| { $( $before )* }),
92+ RenderFn(|$after_cx| { $( $after )* }),
93+ )
94+ .await
95+ .unwrap()
96+ }
97+ )*
98+ }
99+}
100+
101+keyed_tests! {
102+ same_order {
103+ before(cx) {
104+ keyed(cx, [1, 2, 3])
105+ }
106+ after(cx) {
107+ keyed(cx, [1, 2, 3])
108+ }
109+ }
110+
111+ same_order_append {
112+ before(cx) {
113+ keyed(cx, [1])
114+ }
115+ after(cx) {
116+ keyed(cx, [1, 2])
117+ }
118+ }
119+
120+ same_order_delete {
121+ before(cx) {
122+ keyed(cx, [1, 2, 3])
123+ }
124+ after(cx) {
125+ keyed(cx, [1, 2])
126+ }
127+ }
128+
129+ same_suffix {
130+ before(cx) {
131+ keyed(cx, [1, 2, 3])
132+ }
133+ after(cx) {
134+ keyed(cx, [4, 2, 3])
135+ }
136+ }
137+
138+ same_prefix_and_suffix_reorder_middle {
139+ before(cx) {
140+ keyed(cx, [1, 2, 3, 4])
141+ }
142+ after(cx) {
143+ keyed(cx, [1, 3, 2, 4])
144+ }
145+ }
146+
147+ same_prefix_and_suffix_new_middle {
148+ before(cx) {
149+ keyed(cx, [2, 3, 4, 5])
150+ }
151+ after(cx) {
152+ keyed(cx, [2, 7, 8, 5])
153+ }
154+ }
155+
156+ reverse_order {
157+ before(cx) {
158+ keyed(cx, [1, 2, 3])
159+ }
160+ after(cx) {
161+ keyed(cx, [3, 2, 1])
162+ }
163+ }
164+
165+ no_shared_keys {
166+ before(cx) {
167+ keyed(cx, [1, 2])
168+ }
169+ after(cx) {
170+ keyed(cx, [3, 4])
171+ }
172+ }
173+
174+ new_keys_in_middle {
175+ before(cx) {
176+ keyed(cx, [1, 2])
177+ }
178+ after(cx) {
179+ keyed(cx, [1, 3, 4, 2])
180+ }
181+ }
182+
183+ new_keys_at_start_and_end {
184+ before(cx) {
185+ keyed(cx, [1, 2, 3])
186+ }
187+ after(cx) {
188+ keyed(cx, [4, 1, 2, 3, 5])
189+ }
190+ }
191+
192+ delete_prefix {
193+ before(cx) {
194+ keyed(cx, [1, 2, 3])
195+ }
196+ after(cx) {
197+ keyed(cx, [2, 3])
198+ }
199+ }
200+
201+ delete_suffix {
202+ before(cx) {
203+ keyed(cx, [1, 2, 3])
204+ }
205+ after(cx) {
206+ keyed(cx, [1, 2])
207+ }
208+ }
209+
210+ delete_middle {
211+ before(cx) {
212+ keyed(cx, [1, 2, 3])
213+ }
214+ after(cx) {
215+ keyed(cx, [1, 3])
216+ }
217+ }
218+
219+ nested_keyed_children {
220+ before(cx) {
221+ ul(&cx)
222+ .children([
223+ li(&cx)
224+ .key(1)
225+ .children([
226+ keyed(cx, [2, 3, 4])
227+ ])
228+ .finish(),
229+ li(&cx)
230+ .key(5)
231+ .children([
232+ keyed(cx, [6, 7, 8])
233+ ])
234+ .finish(),
235+ li(&cx)
236+ .key(9)
237+ .children([
238+ keyed(cx, [10, 11, 12])
239+ ])
240+ .finish(),
241+ ])
242+ .finish()
243+ }
244+ after(cx) {
245+ ul(&cx)
246+ .children([
247+ li(&cx)
248+ .key(9)
249+ .children([
250+ keyed(cx, [12, 11, 10])
251+ ])
252+ .finish(),
253+ li(&cx)
254+ .key(5)
255+ .children([
256+ keyed(cx, [8, 7, 6])
257+ ])
258+ .finish(),
259+ li(&cx)
260+ .key(1)
261+ .children([
262+ keyed(cx, [4, 3, 2])
263+ ])
264+ .finish(),
265+ ])
266+ .finish()
267+ }
268+ }
269+}
tests/web/main.rs+56−33
@@ -1,11 +1,14 @@
11//! Test suite for the Web and headless browsers.
22
3−#![cfg(target_arch = "wasm32")]
3+#![cfg(all(feature = "xxx-unstable-internal-use-only", target_arch = "wasm32"))]
44
55use bumpalo::Bump;
6−use dodrio::{Attribute, Node, Render, RenderContext, Vdom};
7−use futures::prelude::*;
6+use dodrio::{
7+ Attribute, CachedSet, ElementNode, Node, NodeKind, Render, RenderContext, TextNode, Vdom,
8+};
9+use fxhash::FxHashMap;
810use log::*;
11+use std::cell::RefCell;
912use std::rc::Rc;
1013use wasm_bindgen::prelude::*;
1114use wasm_bindgen::JsCast;
@@ -13,8 +16,10 @@ use wasm_bindgen_test::*;
1316
1417wasm_bindgen_test_configure!(run_in_browser);
1518
19+pub mod cached;
1620pub mod events;
1721pub mod js_api;
22+pub mod keyed;
1823pub mod render;
1924
2025pub fn window() -> web_sys::Window {
@@ -45,16 +50,20 @@ pub fn init_logging() {
4550
4651/// Assert that the `container` contains the physical DOM tree that matches
4752/// `r`'s rendered virtual DOM.
48−pub fn assert_rendered<R: Render>(container: &web_sys::Element, r: &R) {
53+pub fn assert_rendered<R: for<'a> Render<'a>>(container: &web_sys::Element, r: &R) {
4954 init_logging();
5055
56+ let cached_set = &RefCell::new(CachedSet::default());
5157 let bump = &Bump::new();
52− let cx = &mut RenderContext::new(bump);
58+ let templates = &mut FxHashMap::default();
59+ let cx = &mut RenderContext::new(bump, cached_set, templates);
5360 let node = r.render(cx);
5461 let child = container
5562 .first_child()
5663 .expect("container does not have anything rendered into it?");
57− check_node(&child, &node);
64+
65+ let cached_set = cached_set.borrow();
66+ check_node(&cached_set, &child, &node);
5867
5968 fn stringify_actual_node(n: &web_sys::Node) -> String {
6069 if let Some(el) = n.dyn_ref::<web_sys::Element>() {
@@ -64,12 +73,12 @@ pub fn assert_rendered<R: Render>(container: &web_sys::Element, r: &R) {
6473 }
6574 }
6675
67− fn check_node(actual: &web_sys::Node, expected: &Node) {
76+ fn check_node(cached_set: &CachedSet, actual: &web_sys::Node, expected: &Node) {
6877 debug!("check_render:");
6978 debug!(" actual = {}", stringify_actual_node(&actual));
7079 debug!(" expected = {:#?}", expected);
71− match expected {
72− Node::Text(text_node) => {
80+ match expected.kind {
81+ NodeKind::Text(TextNode { text }) => {
7382 assert_eq!(
7483 actual.node_name().to_uppercase(),
7584 "#TEXT",
@@ -77,25 +86,35 @@ pub fn assert_rendered<R: Render>(container: &web_sys::Element, r: &R) {
7786 );
7887 assert_eq!(
7988 actual.text_content().unwrap_or_default(),
80− text_node.text(),
89+ text,
8190 "actual.text_content() == expected.text()"
8291 );
8392 }
84− Node::Element(elem) => {
93+ NodeKind::Element(&ElementNode {
94+ tag_name,
95+ attributes,
96+ children,
97+ namespace,
98+ ..
99+ }) => {
85100 assert_eq!(
86101 actual.node_name().to_uppercase(),
87− elem.tag_name().to_uppercase(),
102+ tag_name.to_uppercase(),
88103 "actual.node_name() == expected.tag_name()"
89104 );
90105 let actual = actual
91106 .dyn_ref::<web_sys::Element>()
92107 .expect("`actual` should be an `Element`");
93− check_attributes(actual.attributes(), elem.attributes());
94− check_children(actual.child_nodes(), elem.children());
95− if let Some(namespace) = elem.namespace() {
108+ check_attributes(actual.attributes(), attributes);
109+ check_children(cached_set, actual.child_nodes(), children);
110+ if let Some(namespace) = namespace {
96111 assert_eq!(actual.namespace_uri(), Some(namespace.into()))
97112 }
98113 }
114+ NodeKind::Cached(ref c) => {
115+ let (expected, _template) = cached_set.get(c.id);
116+ check_node(cached_set, actual, &expected);
117+ }
99118 }
100119 }
101120
@@ -118,7 +137,7 @@ pub fn assert_rendered<R: Render>(container: &web_sys::Element, r: &R) {
118137 }
119138 }
120139
121− fn check_children(actual: web_sys::NodeList, expected: &[Node]) {
140+ fn check_children(cached_set: &CachedSet, actual: web_sys::NodeList, expected: &[Node]) {
122141 assert_eq!(
123142 actual.length(),
124143 expected.len() as u32,
@@ -126,7 +145,7 @@ pub fn assert_rendered<R: Render>(container: &web_sys::Element, r: &R) {
126145 );
127146 for (i, child) in expected.iter().enumerate() {
128147 let actual_child = actual.item(i as u32).unwrap();
129− check_node(&actual_child, child);
148+ check_node(cached_set, &actual_child, child);
130149 }
131150 }
132151}
@@ -134,13 +153,13 @@ pub fn assert_rendered<R: Render>(container: &web_sys::Element, r: &R) {
134153/// Use the function `F` to render.
135154pub struct RenderFn<F>(F)
136155where
137− F: for<'bump> Fn(&mut RenderContext<'bump>) -> Node<'bump>;
156+ F: for<'a> Fn(&mut RenderContext<'a>) -> Node<'a>;
138157
139−impl<F> Render for RenderFn<F>
158+impl<'a, F> Render<'a> for RenderFn<F>
140159where
141− F: for<'bump> Fn(&mut RenderContext<'bump>) -> Node<'bump>,
160+ F: for<'b> Fn(&mut RenderContext<'b>) -> Node<'b>,
142161{
143− fn render<'bump>(&self, cx: &mut RenderContext<'bump>) -> Node<'bump> {
162+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
144163 (self.0)(cx)
145164 }
146165}
@@ -148,10 +167,10 @@ where
148167/// Assert that if we start by rendering the `before` virtual DOM tree into a
149168/// physical DOM tree, and then diff it with the `after` virtual DOM tree, then
150169/// the physical DOM tree correctly matches `after`.
151−pub fn assert_before_after<R, S>(before: R, after: S) -> impl Future<Item = (), Error = JsValue>
170+pub async fn assert_before_after<R, S>(before: R, after: S) -> Result<(), JsValue>
152171where
153− R: 'static + Render,
154− S: 'static + Render,
172+ R: 'static + for<'a> Render<'a>,
173+ S: 'static + for<'a> Render<'a>,
155174{
156175 let container = create_element("div");
157176
@@ -160,7 +179,7 @@ where
160179
161180 debug!("====== Rendering the *before* DOM into the physical DOM ======");
162181 let vdom1 = Rc::new(Vdom::new(&container, before.clone()));
163− let vdom2 = vdom1.clone();
182+ let _vdom2 = vdom1.clone();
164183
165184 debug!("====== Checking the *before* DOM against the physical DOM ======");
166185 assert_rendered(&container, &before);
@@ -168,12 +187,13 @@ where
168187 debug!("====== Rendering the *after* DOM into the physical DOM ======");
169188 let weak = vdom1.weak();
170189 weak.set_component(Box::new(after.clone()))
171− .map(move |_| {
172− debug!("====== Checking the *after* DOM against the physical DOM ======");
173− assert_rendered(&container, &after);
174− drop(vdom2);
175− })
176− .map_err(|e| JsValue::from(e.to_string()))
190+ .await
191+ .map_err(|e| e.to_string())?;
192+
193+ debug!("====== Checking the *after* DOM against the physical DOM ======");
194+ assert_rendered(&container, &after);
195+
196+ Ok(())
177197}
178198
179199/// A helper macro for declaring a bunch of `assert_before_after` tests.
@@ -190,13 +210,16 @@ macro_rules! before_after {
190210 }
191211 )* ) => {
192212 $(
193− #[wasm_bindgen_test(async)]
194− fn $name() -> impl Future<Item = (), Error = wasm_bindgen::JsValue> {
213+ #[wasm_bindgen_test]
214+ async fn $name() {
195215 use crate::{assert_before_after, RenderFn};
216+ log::debug!("############### {} ###############", stringify!($name));
196217 assert_before_after(
197218 RenderFn(|$before_bump| { $( $before )* }),
198219 RenderFn(|$after_bump| { $( $after )* })
199220 )
221+ .await
222+ .unwrap()
200223 }
201224 )*
202225 }
tests/web/render.rs+89−2
@@ -1,7 +1,7 @@
11use super::{assert_rendered, before_after, create_element, RenderFn};
2−use dodrio::{builder::*, Vdom};
3−use futures::prelude::*;
2+use dodrio::{builder::*, bumpalo::collections::String, Node, Render, RenderContext, Vdom};
43use std::rc::Rc;
4+use wasm_bindgen::{ JsCast};
55use wasm_bindgen_test::*;
66
77#[wasm_bindgen_test]
@@ -35,6 +35,93 @@ fn container_is_emptied_upon_drop() {
3535 assert!(container.first_child().is_none());
3636}
3737
38+/// Renders a child with a lifetime scoped to the RenderContext bump arena.
39+#[wasm_bindgen_test]
40+fn render_bump_scoped_node() {
41+ struct Child<'a> {
42+ name: &'a str,
43+ }
44+
45+ impl<'a> Render<'a> for Child<'a> {
46+ fn render(&self, _cx: &mut RenderContext<'a>) -> Node<'a> {
47+ text(self.name)
48+ }
49+ }
50+
51+ struct Parent;
52+
53+ impl<'a> Render<'a> for Parent {
54+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
55+ let child_name = String::from_str_in("child", cx.bump).into_bump_str();
56+
57+ div(&cx)
58+ .children([Child { name: child_name }.render(cx)])
59+ .finish()
60+ }
61+ }
62+
63+ let parent = Rc::new(RenderFn(|cx| {
64+ Parent.render(cx)
65+ }));
66+
67+ let container = create_element("div");
68+ let _vdom = Vdom::new(&container, parent.clone());
69+
70+ assert_rendered(&container, &parent);
71+}
72+
73+/// Originally, dodrio would use the className property for SVGs.
74+///
75+/// This is problematic because when SVG elements are created, the className is flagged as a read
76+/// only property, so setting it causes an exception to be thrown. Here's an example of how this
77+/// happens:
78+///
79+/// let elem = web_sys::window()
80+/// .unwrap()
81+/// .document()
82+/// .unwrap()
83+/// .create_element_ns(Some("http://www.w3.org/2000/svg"), "svg")
84+/// .unwrap();
85+///
86+/// elem.set_class_name("does-not-work");
87+///
88+/// -----------------------------------------------------------------------------------------------
89+///
90+/// wasm-bindgen: imported JS function that was not marked as `catch` threw an error:
91+/// setting getter-only property "className"
92+///
93+/// -----------------------------------------------------------------------------------------------
94+///
95+/// Now, dodrio passes the 'class' attribute of all namespaced elements into set_attribute. This
96+/// satisfies the restrictions on SVG and keeps the optimized path for non-namespaced elements
97+#[wasm_bindgen_test(async)]
98+async fn test_svg_set_class() {
99+ let container = create_element("div");
100+
101+
102+ let valid_svg = Rc::new(RenderFn(|cx| {
103+ ElementBuilder::new(cx.bump, "svg")
104+ .namespace(Some("http://www.w3.org/2000/svg"))
105+ .attr("class", "works")
106+ .finish()
107+ }));
108+
109+ let vdom = Vdom::new(&container, valid_svg.clone());
110+ let weak = vdom.weak();
111+
112+ weak.render().await.unwrap();
113+
114+ assert_eq!(
115+ "works",
116+ container.first_child()
117+ .expect("unable to get svg")
118+ .dyn_ref::<web_sys::Element>()
119+ .expect("svg should be an element")
120+ .get_attribute("class")
121+ .expect("unable to get 'class' of svg")
122+ );
123+}
124+
38125before_after! {
39126 same_text {
40127 before(_cx) {