Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

new features & code modernization #19

Open
wants to merge 34 commits into
base: master
Choose a base branch
from
Open

new features & code modernization #19

wants to merge 34 commits into from

Conversation

grob
Copy link
Contributor

@grob grob commented May 6, 2021

  • new features:
    • allow relative paths in include and extend tags
    • cache included templates in render context to avoid re-parsing of template in loops
    • prevent circular and self-extends
  • "modernized" code

Robert Gaggl added 30 commits April 20, 2021 15:08
first iteration of code modernization
d50c466
ringo's generator implementation appearently breaks the prototype cha…
98e048c 
…in, so use a custom cycle iterator instead
use custom generator implemention, the former doesn't work in ringo v3.x
1caa746
output the test case name if assertion fails
8d5e29b
next step in code modernization, tests pass
5b32508
replaced forEach callbacks with arrow functions (saves re-scoping)
26fa09c
fixed some regressions, replaced "in" checks with hasOwnProperty
2bde25b
code modernization
fd7f780
fixed check
9f86f4b
pass the environment to loader.loadTemplateSource
9b429a8 
the environment is required for template compilation in caching loader
use destructuring assignment
af7b230
used arrow functions in various places
2b5231f
fixed error template
ad0ac94
minor jsdoc fixes
d872ce6
use arrow functions where possible, fixed some minor warnings
107a0af
use native string.startsWith instead of strings module version
f94fe9e
slightly simplified retrieving block content in createToken
0fe25e7
removed noop functions from parser
dc50416
simplified loadTemplateSource
95604b6
modified safeJoin to use java.nio.Path(s)
dbce4a8
simplified filter expression regex and tuned parsing
ad9e0b9
simplified FilterExpression.prototype.resolve()
004c02d
simplified regex used in splitContents
528b021
removed unused split function
26272d5
allow relative paths in include and extends nodes
8dd214f 
this required passing the origin to the non-debug parser too (i dunno
why this wasn't done before).
filesystem origin now contains the absolute file path
15858b9 
the loader directories stored in origin until this change weren't used anywhere,
and are still accessible in origin.loader.templateDirs - but the absolute file
path wasn't stored anywhere, but will be necessary for an upcoming change:
skipping the template containing an extends tag from extending itself.
cache include templates in the toplevel render context
f2c9a25 
this avoids re-parsing included templates in for loops
prevent circular and self extends
ef7fcb2 
added a history array to context that contains the absolute paths
of all _extending_ templates. loaders need to check against
this array and exclude already used templates.
re-added parser noop-functions - these are implemented by DebugParser
25d4b09 
see dc50416#r50471128
fixed regression introduced in 25d4b09
77f505a
Robert Gaggl and others added 4 commits May 10, 2021 08:37
fixed token content replacements
a144828 
using a regex instead of a string as first argument to replace, since
using a string would only replace the first occurrence
enabled some more tests, these now pass too
83abbbf
simplified check if in verbatim node
9c9be43
@botic
Sets the default locale before running tests
090ebd2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@grob @oberhamsi @botic