refactor: major template engine refactor (AST-based)#27
Open
Farrael wants to merge 36 commits intoElliesaur:mainfrom
Open
refactor: major template engine refactor (AST-based)#27Farrael wants to merge 36 commits intoElliesaur:mainfrom
Farrael wants to merge 36 commits intoElliesaur:mainfrom
Conversation
MrMineO5
requested changes
Feb 7, 2026
src/main/java/au/ellie/hyui/html/template/context/FilterRegistry.java
Outdated
Show resolved
Hide resolved
src/main/java/au/ellie/hyui/html/template/context/FilterRegistry.java
Outdated
Show resolved
Hide resolved
src/main/java/au/ellie/hyui/html/template/context/FilterRegistry.java
Outdated
Show resolved
Hide resolved
src/main/java/au/ellie/hyui/html/template/context/VariableStack.java
Outdated
Show resolved
Hide resolved
- Introduced ElseIfAttribute and ElseAttribute records to handle else-if and else conditions in templates. - Updated ControlAttribute to include an indexName for iteration. - Modified EachBlockNode to accommodate the new indexName parameter. - Enhanced parser to support new syntax for each blocks with index. - Implemented grouping of conditional chains in the template processor. - Added tests for conditional rendering with if/else-if/else chains.
…g literals - Add parsing for inline if blocks within attribute values - Enhance string literal parsing to handle single quotes - Update tests to cover inline if blocks and single-quoted strings
…ving attribute handling - Introduced a set of void elements that are self-closing and cannot have children. - Updated the component evaluation logic to skip rendering completely empty non-void elements with no attributes to prevent layout issues. - Improved error handling in the parser for unclosed inline if blocks and unexpected tokens. - Added tests to verify correct rendering of void elements and handling of empty elements.
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
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.
Summary
This PR introduces a complete rewrite of how templates are parsed and processed, thanks to the help of @KelpyCode .
Templates are now compiled into an AST, producing:
These structures are cached to improve performance when updating values, without having to re-parse or rebuild the template (as long as the template itself or the component set doesn’t change).
What changed
AST-based processing
forandeachflow as attributes on HTML elementsImproved variable system
Functions in variables
callFunctionWithArgumentsfor examples.Each improvements
{{ each $item, $index in $items }} ... {{ /each }}{{$key}} instead of {{$item.key}}…but only if it does not shadow an existing variable. (using the same name as a declared one)
Breaking changes
Declaration
$.eachandifshould not use the symbol#at the beginning.❌ Old:
{{#if variable ...}} ... {{/if}}✅ New:
{{if $variable ...}} ... {{/if}}Component syntax change
if="..."/else-if=""/elseto create conditional tagsfor=""to create duplicated tags@<name>=""to create events listeners❌ Old:
{{@special:foo=bar}}✅ New:
Supplier / Function caching
SupplierandFunctionmust now specify the caching policy when used❌ Old:
✅ New:
Keywords
eachblock renamedforforloop allow to retrieve key and valuex contains Yis nowy in $x❌ Old:
{{#each variable ...}} ... {{/if}}✅ New:
{{for $value, $key in $variable}} ... {{/for}} {{for $value in $variable}} ... {{/for}} {{for $variable}} ... {{/for}}Children support
Tip
$slot:<name>is still accessible as variable as a string already parsed and resolvedVariable resolution rules
Tests
Example
Notes
kelpy(discord) did on Feature/template dx #28<template>block are not implemented here