feat: update DefaultTemplateParser regex

WeihanLi · Jan 4, 2024 · 1311d0f · 1311d0f
1 parent 1b51e04
commit 1311d0f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/WeihanLi.Common/Template/DefaultTemplateParser.cs b/src/WeihanLi.Common/Template/DefaultTemplateParser.cs
@@ -7,7 +7,7 @@ namespace WeihanLi.Common.Template;
 
 internal sealed class DefaultTemplateParser : ITemplateParser
 {
-    private const string VariableRegexExp = @"\{\{(?<Variable>[\w\$\s]+)\}\}";
+    private const string VariableRegexExp = @"\{\{(?<Variable>[\w\$\s_:]+)\}\}";
     private static readonly Regex VariableRegex = new(VariableRegexExp, RegexOptions.Compiled);
     public Task<TemplateRenderContext> ParseAsync(string text)
     {

diff --git a/test/WeihanLi.Common.Test/TemplateTest/TemplateParserTest.cs b/test/WeihanLi.Common.Test/TemplateTest/TemplateParserTest.cs
@@ -15,9 +15,18 @@ public async Task ParseTest()
                 Build Status: {{Status}}
                 Chart: {{$env CHART_NAME}} - {{$env VERSION}}
                 AppVersion: {{$env APP_VERSION}}
+                Config: {{$config AppSettings:Host}}
+                Config: {{$config AppSettings--Host}}
+                Config: {{$config AppSettings__Host}}
                 """;
         var result = await new DefaultTemplateParser()
             .ParseAsync(template);
-        Assert.Equal(4, result.Variables.Count);
+        Assert.Equal(6, result.Variables.Count);
+        Assert.Contains("Status", result.Variables);
+        Assert.Contains("$env CHART_NAME", result.Variables);
+        Assert.Contains("$env VERSION", result.Variables);
+        Assert.Contains("$env APP_VERSION", result.Variables);
+        Assert.Contains("$config AppSettings:Host", result.Variables);
+        Assert.Contains("$config AppSettings__Host", result.Variables);
     }
 }