Jinja2 extensions now configurable

(and "jinja2.ext.do" no longer used by default)

Author: dannyadair

src/pdfbaker/page.py

@@ -93,13 +93,23 @@ def process(self) -> Path:
                 self.log_trace_preview(f.read())
 
         try:
-            jinja_env = create_env(self.config.template.parent)
+            jinja_extensions = self.config.get("jinja2_extensions", [])
+            if jinja_extensions:
+                self.log_debug("Using Jinja2 extensions: %s", jinja_extensions)
+            jinja_env = create_env(
+                templates_dir=self.config.template.parent,
+                extensions=jinja_extensions,
+            )
             template = jinja_env.get_template(self.config.template.name)
         except TemplateNotFound as exc:
             raise SVGTemplateError(
                 "Failed to load template for page "
                 f"{self.number} ({self.config.name}): {exc}"
             ) from exc
+        except TemplateError as exc:
+            raise SVGTemplateError(
+                f"Template error for page {self.number} ({self.config.name}): {exc}"
+            ) from exc
 
         template_context = prepare_template_context(
             self.config,

src/pdfbaker/render.py

@@ -39,16 +39,17 @@ def replacer(match: re.Match[str]) -> str:
         return rendered
 
 
-def create_env(templates_dir: Path | None = None) -> jinja2.Environment:
+def create_env(
+    templates_dir: Path | None = None, extensions: list[str] | None = None
+) -> jinja2.Environment:
     """Create and configure the Jinja environment."""
     if templates_dir is None:
         raise ValueError("templates_dir is required")
 
     env = jinja2.Environment(
         loader=jinja2.FileSystemLoader(str(templates_dir)),
         autoescape=jinja2.select_autoescape(),
-        # FIXME: extensions configurable
-        extensions=["jinja2.ext.do"],
+        extensions=extensions or [],
     )
     env.template_class = HighlightingTemplate
     return env