Add enum serialize/parse and start on input serialize

Author: wravery

samples/CMakeLists.txt

@@ -171,7 +171,7 @@ target_compile_definitions(separateschema PUBLIC IMPL_SEPARATE_TODAY)
 target_include_directories(separateschema PUBLIC
   ${CMAKE_CURRENT_SOURCE_DIR}/../include
   ${CMAKE_CURRENT_SOURCE_DIR}/../PEGTL/include
-  separate)
+  ${CMAKE_CURRENT_SOURCE_DIR}/separate)
 
 if(GRAPHQL_UPDATE_SAMPLES)
   # wait for the sample update to complete
@@ -191,7 +191,7 @@ target_compile_definitions(separateschema_nointrospection PUBLIC IMPL_SEPARATE_T
 target_include_directories(separateschema_nointrospection PUBLIC
   ${CMAKE_CURRENT_SOURCE_DIR}/../include
   ${CMAKE_CURRENT_SOURCE_DIR}/../PEGTL/include
-  separate_nointrospection)
+  ${CMAKE_CURRENT_SOURCE_DIR}/separate_nointrospection)
 
 if(GRAPHQL_UPDATE_SAMPLES)
   # wait for the sample update to complete
@@ -274,12 +274,12 @@ endif()
 
 if(GRAPHQL_BUILD_TESTS)
   # tests
-  add_library(unifiedschema STATIC unified/TodaySchema.cpp)
+  add_library(unifiedschema STATIC ${CMAKE_CURRENT_SOURCE_DIR}/unified/TodaySchema.cpp)
   target_link_libraries(unifiedschema PUBLIC graphqlintrospection)
   target_include_directories(unifiedschema PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../include
     ${CMAKE_CURRENT_SOURCE_DIR}/../PEGTL/include
-    unified)
+    ${CMAKE_CURRENT_SOURCE_DIR}/unified)
 
   if(GRAPHQL_UPDATE_SAMPLES)
     # wait for the sample update to complete
@@ -291,12 +291,12 @@ if(GRAPHQL_BUILD_TESTS)
   target_include_directories(unifiedgraphql PUBLIC today)
   add_bigobj_flag(unifiedgraphql)
 
-  add_library(unifiedschema_nointrospection STATIC unified_nointrospection/TodaySchema.cpp)
+  add_library(unifiedschema_nointrospection STATIC ${CMAKE_CURRENT_SOURCE_DIR}/unified_nointrospection/TodaySchema.cpp)
   target_link_libraries(unifiedschema_nointrospection PUBLIC graphqlservice)
   target_include_directories(unifiedschema_nointrospection PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../include
     ${CMAKE_CURRENT_SOURCE_DIR}/../PEGTL/include
-    unified_nointrospection)
+    ${CMAKE_CURRENT_SOURCE_DIR}/unified_nointrospection)
 
   if(GRAPHQL_UPDATE_SAMPLES)
     # wait for the sample update to complete
@@ -309,13 +309,13 @@ if(GRAPHQL_BUILD_TESTS)
   add_bigobj_flag(unifiedgraphql_nointrospection)
 
   add_library(validationgraphql STATIC
-    validation/ValidationMock.cpp
-    validation/ValidationSchema.cpp)
+    ${CMAKE_CURRENT_SOURCE_DIR}/validation/ValidationMock.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/validation/ValidationSchema.cpp)
   target_link_libraries(validationgraphql PUBLIC graphqlintrospection)
   target_include_directories(validationgraphql PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../include
     ${CMAKE_CURRENT_SOURCE_DIR}/../PEGTL/include
-    validation)
+    ${CMAKE_CURRENT_SOURCE_DIR}/validation)
   add_bigobj_flag(validationgraphql)
 
   if(GRAPHQL_UPDATE_SAMPLES)
@@ -327,16 +327,16 @@ endif()
 if(GRAPHQL_BUILD_CLIENTGEN)
   # todayclient
   add_library(todayclient STATIC
-    client/QueryClient.cpp
-    client/MutateClient.cpp
-    client/SubscribeClient.cpp)
+    ${CMAKE_CURRENT_SOURCE_DIR}/client/QueryClient.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/client/MutateClient.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/client/SubscribeClient.cpp)
   target_link_libraries(todayclient PUBLIC
     graphqlpeg
     graphqlresponse)
   target_include_directories(todayclient PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../include
     ${CMAKE_CURRENT_SOURCE_DIR}/../PEGTL/include
-    client)
+    ${CMAKE_CURRENT_SOURCE_DIR}/client)
 
   if(GRAPHQL_UPDATE_SAMPLES)
     # wait for the sample update to complete

samples/client/MutateClient.cpp

@@ -5,11 +5,11 @@
 
 #include "MutateClient.h"
 
+#include "graphqlservice/GraphQLService.h"
+
 #include <algorithm>
 #include <array>
-#include <functional>
 #include <sstream>
-#include <stdexcept>
 #include <string_view>
 
 using namespace std::literals;
@@ -51,4 +51,67 @@ const peg::ast& GetRequestObject() noexcept
 	return s_request;
 }
 
+static const std::array<std::string_view, 4> s_namesTaskState = {
+	"New"sv,
+	"Started"sv,
+	"Complete"sv,
+	"Unassigned"sv,
+};
+
+response::Value serializeTaskState(TaskState value)
+{
+	response::Value result(response::Type::EnumValue);
+
+	result.set<response::StringType>(response::StringType { s_namesTaskState[static_cast<size_t>(value)] });
+
+	return result;
+}
+
+response::Value serializeCompleteTaskInput(Variables::CompleteTaskInput&& inputValue)
+{
+	response::Value result;
+
+	// response::IdType id;
+	// std::optional<TaskState> testTaskState;
+	// std::optional<response::BooleanType> isComplete;
+	// std::optional<response::StringType> clientMutationId;
+
+	return result;
+}
+
+response::Value serializeVariables(Variables&& variables)
+{
+	response::Value result;
+
+	// input = serializeCompleteTaskInput(std::move(variables.input));
+
+	return result;
+}
+
+TaskState parseTaskState(const response::Value& value)
+{
+	if (!value.maybe_enum())
+	{
+		throw service::schema_exception { { "not a valid TaskState value" } };
+	}
+
+	const auto itr = std::find(s_namesTaskState.cbegin(), s_namesTaskState.cend(), value.get<response::StringType>());
+
+	if (itr == s_namesTaskState.cend())
+	{
+		throw service::schema_exception { { "not a valid TaskState value" } };
+	}
+
+	return static_cast<TaskState>(itr - s_namesTaskState.cbegin());
+}
+
+Response parseResponse(response::Value&& response)
+{
+	Response result;
+
+	// completedTask_CompleteTaskPayload completedTask;
+
+	return result;
+}
+
 } /* namespace graphql::mutation::CompleteTaskMutation */

samples/client/MutateClient.h

@@ -24,7 +24,6 @@ static_assert(graphql::internal::MinorVersion == 6, "regenerate with clientgen:
 
 #include <optional>
 #include <string>
-#include <variant>
 #include <vector>
 
 namespace graphql::mutation::CompleteTaskMutation {
@@ -53,18 +52,29 @@ const std::string& GetRequestText() noexcept;
 // Return a pre-parsed, pre-validated request object.
 const peg::ast& GetRequestObject() noexcept;
 
-struct CompleteTaskInput
+enum class TaskState
 {
-	response::IdType id;
-	std::optional<response::BooleanType> isComplete;
-	std::optional<response::StringType> clientMutationId;
+	New,
+	Started,
+	Complete,
+	Unassigned,
 };
 
 struct Variables
 {
+	struct CompleteTaskInput
+{
+		response::IdType id;
+		std::optional<TaskState> testTaskState;
+		std::optional<response::BooleanType> isComplete;
+		std::optional<response::StringType> clientMutationId;
+	};
+
 	CompleteTaskInput input;
 };
 
+response::Value serializeVariables(Variables&& variables);
+
 struct Response
 {
 	struct completedTask_CompleteTaskPayload
@@ -84,6 +94,8 @@ struct Response
 	completedTask_CompleteTaskPayload completedTask;
 };
 
+Response parseResponse(response::Value&& response);
+
 } /* namespace graphql::mutation::CompleteTaskMutation */
 
 #endif // MUTATECLIENT_H

samples/client/QueryClient.cpp

@@ -5,11 +5,11 @@
 
 #include "QueryClient.h"
 
+#include "graphqlservice/GraphQLService.h"
+
 #include <algorithm>
 #include <array>
-#include <functional>
 #include <sstream>
-#include <stdexcept>
 #include <string_view>
 
 using namespace std::literals;
@@ -77,4 +77,40 @@ const peg::ast& GetRequestObject() noexcept
 	return s_request;
 }
 
+static const std::array<std::string_view, 4> s_namesTaskState = {
+	"New"sv,
+	"Started"sv,
+	"Complete"sv,
+	"Unassigned"sv,
+};
+
+TaskState parseTaskState(const response::Value& value)
+{
+	if (!value.maybe_enum())
+	{
+		throw service::schema_exception { { "not a valid TaskState value" } };
+	}
+
+	const auto itr = std::find(s_namesTaskState.cbegin(), s_namesTaskState.cend(), value.get<response::StringType>());
+
+	if (itr == s_namesTaskState.cend())
+	{
+		throw service::schema_exception { { "not a valid TaskState value" } };
+	}
+
+	return static_cast<TaskState>(itr - s_namesTaskState.cbegin());
+}
+
+Response parseResponse(response::Value&& response)
+{
+	Response result;
+
+	// appointments_AppointmentConnection appointments;
+	// tasks_TaskConnection tasks;
+	// unreadCounts_FolderConnection unreadCounts;
+	// std::optional<TaskState> testTaskState;
+
+	return result;
+}
+
 } /* namespace graphql::query::Query */

samples/client/QueryClient.h

@@ -24,7 +24,6 @@ static_assert(graphql::internal::MinorVersion == 6, "regenerate with clientgen:
 
 #include <optional>
 #include <string>
-#include <variant>
 #include <vector>
 
 namespace graphql::query::Query {
@@ -153,6 +152,8 @@ struct Response
 	std::optional<TaskState> testTaskState;
 };
 
+Response parseResponse(response::Value&& response);
+
 } /* namespace graphql::query::Query */
 
 #endif // QUERYCLIENT_H

samples/client/SubscribeClient.cpp

@@ -5,11 +5,11 @@
 
 #include "SubscribeClient.h"
 
+#include "graphqlservice/GraphQLService.h"
+
 #include <algorithm>
 #include <array>
-#include <functional>
 #include <sstream>
-#include <stdexcept>
 #include <string_view>
 
 using namespace std::literals;
@@ -49,4 +49,13 @@ const peg::ast& GetRequestObject() noexcept
 	return s_request;
 }
 
+Response parseResponse(response::Value&& response)
+{
+	Response result;
+
+	// std::optional<nextAppointment_Appointment> nextAppointment;
+
+	return result;
+}
+
 } /* namespace graphql::subscription::TestSubscription */

samples/client/SubscribeClient.h

@@ -24,7 +24,6 @@ static_assert(graphql::internal::MinorVersion == 6, "regenerate with clientgen:
 
 #include <optional>
 #include <string>
-#include <variant>
 #include <vector>
 
 namespace graphql::subscription::TestSubscription {
@@ -64,6 +63,8 @@ struct Response
 	std::optional<nextAppointment_Appointment> nextAppointment;
 };
 
+Response parseResponse(response::Value&& response);
+
 } /* namespace graphql::subscription::TestSubscription */
 
 #endif // SUBSCRIBECLIENT_H

samples/schema.today.graphql

@@ -78,6 +78,7 @@ type FolderConnection {
 
 input CompleteTaskInput {
     id: ID!
+    testTaskState: TaskState
     isComplete: Boolean = true
     clientMutationId: String
 }