Merge branch 'master' of github.com:RocketSurgeonsGuild/Conventions

RocketSurgeonsGuild · Feb 15, 2022 · a568351 · a568351
2 parents dfe70e9 + 67bcba5
commit a568351
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 64 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -68,7 +68,7 @@
     <PackageVersion Include="FakeItEasy" Version="7.3.0" />
     <PackageVersion Include="FakeItEasy.Analyzer.CSharp" Version="6.1.0" />
     <PackageVersion Include="FluentAssertions" Version="6.5.1" />
-    <PackageVersion Include="FluentAssertions.Analyzers" Version="0.15.0" />
+    <PackageVersion Include="FluentAssertions.Analyzers" Version="0.16.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageVersion Include="Rocket.Surgery.Extensions.Testing.FakeItEasy" Version="6.1.0" />
     <PackageVersion Include="Rocket.Surgery.Extensions.Testing.XUnit" Version="6.1.0" />

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
     "devDependencies": {
         "@prettier/plugin-xml": "^1.2.0",
         "husky": "^7.0.4",
-        "lint-staged": "^12.3.3",
+        "lint-staged": "^12.3.4",
         "prettier": "^2.5.1"
     },
     "scripts": {

diff --git a/src/Conventions.Analyzers/ConventionAttributesGenerator.cs b/src/Conventions.Analyzers/ConventionAttributesGenerator.cs
@@ -17,8 +17,8 @@ namespace Rocket.Surgery.Conventions;
 [Generator]
 public class ConventionAttributesGenerator : IIncrementalGenerator
 {
-    private static readonly ConventionConfigurationData _exportsDefaultConfiguration = new(false, true, "", "Exports", "GetConventions");
-    private static readonly ConventionConfigurationData _importsDefaultConfiguration = new(false, true, "", "Imports", "GetConventions");
+    private static readonly ConventionConfigurationData _exportsDefaultConfiguration = new(false, true, "", "Exports", "GetConventions") { Postfix = true };
+    private static readonly ConventionConfigurationData _importsDefaultConfiguration = new(false, true, "", "Imports", "GetConventions") { Postfix = true };
 
     public void Initialize(IncrementalGeneratorInitializationContext context)
     {

diff --git a/src/Conventions.Analyzers/ConventionConfigurationData.cs b/src/Conventions.Analyzers/ConventionConfigurationData.cs
@@ -6,9 +6,10 @@ namespace Rocket.Surgery.Conventions;
 
 internal record ConventionConfigurationData(bool WasConfigured, bool Assembly, string? Namespace, string ClassName, string MethodName)
 {
+    public bool Postfix { get; init; }
+
     private record InnerConventionConfigurationData(bool Assembly, string? Namespace, string ClassName, string MethodName)
     {
-        public bool Postfix { get; init; } = true;
         public bool DefinedNamespace { get; init; }
         public bool WasConfigured { get; init; }
 
@@ -49,13 +50,6 @@ ConventionConfigurationData defaults
                         data = data with { Assembly = bool.TryParse(value, out var b) && b, WasConfigured = true };
                     }
 
-                    if (config.GlobalOptions.TryGetValue(
-                            $"build_property.{attributeName}{nameof(InnerConventionConfigurationData.Postfix)}", out value
-                        ))
-                    {
-                        data = data with { Postfix = bool.TryParse(value, out var b) && b, WasConfigured = true };
-                    }
-
                     return data;
                 }
             );
@@ -108,10 +102,6 @@ syntaxContext.Node is AttributeListSyntax attributeListSyntax
                                     {
                                         Assembly = (bool)syntax.Token.Value!
                                     },
-                                    nameof(InnerConventionConfigurationData.Postfix) => data with
-                                    {
-                                        Postfix = (bool)syntax.Token.Value!
-                                    },
                                     _ => data
                                 };
                             }
@@ -128,11 +118,12 @@ syntaxContext.Node is AttributeListSyntax attributeListSyntax
                    (tuple, token) => new ConventionConfigurationData(
                        tuple.Left.WasConfigured,
                        tuple.Left.Assembly,
-                       tuple.Left.DefinedNamespace ? tuple.Left.Namespace! : GetNamespaceForCompilation(tuple.Right, tuple.Left.Postfix),
+                       tuple.Left.DefinedNamespace ? tuple.Left.Namespace! : GetNamespaceForCompilation(tuple.Right, defaults.Postfix),
                        tuple.Left.ClassName,
                        tuple.Left.MethodName
                    )
-               );
+               )
+              .Select((data, token) => data with { Namespace = data.Namespace == "global" ? "" : data.Namespace });
     }
 
     public static ConventionConfigurationData FromAssemblyAttributes(IAssemblySymbol assemblySymbol, ConventionConfigurationData defaults)
@@ -184,7 +175,7 @@ public SyntaxList<AttributeListSyntax> ToAttributes(string type)
         );
     }
 
-    private static string GetNamespaceForCompilation(Compilation compilation, bool postfix)
+    private static string GetNamespaceForCompilation(Compilation compilation, bool postfix = false)
     {
         var @namespace = compilation.AssemblyName ?? "";
         if (postfix)

diff --git a/src/Conventions.Attributes/ConventionsConfigurationAttribute.cs b/src/Conventions.Attributes/ConventionsConfigurationAttribute.cs
@@ -10,12 +10,6 @@ public abstract class ConventionsConfigurationAttribute : Attribute
     /// </summary>
     public bool Assembly { get; set; }
 
-    /// <summary>
-    ///     Should the default namespace has a the .Conventions postfix
-    /// </summary>
-    /// <returns></returns>
-    public bool Postfix { get; set; } = true;
-
     /// <summary>
     ///     The desired namespace for the emitted classes to go
     /// </summary>

diff --git a/src/Conventions.Attributes/build/Rocket.Surgery.Conventions.Attributes.props b/src/Conventions.Attributes/build/Rocket.Surgery.Conventions.Attributes.props
@@ -4,11 +4,9 @@
         <CompilerVisibleProperty Include="ImportConventionsNamespace" />
         <CompilerVisibleProperty Include="ImportConventionsClassName" />
         <CompilerVisibleProperty Include="ImportConventionsMethodName" />
-        <CompilerVisibleProperty Include="ImportConventionsPostfix" />
         <CompilerVisibleProperty Include="ExportConventionsAssembly" />
         <CompilerVisibleProperty Include="ExportConventionsNamespace" />
         <CompilerVisibleProperty Include="ExportConventionsClassName" />
         <CompilerVisibleProperty Include="ExportConventionsMethodName" />
-        <CompilerVisibleProperty Include="ExportConventionsPostfix" />
     </ItemGroup>
 </Project>
diff --git a/src/Conventions.Attributes/build/Rocket.Surgery.Conventions.Attributes.targets b/src/Conventions.Attributes/build/Rocket.Surgery.Conventions.Attributes.targets
@@ -4,27 +4,25 @@
             Condition="'$(_ConventionApplicationDetected)' == '' and ('$(OutputType)' != 'Library' or '$(OutputType)' != 'library')"
         >true</_ConventionApplicationDetected>
         <_ConventionApplicationDetected Condition="'$(_ConventionApplicationDetected)' == ''">false</_ConventionApplicationDetected>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(_ConventionApplicationDetected)' == 'true'">
-        <ImportConventionsAssembly Condition="'$(ImportConventionsAssembly)' == ''">true</ImportConventionsAssembly>
+
+        <ImportConventionsNamespace Condition="'$(ImportConventionsNamespace)' == ''">$(RootNamespace)</ImportConventionsNamespace>
         <ImportConventionsClassName Condition="'$(ImportConventionsClassName)' == ''">Imports</ImportConventionsClassName>        
-        <ImportConventionsMethodName Condition="'$(ImportConventionsMethodName)' == ''">GetConventions</ImportConventionsMethodName>        
-        <ImportConventionsPostfix Condition="'$(ImportConventionsPostfix)' == ''">false</ImportConventionsPostfix>
+        <ImportConventionsMethodName Condition="'$(ImportConventionsMethodName)' == ''">GetConventions</ImportConventionsMethodName>   
 
-        <ExportConventionsAssembly Condition="'$(ExportConventionsAssembly)' == ''">false</ExportConventionsAssembly>
+        <ExportConventionsNamespace Condition="'$(ExportConventionsNamespace)' == ''">$(RootNamespace).Conventions</ExportConventionsNamespace>
         <ExportConventionsClassName Condition="'$(ExportConventionsClassName)' == ''">Exports</ExportConventionsClassName>        
-        <ExportConventionsMethodName Condition="'$(ExportConventionsMethodName)' == ''">GetConventions</ExportConventionsMethodName>        
-        <ExportConventionsPostfix Condition="'$(ExportConventionsPostfix)' == ''">true</ExportConventionsPostfix>
+        <ExportConventionsMethodName Condition="'$(ExportConventionsMethodName)' == ''">GetConventions</ExportConventionsMethodName>    
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(IsTestProject)' == 'true'">
+        <ImportConventionsAssembly Condition="'$(ImportConventionsAssembly)' == ''">true</ImportConventionsAssembly>        
+        <ExportConventionsAssembly Condition="'$(ExportConventionsAssembly)' == ''">true</ExportConventionsAssembly>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(_ConventionApplicationDetected)' == 'true'">
+        <ImportConventionsAssembly Condition="'$(ImportConventionsAssembly)' == ''">true</ImportConventionsAssembly>             
+        <ExportConventionsAssembly Condition="'$(ExportConventionsAssembly)' == ''">false</ExportConventionsAssembly>    
     </PropertyGroup>
     <PropertyGroup Condition="'$(_ConventionApplicationDetected)' != 'true'">
-        <ImportConventionsAssembly Condition="'$(ImportConventionsAssembly)' == ''">false</ImportConventionsAssembly>
-        <ImportConventionsClassName Condition="'$(ImportConventionsClassName)' == ''">Imports</ImportConventionsClassName>        
-        <ImportConventionsMethodName Condition="'$(ImportConventionsMethodName)' == ''">GetConventions</ImportConventionsMethodName>        
-        <ImportConventionsPostfix Condition="'$(ImportConventionsPostfix)' == ''">false</ImportConventionsPostfix>
-
+        <ImportConventionsAssembly Condition="'$(ImportConventionsAssembly)' == ''">false</ImportConventionsAssembly>        
         <ExportConventionsAssembly Condition="'$(ExportConventionsAssembly)' == ''">true</ExportConventionsAssembly>
-        <ExportConventionsClassName Condition="'$(ExportConventionsClassName)' == ''">Exports</ExportConventionsClassName>        
-        <ExportConventionsMethodName Condition="'$(ExportConventionsMethodName)' == ''">GetConventions</ExportConventionsMethodName>        
-        <ExportConventionsPostfix Condition="'$(ExportConventionsPostfix)' == ''">true</ExportConventionsPostfix>        
     </PropertyGroup>
 </Project>
diff --git a/test/Conventions.Tests/StaticConventionTests.cs b/test/Conventions.Tests/StaticConventionTests.cs
@@ -1,10 +1,7 @@
 using FluentAssertions;
 using Microsoft.Extensions.DependencyInjection;
-using Rocket.Surgery.Conventions;
 using Xunit;
 
-[assembly: ImportConventions]
-
 namespace Rocket.Surgery.Conventions.Tests;
 
 [ImportConventions]
@@ -21,8 +18,8 @@ public void Should_Have_Exports_Method_Defined()
     [Fact]
     public void Should_Have_Imports_Method_Defined_On_Assembly()
     {
-        var list = Conventions.Imports.GetConventions(new ServiceCollection().BuildServiceProvider())
-                              .Should().NotBeNull().And.Subject;
+        var list = Imports.GetConventions(new ServiceCollection().BuildServiceProvider())
+                          .Should().NotBeNull().And.Subject;
         list.As<IEnumerable<IConventionWithDependencies>>().Should().NotBeNull();
     }
 
@@ -35,7 +32,7 @@ public void Should_Have_Imports_Method_Defined_On_Assembly_Into_Provider()
         var items = list.As<IEnumerable<IConventionWithDependencies>>().Should().NotBeNull().And.Subject;
 
         var provider = new ConventionProvider(HostType.Undefined, items, Array.Empty<object>(), Array.Empty<object>());
-        Func<IEnumerable<object>> a = () => provider.GetAll();
+        var a = () => provider.GetAll();
 
         a.Should().NotThrow();
 

diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -1,10 +1,10 @@
 <Project>
     <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+    <Import Project="$(MSBuildThisFileDirectory)../src/Conventions.Attributes/build/Rocket.Surgery.Conventions.Attributes.props" />
     <PropertyGroup>
         <MergeCoverage>true</MergeCoverage>
         <IncludeTestAssembly>true</IncludeTestAssembly>
         <NoWarn>$(NoWarn);CA1812</NoWarn>
-    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>        
     </PropertyGroup>
 </Project>