thtml-tstring 0.1.6__tar.gz → 0.1.7__tar.gz

{thtml_tstring-0.1.6 → thtml_tstring-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: thtml-tstring
-Version: 0.1.6
+Version: 0.1.7
 Summary: T-HTML renderer for PEP 750 template strings
 Keywords: html,pep750,t-strings,template-strings,thtml
 Author: Koudai Aono
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Dist: tstring-html-bindings>=0.1.6
+Requires-Dist: tstring-html-bindings>=0.1.7
 Maintainer: Koudai Aono
 Maintainer-email: Koudai Aono <koxudaxi@gmail.com>
 Requires-Python: >=3.14
@@ -37,6 +37,6 @@ def Button(*, children: str, kind: str = "primary"):
     return t'<button class="{classes}">{children}</button>'
 
 label = "Save"
-page = thtml(t"<Button kind='primary'>{label}</Button>")
+page = thtml(t"<Button kind='primary'>{label}</Button>", registry={"Button": Button})
 assert page.render() == '<button class="primary">Save</button>'
 ```

{thtml_tstring-0.1.6 → thtml_tstring-0.1.7}/README.md

@@ -11,6 +11,6 @@ def Button(*, children: str, kind: str = "primary"):
     return t'<button class="{classes}">{children}</button>'
 
 label = "Save"
-page = thtml(t"<Button kind='primary'>{label}</Button>")
+page = thtml(t"<Button kind='primary'>{label}</Button>", registry={"Button": Button})
 assert page.render() == '<button class="primary">Save</button>'
 ```

{thtml_tstring-0.1.6 → thtml_tstring-0.1.7}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "thtml-tstring"
-version = "0.1.6"
+version = "0.1.7"
 description = "T-HTML renderer for PEP 750 template strings"
 readme = "README.md"
 license = { text = "MIT" }
 authors = [{ name = "Koudai Aono", email = "koxudaxi@gmail.com" }]
 maintainers = [{ name = "Koudai Aono", email = "koxudaxi@gmail.com" }]
 requires-python = ">=3.14"
-dependencies = ["tstring-html-bindings>=0.1.6"]
+dependencies = ["tstring-html-bindings>=0.1.7"]
 keywords = ["html", "pep750", "t-strings", "template-strings", "thtml"]
 classifiers = [
     "Development Status :: 4 - Beta",

{thtml_tstring-0.1.6 → thtml_tstring-0.1.7}/src/thtml_tstring/_runtime.py

@@ -42,7 +42,9 @@ def _capture_scope(
         frame = sys._getframe(frame_depth)
     except AttributeError, ValueError:
         raise TemplateRuntimeError(
-            "Caller-frame inspection failed. Pass globals= or locals= explicitly."
+            "Caller-frame inspection failed. "
+            "On runtimes without frame inspection you must pass registry=, "
+            "or both globals= and locals= explicitly."
         ) from None
 
     captured_globals = dict(globals) if globals is not None else dict(frame.f_globals)
@@ -50,6 +52,23 @@ def _capture_scope(
     return captured_globals, captured_locals
 
 
+def _normalize_scope_overrides(
+    *,
+    globals: Mapping[str, Any] | None,
+    locals: Mapping[str, Any] | None,
+    registry: Mapping[str, object] | None,
+    api_name: str,
+) -> tuple[Mapping[str, Any] | None, Mapping[str, Any] | None]:
+    if registry is not None:
+        if globals is not None or locals is not None:
+            raise TypeError(
+                f"{api_name} does not allow combining registry= "
+                "with globals= or locals=."
+            )
+        return dict(registry), {}
+    return globals, locals
+
+
 def _make_thtml_renderable(
     template: object,
     *,
@@ -76,9 +95,14 @@ def component(
     func: ComponentT | None = None,
     *,
     backend: str = "thtml",
+    registry: Mapping[str, object] | None = None,
 ) -> ComponentT | Callable[[ComponentT], ComponentT]:
     if backend not in {"thtml", "html"}:
         raise ValueError("component backend must be 'thtml' or 'html'.")
+    if backend == "html" and registry is not None:
+        raise ValueError("component registry= is only supported for backend='thtml'.")
+
+    captured_registry = dict(registry) if registry is not None else None
 
     def decorator(inner: ComponentT) -> ComponentT:
         @wraps(inner)
@@ -86,9 +110,14 @@ def component(
             result = inner(*args, **kwargs)
             if _is_template(result):
                 if backend == "thtml":
+                    resolved_globals = (
+                        captured_registry
+                        if captured_registry is not None
+                        else cast(Mapping[str, Any], inner.__globals__)
+                    )
                     return _make_thtml_renderable(
                         result,
-                        globals=cast(Mapping[str, Any], inner.__globals__),
+                        globals=resolved_globals,
                         locals={},
                         frame_depth=0,
                         api_name="component",
@@ -128,11 +157,18 @@ def thtml(
     *,
     globals: Mapping[str, Any] | None = None,
     locals: Mapping[str, Any] | None = None,
+    registry: Mapping[str, object] | None = None,
 ) -> Renderable:
-    return _make_thtml_renderable(
-        template,
+    normalized_globals, normalized_locals = _normalize_scope_overrides(
         globals=globals,
         locals=locals,
+        registry=registry,
+        api_name="thtml",
+    )
+    return _make_thtml_renderable(
+        template,
+        globals=normalized_globals,
+        locals=normalized_locals,
         frame_depth=3,
         api_name="thtml",
     )
@@ -143,14 +179,21 @@ def render_html(
     *,
     globals: Mapping[str, Any] | None = None,
     locals: Mapping[str, Any] | None = None,
+    registry: Mapping[str, object] | None = None,
 ) -> str:
     if _is_renderable(template):
         return cast(Renderable, template).render()
 
     checked = _validate_template(template, "render_html")
+    normalized_globals, normalized_locals = _normalize_scope_overrides(
+        globals=globals,
+        locals=locals,
+        registry=registry,
+        api_name="render_html",
+    )
     captured_globals, captured_locals = _capture_scope(
-        globals,
-        locals,
+        normalized_globals,
+        normalized_locals,
         frame_depth=2,
     )
     return _bindings.render_thtml_template(
@@ -165,13 +208,20 @@ def html(
     *,
     globals: Mapping[str, Any] | None = None,
     locals: Mapping[str, Any] | None = None,
+    registry: Mapping[str, object] | None = None,
 ) -> str:
     if _is_renderable(template):
         return cast(Renderable, template).render()
     checked = _validate_template(template, "html")
+    normalized_globals, normalized_locals = _normalize_scope_overrides(
+        globals=globals,
+        locals=locals,
+        registry=registry,
+        api_name="html",
+    )
     captured_globals, captured_locals = _capture_scope(
-        globals,
-        locals,
+        normalized_globals,
+        normalized_locals,
         frame_depth=2,
     )
     return _bindings.render_thtml_template(