Merge pull request #98 from TheAngryByrd/forloop-with-iasyncenumerable-with-task-and-async

WhileDynamic for task files

Author: TheAngryByrd

src/FSharp.Control.TaskSeq.Test/FSharp.Control.TaskSeq.Test.fsproj

@@ -1,13 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-
     <IsPackable>false</IsPackable>
     <GenerateProgramFile>false</GenerateProgramFile>
     <ApplicationIcon>..\..\assets\TaskSeq.ico</ApplicationIcon>
   </PropertyGroup>
-
   <ItemGroup>
     <Content Include="..\..\assets\TaskSeq.ico" Link="TaskSeq.ico" />
     <Compile Include="AssemblyInfo.fs" />
@@ -47,9 +44,9 @@
     <Compile Include="TaskSeq.StateTransitionBug-delayed.Tests.CE.fs" />
     <Compile Include="TaskSeq.PocTests.fs" />
     <Compile Include="TaskSeq.Realworld.fs" />
+    <Compile Include="TaskSeq.Extensions.Tests.fs" />
     <Compile Include="Program.fs" />
   </ItemGroup>
-
   <ItemGroup>
     <!-- align test project with minimal required version for TaskSeq -->
     <!-- we use 6.0.3 here and not 6.0.2 because TaskResult lib requires it-->
@@ -67,9 +64,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\FSharp.Control.TaskSeq\FSharp.Control.TaskSeq.fsproj" />
   </ItemGroup>
-
 </Project>

src/FSharp.Control.TaskSeq.Test/TaskSeq.Extensions.Tests.fs

@@ -0,0 +1,28 @@
+module TaskSeq.Extenions
+
+open System
+open Xunit
+open FsUnit.Xunit
+open FsToolkit.ErrorHandling
+
+open FSharp.Control
+
+//
+// TaskSeq.except
+// TaskSeq.exceptOfSeq
+//
+
+
+// module TaskBuilder =
+//     open TaskSeq.Tests
+
+//     [<Theory; ClassData(typeof<TestImmTaskSeq>)>]
+//     let ``TaskSeq-existsAsync happy path last item of seq`` variant =
+//         task {
+//             let values =  Gen.getSeqImmutable variant
+//             let mutable sum = 0
+//             for x in values do
+//                 sum <- sum + x
+//         }
+        // |> TaskSeq.existsAsync (fun x -> task { return x = 10 })
+        // |> Task.map (should be True)

src/FSharp.Control.TaskSeq/TaskSeq.fs

@@ -322,8 +322,54 @@ module TaskSeq =
 
     let foldAsync folder state source = Internal.fold (AsyncFolderAction folder) state source
 
+#nowarn "1204"
+#nowarn "3513"
+
+
 [<AutoOpen>]
 module AsyncSeqExtensions =
+
+    let rec WhileDynamic
+        (
+            sm: byref<TaskStateMachine<'Data>>,
+            condition: unit -> ValueTask<bool>,
+            body: TaskCode<'Data, unit>
+        ) : bool =
+        let vt = condition ()
+        TaskBuilderBase.BindDynamic(&sm, vt, fun result ->
+            TaskCode<_,_>(fun sm ->
+                if result then
+                    if body.Invoke(&sm) then
+                        WhileDynamic(&sm, condition, body)
+                    else
+                        let rf = sm.ResumptionDynamicInfo.ResumptionFunc
+
+                        sm.ResumptionDynamicInfo.ResumptionFunc <-
+                            (TaskResumptionFunc<'Data>(fun sm -> WhileBodyDynamicAux(&sm, condition, body, rf)))
+
+                        false
+                else
+                    true
+            )
+        )
+
+
+    and WhileBodyDynamicAux
+        (
+            sm: byref<TaskStateMachine<'Data>>,
+            condition: unit -> ValueTask<bool>,
+            body: TaskCode<'Data, unit>,
+            rf: TaskResumptionFunc<_>
+        ) : bool =
+        if rf.Invoke(&sm) then
+            WhileDynamic(&sm, condition, body)
+        else
+            let rf = sm.ResumptionDynamicInfo.ResumptionFunc
+
+            sm.ResumptionDynamicInfo.ResumptionFunc <-
+                (TaskResumptionFunc<'Data>(fun sm -> WhileBodyDynamicAux(&sm, condition, body, rf)))
+
+            false
     open Microsoft.FSharp.Core.CompilerServices
 
     // Add asynchronous for loop to the 'async' computation builder
@@ -337,17 +383,35 @@ module AsyncSeqExtensions =
     // Add asynchronous for loop to the 'task' computation builder
     type Microsoft.FSharp.Control.TaskBuilder with
 
+
+        member inline this.While(condition : unit -> ValueTask<bool>,  body  : TaskCode<'TOverall,unit>) =
+            TaskCode<_,_>(fun sm ->
+                WhileDynamic(&sm, condition, body)
+
+            )
+
+
+
         member inline this.For
             (
                 tasksq: IAsyncEnumerable<'T>,
                 body: 'T -> TaskCode<'TOverall, unit>
             ) : TaskCode<'TOverall, unit> =
             TaskCode<'TOverall, unit>(fun sm ->
+
                 this
                     .Using(
                         tasksq.GetAsyncEnumerator(CancellationToken()),
                         (fun e ->
-                            // TODO: fix 'true' with e.MoveNextAsync()
-                            this.While((fun () -> true), (fun sm -> (body e.Current).Invoke(&sm))))
+                            let next () = e.MoveNextAsync()
+                            this.While(next, (fun sm -> (body e.Current).Invoke(&sm))))
                     )
                     .Invoke(&sm))
+
+    let foo () =
+        task {
+            let mutable sum = 0
+            let xs = taskSeq { 1; 2; 3}
+            for x in xs do
+                sum <- sum + x
+        }

src/FSharp.Control.TaskSeq/TaskSeq.fsi

@@ -1,5 +1,7 @@
 namespace FSharp.Control
 
+#nowarn "1204"
+
 module TaskSeq =
     open System.Collections.Generic
     open System.Threading.Tasks
@@ -562,3 +564,36 @@ module TaskSeq =
     /// If the accumulator function <paramref name="folder" /> does not need to be asynchronous, consider using <see cref="TaskSeq.fold" />.
     /// </summary>
     val foldAsync: folder: ('State -> 'T -> #Task<'State>) -> state: 'State -> source: taskSeq<'T> -> Task<'State>
+
+
+
+[<AutoOpen>]
+module AsyncSeqExtensions =
+
+    val WhileDynamic:
+        sm: byref<TaskStateMachine<'Data>> *
+        condition: (unit -> System.Threading.Tasks.ValueTask<bool>) *
+        body: TaskCode<'Data, unit> ->
+            bool
+
+    val WhileBodyDynamicAux:
+        sm: byref<TaskStateMachine<'Data>> *
+        condition: (unit -> System.Threading.Tasks.ValueTask<bool>) *
+        body: TaskCode<'Data, unit> *
+        rf: TaskResumptionFunc<'Data> ->
+            bool
+
+    type AsyncBuilder with
+
+        member For: tasksq: System.Collections.Generic.IAsyncEnumerable<'T> * action: ('T -> Async<unit>) -> Async<unit>
+
+    type TaskBuilder with
+
+        member inline While:
+            condition: (unit -> System.Threading.Tasks.ValueTask<bool>) * body: TaskCode<'TOverall, unit> ->
+                TaskCode<'TOverall, 'a>
+
+        member inline For:
+            tasksq: System.Collections.Generic.IAsyncEnumerable<'T> * body: ('T -> TaskCode<'TOverall, unit>) ->
+                TaskCode<'TOverall, unit>
+