Merge pull request #37 from navtech-io/develop

Fix indexer issue

Author: rajeshjn

src/Simpleflow/CodeGenerator/SimpleflowCodeVisitor.Helpers.cs

@@ -22,13 +22,23 @@ private Expression GetNumberExpression(string value)
 
         private Expression GetNumberExpression(string value, Type targetType)
         {
-            if (targetType == typeof(int) ||
-               targetType == typeof(long) ||
-               targetType == typeof(decimal) ||
-               targetType == typeof(double) ||
-               targetType == typeof(float) ||
-               targetType == typeof(object) ||
-               targetType == typeof(byte))
+            if (  targetType == typeof(long)
+               || targetType == typeof(ulong)
+
+               || targetType == typeof(int)
+               || targetType == typeof(uint)
+
+               || targetType == typeof(short)
+               || targetType == typeof(ushort)
+
+               || targetType == typeof(byte)
+               || targetType == typeof(sbyte)
+
+               || targetType == typeof(decimal)
+               || targetType == typeof(double)
+               || targetType == typeof(float) 
+
+               || targetType == typeof(object) )
             {
                 return Expression.Constant(Convert.ChangeType(value, targetType), targetType);
             }

src/Simpleflow/CodeGenerator/SimpleflowCodeVisitor.VisitObjectIdentifier.cs

@@ -82,9 +82,6 @@ private Expression GetFinalPropertyValue(Expression propExp, SimpleflowParser.Id
                     }
                 }
 
-                // Get indexed object
-                propExp = GetIndexObjectExpIfDefined(propExp, property.index());
-
                 // Get property of indexed object
                 if (prop != null)
                 {
@@ -94,6 +91,10 @@ private Expression GetFinalPropertyValue(Expression propExp, SimpleflowParser.Id
                 {
                     propExp = Expression.Field(propExp, field);
                 }
+
+                // Get indexed object
+                propExp = GetIndexObjectExpIfDefined(propExp, property.index());
+
             }
             return propExp;
         }

src/Simpleflow/RuntimeContext.cs

@@ -14,19 +14,28 @@ public sealed class RuntimeContext
         readonly FlowOutput _flowOutput;
         readonly CancellationToken _token;
 
-        private RuntimeContext() { }
-
         internal RuntimeContext(FlowOutput flowOutput,  CancellationToken token)
         {
             _flowOutput = flowOutput;
             _token = token;
         }
 
+        /// <summary>
+        /// Gets true if errors are emitted else false.
+        /// </summary>
         public bool HasErrors => _flowOutput.Errors.Count > 0;
+
+        /// <summary>
+        /// Gets true if messages are emitted else false.
+        /// </summary>
         public bool HasMessages => _flowOutput.Messages.Count > 0;
 
         [Obsolete(null, true)]
         public bool HasOutputs => _flowOutput.Output.Count > 0;
+
+        /// <summary>
+        /// Gets cancellation token 
+        /// </summary>
         public CancellationToken CancellationToken => _token;
     }
 }

src/Simpleflow/Simpleflow.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net48;netcoreapp3.1;net6.0;</TargetFrameworks>
     <PackageIcon>PackageIcon.png</PackageIcon>
     <VersionPrefix>1.0.12</VersionPrefix>
-    <VersionSuffix>beta1</VersionSuffix>
+    <VersionSuffix>beta2</VersionSuffix>
     <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
 

src/Simpleflow/Simpleflow.xml

@@ -187,12 +187,12 @@ public void CheckShortCircuitingAndOperatorWithFunctions()
             // Arrange
             var script =
                 @"
-                 rule when $exists(dict: arg, key: 'ContentType') and $str(value: arg['ContentType']) in ['test'] then
+                 rule when $exists(dict: arg.data, key: 'ContentType') and $str(value: arg.data['ContentType']) in ['test'] then
                      message 'got it'
                 ";
 
             FlowOutput output = SimpleflowEngine.Run(script,
-                new Dictionary<string, object> { { "ContentType", "test" } }
+                new { Data = new Dictionary<string, object> { { "ContentType", "test" } } }
                 ,
                 new FunctionRegister().Add("exists", (System.Func<IDictionary<string, object>, string, bool>)Exists));