Binding mapping issue fix, blob output, auto-generating HttpResponse …

…binding when it's missing (#4)

* Binding mapping issue fix that affecting blob output.
* Auto-generating HttpResponse binding when it's missing 
* Bug fixes

Sources/AzureFunctions/AzureFunction.swift

@@ -109,11 +109,12 @@ internal extension Function {
 
         for binding in outputBindings {
             bindings.append(try (binding as! BindingCapability).jsonDescription(direction: .output))
-
         }
 
-        if trigger is HttpRequest && outputBindings.count == 0 {
-            bindings.append(try HttpResponse().jsonDescription(direction: .output))
+        if trigger is HttpRequest && (outputBindings.count == 0 || !outputBindings.contains { (binding) -> Bool in
+            return binding is HttpResponse
+            }) {
+            bindings.append(try HttpResponse(bindingName: "$return").jsonDescription(direction: .output))
         }
 
         let dic: [String : Any] = ["generatedBy": "azure-functions-swift",

Sources/AzureFunctions/Bindings/BindingFactory.swift

@@ -63,7 +63,7 @@ internal final class BindingFactory {
         case _ as Queue, _ as Table:
             return nil
         default:
-            throw FunctionError.internalInconsistancyException("Cannot build binding for type of '\(binding.name)'")
+            throw FunctionError.internalInconsistancyException("Cannot build binding for type of '\(binding.name)', type unsupported")
         }
     }
 

Sources/AzureFunctions/CodeGen.swift

@@ -52,11 +52,6 @@ internal struct CodeGen {
         } else {
             localSetRes = try environment.renderTemplate(string: Templates.ProjectFiles.localSettingsJson, context: nil)
         }
-        //        if let storage = registry.AzureWebJobsStorage {
-//            localSetRes = try environment.renderTemplate(string: Templates.ProjectFiles.localSettingsJson, context: ["envVars": "\"AzureWebJobsStorage\": \"\(storage)\""])
-//        } else {
-//             localSetRes = try environment.renderTemplate(string: Templates.ProjectFiles.localSettingsJson, context: nil)
-//        }
 
         let localSetFile = try rootFolder.createFile(named: "local.settings.json")
         try localSetFile.write(localSetRes)

Sources/AzureFunctions/Context.swift

@@ -16,6 +16,13 @@ public final class Context {
 
     internal init () { }
 
+    internal func prepBindings() {
+        self.bindings = inputBindings
+        self.bindings.merge(self.outputBindings) { (current, _) -> Any in
+            current
+        }
+    }
+
     public func log(_ message: String) {
         Logger.log(message)
     }

Sources/AzureFunctions/WorkerChannel.swift

@@ -194,6 +194,8 @@ extension WorkerChannel {
                         context!.bindings[http] = httpRes
                     }
 
+                    context!.prepBindings()
+
                     res.outputData = functionInfo.outputBindings
                         .filter({ (key, val) -> Bool in
                             return context!.bindings[key] != nil