set global data at pre-compilation level

Signed-off-by: George Lemon <[email protected]>

src/tim.nim

@@ -21,14 +21,15 @@ const
 
 proc jitCompiler(engine: TimEngine, tpl: TimTemplate, data: JsonNode): HtmlCompiler =
   ## Compiles `tpl` AST at runtime
-  newCompiler(engine.readAst(tpl), tpl, engine.isMinified(), engine.getIndentSize(), data)
+  engine.newCompiler(engine.readAst(tpl), tpl, engine.isMinified, engine.getIndentSize, data)
 
 proc displayErrors(l: Logger) =
   for err in l.errors:
     display(err)
   display(l.filePath)
 
-proc compileCode(engine: TimEngine, tpl: TimTemplate, refreshAst = false) =
+proc compileCode(engine: TimEngine, tpl: TimTemplate,
+    refreshAst = false) =
   # Compiles `tpl` TimTemplate to either `.html` or binary `.ast`
   var tplView: TimTemplate 
   if tpl.getType == ttView: 
@@ -42,7 +43,8 @@ proc compileCode(engine: TimEngine, tpl: TimTemplate, refreshAst = false) =
     else:
       # otherwise, compiles the generated AST and save
       # a pre-compiled HTML version on disk
-      var c = newCompiler(p.getAst, tpl, engine.isMinified, engine.getIndentSize)
+      var c = engine.newCompiler(p.getAst, tpl, engine.isMinified,
+          engine.getIndentSize)
       if likely(not c.hasError):
         case tpl.getType:
         of ttView:
@@ -57,6 +59,7 @@ proc compileCode(engine: TimEngine, tpl: TimTemplate, refreshAst = false) =
 
 var sync: Thread[(Port, int)]
 var lastModified, prevModified: Time
+
 proc browserSync(x: (Port, int)) {.thread.} =
   proc onRequest(req: Request) {.async.} =
     if req.httpMethod == some(HttpGet):
@@ -85,7 +88,7 @@ proc browserSync(x: (Port, int)) {.thread.} =
 
 proc precompile*(engine: TimEngine, callback: TimCallback = nil,
     flush = true, waitThread = false, browserSyncPort = Port(6502),
-    browserSyncDelay = 550) =
+    browserSyncDelay = 550, global: JsonNode = newJObject()) =
   ## Precompiles available templates inside `layouts` and `views`
   ## directories to either static `.html` or binary `.ast`.
   ## 
@@ -97,6 +100,7 @@ proc precompile*(engine: TimEngine, callback: TimCallback = nil,
   ## Enable filesystem monitor by compiling with `-d:timHotCode` flag.
   ## You can create a separate thread for precompiling templates (use `waitThread` to keep the thread alive)
   if flush: engine.flush()
+  engine.setGlobalData(global)
   when not defined release:
     when defined timHotCode:
       # Define callback procs for pkg/watchout
@@ -172,7 +176,6 @@ template layoutWrapper(getViewBlock) {.dirty.} =
     getViewBlock
     layoutTail = layout.getTail()
   else:
-
     var jitLayout = engine.jitCompiler(layout, data)
     if likely(not jitLayout.hasError):
       add result, jitLayout.getHead()
@@ -191,7 +194,7 @@ proc render*(engine: TimEngine, viewName: string,
     var
       view: TimTemplate = engine.getView(viewName)
       data: JsonNode = newJObject()
-    data["global"] = global
+    # data["global"] = global # todo merge global data
     data["local"] = local
     if likely(engine.hasLayout(layoutName)):
       var layout: TimTemplate = engine.getLayout(layoutName)

src/tim/engine/compilers/html.nim

@@ -12,7 +12,7 @@ import ../ast, ../logging, ./js
 
 from std/xmltree import escape
 from ../meta import TimEngine, TimTemplate, TimTemplateType,
-  getType, getSourcePath
+  getType, getSourcePath, getGlobalData
 
 import ./tim # TimCompiler object
 
@@ -1059,10 +1059,11 @@ proc walkNodes(c: var HtmlCompiler, nodes: seq[Node],
 #
 
 when not defined timStandalone:
-  proc newCompiler*(ast: Ast, tpl: TimTemplate, minify = true,
+  proc newCompiler*(engine: TimEngine, ast: Ast, tpl: TimTemplate, minify = true,
       indent = 2, data: JsonNode = newJObject()): HtmlCompiler =
     ## Create a new instance of `HtmlCompiler`
     assert indent in [2, 4]
+    data["global"] = engine.getGlobalData()
     result =
       HtmlCompiler(
         ast: ast,

src/tim/engine/meta.nim

@@ -68,6 +68,12 @@ proc getPath*(engine: TimEngine, key: string, templateType: TimTemplateType): st
   result &= ".timl"
   result = normalizedPath(result) # normalize path for Windows
 
+proc setGlobalData*(engine: TimEngine, data: JsonNode) =
+  engine.globals = data
+
+proc getGlobalData*(engine: TimEngine): JsonNode =
+  engine.globals
+
 proc hashid(path: string): string =
   # Creates an MD5 hashed version of `path`
   result = getMD5(path)