update voodoo extensions

Signed-off-by: George Lemon <georgelemon@protonmail.com>

Author: georgelemon

src/tim/app/build.nim

@@ -14,7 +14,7 @@ import pkg/voodoo/language/[ast, codegen, chunk, sym, vm]
 import pkg/voodoo/packagemanager/packager
 
 import ../engine/parser
-import ../engine/stdlib/[libsystem, libarrays, libffi]
+import ../engine/stdlib/[libsystem, libarrays]
 import ../engine/transpilers/[jsgen, pygen, rbgen, phpgen, luagen, nimgen]
 
 proc parserCallback(astProgram: var Ast, path: string) =
@@ -82,9 +82,6 @@ proc srcCommand*(v: Values) =
   # let stringsLib = initStrings(script, systemModule)
   # module.load(stringsLib)
 
-  # let ffiLib = initFFI(script, systemModule)
-  # module.load(ffiLib)
-
   # let arraysLib = initArrays(script, systemModule)
   # module.load(arraysLib)
 

src/tim/engine/transformers.nim

@@ -245,6 +245,7 @@ block extendVoodooAstAndCodeGen:
             gen.lookup(formalParams[0])
           else:
             gen.module.sym"void"
+      
       # create a new proc
       var (sym, theProc) =
             gen.script.newProc(name, impl = node,
@@ -407,3 +408,72 @@ block extendVoodooAstAndCodeGen:
 
       if gen.kind == gkHtmlNest:
         gen.kind = gkToplevel
+
+  block extendVM:
+    extendEnum Opcode:
+      opcBeginHtml = "beginHtml"    ## construct HTML object
+      opcBeginHtmlWithAttrs = "behinHtmlWithAttrs" ## construct HTML object with attributes
+      opcAttrEnd = "attrEnd"        ## ends HTML object
+      opcInnerHtml = "innerHtml"        ## ends HTML object
+      opcTextHtml = "textHtml"      ## adds text to HTML object
+      opcCloseHtml = "closeHtml"    ## closes HTML object
+
+      opcAttrClass = "attrClass"    ## adds class to HTML object
+      opcAttrId = "attrId"          ## adds id to HTML object
+      opcAttr = "attr"
+      opcAttrKey = "attrKey"        ## adds a key to HTML object attribute
+      opcWSpace = "space"           ## adds whitespace to HTML result
+    
+    extendCaseStmt "vmParseChunkCase":
+      case oc:
+      of opcAttrClass, opcAttrId, opcBeginHtmlWithAttrs, opcBeginHtml, opcCloseHtml:
+        let sid = readArg[uint16](pc)
+        addOp(oc, sid.int64, 0, akString)
+    
+    extendCaseStmt "vmInterpretCase":
+      case oc:
+      # HTML generation
+      of opcAttrClass:
+        # special case for class attribute
+        result.add("class=\"" & co.getArg1Str(pcIdx, currentChunk) & "\"")
+      of opcAttrId:
+        result.add("id=\"" & co.getArg1Str(pcIdx, currentChunk) & "\"")
+      of opcWSpace:
+        result.add(" ")
+      of opcAttrEnd:
+        result.add(">")
+      of opcAttr:
+        let key = stack.pop().stringVal[]
+        let value = stack.pop()
+        result.add(key & "=\"")
+        case value.typeId
+        of tyString: result.add(value.stringVal[])
+        of tyInt:    result.add($value.intVal)
+        of tyFloat:  result.add($value.floatVal)
+        of tyBool:   result.add($(value.boolVal))
+        of tyJsonStorage:
+          result.add(value.jsonVal.toString())
+        else: discard
+        result.add("\"")
+      of opcAttrKey:
+        let attr = stack.pop()
+        if attr.stringVal[].len > 0:
+          result.add(" ") # leading space
+          result.add(attr.stringVal[])
+      of opcBeginHtmlWithAttrs:
+        result.add("<" & co.getArg1Str(pcIdx, currentChunk))
+      of opcBeginHtml:
+        result.add("<" & co.getArg1Str(pcIdx, currentChunk) & ">")
+      of opcTextHtml:
+        let v = stack.pop()
+        case v.typeId
+        of tyString: result.add(v.stringVal[])
+        of tyInt: result.add($v.intVal)
+        of tyFloat: result.add($v.floatVal)
+        of tyBool: result.add($(v.boolVal))
+        of tyJsonStorage: result.add(v.jsonVal.toString())
+        else: discard
+      of opcInnerHtml:
+        discard
+      of opcCloseHtml:
+        result.add("</" & co.getArg1Str(pcIdx, currentChunk) & ">")

src/tim/pm/initializer.nim

@@ -92,10 +92,11 @@ type
 
 let stdlibs = newTable[string, proc(script: Script, systemModule: Module): Module]()
 
-# proc parseHook*(s: string, i: var int, v: var semver.Version) =
-#   var str: string
-#   parseHook(s, i, str)
-#   v = parseVersion(str)
+proc parseHook(parser: var json.JsonParser, field: string, v: var semver.Version) =
+  # A JSON parsing hook to parse the `version` field in the
+  # theme manifest as a `semver.Version` object
+  v = parseVersion(parser.curr.value)
+  parser.walk()
 
 iterator getViews*(engine: TimEngine): TimTemplate =
   ## Iterator to get all view templates