Add Content-Type x-www-form-urlencoded (#29)

* add support to content type x-www-form-urlencoded

* add verbose mode

* fix API generator, set parameters

* fix snapshots

* add snapshot testing for new content type - www-form-urlencoded

* improve template to make parameteres for sending operation

* fix: update to bow 0.8 templates

Author: miguelangel-dev

BowOpenAPI.xcodeproj/project.pbxproj

@@ -14,4 +14,7 @@ struct BowOpenAPICommand: ParsableCommand {
 
     @Option(help: ArgumentHelp("Path where the Swift package containing the network client will be generated. ex. `/home`.", valueName: "output path"))
     var output: String
+    
+    @ArgumentParser.Flag (help: "Run in verbose mode")
+    var verbose: Bool
 }

BowOpenAPI/BowOpenAPICommand.swift

@@ -0,0 +1,36 @@
+//  Copyright © 2019 The Bow Authors.
+
+import Foundation
+import Bow
+import BowEffects
+import OpenApiGenerator
+
+public extension Kleisli where F == IOPartial<APIClientError> {
+    
+    func reportStatus(
+        _ failure: @escaping (APIClientError) -> String,
+        _ success: @escaping (A) -> String)
+        -> EnvIO<D, APIClientError, A> {
+        
+        self.foldM(
+            { e in
+                ConsoleIO.print("☠️ \(failure(e))").env().followedBy(.raiseError(e))^
+            },
+            { a in
+                ConsoleIO.print("🙌 \(success(a))").env().followedBy(.pure(a))^
+            }
+        )^
+    }
+}
+
+public extension Kleisli where F == IOPartial<APIClientError> {
+    func finish() -> EnvIO<D, APIClientError, Void>  {
+        self.foldM(
+            { _ in
+                EnvIO.invoke { _ in Darwin.exit(-1) }
+            },
+            { _ in
+                EnvIO.invoke { _ in Darwin.exit(0) }
+            })
+    }
+}

BowOpenAPI/Console.swift

@@ -0,0 +1,11 @@
+//  Copyright © 2020 The Bow Authors.
+
+import Foundation
+
+extension String {
+    var contentOfFile: String {
+        let fileURL = URL(fileURLWithPath: expandingTildeInPath)
+        let content = try? String(contentsOf: fileURL)
+        return content ?? ""
+    }
+}

BowOpenAPI/Utils/Kleisli+Console.swift

@@ -2,22 +2,37 @@
 
 import Foundation
 import OpenApiGenerator
+import Bow
+import BowEffects
 
 let prodEnv = Environment(logPath: "/tmp/bow-openapi.log",
                           fileSystem: MacFileSystem(),
                           generator: SwaggerClientGenerator())
 
 extension BowOpenAPICommand {
     func run() throws {
-        guard FileManager.default.fileExists(atPath: schema) else {
-            Console.exit(failure: "received invalid schema path")
-        }
-        
-        APIClient.bow(moduleName: name, scheme: schema, output: output)
-            .provide(prodEnv)
-            .unsafeRunSyncEither()
-            .mapLeft { apiError in "could not generate api client for schema '\(schema)'\ninformation: \(apiError)" }
-            .fold(Console.exit(failure:), Console.exit(success:))
+        try run().provide(prodEnv).unsafeRunSync()
+    }
+
+    func run() -> EnvIO<Environment, APIClientError, Void> {
+        APIClient.bow(moduleName: name, schema: schema, output: output)
+            .reportStatus(
+                { apiError in
+                    """
+                    Could not generate API client:
+                    • SCHEMA '\(self.schema)'
+                    
+                    \(apiError)
+                    
+                    \(self.verbose ?
+                    "   • LOG \n\n\(prodEnv.logPath.contentOfFile)\n" :
+                    "   • LOG: \(prodEnv.logPath)")
+                    """
+                },
+                { success in
+                    "\(success)"
+                }
+            ).finish()
     }
 }
 

BowOpenAPI/Utils/String+File.swift

@@ -5,12 +5,16 @@ import Bow
 import BowEffects
 
 public enum APIClient {
-    public static func bow(moduleName: String, scheme: String, output: String) -> EnvIO<Environment, APIClientError, String> {
+    public static func bow(moduleName: String, schema: String, output: String) -> EnvIO<Environment, APIClientError, String> {
         EnvIO { env in
             let template = IO<APIClientError, String>.var()
+            let schema = schema.expandingTildeInPath
+            let output = output.expandingTildeInPath
+            
             return binding(
+                         |<-validate(schema: schema),
                 template <- getTemplatePath(),
-                         |<-bow(moduleName: moduleName, scheme: scheme, output: output, templatePath: template.get).provide(env),
+                         |<-bow(moduleName: moduleName, scheme: schema, output: output, templatePath: template.get).provide(env),
             yield: "RENDER SUCCEEDED")^
         }
     }
@@ -32,6 +36,15 @@ public enum APIClient {
     }
 
     // MARK: attributes
+    private static func validate(schema: String) -> IO<APIClientError, Void> {
+        IO.invoke {
+            guard FileManager.default.fileExists(atPath: schema) else {
+                throw APIClientError(operation: "validate(schema:output:)",
+                                    error: GeneratorError.invalidParameters)
+            }
+        }
+    }
+    
     private static func getTemplatePath() -> IO<APIClientError, String> {
         let libPath = "/usr/local/lib"
         let templateSource1 = Bundle(path: "bow/openapi/templates").toOption()
@@ -54,7 +67,7 @@ public enum APIClient {
                              .followedBy(fileSystem.createDirectory(atPath: parentPath))^
                              .followedBy(fileSystem.createDirectory(atPath: outputPath.sources))^
                              .followedBy(fileSystem.createDirectory(atPath: outputPath.tests))^
-                             .mapLeft { _ in APIClientError(operation: "createStructure(atPath:)", error: GeneratorError.structure) }
+                             .mapError { _ in APIClientError(operation: "createStructure(atPath:)", error: GeneratorError.structure) }
         }
     }
 

BowOpenAPI/main.swift

@@ -40,7 +40,7 @@ public extension FileSystem {
     func moveFile(from origin: String, to destination: String) -> IO<FileSystemError, Void> {
         copy(itemPath: origin, toPath: destination)
             .followedBy(removeFiles(origin))^
-            .mapLeft { _ in .move(from: origin, to: destination) }
+            .mapError { _ in .move(from: origin, to: destination) }
     }
 
     func moveFiles(in input: String, to output: String) -> IO<FileSystemError, ()> {
@@ -51,7 +51,7 @@ public extension FileSystem {
                   |<-self.copy(items: items.get, from: input, to: output),
                   |<-self.removeDirectory(input),
             yield: ()
-        )^.mapLeft { _ in .move(from: input, to: output) }
+        )^.mapError { _ in .move(from: input, to: output) }
     }
 
     func rename(_ newName: String, itemAt: String) -> IO<FileSystemError, ()> {

OpenApiGenerator/APIClient.swift

@@ -3,9 +3,9 @@
 import Foundation
 
 public struct Environment {
-    let logPath: String
-    let fileSystem: FileSystem
-    let generator: ClientGenerator
+    public let logPath: String
+    public let fileSystem: FileSystem
+    public let generator: ClientGenerator
 
     public init(logPath: String, fileSystem: FileSystem, generator: ClientGenerator) {
         self.logPath = logPath

OpenApiGenerator/Algebra/FileSystem.swift

@@ -4,6 +4,7 @@ import Foundation
 
 /// General information about the errors in the generator
 enum GeneratorError: Error {
+    case invalidParameters
     case templateNotFound
     case structure
     case generator
@@ -12,6 +13,8 @@ enum GeneratorError: Error {
 extension GeneratorError: CustomStringConvertible {
     var description: String {
         switch self {
+        case .invalidParameters:
+            return "received invalid parameters"
         case .templateNotFound:
             return "templates for generating Bow client have not been found"
         case .structure: