Don't declare unused names or values for enums

Author: wravery

samples/client/multiple/MultipleQueriesClient.cpp

@@ -121,20 +121,6 @@ const peg::ast& GetRequestObject() noexcept
 	return s_request;
 }
 
-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
-};
-
-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(
 		response::IdType idArg,
 		std::optional<TaskState> testTaskStateArg,
@@ -530,6 +516,13 @@ 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)
 {
@@ -644,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/mutate/MutateClient.cpp

@@ -54,20 +54,6 @@ const peg::ast& GetRequestObject() noexcept
 	return s_request;
 }
 
-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
-};
-
-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(
 		response::IdType idArg,
 		std::optional<TaskState> testTaskStateArg,
@@ -119,6 +105,13 @@ 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 ModifiedVariable<TaskState>::serialize(TaskState&& value)
 {
@@ -142,6 +135,13 @@ response::Value ModifiedVariable<CompleteTaskInput>::serialize(CompleteTaskInput
 	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 ModifiedResponse<TaskState>::parse(response::Value&& value)
 {

samples/client/query/QueryClient.cpp

@@ -102,12 +102,9 @@ const peg::ast& GetRequestObject() noexcept
 	return s_request;
 }
 
-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
-};
+} // namespace query
+
+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),
@@ -116,10 +113,6 @@ static const std::array<std::pair<std::string_view, TaskState>, 4> s_valuesTaskS
 	std::make_pair(R"gql(Unassigned)gql"sv, TaskState::Unassigned)
 };
 
-} // namespace query
-
-using namespace query;
-
 template <>
 TaskState ModifiedResponse<TaskState>::parse(response::Value&& value)
 {

src/ClientGenerator.cpp

@@ -601,75 +601,8 @@ using namespace std::literals;
 	outputGetRequestImplementation(sourceFile);
 
 	const auto& operations = _requestLoader.getOperations();
-	std::unordered_set<std::string_view> outputEnumNames;
 	std::unordered_set<std::string_view> outputInputMethods;
 
-	for (const auto& operation : operations)
-	{
-		for (const auto& enumType : _requestLoader.getReferencedEnums(operation))
-		{
-			const auto cppType = _schemaLoader.getCppType(enumType->name());
-
-			if (!outputEnumNames.insert(cppType).second)
-			{
-				continue;
-			}
-
-			pendingSeparator.reset();
-
-			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";
-
-			bool firstValue = true;
-
-			for (const auto& enumValue : enumValues)
-			{
-				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";
-
-			pendingSeparator.add();
-		}
-	}
-
 	for (const auto& operation : operations)
 	{
 		for (const auto& inputType : _requestLoader.getReferencedInputTypes(operation))
@@ -808,8 +741,10 @@ using namespace )cpp"
 
 	pendingSeparator.add();
 
+	std::unordered_set<std::string_view> outputEnumNames;
 	std::unordered_set<std::string_view> outputModifiedVariableEnum;
 	std::unordered_set<std::string_view> outputModifiedVariableInput;
+	std::unordered_set<std::string_view> outputEnumValues;
 	std::unordered_set<std::string_view> outputModifiedResponseEnum;
 
 	for (const auto& operation : operations)
@@ -827,24 +762,52 @@ using namespace )cpp"
 					continue;
 				}
 
+				if (outputEnumNames.insert(cppType).second)
+				{
+					pendingSeparator.reset();
+
+					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";
+
+					bool firstValue = true;
+
+					for (const auto& enumValue : enumValues)
+					{
+						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(};
+
+)cpp";
+				}
+
 				pendingSeparator.reset();
 
-				if (!variables.empty())
-				{
-					sourceFile << R"cpp(template <>
+				sourceFile << R"cpp(template <>
 response::Value ModifiedVariable<)cpp"
-							   << cppType << R"cpp(>::serialize()cpp" << cppType << R"cpp(&& value)
+						   << cppType << R"cpp(>::serialize()cpp" << cppType << R"cpp(&& value)
 {
 	response::Value result { response::Type::EnumValue };
 
 	result.set<std::string>(std::string { s_names)cpp"
-							   << cppType << R"cpp([static_cast<size_t>(value)] });
+						   << cppType << R"cpp([static_cast<size_t>(value)] });
 
 	return result;
 }
 )cpp";
-				}
-
 				pendingSeparator.add();
 			}
 
@@ -900,6 +863,40 @@ response::Value ModifiedVariable<)cpp"
 				continue;
 			}
 
+			if (outputEnumValues.insert(cppType).second)
+			{
+				pendingSeparator.reset();
+
+				const auto& enumValues = enumType->enumValues();
+
+				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";
+
+				bool 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";
+
+				pendingSeparator.add();
+			}
+
 			pendingSeparator.reset();
 
 			sourceFile << R"cpp(template <>