Declare embedded structs first for better layout

Author: wravery

samples/client/MutateClient.h

@@ -64,7 +64,7 @@ enum class TaskState
 struct Variables
 {
 	struct CompleteTaskInput
-{
+	{
 		response::IdType id {};
 		std::optional<TaskState> testTaskState {};
 		std::optional<response::BooleanType> isComplete {};
@@ -88,7 +88,6 @@ struct Response
 		};
 
 		std::optional<completedTask_Task> completedTask {};
-
 		std::optional<response::StringType> clientMutationId {};
 	};
 

samples/client/QueryClient.h

@@ -127,8 +127,6 @@ struct Response
 		std::optional<std::vector<std::optional<edges_AppointmentEdge>>> edges {};
 	};
 
-	appointments_AppointmentConnection appointments {};
-
 	struct tasks_TaskConnection
 	{
 		struct edges_TaskEdge
@@ -147,8 +145,6 @@ struct Response
 		std::optional<std::vector<std::optional<edges_TaskEdge>>> edges {};
 	};
 
-	tasks_TaskConnection tasks {};
-
 	struct unreadCounts_FolderConnection
 	{
 		struct edges_FolderEdge
@@ -167,9 +163,6 @@ struct Response
 		std::optional<std::vector<std::optional<edges_FolderEdge>>> edges {};
 	};
 
-	unreadCounts_FolderConnection unreadCounts {};
-
-	TaskState testTaskState {};
 	struct anyType_UnionType
 	{
 		response::StringType _typename {};
@@ -181,6 +174,10 @@ struct Response
 		response::BooleanType isNow {};
 	};
 
+	appointments_AppointmentConnection appointments {};
+	tasks_TaskConnection tasks {};
+	unreadCounts_FolderConnection unreadCounts {};
+	TaskState testTaskState {};
 	std::vector<std::optional<anyType_UnionType>> anyType {};
 };
 

src/ClientGenerator.cpp

@@ -261,7 +261,7 @@ static_assert(graphql::internal::MinorVersion == )cpp"
 
 			headerFile << R"cpp(	struct )cpp" << _schemaLoader.getCppType(inputType->name())
 					   << R"cpp(
-{
+	{
 )cpp";
 
 			for (const auto& inputField : inputType->inputFields())
@@ -314,6 +314,11 @@ response::Value serializeVariables(Variables&& variables);
 		{
 			pendingSeparator.add();
 		}
+	}
+
+	for (const auto& responseField : responseType.fields)
+	{
+		pendingSeparator.reset();
 
 		headerFile << R"cpp(	)cpp"
 				   << RequestLoader::getOutputCppType(getResponseFieldCppType(responseField),
@@ -401,26 +406,29 @@ bool Generator::outputResponseFieldType(std::ostream& headerFile,
 			{
 				pendingSeparator.reset();
 
-				if (fieldNames.emplace(field.name).second)
+				if (fieldNames.emplace(field.name).second
+					&& outputResponseFieldType(headerFile, field, indent + 1))
 				{
-					if (outputResponseFieldType(headerFile, field, indent + 1))
-					{
-						pendingSeparator.add();
-					}
+					pendingSeparator.add();
+				}
+			}
 
+			fieldNames.clear();
+
+			for (const auto& field : responseField.children)
+			{
+				pendingSeparator.reset();
+
+				if (fieldNames.emplace(field.name).second)
+				{
 					headerFile << indentTabs << R"cpp(	)cpp"
 							   << RequestLoader::getOutputCppType(getResponseFieldCppType(field),
 									  field.modifiers)
 							   << R"cpp( )cpp" << field.cppName << R"cpp( {};
-)cpp";
-				}
-				else
-				{
-					headerFile << indentTabs << R"cpp(	// duplicate: )cpp" << field.cppName
-							   << R"cpp(
 )cpp";
 				}
 			}
+
 			break;
 		}
 
@@ -429,7 +437,6 @@ bool Generator::outputResponseFieldType(std::ostream& headerFile,
 	}
 
 	headerFile << indentTabs << R"cpp(};
-
 )cpp";
 
 	return true;
@@ -507,8 +514,8 @@ using namespace )cpp"
 			if (!variables.empty())
 			{
 				sourceFile << R"cpp(template <>
-response::Value ModifiedVariable<)cpp" << cppType
-						   << R"cpp(>::serialize()cpp" << cppType << R"cpp(&& value)
+response::Value ModifiedVariable<)cpp"
+						   << cppType << R"cpp(>::serialize()cpp" << cppType << R"cpp(&& value)
 {
 	response::Value result { response::Type::EnumValue };
 
@@ -530,8 +537,9 @@ response::Value ModifiedVariable<)cpp" << cppType
 			const auto cppType = _schemaLoader.getCppType(inputType->name());
 
 			sourceFile << R"cpp(template <>
-response::Value ModifiedVariable<Variables::)cpp" << cppType
-					   << R"cpp(>::serialize(Variables::)cpp" << cppType << R"cpp(&& inputValue)
+response::Value ModifiedVariable<Variables::)cpp"
+					   << cppType << R"cpp(>::serialize(Variables::)cpp" << cppType
+					   << R"cpp(&& inputValue)
 {
 	response::Value result { response::Type::Map };
 
@@ -565,8 +573,8 @@ response::Value ModifiedVariable<Variables::)cpp" << cppType
 		const auto cppType = _schemaLoader.getCppType(enumType->name());
 
 		sourceFile << R"cpp(template <>
-)cpp" << cppType << R"cpp( ModifiedResponse<)cpp" << cppType
-				   << R"cpp(>::parse(response::Value&& value)
+)cpp" << cppType << R"cpp( ModifiedResponse<)cpp"
+				   << cppType << R"cpp(>::parse(response::Value&& value)
 {
 	if (!value.maybe_enum())
 	{