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

Fix quasiquote flattening bug, decouple relations from evaluator

Browse Source 
- Fix qq-expand in eval.sx: use concat+list instead of append to prevent
  nested lists from being flattened during quasiquote expansion
- Update append primitive to match spec ("if x is list, concatenate")
- Rebuild sx_ref.py with quasiquote fix
- Make relations.py self-contained: parse defrelation AST directly
  without depending on the evaluator (25/25 tests pass)
- Replace hand-written JSEmitter with js.sx self-hosting bootstrapper
- Guard server-only tests in test-eval.sx with runtime check

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
giles
2026-03-11 04:53:34 +00:00
parent 46cd179703
commit 3906ab3558
12 changed files with 678 additions and 4526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
shared/sx/tests/test_bootstrapper.py
View File

@@ -1,4 +1,4 @@
"""Test bootstrapper transpilation: JSEmitter and PyEmitter."""
"""Test bootstrapper transpilation: js.sx and py.sx."""
from __future__ import annotations
import os
@@ -6,49 +6,38 @@ import re
import pytest
from shared.sx.parser import parse, parse_all
from shared.sx.ref.bootstrap_js import (
JSEmitter,
from shared.sx.ref.run_js_sx import compile_ref_to_js, load_js_sx
from shared.sx.ref.platform_js import (
ADAPTER_FILES,
SPEC_MODULES,
extract_defines,
compile_ref_to_js,
)
from shared.sx.ref.bootstrap_py import PyEmitter
from shared.sx.types import Symbol, Keyword
class TestJSEmitterNativeDict:
"""JS bootstrapper must handle native Python dicts from {:key val} syntax."""
class TestJsSxTranslation:
"""js.sx self-hosting bootstrapper handles all SX constructs."""
def test_simple_string_values(self):
expr = parse('{"name" "hello"}')
assert isinstance(expr, dict)
js = JSEmitter().emit(expr)
assert js == '{"name": "hello"}'
def _translate(self, sx_source: str) -> str:
"""Translate a single SX expression to JS using js.sx."""
from shared.sx.evaluator import evaluate
env = load_js_sx()
expr = parse(sx_source)
env["_def_expr"] = expr
return evaluate(
[Symbol("js-expr"), Symbol("_def_expr")], env
)
def test_function_call_value(self):
"""Dict value containing a function call must emit the call, not raw AST."""
expr = parse('{"parsed" (parse-route-pattern (get page "path"))}')
js = JSEmitter().emit(expr)
assert "parseRoutePattern" in js
assert "Symbol" not in js
assert js == '{"parsed": parseRoutePattern(get(page, "path"))}'
def test_simple_dict(self):
result = self._translate('{"name" "hello"}')
assert '"name"' in result
assert '"hello"' in result
def test_multiple_keys(self):
expr = parse('{"a" 1 "b" (+ x 2)}')
js = JSEmitter().emit(expr)
assert '"a": 1' in js
assert '"b": (x + 2)' in js
def test_nested_dict(self):
expr = parse('{"outer" {"inner" 42}}')
js = JSEmitter().emit(expr)
assert '{"outer": {"inner": 42}}' == js
def test_nil_value(self):
expr = parse('{"key" nil}')
js = JSEmitter().emit(expr)
assert '"key": NIL' in js
def test_function_call_in_dict(self):
result = self._translate('{"parsed" (parse-route-pattern (get page "path"))}')
assert "parseRoutePattern" in result
assert "Symbol" not in result
class TestPyEmitterNativeDict:
@@ -92,11 +81,7 @@ class TestPlatformMapping:
"""Verify compiled JS output contains all spec-defined functions."""
def test_compiled_defines_present_in_js(self):
"""Every top-level define from spec files must appear in compiled JS output.
Catches: spec modules not included, _mangle producing wrong names for
defines, transpilation silently dropping definitions.
"""
"""Every top-level define from spec files must appear in compiled JS output."""
js_output = compile_ref_to_js(
spec_modules=list(SPEC_MODULES.keys()),
)
@@ -117,10 +102,17 @@ class TestPlatformMapping:
for name, _expr in extract_defines(open(filepath).read()):
all_defs.add(name)
emitter = JSEmitter()
# Use js.sx RENAMES to map SX names → JS names
env = load_js_sx()
renames = env.get("js-renames", {})
missing = []
for sx_name in sorted(all_defs):
js_name = emitter._mangle(sx_name)
# Check if there's an explicit rename
js_name = renames.get(sx_name)
if js_name is None:
# Auto-mangle: hyphens → camelCase, ! → _b, ? → _p
js_name = _auto_mangle(sx_name)
if js_name not in defined_in_js:
missing.append(f"{sx_name} → {js_name}")
@@ -131,41 +123,29 @@ class TestPlatformMapping:
+ "\n ".join(missing)
)
def test_renames_values_are_unique(self):
"""RENAMES should not map different SX names to the same JS name.
Duplicate JS names would cause one definition to silently shadow another.
"""
renames = JSEmitter.RENAMES
seen: dict[str, str] = {}
dupes = []
for sx_name, js_name in sorted(renames.items()):
if js_name in seen:
# Allow intentional aliases (e.g. has-key? and dict-has?
# both → dictHas)
dupes.append(
f" {sx_name} → {js_name} (same as {seen[js_name]})"
)
else:
seen[js_name] = sx_name
# Intentional aliases — these are expected duplicates
# (e.g. has-key? and dict-has? both map to dictHas)
# Don't fail for these, just document them
# The test serves as a warning for accidental duplicates
def _auto_mangle(name: str) -> str:
"""Approximate js.sx's auto-mangle for SX name → JS identifier."""
# Remove ~, replace ?, !, -, *, >
n = name
if n.startswith("~"):
n = n[1:]
n = n.replace("?", "_p").replace("!", "_b")
n = n.replace("->", "_to_").replace(">=", "_gte").replace("<=", "_lte")
n = n.replace(">", "_gt").replace("<", "_lt")
n = n.replace("*", "_star_").replace("/", "_slash_")
# camelCase from hyphens
parts = n.split("-")
if len(parts) > 1:
n = parts[0] + "".join(p.capitalize() for p in parts[1:])
return n
class TestPrimitivesRegistration:
"""Functions callable from runtime-evaluated SX must be in PRIMITIVES[...]."""
def test_declared_primitives_registered(self):
"""Every primitive declared in primitives.sx must have a PRIMITIVES[...] entry.
Primitives are called from runtime-evaluated SX (island bodies, user
components) via getPrimitive(). If a primitive is declared in
primitives.sx but not in PRIMITIVES[...], island code gets
"Undefined symbol" errors.
"""
"""Every primitive declared in primitives.sx must have a PRIMITIVES[...] entry."""
from shared.sx.ref.boundary_parser import parse_primitives_sx
declared = parse_primitives_sx()
@@ -173,8 +153,7 @@ class TestPrimitivesRegistration:
js_output = compile_ref_to_js()
registered = set(re.findall(r'PRIMITIVES\["([^"]+)"\]', js_output))
# Aliases — declared in primitives.sx under alternate names but
# served via canonical PRIMITIVES entries
# Aliases
aliases = {
"downcase": "lower",
"upcase": "upper",
@@ -186,7 +165,7 @@ class TestPrimitivesRegistration:
if alias in declared and canonical in registered:
declared = declared - {alias}
# Extension-only primitives (require continuations extension)
# Extension-only primitives
extension_only = {"continuation?"}
declared = declared - extension_only
@@ -199,12 +178,7 @@ class TestPrimitivesRegistration:
)
def test_signal_runtime_primitives_registered(self):
"""Signal/reactive functions used by island bodies must be in PRIMITIVES.
These are the reactive primitives that island SX code calls via
getPrimitive(). If any is missing, islands with reactive state fail
at runtime.
"""
"""Signal/reactive functions used by island bodies must be in PRIMITIVES."""
required = {
"signal", "signal?", "deref", "reset!", "swap!",
"computed", "effect", "batch", "resource",