coop/rose-ash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Engine: trigger filter support, sx-on event mapping, JS inline handlers

Browse Source 
1. parse-trigger-spec: strip [condition] from event names, store as
   "filter" modifier (e.g. keyup[key=='s'] → event="keyup", filter=...)
2. bind-event: evaluate filter conditions via JS Function constructor
   when filter modifier is present
3. bind-inline-handlers: map afterSwap/beforeRequest etc. to sx:*
   event names (matching what the engine dispatches)
4. bind-inline-handlers: detect JS syntax in body (contains ".") and
   eval via Function instead of SX parse — enables this.reset() etc.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
giles
2026-04-01 22:56:24 +00:00
parent 13eb701518
commit 235d73d837
6 changed files with 98 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
shared/static/wasm/sx/engine.sx
View File

@@ -63,7 +63,26 @@
(starts-with? tok "from:") (starts-with? tok "from:")
(dict-set! mods "from" (slice tok 5)))) (dict-set! mods "from" (slice tok 5))))
(rest tokens)) (rest tokens))
(dict "event" (first tokens) "modifiers" mods)))))) (let
((raw-event (first tokens)))
(let
((bracket-idx (index-of raw-event "[")))
(if
(>= bracket-idx 0)
(do
(dict-set!
mods
"filter"
(slice
raw-event
(+ bracket-idx 1)
(- (len raw-event) 1)))
(dict
"event"
(slice raw-event 0 bracket-idx)
"modifiers"
mods))
(dict "event" raw-event "modifiers" mods)))))))))
raw-parts)))))) raw-parts))))))
(define (define

4
shared/static/wasm/sx/engine.sxbc
View File

File diff suppressed because one or more lines are too long

42
shared/static/wasm/sx/orchestration.sx
View File

@@ -462,7 +462,7 @@
(fn (fn
(e) (e)
(let (let
((should-fire true)) ((should-fire (if (get mods "filter") (host-call (host-call (dom-window) "Function" "event" (get mods "filter")) "call" el e) true)))
(when (when
(get mods "changed") (get mods "changed")
(let (let
@@ -1385,25 +1385,37 @@
(when (when
(starts-with? name "sx-on:") (starts-with? name "sx-on:")
(let (let
((event-name (slice name 6))) ((event-name (let ((raw (slice name 6))) (if (or (starts-with? raw "after") (starts-with? raw "before")) (str "sx:" raw) raw))))
(when (when
(not (is-processed? el (str "on:" event-name))) (not (is-processed? el (str "on:" event-name)))
(mark-processed! el (str "on:" event-name)) (mark-processed! el (str "on:" event-name))
(let (dom-on
((exprs (sx-parse body))) el
(dom-on event-name
el (if
event-name (contains? body ".")
(fn (fn
(e) (e)
(let (host-call
((handler-env (env-extend (dict)))) (host-call (dom-window) "Function" "event" body)
(env-bind! handler-env "event" e) "call"
(env-bind! handler-env "this" el) el
(env-bind! handler-env "detail" (event-detail e)) e))
(for-each (let
(fn (expr) (eval-expr expr handler-env)) ((exprs (parse body)))
exprs)))))))))) (fn
(e)
(let
((handler-env (make-env)))
(env-bind! handler-env "event" e)
(env-bind! handler-env "this" el)
(env-bind!
handler-env
"detail"
(event-detail e))
(for-each
(fn (expr) (eval-expr expr handler-env))
exprs)))))))))))
(dom-attr-list el))) (dom-attr-list el)))
(dom-query-all (or root (dom-body)) "[sx-on\\:]")))) (dom-query-all (or root (dom-body)) "[sx-on\\:]"))))

4
shared/static/wasm/sx/orchestration.sxbc
View File

File diff suppressed because one or more lines are too long

21
web/engine.sx
View File

@@ -63,7 +63,26 @@
(starts-with? tok "from:") (starts-with? tok "from:")
(dict-set! mods "from" (slice tok 5)))) (dict-set! mods "from" (slice tok 5))))
(rest tokens)) (rest tokens))
(dict "event" (first tokens) "modifiers" mods)))))) (let
((raw-event (first tokens)))
(let
((bracket-idx (index-of raw-event "[")))
(if
(>= bracket-idx 0)
(do
(dict-set!
mods
"filter"
(slice
raw-event
(+ bracket-idx 1)
(- (len raw-event) 1)))
(dict
"event"
(slice raw-event 0 bracket-idx)
"modifiers"
mods))
(dict "event" raw-event "modifiers" mods)))))))))
raw-parts)))))) raw-parts))))))
(define (define

42
web/orchestration.sx
View File

@@ -462,7 +462,7 @@
(fn (fn
(e) (e)
(let (let
((should-fire true)) ((should-fire (if (get mods "filter") (host-call (host-call (dom-window) "Function" "event" (get mods "filter")) "call" el e) true)))
(when (when
(get mods "changed") (get mods "changed")
(let (let
@@ -1385,25 +1385,37 @@
(when (when
(starts-with? name "sx-on:") (starts-with? name "sx-on:")
(let (let
((event-name (slice name 6))) ((event-name (let ((raw (slice name 6))) (if (or (starts-with? raw "after") (starts-with? raw "before")) (str "sx:" raw) raw))))
(when (when
(not (is-processed? el (str "on:" event-name))) (not (is-processed? el (str "on:" event-name)))
(mark-processed! el (str "on:" event-name)) (mark-processed! el (str "on:" event-name))
(let (dom-on
((exprs (sx-parse body))) el
(dom-on event-name
el (if
event-name (contains? body ".")
(fn (fn
(e) (e)
(let (host-call
((handler-env (env-extend (dict)))) (host-call (dom-window) "Function" "event" body)
(env-bind! handler-env "event" e) "call"
(env-bind! handler-env "this" el) el
(env-bind! handler-env "detail" (event-detail e)) e))
(for-each (let
(fn (expr) (eval-expr expr handler-env)) ((exprs (parse body)))
exprs)))))))))) (fn
(e)
(let
((handler-env (make-env)))
(env-bind! handler-env "event" e)
(env-bind! handler-env "this" el)
(env-bind!
handler-env
"detail"
(event-detail e))
(for-each
(fn (expr) (eval-expr expr handler-env))
exprs)))))))))))
(dom-attr-list el))) (dom-attr-list el)))
(dom-query-all (or root (dom-body)) "[sx-on\\:]")))) (dom-query-all (or root (dom-body)) "[sx-on\\:]"))))