Include fewer headers and rely on forward declaration in ...Schema.h

wravery · wravery · commit 835f9a0cdf7d · 2021-12-08T17:29:30.000-08:00
diff --git a/samples/learn/HeroData.cpp b/samples/learn/HeroData.cpp
@@ -6,6 +6,8 @@
 #include "DroidData.h"
 #include "HumanData.h"
 
+#include "CharacterObject.h"
+
 namespace graphql::learn {
 
 std::shared_ptr<object::Character> make_hero(const SharedHero& hero) noexcept
diff --git a/samples/learn/schema/DroidObject.h b/samples/learn/schema/DroidObject.h
@@ -10,8 +10,6 @@
 
 #include "StarWarsSchema.h"
 
-#include "CharacterObject.h"
-
 namespace graphql::learn::object {
 namespace implements {
 
diff --git a/samples/learn/schema/HumanObject.h b/samples/learn/schema/HumanObject.h
@@ -10,8 +10,6 @@
 
 #include "StarWarsSchema.h"
 
-#include "CharacterObject.h"
-
 namespace graphql::learn::object {
 namespace implements {
 
diff --git a/samples/learn/schema/StarWarsSchema.cpp b/samples/learn/schema/StarWarsSchema.cpp
@@ -3,7 +3,8 @@
 
 // WARNING! Do not edit this file manually, your changes will be overwritten.
 
-#include "StarWarsObjects.h"
+#include "QueryObject.h"
+#include "MutationObject.h"
 
 #include "graphqlservice/introspection/Introspection.h"
 
diff --git a/samples/today/separate/AppointmentObject.h b/samples/today/separate/AppointmentObject.h
@@ -10,9 +10,6 @@
 
 #include "TodaySchema.h"
 
-#include "NodeObject.h"
-#include "UnionTypeObject.h"
-
 namespace graphql::today::object {
 namespace implements {
 
diff --git a/samples/today/separate/FolderObject.h b/samples/today/separate/FolderObject.h
@@ -10,9 +10,6 @@
 
 #include "TodaySchema.h"
 
-#include "NodeObject.h"
-#include "UnionTypeObject.h"
-
 namespace graphql::today::object {
 namespace implements {
 
diff --git a/samples/today/separate/TaskObject.h b/samples/today/separate/TaskObject.h
@@ -10,9 +10,6 @@
 
 #include "TodaySchema.h"
 
-#include "NodeObject.h"
-#include "UnionTypeObject.h"
-
 namespace graphql::today::object {
 namespace implements {
 
diff --git a/samples/today/separate/TodaySchema.cpp b/samples/today/separate/TodaySchema.cpp
@@ -3,7 +3,9 @@
 
 // WARNING! Do not edit this file manually, your changes will be overwritten.
 
-#include "TodayObjects.h"
+#include "QueryObject.h"
+#include "MutationObject.h"
+#include "SubscriptionObject.h"
 
 #include "graphqlservice/introspection/Introspection.h"
 
diff --git a/samples/today/separate_nointrospection/AppointmentObject.h b/samples/today/separate_nointrospection/AppointmentObject.h
@@ -10,9 +10,6 @@
 
 #include "TodaySchema.h"
 
-#include "NodeObject.h"
-#include "UnionTypeObject.h"
-
 namespace graphql::today::object {
 namespace implements {
 
diff --git a/samples/today/separate_nointrospection/FolderObject.h b/samples/today/separate_nointrospection/FolderObject.h
@@ -10,9 +10,6 @@
 
 #include "TodaySchema.h"
 
-#include "NodeObject.h"
-#include "UnionTypeObject.h"
-
 namespace graphql::today::object {
 namespace implements {
 
diff --git a/samples/today/separate_nointrospection/TaskObject.h b/samples/today/separate_nointrospection/TaskObject.h
@@ -10,9 +10,6 @@
 
 #include "TodaySchema.h"
 
-#include "NodeObject.h"
-#include "UnionTypeObject.h"
-
 namespace graphql::today::object {
 namespace implements {
 
diff --git a/samples/today/separate_nointrospection/TodaySchema.cpp b/samples/today/separate_nointrospection/TodaySchema.cpp
@@ -3,7 +3,9 @@
 
 // WARNING! Do not edit this file manually, your changes will be overwritten.
 
-#include "TodayObjects.h"
+#include "QueryObject.h"
+#include "MutationObject.h"
+#include "SubscriptionObject.h"
 
 #include "graphqlservice/introspection/Introspection.h"
 
diff --git a/src/SchemaGenerator.cpp b/src/SchemaGenerator.cpp
@@ -1170,10 +1170,24 @@ bool Generator::outputSource() const noexcept
 
 	if (!_loader.isIntrospection())
 	{
-		sourceFile << R"cpp(#include ")cpp" << fs::path(_objectHeaderPath).filename().string()
-				   << R"cpp("
+		if (_options.mergeFiles)
+		{
 
+			sourceFile << R"cpp(#include ")cpp" << fs::path(_headerPath).filename().string()
+					   << R"cpp("
+
+)cpp";
+		}
+		else
+		{
+			for (const auto& operation : _loader.getOperationTypes())
+			{
+				sourceFile << R"cpp(#include ")cpp" << operation.cppType << R"cpp(Object.h"
 )cpp";
+			}
+
+			sourceFile << std::endl;
+		}
 	}
 
 	sourceFile << R"cpp(#include "graphqlservice/introspection/Introspection.h"
@@ -2933,24 +2947,6 @@ using namespace std::literals;
 
 )cpp";
 
-		if (!objectType.interfaces.empty() || !objectType.unions.empty())
-		{
-			for (auto interfaceName : objectType.interfaces)
-			{
-				headerFile << R"cpp(#include ")cpp" << _loader.getSafeCppName(interfaceName)
-						   << R"cpp(Object.h"
-)cpp";
-			}
-
-			for (auto unionName : objectType.unions)
-			{
-				headerFile << R"cpp(#include ")cpp" << unionName << R"cpp(Object.h"
-)cpp";
-			}
-
-			headerFile << std::endl;
-		}
-
 		std::ostringstream ossNamespace;
 
 		ossNamespace << R"cpp(graphql::)cpp" << _loader.getSchemaNamespace();
