support varied json types & jarray as query string

disruptek · Aug 8, 2021 · b08c412 · b08c412
1 parent 5a797bc
commit b08c412
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/src/openapi/codegen.nim b/src/openapi/codegen.nim
@@ -1231,11 +1231,25 @@ type
   """
   result.add parseStmt """
 proc queryString(query: JsonNode): string {.used.} =
+  proc toString(js: JsonNode): string =
+    case js.kind
+    of JNull: ""
+    of JInt: $(getInt js)
+    of JFloat: $(getFloat js)
+    of JBool: $(getBool js)
+    else: getStr js
+
+  if query.isNil: return ""
   var qs: seq[KeyVal]
-  if query == nil:
-    return ""
   for k, v in query.pairs:
-    qs.add (key: k, val: v.getStr)
+    if not v.isNil and v.kind == JArray:
+      if v.len == 0:
+        qs.add (key: k, val: "")
+      else:
+        for v in v.items:
+          qs.add (key: k, val: v.toString)
+    else:
+      qs.add (key: k, val: v.toString)
   result = encodeQuery(qs)
 
 proc hydratePath(input: JsonNode; segments: seq[PathToken]): Option[string] {.used.} =