issue 113 proper namespace handling for nested types and types without

namespace

Author: adoconnection

ExampleAppCore/Program.cs

@@ -14,7 +14,7 @@ public class TestModel : RazorEngineTemplateBase
     class Program
     {
         static string Content = @"
-Hello @Model.Name
+@(""Hello"" + Model.Name)111
 
 @foreach(var item in @Model.Items)
 {

Pack.ps1

@@ -1,4 +1,4 @@
 dotnet build -c Release
 dotnet test
 dotnet pack -c Release -o artifacts RazorEngineCore\RazorEngineCore.csproj -p:symbolPackageFormat=snupkg --include-symbols
-dotnet nuget push artifacts\RazorEngineCore.2022.1.2.nupkg --source https://www.nuget.org/api/v2/package -k KEY
+dotnet nuget push artifacts\RazorEngineCore.2022.8.1.nupkg --source https://www.nuget.org/api/v2/package -k KEY

RazorEngineCore.Tests/Models/NestedTestModel.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RazorEngineCore.Tests.Models
+{
+    public class NestedTestModel
+    {
+        public string Name { get; set; }
+        public int[] Items { get; set; }
+
+        public class TestModelInnerClass1
+        {
+            public string Name { get; set; }
+            public int[] Items { get; set; }
+
+            public class TestModelInnerClass2
+            {
+                public string Name { get; set; }
+                public int[] Items { get; set; }
+            }
+        }
+    }
+}

RazorEngineCore.Tests/Models/NoNamespaceModel.cs

@@ -0,0 +1,5 @@
+public class TestModelWithoutNamespace
+{
+    public string Name { get; set; }
+    public int[] Items { get; set; }
+}

RazorEngineCore.Tests/TestTemplateModelNamespace.cs

@@ -0,0 +1,47 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using RazorEngineCore.Tests.Models;
+
+namespace RazorEngineCore.Tests
+{
+    [TestClass]
+    public class TestTemplateModelNamespace
+    {
+        [TestMethod]
+        public void TestModelNestedTypes()
+        {
+            IRazorEngine razorEngine = new RazorEngine();
+            string content = "Hello @Model.Name";
+
+            IRazorEngineCompiledTemplate<RazorEngineTemplateBase<NestedTestModel.TestModelInnerClass1.TestModelInnerClass2>> template2 = razorEngine.Compile<RazorEngineTemplateBase<NestedTestModel.TestModelInnerClass1.TestModelInnerClass2>>(content);
+
+            string result = template2.Run(instance =>
+            {
+                instance.Model = new NestedTestModel.TestModelInnerClass1.TestModelInnerClass2()
+                {
+                    Name = "Hello",
+                };
+            });
+
+            Assert.AreEqual("Hello Hello", result);
+        }
+
+        [TestMethod]
+        public void TestModelNoNamespace()
+        {
+            IRazorEngine razorEngine = new RazorEngine();
+            string content = "Hello @Model.Name";
+
+            IRazorEngineCompiledTemplate<RazorEngineTemplateBase<TestModelWithoutNamespace>> template2 = razorEngine.Compile<RazorEngineTemplateBase<TestModelWithoutNamespace>>(content);
+
+            string result = template2.Run(instance =>
+            {
+                instance.Model = new TestModelWithoutNamespace()
+                {
+                    Name = "Hello",
+                };
+            });
+
+            Assert.AreEqual("Hello Hello", result);
+        }
+    }
+}

RazorEngineCore.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29728.190
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32721.290
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorEngineCore", "RazorEngineCore\RazorEngineCore.csproj", "{1E21186E-49A5-433A-ABAD-18CED1AA2494}"
 EndProject
@@ -14,9 +14,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExampleAppCore", "ExampleAppCore\ExampleAppCore.csproj", "{38338B92-1D09-41FB-AE11-3783DA7AFE0B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExampleAppNET472", "ExampleAppNet472\ExampleAppNET472.csproj", "{D27C1578-BFF9-4469-9099-DAF64450BBBE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExampleAppNET472", "ExampleAppNet472\ExampleAppNET472.csproj", "{D27C1578-BFF9-4469-9099-DAF64450BBBE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExampleAppNET5", "ExampleAppNET5\ExampleAppNET5.csproj", "{B19C090A-4EC1-441D-B702-ADD2ECA79198}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExampleAppNET5", "ExampleAppNET5\ExampleAppNET5.csproj", "{B19C090A-4EC1-441D-B702-ADD2ECA79198}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

RazorEngineCore/RazorEngineCompilationOptionsBuilder.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using Microsoft.CodeAnalysis;
@@ -53,7 +54,14 @@ public void Inherits(Type type)
 
         private string RenderTypeName(Type type)
         {
-            string result = type.Namespace + "." + type.Name;
+            IList<string> elements = new List<string>()
+            {
+                type.Namespace,
+                RenderDeclaringType(type.DeclaringType),
+                type.Name
+            };
+
+            string result = string.Join(".", elements.Where(e => !string.IsNullOrWhiteSpace(e)));
 
             if (result.Contains('`'))
             {
@@ -67,5 +75,22 @@ private string RenderTypeName(Type type)
 
             return result + "<" + string.Join(",", type.GenericTypeArguments.Select(this.RenderTypeName)) + ">";
         }
+
+        private string RenderDeclaringType(Type type)
+        {
+            if (type == null)
+            {
+                return null;
+            }
+
+            string parent = RenderDeclaringType(type.DeclaringType);
+
+            if (string.IsNullOrWhiteSpace(parent))
+            {
+                return type.Name;
+            }
+
+            return parent + "." + type.Name;
+        }
     }
 }

RazorEngineCore/RazorEngineCore.csproj

@@ -2,12 +2,12 @@
   <PropertyGroup>
     <TargetFrameworks>net6.0;net5.0;netstandard2.0</TargetFrameworks>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>2022.1.2</Version>
+    <Version>2022.8.1</Version>
     <Authors>Alexander Selishchev, Simon Mourier, William David Cossey, Benjamin Smith, Dag H. Baardsen, krmr, jddj007-hydra</Authors>
     <PackageProjectUrl>https://github.com/adoconnection/RazorEngineCore</PackageProjectUrl>
     <Description>NET6 Razor Template Engine</Description>
-    <AssemblyVersion>2022.1.2</AssemblyVersion>
-    <FileVersion>2022.1.2</FileVersion>
+    <AssemblyVersion>2022.8.1</AssemblyVersion>
+    <FileVersion>2022.8.1</FileVersion>
     <PackageReleaseNotes></PackageReleaseNotes>
     <Company>Alexander Selishchev, Simon Mourier, William David Cossey, Benjamin Smith, Dag H. Baardsen, krmr, jddj007-hydra</Company>
     <SignAssembly>true</SignAssembly>