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.

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

Update devel #102

Merged
merged 224 commits into from
Aug 9, 2024
Merged
Changes from 1 commit
Commits
Show all changes
224 commits
Select commit Hold shift + click to select a range
2b36367
Signed-off-by: David Krause <krause@biochem2.uni-frankfurt.de>
Aug 13, 2021
864d2f2
Merge pull request #14 from enthus1ast/devel
enthus1ast Aug 18, 2021
05bb4ee
templates can expand to iterator body (when iter = true)
Aug 19, 2021
8cf499c
condenseStrings now operates on FsNode, simpler code;
Aug 19, 2021
fe7e916
Merge branch 'newLexer' into newLexerAgain
Aug 20, 2021
fb35340
new lexer but tests are still failing
Aug 20, 2021
89b6d7e
nex lexer; closes #16, closes #8 ; #17 is not finished yet, lines are…
Aug 21, 2021
32ed438
inc version
Aug 21, 2021
d9e59a1
Signed-off-by: David Krause <krause@biochem2.uni-frankfurt.de>
Aug 23, 2021
80b0182
also test examples. Closes #18
Aug 26, 2021
a8a3925
install dependencies for testing; inc version
Aug 26, 2021
fc199bd
fix prologue installation in tests
Aug 26, 2021
26b96d8
make dynamic library example green
Aug 26, 2021
8982f9d
condense code
Aug 26, 2021
9268071
fix illformed ast
Aug 27, 2021
94bb18d
Signed-off-by: David Krause <krause@biochem2.uni-frankfurt.de>
Aug 28, 2021
5ac0816
Merge branch 'master' into fixBlocks
Aug 28, 2021
8f23c47
make include nwt work at runtime
Aug 28, 2021
ce99187
Merge branch 'master' into fixBlocks
Aug 28, 2021
a39e46c
wip
Aug 28, 2021
7c66fcb
first working version of multi extend, also fixes inner blocks.
Aug 30, 2021
039b971
fixes #19 ; inc version
Aug 31, 2021
660779b
remove temp file
Aug 31, 2021
b648e1b
cleanup simpler cache logic
Aug 31, 2021
70b0767
rename test to make tests green
Aug 31, 2021
61b27f5
Update readme.md
enthus1ast Aug 31, 2021
cb7b7ff
Merge pull request #20 from enthus1ast/fixBlocks
enthus1ast Aug 31, 2021
0cef45e
remove debug echo
Aug 31, 2021
cbded1b
cleanup lexer
Aug 31, 2021
4e8e8cf
enable escape tests
Aug 31, 2021
cc3d5ad
added nimja utils
Sep 1, 2021
d3ee0d6
added tests
Sep 1, 2021
1206e1b
inc version
Sep 1, 2021
5c9dab7
added documentation
Sep 1, 2021
a4e45f5
added (dumb) in browser playground example
Sep 1, 2021
df820c7
Update readme.md
enthus1ast Sep 2, 2021
d3b422d
Signed-off-by: David Krause <krause@biochem2.uni-frankfurt.de>
Sep 6, 2021
29f0e1c
if tests run
Sep 6, 2021
16ec3ad
fixes #25 ; inc version
Sep 6, 2021
59701f5
Merge pull request #26 from enthus1ast/fix25
enthus1ast Sep 6, 2021
eac5f99
Update readme.md
enthus1ast Sep 6, 2021
911d95d
added "~" (stringify and concat operator) to nimjautils; inc version
Sep 8, 2021
9f6286f
added '~' to the readme
Sep 8, 2021
a60c9af
Merge pull request #27 from enthus1ast/tilde
enthus1ast Sep 8, 2021
5e9c82e
added procs #28 ; inc version
Sep 8, 2021
bcd337f
remove unneeded
Sep 8, 2021
8a13903
Merge pull request #29 from enthus1ast/procs
enthus1ast Sep 8, 2021
6833fc5
Signed-off-by: David Krause <krause@biochem2.uni-frankfurt.de>
Sep 9, 2021
272970d
Signed-off-by: David Krause <krause@biochem2.uni-frankfurt.de>
Sep 9, 2021
a6abf50
Merge branch 'procs'
Sep 9, 2021
146ee1d
added funcs; inc version
Sep 9, 2021
6144963
Merge pull request #30 from enthus1ast/func
enthus1ast Sep 9, 2021
1406337
Signed-off-by: David Krause <krause@biochem2.uni-frankfurt.de>
Sep 10, 2021
8adb8b8
Signed-off-by: David Krause <krause@biochem2.uni-frankfurt.de>
Sep 11, 2021
3d41878
Signed-off-by: David Krause <krause@biochem2.uni-frankfurt.de>
Sep 11, 2021
154f196
try to make tests green
Sep 11, 2021
ae5e7b6
another try
Sep 11, 2021
8b18ae6
Signed-off-by: David Krause <krause@biochem2.uni-frankfurt.de>
Sep 11, 2021
b0d7be1
Merge pull request #31 from enthus1ast/includeRaw
enthus1ast Sep 11, 2021
453a1d7
Added new logo to readme, thank you jyapayne
enthus1ast Sep 14, 2021
252f5cd
added new logo
Sep 14, 2021
0135983
added "nl2br"
Sep 14, 2021
7a6c795
Signed-off-by: David Krause <krause@biochem2.uni-frankfurt.de>
Sep 14, 2021
1c583a3
Merge pull request #33 from enthus1ast/nl2br
enthus1ast Sep 14, 2021
e46fef7
added whitespace control
enthus1ast Sep 19, 2021
fd5bd1a
do not whitespace control on FsStr
enthus1ast Sep 19, 2021
8ac5234
Merge pull request #34 from enthus1ast/whitespaceControl
enthus1ast Sep 19, 2021
7b9989f
added spaceless filter
enthus1ast Sep 21, 2021
def5421
make importnwt use the default compile proc.
enthus1ast Sep 21, 2021
4be8c72
Signed-off-by: David Krause <enthus1ast@users.noreply.github.com>
enthus1ast Sep 22, 2021
8f20795
Merge pull request #35 from enthus1ast/fixNwtImport
enthus1ast Sep 23, 2021
95ca628
added slugify
enthus1ast Oct 13, 2021
a9fb87b
Merge pull request #37 from enthus1ast/slugify
enthus1ast Oct 13, 2021
cb6209b
remove unused assignment
enthus1ast Oct 14, 2021
9ed3b6d
Merge branch 'cleanup'
enthus1ast Oct 14, 2021
a4d0853
Fixed compilation error for jester example
adyxax Oct 20, 2021
9a03b46
Signed-off-by: David Krause <enthus1ast@users.noreply.github.com>
enthus1ast Oct 20, 2021
08d7c69
Merge pull request #40 from enthus1ast/fiximportissue
enthus1ast Oct 20, 2021
ab29213
Merge pull request #39 from adyxax/master
enthus1ast Oct 20, 2021
376871e
small cleanup, document includeRaw (#42) and spaceless
enthus1ast Feb 13, 2022
b6a21a1
added includeRawStaticAsDataurl and includeRawStatic
enthus1ast Feb 13, 2022
e656805
cleanup and renamed includeRawStaticAsDataurl to includeStaticAsDataurl
enthus1ast Feb 13, 2022
a24f199
inc version
enthus1ast Feb 13, 2022
20e358a
Merge branch 'master' of https://github.com/enthus1ast/nimja
enthus1ast Feb 13, 2022
995b682
added changelog entry
enthus1ast Feb 13, 2022
fd121d1
added documentation for includeRawStatic and includeStaticAsDataurl
enthus1ast Feb 13, 2022
be30b5e
Removed some unneeded tests
enthus1ast Feb 24, 2022
3c574e9
Signed-off-by: David Krause <enthus1ast@users.noreply.github.com>
enthus1ast Feb 27, 2022
b1fd50b
`?` also supports iterator now.
enthus1ast Feb 27, 2022
65038db
inc version
enthus1ast Feb 27, 2022
aa37f0d
remove {.dirty.} pragma from `?`
enthus1ast Feb 27, 2022
8f9a983
added documentation
enthus1ast Feb 27, 2022
3620928
switch to recent nim version for github tests,
enthus1ast Feb 27, 2022
86556f5
Merge pull request #45 from enthus1ast/shorthandif
enthus1ast Feb 27, 2022
0bd4778
Added ajusa's benchmark to readme.md
enthus1ast Feb 27, 2022
7b11cae
Added nimja iterator benchmark
enthus1ast Feb 27, 2022
13150f3
added example for raw strings to readme.md
enthus1ast Feb 27, 2022
b34c535
fix raw strings example
enthus1ast Feb 27, 2022
e71e51d
add {{"""FOO BAA"""}} functionallity.
enthus1ast Feb 27, 2022
74a7cd3
Merge branch 'master' of https://github.com/enthus1ast/nimja into triple
enthus1ast Feb 27, 2022
71c4a14
Better documentation for compileTemplateFile / compileTemplateStr
enthus1ast Feb 28, 2022
896f42c
Merge branch 'master' of https://github.com/enthus1ast/nimja.git into…
enthus1ast Feb 28, 2022
2dde3ff
fix prologue example #44
enthus1ast Mar 3, 2022
02575e9
Merge pull request #47 from enthus1ast/triple
enthus1ast Mar 3, 2022
32a9160
Merge pull request #48 from enthus1ast/fixPrologue
enthus1ast Mar 3, 2022
e4f42fa
small readme changes
enthus1ast Mar 3, 2022
35fd263
hcr
enthus1ast Mar 8, 2022
b1b3ed7
wip on readme for hcr; hcr example; inc version
enthus1ast Mar 9, 2022
a8d0ee1
hot code reloading closes #6
enthus1ast Mar 9, 2022
2b09ba0
Signed-off-by: David Krause <enthus1ast@users.noreply.github.com>
enthus1ast Mar 9, 2022
377a4f1
Merge branch 'hcr'
enthus1ast Mar 9, 2022
a734070
fix readme
enthus1ast Mar 9, 2022
a829aae
added `|` or "filter", to nimjautils.
enthus1ast Mar 10, 2022
ecaba50
small readme change
enthus1ast Mar 10, 2022
94c3f7e
added self.blockname closes #24
enthus1ast Mar 10, 2022
881f012
Merge pull request #50 from enthus1ast/selfVariable
enthus1ast Mar 10, 2022
2ecffde
Signed-off-by: David Krause <enthus1ast@users.noreply.github.com>
enthus1ast Mar 10, 2022
0531359
Merge branch 'changedBechmarkSize'
enthus1ast Mar 10, 2022
239d455
fix typos
enthus1ast Mar 10, 2022
8dd5f14
make `specialSelf` var changeable, fix whitespace control bug (strip …
enthus1ast Mar 10, 2022
dc94675
Signed-off-by: David Krause <enthus1ast@users.noreply.github.com>
enthus1ast Mar 10, 2022
9823227
filter `|` can now support multiple parameters. closes #52
enthus1ast Mar 13, 2022
653374c
Signed-off-by: David Krause <enthus1ast@users.noreply.github.com>
enthus1ast Mar 13, 2022
60d37ab
find the tmpls.nim next to the host
enthus1ast Mar 23, 2022
facf544
added shortcut functions for compileTemplateFile and compileTemplateS…
enthus1ast Mar 24, 2022
cbfa777
Merge pull request #56 from enthus1ast/shortcutfunctions
enthus1ast Mar 25, 2022
c1fd37c
added readme for tmpls and tmplf
enthus1ast Mar 25, 2022
a2b01b4
Signed-off-by: David Krause <enthus1ast@users.noreply.github.com>
enthus1ast Mar 25, 2022
d8c0abb
Merge pull request #57 from enthus1ast/shortcutfunctions
enthus1ast Mar 25, 2022
45198ad
Added `{{endfunc}}` `{{endproc}}` `{{endmacro}}` for consistency. Clo…
enthus1ast Mar 28, 2022
b394ee6
Merge pull request #59 from enthus1ast/endnames
enthus1ast Mar 28, 2022
fca5f1e
new attempt to fix the shorthands (for eg jester) #55
enthus1ast Mar 28, 2022
0b55002
Merge pull request #60 from enthus1ast/fixshorthands
enthus1ast Mar 28, 2022
6a0cb00
fix compilation
enthus1ast Mar 29, 2022
23a96d4
Signed-off-by: David Krause <enthus1ast@users.noreply.github.com>
enthus1ast Mar 29, 2022
0f8c6d2
Merge pull request #61 from enthus1ast/fixshorthands
enthus1ast Mar 29, 2022
225e3a6
Merge pull request #62 from enthus1ast/testshorthands
enthus1ast Mar 29, 2022
d3b4b7c
skip nodes if they're empty after string condense; Added varname readme.
enthus1ast Apr 8, 2022
12d2ca8
inc version
enthus1ast Apr 8, 2022
f5ac06a
added readme for importing proc/func/macro
enthus1ast Apr 8, 2022
81ab8b8
added procsMaster.html
enthus1ast Apr 8, 2022
d83718a
remove unused test
enthus1ast Apr 8, 2022
9b19b26
Merge pull request #64 from enthus1ast/noCodegenForEmpty
enthus1ast Apr 8, 2022
8e23a90
Update hcrutils.nim
xaqbr Jun 27, 2022
cfc5ece
Version bump
xaqbr Jun 28, 2022
620acee
Merge pull request #65 from xankz/master
enthus1ast Jun 29, 2022
4f60a80
Massive truncate() performance gain.
enthus1ast Jul 2, 2022
515848b
Merge pull request #66 from enthus1ast/fasterTruncate
enthus1ast Jul 2, 2022
ee4377e
Signed-off-by: David Krause <enthus1ast@users.noreply.github.com>
enthus1ast Jul 4, 2022
e7767ff
Merge pull request #67 from enthus1ast/fasterParser
enthus1ast Jul 4, 2022
016ea36
Improved runtime performance for extended templates.
enthus1ast Jul 7, 2022
0469e9e
Signed-off-by: David Krause <enthus1ast@users.noreply.github.com>
enthus1ast Jul 7, 2022
2d6f348
Merge pull request #68 from enthus1ast/fasterExtendedTemplates
enthus1ast Jul 7, 2022
1450617
tries to preallocate the result string thus saveing reallocations, ca…
enthus1ast Jul 8, 2022
c22d47a
Merge pull request #69 from enthus1ast/stringPreallocation
enthus1ast Jul 8, 2022
db83367
Associate .nwt file in VSCode for color syntax
foxoman Jul 10, 2022
173fa73
Add New Nimja Templ file
foxoman Jul 11, 2022
975a86c
Add Nimja template files to VSCode
foxoman Jul 11, 2022
0f811fa
Merge pull request #70 from foxoman/patch-1
enthus1ast Jul 11, 2022
bd44433
add nimble file
enthus1ast Aug 10, 2022
20d26b0
Merge branch 'master' of https://github.com/enthus1ast/nimja.git
enthus1ast Aug 10, 2022
e55314a
changed .nwt to .nimja in the readme, tests and examples.
enthus1ast Aug 12, 2022
dcd1a94
Merge pull request #71 from enthus1ast/bigRename
enthus1ast Aug 12, 2022
360461a
added importnimja deprecate importnwt; fix typos in parser; some exam…
enthus1ast Aug 13, 2022
096b4e2
cleanup
enthus1ast Aug 13, 2022
a242dee
inc version
enthus1ast Aug 13, 2022
e1bc2ec
Merge pull request #73 from enthus1ast/bigRename
enthus1ast Aug 13, 2022
4e9a811
added "when"
enthus1ast Aug 14, 2022
5eeda45
inc version
enthus1ast Aug 14, 2022
9fa6a17
added readme entry for `when`
enthus1ast Aug 14, 2022
8a5ddc5
Merge pull request #74 from enthus1ast/when
enthus1ast Aug 14, 2022
88536f7
Update readme.md
enthus1ast Aug 14, 2022
03cfe8e
`tmpls` and `tmplf` with context!
enthus1ast Aug 17, 2022
c8ccb16
Signed-off-by: David Krause <enthus1ast@users.noreply.github.com>
enthus1ast Aug 17, 2022
bdc3029
Merge branch 'master' into tmplswithcontext
enthus1ast Aug 17, 2022
9834bf1
Merge pull request #76 from enthus1ast/tmplswithcontext
enthus1ast Aug 17, 2022
43cdaa7
Signed-off-by: David Krause <enthus1ast@users.noreply.github.com>
enthus1ast Aug 17, 2022
f1ff272
BREAKING CHANGE!!; changed the context to table syntax;
enthus1ast Aug 18, 2022
a994e8e
Signed-off-by: David Krause <enthus1ast@users.noreply.github.com>
enthus1ast Aug 18, 2022
680dd57
added readme; regenerate docs
enthus1ast Aug 18, 2022
afcfb72
tmpls and tmplf compiles without context now.
enthus1ast Aug 18, 2022
e715dfc
Merge pull request #78 from enthus1ast/contextastable
enthus1ast Aug 18, 2022
a5d9c94
added unicode test
enthus1ast Aug 31, 2022
33c2ce4
added test for unicode symbols
enthus1ast Aug 31, 2022
a08b5fd
Merge branch 'master' into test_unicode
enthus1ast Sep 1, 2022
f54cc4b
Merge pull request #80 from enthus1ast/test_unicode
enthus1ast Sep 2, 2022
432046d
added case
enthus1ast Sep 14, 2022
080653c
cleanup "case" test
enthus1ast Sep 14, 2022
376af47
added readme for case; inc version to 0.7.2
enthus1ast Sep 14, 2022
18ea0ee
Merge remote-tracking branch 'origin/master' into casestmt
enthus1ast Sep 14, 2022
738acb5
Signed-off-by: David Krause <enthus1ast@users.noreply.github.com>
enthus1ast Sep 14, 2022
bc01af1
remove debug echo; added more complex case tests
enthus1ast Sep 15, 2022
1b73939
more complex case test, added missing element test
enthus1ast Sep 15, 2022
05a418d
move case*.nimja templates to "case" folder
enthus1ast Sep 15, 2022
d25b477
Signed-off-by: David Krause <enthus1ast@users.noreply.github.com>
enthus1ast Sep 15, 2022
dc1b5e0
Merge pull request #83 from enthus1ast/casestmt
enthus1ast Sep 15, 2022
4483e93
fix readme, test continue and break for for
enthus1ast Oct 4, 2022
4e5e5e3
Signed-off-by: David Krause <enthus1ast@users.noreply.github.com>
enthus1ast Oct 4, 2022
f3673ac
renamed includeNwt to importNimja closes #84
enthus1ast Oct 4, 2022
3c3a9a2
Merge pull request #87 from enthus1ast/rename
enthus1ast Oct 4, 2022
e40dfcb
wip on scope
enthus1ast Oct 4, 2022
8bbcc66
added scope closes #85
enthus1ast Oct 4, 2022
13a7ec6
Merge pull request #88 from enthus1ast/scope
enthus1ast Oct 4, 2022
e035926
Signed-off-by: David Krause <enthus1ast@users.noreply.github.com>
enthus1ast Oct 4, 2022
83ac14a
remove broken/unneeded string escaping, fixes #75 #77
enthus1ast Oct 6, 2022
33e513f
inc version
enthus1ast Oct 6, 2022
1c008db
Merge pull request #91 from enthus1ast/fixstrparse
enthus1ast Oct 6, 2022
b3393ba
export os (for `/`) closes #90
enthus1ast Oct 6, 2022
c48011e
Merge pull request #92 from enthus1ast/exportos
enthus1ast Oct 6, 2022
d8b6e71
also error on uneven whens
enthus1ast Oct 6, 2022
e46992b
get rid of the unused NImport, cleanup importNimja a bit
enthus1ast Oct 6, 2022
77f3317
Consolidated source of the basepath
PhilippMDoerner Oct 8, 2022
f533ebb
Merge pull request #93 from PhilippMDoerner/patch-1
enthus1ast Oct 11, 2022
9b321ff
inc version
enthus1ast Oct 11, 2022
c38ba0c
updated readme example to reflect examples in code with the correct i…
Jan 30, 2023
f86734a
Merge pull request #95 from sainttttt/master
enthus1ast Feb 3, 2023
f12124e
Merge branch 'gh' into v0.8.7
enthus1ast Mar 16, 2023
b90600e
Signed-off-by: David Krause <enthus1ast@users.noreply.github.com>
enthus1ast Mar 16, 2023
a30bc4e
Merge branch 'unevenwhen' into v0.8.7
enthus1ast Mar 16, 2023
fee7d4d
+ - Removed unused `NImport`.
enthus1ast Mar 16, 2023
698c8b3
changed nim versions that are tested to `stable` and `devel`
enthus1ast Mar 16, 2023
bf960d9
Merge pull request #97 from enthus1ast/v0.8.7
enthus1ast Mar 16, 2023
d1aee74
Update readme.md
enthus1ast Jul 6, 2023
2ab66e6
Merge pull request #98 from enthus1ast/enthus1ast-patch-1
enthus1ast Jul 6, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix prologue installation in tests
Signed-off-by: David Krause <krause@biochem2.uni-frankfurt.de>
  • Loading branch information
David Krause committed Aug 26, 2021
commit fc199bd086f1e71eeb37609ced7dc46b91aa5b41
3 changes: 1 addition & 2 deletions nimja.nimble
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ task tests, "Run all tests":

# Make sure all examples compile
exec "nimble install jester -y"
exec """testament --directory:"./examples/" p "prologue/server*.nim""""

exec "nimble install prologue -y"
exec """testament --directory:"./examples/" p "prologue/server*.nim""""
exec """testament --directory:"./examples/" p "fromReadme/server.nim""""

# This needs to compile the templates as a shared library first.
Expand Down