From 91f2a679315ba05328619bedfd492e1aee3a4ec5 Mon Sep 17 00:00:00 2001
From: Alexander Raszka <araszka94@gmail.com>
Date: Sat, 10 Feb 2024 13:26:54 +0100
Subject: [PATCH 01/19] Extend named slots test

---
 .../IntegrationTests/expected/named-slots.xml | 18 ++++++++++
 .../IntegrationTests/templates/named-slots.mt | 33 +++++++++++++++----
 2 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/tests/ManiaTemplates.Tests/IntegrationTests/expected/named-slots.xml b/tests/ManiaTemplates.Tests/IntegrationTests/expected/named-slots.xml
index 7ee93f9..67d1ce2 100644
--- a/tests/ManiaTemplates.Tests/IntegrationTests/expected/named-slots.xml
+++ b/tests/ManiaTemplates.Tests/IntegrationTests/expected/named-slots.xml
@@ -1,8 +1,26 @@
 <manialink version="3" id="MtNamedSlots" name="EvoSC#-MtNamedSlots">
+<!--  Section 1  -->
 <frame class="outer">
 <label text="test" />
 <frame class="inner">
 <label text="UnitTest" />
 </frame>
 </frame>
+<!--  Section 2  -->
+<frame class="outer">
+<frame class="outer">
+<label text="test2" />
+<frame class="inner">
+<label text="UnitTest_footer2" />
+</frame>
+</frame>
+<frame class="inner">
+<label text="test3" />
+<frame class="outer">
+<label text="test4" />
+<frame class="inner">
+</frame>
+</frame>
+</frame>
+</frame>
 </manialink>
diff --git a/tests/ManiaTemplates.Tests/IntegrationTests/templates/named-slots.mt b/tests/ManiaTemplates.Tests/IntegrationTests/templates/named-slots.mt
index 01c2148..b5329dd 100644
--- a/tests/ManiaTemplates.Tests/IntegrationTests/templates/named-slots.mt
+++ b/tests/ManiaTemplates.Tests/IntegrationTests/templates/named-slots.mt
@@ -1,14 +1,33 @@
 <component>
-    <import component="SlotsComponent" as="SlotsComponent" />
-    
-    <property type="string" name="testVariable" />
-    
+    <import component="SlotsComponent" as="SlotsComponent"/>
+
+    <property type="string" name="testVariable"/>
+
     <template>
+        <!-- Section 1 -->
         <SlotsComponent>
-            <label text="test" />
-            
+            <label text="test"/>
+
             <template slot="footer">
-                <label text="{{ testVariable }}" />
+                <label text="{{ testVariable }}"/>
+            </template>
+        </SlotsComponent>
+        
+        <!-- Section 2 -->
+        <SlotsComponent>
+            <SlotsComponent>
+                <label text="test2"/>
+
+                <template slot="footer">
+                    <label text="{{ testVariable }}_footer2"/>
+                </template>
+            </SlotsComponent>
+
+            <template slot="footer">
+                <label text="test3"/>
+                <SlotsComponent>
+                    <label text="test4"/>
+                </SlotsComponent>
             </template>
         </SlotsComponent>
     </template>

From f313043c48a96449658742ad66ed7da6f75e509d Mon Sep 17 00:00:00 2001
From: Alexander Raszka <araszka94@gmail.com>
Date: Sat, 10 Feb 2024 13:30:07 +0100
Subject: [PATCH 02/19] Extend named slots test

---
 .../IntegrationTests/expected/named-slots.xml         |  8 ++++----
 .../IntegrationTests/templates/named-slots.mt         | 11 +++++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/tests/ManiaTemplates.Tests/IntegrationTests/expected/named-slots.xml b/tests/ManiaTemplates.Tests/IntegrationTests/expected/named-slots.xml
index 67d1ce2..b152eea 100644
--- a/tests/ManiaTemplates.Tests/IntegrationTests/expected/named-slots.xml
+++ b/tests/ManiaTemplates.Tests/IntegrationTests/expected/named-slots.xml
@@ -9,15 +9,15 @@
 <!--  Section 2  -->
 <frame class="outer">
 <frame class="outer">
-<label text="test2" />
+<label text="abcd" />
 <frame class="inner">
-<label text="UnitTest_footer2" />
+<label text="qwer_UnitTest_footer2" />
 </frame>
 </frame>
 <frame class="inner">
-<label text="test3" />
+<label text="abcd_qwer" />
 <frame class="outer">
-<label text="test4" />
+<label text="asdf" />
 <frame class="inner">
 </frame>
 </frame>
diff --git a/tests/ManiaTemplates.Tests/IntegrationTests/templates/named-slots.mt b/tests/ManiaTemplates.Tests/IntegrationTests/templates/named-slots.mt
index b5329dd..cec933c 100644
--- a/tests/ManiaTemplates.Tests/IntegrationTests/templates/named-slots.mt
+++ b/tests/ManiaTemplates.Tests/IntegrationTests/templates/named-slots.mt
@@ -2,6 +2,9 @@
     <import component="SlotsComponent" as="SlotsComponent"/>
 
     <property type="string" name="testVariable"/>
+    <property type="string" name="test2Variable" default="abcd"/>
+    <property type="string" name="test3Variable" default="qwer"/>
+    <property type="string" name="test4Variable" default="asdf"/>
 
     <template>
         <!-- Section 1 -->
@@ -16,17 +19,17 @@
         <!-- Section 2 -->
         <SlotsComponent>
             <SlotsComponent>
-                <label text="test2"/>
+                <label text="{{ test2Variable }}"/>
 
                 <template slot="footer">
-                    <label text="{{ testVariable }}_footer2"/>
+                    <label text="{{ test3Variable }}_{{ testVariable }}_footer2"/>
                 </template>
             </SlotsComponent>
 
             <template slot="footer">
-                <label text="test3"/>
+                <label text="{{ test2Variable }}_{{ test3Variable }}"/>
                 <SlotsComponent>
-                    <label text="test4"/>
+                    <label text="{{ test4Variable }}"/>
                 </SlotsComponent>
             </template>
         </SlotsComponent>

From aaeb11d75344ef2fb094c80e43ff8f72b4479a60 Mon Sep 17 00:00:00 2001
From: Alexander Raszka <araszka94@gmail.com>
Date: Sat, 10 Feb 2024 13:38:11 +0100
Subject: [PATCH 03/19] Improve documentation in MtTransformer

---
 src/ManiaTemplates/Lib/MtTransformer.cs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/ManiaTemplates/Lib/MtTransformer.cs b/src/ManiaTemplates/Lib/MtTransformer.cs
index 4f7220a..3a78622 100644
--- a/src/ManiaTemplates/Lib/MtTransformer.cs
+++ b/src/ManiaTemplates/Lib/MtTransformer.cs
@@ -275,7 +275,7 @@ private string ProcessNode(XmlNode node, MtComponentMap availableMtComponents, M
                 //Node is a component
                 var component = _engine.GetComponent(availableMtComponents[tag].TemplateKey);
                 var slotContents =
-                    GetSlotContentsBySlotName(childNode, component, availableMtComponents, currentContext,
+                    GetSlotContentsGroupedBySlotName(childNode, component, availableMtComponents, currentContext,
                         parentComponent, rootComponent);
 
                 var componentRenderMethodCall = ProcessComponentNode(
@@ -353,7 +353,14 @@ private string ProcessNode(XmlNode node, MtComponentMap availableMtComponents, M
         return snippet.ToString();
     }
 
-    private Dictionary<string, string> GetSlotContentsBySlotName(XmlNode componentNode,
+    /// <summary>
+    /// Recursively goes through all nodes in the components template and extracts the XML for each slot.
+    /// All XML that is not inside a named slot, is appended to the "default" slot.
+    /// </summary>
+    /// <returns>
+    /// A map of slot names and their contents.
+    /// </returns>
+    private Dictionary<string, string> GetSlotContentsGroupedBySlotName(XmlNode componentNode,
         MtComponent component, MtComponentMap availableMtComponents, MtDataContext context, MtComponent parentComponent, MtComponent rootComponent)
     {
         var contentsByName = new Dictionary<string, XmlNode>();
@@ -730,6 +737,9 @@ private string ExtractManiaScriptDirectives(string maniaScriptSource)
         return output;
     }
 
+    /// <summary>
+    /// Inserts a block with ManiaScript, that contains directives like includes, constants and custom structs.
+    /// </summary>
     private string CreateManiaScriptDirectivesBlock()
     {
         if (_maniaScriptIncludes.Count + _maniaScriptStructs.Count + _maniaScriptConstants.Count == 0)

From 2609a10669c03d42c6b311621219ea30405679fe Mon Sep 17 00:00:00 2001
From: Alexander Raszka <araszka94@gmail.com>
Date: Sat, 10 Feb 2024 14:04:47 +0100
Subject: [PATCH 04/19] Create MTScriptTransformer and CurlyBraceMethods from
 extracted MtTransformer methods

---
 .../Interfaces/ICurlyBraceMethods.cs          |  23 ++
 .../Interfaces/IManiaTemplate.cs              |   3 +-
 src/ManiaTemplates/Lib/CurlyBraceMethods.cs   |  84 +++++++
 src/ManiaTemplates/Lib/MtScriptTransformer.cs | 145 +++++++++++
 src/ManiaTemplates/Lib/MtTransformer.cs       | 233 ++----------------
 .../Lib/MtTransformerTest.cs                  |  21 +-
 6 files changed, 281 insertions(+), 228 deletions(-)
 create mode 100644 src/ManiaTemplates/Interfaces/ICurlyBraceMethods.cs
 create mode 100644 src/ManiaTemplates/Lib/CurlyBraceMethods.cs
 create mode 100644 src/ManiaTemplates/Lib/MtScriptTransformer.cs

diff --git a/src/ManiaTemplates/Interfaces/ICurlyBraceMethods.cs b/src/ManiaTemplates/Interfaces/ICurlyBraceMethods.cs
new file mode 100644
index 0000000..bd85f0c
--- /dev/null
+++ b/src/ManiaTemplates/Interfaces/ICurlyBraceMethods.cs
@@ -0,0 +1,23 @@
+using System.Text.RegularExpressions;
+
+namespace ManiaTemplates.Interfaces;
+
+public interface ICurlyBraceMethods
+{
+    protected static readonly Regex TemplateInterpolationRegex = new(@"\{\{\s*(.+?)\s*\}\}");
+
+    /// <summary>
+    /// Takes the contents of double curly braces in a string and wraps them into something else. The second Argument takes a string-argument and returns the newly wrapped string.
+    /// </summary>
+    public string ReplaceCurlyBraces(string value, Func<string, string> curlyContentWrapper);
+
+    /// <summary>
+    /// Checks whether double interpolation exists ({{ {{ a }} {{ b }} }}) and throws exception if so.
+    /// </summary>
+    public void PreventInterpolationRecursion(string value);
+
+    /// <summary>
+    /// Checks whether double interpolation exists ({{ {{ a }} {{ b }} }}) and throws exception if so.
+    /// </summary>
+    public void PreventCurlyBraceCountMismatch(string value);
+}
\ No newline at end of file
diff --git a/src/ManiaTemplates/Interfaces/IManiaTemplate.cs b/src/ManiaTemplates/Interfaces/IManiaTemplate.cs
index e09a70e..253647c 100644
--- a/src/ManiaTemplates/Interfaces/IManiaTemplate.cs
+++ b/src/ManiaTemplates/Interfaces/IManiaTemplate.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using ManiaTemplates.Components;
+using ManiaTemplates.Components;
 
 namespace ManiaTemplates.Interfaces;
 
diff --git a/src/ManiaTemplates/Lib/CurlyBraceMethods.cs b/src/ManiaTemplates/Lib/CurlyBraceMethods.cs
new file mode 100644
index 0000000..5572f25
--- /dev/null
+++ b/src/ManiaTemplates/Lib/CurlyBraceMethods.cs
@@ -0,0 +1,84 @@
+using System.Text.RegularExpressions;
+using ManiaTemplates.Exceptions;
+using ManiaTemplates.Interfaces;
+
+namespace ManiaTemplates.Lib;
+
+public class CurlyBraceMethods: ICurlyBraceMethods
+{
+    protected static readonly Regex TemplateInterpolationRegex = ICurlyBraceMethods.TemplateInterpolationRegex;
+    
+    /// <summary>
+    /// Takes the contents of double curly braces in a string and wraps them into something else. The second Argument takes a string-argument and returns the newly wrapped string.
+    /// </summary>
+    public string ReplaceCurlyBraces(string value, Func<string, string> curlyContentWrapper)
+    {
+        PreventCurlyBraceCountMismatch(value);
+        PreventInterpolationRecursion(value);
+
+        var matches = TemplateInterpolationRegex.Match(value);
+        var output = value;
+
+        while (matches.Success)
+        {
+            var match = matches.Groups[0].Value.Trim();
+            var content = matches.Groups[1].Value.Trim();
+
+            output = output.Replace(match, curlyContentWrapper(content));
+
+            matches = matches.NextMatch();
+        }
+
+        return output;
+    }
+
+    /// <summary>
+    /// Checks whether double interpolation exists ({{ {{ a }} {{ b }} }}) and throws exception if so.
+    /// </summary>
+    public void PreventInterpolationRecursion(string value)
+    {
+        //TODO: find proper algorithm
+        // var openCurlyBraces = 0;
+        // foreach (var character in value.ToCharArray())
+        // {
+        //     if (character == '{')
+        //     {
+        //         openCurlyBraces++;
+        //
+        //         if (openCurlyBraces >= 4)
+        //         {
+        //             throw new InterpolationRecursionException(
+        //                 $"Double interpolation found in: {value}. You must not use double curly braces inside other double curly braces.");
+        //         }
+        //     }
+        //     else if (character == '}')
+        //     {
+        //         openCurlyBraces--;
+        //     }
+        // }
+    }
+
+    /// <summary>
+    /// Checks whether double interpolation exists ({{ {{ a }} {{ b }} }}) and throws exception if so.
+    /// </summary>
+    public void PreventCurlyBraceCountMismatch(string value)
+    {
+        var openCurlyBraces = 0;
+        foreach (var character in value.ToCharArray())
+        {
+            if (character == '{')
+            {
+                openCurlyBraces++;
+            }
+            else if (character == '}')
+            {
+                openCurlyBraces--;
+            }
+        }
+
+        if (openCurlyBraces != 0)
+        {
+            throw new CurlyBraceCountMismatchException($"Found curly brace count mismatch in: {value}.");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ManiaTemplates/Lib/MtScriptTransformer.cs b/src/ManiaTemplates/Lib/MtScriptTransformer.cs
new file mode 100644
index 0000000..e208b49
--- /dev/null
+++ b/src/ManiaTemplates/Lib/MtScriptTransformer.cs
@@ -0,0 +1,145 @@
+using System.Globalization;
+using System.Text;
+using System.Text.RegularExpressions;
+using ManiaTemplates.Components;
+using ManiaTemplates.Exceptions;
+using ManiaTemplates.Interfaces;
+
+namespace ManiaTemplates.Lib;
+
+public class MtScriptTransformer: CurlyBraceMethods
+{
+    private readonly IManiaTemplateLanguage _maniaTemplateLanguage;
+    private readonly Dictionary<string, string> _maniaScriptIncludes = new();
+    private readonly Dictionary<string, string> _maniaScriptConstants = new();
+    private readonly Dictionary<string, string> _maniaScriptStructs = new();
+
+    private static readonly Regex ManiaScriptIncludeRegex = new(@"#Include\s+""(.+?)""\s+as\s+([_a-zA-Z]+)");
+    private static readonly Regex ManiaScriptConstantRegex = new(@"#Const\s+([a-zA-Z_:]+)\s+.+");
+    private static readonly Regex ManiaScriptStructRegex = new(@"(?s)#Struct\s+([_a-zA-Z]+)\s*\{.+?\}");
+
+    public MtScriptTransformer(IManiaTemplateLanguage templateLanguage)
+    {
+        _maniaTemplateLanguage = templateLanguage;
+    }
+
+    public string CreateManiaScriptBlock(MtComponent component)
+    {
+        var renderMethod = new StringBuilder("<script>");
+
+        foreach (var script in component.Scripts)
+        {
+            if (script.Once)
+            {
+                renderMethod.AppendLine(_maniaTemplateLanguage.FeatureBlockStart())
+                    .AppendLine($@"if(!__insertedOneTimeManiaScripts.Contains(""{script.ContentHash()}"")){{")
+                    .AppendLine(_maniaTemplateLanguage.FeatureBlockEnd());
+            }
+
+            renderMethod.AppendLine(ReplaceCurlyBraces(ExtractManiaScriptDirectives(script.Content),
+                _maniaTemplateLanguage.InsertResult));
+
+            if (script.Once)
+            {
+                renderMethod.AppendLine(_maniaTemplateLanguage.FeatureBlockStart())
+                    .AppendLine($@"__insertedOneTimeManiaScripts.Add(""{script.ContentHash()}"");")
+                    .AppendLine("}")
+                    .AppendLine(_maniaTemplateLanguage.FeatureBlockEnd());
+            }
+        }
+
+        return renderMethod.AppendLine("</script>").ToString();
+    }
+
+    /// <summary>
+    /// Inserts a block with ManiaScript, that contains directives like includes, constants and custom structs.
+    /// </summary>
+    public string CreateManiaScriptDirectivesBlock()
+    {
+        if (_maniaScriptIncludes.Count + _maniaScriptStructs.Count + _maniaScriptConstants.Count == 0)
+        {
+            return "";
+        }
+
+        var output = new StringBuilder("<script><!--\n");
+
+        output.AppendJoin("\n",
+                _maniaScriptIncludes.Select(include => $@"#Include ""{include.Value}"" as {include.Key}"))
+            .AppendLine()
+            .AppendJoin("\n", _maniaScriptStructs.Values)
+            .AppendLine()
+            .AppendJoin("\n", _maniaScriptConstants.Values);
+
+        return output.AppendLine("\n--></script>").ToString();
+    }
+
+    /// <summary>
+    /// Extracts directives like structs, includes or constants from a given ManiaScript block.
+    /// </summary>
+    private string ExtractManiaScriptDirectives(string maniaScriptSource)
+    {
+        var output = maniaScriptSource;
+
+        var includeMatcher = ManiaScriptIncludeRegex.Match(output);
+        while (includeMatcher.Success)
+        {
+            var match = includeMatcher.ToString();
+            var libraryToInclude = includeMatcher.Groups[1].Value;
+            var includedAs = includeMatcher.Groups[2].Value;
+
+            if (_maniaScriptIncludes.TryGetValue(includedAs, out var blockingLibrary))
+            {
+                if (blockingLibrary != libraryToInclude)
+                {
+                    throw new DuplicateManiaScriptIncludeException(
+                        $"Can't include {libraryToInclude} as {includedAs}, because another include ({blockingLibrary}) blocks it.");
+                }
+            }
+            else
+            {
+                _maniaScriptIncludes.Add(includedAs, libraryToInclude);
+            }
+
+            output = output.Replace(match, "");
+            includeMatcher = includeMatcher.NextMatch();
+        }
+
+        var constantMatcher = ManiaScriptConstantRegex.Match(output);
+        while (constantMatcher.Success)
+        {
+            var match = constantMatcher.ToString();
+            _maniaScriptConstants.TryAdd(constantMatcher.Groups[1].Value, match);
+            output = output.Replace(match, "");
+            //TODO: exceptions double constant
+
+            constantMatcher = constantMatcher.NextMatch();
+        }
+
+        var structMatcher = ManiaScriptStructRegex.Match(output);
+        while (structMatcher.Success)
+        {
+            var structName = structMatcher.Groups[1].Value;
+            var structDefinition = structMatcher.ToString().Trim();
+
+            if (_maniaScriptStructs.TryGetValue(structName, out var existingStructDefinition))
+            {
+                if (string.Compare(structDefinition, existingStructDefinition, CultureInfo.CurrentCulture,
+                        CompareOptions.IgnoreCase | CompareOptions.IgnoreSymbols) != 0)
+                {
+                    throw new DuplicateManiaScriptStructException(
+                        $"Can't redefine struct {structName}, because it is already defined as: {existingStructDefinition}.");
+                }
+            }
+            else
+            {
+                _maniaScriptStructs.Add(structName, structDefinition);
+            }
+
+            output = output.Replace(structDefinition, "");
+
+            structMatcher = structMatcher.NextMatch();
+        }
+
+        return output;
+    }
+}
\ No newline at end of file
diff --git a/src/ManiaTemplates/Lib/MtTransformer.cs b/src/ManiaTemplates/Lib/MtTransformer.cs
index 3a78622..c84aa67 100644
--- a/src/ManiaTemplates/Lib/MtTransformer.cs
+++ b/src/ManiaTemplates/Lib/MtTransformer.cs
@@ -1,6 +1,5 @@
 using System.CodeDom;
 using System.Dynamic;
-using System.Globalization;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Xml;
@@ -12,30 +11,24 @@
 
 namespace ManiaTemplates.Lib;
 
-public class MtTransformer
+public class MtTransformer : CurlyBraceMethods
 {
     private readonly ManiaTemplateEngine _engine;
     private readonly IManiaTemplateLanguage _maniaTemplateLanguage;
+    private readonly MtScriptTransformer _scriptTransformer;
     private readonly List<string> _namespaces = new();
     private readonly Dictionary<string, string> _renderMethods = new();
     private readonly Dictionary<string, string> _maniaScriptRenderMethods = new();
     private readonly List<MtComponentSlot> _slots = new();
-    private readonly Dictionary<string, string> _maniaScriptIncludes = new();
-    private readonly Dictionary<string, string> _maniaScriptConstants = new();
-    private readonly Dictionary<string, string> _maniaScriptStructs = new();
     private int _loopDepth;
 
     private static readonly Regex TemplateFeatureControlRegex = new(@"#>\s*<#\+");
-    private static readonly Regex TemplateInterpolationRegex = new(@"\{\{\s*(.+?)\s*\}\}");
-
-    private static readonly Regex ManiaScriptIncludeRegex = new(@"#Include\s+""(.+?)""\s+as\s+([_a-zA-Z]+)");
-    private static readonly Regex ManiaScriptConstantRegex = new(@"#Const\s+([a-zA-Z_:]+)\s+.+");
-    private static readonly Regex ManiaScriptStructRegex = new(@"(?s)#Struct\s+([_a-zA-Z]+)\s*\{.+?\}");
 
     public MtTransformer(ManiaTemplateEngine engine, IManiaTemplateLanguage maniaTemplateLanguage)
     {
         _engine = engine;
         _maniaTemplateLanguage = maniaTemplateLanguage;
+        _scriptTransformer = new MtScriptTransformer(maniaTemplateLanguage);
     }
 
     /// <summary>
@@ -45,9 +38,8 @@ public string BuildManialink(MtComponent rootComponent, string className, int ve
     {
         _namespaces.AddRange(rootComponent.Namespaces);
 
-        var renderBodyArguments =
-            string.Join(',', rootComponent.Slots.Select(slotName => "DoNothing").ToList());
-        
+        var renderBodyArguments = string.Join(',', Enumerable.Repeat("DoNothing", rootComponent.Slots.Count));
+
         var body = ProcessNode(
             XmlStringToNode(rootComponent.TemplateContent),
             _engine.BaseMtComponents.Overload(rootComponent.ImportedComponents),
@@ -110,7 +102,7 @@ private string CreateBodyRenderMethod(string body, MtComponent rootComponent)
         var rootScriptBlock = "";
         if (rootComponent.Scripts.Count > 0)
         {
-            rootScriptBlock = CreateManiaScriptBlock(rootComponent);
+            rootScriptBlock = _scriptTransformer.CreateManiaScriptBlock(rootComponent);
         }
 
         var subManiaScripts = new StringBuilder(_maniaTemplateLanguage.FeatureBlockStart())
@@ -121,7 +113,7 @@ private string CreateBodyRenderMethod(string body, MtComponent rootComponent)
 
         //Render content
         bodyRenderMethod.AppendLine(_maniaTemplateLanguage.FeatureBlockEnd())
-            .AppendLine(CreateManiaScriptDirectivesBlock())
+            .AppendLine(_scriptTransformer.CreateManiaScriptDirectivesBlock())
             .AppendLine(body)
             .AppendLine(subManiaScripts)
             .AppendLine(rootScriptBlock)
@@ -214,7 +206,7 @@ private string CreateSlotRenderMethod(MtComponent component, int scope, MtDataCo
                 methodArguments.Add($"{localVariableType} {localVariableName}");
             }
         }
-        
+
         if (parentComponent != rootComponent)
         {
             AppendComponentPropertiesToMethodArgumentsList(parentComponent, methodArguments);
@@ -231,10 +223,10 @@ private string CreateSlotRenderMethod(MtComponent component, int scope, MtDataCo
             {
                 continue;
             }
-            
+
             output.AppendLine($"const {prop.Type} {prop.Name} = {WrapIfString(prop, prop.Default)};");
         }
-        
+
         output
             .AppendLine(_maniaTemplateLanguage.FeatureBlockEnd())
             .AppendLine(slotContent)
@@ -361,7 +353,8 @@ private string ProcessNode(XmlNode node, MtComponentMap availableMtComponents, M
     /// A map of slot names and their contents.
     /// </returns>
     private Dictionary<string, string> GetSlotContentsGroupedBySlotName(XmlNode componentNode,
-        MtComponent component, MtComponentMap availableMtComponents, MtDataContext context, MtComponent parentComponent, MtComponent rootComponent)
+        MtComponent component, MtComponentMap availableMtComponents, MtDataContext context, MtComponent parentComponent,
+        MtComponent rootComponent)
     {
         var contentsByName = new Dictionary<string, XmlNode>();
 
@@ -456,7 +449,7 @@ MtComponent rootComponent
 
         //Create available arguments
         var renderArguments = new List<string>();
-        
+
         //Add local variables to component render method call
         foreach (var localVariableName in currentContext.Keys)
         {
@@ -537,7 +530,8 @@ MtComponent rootComponent
     /// <summary>
     /// Creates the method which renders the contents of a component.
     /// </summary>
-    private string CreateComponentRenderMethod(MtComponent component, string renderMethodName, string componentBody, MtDataContext currentContext)
+    private string CreateComponentRenderMethod(MtComponent component, string renderMethodName, string componentBody,
+        MtDataContext currentContext)
     {
         var renderMethod = new StringBuilder(_maniaTemplateLanguage.FeatureBlockStart())
             .Append("private void ")
@@ -546,7 +540,7 @@ private string CreateComponentRenderMethod(MtComponent component, string renderM
 
         //open method arguments
         var arguments = new List<string>();
-        
+
         //Add local variables to component render method call
         foreach (var (localVariableName, localVariableType) in currentContext)
         {
@@ -555,7 +549,7 @@ private string CreateComponentRenderMethod(MtComponent component, string renderM
 
         //add slot render methods
         AppendSlotRenderArgumentsToList(arguments, component);
-        
+
         //add component properties as arguments with defaults
         AppendComponentPropertiesToMethodArgumentsList(component, arguments);
 
@@ -634,7 +628,7 @@ private string CreateComponentScriptsRenderMethod(MtComponent component, string
             .AppendLine(_maniaTemplateLanguage.FeatureBlockEnd());
 
         //insert body
-        renderMethod.AppendLine(CreateManiaScriptBlock(component));
+        renderMethod.AppendLine(_scriptTransformer.CreateManiaScriptBlock(component));
 
         return renderMethod.AppendLine(_maniaTemplateLanguage.FeatureBlockStart())
             .Append('}')
@@ -642,123 +636,6 @@ private string CreateComponentScriptsRenderMethod(MtComponent component, string
             .ToString();
     }
 
-    private string CreateManiaScriptBlock(MtComponent component)
-    {
-        var renderMethod = new StringBuilder("<script>");
-
-        foreach (var script in component.Scripts)
-        {
-            if (script.Once)
-            {
-                renderMethod.AppendLine(_maniaTemplateLanguage.FeatureBlockStart())
-                    .AppendLine($@"if(!__insertedOneTimeManiaScripts.Contains(""{script.ContentHash()}"")){{")
-                    .AppendLine(_maniaTemplateLanguage.FeatureBlockEnd());
-            }
-
-            renderMethod.AppendLine(ReplaceCurlyBraces(ExtractManiaScriptDirectives(script.Content),
-                _maniaTemplateLanguage.InsertResult));
-
-            if (script.Once)
-            {
-                renderMethod.AppendLine(_maniaTemplateLanguage.FeatureBlockStart())
-                    .AppendLine($@"__insertedOneTimeManiaScripts.Add(""{script.ContentHash()}"");")
-                    .AppendLine("}")
-                    .AppendLine(_maniaTemplateLanguage.FeatureBlockEnd());
-            }
-        }
-
-        return renderMethod.AppendLine("</script>").ToString();
-    }
-
-    private string ExtractManiaScriptDirectives(string maniaScriptSource)
-    {
-        var output = maniaScriptSource;
-
-        var includeMatcher = ManiaScriptIncludeRegex.Match(output);
-        while (includeMatcher.Success)
-        {
-            var match = includeMatcher.ToString();
-            var libraryToInclude = includeMatcher.Groups[1].Value;
-            var includedAs = includeMatcher.Groups[2].Value;
-
-            if (_maniaScriptIncludes.TryGetValue(includedAs, out var blockingLibrary))
-            {
-                if (blockingLibrary != libraryToInclude)
-                {
-                    throw new DuplicateManiaScriptIncludeException(
-                        $"Can't include {libraryToInclude} as {includedAs}, because another include ({blockingLibrary}) blocks it.");
-                }
-            }
-            else
-            {
-                _maniaScriptIncludes.Add(includedAs, libraryToInclude);
-            }
-
-            output = output.Replace(match, "");
-            includeMatcher = includeMatcher.NextMatch();
-        }
-
-        var constantMatcher = ManiaScriptConstantRegex.Match(output);
-        while (constantMatcher.Success)
-        {
-            var match = constantMatcher.ToString();
-            _maniaScriptConstants.TryAdd(constantMatcher.Groups[1].Value, match);
-            output = output.Replace(match, "");
-            //TODO: exceptions double constant
-
-            constantMatcher = constantMatcher.NextMatch();
-        }
-
-        var structMatcher = ManiaScriptStructRegex.Match(output);
-        while (structMatcher.Success)
-        {
-            var structName = structMatcher.Groups[1].Value;
-            var structDefinition = structMatcher.ToString().Trim();
-
-            if (_maniaScriptStructs.TryGetValue(structName, out var existingStructDefinition))
-            {
-                if (string.Compare(structDefinition, existingStructDefinition, CultureInfo.CurrentCulture,
-                        CompareOptions.IgnoreCase | CompareOptions.IgnoreSymbols) != 0)
-                {
-                    throw new DuplicateManiaScriptStructException(
-                        $"Can't redefine struct {structName}, because it is already defined as: {existingStructDefinition}.");
-                }
-            }
-            else
-            {
-                _maniaScriptStructs.Add(structName, structDefinition);
-            }
-
-            output = output.Replace(structDefinition, "");
-
-            structMatcher = structMatcher.NextMatch();
-        }
-
-        return output;
-    }
-
-    /// <summary>
-    /// Inserts a block with ManiaScript, that contains directives like includes, constants and custom structs.
-    /// </summary>
-    private string CreateManiaScriptDirectivesBlock()
-    {
-        if (_maniaScriptIncludes.Count + _maniaScriptStructs.Count + _maniaScriptConstants.Count == 0)
-        {
-            return "";
-        }
-
-        var output = new StringBuilder("<script><!--\n");
-
-        output.AppendJoin("\n",
-                _maniaScriptIncludes.Select(include => $@"#Include ""{include.Value}"" as {include.Key}"))
-            .AppendLine()
-            .AppendJoin("\n", _maniaScriptStructs.Values)
-            .AppendLine()
-            .AppendJoin("\n", _maniaScriptConstants.Values);
-
-        return output.AppendLine("\n--></script>").ToString();
-    }
-
     /// <summary>
     /// Checks the attribute list for if-condition and if found removes & returns it, else null.
     /// </summary>
@@ -988,80 +865,6 @@ public static XmlNode XmlStringToNode(string content)
         return doc.FirstChild!;
     }
 
-    /// <summary>
-    /// Takes the contents of double curly braces in a string and wraps them into something else. The second Argument takes a string-argument and returns the newly wrapped string.
-    /// </summary>
-    public static string ReplaceCurlyBraces(string value, Func<string, string> curlyContentWrapper)
-    {
-        CheckForCurlyBraceCountMismatch(value);
-        CheckInterpolationRecursion(value);
-
-        var matches = TemplateInterpolationRegex.Match(value);
-        var output = value;
-
-        while (matches.Success)
-        {
-            var match = matches.Groups[0].Value.Trim();
-            var content = matches.Groups[1].Value.Trim();
-
-            output = output.Replace(match, curlyContentWrapper(content));
-
-            matches = matches.NextMatch();
-        }
-
-        return output;
-    }
-
-    /// <summary>
-    /// Checks whether double interpolation exists ({{ {{ a }} {{ b }} }}) and throws exception if so.
-    /// </summary>
-    public static void CheckInterpolationRecursion(string value)
-    {
-        //TODO: find proper algorithm
-        // var openCurlyBraces = 0;
-        // foreach (var character in value.ToCharArray())
-        // {
-        //     if (character == '{')
-        //     {
-        //         openCurlyBraces++;
-        //
-        //         if (openCurlyBraces >= 4)
-        //         {
-        //             throw new InterpolationRecursionException(
-        //                 $"Double interpolation found in: {value}. You must not use double curly braces inside other double curly braces.");
-        //         }
-        //     }
-        //     else if (character == '}')
-        //     {
-        //         openCurlyBraces--;
-        //     }
-        // }
-    }
-
-    /// <summary>
-    /// Checks whether double interpolation exists ({{ {{ a }} {{ b }} }}) and throws exception if so.
-    /// </summary>
-    public static void CheckForCurlyBraceCountMismatch(string value)
-    {
-        var openCurlyBraces = 0;
-        foreach (var character in value.ToCharArray())
-        {
-            if (character == '{')
-            {
-                openCurlyBraces++;
-            }
-            else if (character == '}')
-            {
-                openCurlyBraces--;
-            }
-        }
-
-        if (openCurlyBraces != 0)
-        {
-            throw new CurlyBraceCountMismatchException($"Found curly brace count mismatch in: {value}.");
-        }
-    }
-
     /// <summary>
     /// Joins consecutive feature blocks to reduce generated code.
     /// </summary>
diff --git a/tests/ManiaTemplates.Tests/Lib/MtTransformerTest.cs b/tests/ManiaTemplates.Tests/Lib/MtTransformerTest.cs
index 10b99f6..323f635 100644
--- a/tests/ManiaTemplates.Tests/Lib/MtTransformerTest.cs
+++ b/tests/ManiaTemplates.Tests/Lib/MtTransformerTest.cs
@@ -117,8 +117,7 @@ private string TransformCodeToOrderNumber(string input)
     [Fact]
     public void Should_Import_Components_Recursively()
     {
-        var assemblies = new List<Assembly>();
-        assemblies.Add(Assembly.GetExecutingAssembly());
+        var assemblies = new List<Assembly> { Assembly.GetExecutingAssembly() };
 
         _maniaTemplateEngine.AddTemplateFromString("Embeddable", "<component><template><el/></template></component>");
         _maniaTemplateEngine.AddTemplateFromString("RecursionElement",
@@ -145,20 +144,20 @@ public void Should_Import_Components_Recursively()
     [Fact]
     public void Should_Throw_Curly_Brace_Count_Mismatch_Exception()
     {
-        Assert.Throws<CurlyBraceCountMismatchException>(() => MtTransformer.CheckForCurlyBraceCountMismatch("{{ { }}"));
-        Assert.Throws<CurlyBraceCountMismatchException>(() => MtTransformer.CheckForCurlyBraceCountMismatch("{{ } }}"));
-        Assert.Throws<CurlyBraceCountMismatchException>(() => MtTransformer.CheckForCurlyBraceCountMismatch("{"));
-        Assert.Throws<CurlyBraceCountMismatchException>(() => MtTransformer.CheckForCurlyBraceCountMismatch("}}"));
+        Assert.Throws<CurlyBraceCountMismatchException>(() => _transformer.PreventCurlyBraceCountMismatch("{{ { }}"));
+        Assert.Throws<CurlyBraceCountMismatchException>(() => _transformer.PreventCurlyBraceCountMismatch("{{ } }}"));
+        Assert.Throws<CurlyBraceCountMismatchException>(() => _transformer.PreventCurlyBraceCountMismatch("{"));
+        Assert.Throws<CurlyBraceCountMismatchException>(() => _transformer.PreventCurlyBraceCountMismatch("}}"));
     }
 
     [Fact]
     public void Should_Replace_Curly_Braces()
     {
-        Assert.Equal("abcd", MtTransformer.ReplaceCurlyBraces("{{a}}{{ b }}{{c }}{{  d}}", s => s));
-        Assert.Equal("x y z", MtTransformer.ReplaceCurlyBraces("{{x}} {{ y }} {{z }}", s => s));
-        Assert.Equal("unittest", MtTransformer.ReplaceCurlyBraces("{{ unit }}test", s => s));
-        Assert.Equal("#unit#test", MtTransformer.ReplaceCurlyBraces("{{ unit }}test", s => $"#{s}#"));
-        Assert.Equal("#{ unit#}test", MtTransformer.ReplaceCurlyBraces("{{{ unit }}}test", s => $"#{s}#"));
+        Assert.Equal("abcd", _transformer.ReplaceCurlyBraces("{{a}}{{ b }}{{c }}{{  d}}", s => s));
+        Assert.Equal("x y z", _transformer.ReplaceCurlyBraces("{{x}} {{ y }} {{z }}", s => s));
+        Assert.Equal("unittest", _transformer.ReplaceCurlyBraces("{{ unit }}test", s => s));
+        Assert.Equal("#unit#test", _transformer.ReplaceCurlyBraces("{{ unit }}test", s => $"#{s}#"));
+        Assert.Equal("#{ unit#}test", _transformer.ReplaceCurlyBraces("{{{ unit }}}test", s => $"#{s}#"));
     }
 
     [Fact]

From 586d0ca52972c248921e2a190833aae819a85b62 Mon Sep 17 00:00:00 2001
From: Alexander Raszka <araszka94@gmail.com>
Date: Sat, 10 Feb 2024 14:08:22 +0100
Subject: [PATCH 05/19] Move curly braces tests to own class

---
 .../Lib/CurlyBraceMethodsTest.cs              | 45 +++++++++++++++++++
 .../Lib/MtTransformerTest.cs                  | 29 ------------
 2 files changed, 45 insertions(+), 29 deletions(-)
 create mode 100644 tests/ManiaTemplates.Tests/Lib/CurlyBraceMethodsTest.cs

diff --git a/tests/ManiaTemplates.Tests/Lib/CurlyBraceMethodsTest.cs b/tests/ManiaTemplates.Tests/Lib/CurlyBraceMethodsTest.cs
new file mode 100644
index 0000000..ca0caed
--- /dev/null
+++ b/tests/ManiaTemplates.Tests/Lib/CurlyBraceMethodsTest.cs
@@ -0,0 +1,45 @@
+using ManiaTemplates.Exceptions;
+using ManiaTemplates.Languages;
+using ManiaTemplates.Lib;
+using Xunit.Abstractions;
+
+namespace ManiaTemplates.Tests.Lib;
+
+public class CurlyBraceMethodsTest
+{
+    private readonly ITestOutputHelper _testOutputHelper;
+    private readonly MtTransformer _transformer;
+    private readonly ManiaTemplateEngine _maniaTemplateEngine = new();
+
+    public CurlyBraceMethodsTest(ITestOutputHelper testOutputHelper)
+    {
+        _testOutputHelper = testOutputHelper;
+        _transformer = new MtTransformer(_maniaTemplateEngine, new MtLanguageT4());
+    }
+    
+    // [Fact]
+    // public void Should_Throw_Interpolation_Recursion_Exception()
+    // {
+    //     Assert.Throws<InterpolationRecursionException>(() => _transformer.PreventInterpolationRecursion("{{ {{ a }} {{ b }} }}"));
+    //     Assert.Throws<InterpolationRecursionException>(() => _transformer.PreventInterpolationRecursion("{{ {{ b }} }}"));
+    // }
+
+    [Fact]
+    public void Should_Throw_Curly_Brace_Count_Mismatch_Exception()
+    {
+        Assert.Throws<CurlyBraceCountMismatchException>(() => _transformer.PreventCurlyBraceCountMismatch("{{ { }}"));
+        Assert.Throws<CurlyBraceCountMismatchException>(() => _transformer.PreventCurlyBraceCountMismatch("{{ } }}"));
+        Assert.Throws<CurlyBraceCountMismatchException>(() => _transformer.PreventCurlyBraceCountMismatch("{"));
+        Assert.Throws<CurlyBraceCountMismatchException>(() => _transformer.PreventCurlyBraceCountMismatch("}}"));
+    }
+
+    [Fact]
+    public void Should_Replace_Curly_Braces()
+    {
+        Assert.Equal("abcd", _transformer.ReplaceCurlyBraces("{{a}}{{ b }}{{c }}{{  d}}", s => s));
+        Assert.Equal("x y z", _transformer.ReplaceCurlyBraces("{{x}} {{ y }} {{z }}", s => s));
+        Assert.Equal("unittest", _transformer.ReplaceCurlyBraces("{{ unit }}test", s => s));
+        Assert.Equal("#unit#test", _transformer.ReplaceCurlyBraces("{{ unit }}test", s => $"#{s}#"));
+        Assert.Equal("#{ unit#}test", _transformer.ReplaceCurlyBraces("{{{ unit }}}test", s => $"#{s}#"));
+    }
+}
\ No newline at end of file
diff --git a/tests/ManiaTemplates.Tests/Lib/MtTransformerTest.cs b/tests/ManiaTemplates.Tests/Lib/MtTransformerTest.cs
index 323f635..6a6aef2 100644
--- a/tests/ManiaTemplates.Tests/Lib/MtTransformerTest.cs
+++ b/tests/ManiaTemplates.Tests/Lib/MtTransformerTest.cs
@@ -2,7 +2,6 @@
 using System.Text.RegularExpressions;
 using System.Xml;
 using ManiaTemplates.Components;
-using ManiaTemplates.Exceptions;
 using ManiaTemplates.Languages;
 using ManiaTemplates.Lib;
 using Xunit.Abstractions;
@@ -132,34 +131,6 @@ public void Should_Import_Components_Recursively()
 ", output, ignoreLineEndingDifferences: true);
     }
 
-    // [Fact]
-    // public void Should_Throw_Interpolation_Recursion_Exception()
-    // {
-    //     Assert.Throws<InterpolationRecursionException>(() =>
-    //         MtTransformer.CheckInterpolationRecursion("{{ {{ a }} {{ b }} }}"));
-    //     Assert.Throws<InterpolationRecursionException>(() =>
-    //         MtTransformer.CheckInterpolationRecursion("{{ {{ b }} }}"));
-    // }
-
-    [Fact]
-    public void Should_Throw_Curly_Brace_Count_Mismatch_Exception()
-    {
-        Assert.Throws<CurlyBraceCountMismatchException>(() => _transformer.PreventCurlyBraceCountMismatch("{{ { }}"));
-        Assert.Throws<CurlyBraceCountMismatchException>(() => _transformer.PreventCurlyBraceCountMismatch("{{ } }}"));
-        Assert.Throws<CurlyBraceCountMismatchException>(() => _transformer.PreventCurlyBraceCountMismatch("{"));
-        Assert.Throws<CurlyBraceCountMismatchException>(() => _transformer.PreventCurlyBraceCountMismatch("}}"));
-    }
-
-    [Fact]
-    public void Should_Replace_Curly_Braces()
-    {
-        Assert.Equal("abcd", _transformer.ReplaceCurlyBraces("{{a}}{{ b }}{{c }}{{  d}}", s => s));
-        Assert.Equal("x y z", _transformer.ReplaceCurlyBraces("{{x}} {{ y }} {{z }}", s => s));
-        Assert.Equal("unittest", _transformer.ReplaceCurlyBraces("{{ unit }}test", s => s));
-        Assert.Equal("#unit#test", _transformer.ReplaceCurlyBraces("{{ unit }}test", s => $"#{s}#"));
-        Assert.Equal("#{ unit#}test", _transformer.ReplaceCurlyBraces("{{{ unit }}}test", s => $"#{s}#"));
-    }
-
     [Fact]
     public void Should_Wrap_Strings_In_Quotes()
     {

From d4aef292c71ae8c49987284ae506e99fc79f170d Mon Sep 17 00:00:00 2001
From: Alexander Raszka <araszka94@gmail.com>
Date: Sat, 10 Feb 2024 14:45:47 +0100
Subject: [PATCH 06/19] Update to .NET 8.0

---
 .../Interfaces/ICurlyBraceMethods.cs          |  68 ++++-
 .../Interfaces/IManiaTemplateLanguage.cs      |   1 +
 src/ManiaTemplates/Interfaces/IXmlMethods.cs  |  46 ++++
 src/ManiaTemplates/Languages/MtLanguageT4.cs  |  35 ++-
 src/ManiaTemplates/Lib/CurlyBraceMethods.cs   |  84 ------
 src/ManiaTemplates/Lib/ManiaLink.cs           |  26 ++
 src/ManiaTemplates/Lib/MtScriptTransformer.cs |  20 +-
 src/ManiaTemplates/Lib/MtTransformer.cs       | 245 +++++-------------
 src/ManiaTemplates/Lib/Snippet.cs             |   5 +-
 src/ManiaTemplates/ManiaTemplates.csproj      |   2 +-
 .../Lib/CurlyBraceMethodsTest.cs              |  32 +--
 .../Lib/MtTransformerTest.cs                  |  22 +-
 .../ManiaTemplates.Tests.csproj               |   2 +-
 13 files changed, 273 insertions(+), 315 deletions(-)
 create mode 100644 src/ManiaTemplates/Interfaces/IXmlMethods.cs
 delete mode 100644 src/ManiaTemplates/Lib/CurlyBraceMethods.cs

diff --git a/src/ManiaTemplates/Interfaces/ICurlyBraceMethods.cs b/src/ManiaTemplates/Interfaces/ICurlyBraceMethods.cs
index bd85f0c..aea1d9c 100644
--- a/src/ManiaTemplates/Interfaces/ICurlyBraceMethods.cs
+++ b/src/ManiaTemplates/Interfaces/ICurlyBraceMethods.cs
@@ -1,23 +1,83 @@
 using System.Text.RegularExpressions;
+using ManiaTemplates.Exceptions;
 
 namespace ManiaTemplates.Interfaces;
 
 public interface ICurlyBraceMethods
 {
     protected static readonly Regex TemplateInterpolationRegex = new(@"\{\{\s*(.+?)\s*\}\}");
-
+    
     /// <summary>
     /// Takes the contents of double curly braces in a string and wraps them into something else. The second Argument takes a string-argument and returns the newly wrapped string.
     /// </summary>
-    public string ReplaceCurlyBraces(string value, Func<string, string> curlyContentWrapper);
+    public static string ReplaceCurlyBraces(string value, Func<string, string> curlyContentWrapper)
+    {
+        PreventCurlyBraceCountMismatch(value);
+        PreventInterpolationRecursion(value);
+
+        var matches = TemplateInterpolationRegex.Match(value);
+        var output = value;
+
+        while (matches.Success)
+        {
+            var match = matches.Groups[0].Value.Trim();
+            var content = matches.Groups[1].Value.Trim();
+
+            output = output.Replace(match, curlyContentWrapper(content));
+
+            matches = matches.NextMatch();
+        }
+
+        return output;
+    }
 
     /// <summary>
     /// Checks whether double interpolation exists ({{ {{ a }} {{ b }} }}) and throws exception if so.
     /// </summary>
-    public void PreventInterpolationRecursion(string value);
+    public static void PreventInterpolationRecursion(string value)
+    {
+        //TODO: find proper algorithm
+        // var openCurlyBraces = 0;
+        // foreach (var character in value.ToCharArray())
+        // {
+        //     if (character == '{')
+        //     {
+        //         openCurlyBraces++;
+        //
+        //         if (openCurlyBraces >= 4)
+        //         {
+        //             throw new InterpolationRecursionException(
+        //                 $"Double interpolation found in: {value}. You must not use double curly braces inside other double curly braces.");
+        //         }
+        //     }
+        //     else if (character == '}')
+        //     {
+        //         openCurlyBraces--;
+        //     }
+        // }
+    }
 
     /// <summary>
     /// Checks whether double interpolation exists ({{ {{ a }} {{ b }} }}) and throws exception if so.
     /// </summary>
-    public void PreventCurlyBraceCountMismatch(string value);
+    public static void PreventCurlyBraceCountMismatch(string value)
+    {
+        var openCurlyBraces = 0;
+        foreach (var character in value.ToCharArray())
+        {
+            if (character == '{')
+            {
+                openCurlyBraces++;
+            }
+            else if (character == '}')
+            {
+                openCurlyBraces--;
+            }
+        }
+
+        if (openCurlyBraces != 0)
+        {
+            throw new CurlyBraceCountMismatchException($"Found curly brace count mismatch in: {value}.");
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/ManiaTemplates/Interfaces/IManiaTemplateLanguage.cs b/src/ManiaTemplates/Interfaces/IManiaTemplateLanguage.cs
index 8cb67e1..54acbb7 100644
--- a/src/ManiaTemplates/Interfaces/IManiaTemplateLanguage.cs
+++ b/src/ManiaTemplates/Interfaces/IManiaTemplateLanguage.cs
@@ -10,4 +10,5 @@ public interface IManiaTemplateLanguage
     public Snippet FeatureBlock(string content);
     public string FeatureBlockStart();
     public string FeatureBlockEnd();
+    public string OptimizeOutput(string generatedContent) => generatedContent;
 }
\ No newline at end of file
diff --git a/src/ManiaTemplates/Interfaces/IXmlMethods.cs b/src/ManiaTemplates/Interfaces/IXmlMethods.cs
new file mode 100644
index 0000000..a57f86c
--- /dev/null
+++ b/src/ManiaTemplates/Interfaces/IXmlMethods.cs
@@ -0,0 +1,46 @@
+using System.Xml;
+using ManiaTemplates.Components;
+
+namespace ManiaTemplates.Interfaces;
+
+public interface IXmlMethods: ICurlyBraceMethods
+{
+    /// <summary>
+    /// Creates a xml opening tag for the given string and attribute list.
+    /// </summary>
+    public static string CreateXmlOpeningTag(string tag, MtComponentAttributes attributeList, bool hasChildren, Func<string, string> curlyContentWrapper)
+    {
+        var output = $"<{tag}";
+
+        foreach (var (attributeName, attributeValue) in attributeList)
+        {
+            output += @$" {attributeName}=""{ReplaceCurlyBraces(attributeValue, curlyContentWrapper)}""";
+        }
+
+        if (!hasChildren)
+        {
+            output += " /";
+        }
+
+        return output + ">";
+    }
+
+    /// <summary>
+    /// Creates a xml closing tag for the given string.
+    /// </summary>
+    public static string CreateXmlClosingTag(string tag)
+    {
+        return $"</{tag}>";
+    }
+
+    /// <summary>
+    /// Converts any valid XML-string into an XmlNode-element.
+    /// </summary>
+    public static XmlNode XmlStringToNode(string content)
+    {
+        var doc = new XmlDocument();
+        doc.LoadXml($"<doc>{content}</doc>");
+
+        return doc.FirstChild!;
+    }
+}
\ No newline at end of file
diff --git a/src/ManiaTemplates/Languages/MtLanguageT4.cs b/src/ManiaTemplates/Languages/MtLanguageT4.cs
index 6e6a32d..8461f44 100644
--- a/src/ManiaTemplates/Languages/MtLanguageT4.cs
+++ b/src/ManiaTemplates/Languages/MtLanguageT4.cs
@@ -1,10 +1,13 @@
-using ManiaTemplates.Interfaces;
+using System.Text.RegularExpressions;
+using ManiaTemplates.Interfaces;
 using ManiaTemplates.Lib;
 
 namespace ManiaTemplates.Languages;
 
 public class MtLanguageT4 : IManiaTemplateLanguage
 {
+    private static readonly Regex TemplateFeatureControlRegex = new(@"#>\s*<#\+");
+    
     public string Context(string content)
     {
         return $"<#@ {content} #>";
@@ -37,4 +40,34 @@ public string FeatureBlockEnd()
     {
         return "#>";
     }
+
+    public string OptimizeOutput(string generatedContent)
+    {
+        return JoinFeatureBlocks(generatedContent);
+    }
+
+    /// <summary>
+    /// Joins consecutive feature blocks to reduce generated code.
+    /// </summary>
+    private static string JoinFeatureBlocks(string manialink)
+    {
+        var match = TemplateFeatureControlRegex.Match(manialink);
+        var output = new Snippet();
+
+        while (match.Success)
+        {
+            manialink = manialink.Replace(match.ToString(), "\n");
+            match = match.NextMatch();
+        }
+
+        foreach (var line in manialink.Split('\n'))
+        {
+            if (line.Trim().Length > 0)
+            {
+                output.AppendLine(line);
+            }
+        }
+
+        return output.ToString();
+    }
 }
\ No newline at end of file
diff --git a/src/ManiaTemplates/Lib/CurlyBraceMethods.cs b/src/ManiaTemplates/Lib/CurlyBraceMethods.cs
deleted file mode 100644
index 5572f25..0000000
--- a/src/ManiaTemplates/Lib/CurlyBraceMethods.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using System.Text.RegularExpressions;
-using ManiaTemplates.Exceptions;
-using ManiaTemplates.Interfaces;
-
-namespace ManiaTemplates.Lib;
-
-public class CurlyBraceMethods: ICurlyBraceMethods
-{
-    protected static readonly Regex TemplateInterpolationRegex = ICurlyBraceMethods.TemplateInterpolationRegex;
-    
-    /// <summary>
-    /// Takes the contents of double curly braces in a string and wraps them into something else. The second Argument takes a string-argument and returns the newly wrapped string.
-    /// </summary>
-    public string ReplaceCurlyBraces(string value, Func<string, string> curlyContentWrapper)
-    {
-        PreventCurlyBraceCountMismatch(value);
-        PreventInterpolationRecursion(value);
-
-        var matches = TemplateInterpolationRegex.Match(value);
-        var output = value;
-
-        while (matches.Success)
-        {
-            var match = matches.Groups[0].Value.Trim();
-            var content = matches.Groups[1].Value.Trim();
-
-            output = output.Replace(match, curlyContentWrapper(content));
-
-            matches = matches.NextMatch();
-        }
-
-        return output;
-    }
-
-    /// <summary>
-    /// Checks whether double interpolation exists ({{ {{ a }} {{ b }} }}) and throws exception if so.
-    /// </summary>
-    public void PreventInterpolationRecursion(string value)
-    {
-        //TODO: find proper algorithm
-        // var openCurlyBraces = 0;
-        // foreach (var character in value.ToCharArray())
-        // {
-        //     if (character == '{')
-        //     {
-        //         openCurlyBraces++;
-        //
-        //         if (openCurlyBraces >= 4)
-        //         {
-        //             throw new InterpolationRecursionException(
-        //                 $"Double interpolation found in: {value}. You must not use double curly braces inside other double curly braces.");
-        //         }
-        //     }
-        //     else if (character == '}')
-        //     {
-        //         openCurlyBraces--;
-        //     }
-        // }
-    }
-
-    /// <summary>
-    /// Checks whether double interpolation exists ({{ {{ a }} {{ b }} }}) and throws exception if so.
-    /// </summary>
-    public void PreventCurlyBraceCountMismatch(string value)
-    {
-        var openCurlyBraces = 0;
-        foreach (var character in value.ToCharArray())
-        {
-            if (character == '{')
-            {
-                openCurlyBraces++;
-            }
-            else if (character == '}')
-            {
-                openCurlyBraces--;
-            }
-        }
-
-        if (openCurlyBraces != 0)
-        {
-            throw new CurlyBraceCountMismatchException($"Found curly brace count mismatch in: {value}.");
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ManiaTemplates/Lib/ManiaLink.cs b/src/ManiaTemplates/Lib/ManiaLink.cs
index 2fa013d..7271a43 100644
--- a/src/ManiaTemplates/Lib/ManiaLink.cs
+++ b/src/ManiaTemplates/Lib/ManiaLink.cs
@@ -145,4 +145,30 @@ private async Task<Type> CompileCSharpScriptAsync()
 
         return type;
     }
+
+    /// <summary>
+    /// Creates ManiaLink opening tag with version, name and id.
+    /// 
+    /// id = Identifies the ManiaLink for overwrite/delete.
+    /// name = Shown in in-game debugger.
+    /// version = Version for the markup language of Trackmania.
+    /// </summary>
+    public static string OpenTag(string name, int version = 3, string? displayLayer = null)
+    {
+        var layer = "";
+        if (displayLayer != null)
+        {
+            layer += $@" layer=""{displayLayer}""";
+        }
+
+        return $@"<manialink version=""{version}"" id=""{name}"" name=""EvoSC#-{name}""{layer}>";
+    }
+
+    /// <summary>
+    /// Creates ManiaLink closing tag.
+    /// </summary>
+    public static string CloseTag()
+    {
+        return "</manialink>";
+    }
 }
\ No newline at end of file
diff --git a/src/ManiaTemplates/Lib/MtScriptTransformer.cs b/src/ManiaTemplates/Lib/MtScriptTransformer.cs
index e208b49..082a423 100644
--- a/src/ManiaTemplates/Lib/MtScriptTransformer.cs
+++ b/src/ManiaTemplates/Lib/MtScriptTransformer.cs
@@ -7,9 +7,8 @@
 
 namespace ManiaTemplates.Lib;
 
-public class MtScriptTransformer: CurlyBraceMethods
+public class MtScriptTransformer(IManiaTemplateLanguage templateLanguage) : ICurlyBraceMethods
 {
-    private readonly IManiaTemplateLanguage _maniaTemplateLanguage;
     private readonly Dictionary<string, string> _maniaScriptIncludes = new();
     private readonly Dictionary<string, string> _maniaScriptConstants = new();
     private readonly Dictionary<string, string> _maniaScriptStructs = new();
@@ -18,11 +17,6 @@ public class MtScriptTransformer: CurlyBraceMethods
     private static readonly Regex ManiaScriptConstantRegex = new(@"#Const\s+([a-zA-Z_:]+)\s+.+");
     private static readonly Regex ManiaScriptStructRegex = new(@"(?s)#Struct\s+([_a-zA-Z]+)\s*\{.+?\}");
 
-    public MtScriptTransformer(IManiaTemplateLanguage templateLanguage)
-    {
-        _maniaTemplateLanguage = templateLanguage;
-    }
-
     public string CreateManiaScriptBlock(MtComponent component)
     {
         var renderMethod = new StringBuilder("<script>");
@@ -31,20 +25,20 @@ public string CreateManiaScriptBlock(MtComponent component)
         {
             if (script.Once)
             {
-                renderMethod.AppendLine(_maniaTemplateLanguage.FeatureBlockStart())
+                renderMethod.AppendLine(templateLanguage.FeatureBlockStart())
                     .AppendLine($@"if(!__insertedOneTimeManiaScripts.Contains(""{script.ContentHash()}"")){{")
-                    .AppendLine(_maniaTemplateLanguage.FeatureBlockEnd());
+                    .AppendLine(templateLanguage.FeatureBlockEnd());
             }
 
-            renderMethod.AppendLine(ReplaceCurlyBraces(ExtractManiaScriptDirectives(script.Content),
-                _maniaTemplateLanguage.InsertResult));
+            renderMethod.AppendLine(ICurlyBraceMethods.ReplaceCurlyBraces(ExtractManiaScriptDirectives(script.Content),
+                templateLanguage.InsertResult));
 
             if (script.Once)
             {
-                renderMethod.AppendLine(_maniaTemplateLanguage.FeatureBlockStart())
+                renderMethod.AppendLine(templateLanguage.FeatureBlockStart())
                     .AppendLine($@"__insertedOneTimeManiaScripts.Add(""{script.ContentHash()}"");")
                     .AppendLine("}")
-                    .AppendLine(_maniaTemplateLanguage.FeatureBlockEnd());
+                    .AppendLine(templateLanguage.FeatureBlockEnd());
             }
         }
 
diff --git a/src/ManiaTemplates/Lib/MtTransformer.cs b/src/ManiaTemplates/Lib/MtTransformer.cs
index c84aa67..d375dff 100644
--- a/src/ManiaTemplates/Lib/MtTransformer.cs
+++ b/src/ManiaTemplates/Lib/MtTransformer.cs
@@ -1,7 +1,6 @@
 using System.CodeDom;
 using System.Dynamic;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Xml;
 using ManiaTemplates.Components;
 using ManiaTemplates.ControlElements;
@@ -11,26 +10,16 @@
 
 namespace ManiaTemplates.Lib;
 
-public class MtTransformer : CurlyBraceMethods
+public class MtTransformer(ManiaTemplateEngine engine, IManiaTemplateLanguage maniaTemplateLanguage)
+    : IXmlMethods, ICurlyBraceMethods
 {
-    private readonly ManiaTemplateEngine _engine;
-    private readonly IManiaTemplateLanguage _maniaTemplateLanguage;
-    private readonly MtScriptTransformer _scriptTransformer;
+    private readonly MtScriptTransformer _scriptTransformer = new(maniaTemplateLanguage);
     private readonly List<string> _namespaces = new();
     private readonly Dictionary<string, string> _renderMethods = new();
     private readonly Dictionary<string, string> _maniaScriptRenderMethods = new();
     private readonly List<MtComponentSlot> _slots = new();
     private int _loopDepth;
 
-    private static readonly Regex TemplateFeatureControlRegex = new(@"#>\s*<#\+");
-
-    public MtTransformer(ManiaTemplateEngine engine, IManiaTemplateLanguage maniaTemplateLanguage)
-    {
-        _engine = engine;
-        _maniaTemplateLanguage = maniaTemplateLanguage;
-        _scriptTransformer = new MtScriptTransformer(maniaTemplateLanguage);
-    }
-
     /// <summary>
     /// Creates the target language template, which can be pre-processed for faster rendering.
     /// </summary>
@@ -41,8 +30,8 @@ public string BuildManialink(MtComponent rootComponent, string className, int ve
         var renderBodyArguments = string.Join(',', Enumerable.Repeat("DoNothing", rootComponent.Slots.Count));
 
         var body = ProcessNode(
-            XmlStringToNode(rootComponent.TemplateContent),
-            _engine.BaseMtComponents.Overload(rootComponent.ImportedComponents),
+            IXmlMethods.XmlStringToNode(rootComponent.TemplateContent),
+            engine.BaseMtComponents.Overload(rootComponent.ImportedComponents),
             new MtDataContext(),
             rootComponent,
             rootComponent
@@ -50,14 +39,14 @@ public string BuildManialink(MtComponent rootComponent, string className, int ve
 
         var template = new Snippet
         {
-            _maniaTemplateLanguage.Context(@"template language=""C#"""), //Might not be needed
-            _maniaTemplateLanguage.Context(@"import namespace=""System.Collections.Generic"""),
+            maniaTemplateLanguage.Context(@"template language=""C#"""), //Might not be needed
+            maniaTemplateLanguage.Context(@"import namespace=""System.Collections.Generic"""),
             CreateImportStatements(),
-            ManiaLinkStart(className, version, rootComponent.DisplayLayer),
+            ManiaLink.OpenTag(className, version, rootComponent.DisplayLayer),
             "<#",
             $"RenderBody({renderBodyArguments});",
             "#>",
-            ManiaLinkEnd(),
+            ManiaLink.CloseTag(),
             CreateTemplatePropertiesBlock(rootComponent),
             CreateInsertedManiaScriptsList(),
             CreateDoNothingMethod(),
@@ -65,7 +54,7 @@ public string BuildManialink(MtComponent rootComponent, string className, int ve
             CreateRenderMethodsBlock()
         };
 
-        return JoinFeatureBlocks(template.ToString());
+        return maniaTemplateLanguage.OptimizeOutput(template.ToString());
     }
 
     /// <summary>
@@ -73,7 +62,7 @@ public string BuildManialink(MtComponent rootComponent, string className, int ve
     /// </summary>
     private string CreateDoNothingMethod()
     {
-        return _maniaTemplateLanguage.FeatureBlock("private static void DoNothing(){}").ToString();
+        return maniaTemplateLanguage.FeatureBlock("private static void DoNothing(){}").ToString();
     }
 
     /// <summary>
@@ -82,10 +71,10 @@ private string CreateDoNothingMethod()
     private string CreateInsertedManiaScriptsList()
     {
         return new StringBuilder()
-            .AppendLine(_maniaTemplateLanguage.FeatureBlockStart())
+            .AppendLine(maniaTemplateLanguage.FeatureBlockStart())
             .AppendLine("private List<string> __insertedOneTimeManiaScripts = new List<string>();")
             .AppendLine("private List<Action> __maniaScriptRenderMethods = new List<Action>();")
-            .AppendLine(_maniaTemplateLanguage.FeatureBlockEnd())
+            .AppendLine(maniaTemplateLanguage.FeatureBlockEnd())
             .ToString();
     }
 
@@ -105,22 +94,22 @@ private string CreateBodyRenderMethod(string body, MtComponent rootComponent)
             rootScriptBlock = _scriptTransformer.CreateManiaScriptBlock(rootComponent);
         }
 
-        var subManiaScripts = new StringBuilder(_maniaTemplateLanguage.FeatureBlockStart())
+        var subManiaScripts = new StringBuilder(maniaTemplateLanguage.FeatureBlockStart())
             .AppendLine(
                 "foreach(var maniaScriptRenderMethod in __maniaScriptRenderMethods){ maniaScriptRenderMethod(); }")
-            .AppendLine(_maniaTemplateLanguage.FeatureBlockEnd())
+            .AppendLine(maniaTemplateLanguage.FeatureBlockEnd())
             .ToString();
 
         //Render content
-        bodyRenderMethod.AppendLine(_maniaTemplateLanguage.FeatureBlockEnd())
+        bodyRenderMethod.AppendLine(maniaTemplateLanguage.FeatureBlockEnd())
             .AppendLine(_scriptTransformer.CreateManiaScriptDirectivesBlock())
             .AppendLine(body)
             .AppendLine(subManiaScripts)
             .AppendLine(rootScriptBlock)
-            .AppendLine(_maniaTemplateLanguage.FeatureBlockStart())
+            .AppendLine(maniaTemplateLanguage.FeatureBlockStart())
             .AppendLine("}");
 
-        return _maniaTemplateLanguage.FeatureBlock(bodyRenderMethod.ToString()).ToString();
+        return maniaTemplateLanguage.FeatureBlock(bodyRenderMethod.ToString()).ToString();
     }
 
     /// <summary>
@@ -130,19 +119,19 @@ private string CreateImportStatements()
     {
         var imports = new StringBuilder();
 
-        foreach (var propertyValue in _engine.GlobalVariables.Values)
+        foreach (var propertyValue in engine.GlobalVariables.Values)
         {
             var nameSpace = propertyValue.GetType().Namespace;
 
             if (nameSpace != "System")
             {
-                imports.AppendLine(_maniaTemplateLanguage.Context($@"import namespace=""{nameSpace}"""));
+                imports.AppendLine(maniaTemplateLanguage.Context($@"import namespace=""{nameSpace}"""));
             }
         }
 
         foreach (var nameSpace in _namespaces)
         {
-            imports.AppendLine(_maniaTemplateLanguage.Context($@"import namespace=""{nameSpace}"""));
+            imports.AppendLine(maniaTemplateLanguage.Context($@"import namespace=""{nameSpace}"""));
         }
 
         return imports.ToString();
@@ -155,17 +144,17 @@ private string CreateTemplatePropertiesBlock(MtComponent mtComponent)
     {
         var properties = new StringBuilder();
 
-        foreach (var (propertyName, propertyValue) in _engine.GlobalVariables)
+        foreach (var (propertyName, propertyValue) in engine.GlobalVariables)
         {
             var type = propertyValue.GetType();
 
-            properties.AppendLine(_maniaTemplateLanguage
+            properties.AppendLine(maniaTemplateLanguage
                 .FeatureBlock($"public {GetFormattedName(type)} ?{propertyName} {{ get; init; }}").ToString());
         }
 
         foreach (var property in mtComponent.Properties.Values)
         {
-            properties.AppendLine(_maniaTemplateLanguage
+            properties.AppendLine(maniaTemplateLanguage
                 .FeatureBlock(
                     $"public {property.Type} {property.Name} {{ get; init; }}{(property.Default == null ? "" : $" = {WrapIfString(property, property.Default)};")}")
                 .ToString());
@@ -195,12 +184,13 @@ private string CreateSlotRenderMethod(MtComponent component, int scope, MtDataCo
         var methodArguments = new List<string>();
         var methodName = GetSlotRenderMethodName(scope, slotName);
 
-        //Add slot render methods
+        //Add slot render methods.
         AppendSlotRenderArgumentsToList(methodArguments, parentComponent);
 
-        //Add component properties as arguments
+        //Add component properties as arguments.
         foreach (var (localVariableName, localVariableType) in context)
         {
+            //Do not properties present in root component, because they're available everywhere.
             if (!rootComponent.Properties.ContainsKey(localVariableName))
             {
                 methodArguments.Add($"{localVariableType} {localVariableName}");
@@ -213,7 +203,7 @@ private string CreateSlotRenderMethod(MtComponent component, int scope, MtDataCo
         }
 
         //Start slot render method declaration
-        var output = new StringBuilder(_maniaTemplateLanguage.FeatureBlockStart())
+        var output = new StringBuilder(maniaTemplateLanguage.FeatureBlockStart())
             .AppendLine("private void " + CreateMethodCall(methodName, string.Join(',', methodArguments), "") + " {");
 
         //Declare component default variables
@@ -227,14 +217,13 @@ private string CreateSlotRenderMethod(MtComponent component, int scope, MtDataCo
             output.AppendLine($"const {prop.Type} {prop.Name} = {WrapIfString(prop, prop.Default)};");
         }
 
-        output
-            .AppendLine(_maniaTemplateLanguage.FeatureBlockEnd())
+        return output
+            .AppendLine(maniaTemplateLanguage.FeatureBlockEnd())
             .AppendLine(slotContent)
-            .AppendLine(_maniaTemplateLanguage.FeatureBlockStart())
+            .AppendLine(maniaTemplateLanguage.FeatureBlockStart())
             .AppendLine("}")
-            .AppendLine(_maniaTemplateLanguage.FeatureBlockEnd());
-
-        return output.ToString();
+            .AppendLine(maniaTemplateLanguage.FeatureBlockEnd())
+            .ToString();
     }
 
     /// <summary>
@@ -265,7 +254,7 @@ private string ProcessNode(XmlNode node, MtComponentMap availableMtComponents, M
             if (availableMtComponents.ContainsKey(tag))
             {
                 //Node is a component
-                var component = _engine.GetComponent(availableMtComponents[tag].TemplateKey);
+                var component = engine.GetComponent(availableMtComponents[tag].TemplateKey);
                 var slotContents =
                     GetSlotContentsGroupedBySlotName(childNode, component, availableMtComponents, currentContext,
                         parentComponent, rootComponent);
@@ -277,7 +266,7 @@ private string ProcessNode(XmlNode node, MtComponentMap availableMtComponents, M
                     currentContext,
                     attributeList,
                     ProcessNode(
-                        XmlStringToNode(component.TemplateContent),
+                        IXmlMethods.XmlStringToNode(component.TemplateContent),
                         availableMtComponents.Overload(component.ImportedComponents),
                         currentContext,
                         rootComponent: rootComponent,
@@ -287,9 +276,9 @@ private string ProcessNode(XmlNode node, MtComponentMap availableMtComponents, M
                     rootComponent: rootComponent
                 );
 
-                subSnippet.AppendLine(_maniaTemplateLanguage.FeatureBlockStart())
+                subSnippet.AppendLine(maniaTemplateLanguage.FeatureBlockStart())
                     .AppendLine(componentRenderMethodCall)
-                    .AppendLine(_maniaTemplateLanguage.FeatureBlockEnd());
+                    .AppendLine(maniaTemplateLanguage.FeatureBlockEnd());
             }
             else
             {
@@ -303,23 +292,24 @@ private string ProcessNode(XmlNode node, MtComponentMap availableMtComponents, M
                         subSnippet.AppendLine($"<!-- {childNode.InnerText} -->");
                         break;
                     case "slot":
-                        var slotName = GetNameFromNodeAttributes(attributeList);
-                        subSnippet.AppendLine(_maniaTemplateLanguage.FeatureBlockStart())
-                            .AppendLine(CreateMethodCall($"__slotRenderer_{slotName.ToLower()}"))
-                            .AppendLine(_maniaTemplateLanguage.FeatureBlockEnd());
+                        var slotName = GetNameAttributeContentFromNode(attributeList).ToLower();
+                        subSnippet.AppendLine(maniaTemplateLanguage.FeatureBlockStart())
+                            .AppendLine(CreateMethodCall($"__slotRenderer_{slotName}"))
+                            .AppendLine(maniaTemplateLanguage.FeatureBlockEnd());
                         break;
 
                     default:
                     {
                         var hasChildren = childNode.HasChildNodes;
-                        subSnippet.AppendLine(CreateXmlOpeningTag(tag, attributeList, hasChildren));
+                        subSnippet.AppendLine(IXmlMethods.CreateXmlOpeningTag(tag, attributeList, hasChildren,
+                            curlyContentWrapper: maniaTemplateLanguage.InsertResult));
 
                         if (hasChildren)
                         {
                             subSnippet.AppendLine(1,
                                 ProcessNode(childNode, availableMtComponents, currentContext, rootComponent,
                                     parentComponent: parentComponent));
-                            subSnippet.AppendLine(CreateXmlClosingTag(tag));
+                            subSnippet.AppendLine(IXmlMethods.CreateXmlClosingTag(tag));
                         }
 
                         break;
@@ -461,16 +451,10 @@ MtComponent rootComponent
         {
             if (component.Properties.TryGetValue(attributeName, out var value))
             {
-                if (IsStringType(value))
-                {
-                    renderArguments.Add(
-                        $"{attributeName}: {WrapIfString(value, ReplaceCurlyBraces(attributeValue, s => $@"{{({s})}}"))}");
-                }
-                else
-                {
-                    renderArguments.Add(
-                        $"{attributeName}: {ReplaceCurlyBraces(attributeValue, s => $"({s})")}");
-                }
+                renderArguments.Add(
+                    IsStringType(value)
+                        ? $"{attributeName}: {WrapStringInQuotes(ICurlyBraceMethods.ReplaceCurlyBraces(attributeValue, s => $@"{{({s})}}"))}"
+                        : $"{attributeName}: {ICurlyBraceMethods.ReplaceCurlyBraces(attributeValue, s => $"({s})")}");
             }
         }
 
@@ -533,7 +517,7 @@ MtComponent rootComponent
     private string CreateComponentRenderMethod(MtComponent component, string renderMethodName, string componentBody,
         MtDataContext currentContext)
     {
-        var renderMethod = new StringBuilder(_maniaTemplateLanguage.FeatureBlockStart())
+        var renderMethod = new StringBuilder(maniaTemplateLanguage.FeatureBlockStart())
             .Append("private void ")
             .Append(renderMethodName)
             .Append('(');
@@ -556,7 +540,7 @@ private string CreateComponentRenderMethod(MtComponent component, string renderM
         //close method arguments
         renderMethod.Append(string.Join(", ", arguments))
             .AppendLine(") {")
-            .AppendLine(_maniaTemplateLanguage.FeatureBlockEnd())
+            .AppendLine(maniaTemplateLanguage.FeatureBlockEnd())
             .AppendLine(componentBody);
 
         //insert mania scripts
@@ -572,15 +556,15 @@ private string CreateComponentRenderMethod(MtComponent component, string renderM
             scriptArguments.AddRange(component.Properties.Values.OrderBy(property => property.Default != null)
                 .Select(property => property.Name));
 
-            renderMethod.AppendLine(_maniaTemplateLanguage.FeatureBlockStart())
+            renderMethod.AppendLine(maniaTemplateLanguage.FeatureBlockStart())
                 .AppendLine(
                     $"__maniaScriptRenderMethods.Add(() => {scriptRenderMethodName}({string.Join(',', scriptArguments)}));")
-                .AppendLine(_maniaTemplateLanguage.FeatureBlockEnd());
+                .AppendLine(maniaTemplateLanguage.FeatureBlockEnd());
         }
 
-        return renderMethod.AppendLine(_maniaTemplateLanguage.FeatureBlockStart())
+        return renderMethod.AppendLine(maniaTemplateLanguage.FeatureBlockStart())
             .Append('}')
-            .AppendLine(_maniaTemplateLanguage.FeatureBlockEnd())
+            .AppendLine(maniaTemplateLanguage.FeatureBlockEnd())
             .ToString();
     }
 
@@ -592,7 +576,7 @@ private static void AppendComponentPropertiesToMethodArgumentsList(MtComponent c
         arguments.AddRange(component.Properties.Values.OrderBy(property => property.Default != null)
             .Select(property => property.Default == null
                 ? $"{property.Type} {property.Name}"
-                : $"{property.Type} {property.Name} = {(WrapIfString(property, property.Default))}"));
+                : $"{property.Type} {property.Name} = {WrapIfString(property, property.Default)}"));
     }
 
     /// <summary>
@@ -608,7 +592,7 @@ private static void AppendSlotRenderArgumentsToList(List<string> arguments, MtCo
     /// </summary>
     private string CreateComponentScriptsRenderMethod(MtComponent component, string renderMethodName)
     {
-        var renderMethod = new StringBuilder(_maniaTemplateLanguage.FeatureBlockStart())
+        var renderMethod = new StringBuilder(maniaTemplateLanguage.FeatureBlockStart())
             .Append("void ")
             .Append(renderMethodName)
             .Append('(');
@@ -625,14 +609,14 @@ private string CreateComponentScriptsRenderMethod(MtComponent component, string
         //close method arguments
         renderMethod.Append(string.Join(", ", arguments))
             .AppendLine(") {")
-            .AppendLine(_maniaTemplateLanguage.FeatureBlockEnd());
+            .AppendLine(maniaTemplateLanguage.FeatureBlockEnd());
 
         //insert body
         renderMethod.AppendLine(_scriptTransformer.CreateManiaScriptBlock(component));
 
-        return renderMethod.AppendLine(_maniaTemplateLanguage.FeatureBlockStart())
+        return renderMethod.AppendLine(maniaTemplateLanguage.FeatureBlockStart())
             .Append('}')
-            .AppendLine(_maniaTemplateLanguage.FeatureBlockEnd())
+            .AppendLine(maniaTemplateLanguage.FeatureBlockEnd())
             .ToString();
     }
 
@@ -647,7 +631,7 @@ private string CreateComponentScriptsRenderMethod(MtComponent component, string
     /// <summary>
     /// Checks the attribute list for name and if found removes & returns it, else "default".
     /// </summary>
-    private string GetNameFromNodeAttributes(MtComponentAttributes attributeList)
+    private string GetNameAttributeContentFromNode(MtComponentAttributes attributeList)
     {
         return attributeList.ContainsKey("name") ? attributeList.Pull("name") : "default";
     }
@@ -669,15 +653,15 @@ private string GetNameFromNodeAttributes(MtComponentAttributes attributeList)
     private Snippet WrapInIfStatement(Snippet input, string ifCondition)
     {
         var snippet = new Snippet();
-        var ifContent = TemplateInterpolationRegex.Replace(ifCondition, "$1");
+        var ifContent = ICurlyBraceMethods.TemplateInterpolationRegex.Replace(ifCondition, "$1");
 
-        snippet.AppendLine(null, _maniaTemplateLanguage.FeatureBlockStart());
+        snippet.AppendLine(null, maniaTemplateLanguage.FeatureBlockStart());
         snippet.AppendLine(null, $"if ({ifContent}) {{");
-        snippet.AppendLine(null, _maniaTemplateLanguage.FeatureBlockEnd());
+        snippet.AppendLine(null, maniaTemplateLanguage.FeatureBlockEnd());
         snippet.AppendSnippet(input);
-        snippet.AppendLine(null, _maniaTemplateLanguage.FeatureBlockStart());
+        snippet.AppendLine(null, maniaTemplateLanguage.FeatureBlockStart());
         snippet.AppendLine(null, "}");
-        snippet.AppendLine(null, _maniaTemplateLanguage.FeatureBlockEnd());
+        snippet.AppendLine(null, maniaTemplateLanguage.FeatureBlockEnd());
 
         return snippet;
     }
@@ -696,16 +680,16 @@ private Snippet WrapInForeachLoop(Snippet input, MtForeach foreachLoop)
         }
 
         var snippet = new Snippet();
-        snippet.AppendLine(null, _maniaTemplateLanguage.FeatureBlockStart());
+        snippet.AppendLine(null, maniaTemplateLanguage.FeatureBlockStart());
         snippet.AppendLine(null, $"var {outerIndexVariableName} = 0;");
         snippet.AppendLine(null, $"foreach ({foreachLoop.Condition}) {{");
         snippet.AppendLine(null, $"var {innerIndexVariableName} = {outerIndexVariableName};");
-        snippet.AppendLine(null, _maniaTemplateLanguage.FeatureBlockEnd());
+        snippet.AppendLine(null, maniaTemplateLanguage.FeatureBlockEnd());
         snippet.AppendSnippet(input);
-        snippet.AppendLine(null, _maniaTemplateLanguage.FeatureBlockStart());
+        snippet.AppendLine(null, maniaTemplateLanguage.FeatureBlockStart());
         snippet.AppendLine(null, $"{outerIndexVariableName}++;");
         snippet.AppendLine(null, "}");
-        snippet.AppendLine(null, _maniaTemplateLanguage.FeatureBlockEnd());
+        snippet.AppendLine(null, maniaTemplateLanguage.FeatureBlockEnd());
 
         return snippet;
     }
@@ -798,95 +782,4 @@ public static string WrapStringInQuotes(string str)
     {
         return $@"$""{str}""";
     }
-
-    /// <summary>
-    /// Creates ManiaLink opening tag with version, name and id.
-    /// 
-    /// id = Identifies the ManiaLink for overwrite/delete.
-    /// name = Shown in in-game debugger.
-    /// version = Version for the markup language of Trackmania.
-    /// </summary>
-    public static string ManiaLinkStart(string name, int version = 3, string? displayLayer = null)
-    {
-        var layer = "";
-        if (displayLayer != null)
-        {
-            layer += $@" layer=""{displayLayer}""";
-        }
-
-        return $@"<manialink version=""{version}"" id=""{name}"" name=""EvoSC#-{name}""{layer}>";
-    }
-
-    /// <summary>
-    /// Creates ManiaLink closing tag.
-    /// </summary>
-    private static string ManiaLinkEnd()
-    {
-        return "</manialink>";
-    }
-
-    /// <summary>
-    /// Creates a xml opening tag for the given string and attribute list.
-    /// </summary>
-    public string CreateXmlOpeningTag(string tag, MtComponentAttributes attributeList, bool hasChildren)
-    {
-        var output = $"<{tag}";
-
-        foreach (var (attributeName, attributeValue) in attributeList)
-        {
-            output +=
-                @$" {attributeName}=""{ReplaceCurlyBraces(attributeValue, _maniaTemplateLanguage.InsertResult)}""";
-        }
-
-        if (!hasChildren)
-        {
-            output += " /";
-        }
-
-        return output + ">";
-    }
-
-    /// <summary>
-    /// Creates a xml closing tag for the given string.
-    /// </summary>
-    private static string CreateXmlClosingTag(string tag)
-    {
-        return $"</{tag}>";
-    }
-
-    /// <summary>
-    /// Converts any valid XML-string into an XmlNode-element.
-    /// </summary>
-    public static XmlNode XmlStringToNode(string content)
-    {
-        var doc = new XmlDocument();
-        doc.LoadXml($"<doc>{content}</doc>");
-
-        return doc.FirstChild!;
-    }
-
-    /// <summary>
-    /// Joins consecutive feature blocks to reduce generated code.
-    /// </summary>
-    public static string JoinFeatureBlocks(string manialink)
-    {
-        var match = TemplateFeatureControlRegex.Match(manialink);
-        var output = new Snippet();
-
-        while (match.Success)
-        {
-            manialink = manialink.Replace(match.ToString(), "\n");
-            match = match.NextMatch();
-        }
-
-        foreach (var line in manialink.Split('\n'))
-        {
-            if (line.Trim().Length > 0)
-            {
-                output.AppendLine(line);
-            }
-        }
-
-        return output.ToString();
-    }
 }
\ No newline at end of file
diff --git a/src/ManiaTemplates/Lib/Snippet.cs b/src/ManiaTemplates/Lib/Snippet.cs
index 978bdde..5e99650 100644
--- a/src/ManiaTemplates/Lib/Snippet.cs
+++ b/src/ManiaTemplates/Lib/Snippet.cs
@@ -1,7 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
-
-namespace ManiaTemplates.Lib;
+namespace ManiaTemplates.Lib;
 
 public class Snippet : List<string>
 {
diff --git a/src/ManiaTemplates/ManiaTemplates.csproj b/src/ManiaTemplates/ManiaTemplates.csproj
index 269443a..b529565 100644
--- a/src/ManiaTemplates/ManiaTemplates.csproj
+++ b/src/ManiaTemplates/ManiaTemplates.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
diff --git a/tests/ManiaTemplates.Tests/Lib/CurlyBraceMethodsTest.cs b/tests/ManiaTemplates.Tests/Lib/CurlyBraceMethodsTest.cs
index ca0caed..0f6af08 100644
--- a/tests/ManiaTemplates.Tests/Lib/CurlyBraceMethodsTest.cs
+++ b/tests/ManiaTemplates.Tests/Lib/CurlyBraceMethodsTest.cs
@@ -1,22 +1,10 @@
 using ManiaTemplates.Exceptions;
-using ManiaTemplates.Languages;
-using ManiaTemplates.Lib;
-using Xunit.Abstractions;
+using ManiaTemplates.Interfaces;
 
 namespace ManiaTemplates.Tests.Lib;
 
 public class CurlyBraceMethodsTest
 {
-    private readonly ITestOutputHelper _testOutputHelper;
-    private readonly MtTransformer _transformer;
-    private readonly ManiaTemplateEngine _maniaTemplateEngine = new();
-
-    public CurlyBraceMethodsTest(ITestOutputHelper testOutputHelper)
-    {
-        _testOutputHelper = testOutputHelper;
-        _transformer = new MtTransformer(_maniaTemplateEngine, new MtLanguageT4());
-    }
-    
     // [Fact]
     // public void Should_Throw_Interpolation_Recursion_Exception()
     // {
@@ -27,19 +15,19 @@ public CurlyBraceMethodsTest(ITestOutputHelper testOutputHelper)
     [Fact]
     public void Should_Throw_Curly_Brace_Count_Mismatch_Exception()
     {
-        Assert.Throws<CurlyBraceCountMismatchException>(() => _transformer.PreventCurlyBraceCountMismatch("{{ { }}"));
-        Assert.Throws<CurlyBraceCountMismatchException>(() => _transformer.PreventCurlyBraceCountMismatch("{{ } }}"));
-        Assert.Throws<CurlyBraceCountMismatchException>(() => _transformer.PreventCurlyBraceCountMismatch("{"));
-        Assert.Throws<CurlyBraceCountMismatchException>(() => _transformer.PreventCurlyBraceCountMismatch("}}"));
+        Assert.Throws<CurlyBraceCountMismatchException>(() => ICurlyBraceMethods.PreventCurlyBraceCountMismatch("{{ { }}"));
+        Assert.Throws<CurlyBraceCountMismatchException>(() => ICurlyBraceMethods.PreventCurlyBraceCountMismatch("{{ } }}"));
+        Assert.Throws<CurlyBraceCountMismatchException>(() => ICurlyBraceMethods.PreventCurlyBraceCountMismatch("{"));
+        Assert.Throws<CurlyBraceCountMismatchException>(() => ICurlyBraceMethods.PreventCurlyBraceCountMismatch("}}"));
     }
 
     [Fact]
     public void Should_Replace_Curly_Braces()
     {
-        Assert.Equal("abcd", _transformer.ReplaceCurlyBraces("{{a}}{{ b }}{{c }}{{  d}}", s => s));
-        Assert.Equal("x y z", _transformer.ReplaceCurlyBraces("{{x}} {{ y }} {{z }}", s => s));
-        Assert.Equal("unittest", _transformer.ReplaceCurlyBraces("{{ unit }}test", s => s));
-        Assert.Equal("#unit#test", _transformer.ReplaceCurlyBraces("{{ unit }}test", s => $"#{s}#"));
-        Assert.Equal("#{ unit#}test", _transformer.ReplaceCurlyBraces("{{{ unit }}}test", s => $"#{s}#"));
+        Assert.Equal("abcd", ICurlyBraceMethods.ReplaceCurlyBraces("{{a}}{{ b }}{{c }}{{  d}}", s => s));
+        Assert.Equal("x y z", ICurlyBraceMethods.ReplaceCurlyBraces("{{x}} {{ y }} {{z }}", s => s));
+        Assert.Equal("unittest", ICurlyBraceMethods.ReplaceCurlyBraces("{{ unit }}test", s => s));
+        Assert.Equal("#unit#test", ICurlyBraceMethods.ReplaceCurlyBraces("{{ unit }}test", s => $"#{s}#"));
+        Assert.Equal("#{ unit#}test", ICurlyBraceMethods.ReplaceCurlyBraces("{{{ unit }}}test", s => $"#{s}#"));
     }
 }
\ No newline at end of file
diff --git a/tests/ManiaTemplates.Tests/Lib/MtTransformerTest.cs b/tests/ManiaTemplates.Tests/Lib/MtTransformerTest.cs
index 6a6aef2..85a1ce7 100644
--- a/tests/ManiaTemplates.Tests/Lib/MtTransformerTest.cs
+++ b/tests/ManiaTemplates.Tests/Lib/MtTransformerTest.cs
@@ -2,6 +2,7 @@
 using System.Text.RegularExpressions;
 using System.Xml;
 using ManiaTemplates.Components;
+using ManiaTemplates.Interfaces;
 using ManiaTemplates.Languages;
 using ManiaTemplates.Lib;
 using Xunit.Abstractions;
@@ -141,14 +142,16 @@ public void Should_Wrap_Strings_In_Quotes()
     [Fact]
     public void Should_Join_Feature_Blocks()
     {
+        var language = new MtLanguageT4();
+        
         Assert.Equal("<#+\n unittest \n#>",
-            MtTransformer.JoinFeatureBlocks("<#+#><#+\n #> <#+ unittest \n#><#+ \n\n\n#>"));
+            language.OptimizeOutput("<#+#><#+\n #> <#+ unittest \n#><#+ \n\n\n#>"));
     }
 
     [Fact]
     public void Should_Convert_String_To_Xml_Node()
     {
-        var node = MtTransformer.XmlStringToNode("<unit>test</unit>");
+        var node = IXmlMethods.XmlStringToNode("<unit>test</unit>");
         Assert.IsAssignableFrom<XmlNode>(node);
         Assert.Equal("test", node.InnerText);
         Assert.Equal("<unit>test</unit>", node.InnerXml);
@@ -159,27 +162,28 @@ public void Should_Convert_String_To_Xml_Node()
     public void Should_Create_Xml_Opening_Tag()
     {
         var attributeList = new MtComponentAttributes();
-        Assert.Equal("<test />", _transformer.CreateXmlOpeningTag("test", attributeList, false));
-        Assert.Equal("<test>", _transformer.CreateXmlOpeningTag("test", attributeList, true));
+        var lang = new MtLanguageT4();
+        Assert.Equal("<test />", IXmlMethods.CreateXmlOpeningTag("test", attributeList, false, lang.InsertResult));
+        Assert.Equal("<test>", IXmlMethods.CreateXmlOpeningTag("test", attributeList, true, lang.InsertResult));
 
         attributeList["prop"] = "value";
-        Assert.Equal("""<test prop="value" />""", _transformer.CreateXmlOpeningTag("test", attributeList, false));
-        Assert.Equal("""<test prop="value">""", _transformer.CreateXmlOpeningTag("test", attributeList, true));
+        Assert.Equal("""<test prop="value" />""", IXmlMethods.CreateXmlOpeningTag("test", attributeList, false, lang.InsertResult));
+        Assert.Equal("""<test prop="value">""", IXmlMethods.CreateXmlOpeningTag("test", attributeList, true, lang.InsertResult));
     }
 
     [Fact]
     public void Should_Create_ManiaLink_Opening_Tag()
     {
         Assert.Equal("""<manialink version="99" id="Test" name="EvoSC#-Test">""",
-            MtTransformer.ManiaLinkStart("Test", 99));
+            ManiaLink.OpenTag("Test", 99));
         Assert.Equal("""<manialink version="99" id="Test" name="EvoSC#-Test" layer="SomeLayer">""",
-            MtTransformer.ManiaLinkStart("Test", 99, "SomeLayer"));
+            ManiaLink.OpenTag("Test", 99, "SomeLayer"));
     }
 
     [Fact]
     public void Should_Convert_Xml_Node_Arguments_To_MtComponentAttributes_Instance()
     {
-        var node = MtTransformer.XmlStringToNode("""<testNode arg1="test1" arg2="test2">testContent</testNode>""");
+        var node = IXmlMethods.XmlStringToNode("""<testNode arg1="test1" arg2="test2">testContent</testNode>""");
         if (node.FirstChild == null) return;
 
         var attributes = MtTransformer.GetXmlNodeAttributes(node.FirstChild);
diff --git a/tests/ManiaTemplates.Tests/ManiaTemplates.Tests.csproj b/tests/ManiaTemplates.Tests/ManiaTemplates.Tests.csproj
index 862135f..2c629ff 100644
--- a/tests/ManiaTemplates.Tests/ManiaTemplates.Tests.csproj
+++ b/tests/ManiaTemplates.Tests/ManiaTemplates.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 

From 76f9c79666feba6d2d5229fe0aae6382145999d2 Mon Sep 17 00:00:00 2001
From: Alexander Raszka <araszka94@gmail.com>
Date: Sat, 10 Feb 2024 14:58:38 +0100
Subject: [PATCH 07/19] Move more methods from MtTransformer to other/new
 classes

---
 .../Components/MtComponentAttributes.cs       | 30 ++++++-
 src/ManiaTemplates/Interfaces/IXmlMethods.cs  | 22 ++++-
 src/ManiaTemplates/Lib/MtTransformer.cs       | 81 +++++--------------
 .../Lib/MtTransformerTest.cs                  | 26 +++---
 4 files changed, 80 insertions(+), 79 deletions(-)

diff --git a/src/ManiaTemplates/Components/MtComponentAttributes.cs b/src/ManiaTemplates/Components/MtComponentAttributes.cs
index a55bb04..6a3fef0 100644
--- a/src/ManiaTemplates/Components/MtComponentAttributes.cs
+++ b/src/ManiaTemplates/Components/MtComponentAttributes.cs
@@ -1,7 +1,35 @@
-namespace ManiaTemplates.Components;
+using ManiaTemplates.ControlElements;
+
+namespace ManiaTemplates.Components;
 
 public class MtComponentAttributes : Dictionary<string, string>
 {
+    /// <summary>
+    /// Checks the attribute list for if-condition and if found removes & returns it, else null.
+    /// </summary>
+    public string? PullIfCondition()
+    {
+        return ContainsKey("if") ? Pull("if") : null;
+    }
+
+    /// <summary>
+    /// Checks the attribute list for loop-condition and returns it, else null.
+    /// </summary>
+    public MtForeach? PullForeachCondition(MtDataContext context, int nodeId)
+    {
+        return ContainsKey("foreach")
+            ? MtForeach.FromString(Pull("foreach"), context, nodeId)
+            : null;
+    }
+
+    /// <summary>
+    /// Checks the attribute list for name and if found removes & returns it, else "default".
+    /// </summary>
+    public string PullName()
+    {
+        return ContainsKey("name") ? Pull("name") : "default";
+    }
+
     public string Pull(string name)
     {
         var value = this[name];
diff --git a/src/ManiaTemplates/Interfaces/IXmlMethods.cs b/src/ManiaTemplates/Interfaces/IXmlMethods.cs
index a57f86c..a7ddaa2 100644
--- a/src/ManiaTemplates/Interfaces/IXmlMethods.cs
+++ b/src/ManiaTemplates/Interfaces/IXmlMethods.cs
@@ -5,10 +5,26 @@ namespace ManiaTemplates.Interfaces;
 
 public interface IXmlMethods: ICurlyBraceMethods
 {
+    /// <summary>
+    /// Parses the attributes of a XmlNode to an MtComponentAttributes-instance.
+    /// </summary>
+    public static MtComponentAttributes GetAttributes(XmlNode node)
+    {
+        var attributeList = new MtComponentAttributes();
+        if (node.Attributes == null) return attributeList;
+
+        foreach (XmlAttribute attribute in node.Attributes)
+        {
+            attributeList.Add(attribute.Name, attribute.Value);
+        }
+
+        return attributeList;
+    }
+    
     /// <summary>
     /// Creates a xml opening tag for the given string and attribute list.
     /// </summary>
-    public static string CreateXmlOpeningTag(string tag, MtComponentAttributes attributeList, bool hasChildren, Func<string, string> curlyContentWrapper)
+    public static string CreateOpeningTag(string tag, MtComponentAttributes attributeList, bool hasChildren, Func<string, string> curlyContentWrapper)
     {
         var output = $"<{tag}";
 
@@ -28,7 +44,7 @@ public static string CreateXmlOpeningTag(string tag, MtComponentAttributes attri
     /// <summary>
     /// Creates a xml closing tag for the given string.
     /// </summary>
-    public static string CreateXmlClosingTag(string tag)
+    public static string CreateClosingTag(string tag)
     {
         return $"</{tag}>";
     }
@@ -36,7 +52,7 @@ public static string CreateXmlClosingTag(string tag)
     /// <summary>
     /// Converts any valid XML-string into an XmlNode-element.
     /// </summary>
-    public static XmlNode XmlStringToNode(string content)
+    public static XmlNode NodeFromString(string content)
     {
         var doc = new XmlDocument();
         doc.LoadXml($"<doc>{content}</doc>");
diff --git a/src/ManiaTemplates/Lib/MtTransformer.cs b/src/ManiaTemplates/Lib/MtTransformer.cs
index d375dff..c92b8f2 100644
--- a/src/ManiaTemplates/Lib/MtTransformer.cs
+++ b/src/ManiaTemplates/Lib/MtTransformer.cs
@@ -11,7 +11,7 @@
 namespace ManiaTemplates.Lib;
 
 public class MtTransformer(ManiaTemplateEngine engine, IManiaTemplateLanguage maniaTemplateLanguage)
-    : IXmlMethods, ICurlyBraceMethods
+    : IXmlMethods
 {
     private readonly MtScriptTransformer _scriptTransformer = new(maniaTemplateLanguage);
     private readonly List<string> _namespaces = new();
@@ -30,7 +30,7 @@ public string BuildManialink(MtComponent rootComponent, string className, int ve
         var renderBodyArguments = string.Join(',', Enumerable.Repeat("DoNothing", rootComponent.Slots.Count));
 
         var body = ProcessNode(
-            IXmlMethods.XmlStringToNode(rootComponent.TemplateContent),
+            IXmlMethods.NodeFromString(rootComponent.TemplateContent),
             engine.BaseMtComponents.Overload(rootComponent.ImportedComponents),
             new MtDataContext(),
             rootComponent,
@@ -149,7 +149,7 @@ private string CreateTemplatePropertiesBlock(MtComponent mtComponent)
             var type = propertyValue.GetType();
 
             properties.AppendLine(maniaTemplateLanguage
-                .FeatureBlock($"public {GetFormattedName(type)} ?{propertyName} {{ get; init; }}").ToString());
+                .FeatureBlock($"public {GetFormattedTypeName(type)} ?{propertyName} {{ get; init; }}").ToString());
         }
 
         foreach (var property in mtComponent.Properties.Values)
@@ -229,7 +229,7 @@ private string CreateSlotRenderMethod(MtComponent component, int scope, MtDataCo
     /// <summary>
     /// Process a ManiaTemplate node.
     /// </summary>
-    private string ProcessNode(XmlNode node, MtComponentMap availableMtComponents, MtDataContext context,
+    private string ProcessNode(XmlNode node, MtComponentMap componentMap, MtDataContext context,
         MtComponent rootComponent, MtComponent parentComponent)
     {
         Snippet snippet = new();
@@ -239,11 +239,11 @@ private string ProcessNode(XmlNode node, MtComponentMap availableMtComponents, M
         {
             var subSnippet = new Snippet();
             var tag = childNode.Name;
-            var attributeList = GetXmlNodeAttributes(childNode);
+            var attributeList = IXmlMethods.GetAttributes(childNode);
             var currentContext = context;
 
-            var forEachCondition = GetForeachConditionFromNodeAttributes(attributeList, context, nodeId);
-            var ifCondition = GetIfConditionFromNodeAttributes(attributeList);
+            var forEachCondition = attributeList.PullForeachCondition(context, nodeId);
+            var ifCondition = attributeList.PullIfCondition();
 
             if (forEachCondition != null)
             {
@@ -251,12 +251,12 @@ private string ProcessNode(XmlNode node, MtComponentMap availableMtComponents, M
                 _loopDepth++;
             }
 
-            if (availableMtComponents.ContainsKey(tag))
+            if (componentMap.TryGetValue(tag, out var importedComponent))
             {
                 //Node is a component
-                var component = engine.GetComponent(availableMtComponents[tag].TemplateKey);
+                var component = engine.GetComponent(importedComponent.TemplateKey);
                 var slotContents =
-                    GetSlotContentsGroupedBySlotName(childNode, component, availableMtComponents, currentContext,
+                    GetSlotContentsGroupedBySlotName(childNode, component, componentMap, currentContext,
                         parentComponent, rootComponent);
 
                 var componentRenderMethodCall = ProcessComponentNode(
@@ -266,8 +266,8 @@ private string ProcessNode(XmlNode node, MtComponentMap availableMtComponents, M
                     currentContext,
                     attributeList,
                     ProcessNode(
-                        IXmlMethods.XmlStringToNode(component.TemplateContent),
-                        availableMtComponents.Overload(component.ImportedComponents),
+                        IXmlMethods.NodeFromString(component.TemplateContent),
+                        componentMap.Overload(component.ImportedComponents),
                         currentContext,
                         rootComponent: rootComponent,
                         parentComponent: component
@@ -292,7 +292,7 @@ private string ProcessNode(XmlNode node, MtComponentMap availableMtComponents, M
                         subSnippet.AppendLine($"<!-- {childNode.InnerText} -->");
                         break;
                     case "slot":
-                        var slotName = GetNameAttributeContentFromNode(attributeList).ToLower();
+                        var slotName = attributeList.PullName().ToLower();
                         subSnippet.AppendLine(maniaTemplateLanguage.FeatureBlockStart())
                             .AppendLine(CreateMethodCall($"__slotRenderer_{slotName}"))
                             .AppendLine(maniaTemplateLanguage.FeatureBlockEnd());
@@ -301,15 +301,15 @@ private string ProcessNode(XmlNode node, MtComponentMap availableMtComponents, M
                     default:
                     {
                         var hasChildren = childNode.HasChildNodes;
-                        subSnippet.AppendLine(IXmlMethods.CreateXmlOpeningTag(tag, attributeList, hasChildren,
+                        subSnippet.AppendLine(IXmlMethods.CreateOpeningTag(tag, attributeList, hasChildren,
                             curlyContentWrapper: maniaTemplateLanguage.InsertResult));
 
                         if (hasChildren)
                         {
                             subSnippet.AppendLine(1,
-                                ProcessNode(childNode, availableMtComponents, currentContext, rootComponent,
+                                ProcessNode(childNode, componentMap, currentContext, rootComponent,
                                     parentComponent: parentComponent));
-                            subSnippet.AppendLine(IXmlMethods.CreateXmlClosingTag(tag));
+                            subSnippet.AppendLine(IXmlMethods.CreateClosingTag(tag));
                         }
 
                         break;
@@ -620,33 +620,6 @@ private string CreateComponentScriptsRenderMethod(MtComponent component, string
             .ToString();
     }
 
-    /// <summary>
-    /// Checks the attribute list for if-condition and if found removes & returns it, else null.
-    /// </summary>
-    private string? GetIfConditionFromNodeAttributes(MtComponentAttributes attributeList)
-    {
-        return attributeList.ContainsKey("if") ? attributeList.Pull("if") : null;
-    }
-
-    /// <summary>
-    /// Checks the attribute list for name and if found removes & returns it, else "default".
-    /// </summary>
-    private string GetNameAttributeContentFromNode(MtComponentAttributes attributeList)
-    {
-        return attributeList.ContainsKey("name") ? attributeList.Pull("name") : "default";
-    }
-
-    /// <summary>
-    /// Checks the attribute list for loop-condition and returns it, else null.
-    /// </summary>
-    private MtForeach? GetForeachConditionFromNodeAttributes(MtComponentAttributes attributeList, MtDataContext context,
-        int nodeId)
-    {
-        return attributeList.ContainsKey("foreach")
-            ? MtForeach.FromString(attributeList.Pull("foreach"), context, nodeId)
-            : null;
-    }
-
     /// <summary>
     /// Wraps the snippet in a if-condition.
     /// </summary>
@@ -694,27 +667,11 @@ private Snippet WrapInForeachLoop(Snippet input, MtForeach foreachLoop)
         return snippet;
     }
 
-    /// <summary>
-    /// Parses the attributes of a XmlNode to an MtComponentAttributes-instance.
-    /// </summary>
-    public static MtComponentAttributes GetXmlNodeAttributes(XmlNode node)
-    {
-        var attributeList = new MtComponentAttributes();
-        if (node.Attributes == null) return attributeList;
-
-        foreach (XmlAttribute attribute in node.Attributes)
-        {
-            attributeList.Add(attribute.Name, attribute.Value);
-        }
-
-        return attributeList;
-    }
-
     /// <summary>
     /// Returns C# code representation of the type.
     /// </summary>
     /// <param name="type">The type.</param>
-    public static string GetFormattedName(Type type)
+    public static string GetFormattedTypeName(Type type)
     {
         if (type.IsSubclassOf(typeof(DynamicObject)))
         {
@@ -738,7 +695,7 @@ private static string CreateMethodCall(string methodName, string methodArguments
     /// <summary>
     /// Returns the method name that renders the given component.
     /// </summary>
-    private string GetComponentRenderMethodName(MtComponent component, MtDataContext context)
+    private static string GetComponentRenderMethodName(MtComponent component, MtDataContext context)
     {
         return $"Render_Component_{component.Id()}{context}";
     }
@@ -746,7 +703,7 @@ private string GetComponentRenderMethodName(MtComponent component, MtDataContext
     /// <summary>
     /// Returns the method name that renders the scripts of a given component.
     /// </summary>
-    private string GetComponentScriptsRenderMethodName(MtComponent component)
+    private static string GetComponentScriptsRenderMethodName(MtComponent component)
     {
         return $"Render_ComponentScript_{component.Id()}";
     }
diff --git a/tests/ManiaTemplates.Tests/Lib/MtTransformerTest.cs b/tests/ManiaTemplates.Tests/Lib/MtTransformerTest.cs
index 85a1ce7..cc2e183 100644
--- a/tests/ManiaTemplates.Tests/Lib/MtTransformerTest.cs
+++ b/tests/ManiaTemplates.Tests/Lib/MtTransformerTest.cs
@@ -151,7 +151,7 @@ public void Should_Join_Feature_Blocks()
     [Fact]
     public void Should_Convert_String_To_Xml_Node()
     {
-        var node = IXmlMethods.XmlStringToNode("<unit>test</unit>");
+        var node = IXmlMethods.NodeFromString("<unit>test</unit>");
         Assert.IsAssignableFrom<XmlNode>(node);
         Assert.Equal("test", node.InnerText);
         Assert.Equal("<unit>test</unit>", node.InnerXml);
@@ -163,12 +163,12 @@ public void Should_Create_Xml_Opening_Tag()
     {
         var attributeList = new MtComponentAttributes();
         var lang = new MtLanguageT4();
-        Assert.Equal("<test />", IXmlMethods.CreateXmlOpeningTag("test", attributeList, false, lang.InsertResult));
-        Assert.Equal("<test>", IXmlMethods.CreateXmlOpeningTag("test", attributeList, true, lang.InsertResult));
+        Assert.Equal("<test />", IXmlMethods.CreateOpeningTag("test", attributeList, false, lang.InsertResult));
+        Assert.Equal("<test>", IXmlMethods.CreateOpeningTag("test", attributeList, true, lang.InsertResult));
 
         attributeList["prop"] = "value";
-        Assert.Equal("""<test prop="value" />""", IXmlMethods.CreateXmlOpeningTag("test", attributeList, false, lang.InsertResult));
-        Assert.Equal("""<test prop="value">""", IXmlMethods.CreateXmlOpeningTag("test", attributeList, true, lang.InsertResult));
+        Assert.Equal("""<test prop="value" />""", IXmlMethods.CreateOpeningTag("test", attributeList, false, lang.InsertResult));
+        Assert.Equal("""<test prop="value">""", IXmlMethods.CreateOpeningTag("test", attributeList, true, lang.InsertResult));
     }
 
     [Fact]
@@ -183,10 +183,10 @@ public void Should_Create_ManiaLink_Opening_Tag()
     [Fact]
     public void Should_Convert_Xml_Node_Arguments_To_MtComponentAttributes_Instance()
     {
-        var node = IXmlMethods.XmlStringToNode("""<testNode arg1="test1" arg2="test2">testContent</testNode>""");
+        var node = IXmlMethods.NodeFromString("""<testNode arg1="test1" arg2="test2">testContent</testNode>""");
         if (node.FirstChild == null) return;
 
-        var attributes = MtTransformer.GetXmlNodeAttributes(node.FirstChild);
+        var attributes = IXmlMethods.GetAttributes(node.FirstChild);
         Assert.Equal(2, attributes.Count);
         Assert.Equal("test1", attributes["arg1"]);
         Assert.Equal("test2", attributes["arg2"]);
@@ -195,13 +195,13 @@ public void Should_Convert_Xml_Node_Arguments_To_MtComponentAttributes_Instance(
     [Fact]
     public void Should_Detect_Correct_Type_String_For_CSharp_Scripting()
     {
-        Assert.Equal("int", MtTransformer.GetFormattedName(0.GetType()));
-        Assert.Equal("double", MtTransformer.GetFormattedName(0.0.GetType()));
-        Assert.Equal("string", MtTransformer.GetFormattedName("test".GetType()));
+        Assert.Equal("int", MtTransformer.GetFormattedTypeName(0.GetType()));
+        Assert.Equal("double", MtTransformer.GetFormattedTypeName(0.0.GetType()));
+        Assert.Equal("string", MtTransformer.GetFormattedTypeName("test".GetType()));
         Assert.Equal("System.Collections.Generic.List<string>",
-            MtTransformer.GetFormattedName(new List<string>().GetType()));
+            MtTransformer.GetFormattedTypeName(new List<string>().GetType()));
         Assert.Equal("System.Collections.Generic.HashSet<string>",
-            MtTransformer.GetFormattedName(new HashSet<string>().GetType()));
-        Assert.Equal("dynamic", MtTransformer.GetFormattedName(new TestDynamicObject().GetType()));
+            MtTransformer.GetFormattedTypeName(new HashSet<string>().GetType()));
+        Assert.Equal("dynamic", MtTransformer.GetFormattedTypeName(new TestDynamicObject().GetType()));
     }
 }
\ No newline at end of file

From 96ce36a456225045f41489f095a27c5457b32695 Mon Sep 17 00:00:00 2001
From: Alexander Raszka <araszka94@gmail.com>
Date: Sat, 10 Feb 2024 15:17:40 +0100
Subject: [PATCH 08/19] Create IStringMethods

---
 .../Components/MtComponentProperty.cs         |  8 ++++
 .../Interfaces/IStringMethods.cs              | 22 +++++++++++
 src/ManiaTemplates/Lib/MtTransformer.cs       | 38 ++++---------------
 .../Lib/MtTransformerTest.cs                  |  4 +-
 4 files changed, 39 insertions(+), 33 deletions(-)
 create mode 100644 src/ManiaTemplates/Interfaces/IStringMethods.cs

diff --git a/src/ManiaTemplates/Components/MtComponentProperty.cs b/src/ManiaTemplates/Components/MtComponentProperty.cs
index 3ef8ebc..82c0433 100644
--- a/src/ManiaTemplates/Components/MtComponentProperty.cs
+++ b/src/ManiaTemplates/Components/MtComponentProperty.cs
@@ -5,4 +5,12 @@ public class MtComponentProperty
     public required string Type { get; init; }
     public required string Name { get; init; }
     public string? Default { get; init; }
+
+    /// <summary>
+    /// Determines whether a component property is a string type.
+    /// </summary>
+    public bool IsStringType()
+    {
+        return Type.ToLower().Contains("string"); //TODO: find better way to determine string
+    }
 }
\ No newline at end of file
diff --git a/src/ManiaTemplates/Interfaces/IStringMethods.cs b/src/ManiaTemplates/Interfaces/IStringMethods.cs
new file mode 100644
index 0000000..8048010
--- /dev/null
+++ b/src/ManiaTemplates/Interfaces/IStringMethods.cs
@@ -0,0 +1,22 @@
+using ManiaTemplates.Components;
+
+namespace ManiaTemplates.Interfaces;
+
+public interface IStringMethods
+{
+    /// <summary>
+    /// Wrap the second argument in quotes, if the given property is a string type.
+    /// </summary>
+    public static string WrapIfString(MtComponentProperty property, string value)
+    {
+        return property.IsStringType() ? WrapStringInQuotes(value) : value;
+    }
+
+    /// <summary>
+    /// Wraps a string in quotes.
+    /// </summary>
+    public static string WrapStringInQuotes(string str)
+    {
+        return $@"$""{str}""";
+    }
+}
\ No newline at end of file
diff --git a/src/ManiaTemplates/Lib/MtTransformer.cs b/src/ManiaTemplates/Lib/MtTransformer.cs
index c92b8f2..a3b2863 100644
--- a/src/ManiaTemplates/Lib/MtTransformer.cs
+++ b/src/ManiaTemplates/Lib/MtTransformer.cs
@@ -11,7 +11,7 @@
 namespace ManiaTemplates.Lib;
 
 public class MtTransformer(ManiaTemplateEngine engine, IManiaTemplateLanguage maniaTemplateLanguage)
-    : IXmlMethods
+    : IXmlMethods, IStringMethods
 {
     private readonly MtScriptTransformer _scriptTransformer = new(maniaTemplateLanguage);
     private readonly List<string> _namespaces = new();
@@ -156,7 +156,7 @@ private string CreateTemplatePropertiesBlock(MtComponent mtComponent)
         {
             properties.AppendLine(maniaTemplateLanguage
                 .FeatureBlock(
-                    $"public {property.Type} {property.Name} {{ get; init; }}{(property.Default == null ? "" : $" = {WrapIfString(property, property.Default)};")}")
+                    $"public {property.Type} {property.Name} {{ get; init; }}{(property.Default == null ? "" : $" = {IStringMethods.WrapIfString(property, property.Default)};")}")
                 .ToString());
         }
 
@@ -214,7 +214,7 @@ private string CreateSlotRenderMethod(MtComponent component, int scope, MtDataCo
                 continue;
             }
 
-            output.AppendLine($"const {prop.Type} {prop.Name} = {WrapIfString(prop, prop.Default)};");
+            output.AppendLine($"const {prop.Type} {prop.Name} = {IStringMethods.WrapIfString(prop, prop.Default)};");
         }
 
         return output
@@ -452,8 +452,8 @@ MtComponent rootComponent
             if (component.Properties.TryGetValue(attributeName, out var value))
             {
                 renderArguments.Add(
-                    IsStringType(value)
-                        ? $"{attributeName}: {WrapStringInQuotes(ICurlyBraceMethods.ReplaceCurlyBraces(attributeValue, s => $@"{{({s})}}"))}"
+                    value.IsStringType()
+                        ? $"{attributeName}: {IStringMethods.WrapStringInQuotes(ICurlyBraceMethods.ReplaceCurlyBraces(attributeValue, s => $@"{{({s})}}"))}"
                         : $"{attributeName}: {ICurlyBraceMethods.ReplaceCurlyBraces(attributeValue, s => $"({s})")}");
             }
         }
@@ -576,7 +576,7 @@ private static void AppendComponentPropertiesToMethodArgumentsList(MtComponent c
         arguments.AddRange(component.Properties.Values.OrderBy(property => property.Default != null)
             .Select(property => property.Default == null
                 ? $"{property.Type} {property.Name}"
-                : $"{property.Type} {property.Name} = {WrapIfString(property, property.Default)}"));
+                : $"{property.Type} {property.Name} = {IStringMethods.WrapIfString(property, property.Default)}"));
     }
 
     /// <summary>
@@ -604,7 +604,7 @@ private string CreateComponentScriptsRenderMethod(MtComponent component, string
         arguments.AddRange(component.Properties.Values.OrderBy(property => property.Default != null).Select(property =>
             property.Default == null
                 ? $"{property.Type} {property.Name}"
-                : $"{property.Type} {property.Name} = {(WrapIfString(property, property.Default))}"));
+                : $"{property.Type} {property.Name} = {IStringMethods.WrapIfString(property, property.Default)}"));
 
         //close method arguments
         renderMethod.Append(string.Join(", ", arguments))
@@ -715,28 +715,4 @@ private static string GetSlotRenderMethodName(int scope, string name)
     {
         return $"Render_Slot_{scope.GetHashCode()}_{name}";
     }
-
-    /// <summary>
-    /// Wrap the second argument in quotes, if the given property is a string type.
-    /// </summary>
-    private static string WrapIfString(MtComponentProperty property, string value)
-    {
-        return IsStringType(property) ? WrapStringInQuotes(value) : value;
-    }
-
-    /// <summary>
-    /// Determines whether a component property is a string type.
-    /// </summary>
-    private static bool IsStringType(MtComponentProperty property)
-    {
-        return property.Type.ToLower().Contains("string"); //TODO: find better way to determine string
-    }
-
-    /// <summary>
-    /// Wraps a string in quotes.
-    /// </summary>
-    public static string WrapStringInQuotes(string str)
-    {
-        return $@"$""{str}""";
-    }
 }
\ No newline at end of file
diff --git a/tests/ManiaTemplates.Tests/Lib/MtTransformerTest.cs b/tests/ManiaTemplates.Tests/Lib/MtTransformerTest.cs
index cc2e183..9914cbf 100644
--- a/tests/ManiaTemplates.Tests/Lib/MtTransformerTest.cs
+++ b/tests/ManiaTemplates.Tests/Lib/MtTransformerTest.cs
@@ -135,8 +135,8 @@ public void Should_Import_Components_Recursively()
     [Fact]
     public void Should_Wrap_Strings_In_Quotes()
     {
-        Assert.Equal(@"$""unit test""", MtTransformer.WrapStringInQuotes("unit test"));
-        Assert.Equal(@"$""""", MtTransformer.WrapStringInQuotes(""));
+        Assert.Equal(@"$""unit test""", IStringMethods.WrapStringInQuotes("unit test"));
+        Assert.Equal(@"$""""", IStringMethods.WrapStringInQuotes(""));
     }
 
     [Fact]

From cc2dd02b2a41928f4378afb5437d258b1613949d Mon Sep 17 00:00:00 2001
From: Alexander Raszka <araszka94@gmail.com>
Date: Sat, 10 Feb 2024 15:43:49 +0100
Subject: [PATCH 09/19] Add method CreateMethodCallArgument to MtTransformer

---
 .../Components/MtComponentMap.cs              |   4 +-
 src/ManiaTemplates/Lib/MtTransformer.cs       | 166 ++++++++++--------
 2 files changed, 91 insertions(+), 79 deletions(-)

diff --git a/src/ManiaTemplates/Components/MtComponentMap.cs b/src/ManiaTemplates/Components/MtComponentMap.cs
index 06a6296..6dad991 100644
--- a/src/ManiaTemplates/Components/MtComponentMap.cs
+++ b/src/ManiaTemplates/Components/MtComponentMap.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace ManiaTemplates.Components;
+namespace ManiaTemplates.Components;
 
 public class MtComponentMap : Dictionary<string, MtComponentImport>
 {
diff --git a/src/ManiaTemplates/Lib/MtTransformer.cs b/src/ManiaTemplates/Lib/MtTransformer.cs
index a3b2863..d8f31f7 100644
--- a/src/ManiaTemplates/Lib/MtTransformer.cs
+++ b/src/ManiaTemplates/Lib/MtTransformer.cs
@@ -14,10 +14,10 @@ public class MtTransformer(ManiaTemplateEngine engine, IManiaTemplateLanguage ma
     : IXmlMethods, IStringMethods
 {
     private readonly MtScriptTransformer _scriptTransformer = new(maniaTemplateLanguage);
-    private readonly List<string> _namespaces = new();
+    private readonly List<string> _namespaces = [];
+    private readonly List<MtComponentSlot> _slots = [];
     private readonly Dictionary<string, string> _renderMethods = new();
     private readonly Dictionary<string, string> _maniaScriptRenderMethods = new();
-    private readonly List<MtComponentSlot> _slots = new();
     private int _loopDepth;
 
     /// <summary>
@@ -57,27 +57,6 @@ public string BuildManialink(MtComponent rootComponent, string className, int ve
         return maniaTemplateLanguage.OptimizeOutput(template.ToString());
     }
 
-    /// <summary>
-    /// Creates a dummy DoNothing() method that returns a empty string.
-    /// </summary>
-    private string CreateDoNothingMethod()
-    {
-        return maniaTemplateLanguage.FeatureBlock("private static void DoNothing(){}").ToString();
-    }
-
-    /// <summary>
-    /// Creates a dummy DoNothing() method that returns a empty string.
-    /// </summary>
-    private string CreateInsertedManiaScriptsList()
-    {
-        return new StringBuilder()
-            .AppendLine(maniaTemplateLanguage.FeatureBlockStart())
-            .AppendLine("private List<string> __insertedOneTimeManiaScripts = new List<string>();")
-            .AppendLine("private List<Action> __maniaScriptRenderMethods = new List<Action>();")
-            .AppendLine(maniaTemplateLanguage.FeatureBlockEnd())
-            .ToString();
-    }
-
     /// <summary>
     /// Creates the method that renders the body of the ManiaLink.
     /// </summary>
@@ -163,18 +142,6 @@ private string CreateTemplatePropertiesBlock(MtComponent mtComponent)
         return properties.ToString();
     }
 
-    /// <summary>
-    /// Creates a block containing all render methods used in the template.
-    /// </summary>
-    private string CreateRenderMethodsBlock()
-    {
-        return new StringBuilder()
-            .AppendJoin("\n", _renderMethods.Values)
-            .AppendJoin("\n", _maniaScriptRenderMethods.Values)
-            .AppendJoin("\n", _slots.Select(slot => slot.RenderMethodT4))
-            .ToString();
-    }
-
     /// <summary>
     /// Creates the slot-render method for a given data context.
     /// </summary>
@@ -204,7 +171,7 @@ private string CreateSlotRenderMethod(MtComponent component, int scope, MtDataCo
 
         //Start slot render method declaration
         var output = new StringBuilder(maniaTemplateLanguage.FeatureBlockStart())
-            .AppendLine("private void " + CreateMethodCall(methodName, string.Join(',', methodArguments), "") + " {");
+            .AppendLine($"private void {methodName}({string.Join(',', methodArguments)}) {{");
 
         //Declare component default variables
         foreach (var prop in component.Properties.Values)
@@ -232,7 +199,7 @@ private string CreateSlotRenderMethod(MtComponent component, int scope, MtDataCo
     private string ProcessNode(XmlNode node, MtComponentMap componentMap, MtDataContext context,
         MtComponent rootComponent, MtComponent parentComponent)
     {
-        Snippet snippet = new();
+        Snippet snippet = [];
 
         var nodeId = 1;
         foreach (XmlNode childNode in node.ChildNodes)
@@ -294,7 +261,7 @@ private string ProcessNode(XmlNode node, MtComponentMap componentMap, MtDataCont
                     case "slot":
                         var slotName = attributeList.PullName().ToLower();
                         subSnippet.AppendLine(maniaTemplateLanguage.FeatureBlockStart())
-                            .AppendLine(CreateMethodCall($"__slotRenderer_{slotName}"))
+                            .AppendLine($"{GetSlotRendererVariableName(slotName)}();")
                             .AppendLine(maniaTemplateLanguage.FeatureBlockEnd());
                         break;
 
@@ -319,12 +286,12 @@ private string ProcessNode(XmlNode node, MtComponentMap componentMap, MtDataCont
 
             if (ifCondition != null)
             {
-                subSnippet = WrapInIfStatement(subSnippet, ifCondition);
+                subSnippet = CreateIfBlock(subSnippet, ifCondition);
             }
 
             if (forEachCondition != null)
             {
-                subSnippet = WrapInForeachLoop(subSnippet, forEachCondition);
+                subSnippet = CreateForEachBlock(subSnippet, forEachCondition);
                 _loopDepth--;
             }
 
@@ -438,27 +405,24 @@ MtComponent rootComponent
         var renderComponentCall = new StringBuilder(renderMethodName + "(");
 
         //Create available arguments
-        var renderArguments = new List<string>();
-
-        //Add local variables to component render method call
-        foreach (var localVariableName in currentContext.Keys)
-        {
-            renderArguments.Add($"{localVariableName}: {localVariableName}");
-        }
+        var componentRenderArguments = currentContext.Keys
+            .Select(CreateMethodCallArgument)
+            .ToList();
 
         //Attach attributes to render method call
         foreach (var (attributeName, attributeValue) in attributeList)
         {
-            if (component.Properties.TryGetValue(attributeName, out var value))
-            {
-                renderArguments.Add(
-                    value.IsStringType()
-                        ? $"{attributeName}: {IStringMethods.WrapStringInQuotes(ICurlyBraceMethods.ReplaceCurlyBraces(attributeValue, s => $@"{{({s})}}"))}"
-                        : $"{attributeName}: {ICurlyBraceMethods.ReplaceCurlyBraces(attributeValue, s => $"({s})")}");
-            }
+            if (!component.Properties.TryGetValue(attributeName, out var componentProperty)) continue;
+
+            var methodArgumentValue = componentProperty.IsStringType()
+                ? IStringMethods.WrapStringInQuotes(
+                    ICurlyBraceMethods.ReplaceCurlyBraces(attributeValue, s => $"{{({s})}}"))
+                : ICurlyBraceMethods.ReplaceCurlyBraces(attributeValue, s => $"({s})");
+
+            componentRenderArguments.Add(CreateMethodCallArgument(attributeName, methodArgumentValue));
         }
 
-        renderComponentCall.Append(string.Join(", ", renderArguments));
+        renderComponentCall.Append(string.Join(", ", componentRenderArguments));
 
         //Append slot render calls
         if (component.Slots.Count > 0)
@@ -466,13 +430,12 @@ MtComponent rootComponent
             var i = 0;
             foreach (var slotName in component.Slots)
             {
-                if (renderArguments.Count > 0 || i > 0)
+                if (componentRenderArguments.Count > 0 || i > 0)
                 {
                     renderComponentCall.Append(", ");
                 }
 
-                renderComponentCall.Append($"__slotRenderer_{slotName}: ")
-                    .Append("() => ")
+                renderComponentCall.Append($"{GetSlotRendererVariableName(slotName)}: () => ")
                     .Append(GetSlotRenderMethodName(scope, slotName))
                     .Append('(');
 
@@ -481,24 +444,26 @@ MtComponent rootComponent
                 //Add local variables to slot render call
                 foreach (var localVariableName in currentContext.Keys)
                 {
-                    slotArguments.Add($"{localVariableName}: {localVariableName}");
+                    slotArguments.Add(CreateMethodCallArgument(localVariableName));
                 }
 
-                //Pass slot renderers
+                //Add parent properties as arguments
                 if (parentComponent != rootComponent)
                 {
                     foreach (var propertyName in parentComponent.Properties.Keys)
                     {
-                        slotArguments.Add($"{propertyName}: {propertyName}");
+                        slotArguments.Add(CreateMethodCallArgument(propertyName));
                     }
                 }
 
-                foreach (var parentSlotName in parentComponent.Slots)
+                //Pass slot renderers
+                foreach (var slotRenderVariable in parentComponent.Slots.Select(GetSlotRendererVariableName))
                 {
-                    slotArguments.Add($"__slotRenderer_{parentSlotName}: __slotRenderer_{parentSlotName}");
+                    slotArguments.Add(CreateMethodCallArgument(slotRenderVariable));
                 }
 
-                renderComponentCall.Append(string.Join(", ", slotArguments)).Append(')');
+                renderComponentCall.Append(string.Join(", ", slotArguments))
+                    .Append(')');
 
                 i++;
             }
@@ -584,7 +549,7 @@ private static void AppendComponentPropertiesToMethodArgumentsList(MtComponent c
     /// </summary>
     private static void AppendSlotRenderArgumentsToList(List<string> arguments, MtComponent component)
     {
-        arguments.AddRange(component.Slots.Select(slotName => $"Action __slotRenderer_{slotName}"));
+        arguments.AddRange(component.Slots.Select(slotName => $"Action {GetSlotRendererVariableName(slotName)}"));
     }
 
     /// <summary>
@@ -620,10 +585,43 @@ private string CreateComponentScriptsRenderMethod(MtComponent component, string
             .ToString();
     }
 
+    /// <summary>
+    /// Creates a dummy DoNothing() method that returns a empty string.
+    /// </summary>
+    private string CreateDoNothingMethod()
+    {
+        return maniaTemplateLanguage.FeatureBlock("private static void DoNothing(){}").ToString();
+    }
+
+    /// <summary>
+    /// Creates a dummy DoNothing() method that returns a empty string.
+    /// </summary>
+    private string CreateInsertedManiaScriptsList()
+    {
+        return new StringBuilder()
+            .AppendLine(maniaTemplateLanguage.FeatureBlockStart())
+            .AppendLine("private List<string> __insertedOneTimeManiaScripts = new List<string>();")
+            .AppendLine("private List<Action> __maniaScriptRenderMethods = new List<Action>();")
+            .AppendLine(maniaTemplateLanguage.FeatureBlockEnd())
+            .ToString();
+    }
+
+    /// <summary>
+    /// Creates a block containing all render methods used in the template.
+    /// </summary>
+    private string CreateRenderMethodsBlock()
+    {
+        return new StringBuilder()
+            .AppendJoin("\n", _renderMethods.Values)
+            .AppendJoin("\n", _maniaScriptRenderMethods.Values)
+            .AppendJoin("\n", _slots.Select(slot => slot.RenderMethodT4))
+            .ToString();
+    }
+
     /// <summary>
     /// Wraps the snippet in a if-condition.
     /// </summary>
-    private Snippet WrapInIfStatement(Snippet input, string ifCondition)
+    private Snippet CreateIfBlock(Snippet input, string ifCondition)
     {
         var snippet = new Snippet();
         var ifContent = ICurlyBraceMethods.TemplateInterpolationRegex.Replace(ifCondition, "$1");
@@ -642,7 +640,7 @@ private Snippet WrapInIfStatement(Snippet input, string ifCondition)
     /// <summary>
     /// Wraps the snippet in a foreach-loop.
     /// </summary>
-    private Snippet WrapInForeachLoop(Snippet input, MtForeach foreachLoop)
+    private Snippet CreateForEachBlock(Snippet input, MtForeach foreachLoop)
     {
         var outerIndexVariableName = "__outerIndex" + (new Random()).Next();
         var innerIndexVariableName = "__index";
@@ -683,15 +681,6 @@ public static string GetFormattedTypeName(Type type)
         return codeProvider.GetTypeOutput(typeReference);
     }
 
-    /// <summary>
-    /// Creates a method call in the target language.
-    /// </summary>
-    private static string CreateMethodCall(string methodName, string methodArguments = "",
-        string append = ";")
-    {
-        return $"{methodName}({methodArguments}){append}";
-    }
-
     /// <summary>
     /// Returns the method name that renders the given component.
     /// </summary>
@@ -715,4 +704,29 @@ private static string GetSlotRenderMethodName(int scope, string name)
     {
         return $"Render_Slot_{scope.GetHashCode()}_{name}";
     }
+
+    /// <summary>
+    /// Returns the name of the variable that renders a slot.
+    /// </summary>
+    private static string GetSlotRendererVariableName(string slotName)
+    {
+        return $"__slotRenderer_{slotName}";
+    }
+
+    /// <summary>
+    /// Formats local variables to be passed to a render method.
+    /// </summary>
+    private static string CreateMethodCallArgument(string argumentName)
+    {
+        return CreateMethodCallArgument(argumentName, argumentName);
+    }
+
+    /// <summary>
+    /// Formats local variables to be passed to a render method.
+    /// It uses the argument name if no value is passed as second argument.
+    /// </summary>
+    private static string CreateMethodCallArgument(string argumentName, string argumentValue)
+    {
+        return $"{argumentName}: {argumentValue}";
+    }
 }
\ No newline at end of file

From f0a73c90e29eaa4de6702baaddfcfe2b59d4253f Mon Sep 17 00:00:00 2001
From: Alexander Raszka <araszka94@gmail.com>
Date: Sat, 10 Feb 2024 15:52:22 +0100
Subject: [PATCH 10/19] Reduce code in MtTransformer

---
 .../Components/MtComponentProperty.cs         | 20 +++++++++++++++----
 .../Interfaces/IStringMethods.cs              | 16 +++++----------
 src/ManiaTemplates/Lib/MtTransformer.cs       |  8 ++++----
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/ManiaTemplates/Components/MtComponentProperty.cs b/src/ManiaTemplates/Components/MtComponentProperty.cs
index 82c0433..d070609 100644
--- a/src/ManiaTemplates/Components/MtComponentProperty.cs
+++ b/src/ManiaTemplates/Components/MtComponentProperty.cs
@@ -1,6 +1,8 @@
-namespace ManiaTemplates.Components;
+using ManiaTemplates.Interfaces;
 
-public class MtComponentProperty
+namespace ManiaTemplates.Components;
+
+public class MtComponentProperty: IStringMethods
 {
     public required string Type { get; init; }
     public required string Name { get; init; }
@@ -9,8 +11,18 @@ public class MtComponentProperty
     /// <summary>
     /// Determines whether a component property is a string type.
     /// </summary>
-    public bool IsStringType()
+    public bool IsStringType() => IStringMethods.IsStringType(Type);
+
+    /// <summary>
+    /// Gets the default value for this property and wraps it in quotes, if string type.
+    /// </summary>
+    public string? GetDefaultWrapped()
     {
-        return Type.ToLower().Contains("string"); //TODO: find better way to determine string
+        if (Default == null)
+        {
+            return null;
+        }
+        
+        return IsStringType() ? IStringMethods.WrapStringInQuotes(Default) : Default;
     }
 }
\ No newline at end of file
diff --git a/src/ManiaTemplates/Interfaces/IStringMethods.cs b/src/ManiaTemplates/Interfaces/IStringMethods.cs
index 8048010..d3caa34 100644
--- a/src/ManiaTemplates/Interfaces/IStringMethods.cs
+++ b/src/ManiaTemplates/Interfaces/IStringMethods.cs
@@ -1,22 +1,16 @@
-using ManiaTemplates.Components;
-
-namespace ManiaTemplates.Interfaces;
+namespace ManiaTemplates.Interfaces;
 
 public interface IStringMethods
 {
     /// <summary>
-    /// Wrap the second argument in quotes, if the given property is a string type.
+    /// Determines whether a component property is a string type.
     /// </summary>
-    public static string WrapIfString(MtComponentProperty property, string value)
-    {
-        return property.IsStringType() ? WrapStringInQuotes(value) : value;
-    }
+    public static bool IsStringType(string typeString)
+        => typeString.ToLower().Contains("string"); //TODO: find better way to determine string
 
     /// <summary>
     /// Wraps a string in quotes.
     /// </summary>
     public static string WrapStringInQuotes(string str)
-    {
-        return $@"$""{str}""";
-    }
+        => $@"$""{str}""";
 }
\ No newline at end of file
diff --git a/src/ManiaTemplates/Lib/MtTransformer.cs b/src/ManiaTemplates/Lib/MtTransformer.cs
index d8f31f7..1c34eb1 100644
--- a/src/ManiaTemplates/Lib/MtTransformer.cs
+++ b/src/ManiaTemplates/Lib/MtTransformer.cs
@@ -135,7 +135,7 @@ private string CreateTemplatePropertiesBlock(MtComponent mtComponent)
         {
             properties.AppendLine(maniaTemplateLanguage
                 .FeatureBlock(
-                    $"public {property.Type} {property.Name} {{ get; init; }}{(property.Default == null ? "" : $" = {IStringMethods.WrapIfString(property, property.Default)};")}")
+                    $"public {property.Type} {property.Name} {{ get; init; }}{(property.Default == null ? "" : $" = {property.GetDefaultWrapped()};")}")
                 .ToString());
         }
 
@@ -181,7 +181,7 @@ private string CreateSlotRenderMethod(MtComponent component, int scope, MtDataCo
                 continue;
             }
 
-            output.AppendLine($"const {prop.Type} {prop.Name} = {IStringMethods.WrapIfString(prop, prop.Default)};");
+            output.AppendLine($"const {prop.Type} {prop.Name} = {prop.GetDefaultWrapped()};");
         }
 
         return output
@@ -541,7 +541,7 @@ private static void AppendComponentPropertiesToMethodArgumentsList(MtComponent c
         arguments.AddRange(component.Properties.Values.OrderBy(property => property.Default != null)
             .Select(property => property.Default == null
                 ? $"{property.Type} {property.Name}"
-                : $"{property.Type} {property.Name} = {IStringMethods.WrapIfString(property, property.Default)}"));
+                : $"{property.Type} {property.Name} = {property.GetDefaultWrapped()}"));
     }
 
     /// <summary>
@@ -569,7 +569,7 @@ private string CreateComponentScriptsRenderMethod(MtComponent component, string
         arguments.AddRange(component.Properties.Values.OrderBy(property => property.Default != null).Select(property =>
             property.Default == null
                 ? $"{property.Type} {property.Name}"
-                : $"{property.Type} {property.Name} = {IStringMethods.WrapIfString(property, property.Default)}"));
+                : $"{property.Type} {property.Name} = {property.GetDefaultWrapped()}"));
 
         //close method arguments
         renderMethod.Append(string.Join(", ", arguments))

From 72e32d4638283942eeb935faa409cc10ec5c249a Mon Sep 17 00:00:00 2001
From: Alexander Raszka <araszka94@gmail.com>
Date: Sat, 10 Feb 2024 15:58:26 +0100
Subject: [PATCH 11/19] Reduce duplicate code

---
 .../Components/MtComponentProperty.cs            | 14 ++++++++++++--
 src/ManiaTemplates/Lib/MtTransformer.cs          | 16 ++++++----------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/ManiaTemplates/Components/MtComponentProperty.cs b/src/ManiaTemplates/Components/MtComponentProperty.cs
index d070609..b3e6886 100644
--- a/src/ManiaTemplates/Components/MtComponentProperty.cs
+++ b/src/ManiaTemplates/Components/MtComponentProperty.cs
@@ -2,7 +2,7 @@
 
 namespace ManiaTemplates.Components;
 
-public class MtComponentProperty: IStringMethods
+public class MtComponentProperty : IStringMethods
 {
     public required string Type { get; init; }
     public required string Name { get; init; }
@@ -22,7 +22,17 @@ public class MtComponentProperty: IStringMethods
         {
             return null;
         }
-        
+
         return IsStringType() ? IStringMethods.WrapStringInQuotes(Default) : Default;
     }
+
+    /// <summary>
+    /// Converts the property to method argument format.
+    /// </summary>
+    public string ToMethodArgument()
+    {
+        return Default == null
+            ? $"{Type} {Name}"
+            : $"{Type} {Name} = {GetDefaultWrapped()}";
+    }
 }
\ No newline at end of file
diff --git a/src/ManiaTemplates/Lib/MtTransformer.cs b/src/ManiaTemplates/Lib/MtTransformer.cs
index 1c34eb1..0f5ee44 100644
--- a/src/ManiaTemplates/Lib/MtTransformer.cs
+++ b/src/ManiaTemplates/Lib/MtTransformer.cs
@@ -181,7 +181,7 @@ private string CreateSlotRenderMethod(MtComponent component, int scope, MtDataCo
                 continue;
             }
 
-            output.AppendLine($"const {prop.Type} {prop.Name} = {prop.GetDefaultWrapped()};");
+            output.AppendLine($"const {prop.ToMethodArgument()};");
         }
 
         return output
@@ -538,10 +538,9 @@ private string CreateComponentRenderMethod(MtComponent component, string renderM
     /// </summary>
     private static void AppendComponentPropertiesToMethodArgumentsList(MtComponent component, List<string> arguments)
     {
-        arguments.AddRange(component.Properties.Values.OrderBy(property => property.Default != null)
-            .Select(property => property.Default == null
-                ? $"{property.Type} {property.Name}"
-                : $"{property.Type} {property.Name} = {property.GetDefaultWrapped()}"));
+        arguments.AddRange(component.Properties.Values
+            .OrderBy(property => property.Default != null)
+            .Select(property => property.ToMethodArgument()));
     }
 
     /// <summary>
@@ -565,11 +564,8 @@ private string CreateComponentScriptsRenderMethod(MtComponent component, string
         //open method arguments
         var arguments = new List<string>();
 
-        //add method arguments with defaults
-        arguments.AddRange(component.Properties.Values.OrderBy(property => property.Default != null).Select(property =>
-            property.Default == null
-                ? $"{property.Type} {property.Name}"
-                : $"{property.Type} {property.Name} = {property.GetDefaultWrapped()}"));
+        //Add method arguments with defaults
+        AppendComponentPropertiesToMethodArgumentsList(component, arguments);
 
         //close method arguments
         renderMethod.Append(string.Join(", ", arguments))

From c78063510eef8a7d5dfb1eea88eccfec452dc2a1 Mon Sep 17 00:00:00 2001
From: Alexander Raszka <araszka94@gmail.com>
Date: Sat, 10 Feb 2024 16:32:58 +0100
Subject: [PATCH 12/19] Reduce duplicate code

---
 .../Components/MtComponentProperty.cs         |   8 +
 src/ManiaTemplates/Lib/MtTransformer.cs       | 179 ++++++++----------
 tests/ManiaTemplates.Tests/Lib/expected.tt    |   7 +-
 3 files changed, 95 insertions(+), 99 deletions(-)

diff --git a/src/ManiaTemplates/Components/MtComponentProperty.cs b/src/ManiaTemplates/Components/MtComponentProperty.cs
index b3e6886..cab200f 100644
--- a/src/ManiaTemplates/Components/MtComponentProperty.cs
+++ b/src/ManiaTemplates/Components/MtComponentProperty.cs
@@ -35,4 +35,12 @@ public string ToMethodArgument()
             ? $"{Type} {Name}"
             : $"{Type} {Name} = {GetDefaultWrapped()}";
     }
+
+    /// <summary>
+    /// Converts the property to constant for use in render methods.
+    /// </summary>
+    public string ToLocalConstant()
+    {
+        return $"const {ToMethodArgument()};";
+    }
 }
\ No newline at end of file
diff --git a/src/ManiaTemplates/Lib/MtTransformer.cs b/src/ManiaTemplates/Lib/MtTransformer.cs
index 0f5ee44..70fadc0 100644
--- a/src/ManiaTemplates/Lib/MtTransformer.cs
+++ b/src/ManiaTemplates/Lib/MtTransformer.cs
@@ -142,57 +142,6 @@ private string CreateTemplatePropertiesBlock(MtComponent mtComponent)
         return properties.ToString();
     }
 
-    /// <summary>
-    /// Creates the slot-render method for a given data context.
-    /// </summary>
-    private string CreateSlotRenderMethod(MtComponent component, int scope, MtDataContext context, string slotName,
-        MtComponent rootComponent, string slotContent, MtComponent parentComponent)
-    {
-        var methodArguments = new List<string>();
-        var methodName = GetSlotRenderMethodName(scope, slotName);
-
-        //Add slot render methods.
-        AppendSlotRenderArgumentsToList(methodArguments, parentComponent);
-
-        //Add component properties as arguments.
-        foreach (var (localVariableName, localVariableType) in context)
-        {
-            //Do not properties present in root component, because they're available everywhere.
-            if (!rootComponent.Properties.ContainsKey(localVariableName))
-            {
-                methodArguments.Add($"{localVariableType} {localVariableName}");
-            }
-        }
-
-        if (parentComponent != rootComponent)
-        {
-            AppendComponentPropertiesToMethodArgumentsList(parentComponent, methodArguments);
-        }
-
-        //Start slot render method declaration
-        var output = new StringBuilder(maniaTemplateLanguage.FeatureBlockStart())
-            .AppendLine($"private void {methodName}({string.Join(',', methodArguments)}) {{");
-
-        //Declare component default variables
-        foreach (var prop in component.Properties.Values)
-        {
-            if (prop.Default == null || (parentComponent.Properties.ContainsKey(prop.Name)))
-            {
-                continue;
-            }
-
-            output.AppendLine($"const {prop.ToMethodArgument()};");
-        }
-
-        return output
-            .AppendLine(maniaTemplateLanguage.FeatureBlockEnd())
-            .AppendLine(slotContent)
-            .AppendLine(maniaTemplateLanguage.FeatureBlockStart())
-            .AppendLine("}")
-            .AppendLine(maniaTemplateLanguage.FeatureBlockEnd())
-            .ToString();
-    }
-
     /// <summary>
     /// Process a ManiaTemplate node.
     /// </summary>
@@ -412,14 +361,15 @@ MtComponent rootComponent
         //Attach attributes to render method call
         foreach (var (attributeName, attributeValue) in attributeList)
         {
+            //Skip attributes that don't match component property name
             if (!component.Properties.TryGetValue(attributeName, out var componentProperty)) continue;
 
-            var methodArgumentValue = componentProperty.IsStringType()
+            var methodArgument = componentProperty.IsStringType()
                 ? IStringMethods.WrapStringInQuotes(
                     ICurlyBraceMethods.ReplaceCurlyBraces(attributeValue, s => $"{{({s})}}"))
                 : ICurlyBraceMethods.ReplaceCurlyBraces(attributeValue, s => $"({s})");
 
-            componentRenderArguments.Add(CreateMethodCallArgument(attributeName, methodArgumentValue));
+            componentRenderArguments.Add(CreateMethodCallArgument(attributeName, methodArgument));
         }
 
         renderComponentCall.Append(string.Join(", ", componentRenderArguments));
@@ -482,13 +432,9 @@ MtComponent rootComponent
     private string CreateComponentRenderMethod(MtComponent component, string renderMethodName, string componentBody,
         MtDataContext currentContext)
     {
-        var renderMethod = new StringBuilder(maniaTemplateLanguage.FeatureBlockStart())
-            .Append("private void ")
-            .Append(renderMethodName)
-            .Append('(');
-
         //open method arguments
         var arguments = new List<string>();
+        var body = new StringBuilder(componentBody);
 
         //Add local variables to component render method call
         foreach (var (localVariableName, localVariableType) in currentContext)
@@ -502,13 +448,7 @@ private string CreateComponentRenderMethod(MtComponent component, string renderM
         //add component properties as arguments with defaults
         AppendComponentPropertiesToMethodArgumentsList(component, arguments);
 
-        //close method arguments
-        renderMethod.Append(string.Join(", ", arguments))
-            .AppendLine(") {")
-            .AppendLine(maniaTemplateLanguage.FeatureBlockEnd())
-            .AppendLine(componentBody);
-
-        //insert mania scripts
+        //Insert mania scripts
         if (component.Scripts.Count > 0)
         {
             var scriptRenderMethodName = GetComponentScriptsRenderMethodName(component);
@@ -521,34 +461,55 @@ private string CreateComponentRenderMethod(MtComponent component, string renderM
             scriptArguments.AddRange(component.Properties.Values.OrderBy(property => property.Default != null)
                 .Select(property => property.Name));
 
-            renderMethod.AppendLine(maniaTemplateLanguage.FeatureBlockStart())
+            body.AppendLine(maniaTemplateLanguage.FeatureBlockStart())
                 .AppendLine(
                     $"__maniaScriptRenderMethods.Add(() => {scriptRenderMethodName}({string.Join(',', scriptArguments)}));")
                 .AppendLine(maniaTemplateLanguage.FeatureBlockEnd());
         }
 
-        return renderMethod.AppendLine(maniaTemplateLanguage.FeatureBlockStart())
-            .Append('}')
-            .AppendLine(maniaTemplateLanguage.FeatureBlockEnd())
-            .ToString();
+        return CreateRenderMethod(renderMethodName, arguments, body.ToString());
     }
 
     /// <summary>
-    /// Takes all available properties of a component and adds them to the given list of method arguments.
+    /// Creates the slot-render method for a given data context.
     /// </summary>
-    private static void AppendComponentPropertiesToMethodArgumentsList(MtComponent component, List<string> arguments)
+    private string CreateSlotRenderMethod(MtComponent component, int scope, MtDataContext context, string slotName,
+        MtComponent rootComponent, string slotContent, MtComponent parentComponent)
     {
-        arguments.AddRange(component.Properties.Values
-            .OrderBy(property => property.Default != null)
-            .Select(property => property.ToMethodArgument()));
-    }
+        var methodArguments = new List<string>();
+        var methodName = GetSlotRenderMethodName(scope, slotName);
+        var localVariables = new List<string>();
 
-    /// <summary>
-    /// Takes all available slots of a component and app ends the slot render arguments to the given list.
-    /// </summary>
-    private static void AppendSlotRenderArgumentsToList(List<string> arguments, MtComponent component)
-    {
-        arguments.AddRange(component.Slots.Select(slotName => $"Action {GetSlotRendererVariableName(slotName)}"));
+        //Add slot render methods.
+        AppendSlotRenderArgumentsToList(methodArguments, parentComponent);
+
+        //Add component properties as arguments.
+        foreach (var (localVariableName, localVariableType) in context)
+        {
+            //Do not properties present in root component, because they're available everywhere.
+            if (!rootComponent.Properties.ContainsKey(localVariableName))
+            {
+                methodArguments.Add($"{localVariableType} {localVariableName}");
+            }
+        }
+
+        if (parentComponent != rootComponent)
+        {
+            AppendComponentPropertiesToMethodArgumentsList(parentComponent, methodArguments);
+        }
+
+        //Declare component default variables
+        foreach (var prop in component.Properties.Values)
+        {
+            if (prop.Default == null || parentComponent.Properties.ContainsKey(prop.Name))
+            {
+                continue;
+            }
+
+            localVariables.Add(prop.ToLocalConstant());
+        }
+
+        return CreateRenderMethod(methodName, methodArguments, slotContent, localVariables);
     }
 
     /// <summary>
@@ -556,31 +517,59 @@ private static void AppendSlotRenderArgumentsToList(List<string> arguments, MtCo
     /// </summary>
     private string CreateComponentScriptsRenderMethod(MtComponent component, string renderMethodName)
     {
-        var renderMethod = new StringBuilder(maniaTemplateLanguage.FeatureBlockStart())
-            .Append("void ")
-            .Append(renderMethodName)
-            .Append('(');
-
-        //open method arguments
         var arguments = new List<string>();
 
         //Add method arguments with defaults
         AppendComponentPropertiesToMethodArgumentsList(component, arguments);
 
-        //close method arguments
-        renderMethod.Append(string.Join(", ", arguments))
-            .AppendLine(") {")
-            .AppendLine(maniaTemplateLanguage.FeatureBlockEnd());
+        return CreateRenderMethod(renderMethodName, arguments, _scriptTransformer.CreateManiaScriptBlock(component));
+    }
+
+    /// <summary>
+    /// Creates a method to render template contents.
+    /// </summary>
+    private string CreateRenderMethod(string name, IEnumerable<string> arguments, string body,
+        IEnumerable<string>? localVariableDeclarations = null)
+    {
+        var renderMethod = new StringBuilder(maniaTemplateLanguage.FeatureBlockStart())
+            .Append($"private void {name}(")
+            .Append(string.Join(", ", arguments))
+            .AppendLine(") {");
 
-        //insert body
-        renderMethod.AppendLine(_scriptTransformer.CreateManiaScriptBlock(component));
+        if (localVariableDeclarations != null)
+        {
+            foreach (var declaration in localVariableDeclarations)
+            {
+                renderMethod.AppendLine(declaration);
+            }
+        }
 
-        return renderMethod.AppendLine(maniaTemplateLanguage.FeatureBlockStart())
+        return renderMethod.AppendLine(maniaTemplateLanguage.FeatureBlockEnd())
+            .AppendLine(body)
+            .AppendLine(maniaTemplateLanguage.FeatureBlockStart())
             .Append('}')
             .AppendLine(maniaTemplateLanguage.FeatureBlockEnd())
             .ToString();
     }
 
+    /// <summary>
+    /// Takes all available properties of a component and adds them to the given list of method arguments.
+    /// </summary>
+    private static void AppendComponentPropertiesToMethodArgumentsList(MtComponent component, List<string> arguments)
+    {
+        arguments.AddRange(component.Properties.Values
+            .OrderBy(property => property.Default != null)
+            .Select(property => property.ToMethodArgument()));
+    }
+
+    /// <summary>
+    /// Takes all available slots of a component and app ends the slot render arguments to the given list.
+    /// </summary>
+    private static void AppendSlotRenderArgumentsToList(List<string> arguments, MtComponent component)
+    {
+        arguments.AddRange(component.Slots.Select(slotName => $"Action {GetSlotRendererVariableName(slotName)}"));
+    }
+
     /// <summary>
     /// Creates a dummy DoNothing() method that returns a empty string.
     /// </summary>
diff --git a/tests/ManiaTemplates.Tests/Lib/expected.tt b/tests/ManiaTemplates.Tests/Lib/expected.tt
index b7fc543..77612bb 100644
--- a/tests/ManiaTemplates.Tests/Lib/expected.tt
+++ b/tests/ManiaTemplates.Tests/Lib/expected.tt
@@ -64,7 +64,7 @@ __slotRenderer_default();
 </frame>
 <#+
 }
-void Render_ComponentScript_MtContext6(test arg3, string arg1 = $"", int arg2 = 0) {
+private void Render_ComponentScript_MtContext6(test arg3, string arg1 = $"", int arg2 = 0) {
 #>
 <script>GraphScript
 <#+
@@ -78,7 +78,7 @@ __insertedOneTimeManiaScripts.Add("FWKSFxnFcgdsXVn9dn5IW3isD6T8z+2eK6liK8rPSpU="
 </script>
 <#+
 }
-private void Render_Slot_3_default(int __index,int i) {
+private void Render_Slot_3_default(int __index, int i) {
 const int zIndex = 0;
 const double x = 0.0;
 const double y = 0.0;
@@ -114,5 +114,4 @@ const double y = 0.0;
 const double w = 0.0;
 const double h = 0.0;
 Render_Component_MtContext2(__slotRenderer_default: () => Render_Slot_8_default());
-}
-#>
\ No newline at end of file
+}#>
\ No newline at end of file

From 0b6df9995f2f3dc70aede4d64f533449272a347f Mon Sep 17 00:00:00 2001
From: Alexander Raszka <araszka94@gmail.com>
Date: Sat, 17 Feb 2024 12:08:34 +0100
Subject: [PATCH 13/19] Comment out unnecessary code

---
 src/ManiaTemplates/Lib/MtTransformer.cs | 38 ++++++++++++-------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/ManiaTemplates/Lib/MtTransformer.cs b/src/ManiaTemplates/Lib/MtTransformer.cs
index 70fadc0..ec10cf1 100644
--- a/src/ManiaTemplates/Lib/MtTransformer.cs
+++ b/src/ManiaTemplates/Lib/MtTransformer.cs
@@ -63,7 +63,7 @@ public string BuildManialink(MtComponent rootComponent, string className, int ve
     private string CreateBodyRenderMethod(string body, MtComponent rootComponent)
     {
         var methodArguments = new List<string>();
-        AppendSlotRenderArgumentsToList(methodArguments, rootComponent);
+        AppendSlotRenderArgumentsToList(rootComponent, methodArguments);
         var bodyRenderMethod = new StringBuilder($"private void RenderBody({string.Join(',', methodArguments)}) {{\n");
 
         //Root mania script block
@@ -443,10 +443,10 @@ private string CreateComponentRenderMethod(MtComponent component, string renderM
         }
 
         //add slot render methods
-        AppendSlotRenderArgumentsToList(arguments, component);
+        AppendSlotRenderArgumentsToList(component, arguments);
 
         //add component properties as arguments with defaults
-        AppendComponentPropertiesToMethodArgumentsList(component, arguments);
+        AppendComponentPropertiesArgumentsList(component, arguments);
 
         //Insert mania scripts
         if (component.Scripts.Count > 0)
@@ -481,7 +481,7 @@ private string CreateSlotRenderMethod(MtComponent component, int scope, MtDataCo
         var localVariables = new List<string>();
 
         //Add slot render methods.
-        AppendSlotRenderArgumentsToList(methodArguments, parentComponent);
+        AppendSlotRenderArgumentsToList(parentComponent, methodArguments);
 
         //Add component properties as arguments.
         foreach (var (localVariableName, localVariableType) in context)
@@ -495,18 +495,18 @@ private string CreateSlotRenderMethod(MtComponent component, int scope, MtDataCo
 
         if (parentComponent != rootComponent)
         {
-            AppendComponentPropertiesToMethodArgumentsList(parentComponent, methodArguments);
-        }
-
-        //Declare component default variables
-        foreach (var prop in component.Properties.Values)
-        {
-            if (prop.Default == null || parentComponent.Properties.ContainsKey(prop.Name))
-            {
-                continue;
-            }
-
-            localVariables.Add(prop.ToLocalConstant());
+            AppendComponentPropertiesArgumentsList(parentComponent, methodArguments);
+
+            //Declare component default variables
+            // foreach (var prop in parentComponent.Properties.Values)
+            // {
+            //     if (prop.Default == null)
+            //     {
+            //         continue;
+            //     }
+            //
+            //     localVariables.Add(prop.ToLocalConstant());
+            // }
         }
 
         return CreateRenderMethod(methodName, methodArguments, slotContent, localVariables);
@@ -520,7 +520,7 @@ private string CreateComponentScriptsRenderMethod(MtComponent component, string
         var arguments = new List<string>();
 
         //Add method arguments with defaults
-        AppendComponentPropertiesToMethodArgumentsList(component, arguments);
+        AppendComponentPropertiesArgumentsList(component, arguments);
 
         return CreateRenderMethod(renderMethodName, arguments, _scriptTransformer.CreateManiaScriptBlock(component));
     }
@@ -555,7 +555,7 @@ private string CreateRenderMethod(string name, IEnumerable<string> arguments, st
     /// <summary>
     /// Takes all available properties of a component and adds them to the given list of method arguments.
     /// </summary>
-    private static void AppendComponentPropertiesToMethodArgumentsList(MtComponent component, List<string> arguments)
+    private static void AppendComponentPropertiesArgumentsList(MtComponent component, List<string> arguments)
     {
         arguments.AddRange(component.Properties.Values
             .OrderBy(property => property.Default != null)
@@ -565,7 +565,7 @@ private static void AppendComponentPropertiesToMethodArgumentsList(MtComponent c
     /// <summary>
     /// Takes all available slots of a component and app ends the slot render arguments to the given list.
     /// </summary>
-    private static void AppendSlotRenderArgumentsToList(List<string> arguments, MtComponent component)
+    private static void AppendSlotRenderArgumentsToList(MtComponent component, List<string> arguments)
     {
         arguments.AddRange(component.Slots.Select(slotName => $"Action {GetSlotRendererVariableName(slotName)}"));
     }

From 08a992d4273f867397930a49cd634ca12d868838 Mon Sep 17 00:00:00 2001
From: Alexander Raszka <araszka94@gmail.com>
Date: Sat, 17 Feb 2024 12:51:37 +0100
Subject: [PATCH 14/19] Add loop test

---
 .../ControlElements/MtContextAlias.cs         | 17 +++++++
 src/ManiaTemplates/Lib/MtTransformer.cs       | 47 ++++++++-----------
 .../IntegrationTests/ManialinkEngineTest.cs   | 15 ++++++
 .../IntegrationTests/expected/loop-test.xml   | 11 +++++
 .../templates/loop-test-component.mt          |  8 ++++
 .../IntegrationTests/templates/loop-test.mt   | 13 +++++
 tests/ManiaTemplates.Tests/Lib/expected.tt    | 23 ++-------
 7 files changed, 88 insertions(+), 46 deletions(-)
 create mode 100644 src/ManiaTemplates/ControlElements/MtContextAlias.cs
 create mode 100644 tests/ManiaTemplates.Tests/IntegrationTests/expected/loop-test.xml
 create mode 100644 tests/ManiaTemplates.Tests/IntegrationTests/templates/loop-test-component.mt
 create mode 100644 tests/ManiaTemplates.Tests/IntegrationTests/templates/loop-test.mt

diff --git a/src/ManiaTemplates/ControlElements/MtContextAlias.cs b/src/ManiaTemplates/ControlElements/MtContextAlias.cs
new file mode 100644
index 0000000..59d73e6
--- /dev/null
+++ b/src/ManiaTemplates/ControlElements/MtContextAlias.cs
@@ -0,0 +1,17 @@
+namespace ManiaTemplates.ControlElements;
+
+public class MtContextAlias
+{
+    public MtDataContext Context { get; init; }
+    public Dictionary<string, string> Aliases { get; } = new();
+
+    public MtContextAlias(MtDataContext context)
+    {
+        Context = context;
+        foreach (var (variableName, variableType) in Context)
+        {
+            var variableAlias = variableName + (new Random()).Next();
+            Aliases[variableName] = variableAlias;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ManiaTemplates/Lib/MtTransformer.cs b/src/ManiaTemplates/Lib/MtTransformer.cs
index ec10cf1..e98051d 100644
--- a/src/ManiaTemplates/Lib/MtTransformer.cs
+++ b/src/ManiaTemplates/Lib/MtTransformer.cs
@@ -330,23 +330,23 @@ MtComponent rootComponent
                 Scope = scope,
                 Name = slotName,
                 RenderMethodT4 = CreateSlotRenderMethod(
-                    component,
                     scope,
                     currentContext,
                     slotName,
-                    rootComponent,
                     slotContent,
+                    rootComponent,
                     parentComponent
                 )
             });
         }
 
         var renderMethodName = GetComponentRenderMethodName(component, currentContext);
+        var contextAliasMap = new MtContextAlias(currentContext);
         if (!_renderMethods.ContainsKey(renderMethodName))
         {
             _renderMethods.Add(
                 renderMethodName,
-                CreateComponentRenderMethod(component, renderMethodName, componentBody, currentContext)
+                CreateComponentRenderMethod(component, renderMethodName, componentBody, contextAliasMap)
             );
         }
 
@@ -354,9 +354,13 @@ MtComponent rootComponent
         var renderComponentCall = new StringBuilder(renderMethodName + "(");
 
         //Create available arguments
-        var componentRenderArguments = currentContext.Keys
-            .Select(CreateMethodCallArgument)
-            .ToList();
+        var componentRenderArguments = new List<string>();
+
+        //Add local variables with aliases
+        // foreach (var (alias, originalName) in contextAliasMap.Aliases)
+        // {
+        //     componentRenderArguments.Add(CreateMethodCallArgument(originalName, alias));
+        // }
 
         //Attach attributes to render method call
         foreach (var (attributeName, attributeValue) in attributeList)
@@ -391,7 +395,7 @@ MtComponent rootComponent
 
                 var slotArguments = new HashSet<string>();
 
-                //Add local variables to slot render call
+                //Add local variables to slot render call (passes loop index and fallthrough vars)
                 foreach (var localVariableName in currentContext.Keys)
                 {
                     slotArguments.Add(CreateMethodCallArgument(localVariableName));
@@ -430,17 +434,17 @@ MtComponent rootComponent
     /// Creates the method which renders the contents of a component.
     /// </summary>
     private string CreateComponentRenderMethod(MtComponent component, string renderMethodName, string componentBody,
-        MtDataContext currentContext)
+        MtContextAlias contextAliasMap)
     {
         //open method arguments
         var arguments = new List<string>();
         var body = new StringBuilder(componentBody);
 
-        //Add local variables to component render method call
-        foreach (var (localVariableName, localVariableType) in currentContext)
-        {
-            arguments.Add($"{localVariableType} {localVariableName}");
-        }
+        //Add local variables to component render method call (loop index, fallthrough vars, ...)
+        // foreach (var (localVariableName, localVariableType) in contextAliasMap.Context)
+        // {
+        //     arguments.Add($"{localVariableType} {contextAliasMap.Aliases[localVariableName]}");
+        // }
 
         //add slot render methods
         AppendSlotRenderArgumentsToList(component, arguments);
@@ -473,8 +477,8 @@ private string CreateComponentRenderMethod(MtComponent component, string renderM
     /// <summary>
     /// Creates the slot-render method for a given data context.
     /// </summary>
-    private string CreateSlotRenderMethod(MtComponent component, int scope, MtDataContext context, string slotName,
-        MtComponent rootComponent, string slotContent, MtComponent parentComponent)
+    private string CreateSlotRenderMethod(int scope, MtDataContext context, string slotName, string slotContent,
+        MtComponent rootComponent, MtComponent parentComponent)
     {
         var methodArguments = new List<string>();
         var methodName = GetSlotRenderMethodName(scope, slotName);
@@ -486,7 +490,7 @@ private string CreateSlotRenderMethod(MtComponent component, int scope, MtDataCo
         //Add component properties as arguments.
         foreach (var (localVariableName, localVariableType) in context)
         {
-            //Do not properties present in root component, because they're available everywhere.
+            //Don't add properties present in root component, because they're available everywhere.
             if (!rootComponent.Properties.ContainsKey(localVariableName))
             {
                 methodArguments.Add($"{localVariableType} {localVariableName}");
@@ -496,17 +500,6 @@ private string CreateSlotRenderMethod(MtComponent component, int scope, MtDataCo
         if (parentComponent != rootComponent)
         {
             AppendComponentPropertiesArgumentsList(parentComponent, methodArguments);
-
-            //Declare component default variables
-            // foreach (var prop in parentComponent.Properties.Values)
-            // {
-            //     if (prop.Default == null)
-            //     {
-            //         continue;
-            //     }
-            //
-            //     localVariables.Add(prop.ToLocalConstant());
-            // }
         }
 
         return CreateRenderMethod(methodName, methodArguments, slotContent, localVariables);
diff --git a/tests/ManiaTemplates.Tests/IntegrationTests/ManialinkEngineTest.cs b/tests/ManiaTemplates.Tests/IntegrationTests/ManialinkEngineTest.cs
index 486156a..1dc32f1 100644
--- a/tests/ManiaTemplates.Tests/IntegrationTests/ManialinkEngineTest.cs
+++ b/tests/ManiaTemplates.Tests/IntegrationTests/ManialinkEngineTest.cs
@@ -141,4 +141,19 @@ public async void Should_Fill_All_Slots()
         var template = _maniaTemplateEngine.RenderAsync("Base", new { }, assemblies).Result;
         Assert.Equal(expected, template, ignoreLineEndingDifferences: true);
     }
+
+    [Fact]
+    public async void Component_Properties_Should_Not_Collide_With_Loop_Variables()
+    {
+        var loopTestComponent = await File.ReadAllTextAsync("IntegrationTests/templates/loop-test-component.mt");
+        var containerTemplate = await File.ReadAllTextAsync("IntegrationTests/templates/loop-test.mt");
+        var expected = await File.ReadAllTextAsync("IntegrationTests/expected/loop-test.xml");
+        var assemblies = new[] { typeof(ManiaTemplateEngine).Assembly, typeof(ComplexDataType).Assembly };
+
+        _maniaTemplateEngine.AddTemplateFromString("LoopComponent", loopTestComponent);
+        _maniaTemplateEngine.AddTemplateFromString("LoopTest", containerTemplate);
+
+        var template = _maniaTemplateEngine.RenderAsync("LoopTest", new { }, assemblies).Result;
+        Assert.Equal(expected, template, ignoreLineEndingDifferences: true);
+    }
 }
\ No newline at end of file
diff --git a/tests/ManiaTemplates.Tests/IntegrationTests/expected/loop-test.xml b/tests/ManiaTemplates.Tests/IntegrationTests/expected/loop-test.xml
new file mode 100644
index 0000000..3c60889
--- /dev/null
+++ b/tests/ManiaTemplates.Tests/IntegrationTests/expected/loop-test.xml
@@ -0,0 +1,11 @@
+<manialink version="3" id="MtLoopTest" name="EvoSC#-MtLoopTest">
+<label text="inner_-1" />
+<label text="inner_10" />
+<label text="outer_1" />
+<label text="inner_-1" />
+<label text="inner_20" />
+<label text="outer_2" />
+<label text="inner_-1" />
+<label text="inner_30" />
+<label text="outer_3" />
+</manialink>
diff --git a/tests/ManiaTemplates.Tests/IntegrationTests/templates/loop-test-component.mt b/tests/ManiaTemplates.Tests/IntegrationTests/templates/loop-test-component.mt
new file mode 100644
index 0000000..ea5127a
--- /dev/null
+++ b/tests/ManiaTemplates.Tests/IntegrationTests/templates/loop-test-component.mt
@@ -0,0 +1,8 @@
+<component>
+    <property type="int" name="i" default="-1" />
+    
+    <template>
+        <label text="inner_{{ i }}" />
+        <slot />
+    </template>
+</component>
\ No newline at end of file
diff --git a/tests/ManiaTemplates.Tests/IntegrationTests/templates/loop-test.mt b/tests/ManiaTemplates.Tests/IntegrationTests/templates/loop-test.mt
new file mode 100644
index 0000000..1416939
--- /dev/null
+++ b/tests/ManiaTemplates.Tests/IntegrationTests/templates/loop-test.mt
@@ -0,0 +1,13 @@
+<component>
+    <using namespace="System.Linq"/>
+    
+    <import component="LoopComponent" as="LoopComponent" />
+    
+    <template>
+        <LoopComponent foreach="int i in Enumerable.Range(1, 3)">
+            <LoopComponent i="{{ i * 10 }}">
+                <label text="outer_{{ i }}" />
+            </LoopComponent>
+        </LoopComponent>
+    </template>
+</component>
\ No newline at end of file
diff --git a/tests/ManiaTemplates.Tests/Lib/expected.tt b/tests/ManiaTemplates.Tests/Lib/expected.tt
index 77612bb..12e4454 100644
--- a/tests/ManiaTemplates.Tests/Lib/expected.tt
+++ b/tests/ManiaTemplates.Tests/Lib/expected.tt
@@ -18,7 +18,7 @@ var __outerIndex1 = 0;
 foreach (int i in numbers) {
 var __index = __outerIndex1;
 if (enabled) {
-Render_Component_MtContext2_ForEachLoop1(__index: __index, i: i, x: (20 * __index), __slotRenderer_default: () => Render_Slot_3_default(__index: __index, i: i));
+Render_Component_MtContext2_ForEachLoop1(x: (20 * __index), __slotRenderer_default: () => Render_Slot_3_default(__index: __index, i: i));
 }
 __outerIndex1++;
 }
@@ -38,12 +38,12 @@ scriptText3
 </script>
 <#+
 }
-private void Render_Component_MtContext5_ForEachLoop1_ForEachLoop1(int __index, int j, double x = 0.0, double y = 0.0, double w = 0.0, double h = 0.0, string halign = $"left", string valign = $"center", double opacity = 1.0, int zIndex = 0, int events = 0, string action = $"", string url = $"", string manialink = $"", string style = $"", string textfont = $"GameFont", double textsize = 1.0, string textcolor = $"", string focusareacolor1 = $"", string focusareacolor2 = $"", string text = $"", string textprefix = $"", int bold = 0, int autonewline = 0, int maxline = 0, int translate = 0, string textid = $"", string id = $"") {
+private void Render_Component_MtContext5_ForEachLoop1_ForEachLoop1(double x = 0.0, double y = 0.0, double w = 0.0, double h = 0.0, string halign = $"left", string valign = $"center", double opacity = 1.0, int zIndex = 0, int events = 0, string action = $"", string url = $"", string manialink = $"", string style = $"", string textfont = $"GameFont", double textsize = 1.0, string textcolor = $"", string focusareacolor1 = $"", string focusareacolor2 = $"", string text = $"", string textprefix = $"", int bold = 0, int autonewline = 0, int maxline = 0, int translate = 0, string textid = $"", string id = $"") {
 #>
 <label pos="<#= (x) #> <#= (y) #>" size="<#= (w) #> <#= (h) #>" halign="<#= (halign) #>" valign="<#= (valign) #>" opacity="<#= (opacity) #>" z-index="<#= (zIndex) #>" ScriptEvents="<#= (events) #>" action="<#= (action) #>" url="<#= (url) #>" manialink="<#= (manialink) #>" style="<#= (style) #>" textfont="<#= (textfont) #>" textsize="<#= (textsize) #>" textcolor="<#= (textcolor) #>" focusareacolor1="<#= (focusareacolor1) #>" focusareacolor2="<#= (focusareacolor2) #>" text="<#= (text) #>" textprefix="<#= (textprefix) #>" textemboss="<#= (bold) #>" autonewline="<#= (autonewline) #>" maxline="<#= (maxline) #>" translate="<#= (translate) #>" textid="<#= (textid) #>" id="<#= (id) #>" />
 <#+
 }
-private void Render_Component_MtContext2_ForEachLoop1(int __index, int i, Action __slotRenderer_default, int zIndex = 0, double x = 0.0, double y = 0.0, double w = 0.0, double h = 0.0) {
+private void Render_Component_MtContext2_ForEachLoop1(Action __slotRenderer_default, int zIndex = 0, double x = 0.0, double y = 0.0, double w = 0.0, double h = 0.0) {
 #>
 <frame pos="<#= (x) #> <#= (y) #>" size="<#= (w) #> <#= (h) #>" z-index="<#= (zIndex) #>">
 <#+
@@ -79,26 +79,16 @@ __insertedOneTimeManiaScripts.Add("FWKSFxnFcgdsXVn9dn5IW3isD6T8z+2eK6liK8rPSpU="
 <#+
 }
 private void Render_Slot_3_default(int __index, int i) {
-const int zIndex = 0;
-const double x = 0.0;
-const double y = 0.0;
-const double w = 0.0;
-const double h = 0.0;
 var __outerIndex7 = 0;
 foreach (int j in numbers.GetRange(0, i)) {
 var __index2 = __outerIndex7;
 if (i < numbers.Count) {
-Render_Component_MtContext5_ForEachLoop1_ForEachLoop1(__index: __index, j: j, text: $"{(i)}, {(j)} at index {(__index)}, {(__index2)}");
+Render_Component_MtContext5_ForEachLoop1_ForEachLoop1(text: $"{(i)}, {(j)} at index {(__index)}, {(__index2)}");
 }
 __outerIndex7++;
 }
 }
 private void Render_Slot_8_default() {
-const int zIndex = 0;
-const double x = 0.0;
-const double y = 0.0;
-const double w = 0.0;
-const double h = 0.0;
 #>
 <test>
 <#+
@@ -108,10 +98,5 @@ Render_Component_MtContext6(arg3: (new test()));
 <#+
 }
 private void Render_Slot_4_default() {
-const int zIndex = 0;
-const double x = 0.0;
-const double y = 0.0;
-const double w = 0.0;
-const double h = 0.0;
 Render_Component_MtContext2(__slotRenderer_default: () => Render_Slot_8_default());
 }#>
\ No newline at end of file

From 829e77d010048283fe8850f3a606fec6b2dc63c0 Mon Sep 17 00:00:00 2001
From: Alexander Raszka <araszka94@gmail.com>
Date: Sat, 17 Feb 2024 13:23:17 +0100
Subject: [PATCH 15/19] Do not pass updated context to slot render of old
 context

---
 .../ControlElements/MtDataContext.cs          |  1 +
 src/ManiaTemplates/Lib/MtTransformer.cs       | 11 ++++-----
 .../IntegrationTests/expected/loop-test.xml   | 24 +++++++++++++++++++
 .../templates/loop-test-component.mt          |  1 +
 .../IntegrationTests/templates/loop-test.mt   | 22 +++++++++++++----
 5 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/src/ManiaTemplates/ControlElements/MtDataContext.cs b/src/ManiaTemplates/ControlElements/MtDataContext.cs
index 1d4f634..854c1eb 100644
--- a/src/ManiaTemplates/ControlElements/MtDataContext.cs
+++ b/src/ManiaTemplates/ControlElements/MtDataContext.cs
@@ -14,6 +14,7 @@ public MtDataContext(string? name = null, MtDataContext? previousContext = null)
     public MtDataContext NewContext(MtDataContext otherContext)
     {
         var clone = new MtDataContext($"{_name}_{otherContext._name}", this);
+        
         foreach (var (name, type) in otherContext)
         {
             clone[name] = type;
diff --git a/src/ManiaTemplates/Lib/MtTransformer.cs b/src/ManiaTemplates/Lib/MtTransformer.cs
index e98051d..e93318e 100644
--- a/src/ManiaTemplates/Lib/MtTransformer.cs
+++ b/src/ManiaTemplates/Lib/MtTransformer.cs
@@ -145,7 +145,7 @@ private string CreateTemplatePropertiesBlock(MtComponent mtComponent)
     /// <summary>
     /// Process a ManiaTemplate node.
     /// </summary>
-    private string ProcessNode(XmlNode node, MtComponentMap componentMap, MtDataContext context,
+    private string ProcessNode(XmlNode node, MtComponentMap componentMap, MtDataContext oldContext,
         MtComponent rootComponent, MtComponent parentComponent)
     {
         Snippet snippet = [];
@@ -156,9 +156,9 @@ private string ProcessNode(XmlNode node, MtComponentMap componentMap, MtDataCont
             var subSnippet = new Snippet();
             var tag = childNode.Name;
             var attributeList = IXmlMethods.GetAttributes(childNode);
-            var currentContext = context;
+            var currentContext = oldContext;
 
-            var forEachCondition = attributeList.PullForeachCondition(context, nodeId);
+            var forEachCondition = attributeList.PullForeachCondition(oldContext, nodeId);
             var ifCondition = attributeList.PullIfCondition();
 
             if (forEachCondition != null)
@@ -171,8 +171,7 @@ private string ProcessNode(XmlNode node, MtComponentMap componentMap, MtDataCont
             {
                 //Node is a component
                 var component = engine.GetComponent(importedComponent.TemplateKey);
-                var slotContents =
-                    GetSlotContentsGroupedBySlotName(childNode, component, componentMap, currentContext,
+                var slotContents = GetSlotContentsGroupedBySlotName(childNode, component, componentMap, currentContext,
                         parentComponent, rootComponent);
 
                 var componentRenderMethodCall = ProcessComponentNode(
@@ -184,7 +183,7 @@ private string ProcessNode(XmlNode node, MtComponentMap componentMap, MtDataCont
                     ProcessNode(
                         IXmlMethods.NodeFromString(component.TemplateContent),
                         componentMap.Overload(component.ImportedComponents),
-                        currentContext,
+                        oldContext,
                         rootComponent: rootComponent,
                         parentComponent: component
                     ),
diff --git a/tests/ManiaTemplates.Tests/IntegrationTests/expected/loop-test.xml b/tests/ManiaTemplates.Tests/IntegrationTests/expected/loop-test.xml
index 3c60889..89d14b3 100644
--- a/tests/ManiaTemplates.Tests/IntegrationTests/expected/loop-test.xml
+++ b/tests/ManiaTemplates.Tests/IntegrationTests/expected/loop-test.xml
@@ -8,4 +8,28 @@
 <label text="inner_-1" />
 <label text="inner_30" />
 <label text="outer_3" />
+<!--  End Loop 1  -->
+<label text="inner_-1" />
+<label text="inner_1" />
+<label text="inner_-1" />
+<label text="outer" />
+<label text="inner_-1" />
+<label text="inner_2" />
+<label text="inner_-1" />
+<label text="outer" />
+<label text="inner_-1" />
+<label text="inner_3" />
+<label text="inner_-1" />
+<label text="outer" />
+<!--  End Loop 2  -->
+<label text="inner_0" />
+<label text="inner_0" />
+<label text="outer_1_1" />
+<label text="inner_1" />
+<label text="outer_1_2" />
+<label text="inner_1" />
+<label text="inner_0" />
+<label text="outer_2_1" />
+<label text="inner_1" />
+<label text="outer_2_2" />
 </manialink>
diff --git a/tests/ManiaTemplates.Tests/IntegrationTests/templates/loop-test-component.mt b/tests/ManiaTemplates.Tests/IntegrationTests/templates/loop-test-component.mt
index ea5127a..0140df1 100644
--- a/tests/ManiaTemplates.Tests/IntegrationTests/templates/loop-test-component.mt
+++ b/tests/ManiaTemplates.Tests/IntegrationTests/templates/loop-test-component.mt
@@ -1,5 +1,6 @@
 <component>
     <property type="int" name="i" default="-1" />
+    <property type="string" name="unusedArgumentOne" default="hello" />
     
     <template>
         <label text="inner_{{ i }}" />
diff --git a/tests/ManiaTemplates.Tests/IntegrationTests/templates/loop-test.mt b/tests/ManiaTemplates.Tests/IntegrationTests/templates/loop-test.mt
index 1416939..4ac3984 100644
--- a/tests/ManiaTemplates.Tests/IntegrationTests/templates/loop-test.mt
+++ b/tests/ManiaTemplates.Tests/IntegrationTests/templates/loop-test.mt
@@ -1,12 +1,26 @@
 <component>
     <using namespace="System.Linq"/>
-    
-    <import component="LoopComponent" as="LoopComponent" />
-    
+
+    <import component="LoopComponent" as="LoopComponent"/>
+
     <template>
         <LoopComponent foreach="int i in Enumerable.Range(1, 3)">
             <LoopComponent i="{{ i * 10 }}">
-                <label text="outer_{{ i }}" />
+                <label text="outer_{{ i }}"/>
+            </LoopComponent>
+        </LoopComponent>
+        <!-- End Loop 1 -->
+        <LoopComponent foreach="int i in Enumerable.Range(1, 3)">
+            <LoopComponent i="{{ i }}">
+                <LoopComponent>
+                    <label text="outer" />
+                </LoopComponent>
+            </LoopComponent>
+        </LoopComponent>
+        <!-- End Loop 2 -->
+        <LoopComponent foreach="int i in Enumerable.Range(1, 2)" i="{{ __index }}">
+            <LoopComponent foreach="int j in Enumerable.Range(1, 2)" i="{{ __index2 }}">
+                <label text="outer_{{ i }}_{{ j }}"/>
             </LoopComponent>
         </LoopComponent>
     </template>

From e35a0a36e964acc81fc0ddec942554333f18c611 Mon Sep 17 00:00:00 2001
From: Alexander Raszka <araszka94@gmail.com>
Date: Sat, 17 Feb 2024 13:40:09 +0100
Subject: [PATCH 16/19] Fix __index in nested foreach loops

---
 .../Components/MtComponentAttributes.cs            |  4 ++--
 src/ManiaTemplates/ControlElements/MtForeach.cs    | 10 ++++++++--
 src/ManiaTemplates/Lib/MtTransformer.cs            |  6 ++++--
 .../IntegrationTests/expected/loop-test.xml        | 14 +++++++-------
 .../IntegrationTests/templates/loop-test.mt        |  6 +++---
 5 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/ManiaTemplates/Components/MtComponentAttributes.cs b/src/ManiaTemplates/Components/MtComponentAttributes.cs
index 6a3fef0..48c157a 100644
--- a/src/ManiaTemplates/Components/MtComponentAttributes.cs
+++ b/src/ManiaTemplates/Components/MtComponentAttributes.cs
@@ -15,10 +15,10 @@ public class MtComponentAttributes : Dictionary<string, string>
     /// <summary>
     /// Checks the attribute list for loop-condition and returns it, else null.
     /// </summary>
-    public MtForeach? PullForeachCondition(MtDataContext context, int nodeId)
+    public MtForeach? PullForeachCondition(MtDataContext context, int nodeId, int loopDepth)
     {
         return ContainsKey("foreach")
-            ? MtForeach.FromString(Pull("foreach"), context, nodeId)
+            ? MtForeach.FromString(Pull("foreach"), context, nodeId, loopDepth)
             : null;
     }
 
diff --git a/src/ManiaTemplates/ControlElements/MtForeach.cs b/src/ManiaTemplates/ControlElements/MtForeach.cs
index 3ba1ce0..784bd65 100644
--- a/src/ManiaTemplates/ControlElements/MtForeach.cs
+++ b/src/ManiaTemplates/ControlElements/MtForeach.cs
@@ -16,7 +16,7 @@ public class MtForeach
     private static readonly Regex ForeachVariablesRegex = new(@"^\(?(.+?)(?:$|,\s*(.+)\))");
     private static readonly Regex ForeachVariablesTypeSplitterRegex = new(@"^(.+?)(?:$|\s+(.+)$)");
 
-    public static MtForeach FromString(string foreachAttributeValue, MtDataContext context, int nodeId)
+    public static MtForeach FromString(string foreachAttributeValue, MtDataContext context, int nodeId, int loopDepth)
     {
         //Match the value of the foreach-attribute of the XmlNode.
         //Split it into type, variables (var x, var (x,y), ...) and the source.
@@ -90,9 +90,15 @@ public static MtForeach FromString(string foreachAttributeValue, MtDataContext c
             throw new ParsingForeachLoopFailedException("User defined variables must not start with __.");
         }
 
+        var indexVariable = "__index";
+        if (loopDepth > 1)
+        {
+            indexVariable += loopDepth;
+        }
+
         var newContext = new MtDataContext($"ForEachLoop{nodeId}")
         {
-            { "__index", "int" }
+            { indexVariable, "int" }
         };
 
         foreach (var variable in foundVariables)
diff --git a/src/ManiaTemplates/Lib/MtTransformer.cs b/src/ManiaTemplates/Lib/MtTransformer.cs
index e93318e..cd73557 100644
--- a/src/ManiaTemplates/Lib/MtTransformer.cs
+++ b/src/ManiaTemplates/Lib/MtTransformer.cs
@@ -156,16 +156,18 @@ private string ProcessNode(XmlNode node, MtComponentMap componentMap, MtDataCont
             var subSnippet = new Snippet();
             var tag = childNode.Name;
             var attributeList = IXmlMethods.GetAttributes(childNode);
-            var currentContext = oldContext;
 
-            var forEachCondition = attributeList.PullForeachCondition(oldContext, nodeId);
+            var forEachCondition = attributeList.PullForeachCondition(oldContext, nodeId, _loopDepth);
             var ifCondition = attributeList.PullIfCondition();
+            var currentContext = oldContext;
 
             if (forEachCondition != null)
             {
                 currentContext = forEachCondition.Context;
                 _loopDepth++;
             }
+            
+            //TODO: find out why __index2 isn't attached to old context
 
             if (componentMap.TryGetValue(tag, out var importedComponent))
             {
diff --git a/tests/ManiaTemplates.Tests/IntegrationTests/expected/loop-test.xml b/tests/ManiaTemplates.Tests/IntegrationTests/expected/loop-test.xml
index 89d14b3..6964972 100644
--- a/tests/ManiaTemplates.Tests/IntegrationTests/expected/loop-test.xml
+++ b/tests/ManiaTemplates.Tests/IntegrationTests/expected/loop-test.xml
@@ -24,12 +24,12 @@
 <!--  End Loop 2  -->
 <label text="inner_0" />
 <label text="inner_0" />
-<label text="outer_1_1" />
-<label text="inner_1" />
-<label text="outer_1_2" />
-<label text="inner_1" />
+<label text="outer_0_0_1_1" />
+<label text="inner_100" />
+<label text="outer_0_1_1_2" />
+<label text="inner_1000" />
 <label text="inner_0" />
-<label text="outer_2_1" />
-<label text="inner_1" />
-<label text="outer_2_2" />
+<label text="outer_1_0_2_1" />
+<label text="inner_100" />
+<label text="outer_1_1_2_2" />
 </manialink>
diff --git a/tests/ManiaTemplates.Tests/IntegrationTests/templates/loop-test.mt b/tests/ManiaTemplates.Tests/IntegrationTests/templates/loop-test.mt
index 4ac3984..6578dff 100644
--- a/tests/ManiaTemplates.Tests/IntegrationTests/templates/loop-test.mt
+++ b/tests/ManiaTemplates.Tests/IntegrationTests/templates/loop-test.mt
@@ -18,9 +18,9 @@
             </LoopComponent>
         </LoopComponent>
         <!-- End Loop 2 -->
-        <LoopComponent foreach="int i in Enumerable.Range(1, 2)" i="{{ __index }}">
-            <LoopComponent foreach="int j in Enumerable.Range(1, 2)" i="{{ __index2 }}">
-                <label text="outer_{{ i }}_{{ j }}"/>
+        <LoopComponent foreach="int i in Enumerable.Range(1, 2)" i="{{ __index * 1000 }}">
+            <LoopComponent foreach="int j in Enumerable.Range(1, 2)" i="{{ __index2 * 100 }}">
+                <label text="outer_{{ __index }}_{{ __index2 }}_{{ i }}_{{ j }}"/>
             </LoopComponent>
         </LoopComponent>
     </template>

From 6a961965060a27acd380bdc845147c4251c8c6f4 Mon Sep 17 00:00:00 2001
From: Alexander Raszka <araszka94@gmail.com>
Date: Sat, 17 Feb 2024 14:03:21 +0100
Subject: [PATCH 17/19] Fix depth for __index in nested foreach loops

---
 .../ControlElements/MtDataContext.cs          |  7 ++++-
 .../ControlElements/MtForeach.cs              | 10 +++----
 .../ControlElements/MtDataContextTest.cs      | 27 +++++++++++++++++++
 tests/ManiaTemplates.Tests/Lib/expected.tt    |  8 +++---
 4 files changed, 41 insertions(+), 11 deletions(-)
 create mode 100644 tests/ManiaTemplates.Tests/ControlElements/MtDataContextTest.cs

diff --git a/src/ManiaTemplates/ControlElements/MtDataContext.cs b/src/ManiaTemplates/ControlElements/MtDataContext.cs
index 854c1eb..d2fc72f 100644
--- a/src/ManiaTemplates/ControlElements/MtDataContext.cs
+++ b/src/ManiaTemplates/ControlElements/MtDataContext.cs
@@ -15,10 +15,15 @@ public MtDataContext NewContext(MtDataContext otherContext)
     {
         var clone = new MtDataContext($"{_name}_{otherContext._name}", this);
         
-        foreach (var (name, type) in otherContext)
+        foreach (var (name, type) in this)
         {
             clone[name] = type;
         }
+        
+        foreach (var (name, type) in otherContext)
+        {
+            clone[name] = type; //TODO: prevent duplicate?
+        }
 
         return clone;
     }
diff --git a/src/ManiaTemplates/ControlElements/MtForeach.cs b/src/ManiaTemplates/ControlElements/MtForeach.cs
index 784bd65..8800646 100644
--- a/src/ManiaTemplates/ControlElements/MtForeach.cs
+++ b/src/ManiaTemplates/ControlElements/MtForeach.cs
@@ -60,7 +60,6 @@ public static MtForeach FromString(string foreachAttributeValue, MtDataContext c
 
             if (nameOrEmpty.Length == 0)
             {
-                // Console.WriteLine($"add: {typeOrVariable.Value} -> {type}");
                 foundVariables.Add(new MtForeachVariable
                 {
                     Type = type,
@@ -75,7 +74,6 @@ public static MtForeach FromString(string foreachAttributeValue, MtDataContext c
                         "You may not use var in foreach loops, please specify type.");
                 }
 
-                // Console.WriteLine($"add: {variableOrEmpty.Value} -> {typeOrVariable.Value}");
                 foundVariables.Add(new MtForeachVariable
                 {
                     Type = typeOrName.Value,
@@ -91,14 +89,14 @@ public static MtForeach FromString(string foreachAttributeValue, MtDataContext c
         }
 
         var indexVariable = "__index";
-        if (loopDepth > 1)
+        if (loopDepth > 0)
         {
-            indexVariable += loopDepth;
+            indexVariable += (loopDepth + 1);
         }
 
         var newContext = new MtDataContext($"ForEachLoop{nodeId}")
         {
-            { indexVariable, "int" }
+            { indexVariable, "int" },
         };
 
         foreach (var variable in foundVariables)
@@ -110,7 +108,7 @@ public static MtForeach FromString(string foreachAttributeValue, MtDataContext c
         {
             Condition = foreachAttributeValue,
             Variables = foundVariables,
-            Context = context.NewContext(newContext)
+            Context = newContext.NewContext(context)
         };
     }
 }
\ No newline at end of file
diff --git a/tests/ManiaTemplates.Tests/ControlElements/MtDataContextTest.cs b/tests/ManiaTemplates.Tests/ControlElements/MtDataContextTest.cs
new file mode 100644
index 0000000..64f1e03
--- /dev/null
+++ b/tests/ManiaTemplates.Tests/ControlElements/MtDataContextTest.cs
@@ -0,0 +1,27 @@
+using ManiaTemplates.ControlElements;
+
+namespace ManiaTemplates.Tests.ControlElements;
+
+public class MtDataContextTest
+{
+    [Fact]
+    public void Should_Create_New_Context_With_Previous_Variables()
+    {
+        var oldContext = new MtDataContext
+        {
+            { "__index", "int" },
+            { "i", "int" },
+        };
+
+        var newContext = new MtDataContext
+        {
+            { "__index2", "int" },
+            { "j", "int" },
+            { "i", "int" },
+        };
+
+        var merged = oldContext.NewContext(newContext);
+        Assert.Equal(4, merged.Count);
+        Assert.Equal("int", merged["__index2"]);
+    }
+}
\ No newline at end of file
diff --git a/tests/ManiaTemplates.Tests/Lib/expected.tt b/tests/ManiaTemplates.Tests/Lib/expected.tt
index 12e4454..3fe7a11 100644
--- a/tests/ManiaTemplates.Tests/Lib/expected.tt
+++ b/tests/ManiaTemplates.Tests/Lib/expected.tt
@@ -18,7 +18,7 @@ var __outerIndex1 = 0;
 foreach (int i in numbers) {
 var __index = __outerIndex1;
 if (enabled) {
-Render_Component_MtContext2_ForEachLoop1(x: (20 * __index), __slotRenderer_default: () => Render_Slot_3_default(__index: __index, i: i));
+Render_Component_MtContext2ForEachLoop1_(x: (20 * __index), __slotRenderer_default: () => Render_Slot_3_default(__index: __index, i: i));
 }
 __outerIndex1++;
 }
@@ -38,12 +38,12 @@ scriptText3
 </script>
 <#+
 }
-private void Render_Component_MtContext5_ForEachLoop1_ForEachLoop1(double x = 0.0, double y = 0.0, double w = 0.0, double h = 0.0, string halign = $"left", string valign = $"center", double opacity = 1.0, int zIndex = 0, int events = 0, string action = $"", string url = $"", string manialink = $"", string style = $"", string textfont = $"GameFont", double textsize = 1.0, string textcolor = $"", string focusareacolor1 = $"", string focusareacolor2 = $"", string text = $"", string textprefix = $"", int bold = 0, int autonewline = 0, int maxline = 0, int translate = 0, string textid = $"", string id = $"") {
+private void Render_Component_MtContext5ForEachLoop1_ForEachLoop1_(double x = 0.0, double y = 0.0, double w = 0.0, double h = 0.0, string halign = $"left", string valign = $"center", double opacity = 1.0, int zIndex = 0, int events = 0, string action = $"", string url = $"", string manialink = $"", string style = $"", string textfont = $"GameFont", double textsize = 1.0, string textcolor = $"", string focusareacolor1 = $"", string focusareacolor2 = $"", string text = $"", string textprefix = $"", int bold = 0, int autonewline = 0, int maxline = 0, int translate = 0, string textid = $"", string id = $"") {
 #>
 <label pos="<#= (x) #> <#= (y) #>" size="<#= (w) #> <#= (h) #>" halign="<#= (halign) #>" valign="<#= (valign) #>" opacity="<#= (opacity) #>" z-index="<#= (zIndex) #>" ScriptEvents="<#= (events) #>" action="<#= (action) #>" url="<#= (url) #>" manialink="<#= (manialink) #>" style="<#= (style) #>" textfont="<#= (textfont) #>" textsize="<#= (textsize) #>" textcolor="<#= (textcolor) #>" focusareacolor1="<#= (focusareacolor1) #>" focusareacolor2="<#= (focusareacolor2) #>" text="<#= (text) #>" textprefix="<#= (textprefix) #>" textemboss="<#= (bold) #>" autonewline="<#= (autonewline) #>" maxline="<#= (maxline) #>" translate="<#= (translate) #>" textid="<#= (textid) #>" id="<#= (id) #>" />
 <#+
 }
-private void Render_Component_MtContext2_ForEachLoop1(Action __slotRenderer_default, int zIndex = 0, double x = 0.0, double y = 0.0, double w = 0.0, double h = 0.0) {
+private void Render_Component_MtContext2ForEachLoop1_(Action __slotRenderer_default, int zIndex = 0, double x = 0.0, double y = 0.0, double w = 0.0, double h = 0.0) {
 #>
 <frame pos="<#= (x) #> <#= (y) #>" size="<#= (w) #> <#= (h) #>" z-index="<#= (zIndex) #>">
 <#+
@@ -83,7 +83,7 @@ var __outerIndex7 = 0;
 foreach (int j in numbers.GetRange(0, i)) {
 var __index2 = __outerIndex7;
 if (i < numbers.Count) {
-Render_Component_MtContext5_ForEachLoop1_ForEachLoop1(text: $"{(i)}, {(j)} at index {(__index)}, {(__index2)}");
+Render_Component_MtContext5ForEachLoop1_ForEachLoop1_(text: $"{(i)}, {(j)} at index {(__index)}, {(__index2)}");
 }
 __outerIndex7++;
 }

From a360523af690c97b36d22dc7c5df947588b92c87 Mon Sep 17 00:00:00 2001
From: Alexander Raszka <araszka94@gmail.com>
Date: Sat, 17 Feb 2024 14:39:32 +0100
Subject: [PATCH 18/19] Fix component with loop inside a loop with same
 iterator name

---
 src/ManiaTemplates/Lib/MtTransformer.cs       |  7 ++--
 .../IntegrationTests/ManialinkEngineTest.cs   |  6 ++--
 .../IntegrationTests/expected/loop-test.xml   | 25 +++++++++++++
 .../templates/component-with-loop.mt          | 10 ++++++
 .../IntegrationTests/templates/loop-test.mt   | 35 +++++++++++--------
 5 files changed, 64 insertions(+), 19 deletions(-)
 create mode 100644 tests/ManiaTemplates.Tests/IntegrationTests/templates/component-with-loop.mt

diff --git a/src/ManiaTemplates/Lib/MtTransformer.cs b/src/ManiaTemplates/Lib/MtTransformer.cs
index cd73557..cba4c26 100644
--- a/src/ManiaTemplates/Lib/MtTransformer.cs
+++ b/src/ManiaTemplates/Lib/MtTransformer.cs
@@ -156,10 +156,10 @@ private string ProcessNode(XmlNode node, MtComponentMap componentMap, MtDataCont
             var subSnippet = new Snippet();
             var tag = childNode.Name;
             var attributeList = IXmlMethods.GetAttributes(childNode);
+            var currentContext = oldContext;
 
             var forEachCondition = attributeList.PullForeachCondition(oldContext, nodeId, _loopDepth);
             var ifCondition = attributeList.PullIfCondition();
-            var currentContext = oldContext;
 
             if (forEachCondition != null)
             {
@@ -167,7 +167,7 @@ private string ProcessNode(XmlNode node, MtComponentMap componentMap, MtDataCont
                 _loopDepth++;
             }
             
-            //TODO: find out why __index2 isn't attached to old context
+            //TODO: find out why __index2 isn't attache
 
             if (componentMap.TryGetValue(tag, out var importedComponent))
             {
@@ -176,6 +176,8 @@ private string ProcessNode(XmlNode node, MtComponentMap componentMap, MtDataCont
                 var slotContents = GetSlotContentsGroupedBySlotName(childNode, component, componentMap, currentContext,
                         parentComponent, rootComponent);
 
+                var oldLoopDepth = _loopDepth;
+                _loopDepth = 0;
                 var componentRenderMethodCall = ProcessComponentNode(
                     childNode.GetHashCode(),
                     component,
@@ -192,6 +194,7 @@ private string ProcessNode(XmlNode node, MtComponentMap componentMap, MtDataCont
                     slotContents,
                     rootComponent: rootComponent
                 );
+                _loopDepth = oldLoopDepth;
 
                 subSnippet.AppendLine(maniaTemplateLanguage.FeatureBlockStart())
                     .AppendLine(componentRenderMethodCall)
diff --git a/tests/ManiaTemplates.Tests/IntegrationTests/ManialinkEngineTest.cs b/tests/ManiaTemplates.Tests/IntegrationTests/ManialinkEngineTest.cs
index 1dc32f1..b2c0e53 100644
--- a/tests/ManiaTemplates.Tests/IntegrationTests/ManialinkEngineTest.cs
+++ b/tests/ManiaTemplates.Tests/IntegrationTests/ManialinkEngineTest.cs
@@ -145,12 +145,14 @@ public async void Should_Fill_All_Slots()
     [Fact]
     public async void Component_Properties_Should_Not_Collide_With_Loop_Variables()
     {
-        var loopTestComponent = await File.ReadAllTextAsync("IntegrationTests/templates/loop-test-component.mt");
+        var testComponent = await File.ReadAllTextAsync("IntegrationTests/templates/loop-test-component.mt");
+        var testComponentWithLoop = await File.ReadAllTextAsync("IntegrationTests/templates/component-with-loop.mt");
         var containerTemplate = await File.ReadAllTextAsync("IntegrationTests/templates/loop-test.mt");
         var expected = await File.ReadAllTextAsync("IntegrationTests/expected/loop-test.xml");
         var assemblies = new[] { typeof(ManiaTemplateEngine).Assembly, typeof(ComplexDataType).Assembly };
 
-        _maniaTemplateEngine.AddTemplateFromString("LoopComponent", loopTestComponent);
+        _maniaTemplateEngine.AddTemplateFromString("TestComponent", testComponent);
+        _maniaTemplateEngine.AddTemplateFromString("TestComponentWithLoop", testComponentWithLoop);
         _maniaTemplateEngine.AddTemplateFromString("LoopTest", containerTemplate);
 
         var template = _maniaTemplateEngine.RenderAsync("LoopTest", new { }, assemblies).Result;
diff --git a/tests/ManiaTemplates.Tests/IntegrationTests/expected/loop-test.xml b/tests/ManiaTemplates.Tests/IntegrationTests/expected/loop-test.xml
index 6964972..a7556f7 100644
--- a/tests/ManiaTemplates.Tests/IntegrationTests/expected/loop-test.xml
+++ b/tests/ManiaTemplates.Tests/IntegrationTests/expected/loop-test.xml
@@ -32,4 +32,29 @@
 <label text="outer_1_0_2_1" />
 <label text="inner_100" />
 <label text="outer_1_1_2_2" />
+<!--  End Loop 3  -->
+<frame>
+<label text="inner_0_1" />
+<label text="outer_0_1" />
+</frame>
+<frame>
+<label text="inner_1_2" />
+<label text="outer_0_1" />
+</frame>
+<frame>
+<label text="inner_2_3" />
+<label text="outer_0_1" />
+</frame>
+<frame>
+<label text="inner_0_1" />
+<label text="outer_1_2" />
+</frame>
+<frame>
+<label text="inner_1_2" />
+<label text="outer_1_2" />
+</frame>
+<frame>
+<label text="inner_2_3" />
+<label text="outer_1_2" />
+</frame>
 </manialink>
diff --git a/tests/ManiaTemplates.Tests/IntegrationTests/templates/component-with-loop.mt b/tests/ManiaTemplates.Tests/IntegrationTests/templates/component-with-loop.mt
new file mode 100644
index 0000000..6ed0fce
--- /dev/null
+++ b/tests/ManiaTemplates.Tests/IntegrationTests/templates/component-with-loop.mt
@@ -0,0 +1,10 @@
+<component>
+    <using namespace="System.Linq"/>
+
+    <template>
+        <frame foreach="int i in Enumerable.Range(1, 3)">
+            <label text="inner_{{ __index }}_{{ i }}"/>
+            <slot/>
+        </frame>
+    </template>
+</component>
\ No newline at end of file
diff --git a/tests/ManiaTemplates.Tests/IntegrationTests/templates/loop-test.mt b/tests/ManiaTemplates.Tests/IntegrationTests/templates/loop-test.mt
index 6578dff..8773fa0 100644
--- a/tests/ManiaTemplates.Tests/IntegrationTests/templates/loop-test.mt
+++ b/tests/ManiaTemplates.Tests/IntegrationTests/templates/loop-test.mt
@@ -1,27 +1,32 @@
 <component>
     <using namespace="System.Linq"/>
 
-    <import component="LoopComponent" as="LoopComponent"/>
+    <import component="TestComponent" as="TestComponent"/>
+    <import component="TestComponentWithLoop" as="TestComponentWithLoop"/>
 
     <template>
-        <LoopComponent foreach="int i in Enumerable.Range(1, 3)">
-            <LoopComponent i="{{ i * 10 }}">
+        <TestComponent foreach="int i in Enumerable.Range(1, 3)">
+            <TestComponent i="{{ i * 10 }}">
                 <label text="outer_{{ i }}"/>
-            </LoopComponent>
-        </LoopComponent>
+            </TestComponent>
+        </TestComponent>
         <!-- End Loop 1 -->
-        <LoopComponent foreach="int i in Enumerable.Range(1, 3)">
-            <LoopComponent i="{{ i }}">
-                <LoopComponent>
+        <TestComponent foreach="int i in Enumerable.Range(1, 3)">
+            <TestComponent i="{{ i }}">
+                <TestComponent>
                     <label text="outer" />
-                </LoopComponent>
-            </LoopComponent>
-        </LoopComponent>
+                </TestComponent>
+            </TestComponent>
+        </TestComponent>
         <!-- End Loop 2 -->
-        <LoopComponent foreach="int i in Enumerable.Range(1, 2)" i="{{ __index * 1000 }}">
-            <LoopComponent foreach="int j in Enumerable.Range(1, 2)" i="{{ __index2 * 100 }}">
+        <TestComponent foreach="int i in Enumerable.Range(1, 2)" i="{{ __index * 1000 }}">
+            <TestComponent foreach="int j in Enumerable.Range(1, 2)" i="{{ __index2 * 100 }}">
                 <label text="outer_{{ __index }}_{{ __index2 }}_{{ i }}_{{ j }}"/>
-            </LoopComponent>
-        </LoopComponent>
+            </TestComponent>
+        </TestComponent>
+        <!-- End Loop 3 -->
+        <TestComponentWithLoop foreach="int i in Enumerable.Range(1, 2)">
+            <label text="outer_{{ __index }}_{{ i }}"/>
+        </TestComponentWithLoop>
     </template>
 </component>
\ No newline at end of file

From 4fe2bed892e2af7c2cbb78a01a7aaf68e0c747df Mon Sep 17 00:00:00 2001
From: Alexander Raszka <araszka94@gmail.com>
Date: Sat, 17 Feb 2024 14:39:55 +0100
Subject: [PATCH 19/19] Remove TODO

---
 src/ManiaTemplates/Lib/MtTransformer.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/ManiaTemplates/Lib/MtTransformer.cs b/src/ManiaTemplates/Lib/MtTransformer.cs
index cba4c26..000ec43 100644
--- a/src/ManiaTemplates/Lib/MtTransformer.cs
+++ b/src/ManiaTemplates/Lib/MtTransformer.cs
@@ -167,8 +167,6 @@ private string ProcessNode(XmlNode node, MtComponentMap componentMap, MtDataCont
                 _loopDepth++;
             }
             
-            //TODO: find out why __index2 isn't attache
-
             if (componentMap.TryGetValue(tag, out var importedComponent))
             {
                 //Node is a component