Better support for optional parameters

Author: sergey-tihon

docs/docs.fsx

@@ -5,7 +5,7 @@
 #load "../packages/build/FSharp.Formatting/FSharp.Formatting.fsx"
 #I "../packages/build/FAKE/tools/"
 #I "../packages/build/Suave/lib/net40"
-#I "../packages/build/DotLiquid/lib/NET451"
+#I "../packages/build/DotLiquid/lib/net45"
 #r "FakeLib.dll"
 #r "Suave.dll"
 #r "DotLiquid.dll"

src/SwaggerProvider.DesignTime/DefinitionCompiler.fs

@@ -166,3 +166,19 @@ type DefinitionCompiler (schema:SwaggerObject) =
     /// Compiles the definition.
     member __.CompileTy opName tyUseSuffix ty required =
         compileSchemaObject (uniqueName opName tyUseSuffix) ty required
+
+    /// Default value for parameters
+    member __.GetDefaultValue schemaObj =
+        match schemaObj with
+        | Boolean
+        | Byte | Int32 | Int64
+        | Float| Double 
+        | Date | DateTime
+           -> box <| None
+        | String | Enum _
+           -> box <| Unchecked.defaultof<string>
+        | File | Array _ 
+        | Dictionary _ | Object _
+        | Reference _
+           -> null
+

src/SwaggerProvider.DesignTime/OperationCompiler.fs

@@ -20,10 +20,17 @@ type OperationCompiler (schema:SwaggerObject, defCompiler:DefinitionCompiler) =
             then failwithf "Operation name could not be empty. See '%s/%A'" op.Path op.Type
 
         let parameters =
-            [let required, optional = op.Parameters |> Array.partition (fun x->x.Required)
-             for x in Array.append required optional ->
+            [
+             let required, optional = op.Parameters |> Array.partition (fun x->x.Required)
+             let parameters = Array.append required optional
+             for x in parameters ->
                 let paramName = niceCamelName x.Name
-                ProvidedParameter(paramName, defCompiler.CompileTy methodName paramName x.Type x.Required)]
+                let paramType = defCompiler.CompileTy methodName paramName x.Type x.Required
+                if x.Required then ProvidedParameter(paramName, paramType)
+                else 
+                    let paramDefaultValue = defCompiler.GetDefaultValue x.Type
+                    ProvidedParameter(paramName, paramType, false, paramDefaultValue)
+            ]
         let retTy =
             let okResponse = // BUG :  wrong selector
                 op.Responses |> Array.tryFind (fun (code, resp) ->

tests/SwaggerProvider.ProviderTests/Swashbuckle.UpdateControllers.Tests.fs

@@ -140,4 +140,11 @@ let returnControllersTests =
         let bytes = [|42uy;24uy|]
         let y = api.GetApiUpdateObjectFileDescriptionClass(bytes)
         y.Bytes |> shouldEqual bytes
+
+    testCase "Use Optional param Int" <| fun _ ->
+        api.GetApiUpdateWithOptionalInt(1)
+        |> shouldEqual 2
+
+        api.GetApiUpdateWithOptionalInt(1, Some(2))
+        |> shouldEqual 3
   ]

tests/Swashbuckle.OWIN.Server/UpdateControllers.fs

@@ -2,6 +2,7 @@
 
 open System
 open System.Web.Http
+open System.Runtime.InteropServices
 
 type UpdateController<'T>(f:'T->'T) =
     inherit ApiController()
@@ -54,4 +55,11 @@ type UpdateObjectFileDescriptionClassController () =
     inherit ApiController()
 
     member this.Get ([<FromUri>]x) = Types.FileDescription("1.txt", x)
-    member this.Post (x:Types.FileDescription) = x
+    member this.Post (x:Types.FileDescription) = x
+
+
+type UpdateWithOptionalIntController() =
+    inherit ApiController()
+
+    member this.Get ([<FromUri>]x, [<FromUri; Optional; DefaultParameterValue(1)>]y:int) =
+        x+y