Added StrawberryShake Code Generator Server (ChilliCream#4742)

binarythistle · Feb 10, 2022 · e34f6ee · e34f6ee
1 parent 4e5aa62
commit e34f6ee
Show file tree

Hide file tree

Showing 105 changed files with 2,849 additions and 3,065 deletions.
diff --git a/.build/Build.Publish.cs b/.build/Build.Publish.cs
@@ -77,57 +77,6 @@ partial class Build
                     t => t.SetTargetPath(StarWarsTemplateNuSpec),
                     t => t.SetTargetPath(EmptyServerTemplateNuSpec),
                     t => t.SetTargetPath(TemplatesNuSpec)));
-
-            var analyzerProject = ProjectModelTasks
-                .ParseSolution(SgSolutionFile)
-                .GetProjects("*.Analyzers")
-                .Single();
-
-            Project parsedProject = ProjectModelTasks.ParseProject(analyzerProject);
-            ProjectItem packageReference = parsedProject.Items
-                .Single(t =>
-                    t.ItemType == "PackageReference" &&
-                    t.IsImported == false &&
-                    t.EvaluatedInclude == "StrawberryShake.CodeGeneration.CSharp");
-            packageReference.SetMetadataValue("Version", GitVersion.SemVer);
-            parsedProject.Save();
-
-            DotNetBuild(c => c
-                .SetProjectFile(analyzerProject)
-                .SetConfiguration(Configuration)
-                .SetAssemblyVersion(GitVersion.AssemblySemVer)
-                .SetFileVersion(GitVersion.AssemblySemFileVer)
-                .SetInformationalVersion(GitVersion.InformationalVersion)
-                .SetVersion(GitVersion.SemVer));
-
-            DotNetPack(c => c
-                .SetProject(analyzerProject)
-                .SetNoBuild(InvokedTargets.Contains(Compile))
-                .SetConfiguration(Configuration)
-                .SetOutputDirectory(PackageDirectory)
-                .SetVersion(GitVersion.SemVer));
-
-            var analyzerTestProject = ProjectModelTasks
-                .ParseSolution(SgSolutionFile)
-                .GetProjects("*.Tests")
-                .Single();
-
-            parsedProject = ProjectModelTasks.ParseProject(analyzerTestProject);
-            packageReference = parsedProject.Items
-                .Single(t =>
-                    t.ItemType == "PackageReference" &&
-                    t.IsImported == false &&
-                    t.EvaluatedInclude == "StrawberryShake.CodeGeneration.CSharp.Analyzers");
-            packageReference.SetMetadataValue("Version", GitVersion.SemVer);
-            parsedProject.Save();
-
-            DotNetBuild(c => c
-                .SetProjectFile(analyzerTestProject)
-                .SetConfiguration(Configuration)
-                .SetAssemblyVersion(GitVersion.AssemblySemVer)
-                .SetFileVersion(GitVersion.AssemblySemFileVer)
-                .SetInformationalVersion(GitVersion.InformationalVersion)
-                .SetVersion(GitVersion.SemVer));
         });
 
     Target Publish => _ => _

diff --git a/.build/Helpers.cs b/.build/Helpers.cs
@@ -29,6 +29,7 @@ class Helpers
         Path.Combine("HotChocolate", "Spatial"),
         Path.Combine("StrawberryShake", "Client"),
         Path.Combine("StrawberryShake", "CodeGeneration"),
+        Path.Combine("StrawberryShake", "SourceGenerator"),
         Path.Combine("StrawberryShake", "Tooling")
     };
 

diff --git a/.devops/azure-pipelines.release-hotchocolate.yml b/.devops/azure-pipelines.release-hotchocolate.yml
@@ -39,7 +39,7 @@ stages:
               pathtoPublish: "output/packages"
       - job: Publish
         displayName: "Publish"
-        dependsOn: [Test, Pack]
+        dependsOn: [Pack]
         steps:
           - task: DownloadBuildArtifacts@0
             displayName: "Download Packages"

diff --git a/.gitignore b/.gitignore
@@ -319,4 +319,6 @@ appsettings.user.json
 # benchmark dbs
 conferences.db
 conferences.db-shm
-conferences.db-wal
+conferences.db-wal
+
+.server/
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -38,7 +38,7 @@
                 "reveal": "silent"
             },
             "problemMatcher": "$msCompile"
-        }
+        },
         {
             "label": "build hc types analyzer",
             "command": "dotnet",
@@ -56,6 +56,42 @@
                 "reveal": "silent"
             },
             "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "build ss generator",
+            "command": "dotnet",
+            "type": "shell",
+            "args": [
+                "build",
+                "src/StrawberryShake/CodeGeneration",
+                // Ask dotnet build to generate full paths for file names.
+                "/property:GenerateFullPaths=true",
+                // Do not generate summary otherwise it leads to duplicate errors in Problems panel
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "group": "build",
+            "presentation": {
+                "reveal": "silent"
+            },
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "build ss source generator",
+            "command": "dotnet",
+            "type": "shell",
+            "args": [
+                "build",
+                "src/StrawberryShake/SourceGenerator",
+                // Ask dotnet build to generate full paths for file names.
+                "/property:GenerateFullPaths=true",
+                // Do not generate summary otherwise it leads to duplicate errors in Problems panel
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "group": "build",
+            "presentation": {
+                "reveal": "silent"
+            },
+            "problemMatcher": "$msCompile"
         }
     ]
 }
diff --git a/src/HotChocolate/AspNetCore/src/AspNetCore.Authorization/DefaultAuthorizationHandler.cs b/src/HotChocolate/AspNetCore/src/AspNetCore.Authorization/DefaultAuthorizationHandler.cs
@@ -34,7 +34,7 @@ public async ValueTask<AuthorizeResult> AuthorizeAsync(
             return AuthorizeResult.NotAuthenticated;
         }
 
-        if (IsInAnyRole(principal, directive.Roles))
+        if (IsInAnyRole(principal!, directive.Roles))
         {
             if (NeedsPolicyValidation(directive))
             {
@@ -93,11 +93,9 @@ private static bool IsInAnyRole(
     }
 
     private static bool NeedsPolicyValidation(AuthorizeDirective directive)
-    {
-        return directive.Roles == null
-               || directive.Roles.Count == 0
-               || !string.IsNullOrEmpty(directive.Policy);
-    }
+        => directive.Roles == null
+           || directive.Roles.Count == 0
+           || !string.IsNullOrEmpty(directive.Policy);
 
     private static async Task<AuthorizeResult> AuthorizeWithPolicyAsync(
         IMiddlewareContext context,

diff --git a/...re/src/Execution/DependencyInjection/RequestExecutorBuilderExtensions.ResolverCompiler.cs b/...re/src/Execution/DependencyInjection/RequestExecutorBuilderExtensions.ResolverCompiler.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Reflection;
 using HotChocolate;
 using HotChocolate.Execution.Configuration;
 using HotChocolate.Internal;

diff --git a/src/HotChocolate/Core/src/Types/Types/Descriptors/InputFieldDescriptor.cs b/src/HotChocolate/Core/src/Types/Types/Descriptors/InputFieldDescriptor.cs
@@ -92,7 +92,7 @@ public IInputFieldDescriptor Name(NameString value)
     }
 
     /// <inheritdoc />
-    public new IInputFieldDescriptor Deprecated(string reason)
+    public new IInputFieldDescriptor Deprecated(string? reason)
     {
         base.Deprecated(reason);
         return this;

diff --git a/src/HotChocolate/Core/test/Types.Tests/Types/InputObjectTypeTests.cs b/src/HotChocolate/Core/test/Types.Tests/Types/InputObjectTypeTests.cs
@@ -764,7 +764,7 @@ public class FieldNameInput
         {
             public string? YourFieldName { get; set; }
 
-            public string YourFieldname { get; set; }
+            public string YourFieldname { get; set; } = default!;
         }
 
         public class DeprecatedInputFields

diff --git a/src/HotChocolate/Core/test/Validation.Tests/package.json b/src/HotChocolate/Core/test/Validation.Tests/package.json
diff --git a/src/HotChocolate/Stitching/src/Stitching/Directives/SourceDirective.cs b/src/HotChocolate/Stitching/src/Stitching/Directives/SourceDirective.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace HotChocolate.Stitching
 {
     public class SourceDirective