Flavor automatic serialization (#241)

* Flavor automatic serialization

* Fix

* Fix tests

Author: jangko

json_rpc.nimble

@@ -25,7 +25,8 @@ requires "nim >= 1.6.0",
          "httputils >= 0.3.0 & < 0.4.0",
          "chronicles",
          "websock >= 0.2.0 & < 0.3.0",
-         "json_serialization",
+         "serialization >= 0.4.4",
+         "json_serialization >= 0.4.2",
          "unittest2"
 
 let nimc = getEnv("NIMC", "nim") # Which nim compiler to use

json_rpc/jsonmarshal.nim

@@ -20,7 +20,12 @@ createJsonFlavor JrpcConv,
   requireAllFields = false,
   omitOptionalFields = false, # Don't skip optional fields==none in Writer
   allowUnknownFields = true,
-  skipNullFields = true       # Skip optional fields==null in Reader
+  skipNullFields = true,      # Skip optional fields==null in Reader
+  automaticPrimitivesSerialization = false
 
 # JrpcConv is a namespace/flavor for encoding and decoding
 # parameters and return value of a rpc method.
+
+when declared(json_serialization.automaticSerialization):
+  # Nim 1.6 cannot use this new feature
+  JrpcConv.automaticSerialization(JsonNode, true)

json_rpc/private/jrpc_sys.nim

@@ -13,7 +13,7 @@ import
   std/hashes,
   results,
   json_serialization,
-  json_serialization/stew/results as jser_results
+  json_serialization/pkg/results as jser_results
 
 export
   results,

json_rpc/private/server_handler_wrapper.nim

@@ -14,7 +14,7 @@ import
   stew/[byteutils, objects],
   json_serialization,
   json_serialization/std/[options],
-  json_serialization/stew/results,
+  json_serialization/pkg/results,
   ../errors,
   ./jrpc_sys,
   ./shared_wrapper,

tests/test_router_rpc.nim

@@ -11,13 +11,13 @@ import
   unittest2,
   ../json_rpc/router,
   json_serialization/std/options,
-  json_serialization/stew/results
+  json_serialization/pkg/results
 
 var server = RpcRouter()
 
 type
   OptAlias[T] = results.Opt[T]
-  
+
 server.rpc("std_option") do(A: int, B: Option[int], C: string, D: Option[int], E: Option[string]) -> string:
   var res = "A: " & $A
   res.add ", B: " & $B.get(99)
@@ -49,7 +49,7 @@ server.rpc("alias_opt") do(A: int, B: OptAlias[int], C: string, D: Option[int],
   res.add ", D: " & $D.get(77)
   res.add ", E: " & E.get("none")
   return res
-  
+
 server.rpc("noParams") do() -> int:
   return 123
 
@@ -93,7 +93,7 @@ template test_optional(meth: static[string]) =
       check res == """{"jsonrpc":"2.0","id":0,"error":{"code":-32000,"message":"`mixed_opt` raised an exception","data":"Parameter [D] of type 'Option[system.int]' could not be decoded: number expected"}}"""
     else:
       check res == """{"jsonrpc":"2.0","id":0,"error":{"code":-32000,"message":"`alias_opt` raised an exception","data":"Parameter [D] of type 'Option[system.int]' could not be decoded: number expected"}}"""
-      
+
   test meth & " D extra, positional":
     let n = req(meth, "[44, 567, \"apple\", 999, \"banana\", true]")
     let res = waitFor server.route(n)

tests/testrpcmacro.nim

@@ -50,6 +50,20 @@ MyOptional.useDefaultSerializationIn JrpcConv
 MyOptionalNotBuiltin.useDefaultSerializationIn JrpcConv
 MuscleCar.useDefaultSerializationIn JrpcConv
 
+when declared(json_serialization.automaticSerialization):
+  # Nim 1.6 cannot use this new feature
+  JrpcConv.automaticSerialization(int, true)
+  JrpcConv.automaticSerialization(string, true)
+  JrpcConv.automaticSerialization(array, true)
+  JrpcConv.automaticSerialization(byte, true)
+  JrpcConv.automaticSerialization(seq, true)
+  JrpcConv.automaticSerialization(float, true)
+  JrpcConv.automaticSerialization(JsonString, true)
+  JrpcConv.automaticSerialization(bool, true)
+  JrpcConv.automaticSerialization(int64, true)
+  JrpcConv.automaticSerialization(ref, true)
+  JrpcConv.automaticSerialization(enum, true)
+
 proc readValue*(r: var JsonReader[JrpcConv], val: var MyEnum)
        {.gcsafe, raises: [IOError, SerializationError].} =
   let intVal = r.parseInt(int)