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

Author: wravery

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"
 

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"
 

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"
 

src/SchemaGenerator.cpp

@@ -575,10 +575,24 @@ bool Generator::outputSource() const noexcept
 
 	if (!_loader.isIntrospection())
 	{
-		sourceFile << R"cpp(#include ")cpp" << fs::path(_objectHeaderPath).filename().string()
-				   << R"cpp("
+		if (!_options.separateFiles)
+		{
+
+			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"