Stop generating the convenience header

Author: wravery

include/SchemaGenerator.h

@@ -38,7 +38,6 @@ class Generator
 	std::string getHeaderDir() const noexcept;
 	std::string getSourceDir() const noexcept;
 	std::string getHeaderPath() const noexcept;
-	std::string getObjectHeaderPath() const noexcept;
 	std::string getSourcePath() const noexcept;
 
 	bool outputHeader() const noexcept;
@@ -80,7 +79,6 @@ class Generator
 	const std::string _headerDir;
 	const std::string _sourceDir;
 	const std::string _headerPath;
-	const std::string _objectHeaderPath;
 	const std::string _sourcePath;
 };
 

samples/learn/schema/StarWarsObjects.h

@@ -53,7 +53,6 @@ Generator::Generator(std::optional<SchemaOptions>&& customSchema, GeneratorOptio
 	, _headerDir(getHeaderDir())
 	, _sourceDir(getSourceDir())
 	, _headerPath(getHeaderPath())
-	, _objectHeaderPath(getObjectHeaderPath())
 	, _sourcePath(getSourcePath())
 {
 }
@@ -90,19 +89,6 @@ std::string Generator::getHeaderPath() const noexcept
 	return fullPath.string();
 }
 
-std::string Generator::getObjectHeaderPath() const noexcept
-{
-	if (!_options.mergeFiles)
-	{
-		fs::path fullPath { _headerDir };
-
-		fullPath /= (std::string { _loader.getFilenamePrefix() } + "Objects.h");
-		return fullPath.string();
-	}
-
-	return _headerPath;
-}
-
 std::string Generator::getSourcePath() const noexcept
 {
 	fs::path fullPath { _sourceDir };
@@ -1731,8 +1717,6 @@ Operations::Operations()cpp";
 	{
 		sourceFile << std::endl;
 
-		const std::vector<std::string_view> emptyInterfaces {};
-
 		for (const auto& interfaceType : _loader.getInterfaceTypes())
 		{
 			if (!_options.mergeFiles)
@@ -2745,47 +2729,6 @@ std::vector<std::string> Generator::outputSeparateFiles() const noexcept
 		}
 	}
 
-	// Output a convenience header
-	std::ofstream objectHeaderFile(_objectHeaderPath, std::ios_base::trunc);
-	IncludeGuardScope includeGuard { objectHeaderFile,
-		fs::path(_objectHeaderPath).filename().string() };
-
-	objectHeaderFile << R"cpp(#include ")cpp" << fs::path(_headerPath).filename().string()
-					 << R"cpp("
-
-)cpp";
-
-	for (const auto& interfaceType : _loader.getInterfaceTypes())
-	{
-		const auto headerFilename = std::string(interfaceType.cppType) + "Object.h";
-
-		objectHeaderFile << R"cpp(#include ")cpp" << headerFilename << R"cpp("
-)cpp";
-	}
-
-	for (const auto& unionType : _loader.getUnionTypes())
-	{
-		const auto headerFilename = std::string(unionType.cppType) + "Object.h";
-
-		objectHeaderFile << R"cpp(#include ")cpp" << headerFilename << R"cpp("
-)cpp";
-	}
-
-	for (const auto& objectType : _loader.getObjectTypes())
-	{
-		const auto headerFilename = std::string(objectType.cppType) + "Object.h";
-
-		objectHeaderFile << R"cpp(#include ")cpp" << headerFilename << R"cpp("
-)cpp";
-	}
-
-	if (_options.verbose)
-	{
-		files.push_back({ _objectHeaderPath });
-	}
-
-	const std::vector<std::string_view> emptyInterfacesAndUnions {};
-
 	for (const auto& interfaceType : _loader.getInterfaceTypes())
 	{
 		const auto headerFilename = std::string(interfaceType.cppType) + "Object.h";