Deduplicate enum and input types in schema namespace

Author: wravery

samples/client/benchmark/BenchmarkClient.cpp

@@ -58,6 +58,8 @@ const peg::ast& GetRequestObject() noexcept
 
 } // namespace benchmark
 
+using namespace benchmark;
+
 template <>
 query::Query::Response::appointments_AppointmentConnection::pageInfo_PageInfo ModifiedResponse<query::Query::Response::appointments_AppointmentConnection::pageInfo_PageInfo>::parse(response::Value&& response)
 {

samples/client/multiple/MultipleQueriesClient.cpp

@@ -107,8 +107,17 @@ 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,
+};
+
 } // namespace multiple
 
+using namespace multiple;
+
 template <>
 query::Appointments::Response::appointments_AppointmentConnection::edges_AppointmentEdge::node_Appointment ModifiedResponse<query::Appointments::Response::appointments_AppointmentConnection::edges_AppointmentEdge::node_Appointment>::parse(response::Value&& response)
 {
@@ -453,15 +462,8 @@ Response parseResponse(response::Value&& response)
 
 } // namespace query::UnreadCounts
 
-static const std::array<std::string_view, 4> s_namesTaskState = {
-	"New"sv,
-	"Started"sv,
-	"Complete"sv,
-	"Unassigned"sv,
-};
-
 template <>
-query::Miscellaneous::TaskState ModifiedResponse<query::Miscellaneous::TaskState>::parse(response::Value&& value)
+TaskState ModifiedResponse<TaskState>::parse(response::Value&& value)
 {
 	if (!value.maybe_enum())
 	{
@@ -475,7 +477,7 @@ query::Miscellaneous::TaskState ModifiedResponse<query::Miscellaneous::TaskState
 		throw std::logic_error { "not a valid TaskState value" };
 	}
 
-	return static_cast<query::Miscellaneous::TaskState>(itr - s_namesTaskState.cbegin());
+	return static_cast<TaskState>(itr - s_namesTaskState.cbegin());
 }
 
 template <>

samples/client/multiple/MultipleQueriesClient.h

@@ -106,6 +106,14 @@ const std::string& GetRequestText() noexcept;
 // Return a pre-parsed, pre-validated request object.
 const peg::ast& GetRequestObject() noexcept;
 
+enum class [[nodiscard]] TaskState
+{
+	New,
+	Started,
+	Complete,
+	Unassigned,
+};
+
 } // namespace multiple
 
 namespace query::Appointments {
@@ -222,13 +230,7 @@ using multiple::GetRequestObject;
 // Return the name of this operation in the shared request document.
 const std::string& GetOperationName() noexcept;
 
-enum class [[nodiscard]] TaskState
-{
-	New,
-	Started,
-	Complete,
-	Unassigned,
-};
+using multiple::TaskState;
 
 struct Response
 {

samples/client/mutate/MutateClient.cpp

@@ -51,23 +51,25 @@ const peg::ast& GetRequestObject() noexcept
 	return s_request;
 }
 
-} // namespace mutate
-
 static const std::array<std::string_view, 4> s_namesTaskState = {
 	"New"sv,
 	"Started"sv,
 	"Complete"sv,
 	"Unassigned"sv,
 };
 
+} // namespace mutate
+
+using namespace mutate;
+
 template <>
-constexpr bool isInputType<mutation::CompleteTaskMutation::Variables::CompleteTaskInput>() noexcept
+constexpr bool isInputType<CompleteTaskInput>() noexcept
 {
 	return true;
 }
 
 template <>
-response::Value ModifiedVariable<mutation::CompleteTaskMutation::TaskState>::serialize(mutation::CompleteTaskMutation::TaskState&& value)
+response::Value ModifiedVariable<TaskState>::serialize(TaskState&& value)
 {
 	response::Value result { response::Type::EnumValue };
 
@@ -77,20 +79,20 @@ response::Value ModifiedVariable<mutation::CompleteTaskMutation::TaskState>::ser
 }
 
 template <>
-response::Value ModifiedVariable<mutation::CompleteTaskMutation::Variables::CompleteTaskInput>::serialize(mutation::CompleteTaskMutation::Variables::CompleteTaskInput&& inputValue)
+response::Value ModifiedVariable<CompleteTaskInput>::serialize(CompleteTaskInput&& inputValue)
 {
 	response::Value result { response::Type::Map };
 
 	result.emplace_back(R"js(id)js"s, ModifiedVariable<response::IdType>::serialize(std::move(inputValue.id)));
-	result.emplace_back(R"js(testTaskState)js"s, ModifiedVariable<mutation::CompleteTaskMutation::TaskState>::serialize<TypeModifier::Nullable>(std::move(inputValue.testTaskState)));
+	result.emplace_back(R"js(testTaskState)js"s, ModifiedVariable<TaskState>::serialize<TypeModifier::Nullable>(std::move(inputValue.testTaskState)));
 	result.emplace_back(R"js(isComplete)js"s, ModifiedVariable<bool>::serialize<TypeModifier::Nullable>(std::move(inputValue.isComplete)));
 	result.emplace_back(R"js(clientMutationId)js"s, ModifiedVariable<std::string>::serialize<TypeModifier::Nullable>(std::move(inputValue.clientMutationId)));
 
 	return result;
 }
 
 template <>
-mutation::CompleteTaskMutation::TaskState ModifiedResponse<mutation::CompleteTaskMutation::TaskState>::parse(response::Value&& value)
+TaskState ModifiedResponse<TaskState>::parse(response::Value&& value)
 {
 	if (!value.maybe_enum())
 	{
@@ -104,7 +106,7 @@ mutation::CompleteTaskMutation::TaskState ModifiedResponse<mutation::CompleteTas
 		throw std::logic_error { "not a valid TaskState value" };
 	}
 
-	return static_cast<mutation::CompleteTaskMutation::TaskState>(itr - s_namesTaskState.cbegin());
+	return static_cast<TaskState>(itr - s_namesTaskState.cbegin());
 }
 
 template <>
@@ -179,7 +181,7 @@ response::Value serializeVariables(Variables&& variables)
 {
 	response::Value result { response::Type::Map };
 
-	result.emplace_back(R"js(input)js"s, ModifiedVariable<Variables::CompleteTaskInput>::serialize<TypeModifier::Nullable>(std::move(variables.input)));
+	result.emplace_back(R"js(input)js"s, ModifiedVariable<CompleteTaskInput>::serialize<TypeModifier::Nullable>(std::move(variables.input)));
 	result.emplace_back(R"js(skipClientMutationId)js"s, ModifiedVariable<bool>::serialize(std::move(variables.skipClientMutationId)));
 
 	return result;

samples/client/mutate/MutateClient.h

@@ -50,6 +50,22 @@ const std::string& GetRequestText() noexcept;
 // Return a pre-parsed, pre-validated request object.
 const peg::ast& GetRequestObject() noexcept;
 
+enum class [[nodiscard]] TaskState
+{
+	New,
+	Started,
+	Complete,
+	Unassigned,
+};
+
+struct CompleteTaskInput
+{
+	response::IdType id {};
+	std::optional<TaskState> testTaskState {};
+	std::optional<bool> isComplete {};
+	std::optional<std::string> clientMutationId {};
+};
+
 } // namespace mutate
 
 namespace mutation::CompleteTaskMutation {
@@ -60,24 +76,12 @@ using mutate::GetRequestObject;
 // Return the name of this operation in the shared request document.
 const std::string& GetOperationName() noexcept;
 
-enum class [[nodiscard]] TaskState
-{
-	New,
-	Started,
-	Complete,
-	Unassigned,
-};
+using mutate::TaskState;
+
+using mutate::CompleteTaskInput;
 
 struct Variables
 {
-	struct CompleteTaskInput
-	{
-		response::IdType id {};
-		std::optional<TaskState> testTaskState {};
-		std::optional<bool> isComplete {};
-		std::optional<std::string> clientMutationId {};
-	};
-
 	std::unique_ptr<CompleteTaskInput> input {};
 	bool skipClientMutationId {};
 };

samples/client/nestedinput/NestedInputClient.cpp

@@ -47,32 +47,34 @@ const peg::ast& GetRequestObject() noexcept
 
 } // namespace nestedinput
 
+using namespace nestedinput;
+
 template <>
-constexpr bool isInputType<query::testQuery::Variables::InputA>() noexcept
+constexpr bool isInputType<InputA>() noexcept
 {
 	return true;
 }
 
 template <>
-constexpr bool isInputType<query::testQuery::Variables::InputB>() noexcept
+constexpr bool isInputType<InputB>() noexcept
 {
 	return true;
 }
 
 template <>
-constexpr bool isInputType<query::testQuery::Variables::InputABCD>() noexcept
+constexpr bool isInputType<InputABCD>() noexcept
 {
 	return true;
 }
 
 template <>
-constexpr bool isInputType<query::testQuery::Variables::InputBC>() noexcept
+constexpr bool isInputType<InputBC>() noexcept
 {
 	return true;
 }
 
 template <>
-response::Value ModifiedVariable<query::testQuery::Variables::InputA>::serialize(query::testQuery::Variables::InputA&& inputValue)
+response::Value ModifiedVariable<InputA>::serialize(InputA&& inputValue)
 {
 	response::Value result { response::Type::Map };
 
@@ -82,7 +84,7 @@ response::Value ModifiedVariable<query::testQuery::Variables::InputA>::serialize
 }
 
 template <>
-response::Value ModifiedVariable<query::testQuery::Variables::InputB>::serialize(query::testQuery::Variables::InputB&& inputValue)
+response::Value ModifiedVariable<InputB>::serialize(InputB&& inputValue)
 {
 	response::Value result { response::Type::Map };
 
@@ -92,25 +94,25 @@ response::Value ModifiedVariable<query::testQuery::Variables::InputB>::serialize
 }
 
 template <>
-response::Value ModifiedVariable<query::testQuery::Variables::InputABCD>::serialize(query::testQuery::Variables::InputABCD&& inputValue)
+response::Value ModifiedVariable<InputABCD>::serialize(InputABCD&& inputValue)
 {
 	response::Value result { response::Type::Map };
 
 	result.emplace_back(R"js(d)js"s, ModifiedVariable<std::string>::serialize(std::move(inputValue.d)));
-	result.emplace_back(R"js(a)js"s, ModifiedVariable<query::testQuery::Variables::InputA>::serialize(std::move(inputValue.a)));
-	result.emplace_back(R"js(b)js"s, ModifiedVariable<query::testQuery::Variables::InputB>::serialize(std::move(inputValue.b)));
-	result.emplace_back(R"js(bc)js"s, ModifiedVariable<query::testQuery::Variables::InputBC>::serialize<TypeModifier::List>(std::move(inputValue.bc)));
+	result.emplace_back(R"js(a)js"s, ModifiedVariable<InputA>::serialize(std::move(inputValue.a)));
+	result.emplace_back(R"js(b)js"s, ModifiedVariable<InputB>::serialize(std::move(inputValue.b)));
+	result.emplace_back(R"js(bc)js"s, ModifiedVariable<InputBC>::serialize<TypeModifier::List>(std::move(inputValue.bc)));
 
 	return result;
 }
 
 template <>
-response::Value ModifiedVariable<query::testQuery::Variables::InputBC>::serialize(query::testQuery::Variables::InputBC&& inputValue)
+response::Value ModifiedVariable<InputBC>::serialize(InputBC&& inputValue)
 {
 	response::Value result { response::Type::Map };
 
 	result.emplace_back(R"js(c)js"s, ModifiedVariable<response::IdType>::serialize(std::move(inputValue.c)));
-	result.emplace_back(R"js(b)js"s, ModifiedVariable<query::testQuery::Variables::InputB>::serialize(std::move(inputValue.b)));
+	result.emplace_back(R"js(b)js"s, ModifiedVariable<InputB>::serialize(std::move(inputValue.b)));
 
 	return result;
 }
@@ -172,7 +174,7 @@ response::Value serializeVariables(Variables&& variables)
 {
 	response::Value result { response::Type::Map };
 
-	result.emplace_back(R"js(stream)js"s, ModifiedVariable<Variables::InputABCD>::serialize(std::move(variables.stream)));
+	result.emplace_back(R"js(stream)js"s, ModifiedVariable<InputABCD>::serialize(std::move(variables.stream)));
 
 	return result;
 }

samples/client/nestedinput/NestedInputClient.h

@@ -44,6 +44,32 @@ const std::string& GetRequestText() noexcept;
 // Return a pre-parsed, pre-validated request object.
 const peg::ast& GetRequestObject() noexcept;
 
+struct InputA
+{
+	bool a {};
+};
+
+struct InputB
+{
+	double b {};
+};
+
+struct InputBC;
+
+struct InputABCD
+{
+	std::string d {};
+	InputA a {};
+	InputB b {};
+	std::vector<InputBC> bc {};
+};
+
+struct InputBC
+{
+	response::IdType c {};
+	InputB b {};
+};
+
 } // namespace nestedinput
 
 namespace query::testQuery {
@@ -54,34 +80,13 @@ using nestedinput::GetRequestObject;
 // Return the name of this operation in the shared request document.
 const std::string& GetOperationName() noexcept;
 
+using nestedinput::InputA;
+using nestedinput::InputB;
+using nestedinput::InputABCD;
+using nestedinput::InputBC;
+
 struct Variables
 {
-	struct InputA
-	{
-		bool a {};
-	};
-
-	struct InputB
-	{
-		double b {};
-	};
-
-	struct InputBC;
-
-	struct InputABCD
-	{
-		std::string d {};
-		InputA a {};
-		InputB b {};
-		std::vector<InputBC> bc {};
-	};
-
-	struct InputBC
-	{
-		response::IdType c {};
-		InputB b {};
-	};
-
 	InputABCD stream {};
 };