Merge pull request #402 from serverlessworkflow/fix-export-as

Fixed the TaskExecutor to evaluate `export.as` against the task transformed output instead of context data
serverlessworkflow · Sep 11, 2024 · 090fdb0 · 090fdb0
2 parents 3dd559e + c4e3600
commit 090fdb0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/runner/Synapse.Runner/Services/TaskExecutor.cs b/src/runner/Synapse.Runner/Services/TaskExecutor.cs
@@ -345,15 +345,15 @@ public virtual async Task SetResultAsync(object? result, string? then = FlowDire
         else if (this.Task.Definition.Output?.As != null) output = await this.Task.Workflow.Expressions.EvaluateAsync<object>(this.Task.Definition.Output.As, output ?? new(), arguments, cancellationToken).ConfigureAwait(false);
         if (this.Task.Definition.Export?.As is string toExpression) 
         {
-            var context = (await this.Task.Workflow.Expressions.EvaluateAsync<IDictionary<string, object>>(toExpression, this.Task.ContextData, arguments, cancellationToken).ConfigureAwait(false))!;
+            var context = (await this.Task.Workflow.Expressions.EvaluateAsync<IDictionary<string, object>>(toExpression, output ?? new(), arguments, cancellationToken).ConfigureAwait(false))!;
             await this.Task.SetContextDataAsync(context, cancellationToken).ConfigureAwait(false);
         }
         else if (this.Task.Definition.Export?.As != null)
         {
-            var context = (await this.Task.Workflow.Expressions.EvaluateAsync<IDictionary<string, object>>(this.Task.Definition.Export.As, this.Task.ContextData, arguments, cancellationToken).ConfigureAwait(false))!;
+            var context = (await this.Task.Workflow.Expressions.EvaluateAsync<IDictionary<string, object>>(this.Task.Definition.Export.As, output ?? new(), arguments, cancellationToken).ConfigureAwait(false))!;
             await this.Task.SetContextDataAsync(context, cancellationToken).ConfigureAwait(false);
         }
-        await this.AfterExecuteAsync(cancellationToken).ConfigureAwait(false); //todo: act upon last directive
+        await this.AfterExecuteAsync(cancellationToken).ConfigureAwait(false);
         await this.DoSetResultAsync(output, then, cancellationToken).ConfigureAwait(false);
         await this.Task.SetResultAsync(output, then, cancellationToken).ConfigureAwait(false);
         this.Subject.OnNext(new TaskLifeCycleEvent(TaskLifeCycleEventType.Completed));