Add support for ref ints, ref enums etc...

Author: treeform

src/jsony.nim

@@ -17,7 +17,7 @@ proc parseHook*[T](s: string, i: var int, v: var SomeTable[string, T])
 proc parseHook*[T](s: string, i: var int, v: var SomeSet[T])
 proc parseHook*[T: tuple](s: string, i: var int, v: var T)
 proc parseHook*[T: array](s: string, i: var int, v: var T)
-proc parseHook*[T: ref array](s: string, i: var int, v: var T)
+proc parseHook*[T: not object](s: string, i: var int, v: var ref T)
 proc parseHook*(s: string, i: var int, v: var JsonNode)
 proc parseHook*(s: string, i: var int, v: var char)
 
@@ -280,7 +280,7 @@ proc parseHook*[T: array](s: string, i: var int, v: var T) =
       inc i
   eatChar(s, i, ']')
 
-proc parseHook*[T: ref array](s: string, i: var int, v: var T) =
+proc parseHook*[T: not object](s: string, i: var int, v: var ref T) =
   eatSpace(s, i)
   if i + 3 < s.len and s[i+0] == 'n' and s[i+1] == 'u' and s[i+2] == 'l' and s[i+3] == 'l':
     i += 4
@@ -548,7 +548,7 @@ proc dumpHook*(s: var string, v: enum)
 proc dumpHook*[N, T](s: var string, v: array[N, T])
 proc dumpHook*[T](s: var string, v: seq[T])
 proc dumpHook*(s: var string, v: object)
-proc dumpHook*(s: var string, v: ref object)
+proc dumpHook*(s: var string, v: ref)
 
 proc dumpHook*(s: var string, v: bool) =
   if v:
@@ -739,7 +739,7 @@ proc dumpHook*(s: var string, v: object) =
       inc i
   s.add '}'
 
-proc dumpHook*(s: var string, v: ref object) =
+proc dumpHook*(s: var string, v: ref) =
   if v == nil:
     s.add "null"
   else:

tests/all.nim

@@ -17,5 +17,6 @@ import test_strings
 import test_tables
 import test_tojson
 import test_tuples
+import test_refs
 
 echo "all tests pass"

tests/test_quirkydump.nim

@@ -0,0 +1,64 @@
+import jsony, options
+
+type
+  Bar = ref object
+    nameOfThing: string
+    arr: seq[int]
+
+  Foo = ref object
+    idRef: string
+    bar1Object: Option[Bar]
+    bar2Object: Option[Bar]
+
+proc camel2snake*(s: string): string =
+  ## CanBeFun => can_be_fun
+  ## https://forum.nim-lang.org/t/1701
+  result = newStringOfCap(s.len)
+  for i in 0..<len(s):
+    if s[i] in {'A'..'Z'}:
+      if i > 0:
+        result.add('_')
+      result.add(chr(ord(s[i]) + (ord('a') - ord('A'))))
+    else:
+      result.add(s[i])
+
+template dumpKey(s: var string, v: string) =
+  const v2 = v.camel2snake().toJson() & ":"
+  s.add v2
+
+proc dumpHook*(s: var string, v: object) =
+  s.add '{'
+  var i = 0
+  when compiles(for k, e in v.pairs: discard):
+    # Tables and table like objects.
+    for k, e in v.pairs:
+      if i > 0:
+        s.add ','
+      s.dumpHook(k)
+      s.add ':'
+      s.dumpHook(e)
+      inc i
+  else:
+    # Normal objects.
+    for k, e in v.fieldPairs:
+      when compiles(e.isSome):
+        if e.isSome:
+          if i > 0:
+            s.add ','
+          s.dumpKey(k)
+          s.dumpHook(e)
+          inc i
+      else:
+        if i > 0:
+          s.add ','
+        s.dumpKey(k)
+        s.dumpHook(e)
+        inc i
+  s.add '}'
+
+var foo = Foo(
+  idRef: "0000-1234",
+  bar1Object: some(Bar(nameOfThing:"Bar", arr: @[1, 2, 3]))
+)
+
+echo foo.toJson()

tests/test_refs.nim

@@ -0,0 +1,49 @@
+import jsony
+
+proc newRef[T](v: T): ref T =
+  new(result)
+  result[] = v
+
+var
+  a: ref int = newRef(123)
+  b: ref int
+
+doAssert a.toJson() == """123"""
+doAssert b.toJson() == """null"""
+
+doAssert $(fromJson("""1""", ref int)[]) == "1"
+doAssert fromJson("""null""", ref int) == nil
+
+proc check[T](v: T) =
+  var v2: ref T = newRef(v)
+  var v3: ref T = nil
+  doAssert v2.toJson.fromJson(ref T)[] == v2[]
+  doAssert v3.toJson.fromJson(ref T) == nil
+
+check(1.int)
+check(1.int8)
+check(1.int16)
+check(1.int32)
+check(1.int64)
+check(1.uint8)
+check(1.uint16)
+check(1.uint32)
+check(1.uint64)
+
+check("hello")
+check([1,2,3])
+check(@[1,2,3])
+
+type Entry = object
+  color: string
+
+check(Entry())
+
+type
+  Test = object
+    key: ref int
+var test = """{ "key": null }""".fromJson(Test)
+doAssert test.key == nil
+var test2 = """{ "key": 2 }""".fromJson(Test)
+doAssert test2.key != nil
+doAssert test2.key[] == 2