Port sorted_map_lookup for enums to clientgen

Author: wravery

samples/client/benchmark/BenchmarkClient.cpp

@@ -5,6 +5,8 @@
 
 #include "BenchmarkClient.h"
 
+#include "graphqlservice/internal/SortedMap.h"
+
 #include <algorithm>
 #include <array>
 #include <sstream>

samples/client/multiple/MultipleQueriesClient.cpp

@@ -5,6 +5,8 @@
 
 #include "MultipleQueriesClient.h"
 
+#include "graphqlservice/internal/SortedMap.h"
+
 #include <algorithm>
 #include <array>
 #include <sstream>
@@ -120,10 +122,17 @@ const peg::ast& GetRequestObject() noexcept
 }
 
 static const std::array<std::string_view, 4> s_namesTaskState = {
-	"New"sv,
-	"Started"sv,
-	"Complete"sv,
-	"Unassigned"sv,
+	R"gql(New)gql"sv,
+	R"gql(Started)gql"sv,
+	R"gql(Complete)gql"sv,
+	R"gql(Unassigned)gql"sv
+};
+
+static const std::array<std::pair<std::string_view, TaskState>, 4> s_valuesTaskState = {
+	std::make_pair(R"gql(New)gql"sv, TaskState::New),
+	std::make_pair(R"gql(Started)gql"sv, TaskState::Started),
+	std::make_pair(R"gql(Complete)gql"sv, TaskState::Complete),
+	std::make_pair(R"gql(Unassigned)gql"sv, TaskState::Unassigned)
 };
 
 CompleteTaskInput::CompleteTaskInput(
@@ -526,17 +535,19 @@ TaskState ModifiedResponse<TaskState>::parse(response::Value&& value)
 {
 	if (!value.maybe_enum())
 	{
-		throw std::logic_error { "not a valid TaskState value" };
+		throw std::logic_error {  R"ex(not a valid TaskState value)ex" };
 	}
 
-	const auto itr = std::find(s_namesTaskState.cbegin(), s_namesTaskState.cend(), value.release<std::string>());
+	const auto result = internal::sorted_map_lookup<internal::shorter_or_less>(
+		s_valuesTaskState,
+		std::string_view { value.get<std::string>() });
 
-	if (itr == s_namesTaskState.cend())
+	if (!result)
 	{
-		throw std::logic_error { "not a valid TaskState value" };
+		throw std::logic_error { { R"ex(not a valid TaskState value)ex" } };
 	}
 
-	return static_cast<TaskState>(itr - s_namesTaskState.cbegin());
+	return *result;
 }
 
 template <>

samples/client/mutate/MutateClient.cpp

@@ -5,6 +5,8 @@
 
 #include "MutateClient.h"
 
+#include "graphqlservice/internal/SortedMap.h"
+
 #include <algorithm>
 #include <array>
 #include <sstream>
@@ -53,10 +55,17 @@ const peg::ast& GetRequestObject() noexcept
 }
 
 static const std::array<std::string_view, 4> s_namesTaskState = {
-	"New"sv,
-	"Started"sv,
-	"Complete"sv,
-	"Unassigned"sv,
+	R"gql(New)gql"sv,
+	R"gql(Started)gql"sv,
+	R"gql(Complete)gql"sv,
+	R"gql(Unassigned)gql"sv
+};
+
+static const std::array<std::pair<std::string_view, TaskState>, 4> s_valuesTaskState = {
+	std::make_pair(R"gql(New)gql"sv, TaskState::New),
+	std::make_pair(R"gql(Started)gql"sv, TaskState::Started),
+	std::make_pair(R"gql(Complete)gql"sv, TaskState::Complete),
+	std::make_pair(R"gql(Unassigned)gql"sv, TaskState::Unassigned)
 };
 
 CompleteTaskInput::CompleteTaskInput(
@@ -138,17 +147,19 @@ TaskState ModifiedResponse<TaskState>::parse(response::Value&& value)
 {
 	if (!value.maybe_enum())
 	{
-		throw std::logic_error { "not a valid TaskState value" };
+		throw std::logic_error {  R"ex(not a valid TaskState value)ex" };
 	}
 
-	const auto itr = std::find(s_namesTaskState.cbegin(), s_namesTaskState.cend(), value.release<std::string>());
+	const auto result = internal::sorted_map_lookup<internal::shorter_or_less>(
+		s_valuesTaskState,
+		std::string_view { value.get<std::string>() });
 
-	if (itr == s_namesTaskState.cend())
+	if (!result)
 	{
-		throw std::logic_error { "not a valid TaskState value" };
+		throw std::logic_error { { R"ex(not a valid TaskState value)ex" } };
 	}
 
-	return static_cast<TaskState>(itr - s_namesTaskState.cbegin());
+	return *result;
 }
 
 template <>

samples/client/nestedinput/NestedInputClient.cpp

@@ -5,6 +5,8 @@
 
 #include "NestedInputClient.h"
 
+#include "graphqlservice/internal/SortedMap.h"
+
 #include <algorithm>
 #include <array>
 #include <sstream>

samples/client/query/QueryClient.cpp

@@ -5,6 +5,8 @@
 
 #include "QueryClient.h"
 
+#include "graphqlservice/internal/SortedMap.h"
+
 #include <algorithm>
 #include <array>
 #include <sstream>
@@ -101,10 +103,17 @@ const peg::ast& GetRequestObject() noexcept
 }
 
 static const std::array<std::string_view, 4> s_namesTaskState = {
-	"New"sv,
-	"Started"sv,
-	"Complete"sv,
-	"Unassigned"sv,
+	R"gql(New)gql"sv,
+	R"gql(Started)gql"sv,
+	R"gql(Complete)gql"sv,
+	R"gql(Unassigned)gql"sv
+};
+
+static const std::array<std::pair<std::string_view, TaskState>, 4> s_valuesTaskState = {
+	std::make_pair(R"gql(New)gql"sv, TaskState::New),
+	std::make_pair(R"gql(Started)gql"sv, TaskState::Started),
+	std::make_pair(R"gql(Complete)gql"sv, TaskState::Complete),
+	std::make_pair(R"gql(Unassigned)gql"sv, TaskState::Unassigned)
 };
 
 } // namespace query
@@ -116,17 +125,19 @@ TaskState ModifiedResponse<TaskState>::parse(response::Value&& value)
 {
 	if (!value.maybe_enum())
 	{
-		throw std::logic_error { "not a valid TaskState value" };
+		throw std::logic_error {  R"ex(not a valid TaskState value)ex" };
 	}
 
-	const auto itr = std::find(s_namesTaskState.cbegin(), s_namesTaskState.cend(), value.release<std::string>());
+	const auto result = internal::sorted_map_lookup<internal::shorter_or_less>(
+		s_valuesTaskState,
+		std::string_view { value.get<std::string>() });
 
-	if (itr == s_namesTaskState.cend())
+	if (!result)
 	{
-		throw std::logic_error { "not a valid TaskState value" };
+		throw std::logic_error { { R"ex(not a valid TaskState value)ex" } };
 	}
 
-	return static_cast<TaskState>(itr - s_namesTaskState.cbegin());
+	return *result;
 }
 
 template <>

samples/client/subscribe/SubscribeClient.cpp

@@ -5,6 +5,8 @@
 
 #include "SubscribeClient.h"
 
+#include "graphqlservice/internal/SortedMap.h"
+
 #include <algorithm>
 #include <array>
 #include <sstream>

src/ClientGenerator.cpp

@@ -581,6 +581,8 @@ bool Generator::outputSource() const noexcept
 #include ")cpp" << _schemaLoader.getFilenamePrefix()
 			   << R"cpp(Client.h"
 
+#include "graphqlservice/internal/SortedMap.h"
+
 #include <algorithm>
 #include <array>
 #include <sstream>
@@ -618,16 +620,49 @@ using namespace std::literals;
 			const auto& enumValues = enumType->enumValues();
 
 			sourceFile << R"cpp(static const std::array<std::string_view, )cpp" << enumValues.size()
-					   << R"cpp(> s_names)cpp" << cppType << R"cpp( = {
-)cpp";
+					   << R"cpp(> s_names)cpp" << cppType << R"cpp( = {)cpp";
+
+			bool firstValue = true;
 
 			for (const auto& enumValue : enumValues)
 			{
-				sourceFile << R"cpp(	")cpp" << SchemaLoader::getSafeCppName(enumValue->name())
-						   << R"cpp("sv,
-)cpp";
+				if (!firstValue)
+				{
+					sourceFile << R"cpp(,)cpp";
+				}
+
+				firstValue = false;
+				sourceFile << R"cpp(
+	R"gql()cpp" << enumValue->name()
+						   << R"cpp()gql"sv)cpp";
+				pendingSeparator.add();
+			}
+
+			pendingSeparator.reset();
+			sourceFile << R"cpp(};
+
+static const std::array<std::pair<std::string_view, )cpp"
+					   << cppType << R"cpp(>, )cpp" << enumValues.size() << R"cpp(> s_values)cpp"
+					   << cppType << R"cpp( = {)cpp";
+
+			firstValue = true;
+
+			for (const auto& enumValue : enumValues)
+			{
+				if (!firstValue)
+				{
+					sourceFile << R"cpp(,)cpp";
+				}
+
+				firstValue = false;
+				sourceFile << R"cpp(
+	std::make_pair(R"gql()cpp"
+						   << enumValue->name() << R"cpp()gql"sv, )cpp" << cppType << R"cpp(::)cpp"
+						   << SchemaLoader::getSafeCppName(enumValue->name()) << R"cpp())cpp";
+				pendingSeparator.add();
 			}
 
+			pendingSeparator.reset();
 			sourceFile << R"cpp(};
 )cpp";
 
@@ -873,23 +908,22 @@ response::Value ModifiedVariable<)cpp"
 {
 	if (!value.maybe_enum())
 	{
-		throw std::logic_error { "not a valid )cpp"
-					   << cppType << R"cpp( value" };
+		throw std::logic_error {  R"ex(not a valid )cpp"
+					   << enumType->name() << R"cpp( value)ex" };
 	}
 
-	const auto itr = std::find(s_names)cpp"
-					   << cppType << R"cpp(.cbegin(), s_names)cpp" << cppType
-					   << R"cpp(.cend(), value.release<std::string>());
+	const auto result = internal::sorted_map_lookup<internal::shorter_or_less>(
+		s_values)cpp" << cppType
+					   << R"cpp(,
+		std::string_view { value.get<std::string>() });
 
-	if (itr == s_names)cpp"
-					   << cppType << R"cpp(.cend())
+	if (!result)
 	{
-		throw std::logic_error { "not a valid )cpp"
-					   << cppType << R"cpp( value" };
+		throw std::logic_error { { R"ex(not a valid )cpp"
+					   << enumType->name() << R"cpp( value)ex" } };
 	}
 
-	return static_cast<)cpp"
-					   << cppType << R"cpp(>(itr - s_names)cpp" << cppType << R"cpp(.cbegin());
+	return *result;
 }
 )cpp";