Merge pull request #834 from dwy12321/DeepExpressionProperty

support yaml definition of Outputs with Deep expression property

Author: danielgerlag

WorkflowCore.sln

@@ -150,7 +150,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.Tests.QueuePro
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.Sample19", "src\samples\WorkflowCore.Sample19\WorkflowCore.Sample19.csproj", "{1223ED47-3E5E-4960-B70D-DFAF550F6666}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkflowCore.Persistence.RavenDB", "src\providers\WorkflowCore.Persistence.RavenDB\WorkflowCore.Persistence.RavenDB.csproj", "{AF205715-C8B7-42EF-BF14-AFC9E7F27242}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.Persistence.RavenDB", "src\providers\WorkflowCore.Persistence.RavenDB\WorkflowCore.Persistence.RavenDB.csproj", "{AF205715-C8B7-42EF-BF14-AFC9E7F27242}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/WorkflowCore.DSL/Services/DefinitionLoader.cs

@@ -217,30 +217,116 @@ private void AttachOutputs(StepSourceV1 source, Type dataType, Type stepType, Wo
                 var sourceExpr = DynamicExpressionParser.ParseLambda(new[] { stepParameter }, typeof(object), output.Value);
 
                 var dataParameter = Expression.Parameter(dataType, "data");
-                Expression targetProperty;
 
-                // Check if our datatype has a matching property
-                var propertyInfo = dataType.GetProperty(output.Key);
-                if (propertyInfo != null)
+
+                if(output.Key.Contains(".") || output.Key.Contains("["))
+                {
+                    AttachNestedOutput(output, step, source, sourceExpr, dataParameter);
+                }else
                 {
-                    targetProperty = Expression.Property(dataParameter, propertyInfo);
-                    var targetExpr = Expression.Lambda(targetProperty, dataParameter);
-                    step.Outputs.Add(new MemberMapParameter(sourceExpr, targetExpr));
+                    AttachDirectlyOutput(output, step, dataType, sourceExpr, dataParameter);
                 }
-                else
+            }
+        }
+
+        private void AttachDirectlyOutput(KeyValuePair<string, string> output, WorkflowStep step, Type dataType, LambdaExpression sourceExpr, ParameterExpression dataParameter)
+        {
+            Expression targetProperty;
+
+            // Check if our datatype has a matching property
+            var propertyInfo = dataType.GetProperty(output.Key);
+            if (propertyInfo != null)
+            {
+                targetProperty = Expression.Property(dataParameter, propertyInfo);
+                var targetExpr = Expression.Lambda(targetProperty, dataParameter);
+                step.Outputs.Add(new MemberMapParameter(sourceExpr, targetExpr));
+            }
+            else
+            {
+                // If we did not find a matching property try to find a Indexer with string parameter
+                propertyInfo = dataType.GetProperty("Item");
+                targetProperty = Expression.Property(dataParameter, propertyInfo, Expression.Constant(output.Key));
+
+                Action<IStepBody, object> acn = (pStep, pData) =>
+                {
+                    object resolvedValue = sourceExpr.Compile().DynamicInvoke(pStep); ;
+                    propertyInfo.SetValue(pData, resolvedValue, new object[] { output.Key });
+                };
+
+                step.Outputs.Add(new ActionParameter<IStepBody, object>(acn));
+            }
+
+        }
+
+        private void AttachNestedOutput( KeyValuePair<string, string> output, WorkflowStep step, StepSourceV1 source, LambdaExpression sourceExpr, ParameterExpression dataParameter)
+        {
+            PropertyInfo propertyInfo = null;
+            String[] paths = output.Key.Split('.');
+         
+            Expression targetProperty = dataParameter;
+
+            bool hasAddOutput = false;
+
+            foreach (String propertyName in paths)
+            {
+                if (hasAddOutput)
+                {
+                    throw new ArgumentException($"Unknown property for output {output.Key} on {source.Id}");
+                }
+
+                if (targetProperty == null)
+                {
+                    break;
+                }
+
+                if (propertyName.Contains("["))
                 {
-                    // If we did not find a matching property try to find a Indexer with string parameter
-                    propertyInfo = dataType.GetProperty("Item");
-                    targetProperty = Expression.Property(dataParameter, propertyInfo, Expression.Constant(output.Key));
+                    String[] items = propertyName.Split('[');
+
+                    if (items.Length != 2)
+                    {
+                        throw new ArgumentException($"Unknown property for output {output.Key} on {source.Id}");
+                    }
+
+                    items[1] = items[1].Trim().TrimEnd(']').Trim().Trim('"');
+
+                    MemberExpression memberExpression = Expression.Property(targetProperty, items[0]);
+
+                    if (memberExpression == null)
+                    {
+                        throw new ArgumentException($"Unknown property for output {output.Key} on {source.Id}");
+                    }
+                    propertyInfo = ((PropertyInfo)memberExpression.Member).PropertyType.GetProperty("Item");
 
                     Action<IStepBody, object> acn = (pStep, pData) =>
                     {
+                        var targetExpr = Expression.Lambda(memberExpression, dataParameter);
+                        object data = targetExpr.Compile().DynamicInvoke(pData);
                         object resolvedValue = sourceExpr.Compile().DynamicInvoke(pStep); ;
-                        propertyInfo.SetValue(pData, resolvedValue, new object[] { output.Key });
+                        propertyInfo.SetValue(data, resolvedValue, new object[] { items[1] });
                     };
 
                     step.Outputs.Add(new ActionParameter<IStepBody, object>(acn));
+                    hasAddOutput = true;
                 }
+                else
+                {
+                    try
+                    {
+                        targetProperty = Expression.Property(targetProperty, propertyName);
+                    }
+                    catch
+                    {
+                        targetProperty = null;
+                        break;
+                    }
+                }
+            }
+
+            if (targetProperty != null && !hasAddOutput)
+            {
+                var targetExpr = Expression.Lambda(targetProperty, dataParameter);
+                step.Outputs.Add(new MemberMapParameter(sourceExpr, targetExpr));
             }
         }
 

test/WorkflowCore.TestAssets/DataTypes/CounterBoardWithDynamicData.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace WorkflowCore.TestAssets.DataTypes
+{
+    public class CounterBoardWithDynamicData: CounterBoard
+    {
+        public DynamicData DynamicDataInstance { get; set; }
+        public CounterBoard CounterBoardInstance { get; set; }
+    }
+}

test/WorkflowCore.TestAssets/Utils.cs

@@ -30,6 +30,10 @@ public static string GetTestDefinitionDynamicJson()
         {
             return File.ReadAllText("stored-dynamic-definition.json");
         }
+        public static string GetTestDefinitionDynamicYaml()
+        {
+            return File.ReadAllText("stored-dynamic-definition.yaml");
+        }
 
         public static string GetTestDefinitionJsonMissingInputProperty()
         {

test/WorkflowCore.TestAssets/WorkflowCore.TestAssets.csproj

@@ -13,9 +13,13 @@
     <None Remove="stored-definition.json" />
     <None Remove="stored-definition.yaml" />
     <None Remove="stored-dynamic-definition.json" />
+    <None Remove="stored-dynamic-definition.yaml" />
   </ItemGroup>
 
   <ItemGroup>
+    <EmbeddedResource Include="stored-dynamic-definition.yaml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
     <EmbeddedResource Include="stored-definition.yaml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>

test/WorkflowCore.TestAssets/stored-dynamic-definition.yaml

@@ -0,0 +1,58 @@
+Id: Test
+Version: 1
+DataType: WorkflowCore.TestAssets.DataTypes.CounterBoardWithDynamicData, WorkflowCore.TestAssets
+Steps:
+- Id: Step1
+  StepType: WorkflowCore.TestAssets.Steps.Counter, WorkflowCore.TestAssets
+  ErrorBehavior: Retry
+  Inputs:
+    Value: data.DynamicDataInstance["test"]
+  Outputs:
+    DynamicDataInstance["test"]: step.Value
+  NextStepId: Step2
+- Id: Step2
+  StepType: WorkflowCore.TestAssets.Steps.Counter, WorkflowCore.TestAssets
+  Inputs:
+    Value: data.Counter2
+  Outputs:
+    CounterBoardInstance.Counter1: step.Value
+  NextStepId: Step3
+- Id: Step3
+  StepType: WorkflowCore.Primitives.If, WorkflowCore
+  NextStepId: Step4
+  Inputs:
+    Condition: object.Equals(data.Flag1, true)
+  Do:
+  - - Id: Step3.1.1
+      StepType: WorkflowCore.TestAssets.Steps.Counter, WorkflowCore.TestAssets
+      Inputs:
+        Value: data.Counter3
+      Outputs:
+        Counter3: step.Value
+      NextStepId: Step3.1.2
+    - Id: Step3.1.2
+      StepType: WorkflowCore.TestAssets.Steps.Counter, WorkflowCore.TestAssets
+      Inputs:
+        Value: data.Counter4
+      Outputs:
+        Counter4: step.Value
+  - - Id: Step3.2.1
+      StepType: WorkflowCore.Primitives.WaitFor, WorkflowCore
+      NextStepId: Step3.2.2
+      CancelCondition: data.Flag2
+      Inputs:
+        EventName: '"Event1"'
+        EventKey: '"Key1"'
+        EffectiveDate: DateTime.Now
+    - Id: Step3.2.2
+      StepType: WorkflowCore.TestAssets.Steps.Counter, WorkflowCore.TestAssets
+      Inputs:
+        Value: data.Counter5
+      Outputs:
+        Counter5: step.Value
+- Id: Step4
+  StepType: WorkflowCore.TestAssets.Steps.Counter, WorkflowCore.TestAssets
+  Inputs:
+    Value: data.Counter6
+  Outputs:
+    Counter6: step.Value

test/WorkflowCore.UnitTests/Services/DefinitionStorage/DefinitionLoaderTests.cs

@@ -43,6 +43,16 @@ public void ParseDefinition()
             A.CallTo(() => _registry.RegisterWorkflow(A<WorkflowDefinition>.That.Matches(MatchTestDefinition, ""))).MustHaveHappened();
         }
 
+        [Fact(DisplayName = "Should parse definition")]
+        public void ParseDefinitionPropertyDynamic()
+        {
+            _subject.LoadDefinition(TestAssets.Utils.GetTestDefinitionDynamicYaml(), Deserializers.Yaml);
+
+            A.CallTo(() => _registry.RegisterWorkflow(A<WorkflowDefinition>.That.Matches(x => x.Id == "Test"))).MustHaveHappened();
+            A.CallTo(() => _registry.RegisterWorkflow(A<WorkflowDefinition>.That.Matches(x => x.Version == 1))).MustHaveHappened();
+            A.CallTo(() => _registry.RegisterWorkflow(A<WorkflowDefinition>.That.Matches(x => x.DataType == typeof(CounterBoardWithDynamicData)))).MustHaveHappened();
+            A.CallTo(() => _registry.RegisterWorkflow(A<WorkflowDefinition>.That.Matches(MatchTestDefinition, ""))).MustHaveHappened();
+        }
 
         [Fact(DisplayName = "Should parse definition")]
         public void ParseDefinitionDynamic()