Revert WIP hydration commit — undefined hydrate-start!/stop! broke all islands
The WIP commit (0044f17e) added calls to hydrate-start!, hydrate-stop!,
hydrate-push!, hydrate-pop!, and hydrate-next-*! — none of which were
ever defined. This crashed hydrate-island silently (cek-try swallowed
the error), preventing event listener attachment on every island.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -1,49 +1,17 @@
|
||||
(import (sx dom))
|
||||
(import (sx render))
|
||||
|
||||
(define-library
|
||||
(web adapter-dom)
|
||||
(export
|
||||
SVG_NS
|
||||
MATH_NS
|
||||
island-scope?
|
||||
contains-deref?
|
||||
dom-on
|
||||
render-to-dom
|
||||
render-dom-list
|
||||
render-dom-element
|
||||
render-dom-component
|
||||
render-dom-fragment
|
||||
render-dom-raw
|
||||
render-dom-unknown-component
|
||||
RENDER_DOM_FORMS
|
||||
render-dom-form?
|
||||
dispatch-render-form
|
||||
render-lambda-dom
|
||||
render-dom-island
|
||||
render-dom-lake
|
||||
render-dom-marsh
|
||||
reactive-text
|
||||
reactive-attr
|
||||
reactive-spread
|
||||
reactive-fragment
|
||||
render-list-item
|
||||
extract-key
|
||||
reactive-list
|
||||
bind-input
|
||||
*use-cek-reactive*
|
||||
enable-cek-reactive!
|
||||
cek-reactive-text
|
||||
cek-reactive-attr
|
||||
render-dom-portal
|
||||
render-dom-error-boundary)
|
||||
(begin
|
||||
(define SVG_NS "http://www.w3.org/2000/svg")
|
||||
(define MATH_NS "http://www.w3.org/1998/Math/MathML")
|
||||
(define
|
||||
island-scope?
|
||||
(fn () (not (nil? (scope-peek "sx-island-scope")))))
|
||||
(define-library (web adapter-dom)
|
||||
(export SVG_NS MATH_NS island-scope? contains-deref? dom-on render-to-dom render-dom-list render-dom-element render-dom-component render-dom-fragment render-dom-raw render-dom-unknown-component RENDER_DOM_FORMS render-dom-form? dispatch-render-form render-lambda-dom render-dom-island render-dom-lake render-dom-marsh reactive-text reactive-attr reactive-spread reactive-fragment render-list-item extract-key reactive-list bind-input *use-cek-reactive* enable-cek-reactive! cek-reactive-text cek-reactive-attr render-dom-portal render-dom-error-boundary)
|
||||
(begin
|
||||
|
||||
(define SVG_NS "http://www.w3.org/2000/svg")
|
||||
|
||||
(define MATH_NS "http://www.w3.org/1998/Math/MathML")
|
||||
|
||||
(define island-scope? (fn () (not (nil? (scope-peek "sx-island-scope")))))
|
||||
|
||||
(begin
|
||||
(define *memo-cache* (dict))
|
||||
(define *cyst-counter* 0)
|
||||
(define
|
||||
@@ -52,7 +20,8 @@
|
||||
()
|
||||
(set! *cyst-counter* (+ *cyst-counter* 1))
|
||||
(str "sx-cyst-" *cyst-counter*))))
|
||||
(define
|
||||
|
||||
(define
|
||||
contains-deref?
|
||||
(fn
|
||||
(expr)
|
||||
@@ -68,7 +37,8 @@
|
||||
(= (symbol-name (first expr)) "deref"))
|
||||
true
|
||||
(some contains-deref? expr))))))
|
||||
(define
|
||||
|
||||
(define
|
||||
dom-on
|
||||
:effects (io)
|
||||
(fn
|
||||
@@ -89,7 +59,8 @@
|
||||
(trampoline (call-lambda handler (list e)))
|
||||
(run-post-render-hooks)))
|
||||
handler))))
|
||||
(define
|
||||
|
||||
(define
|
||||
render-to-dom
|
||||
:effects (render)
|
||||
(fn
|
||||
@@ -104,15 +75,9 @@
|
||||
"raw-html"
|
||||
(dom-parse-html (raw-html-content expr))
|
||||
"string"
|
||||
(if
|
||||
*hydrating*
|
||||
(or (hydrate-next-text!) (create-text-node expr))
|
||||
(create-text-node expr))
|
||||
(create-text-node expr)
|
||||
"number"
|
||||
(if
|
||||
*hydrating*
|
||||
(or (hydrate-next-text!) (create-text-node (str expr)))
|
||||
(create-text-node (str expr)))
|
||||
(create-text-node (str expr))
|
||||
"symbol"
|
||||
(render-to-dom (trampoline (eval-expr expr env)) env ns)
|
||||
"keyword"
|
||||
@@ -136,7 +101,8 @@
|
||||
(reactive-text expr)
|
||||
(create-text-node (str (deref expr))))
|
||||
(create-text-node (str expr))))))
|
||||
(define
|
||||
|
||||
(define
|
||||
render-dom-list
|
||||
:effects (render)
|
||||
(fn
|
||||
@@ -170,10 +136,7 @@
|
||||
(render-dom-element name args env ns)
|
||||
(dispatch-render-form name expr env ns))
|
||||
(and (env-has? env name) (macro? (env-get env name)))
|
||||
(render-to-dom
|
||||
(expand-macro (env-get env name) args env)
|
||||
env
|
||||
ns)
|
||||
(render-to-dom (expand-macro (env-get env name) args env) env ns)
|
||||
(contains? HTML_TAGS name)
|
||||
(render-dom-element name args env ns)
|
||||
(and
|
||||
@@ -193,12 +156,7 @@
|
||||
((skip (get state "skip")))
|
||||
(if
|
||||
skip
|
||||
(assoc
|
||||
state
|
||||
"skip"
|
||||
false
|
||||
"i"
|
||||
(inc (get state "i")))
|
||||
(assoc state "skip" false "i" (inc (get state "i")))
|
||||
(if
|
||||
(and
|
||||
(= (type-of arg) "keyword")
|
||||
@@ -220,10 +178,7 @@
|
||||
(assoc state "i" (inc (get state "i")))))))
|
||||
(dict "i" 0 "skip" false)
|
||||
args)
|
||||
(dom-set-attr
|
||||
marker
|
||||
"data-sx-island"
|
||||
(component-name island))
|
||||
(dom-set-attr marker "data-sx-island" (component-name island))
|
||||
(when
|
||||
(not (empty-dict? kw-state))
|
||||
(dom-set-attr
|
||||
@@ -269,21 +224,15 @@
|
||||
(when (not (spread? result)) (dom-append frag result))))
|
||||
expr)
|
||||
frag)))))
|
||||
(define
|
||||
|
||||
(define
|
||||
render-dom-element
|
||||
:effects (render)
|
||||
(fn
|
||||
((tag :as string) (args :as list) (env :as dict) (ns :as string))
|
||||
(let
|
||||
((new-ns (if (= tag "svg") SVG_NS (if (= tag "math") MATH_NS ns)))
|
||||
(el
|
||||
(if
|
||||
*hydrating*
|
||||
(let
|
||||
((existing (hydrate-next-element!)))
|
||||
(when existing (hydrate-push! existing))
|
||||
(or existing (dom-create-element tag new-ns)))
|
||||
(dom-create-element tag new-ns))))
|
||||
((new-ns (cond (= tag "svg") SVG_NS (= tag "math") MATH_NS :else ns))
|
||||
(el (dom-create-element tag new-ns)))
|
||||
(scope-push! "element-attrs" nil)
|
||||
(reduce
|
||||
(fn
|
||||
@@ -347,7 +296,7 @@
|
||||
(fn () (render-to-dom arg env new-ns)))
|
||||
(spread? child)
|
||||
nil
|
||||
:else (when (not *hydrating*) (dom-append el child)))))
|
||||
:else (dom-append el child))))
|
||||
(assoc state "i" (inc (get state "i"))))))))
|
||||
(dict "i" 0 "skip" false)
|
||||
args)
|
||||
@@ -385,15 +334,13 @@
|
||||
(keys spread-dict)))
|
||||
(scope-emitted "element-attrs"))
|
||||
(scope-pop! "element-attrs")
|
||||
(do (when *hydrating* (hydrate-pop!)) el))))
|
||||
(define
|
||||
el)))
|
||||
|
||||
(define
|
||||
render-dom-component
|
||||
:effects (render)
|
||||
(fn
|
||||
((comp :as component)
|
||||
(args :as list)
|
||||
(env :as dict)
|
||||
(ns :as string))
|
||||
((comp :as component) (args :as list) (env :as dict) (ns :as string))
|
||||
(let
|
||||
((kwargs (dict)) (children (list)))
|
||||
(reduce
|
||||
@@ -442,7 +389,8 @@
|
||||
children)
|
||||
(env-bind! local "children" child-frag)))
|
||||
(render-to-dom (component-body comp) local ns)))))
|
||||
(define
|
||||
|
||||
(define
|
||||
render-dom-fragment
|
||||
:effects (render)
|
||||
(fn
|
||||
@@ -457,7 +405,8 @@
|
||||
(when (not (spread? result)) (dom-append frag result))))
|
||||
args)
|
||||
frag)))
|
||||
(define
|
||||
|
||||
(define
|
||||
render-dom-raw
|
||||
:effects (render)
|
||||
(fn
|
||||
@@ -478,11 +427,13 @@
|
||||
(dom-append frag (create-text-node (str val))))))
|
||||
args)
|
||||
frag)))
|
||||
(define
|
||||
|
||||
(define
|
||||
render-dom-unknown-component
|
||||
:effects (render)
|
||||
(fn ((name :as string)) (error (str "Unknown component: " name))))
|
||||
(define
|
||||
|
||||
(define
|
||||
RENDER_DOM_FORMS
|
||||
(list
|
||||
"if"
|
||||
@@ -508,11 +459,13 @@
|
||||
"scope"
|
||||
"provide"
|
||||
"cyst"))
|
||||
(define
|
||||
|
||||
(define
|
||||
render-dom-form?
|
||||
:effects ()
|
||||
(fn ((name :as string)) (contains? RENDER_DOM_FORMS name)))
|
||||
(define
|
||||
|
||||
(define
|
||||
dispatch-render-form
|
||||
:effects (render)
|
||||
(fn
|
||||
@@ -602,9 +555,7 @@
|
||||
(for-each
|
||||
(fn
|
||||
(i)
|
||||
(dom-append
|
||||
frag
|
||||
(render-to-dom (nth expr i) env ns)))
|
||||
(dom-append frag (render-to-dom (nth expr i) env ns)))
|
||||
(range 2 (len expr)))
|
||||
(set! current-nodes (dom-child-nodes frag))
|
||||
(set! initial-result frag))))))
|
||||
@@ -719,9 +670,7 @@
|
||||
bindings)
|
||||
(when
|
||||
(> (len body) 1)
|
||||
(for-each
|
||||
(fn (e) (trampoline (eval-expr e local)))
|
||||
(init body)))
|
||||
(for-each (fn (e) (trampoline (eval-expr e local))) (init body)))
|
||||
(render-to-dom (last body) local ns))
|
||||
(or (= name "begin") (= name "do"))
|
||||
(if
|
||||
@@ -822,9 +771,7 @@
|
||||
(= (type-of (first rest-args)) "keyword")
|
||||
(= (keyword-name (first rest-args)) "value"))
|
||||
(do
|
||||
(set!
|
||||
scope-val
|
||||
(trampoline (eval-expr (nth rest-args 1) env)))
|
||||
(set! scope-val (trampoline (eval-expr (nth rest-args 1) env)))
|
||||
(set! body-exprs (slice rest-args 2)))
|
||||
(set! body-exprs rest-args))
|
||||
(scope-push! scope-name scope-val)
|
||||
@@ -840,9 +787,7 @@
|
||||
(frag (create-fragment)))
|
||||
(scope-push! prov-name prov-val)
|
||||
(for-each
|
||||
(fn
|
||||
(i)
|
||||
(dom-append frag (render-to-dom (nth expr i) env ns)))
|
||||
(fn (i) (dom-append frag (render-to-dom (nth expr i) env ns)))
|
||||
(range 3 (len expr)))
|
||||
(scope-pop! prov-name)
|
||||
frag)
|
||||
@@ -872,7 +817,8 @@
|
||||
(dict-set! *memo-cache* cyst-key container)
|
||||
container))))
|
||||
:else (render-to-dom (trampoline (eval-expr expr env)) env ns))))
|
||||
(define
|
||||
|
||||
(define
|
||||
render-lambda-dom
|
||||
:effects (render)
|
||||
(fn
|
||||
@@ -883,14 +829,12 @@
|
||||
(fn (i p) (env-bind! local p (nth args i)))
|
||||
(lambda-params f))
|
||||
(render-to-dom (lambda-body f) local ns))))
|
||||
(define
|
||||
|
||||
(define
|
||||
render-dom-island
|
||||
:effects (render mutation)
|
||||
(fn
|
||||
((island :as island)
|
||||
(args :as list)
|
||||
(env :as dict)
|
||||
(ns :as string))
|
||||
((island :as island) (args :as list) (env :as dict) (ns :as string))
|
||||
(let
|
||||
((kwargs (dict)) (children (list)))
|
||||
(reduce
|
||||
@@ -934,23 +878,20 @@
|
||||
children)
|
||||
(env-bind! local "children" child-frag)))
|
||||
(let
|
||||
((container (dom-create-element "span" nil))
|
||||
(disposers (list)))
|
||||
((container (dom-create-element "span" nil)) (disposers (list)))
|
||||
(begin
|
||||
(dom-set-attr container "data-sx-island" island-name)
|
||||
(when
|
||||
(not (empty-dict? kwargs))
|
||||
(dom-set-attr
|
||||
container
|
||||
"data-sx-state"
|
||||
(sx-serialize kwargs))))
|
||||
(dom-set-attr container "data-sx-state" (sx-serialize kwargs))))
|
||||
(mark-processed! container "island-hydrated")
|
||||
(let
|
||||
((body-dom (with-island-scope (fn (disposable) (append! disposers disposable)) (fn () (render-to-dom (component-body island) local ns)))))
|
||||
(dom-append container body-dom)
|
||||
(dom-set-data container "sx-disposers" disposers)
|
||||
container))))))
|
||||
(define
|
||||
|
||||
(define
|
||||
render-dom-lake
|
||||
:effects (render)
|
||||
(fn
|
||||
@@ -992,7 +933,8 @@
|
||||
(fn (c) (dom-append el (render-to-dom c env ns)))
|
||||
children)
|
||||
el))))
|
||||
(define
|
||||
|
||||
(define
|
||||
render-dom-marsh
|
||||
:effects (render)
|
||||
(fn
|
||||
@@ -1043,16 +985,18 @@
|
||||
(fn (c) (dom-append el (render-to-dom c env ns)))
|
||||
children)
|
||||
el))))
|
||||
(define
|
||||
|
||||
(define
|
||||
reactive-text
|
||||
:effects (render mutation)
|
||||
(fn
|
||||
(sig)
|
||||
(let
|
||||
((node (if *hydrating* (or (hydrate-next-text!) (create-text-node (str (deref sig)))) (create-text-node (str (deref sig))))))
|
||||
((node (create-text-node (str (deref sig)))))
|
||||
(effect (fn () (dom-set-text-content node (str (deref sig)))))
|
||||
node)))
|
||||
(define
|
||||
|
||||
(define
|
||||
reactive-attr
|
||||
:effects (render mutation)
|
||||
(fn
|
||||
@@ -1075,7 +1019,8 @@
|
||||
(= val true)
|
||||
(dom-set-attr el attr-name "")
|
||||
:else (dom-set-attr el attr-name (str val)))))))))
|
||||
(define
|
||||
|
||||
(define
|
||||
reactive-spread
|
||||
:effects (render mutation)
|
||||
(fn
|
||||
@@ -1099,9 +1044,7 @@
|
||||
(filter (fn (c) (not (= c ""))) (split current " ")))
|
||||
(kept
|
||||
(filter
|
||||
(fn
|
||||
(c)
|
||||
(not (some (fn (pc) (= pc c)) prev-classes)))
|
||||
(fn (c) (not (some (fn (pc) (= pc c)) prev-classes)))
|
||||
tokens)))
|
||||
(if
|
||||
(empty? kept)
|
||||
@@ -1116,9 +1059,7 @@
|
||||
((attrs (spread-attrs result))
|
||||
(cls-str (or (dict-get attrs "class") ""))
|
||||
(new-classes
|
||||
(filter
|
||||
(fn (c) (not (= c "")))
|
||||
(split cls-str " ")))
|
||||
(filter (fn (c) (not (= c ""))) (split cls-str " ")))
|
||||
(extra-keys
|
||||
(filter (fn (k) (not (= k "class"))) (keys attrs))))
|
||||
(set! prev-classes new-classes)
|
||||
@@ -1138,10 +1079,9 @@
|
||||
(fn (k) (dom-set-attr el k (str (dict-get attrs k))))
|
||||
extra-keys)
|
||||
(run-post-render-hooks))
|
||||
(do
|
||||
(set! prev-classes (list))
|
||||
(set! prev-extra-keys (list))))))))))
|
||||
(define
|
||||
(do (set! prev-classes (list)) (set! prev-extra-keys (list))))))))))
|
||||
|
||||
(define
|
||||
reactive-fragment
|
||||
:effects (render mutation)
|
||||
(fn
|
||||
@@ -1150,8 +1090,7 @@
|
||||
(env :as dict)
|
||||
(ns :as string))
|
||||
(let
|
||||
((marker (create-comment "island-fragment"))
|
||||
(current-nodes (list)))
|
||||
((marker (create-comment "island-fragment")) (current-nodes (list)))
|
||||
(effect
|
||||
(fn
|
||||
()
|
||||
@@ -1164,7 +1103,8 @@
|
||||
(set! current-nodes (dom-child-nodes frag))
|
||||
(dom-insert-after marker frag)))))
|
||||
marker)))
|
||||
(define
|
||||
|
||||
(define
|
||||
render-list-item
|
||||
:effects (render)
|
||||
(fn
|
||||
@@ -1173,7 +1113,8 @@
|
||||
(lambda? map-fn)
|
||||
(render-lambda-dom map-fn (list item) env ns)
|
||||
(render-to-dom (apply map-fn (list item)) env ns))))
|
||||
(define
|
||||
|
||||
(define
|
||||
extract-key
|
||||
:effects (render)
|
||||
(fn
|
||||
@@ -1186,7 +1127,8 @@
|
||||
(let
|
||||
((dk (dom-get-data node "key")))
|
||||
(if dk (str dk) (str "__idx_" index)))))))
|
||||
(define
|
||||
|
||||
(define
|
||||
reactive-list
|
||||
:effects (render mutation)
|
||||
(fn
|
||||
@@ -1270,15 +1212,15 @@
|
||||
(dom-append container rendered)))
|
||||
items)))))
|
||||
container)))
|
||||
(define
|
||||
|
||||
(define
|
||||
bind-input
|
||||
:effects (render mutation)
|
||||
(fn
|
||||
(el (sig :as signal))
|
||||
(let
|
||||
((input-type (lower (or (dom-get-attr el "type") "")))
|
||||
(is-checkbox
|
||||
(or (= input-type "checkbox") (= input-type "radio"))))
|
||||
(is-checkbox (or (= input-type "checkbox") (= input-type "radio"))))
|
||||
(if
|
||||
is-checkbox
|
||||
(dom-set-prop el "checked" (deref sig))
|
||||
@@ -1303,9 +1245,12 @@
|
||||
is-checkbox
|
||||
(reset! sig (dom-get-prop el "checked"))
|
||||
(reset! sig (dom-get-prop el "value"))))))))
|
||||
(define *use-cek-reactive* true)
|
||||
(define enable-cek-reactive! (fn () (set! *use-cek-reactive* true)))
|
||||
(define
|
||||
|
||||
(define *use-cek-reactive* true)
|
||||
|
||||
(define enable-cek-reactive! (fn () (set! *use-cek-reactive* true)))
|
||||
|
||||
(define
|
||||
cek-reactive-text
|
||||
:effects (render mutation)
|
||||
(fn
|
||||
@@ -1317,7 +1262,8 @@
|
||||
((initial (cek-run (make-cek-state expr env (list (make-reactive-reset-frame env update-fn true))))))
|
||||
(dom-set-text-content node (str initial))
|
||||
node))))
|
||||
(define
|
||||
|
||||
(define
|
||||
cek-reactive-attr
|
||||
:effects (render mutation)
|
||||
(fn
|
||||
@@ -1332,7 +1278,8 @@
|
||||
(let
|
||||
((initial (cek-run (make-cek-state expr env (list (make-reactive-reset-frame env update-fn true))))))
|
||||
(cek-call update-fn (list initial))))))
|
||||
(define
|
||||
|
||||
(define
|
||||
render-dom-portal
|
||||
:effects (render)
|
||||
(fn
|
||||
@@ -1355,7 +1302,8 @@
|
||||
(register-in-scope
|
||||
(fn () (for-each (fn (n) (dom-remove n)) portal-nodes))))
|
||||
marker)))))
|
||||
(define
|
||||
|
||||
(define
|
||||
render-dom-error-boundary
|
||||
:effects (render)
|
||||
(fn
|
||||
@@ -1394,7 +1342,10 @@
|
||||
(let
|
||||
((fallback-dom (if (nil? fallback-fn) (let ((el (dom-create-element "div" nil))) (dom-set-attr el "class" "sx-render-error") (dom-set-attr el "style" "color:red;font-size:0.875rem;padding:0.5rem;border:1px solid red;border-radius:0.25rem;margin:0.5rem 0;") (dom-set-text-content el (str "Render error: " err)) el) (if (lambda? fallback-fn) (render-lambda-dom fallback-fn (list err retry-fn) env ns) (render-to-dom (apply fallback-fn (list err retry-fn)) env ns)))))
|
||||
(dom-append container fallback-dom)))))))
|
||||
container)))))
|
||||
container)))
|
||||
|
||||
|
||||
))
|
||||
|
||||
;; Re-export to global env
|
||||
(import (web adapter-dom))
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -55,8 +55,6 @@
|
||||
(dom-append-to-head el)))))
|
||||
els))))
|
||||
|
||||
(define *hydrating* false)
|
||||
|
||||
(define
|
||||
sx-mount
|
||||
:effects (mutation io)
|
||||
@@ -331,14 +329,9 @@
|
||||
p
|
||||
(if (dict-has? kwargs p) (dict-get kwargs p) nil)))
|
||||
(component-params comp))
|
||||
(do
|
||||
(hydrate-start! el)
|
||||
(log-info " hydrate-start done")
|
||||
(with-island-scope
|
||||
(fn (disposable) (append! disposers disposable))
|
||||
(fn () (render-to-dom (component-body comp) local nil)))
|
||||
(log-info " render-to-dom done")
|
||||
(hydrate-stop!)
|
||||
(let
|
||||
((body-dom (cek-try (fn () (with-island-scope (fn (disposable) (append! disposers disposable)) (fn () (render-to-dom (component-body comp) local nil)))) (fn (err) (log-warn (str "hydrate-island FAILED: " comp-name " — " err)) (let ((error-el (dom-create-element "div" nil))) (dom-set-attr error-el "class" "sx-island-error") (dom-set-attr error-el "style" "padding:8px;margin:4px 0;border:1px solid #ef4444;border-radius:4px;background:#fef2f2;color:#b91c1c;font-family:monospace;font-size:12px;white-space:pre-wrap") (dom-set-text-content error-el (str "Island error: " comp-name "\n" err)) error-el)))))
|
||||
(host-call el "replaceChildren" body-dom)
|
||||
(dom-set-data el "sx-disposers" disposers)
|
||||
(set-timeout (fn () (process-elements el)) 0)
|
||||
(log-info
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -1,49 +1,17 @@
|
||||
(import (sx dom))
|
||||
(import (sx render))
|
||||
|
||||
(define-library
|
||||
(web adapter-dom)
|
||||
(export
|
||||
SVG_NS
|
||||
MATH_NS
|
||||
island-scope?
|
||||
contains-deref?
|
||||
dom-on
|
||||
render-to-dom
|
||||
render-dom-list
|
||||
render-dom-element
|
||||
render-dom-component
|
||||
render-dom-fragment
|
||||
render-dom-raw
|
||||
render-dom-unknown-component
|
||||
RENDER_DOM_FORMS
|
||||
render-dom-form?
|
||||
dispatch-render-form
|
||||
render-lambda-dom
|
||||
render-dom-island
|
||||
render-dom-lake
|
||||
render-dom-marsh
|
||||
reactive-text
|
||||
reactive-attr
|
||||
reactive-spread
|
||||
reactive-fragment
|
||||
render-list-item
|
||||
extract-key
|
||||
reactive-list
|
||||
bind-input
|
||||
*use-cek-reactive*
|
||||
enable-cek-reactive!
|
||||
cek-reactive-text
|
||||
cek-reactive-attr
|
||||
render-dom-portal
|
||||
render-dom-error-boundary)
|
||||
(begin
|
||||
(define SVG_NS "http://www.w3.org/2000/svg")
|
||||
(define MATH_NS "http://www.w3.org/1998/Math/MathML")
|
||||
(define
|
||||
island-scope?
|
||||
(fn () (not (nil? (scope-peek "sx-island-scope")))))
|
||||
(define-library (web adapter-dom)
|
||||
(export SVG_NS MATH_NS island-scope? contains-deref? dom-on render-to-dom render-dom-list render-dom-element render-dom-component render-dom-fragment render-dom-raw render-dom-unknown-component RENDER_DOM_FORMS render-dom-form? dispatch-render-form render-lambda-dom render-dom-island render-dom-lake render-dom-marsh reactive-text reactive-attr reactive-spread reactive-fragment render-list-item extract-key reactive-list bind-input *use-cek-reactive* enable-cek-reactive! cek-reactive-text cek-reactive-attr render-dom-portal render-dom-error-boundary)
|
||||
(begin
|
||||
|
||||
(define SVG_NS "http://www.w3.org/2000/svg")
|
||||
|
||||
(define MATH_NS "http://www.w3.org/1998/Math/MathML")
|
||||
|
||||
(define island-scope? (fn () (not (nil? (scope-peek "sx-island-scope")))))
|
||||
|
||||
(begin
|
||||
(define *memo-cache* (dict))
|
||||
(define *cyst-counter* 0)
|
||||
(define
|
||||
@@ -52,7 +20,8 @@
|
||||
()
|
||||
(set! *cyst-counter* (+ *cyst-counter* 1))
|
||||
(str "sx-cyst-" *cyst-counter*))))
|
||||
(define
|
||||
|
||||
(define
|
||||
contains-deref?
|
||||
(fn
|
||||
(expr)
|
||||
@@ -68,7 +37,8 @@
|
||||
(= (symbol-name (first expr)) "deref"))
|
||||
true
|
||||
(some contains-deref? expr))))))
|
||||
(define
|
||||
|
||||
(define
|
||||
dom-on
|
||||
:effects (io)
|
||||
(fn
|
||||
@@ -89,7 +59,8 @@
|
||||
(trampoline (call-lambda handler (list e)))
|
||||
(run-post-render-hooks)))
|
||||
handler))))
|
||||
(define
|
||||
|
||||
(define
|
||||
render-to-dom
|
||||
:effects (render)
|
||||
(fn
|
||||
@@ -104,15 +75,9 @@
|
||||
"raw-html"
|
||||
(dom-parse-html (raw-html-content expr))
|
||||
"string"
|
||||
(if
|
||||
*hydrating*
|
||||
(or (hydrate-next-text!) (create-text-node expr))
|
||||
(create-text-node expr))
|
||||
(create-text-node expr)
|
||||
"number"
|
||||
(if
|
||||
*hydrating*
|
||||
(or (hydrate-next-text!) (create-text-node (str expr)))
|
||||
(create-text-node (str expr)))
|
||||
(create-text-node (str expr))
|
||||
"symbol"
|
||||
(render-to-dom (trampoline (eval-expr expr env)) env ns)
|
||||
"keyword"
|
||||
@@ -136,7 +101,8 @@
|
||||
(reactive-text expr)
|
||||
(create-text-node (str (deref expr))))
|
||||
(create-text-node (str expr))))))
|
||||
(define
|
||||
|
||||
(define
|
||||
render-dom-list
|
||||
:effects (render)
|
||||
(fn
|
||||
@@ -170,10 +136,7 @@
|
||||
(render-dom-element name args env ns)
|
||||
(dispatch-render-form name expr env ns))
|
||||
(and (env-has? env name) (macro? (env-get env name)))
|
||||
(render-to-dom
|
||||
(expand-macro (env-get env name) args env)
|
||||
env
|
||||
ns)
|
||||
(render-to-dom (expand-macro (env-get env name) args env) env ns)
|
||||
(contains? HTML_TAGS name)
|
||||
(render-dom-element name args env ns)
|
||||
(and
|
||||
@@ -193,12 +156,7 @@
|
||||
((skip (get state "skip")))
|
||||
(if
|
||||
skip
|
||||
(assoc
|
||||
state
|
||||
"skip"
|
||||
false
|
||||
"i"
|
||||
(inc (get state "i")))
|
||||
(assoc state "skip" false "i" (inc (get state "i")))
|
||||
(if
|
||||
(and
|
||||
(= (type-of arg) "keyword")
|
||||
@@ -220,10 +178,7 @@
|
||||
(assoc state "i" (inc (get state "i")))))))
|
||||
(dict "i" 0 "skip" false)
|
||||
args)
|
||||
(dom-set-attr
|
||||
marker
|
||||
"data-sx-island"
|
||||
(component-name island))
|
||||
(dom-set-attr marker "data-sx-island" (component-name island))
|
||||
(when
|
||||
(not (empty-dict? kw-state))
|
||||
(dom-set-attr
|
||||
@@ -269,21 +224,15 @@
|
||||
(when (not (spread? result)) (dom-append frag result))))
|
||||
expr)
|
||||
frag)))))
|
||||
(define
|
||||
|
||||
(define
|
||||
render-dom-element
|
||||
:effects (render)
|
||||
(fn
|
||||
((tag :as string) (args :as list) (env :as dict) (ns :as string))
|
||||
(let
|
||||
((new-ns (if (= tag "svg") SVG_NS (if (= tag "math") MATH_NS ns)))
|
||||
(el
|
||||
(if
|
||||
*hydrating*
|
||||
(let
|
||||
((existing (hydrate-next-element!)))
|
||||
(when existing (hydrate-push! existing))
|
||||
(or existing (dom-create-element tag new-ns)))
|
||||
(dom-create-element tag new-ns))))
|
||||
((new-ns (cond (= tag "svg") SVG_NS (= tag "math") MATH_NS :else ns))
|
||||
(el (dom-create-element tag new-ns)))
|
||||
(scope-push! "element-attrs" nil)
|
||||
(reduce
|
||||
(fn
|
||||
@@ -347,7 +296,7 @@
|
||||
(fn () (render-to-dom arg env new-ns)))
|
||||
(spread? child)
|
||||
nil
|
||||
:else (when (not *hydrating*) (dom-append el child)))))
|
||||
:else (dom-append el child))))
|
||||
(assoc state "i" (inc (get state "i"))))))))
|
||||
(dict "i" 0 "skip" false)
|
||||
args)
|
||||
@@ -385,15 +334,13 @@
|
||||
(keys spread-dict)))
|
||||
(scope-emitted "element-attrs"))
|
||||
(scope-pop! "element-attrs")
|
||||
(do (when *hydrating* (hydrate-pop!)) el))))
|
||||
(define
|
||||
el)))
|
||||
|
||||
(define
|
||||
render-dom-component
|
||||
:effects (render)
|
||||
(fn
|
||||
((comp :as component)
|
||||
(args :as list)
|
||||
(env :as dict)
|
||||
(ns :as string))
|
||||
((comp :as component) (args :as list) (env :as dict) (ns :as string))
|
||||
(let
|
||||
((kwargs (dict)) (children (list)))
|
||||
(reduce
|
||||
@@ -442,7 +389,8 @@
|
||||
children)
|
||||
(env-bind! local "children" child-frag)))
|
||||
(render-to-dom (component-body comp) local ns)))))
|
||||
(define
|
||||
|
||||
(define
|
||||
render-dom-fragment
|
||||
:effects (render)
|
||||
(fn
|
||||
@@ -457,7 +405,8 @@
|
||||
(when (not (spread? result)) (dom-append frag result))))
|
||||
args)
|
||||
frag)))
|
||||
(define
|
||||
|
||||
(define
|
||||
render-dom-raw
|
||||
:effects (render)
|
||||
(fn
|
||||
@@ -478,11 +427,13 @@
|
||||
(dom-append frag (create-text-node (str val))))))
|
||||
args)
|
||||
frag)))
|
||||
(define
|
||||
|
||||
(define
|
||||
render-dom-unknown-component
|
||||
:effects (render)
|
||||
(fn ((name :as string)) (error (str "Unknown component: " name))))
|
||||
(define
|
||||
|
||||
(define
|
||||
RENDER_DOM_FORMS
|
||||
(list
|
||||
"if"
|
||||
@@ -508,11 +459,13 @@
|
||||
"scope"
|
||||
"provide"
|
||||
"cyst"))
|
||||
(define
|
||||
|
||||
(define
|
||||
render-dom-form?
|
||||
:effects ()
|
||||
(fn ((name :as string)) (contains? RENDER_DOM_FORMS name)))
|
||||
(define
|
||||
|
||||
(define
|
||||
dispatch-render-form
|
||||
:effects (render)
|
||||
(fn
|
||||
@@ -602,9 +555,7 @@
|
||||
(for-each
|
||||
(fn
|
||||
(i)
|
||||
(dom-append
|
||||
frag
|
||||
(render-to-dom (nth expr i) env ns)))
|
||||
(dom-append frag (render-to-dom (nth expr i) env ns)))
|
||||
(range 2 (len expr)))
|
||||
(set! current-nodes (dom-child-nodes frag))
|
||||
(set! initial-result frag))))))
|
||||
@@ -719,9 +670,7 @@
|
||||
bindings)
|
||||
(when
|
||||
(> (len body) 1)
|
||||
(for-each
|
||||
(fn (e) (trampoline (eval-expr e local)))
|
||||
(init body)))
|
||||
(for-each (fn (e) (trampoline (eval-expr e local))) (init body)))
|
||||
(render-to-dom (last body) local ns))
|
||||
(or (= name "begin") (= name "do"))
|
||||
(if
|
||||
@@ -822,9 +771,7 @@
|
||||
(= (type-of (first rest-args)) "keyword")
|
||||
(= (keyword-name (first rest-args)) "value"))
|
||||
(do
|
||||
(set!
|
||||
scope-val
|
||||
(trampoline (eval-expr (nth rest-args 1) env)))
|
||||
(set! scope-val (trampoline (eval-expr (nth rest-args 1) env)))
|
||||
(set! body-exprs (slice rest-args 2)))
|
||||
(set! body-exprs rest-args))
|
||||
(scope-push! scope-name scope-val)
|
||||
@@ -840,9 +787,7 @@
|
||||
(frag (create-fragment)))
|
||||
(scope-push! prov-name prov-val)
|
||||
(for-each
|
||||
(fn
|
||||
(i)
|
||||
(dom-append frag (render-to-dom (nth expr i) env ns)))
|
||||
(fn (i) (dom-append frag (render-to-dom (nth expr i) env ns)))
|
||||
(range 3 (len expr)))
|
||||
(scope-pop! prov-name)
|
||||
frag)
|
||||
@@ -872,7 +817,8 @@
|
||||
(dict-set! *memo-cache* cyst-key container)
|
||||
container))))
|
||||
:else (render-to-dom (trampoline (eval-expr expr env)) env ns))))
|
||||
(define
|
||||
|
||||
(define
|
||||
render-lambda-dom
|
||||
:effects (render)
|
||||
(fn
|
||||
@@ -883,14 +829,12 @@
|
||||
(fn (i p) (env-bind! local p (nth args i)))
|
||||
(lambda-params f))
|
||||
(render-to-dom (lambda-body f) local ns))))
|
||||
(define
|
||||
|
||||
(define
|
||||
render-dom-island
|
||||
:effects (render mutation)
|
||||
(fn
|
||||
((island :as island)
|
||||
(args :as list)
|
||||
(env :as dict)
|
||||
(ns :as string))
|
||||
((island :as island) (args :as list) (env :as dict) (ns :as string))
|
||||
(let
|
||||
((kwargs (dict)) (children (list)))
|
||||
(reduce
|
||||
@@ -934,23 +878,20 @@
|
||||
children)
|
||||
(env-bind! local "children" child-frag)))
|
||||
(let
|
||||
((container (dom-create-element "span" nil))
|
||||
(disposers (list)))
|
||||
((container (dom-create-element "span" nil)) (disposers (list)))
|
||||
(begin
|
||||
(dom-set-attr container "data-sx-island" island-name)
|
||||
(when
|
||||
(not (empty-dict? kwargs))
|
||||
(dom-set-attr
|
||||
container
|
||||
"data-sx-state"
|
||||
(sx-serialize kwargs))))
|
||||
(dom-set-attr container "data-sx-state" (sx-serialize kwargs))))
|
||||
(mark-processed! container "island-hydrated")
|
||||
(let
|
||||
((body-dom (with-island-scope (fn (disposable) (append! disposers disposable)) (fn () (render-to-dom (component-body island) local ns)))))
|
||||
(dom-append container body-dom)
|
||||
(dom-set-data container "sx-disposers" disposers)
|
||||
container))))))
|
||||
(define
|
||||
|
||||
(define
|
||||
render-dom-lake
|
||||
:effects (render)
|
||||
(fn
|
||||
@@ -992,7 +933,8 @@
|
||||
(fn (c) (dom-append el (render-to-dom c env ns)))
|
||||
children)
|
||||
el))))
|
||||
(define
|
||||
|
||||
(define
|
||||
render-dom-marsh
|
||||
:effects (render)
|
||||
(fn
|
||||
@@ -1043,16 +985,18 @@
|
||||
(fn (c) (dom-append el (render-to-dom c env ns)))
|
||||
children)
|
||||
el))))
|
||||
(define
|
||||
|
||||
(define
|
||||
reactive-text
|
||||
:effects (render mutation)
|
||||
(fn
|
||||
(sig)
|
||||
(let
|
||||
((node (if *hydrating* (or (hydrate-next-text!) (create-text-node (str (deref sig)))) (create-text-node (str (deref sig))))))
|
||||
((node (create-text-node (str (deref sig)))))
|
||||
(effect (fn () (dom-set-text-content node (str (deref sig)))))
|
||||
node)))
|
||||
(define
|
||||
|
||||
(define
|
||||
reactive-attr
|
||||
:effects (render mutation)
|
||||
(fn
|
||||
@@ -1075,7 +1019,8 @@
|
||||
(= val true)
|
||||
(dom-set-attr el attr-name "")
|
||||
:else (dom-set-attr el attr-name (str val)))))))))
|
||||
(define
|
||||
|
||||
(define
|
||||
reactive-spread
|
||||
:effects (render mutation)
|
||||
(fn
|
||||
@@ -1099,9 +1044,7 @@
|
||||
(filter (fn (c) (not (= c ""))) (split current " ")))
|
||||
(kept
|
||||
(filter
|
||||
(fn
|
||||
(c)
|
||||
(not (some (fn (pc) (= pc c)) prev-classes)))
|
||||
(fn (c) (not (some (fn (pc) (= pc c)) prev-classes)))
|
||||
tokens)))
|
||||
(if
|
||||
(empty? kept)
|
||||
@@ -1116,9 +1059,7 @@
|
||||
((attrs (spread-attrs result))
|
||||
(cls-str (or (dict-get attrs "class") ""))
|
||||
(new-classes
|
||||
(filter
|
||||
(fn (c) (not (= c "")))
|
||||
(split cls-str " ")))
|
||||
(filter (fn (c) (not (= c ""))) (split cls-str " ")))
|
||||
(extra-keys
|
||||
(filter (fn (k) (not (= k "class"))) (keys attrs))))
|
||||
(set! prev-classes new-classes)
|
||||
@@ -1138,10 +1079,9 @@
|
||||
(fn (k) (dom-set-attr el k (str (dict-get attrs k))))
|
||||
extra-keys)
|
||||
(run-post-render-hooks))
|
||||
(do
|
||||
(set! prev-classes (list))
|
||||
(set! prev-extra-keys (list))))))))))
|
||||
(define
|
||||
(do (set! prev-classes (list)) (set! prev-extra-keys (list))))))))))
|
||||
|
||||
(define
|
||||
reactive-fragment
|
||||
:effects (render mutation)
|
||||
(fn
|
||||
@@ -1150,8 +1090,7 @@
|
||||
(env :as dict)
|
||||
(ns :as string))
|
||||
(let
|
||||
((marker (create-comment "island-fragment"))
|
||||
(current-nodes (list)))
|
||||
((marker (create-comment "island-fragment")) (current-nodes (list)))
|
||||
(effect
|
||||
(fn
|
||||
()
|
||||
@@ -1164,7 +1103,8 @@
|
||||
(set! current-nodes (dom-child-nodes frag))
|
||||
(dom-insert-after marker frag)))))
|
||||
marker)))
|
||||
(define
|
||||
|
||||
(define
|
||||
render-list-item
|
||||
:effects (render)
|
||||
(fn
|
||||
@@ -1173,7 +1113,8 @@
|
||||
(lambda? map-fn)
|
||||
(render-lambda-dom map-fn (list item) env ns)
|
||||
(render-to-dom (apply map-fn (list item)) env ns))))
|
||||
(define
|
||||
|
||||
(define
|
||||
extract-key
|
||||
:effects (render)
|
||||
(fn
|
||||
@@ -1186,7 +1127,8 @@
|
||||
(let
|
||||
((dk (dom-get-data node "key")))
|
||||
(if dk (str dk) (str "__idx_" index)))))))
|
||||
(define
|
||||
|
||||
(define
|
||||
reactive-list
|
||||
:effects (render mutation)
|
||||
(fn
|
||||
@@ -1270,15 +1212,15 @@
|
||||
(dom-append container rendered)))
|
||||
items)))))
|
||||
container)))
|
||||
(define
|
||||
|
||||
(define
|
||||
bind-input
|
||||
:effects (render mutation)
|
||||
(fn
|
||||
(el (sig :as signal))
|
||||
(let
|
||||
((input-type (lower (or (dom-get-attr el "type") "")))
|
||||
(is-checkbox
|
||||
(or (= input-type "checkbox") (= input-type "radio"))))
|
||||
(is-checkbox (or (= input-type "checkbox") (= input-type "radio"))))
|
||||
(if
|
||||
is-checkbox
|
||||
(dom-set-prop el "checked" (deref sig))
|
||||
@@ -1303,9 +1245,12 @@
|
||||
is-checkbox
|
||||
(reset! sig (dom-get-prop el "checked"))
|
||||
(reset! sig (dom-get-prop el "value"))))))))
|
||||
(define *use-cek-reactive* true)
|
||||
(define enable-cek-reactive! (fn () (set! *use-cek-reactive* true)))
|
||||
(define
|
||||
|
||||
(define *use-cek-reactive* true)
|
||||
|
||||
(define enable-cek-reactive! (fn () (set! *use-cek-reactive* true)))
|
||||
|
||||
(define
|
||||
cek-reactive-text
|
||||
:effects (render mutation)
|
||||
(fn
|
||||
@@ -1317,7 +1262,8 @@
|
||||
((initial (cek-run (make-cek-state expr env (list (make-reactive-reset-frame env update-fn true))))))
|
||||
(dom-set-text-content node (str initial))
|
||||
node))))
|
||||
(define
|
||||
|
||||
(define
|
||||
cek-reactive-attr
|
||||
:effects (render mutation)
|
||||
(fn
|
||||
@@ -1332,7 +1278,8 @@
|
||||
(let
|
||||
((initial (cek-run (make-cek-state expr env (list (make-reactive-reset-frame env update-fn true))))))
|
||||
(cek-call update-fn (list initial))))))
|
||||
(define
|
||||
|
||||
(define
|
||||
render-dom-portal
|
||||
:effects (render)
|
||||
(fn
|
||||
@@ -1355,7 +1302,8 @@
|
||||
(register-in-scope
|
||||
(fn () (for-each (fn (n) (dom-remove n)) portal-nodes))))
|
||||
marker)))))
|
||||
(define
|
||||
|
||||
(define
|
||||
render-dom-error-boundary
|
||||
:effects (render)
|
||||
(fn
|
||||
@@ -1394,7 +1342,10 @@
|
||||
(let
|
||||
((fallback-dom (if (nil? fallback-fn) (let ((el (dom-create-element "div" nil))) (dom-set-attr el "class" "sx-render-error") (dom-set-attr el "style" "color:red;font-size:0.875rem;padding:0.5rem;border:1px solid red;border-radius:0.25rem;margin:0.5rem 0;") (dom-set-text-content el (str "Render error: " err)) el) (if (lambda? fallback-fn) (render-lambda-dom fallback-fn (list err retry-fn) env ns) (render-to-dom (apply fallback-fn (list err retry-fn)) env ns)))))
|
||||
(dom-append container fallback-dom)))))))
|
||||
container)))))
|
||||
container)))
|
||||
|
||||
|
||||
))
|
||||
|
||||
;; Re-export to global env
|
||||
(import (web adapter-dom))
|
||||
|
||||
13
web/boot.sx
13
web/boot.sx
@@ -55,8 +55,6 @@
|
||||
(dom-append-to-head el)))))
|
||||
els))))
|
||||
|
||||
(define *hydrating* false)
|
||||
|
||||
(define
|
||||
sx-mount
|
||||
:effects (mutation io)
|
||||
@@ -331,14 +329,9 @@
|
||||
p
|
||||
(if (dict-has? kwargs p) (dict-get kwargs p) nil)))
|
||||
(component-params comp))
|
||||
(do
|
||||
(hydrate-start! el)
|
||||
(log-info " hydrate-start done")
|
||||
(with-island-scope
|
||||
(fn (disposable) (append! disposers disposable))
|
||||
(fn () (render-to-dom (component-body comp) local nil)))
|
||||
(log-info " render-to-dom done")
|
||||
(hydrate-stop!)
|
||||
(let
|
||||
((body-dom (cek-try (fn () (with-island-scope (fn (disposable) (append! disposers disposable)) (fn () (render-to-dom (component-body comp) local nil)))) (fn (err) (log-warn (str "hydrate-island FAILED: " comp-name " — " err)) (let ((error-el (dom-create-element "div" nil))) (dom-set-attr error-el "class" "sx-island-error") (dom-set-attr error-el "style" "padding:8px;margin:4px 0;border:1px solid #ef4444;border-radius:4px;background:#fef2f2;color:#b91c1c;font-family:monospace;font-size:12px;white-space:pre-wrap") (dom-set-text-content error-el (str "Island error: " comp-name "\n" err)) error-el)))))
|
||||
(host-call el "replaceChildren" body-dom)
|
||||
(dom-set-data el "sx-disposers" disposers)
|
||||
(set-timeout (fn () (process-elements el)) 0)
|
||||
(log-info
|
||||
|
||||
Reference in New Issue
Block a user