WIP: mostly working

Stillpoint-Software · Oct 31, 2024 · 821c37d · 821c37d
1 parent c2873e6
commit 821c37d
Show file tree

Hide file tree

Showing 15 changed files with 80 additions and 61 deletions.
diff --git a/src/Hyperbee.Pipeline/Binders/Abstractions/Binder.cs b/src/Hyperbee.Pipeline/Binders/Abstractions/Binder.cs
@@ -40,8 +40,6 @@ protected virtual Expression ProcessPipelineAsync( ParameterExpression context,
             Assign( result, Await( Invoke( Pipeline, context, argument ), configureAwait: false ) ),
             Assign( canceled, HandleCancellationRequested( contextControl, result ) ),
 
-            Invoke( LoggerExpression.Log( "Binder.ProcessPipelineAsync" + Random.Shared.Next( 0, 1000 ) ), Convert( result, typeof( object ) ) ),
-
             Condition(
                 canceled,
                 New( tupleCtor, Default( typeof( TOutput ) ), canceled ),

diff --git a/src/Hyperbee.Pipeline/Binders/Abstractions/StatementBinder.cs b/src/Hyperbee.Pipeline/Binders/Abstractions/StatementBinder.cs
@@ -39,7 +39,7 @@ protected virtual Expression ProcessStatementAsync<TNext>( Expression<FunctionAs
         //     return await nextFunction( context, nextArgument ).ConfigureAwait( false );
         if ( Middleware == null )
         {
-            return Invoke( nextFunction, context, nextArgument ); //, configureAwait: false );
+            return Invoke( nextFunction, context, nextArgument );
 
             //using var _ = contextControl.CreateFrame( context, Configure, frameName );
             // return CreateFrameExpression(
@@ -69,23 +69,38 @@ protected virtual Expression ProcessStatementAsync<TNext>( Expression<FunctionAs
         //     nextArgument,
         //     middlewareNext
         // ).ConfigureAwait( false );
-        return
-            //using var _ = contextControl.CreateFrame( context, Configure, frameName );
-            // CreateFrameExpression(
-            //     Convert( Constant( context ), typeof(IPipelineContextControl) ),
-            //     context,
-            //     Configure,
-            BlockAsync(
-                Convert(
+        //return
+        //using var _ = contextControl.CreateFrame( context, Configure, frameName );
+        // CreateFrameExpression(
+        //     Convert( Constant( context ), typeof(IPipelineContextControl) ),
+        //     context,
+        //     Configure,
+
+        var returnResult = Variable( typeof( TNext ), "returnResult" );
+
+        var b = BlockAsync(
+                [returnResult],
+                //Invoke( LoggerExpression.Log( "StatementBinder.ProcessStatementAsync" + Random.Shared.Next( 0, 1000 ) ), Convert( nextArgument, typeof( object ) ) ),
+
+                Assign( returnResult, Convert(
                     Await(
                         Invoke( Middleware,
                             context,
-                            nextArgument,
+                            Convert( nextArgument, typeof(object)),
                             middlewareNext
                         ),
                         configureAwait: false ),
-                    typeof( TNext ) ) ); //,
+                    typeof( TNext ) ) )
+
+                //Invoke( LoggerExpression.Log( "StatementBinder.ProcessStatementAsync-" + Random.Shared.Next( 0, 1000 ) ), Convert( returnResult, typeof( object ) ) )
+
+                , returnResult
+                ); //,
+
+
         // frameName ); //);
+
+        return b;
     }
 
     public static Expression CreateFrameExpression(

diff --git a/src/Hyperbee.Pipeline/Binders/CallBlockBinder.cs b/src/Hyperbee.Pipeline/Binders/CallBlockBinder.cs
@@ -33,29 +33,33 @@ public Expression<FunctionAsync<TInput, TOutput>> Bind( Expression<FunctionAsync
         var argument = Parameter( typeof( TInput ), "argument" );
 
         var awaitedResult = Variable( typeof( (TOutput, bool) ), "awaitedResult" );
+        var result = Variable( typeof( TOutput ), "result" );
+
+        var returnValue = Label( typeof( TOutput ) );
         var nextArgument = Field( awaitedResult, "Item1" );
         var canceled = Field( awaitedResult, "Item2" );
 
         return Lambda<FunctionAsync<TInput, TOutput>>(
             BlockAsync(
-                [awaitedResult],
-                Assign( awaitedResult, Await( ProcessPipelineAsync( context, argument ) ) ),
-
-                Invoke( LoggerExpression.Log( "CallBlockBinder.Bind" + Random.Shared.Next( 0, 1000 ) ), Convert( nextArgument, typeof( object ) ) ),
-
-                Condition( canceled,
-                    Default( typeof( TOutput ) ),
-                    // TODO: Think there is a bug here, we shouldn't need a child state machine.
+                [awaitedResult, result],
+                Assign( awaitedResult, Await( ProcessPipelineAsync( context, argument ), configureAwait: false ) ),
 
+                IfThenElse( canceled,
+                    Block(
+                        Assign( result, Default( typeof(TOutput) ) )//,
+                        //Return( returnValue, result )
+                    ),
                     Block(
                         Await(
                             ProcessBlockAsync( next, context, nextArgument ),
                             configureAwait: false
                         ),
-                        nextArgument
+                        Assign( result, nextArgument )//,
+                        //Return( returnValue, result )
                     )
-
-                )
+                ),
+                result
+            //Label( returnValue, result )
             ),
             parameters: [context, argument]
         );

diff --git a/src/Hyperbee.Pipeline/Binders/CallStatementBinder.cs b/src/Hyperbee.Pipeline/Binders/CallStatementBinder.cs
@@ -42,6 +42,7 @@ public Expression<FunctionAsync<TInput, TOutput>> Bind( Expression<ProcedureAsyn
         var argument = Parameter( typeof( TInput ), "argument" );
 
         var awaitedResult = Variable( typeof( (TOutput, bool) ), "awaitedResult" );
+
         var nextArgument = Field( awaitedResult, "Item1" );
         var canceled = Field( awaitedResult, "Item2" );
 
@@ -51,35 +52,28 @@ public Expression<FunctionAsync<TInput, TOutput>> Bind( Expression<ProcedureAsyn
         var nextExpression = Lambda<FunctionAsync<TOutput, TInput>>(
             BlockAsync(
                 Await( Invoke( next, ctx, arg ), configureAwait: false ),
-                argument
+                arg
             ),
             parameters: [ctx, arg]
         );
 
-        return Lambda<FunctionAsync<TInput, TOutput>>(
+        var l = Lambda<FunctionAsync<TInput, TOutput>>(
             BlockAsync(
                 [awaitedResult],
                 Assign( awaitedResult, Await( ProcessPipelineAsync( context, argument ), configureAwait: false ) ),
+
                 Condition( canceled,
-                    Default( typeof( TOutput ) ),
-                    // TODO: Think there is a bug here, we shouldn't need a child state machine.
-                    // Await(
-                    //     BlockAsync(
-                    //         [awaitedResult],
-                    Block(
-                            // [awaitedResult],
-                            Await(
-                                ProcessStatementAsync( nextExpression, context, nextArgument, defaultName ),
-                                configureAwait: false
-                            ),
-                            nextArgument
-                            )
-                //     )
-                // )
+                    Default( typeof(TOutput) ),
+                    Await(
+                        ProcessStatementAsync( nextExpression, context, nextArgument, defaultName ),
+                        configureAwait: false
+                    )
                 )
             ),
             parameters: [context, argument]
         );
+
+        return l;
     }
 }
 
diff --git a/src/Hyperbee.Pipeline/Binders/HookBinder.cs b/src/Hyperbee.Pipeline/Binders/HookBinder.cs
@@ -38,9 +38,9 @@ public Expression<MiddlewareAsync<TInput, TOutput>> Bind( Expression<MiddlewareA
         var ctx = Parameter( typeof( IPipelineContext ), "ctx" );
         var arg = Parameter( typeof( TInput ), "arg" );
         var nextExpression = Lambda<FunctionAsync<TOutput, TInput>>(
-        BlockAsync(
-                Await( Invoke( Middleware, ctx, arg, function ), configureAwait: false ),
-                argument
+            BlockAsync(
+                [function],
+                Await( Invoke( Middleware, ctx, arg, function ), configureAwait: false )
             ),
             parameters: [ctx, arg]
         );

diff --git a/src/Hyperbee.Pipeline/Binders/PipeBlockBinder.cs b/src/Hyperbee.Pipeline/Binders/PipeBlockBinder.cs
@@ -39,6 +39,10 @@ public Expression<FunctionAsync<TInput, TNext>> Bind<TNext>( Expression<Function
             BlockAsync(
                 [awaitedResult],
                 Assign( awaitedResult, Await( ProcessPipelineAsync( context, argument ) ) ),
+
+                Invoke( LoggerExpression.Log( "PipeBlockBinder.Bind" + Random.Shared.Next( 0, 1000 ) ),
+                    Convert( nextArgument, typeof( object ) ) ),
+
                 Condition( canceled,
                     Default( typeof( TNext ) ),
                     Await( ProcessBlockAsync( next, context, nextArgument ), configureAwait: false )

diff --git a/src/Hyperbee.Pipeline/Binders/PipeStatementBinder.cs b/src/Hyperbee.Pipeline/Binders/PipeStatementBinder.cs
@@ -46,8 +46,6 @@ public Expression<FunctionAsync<TInput, TNext>> Bind<TNext>( Expression<Function
                 [awaitedResult],
                 Assign( awaitedResult, Await( ProcessPipelineAsync( context, argument ) ) ),
 
-                Invoke( LoggerExpression.Log( "PipeStatementBinder.Bind" + Random.Shared.Next( 0, 1000 ) ), Convert( nextArgument, typeof( object ) ) ),
-
                 Condition( canceled,
                     Default( typeof( TNext ) ),
                     Await( ProcessStatementAsync( next, context, nextArgument, defaultName ), configureAwait: false )

diff --git a/src/Hyperbee.Pipeline/Builders/PipeStatementBuilder.cs b/src/Hyperbee.Pipeline/Builders/PipeStatementBuilder.cs
@@ -56,14 +56,14 @@ public static IPipelineBuilder<TInput, TNext> Pipe<TNext>(
 
         var (parentFunction, parentMiddleware) = parent.GetPipelineFunction();
 
-        Expression<FunctionAsync<TOutput, TNext>> nextExpression = ( ctx, arg ) => Task.FromResult( next( ctx, arg ) );
+        Expression<FunctionAsync<TOutput, TNext>> nextExpression = ( ctx, arg ) => AsyncNext( next, ctx, arg );
         Expression<Action<IPipelineContext>> configExpression = config == null
             ? null
             : ctx => config( ctx );
 
         return new PipelineBuilder<TInput, TNext>
         {
-            Function = new PipeStatementBinder<TInput, TOutput>( parentFunction, parentMiddleware, configExpression ).Bind( nextExpression ).Reduce() as Expression<FunctionAsync<TInput, TNext>>,
+            Function = new PipeStatementBinder<TInput, TOutput>( parentFunction, parentMiddleware, configExpression ).Bind( nextExpression ),
             Middleware = parentMiddleware
         };
     }
@@ -89,4 +89,13 @@ public static IPipelineBuilder<TInput, TNext> PipeAsync<TNext>(
             Middleware = parentMiddleware
         };
     }
+
+    private static async Task<TNext> AsyncNext<TNext>( Function<TOutput, TNext> next, IPipelineContext ctx, TOutput arg )
+    {
+        var result = next( ctx, arg );
+        await Task.CompletedTask.ConfigureAwait( false );
+
+        return result;
+    }
+
 }
diff --git a/src/Hyperbee.Pipeline/Hyperbee.Pipeline.csproj b/src/Hyperbee.Pipeline/Hyperbee.Pipeline.csproj
@@ -30,7 +30,7 @@
     <PrivateAssets>all</PrivateAssets>
     <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-	<PackageReference Include="Hyperbee.Expressions" Version="1.0.0-develop.241025145716" />
+	<PackageReference Include="Hyperbee.Expressions" Version="1.0.0-develop.241031173234" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0-rc.2.24473.5" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0-rc.2.24473.5" />
   </ItemGroup>

diff --git a/src/Hyperbee.Pipeline/PipelineBuilder.cs b/src/Hyperbee.Pipeline/PipelineBuilder.cs
@@ -85,7 +85,6 @@ Expression<FunctionAsync<TIn, TOut>> IPipelineBuilder.CastExpression<TIn, TOut>(
 
         return Lambda<FunctionAsync<TIn, TOut>>(
             BlockAsync(
-                [context, argument],
                 Convert( Await( Invoke( Function, context, Convert( argument, typeof( TInput ) ) ), configureAwait: false ), typeof( TOut ) )
             ),
             parameters: [context, argument]

diff --git a/test/Hyperbee.Pipeline.Auth.Tests/Hyperbee.Pipeline.Auth.Tests.csproj b/test/Hyperbee.Pipeline.Auth.Tests/Hyperbee.Pipeline.Auth.Tests.csproj
@@ -14,9 +14,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.6.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.6.1" />
-    <PackageReference Include="NSubstitute" Version="5.1.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.6.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.6.2" />
+    <PackageReference Include="NSubstitute" Version="5.3.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/Hyperbee.Pipeline.Tests/Hyperbee.Pipeline.Tests.csproj b/test/Hyperbee.Pipeline.Tests/Hyperbee.Pipeline.Tests.csproj
@@ -4,9 +4,9 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="3.6.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.6.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.6.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.6.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Hyperbee.Pipeline\Hyperbee.Pipeline.csproj" />

diff --git a/test/Hyperbee.Pipeline.Tests/PipelineEnumerationTests.cs b/test/Hyperbee.Pipeline.Tests/PipelineEnumerationTests.cs
@@ -53,7 +53,7 @@ public async Task Pipeline_should_enumerate()
 
         await command( new PipelineContext(), "e f" );
 
-        Assert.AreEqual( count, 25 );
+        Assert.AreEqual( 25, count );
     }
 
     [TestMethod]

diff --git a/test/Hyperbee.Pipeline.Tests/PipelineExecutionTests.cs b/test/Hyperbee.Pipeline.Tests/PipelineExecutionTests.cs
@@ -16,8 +16,6 @@ public async Task Pipeline_should_execute_function()
         var command = PipelineFactory
             .Start<string>()
             .Pipe( ( ctx, arg ) => int.Parse( arg ) )
-            .Pipe( ( ctx, arg ) => arg )
-            //.Pipe( ( ctx, arg ) => arg )
             .Build();
 
         var result = await command( new PipelineContext(), "5" );

diff --git a/test/Hyperbee.PipelineCaching.Tests/Hyperbee.Pipeline.Caching.Tests.csproj b/test/Hyperbee.PipelineCaching.Tests/Hyperbee.Pipeline.Caching.Tests.csproj
@@ -14,10 +14,10 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0-rc.2.24473.5" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.6.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.6.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.6.1" />
-    <PackageReference Include="NSubstitute" Version="5.1.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.6.2" />
+    <PackageReference Include="NSubstitute" Version="5.3.0" />
   </ItemGroup>
 
   <ItemGroup>