Merge branch 'main' into stj

microsoft · Aug 23, 2024 · 47dea16 · 47dea16
2 parents bc6b0ec + d7c92c2
commit 47dea16
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 9 deletions.
diff --git a/.github/workflows/dotnetcore-build.yml b/.github/workflows/dotnetcore-build.yml
@@ -34,7 +34,7 @@ jobs:
       run: ./scripts/check-coverage.ps1 -reportPath coveragereport/Cobertura.xml -threshold 96
 
     - name: Coveralls GitHub Action
-      uses: coverallsapp/github-action@v2.2.1
+      uses: coverallsapp/github-action@v2.3.0
       if: ${{ github.event_name == 'push' }}
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/docs/index.md b/docs/index.md
@@ -162,7 +162,7 @@ Add it in your ReSettings and pass in RulesEngine constructor
 ```c#
   var reSettings = new ReSettings{
       CustomTypes = new Type[] { typeof(Utils) }
-  }
+  };
 
   var rulesEngine = new RulesEngine.RulesEngine(workflowRules,reSettings);
 ```
@@ -275,7 +275,7 @@ LocalParams are defined at rule level and can be used by the rule and its child
 
 These rules when executed with the below input will return success
 ```c#
-  var input = new RuleParameter("myInput",new {
+  var rp = new RuleParameter("myInput",new {
     hello = "HELLO"
   });
 
@@ -404,7 +404,7 @@ Define OnSuccess or OnFailure Action for your Rule:
            "OnFailure": { // This will execute if the Rule evaluates to failure
                "Name": "EvaluateRule",
                "Context": {
-                   "WorkflowName": "inputWorkflow",
+                   "workflowName": "inputWorkflow",
                    "ruleName": "GiveDiscount10Percent"
                }
            }
@@ -443,7 +443,7 @@ EvaluateRule also supports passing filtered inputs and computed inputs to chaine
          "OnSuccess": {
             "Name": "EvaluateRule",
                "Context": {
-                   "WorkflowName": "inputWorkflow",
+                   "workflowName": "inputWorkflow",
                    "ruleName": "GiveDiscount10Percent",
                    "inputFilter": ["input2"], //will only pass input2 from existing inputs,scopedparams to the chained rule
                    "additionalInputs":[ // will pass a new input named currentDiscount with the result of the expression to the chained rule
@@ -583,4 +583,4 @@ Here are the all the options available:-
 | Value | Description |
 | --- | --- |
 | `All` | Executes all nested rules. |
-| `Performance` | Skips nested rules whose execution does not impact parent rule's result. |
+| `Performance` | Skips nested rules whose execution does not impact parent rule's result. |
diff --git a/src/RulesEngine/Actions/ActionContext.cs b/src/RulesEngine/Actions/ActionContext.cs
@@ -46,6 +46,13 @@ public bool TryGetContext<T>(string name,out T output)
         {
             try
             {
+                //key not found return
+                //Returning a KeyNotFoundException has a significant impact on performance.
+                if (!_context.ContainsKey(name))
+                {
+                    output = default(T);
+                    return false;
+                }
                 output =  GetContext<T>(name);
                 return true;
             }

diff --git a/src/RulesEngine/CustomTypeProvider.cs b/src/RulesEngine/CustomTypeProvider.cs
@@ -4,14 +4,15 @@
 using RulesEngine.HelperFunctions;
 using System;
 using System.Collections.Generic;
+using System.Linq.Dynamic.Core;
 using System.Linq.Dynamic.Core.CustomTypeProviders;
 
 namespace RulesEngine
 {
     public class CustomTypeProvider : DefaultDynamicLinqCustomTypeProvider
     {
         private HashSet<Type> _types;
-        public CustomTypeProvider(Type[] types) : base()
+        public CustomTypeProvider(Type[] types) : base(ParsingConfig.Default)
         {
             _types = new HashSet<Type>(types ?? new Type[] { });
             _types.Add(typeof(ExpressionUtils));

diff --git a/src/RulesEngine/RulesEngine.csproj b/src/RulesEngine/RulesEngine.csproj
@@ -35,7 +35,9 @@
   <ItemGroup>
     <PackageReference Include="FastExpressionCompiler" Version="4.1.0" />
     <PackageReference Include="FluentValidation" Version="11.9.0" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.7" />
+
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.3" />
+
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 
@@ -48,8 +50,10 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+
     <PackageReference Include="System.Text.Json" Version="8.0.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0"/>
+
   </ItemGroup>
 
 </Project>
diff --git a/test/RulesEngine.UnitTest/RulesEngine.UnitTest.csproj b/test/RulesEngine.UnitTest/RulesEngine.UnitTest.csproj
@@ -9,7 +9,7 @@
     <PackageReference Include="AutoFixture" Version="4.18.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="System.Text.Json" Version="8.0.1" />
+    <PackageReference Include="System.Text.Json" Version="8.0.4" />
     <PackageReference Include="xunit" Version="2.6.5" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <PrivateAssets>all</PrivateAssets>