Merge pull request #266 from wravery/sort-clientgen-enums

wravery · web-flow · commit e65267296d60 · 2022-06-06T10:05:48.000-07:00
Fix #265
diff --git a/cmake/version.txt b/cmake/version.txt
@@ -1 +1 @@
-4.5.0
+4.5.1
diff --git a/include/graphqlservice/internal/Version.h b/include/graphqlservice/internal/Version.h
@@ -10,11 +10,11 @@
 
 namespace graphql::internal {
 
-constexpr std::string_view FullVersion { "4.5.0" };
+constexpr std::string_view FullVersion { "4.5.1" };
 
 constexpr size_t MajorVersion = 4;
 constexpr size_t MinorVersion = 5;
-constexpr size_t PatchVersion = 0;
+constexpr size_t PatchVersion = 1;
 
 } // namespace graphql::internal
 
diff --git a/res/ClientGen.rc b/res/ClientGen.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,0,0
-#define GRAPHQL_RC_VERSION_STR "4.5.0"
+#define GRAPHQL_RC_VERSION     4,5,1,0
+#define GRAPHQL_RC_VERSION_STR "4.5.1"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/res/SchemaGen.rc b/res/SchemaGen.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,0,0
-#define GRAPHQL_RC_VERSION_STR "4.5.0"
+#define GRAPHQL_RC_VERSION     4,5,1,0
+#define GRAPHQL_RC_VERSION_STR "4.5.1"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/res/graphqlclient_version.rc b/res/graphqlclient_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,0,0
-#define GRAPHQL_RC_VERSION_STR "4.5.0"
+#define GRAPHQL_RC_VERSION     4,5,1,0
+#define GRAPHQL_RC_VERSION_STR "4.5.1"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/res/graphqljson_version.rc b/res/graphqljson_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,0,0
-#define GRAPHQL_RC_VERSION_STR "4.5.0"
+#define GRAPHQL_RC_VERSION     4,5,1,0
+#define GRAPHQL_RC_VERSION_STR "4.5.1"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/res/graphqlpeg_version.rc b/res/graphqlpeg_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,0,0
-#define GRAPHQL_RC_VERSION_STR "4.5.0"
+#define GRAPHQL_RC_VERSION     4,5,1,0
+#define GRAPHQL_RC_VERSION_STR "4.5.1"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/res/graphqlresponse_version.rc b/res/graphqlresponse_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,0,0
-#define GRAPHQL_RC_VERSION_STR "4.5.0"
+#define GRAPHQL_RC_VERSION     4,5,1,0
+#define GRAPHQL_RC_VERSION_STR "4.5.1"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/res/graphqlservice_version.rc b/res/graphqlservice_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,0,0
-#define GRAPHQL_RC_VERSION_STR "4.5.0"
+#define GRAPHQL_RC_VERSION     4,5,1,0
+#define GRAPHQL_RC_VERSION_STR "4.5.1"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/samples/client/multiple/MultipleQueriesClient.cpp b/samples/client/multiple/MultipleQueriesClient.cpp
@@ -516,13 +516,6 @@ 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 Response<TaskState>::parse(response::Value&& value)
 {
@@ -531,8 +524,15 @@ TaskState Response<TaskState>::parse(response::Value&& value)
 		throw std::logic_error { R"ex(not a valid TaskState value)ex" };
 	}
 
+	static const std::array<std::pair<std::string_view, TaskState>, 4> s_values = {
+		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)
+	};
+
 	const auto result = internal::sorted_map_lookup<internal::shorter_or_less>(
-		s_valuesTaskState,
+		s_values,
 		std::string_view { value.get<std::string>() });
 
 	if (!result)
@@ -637,19 +637,19 @@ 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 Variable<TaskState>::serialize(TaskState&& value)
 {
+	static const std::array<std::string_view, 4> s_names = {
+		R"gql(Unassigned)gql"sv,
+		R"gql(New)gql"sv,
+		R"gql(Started)gql"sv,
+		R"gql(Complete)gql"sv
+	};
+
 	response::Value result { response::Type::EnumValue };
 
-	result.set<std::string>(std::string { s_namesTaskState[static_cast<size_t>(value)] });
+	result.set<std::string>(std::string { s_names[static_cast<size_t>(value)] });
 
 	return result;
 }
diff --git a/samples/client/multiple/MultipleQueriesClient.h b/samples/client/multiple/MultipleQueriesClient.h
@@ -119,10 +119,10 @@ namespace multiple {
 
 enum class [[nodiscard]] TaskState
 {
+	Unassigned,
 	New,
 	Started,
 	Complete,
-	Unassigned,
 };
 
 struct [[nodiscard]] CompleteTaskInput
diff --git a/samples/client/mutate/MutateClient.cpp b/samples/client/mutate/MutateClient.cpp
@@ -25,7 +25,7 @@ const std::string& GetRequestText() noexcept
 		# Copyright (c) Microsoft Corporation. All rights reserved.
 		# Licensed under the MIT License.
 		
-		mutation CompleteTaskMutation($input: CompleteTaskInput = {id: "ZmFrZVRhc2tJZA==", isComplete: true, clientMutationId: "Hi There!"}, $skipClientMutationId: Boolean!) {
+		mutation CompleteTaskMutation($input: CompleteTaskInput = {id: "ZmFrZVRhc2tJZA==", isComplete: true, clientMutationId: "Hi There!", testTaskState: Unassigned}, $skipClientMutationId: Boolean!) {
 		  completedTask: completeTask(input: $input) {
 		    completedTask: task {
 		      completedTaskId: id
@@ -105,19 +105,19 @@ CompleteTaskInput& CompleteTaskInput::operator=(CompleteTaskInput&& other) noexc
 
 using namespace mutate;
 
-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 Variable<TaskState>::serialize(TaskState&& value)
 {
+	static const std::array<std::string_view, 4> s_names = {
+		R"gql(Unassigned)gql"sv,
+		R"gql(New)gql"sv,
+		R"gql(Started)gql"sv,
+		R"gql(Complete)gql"sv
+	};
+
 	response::Value result { response::Type::EnumValue };
 
-	result.set<std::string>(std::string { s_namesTaskState[static_cast<size_t>(value)] });
+	result.set<std::string>(std::string { s_names[static_cast<size_t>(value)] });
 
 	return result;
 }
@@ -135,13 +135,6 @@ response::Value Variable<CompleteTaskInput>::serialize(CompleteTaskInput&& input
 	return result;
 }
 
-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 Response<TaskState>::parse(response::Value&& value)
 {
@@ -150,8 +143,15 @@ TaskState Response<TaskState>::parse(response::Value&& value)
 		throw std::logic_error { R"ex(not a valid TaskState value)ex" };
 	}
 
+	static const std::array<std::pair<std::string_view, TaskState>, 4> s_values = {
+		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)
+	};
+
 	const auto result = internal::sorted_map_lookup<internal::shorter_or_less>(
-		s_valuesTaskState,
+		s_values,
 		std::string_view { value.get<std::string>() });
 
 	if (!result)
diff --git a/samples/client/mutate/MutateClient.h b/samples/client/mutate/MutateClient.h
@@ -31,7 +31,7 @@ namespace graphql::client {
 /// # Copyright (c) Microsoft Corporation. All rights reserved.
 /// # Licensed under the MIT License.
 /// 
-/// mutation CompleteTaskMutation($input: CompleteTaskInput = {id: "ZmFrZVRhc2tJZA==", isComplete: true, clientMutationId: "Hi There!"}, $skipClientMutationId: Boolean!) {
+/// mutation CompleteTaskMutation($input: CompleteTaskInput = {id: "ZmFrZVRhc2tJZA==", isComplete: true, clientMutationId: "Hi There!", testTaskState: Unassigned}, $skipClientMutationId: Boolean!) {
 ///   completedTask: completeTask(input: $input) {
 ///     completedTask: task {
 ///       completedTaskId: id
@@ -52,10 +52,10 @@ namespace mutate {
 
 enum class [[nodiscard]] TaskState
 {
+	Unassigned,
 	New,
 	Started,
 	Complete,
-	Unassigned,
 };
 
 struct [[nodiscard]] CompleteTaskInput
diff --git a/samples/client/mutate/mutate.today.graphql b/samples/client/mutate/mutate.today.graphql
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-mutation CompleteTaskMutation($input: CompleteTaskInput = {id: "ZmFrZVRhc2tJZA==", isComplete: true, clientMutationId: "Hi There!"}, $skipClientMutationId: Boolean!) {
+mutation CompleteTaskMutation($input: CompleteTaskInput = {id: "ZmFrZVRhc2tJZA==", isComplete: true, clientMutationId: "Hi There!", testTaskState: Unassigned}, $skipClientMutationId: Boolean!) {
   completedTask: completeTask(input: $input) {
     completedTask: task {
       completedTaskId: id
diff --git a/samples/client/query/QueryClient.cpp b/samples/client/query/QueryClient.cpp
@@ -106,13 +106,6 @@ const peg::ast& GetRequestObject() noexcept
 
 using namespace query;
 
-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 Response<TaskState>::parse(response::Value&& value)
 {
@@ -121,8 +114,15 @@ TaskState Response<TaskState>::parse(response::Value&& value)
 		throw std::logic_error { R"ex(not a valid TaskState value)ex" };
 	}
 
+	static const std::array<std::pair<std::string_view, TaskState>, 4> s_values = {
+		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)
+	};
+
 	const auto result = internal::sorted_map_lookup<internal::shorter_or_less>(
-		s_valuesTaskState,
+		s_values,
 		std::string_view { value.get<std::string>() });
 
 	if (!result)
diff --git a/samples/client/query/QueryClient.h b/samples/client/query/QueryClient.h
@@ -100,10 +100,10 @@ namespace query {
 
 enum class [[nodiscard]] TaskState
 {
+	Unassigned,
 	New,
 	Started,
 	Complete,
-	Unassigned,
 };
 
 } // namespace query
diff --git a/samples/today/nointrospection/TodaySchema.cpp b/samples/today/nointrospection/TodaySchema.cpp
@@ -684,10 +684,10 @@ void AddTypesToSchema(const std::shared_ptr<schema::Schema>& schema)
 	schema->AddType(R"gql(Expensive)gql"sv, typeExpensive);
 
 	typeTaskState->AddEnumValues({
+		{ service::s_namesTaskState[static_cast<size_t>(today::TaskState::Unassigned)], R"md()md"sv, std::make_optional(R"md(Need to deprecate an [enum value](https://spec.graphql.org/October2021/#sec-Schema-Introspection.Deprecation))md"sv) },
 		{ service::s_namesTaskState[static_cast<size_t>(today::TaskState::New)], R"md()md"sv, std::nullopt },
 		{ service::s_namesTaskState[static_cast<size_t>(today::TaskState::Started)], R"md()md"sv, std::nullopt },
-		{ service::s_namesTaskState[static_cast<size_t>(today::TaskState::Complete)], R"md()md"sv, std::nullopt },
-		{ service::s_namesTaskState[static_cast<size_t>(today::TaskState::Unassigned)], R"md()md"sv, std::make_optional(R"md(Need to deprecate an [enum value](https://spec.graphql.org/October2021/#sec-Schema-Introspection.Deprecation))md"sv) }
+		{ service::s_namesTaskState[static_cast<size_t>(today::TaskState::Complete)], R"md()md"sv, std::nullopt }
 	});
 
 	typeCompleteTaskInput->AddInputValues({
diff --git a/samples/today/nointrospection/TodaySchema.h b/samples/today/nointrospection/TodaySchema.h
@@ -24,21 +24,21 @@ namespace today {
 
 enum class [[nodiscard]] TaskState
 {
+	Unassigned,
 	New,
 	Started,
-	Complete,
-	Unassigned
+	Complete
 };
 
 [[nodiscard]] constexpr auto getTaskStateNames() noexcept
 {
 	using namespace std::literals;
 
 	return std::array<std::string_view, 4> {
+		R"gql(Unassigned)gql"sv,
 		R"gql(New)gql"sv,
 		R"gql(Started)gql"sv,
-		R"gql(Complete)gql"sv,
-		R"gql(Unassigned)gql"sv
+		R"gql(Complete)gql"sv
 	};
 }
 
diff --git a/samples/today/schema.today.graphql b/samples/today/schema.today.graphql
@@ -117,12 +117,12 @@ type Subscription {
 scalar DateTime @specifiedBy(url: "https://en.wikipedia.org/wiki/ISO_8601")
 
 enum TaskState {
-    New
-    Started
-    Complete
     Unassigned @deprecated(
         reason:"""Need to deprecate an [enum value](https://spec.graphql.org/October2021/#sec-Schema-Introspection.Deprecation)"""
     )
+    New
+    Started
+    Complete
 }
 
 type Appointment implements Node {
diff --git a/samples/today/schema/TodaySchema.cpp b/samples/today/schema/TodaySchema.cpp
@@ -687,10 +687,10 @@ void AddTypesToSchema(const std::shared_ptr<schema::Schema>& schema)
 	schema->AddType(R"gql(Expensive)gql"sv, typeExpensive);
 
 	typeTaskState->AddEnumValues({
+		{ service::s_namesTaskState[static_cast<size_t>(today::TaskState::Unassigned)], R"md()md"sv, std::make_optional(R"md(Need to deprecate an [enum value](https://spec.graphql.org/October2021/#sec-Schema-Introspection.Deprecation))md"sv) },
 		{ service::s_namesTaskState[static_cast<size_t>(today::TaskState::New)], R"md()md"sv, std::nullopt },
 		{ service::s_namesTaskState[static_cast<size_t>(today::TaskState::Started)], R"md()md"sv, std::nullopt },
-		{ service::s_namesTaskState[static_cast<size_t>(today::TaskState::Complete)], R"md()md"sv, std::nullopt },
-		{ service::s_namesTaskState[static_cast<size_t>(today::TaskState::Unassigned)], R"md()md"sv, std::make_optional(R"md(Need to deprecate an [enum value](https://spec.graphql.org/October2021/#sec-Schema-Introspection.Deprecation))md"sv) }
+		{ service::s_namesTaskState[static_cast<size_t>(today::TaskState::Complete)], R"md()md"sv, std::nullopt }
 	});
 
 	typeCompleteTaskInput->AddInputValues({
diff --git a/samples/today/schema/TodaySchema.h b/samples/today/schema/TodaySchema.h
diff --git a/src/ClientGenerator.cpp b/src/ClientGenerator.cpp
