More defensive checking for options

theolampert · Jul 3, 2024 · dd7ad58 · dd7ad58
1 parent b16ed8d
commit dd7ad58
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/Sources/ECMASwift/API/Fetch/Fetch.swift b/Sources/ECMASwift/API/Fetch/Fetch.swift
@@ -61,7 +61,7 @@ public final class FetchAPI {
                     return
                 }
                 // options can include body.
-                if let options, options.hasProperty("body") {
+                if let options, options.hasValue, options.hasProperty("body") {
                     request.httpBody = options.forProperty("body").toString().data(using: .utf8)
                 }
                 guard let client = self?.client else { return }
@@ -89,11 +89,13 @@ public final class FetchAPI {
                         return
                     }
                 }
-                if let signal = options?.forProperty("signal").toType(AbortSignal.self) {
-                    signal.onAbort = {
-                        if signal.aborted {
-                            fetchTask?.cancel()
-                            reject.call(withArguments: [["name": "AbortError"]])
+                if let options = options, options.hasValue {
+                    if let signal = options.forProperty("signal").toType(AbortSignal.self) {
+                        signal.onAbort = {
+                            if signal.aborted {
+                                fetchTask?.cancel()
+                                reject.call(withArguments: [["name": "AbortError"]])
+                            }
                         }
                     }
                 }