Added support for persisted queries to StrawberryShake

ChilliCream · Aug 31, 2022 · 4b7ad3c · 4b7ad3c
1 parent 3e6c7ac
commit 4b7ad3c
Show file tree

Hide file tree

Showing 9 changed files with 204 additions and 159 deletions.
diff --git a/src/StrawberryShake/MetaPackages/Blazor/MSBuild/StrawberryShake.Blazor.props b/src/StrawberryShake/MetaPackages/Blazor/MSBuild/StrawberryShake.Blazor.props
@@ -10,6 +10,11 @@
     <GraphQLRequestHash>md5</GraphQLRequestHash>
     <!--intermediate/project-->
     <GraphQLOutput>intermediate</GraphQLOutput>
+    <!--A relative path from the project root to where the persisted queries output dir-->
+    <GraphQLPersistedQueryOutput></GraphQLPersistedQueryOutput>
+    <!--default/relay-->
+    <GraphQLPersistedQueryFormat>default</GraphQLPersistedQueryFormat>
+    <!--enable/disable-->
     <GraphQLDebug>disable</GraphQLDebug>
   </PropertyGroup>
 

diff --git a/src/StrawberryShake/MetaPackages/Common/MSBuild/StrawberryShake.targets b/src/StrawberryShake/MetaPackages/Common/MSBuild/StrawberryShake.targets
@@ -22,16 +22,19 @@
     Condition="'@(GraphQL)' != ''">
     <PropertyGroup>
       <GraphQLCodeGenerationRoot>$(MSBuildProjectDirectory)\$(IntermediateOutputPath)berry\</GraphQLCodeGenerationRoot>
+      <GraphQLQueryGenerationRoot>$(MSBuildProjectDirectory)\$(GraphQLPersistedQueryFormat)</GraphQLQueryGenerationRoot>
     </PropertyGroup>
 
     <PropertyGroup>
       <GenCommand>dotnet $(GenTool) generate "$(MSBuildProjectDirectory)"</GenCommand>
       <GenCommand>$(GenCommand) -o "$(GraphQLCodeGenerationRoot)"</GenCommand>
       <GenCommand Condition="'$(RootNamespace)' != ''">$(GenCommand) -n "$(RootNamespace)"</GenCommand>
+      <GenCommand Condition="'$(GraphQLPersistedQueryOutput)' != ''">$(GenCommand) -q "$(GraphQLQueryGenerationRoot)"</GenCommand>
       <GenCommand Condition="'$(GraphQLRequestHash)' != ''">$(GenCommand) -a "$(GraphQLRequestHash)"</GenCommand>
       <GenCommand Condition="'$(GraphQLStrictSchemaValidation)' != 'enable'">$(GenCommand) -s</GenCommand>
       <GenCommand Condition="'$(GraphQLClientStore)' != 'enable'">$(GenCommand) -t</GenCommand>
       <GenCommand Condition="'$(GraphQLRazorComponents)' == 'enable'">$(GenCommand) -r</GenCommand>
+      <GenCommand Condition="'$(GraphQLPersistedQueryFormat)' == 'relay'">$(GenCommand) --relayFormat</GenCommand>
     </PropertyGroup>
 
     <Message Text="MSBuildProjectDirectory: $(MSBuildProjectDirectory)" Importance="High" Condition="'$(GraphQLDebug)' == 'enable'" />

diff --git a/src/StrawberryShake/MetaPackages/Maui/MSBuild/StrawberryShake.Maui.props b/src/StrawberryShake/MetaPackages/Maui/MSBuild/StrawberryShake.Maui.props
@@ -10,6 +10,11 @@
     <GraphQLRequestHash>md5</GraphQLRequestHash>
     <!--intermediate/project-->
     <GraphQLOutput>intermediate</GraphQLOutput>
+    <!--A relative path from the project root to where the persisted queries output dir-->
+    <GraphQLPersistedQueryOutput></GraphQLPersistedQueryOutput>
+    <!--default/relay-->
+    <GraphQLPersistedQueryFormat>default</GraphQLPersistedQueryFormat>
+    <!--enable/disable-->
     <GraphQLDebug>disable</GraphQLDebug>
   </PropertyGroup>
 

diff --git a/src/StrawberryShake/MetaPackages/Server/MSBuild/StrawberryShake.Server.props b/src/StrawberryShake/MetaPackages/Server/MSBuild/StrawberryShake.Server.props
@@ -10,6 +10,11 @@
     <GraphQLRequestHash>md5</GraphQLRequestHash>
     <!--intermediate/project-->
     <GraphQLOutput>intermediate</GraphQLOutput>
+    <!--A relative path from the project root to where the persisted queries output dir-->
+    <GraphQLPersistedQueryOutput></GraphQLPersistedQueryOutput>
+    <!--default/relay-->
+    <GraphQLPersistedQueryFormat>default</GraphQLPersistedQueryFormat>
+    <!--enable/disable-->
     <GraphQLDebug>disable</GraphQLDebug>
   </PropertyGroup>
 

diff --git a/src/StrawberryShake/Tooling/.vscode/launch.json b/src/StrawberryShake/Tooling/.vscode/launch.json
@@ -13,11 +13,13 @@
         "generate",
         "/Users/michael/local/play/StrawberryBuildTests",
         "-o /Users/michael/local/play/StrawberryBuildTests/obj/Debug/net7.0/berry/",
+        "-q /Users/michael/local/play/StrawberryBuildTests/obj/Debug/net7.0/berry/q",
          "-n StrawberryBuildTests", 
          "-a md5", 
          "-s", 
          "-t", 
-         "-r"
+         "-r",
+         "--relayFormat"
       ],
       "cwd": "${workspaceFolder}/src/dotnet-graphql",
       "console": "internalConsole",

diff --git a/src/StrawberryShake/Tooling/src/dotnet-graphql/ExportCommand.cs b/src/StrawberryShake/Tooling/src/dotnet-graphql/ExportCommand.cs