ourui 0.2.1__tar.gz → 0.2.2__tar.gz

{ourui-0.2.1 → ourui-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ourui
-Version: 0.2.1
+Version: 0.2.2
 Summary: Python-first UI compiler — write intent in Python, emit HTML/CSS/JS
 Author: OurUI contributors
 License: MIT License
@@ -46,7 +46,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Dynamic: license-file
 
-# ourui 0.2.1
+# ourui 0.2.2
 
 Python package for the **OurUI** compiler and runtime.
 

{ourui-0.2.1 → ourui-0.2.2}/README.md

@@ -1,4 +1,4 @@
-# ourui 0.2.1
+# ourui 0.2.2
 
 Python package for the **OurUI** compiler and runtime.
 

{ourui-0.2.1 → ourui-0.2.2}/ourui/emit/html.py

@@ -98,6 +98,60 @@ button.ourui-tone-muted {
   color: var(--ourui-muted-fg);
 }
 """
+# Tone classes above use CSS vars seeded from Resolved Design (Host Contract).
+# Per-node rules from Resolved Design override for concrete fill/fg/radius/pad.
+
+
+def _as_resolved_design(resolved_design: Any) -> dict[str, Any] | None:
+    if resolved_design is None:
+        return None
+    if hasattr(resolved_design, "to_dict"):
+        return resolved_design.to_dict()
+    return dict(resolved_design)
+
+
+def _tokens_from_resolved(rd: dict[str, Any]) -> dict[str, dict[str, str]]:
+    tokens = rd.get("tokens") or {}
+    return {
+        "light": dict(tokens.get("light") or {}),
+        "dark": dict(tokens.get("dark") or {}),
+    }
+
+
+def _emit_resolved_node_css(rd: dict[str, Any]) -> str:
+    """Host maps Resolved Design node values → CSS (no Design System tables)."""
+    lines: list[str] = []
+    nodes = rd.get("nodes") or {}
+    for nid in sorted(nodes):
+        node = nodes[nid]
+        role = node.get("role")
+        resolved = node.get("resolved") or {}
+        if role not in {"button", "link"}:
+            continue
+        fill = resolved.get("fill")
+        fg = resolved.get("fg")
+        if not fill and not fg:
+            continue
+        lines.append(f'[data-ourui-id="{nid}"] {{')
+        if role == "button":
+            if fill:
+                lines.append(f"  background: {fill};")
+            if fg:
+                lines.append(f"  color: {fg};")
+            if resolved.get("radius"):
+                lines.append(f"  border-radius: {resolved['radius']};")
+            pad_b = resolved.get("pad_block")
+            pad_i = resolved.get("pad_inline")
+            if pad_b and pad_i:
+                lines.append(f"  padding: {pad_b} {pad_i};")
+            lines.append("  border-color: transparent;")
+        else:
+            if fill:
+                lines.append(f"  color: {fill};")
+        lines.append("}")
+    if not lines:
+        return ""
+    return "\n".join(lines) + "\n"
 
 
 def _tone_name(attrs: dict[str, Any]) -> str | None:
@@ -232,7 +286,16 @@ def apply_state_values(rtr: dict[str, Any], state_values: dict[str, Any] | None)
     return out
 
 
-def emit_css(tokens: dict[str, dict[str, str]] | None = None) -> str:
+def emit_css(
+    tokens: dict[str, dict[str, str]] | None = None,
+    *,
+    resolved_design: Any = None,
+) -> str:
+    """Emit host CSS. Prefer Resolved Design tokens + per-node rules (Host Contract)."""
+    rd = _as_resolved_design(resolved_design)
+    if rd is not None:
+        token_block = emit_tokens_css(_tokens_from_resolved(rd))
+        return token_block + _BASE_CSS + _emit_resolved_node_css(rd)
     token_block = emit_tokens_css(tokens or default_tokens())
     return token_block + _BASE_CSS
 
@@ -244,8 +307,9 @@ def emit_html_document(
     state_values: dict[str, Any] | None = None,
     hmr: bool = False,
     tokens: dict[str, dict[str, str]] | None = None,
+    resolved_design: Any = None,
 ) -> str:
-    """Emit a full HTML document from an RTR dict (HostNode tree only)."""
+    """Emit HTML from Host Contract inputs: RTR + Resolved Design (+ optional tokens fallback)."""
     rtr = apply_state_values(rtr, state_values)
     nodes = rtr["nodes"]
     roots = rtr["roots"]
@@ -255,7 +319,7 @@ def emit_html_document(
     body_lines.append("  </div>")
 
     js = emit_js(rtr, hmr=hmr).rstrip("\n")
-    css = emit_css(tokens).rstrip("\n")
+    css = emit_css(tokens, resolved_design=resolved_design).rstrip("\n")
     parts = [
         "<!DOCTYPE html>",
         '<html lang="en">',
@@ -283,10 +347,13 @@ def emit_bundle(
     *,
     title: str = "OurUI",
     tokens: dict[str, dict[str, str]] | None = None,
+    resolved_design: Any = None,
 ) -> dict[str, str]:
     """Serializable emit artifacts (I10): html + css + js."""
     return {
-        "html": emit_html_document(rtr, title=title, tokens=tokens),
-        "css": emit_css(tokens),
+        "html": emit_html_document(
+            rtr, title=title, tokens=tokens, resolved_design=resolved_design
+        ),
+        "css": emit_css(tokens, resolved_design=resolved_design),
         "js": emit_js(rtr),
     }

{ourui-0.2.1 → ourui-0.2.2}/ourui/pipeline.py

@@ -71,6 +71,7 @@ def compile_dump(path: str | Path) -> dict[str, Any]:
             "tokens": True,
             "presentation_graph": True,
             "resolved_design": True,
+            "host_contract": True,
         },
     }
 
@@ -87,7 +88,7 @@ def emit_html(
     state_values: dict[str, Any] | None = None,
     hmr: bool = False,
 ) -> str:
-    """Compile source → RTR → HTML. Emitter consumes HostNode only."""
+    """Compile source → RTR + Resolved Design → HTML (Host Contract)."""
     artifacts = compile_to_rtr(path, route=route)
     doc_title = title or Path(path).stem
     return emit_html_document(
@@ -96,6 +97,7 @@ def emit_html(
         state_values=state_values,
         hmr=hmr,
         tokens=artifacts["semantic_graph"].tokens,
+        resolved_design=artifacts["resolved_design"],
     )
 
 
@@ -106,4 +108,5 @@ def emit_all(path: str | Path, *, title: str | None = None) -> dict[str, str]:
         artifacts["rtr"].to_dict(),
         title=doc_title,
         tokens=artifacts["semantic_graph"].tokens,
+        resolved_design=artifacts["resolved_design"],
     )

{ourui-0.2.1 → ourui-0.2.2}/ourui.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ourui
-Version: 0.2.1
+Version: 0.2.2
 Summary: Python-first UI compiler — write intent in Python, emit HTML/CSS/JS
 Author: OurUI contributors
 License: MIT License
@@ -46,7 +46,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Dynamic: license-file
 
-# ourui 0.2.1
+# ourui 0.2.2
 
 Python package for the **OurUI** compiler and runtime.
 

{ourui-0.2.1 → ourui-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ourui"
-version = "0.2.1"
+version = "0.2.2"
 description = "Python-first UI compiler — write intent in Python, emit HTML/CSS/JS"
 readme = "README.md"
 license = { file = "LICENSE" }