feat: add caller pattern from jinja by pollend · Pull Request #422 · askama-rs/askama

pollend · 2025-04-30T05:01:13Z

I adjusted this quite heavily given the discussion in issue 282. This both adds the caller macro pattern and changes the syntax to align closer to jinja.

{% call super() %} is now {{ super() }}

https://jinja.palletsprojects.com/en/stable/templates/#call
https://jinja.palletsprojects.com/en/stable/templates/#child-template

{% macro render_dialog(title, class='dialog') -%}
    <div class="{{ class }}">
        <h2>{{ title }}</h2>
        <div class="contents">
            {{ caller() }}
        </div>
    </div>
{%- endmacro %}

{% call render_dialog('Hello World') %}
    This is a simple dialog rendered by using a macro and
    a call block.
{% endcall %}

GuillaumeGomez

Seems like a very good and solid start! I think the syntax should allow to have default values etc, but can be done in a follow-up. For now though, please support more than just identifiers as arguments when calling it.

GuillaumeGomez · 2025-05-05T14:31:21Z

+        source = r#"
+{%- macro test() -%}
+{{-  caller("test") -}}
+{{-  caller("test") -}}


Maybe replace "test" with 1 for this one? Like that we cover integer literals as well. :)

pollend · 2025-05-05T15:04:38Z

probably need a lot more test where to start?

GuillaumeGomez · 2025-05-05T15:07:49Z

Hard to say. ^^'

I have a few ideas:

What happens if you call caller() inside the call block?
What happens if you use named arguments in caller like caller(blue="a")?
Can you call a macro caller? (That should emit an error as it should not be allowed!)
What happens if you call caller outside of a macro?

And of course, all the same with super (which should support named arguments though).

pollend · 2025-05-06T02:20:36Z

the space handling was wrong didn't understand it on the first pass. I made some more adjustments hopefully the handling is correct now.

pollend · 2025-05-06T02:34:12Z

+error: missing `c` argument
+ --> InvalidNumberArguments.txt:3:18
+       "(\"a\", \"b\") -}}\n    {%- endmacro -%}\n    {%- call(a,b,c) test() -%}\n        {{- a"...
+  --> tests/ui/caller_arguments.rs:5:14
+   |
+5  |       source = r#"
+   |  ______________^
+6  | |     {% macro test() %}
+7  | |         {{- caller("a", "b") -}}
+8  | |     {%- endmacro -%}
+...  |
+11 | |     {%- endcall -%}
+12 | |     "#,
+   | |______^


this does not look quite correct it should be the call. umm, not sure how to address this.

Strange indeed, seems like the span is created from the start of the arguments and not of caller.

pollend · 2025-05-06T03:14:46Z

having to wrap every macro in {% call .. %} and {% endcall %} seems kind of annoying. would be nice to support this syntax as well: https://jinja.palletsprojects.com/en/stable/templates/#import we can do that later

pollend · 2025-05-07T00:04:24Z

I added more test cases. and addressed some problems.

GuillaumeGomez · 2025-05-07T14:57:52Z

having to wrap every macro in {% call .. %} and {% endcall %} seems kind of annoying. would be nice to support this syntax as well: https://jinja.palletsprojects.com/en/stable/templates/#import we can do that later

It's somewhat supported. Can be revisited though.

Signed-off-by: Michael Pollind <mpollind@gmail.com>

Co-authored-by: Guillaume Gomez <guillaume1.gomez@gmail.com>

Signed-off-by: Michael Pollind <mpollind@gmail.com>

Co-authored-by: Guillaume Gomez <guillaume1.gomez@gmail.com>

Signed-off-by: Michael Pollind <mpollind@gmail.com>

GuillaumeGomez · 2025-05-22T21:20:04Z

@Kijewski: The book build breakage is expected or is it a new dark magic bug? XD

pollend · 2025-05-22T23:12:51Z

@Kijewski: The book build breakage is expected or is it a new dark magic bug? XD

403 is a permission error

Kijewski · 2025-05-22T23:32:05Z

I re-ran the test, and it works now. The download is retried up to 3 times, but I guess 1 second in between is a bit short.

The examples use macros, and need to be updated, too.

Signed-off-by: Michael Pollind <mpollind@gmail.com>

GuillaumeGomez · 2025-05-23T11:57:15Z

CI is happy. Time to merge! Thanks a lot!

pollend force-pushed the feature/add-support-for-caller branch 2 times, most recently from ced67ce to f0cc0cb Compare April 30, 2025 05:24

pollend marked this pull request as draft April 30, 2025 15:53

pollend marked this pull request as ready for review May 1, 2025 02:23

pollend force-pushed the feature/add-support-for-caller branch from 7368ac2 to 0c47b3f Compare May 1, 2025 02:49

pollend changed the title ~~feat: add caller pattern for macro~~ feat: add caller pattern from jinja May 1, 2025

GuillaumeGomez reviewed May 5, 2025

View reviewed changes

Comment thread askama_derive/src/generator/node.rs Outdated

GuillaumeGomez reviewed May 5, 2025

View reviewed changes

Comment thread askama_derive/src/generator/node.rs Outdated

GuillaumeGomez reviewed May 5, 2025

View reviewed changes

Comment thread askama_parser/src/node.rs

GuillaumeGomez reviewed May 5, 2025

View reviewed changes

Comment thread book/src/template_syntax.md Outdated

GuillaumeGomez reviewed May 5, 2025

View reviewed changes

Comment thread book/src/template_syntax.md Outdated

GuillaumeGomez reviewed May 5, 2025

View reviewed changes

Comment thread book/src/template_syntax.md Outdated

GuillaumeGomez requested changes May 5, 2025

View reviewed changes

GuillaumeGomez reviewed May 5, 2025

View reviewed changes

pollend force-pushed the feature/add-support-for-caller branch from 1f50bbb to a70b7bc Compare May 6, 2025 02:28

pollend commented May 6, 2025

View reviewed changes

pollend force-pushed the feature/add-support-for-caller branch from f69db26 to aa1458c Compare May 6, 2025 23:58

pollend force-pushed the feature/add-support-for-caller branch 3 times, most recently from 34764cf to 329aa4e Compare May 7, 2025 00:52

GuillaumeGomez reviewed May 7, 2025

View reviewed changes

Comment thread book/src/template_syntax.md Outdated

GuillaumeGomez reviewed May 7, 2025

View reviewed changes

Comment thread book/src/template_syntax.md Outdated

GuillaumeGomez reviewed May 7, 2025

View reviewed changes

Comment thread book/src/template_syntax.md Outdated

GuillaumeGomez reviewed May 7, 2025

View reviewed changes

Comment thread book/src/template_syntax.md Outdated

pollend and others added 17 commits May 22, 2025 22:50

feat: add caller pattern for macro

b8c85a0

Signed-off-by: Michael Pollind <mpollind@gmail.com>

add docs

9215884

Signed-off-by: Michael Pollind <mpollind@gmail.com>

feat: add caller pattern and adjust syntax to closer match jinja

ce73e73

Signed-off-by: Michael Pollind <mpollind@gmail.com>

Update book/src/template_syntax.md

c88c401

Co-authored-by: Guillaume Gomez <guillaume1.gomez@gmail.com>

Update book/src/template_syntax.md

7370f95

Co-authored-by: Guillaume Gomez <guillaume1.gomez@gmail.com>

address comments

5c07ea6

Signed-off-by: Michael Pollind <mpollind@gmail.com>

tweak test

8862325

Signed-off-by: Michael Pollind <mpollind@gmail.com>

add test cases and rework spaces

ef489b6

Signed-off-by: Michael Pollind <mpollind@gmail.com>

simplify handler

b328a96

Signed-off-by: Michael Pollind <mpollind@gmail.com>

fix caller logic

0547c2e

Signed-off-by: Michael Pollind <mpollind@gmail.com>

address comments

c4fcd47

Signed-off-by: Michael Pollind <mpollind@gmail.com>

Update askama_derive/src/generator/node.rs

83057d8

Co-authored-by: Guillaume Gomez <guillaume1.gomez@gmail.com>

add more test add reserved word caller

f08ca46

Signed-off-by: Michael Pollind <mpollind@gmail.com>

Fix handling of endcall whitespace characters

3ab930d

Allow super in calls

06c32d6

Fix test_short_circuit test

aefd084

Improve error output

1acbc33

GuillaumeGomez dismissed their stale review via 1acbc33 May 22, 2025 21:11

GuillaumeGomez force-pushed the feature/add-support-for-caller branch from 4b70331 to 1acbc33 Compare May 22, 2025 21:11

pollend and others added 2 commits May 22, 2025 19:35

add missing endcall for examples

5bbaca5

Signed-off-by: Michael Pollind <mpollind@gmail.com>

Add missing endcall in examples

a2088e7

GuillaumeGomez approved these changes May 23, 2025

View reviewed changes

GuillaumeGomez merged commit 657dcea into askama-rs:master May 23, 2025
39 checks passed

pollend deleted the feature/add-support-for-caller branch May 23, 2025 13:57

Kijewski mentioned this pull request Jun 6, 2025

v0.15 release planning #477

Closed

oliviacrain mentioned this pull request Dec 30, 2025

Bump askama, askama_web to v0.15 kanidm/kanidm#4030

Merged

3 tasks

Conversation

pollend commented Apr 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

GuillaumeGomez left a comment

Choose a reason for hiding this comment

Uh oh!

GuillaumeGomez May 5, 2025

Choose a reason for hiding this comment

Uh oh!

pollend commented May 5, 2025

Uh oh!

GuillaumeGomez commented May 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pollend commented May 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pollend May 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

GuillaumeGomez May 7, 2025

Choose a reason for hiding this comment

Uh oh!

pollend commented May 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pollend commented May 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

GuillaumeGomez commented May 7, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

GuillaumeGomez commented May 22, 2025

Uh oh!

pollend commented May 22, 2025

Uh oh!

Kijewski commented May 22, 2025

Uh oh!

GuillaumeGomez commented May 23, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

pollend commented Apr 30, 2025 •

edited

Loading

GuillaumeGomez commented May 5, 2025 •

edited

Loading

pollend commented May 6, 2025 •

edited

Loading

pollend May 6, 2025 •

edited

Loading

pollend commented May 6, 2025 •

edited

Loading

pollend commented May 7, 2025 •

edited

Loading