Extract the variables into python types to get into the correct matcharm from the start

src/render/common.rs

@@ -3,16 +3,16 @@ use std::collections::HashMap;
 
 use pyo3::prelude::*;
 
+use super::types::{Content, Context};
+use super::{Render, RenderResult, Resolve, ResolveResult};
 use crate::error::RenderError;
 use crate::parse::{TagElement, TokenTree};
+use crate::render::types::PythonTypes;
 use crate::types::Argument;
 use crate::types::ArgumentType;
 use crate::types::TemplateString;
 use crate::types::Text;
 use crate::types::Variable;
-use super::{Render, RenderResult, Resolve, ResolveResult};
-use super::types::{Content, Context};
-
 
 impl Resolve for Variable {
     fn resolve<'t, 'py>(
@@ -43,7 +43,7 @@ impl Resolve for Variable {
                                     key_at: key_at.into(),
                                     object_at: Some(object_at.into()),
                                 }
-                                .into())
+                                .into());
                             }
                         };
                         match variable.get_item(int) {
@@ -55,7 +55,14 @@ impl Resolve for Variable {
             };
             object_at.1 += key_at.1 + 1;
         }
-        Ok(Some(Content::Py(variable)))
+        let python_type: PythonTypes = variable.extract()?;
+        let content = match python_type {
+            PythonTypes::Int(data) => Content::Int(data),
+            PythonTypes::Float(data) => Content::Float(data),
+            PythonTypes::String(data) => Content::String(Cow::Owned(data)),
+            PythonTypes::CatchAll(data) => Content::Py(data),
+        };
+        Ok(Some(content))
     }
 }
 

src/render/filters.rs

@@ -446,8 +446,9 @@ mod tests {
 
         Python::with_gil(|py| {
             let engine = EngineData::empty();
-            let template_string = "{{ var|default:1|slugify }}".to_string();
+            let template_string = "{{ var|slugify }}".to_string();
             let context = PyDict::new(py);
+            context.set_item("var", 1).unwrap();
             let template = Template::new_from_string(py, template_string, &engine).unwrap();
             let result = template.render(py, Some(context), None).unwrap();
 

src/render/types.rs

@@ -63,6 +63,17 @@ fn resolve_python<'t>(value: Bound<'_, PyAny>, context: &Context) -> PyResult<Co
     ))
 }
 
+#[derive(Debug, FromPyObject)]
+pub enum PythonTypes<'py> {
+    #[pyo3(transparent)]
+    Int(BigInt),
+    #[pyo3(transparent)]
+    Float(f64),
+    #[pyo3(transparent)]
+    String(String),
+    CatchAll(Bound<'py, PyAny>),
+}
+
 #[derive(Debug, IntoPyObject)]
 pub enum Content<'t, 'py> {
     Py(Bound<'py, PyAny>),