snapshot

Author: winrid

samples/client/petstore/nim/petstore/apis/api_pet.nim

@@ -28,10 +28,7 @@ const basepath = "http://petstore.swagger.io/v2"
 template constructResult[T](response: Response): untyped =
   if response.code in {Http200, Http201, Http202, Http204, Http206}:
     try:
-      when name(stripGenericParams(T.typedesc).typedesc) == name(Table):
-        (some(json.to(parseJson(response.body), T.typedesc)), response)
-      else:
-        (some(marshal.to[T](response.body)), response)
+      (some(to(parseJson(response.body), T)), response)
     except JsonParsingError:
       # The server returned a malformed response though the response code is 2XX
       # TODO: need better error handling
@@ -58,19 +55,19 @@ proc deletePet*(httpClient: HttpClient, petId: int64, apiKey: string): Response
 
 proc findPetsByStatus*(httpClient: HttpClient, status: seq[Status]): (Option[seq[Pet]], Response) =
   ## Finds Pets by status
-  let url_encoded_query_params = encodeQuery([
-    ("status", $status.join(",")), # Status values that need to be considered for filter
-  ])
+  var query_params_list: seq[(string, string)] = @[]
+  query_params_list.add(("status", $status.join(",")))
+  let url_encoded_query_params = encodeQuery(query_params_list)
 
   let response = httpClient.get(basepath & "/pet/findByStatus" & "?" & url_encoded_query_params)
   constructResult[seq[Pet]](response)
 
 
 proc findPetsByTags*(httpClient: HttpClient, tags: seq[string]): (Option[seq[Pet]], Response) {.deprecated.} =
   ## Finds Pets by tags
-  let url_encoded_query_params = encodeQuery([
-    ("tags", $tags.join(",")), # Tags to filter by
-  ])
+  var query_params_list: seq[(string, string)] = @[]
+  query_params_list.add(("tags", $tags.join(",")))
+  let url_encoded_query_params = encodeQuery(query_params_list)
 
   let response = httpClient.get(basepath & "/pet/findByTags" & "?" & url_encoded_query_params)
   constructResult[seq[Pet]](response)

samples/client/petstore/nim/petstore/apis/api_store.nim

@@ -25,10 +25,7 @@ const basepath = "http://petstore.swagger.io/v2"
 template constructResult[T](response: Response): untyped =
   if response.code in {Http200, Http201, Http202, Http204, Http206}:
     try:
-      when name(stripGenericParams(T.typedesc).typedesc) == name(Table):
-        (some(json.to(parseJson(response.body), T.typedesc)), response)
-      else:
-        (some(marshal.to[T](response.body)), response)
+      (some(to(parseJson(response.body), T)), response)
     except JsonParsingError:
       # The server returned a malformed response though the response code is 2XX
       # TODO: need better error handling

samples/client/petstore/nim/petstore/apis/api_user.nim

@@ -25,10 +25,7 @@ const basepath = "http://petstore.swagger.io/v2"
 template constructResult[T](response: Response): untyped =
   if response.code in {Http200, Http201, Http202, Http204, Http206}:
     try:
-      when name(stripGenericParams(T.typedesc).typedesc) == name(Table):
-        (some(json.to(parseJson(response.body), T.typedesc)), response)
-      else:
-        (some(marshal.to[T](response.body)), response)
+      (some(to(parseJson(response.body), T)), response)
     except JsonParsingError:
       # The server returned a malformed response though the response code is 2XX
       # TODO: need better error handling
@@ -74,10 +71,10 @@ proc getUserByName*(httpClient: HttpClient, username: string): (Option[User], Re
 
 proc loginUser*(httpClient: HttpClient, username: string, password: string): (Option[string], Response) =
   ## Logs user into the system
-  let url_encoded_query_params = encodeQuery([
-    ("username", $username), # The user name for login
-    ("password", $password), # The password for login in clear text
-  ])
+  var query_params_list: seq[(string, string)] = @[]
+  query_params_list.add(("username", $username))
+  query_params_list.add(("password", $password))
+  let url_encoded_query_params = encodeQuery(query_params_list)
 
   let response = httpClient.get(basepath & "/user/login" & "?" & url_encoded_query_params)
   constructResult[string](response)

samples/client/petstore/nim/petstore/models/model_api_response.nim

@@ -9,11 +9,13 @@
 
 import json
 import tables
+import marshal
+import options
 
 
 type ApiResponse* = object
   ## Describes the result of uploading an image resource
-  code*: int
-  `type`*: string
-  message*: string
+  code*: Option[int]
+  `type`*: Option[string]
+  message*: Option[string]
 

samples/client/petstore/nim/petstore/models/model_category.nim

@@ -9,10 +9,12 @@
 
 import json
 import tables
+import marshal
+import options
 
 
 type Category* = object
   ## A category for a pet
-  id*: int64
-  name*: string
+  id*: Option[int64]
+  name*: Option[string]
 

samples/client/petstore/nim/petstore/models/model_get_pet_stats200response.nim

@@ -9,10 +9,12 @@
 
 import json
 import tables
+import marshal
+import options
 
 
 type GetPetStats200response* = object
   ## 
-  totalPets*: int
-  status*: string
+  totalPets*: Option[int]
+  status*: Option[string]
 

samples/client/petstore/nim/petstore/models/model_order.nim

@@ -9,6 +9,8 @@
 
 import json
 import tables
+import marshal
+import options
 
 
 type Status* {.pure.} = enum
@@ -18,12 +20,12 @@ type Status* {.pure.} = enum
 
 type Order* = object
   ## An order for a pets from the pet store
-  id*: int64
-  petId*: int64
-  quantity*: int
-  shipDate*: string
+  id*: Option[int64]
+  petId*: Option[int64]
+  quantity*: Option[int]
+  shipDate*: Option[string]
   status*: Status ## Order Status
-  complete*: bool
+  complete*: Option[bool]
 
 func `%`*(v: Status): JsonNode =
   result = case v:

samples/client/petstore/nim/petstore/models/model_pet.nim

@@ -9,6 +9,8 @@
 
 import json
 import tables
+import marshal
+import options
 
 import model_category
 import model_tag
@@ -20,11 +22,11 @@ type Status* {.pure.} = enum
 
 type Pet* = object
   ## A pet for sale in the pet store
-  id*: int64
-  category*: Category
+  id*: Option[int64]
+  category*: Option[Category]
   name*: string
   photoUrls*: seq[string]
-  tags*: seq[Tag]
+  tags*: Option[seq[Tag]]
   status*: Status ## pet status in the store
 
 func `%`*(v: Status): JsonNode =

samples/client/petstore/nim/petstore/models/model_pet_config_any_of1.nim

@@ -9,9 +9,11 @@
 
 import json
 import tables
+import marshal
+import options
 
 
 type PetConfigAnyOf1* = object
   ## 
-  version*: int
+  version*: Option[int]
 

samples/client/petstore/nim/petstore/models/model_pet_metadata.nim

@@ -9,9 +9,11 @@
 
 import json
 import tables
+import marshal
+import options
 
 
 type PetMetadata* = object
   ## 
-  metadata*: string
+  metadata*: Option[string]