tstring-html-bindings 0.1.6__tar.gz → 0.1.7__tar.gz

{tstring_html_bindings-0.1.6 → tstring_html_bindings-0.1.7}/Cargo.lock

@@ -290,14 +290,14 @@ checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
 
 [[package]]
 name = "tstring-format-doc"
-version = "0.1.6"
+version = "0.1.7"
 dependencies = [
  "unicode-width",
 ]
 
 [[package]]
 name = "tstring-html"
-version = "0.1.6"
+version = "0.1.7"
 dependencies = [
  "tstring-format-doc",
  "tstring-syntax",
@@ -305,7 +305,7 @@ dependencies = [
 
 [[package]]
 name = "tstring-html-backend-e2e-tests"
-version = "0.1.6"
+version = "0.1.7"
 dependencies = [
  "serde",
  "toml",
@@ -316,7 +316,7 @@ dependencies = [
 
 [[package]]
 name = "tstring-html-bindings"
-version = "0.1.6"
+version = "0.1.7"
 dependencies = [
  "pyo3",
  "tstring-html",
@@ -335,7 +335,7 @@ dependencies = [
 
 [[package]]
 name = "tstring-thtml"
-version = "0.1.6"
+version = "0.1.7"
 dependencies = [
  "tstring-html",
  "tstring-syntax",

{tstring_html_bindings-0.1.6 → tstring_html_bindings-0.1.7}/Cargo.toml

@@ -9,7 +9,7 @@ homepage = "https://github.com/koxudaxi/tstring-html"
 license = "MIT"
 repository = "https://github.com/koxudaxi/tstring-html"
 rust-version = "1.94.0"
-version = "0.1.6"
+version = "0.1.7"
 
 [workspace.dependencies]
 pyo3 = "0.27.1"

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tstring-html-bindings
-Version: 0.1.6
+Version: 0.1.7
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License

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

@@ -1,6 +1,6 @@
 [project]
 name = "tstring-html-bindings"
-version = "0.1.6"
+version = "0.1.7"
 description = "Native Python bindings for tstring-html"
 readme = "README.md"
 license = { text = "MIT" }

{tstring_html_bindings-0.1.6 → tstring_html_bindings-0.1.7}/tstring-html-bindings/Cargo.toml

@@ -19,8 +19,8 @@ extension-module = ["pyo3/extension-module"]
 
 [dependencies]
 pyo3 = { workspace = true, features = ["abi3-py314"] }
-tstring-html = { version = "0.1.6", path = "../tstring-html-rs" }
-tstring-thtml = { version = "0.1.6", path = "../tstring-thtml-rs" }
+tstring-html = { version = "0.1.7", path = "../tstring-html-rs" }
+tstring-thtml = { version = "0.1.7", path = "../tstring-thtml-rs" }
 tstring-syntax.workspace = true
 
 [dev-dependencies]

{tstring_html_bindings-0.1.6 → tstring_html_bindings-0.1.7}/tstring-html-bindings/src/lib.rs

@@ -18,7 +18,8 @@ create_exception!(tstring_html_bindings, TemplateSemanticError, TemplateError);
 create_exception!(tstring_html_bindings, TemplateRuntimeError, TemplateError);
 
 const PARSE_CACHE_CAPACITY: usize = 256;
-const CONTRACT_VERSION: u32 = 1;
+const CONTRACT_VERSION: u32 = 2;
+const REGISTRY_TYPE_ERROR: &str = "registry= must be mapping-like.";
 const CONTRACT_SYMBOLS: &[&str] = &[
     "TemplateError",
     "TemplateParseError",
@@ -197,16 +198,30 @@ impl PyCompiledHtmlTemplate {
 
 #[pymethods]
 impl PyCompiledThtmlTemplate {
-    #[pyo3(signature = (values, globals = None, locals = None))]
+    #[pyo3(signature = (values, globals = None, locals = None, registry = None))]
     fn render(
         &self,
         py: Python<'_>,
         values: Vec<Py<PyAny>>,
         globals: Option<&Bound<'_, PyDict>>,
         locals: Option<&Bound<'_, PyDict>>,
+        registry: Option<&Bound<'_, PyAny>>,
     ) -> PyResult<String> {
+        let (globals, locals) = normalize_scope_inputs(
+            py,
+            globals,
+            locals,
+            registry,
+            "CompiledThtmlTemplate.render",
+        )?;
         let context = runtime_context_from_values(py, &values)?;
-        render_thtml_document(py, self.compiled.document(), &context, globals, locals)
+        render_thtml_document(
+            py,
+            self.compiled.document(),
+            &context,
+            globals.as_ref(),
+            locals.as_ref(),
+        )
     }
 
     fn __repr__(&self) -> String {
@@ -415,6 +430,42 @@ fn runtime_context_from_values(py: Python<'_>, values: &[Py<PyAny>]) -> PyResult
     })
 }
 
+fn registry_to_scope_dict<'py>(
+    py: Python<'py>,
+    registry: &Bound<'py, PyAny>,
+) -> PyResult<Bound<'py, PyDict>> {
+    let builtins = py.import("builtins")?;
+    let dict = builtins
+        .getattr("dict")?
+        .call1((registry,))
+        .map_err(|_| PyTypeError::new_err(REGISTRY_TYPE_ERROR))?;
+    dict.cast_into::<PyDict>()
+        .map_err(|_| PyTypeError::new_err(REGISTRY_TYPE_ERROR))
+}
+
+fn normalize_scope_inputs<'py>(
+    py: Python<'py>,
+    globals: Option<&Bound<'py, PyDict>>,
+    locals: Option<&Bound<'py, PyDict>>,
+    registry: Option<&Bound<'py, PyAny>>,
+    api_name: &str,
+) -> PyResult<(Option<Bound<'py, PyDict>>, Option<Bound<'py, PyDict>>)> {
+    if registry.is_some() && (globals.is_some() || locals.is_some()) {
+        return Err(PyTypeError::new_err(format!(
+            "{api_name} does not allow combining registry= with globals= or locals=."
+        )));
+    }
+
+    if let Some(registry) = registry {
+        return Ok((
+            Some(registry_to_scope_dict(py, registry)?),
+            Some(PyDict::new(py)),
+        ));
+    }
+
+    Ok((globals.cloned(), locals.cloned()))
+}
+
 fn render_thtml_document(
     py: Python<'_>,
     document: &Document,
@@ -788,7 +839,7 @@ fn resolve_component<'py>(
         )));
     }
     Err(runtime_error_to_py(format!(
-        "Unknown component '{name}'. Pass globals= or locals= explicitly."
+        "Unknown component '{name}'. Pass registry=, globals=, or locals= explicitly."
     )))
 }
 
@@ -799,7 +850,7 @@ fn default_scope_dict<'py>(py: Python<'py>, globals: bool) -> PyResult<Bound<'py
         .call1((1,)) // immediate caller only
         .map_err(|_| {
             runtime_error_to_py(
-                "Caller-frame inspection failed. Pass globals= or locals= explicitly.",
+                "Caller-frame inspection failed. Pass registry=, globals=, or locals= explicitly.",
             )
         })?;
     let dict = if globals {
@@ -808,7 +859,9 @@ fn default_scope_dict<'py>(py: Python<'py>, globals: bool) -> PyResult<Bound<'py
         frame.getattr("f_locals")?
     };
     dict.cast_into::<PyDict>().map_err(|_| {
-        runtime_error_to_py("Caller-frame inspection failed. Pass globals= or locals= explicitly.")
+        runtime_error_to_py(
+            "Caller-frame inspection failed. Pass registry=, globals=, or locals= explicitly.",
+        )
     })
 }
 
@@ -886,17 +939,26 @@ fn compile_thtml_template(
     })
 }
 
-#[pyfunction(signature = (template, globals = None, locals = None))]
+#[pyfunction(signature = (template, globals = None, locals = None, registry = None))]
 fn render_thtml_template(
     py: Python<'_>,
     template: &Bound<'_, PyAny>,
     globals: Option<&Bound<'_, PyDict>>,
     locals: Option<&Bound<'_, PyDict>>,
+    registry: Option<&Bound<'_, PyAny>>,
 ) -> PyResult<String> {
     let bound = extract_template(py, template, "render_thtml_template")?;
+    let (globals, locals) =
+        normalize_scope_inputs(py, globals, locals, registry, "render_thtml_template")?;
     let compiled = compile_cached_thtml(&bound)?;
     let context = runtime_context_from_bound(py, &bound)?;
-    render_thtml_document(py, compiled.document(), &context, globals, locals)
+    render_thtml_document(
+        py,
+        compiled.document(),
+        &context,
+        globals.as_ref(),
+        locals.as_ref(),
+    )
 }
 
 #[pymodule]

{tstring_html_bindings-0.1.6 → tstring_html_bindings-0.1.7}/tstring-thtml-rs/Cargo.toml

@@ -9,5 +9,5 @@ rust-version.workspace = true
 version.workspace = true
 
 [dependencies]
-tstring-html = { version = "0.1.6", path = "../tstring-html-rs" }
+tstring-html = { version = "0.1.7", path = "../tstring-html-rs" }
 tstring-syntax.workspace = true