updated nugets

updated to version 0.8.0-beta.2

Author: Jani Giannoudis

Client.Scripting/Cache/Cache.cs

@@ -113,7 +113,7 @@ protected List<DateTime> GetConsolidatedPeriodStarts(PayrunFunction function, Co
         }
 
         // order periods from newest to oldest
-        return new(periodStarts.OrderByDescending(x => x));
+        return [..periodStarts.OrderByDescending(x => x)];
     }
 
     // Duplicated in backend payroll repository command

Client.Scripting/CasePayrollValue.cs

@@ -14,7 +14,7 @@ namespace PayrollEngine.Client.Scripting;
 /// <summary>Dictionary of case value grouped by date period</summary>
 public class PeriodCasePayrollValueDictionary : Dictionary<DatePeriod, CasePayrollValue>, IEnumerable<PeriodValue>
 {
-    private readonly List<PeriodValue> periodValues = new();
+    private readonly List<PeriodValue> periodValues = [];
 
     /// <inheritdoc />
     public PeriodCasePayrollValueDictionary(IDictionary<DatePeriod, CasePayrollValue> values) :
@@ -33,7 +33,7 @@ IEnumerator<PeriodValue> IEnumerable<PeriodValue>.GetEnumerator() =>
 /// <summary>Dictionary of multiple case values grouped by case field name</summary>
 public class CasePayrollValueDictionary : Dictionary<string, CasePayrollValue>, IEnumerable<PeriodValue>
 {
-    private readonly List<PeriodValue> periodValues = new();
+    private readonly List<PeriodValue> periodValues = [];
 
     /// <inheritdoc />
     public CasePayrollValueDictionary(IDictionary<string, CasePayrollValue> values) :
@@ -428,6 +428,7 @@ private static PayrollValue AddToResult(PayrollValue result, PayrollValue value)
     /// <summary>Returns an enumerator that iterates through the collection</summary>
     /// <returns>An enumerator that can be used to iterate through the collection</returns>
     public IEnumerator<PeriodValue> GetEnumerator() =>
+        // ReSharper disable once NotDisposedResourceIsReturned
         PeriodValues.GetEnumerator();
 
     IEnumerator IEnumerable.GetEnumerator() =>

Client.Scripting/ClientScript.cs

@@ -90,7 +90,7 @@ public enum LogLevel
     Fatal
 }
 
-/// <summary>The type of a case</summary>
+/// <summary>The case type</summary>
 public enum CaseType
 {
     /// <summary>Global case</summary>

Client.Scripting/Date.cs

@@ -45,7 +45,7 @@ public static class Date
     public static DateTime YearStart(int year) =>
         new(year, 1, 1, 0, 0, 0, DateTimeKind.Utc);
 
-    /// <summary>Get the year end date in UTC</summary>
+    /// <summary>Get the year-end date in UTC</summary>
     public static DateTime YearEnd(int year) =>
         YearStart(year).AddYears(1).AddTicks(-1);
 

Client.Scripting/DatePeriod.cs

@@ -113,7 +113,7 @@ public DatePeriod(DateTime? start, DateTime? end)
     [JsonIgnore]
     public bool IsWithinDay => Start.IsSameDay(End);
 
-    /// <summary>Test if the period is within a hour</summary>
+    /// <summary>Test if the period is within an hour</summary>
     [JsonIgnore]
     public bool IsWithinHour => Start.IsSameHour(End);
 

Client.Scripting/Extensions.cs

@@ -94,11 +94,7 @@ public static string GetLocalization(this string culture, Dictionary<string, str
             return defaultValue;
         }
         var baseCulture = culture.Substring(0, index);
-        if (localizations.TryGetValue(baseCulture, out var baseLocalization))
-        {
-            return baseLocalization;
-        }
-        return defaultValue;
+        return localizations.GetValueOrDefault(baseCulture, defaultValue);
     }
 
     #endregion
@@ -393,11 +389,11 @@ public static T ObjectValueJson<T>(this string json, string objectKey, T default
         }
 
         var dictionary = ConvertJson<Dictionary<string, object>>(json);
-        if (!dictionary.ContainsKey(objectKey))
+        if (!dictionary.TryGetValue(objectKey, out var value))
         {
             return defaultValue;
         }
-        var value = dictionary[objectKey];
+
         if (value == null)
         {
             return defaultValue;
@@ -688,9 +684,9 @@ public static string ToUtcString(this DateTime dateTime) =>
     public static string ToUtcString(this DateTime dateTime, IFormatProvider provider) =>
         dateTime.ToUtcTime().ToString("o", provider);
 
-    /// <summary>Round to hour, if it is the last tick from a hour</summary>
+    /// <summary>Round to hour, if it is the last tick from an hour</summary>
     /// <param name="dateTime">The source date time</param>
-    /// <returns>Date of the next hour if the input is on the last tick on a hour, else the original value</returns>
+    /// <returns>Date of the next hour if the input is on the last tick on an hour, else the original value</returns>
     public static DateTime RoundTickToHour(this DateTime dateTime)
     {
         if (dateTime >= Date.MaxValue)
@@ -708,7 +704,7 @@ public static DateTime RoundTickToHour(this DateTime dateTime)
     public static DateTime YearStart(this DateTime yearMoment) =>
         Date.YearStart(yearMoment.Year);
 
-    /// <summary>Get the year end date in UTC</summary>
+    /// <summary>Get the year-end date in UTC</summary>
     /// <param name="yearMoment">The year moment</param>
     /// <returns>Last moment of the year</returns>
     public static DateTime YearEnd(this DateTime yearMoment) =>
@@ -896,14 +892,14 @@ public static DateTime FirstDayOfWeek(int year, int weekOfYear, CultureInfo cult
         return firstWeekDay.AddDays(weekOfYear * 7);
     }
 
-    /// <summary>Get week end date by ISO 8601 week number of the year</summary>
+    /// <summary>Get weekend date by ISO 8601 week number of the year</summary>
     /// <param name="year">The year</param>
     /// <param name="weekOfYear">The ISO 8601 week number of the year</param>
     /// <returns>Last day of the week</returns>
     public static DateTime LastDayOfWeek(int year, int weekOfYear) =>
         LastDayOfWeek(year, weekOfYear, CultureInfo.CurrentCulture);
 
-    /// <summary>Get week end date by ISO 8601 week number of the year</summary>
+    /// <summary>Get weekend date by ISO 8601 week number of the year</summary>
     /// <param name="year">The year</param>
     /// <param name="weekOfYear">The ISO 8601 week number of the year</param>
     /// <param name="culture">The calendar culture</param>
@@ -982,13 +978,13 @@ public static bool IsSameHour(this DateTime date, DateTime compare) =>
         date.IsSameDay(compare) && date.Hour == compare.Hour;
 
     /// <summary>Calculates the current age, counting the completed years</summary>
-    /// <param name="birthDate">The birth date</param>
+    /// <param name="birthDate">The birthdate</param>
     /// <returns>The current age</returns>
     public static int Age(this DateTime birthDate) =>
         Age(birthDate, DateTime.UtcNow);
 
     /// <summary>Calculates the age at a specific moment, counting the completed years</summary>
-    /// <param name="birthDate">The birth date</param>
+    /// <param name="birthDate">The birthdate</param>
     /// <param name="testMoment">The test moment</param>
     /// <returns>The age at the test moment</returns>
     public static int Age(this DateTime birthDate, DateTime testMoment)
@@ -1199,11 +1195,11 @@ public static class DictionaryExtensions
     /// <returns>The dictionary value</returns>
     public static object GetValue(this Dictionary<string, object> dictionary, string key, object defaultValue = default)
     {
-        if (!dictionary.ContainsKey(key))
+        if (!dictionary.TryGetValue(key, out var value))
         {
             return defaultValue;
         }
-        var value = dictionary[key];
+
         if (value is JsonElement jsonElement)
         {
             value = jsonElement.GetValue();
@@ -1714,7 +1710,7 @@ public static TimeSpan TotalDuration(this IEnumerable<CaseValue> periodValues) =
     /// <param name="intersectPeriod">The period to intersect</param>
     /// <returns>List of intersecting date periods</returns>
     public static List<CaseValue> Intersections(this IEnumerable<CaseValue> periodValues, DatePeriod intersectPeriod) =>
-        new(periodValues.Where(periodValue => periodValue.Period().IsOverlapping(intersectPeriod)));
+        [..periodValues.Where(periodValue => periodValue.Period().IsOverlapping(intersectPeriod))];
 
     /// <summary>Get case period values matching a period predicate</summary>
     /// <param name="periodValues">The time periods to test</param>
@@ -1906,7 +1902,7 @@ public static IEnumerable<TimeSpan> GetDurations(this IEnumerable<PeriodValue> v
 
     /// <summary>Summarize the total duration from all date period durations</summary>
     /// <param name="values">The period payroll values</param>
-    /// <returns>Total duration from all periods,, an empty time span on empty collection</returns>
+    /// <returns>Total duration from all periods, an empty time span on empty collection</returns>
     public static TimeSpan TotalDuration(this IEnumerable<PeriodValue> values) =>
         // summarize from all durations the time span ticks
         values != null ? new(GetDurations(values).Sum(ts => ts.Ticks)) : TimeSpan.Zero;
@@ -2061,7 +2057,7 @@ public static List<decimal> Values(this IEnumerable<WageTypeCustomResult> result
 
     /// <summary>Get summary of wage type custom results</summary>
     /// <param name="results">The wage type custom results</param>
-    /// <returns>Wage type results result values summary</returns>
+    /// <returns>Wage type result values summary</returns>
     public static decimal Sum(this IEnumerable<WageTypeCustomResult> results) =>
         Values(results).Sum();
 }
@@ -2095,7 +2091,7 @@ valueType is ValueType.Date or
     public static bool IsNumber(this ValueType valueType) =>
         IsInteger(valueType) || IsDecimal(valueType);
 
-    /// <summary>Test if value type is a integer</summary>
+    /// <summary>Test if value type is an integer</summary>
     /// <param name="valueType">The value type</param>
     /// <returns>True for integer value types</returns>
     public static bool IsInteger(this ValueType valueType) =>
@@ -2299,21 +2295,24 @@ public static CasePayrollValueDictionary TupleToCaseValuesDictionary(this Dictio
     /// <param name="values">The tuple values</param>
     /// <returns>The collector results</returns>
     public static List<CollectorResult> TupleToCollectorResults(this List<Tuple<string, Tuple<DateTime, DateTime>, decimal, List<string>, Dictionary<string, object>>> values) =>
-        new(values.Select(x => new CollectorResult
+    [
+        ..values.Select(x => new CollectorResult
         {
             CollectorName = x.Item1,
             Start = x.Item2.Item1,
             End = x.Item2.Item2,
             Value = x.Item3,
             Tags = x.Item4,
             Attributes = x.Item5
-        }));
+        })
+    ];
 
     /// <summary>Convert tuple values to a collector custom result</summary>
     /// <param name="values">The tuple values</param>
     /// <returns>The collector custom results</returns>
     public static List<CollectorCustomResult> TupleToCollectorCustomResults(this List<Tuple<string, string, Tuple<DateTime, DateTime>, decimal, List<string>, Dictionary<string, object>>> values) =>
-        new(values.Select(x => new CollectorCustomResult
+    [
+        ..values.Select(x => new CollectorCustomResult
         {
             CollectorName = x.Item1,
             Source = x.Item2,
@@ -2322,13 +2321,15 @@ public static List<CollectorCustomResult> TupleToCollectorCustomResults(this Lis
             Value = x.Item4,
             Tags = x.Item5,
             Attributes = x.Item6
-        }));
+        })
+    ];
 
     /// <summary>Convert tuple values to a wage type result</summary>
     /// <param name="values">The tuple values</param>
     /// <returns>The wage type results</returns>
     public static List<WageTypeResult> TupleToWageTypeResults(this List<Tuple<decimal, string, Tuple<DateTime, DateTime>, decimal, List<string>, Dictionary<string, object>>> values) =>
-        new(values.Select(x => new WageTypeResult
+    [
+        ..values.Select(x => new WageTypeResult
         {
             WageTypeNumber = x.Item1,
             WageTypeName = x.Item2,
@@ -2337,13 +2338,15 @@ public static List<WageTypeResult> TupleToWageTypeResults(this List<Tuple<decima
             Value = x.Item4,
             Tags = x.Item5,
             Attributes = x.Item6
-        }));
+        })
+    ];
 
     /// <summary>Convert tuple values to a wage type custom result</summary>
     /// <param name="values">The tuple values</param>
     /// <returns>The wage type custom results</returns>
     public static List<WageTypeCustomResult> TupleToWageTypeCustomResults(this List<Tuple<decimal, string, string, Tuple<DateTime, DateTime>, decimal, List<string>, Dictionary<string, object>>> values) =>
-        new(values.Select(x => new WageTypeCustomResult
+    [
+        ..values.Select(x => new WageTypeCustomResult
         {
             WageTypeNumber = x.Item1,
             Name = x.Item2,
@@ -2353,5 +2356,6 @@ public static List<WageTypeCustomResult> TupleToWageTypeCustomResults(this List<
             Value = x.Item5,
             Tags = x.Item6,
             Attributes = x.Item7
-        }));
+        })
+    ];
 }

Client.Scripting/Function/CaseAction.cs

@@ -381,7 +381,7 @@ public abstract class ActionMethodBase<TContext, TFunc, TValue> : IActionMethod<
     public DateTime CaseValueDate { get; }
 
     /// <summary>The method parameters</summary>
-    public List<string> Parameters { get; } = new();
+    public List<string> Parameters { get; } = [];
 
     /// <summary>Test for method parameters</summary>
     public bool HasParameters => Parameters.Count > 0;
@@ -426,11 +426,11 @@ protected void RegisterFunction(string name, ActionValueType valueType, Func<TVa
 
     private Tuple<ActionValueType, Func<TValue, object>> GetValueFunction()
     {
-        if (!valueFunctions.ContainsKey(Name))
+        if (!valueFunctions.TryGetValue(Name, out var function))
         {
             throw new ScriptException($"Missing action function {Name}");
         }
-        return valueFunctions[Name];
+        return function;
     }
 
     #endregion
@@ -1773,12 +1773,12 @@ protected object GetObjectValue(string lookupValue, string objectKey)
         }
 
         var dictionary = JsonSerializer.Deserialize<Dictionary<string, object>>(lookupValue);
-        if (dictionary == null || !dictionary.ContainsKey(objectKey))
+        if (dictionary == null || !dictionary.TryGetValue(objectKey, out var value))
         {
             Context.Function.LogError($"Invalid lookup object key: {objectKey}");
             return null;
         }
-        return dictionary[objectKey];
+        return value;
     }
 }