feat(sharetypes): enable shared types for client benchmark

Author: wravery

samples/client/CMakeLists.txt

@@ -15,7 +15,6 @@ if(GRAPHQL_BUILD_MODULES)
   # client_benchmark
   add_executable(client_benchmark benchmark.cpp)
   target_link_libraries(client_benchmark PRIVATE
-    todaygraphql
     benchmark_client)
 
   if(WIN32 AND BUILD_SHARED_LIBS)

samples/client/benchmark.cpp

@@ -16,8 +16,7 @@ import GraphQL.Client;
 import GraphQL.Service;
 
 import GraphQL.Today.Mock;
-
-import GraphQL.Benchmark.BenchmarkClient;
+import GraphQL.Today.TodayClient;
 
 using namespace graphql;
 
@@ -93,7 +92,7 @@ int main(int argc, char** argv)
 
 	try
 	{
-		using namespace benchmark::client::query::Query;
+		using namespace today::client::query::Query;
 
 		auto query = GetRequestObject();
 		const auto& name = GetOperationName();

samples/client/benchmark/CMakeLists.txt

@@ -7,7 +7,8 @@ cmake_minimum_required(VERSION 3.28)
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/cppgraphqlgen-functions.cmake)
 
 if(GRAPHQL_UPDATE_SAMPLES AND GRAPHQL_BUILD_CLIENTGEN)
-  update_graphql_client_files(benchmark ../../today/schema.today.graphql client.benchmark.today.graphql Benchmark benchmark)
+  update_graphql_client_files(benchmark ../../today/schema.today.graphql client.benchmark.today.graphql Today today --shared-types)
 endif()
 
 add_graphql_client_target(benchmark)
+target_link_libraries(benchmark_client PRIVATE todaygraphql)

…les/client/benchmark/BenchmarkClient.cpp samples/client/benchmark/TodayClient.cppsamples/client/benchmark/BenchmarkClient.cpp renamed to samples/client/benchmark/TodayClient.cpp samples/client/benchmark/BenchmarkClient.cpp renamed to samples/client/benchmark/TodayClient.cpp

@@ -3,7 +3,7 @@
 
 // WARNING! Do not edit this file manually, your changes will be overwritten.
 
-#include "BenchmarkClient.h"
+#include "TodayClient.h"
 
 #include "graphqlservice/internal/SortedMap.h"
 
@@ -17,7 +17,7 @@
 using namespace std::literals;
 
 namespace graphql {
-namespace benchmark {
+namespace today {
 namespace client {
 
 const std::string& GetRequestText() noexcept
@@ -61,15 +61,15 @@ const peg::ast& GetRequestObject() noexcept
 }
 
 } // namespace client
-} // namespace benchmark
+} // namespace today
 namespace client {
 
-using namespace benchmark;
+using namespace today;
 
 template <>
-graphql::benchmark::client::query::Query::Response::appointments_AppointmentConnection::pageInfo_PageInfo Response<graphql::benchmark::client::query::Query::Response::appointments_AppointmentConnection::pageInfo_PageInfo>::parse(response::Value&& response)
+graphql::today::client::query::Query::Response::appointments_AppointmentConnection::pageInfo_PageInfo Response<graphql::today::client::query::Query::Response::appointments_AppointmentConnection::pageInfo_PageInfo>::parse(response::Value&& response)
 {
-	graphql::benchmark::client::query::Query::Response::appointments_AppointmentConnection::pageInfo_PageInfo result;
+	graphql::today::client::query::Query::Response::appointments_AppointmentConnection::pageInfo_PageInfo result;
 
 	if (response.type() == response::Type::Map)
 	{
@@ -89,9 +89,9 @@ graphql::benchmark::client::query::Query::Response::appointments_AppointmentConn
 }
 
 template <>
-graphql::benchmark::client::query::Query::Response::appointments_AppointmentConnection::edges_AppointmentEdge::node_Appointment Response<graphql::benchmark::client::query::Query::Response::appointments_AppointmentConnection::edges_AppointmentEdge::node_Appointment>::parse(response::Value&& response)
+graphql::today::client::query::Query::Response::appointments_AppointmentConnection::edges_AppointmentEdge::node_Appointment Response<graphql::today::client::query::Query::Response::appointments_AppointmentConnection::edges_AppointmentEdge::node_Appointment>::parse(response::Value&& response)
 {
-	graphql::benchmark::client::query::Query::Response::appointments_AppointmentConnection::edges_AppointmentEdge::node_Appointment result;
+	graphql::today::client::query::Query::Response::appointments_AppointmentConnection::edges_AppointmentEdge::node_Appointment result;
 
 	if (response.type() == response::Type::Map)
 	{
@@ -126,9 +126,9 @@ graphql::benchmark::client::query::Query::Response::appointments_AppointmentConn
 }
 
 template <>
-graphql::benchmark::client::query::Query::Response::appointments_AppointmentConnection::edges_AppointmentEdge Response<graphql::benchmark::client::query::Query::Response::appointments_AppointmentConnection::edges_AppointmentEdge>::parse(response::Value&& response)
+graphql::today::client::query::Query::Response::appointments_AppointmentConnection::edges_AppointmentEdge Response<graphql::today::client::query::Query::Response::appointments_AppointmentConnection::edges_AppointmentEdge>::parse(response::Value&& response)
 {
-	graphql::benchmark::client::query::Query::Response::appointments_AppointmentConnection::edges_AppointmentEdge result;
+	graphql::today::client::query::Query::Response::appointments_AppointmentConnection::edges_AppointmentEdge result;
 
 	if (response.type() == response::Type::Map)
 	{
@@ -138,7 +138,7 @@ graphql::benchmark::client::query::Query::Response::appointments_AppointmentConn
 		{
 			if (member.first == R"js(node)js"sv)
 			{
-				result.node = ModifiedResponse<graphql::benchmark::client::query::Query::Response::appointments_AppointmentConnection::edges_AppointmentEdge::node_Appointment>::parse<TypeModifier::Nullable>(std::move(member.second));
+				result.node = ModifiedResponse<graphql::today::client::query::Query::Response::appointments_AppointmentConnection::edges_AppointmentEdge::node_Appointment>::parse<TypeModifier::Nullable>(std::move(member.second));
 				continue;
 			}
 		}
@@ -148,9 +148,9 @@ graphql::benchmark::client::query::Query::Response::appointments_AppointmentConn
 }
 
 template <>
-graphql::benchmark::client::query::Query::Response::appointments_AppointmentConnection Response<graphql::benchmark::client::query::Query::Response::appointments_AppointmentConnection>::parse(response::Value&& response)
+graphql::today::client::query::Query::Response::appointments_AppointmentConnection Response<graphql::today::client::query::Query::Response::appointments_AppointmentConnection>::parse(response::Value&& response)
 {
-	graphql::benchmark::client::query::Query::Response::appointments_AppointmentConnection result;
+	graphql::today::client::query::Query::Response::appointments_AppointmentConnection result;
 
 	if (response.type() == response::Type::Map)
 	{
@@ -160,12 +160,12 @@ graphql::benchmark::client::query::Query::Response::appointments_AppointmentConn
 		{
 			if (member.first == R"js(pageInfo)js"sv)
 			{
-				result.pageInfo = ModifiedResponse<graphql::benchmark::client::query::Query::Response::appointments_AppointmentConnection::pageInfo_PageInfo>::parse(std::move(member.second));
+				result.pageInfo = ModifiedResponse<graphql::today::client::query::Query::Response::appointments_AppointmentConnection::pageInfo_PageInfo>::parse(std::move(member.second));
 				continue;
 			}
 			if (member.first == R"js(edges)js"sv)
 			{
-				result.edges = ModifiedResponse<graphql::benchmark::client::query::Query::Response::appointments_AppointmentConnection::edges_AppointmentEdge>::parse<TypeModifier::Nullable, TypeModifier::List, TypeModifier::Nullable>(std::move(member.second));
+				result.edges = ModifiedResponse<graphql::today::client::query::Query::Response::appointments_AppointmentConnection::edges_AppointmentEdge>::parse<TypeModifier::Nullable, TypeModifier::List, TypeModifier::Nullable>(std::move(member.second));
 				continue;
 			}
 		}
@@ -176,7 +176,7 @@ graphql::benchmark::client::query::Query::Response::appointments_AppointmentConn
 
 } // namespace client
 
-namespace benchmark::client::query::Query {
+namespace today::client::query::Query {
 
 const std::string& GetOperationName() noexcept
 {
@@ -228,5 +228,5 @@ Response parseResponse(response::Value&& response)
 	return Query::parseResponse(std::move(response));
 }
 
-} // namespace benchmark::client::query::Query
+} // namespace today::client::query::Query
 } // namespace graphql

…mples/client/benchmark/BenchmarkClient.h samples/client/benchmark/TodayClient.hsamples/client/benchmark/BenchmarkClient.h renamed to samples/client/benchmark/TodayClient.h samples/client/benchmark/BenchmarkClient.h renamed to samples/client/benchmark/TodayClient.h

@@ -5,15 +5,17 @@
 
 #pragma once
 
-#ifndef BENCHMARKCLIENT_H
-#define BENCHMARKCLIENT_H
+#ifndef TODAYCLIENT_H
+#define TODAYCLIENT_H
 
 #include "graphqlservice/GraphQLClient.h"
 #include "graphqlservice/GraphQLParse.h"
 #include "graphqlservice/GraphQLResponse.h"
 
 #include "graphqlservice/internal/Version.h"
 
+#include "TodaySchema.h"
+
 #include <optional>
 #include <string>
 #include <vector>
@@ -22,7 +24,7 @@
 static_assert(graphql::internal::MajorVersion == 5, "regenerate with clientgen: major version mismatch");
 static_assert(graphql::internal::MinorVersion == 0, "regenerate with clientgen: minor version mismatch");
 
-namespace graphql::benchmark {
+namespace graphql::today {
 
 /// # Operation: query (unnamed)
 /// ```graphql
@@ -55,8 +57,8 @@ namespace client {
 
 namespace query::Query {
 
-using graphql::benchmark::client::GetRequestText;
-using graphql::benchmark::client::GetRequestObject;
+using graphql::today::client::GetRequestText;
+using graphql::today::client::GetRequestObject;
 
 // Return the name of this operation in the shared request document.
 [[nodiscard("unnecessary call")]] const std::string& GetOperationName() noexcept;
@@ -105,6 +107,6 @@ struct Traits
 
 } // namespace query::Query
 } // namespace client
-} // namespace graphql::benchmark
+} // namespace graphql::today
 
-#endif // BENCHMARKCLIENT_H
+#endif // TODAYCLIENT_H

…les/client/benchmark/BenchmarkClient.ixx samples/client/benchmark/TodayClient.ixxsamples/client/benchmark/BenchmarkClient.ixx renamed to samples/client/benchmark/TodayClient.ixx samples/client/benchmark/BenchmarkClient.ixx renamed to samples/client/benchmark/TodayClient.ixx

@@ -5,11 +5,11 @@
 
 module;
 
-#include "BenchmarkClient.h"
+#include "TodayClient.h"
 
-export module GraphQL.Benchmark.BenchmarkClient;
+export module GraphQL.Today.TodayClient;
 
-export namespace graphql::benchmark {
+export namespace graphql::today {
 
 namespace client {
 
@@ -18,8 +18,8 @@ using client::GetRequestObject;
 
 namespace query::Query {
 
-using graphql::benchmark::client::GetRequestText;
-using graphql::benchmark::client::GetRequestObject;
+using graphql::today::client::GetRequestText;
+using graphql::today::client::GetRequestObject;
 using Query::GetOperationName;
 
 using Query::Response;
@@ -30,4 +30,4 @@ using Query::Traits;
 } // namespace query::Query
 
 } // namespace client
-} // namespace graphql::benchmark
+} // namespace graphql::today

samples/client/benchmark/benchmark_client_files

@@ -1 +1 @@
-BenchmarkClient.cpp
+TodayClient.cpp

src/ClientGenerator.cpp

@@ -1134,7 +1134,8 @@ using namespace )cpp" << _schemaLoader.getSchemaNamespace()
 
 				sourceFile << R"cpp(template <>
 response::Value Variable<)cpp"
-						   << cppType << R"cpp(>::serialize()cpp" << cppType << R"cpp(&& inputValue)
+						   << cppType << R"cpp(>::serialize()cpp" << cppType
+						   << R"cpp(&& inputValue)
 {
 	response::Value result { response::Type::Map };