Fixes for fable

Author: TheAngryByrd

.nvmrc

@@ -0,0 +1 @@
+14.16.1

package-lock.json

@@ -58,49 +58,51 @@ module Expect =
     else Tests.failtestf "Expected %A, was %A." v x
   }
 
-  let hasTaskValue v taskX =
-    let x =  taskX |> Async.AwaitTask |> Async.RunSynchronously
-    if v = x then
-      ()
-    else Tests.failtestf "Expected %A, was %A." v x
-
-
   let hasAsyncOkValue v asyncX = async {
     let! x = asyncX
     hasOkValue v x
   }
 
-  let hasTaskOkValue v taskX = 
-    let x =  taskX |> Async.AwaitTask |> Async.RunSynchronously
-    hasOkValue v x
-
   let hasAsyncErrorValue v asyncX =  async {
     let! x = asyncX
     hasErrorValue v x
   }
 
-  let hasTaskErrorValue v taskX = 
-    let x =  taskX |> Async.AwaitTask |> Async.RunSynchronously
-    hasErrorValue v x
-
   let hasAsyncSomeValue v asyncX = async {
     let! x = asyncX
     hasSomeValue v x
   }
 
-  let hasTaskSomeValue v taskX = 
-    let x =  taskX |> Async.AwaitTask |> Async.RunSynchronously
-    hasSomeValue v x
-
   let hasAsyncNoneValue asyncX = async {
     let! x = asyncX
     hasNoneValue x
   }
 
+#if !FABLE_COMPILER
+  let hasTaskValue v taskX =
+    let x =  taskX |> Async.AwaitTask |> Async.RunSynchronously
+    if v = x then
+      ()
+    else Tests.failtestf "Expected %A, was %A." v x
+
+  let hasTaskOkValue v taskX = 
+    let x =  taskX |> Async.AwaitTask |> Async.RunSynchronously
+    hasOkValue v x
+
   let hasTaskNoneValue taskX = 
     let x =  taskX |> Async.AwaitTask |> Async.RunSynchronously
     hasNoneValue x
 
+  let hasTaskErrorValue v taskX = 
+    let x =  taskX |> Async.AwaitTask |> Async.RunSynchronously
+    hasErrorValue v x
+
+  let hasTaskSomeValue v taskX = 
+    let x =  taskX |> Async.AwaitTask |> Async.RunSynchronously
+    hasSomeValue v x
+    
+#endif
+
   let same expected actual =
     Expect.equal actual expected "expected and actual should be same"
 

tests/FsToolkit.ErrorHandling.Tests/Expect.fs

@@ -14,9 +14,14 @@ let makeDisposable () =
     { new System.IDisposable
         with member this.Dispose() = () }
 
+
+// type Option<'a> = | Some of 'a | None
+
 let ceTests = 
     testList "CE Tests" [
         testCase "Return value" <| fun _ ->
+
+
             let expected = Some 42
             let actual = option  {
                 return 42
@@ -127,22 +132,24 @@ let ceTests =
                 return data
             }
             Expect.equal actual (Some data) "Should be ok"
+#if !FABLE_COMPILER
         testCase "Nullable value" <| fun () ->
             let data = 42
             let actual = option {
-                return! System.Nullable data
+                let! value = System.Nullable<int> data
+                return value
             }
             Expect.equal actual (Some data) ""
         testCase "Nullable null" <| fun () ->
             let actual = option {
                 return! System.Nullable<_> ()
             }
             Expect.equal actual None ""
-
+#endif
         testCase "string value" <| fun () ->
             let data = "hello"
             let actual = option {
-                let! v = data
+                let! v = data 
                 return v
             }
             Expect.equal actual (Some data) ""
@@ -197,6 +204,7 @@ let ``OptionCE applicative tests`` =
             }
             Expect.equal actual (Some 4) "Should be Some 4"
 
+#if !FABLE_COMPILER
         testCase "Happy Path Nullable" <| fun () ->
             let actual = option {
                 let! a = Nullable<_> 3
@@ -205,7 +213,7 @@ let ``OptionCE applicative tests`` =
                 return a + b - c
             }
             Expect.equal actual (Some 4) "Should be Some 4"
-
+#endif
         testCase "Happy Path null Objects" <| fun () ->
             // let hello = CustomClass
             let actual = option {
@@ -244,6 +252,7 @@ let ``OptionCE applicative tests`` =
             }
             Expect.equal actual (Some 6) "Should be Some"
 
+#if !FABLE_COMPILER
         testCase "Happy Path Option.Some/Nullable" <| fun () ->
             let actual = option {
                 let! a = Some 3
@@ -263,27 +272,29 @@ let ``OptionCE applicative tests`` =
             Expect.equal actual (Some 4) "Should be Some 4"
 
 
-        testCase "Hapy Combo" <| fun () ->
+        testCase "Happy Combo all" <| fun () ->
             let actual = option {
                 let! a = Nullable<_> 3
                 and! b = Some 2
-                and! c = "Nullable<_>()"
+                and! c = "hello"
                 and! d = ResizeArray [1]
                 and! e = CustomClass 5
-                and! f = Uri "http://github.com"
-                return a,b,c,d,e,f 
+                and! f = Uri "https://github.com/"
+                return sprintf "%d %d %s %d %d %s" a b c (Seq.head d) e.getX (string f)
             }
-            Expect.isSome actual "Should be Some"
-
+            
+            Expect.equal actual (Some "3 2 hello 1 5 https://github.com/") "Should be Some"
+#endif 
         testCase "Fail Path Option.None" <| fun () ->
             let actual = option {
                 let! a = Some 3
                 and! b = Some 2
                 and! c = None
                 return a + b - c
             }
-            Expect.isNone actual "Should be None"
-            
+            Expect.equal actual None "Should be None"
+
+#if !FABLE_COMPILER     
         testCase "Fail Path Nullable" <| fun () ->
             let actual = option {
                 let! a = Nullable 3
@@ -292,7 +303,7 @@ let ``OptionCE applicative tests`` =
                 return a + b - c
             }
             Expect.equal actual (None) "Should be None"    
-
+#endif
         testCase "Fail Path Objects" <| fun () ->
             let c1 = CustomClass 3
             let c2 = CustomClass 2
@@ -318,15 +329,16 @@ let ``OptionCE applicative tests`` =
             }
             Expect.equal actual (None) "Should be None"
 
+#if !FABLE_COMPILER
         testCase "Fail Path Option.Some/Nullable" <| fun () ->
             let actual = option {
                 let! a = Nullable<_> 3
                 and! b = Some 2
                 and! c = Nullable<_>()
                 return a + b - c
             }
-            Expect.isNone actual "Should be None"
-
+            Expect.equal actual None "Should be None"
+#endif
     ]
 
 let allTests = testList "Option CE tests" [