Updated JSConsole

Author: colemancda

Example/JavaScriptKitExample/Sources/JavaScriptKitExample/main.swift

@@ -16,16 +16,18 @@ buttonElement.onclick = .function { _ in
     JSConsole.debug("\(#file) \(#function) \(#line)")
     alert("Swift is running on browser!")
     JSConsole.log("Requesting any Bluetooth Device...")
-    bluetooth.requestDevice().then {
-        JSConsole.info($0)
-        JSConsole.debug("\(#file) \(#function) \(#line)")
-        alert("Got device \($0)")
+    bluetooth.requestDevice().then { (device: JSBluetoothDevice) -> (JSPromise<JSBluetoothRemoteGATTServer>) in
+        JSConsole.info(device)
+        JSConsole.debug("\(#file) \(#function) \(#line) \(device)")
+        alert("Got device \(device)")
         JSConsole.log("Connecting to GATT Server...")
-        $0.gatt.connect()
-    }.then {
-        JSConsole.info($0)
-        JSConsole.debug("\(#file) \(#function) \(#line)")
+        return device.gatt.connect()
+    }.then { (server: JSBluetoothRemoteGATTServer) -> () in
+        JSConsole.info(server)
+        JSConsole.debug("\(#file) \(#function) \(#line) \(server)")
         alert("Connected")
+    }.catch { (error: JSError) in
+        alert("Error: \(error)")
     }
     JSConsole.debug("\(#file) \(#function) \(#line)")
     return .undefined

Sources/JavaScriptKit/JS Types/JSConsole.swift

@@ -22,36 +22,36 @@ public final class JSConsole: JSType {
     /**
      The Console method `log()` outputs a message to the web console. The message may be a single string (with optional substitution values), or it may be any one or more JavaScript objects.
      */
-    public static func log(_ arguments: JSValueConvertible...) {
-        logFunction.dynamicallyCall(withArguments: arguments)
+    public static func log(_ arguments: Any...) {
+        logFunction.dynamicallyCall(withArguments: arguments.map(print))
     }
 
     /**
      The `console.info()` method outputs an informational message to the Web Console. In Firefox, a small "i" icon is displayed next to these items in the Web Console's log.
      */
-    public static func info(_ arguments: JSValueConvertible...) {
-        infoFunction.dynamicallyCall(withArguments: arguments)
+    public static func info(_ arguments: Any...) {
+        infoFunction.dynamicallyCall(withArguments: arguments.map(print))
     }
 
     /**
      The console method `debug()` outputs a message to the web console at the "debug" log level. The message is only displayed to the user if the console is configured to display debug output.
      */
-    public static func debug(_ arguments: JSValueConvertible...) {
-        debugFunction.dynamicallyCall(withArguments: arguments)
+    public static func debug(_ arguments: Any...) {
+        debugFunction.dynamicallyCall(withArguments: arguments.map(print))
     }
 
     /**
      Outputs an error message to the Web Console.
      */
-    public static func error(_ arguments: JSValueConvertible...) {
-        errorFunction.dynamicallyCall(withArguments: arguments)
+    public static func error(_ arguments: Any...) {
+        errorFunction.dynamicallyCall(withArguments: arguments.map(print))
     }
 
     /**
      The `console.assert()` method writes an error message to the console if the assertion is false. If the assertion is true, nothing happens.
      */
     public static func assert(_ condition: @autoclosure () -> (Bool), _ arguments: JSValueConvertible...) {
-        assertFunction.dynamicallyCall(withArguments: [condition()] + arguments)
+        assertFunction.dynamicallyCall(withArguments: [condition()] + arguments.map(print))
     }
 }
 
@@ -69,16 +69,19 @@ internal extension JSConsole {
 
     static let assertFunction = classObject.assert.function!
 }
-/*
+
 private extension JSConsole {
 
     /// Console should print objects as their description and not
-    static func print(_ value: JSValueConvertible) -> JSValueConvertible {
-        if let value = value as? CustomStringConvertible {
+    static func print(_ value: Any) -> JSValueConvertible {
+        if let value = value as? JSType {
+            return value
+        } else if let value = value as? JSValueConvertible {
+            return value
+        } else if let value = value as? CustomStringConvertible {
             return value.description
         } else {
-            return value
+            return "\(value)"
         }
     }
 }
-*/