Updated assertions

swiftwasm · colemancda · Jun 3, 2020 · Jun 3, 2020 · Jun 3, 2020 · Jun 3, 2020
commit cfc85cee7987f01b3d0191f52e4fac5ec35e80ef
diff --git a/Sources/JavaScriptKit/Utilities.swift → Sources/JavaScriptKit/Assert.swift b/Sources/JavaScriptKit/Utilities.swift → Sources/JavaScriptKit/Assert.swift
@@ -1,5 +1,5 @@
 //
-//  Utilities.swift
+//  Assert.swift
 //  
 //
 //  Created by Alsey Coleman Miller on 6/4/20.
@@ -24,3 +24,15 @@ internal func assert(_ condition: @autoclosure () -> Bool, _ message: @autoclosu
 internal func assert(_ condition: @autoclosure () -> JSBoolean, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
     assert(condition().rawValue, message(), file: file, line: line)
 }
+
+internal extension Optional {
+
+    func assert(_ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) -> Wrapped {
+        switch self {
+        case .none:
+            fatalError(message(), file: file, line: line)
+        case let .some(value):
+            return value
+        }
+    }
+}
diff --git a/Sources/JavaScriptKit/JS Types/JSBoolean.swift b/Sources/JavaScriptKit/JS Types/JSBoolean.swift
@@ -32,9 +32,8 @@ extension JSBoolean: RawRepresentable {
     }
 
     public var rawValue: Bool {
-        guard let function = jsObject.valueOf.function
-            else { fatalError("Invalid function \(#function)") }
-        return function.apply(this: jsObject).boolean ?? false
+        let function = jsObject.valueOf.function.assert("Invalid function \(#function)")
+        return function.apply(this: jsObject).boolean.assert()
     }
 }