205 overload resolution (#252)

* Missed this in net8 additions * Fix overload resolution issues in Core * Fix overload resolution issues in Tasks/Hopac * Fix overload resolution issues in CancellableTaskResult * WIP: TaskValidtionCE * Wip merge sources * Fix MergeSources for CTValidation * cleanup * Ensure IAsyncDisposable tests * ignore nuget stuff
demystifyfp · Apr 6, 2024 · 08cf82b · 08cf82b
1 parent ab64ba3
commit 08cf82b
Show file tree

Hide file tree

Showing 38 changed files with 3,402 additions and 1,743 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,6 +8,7 @@ on:
   pull_request:
     branches:
       - master
+  workflow_dispatch:
 
 jobs:
 

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <DisableCheckingDuplicateNuGetItems>true</DisableCheckingDuplicateNuGetItems>
-    <NoWarn>$(NoWarn);FS2003; NU1903</NoWarn>
+    <NoWarn>$(NoWarn);FS2003; NU1903; NU1904</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
   </PropertyGroup>

diff --git a/src/FsToolkit.ErrorHandling.IcedTasks/CancellableTaskResultBuilderBase.fs b/src/FsToolkit.ErrorHandling.IcedTasks/CancellableTaskResultBuilderBase.fs
diff --git a/src/FsToolkit.ErrorHandling.IcedTasks/CancellableTaskResultCE.fs b/src/FsToolkit.ErrorHandling.IcedTasks/CancellableTaskResultCE.fs
diff --git a/src/FsToolkit.ErrorHandling.IcedTasks/CancellableTaskValidationCE.fs b/src/FsToolkit.ErrorHandling.IcedTasks/CancellableTaskValidationCE.fs
diff --git a/src/FsToolkit.ErrorHandling.IcedTasks/FsToolkit.ErrorHandling.IcedTasks.fsproj b/src/FsToolkit.ErrorHandling.IcedTasks/FsToolkit.ErrorHandling.IcedTasks.fsproj
@@ -2,17 +2,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Library</OutputType>
-        <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+        <TargetFrameworks>net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
         <LangVersion>preview</LangVersion>
         <DebugType>portable</DebugType>
         <NoWarn>FS3511;FS3513</NoWarn>
     </PropertyGroup>
     <ItemGroup>
+        <Compile Include="CancellableTaskResultBuilderBase.fs" />
         <Compile Include="CancellableTaskResultCE.fs" />
         <None Include="paket.references" />
         <Compile Include="CancellableTaskValidationCE.fs" />
         <Compile Include="CancellableTaskValidationOp.fs" />
-        <Watch Include="@(None)" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference

diff --git a/src/FsToolkit.ErrorHandling.JobResult/JobOptionCE.fs b/src/FsToolkit.ErrorHandling.JobResult/JobOptionCE.fs
@@ -118,19 +118,6 @@ module JobOptionCE =
         /// </summary>
         member inline _.Source(job: Job<_ option>) : Job<_ option> = job
 
-        /// <summary>
-        /// Method lets us transform data types into our internal representation.
-        /// </summary>
-        member inline _.Source(async: Async<_ option>) : Job<_ option> =
-            async
-            |> Job.fromAsync
-
-        /// <summary>
-        /// Method lets us transform data types into our internal representation.
-        /// </summary>
-        member inline _.Source(task: Task<_ option>) : Job<_ option> =
-            task
-            |> Job.awaitTask
 
     let jobOption = JobOptionBuilder()
 
@@ -173,3 +160,24 @@ module JobOptionCEExtensions =
             a
             |> Job.awaitTask
             |> Job.map Some
+
+[<AutoOpen>]
+// Having members as extensions gives them lower priority in
+// overload resolution and allows skipping more type annotations.
+module JobOptionCEExtensions2 =
+
+    type JobOptionBuilder with
+
+        /// <summary>
+        /// Method lets us transform data types into our internal representation.
+        /// </summary>
+        member inline _.Source(async: Async<_ option>) : Job<_ option> =
+            async
+            |> Job.fromAsync
+
+        /// <summary>
+        /// Method lets us transform data types into our internal representation.
+        /// </summary>
+        member inline _.Source(task: Task<_ option>) : Job<_ option> =
+            task
+            |> Job.awaitTask
diff --git a/src/FsToolkit.ErrorHandling.JobResult/JobResultCE.fs b/src/FsToolkit.ErrorHandling.JobResult/JobResultCE.fs
@@ -123,20 +123,6 @@ module JobResultCE =
         /// </summary>
         member inline _.Source(job': Job<Result<_, _>>) : Job<Result<_, _>> = job'
 
-        /// <summary>
-        /// Method lets us transform data types into our internal representation. This is the identity method to recognize the self type.
-        /// </summary>
-        member inline _.Source(task: Task<Result<_, _>>) : Job<Result<_, _>> =
-            task
-            |> Job.awaitTask
-
-        /// <summary>
-        /// Method lets us transform data types into our internal representation.
-        /// </summary>
-        member inline _.Source(result: Async<Result<_, _>>) : Job<Result<_, _>> =
-            result
-            |> Job.fromAsync
-
     let jobResult = JobResultBuilder()
 
 [<AutoOpen>]
@@ -194,3 +180,22 @@ module JobResultCEExtensions =
             t
             |> Job.awaitUnitTask
             |> Job.map Ok
+
+
+[<AutoOpen>]
+module JobResultCEExtensions2 =
+    type JobResultBuilder with
+
+        /// <summary>
+        /// Method lets us transform data types into our internal representation. This is the identity method to recognize the self type.
+        /// </summary>
+        member inline _.Source(task: Task<Result<_, _>>) : Job<Result<_, _>> =
+            task
+            |> Job.awaitTask
+
+        /// <summary>
+        /// Method lets us transform data types into our internal representation.
+        /// </summary>
+        member inline _.Source(result: Async<Result<_, _>>) : Job<Result<_, _>> =
+            result
+            |> Job.fromAsync
diff --git a/src/FsToolkit.ErrorHandling.TaskResult/TaskOptionCE.fs b/src/FsToolkit.ErrorHandling.TaskResult/TaskOptionCE.fs
@@ -212,16 +212,8 @@ type TaskOptionBuilderBase() =
             )
         )
 
-    member inline this.Source(computation: Async<'T option>) : TaskOption<'T> =
-        computation
-        |> Async.StartImmediateAsTask
-
     member inline this.Source(taskOption: TaskOption<'T>) : TaskOption<'T> = taskOption
 
-    member inline this.Source(taskOption: ValueTask<'T option>) : TaskOption<'T> =
-        taskOption.AsTask()
-
-
 type TaskOptionBuilder() =
 
     inherit TaskOptionBuilderBase()
@@ -617,3 +609,17 @@ module TaskOptionCEExtensionsMediumPriority =
             computation
             |> Async.map Some
             |> Async.StartImmediateAsTask
+
+
+[<AutoOpen>]
+module TaskOptionCEExtensionsHighPriority2 =
+
+    // Medium priority extensions
+    type TaskOptionBuilderBase with
+
+        member inline this.Source(computation: Async<'T option>) : TaskOption<'T> =
+            computation
+            |> Async.StartImmediateAsTask
+
+        member inline this.Source(taskOption: ValueTask<'T option>) : TaskOption<'T> =
+            taskOption.AsTask()
diff --git a/src/FsToolkit.ErrorHandling.TaskResult/TaskResultCE.fs b/src/FsToolkit.ErrorHandling.TaskResult/TaskResultCE.fs
@@ -218,19 +218,6 @@ type TaskResultBuilderBase() =
     member inline this.Source(taskResult: TaskResult<'T, 'Error>) : TaskResult<'T, 'Error> =
         taskResult
 
-    member inline _.Source(result: Async<Result<_, _>>) : Task<Result<_, _>> =
-        result
-        |> Async.StartImmediateAsTask
-
-    member inline _.Source(t: ValueTask<Result<_, _>>) : Task<Result<_, _>> = task { return! t }
-
-    member inline _.Source(result: Result<_, _>) : Task<Result<_, _>> = Task.singleton result
-
-    member inline _.Source(result: Choice<_, _>) : Task<Result<_, _>> =
-        result
-        |> Result.ofChoice
-        |> Task.singleton
-
 
 type TaskResultBuilder() =
 
@@ -591,3 +578,23 @@ module TaskResultCEExtensionsMediumPriority =
             computation
             |> Async.map Ok
             |> Async.StartImmediateAsTask
+
+[<AutoOpen>]
+module TaskResultCEExtensionsHighPriority2 =
+
+    // Medium priority extensions
+    type TaskResultBuilderBase with
+
+
+        member inline _.Source(result: Async<Result<_, _>>) : Task<Result<_, _>> =
+            result
+            |> Async.StartImmediateAsTask
+
+        member inline _.Source(t: ValueTask<Result<_, _>>) : Task<Result<_, _>> = task { return! t }
+
+        member inline _.Source(result: Result<_, _>) : Task<Result<_, _>> = Task.singleton result
+
+        member inline _.Source(result: Choice<_, _>) : Task<Result<_, _>> =
+            result
+            |> Result.ofChoice
+            |> Task.singleton
diff --git a/src/FsToolkit.ErrorHandling.TaskResult/TaskResultOption.fs b/src/FsToolkit.ErrorHandling.TaskResult/TaskResultOption.fs
@@ -21,7 +21,7 @@ module TaskResultOption =
     let inline map3 ([<InlineIfLambda>] f) xTRO yTRO zTRO =
         TaskResult.map3 (Option.map3 f) xTRO yTRO zTRO
 
-    let inline retn value = TaskResult.retn (Ok value)
+    let inline retn value = TaskResult.retn (Some value)
 
     let inline apply fTRO xTRO = map2 (fun f x -> f x) fTRO xTRO
 

diff --git a/src/FsToolkit.ErrorHandling/AsyncOptionCE.fs b/src/FsToolkit.ErrorHandling/AsyncOptionCE.fs
@@ -100,15 +100,6 @@ module AsyncOptionCE =
         /// </summary>
         member inline _.Source(async: Async<'value option>) : Async<'value option> = async
 
-#if !FABLE_COMPILER
-        /// <summary>
-        /// Method lets us transform data types into our internal representation.
-        /// </summary>
-        member inline _.Source(task: Task<'value option>) : Async<'value option> =
-            task
-            |> Async.AwaitTask
-
-#endif
 
     let asyncOption = AsyncOptionBuilder()
 
@@ -177,4 +168,17 @@ module AsyncOptionCEExtensions =
             a
             |> Async.AwaitTask
             |> Async.map Some
+
+[<AutoOpen>]
+module AsyncOptionCEExtensionsHigher =
+
+    type AsyncOptionBuilder with
+
+        /// <summary>
+        /// Method lets us transform data types into our internal representation.
+        /// </summary>
+        member inline _.Source(task: Task<'value option>) : Async<'value option> =
+            task
+            |> Async.AwaitTask
+
 #endif
diff --git a/src/FsToolkit.ErrorHandling/AsyncResultCE.fs b/src/FsToolkit.ErrorHandling/AsyncResultCE.fs
@@ -128,14 +128,6 @@ module AsyncResultCE =
         member inline _.Source(result: Async<Result<'ok, 'error>>) : Async<Result<'ok, 'error>> =
             result
 
-#if !FABLE_COMPILER
-        /// <summary>
-        /// Method lets us transform data types into our internal representation.
-        /// </summary>
-        member inline _.Source(task: Task<Result<'ok, 'error>>) : Async<Result<'ok, 'error>> =
-            task
-            |> Async.AwaitTask
-#endif
 
     let asyncResult = AsyncResultBuilder()
 
@@ -211,3 +203,17 @@ module AsyncResultCEExtensions =
             |> Async.AwaitTask
             |> Async.map Ok
 #endif
+
+#if !FABLE_COMPILER
+[<AutoOpen>]
+module AsyncResultCEExtensions2 =
+
+    type AsyncResultBuilder with
+
+        /// <summary>
+        /// Method lets us transform data types into our internal representation.
+        /// </summary>
+        member inline _.Source(task: Task<Result<'ok, 'error>>) : Async<Result<'ok, 'error>> =
+            task
+            |> Async.AwaitTask
+#endif
diff --git a/src/FsToolkit.ErrorHandling/AsyncResultOptionCE.fs b/src/FsToolkit.ErrorHandling/AsyncResultOptionCE.fs
@@ -103,19 +103,7 @@ module AsyncResultOptionCE =
             (result: AsyncResultOption<'ok, 'error>)
             : AsyncResultOption<'ok, 'error> =
             result
-#if !FABLE_COMPILER
 
-        /// <summary>
-        /// Method lets us transform data types into our internal representation.  This is the identity method to recognize the self type.
-        ///
-        /// See https://stackoverflow.com/questions/35286541/why-would-you-use-builder-source-in-a-custom-computation-expression-builder
-        /// </summary>
-        member inline _.Source
-            (result: Task<Result<Option<'ok>, 'error>>)
-            : AsyncResultOption<'ok, 'error> =
-            result
-            |> Async.AwaitTask
-#endif
     let asyncResultOption = new AsyncResultOptionBuilder()
 
 
@@ -231,3 +219,22 @@ module AsyncResultOptionCEExtensionsHighPriority =
             |> Async.AwaitTask
             |> AsyncResultOption.ofAsyncOption
 #endif
+
+#if !FABLE_COMPILER
+[<AutoOpen>]
+module AsyncResultOptionCEExtensionsHighPriority2 =
+
+    type AsyncResultOptionBuilder with
+
+
+        /// <summary>
+        /// Method lets us transform data types into our internal representation.  This is the identity method to recognize the self type.
+        ///
+        /// See https://stackoverflow.com/questions/35286541/why-would-you-use-builder-source-in-a-custom-computation-expression-builder
+        /// </summary>
+        member inline _.Source
+            (result: Task<Result<Option<'ok>, 'error>>)
+            : AsyncResultOption<'ok, 'error> =
+            result
+            |> Async.AwaitTask
+#endif
diff --git a/src/FsToolkit.ErrorHandling/OptionCE.fs b/src/FsToolkit.ErrorHandling/OptionCE.fs
@@ -126,11 +126,6 @@ module OptionCE =
         member inline _.Source(result: 'value option) : 'value option = result
 
 
-        /// <summary>
-        /// Method lets us transform data types into our internal representation.
-        /// </summary>
-        member inline _.Source(vopt: 'value voption) : 'value option = Option.ofValueOption vopt
-
     let option = OptionBuilder()
 
 [<AutoOpen>]
@@ -176,8 +171,13 @@ module OptionExtensions =
         /// </summary>
         member inline _.Source(s: #seq<'value>) : #seq<'value> = s
 
-        // /// <summary>
-        // /// Method lets us transform data types into our internal representation.
-        // /// </summary>
+        /// <summary>
+        /// Method lets us transform data types into our internal representation.
+        /// </summary>
         member inline _.Source(nullable: Nullable<'value>) : 'value option =
             Option.ofNullable nullable
+
+        /// <summary>
+        /// Method lets us transform data types into our internal representation.
+        /// </summary>
+        member inline _.Source(vopt: 'value voption) : 'value option = Option.ofValueOption vopt
diff --git a/src/FsToolkit.ErrorHandling/ValueOptionCE.fs b/src/FsToolkit.ErrorHandling/ValueOptionCE.fs
@@ -113,13 +113,6 @@ module ValueOptionCE =
         member inline _.Source(result: _ voption) : _ voption = result
 
 
-        // /// <summary>
-        // /// Method lets us transform data types into our internal representation.
-        // /// </summary>
-        member inline _.Source(vopt: _ option) : _ voption =
-            vopt
-            |> ValueOption.ofOption
-
     let voption = ValueOptionBuilder()
 
 [<AutoOpen>]
@@ -156,10 +149,18 @@ module ValueOptionExtensions =
         /// </summary>
         member inline _.Source(s: #seq<_>) = s
 
-        // /// <summary>
-        // /// Method lets us transform data types into our internal representation.
-        // /// </summary>
+        /// <summary>
+        /// Method lets us transform data types into our internal representation.
+        /// </summary>
         member inline _.Source(nullable: Nullable<'a>) : 'a voption =
             nullable
             |> ValueOption.ofNullable
+
+
+        /// <summary>
+        /// Method lets us transform data types into our internal representation.
+        /// </summary>
+        member inline _.Source(vopt: _ option) : _ voption =
+            vopt
+            |> ValueOption.ofOption
 #endif
diff --git a/tests/FsToolkit.ErrorHandling.AsyncSeq.Tests/FsToolkit.ErrorHandling.AsyncSeq.Tests.fsproj b/tests/FsToolkit.ErrorHandling.AsyncSeq.Tests/FsToolkit.ErrorHandling.AsyncSeq.Tests.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <LangVersion>preview</LangVersion>
     </PropertyGroup>
     <ItemGroup>