Parse optinally parse named tupples as arrays.

Author: treeform

src/jsony.nim

@@ -260,17 +260,6 @@ proc parseHook*[T](s: string, i: var int, v: var seq[T]) =
       break
   eatChar(s, i, ']')
 
-proc parseHook*[T: tuple](s: string, i: var int, v: var T) =
-  eatSpace(s, i)
-  eatChar(s, i, '[')
-  for name, value in v.fieldPairs:
-    eatSpace(s, i)
-    parseHook(s, i, value)
-    eatSpace(s, i)
-    if i < s.len and s[i] == ',':
-      inc i
-  eatChar(s, i, ']')
-
 proc parseHook*[T: array](s: string, i: var int, v: var T) =
   eatSpace(s, i)
   eatChar(s, i, '[')
@@ -341,6 +330,46 @@ template snakeCase(s: string): string =
   const k = snakeCaseDynamic(s)
   k
 
+proc parseObject[T](s: string, i: var int, v: var T) =
+  eatChar(s, i, '{')
+  while i < s.len:
+    eatSpace(s, i)
+    if i < s.len and s[i] == '}':
+      break
+    var key: string
+    parseHook(s, i, key)
+    eatChar(s, i, ':')
+    when compiles(renameHook(v, key)):
+      renameHook(v, key)
+    block all:
+      for k, v in v.fieldPairs:
+        if k == key or snakeCase(k) == key:
+          var v2: type(v)
+          parseHook(s, i, v2)
+          v = v2
+          break all
+      skipValue(s, i)
+    eatSpace(s, i)
+    if i < s.len and s[i] == ',':
+      inc i
+    else:
+      break
+
+proc parseHook*[T: tuple](s: string, i: var int, v: var T) =
+  eatSpace(s, i)
+  when T.isNamedTuple():
+    if i < s.len and s[i] == '{':
+      parseObject(s, i, v)
+      return
+  eatChar(s, i, '[')
+  for name, value in v.fieldPairs:
+    eatSpace(s, i)
+    parseHook(s, i, value)
+    eatSpace(s, i)
+    if i < s.len and s[i] == ',':
+      inc i
+  eatChar(s, i, ']')
+
 proc parseHook*[T: enum](s: string, i: var int, v: var T) =
   eatSpace(s, i)
   var strV: string

tests/test_tuples.nim

@@ -14,6 +14,18 @@ block:
   doAssert v[1] == "hi"
   doAssert v[2] == 3.5
 
+block:
+  type Vector3i = tuple[x: int, y: int, z: int]
+  var s = """[0, 1, 2]"""
+  var v = s.fromJson(Vector3i)
+  doAssert v[0] == 0
+  doAssert v[1] == 1
+  doAssert v[2] == 2
+  doAssert v.x == 0
+  doAssert v.y == 1
+  doAssert v.z == 2
+
+
 block:
   type Entry = tuple[id: int, name: string, dist: float32]
   var s = """[134, "red", 13.5]"""
@@ -26,12 +38,12 @@ block:
   doAssert v.dist == 13.5
 
 block:
-  type Vector3i = tuple[x: int, y: int, z: int]
-  var s = """[0, 1, 2]"""
-  var v = s.fromJson(Vector3i)
-  doAssert v[0] == 0
-  doAssert v[1] == 1
-  doAssert v[2] == 2
-  doAssert v.x == 0
-  doAssert v.y == 1
-  doAssert v.z == 2
+  type Entry = tuple[id: int, name: string, dist: float32]
+  var s = """{"id": 134, "name": "red", "dist": 13.5}"""
+  var v = s.fromJson(Entry)
+  doAssert v[0] == 134
+  doAssert v[1] == "red"
+  doAssert v[2] == 13.5
+  doAssert v.id == 134
+  doAssert v.name == "red"
+  doAssert v.dist == 13.5