Forward declare object types earlier

Author: wravery

SchemaGenerator.cpp

@@ -1300,6 +1300,25 @@ struct )cpp" << inputType.type << R"cpp(
 
 	if (!_interfaceTypes.empty())
 	{
+		if (!_objectTypes.empty())
+		{
+			headerFile << R"cpp(
+namespace object {
+)cpp";
+
+			// Forward declare all of the object types so the interface types can reference them
+			for (const auto& objectType : _objectTypes)
+			{
+				headerFile << R"cpp(
+class )cpp" << objectType.type << R"cpp(;)cpp";
+			}
+
+			headerFile << R"cpp(
+
+} /* namespace object */
+)cpp";
+		}
+
 		// Forward declare all of the interface types
 		if (_interfaceTypes.size() > 1)
 		{
@@ -1337,9 +1356,11 @@ struct )cpp" << interfaceType.type << R"cpp(
 		headerFile << R"cpp(namespace object {
 )cpp";
 
-		if (_objectTypes.size() > 1)
+		if (_interfaceTypes.empty()
+			&& _objectTypes.size() > 1)
 		{
-			// Forward declare all of the object types
+			// Forward declare all of the object types if there were no interfaces so the
+			// object types can reference one another
 			for (const auto& objectType : _objectTypes)
 			{
 				headerFile << R"cpp(

samples/TodaySchema.h

@@ -34,11 +34,6 @@ struct CompleteTaskInput
 	std::unique_ptr<response::StringType> clientMutationId;
 };
 
-struct Node
-{
-	virtual std::future<std::vector<uint8_t>> getId(service::FieldParams&& params) const = 0;
-};
-
 namespace object {
 
 class Query;
@@ -57,6 +52,15 @@ class Task;
 class Folder;
 class NestedType;
 
+} /* namespace object */
+
+struct Node
+{
+	virtual std::future<std::vector<uint8_t>> getId(service::FieldParams&& params) const = 0;
+};
+
+namespace object {
+
 class Query
 	: public service::Object
 {