HS take command: class/attr with+giving, attr removal from scope, giving keyword
- tokenizer: add 'giving' as keyword so parse-take-cmd can detect it.
- parser.sx parse-take-cmd: loop over 'with <class>' / 'giving <class>' /
'from <sel>' / 'for <tgt>' clauses in any order for both the class and
attribute cases. Emits uniform (take! kind name from-sel for-tgt
attr-val with-val) 7-slot AST.
- compiler emit-take: pass with-cls for the class case through to runtime.
- runtime hs-take!: with a class 'with' replacement, toggle both classes
across scope + target. For attribute take, always strip the attr from
the scope 'others' (setting to with-val if given, otherwise removing).
- generator pw-body: translate evaluate(() => document.querySelector(s).
click()) and .dispatchEvent(new Event('name', …)) into dom-dispatch ops
so bubbling-click assertions in 'parent takes…' tests work.
- generator toHaveClass: strip JS regex word-boundaries (\\b) from the
expected class name.
- shared/static/wasm/sx/dom.sx: dom-child-list / dom-child-nodes mirror
the dom-query-all SX-list passthrough — childNodes arrives pre-SXified.
Net: take 6→15 (100%), remove 16→17, fetch 11→15.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -308,42 +308,54 @@
|
||||
(fn
|
||||
(el)
|
||||
"Return child nodes as an SX list."
|
||||
(if
|
||||
el
|
||||
(let
|
||||
((nl (host-get el "childNodes"))
|
||||
(n (host-get nl "length"))
|
||||
(result (list)))
|
||||
(cond
|
||||
((nil? el) (list))
|
||||
(true
|
||||
(let
|
||||
loop
|
||||
((i 0))
|
||||
(when
|
||||
(< i n)
|
||||
(append! result (host-call nl "item" i))
|
||||
(loop (+ i 1))))
|
||||
result)
|
||||
(list))))
|
||||
((nl (host-get el "childNodes")))
|
||||
(cond
|
||||
((nil? nl) (list))
|
||||
((list? nl) nl)
|
||||
(true
|
||||
(let
|
||||
((n (host-get nl "length")) (result (list)))
|
||||
(when
|
||||
(not (nil? n))
|
||||
(let
|
||||
loop
|
||||
((i 0))
|
||||
(when
|
||||
(< i n)
|
||||
(append! result (host-call nl "item" i))
|
||||
(loop (+ i 1)))))
|
||||
result))))))))
|
||||
(define dom-is-fragment? (fn (el) (= (host-get el "nodeType") 11)))
|
||||
(define
|
||||
dom-child-nodes
|
||||
(fn
|
||||
(el)
|
||||
"Return child nodes as an SX list."
|
||||
(if
|
||||
el
|
||||
(let
|
||||
((nl (host-get el "childNodes"))
|
||||
(n (host-get nl "length"))
|
||||
(result (list)))
|
||||
(cond
|
||||
((nil? el) (list))
|
||||
(true
|
||||
(let
|
||||
loop
|
||||
((i 0))
|
||||
(when
|
||||
(< i n)
|
||||
(append! result (host-call nl "item" i))
|
||||
(loop (+ i 1))))
|
||||
result)
|
||||
(list))))
|
||||
((nl (host-get el "childNodes")))
|
||||
(cond
|
||||
((nil? nl) (list))
|
||||
((list? nl) nl)
|
||||
(true
|
||||
(let
|
||||
((n (host-get nl "length")) (result (list)))
|
||||
(when
|
||||
(not (nil? n))
|
||||
(let
|
||||
loop
|
||||
((i 0))
|
||||
(when
|
||||
(< i n)
|
||||
(append! result (host-call nl "item" i))
|
||||
(loop (+ i 1)))))
|
||||
result))))))))
|
||||
(define
|
||||
dom-remove-children-after
|
||||
(fn
|
||||
|
||||
@@ -1621,18 +1621,35 @@
|
||||
((nil? from-sel) nil)
|
||||
((and (list? from-sel) (= (first from-sel) (quote query)))
|
||||
(list (quote hs-query-all) (nth from-sel 1)))
|
||||
(true (hs-to-sx from-sel)))))
|
||||
(if
|
||||
(and (= kind "attr") (or attr-val with-val))
|
||||
(list
|
||||
(quote hs-take!)
|
||||
target
|
||||
kind
|
||||
name
|
||||
scope
|
||||
attr-val
|
||||
(if with-val (hs-to-sx with-val) nil))
|
||||
(list (quote hs-take!) target kind name scope)))))
|
||||
(true (hs-to-sx from-sel))))
|
||||
(with-sx
|
||||
(if
|
||||
with-val
|
||||
(if
|
||||
(string? with-val)
|
||||
with-val
|
||||
(hs-to-sx with-val))
|
||||
nil)))
|
||||
(cond
|
||||
((and (= kind "attr") (or attr-val with-val))
|
||||
(list
|
||||
(quote hs-take!)
|
||||
target
|
||||
kind
|
||||
name
|
||||
scope
|
||||
attr-val
|
||||
with-sx))
|
||||
((and (= kind "class") with-val)
|
||||
(list
|
||||
(quote hs-take!)
|
||||
target
|
||||
kind
|
||||
name
|
||||
scope
|
||||
nil
|
||||
with-sx))
|
||||
(true (list (quote hs-take!) target kind name scope))))))
|
||||
((= head (quote make)) (emit-make ast))
|
||||
((= head (quote install))
|
||||
(cons (quote hs-install) (map hs-to-sx (rest ast))))
|
||||
|
||||
@@ -1648,48 +1648,94 @@
|
||||
((collect (fn () (when (= (tp-type) "class") (let ((v (tp-val))) (adv!) (set! classes (append classes (list v))) (collect))))))
|
||||
(collect)
|
||||
(let
|
||||
((from-sel (if (match-kw "from") (parse-expr) nil)))
|
||||
(let
|
||||
((for-tgt (if (match-kw "for") (parse-expr) nil)))
|
||||
(if
|
||||
(= (len classes) 1)
|
||||
(list
|
||||
(quote take!)
|
||||
"class"
|
||||
(first classes)
|
||||
from-sel
|
||||
for-tgt)
|
||||
(cons
|
||||
(quote do)
|
||||
(map
|
||||
(fn
|
||||
(cls)
|
||||
(list
|
||||
(quote take!)
|
||||
"class"
|
||||
cls
|
||||
from-sel
|
||||
for-tgt))
|
||||
classes))))))))
|
||||
((with-cls nil) (from-sel nil) (for-tgt nil))
|
||||
(define
|
||||
parse-cls-clauses
|
||||
(fn
|
||||
()
|
||||
(cond
|
||||
((and (nil? with-cls) (match-kw "with") (= (tp-type) "class"))
|
||||
(do
|
||||
(set! with-cls (tp-val))
|
||||
(adv!)
|
||||
(parse-cls-clauses)))
|
||||
((and (nil? with-cls) (match-kw "giving") (= (tp-type) "class"))
|
||||
(do
|
||||
(set! with-cls (tp-val))
|
||||
(adv!)
|
||||
(parse-cls-clauses)))
|
||||
((and (nil? from-sel) (match-kw "from"))
|
||||
(do
|
||||
(set! from-sel (parse-expr))
|
||||
(parse-cls-clauses)))
|
||||
((and (nil? for-tgt) (match-kw "for"))
|
||||
(do
|
||||
(set! for-tgt (parse-expr))
|
||||
(parse-cls-clauses)))
|
||||
(true nil))))
|
||||
(parse-cls-clauses)
|
||||
(if
|
||||
(= (len classes) 1)
|
||||
(list
|
||||
(quote take!)
|
||||
"class"
|
||||
(first classes)
|
||||
from-sel
|
||||
for-tgt
|
||||
nil
|
||||
with-cls)
|
||||
(cons
|
||||
(quote do)
|
||||
(map
|
||||
(fn
|
||||
(cls)
|
||||
(list
|
||||
(quote take!)
|
||||
"class"
|
||||
cls
|
||||
from-sel
|
||||
for-tgt
|
||||
nil
|
||||
with-cls))
|
||||
classes)))))))
|
||||
((= (tp-type) "attr")
|
||||
(let
|
||||
((attr-name (get (adv!) "value")))
|
||||
(let
|
||||
((attr-val (if (and (= (tp-type) "op") (= (tp-val) "=")) (do (adv!) (get (adv!) "value")) nil)))
|
||||
(let
|
||||
((with-val (if (match-kw "with") (parse-expr) nil)))
|
||||
(let
|
||||
((from-sel (if (match-kw "from") (parse-expr) nil)))
|
||||
(let
|
||||
((for-tgt (if (match-kw "for") (parse-expr) nil)))
|
||||
(list
|
||||
(quote take!)
|
||||
"attr"
|
||||
attr-name
|
||||
from-sel
|
||||
for-tgt
|
||||
attr-val
|
||||
with-val)))))))
|
||||
((with-val nil) (from-sel nil) (for-tgt nil))
|
||||
(define
|
||||
parse-attr-clauses
|
||||
(fn
|
||||
()
|
||||
(cond
|
||||
((and (nil? with-val) (match-kw "with"))
|
||||
(do
|
||||
(set! with-val (parse-expr))
|
||||
(parse-attr-clauses)))
|
||||
((and (nil? with-val) (match-kw "giving"))
|
||||
(do
|
||||
(set! with-val (parse-expr))
|
||||
(parse-attr-clauses)))
|
||||
((and (nil? from-sel) (match-kw "from"))
|
||||
(do
|
||||
(set! from-sel (parse-expr))
|
||||
(parse-attr-clauses)))
|
||||
((and (nil? for-tgt) (match-kw "for"))
|
||||
(do
|
||||
(set! for-tgt (parse-expr))
|
||||
(parse-attr-clauses)))
|
||||
(true nil))))
|
||||
(parse-attr-clauses)
|
||||
(list
|
||||
(quote take!)
|
||||
"attr"
|
||||
attr-name
|
||||
from-sel
|
||||
for-tgt
|
||||
attr-val
|
||||
with-val)))))
|
||||
(true nil))))
|
||||
(define
|
||||
parse-pick-cmd
|
||||
|
||||
@@ -146,16 +146,32 @@
|
||||
((els (if scope (if (list? scope) scope (list scope)) (let ((parent (dom-parent target))) (if parent (dom-child-list parent) (list))))))
|
||||
(if
|
||||
(= kind "class")
|
||||
(do
|
||||
(for-each (fn (el) (dom-remove-class el name)) els)
|
||||
(dom-add-class target name))
|
||||
(let
|
||||
((with-cls (if (> (len extra) 1) (nth extra 1) nil)))
|
||||
(do
|
||||
(for-each
|
||||
(fn
|
||||
(el)
|
||||
(do
|
||||
(dom-remove-class el name)
|
||||
(when with-cls (dom-add-class el with-cls))))
|
||||
els)
|
||||
(dom-add-class target name)
|
||||
(when with-cls (dom-remove-class target with-cls))))
|
||||
(let
|
||||
((attr-val (if (> (len extra) 0) (first extra) nil))
|
||||
(with-val (if (> (len extra) 1) (nth extra 1) nil)))
|
||||
(do
|
||||
(when
|
||||
with-val
|
||||
(for-each (fn (el) (dom-set-attr el name with-val)) els))
|
||||
(for-each
|
||||
(fn
|
||||
(el)
|
||||
(when
|
||||
(not (= el target))
|
||||
(if
|
||||
with-val
|
||||
(dom-set-attr el name with-val)
|
||||
(dom-remove-attr el name))))
|
||||
els)
|
||||
(if
|
||||
attr-val
|
||||
(dom-set-attr target name attr-val)
|
||||
|
||||
@@ -184,7 +184,8 @@
|
||||
"blur"
|
||||
"dom"
|
||||
"morph"
|
||||
"using"))
|
||||
"using"
|
||||
"giving"))
|
||||
|
||||
(define hs-keyword? (fn (word) (some (fn (k) (= k word)) hs-keywords)))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user