Decouple moving parts: use last id only

src/hyperscript.nim

@@ -335,7 +335,7 @@ macro createElement(args: varargs[untyped]): untyped =
 
 
   var
-    tag, id, style: string
+    tag, style: string
     classes: seq[string]
     attributes, children, events = newNimNode(nnkBracket)
 
@@ -354,14 +354,6 @@ macro createElement(args: varargs[untyped]): untyped =
     addClass class.strVal
 
 
-  func addId(x: string) {.compileTime.} =
-    ## Helper that adds a new class.
-    id.add x
-  func addId(x: NimNode) {.compileTime.} =
-    ## Helper that adds a new class.
-    addId x.strVal
-
-
   func addStyle(styles: auto) {.compileTime.} =
     ## Helper that adds styles.
     style.add styles
@@ -399,8 +391,6 @@ macro createElement(args: varargs[untyped]): untyped =
     case key:
     of "class":
       addClass val
-    of "id":
-      addId val
     of "style":
       addStyle val
     else:
@@ -436,7 +426,7 @@ macro createElement(args: varargs[untyped]): untyped =
       of '.':
         addClass selector[1..^1]
       of '#':
-        addId selector[1..^1]
+        addAttribute "id", selector[1..^1]
       of '[':
         let fs = selector[1..^1].split('=', 1)
         addAttribute fs[0], fs[1].strip(chars = {'\'', '"'})
@@ -489,9 +479,6 @@ macro createElement(args: varargs[untyped]): untyped =
   if len(classes) > 0:
     addTupleExpr(attributes, "class", join(classes, " "))
 
-  if len(id) > 0:
-    addTupleExpr(attributes, "id", id)
-
   if len(style) > 0:
     addTupleExpr(attributes, "style", style.strip)
 

tests/tests.nim

@@ -144,10 +144,10 @@ suite "Using selector notation":
     check h("div#header").tag == "div"
     check h("div#header").attr("id") == "header"
 
-  test "two ids get concatenated":
+  test "the last given id takes precedence":
     check h("div#header#main") is HTMLNode
     check h("div#header#main").tag == "div"
-    check h("div#header#main").attr("id") == "headermain"
+    check h("div#header#main").attr("id") == "main"
 
   test "can indicate a class":
     check h("div.header") is HTMLNode
@@ -197,7 +197,7 @@ suite "Using selector notation":
   test "can mix notations":
     check h("div#header", id = "main") is HTMLNode
     check h("div#header", id = "main").tag == "div"
-    check h("div#header", id = "main").attr("id") == "headermain"
+    check h("div#header", id = "main").attr("id") == "main"
 
     check h("div.header", class = "note") is HTMLNode
     check h("div.header", class = "note").tag == "div"