From 9d3b63c32cfb1a7b4dba7892c03670c57016cf38 Mon Sep 17 00:00:00 2001 From: "bojan.malinic" Date: Fri, 25 Nov 2022 11:46:55 +0100 Subject: [PATCH] Use consistent snake case when adding a task and accessing task output properties --- .../Util/ExpressionUtil.cs | 2 +- .../Util/SnakeCaseUtil.cs | 24 ------------------- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/src/ConductorSharp.Engine/Util/ExpressionUtil.cs b/src/ConductorSharp.Engine/Util/ExpressionUtil.cs index 9c096c98..2e9e0040 100644 --- a/src/ConductorSharp.Engine/Util/ExpressionUtil.cs +++ b/src/ConductorSharp.Engine/Util/ExpressionUtil.cs @@ -210,7 +210,7 @@ private static string GetMemberName(PropertyInfo propertyInfo) memberName = propertyInfo.GetCustomAttribute(true)?.PropertyName; if (memberName == null) - memberName = SnakeCaseUtil.ToLowercasedPrefixSnakeCase(propertyInfo.Name); + memberName = SnakeCaseUtil.ToSnakeCase(propertyInfo.Name); return memberName; } diff --git a/src/ConductorSharp.Engine/Util/SnakeCaseUtil.cs b/src/ConductorSharp.Engine/Util/SnakeCaseUtil.cs index ffcc33d2..f2132296 100644 --- a/src/ConductorSharp.Engine/Util/SnakeCaseUtil.cs +++ b/src/ConductorSharp.Engine/Util/SnakeCaseUtil.cs @@ -31,30 +31,6 @@ public static string ToCapitalizedPrefixSnakeCase(string str) return string.Join("_", chunks); } - public static string ToLowercasedPrefixSnakeCase(string str) - { - str = str.Replace("-", ""); - var pattern = new Regex(@"[A-Z0-9_]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z][0-9]+|[A-Z]"); - var prefixPattern = new Regex(@"[A-Z0-9]{2,}"); - - var matches = pattern.Matches(str); - - var chunks = new List(); - - for (var i = 0; i < matches.Count; i++) - { - if (i == 0 && prefixPattern.Match(matches[i].Value).Success) - { - chunks.Add(matches[i].Value.Replace("_", "").ToLower()); - continue; - } - else - chunks.Add(matches[i].Value.ToLower()); - } - - return string.Join("_", chunks); - } - public static string ToSnakeCase(string str) => string.Concat(str.Select((x, i) => i > 0 && char.IsUpper(x) ? "_" + x.ToString() : x.ToString())).ToLower();