fix: add schemagen --prefix-headers option

microsoft · Oct 26, 2024 · 11426ca · 11426ca
1 parent 8d328c9
commit 11426ca
Show file tree

Hide file tree

Showing 116 changed files with 293 additions and 263 deletions.
diff --git a/include/SchemaGenerator.h b/include/SchemaGenerator.h
@@ -24,6 +24,7 @@ struct [[nodiscard("unnecessary construction")]] GeneratorOptions
 	const bool verbose = false;
 	const bool stubs = false;
 	const bool noIntrospection = false;
+	const bool prefixedHeaders = false;
 };
 
 class [[nodiscard("unnecessary construction")]] Generator

diff --git a/samples/today/TodayMock.cpp b/samples/today/TodayMock.cpp
@@ -3,13 +3,13 @@
 
 #include "TodayMock.h"
 
-#include "AppointmentConnectionObject.h"
-#include "CompleteTaskPayloadObject.h"
-#include "ExpensiveObject.h"
-#include "FolderConnectionObject.h"
-#include "NestedTypeObject.h"
-#include "TaskConnectionObject.h"
-#include "UnionTypeObject.h"
+#include "TodayAppointmentConnectionObject.h"
+#include "TodayCompleteTaskPayloadObject.h"
+#include "TodayExpensiveObject.h"
+#include "TodayFolderConnectionObject.h"
+#include "TodayNestedTypeObject.h"
+#include "TodayTaskConnectionObject.h"
+#include "TodayUnionTypeObject.h"
 
 #include <algorithm>
 #include <chrono>

diff --git a/samples/today/TodayMock.h b/samples/today/TodayMock.h
@@ -8,17 +8,17 @@
 
 #include "TodaySchema.h"
 
-#include "AppointmentEdgeObject.h"
-#include "AppointmentObject.h"
-#include "FolderEdgeObject.h"
-#include "FolderObject.h"
-#include "MutationObject.h"
-#include "NodeObject.h"
-#include "PageInfoObject.h"
-#include "QueryObject.h"
-#include "SubscriptionObject.h"
-#include "TaskEdgeObject.h"
-#include "TaskObject.h"
+#include "TodayAppointmentEdgeObject.h"
+#include "TodayAppointmentObject.h"
+#include "TodayFolderEdgeObject.h"
+#include "TodayFolderObject.h"
+#include "TodayMutationObject.h"
+#include "TodayNodeObject.h"
+#include "TodayPageInfoObject.h"
+#include "TodayQueryObject.h"
+#include "TodaySubscriptionObject.h"
+#include "TodayTaskEdgeObject.h"
+#include "TodayTaskObject.h"
 
 #include <atomic>
 #include <memory>

diff --git a/samples/today/nointrospection/AppointmentConnectionObject.cpp b/samples/today/nointrospection/AppointmentConnectionObject.cpp
@@ -3,9 +3,9 @@
 
 // WARNING! Do not edit this file manually, your changes will be overwritten.
 
-#include "AppointmentConnectionObject.h"
-#include "PageInfoObject.h"
-#include "AppointmentEdgeObject.h"
+#include "TodayAppointmentConnectionObject.h"
+#include "TodayPageInfoObject.h"
+#include "TodayAppointmentEdgeObject.h"
 
 #include "graphqlservice/internal/Schema.h"
 

diff --git a/samples/today/nointrospection/AppointmentConnectionObject.ixx b/samples/today/nointrospection/AppointmentConnectionObject.ixx
@@ -5,7 +5,7 @@
 
 module;
 
-#include "AppointmentConnectionObject.h"
+#include "TodayAppointmentConnectionObject.h"
 
 export module GraphQL.Today.AppointmentConnectionObject;
 

diff --git a/samples/today/nointrospection/AppointmentEdgeObject.cpp b/samples/today/nointrospection/AppointmentEdgeObject.cpp
@@ -3,8 +3,8 @@
 
 // WARNING! Do not edit this file manually, your changes will be overwritten.
 
-#include "AppointmentEdgeObject.h"
-#include "AppointmentObject.h"
+#include "TodayAppointmentEdgeObject.h"
+#include "TodayAppointmentObject.h"
 
 #include "graphqlservice/internal/Schema.h"
 

diff --git a/samples/today/nointrospection/AppointmentEdgeObject.ixx b/samples/today/nointrospection/AppointmentEdgeObject.ixx
@@ -5,7 +5,7 @@
 
 module;
 
-#include "AppointmentEdgeObject.h"
+#include "TodayAppointmentEdgeObject.h"
 
 export module GraphQL.Today.AppointmentEdgeObject;
 

diff --git a/samples/today/nointrospection/AppointmentObject.cpp b/samples/today/nointrospection/AppointmentObject.cpp
@@ -3,7 +3,7 @@
 
 // WARNING! Do not edit this file manually, your changes will be overwritten.
 
-#include "AppointmentObject.h"
+#include "TodayAppointmentObject.h"
 
 #include "graphqlservice/internal/Schema.h"
 

diff --git a/samples/today/nointrospection/AppointmentObject.ixx b/samples/today/nointrospection/AppointmentObject.ixx
@@ -5,7 +5,7 @@
 
 module;
 
-#include "AppointmentObject.h"
+#include "TodayAppointmentObject.h"
 
 export module GraphQL.Today.AppointmentObject;
 

diff --git a/samples/today/nointrospection/CMakeLists.txt b/samples/today/nointrospection/CMakeLists.txt
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.28)
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/cppgraphqlgen-functions.cmake)
 
 if(GRAPHQL_UPDATE_SAMPLES)
-  update_graphql_schema_files(today_nointrospection ../schema.today.graphql Today today --stubs --no-introspection)
+  update_graphql_schema_files(today_nointrospection ../schema.today.graphql Today today --stubs --no-introspection --prefix-headers)
 endif()
 
 add_graphql_schema_target(today_nointrospection)
diff --git a/samples/today/nointrospection/CompleteTaskPayloadObject.cpp b/samples/today/nointrospection/CompleteTaskPayloadObject.cpp
@@ -3,8 +3,8 @@
 
 // WARNING! Do not edit this file manually, your changes will be overwritten.
 
-#include "CompleteTaskPayloadObject.h"
-#include "TaskObject.h"
+#include "TodayCompleteTaskPayloadObject.h"
+#include "TodayTaskObject.h"
 
 #include "graphqlservice/internal/Schema.h"
 

diff --git a/samples/today/nointrospection/CompleteTaskPayloadObject.ixx b/samples/today/nointrospection/CompleteTaskPayloadObject.ixx
@@ -5,7 +5,7 @@
 
 module;
 
-#include "CompleteTaskPayloadObject.h"
+#include "TodayCompleteTaskPayloadObject.h"
 
 export module GraphQL.Today.CompleteTaskPayloadObject;
 

diff --git a/samples/today/nointrospection/ExpensiveObject.cpp b/samples/today/nointrospection/ExpensiveObject.cpp
@@ -3,7 +3,7 @@
 
 // WARNING! Do not edit this file manually, your changes will be overwritten.
 
-#include "ExpensiveObject.h"
+#include "TodayExpensiveObject.h"
 
 #include "graphqlservice/internal/Schema.h"
 

diff --git a/samples/today/nointrospection/ExpensiveObject.ixx b/samples/today/nointrospection/ExpensiveObject.ixx
@@ -5,7 +5,7 @@
 
 module;
 
-#include "ExpensiveObject.h"
+#include "TodayExpensiveObject.h"
 
 export module GraphQL.Today.ExpensiveObject;
 

diff --git a/samples/today/nointrospection/FolderConnectionObject.cpp b/samples/today/nointrospection/FolderConnectionObject.cpp
@@ -3,9 +3,9 @@
 
 // WARNING! Do not edit this file manually, your changes will be overwritten.
 
-#include "FolderConnectionObject.h"
-#include "PageInfoObject.h"
-#include "FolderEdgeObject.h"
+#include "TodayFolderConnectionObject.h"
+#include "TodayPageInfoObject.h"
+#include "TodayFolderEdgeObject.h"
 
 #include "graphqlservice/internal/Schema.h"
 

diff --git a/samples/today/nointrospection/FolderConnectionObject.ixx b/samples/today/nointrospection/FolderConnectionObject.ixx
@@ -5,7 +5,7 @@
 
 module;
 
-#include "FolderConnectionObject.h"
+#include "TodayFolderConnectionObject.h"
 
 export module GraphQL.Today.FolderConnectionObject;
 

diff --git a/samples/today/nointrospection/FolderEdgeObject.cpp b/samples/today/nointrospection/FolderEdgeObject.cpp
@@ -3,8 +3,8 @@
 
 // WARNING! Do not edit this file manually, your changes will be overwritten.
 
-#include "FolderEdgeObject.h"
-#include "FolderObject.h"
+#include "TodayFolderEdgeObject.h"
+#include "TodayFolderObject.h"
 
 #include "graphqlservice/internal/Schema.h"
 

diff --git a/samples/today/nointrospection/FolderEdgeObject.ixx b/samples/today/nointrospection/FolderEdgeObject.ixx
@@ -5,7 +5,7 @@
 
 module;
 
-#include "FolderEdgeObject.h"
+#include "TodayFolderEdgeObject.h"
 
 export module GraphQL.Today.FolderEdgeObject;
 

diff --git a/samples/today/nointrospection/FolderObject.cpp b/samples/today/nointrospection/FolderObject.cpp
@@ -3,7 +3,7 @@
 
 // WARNING! Do not edit this file manually, your changes will be overwritten.
 
-#include "FolderObject.h"
+#include "TodayFolderObject.h"
 
 #include "graphqlservice/internal/Schema.h"
 

diff --git a/samples/today/nointrospection/FolderObject.ixx b/samples/today/nointrospection/FolderObject.ixx
@@ -5,7 +5,7 @@
 
 module;
 
-#include "FolderObject.h"
+#include "TodayFolderObject.h"
 
 export module GraphQL.Today.FolderObject;
 

diff --git a/samples/today/nointrospection/MutationObject.cpp b/samples/today/nointrospection/MutationObject.cpp
@@ -3,8 +3,8 @@
 
 // WARNING! Do not edit this file manually, your changes will be overwritten.
 
-#include "MutationObject.h"
-#include "CompleteTaskPayloadObject.h"
+#include "TodayMutationObject.h"
+#include "TodayCompleteTaskPayloadObject.h"
 
 #include "graphqlservice/internal/Schema.h"
 

diff --git a/samples/today/nointrospection/MutationObject.ixx b/samples/today/nointrospection/MutationObject.ixx
@@ -5,7 +5,7 @@
 
 module;
 
-#include "MutationObject.h"
+#include "TodayMutationObject.h"
 
 export module GraphQL.Today.MutationObject;
 

diff --git a/samples/today/nointrospection/NestedTypeObject.cpp b/samples/today/nointrospection/NestedTypeObject.cpp
@@ -3,8 +3,8 @@
 
 // WARNING! Do not edit this file manually, your changes will be overwritten.
 
-#include "NestedTypeObject.h"
-#include "NestedTypeObject.h"
+#include "TodayNestedTypeObject.h"
+#include "TodayNestedTypeObject.h"
 
 #include "graphqlservice/internal/Schema.h"
 

diff --git a/samples/today/nointrospection/NestedTypeObject.ixx b/samples/today/nointrospection/NestedTypeObject.ixx
@@ -5,7 +5,7 @@
 
 module;
 
-#include "NestedTypeObject.h"
+#include "TodayNestedTypeObject.h"
 
 export module GraphQL.Today.NestedTypeObject;
 

diff --git a/samples/today/nointrospection/NodeObject.cpp b/samples/today/nointrospection/NodeObject.cpp
@@ -3,7 +3,7 @@
 
 // WARNING! Do not edit this file manually, your changes will be overwritten.
 
-#include "NodeObject.h"
+#include "TodayNodeObject.h"
 
 #include "graphqlservice/internal/Schema.h"
 

diff --git a/samples/today/nointrospection/NodeObject.ixx b/samples/today/nointrospection/NodeObject.ixx
@@ -5,7 +5,7 @@
 
 module;
 
-#include "NodeObject.h"
+#include "TodayNodeObject.h"
 
 export module GraphQL.Today.NodeObject;
 

diff --git a/samples/today/nointrospection/PageInfoObject.cpp b/samples/today/nointrospection/PageInfoObject.cpp
@@ -3,7 +3,7 @@
 
 // WARNING! Do not edit this file manually, your changes will be overwritten.
 
-#include "PageInfoObject.h"
+#include "TodayPageInfoObject.h"
 
 #include "graphqlservice/internal/Schema.h"
 

diff --git a/samples/today/nointrospection/PageInfoObject.ixx b/samples/today/nointrospection/PageInfoObject.ixx
@@ -5,7 +5,7 @@
 
 module;
 
-#include "PageInfoObject.h"
+#include "TodayPageInfoObject.h"
 
 export module GraphQL.Today.PageInfoObject;
 

diff --git a/samples/today/nointrospection/QueryObject.cpp b/samples/today/nointrospection/QueryObject.cpp
@@ -3,17 +3,17 @@
 
 // WARNING! Do not edit this file manually, your changes will be overwritten.
 
-#include "QueryObject.h"
-#include "NodeObject.h"
-#include "AppointmentConnectionObject.h"
-#include "TaskConnectionObject.h"
-#include "FolderConnectionObject.h"
-#include "AppointmentObject.h"
-#include "TaskObject.h"
-#include "FolderObject.h"
-#include "NestedTypeObject.h"
-#include "ExpensiveObject.h"
-#include "UnionTypeObject.h"
+#include "TodayQueryObject.h"
+#include "TodayNodeObject.h"
+#include "TodayAppointmentConnectionObject.h"
+#include "TodayTaskConnectionObject.h"
+#include "TodayFolderConnectionObject.h"
+#include "TodayAppointmentObject.h"
+#include "TodayTaskObject.h"
+#include "TodayFolderObject.h"
+#include "TodayNestedTypeObject.h"
+#include "TodayExpensiveObject.h"
+#include "TodayUnionTypeObject.h"
 
 #include "graphqlservice/internal/Schema.h"
 

diff --git a/samples/today/nointrospection/QueryObject.ixx b/samples/today/nointrospection/QueryObject.ixx
@@ -5,7 +5,7 @@
 
 module;
 
-#include "QueryObject.h"
+#include "TodayQueryObject.h"
 
 export module GraphQL.Today.QueryObject;
 

diff --git a/samples/today/nointrospection/SubscriptionObject.cpp b/samples/today/nointrospection/SubscriptionObject.cpp
@@ -3,9 +3,9 @@
 
 // WARNING! Do not edit this file manually, your changes will be overwritten.
 
-#include "SubscriptionObject.h"
-#include "AppointmentObject.h"
-#include "NodeObject.h"
+#include "TodaySubscriptionObject.h"
+#include "TodayAppointmentObject.h"
+#include "TodayNodeObject.h"
 
 #include "graphqlservice/internal/Schema.h"
 

diff --git a/samples/today/nointrospection/SubscriptionObject.ixx b/samples/today/nointrospection/SubscriptionObject.ixx
@@ -5,7 +5,7 @@
 
 module;
 
-#include "SubscriptionObject.h"
+#include "TodaySubscriptionObject.h"
 
 export module GraphQL.Today.SubscriptionObject;
 

diff --git a/samples/today/nointrospection/TaskConnectionObject.cpp b/samples/today/nointrospection/TaskConnectionObject.cpp
@@ -3,9 +3,9 @@
 
 // WARNING! Do not edit this file manually, your changes will be overwritten.
 
-#include "TaskConnectionObject.h"
-#include "PageInfoObject.h"
-#include "TaskEdgeObject.h"
+#include "TodayTaskConnectionObject.h"
+#include "TodayPageInfoObject.h"
+#include "TodayTaskEdgeObject.h"
 
 #include "graphqlservice/internal/Schema.h"
 

diff --git a/samples/today/nointrospection/TaskConnectionObject.ixx b/samples/today/nointrospection/TaskConnectionObject.ixx
@@ -5,7 +5,7 @@
 
 module;
 
-#include "TaskConnectionObject.h"
+#include "TodayTaskConnectionObject.h"
 
 export module GraphQL.Today.TaskConnectionObject;
 

diff --git a/samples/today/nointrospection/TaskEdgeObject.cpp b/samples/today/nointrospection/TaskEdgeObject.cpp
@@ -3,8 +3,8 @@
 
 // WARNING! Do not edit this file manually, your changes will be overwritten.
 
-#include "TaskEdgeObject.h"
-#include "TaskObject.h"
+#include "TodayTaskEdgeObject.h"
+#include "TodayTaskObject.h"
 
 #include "graphqlservice/internal/Schema.h"
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ @@
     module;
-    #include "AppointmentConnectionObject.h"
+    #include "TodayAppointmentConnectionObject.h"
     export module GraphQL.Today.AppointmentConnectionObject;
@@ Expand Down @@