fix python bindings, improve openapi

HapticX · Oct 27, 2024 · db96bbb · db96bbb
1 parent 75e27d7
commit db96bbb
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/happyx.nimble b/happyx.nimble
@@ -2,7 +2,7 @@
 
 description = "Macro-oriented asynchronous web-framework written with ♥"
 author = "HapticX"
-version = "4.6.3"
+version = "4.6.4"
 license = "MIT"
 srcDir = "src"
 installExt = @["nim"]

diff --git a/src/happyx/core/constants.nim b/src/happyx/core/constants.nim
@@ -109,7 +109,7 @@ const
   # Framework version
   HpxMajor* = 4
   HpxMinor* = 6
-  HpxPatch* = 3
+  HpxPatch* = 4
   HpxVersion* = $HpxMajor & "." & $HpxMinor & "." & $HpxPatch
 
 

diff --git a/src/happyx/ssr/docs/autodocs.nim b/src/happyx/ssr/docs/autodocs.nim
@@ -204,6 +204,7 @@ proc procApiDocs*(docsData: NimNode): NimNode =
                     "newApiDocObject",
                     newCall("@", bracket(newLit"GET")),
                     ident"documentation",
+                    newLit"",
                     newDotExpr(ident"routeData", ident"path"),
                     newDotExpr(ident"routeData", ident"pathParams"),
                     newDotExpr(ident"routeData", ident"requestModels"),
@@ -225,6 +226,7 @@ proc procApiDocs*(docsData: NimNode): NimNode =
                   "newApiDocObject",
                   newDotExpr(ident"route", ident"httpMethod"),
                   ident"documentation",
+                  newLit"",
                   newDotExpr(ident"routeData", ident"path"),
                   newDotExpr(ident"routeData", ident"pathParams"),
                   newDotExpr(ident"routeData", ident"requestModels"),
@@ -373,11 +375,13 @@ proc openApiDocs*(docsData: NimNode): NimNode =
             "responses": {
               "200": {
                 "description": "",
-                "content": {}
+                "content": {},
+                "headers": {},
               }
             }
           }
 
+          # Parse all status codes
           for m in route.src.findAll(re2"\bstatusCode\b\s*=\s*(\d+)(\s*#+\s*([^\n]+))?"):
             let
               statusCode = route.src[m.group(0)]
@@ -389,6 +393,22 @@ proc openApiDocs*(docsData: NimNode): NimNode =
                 "content": {}
               }
 
+          # Parse all outHeaders
+          for m in route.src.findAll(re2"""\boutHeaders\b\["([^\"\]]+)"\]\s*=\s*(.*#+\s*((\d+):\s*)?([^\n]+))?"""):
+            let
+              header = route.src[m.group(0)]
+              statusCode = route.src[m.group(3)]
+              description = route.src[m.group(4)]
+            if statusCode == "" or statusCode notin pathData["responses"]:
+              for code in pathData["responses"].keys():
+                pathData["responses"][code]["headers"][header] = %*{
+                  "description": description
+                }
+            else:
+              pathData["responses"][statusCode]["headers"][header] = %*{
+                "description": description
+              }
+
           # echo route.srcd
 
           # Params

diff --git a/tests/testc15.nim b/tests/testc15.nim
@@ -10,7 +10,6 @@ type
   OptionsEncoding* = enum
       encodingA, encodingB
 
-
 model TestModel:
   lang: Language
 
@@ -62,8 +61,11 @@ serve "127.0.0.1", 5000:
     return {"response": m.x}
 
   get "/teststatuscodes/{i:int}":
+    ## you can test here status codes
+    outHeaders["Server"] = "HappyX " & HpxVersion   ## Here just a server
     if i mod 2 == 0:
-      statusCode = 403  ## i is not even
+      outHeaders["Reason"] = "bye world"   ## 403: error reason
+      statusCode = 403   ## i is not even
       return i
     return i