logos-storage/nim-json-rpc
1
0
Fork 0
mirror of https://github.com/logos-storage/nim-json-rpc.git synced 2026-01-24 08:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove expectType for Option[T], use fromJson on subtype for validation

Browse Source
This commit is contained in:
coffeepots 2018-11-23 16:10:35 +00:00
parent e942357de6
commit 51ed6f3000
1 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
json_rpc/jsonmarshal.nim
View File

@ -3,27 +3,6 @@ import macros, json, options, typetraits
proc expect*(actual, expected: JsonNodeKind, argName: string) =
if actual != expected: raise newException(ValueError, "Parameter [" & argName & "] expected " & $expected & " but got " & $actual)
proc expectType*(actual: JsonNodeKind, expected: typedesc, argName: string, allowNull = false) =
var expType: JsonNodeKind
when expected is array:
expType = JArray
elif expected is object:
expType = JObject
elif expected is int:
expType = JInt
elif expected is float:
expType = JFloat
elif expected is bool:
expType = JBool
elif expected is string:
expType = JString
else:
const eStr = "Unable to convert " & expected.name & " to JSON for expectType"
{.fatal: eStr}
if actual != expType:
if allowNull == false or (allowNull and actual != JNull):
raise newException(ValueError, "Parameter [" & argName & "] expected " & expected.name & " but got " & $actual)
proc `%`*(n: byte{not lit}): JsonNode =
result = newJInt(int(n))
@ -54,13 +33,7 @@ proc fromJson(n: JsonNode, argName: string, result: var int64)
proc fromJson(n: JsonNode, argName: string, result: var uint64)
proc fromJson(n: JsonNode, argName: string, result: var ref int64)
proc fromJson(n: JsonNode, argName: string, result: var ref int)
proc fromJson[T](n: JsonNode, argName: string, result: var Option[T]) =
n.kind.expectType(T, argName, true) # Allow JNull
if n.kind != JNull:
var val: T
fromJson(n, argName, val)
result = some(val)
proc fromJson[T](n: JsonNode, argName: string, result: var Option[T])
# This can't be forward declared: https://github.com/nim-lang/Nim/issues/7868
proc fromJson[T: enum](n: JsonNode, argName: string, result: var T) =
@ -73,6 +46,13 @@ proc fromJson[T: object](n: JsonNode, argName: string, result: var T) =
for k, v in fieldPairs(result):
fromJson(n[k], k, v)
proc fromJson[T](n: JsonNode, argName: string, result: var Option[T]) =
# Allow JNull for options
if n.kind != JNull:
var val: T
fromJson(n, argName, val)
result = some(val)
proc fromJson(n: JsonNode, argName: string, result: var bool) =
n.kind.expect(JBool, argName)
result = n.getBool()