Use concepts and type traits instead of specializing service::isInputType() for each input type

cmake/version.txt

@@ -1 +1 @@
-4.3.1
+4.4.0

include/graphqlservice/GraphQLClient.h

@@ -70,19 +70,23 @@ enum class [[nodiscard]] TypeModifier {
 	List,
 };
 
-// Specialized to return true for all INPUT_OBJECT types.
+// These types are used as scalar variables even though they are represented with a class.
 template <typename Type>
-[[nodiscard]] constexpr bool isInputType() noexcept
-{
-	return false;
-}
+concept ScalarVariableClass = std::is_same_v<Type, std::string> || std::is_same_v<Type,
+	response::IdType> || std::is_same_v<Type, response::Value>;
 
-// Special-case an innermost nullable INPUT_OBJECT type.
+// Any non-scalar class used in a variable is a generated INPUT_OBJECT type.
+template <typename Type>
+concept InputVariableClass = std::is_class_v<Type> && !ScalarVariableClass<Type>;
+
+// Test if there are any non-None modifiers left.
 template <TypeModifier... Other>
-[[nodiscard]] constexpr bool onlyNoneModifiers() noexcept
-{
-	return (... && (Other == TypeModifier::None));
-}
+concept OnlyNoneModifiers = (... && (Other == TypeModifier::None));
+
+// Special-case an innermost nullable INPUT_OBJECT type.
+template <typename Type, TypeModifier... Other>
+concept InputVariableUniquePtr = InputVariableClass<Type> && OnlyNoneModifiers<Other...>;
+
 
 // Serialize variable input values with chained type modifiers which add nullable or list wrappers.
 template <typename Type>
@@ -94,8 +98,8 @@ struct ModifiedVariable
 	{
 		// Peel off modifiers until we get to the underlying type.
 		using type = typename std::conditional_t<TypeModifier::Nullable == Modifier,
-			typename std::conditional_t<isInputType<U>() && onlyNoneModifiers<Other...>(),
-				std::unique_ptr<U>, std::optional<typename VariableTraits<U, Other...>::type>>,
+			typename std::conditional_t<InputVariableUniquePtr<U, Other...>, std::unique_ptr<U>,
+				std::optional<typename VariableTraits<U, Other...>::type>>,
 			typename std::conditional_t<TypeModifier::List == Modifier,
 				std::vector<typename VariableTraits<U, Other...>::type>, U>>;
 	};
@@ -173,7 +177,7 @@ struct ModifiedVariable
 
 		if (nullableValue)
 		{
-			if constexpr (isInputType<Type>() && onlyNoneModifiers<Other...>())
+			if constexpr (InputVariableUniquePtr<Type, Other...>)
 			{
 				// Special case duplicating the std::unique_ptr.
 				result = std::make_unique<Type>(Type { *nullableValue });

include/graphqlservice/GraphQLService.h

@@ -592,19 +592,22 @@ enum class [[nodiscard]] TypeModifier {
 	List,
 };
 
-// Specialized to return true for all INPUT_OBJECT types.
+// These types are used as scalar arguments even though they are represented with a class.
 template <typename Type>
-[[nodiscard]] constexpr bool isInputType() noexcept
-{
-	return false;
-}
+concept ScalarArgumentClass = std::is_same_v<Type, std::string> || std::is_same_v<Type,
+	response::IdType> || std::is_same_v<Type, response::Value>;
 
-// Special-case an innermost nullable INPUT_OBJECT type.
+// Any non-scalar class used in an argument is a generated INPUT_OBJECT type.
+template <typename Type>
+concept InputArgumentClass = std::is_class_v<Type> && !ScalarArgumentClass<Type>;
+
+// Test if there are any non-None modifiers left.
 template <TypeModifier... Other>
-[[nodiscard]] constexpr bool onlyNoneModifiers() noexcept
-{
-	return (... && (Other == TypeModifier::None));
-}
+concept OnlyNoneModifiers = (... && (Other == TypeModifier::None));
+
+// Special-case an innermost nullable INPUT_OBJECT type.
+template <typename Type, TypeModifier... Other>
+concept InputArgumentUniquePtr = InputArgumentClass<Type> && OnlyNoneModifiers<Other...>;
 
 // Extract individual arguments with chained type modifiers which add nullable or list wrappers.
 // If the argument is not optional, use require and let it throw a schema_exception when the
@@ -619,8 +622,8 @@ struct ModifiedArgument
 	{
 		// Peel off modifiers until we get to the underlying type.
 		using type = typename std::conditional_t<TypeModifier::Nullable == Modifier,
-			typename std::conditional_t<isInputType<U>() && onlyNoneModifiers<Other...>(),
-				std::unique_ptr<U>, std::optional<typename ArgumentTraits<U, Other...>::type>>,
+			typename std::conditional_t<InputArgumentUniquePtr<U, Other...>, std::unique_ptr<U>,
+				std::optional<typename ArgumentTraits<U, Other...>::type>>,
 			typename std::conditional_t<TypeModifier::List == Modifier,
 				std::vector<typename ArgumentTraits<U, Other...>::type>, U>>;
 	};
@@ -699,7 +702,7 @@ struct ModifiedArgument
 
 		auto result = require<Other...>(name, arguments);
 
-		if constexpr (isInputType<Type>() && onlyNoneModifiers<Other...>())
+		if constexpr (InputArgumentUniquePtr<Type, Other...>)
 		{
 			return std::make_unique<decltype(result)>(std::move(result));
 		}
@@ -768,7 +771,7 @@ struct ModifiedArgument
 
 		if (nullableValue)
 		{
-			if constexpr (isInputType<Type>() && onlyNoneModifiers<Other...>())
+			if constexpr (InputArgumentUniquePtr<Type, Other...>)
 			{
 				// Special case duplicating the std::unique_ptr.
 				result = std::make_unique<Type>(Type { *nullableValue });

include/graphqlservice/internal/Version.h

@@ -10,11 +10,11 @@
 
 namespace graphql::internal {
 
-constexpr std::string_view FullVersion { "4.3.1" };
+constexpr std::string_view FullVersion { "4.4.0" };
 
 constexpr size_t MajorVersion = 4;
-constexpr size_t MinorVersion = 3;
-constexpr size_t PatchVersion = 1;
+constexpr size_t MinorVersion = 4;
+constexpr size_t PatchVersion = 0;
 
 } // namespace graphql::internal
 

include/graphqlservice/introspection/IntrospectionSchema.h

@@ -10,9 +10,9 @@
 
 #include "graphqlservice/internal/Schema.h"
 
-// Check if the library version is compatible with schemagen 4.3.0
+// Check if the library version is compatible with schemagen 4.4.0
 static_assert(graphql::internal::MajorVersion == 4, "regenerate with schemagen: major version mismatch");
-static_assert(graphql::internal::MinorVersion == 3, "regenerate with schemagen: minor version mismatch");
+static_assert(graphql::internal::MinorVersion == 4, "regenerate with schemagen: minor version mismatch");
 
 #include <array>
 #include <memory>

res/ClientGen.rc

@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,3,1,0
-#define GRAPHQL_RC_VERSION_STR "4.3.1"
+#define GRAPHQL_RC_VERSION     4,4,0,0
+#define GRAPHQL_RC_VERSION_STR "4.4.0"
 
 #ifndef DEBUG
 #define VER_DEBUG   0

res/SchemaGen.rc

@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,3,1,0
-#define GRAPHQL_RC_VERSION_STR "4.3.1"
+#define GRAPHQL_RC_VERSION     4,4,0,0
+#define GRAPHQL_RC_VERSION_STR "4.4.0"
 
 #ifndef DEBUG
 #define VER_DEBUG   0

res/graphqlclient_version.rc

@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,3,1,0
-#define GRAPHQL_RC_VERSION_STR "4.3.1"
+#define GRAPHQL_RC_VERSION     4,4,0,0
+#define GRAPHQL_RC_VERSION_STR "4.4.0"
 
 #ifndef DEBUG
 #define VER_DEBUG   0

res/graphqljson_version.rc

@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,3,1,0
-#define GRAPHQL_RC_VERSION_STR "4.3.1"
+#define GRAPHQL_RC_VERSION     4,4,0,0
+#define GRAPHQL_RC_VERSION_STR "4.4.0"
 
 #ifndef DEBUG
 #define VER_DEBUG   0

res/graphqlpeg_version.rc

@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,3,1,0
-#define GRAPHQL_RC_VERSION_STR "4.3.1"
+#define GRAPHQL_RC_VERSION     4,4,0,0
+#define GRAPHQL_RC_VERSION_STR "4.4.0"
 
 #ifndef DEBUG
 #define VER_DEBUG   0

res/graphqlresponse_version.rc

@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,3,1,0
-#define GRAPHQL_RC_VERSION_STR "4.3.1"
+#define GRAPHQL_RC_VERSION     4,4,0,0
+#define GRAPHQL_RC_VERSION_STR "4.4.0"
 
 #ifndef DEBUG
 #define VER_DEBUG   0

res/graphqlservice_version.rc

@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,3,1,0
-#define GRAPHQL_RC_VERSION_STR "4.3.1"
+#define GRAPHQL_RC_VERSION     4,4,0,0
+#define GRAPHQL_RC_VERSION_STR "4.4.0"
 
 #ifndef DEBUG
 #define VER_DEBUG   0

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/benchmark/BenchmarkClient.h

@@ -14,9 +14,9 @@
 
 #include "graphqlservice/internal/Version.h"
 
-// Check if the library version is compatible with clientgen 4.3.0
+// Check if the library version is compatible with clientgen 4.4.0
 static_assert(graphql::internal::MajorVersion == 4, "regenerate with clientgen: major version mismatch");
-static_assert(graphql::internal::MinorVersion == 3, "regenerate with clientgen: minor version mismatch");
+static_assert(graphql::internal::MinorVersion == 4, "regenerate with clientgen: minor version mismatch");
 
 #include <optional>
 #include <string>

samples/client/multiple/MultipleQueriesClient.cpp

@@ -5,6 +5,8 @@
 
 #include "MultipleQueriesClient.h"
 
+#include "graphqlservice/internal/SortedMap.h"
+
 #include <algorithm>
 #include <array>
 #include <sstream>
@@ -119,13 +121,6 @@ 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,
-};
-
 CompleteTaskInput::CompleteTaskInput(
 		response::IdType idArg,
 		std::optional<TaskState> testTaskStateArg,
@@ -521,22 +516,31 @@ Response parseResponse(response::Value&& response)
 
 } // namespace query::UnreadCounts
 
+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)
+};
+
 template <>
 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 <>
@@ -633,6 +637,13 @@ Response parseResponse(response::Value&& response)
 
 } // namespace query::Miscellaneous
 
+static const std::array<std::string_view, 4> s_namesTaskState = {
+	R"gql(New)gql"sv,
+	R"gql(Started)gql"sv,
+	R"gql(Complete)gql"sv,
+	R"gql(Unassigned)gql"sv
+};
+
 template <>
 response::Value ModifiedVariable<TaskState>::serialize(TaskState&& value)
 {

samples/client/multiple/MultipleQueriesClient.h

@@ -14,9 +14,9 @@
 
 #include "graphqlservice/internal/Version.h"
 
-// Check if the library version is compatible with clientgen 4.3.0
+// Check if the library version is compatible with clientgen 4.4.0
 static_assert(graphql::internal::MajorVersion == 4, "regenerate with clientgen: major version mismatch");
-static_assert(graphql::internal::MinorVersion == 3, "regenerate with clientgen: minor version mismatch");
+static_assert(graphql::internal::MinorVersion == 4, "regenerate with clientgen: minor version mismatch");
 
 #include <optional>
 #include <string>
@@ -146,12 +146,6 @@ struct [[nodiscard]] CompleteTaskInput
 
 } // namespace multiple
 
-template <>
-constexpr bool isInputType<multiple::CompleteTaskInput>() noexcept
-{
-	return true;
-}
-
 namespace query::Appointments {
 
 using multiple::GetRequestText;