Guard is escaped checks with is defined - #115
Open
colinrotherham wants to merge 7 commits into
Open
Conversation
|
colinrotherham
changed the title
is escaped checks with is defined and … is escapedis escaped checks with is defined
colinrotherham
commented
Aug 27, 2026
Comment on lines
+75
to
+91
| macro_name = component_name_to_macro_name(component_name) | ||
| macro_path = f"nhsuk/components/{component_name}/macro.jinja" | ||
| macro_string = f'{{% from "{macro_path}" import {macro_name} -%}}\n\n' | ||
| macro_call = f"{macro_name}()" | ||
|
|
||
| if context: | ||
| macro_call = f"{macro_name}({json.dumps(context, ensure_ascii=False)})" | ||
|
|
||
| # If we're nesting child components or text, pass the children to the macro | ||
| # using the 'caller' Jinja feature | ||
| macro_string += ( | ||
| f"{{% call {macro_call} %}}\n{call_block.strip()}\n{{%- endcall %}}" | ||
| if call_block | ||
| else f"{{{{ {macro_call} }}}}" | ||
| ) | ||
|
|
||
| return environment.from_string(macro_string).render().rstrip() |
Contributor
Author
There was a problem hiding this comment.
Please excuse all the renaming
I've copied the naming convention and new-line trimming from:
https://github.com/nhsuk/nhsuk-frontend/blob/main/packages/nhsuk-frontend/src/nhsuk/lib/nunjucks/index.mjs#L44
I got close to have all tests passing without needing a formatter
One to finish off another day though
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Looks like we've found an issue with Jinja's
is escapedwhen ChainableUndefined is usedReplacing the
is escapedcheck withis defined and … is escapedresolves the issueRaised this with Jinja in pallets/jinja#2244