Merge branch 'feature-source-generators'

otac0n · Dec 5, 2023 · 4ad9423 · 4ad9423
2 parents 526c9a8 + 3dee04b
commit 4ad9423
Show file tree

Hide file tree

Showing 45 changed files with 655 additions and 152 deletions.
diff --git a/Weave.Tests.Generated/ConfigTest/AbsentConfig/TestAbsentConfig.weave b/Weave.Tests.Generated/ConfigTest/AbsentConfig/TestAbsentConfig.weave
@@ -0,0 +1,3 @@
+@namespace Weave.Tests.Generated.ConfigTest.AbsentConfig
+@accessibility public
+Hello, world!
diff --git a/Weave.Tests.Generated/ConfigTest/CompiledConfig/TestCompiledConfig.weave b/Weave.Tests.Generated/ConfigTest/CompiledConfig/TestCompiledConfig.weave
@@ -0,0 +1 @@
+Hello, world!
diff --git a/Weave.Tests.Generated/ConfigTest/CompiledConfig/_config.weave b/Weave.Tests.Generated/ConfigTest/CompiledConfig/_config.weave
@@ -0,0 +1,2 @@
+@namespace Weave.Tests.Generated.ConfigTest.CompiledConfig
+@accessibility public
diff --git a/Weave.Tests.Generated/ConfigTest/GeneratedConfig/TestGeneratedConfig.weave b/Weave.Tests.Generated/ConfigTest/GeneratedConfig/TestGeneratedConfig.weave
@@ -0,0 +1 @@
+Hello, world!
diff --git a/Weave.Tests.Generated/ConfigTest/GeneratedConfig/_config.weave b/Weave.Tests.Generated/ConfigTest/GeneratedConfig/_config.weave
@@ -0,0 +1,2 @@
+@namespace Weave.Tests.Generated.ConfigTest.GeneratedConfig
+@accessibility public
diff --git a/Weave.Tests.Generated/ConfigTest/LegacyCompiledConfig/LegacyCompiledConfig.weave b/Weave.Tests.Generated/ConfigTest/LegacyCompiledConfig/LegacyCompiledConfig.weave
@@ -0,0 +1 @@
+Hello, world!
diff --git a/Weave.Tests.Generated/ConfigTest/LegacyCompiledConfig/_config.weave b/Weave.Tests.Generated/ConfigTest/LegacyCompiledConfig/_config.weave
@@ -0,0 +1,2 @@
+@namespace Weave.Tests.Generated.ConfigTest.LegacyCompiledConfig
+@accessibility public
diff --git a/Weave.Tests.Generated/ConfigTest/LegacyGeneratedConfig/LegacyGeneratedConfig.weave b/Weave.Tests.Generated/ConfigTest/LegacyGeneratedConfig/LegacyGeneratedConfig.weave
@@ -0,0 +1 @@
+Hello, world!
diff --git a/Weave.Tests.Generated/ConfigTest/LegacyGeneratedConfig/_config.weave b/Weave.Tests.Generated/ConfigTest/LegacyGeneratedConfig/_config.weave
@@ -0,0 +1,2 @@
+@namespace Weave.Tests.Generated.ConfigTest.LegacyGeneratedConfig
+@accessibility public
diff --git a/Weave.Tests.Generated/ConfigTest/NoneConfig/TestNoneConfig.weave b/Weave.Tests.Generated/ConfigTest/NoneConfig/TestNoneConfig.weave
@@ -0,0 +1 @@
+Hello, world!
diff --git a/Weave.Tests.Generated/ConfigTest/NoneConfig/_config.weave b/Weave.Tests.Generated/ConfigTest/NoneConfig/_config.weave
@@ -0,0 +1,2 @@
+@namespace Weave.Tests.Generated.ConfigTest.NoneConfig
+@accessibility public
diff --git a/Weave.Tests.Generated/Properties/AssemblyInfo.cs b/Weave.Tests.Generated/Properties/AssemblyInfo.cs
@@ -0,0 +1,4 @@
+// <auto-generated />
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Weave.Tests")]
diff --git a/Weave.Tests.Generated/Weave.Tests.Generated.csproj b/Weave.Tests.Generated/Weave.Tests.Generated.csproj
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Pegasus" Version="4.2.0-alpha0009" GeneratePathProperty="true" PrivateAssets="all" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Weave\Weave.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" SetTargetFramework="TargetFramework=netstandard2.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <WeaveTemplate Include="ConfigTest\AbsentConfig\TestAbsentConfig.weave" />
+    <None Remove="ConfigTest\CompiledConfig\_config.weave" />
+    <WeaveTemplate Include="ConfigTest\CompiledConfig\_config.weave">
+      <UseSourceGeneration>false</UseSourceGeneration>
+    </WeaveTemplate>
+    <None Remove="ConfigTest\CompiledConfig\TestCompiledConfig.weave" />
+    <WeaveTemplate Include="ConfigTest\CompiledConfig\TestCompiledConfig.weave" />
+    <None Remove="ConfigTest\GeneratedConfig\_config.weave" />
+    <WeaveTemplate Include="ConfigTest\GeneratedConfig\_config.weave" />
+    <None Remove="ConfigTest\GeneratedConfig\TestGeneratedConfig.weave" />
+    <WeaveTemplate Include="ConfigTest\GeneratedConfig\TestGeneratedConfig.weave" />
+    <WeaveTemplate Include="ConfigTest\LegacyCompiledConfig\_config.weave">
+      <UseSourceGeneration>false</UseSourceGeneration>
+    </WeaveTemplate>
+    <None Remove="ConfigTest\LegacyCompiledConfig\_config.weave" />
+    <None Remove="ConfigTest\LegacyCompiledConfig\LegacyCompiledConfig.weave" />
+    <WeaveTemplate Include="ConfigTest\LegacyCompiledConfig\LegacyCompiledConfig.weave">
+      <UseSourceGeneration>false</UseSourceGeneration>
+    </WeaveTemplate>
+    <None Remove="ConfigTest\LegacyGeneratedConfig\_config.weave" />
+    <WeaveTemplate Include="ConfigTest\LegacyGeneratedConfig\_config.weave" />
+    <None Remove="ConfigTest\LegacyGeneratedConfig\LegacyGeneratedConfig.weave" />
+    <WeaveTemplate Include="ConfigTest\LegacyGeneratedConfig\LegacyGeneratedConfig.weave">
+      <UseSourceGeneration>false</UseSourceGeneration>
+    </WeaveTemplate>
+    <None Remove="ConfigTest\NoneConfig\TestNoneConfig.weave" />
+    <WeaveTemplate Include="ConfigTest\NoneConfig\TestNoneConfig.weave" />
+  </ItemGroup>
+  <PropertyGroup>
+    <GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPaths</GetTargetPathDependsOn>
+  </PropertyGroup>
+  <Import Project="..\Weave\bin\$(Configuration)\Weave.targets" />
+  <Target Name="GetDependencyTargetPaths">
+    <ItemGroup>
+      <TargetPathWithTargetPlatformMoniker Include="$(PKGPegasus)\lib\netstandard2.0\Pegasus.Common.dll" IncludeRuntimeDependency="false" />
+    </ItemGroup>
+  </Target>
+</Project>
diff --git a/Weave.Tests/GeneratedCode/ConfigTests.cs b/Weave.Tests/GeneratedCode/ConfigTests.cs
@@ -0,0 +1,81 @@
+// Copyright © John Gietzen. All Rights Reserved. This source is subject to the MIT license. Please see license.md for more information.
+
+namespace Weave.Tests.IntegrationTests
+{
+    using System;
+    using System.IO;
+    using Xunit;
+
+    public class ConfigTests
+    {
+        private static readonly string ExpectedConfigOutput = "";
+        private static readonly string ExpectedTemplateOutput = $"Hello, world!{Environment.NewLine}";
+
+        [Fact]
+        public void AbsentConfig()
+        {
+            TestHelper(
+                Generated.ConfigTest.AbsentConfig.Templates.RenderTestAbsentConfig, ExpectedTemplateOutput);
+        }
+
+        [Fact]
+        public void CompiledConfig()
+        {
+            TestHelper(
+                (Generated.ConfigTest.CompiledConfig.Templates.Render_config, ExpectedConfigOutput),
+                (Generated.ConfigTest.CompiledConfig.Templates.RenderTestCompiledConfig, ExpectedTemplateOutput));
+        }
+
+        [Fact]
+        public void GeneratedConfig()
+        {
+            TestHelper(
+                (Generated.ConfigTest.GeneratedConfig.Templates.Render_config, ExpectedConfigOutput),
+                (Generated.ConfigTest.GeneratedConfig.Templates.RenderTestGeneratedConfig, ExpectedTemplateOutput));
+        }
+
+        [Fact]
+        public void LegacyCompiledConfig()
+        {
+            TestHelper(
+                (Generated.ConfigTest.LegacyCompiledConfig.Templates.Render_config, ExpectedConfigOutput),
+                (Generated.ConfigTest.LegacyCompiledConfig.Templates.RenderLegacyCompiledConfig, ExpectedTemplateOutput));
+        }
+
+        [Fact]
+        public void LegacyGeneratedConfig()
+        {
+            TestHelper(
+                (Generated.ConfigTest.LegacyGeneratedConfig.Templates.Render_config, ExpectedConfigOutput),
+                (Generated.ConfigTest.LegacyGeneratedConfig.Templates.RenderLegacyGeneratedConfig, ExpectedTemplateOutput));
+        }
+
+        [Fact]
+        public void NoneConfig()
+        {
+            TestHelper(
+                Generated.ConfigTest.NoneConfig.Templates.RenderTestNoneConfig, ExpectedTemplateOutput);
+        }
+
+        private static void TestHelper(params (Action<dynamic, TextWriter, string> render, string expected)[] tests)
+        {
+            foreach (var (render, expected) in tests)
+            {
+                TestHelper(render, expected);
+            }
+        }
+
+        private static void TestHelper(Action<dynamic, TextWriter, string> render, string expected)
+        {
+            var output = TestHelper(render);
+            Assert.Equal(expected, output);
+        }
+
+        private static string TestHelper(Action<dynamic, TextWriter, string> render)
+        {
+            var writer = new StringWriter();
+            render(null, writer, null);
+            return writer.ToString();
+        }
+    }
+}
diff --git a/Weave.Tests/Weave.Tests.csproj b/Weave.Tests/Weave.Tests.csproj
@@ -1,31 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\SharedAssemblyInfo.props" />
   <PropertyGroup>
     <CodeAnalysisRuleSet>Weave.Tests.ruleset</CodeAnalysisRuleSet>
     <DebugType>Full</DebugType>
     <IsPackable>false</IsPackable>
-    <TargetFramework>net461</TargetFramework>
-    <Description />
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <AdditionalFiles Include="..\stylecop.json" Link="stylecop.json" />
     <AdditionalFiles Include="Weave.Tests.ruleset" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FixMe" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="GitVersionTask" Version="4.0.0-beta0012" PrivateAssets="All" />
+    <PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.6.85" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta006" PrivateAssets="All" />
-    <PackageReference Include="System.CodeDom" Version="4.4.0" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
+    <PackageReference Include="System.CodeDom" Version="4.7.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Weave\Weave.csproj" />
+    <ProjectReference Include="..\Weave.Tests.Generated\Weave.Tests.Generated.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Remove="GeneratedCode\ConfigTests.cs" />
+    <None Include="GeneratedCode\ConfigTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />

diff --git a/Weave.sln b/Weave.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27428.2037
+# Visual Studio Version 17
+VisualStudioVersion = 17.7.34003.232
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D0E57E35-59EE-487F-852B-864CFC020B46}"
 	ProjectSection(SolutionItems) = preProject
@@ -25,6 +25,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Weave", "Weave\Weave.csproj
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Weave.Tests", "Weave.Tests\Weave.Tests.csproj", "{F2ECD1F3-7200-4FEA-A456-873F1749E008}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Weave.Tests.Generated", "Weave.Tests.Generated\Weave.Tests.Generated.csproj", "{46D94595-1DBC-49C6-9D77-A1E5E307E21E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -39,6 +41,10 @@ Global
 		{F2ECD1F3-7200-4FEA-A456-873F1749E008}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F2ECD1F3-7200-4FEA-A456-873F1749E008}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F2ECD1F3-7200-4FEA-A456-873F1749E008}.Release|Any CPU.Build.0 = Release|Any CPU
+		{46D94595-1DBC-49C6-9D77-A1E5E307E21E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{46D94595-1DBC-49C6-9D77-A1E5E307E21E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{46D94595-1DBC-49C6-9D77-A1E5E307E21E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{46D94595-1DBC-49C6-9D77-A1E5E307E21E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Weave/CompileManager.cs b/Weave/CompileManager.cs
@@ -1,4 +1,4 @@
-// Copyright © John Gietzen. All Rights Reserved. This source is subject to the MIT license. Please see license.md for more information.
+// Copyright © John Gietzen. All Rights Reserved. This source is subject to the MIT license. Please see license.md for more information.
 
 namespace Weave
 {
@@ -13,29 +13,64 @@ namespace Weave
 
     internal static class CompileManager
     {
-        public static void CompileFile(string inputFile, string outputFile, Action<CompilerError> logError)
-        {
-            outputFile = outputFile ?? inputFile + ".cs";
-            var configFile = Path.Combine(Path.GetDirectoryName(inputFile), "_config.weave");
+        public static readonly string ConfigFileName = "_config.weave";
 
-            var template = ParseTemplate(inputFile, logError);
-            if (template == null)
+        public static CompileResult<Template> ParseTemplate(string inputFileContents, string inputFileName)
+        {
+            var parser = new WeaveParser();
+            var compileResult = new CompileResult<Template>();
+            try
             {
-                return;
+                compileResult.Result = parser.Parse(inputFileContents, fileName: inputFileName);
             }
-
-            if (File.Exists(configFile))
+            catch (FormatException ex)
             {
-                var config = ParseTemplate(configFile, logError);
-                if (config == null)
+                var cursor = ex.Data["cursor"] as Cursor;
+                if (cursor != null && Regex.IsMatch(ex.Message, @"^WEAVE\d+:"))
+                {
+                    var parts = ex.Message.Split(new[] { ':' }, 2);
+                    compileResult.Errors.Add(new CompilerError(cursor.FileName, cursor.Line, cursor.Column, parts[0], parts[1]));
+                }
+                else
                 {
-                    return;
+                    throw;
                 }
+            }
+
+            return compileResult;
+        }
+
+        public static CompileResult<Template> CombineTemplateConfig(CompileResult<Template> template, CompileResult<Template> config)
+        {
+            if (config == null || (config.Result == null && config.Errors.Count == 0))
+            {
+                return template;
+            }
+
+            var result = new CompileResult<Template>
+            {
+                Result = new Template(template.Result, config.Result),
+            };
+
+            foreach (var error in config.Errors)
+            {
+                result.Errors.Add(error);
+            }
 
-                template = new Template(template, config);
+            foreach (var error in result.Errors)
+            {
+                result.Errors.Add(error);
             }
 
-            var result = WeaveCompiler.Compile(template);
+            return result;
+        }
+
+#if !NETSTANDARD
+        public static void CompileFile(string inputFileName, string outputFileName, Action<CompilerError> logError)
+        {
+            inputFileName = Path.GetFullPath(inputFileName);
+            outputFileName = Path.GetFullPath(outputFileName ?? inputFileName + ".cs");
+            var result = CompileFile(inputFileName, outputFileName);
 
             var hadFatal = false;
             foreach (var error in result.Errors)
@@ -46,31 +81,43 @@ public static void CompileFile(string inputFile, string outputFile, Action<Compi
 
             if (!hadFatal)
             {
-                Directory.CreateDirectory(Path.GetDirectoryName(outputFile));
-                File.WriteAllText(outputFile, result.Code);
+                Directory.CreateDirectory(Path.GetDirectoryName(outputFileName));
+                File.WriteAllText(outputFileName, result.Code);
             }
         }
 
-        private static Template ParseTemplate(string inputFile, Action<CompilerError> logError)
+        private static CompileResult CompileFile(string inputFileName, string outputFileName)
         {
-            var subject = File.ReadAllText(inputFile);
-            var parser = new WeaveParser();
-            try
-            {
-                return parser.Parse(subject, fileName: inputFile);
-            }
-            catch (FormatException ex)
+            var inputResult = ParseTemplateInternal(inputFileName, outputFileName);
+            var inputTemplate = inputResult.Result;
+            if (inputTemplate == null)
             {
-                var cursor = ex.Data["cursor"] as Cursor;
-                if (cursor != null && Regex.IsMatch(ex.Message, @"^WEAVE\d+:"))
+                var errorResult = new CompileResult();
+                foreach (var error in inputResult.Errors)
                 {
-                    var parts = ex.Message.Split(new[] { ':' }, 2);
-                    logError(new CompilerError(cursor.FileName, cursor.Line, cursor.Column, parts[0], parts[1]));
-                    return null;
+                    errorResult.Errors.Add(error);
                 }
 
-                throw;
+                return errorResult;
             }
+
+            return WeaveCompiler.Compile(inputTemplate);
+        }
+
+        private static CompileResult<Template> ParseTemplateInternal(string inputFileName, string outputFileName)
+        {
+            var relativePath = PathUtils.MakeRelative(outputFileName, inputFileName);
+            var templateResult = ParseTemplate(File.ReadAllText(inputFileName), relativePath);
+
+            var configFileName = Path.Combine(Path.GetDirectoryName(inputFileName), ConfigFileName);
+            if (File.Exists(configFileName))
+            {
+                var configResult = ParseTemplate(File.ReadAllText(configFileName), PathUtils.MakeRelative(outputFileName, configFileName));
+                templateResult = CombineTemplateConfig(templateResult, configResult);
+            }
+
+            return templateResult;
         }
+#endif
     }
 }