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

Phase 7a: affinity annotations + fix parser escape sequences

Browse Source 
Add :affinity :client/:server/:auto annotations to defcomp, with
render-target function combining affinity + IO analysis. Includes
spec (eval.sx, deps.sx), tests, Python evaluator, and demo page.

Fix critical bug: Python SX parser _ESCAPE_MAP was missing \r and \0,
causing bootstrapped JS parser to treat 'r' as whitespace — breaking
all client-side SX parsing. Also add \0 to JS string emitter and
fix serializer round-tripping for \r and \0.

Reserved word escaping: bootstrappers now auto-append _ to identifiers
colliding with JS/Python reserved words (e.g. default → default_,
final → final_), so the spec never needs to avoid host language keywords.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
giles
2026-03-07 23:53:33 +00:00
parent 81d8e55fb0
commit a70ff2b153
19 changed files with 540 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

177
sx/sx/affinity-demo.sx Normal file
View File

@@ -0,0 +1,177 @@
;; Affinity demo — Phase 7a render boundary annotations.
;;
;; Demonstrates :affinity annotations on defcomp and how they influence
;; the server/client render boundary decision. Components declare where
;; they prefer to render; the runtime combines this with IO analysis.
;; --- Demo components with different affinities ---
(defcomp ~aff-demo-auto (&key label)
(div :class "rounded border border-stone-200 bg-white p-4"
(div :class "flex items-center gap-2 mb-2"
(span :class "inline-block w-2 h-2 rounded-full bg-stone-400")
(span :class "text-sm font-mono text-stone-500" ":affinity :auto"))
(p :class "text-stone-800" (or label "Pure component — no IO calls. Auto-detected as client-renderable."))))
(defcomp ~aff-demo-client (&key label)
:affinity :client
(div :class "rounded border border-blue-200 bg-blue-50 p-4"
(div :class "flex items-center gap-2 mb-2"
(span :class "inline-block w-2 h-2 rounded-full bg-blue-400")
(span :class "text-sm font-mono text-blue-600" ":affinity :client"))
(p :class "text-blue-800" (or label "Explicitly client-rendered — even IO calls would be proxied."))))
(defcomp ~aff-demo-server (&key label)
:affinity :server
(div :class "rounded border border-amber-200 bg-amber-50 p-4"
(div :class "flex items-center gap-2 mb-2"
(span :class "inline-block w-2 h-2 rounded-full bg-amber-400")
(span :class "text-sm font-mono text-amber-600" ":affinity :server"))
(p :class "text-amber-800" (or label "Always server-rendered — auth-sensitive or secret-dependent."))))
(defcomp ~aff-demo-io-auto ()
(div :class "rounded border border-red-200 bg-red-50 p-4"
(div :class "flex items-center gap-2 mb-2"
(span :class "inline-block w-2 h-2 rounded-full bg-red-400")
(span :class "text-sm font-mono text-red-600" ":affinity :auto + IO"))
(p :class "text-red-800 mb-3" "Auto affinity with IO dependency — auto-detected as server-rendered.")
(~doc-code :code (highlight "(render-target name env io-names)" "lisp"))))
(defcomp ~aff-demo-io-client ()
:affinity :client
(div :class "rounded border border-violet-200 bg-violet-50 p-4"
(div :class "flex items-center gap-2 mb-2"
(span :class "inline-block w-2 h-2 rounded-full bg-violet-400")
(span :class "text-sm font-mono text-violet-600" ":affinity :client + IO"))
(p :class "text-violet-800 mb-3" "Client affinity overrides IO — calls proxied to server via /sx/io/.")
(~doc-code :code (highlight "(component-affinity comp)" "lisp"))))
;; --- Main page component ---
(defcomp ~affinity-demo-content (&key components)
(div :class "space-y-8"
(div :class "border-b border-stone-200 pb-6"
(h1 :class "text-2xl font-bold text-stone-900" "Affinity Annotations")
(p :class "mt-2 text-stone-600"
"Phase 7a: components declare where they prefer to render. The "
(code :class "bg-stone-100 px-1 rounded text-violet-700" "render-target")
" function in deps.sx combines the annotation with IO analysis to produce a per-component boundary decision."))
;; Syntax
(~doc-section :title "Syntax" :id "syntax"
(p "Add " (code ":affinity") " between the params list and the body:")
(~doc-code :code (highlight "(defcomp ~my-component (&key title)\n :affinity :client ;; or :server, or omit for :auto\n (div title))" "lisp"))
(p "Three values:")
(ul :class "list-disc pl-5 text-stone-700 space-y-1"
(li (code ":auto") " (default) — runtime decides from IO dependency analysis")
(li (code ":client") " — always render client-side; IO calls proxied to server")
(li (code ":server") " — always render server-side; never sent to client as SX")))
;; Live components
(~doc-section :title "Live Components" :id "live"
(p "These components are defined with different affinities. The server analyzed them at registration time:")
(div :class "space-y-4 mt-4"
(~aff-demo-auto)
(~aff-demo-client)
(~aff-demo-server)
(~aff-demo-io-auto)
(~aff-demo-io-client)))
;; Analysis table from server
(~doc-section :title "Server Analysis" :id "analysis"
(p "The server computed these render targets at component registration time:")
(div :class "overflow-x-auto rounded border border-stone-200"
(table :class "w-full text-left text-sm"
(thead (tr :class "border-b border-stone-200 bg-stone-100"
(th :class "px-3 py-2 font-medium text-stone-600" "Component")
(th :class "px-3 py-2 font-medium text-stone-600" "Affinity")
(th :class "px-3 py-2 font-medium text-stone-600" "IO Deps")
(th :class "px-3 py-2 font-medium text-stone-600" "Render Target")))
(tbody
(map (fn (c)
(tr :class "border-b border-stone-100"
(td :class "px-3 py-2 font-mono text-sm text-violet-700" (get c "name"))
(td :class "px-3 py-2"
(span :class (str "inline-block px-2 py-0.5 rounded text-xs font-bold uppercase "
(case (get c "affinity")
"client" "bg-blue-100 text-blue-700"
"server" "bg-amber-100 text-amber-700"
"bg-stone-100 text-stone-600"))
(get c "affinity")))
(td :class "px-3 py-2 text-stone-600"
(if (> (len (get c "io-refs")) 0)
(span :class "text-red-600 font-medium"
(join ", " (get c "io-refs")))
(span :class "text-green-600" "none")))
(td :class "px-3 py-2"
(span :class (str "inline-block px-2 py-0.5 rounded text-xs font-bold uppercase "
(if (= (get c "render-target") "client")
"bg-green-100 text-green-700"
"bg-orange-100 text-orange-700"))
(get c "render-target")))))
components)))))
;; Decision matrix
(~doc-section :title "Decision Matrix" :id "matrix"
(div :class "overflow-x-auto rounded border border-stone-200"
(table :class "w-full text-left text-sm"
(thead (tr :class "border-b border-stone-200 bg-stone-100"
(th :class "px-3 py-2 font-medium text-stone-600" "Affinity")
(th :class "px-3 py-2 font-medium text-stone-600" "Has IO?")
(th :class "px-3 py-2 font-medium text-stone-600" "Render Target")
(th :class "px-3 py-2 font-medium text-stone-600" "Why")))
(tbody
(tr :class "border-b border-stone-100"
(td :class "px-3 py-2 font-mono" ":auto")
(td :class "px-3 py-2" "No")
(td :class "px-3 py-2 font-bold text-green-700" "client")
(td :class "px-3 py-2 text-stone-600" "Pure — can render anywhere"))
(tr :class "border-b border-stone-100"
(td :class "px-3 py-2 font-mono" ":auto")
(td :class "px-3 py-2" "Yes")
(td :class "px-3 py-2 font-bold text-orange-700" "server")
(td :class "px-3 py-2 text-stone-600" "IO must resolve server-side"))
(tr :class "border-b border-stone-100"
(td :class "px-3 py-2 font-mono" ":client")
(td :class "px-3 py-2" "No")
(td :class "px-3 py-2 font-bold text-green-700" "client")
(td :class "px-3 py-2 text-stone-600" "Explicit + pure"))
(tr :class "border-b border-stone-100"
(td :class "px-3 py-2 font-mono" ":client")
(td :class "px-3 py-2" "Yes")
(td :class "px-3 py-2 font-bold text-green-700" "client")
(td :class "px-3 py-2 text-stone-600" "Override — IO proxied via /sx/io/"))
(tr :class "border-b border-stone-100"
(td :class "px-3 py-2 font-mono" ":server")
(td :class "px-3 py-2" "No")
(td :class "px-3 py-2 font-bold text-orange-700" "server")
(td :class "px-3 py-2 text-stone-600" "Override — auth-sensitive"))
(tr :class "border-b border-stone-100"
(td :class "px-3 py-2 font-mono" ":server")
(td :class "px-3 py-2" "Yes")
(td :class "px-3 py-2 font-bold text-orange-700" "server")
(td :class "px-3 py-2 text-stone-600" "Both affinity and IO say server"))))))
;; How it integrates
(~doc-section :title "How It Works" :id "how"
(ol :class "list-decimal list-inside text-stone-700 space-y-2"
(li (code "defcomp") " parses " (code ":affinity") " annotation between params and body")
(li "Component object stores " (code "affinity") " field (\"auto\", \"client\", or \"server\")")
(li (code "compute-all-io-refs") " scans transitive IO deps at registration time")
(li (code "render-target") " in deps.sx combines affinity + IO analysis → \"server\" or \"client\"")
(li "Server partial evaluator (" (code "_aser") ") checks " (code "render_target") ":")
(ul :class "list-disc pl-8 text-stone-600"
(li "\"server\" → expand component, embed rendered HTML")
(li "\"client\" → serialize as SX, let client render"))
(li "Client routing uses same info: IO deps in page registry → proxy registration")))
;; Verification
(div :class "rounded-lg border border-amber-200 bg-amber-50 p-4 text-sm space-y-2"
(p :class "font-semibold text-amber-800" "How to verify")
(ol :class "list-decimal list-inside text-amber-700 space-y-1"
(li "View page source — components with render-target \"server\" are expanded to HTML")
(li "Components with render-target \"client\" appear as " (code "(~name ...)") " in the SX wire format")
(li "Navigate away and back — client-routable pure components render instantly")
(li "Check the analysis table above — it shows live data from the server's component registry")))))