fix(Worker): Fixed the IterationStateProcessor which was not properly merging the output collection, if any, back into the state data

fix(Worker): Fixed the ForEachStateProcessor which was outputting the iteration parameter, which is now deleted from the state data
fix(Worker): Fixed the OpenApiFunctionProcessor, which was not removing espace characters inherited from JSON when iterating through expression matches

Fixes #180
Fixes #181
Fixes #179

Author: cdavernas

src/apps/Synapse.Worker/Services/Processors/ForEachStateProcessor.cs

@@ -31,12 +31,17 @@ public class ForEachStateProcessor
 
         /// <inheritdoc/>
         public ForEachStateProcessor(ILoggerFactory loggerFactory, IWorkflowRuntimeContext context, IWorkflowActivityProcessorFactory activityProcessorFactory,
-            IOptions<ApplicationOptions> options, V1WorkflowActivity activity, ForEachStateDefinition state)
+            IJsonSerializer jsonSerializer, IOptions<ApplicationOptions> options, V1WorkflowActivity activity, ForEachStateDefinition state)
             : base(loggerFactory, context, activityProcessorFactory, options, activity, state)
         {
-
+            this.JsonSerializer = jsonSerializer;
         }
 
+        /// <summary>
+        /// Gets the service used to serialize/deserialize to/from JSON
+        /// </summary>
+        protected IJsonSerializer JsonSerializer { get; }
+
         /// <inheritdoc/>
         protected override IWorkflowActivityProcessor CreateProcessorFor(V1WorkflowActivity activity)
         {
@@ -65,7 +70,10 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
                 }
                 var iterationParamValue = inputCollection.First();
                 var input = (DynamicObject)this.Activity.Input!;
-                input.Set(this.State.IterationParameter!, iterationParamValue);
+                var iterationParam = this.State.IterationParameter;
+                if (string.IsNullOrWhiteSpace(iterationParam))
+                    iterationParam = "item";
+                input.Set(iterationParam, iterationParamValue);
                 var metadata = new Dictionary<string, string>()
                 {
                     { V1WorkflowActivityMetadata.State, this.State.Name! },
@@ -141,13 +149,31 @@ protected virtual async Task OnIterationResultAsync(IterationProcessor processor
                || inputCollection.Count() - 1 <= iterationIndex)
             {
                 var outputCollection = await this.GetOutputCollectionAsync(cancellationToken);
-                foreach (var itarationActivity in (await this.Context.Workflow.GetActivitiesAsync(this.Activity, cancellationToken))
-                    .Where(a => a.Type == V1WorkflowActivityType.Iteration && a.Status == V1WorkflowActivityStatus.Completed)
+                foreach (var iterationActivity in (await this.Context.Workflow.GetActivitiesAsync(this.Activity, cancellationToken))
+                    .Where(a => a.Type == V1WorkflowActivityType.Iteration && a.Status == V1WorkflowActivityStatus.Completed && a.Output != null)
                     .ToList())
                 {
-                    outputCollection.Add(itarationActivity.Output!.ToObject()!);
+                    outputCollection.Add(iterationActivity.Output!.ToObject()!);
+                }
+                var output = this.Activity.Input.ToObject();
+                var expression = this.State.IterationParameter;
+                if (string.IsNullOrWhiteSpace(expression))
+                    expression = "item";
+                if (expression.StartsWith("${"))
+                    expression = expression[2..^1];
+                expression = $". |= del(.{expression})";
+                if (output != null)
+                    output = await this.Context.EvaluateAsync(expression, output, cancellationToken);
+                if (!string.IsNullOrWhiteSpace(this.State.OutputCollection))
+                {
+                    expression = this.State.OutputCollection.Trim();
+                    var outputCollectionJson = await this.JsonSerializer.SerializeAsync(outputCollection, cancellationToken);
+                    if (expression.StartsWith("${"))
+                        expression = expression[2..^1];
+                    expression = $"{expression} = {outputCollectionJson}";
+                    output = await this.Context.EvaluateAsync(expression, output, cancellationToken);
                 }
-                await this.OnNextAsync(new V1WorkflowActivityCompletedIntegrationEvent(this.Activity.Id, outputCollection), cancellationToken);
+                await this.OnNextAsync(new V1WorkflowActivityCompletedIntegrationEvent(this.Activity.Id, output), cancellationToken);
                 return;
             }
             iterationIndex += 1;

src/apps/Synapse.Worker/Services/Processors/IterationProcessor.cs

@@ -133,7 +133,7 @@ protected override async Task ProcessAsync(CancellationToken cancellationToken)
         /// <returns>The result of the action outputs aggregation</returns>
         protected virtual async Task<object> AggregateActionOutputsAsync(CancellationToken cancellationToken)
         {
-            var output = this.Activity.Input.ToObject();
+            object? output = null;
             foreach (var activity in (await this.Context.Workflow.GetActivitiesAsync(this.Activity, cancellationToken))
                 .Where(a => a.Type == V1WorkflowActivityType.Action && a.Status == V1WorkflowActivityStatus.Completed)
                 .OrderBy(a => a.ExecutedAt))
@@ -156,6 +156,8 @@ protected virtual async Task<object> AggregateActionOutputsAsync(CancellationTok
                             expression = expression[2..^1];
                         expression = $"{expression} = {json}";
                     }
+                    if (output == null)
+                        output = new();
                     output = await this.Context.EvaluateAsync(expression, output, cancellationToken);
                 }
             }

src/apps/Synapse.Worker/Services/Processors/OpenApiFunctionProcessor.cs

@@ -263,7 +263,7 @@ protected virtual async Task BuildParametersAsync(CancellationToken cancellation
             var jsonArgs = JsonConvert.SerializeObject(this.FunctionReference.Arguments);
             foreach (Match match in Regex.Matches(jsonArgs, @"""\$\{.+?\}"""))
             {
-                var expression = match.Value[3..^2].Trim();
+                var expression = match.Value[3..^2].Trim().Replace(@"\""", @"""");
                 var evaluationResult = await this.Context.EvaluateAsync(expression, this.Activity.Input!.ToObject()!, cancellationToken);
                 if(evaluationResult == null)
                 {