diff --git a/.gitignore b/.gitignore
index e5e574e..06a2f4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ obj/
/packages/
riderModule.iml
/_ReSharper.Caches/\
-/.idea/
\ No newline at end of file
+/.idea/
+Htmt.sln.DotSettings.user
diff --git a/Htmt/AttributeParsers/BaseAttributeParser.cs b/Htmt/AttributeParsers/BaseAttributeParser.cs
new file mode 100644
index 0000000..556604a
--- /dev/null
+++ b/Htmt/AttributeParsers/BaseAttributeParser.cs
@@ -0,0 +1,81 @@
+using System.Globalization;
+using System.Text.RegularExpressions;
+using System.Xml;
+
+namespace Htmt.AttributeParsers;
+
+///
+/// Base class for attribute parsers that provides some common functionality.
+///
+public partial class BaseAttributeParser : IAttributeParser
+{
+ ///
+ /// XML Tag selector for finding the relevant nodes.
+ ///
+ ///
+ public virtual string XTag => throw new NotImplementedException();
+
+ ///
+ /// The entire XML document that is being parsed.
+ ///
+ public XmlDocument Xml { get; set; } = new();
+
+ ///
+ /// Templating data.
+ ///
+ public Dictionary Data { get; set; } = new();
+
+ ///
+ /// List of expression modifiers.
+ ///
+ public IExpressionModifier[] ExpressionModifiers { get; set; } = [];
+
+ [GeneratedRegex(@"(?\{.*?\})")]
+ private static partial Regex WholeKeyRegex();
+
+ ///
+ /// Parser the expression where it replaces variables with their data, and applies
+ /// expression modifiers.
+ ///
+ ///
+ /// Returns the parsed expression as a string.
+ protected string ParseExpression(string str)
+ {
+ var matches = WholeKeyRegex().Matches(str).Select(x => x.Groups["name"].Value).ToArray();
+
+ foreach (var match in matches)
+ {
+ var strippedName = match[1..^1];
+ var expressionModifierParser = new ExpressionModifierParser { Data = Data, ExpressionModifiers = ExpressionModifiers };
+ var value = expressionModifierParser.Parse(strippedName);
+
+ if (value != null)
+ {
+ str = value switch
+ {
+ string s => str.Replace(match, s),
+ int i => str.Replace(match, i.ToString()),
+ double d => str.Replace(match, d.ToString(CultureInfo.CurrentCulture)),
+ bool b => str.Replace(match, b.ToString()),
+ _ => str.Replace(match, value.ToString()),
+ };
+ }
+ else
+ {
+ str = str.Replace(match, "");
+ }
+ }
+
+ return str;
+ }
+
+ ///
+ /// A method that is called to parse the XML nodes.
+ ///
+ ///
+ ///
+ public virtual void Parse(XmlNodeList? nodes)
+ {
+ throw new NotImplementedException();
+ }
+}
\ No newline at end of file
diff --git a/Htmt/AttributeParsers/ForAttributeParser.cs b/Htmt/AttributeParsers/ForAttributeParser.cs
index ddf37ff..9739dcc 100644
--- a/Htmt/AttributeParsers/ForAttributeParser.cs
+++ b/Htmt/AttributeParsers/ForAttributeParser.cs
@@ -2,16 +2,19 @@
namespace Htmt.AttributeParsers;
-public class ForAttributeParser : IAttributeParser
+///
+/// A parser for the x:for attribute.
+///
+public class ForAttributeParser : BaseAttributeParser
{
- public string XTag => "//*[@x:for]";
-
- public void Parse(XmlDocument xml, Dictionary data, XmlNodeList? nodes)
+ public override string XTag => "//*[@x:for]";
+
+ public override void Parse(XmlNodeList? nodes)
{
// No nodes found
if (nodes == null || nodes.Count == 0)
{
- return;
+ return;
}
Parallel.ForEach(nodes.Cast(), node =>
@@ -20,18 +23,18 @@ public void Parse(XmlDocument xml, Dictionary data, XmlNodeList
var collection = n.GetAttribute("x:for");
var asVar = n.GetAttribute("x:as");
-
+
n.RemoveAttribute("x:for");
n.RemoveAttribute("x:as");
- var value = Helper.FindValueByKeys(data, collection.Split('.'));
+ var value = Utils.FindValueByKeys(Data, collection.Split('.'));
if (value is not IEnumerable