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

Hyperscript: focus command, diagnostic test output, blur keyword

Browse Source 
Parser/compiler/runtime for focus command. Tokenizer: focus, blur,
precedes, follows, ignoring, case keywords. Test spec: per-test
failure output for diagnosis.

374/831 (45%)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
giles
2026-04-12 12:38:05 +00:00
parent 1783f4805a
commit f60d22e86e
12 changed files with 277 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
hosts/ocaml/bin/sx_server.ml
View File

@@ -1838,6 +1838,47 @@ let parse_http_headers data =
) (match lines with _ :: rest -> rest | [] -> []);
!headers
(* IO-aware eval for rendering — handles perform (text-measure, sleep, import).
Used by aser and SSR so components can call measure-text via perform. *)
let eval_with_io_render expr env =
let state = ref (Sx_ref.cek_step_loop (Sx_ref.make_cek_state expr (Env env) Nil)) in
while sx_truthy (Sx_ref.cek_suspended_p !state) do
let request = Sx_ref.cek_io_request !state in
let op = match request with
| Dict d -> (match Hashtbl.find_opt d "op" with Some (String s) -> s | Some (Symbol s) -> s | _ -> "")
| _ -> "" in
let args = match request with
| Dict d -> (match Hashtbl.find_opt d "args" with Some v -> v | None -> Nil)
| _ -> Nil in
let result = match op with
| "text-measure" ->
let size = match args with
| List [_font; Number sz; _text] -> sz
| List [_font; Number sz] -> sz
| _ -> 16.0 in
let text = match args with
| List [_font; _sz; String t] -> t
| _ -> "" in
let char_width = size *. 0.6 in
let width = char_width *. (float_of_int (String.length text)) in
let d = Hashtbl.create 4 in
Hashtbl.replace d "width" (Number width);
Hashtbl.replace d "height" (Number size);
Hashtbl.replace d "ascent" (Number (size *. 0.8));
Hashtbl.replace d "descent" (Number (size *. 0.2));
Dict d
| "io-sleep" | "sleep" ->
let ms = match args with
| List (Number n :: _) -> n | Number n -> n | _ -> 0.0 in
Unix.sleepf (ms /. 1000.0); Nil
| "import" -> Nil
| _ -> Nil
in
state := Sx_ref.cek_step_loop (Sx_ref.cek_resume !state result)
done;
if sx_truthy (Sx_ref.cek_terminal_p !state) then Sx_ref.cek_value !state
else Nil
(** Render a page. Routing + AJAX detection in SX (request-handler.sx),
render pipeline (aser → SSR → shell) in OCaml for reliable env access. *)
let http_render_page env path headers =
@@ -1889,7 +1930,7 @@ let http_render_page env path headers =
(* AJAX: return SX wire format (aser output) with text/sx content type *)
let body_result =
let call = List [Symbol "aser"; List [Symbol "quote"; wrapped]; Env env] in
Sx_ref.eval_expr call (Env env) in
eval_with_io_render call env in
let body_str = match body_result with
| String s | SxExpr s -> s | _ -> serialize_value body_result in
let t1 = Unix.gettimeofday () in
@@ -1903,7 +1944,7 @@ let http_render_page env path headers =
let t1 = Unix.gettimeofday () in
let body_result =
let call = List [Symbol "aser"; List [Symbol "quote"; full_ast]; Env env] in
Sx_ref.eval_expr call (Env env) in
eval_with_io_render call env in
let body_str = match body_result with
| String s | SxExpr s -> s | _ -> serialize_value body_result in
let t2 = Unix.gettimeofday () in
@@ -1913,7 +1954,7 @@ let http_render_page env path headers =
if env_has env "render-to-html" then
let render_call = List [Symbol "render-to-html";
List [Symbol "quote"; body_expr]; Env env] in
(match Sx_ref.eval_expr render_call (Env env) with
(match eval_with_io_render render_call env with
| String s | RawHTML s -> s | v -> Sx_runtime.value_to_str v)
else Sx_render.sx_render_to_html env body_expr env
with e -> Printf.eprintf "[http-ssr] failed for %s: %s\n%!" path (Printexc.to_string e); "" in

2
lib/hyperscript/compiler.sx
View File

@@ -1061,6 +1061,8 @@
(list (quote nil?) t)
(list (quote set!) t v))))
((= head (quote halt!)) (list (quote hs-halt!) (nth ast 1)))
((= head (quote focus!))
(list (quote dom-focus) (hs-to-sx (nth ast 1))))
(true ast))))))))
;; ── Convenience: source → SX ─────────────────────────────────

12
lib/hyperscript/parser.sx
View File

@@ -1266,6 +1266,13 @@
(define
parse-param-list
(fn () (if (= (tp-type) "paren-open") (parse-call-args) (list))))
(define
parse-focus-cmd
(fn
()
(let
((tgt (cond ((at-end?) (list (quote me))) ((and (= (tp-type) "keyword") (or (= (tp-val) "then") (= (tp-val) "end"))) (list (quote me))) (true (parse-expr)))))
(list (quote focus!) tgt))))
(define
parse-feat-body
(fn
@@ -1452,6 +1459,8 @@
(do (adv!) (parse-default-cmd)))
((and (= typ "keyword") (= val "halt"))
(do (adv!) (parse-halt-cmd)))
((and (= typ "keyword") (= val "focus"))
(do (adv!) (parse-focus-cmd)))
(true (parse-expr))))))
(define
parse-cmd-list
@@ -1496,7 +1505,8 @@
(= v "default")
(= v "scroll")
(= v "select")
(= v "reset"))))
(= v "reset")
(= v "focus"))))
(define
cl-collect
(fn

4
lib/hyperscript/tokenizer.sx
View File

@@ -170,7 +170,9 @@
"precedes"
"follows"
"ignoring"
"case"))
"case"
"focus"
"blur"))
(define hs-keyword? (fn (word) (some (fn (k) (= k word)) hs-keywords)))

2
shared/static/wasm/sx/hs-compiler.sx
View File

@@ -1061,6 +1061,8 @@
(list (quote nil?) t)
(list (quote set!) t v))))
((= head (quote halt!)) (list (quote hs-halt!) (nth ast 1)))
((= head (quote focus!))
(list (quote dom-focus) (hs-to-sx (nth ast 1))))
(true ast))))))))
;; ── Convenience: source → SX ─────────────────────────────────

4
shared/static/wasm/sx/hs-compiler.sxbc
View File

File diff suppressed because one or more lines are too long

12
shared/static/wasm/sx/hs-parser.sx
View File

@@ -1266,6 +1266,13 @@
(define
parse-param-list
(fn () (if (= (tp-type) "paren-open") (parse-call-args) (list))))
(define
parse-focus-cmd
(fn
()
(let
((tgt (cond ((at-end?) (list (quote me))) ((and (= (tp-type) "keyword") (or (= (tp-val) "then") (= (tp-val) "end"))) (list (quote me))) (true (parse-expr)))))
(list (quote focus!) tgt))))
(define
parse-feat-body
(fn
@@ -1452,6 +1459,8 @@
(do (adv!) (parse-default-cmd)))
((and (= typ "keyword") (= val "halt"))
(do (adv!) (parse-halt-cmd)))
((and (= typ "keyword") (= val "focus"))
(do (adv!) (parse-focus-cmd)))
(true (parse-expr))))))
(define
parse-cmd-list
@@ -1496,7 +1505,8 @@
(= v "default")
(= v "scroll")
(= v "select")
(= v "reset"))))
(= v "reset")
(= v "focus"))))
(define
cl-collect
(fn

4
shared/static/wasm/sx/hs-parser.sxbc
View File

File diff suppressed because one or more lines are too long

4
shared/static/wasm/sx/hs-tokenizer.sx
View File

@@ -170,7 +170,9 @@
"precedes"
"follows"
"ignoring"
"case"))
"case"
"focus"
"blur"))
(define hs-keyword? (fn (word) (some (fn (k) (= k word)) hs-keywords)))

4
shared/static/wasm/sx/hs-tokenizer.sxbc
View File

File diff suppressed because one or more lines are too long

71
sx/sx/pretext-demo.sx
View File

@@ -1,10 +1,9 @@
;; Pretext demo — DOM-free text layout
;;
;; Visual-first: shows typeset text, then explains how.
;; All layout computed as data, then rendered.
;; Uses measure-text (perform) for real glyph measurement.
;; Compute positioned word data for one line.
;; Returns list of {:word :x :width} dicts.
(define
pretext-position-line
(fn
@@ -21,7 +20,6 @@
(append acc (list {:width (nth widths i) :x x :word (nth words i)})))))))
;; Compute all positioned lines for a paragraph.
;; Returns list of {:y :words [{:word :x :width}...]} dicts.
(define
pretext-layout-lines
(fn
@@ -47,6 +45,15 @@
{:y y :words (pretext-position-line lw lwid gap)}))))))
(range n-lines)))))
;; Measure all words and return widths list
(define
pretext-measure-words
(fn
(words font size)
(map
(fn (w) (let ((m (measure-text font size w))) (get m :width)))
words)))
;; Render pre-computed positioned lines
(defcomp
~pretext-demo/render-paragraph
@@ -99,18 +106,22 @@
()
(let
((sample-words (split "In the beginning was the Word, and the Word was with God, and the Word was God. The same was in the beginning with God. All things were made by him; and without him was not any thing made that was made. In him was life; and the life was the light of men." " "))
(char-w 9.6)
(space-w 9.6))
(font "serif")
(size 15))
(let
((sw (map (fn (w) (* (len w) char-w)) sample-words))
((sw (pretext-measure-words sample-words font size))
(space-m (measure-text font size " "))
(n-words (len sample-words)))
(let
((space-w (get space-m :width)))
(div
(~tw :tokens "space-y-10")
(div
(~tw :tokens "space-y-4")
(div
(h1
(~tw :tokens "text-3xl font-bold text-stone-900 tracking-tight")
(~tw
:tokens "text-3xl font-bold text-stone-900 tracking-tight")
"Pretext")
(p
(~tw :tokens "mt-1 text-lg text-stone-500")
@@ -131,7 +142,8 @@
:n-words n-words
:label "Knuth-Plass optimal line breaking — John 1:1–4"))))
(div
(~tw :tokens "rounded-lg border border-violet-200 bg-violet-50 p-5")
(~tw
:tokens "rounded-lg border border-violet-200 bg-violet-50 p-5")
(p
(~tw :tokens "text-sm text-violet-800")
(strong "One ")
@@ -150,34 +162,37 @@
"Most web text uses greedy word wrap — break when the next word doesn't fit. "
"Knuth-Plass considers all possible breaks simultaneously, minimizing total raggedness.")
(let
((nw (map (fn (w) (* (len w) 7.8)) sample-words))
(ns 7.8)
(nm 340)
(nlh 22))
((nm 340))
(div
(~tw :tokens "grid grid-cols-1 md:grid-cols-2 gap-4")
(~pretext-demo/render-paragraph
:words sample-words
:widths sw
:space-width space-w
:max-width nm
:line-height 22
:lines (pretext-layout-lines
sample-words
nw
(break-lines-greedy nw ns nm)
ns
sw
(break-lines-greedy sw space-w nm)
space-w
nm
nlh)
:max-width nm
:line-height nlh
22)
:n-words n-words
:label "Greedy (browser default)")
(~pretext-demo/render-paragraph
:words sample-words
:widths sw
:space-width space-w
:max-width nm
:line-height 22
:lines (pretext-layout-lines
sample-words
nw
(break-lines nw ns nm)
ns
sw
(break-lines sw space-w nm)
space-w
nm
nlh)
:max-width nm
:line-height nlh
22)
:n-words n-words
:label "Knuth-Plass optimal"))))
(div
@@ -248,10 +263,8 @@
(if
(= i 0)
(span syl)
(list
(span
(~tw :tokens "text-violet-400 mx-0.5")
"·")
(<>
(span :class "text-violet-400 mx-0.5" "·")
(span syl))))
syllables))
(div (~tw :tokens "text-xs text-stone-400 mt-1") word))))
@@ -282,4 +295,4 @@
(li
"All layout is "
(strong "deterministic")
" — same widths → same positions, every time")))))))
" — same widths → same positions, every time"))))))))

15
tests/playwright/hs-behavioral.spec.js
View File

@@ -322,11 +322,16 @@ test.describe('Hyperscript behavioral tests', () => {
for (const [e, info] of Object.entries(uniqueErrors).sort((a,b) => b[1].count - a[1].count).slice(0, 25)) {
console.log(` [${info.count}x] ${e}`);
}
// Show samples of "bar" error specifically
const barSamples = results.filter(r => !r.p && (r.e||'').includes('Expected , got')).slice(0, 15);
if (barSamples.length > 0) {
console.log(` Expected-got failures (${barSamples.length}):`);
for (const s of barSamples) console.log(` ${s.s}/${s.n}`);
// Show ALL failing tests with errors (for diagnosis)
const failsByCategory = {};
for (const r of results.filter(r => !r.p)) {
if (!failsByCategory[r.s]) failsByCategory[r.s] = [];
failsByCategory[r.s].push(r);
}
for (const [cat, fails] of Object.entries(failsByCategory).sort((a,b) => a[0].localeCompare(b[0]))) {
for (const f of fails.slice(0, 5)) {
console.log(` FAIL ${f.s}/${f.n}: ${(f.e||'').slice(0, 100)}`);
}
}
expect(results.length).toBeGreaterThanOrEqual(830);