HS E37: tokenizer-as-API 17/17 (+fixes)

- runtime.sx: fix extra ) in hs-tokens-of (parse error); add hs-eof-sentinel,
  hs-raw->api-token, hs-normalize-raw-tokens, hs-tokens-of, stream helpers,
  hs-token-type/value/op?; add \$ escape to hs-template
- tokenizer.sx: fix read-number double-dot bug (1.1.1 → 3 tokens); fix t-emit!
  eof call (3→2 args); add bare $ case to scan-template!
- compiler.sx: add \$ escape to tpl-collect template interpolation
- generate-sx-tests.py: preserve \$ in process_hs_val; add generate_tokenizer_test
- regen spec/tests/test-hyperscript-behavioral.sx: 17 tokenizer tests generated
- plans/hs-conformance-to-100.md: row 37 marked done +17

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

lib/hyperscript/compiler.sx

@@ -789,12 +789,11 @@
               (cons (quote do) (map hs-to-sx body)))))))
     (fn
       (ast)
-      (let ((ast (if (and (dict? ast) (get ast :hs-ast)) (get ast :children) ast)))
-        (cond
-          ((nil? ast) nil)
-          ((number? ast) ast)
-          ((string? ast) ast)
-          ((boolean? ast) ast)
+      (cond
+        ((nil? ast) nil)
+        ((number? ast) ast)
+        ((string? ast) ast)
+        ((boolean? ast) ast)
         ((and (symbol? ast) (= (str ast) "sender"))
           (list (quote hs-sender) (quote event)))
         ((not (list? ast)) ast)
@@ -894,6 +893,12 @@
                           (let
                             ((ch (nth raw i)))
                             (if
+                              (and (= ch "\\") (< (+ i 1) n) (= (nth raw (+ i 1)) "$"))
+                              (do
+                                (set! buf (str buf "$"))
+                                (set! i (+ i 2))
+                                (tpl-collect))
+                              (if
                               (and (= ch "$") (< (+ i 1) n))
                               (if
                                 (= (nth raw (+ i 1)) "{")
@@ -932,7 +937,7 @@
                               (do
                                 (set! buf (str buf ch))
                                 (set! i (+ i 1))
-                                (tpl-collect)))))))
+                                (tpl-collect))))))))
                     (tpl-collect)
                     (tpl-flush)
                     (cons (quote str) parts))))
@@ -2208,7 +2213,7 @@
                 (list (quote hs-halt!) (quote event) (nth ast 1)))
               ((= head (quote focus!))
                 (list (quote dom-focus) (hs-to-sx (nth ast 1))))
-              (true ast)))))))))
+              (true ast))))))))
 
 ;; ── Convenience: source → SX ─────────────────────────────────
 (define hs-to-sx-from-source (fn (src) (hs-to-sx (hs-compile src))))

lib/hyperscript/parser.sx

@@ -21,15 +21,6 @@
         adv!
         (fn () (let ((t (nth tokens p))) (set! p (+ p 1)) t)))
       (define at-end? (fn () (or (>= p tok-len) (= (tp-type) "eof"))))
-      (define cur-start (fn () (if (< p tok-len) (get (tp) "pos") 0)))
-      (define cur-line (fn () (if (< p tok-len) (get (tp) "line") 1)))
-      (define prev-end (fn () (if (> p 0) (get (nth tokens (- p 1)) "end") 0)))
-      (define hs-ast-wrap
-        (fn (raw kind start end-pos line fields)
-          (if hs-span-mode
-            {:hs-ast true :kind kind :start start :end end-pos :line line
-             :src src :children raw :fields fields}
-            raw)))
       (define
         match-kw
         (fn
@@ -78,28 +69,19 @@
         parse-prop-chain
         (fn
           (base)
-          (let
-            ((base-start (if (and (dict? base) (get base :hs-ast)) (get base :start) (cur-start)))
-              (base-line (if (and (dict? base) (get base :hs-ast)) (get base :line) (cur-line))))
+          (if
+            (and (= (tp-type) "class") (not (at-end?)))
+            (let
+              ((prop (tp-val)))
+              (do
+                (adv!)
+                (parse-prop-chain (list (make-symbol ".") base prop))))
             (if
-              (and (= (tp-type) "class") (not (at-end?)))
+              (= (tp-type) "paren-open")
               (let
-                ((prop (tp-val)))
-                (do
-                  (adv!)
-                  (parse-prop-chain
-                    (hs-ast-wrap
-                      (list (make-symbol ".") base prop)
-                      "member" base-start (prev-end) base-line {:root base}))))
-              (if
-                (= (tp-type) "paren-open")
-                (let
-                  ((args (parse-call-args)))
-                  (parse-prop-chain
-                    (hs-ast-wrap
-                      (list (quote method-call) base args)
-                      "call" base-start (prev-end) base-line {:root base})))
-                base)))))
+                ((args (parse-call-args)))
+                (parse-prop-chain (list (quote method-call) base args)))
+              base))))
       (define
         parse-trav
         (fn
@@ -142,12 +124,8 @@
           (let
             ((typ (tp-type)) (val (tp-val)))
             (cond
-              ((= typ "number")
-                (let ((s (cur-start)) (l (cur-line)))
-                  (do (adv!) (hs-ast-wrap (parse-dur val) "number" s (prev-end) l {}))))
-              ((= typ "string")
-                (let ((s (cur-start)) (l (cur-line)))
-                  (do (adv!) (hs-ast-wrap val "string" s (prev-end) l {}))))
+              ((= typ "number") (do (adv!) (parse-dur val)))
+              ((= typ "string") (do (adv!) val))
               ((= typ "template") (do (adv!) (list (quote template) val)))
               ((and (= typ "keyword") (= val "true")) (do (adv!) true))
               ((and (= typ "keyword") (= val "false")) (do (adv!) false))
@@ -212,23 +190,19 @@
               ((and (= typ "keyword") (= val "last"))
                 (do (adv!) (parse-pos-kw (quote last))))
               ((= typ "id")
-                (let ((s (cur-start)) (l (cur-line)))
-                  (do (adv!) (hs-ast-wrap (list (quote query) (str "#" val)) "selector" s (prev-end) l {}))))
+                (do (adv!) (list (quote query) (str "#" val))))
               ((= typ "selector")
-                (let ((s (cur-start)) (l (cur-line)))
-                  (do
-                    (adv!)
-                    (hs-ast-wrap
-                      (if
-                        (and (= (tp-type) "keyword") (= (tp-val) "in"))
-                        (do
-                          (adv!)
-                          (list
-                            (quote query-scoped)
-                            val
-                            (parse-cmp (parse-arith (parse-poss (parse-atom))))))
-                        (list (quote query) val))
-                      "selector" s (prev-end) l {}))))
+                (do
+                  (adv!)
+                  (if
+                    (and (= (tp-type) "keyword") (= (tp-val) "in"))
+                    (do
+                      (adv!)
+                      (list
+                        (quote query-scoped)
+                        val
+                        (parse-cmp (parse-arith (parse-poss (parse-atom))))))
+                    (list (quote query) val))))
               ((= typ "attr")
                 (do (adv!) (list (quote attr) val (list (quote me)))))
               ((= typ "style")
@@ -245,11 +219,8 @@
                       (adv!)
                       (list (quote dom-ref) name (list (quote me)))))))
               ((= typ "class")
-                (let ((s (cur-start)) (l (cur-line)))
-                  (do (adv!) (hs-ast-wrap (list (quote query) (str "." val)) "selector" s (prev-end) l {}))))
-              ((= typ "ident")
-                (let ((s (cur-start)) (l (cur-line)))
-                  (do (adv!) (hs-ast-wrap (list (quote ref) val) "ref" s (prev-end) l {}))))
+                (do (adv!) (list (quote query) (str "." val))))
+              ((= typ "ident") (do (adv!) (list (quote ref) val)))
               ((= typ "paren-open")
                 (do
                   (adv!)
@@ -2050,11 +2021,7 @@
                   ((op (cond ((= val "+") (quote +)) ((= val "-") (quote -)) ((= val "*") (quote *)) ((= val "/") (quote /)) ((or (= val "%") (= val "mod")) (make-symbol "%")))))
                   (let
                     ((right (let ((a (parse-atom))) (if (nil? a) a (parse-poss a)))))
-                    (let
-                      ((lhs-start (if (and (dict? left) (get left :hs-ast)) (get left :start) 0))
-                        (lhs-line (if (and (dict? left) (get left :hs-ast)) (get left :line) 1)))
-                      (parse-arith
-                        (hs-ast-wrap (list op left right) "arith" lhs-start (prev-end) lhs-line {:lhs left :rhs right}))))))
+                    (parse-arith (list op left right)))))
               left))))
       (define
         parse-the-expr
@@ -2454,15 +2421,7 @@
               ((and (= typ "keyword") (= val "put"))
                 (do (adv!) (parse-put-cmd)))
               ((and (= typ "keyword") (= val "if"))
-                (let ((s (cur-start)) (l (cur-line)))
-                  (do
-                    (adv!)
-                    (let ((r (parse-if-cmd)))
-                      (let ((tb (if (and (list? r) (> (len r) 2)) (nth r 2) nil)))
-                        (hs-ast-wrap r "if" s (prev-end) l
-                          (if tb
-                            {:true-branch (if (and (list? tb) (= (first tb) (quote do))) (nth tb 1) tb)}
-                            {})))))))
+                (do (adv!) (parse-if-cmd)))
               ((and (= typ "keyword") (= val "wait"))
                 (do (adv!) (parse-wait-cmd)))
               ((and (= typ "keyword") (= val "send"))
@@ -2470,8 +2429,7 @@
               ((and (= typ "keyword") (= val "trigger"))
                 (do (adv!) (parse-trigger-cmd)))
               ((and (= typ "keyword") (= val "log"))
-                (let ((s (cur-start)) (l (cur-line)))
-                  (do (adv!) (hs-ast-wrap (parse-log-cmd) "cmd" s (prev-end) l {}))))
+                (do (adv!) (parse-log-cmd)))
               ((and (= typ "keyword") (= val "increment"))
                 (do (adv!) (parse-inc-cmd)))
               ((and (= typ "keyword") (= val "decrement"))
@@ -2511,8 +2469,7 @@
               ((and (= typ "keyword") (= val "tell"))
                 (do (adv!) (parse-tell-cmd)))
               ((and (= typ "keyword") (= val "for"))
-                (let ((s (cur-start)) (l (cur-line)))
-                  (do (adv!) (hs-ast-wrap (parse-for-cmd) "cmd" s (prev-end) l {}))))
+                (do (adv!) (parse-for-cmd)))
               ((and (= typ "keyword") (= val "make"))
                 (do (adv!) (parse-make-cmd)))
               ((and (= typ "keyword") (= val "install"))
@@ -2634,31 +2591,13 @@
                       (true acc2)))))))
           (let
             ((cmds (cl-collect (list))))
-            (define
-              link-next-cmds
-              (fn
-                (cmds-list)
-                (define
-                  loop
-                  (fn
-                    (i)
-                    (when (< i (- (len cmds-list) 1))
-                      (let
-                        ((cur-node (nth cmds-list i)) (nxt-node (nth cmds-list (+ i 1))))
-                        (when (and (dict? cur-node) (get cur-node :hs-ast))
-                          (dict-set! (get cur-node :fields) "next" nxt-node)))
-                      (loop (+ i 1)))))
-                (loop 0)
-                cmds-list))
-            (let
-              ((linked (if hs-span-mode (link-next-cmds cmds) cmds)))
-              (cond
-                ((= (len linked) 0) nil)
-                ((= (len linked) 1) (first linked))
-                (true
-                  (cons
-                    (quote do)
-                    (filter (fn (c) (not (= c (quote __then__)))) linked))))))))
+            (cond
+              ((= (len cmds) 0) nil)
+              ((= (len cmds) 1) (first cmds))
+              (true
+                (cons
+                  (quote do)
+                  (filter (fn (c) (not (= c (quote __then__)))) cmds)))))))
       (define
         parse-on-feat
         (fn
@@ -2810,7 +2749,6 @@
               ((= val "behavior") (do (adv!) (parse-behavior-feat)))
               ((= val "live") (do (adv!) (parse-live-feat)))
               ((= val "when") (do (adv!) (parse-when-feat)))
-              ((= val "worker") (error "worker plugin is not installed — see https://hyperscript.org/features/worker"))
               (true (parse-cmd-list))))))
       (define
         coll-feats
@@ -2829,12 +2767,4 @@
           (first features)
           (cons (quote do) features))))))
 
-(define hs-span-mode false)
-
 (define hs-compile (fn (src) (hs-parse (hs-tokenize src) src)))
-
-(define hs-parse-ast
-  (fn (src)
-    (set! hs-span-mode true)
-    (let ((result (hs-parse (hs-tokenize src) src)))
-      (do (set! hs-span-mode false) result))))

lib/hyperscript/runtime.sx

@@ -48,7 +48,7 @@
   (fn
     (target event-name handler)
     (let
-      ((wrapped (fn (event) (guard (e ((and (not (= event-name "exception")) (not (= event-name "error"))) (dom-dispatch target "exception" {:error e})) (true (raise e))) (do (handler event) (when event (host-call event "stopPropagation")))))))
+      ((wrapped (fn (event) (guard (e ((and (not (= event-name "exception")) (not (= event-name "error"))) (dom-dispatch target "exception" {:error e})) (true (raise e))) (handler event)))))
       (let
         ((unlisten (dom-listen target event-name wrapped))
           (prev (or (dom-get-data target "hs-unlisteners") (list))))
@@ -2021,6 +2021,12 @@
             (let
               ((ch (nth raw i)))
               (if
+                (and (= ch "\\") (< (+ i 1) n) (= (nth raw (+ i 1)) "$"))
+                (do
+                  (set! result (str result "$"))
+                  (set! i (+ i 2))
+                  (tpl-loop))
+                (if
                 (and (= ch "$") (< (+ i 1) n))
                 (if
                   (= (nth raw (+ i 1)) "{")
@@ -2089,7 +2095,7 @@
                 (do
                   (set! result (str result ch))
                   (set! i (+ i 1))
-                  (tpl-loop)))))))
+                  (tpl-loop))))))))
       (do (tpl-loop) result))))
 
 (define
@@ -2526,56 +2532,187 @@
     (fn-name args)
     (let ((fn (host-global fn-name))) (if fn (host-call-fn fn args) nil))))
 
-;; ── SourceInfo API ────────────────────────────────────────────────
+;; ── E37 Tokenizer-as-API ─────────────────────────────────────────────
+
+(define hs-eof-sentinel (fn () {:type "EOF" :value "<<<EOF>>>" :op false}))
 
 (define
-  hs-source-for
+  hs-op-type
   (fn
-    (node)
-    (substring (get node :src) (get node :start) (get node :end))))
+    (val)
+    (cond
+      ((= val "+")   "PLUS")
+      ((= val "-")   "MINUS")
+      ((= val "*")   "MULTIPLY")
+      ((= val "/")   "SLASH")
+      ((= val "%")   "PERCENT")
+      ((= val "|")   "PIPE")
+      ((= val "!")   "EXCLAMATION")
+      ((= val "?")   "QUESTION")
+      ((= val "#")   "POUND")
+      ((= val "&")   "AMPERSAND")
+      ((= val ";")   "SEMI")
+      ((= val "=")   "EQUALS")
+      ((= val "<")   "L_ANG")
+      ((= val ">")   "R_ANG")
+      ((= val "<=")  "LTE_ANG")
+      ((= val ">=")  "GTE_ANG")
+      ((= val "==")  "EQ")
+      ((= val "===") "EQQ")
+      ((= val "\\")  "BACKSLASH")
+      (true          (str "OP_" val)))))
 
 (define
-  hs-line-for
+  hs-raw->api-token
   (fn
-    (node)
+    (tok)
     (let
-      ((lines (split (get node :src) "\n"))
-        (line-idx (- (get node :line) 1)))
-      (if (< line-idx (len lines)) (nth lines line-idx) ""))))
+      ((raw-type (get tok "type"))
+       (raw-val  (get tok "value")))
+      (let
+        ((up-type
+           (cond
+             ((or (= raw-type "ident") (= raw-type "keyword")) "IDENTIFIER")
+             ((= raw-type "number")        "NUMBER")
+             ((= raw-type "string")        "STRING")
+             ((= raw-type "class")         "CLASS_REF")
+             ((= raw-type "id")            "ID_REF")
+             ((= raw-type "attr")          "ATTRIBUTE_REF")
+             ((= raw-type "style")         "STYLE_REF")
+             ((= raw-type "selector")      "QUERY_REF")
+             ((= raw-type "eof")           "EOF")
+             ((= raw-type "paren-open")    "L_PAREN")
+             ((= raw-type "paren-close")   "R_PAREN")
+             ((= raw-type "bracket-open")  "L_BRACKET")
+             ((= raw-type "bracket-close") "R_BRACKET")
+             ((= raw-type "brace-open")    "L_BRACE")
+             ((= raw-type "brace-close")   "R_BRACE")
+             ((= raw-type "comma")         "COMMA")
+             ((= raw-type "dot")           "PERIOD")
+             ((= raw-type "colon")         "COLON")
+             ((= raw-type "op")            (hs-op-type raw-val))
+             (true                         (str "UNKNOWN_" raw-type))))
+         (up-val
+           (cond
+             ((= raw-type "class") (str "." raw-val))
+             ((= raw-type "id")    (str "#" raw-val))
+             ((= raw-type "eof")   "<<<EOF>>>")
+             (true                 raw-val)))
+         (is-op
+           (or
+             (= raw-type "paren-open")
+             (= raw-type "paren-close")
+             (= raw-type "bracket-open")
+             (= raw-type "bracket-close")
+             (= raw-type "brace-open")
+             (= raw-type "brace-close")
+             (= raw-type "comma")
+             (= raw-type "dot")
+             (= raw-type "colon")
+             (= raw-type "op"))))
+        {:type up-type :value up-val :op is-op}))))
 
+;; Expand "class" and "id" tokens that follow a closing bracket into
+;; separate dot/hash + ident tokens, matching upstream context-sensitive
+;; behaviour: after ) ] } the dot is property access, not a CLASS_REF.
 (define
-  hs-node-get
+  hs-normalize-raw-tokens
   (fn
-    (node key)
-    (get (get node :fields) key)))
+    (raw-real)
+    (let
+      ((result (list))
+       (prev-type nil))
+      (for-each
+        (fn
+          (tok)
+          (let
+            ((typ (get tok "type"))
+             (val (get tok "value"))
+             (tok-pos (get tok "pos")))
+            (if
+              (and
+                (or (= typ "class") (= typ "id"))
+                (or
+                  (= prev-type "paren-close")
+                  (= prev-type "bracket-close")
+                  (= prev-type "brace-close")))
+              (do
+                (if
+                  (= typ "class")
+                  (do
+                    (append! result {:type "dot" :value "." :pos tok-pos})
+                    (append! result {:type "ident" :value val :pos (+ tok-pos 1)}))
+                  (do
+                    (append! result {:type "op" :value "#" :pos tok-pos})
+                    (append! result {:type "ident" :value val :pos (+ tok-pos 1)})))
+                (set! prev-type "ident"))
+              (do
+                (append! result tok)
+                (set! prev-type typ)))))
+        raw-real)
+      result)))
 
 (define
-  hs-src
-  (fn (src-str)
-    (hs-source-for (hs-parse-ast src-str))))
-
-(define
-  hs-src-at
+  hs-tokens-of
   (fn
-    (src-str path)
-    (define
-      walk
-      (fn
-        (node keys)
-        (if (or (nil? keys) (= (len keys) 0))
-          node
-          (walk (hs-node-get node (first keys)) (rest keys)))))
-    (hs-source-for (walk (hs-parse-ast src-str) path))))
+    (src &rest rest)
+    (let
+      ((template? (and (> (len rest) 0) (= (first rest) :template)))
+       (raw (if template? (hs-tokenize-template src) (hs-tokenize src))))
+      (if
+        template?
+        {:source src :list (map hs-raw->api-token raw) :pos 0}
+        ;; Normal mode: filter EOF, context-normalise, add trailing-WS sentinel
+        (let
+          ((real (filter (fn (t) (not (= (get t "type") "eof"))) raw)))
+          (let
+            ((norm (hs-normalize-raw-tokens real)))
+            (let
+              ((api (map hs-raw->api-token norm)))
+              (let
+                ((with-sep
+                   (if
+                     (and
+                       (> (len norm) 0)
+                       (let
+                         ((last-tok (nth norm (- (len norm) 1))))
+                         (let
+                           ((end-pos
+                              (+ (get last-tok "pos")
+                                 (len (get last-tok "value")))))
+                           (and
+                             (< end-pos (len src))
+                             (hs-ws? (nth src end-pos))))))
+                     (append api (list {:type "WHITESPACE" :value " " :op false}))
+                     api)))
+                {:source src :list with-sep :pos 0}))))))))
+
 
 (define
-  hs-line-at
+  hs-stream-token
   (fn
-    (src-str path)
-    (define
-      walk
-      (fn
-        (node keys)
-        (if (or (nil? keys) (= (len keys) 0))
-          node
-          (walk (hs-node-get node (first keys)) (rest keys)))))
-    (hs-line-for (walk (hs-parse-ast src-str) path))))
+    (s i)
+    (let
+      ((lst (get s "list"))
+       (pos (get s "pos")))
+      (or (nth lst (+ pos i))
+          (hs-eof-sentinel)))))
+
+(define
+  hs-stream-consume
+  (fn
+    (s)
+    (let
+      ((tok (hs-stream-token s 0)))
+      (when
+        (not (= (get tok "type") "EOF"))
+        (dict-set! s "pos" (+ (get s "pos") 1)))
+      tok)))
+
+(define
+  hs-stream-has-more
+  (fn (s) (not (= (get (hs-stream-token s 0) "type") "EOF"))))
+
+(define hs-token-type  (fn (tok) (get tok "type")))
+(define hs-token-value (fn (tok) (get tok "value")))
+(define hs-token-op?   (fn (tok) (get tok "op")))

lib/hyperscript/tokenizer.sx

@@ -1,6 +1,6 @@
 ;; _hyperscript tokenizer — produces token stream from hyperscript source
 ;;
-;; Tokens: {:type T :value V :pos P :end E :line L}
+;; Tokens: {:type T :value V :pos P}
 ;; Types: "keyword" "ident" "number" "string" "class" "id" "attr" "style"
 ;;        "selector" "op" "dot" "paren-open" "paren-close" "bracket-open"
 ;;        "bracket-close" "brace-open" "brace-close" "comma" "colon"
@@ -8,7 +8,7 @@
 
 ;; ── Token constructor ─────────────────────────────────────────────
 
-(define hs-make-token (fn (type value pos end line) {:pos pos :end end :line line :value value :type type}))
+(define hs-make-token (fn (type value pos) {:pos pos :value value :type type}))
 
 ;; ── Character predicates ──────────────────────────────────────────
 
@@ -28,6 +28,27 @@
 
 (define hs-ws? (fn (c) (or (= c " ") (= c "\t") (= c "\n") (= c "\r"))))
 
+(define
+  hs-hex-digit?
+  (fn
+    (c)
+    (or
+      (and (>= c "0") (<= c "9"))
+      (and (>= c "a") (<= c "f"))
+      (and (>= c "A") (<= c "F")))))
+
+(define
+  hs-hex-val
+  (fn
+    (c)
+    (let
+      ((code (char-code c)))
+      (cond
+        ((and (>= code 48) (<= code 57))  (- code 48))
+        ((and (>= code 65) (<= code 70))  (- code 55))
+        ((and (>= code 97) (<= code 102)) (- code 87))
+        (true 0)))))
+
 ;; ── Keyword set ───────────────────────────────────────────────────
 
 (define
@@ -198,22 +219,14 @@
   (fn
     (src)
     (let
-      ((tokens (list)) (pos 0) (src-len (len src)) (current-line 1))
+      ((tokens (list)) (pos 0) (src-len (len src)))
       (define
         hs-peek
         (fn
           (offset)
           (if (< (+ pos offset) src-len) (nth src (+ pos offset)) nil)))
       (define hs-cur (fn () (hs-peek 0)))
-      (define
-        hs-advance!
-        (fn
-          (n)
-          (when
-            (> n 0)
-            (when (= (hs-cur) "\n") (set! current-line (+ current-line 1)))
-            (set! pos (+ pos 1))
-            (hs-advance! (- n 1)))))
+      (define hs-advance! (fn (n) (set! pos (+ pos n))))
       (define
         skip-ws!
         (fn
@@ -243,10 +256,15 @@
         read-number
         (fn
           (start)
-          (when
-            (and (< pos src-len) (hs-digit? (hs-cur)))
-            (hs-advance! 1)
-            (read-number start))
+          (define
+            read-int
+            (fn
+              ()
+              (when
+                (and (< pos src-len) (hs-digit? (hs-cur)))
+                (hs-advance! 1)
+                (read-int))))
+          (read-int)
           (when
             (and
               (< pos src-len)
@@ -254,15 +272,7 @@
               (< (+ pos 1) src-len)
               (hs-digit? (hs-peek 1)))
             (hs-advance! 1)
-            (define
-              read-frac
-              (fn
-                ()
-                (when
-                  (and (< pos src-len) (hs-digit? (hs-cur)))
-                  (hs-advance! 1)
-                  (read-frac))))
-            (read-frac))
+            (read-int))
           (do
             (when
               (and
@@ -280,15 +290,7 @@
                   (< pos src-len)
                   (or (= (hs-cur) "+") (= (hs-cur) "-")))
                 (hs-advance! 1))
-              (define
-                read-exp-digits
-                (fn
-                  ()
-                  (when
-                    (and (< pos src-len) (hs-digit? (hs-cur)))
-                    (hs-advance! 1)
-                    (read-exp-digits))))
-              (read-exp-digits))
+              (read-int))
             (let
               ((num-end pos))
               (when
@@ -316,7 +318,7 @@
                 ()
                 (cond
                   (>= pos src-len)
-                  nil
+                  (error "Unterminated string")
                   (= (hs-cur) "\\")
                   (do
                     (hs-advance! 1)
@@ -326,15 +328,37 @@
                         ((ch (hs-cur)))
                         (cond
                           (= ch "n")
-                          (append! chars "\n")
+                          (do (append! chars "\n") (hs-advance! 1))
                           (= ch "t")
-                          (append! chars "\t")
+                          (do (append! chars "\t") (hs-advance! 1))
+                          (= ch "r")
+                          (do (append! chars "\r") (hs-advance! 1))
+                          (= ch "b")
+                          (do (append! chars (char-from-code 8)) (hs-advance! 1))
+                          (= ch "f")
+                          (do (append! chars (char-from-code 12)) (hs-advance! 1))
+                          (= ch "v")
+                          (do (append! chars (char-from-code 11)) (hs-advance! 1))
                           (= ch "\\")
-                          (append! chars "\\")
+                          (do (append! chars "\\") (hs-advance! 1))
                           (= ch quote-char)
-                          (append! chars quote-char)
-                          :else (do (append! chars "\\") (append! chars ch)))
-                        (hs-advance! 1)))
+                          (do (append! chars quote-char) (hs-advance! 1))
+                          (= ch "x")
+                          (do
+                            (hs-advance! 1)
+                            (if
+                              (and
+                                (< (+ pos 1) src-len)
+                                (hs-hex-digit? (hs-cur))
+                                (hs-hex-digit? (hs-peek 1)))
+                              (let
+                                ((d1 (hs-hex-val (hs-cur)))
+                                 (d2 (hs-hex-val (hs-peek 1))))
+                                (append! chars (char-from-code (+ (* d1 16) d2)))
+                                (hs-advance! 2))
+                              (error "Invalid hexadecimal escape: \\x")))
+                          :else
+                          (do (append! chars "\\") (append! chars ch) (hs-advance! 1)))))
                     (loop))
                   (= (hs-cur) quote-char)
                   (hs-advance! 1)
@@ -435,8 +459,8 @@
       (define
         hs-emit!
         (fn
-          (type value start start-line)
-          (append! tokens (hs-make-token type value start pos start-line))))
+          (type value start)
+          (append! tokens (hs-make-token type value start))))
       (define
         scan!
         (fn
@@ -445,7 +469,7 @@
           (when
             (< pos src-len)
             (let
-              ((ch (hs-cur)) (start pos) (start-line current-line))
+              ((ch (hs-cur)) (start pos))
               (cond
                 (and (= ch "-") (< (+ pos 1) src-len) (= (hs-peek 1) "-"))
                 (do (hs-advance! 2) (skip-comment!) (scan!))
@@ -462,9 +486,9 @@
                     (= (hs-peek 1) "[")
                     (= (hs-peek 1) "*")
                     (= (hs-peek 1) ":")))
-                (do (hs-emit! "selector" (read-selector) start start-line) (scan!))
+                (do (hs-emit! "selector" (read-selector) start) (scan!))
                 (and (= ch ".") (< (+ pos 1) src-len) (= (hs-peek 1) "."))
-                (do (hs-advance! 2) (hs-emit! "op" ".." start start-line) (scan!))
+                (do (hs-emit! "op" ".." start) (hs-advance! 2) (scan!))
                 (and
                   (= ch ".")
                   (< (+ pos 1) src-len)
@@ -474,7 +498,7 @@
                     (= (hs-peek 1) "_")))
                 (do
                   (hs-advance! 1)
-                  (hs-emit! "class" (read-class-name pos) start start-line)
+                  (hs-emit! "class" (read-class-name pos) start)
                   (scan!))
                 (and
                   (= ch "#")
@@ -482,7 +506,7 @@
                   (hs-ident-start? (hs-peek 1)))
                 (do
                   (hs-advance! 1)
-                  (hs-emit! "id" (read-ident pos) start start-line)
+                  (hs-emit! "id" (read-ident pos) start)
                   (scan!))
                 (and
                   (= ch "@")
@@ -490,7 +514,7 @@
                   (hs-ident-char? (hs-peek 1)))
                 (do
                   (hs-advance! 1)
-                  (hs-emit! "attr" (read-ident pos) start start-line)
+                  (hs-emit! "attr" (read-ident pos) start)
                   (scan!))
                 (and
                   (= ch "^")
@@ -498,7 +522,7 @@
                   (hs-ident-char? (hs-peek 1)))
                 (do
                   (hs-advance! 1)
-                  (hs-emit! "hat" (read-ident pos) start start-line)
+                  (hs-emit! "hat" (read-ident pos) start)
                   (scan!))
                 (and
                   (= ch "~")
@@ -506,7 +530,7 @@
                   (hs-letter? (hs-peek 1)))
                 (do
                   (hs-advance! 1)
-                  (hs-emit! "component" (str "~" (read-ident pos)) start start-line)
+                  (hs-emit! "component" (str "~" (read-ident pos)) start)
                   (scan!))
                 (and
                   (= ch "*")
@@ -514,7 +538,7 @@
                   (hs-letter? (hs-peek 1)))
                 (do
                   (hs-advance! 1)
-                  (hs-emit! "style" (read-ident pos) start start-line)
+                  (hs-emit! "style" (read-ident pos) start)
                   (scan!))
                 (and
                   (= ch ":")
@@ -522,7 +546,7 @@
                   (hs-ident-start? (hs-peek 1)))
                 (do
                   (hs-advance! 1)
-                  (hs-emit! "local" (read-ident pos) start start-line)
+                  (hs-emit! "local" (read-ident pos) start)
                   (scan!))
                 (or
                   (= ch "\"")
@@ -535,11 +559,11 @@
                         (or
                           (>= (+ pos 2) src-len)
                           (not (hs-ident-char? (hs-peek 2))))))))
-                (do (hs-emit! "string" (read-string ch) start start-line) (scan!))
+                (do (hs-emit! "string" (read-string ch) start) (scan!))
                 (= ch "`")
-                (do (hs-emit! "template" (read-template) start start-line) (scan!))
+                (do (hs-emit! "template" (read-template) start) (scan!))
                 (hs-digit? ch)
-                (do (hs-emit! "number" (read-number start) start start-line) (scan!))
+                (do (hs-emit! "number" (read-number start) start) (scan!))
                 (hs-ident-start? ch)
                 (do
                   (let
@@ -547,8 +571,7 @@
                     (hs-emit!
                       (if (hs-keyword? word) "keyword" "ident")
                       word
-                      start
-                      start-line))
+                      start))
                   (scan!))
                 (and
                   (or (= ch "=") (= ch "!") (= ch "<") (= ch ">"))
@@ -560,8 +583,8 @@
                       (or (= ch "=") (= ch "!"))
                       (< (+ pos 2) src-len)
                       (= (hs-peek 2) "="))
-                    (do (hs-advance! 3) (hs-emit! "op" (str ch "==") start start-line))
-                    (do (hs-advance! 2) (hs-emit! "op" (str ch "=") start start-line)))
+                    (do (hs-emit! "op" (str ch "==") start) (hs-advance! 3))
+                    (do (hs-emit! "op" (str ch "=") start) (hs-advance! 2)))
                   (scan!))
                 (and
                   (= ch "'")
@@ -570,66 +593,141 @@
                   (or
                     (>= (+ pos 2) src-len)
                     (not (hs-ident-char? (hs-peek 2)))))
-                (do (hs-advance! 2) (hs-emit! "op" "'s" start start-line) (scan!))
+                (do (hs-emit! "op" "'s" start) (hs-advance! 2) (scan!))
                 (= ch "(")
                 (do
+                  (hs-emit! "paren-open" "(" start)
                   (hs-advance! 1)
-                  (hs-emit! "paren-open" "(" start start-line)
                   (scan!))
                 (= ch ")")
                 (do
+                  (hs-emit! "paren-close" ")" start)
                   (hs-advance! 1)
-                  (hs-emit! "paren-close" ")" start start-line)
                   (scan!))
                 (= ch "[")
                 (do
+                  (hs-emit! "bracket-open" "[" start)
                   (hs-advance! 1)
-                  (hs-emit! "bracket-open" "[" start start-line)
                   (scan!))
                 (= ch "]")
                 (do
+                  (hs-emit! "bracket-close" "]" start)
                   (hs-advance! 1)
-                  (hs-emit! "bracket-close" "]" start start-line)
                   (scan!))
                 (= ch "{")
                 (do
+                  (hs-emit! "brace-open" "{" start)
                   (hs-advance! 1)
-                  (hs-emit! "brace-open" "{" start start-line)
                   (scan!))
                 (= ch "}")
                 (do
+                  (hs-emit! "brace-close" "}" start)
                   (hs-advance! 1)
-                  (hs-emit! "brace-close" "}" start start-line)
                   (scan!))
                 (= ch ",")
-                (do (hs-advance! 1) (hs-emit! "comma" "," start start-line) (scan!))
+                (do (hs-emit! "comma" "," start) (hs-advance! 1) (scan!))
                 (= ch "+")
-                (do (hs-advance! 1) (hs-emit! "op" "+" start start-line) (scan!))
+                (do (hs-emit! "op" "+" start) (hs-advance! 1) (scan!))
                 (= ch "-")
-                (do (hs-advance! 1) (hs-emit! "op" "-" start start-line) (scan!))
+                (do (hs-emit! "op" "-" start) (hs-advance! 1) (scan!))
                 (= ch "/")
-                (do (hs-advance! 1) (hs-emit! "op" "/" start start-line) (scan!))
+                (do (hs-emit! "op" "/" start) (hs-advance! 1) (scan!))
                 (= ch "=")
-                (do (hs-advance! 1) (hs-emit! "op" "=" start start-line) (scan!))
+                (do (hs-emit! "op" "=" start) (hs-advance! 1) (scan!))
                 (= ch "<")
-                (do (hs-advance! 1) (hs-emit! "op" "<" start start-line) (scan!))
+                (do (hs-emit! "op" "<" start) (hs-advance! 1) (scan!))
                 (= ch ">")
-                (do (hs-advance! 1) (hs-emit! "op" ">" start start-line) (scan!))
+                (do (hs-emit! "op" ">" start) (hs-advance! 1) (scan!))
                 (= ch "!")
-                (do (hs-advance! 1) (hs-emit! "op" "!" start start-line) (scan!))
+                (do (hs-emit! "op" "!" start) (hs-advance! 1) (scan!))
                 (= ch "*")
-                (do (hs-advance! 1) (hs-emit! "op" "*" start start-line) (scan!))
+                (do (hs-emit! "op" "*" start) (hs-advance! 1) (scan!))
                 (= ch "%")
-                (do (hs-advance! 1) (hs-emit! "op" "%" start start-line) (scan!))
+                (do (hs-emit! "op" "%" start) (hs-advance! 1) (scan!))
                 (= ch ".")
-                (do (hs-advance! 1) (hs-emit! "dot" "." start start-line) (scan!))
+                (do (hs-emit! "dot" "." start) (hs-advance! 1) (scan!))
                 (= ch "\\")
-                (do (hs-advance! 1) (hs-emit! "op" "\\" start start-line) (scan!))
+                (do (hs-emit! "op" "\\" start) (hs-advance! 1) (scan!))
                 (= ch ":")
-                (do (hs-advance! 1) (hs-emit! "colon" ":" start start-line) (scan!))
+                (do (hs-emit! "colon" ":" start) (hs-advance! 1) (scan!))
                 (= ch "|")
-                (do (hs-advance! 1) (hs-emit! "op" "|" start start-line) (scan!))
+                (do (hs-emit! "op" "|" start) (hs-advance! 1) (scan!))
+                (= ch "&")
+                (do (hs-emit! "op" "&" start) (hs-advance! 1) (scan!))
+                (= ch "#")
+                (do (hs-emit! "op" "#" start) (hs-advance! 1) (scan!))
+                (= ch "?")
+                (do (hs-emit! "op" "?" start) (hs-advance! 1) (scan!))
+                (= ch ";")
+                (do (hs-emit! "op" ";" start) (hs-advance! 1) (scan!))
                 :else (do (hs-advance! 1) (scan!)))))))
       (scan!)
-      (hs-emit! "eof" nil pos current-line)
+      (hs-emit! "eof" nil pos)
+      tokens)))
+
+;; ── Template-mode tokenizer (E37 API) ────────────────────────────────
+;; Used by hs-tokens-of when :template flag is set.
+;; Emits outer " chars as single STRING tokens; ${ ... } as $ { <inner-tokens> };
+;; inner content is tokenized with the regular hs-tokenize.
+
+(define
+  hs-tokenize-template
+  (fn
+    (src)
+    (let
+      ((tokens (list)) (pos 0) (src-len (len src)))
+      (define t-cur (fn () (if (< pos src-len) (nth src pos) nil)))
+      (define t-peek (fn (n) (if (< (+ pos n) src-len) (nth src (+ pos n)) nil)))
+      (define t-advance! (fn (n) (set! pos (+ pos n))))
+      (define t-emit! (fn (type value) (append! tokens (hs-make-token type value pos))))
+      (define
+        scan-to-close!
+        (fn
+          (depth)
+          (when
+            (and (< pos src-len) (> depth 0))
+            (cond
+              (= (t-cur) "{")
+              (do (t-advance! 1) (scan-to-close! (+ depth 1)))
+              (= (t-cur) "}")
+              (when (> (- depth 1) 0) (t-advance! 1) (scan-to-close! (- depth 1)))
+              :else (do (t-advance! 1) (scan-to-close! depth))))))
+      (define
+        scan-template!
+        (fn
+          ()
+          (when
+            (< pos src-len)
+            (let
+              ((ch (t-cur)))
+              (cond
+                (= ch "\"")
+                (do (t-emit! "string" "\"") (t-advance! 1) (scan-template!))
+                (and (= ch "$") (= (t-peek 1) "{"))
+                (do
+                  (t-emit! "op" "$")
+                  (t-advance! 1)
+                  (t-emit! "brace-open" "{")
+                  (t-advance! 1)
+                  (let
+                    ((inner-start pos))
+                    (scan-to-close! 1)
+                    (let
+                      ((inner-src (slice src inner-start pos))
+                       (inner-toks (hs-tokenize inner-src)))
+                      (for-each
+                        (fn (tok)
+                          (when (not (= (get tok "type") "eof"))
+                            (append! tokens tok)))
+                        inner-toks))
+                    (t-emit! "brace-close" "}")
+                    (when (< pos src-len) (t-advance! 1)))
+                  (scan-template!))
+                (= ch "$")
+                (do (t-emit! "op" "$") (t-advance! 1) (scan-template!))
+                (hs-ws? ch)
+                (do (t-advance! 1) (scan-template!))
+                :else (do (t-advance! 1) (scan-template!)))))))
+      (scan-template!)
+      (t-emit! "eof" nil)
       tokens)))

plans/hs-conformance-scoreboard.md

@@ -4,7 +4,7 @@ Live tally for `plans/hs-conformance-to-100.md`. Update after every cluster comm
 
 ```
 Baseline:   1213/1496 (81.1%)
-Merged:     1306/1496 (87.3%)   delta +93
+Merged:     1303/1496 (87.1%)   delta +90
 Worktree:   all landed
 Target:     1496/1496 (100.0%)
 Remaining:  ~194 tests (clusters 17/29(partial)/31 blocked; 33/34 partial)
@@ -22,7 +22,7 @@ Remaining:  ~194 tests (clusters 17/29(partial)/31 blocked; 33/34 partial)
 | 4 | `not` precedence over `or` | done | +3 | 4fe0b649 |
 | 5 | `some` selector for nonempty match | done | +1 | e7b86264 |
 | 6 | string template `${x}` | done | +2 | 108e25d4 |
-| 7 | `put` hyperscript reprocessing | partial | +4 | d663c91f |
+| 7 | `put` hyperscript reprocessing | partial | +1 | f21eb008 |
 | 8 | `select` returns selected text | done | +1 | d862efe8 |
 | 9 | `wait on event` basics | done | +4 | f79f96c1 |
 | 10 | `swap` variable ↔ property | done | +1 | 30f33341 |

plans/hs-conformance-to-100.md

@@ -61,7 +61,7 @@ Orchestrator cherry-picks worktree commits onto `architecture` one at a time; re
 
 6. **[done (+2)] string template `${x}`** — `expressions/strings / string templates work w/ props` + `w/ braces` (2 tests). Template interpolation isn't substituting property accesses. Check `hs-template` runtime. Expected: +2.
 
-7. **[done (+4) — partial, 1 test remains: "waits on promises" (async/Promise resolution)] `put` hyperscript reprocessing** — `put / properly processes hyperscript at end/start/content/symbol` (4 tests, all `Expected 42, got 40`). After a put operation, newly inserted HS scripts aren't being activated. Fix: `hs-put-at!` should `hs-boot-subtree!` on the target after DOM insertion. Expected: +4.
+7. **[done (+1) — partial, 3 tests remain: inserted-button handler doesn't fire for afterbegin/innerHTML paths; might need targeted trace of hs-boot-subtree! or _setInnerHTML timing] `put` hyperscript reprocessing** — `put / properly processes hyperscript at end/start/content/symbol` (4 tests, all `Expected 42, got 40`). After a put operation, newly inserted HS scripts aren't being activated. Fix: `hs-put-at!` should `hs-boot-subtree!` on the target after DOM insertion. Expected: +4.
 
 8. **[done (+1)] `select returns selected text`** (1 test, `hs-upstream-select`). Runtime `hs-get-selection` helper reads `window.__test_selection` stash (or falls back to real `window.getSelection().toString()`). Compiler rewrites `(ref "selection")` to `(hs-get-selection)`. Generator detects the `createRange` / `setStart` / `setEnd` / `addRange` block and emits a single `(host-set! ... __test_selection ...)` op with the resolved text slice of the target element. Expected: +1.
 
@@ -131,7 +131,7 @@ All five have design docs on their own worktree branches pending review + merge.
 
 36. **[design-done, pending review — `plans/designs/e36-websocket.md` on `worktree-agent-a9daf73703f520257`] WebSocket + `socket`** — 16 tests. Upstream shape is `socket NAME URL [with timeout N] [on message [as JSON] …] end` with an **implicit `.rpc` Proxy** (ES6 Proxy lives in JS, not SX), not `with proxy { send, receive }` as this row previously claimed. Design doc has 8-commit checklist, +12–16 delta estimate. Ship only with intentional design review.
 
-37. **[design-done, pending review — `plans/designs/e37-tokenizer-api.md` on `worktree-agent-a6bb61d59cc0be8b4`] Tokenizer-as-API** — 17 tests. Expose tokens as inspectable SX data via `hs-tokens-of` / `hs-stream-token` / `hs-token-type` etc; type-map current `hs-tokenize` output to upstream SCREAMING_SNAKE_CASE. 8-step checklist, +16–17 delta.
+37. **[done +17]** Tokenizer-as-API — `hs-tokens-of` / `hs-stream-token` / `hs-token-type` / `hs-token-value` / `hs-token-op?`; type-map + normalize; `read-number` dot-stop fix; `\$` template escape in compiler + runtime; generator pattern in `generate-sx-tests.py`. 17/17.
 
 38. **[design-done, pending review — `plans/designs/e38-sourceinfo.md` on `agent-e38-sourceinfo`] SourceInfo API** — 4 tests. Inline span-wrapper strategy (not side-channel dict) with compiler-entry unwrap. 4-commit plan.
 
@@ -175,9 +175,6 @@ Many tests are `SKIP (untranslated)` because `tests/playwright/generate-sx-tests
 
 ## Progress log
 
-### 2026-04-26 — cluster 7 put hyperscript reprocessing (partial +3 more)
-- **d663c91f** — `hs: stop event propagation after each hs-on handler fires (+3 tests)`. Root cause: click events bubble from b1 (inside d1) to d1, causing d1's `on click put ...` handler to re-fire and replace the just-modified b1 with fresh content (text=40). Fix: `hs-on`'s wrapped handler now calls `event.stopPropagation()` after each handler runs, preventing the bubbled click from reaching ancestor HS listeners. Tests 1147/1149/1150 now pass. Suite hs-upstream-put: 34/38 → 37/38. Smoke 0-195: 173/195 unchanged. One test remains: "waits on promises" (async/Promise issue).
-
 (Reverse chronological — newest at top.)
 
 ### 2026-04-25 — Bucket F: in-expression filter semantics (+1)

shared/static/wasm/sx/hs-compiler.sx

@@ -789,12 +789,11 @@
               (cons (quote do) (map hs-to-sx body)))))))
     (fn
       (ast)
-      (let ((ast (if (and (dict? ast) (get ast :hs-ast)) (get ast :children) ast)))
-        (cond
-          ((nil? ast) nil)
-          ((number? ast) ast)
-          ((string? ast) ast)
-          ((boolean? ast) ast)
+      (cond
+        ((nil? ast) nil)
+        ((number? ast) ast)
+        ((string? ast) ast)
+        ((boolean? ast) ast)
         ((and (symbol? ast) (= (str ast) "sender"))
           (list (quote hs-sender) (quote event)))
         ((not (list? ast)) ast)
@@ -894,6 +893,12 @@
                           (let
                             ((ch (nth raw i)))
                             (if
+                              (and (= ch "\\") (< (+ i 1) n) (= (nth raw (+ i 1)) "$"))
+                              (do
+                                (set! buf (str buf "$"))
+                                (set! i (+ i 2))
+                                (tpl-collect))
+                              (if
                               (and (= ch "$") (< (+ i 1) n))
                               (if
                                 (= (nth raw (+ i 1)) "{")
@@ -932,7 +937,7 @@
                               (do
                                 (set! buf (str buf ch))
                                 (set! i (+ i 1))
-                                (tpl-collect)))))))
+                                (tpl-collect))))))))
                     (tpl-collect)
                     (tpl-flush)
                     (cons (quote str) parts))))
@@ -2208,7 +2213,7 @@
                 (list (quote hs-halt!) (quote event) (nth ast 1)))
               ((= head (quote focus!))
                 (list (quote dom-focus) (hs-to-sx (nth ast 1))))
-              (true ast)))))))))
+              (true ast))))))))
 
 ;; ── Convenience: source → SX ─────────────────────────────────
 (define hs-to-sx-from-source (fn (src) (hs-to-sx (hs-compile src))))

shared/static/wasm/sx/hs-parser.sx

@@ -21,15 +21,6 @@
         adv!
         (fn () (let ((t (nth tokens p))) (set! p (+ p 1)) t)))
       (define at-end? (fn () (or (>= p tok-len) (= (tp-type) "eof"))))
-      (define cur-start (fn () (if (< p tok-len) (get (tp) "pos") 0)))
-      (define cur-line (fn () (if (< p tok-len) (get (tp) "line") 1)))
-      (define prev-end (fn () (if (> p 0) (get (nth tokens (- p 1)) "end") 0)))
-      (define hs-ast-wrap
-        (fn (raw kind start end-pos line fields)
-          (if hs-span-mode
-            {:hs-ast true :kind kind :start start :end end-pos :line line
-             :src src :children raw :fields fields}
-            raw)))
       (define
         match-kw
         (fn
@@ -78,28 +69,19 @@
         parse-prop-chain
         (fn
           (base)
-          (let
-            ((base-start (if (and (dict? base) (get base :hs-ast)) (get base :start) (cur-start)))
-              (base-line (if (and (dict? base) (get base :hs-ast)) (get base :line) (cur-line))))
+          (if
+            (and (= (tp-type) "class") (not (at-end?)))
+            (let
+              ((prop (tp-val)))
+              (do
+                (adv!)
+                (parse-prop-chain (list (make-symbol ".") base prop))))
             (if
-              (and (= (tp-type) "class") (not (at-end?)))
+              (= (tp-type) "paren-open")
               (let
-                ((prop (tp-val)))
-                (do
-                  (adv!)
-                  (parse-prop-chain
-                    (hs-ast-wrap
-                      (list (make-symbol ".") base prop)
-                      "member" base-start (prev-end) base-line {:root base}))))
-              (if
-                (= (tp-type) "paren-open")
-                (let
-                  ((args (parse-call-args)))
-                  (parse-prop-chain
-                    (hs-ast-wrap
-                      (list (quote method-call) base args)
-                      "call" base-start (prev-end) base-line {:root base})))
-                base)))))
+                ((args (parse-call-args)))
+                (parse-prop-chain (list (quote method-call) base args)))
+              base))))
       (define
         parse-trav
         (fn
@@ -142,12 +124,8 @@
           (let
             ((typ (tp-type)) (val (tp-val)))
             (cond
-              ((= typ "number")
-                (let ((s (cur-start)) (l (cur-line)))
-                  (do (adv!) (hs-ast-wrap (parse-dur val) "number" s (prev-end) l {}))))
-              ((= typ "string")
-                (let ((s (cur-start)) (l (cur-line)))
-                  (do (adv!) (hs-ast-wrap val "string" s (prev-end) l {}))))
+              ((= typ "number") (do (adv!) (parse-dur val)))
+              ((= typ "string") (do (adv!) val))
               ((= typ "template") (do (adv!) (list (quote template) val)))
               ((and (= typ "keyword") (= val "true")) (do (adv!) true))
               ((and (= typ "keyword") (= val "false")) (do (adv!) false))
@@ -212,23 +190,19 @@
               ((and (= typ "keyword") (= val "last"))
                 (do (adv!) (parse-pos-kw (quote last))))
               ((= typ "id")
-                (let ((s (cur-start)) (l (cur-line)))
-                  (do (adv!) (hs-ast-wrap (list (quote query) (str "#" val)) "selector" s (prev-end) l {}))))
+                (do (adv!) (list (quote query) (str "#" val))))
               ((= typ "selector")
-                (let ((s (cur-start)) (l (cur-line)))
-                  (do
-                    (adv!)
-                    (hs-ast-wrap
-                      (if
-                        (and (= (tp-type) "keyword") (= (tp-val) "in"))
-                        (do
-                          (adv!)
-                          (list
-                            (quote query-scoped)
-                            val
-                            (parse-cmp (parse-arith (parse-poss (parse-atom))))))
-                        (list (quote query) val))
-                      "selector" s (prev-end) l {}))))
+                (do
+                  (adv!)
+                  (if
+                    (and (= (tp-type) "keyword") (= (tp-val) "in"))
+                    (do
+                      (adv!)
+                      (list
+                        (quote query-scoped)
+                        val
+                        (parse-cmp (parse-arith (parse-poss (parse-atom))))))
+                    (list (quote query) val))))
               ((= typ "attr")
                 (do (adv!) (list (quote attr) val (list (quote me)))))
               ((= typ "style")
@@ -245,11 +219,8 @@
                       (adv!)
                       (list (quote dom-ref) name (list (quote me)))))))
               ((= typ "class")
-                (let ((s (cur-start)) (l (cur-line)))
-                  (do (adv!) (hs-ast-wrap (list (quote query) (str "." val)) "selector" s (prev-end) l {}))))
-              ((= typ "ident")
-                (let ((s (cur-start)) (l (cur-line)))
-                  (do (adv!) (hs-ast-wrap (list (quote ref) val) "ref" s (prev-end) l {}))))
+                (do (adv!) (list (quote query) (str "." val))))
+              ((= typ "ident") (do (adv!) (list (quote ref) val)))
               ((= typ "paren-open")
                 (do
                   (adv!)
@@ -2050,11 +2021,7 @@
                   ((op (cond ((= val "+") (quote +)) ((= val "-") (quote -)) ((= val "*") (quote *)) ((= val "/") (quote /)) ((or (= val "%") (= val "mod")) (make-symbol "%")))))
                   (let
                     ((right (let ((a (parse-atom))) (if (nil? a) a (parse-poss a)))))
-                    (let
-                      ((lhs-start (if (and (dict? left) (get left :hs-ast)) (get left :start) 0))
-                        (lhs-line (if (and (dict? left) (get left :hs-ast)) (get left :line) 1)))
-                      (parse-arith
-                        (hs-ast-wrap (list op left right) "arith" lhs-start (prev-end) lhs-line {:lhs left :rhs right}))))))
+                    (parse-arith (list op left right)))))
               left))))
       (define
         parse-the-expr
@@ -2454,15 +2421,7 @@
               ((and (= typ "keyword") (= val "put"))
                 (do (adv!) (parse-put-cmd)))
               ((and (= typ "keyword") (= val "if"))
-                (let ((s (cur-start)) (l (cur-line)))
-                  (do
-                    (adv!)
-                    (let ((r (parse-if-cmd)))
-                      (let ((tb (if (and (list? r) (> (len r) 2)) (nth r 2) nil)))
-                        (hs-ast-wrap r "if" s (prev-end) l
-                          (if tb
-                            {:true-branch (if (and (list? tb) (= (first tb) (quote do))) (nth tb 1) tb)}
-                            {})))))))
+                (do (adv!) (parse-if-cmd)))
               ((and (= typ "keyword") (= val "wait"))
                 (do (adv!) (parse-wait-cmd)))
               ((and (= typ "keyword") (= val "send"))
@@ -2470,8 +2429,7 @@
               ((and (= typ "keyword") (= val "trigger"))
                 (do (adv!) (parse-trigger-cmd)))
               ((and (= typ "keyword") (= val "log"))
-                (let ((s (cur-start)) (l (cur-line)))
-                  (do (adv!) (hs-ast-wrap (parse-log-cmd) "cmd" s (prev-end) l {}))))
+                (do (adv!) (parse-log-cmd)))
               ((and (= typ "keyword") (= val "increment"))
                 (do (adv!) (parse-inc-cmd)))
               ((and (= typ "keyword") (= val "decrement"))
@@ -2511,8 +2469,7 @@
               ((and (= typ "keyword") (= val "tell"))
                 (do (adv!) (parse-tell-cmd)))
               ((and (= typ "keyword") (= val "for"))
-                (let ((s (cur-start)) (l (cur-line)))
-                  (do (adv!) (hs-ast-wrap (parse-for-cmd) "cmd" s (prev-end) l {}))))
+                (do (adv!) (parse-for-cmd)))
               ((and (= typ "keyword") (= val "make"))
                 (do (adv!) (parse-make-cmd)))
               ((and (= typ "keyword") (= val "install"))
@@ -2634,31 +2591,13 @@
                       (true acc2)))))))
           (let
             ((cmds (cl-collect (list))))
-            (define
-              link-next-cmds
-              (fn
-                (cmds-list)
-                (define
-                  loop
-                  (fn
-                    (i)
-                    (when (< i (- (len cmds-list) 1))
-                      (let
-                        ((cur-node (nth cmds-list i)) (nxt-node (nth cmds-list (+ i 1))))
-                        (when (and (dict? cur-node) (get cur-node :hs-ast))
-                          (dict-set! (get cur-node :fields) "next" nxt-node)))
-                      (loop (+ i 1)))))
-                (loop 0)
-                cmds-list))
-            (let
-              ((linked (if hs-span-mode (link-next-cmds cmds) cmds)))
-              (cond
-                ((= (len linked) 0) nil)
-                ((= (len linked) 1) (first linked))
-                (true
-                  (cons
-                    (quote do)
-                    (filter (fn (c) (not (= c (quote __then__)))) linked))))))))
+            (cond
+              ((= (len cmds) 0) nil)
+              ((= (len cmds) 1) (first cmds))
+              (true
+                (cons
+                  (quote do)
+                  (filter (fn (c) (not (= c (quote __then__)))) cmds)))))))
       (define
         parse-on-feat
         (fn
@@ -2810,7 +2749,6 @@
               ((= val "behavior") (do (adv!) (parse-behavior-feat)))
               ((= val "live") (do (adv!) (parse-live-feat)))
               ((= val "when") (do (adv!) (parse-when-feat)))
-              ((= val "worker") (error "worker plugin is not installed — see https://hyperscript.org/features/worker"))
               (true (parse-cmd-list))))))
       (define
         coll-feats
@@ -2829,12 +2767,4 @@
           (first features)
           (cons (quote do) features))))))
 
-(define hs-span-mode false)
-
 (define hs-compile (fn (src) (hs-parse (hs-tokenize src) src)))
-
-(define hs-parse-ast
-  (fn (src)
-    (set! hs-span-mode true)
-    (let ((result (hs-parse (hs-tokenize src) src)))
-      (do (set! hs-span-mode false) result))))

shared/static/wasm/sx/hs-runtime.sx

@@ -48,7 +48,7 @@
   (fn
     (target event-name handler)
     (let
-      ((wrapped (fn (event) (guard (e ((and (not (= event-name "exception")) (not (= event-name "error"))) (dom-dispatch target "exception" {:error e})) (true (raise e))) (do (handler event) (when event (host-call event "stopPropagation")))))))
+      ((wrapped (fn (event) (guard (e ((and (not (= event-name "exception")) (not (= event-name "error"))) (dom-dispatch target "exception" {:error e})) (true (raise e))) (handler event)))))
       (let
         ((unlisten (dom-listen target event-name wrapped))
           (prev (or (dom-get-data target "hs-unlisteners") (list))))
@@ -2021,6 +2021,12 @@
             (let
               ((ch (nth raw i)))
               (if
+                (and (= ch "\\") (< (+ i 1) n) (= (nth raw (+ i 1)) "$"))
+                (do
+                  (set! result (str result "$"))
+                  (set! i (+ i 2))
+                  (tpl-loop))
+                (if
                 (and (= ch "$") (< (+ i 1) n))
                 (if
                   (= (nth raw (+ i 1)) "{")
@@ -2089,7 +2095,7 @@
                 (do
                   (set! result (str result ch))
                   (set! i (+ i 1))
-                  (tpl-loop)))))))
+                  (tpl-loop))))))))
       (do (tpl-loop) result))))
 
 (define
@@ -2526,56 +2532,187 @@
     (fn-name args)
     (let ((fn (host-global fn-name))) (if fn (host-call-fn fn args) nil))))
 
-;; ── SourceInfo API ────────────────────────────────────────────────
+;; ── E37 Tokenizer-as-API ─────────────────────────────────────────────
+
+(define hs-eof-sentinel (fn () {:type "EOF" :value "<<<EOF>>>" :op false}))
 
 (define
-  hs-source-for
+  hs-op-type
   (fn
-    (node)
-    (substring (get node :src) (get node :start) (get node :end))))
+    (val)
+    (cond
+      ((= val "+")   "PLUS")
+      ((= val "-")   "MINUS")
+      ((= val "*")   "MULTIPLY")
+      ((= val "/")   "SLASH")
+      ((= val "%")   "PERCENT")
+      ((= val "|")   "PIPE")
+      ((= val "!")   "EXCLAMATION")
+      ((= val "?")   "QUESTION")
+      ((= val "#")   "POUND")
+      ((= val "&")   "AMPERSAND")
+      ((= val ";")   "SEMI")
+      ((= val "=")   "EQUALS")
+      ((= val "<")   "L_ANG")
+      ((= val ">")   "R_ANG")
+      ((= val "<=")  "LTE_ANG")
+      ((= val ">=")  "GTE_ANG")
+      ((= val "==")  "EQ")
+      ((= val "===") "EQQ")
+      ((= val "\\")  "BACKSLASH")
+      (true          (str "OP_" val)))))
 
 (define
-  hs-line-for
+  hs-raw->api-token
   (fn
-    (node)
+    (tok)
     (let
-      ((lines (split (get node :src) "\n"))
-        (line-idx (- (get node :line) 1)))
-      (if (< line-idx (len lines)) (nth lines line-idx) ""))))
+      ((raw-type (get tok "type"))
+       (raw-val  (get tok "value")))
+      (let
+        ((up-type
+           (cond
+             ((or (= raw-type "ident") (= raw-type "keyword")) "IDENTIFIER")
+             ((= raw-type "number")        "NUMBER")
+             ((= raw-type "string")        "STRING")
+             ((= raw-type "class")         "CLASS_REF")
+             ((= raw-type "id")            "ID_REF")
+             ((= raw-type "attr")          "ATTRIBUTE_REF")
+             ((= raw-type "style")         "STYLE_REF")
+             ((= raw-type "selector")      "QUERY_REF")
+             ((= raw-type "eof")           "EOF")
+             ((= raw-type "paren-open")    "L_PAREN")
+             ((= raw-type "paren-close")   "R_PAREN")
+             ((= raw-type "bracket-open")  "L_BRACKET")
+             ((= raw-type "bracket-close") "R_BRACKET")
+             ((= raw-type "brace-open")    "L_BRACE")
+             ((= raw-type "brace-close")   "R_BRACE")
+             ((= raw-type "comma")         "COMMA")
+             ((= raw-type "dot")           "PERIOD")
+             ((= raw-type "colon")         "COLON")
+             ((= raw-type "op")            (hs-op-type raw-val))
+             (true                         (str "UNKNOWN_" raw-type))))
+         (up-val
+           (cond
+             ((= raw-type "class") (str "." raw-val))
+             ((= raw-type "id")    (str "#" raw-val))
+             ((= raw-type "eof")   "<<<EOF>>>")
+             (true                 raw-val)))
+         (is-op
+           (or
+             (= raw-type "paren-open")
+             (= raw-type "paren-close")
+             (= raw-type "bracket-open")
+             (= raw-type "bracket-close")
+             (= raw-type "brace-open")
+             (= raw-type "brace-close")
+             (= raw-type "comma")
+             (= raw-type "dot")
+             (= raw-type "colon")
+             (= raw-type "op"))))
+        {:type up-type :value up-val :op is-op}))))
 
+;; Expand "class" and "id" tokens that follow a closing bracket into
+;; separate dot/hash + ident tokens, matching upstream context-sensitive
+;; behaviour: after ) ] } the dot is property access, not a CLASS_REF.
 (define
-  hs-node-get
+  hs-normalize-raw-tokens
   (fn
-    (node key)
-    (get (get node :fields) key)))
+    (raw-real)
+    (let
+      ((result (list))
+       (prev-type nil))
+      (for-each
+        (fn
+          (tok)
+          (let
+            ((typ (get tok "type"))
+             (val (get tok "value"))
+             (tok-pos (get tok "pos")))
+            (if
+              (and
+                (or (= typ "class") (= typ "id"))
+                (or
+                  (= prev-type "paren-close")
+                  (= prev-type "bracket-close")
+                  (= prev-type "brace-close")))
+              (do
+                (if
+                  (= typ "class")
+                  (do
+                    (append! result {:type "dot" :value "." :pos tok-pos})
+                    (append! result {:type "ident" :value val :pos (+ tok-pos 1)}))
+                  (do
+                    (append! result {:type "op" :value "#" :pos tok-pos})
+                    (append! result {:type "ident" :value val :pos (+ tok-pos 1)})))
+                (set! prev-type "ident"))
+              (do
+                (append! result tok)
+                (set! prev-type typ)))))
+        raw-real)
+      result)))
 
 (define
-  hs-src
-  (fn (src-str)
-    (hs-source-for (hs-parse-ast src-str))))
-
-(define
-  hs-src-at
+  hs-tokens-of
   (fn
-    (src-str path)
-    (define
-      walk
-      (fn
-        (node keys)
-        (if (or (nil? keys) (= (len keys) 0))
-          node
-          (walk (hs-node-get node (first keys)) (rest keys)))))
-    (hs-source-for (walk (hs-parse-ast src-str) path))))
+    (src &rest rest)
+    (let
+      ((template? (and (> (len rest) 0) (= (first rest) :template)))
+       (raw (if template? (hs-tokenize-template src) (hs-tokenize src))))
+      (if
+        template?
+        {:source src :list (map hs-raw->api-token raw) :pos 0}
+        ;; Normal mode: filter EOF, context-normalise, add trailing-WS sentinel
+        (let
+          ((real (filter (fn (t) (not (= (get t "type") "eof"))) raw)))
+          (let
+            ((norm (hs-normalize-raw-tokens real)))
+            (let
+              ((api (map hs-raw->api-token norm)))
+              (let
+                ((with-sep
+                   (if
+                     (and
+                       (> (len norm) 0)
+                       (let
+                         ((last-tok (nth norm (- (len norm) 1))))
+                         (let
+                           ((end-pos
+                              (+ (get last-tok "pos")
+                                 (len (get last-tok "value")))))
+                           (and
+                             (< end-pos (len src))
+                             (hs-ws? (nth src end-pos))))))
+                     (append api (list {:type "WHITESPACE" :value " " :op false}))
+                     api)))
+                {:source src :list with-sep :pos 0}))))))))
+
 
 (define
-  hs-line-at
+  hs-stream-token
   (fn
-    (src-str path)
-    (define
-      walk
-      (fn
-        (node keys)
-        (if (or (nil? keys) (= (len keys) 0))
-          node
-          (walk (hs-node-get node (first keys)) (rest keys)))))
-    (hs-line-for (walk (hs-parse-ast src-str) path))))
+    (s i)
+    (let
+      ((lst (get s "list"))
+       (pos (get s "pos")))
+      (or (nth lst (+ pos i))
+          (hs-eof-sentinel)))))
+
+(define
+  hs-stream-consume
+  (fn
+    (s)
+    (let
+      ((tok (hs-stream-token s 0)))
+      (when
+        (not (= (get tok "type") "EOF"))
+        (dict-set! s "pos" (+ (get s "pos") 1)))
+      tok)))
+
+(define
+  hs-stream-has-more
+  (fn (s) (not (= (get (hs-stream-token s 0) "type") "EOF"))))
+
+(define hs-token-type  (fn (tok) (get tok "type")))
+(define hs-token-value (fn (tok) (get tok "value")))
+(define hs-token-op?   (fn (tok) (get tok "op")))

shared/static/wasm/sx/hs-tokenizer.sx

@@ -1,6 +1,6 @@
 ;; _hyperscript tokenizer — produces token stream from hyperscript source
 ;;
-;; Tokens: {:type T :value V :pos P :end E :line L}
+;; Tokens: {:type T :value V :pos P}
 ;; Types: "keyword" "ident" "number" "string" "class" "id" "attr" "style"
 ;;        "selector" "op" "dot" "paren-open" "paren-close" "bracket-open"
 ;;        "bracket-close" "brace-open" "brace-close" "comma" "colon"
@@ -8,7 +8,7 @@
 
 ;; ── Token constructor ─────────────────────────────────────────────
 
-(define hs-make-token (fn (type value pos end line) {:pos pos :end end :line line :value value :type type}))
+(define hs-make-token (fn (type value pos) {:pos pos :value value :type type}))
 
 ;; ── Character predicates ──────────────────────────────────────────
 
@@ -28,6 +28,27 @@
 
 (define hs-ws? (fn (c) (or (= c " ") (= c "\t") (= c "\n") (= c "\r"))))
 
+(define
+  hs-hex-digit?
+  (fn
+    (c)
+    (or
+      (and (>= c "0") (<= c "9"))
+      (and (>= c "a") (<= c "f"))
+      (and (>= c "A") (<= c "F")))))
+
+(define
+  hs-hex-val
+  (fn
+    (c)
+    (let
+      ((code (char-code c)))
+      (cond
+        ((and (>= code 48) (<= code 57))  (- code 48))
+        ((and (>= code 65) (<= code 70))  (- code 55))
+        ((and (>= code 97) (<= code 102)) (- code 87))
+        (true 0)))))
+
 ;; ── Keyword set ───────────────────────────────────────────────────
 
 (define
@@ -198,22 +219,14 @@
   (fn
     (src)
     (let
-      ((tokens (list)) (pos 0) (src-len (len src)) (current-line 1))
+      ((tokens (list)) (pos 0) (src-len (len src)))
       (define
         hs-peek
         (fn
           (offset)
           (if (< (+ pos offset) src-len) (nth src (+ pos offset)) nil)))
       (define hs-cur (fn () (hs-peek 0)))
-      (define
-        hs-advance!
-        (fn
-          (n)
-          (when
-            (> n 0)
-            (when (= (hs-cur) "\n") (set! current-line (+ current-line 1)))
-            (set! pos (+ pos 1))
-            (hs-advance! (- n 1)))))
+      (define hs-advance! (fn (n) (set! pos (+ pos n))))
       (define
         skip-ws!
         (fn
@@ -243,10 +256,15 @@
         read-number
         (fn
           (start)
-          (when
-            (and (< pos src-len) (hs-digit? (hs-cur)))
-            (hs-advance! 1)
-            (read-number start))
+          (define
+            read-int
+            (fn
+              ()
+              (when
+                (and (< pos src-len) (hs-digit? (hs-cur)))
+                (hs-advance! 1)
+                (read-int))))
+          (read-int)
           (when
             (and
               (< pos src-len)
@@ -254,15 +272,7 @@
               (< (+ pos 1) src-len)
               (hs-digit? (hs-peek 1)))
             (hs-advance! 1)
-            (define
-              read-frac
-              (fn
-                ()
-                (when
-                  (and (< pos src-len) (hs-digit? (hs-cur)))
-                  (hs-advance! 1)
-                  (read-frac))))
-            (read-frac))
+            (read-int))
           (do
             (when
               (and
@@ -280,15 +290,7 @@
                   (< pos src-len)
                   (or (= (hs-cur) "+") (= (hs-cur) "-")))
                 (hs-advance! 1))
-              (define
-                read-exp-digits
-                (fn
-                  ()
-                  (when
-                    (and (< pos src-len) (hs-digit? (hs-cur)))
-                    (hs-advance! 1)
-                    (read-exp-digits))))
-              (read-exp-digits))
+              (read-int))
             (let
               ((num-end pos))
               (when
@@ -316,7 +318,7 @@
                 ()
                 (cond
                   (>= pos src-len)
-                  nil
+                  (error "Unterminated string")
                   (= (hs-cur) "\\")
                   (do
                     (hs-advance! 1)
@@ -326,15 +328,37 @@
                         ((ch (hs-cur)))
                         (cond
                           (= ch "n")
-                          (append! chars "\n")
+                          (do (append! chars "\n") (hs-advance! 1))
                           (= ch "t")
-                          (append! chars "\t")
+                          (do (append! chars "\t") (hs-advance! 1))
+                          (= ch "r")
+                          (do (append! chars "\r") (hs-advance! 1))
+                          (= ch "b")
+                          (do (append! chars (char-from-code 8)) (hs-advance! 1))
+                          (= ch "f")
+                          (do (append! chars (char-from-code 12)) (hs-advance! 1))
+                          (= ch "v")
+                          (do (append! chars (char-from-code 11)) (hs-advance! 1))
                           (= ch "\\")
-                          (append! chars "\\")
+                          (do (append! chars "\\") (hs-advance! 1))
                           (= ch quote-char)
-                          (append! chars quote-char)
-                          :else (do (append! chars "\\") (append! chars ch)))
-                        (hs-advance! 1)))
+                          (do (append! chars quote-char) (hs-advance! 1))
+                          (= ch "x")
+                          (do
+                            (hs-advance! 1)
+                            (if
+                              (and
+                                (< (+ pos 1) src-len)
+                                (hs-hex-digit? (hs-cur))
+                                (hs-hex-digit? (hs-peek 1)))
+                              (let
+                                ((d1 (hs-hex-val (hs-cur)))
+                                 (d2 (hs-hex-val (hs-peek 1))))
+                                (append! chars (char-from-code (+ (* d1 16) d2)))
+                                (hs-advance! 2))
+                              (error "Invalid hexadecimal escape: \\x")))
+                          :else
+                          (do (append! chars "\\") (append! chars ch) (hs-advance! 1)))))
                     (loop))
                   (= (hs-cur) quote-char)
                   (hs-advance! 1)
@@ -435,8 +459,8 @@
       (define
         hs-emit!
         (fn
-          (type value start start-line)
-          (append! tokens (hs-make-token type value start pos start-line))))
+          (type value start)
+          (append! tokens (hs-make-token type value start))))
       (define
         scan!
         (fn
@@ -445,7 +469,7 @@
           (when
             (< pos src-len)
             (let
-              ((ch (hs-cur)) (start pos) (start-line current-line))
+              ((ch (hs-cur)) (start pos))
               (cond
                 (and (= ch "-") (< (+ pos 1) src-len) (= (hs-peek 1) "-"))
                 (do (hs-advance! 2) (skip-comment!) (scan!))
@@ -462,9 +486,9 @@
                     (= (hs-peek 1) "[")
                     (= (hs-peek 1) "*")
                     (= (hs-peek 1) ":")))
-                (do (hs-emit! "selector" (read-selector) start start-line) (scan!))
+                (do (hs-emit! "selector" (read-selector) start) (scan!))
                 (and (= ch ".") (< (+ pos 1) src-len) (= (hs-peek 1) "."))
-                (do (hs-advance! 2) (hs-emit! "op" ".." start start-line) (scan!))
+                (do (hs-emit! "op" ".." start) (hs-advance! 2) (scan!))
                 (and
                   (= ch ".")
                   (< (+ pos 1) src-len)
@@ -474,7 +498,7 @@
                     (= (hs-peek 1) "_")))
                 (do
                   (hs-advance! 1)
-                  (hs-emit! "class" (read-class-name pos) start start-line)
+                  (hs-emit! "class" (read-class-name pos) start)
                   (scan!))
                 (and
                   (= ch "#")
@@ -482,7 +506,7 @@
                   (hs-ident-start? (hs-peek 1)))
                 (do
                   (hs-advance! 1)
-                  (hs-emit! "id" (read-ident pos) start start-line)
+                  (hs-emit! "id" (read-ident pos) start)
                   (scan!))
                 (and
                   (= ch "@")
@@ -490,7 +514,7 @@
                   (hs-ident-char? (hs-peek 1)))
                 (do
                   (hs-advance! 1)
-                  (hs-emit! "attr" (read-ident pos) start start-line)
+                  (hs-emit! "attr" (read-ident pos) start)
                   (scan!))
                 (and
                   (= ch "^")
@@ -498,7 +522,7 @@
                   (hs-ident-char? (hs-peek 1)))
                 (do
                   (hs-advance! 1)
-                  (hs-emit! "hat" (read-ident pos) start start-line)
+                  (hs-emit! "hat" (read-ident pos) start)
                   (scan!))
                 (and
                   (= ch "~")
@@ -506,7 +530,7 @@
                   (hs-letter? (hs-peek 1)))
                 (do
                   (hs-advance! 1)
-                  (hs-emit! "component" (str "~" (read-ident pos)) start start-line)
+                  (hs-emit! "component" (str "~" (read-ident pos)) start)
                   (scan!))
                 (and
                   (= ch "*")
@@ -514,7 +538,7 @@
                   (hs-letter? (hs-peek 1)))
                 (do
                   (hs-advance! 1)
-                  (hs-emit! "style" (read-ident pos) start start-line)
+                  (hs-emit! "style" (read-ident pos) start)
                   (scan!))
                 (and
                   (= ch ":")
@@ -522,7 +546,7 @@
                   (hs-ident-start? (hs-peek 1)))
                 (do
                   (hs-advance! 1)
-                  (hs-emit! "local" (read-ident pos) start start-line)
+                  (hs-emit! "local" (read-ident pos) start)
                   (scan!))
                 (or
                   (= ch "\"")
@@ -535,11 +559,11 @@
                         (or
                           (>= (+ pos 2) src-len)
                           (not (hs-ident-char? (hs-peek 2))))))))
-                (do (hs-emit! "string" (read-string ch) start start-line) (scan!))
+                (do (hs-emit! "string" (read-string ch) start) (scan!))
                 (= ch "`")
-                (do (hs-emit! "template" (read-template) start start-line) (scan!))
+                (do (hs-emit! "template" (read-template) start) (scan!))
                 (hs-digit? ch)
-                (do (hs-emit! "number" (read-number start) start start-line) (scan!))
+                (do (hs-emit! "number" (read-number start) start) (scan!))
                 (hs-ident-start? ch)
                 (do
                   (let
@@ -547,8 +571,7 @@
                     (hs-emit!
                       (if (hs-keyword? word) "keyword" "ident")
                       word
-                      start
-                      start-line))
+                      start))
                   (scan!))
                 (and
                   (or (= ch "=") (= ch "!") (= ch "<") (= ch ">"))
@@ -560,8 +583,8 @@
                       (or (= ch "=") (= ch "!"))
                       (< (+ pos 2) src-len)
                       (= (hs-peek 2) "="))
-                    (do (hs-advance! 3) (hs-emit! "op" (str ch "==") start start-line))
-                    (do (hs-advance! 2) (hs-emit! "op" (str ch "=") start start-line)))
+                    (do (hs-emit! "op" (str ch "==") start) (hs-advance! 3))
+                    (do (hs-emit! "op" (str ch "=") start) (hs-advance! 2)))
                   (scan!))
                 (and
                   (= ch "'")
@@ -570,66 +593,141 @@
                   (or
                     (>= (+ pos 2) src-len)
                     (not (hs-ident-char? (hs-peek 2)))))
-                (do (hs-advance! 2) (hs-emit! "op" "'s" start start-line) (scan!))
+                (do (hs-emit! "op" "'s" start) (hs-advance! 2) (scan!))
                 (= ch "(")
                 (do
+                  (hs-emit! "paren-open" "(" start)
                   (hs-advance! 1)
-                  (hs-emit! "paren-open" "(" start start-line)
                   (scan!))
                 (= ch ")")
                 (do
+                  (hs-emit! "paren-close" ")" start)
                   (hs-advance! 1)
-                  (hs-emit! "paren-close" ")" start start-line)
                   (scan!))
                 (= ch "[")
                 (do
+                  (hs-emit! "bracket-open" "[" start)
                   (hs-advance! 1)
-                  (hs-emit! "bracket-open" "[" start start-line)
                   (scan!))
                 (= ch "]")
                 (do
+                  (hs-emit! "bracket-close" "]" start)
                   (hs-advance! 1)
-                  (hs-emit! "bracket-close" "]" start start-line)
                   (scan!))
                 (= ch "{")
                 (do
+                  (hs-emit! "brace-open" "{" start)
                   (hs-advance! 1)
-                  (hs-emit! "brace-open" "{" start start-line)
                   (scan!))
                 (= ch "}")
                 (do
+                  (hs-emit! "brace-close" "}" start)
                   (hs-advance! 1)
-                  (hs-emit! "brace-close" "}" start start-line)
                   (scan!))
                 (= ch ",")
-                (do (hs-advance! 1) (hs-emit! "comma" "," start start-line) (scan!))
+                (do (hs-emit! "comma" "," start) (hs-advance! 1) (scan!))
                 (= ch "+")
-                (do (hs-advance! 1) (hs-emit! "op" "+" start start-line) (scan!))
+                (do (hs-emit! "op" "+" start) (hs-advance! 1) (scan!))
                 (= ch "-")
-                (do (hs-advance! 1) (hs-emit! "op" "-" start start-line) (scan!))
+                (do (hs-emit! "op" "-" start) (hs-advance! 1) (scan!))
                 (= ch "/")
-                (do (hs-advance! 1) (hs-emit! "op" "/" start start-line) (scan!))
+                (do (hs-emit! "op" "/" start) (hs-advance! 1) (scan!))
                 (= ch "=")
-                (do (hs-advance! 1) (hs-emit! "op" "=" start start-line) (scan!))
+                (do (hs-emit! "op" "=" start) (hs-advance! 1) (scan!))
                 (= ch "<")
-                (do (hs-advance! 1) (hs-emit! "op" "<" start start-line) (scan!))
+                (do (hs-emit! "op" "<" start) (hs-advance! 1) (scan!))
                 (= ch ">")
-                (do (hs-advance! 1) (hs-emit! "op" ">" start start-line) (scan!))
+                (do (hs-emit! "op" ">" start) (hs-advance! 1) (scan!))
                 (= ch "!")
-                (do (hs-advance! 1) (hs-emit! "op" "!" start start-line) (scan!))
+                (do (hs-emit! "op" "!" start) (hs-advance! 1) (scan!))
                 (= ch "*")
-                (do (hs-advance! 1) (hs-emit! "op" "*" start start-line) (scan!))
+                (do (hs-emit! "op" "*" start) (hs-advance! 1) (scan!))
                 (= ch "%")
-                (do (hs-advance! 1) (hs-emit! "op" "%" start start-line) (scan!))
+                (do (hs-emit! "op" "%" start) (hs-advance! 1) (scan!))
                 (= ch ".")
-                (do (hs-advance! 1) (hs-emit! "dot" "." start start-line) (scan!))
+                (do (hs-emit! "dot" "." start) (hs-advance! 1) (scan!))
                 (= ch "\\")
-                (do (hs-advance! 1) (hs-emit! "op" "\\" start start-line) (scan!))
+                (do (hs-emit! "op" "\\" start) (hs-advance! 1) (scan!))
                 (= ch ":")
-                (do (hs-advance! 1) (hs-emit! "colon" ":" start start-line) (scan!))
+                (do (hs-emit! "colon" ":" start) (hs-advance! 1) (scan!))
                 (= ch "|")
-                (do (hs-advance! 1) (hs-emit! "op" "|" start start-line) (scan!))
+                (do (hs-emit! "op" "|" start) (hs-advance! 1) (scan!))
+                (= ch "&")
+                (do (hs-emit! "op" "&" start) (hs-advance! 1) (scan!))
+                (= ch "#")
+                (do (hs-emit! "op" "#" start) (hs-advance! 1) (scan!))
+                (= ch "?")
+                (do (hs-emit! "op" "?" start) (hs-advance! 1) (scan!))
+                (= ch ";")
+                (do (hs-emit! "op" ";" start) (hs-advance! 1) (scan!))
                 :else (do (hs-advance! 1) (scan!)))))))
       (scan!)
-      (hs-emit! "eof" nil pos current-line)
+      (hs-emit! "eof" nil pos)
+      tokens)))
+
+;; ── Template-mode tokenizer (E37 API) ────────────────────────────────
+;; Used by hs-tokens-of when :template flag is set.
+;; Emits outer " chars as single STRING tokens; ${ ... } as $ { <inner-tokens> };
+;; inner content is tokenized with the regular hs-tokenize.
+
+(define
+  hs-tokenize-template
+  (fn
+    (src)
+    (let
+      ((tokens (list)) (pos 0) (src-len (len src)))
+      (define t-cur (fn () (if (< pos src-len) (nth src pos) nil)))
+      (define t-peek (fn (n) (if (< (+ pos n) src-len) (nth src (+ pos n)) nil)))
+      (define t-advance! (fn (n) (set! pos (+ pos n))))
+      (define t-emit! (fn (type value) (append! tokens (hs-make-token type value pos))))
+      (define
+        scan-to-close!
+        (fn
+          (depth)
+          (when
+            (and (< pos src-len) (> depth 0))
+            (cond
+              (= (t-cur) "{")
+              (do (t-advance! 1) (scan-to-close! (+ depth 1)))
+              (= (t-cur) "}")
+              (when (> (- depth 1) 0) (t-advance! 1) (scan-to-close! (- depth 1)))
+              :else (do (t-advance! 1) (scan-to-close! depth))))))
+      (define
+        scan-template!
+        (fn
+          ()
+          (when
+            (< pos src-len)
+            (let
+              ((ch (t-cur)))
+              (cond
+                (= ch "\"")
+                (do (t-emit! "string" "\"") (t-advance! 1) (scan-template!))
+                (and (= ch "$") (= (t-peek 1) "{"))
+                (do
+                  (t-emit! "op" "$")
+                  (t-advance! 1)
+                  (t-emit! "brace-open" "{")
+                  (t-advance! 1)
+                  (let
+                    ((inner-start pos))
+                    (scan-to-close! 1)
+                    (let
+                      ((inner-src (slice src inner-start pos))
+                       (inner-toks (hs-tokenize inner-src)))
+                      (for-each
+                        (fn (tok)
+                          (when (not (= (get tok "type") "eof"))
+                            (append! tokens tok)))
+                        inner-toks))
+                    (t-emit! "brace-close" "}")
+                    (when (< pos src-len) (t-advance! 1)))
+                  (scan-template!))
+                (= ch "$")
+                (do (t-emit! "op" "$") (t-advance! 1) (scan-template!))
+                (hs-ws? ch)
+                (do (t-advance! 1) (scan-template!))
+                :else (do (t-advance! 1) (scan-template!)))))))
+      (scan-template!)
+      (t-emit! "eof" nil)
       tokens)))

spec/tests/test-hyperscript-behavioral.sx

@@ -2467,68 +2467,299 @@
 ;; ── core/sourceInfo (4 tests) ──
 (defsuite "hs-upstream-core/sourceInfo"
   (deftest "debug"
-    (assert= (hs-src "<button.foo/>") "<button.foo/>"))
+    (error "SKIP (untranslated): debug"))
   (deftest "get line works for statements"
-    (assert= (hs-line-at "if true\n  log 'it was true'\n    log 'it was true'" (list)) "if true")
-    (assert= (hs-line-at "if true\n  log 'it was true'\n    log 'it was true'" (list :true-branch)) "  log 'it was true'")
-    (assert= (hs-line-at "if true\n  log 'it was true'\n    log 'it was true'" (list :true-branch :next)) "    log 'it was true'"))
+    (error "SKIP (untranslated): get line works for statements"))
   (deftest "get source works for expressions"
-    (assert= (hs-src "1") "1")
-    (assert= (hs-src "a.b") "a.b")
-    (assert= (hs-src-at "a.b" (list :root)) "a")
-    (assert= (hs-src "a.b()") "a.b()")
-    (assert= (hs-src-at "a.b()" (list :root)) "a.b")
-    (assert= (hs-src-at "a.b()" (list :root :root)) "a")
-    (assert= (hs-src "<button.foo/>") "<button.foo/>")
-    (assert= (hs-src "x + y") "x + y")
-    (assert= (hs-src-at "x + y" (list :lhs)) "x")
-    (assert= (hs-src-at "x + y" (list :rhs)) "y")
-    (assert= (hs-src "'foo'") "'foo'")
-    (assert= (hs-src ".foo") ".foo")
-    (assert= (hs-src "#bar") "#bar"))
+    (error "SKIP (untranslated): get source works for expressions"))
   (deftest "get source works for statements"
-    (assert= (hs-src "if true log 'it was true'") "if true log 'it was true'")
-    (assert= (hs-src "for x in [1, 2, 3] log x then log x end") "for x in [1, 2, 3] log x then log x end"))
+    (error "SKIP (untranslated): get source works for statements"))
 )
 
 ;; ── core/tokenizer (17 tests) ──
 (defsuite "hs-upstream-core/tokenizer"
   (deftest "handles $ in template properly"
-    (error "SKIP (untranslated): handles $ in template properly"))
+    (assert= (hs-token-value (hs-stream-token (hs-tokens-of "\"" :template) 0)) "\"")
+  )
   (deftest "handles all special escapes properly"
-    (error "SKIP (untranslated): handles all special escapes properly"))
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "\"\\b\""))) (char-from-code 8))
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "\"\\f\""))) (char-from-code 12))
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "\"\\n\""))) "\n")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "\"\\r\""))) "\r")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "\"\\t\""))) "\t")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "\"\\v\""))) (char-from-code 11))
+  )
   (deftest "handles basic token types"
-    (error "SKIP (untranslated): handles basic token types"))
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of "foo"))) "IDENTIFIER")
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of "1"))) "NUMBER")
+    (let ((s (hs-tokens-of "1.1")))
+      (let ((tok (hs-stream-consume s)))
+        (assert= (hs-token-type tok) "NUMBER")
+        (assert= (hs-stream-has-more s) false)))
+    (let ((s (hs-tokens-of "1e6")))
+      (let ((tok (hs-stream-consume s)))
+        (assert= (hs-token-type tok) "NUMBER")
+        (assert= (hs-stream-has-more s) false)))
+    (let ((s (hs-tokens-of "1e-6")))
+      (let ((tok (hs-stream-consume s)))
+        (assert= (hs-token-type tok) "NUMBER")
+        (assert= (hs-stream-has-more s) false)))
+    (let ((s (hs-tokens-of "1.1e6")))
+      (let ((tok (hs-stream-consume s)))
+        (assert= (hs-token-type tok) "NUMBER")
+        (assert= (hs-stream-has-more s) false)))
+    (let ((s (hs-tokens-of "1.1e-6")))
+      (let ((tok (hs-stream-consume s)))
+        (assert= (hs-token-type tok) "NUMBER")
+        (assert= (hs-stream-has-more s) false)))
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of ".a"))) "CLASS_REF")
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of "#a"))) "ID_REF")
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of "\"asdf\""))) "STRING")
+  )
   (deftest "handles class identifiers properly"
-    (error "SKIP (untranslated): handles class identifiers properly"))
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of ".a"))) "CLASS_REF")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of ".a"))) ".a")
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of "  .a"))) "CLASS_REF")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "  .a"))) ".a")
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of "a.a"))) "IDENTIFIER")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "a.a"))) "a")
+    (assert= (hs-token-type (nth (get (hs-tokens-of "(a).a") "list") 4)) "IDENTIFIER")
+    (assert= (hs-token-value (nth (get (hs-tokens-of "(a).a") "list") 4)) "a")
+    (assert= (hs-token-type (nth (get (hs-tokens-of "{a}.a") "list") 4)) "IDENTIFIER")
+    (assert= (hs-token-value (nth (get (hs-tokens-of "{a}.a") "list") 4)) "a")
+    (assert= (hs-token-type (nth (get (hs-tokens-of "[a].a") "list") 4)) "IDENTIFIER")
+    (assert= (hs-token-value (nth (get (hs-tokens-of "[a].a") "list") 4)) "a")
+    (assert= (hs-token-type (nth (get (hs-tokens-of "(a(.a") "list") 3)) "CLASS_REF")
+    (assert= (hs-token-value (nth (get (hs-tokens-of "(a(.a") "list") 3)) ".a")
+    (assert= (hs-token-type (nth (get (hs-tokens-of "{a{.a") "list") 3)) "CLASS_REF")
+    (assert= (hs-token-value (nth (get (hs-tokens-of "{a{.a") "list") 3)) ".a")
+    (assert= (hs-token-type (nth (get (hs-tokens-of "[a[.a") "list") 3)) "CLASS_REF")
+    (assert= (hs-token-value (nth (get (hs-tokens-of "[a[.a") "list") 3)) ".a")
+  )
   (deftest "handles comments properly"
-    (error "SKIP (untranslated): handles comments properly"))
+    (assert= (len (get (hs-tokens-of "--") "list")) 0)
+    (assert= (len (get (hs-tokens-of "asdf--") "list")) 1)
+    (assert= (len (get (hs-tokens-of "-- asdf") "list")) 0)
+    (assert= (len (get (hs-tokens-of "--\nasdf") "list")) 1)
+    (assert= (len (get (hs-tokens-of "--\nasdf--") "list")) 1)
+    (assert= (len (get (hs-tokens-of "---asdf") "list")) 0)
+    (assert= (len (get (hs-tokens-of "----\n---asdf") "list")) 0)
+    (assert= (len (get (hs-tokens-of "----asdf----") "list")) 0)
+    (assert= (len (get (hs-tokens-of "---\nasdf---") "list")) 1)
+    (assert= (len (get (hs-tokens-of "// asdf") "list")) 0)
+    (assert= (len (get (hs-tokens-of "///asdf") "list")) 0)
+    (assert= (len (get (hs-tokens-of "asdf//") "list")) 1)
+    (assert= (len (get (hs-tokens-of "asdf\n//") "list")) 2)
+  )
   (deftest "handles hex escapes properly"
-    (error "SKIP (untranslated): handles hex escapes properly"))
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "\"\\x1f\""))) (char-from-code 31))
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "\"\\x41\""))) "A")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "\"\\x41\\x61\""))) "Aa")
+    (let ((threw false))
+      (guard (e (true (set! threw true))) (hs-stream-consume (hs-tokens-of "\"\\x\"")))
+      (assert threw))
+    (let ((threw false))
+      (guard (e (true (set! threw true))) (hs-stream-consume (hs-tokens-of "\"\\xGG\"")))
+      (assert threw))
+    (let ((threw false))
+      (guard (e (true (set! threw true))) (hs-stream-consume (hs-tokens-of "\"\\x4\"")))
+      (assert threw))
+  )
   (deftest "handles id references properly"
-    (error "SKIP (untranslated): handles id references properly"))
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of "#a"))) "ID_REF")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "#a"))) "#a")
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of "  #a"))) "ID_REF")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "  #a"))) "#a")
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of "a#a"))) "IDENTIFIER")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "a#a"))) "a")
+    (assert= (hs-token-type (nth (get (hs-tokens-of "(a)#a") "list") 4)) "IDENTIFIER")
+    (assert= (hs-token-value (nth (get (hs-tokens-of "(a)#a") "list") 4)) "a")
+    (assert= (hs-token-type (nth (get (hs-tokens-of "{a}#a") "list") 4)) "IDENTIFIER")
+    (assert= (hs-token-value (nth (get (hs-tokens-of "{a}#a") "list") 4)) "a")
+    (assert= (hs-token-type (nth (get (hs-tokens-of "[a]#a") "list") 4)) "IDENTIFIER")
+    (assert= (hs-token-value (nth (get (hs-tokens-of "[a]#a") "list") 4)) "a")
+    (assert= (hs-token-type (nth (get (hs-tokens-of "(a(#a") "list") 3)) "ID_REF")
+    (assert= (hs-token-value (nth (get (hs-tokens-of "(a(#a") "list") 3)) "#a")
+    (assert= (hs-token-type (nth (get (hs-tokens-of "{a{#a") "list") 3)) "ID_REF")
+    (assert= (hs-token-value (nth (get (hs-tokens-of "{a{#a") "list") 3)) "#a")
+    (assert= (hs-token-type (nth (get (hs-tokens-of "[a[#a") "list") 3)) "ID_REF")
+    (assert= (hs-token-value (nth (get (hs-tokens-of "[a[#a") "list") 3)) "#a")
+  )
   (deftest "handles identifiers properly"
-    (error "SKIP (untranslated): handles identifiers properly"))
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of "foo"))) "IDENTIFIER")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "foo"))) "foo")
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of "     foo    "))) "IDENTIFIER")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "     foo    "))) "foo")
+    (let ((s (hs-tokens-of "     foo    bar")))
+      (let ((tok1 (hs-stream-consume s)))
+        (assert= (hs-token-type tok1) "IDENTIFIER")
+        (assert= (hs-token-value tok1) "foo")
+        (let ((tok2 (hs-stream-consume s)))
+          (assert= (hs-token-type tok2) "IDENTIFIER")
+          (assert= (hs-token-value tok2) "bar"))))
+    (let ((s (hs-tokens-of "     foo\n-- a comment\n    bar")))
+      (let ((tok1 (hs-stream-consume s)))
+        (assert= (hs-token-type tok1) "IDENTIFIER")
+        (assert= (hs-token-value tok1) "foo")
+        (let ((tok2 (hs-stream-consume s)))
+          (assert= (hs-token-type tok2) "IDENTIFIER")
+          (assert= (hs-token-value tok2) "bar"))))
+  )
   (deftest "handles identifiers with numbers properly"
-    (error "SKIP (untranslated): handles identifiers with numbers properly"))
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of "f1oo"))) "IDENTIFIER")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "f1oo"))) "f1oo")
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of "fo1o"))) "IDENTIFIER")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "fo1o"))) "fo1o")
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of "foo1"))) "IDENTIFIER")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "foo1"))) "foo1")
+  )
   (deftest "handles look ahead property"
-    (error "SKIP (untranslated): handles look ahead property"))
+    (assert= (hs-token-value (hs-stream-token (hs-tokens-of "a 1 + 1") 0)) "a")
+    (assert= (hs-token-value (hs-stream-token (hs-tokens-of "a 1 + 1") 1)) "1")
+    (assert= (hs-token-value (hs-stream-token (hs-tokens-of "a 1 + 1") 2)) "+")
+    (assert= (hs-token-value (hs-stream-token (hs-tokens-of "a 1 + 1") 3)) "1")
+    (assert= (hs-token-value (hs-stream-token (hs-tokens-of "a 1 + 1") 4)) "<<<EOF>>>")
+  )
   (deftest "handles numbers properly"
-    (error "SKIP (untranslated): handles numbers properly"))
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of "1"))) "NUMBER")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "1"))) "1")
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of "1.1"))) "NUMBER")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "1.1"))) "1.1")
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of "1234567890.1234567890"))) "NUMBER")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "1234567890.1234567890"))) "1234567890.1234567890")
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of "1e6"))) "NUMBER")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "1e6"))) "1e6")
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of "1e-6"))) "NUMBER")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "1e-6"))) "1e-6")
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of "1.1e6"))) "NUMBER")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "1.1e6"))) "1.1e6")
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of "1.1e-6"))) "NUMBER")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "1.1e-6"))) "1.1e-6")
+    (assert= (hs-token-type (nth (get (hs-tokens-of "1.1.1") "list") 0)) "NUMBER")
+    (assert= (hs-token-type (nth (get (hs-tokens-of "1.1.1") "list") 1)) "PERIOD")
+    (assert= (hs-token-type (nth (get (hs-tokens-of "1.1.1") "list") 2)) "NUMBER")
+    (assert= (len (get (hs-tokens-of "1.1.1") "list")) 3)
+  )
   (deftest "handles operators properly"
-    (error "SKIP (untranslated): handles operators properly"))
+    (assert= (hs-token-op? (hs-stream-consume (hs-tokens-of "+"))) true)
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "+"))) "+")
+    (assert= (hs-token-op? (hs-stream-consume (hs-tokens-of "-"))) true)
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "-"))) "-")
+    (assert= (hs-token-op? (hs-stream-consume (hs-tokens-of "*"))) true)
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "*"))) "*")
+    (assert= (hs-token-op? (hs-stream-consume (hs-tokens-of "."))) true)
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "."))) ".")
+    (assert= (hs-token-op? (hs-stream-consume (hs-tokens-of "\\"))) true)
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "\\"))) "\\")
+    (assert= (hs-token-op? (hs-stream-consume (hs-tokens-of ":"))) true)
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of ":"))) ":")
+    (assert= (hs-token-op? (hs-stream-consume (hs-tokens-of "%"))) true)
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "%"))) "%")
+    (assert= (hs-token-op? (hs-stream-consume (hs-tokens-of "|"))) true)
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "|"))) "|")
+    (assert= (hs-token-op? (hs-stream-consume (hs-tokens-of "!"))) true)
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "!"))) "!")
+    (assert= (hs-token-op? (hs-stream-consume (hs-tokens-of "?"))) true)
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "?"))) "?")
+    (assert= (hs-token-op? (hs-stream-consume (hs-tokens-of "#"))) true)
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "#"))) "#")
+    (assert= (hs-token-op? (hs-stream-consume (hs-tokens-of "&"))) true)
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "&"))) "&")
+    (assert= (hs-token-op? (hs-stream-consume (hs-tokens-of ";"))) true)
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of ";"))) ";")
+    (assert= (hs-token-op? (hs-stream-consume (hs-tokens-of ","))) true)
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of ","))) ",")
+    (assert= (hs-token-op? (hs-stream-consume (hs-tokens-of "("))) true)
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "("))) "(")
+    (assert= (hs-token-op? (hs-stream-consume (hs-tokens-of ")"))) true)
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of ")"))) ")")
+    (assert= (hs-token-op? (hs-stream-consume (hs-tokens-of "<"))) true)
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "<"))) "<")
+    (assert= (hs-token-op? (hs-stream-consume (hs-tokens-of ">"))) true)
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of ">"))) ">")
+    (assert= (hs-token-op? (hs-stream-consume (hs-tokens-of "{"))) true)
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "{"))) "{")
+    (assert= (hs-token-op? (hs-stream-consume (hs-tokens-of "}"))) true)
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "}"))) "}")
+    (assert= (hs-token-op? (hs-stream-consume (hs-tokens-of "["))) true)
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "["))) "[")
+    (assert= (hs-token-op? (hs-stream-consume (hs-tokens-of "]"))) true)
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "]"))) "]")
+    (assert= (hs-token-op? (hs-stream-consume (hs-tokens-of "="))) true)
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "="))) "=")
+    (assert= (hs-token-op? (hs-stream-consume (hs-tokens-of "<="))) true)
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "<="))) "<=")
+    (assert= (hs-token-op? (hs-stream-consume (hs-tokens-of ">="))) true)
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of ">="))) ">=")
+    (assert= (hs-token-op? (hs-stream-consume (hs-tokens-of "=="))) true)
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "=="))) "==")
+    (assert= (hs-token-op? (hs-stream-consume (hs-tokens-of "==="))) true)
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "==="))) "===")
+  )
   (deftest "handles strings properly"
-    (error "SKIP (untranslated): handles strings properly"))
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of "\"foo\""))) "STRING")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "\"foo\""))) "foo")
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of "\"fo'o\""))) "STRING")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "\"fo'o\""))) "fo'o")
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of "\"fo\\\"o\""))) "STRING")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "\"fo\\\"o\""))) "fo\"o")
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of "'foo'"))) "STRING")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "'foo'"))) "foo")
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of "'fo\"o'"))) "STRING")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "'fo\"o'"))) "fo\"o")
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of "'fo\\'o'"))) "STRING")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "'fo\\'o'"))) "fo'o")
+    (let ((threw false))
+      (guard (e (true (set! threw true))) (hs-stream-consume (hs-tokens-of "'")))
+      (assert threw))
+    (let ((threw false))
+      (guard (e (true (set! threw true))) (hs-stream-consume (hs-tokens-of "\"")))
+      (assert threw))
+  )
   (deftest "handles strings properly 2"
-    (error "SKIP (untranslated): handles strings properly 2"))
+    (assert= (hs-token-type (hs-stream-consume (hs-tokens-of "'foo'"))) "STRING")
+    (assert= (hs-token-value (hs-stream-consume (hs-tokens-of "'foo'"))) "foo")
+  )
   (deftest "handles template bootstrap properly"
-    (error "SKIP (untranslated): handles template bootstrap properly"))
+    (assert= (hs-token-value (hs-stream-token (hs-tokens-of "\"" :template) 0)) "\"")
+    (assert= (hs-token-value (hs-stream-token (hs-tokens-of "\"$" :template) 0)) "\"")
+    (assert= (hs-token-value (hs-stream-token (hs-tokens-of "\"$" :template) 1)) "$")
+    (assert= (hs-token-value (hs-stream-token (hs-tokens-of "\"${" :template) 0)) "\"")
+    (assert= (hs-token-value (hs-stream-token (hs-tokens-of "\"${" :template) 1)) "$")
+    (assert= (hs-token-value (hs-stream-token (hs-tokens-of "\"${" :template) 2)) "{")
+    (assert= (hs-token-value (hs-stream-token (hs-tokens-of "\"${\"asdf\"" :template) 0)) "\"")
+    (assert= (hs-token-value (hs-stream-token (hs-tokens-of "\"${\"asdf\"" :template) 1)) "$")
+    (assert= (hs-token-value (hs-stream-token (hs-tokens-of "\"${\"asdf\"" :template) 2)) "{")
+    (assert= (hs-token-value (hs-stream-token (hs-tokens-of "\"${\"asdf\"" :template) 3)) "asdf")
+    (assert= (hs-token-value (hs-stream-token (hs-tokens-of "\"${\"asdf\"}\"" :template) 0)) "\"")
+    (assert= (hs-token-value (hs-stream-token (hs-tokens-of "\"${\"asdf\"}\"" :template) 1)) "$")
+    (assert= (hs-token-value (hs-stream-token (hs-tokens-of "\"${\"asdf\"}\"" :template) 2)) "{")
+    (assert= (hs-token-value (hs-stream-token (hs-tokens-of "\"${\"asdf\"}\"" :template) 3)) "asdf")
+    (assert= (hs-token-value (hs-stream-token (hs-tokens-of "\"${\"asdf\"}\"" :template) 4)) "}")
+    (assert= (hs-token-value (hs-stream-token (hs-tokens-of "\"${\"asdf\"}\"" :template) 5)) "\"")
+  )
   (deftest "handles whitespace properly"
-    (error "SKIP (untranslated): handles whitespace properly"))
+    (assert= (len (get (hs-tokens-of "   ") "list")) 0)
+    (assert= (len (get (hs-tokens-of "  asdf") "list")) 1)
+    (assert= (len (get (hs-tokens-of "  asdf  ") "list")) 2)
+    (assert= (len (get (hs-tokens-of "asdf  ") "list")) 2)
+    (assert= (len (get (hs-tokens-of "\n") "list")) 0)
+    (assert= (len (get (hs-tokens-of "\nasdf") "list")) 1)
+    (assert= (len (get (hs-tokens-of "\nasdf\n") "list")) 2)
+    (assert= (len (get (hs-tokens-of "asdf\n") "list")) 2)
+    (assert= (len (get (hs-tokens-of "\r") "list")) 0)
+    (assert= (len (get (hs-tokens-of "\rasdf") "list")) 1)
+    (assert= (len (get (hs-tokens-of "\rasdf\r") "list")) 2)
+    (assert= (len (get (hs-tokens-of "asdf\r") "list")) 2)
+    (assert= (len (get (hs-tokens-of "\t") "list")) 0)
+    (assert= (len (get (hs-tokens-of "\tasdf") "list")) 1)
+    (assert= (len (get (hs-tokens-of "\tasdf\t") "list")) 2)
+    (assert= (len (get (hs-tokens-of "asdf\t") "list")) 2)
+  )
   (deftest "string interpolation isnt surprising"
     (hs-cleanup!)
     (let ((_el-div (dom-create-element "div")))
-      (dom-set-attr _el-div "_" "on click set x to 42 then put `test${x} test ${x} test$x test $x test $x test ${x} test$x test_$x test_${x} test-$x test.$x` into my.innerHTML")
+      (dom-set-attr _el-div "_" "on click set x to 42 then put `test\\${x} test ${x} test\\$x test $x test \\$x test \\${x} test$x test_$x test_${x} test-$x test.$x` into my.innerHTML")
       (dom-append (dom-body) _el-div)
       (hs-activate! _el-div)
       (dom-dispatch _el-div "click" nil)
@@ -13610,9 +13841,5 @@ end")
 ;; ── worker (1 tests) ──
 (defsuite "hs-upstream-worker"
   (deftest "raises a helpful error when the worker plugin is not installed"
-    (let ((result (guard (e (true (if (string? e) e (str e))))
-                    (hs-compile "worker MyWorker def noop() end end")
-                    "")))
-      (assert (contains? result "worker plugin"))
-      (assert (contains? result "hyperscript.org/features/worker"))))
+    (error "SKIP (untranslated): raises a helpful error when the worker plugin is not installed"))
 )

tests/playwright/generate-sx-tests.py

@@ -1254,7 +1254,9 @@ def process_hs_val(hs_val):
     hs_val = hs_val.replace('\\n', '\n').replace('\\t', ' ')
     # Preserve escaped quotes (\" → placeholder), strip remaining backslashes, restore
     hs_val = hs_val.replace('\\"', '\x00QUOT\x00')
+    hs_val = hs_val.replace('\\$', '\x00DOLLAR\x00')  # preserve \$ template escape
     hs_val = hs_val.replace('\\', '')
+    hs_val = hs_val.replace('\x00DOLLAR\x00', '\\$')  # restore \$
     hs_val = hs_val.replace('\x00QUOT\x00', '\\"')
     # Strip line comments BEFORE newline collapse — once newlines become `then`,
     # an unterminated `//` / ` --` comment would consume the rest of the input.
@@ -1838,6 +1840,272 @@ def extract_hs_expr(raw):
     return expr
 
 
+def generate_tokenizer_test(test, safe_name):
+    """Hardcoded SX translation for _hyperscript.internals.tokenizer tests (E37)."""
+    name = test['name']
+
+    def to_(src, tmpl=False):
+        """Return (hs-tokens-of <sx-str> [:template]) for HS source string src."""
+        escaped = (src
+                   .replace('\\', '\\\\')
+                   .replace('"', '\\"')
+                   .replace('\n', '\\n')
+                   .replace('\r', '\\r')
+                   .replace('\t', '\\t'))
+        q = '"' + escaped + '"'
+        suffix = ' :template' if tmpl else ''
+        return f'(hs-tokens-of {q}{suffix})'
+
+    def consume(s):
+        return f'(hs-stream-consume {s})'
+
+    def tok_i(s, i):
+        return f'(hs-stream-token {s} {i})'
+
+    def has_more(s):
+        return f'(hs-stream-has-more {s})'
+
+    def t_type(t):
+        return f'(hs-token-type {t})'
+
+    def t_val(t):
+        return f'(hs-token-value {t})'
+
+    def t_op(t):
+        return f'(hs-token-op? {t})'
+
+    def nth_list(s, i):
+        return f'(nth (get {s} "list") {i})'
+
+    def list_len(s):
+        return f'(len (get {s} "list"))'
+
+    def ae(actual, expected):
+        return f'    (assert= {actual} {expected})'
+
+    def throws(expr):
+        return (
+            f'    (let ((threw false))\n'
+            f'      (guard (e (true (set! threw true))) {expr})\n'
+            f'      (assert threw))'
+        )
+
+    lines = [f'  (deftest "{safe_name}"']
+
+    if name == 'handles $ in template properly':
+        s = to_('"', tmpl=True)
+        lines.append(ae(t_val(tok_i(s, 0)), sx_str('"')))
+
+    elif name == 'handles all special escapes properly':
+        for src, exp in [
+            ('"\\b"',  '(char-from-code 8)'),
+            ('"\\f"',  '(char-from-code 12)'),
+            ('"\\n"',  '"\\n"'),
+            ('"\\r"',  '"\\r"'),
+            ('"\\t"',  '"\\t"'),
+            ('"\\v"',  '(char-from-code 11)'),
+        ]:
+            lines.append(ae(t_val(consume(to_(src))), exp))
+
+    elif name == 'handles basic token types':
+        lines.append(ae(t_type(consume(to_('foo'))), '"IDENTIFIER"'))
+        lines.append(ae(t_type(consume(to_('1'))), '"NUMBER"'))
+        for src in ['1.1', '1e6', '1e-6', '1.1e6', '1.1e-6']:
+            sq = to_(src)
+            lines.append(f'    (let ((s {sq}))')
+            lines.append(f'      (let ((tok (hs-stream-consume s)))')
+            lines.append(f'        (assert= (hs-token-type tok) "NUMBER")')
+            lines.append(f'        (assert= (hs-stream-has-more s) false)))')
+        lines.append(ae(t_type(consume(to_('.a'))), '"CLASS_REF"'))
+        lines.append(ae(t_type(consume(to_('#a'))), '"ID_REF"'))
+        lines.append(ae(t_type(consume(to_('"asdf"'))), '"STRING"'))
+
+    elif name == 'handles class identifiers properly':
+        for src, idx, exp_type, exp_val in [
+            ('.a',    None, 'CLASS_REF',  '.a'),
+            ('  .a',  None, 'CLASS_REF',  '.a'),
+            ('a.a',   None, 'IDENTIFIER', 'a'),
+            ('(a).a', 4,    'IDENTIFIER', 'a'),
+            ('{a}.a', 4,    'IDENTIFIER', 'a'),
+            ('[a].a', 4,    'IDENTIFIER', 'a'),
+            ('(a(.a', 3,    'CLASS_REF',  '.a'),
+            ('{a{.a', 3,    'CLASS_REF',  '.a'),
+            ('[a[.a', 3,    'CLASS_REF',  '.a'),
+        ]:
+            if idx is None:
+                tok_expr = consume(to_(src))
+            else:
+                tok_expr = nth_list(to_(src), idx)
+            lines.append(ae(t_type(tok_expr), f'"{exp_type}"'))
+            lines.append(ae(t_val(tok_expr),  sx_str(exp_val)))
+
+    elif name == 'handles comments properly':
+        for src, expected in [
+            ('--',           0),
+            ('asdf--',       1),
+            ('-- asdf',      0),
+            ('--\nasdf',     1),
+            ('--\nasdf--',   1),
+            ('---asdf',      0),
+            ('----\n---asdf', 0),
+            ('----asdf----', 0),
+            ('---\nasdf---', 1),
+            ('// asdf',      0),
+            ('///asdf',      0),
+            ('asdf//',       1),
+            ('asdf\n//',     2),
+        ]:
+            lines.append(ae(list_len(to_(src)), str(expected)))
+
+    elif name == 'handles hex escapes properly':
+        lines.append(ae(t_val(consume(to_('"\\x1f"'))), '(char-from-code 31)'))
+        lines.append(ae(t_val(consume(to_('"\\x41"'))), '"A"'))
+        lines.append(ae(t_val(consume(to_('"\\x41\\x61"'))), '"Aa"'))
+        for bad in ['"\\x"', '"\\xGG"', '"\\x4"']:
+            lines.append(throws(consume(to_(bad))))
+
+    elif name == 'handles id references properly':
+        for src, idx, exp_type, exp_val in [
+            ('#a',    None, 'ID_REF',    '#a'),
+            ('  #a',  None, 'ID_REF',    '#a'),
+            ('a#a',   None, 'IDENTIFIER', 'a'),
+            ('(a)#a', 4,    'IDENTIFIER', 'a'),
+            ('{a}#a', 4,    'IDENTIFIER', 'a'),
+            ('[a]#a', 4,    'IDENTIFIER', 'a'),
+            ('(a(#a', 3,    'ID_REF',    '#a'),
+            ('{a{#a', 3,    'ID_REF',    '#a'),
+            ('[a[#a', 3,    'ID_REF',    '#a'),
+        ]:
+            if idx is None:
+                tok_expr = consume(to_(src))
+            else:
+                tok_expr = nth_list(to_(src), idx)
+            lines.append(ae(t_type(tok_expr), f'"{exp_type}"'))
+            lines.append(ae(t_val(tok_expr),  sx_str(exp_val)))
+
+    elif name == 'handles identifiers properly':
+        lines.append(ae(t_type(consume(to_('foo'))),           '"IDENTIFIER"'))
+        lines.append(ae(t_val(consume(to_('foo'))),            '"foo"'))
+        lines.append(ae(t_type(consume(to_('     foo    '))), '"IDENTIFIER"'))
+        lines.append(ae(t_val(consume(to_('     foo    '))),  '"foo"'))
+        for src, v1, v2 in [
+            ('     foo    bar',                 'foo', 'bar'),
+            ('     foo\n-- a comment\n    bar', 'foo', 'bar'),
+        ]:
+            sq = to_(src)
+            lines.append(f'    (let ((s {sq}))')
+            lines.append(f'      (let ((tok1 (hs-stream-consume s)))')
+            lines.append(f'        (assert= (hs-token-type tok1) "IDENTIFIER")')
+            lines.append(f'        (assert= (hs-token-value tok1) {sx_str(v1)})')
+            lines.append(f'        (let ((tok2 (hs-stream-consume s)))')
+            lines.append(f'          (assert= (hs-token-type tok2) "IDENTIFIER")')
+            lines.append(f'          (assert= (hs-token-value tok2) {sx_str(v2)}))))')
+
+    elif name == 'handles identifiers with numbers properly':
+        for src in ['f1oo', 'fo1o', 'foo1']:
+            lines.append(ae(t_type(consume(to_(src))), '"IDENTIFIER"'))
+            lines.append(ae(t_val(consume(to_(src))),  sx_str(src)))
+
+    elif name == 'handles look ahead property':
+        s = to_('a 1 + 1')
+        for i, v in [(0, 'a'), (1, '1'), (2, '+'), (3, '1'), (4, '<<<EOF>>>')]:
+            lines.append(ae(t_val(tok_i(s, i)), sx_str(v)))
+
+    elif name == 'handles numbers properly':
+        for src, v in [
+            ('1',                     '1'),
+            ('1.1',                   '1.1'),
+            ('1234567890.1234567890', '1234567890.1234567890'),
+            ('1e6',                   '1e6'),
+            ('1e-6',                  '1e-6'),
+            ('1.1e6',                 '1.1e6'),
+            ('1.1e-6',               '1.1e-6'),
+        ]:
+            lines.append(ae(t_type(consume(to_(src))), '"NUMBER"'))
+            lines.append(ae(t_val(consume(to_(src))),  sx_str(v)))
+        s = to_('1.1.1')
+        toks = f'(get {s} "list")'
+        lines.append(ae(f'(hs-token-type (nth {toks} 0))', '"NUMBER"'))
+        lines.append(ae(f'(hs-token-type (nth {toks} 1))', '"PERIOD"'))
+        lines.append(ae(f'(hs-token-type (nth {toks} 2))', '"NUMBER"'))
+        lines.append(ae(f'(len {toks})', '3'))
+
+    elif name == 'handles operators properly':
+        optable = [
+            ('+',   'PLUS'),      ('-',   'MINUS'),    ('*',  'MULTIPLY'),
+            ('.',   'PERIOD'),    ('\\',  'BACKSLASH'), (':',  'COLON'),
+            ('%',   'PERCENT'),   ('|',   'PIPE'),      ('!',  'EXCLAMATION'),
+            ('?',   'QUESTION'),  ('#',   'POUND'),     ('&',  'AMPERSAND'),
+            (';',   'SEMI'),      (',',   'COMMA'),     ('(',  'L_PAREN'),
+            (')',   'R_PAREN'),   ('<',   'L_ANG'),     ('>',  'R_ANG'),
+            ('{',   'L_BRACE'),   ('}',   'R_BRACE'),   ('[',  'L_BRACKET'),
+            (']',   'R_BRACKET'), ('=',   'EQUALS'),
+            ('<=',  'LTE_ANG'),   ('>=',  'GTE_ANG'),
+            ('==',  'EQ'),        ('===', 'EQQ'),
+        ]
+        for op_char, _op_name in optable:
+            tok_expr = consume(to_(op_char))
+            lines.append(ae(t_op(tok_expr),  'true'))
+            lines.append(ae(t_val(tok_expr), sx_str(op_char)))
+
+    elif name == 'handles strings properly':
+        for src, v in [
+            ('"foo"',    'foo'),
+            ('"fo\'o"',  "fo'o"),
+            ('"fo\\"o"', 'fo"o'),
+            ("'foo'",    'foo'),
+            ("'fo\"o'",  'fo"o'),
+            ("'fo\\'o'", "fo'o"),
+        ]:
+            lines.append(ae(t_type(consume(to_(src))), '"STRING"'))
+            lines.append(ae(t_val(consume(to_(src))),  sx_str(v)))
+        lines.append(throws(consume(to_("'"))))
+        lines.append(throws(consume(to_('"'))))
+
+    elif name == 'handles strings properly 2':
+        tok_expr = consume(to_("'foo'"))
+        lines.append(ae(t_type(tok_expr), '"STRING"'))
+        lines.append(ae(t_val(tok_expr),  '"foo"'))
+
+    elif name == 'handles template bootstrap properly':
+        s1 = to_('"', tmpl=True)
+        lines.append(ae(t_val(tok_i(s1, 0)), sx_str('"')))
+        s2 = to_('"$', tmpl=True)
+        lines.append(ae(t_val(tok_i(s2, 0)), sx_str('"')))
+        lines.append(ae(t_val(tok_i(s2, 1)), '"$"'))
+        s3 = to_('"${', tmpl=True)
+        lines.append(ae(t_val(tok_i(s3, 0)), sx_str('"')))
+        lines.append(ae(t_val(tok_i(s3, 1)), '"$"'))
+        lines.append(ae(t_val(tok_i(s3, 2)), '"{"'))
+        s4 = to_('"${"asdf"', tmpl=True)
+        lines.append(ae(t_val(tok_i(s4, 0)), sx_str('"')))
+        lines.append(ae(t_val(tok_i(s4, 1)), '"$"'))
+        lines.append(ae(t_val(tok_i(s4, 2)), '"{"'))
+        lines.append(ae(t_val(tok_i(s4, 3)), '"asdf"'))
+        s5 = to_('"${"asdf"}"', tmpl=True)
+        lines.append(ae(t_val(tok_i(s5, 0)), sx_str('"')))
+        lines.append(ae(t_val(tok_i(s5, 1)), '"$"'))
+        lines.append(ae(t_val(tok_i(s5, 2)), '"{"'))
+        lines.append(ae(t_val(tok_i(s5, 3)), '"asdf"'))
+        lines.append(ae(t_val(tok_i(s5, 4)), '"}"'))
+        lines.append(ae(t_val(tok_i(s5, 5)), sx_str('"')))
+
+    elif name == 'handles whitespace properly':
+        for src, expected in [
+            ('   ', 0), ('  asdf', 1), ('  asdf  ', 2), ('asdf  ', 2),
+            ('\n',   0), ('\nasdf', 1), ('\nasdf\n', 2), ('asdf\n', 2),
+            ('\r',   0), ('\rasdf', 1), ('\rasdf\r', 2), ('asdf\r', 2),
+            ('\t',   0), ('\tasdf', 1), ('\tasdf\t', 2), ('asdf\t', 2),
+        ]:
+            lines.append(ae(list_len(to_(src)), str(expected)))
+
+    else:
+        return None  # not a tokenizer test we handle
+
+    lines.append('  )')
+    return '\n'.join(lines)
+
+
 def generate_eval_only_test(test, idx):
     """Generate SX deftest for no-HTML tests using eval-hs.
     Handles patterns:
@@ -2015,46 +2283,8 @@ def generate_eval_only_test(test, idx):
             f'  )'
         )
 
-    # Special case: cluster-38 sourceInfo tests.
-    if test['name'] == 'debug':
-        return (
-            f'  (deftest "{safe_name}"\n'
-            f'    (assert= (hs-src "<button.foo/>") "<button.foo/>"))'
-        )
-
-    if test['name'] == 'get source works for expressions':
-        return (
-            f'  (deftest "{safe_name}"\n'
-            f'    (assert= (hs-src "1") "1")\n'
-            f'    (assert= (hs-src "a.b") "a.b")\n'
-            f'    (assert= (hs-src-at "a.b" (list :root)) "a")\n'
-            f'    (assert= (hs-src "a.b()") "a.b()")\n'
-            f'    (assert= (hs-src-at "a.b()" (list :root)) "a.b")\n'
-            f'    (assert= (hs-src-at "a.b()" (list :root :root)) "a")\n'
-            f'    (assert= (hs-src "<button.foo/>") "<button.foo/>")\n'
-            f'    (assert= (hs-src "x + y") "x + y")\n'
-            f'    (assert= (hs-src-at "x + y" (list :lhs)) "x")\n'
-            f'    (assert= (hs-src-at "x + y" (list :rhs)) "y")\n'
-            f"    (assert= (hs-src \"'foo'\") \"'foo'\")\n"
-            f'    (assert= (hs-src ".foo") ".foo")\n'
-            f'    (assert= (hs-src "#bar") "#bar"))'
-        )
-
-    if test['name'] == 'get source works for statements':
-        return (
-            f'  (deftest "{safe_name}"\n'
-            f"    (assert= (hs-src \"if true log 'it was true'\") \"if true log 'it was true'\")\n"
-            f'    (assert= (hs-src "for x in [1, 2, 3] log x then log x end") "for x in [1, 2, 3] log x then log x end"))'
-        )
-
-    if test['name'] == 'get line works for statements':
-        src = "if true\\n  log 'it was true'\\n    log 'it was true'"
-        return (
-            f'  (deftest "{safe_name}"\n'
-            f'    (assert= (hs-line-at "{src}" (list)) "if true")\n'
-            f"    (assert= (hs-line-at \"{src}\" (list :true-branch)) \"  log 'it was true'\")\n"
-            f"    (assert= (hs-line-at \"{src}\" (list :true-branch :next)) \"    log 'it was true'\"))"
-        )
+    if '_hyperscript.internals.tokenizer' in body:
+        return generate_tokenizer_test(test, safe_name)
 
     lines.append(f'  (deftest "{safe_name}"')