microsoft · wravery · Oct 26, 2024 · Oct 26, 2024 · Oct 26, 2024 · Oct 26, 2024
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/include/graphqlservice/introspection/DirectiveObject.h b/include/graphqlservice/introspection/DirectiveObject.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#ifndef DIRECTIVEOBJECT_H
-#define DIRECTIVEOBJECT_H
+#ifndef INTROSPECTION_DIRECTIVEOBJECT_H
+#define INTROSPECTION_DIRECTIVEOBJECT_H
 
 #include "IntrospectionSchema.h"
 
@@ -85,4 +85,4 @@ class [[nodiscard("unnecessary construction")]] Directive final
 
 } // namespace graphql::introspection::object
 
-#endif // DIRECTIVEOBJECT_H
+#endif // INTROSPECTION_DIRECTIVEOBJECT_H
diff --git a/include/graphqlservice/introspection/EnumValueObject.h b/include/graphqlservice/introspection/EnumValueObject.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#ifndef ENUMVALUEOBJECT_H
-#define ENUMVALUEOBJECT_H
+#ifndef INTROSPECTION_ENUMVALUEOBJECT_H
+#define INTROSPECTION_ENUMVALUEOBJECT_H
 
 #include "IntrospectionSchema.h"
 
@@ -78,4 +78,4 @@ class [[nodiscard("unnecessary construction")]] EnumValue final
 
 } // namespace graphql::introspection::object
 
-#endif // ENUMVALUEOBJECT_H
+#endif // INTROSPECTION_ENUMVALUEOBJECT_H
diff --git a/include/graphqlservice/introspection/FieldObject.h b/include/graphqlservice/introspection/FieldObject.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#ifndef FIELDOBJECT_H
-#define FIELDOBJECT_H
+#ifndef INTROSPECTION_FIELDOBJECT_H
+#define INTROSPECTION_FIELDOBJECT_H
 
 #include "IntrospectionSchema.h"
 
@@ -92,4 +92,4 @@ class [[nodiscard("unnecessary construction")]] Field final
 
 } // namespace graphql::introspection::object
 
-#endif // FIELDOBJECT_H
+#endif // INTROSPECTION_FIELDOBJECT_H
diff --git a/include/graphqlservice/introspection/InputValueObject.h b/include/graphqlservice/introspection/InputValueObject.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#ifndef INPUTVALUEOBJECT_H
-#define INPUTVALUEOBJECT_H
+#ifndef INTROSPECTION_INPUTVALUEOBJECT_H
+#define INTROSPECTION_INPUTVALUEOBJECT_H
 
 #include "IntrospectionSchema.h"
 
@@ -78,4 +78,4 @@ class [[nodiscard("unnecessary construction")]] InputValue final
 
 } // namespace graphql::introspection::object
 
-#endif // INPUTVALUEOBJECT_H
+#endif // INTROSPECTION_INPUTVALUEOBJECT_H
diff --git a/include/graphqlservice/introspection/SchemaObject.h b/include/graphqlservice/introspection/SchemaObject.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#ifndef SCHEMAOBJECT_H
-#define SCHEMAOBJECT_H
+#ifndef INTROSPECTION_SCHEMAOBJECT_H
+#define INTROSPECTION_SCHEMAOBJECT_H
 
 #include "IntrospectionSchema.h"
 
@@ -92,4 +92,4 @@ class [[nodiscard("unnecessary construction")]] Schema final
 
 } // namespace graphql::introspection::object
 
-#endif // SCHEMAOBJECT_H
+#endif // INTROSPECTION_SCHEMAOBJECT_H
diff --git a/include/graphqlservice/introspection/TypeObject.h b/include/graphqlservice/introspection/TypeObject.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#ifndef TYPEOBJECT_H
-#define TYPEOBJECT_H
+#ifndef INTROSPECTION_TYPEOBJECT_H
+#define INTROSPECTION_TYPEOBJECT_H
 
 #include "IntrospectionSchema.h"
 
@@ -120,4 +120,4 @@ class [[nodiscard("unnecessary construction")]] Type final
 
 } // namespace graphql::introspection::object
 
-#endif // TYPEOBJECT_H
+#endif // INTROSPECTION_TYPEOBJECT_H
diff --git a/samples/learn/schema/CharacterObject.h b/samples/learn/schema/CharacterObject.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#ifndef CHARACTEROBJECT_H
-#define CHARACTEROBJECT_H
+#ifndef STARWARS_CHARACTEROBJECT_H
+#define STARWARS_CHARACTEROBJECT_H
 
 #include "StarWarsSchema.h"
 
@@ -78,4 +78,4 @@ class [[nodiscard("unnecessary construction")]] Character final
 
 } // namespace graphql::learn::object
 
-#endif // CHARACTEROBJECT_H
+#endif // STARWARS_CHARACTEROBJECT_H
diff --git a/samples/learn/schema/DroidObject.h b/samples/learn/schema/DroidObject.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#ifndef DROIDOBJECT_H
-#define DROIDOBJECT_H
+#ifndef STARWARS_DROIDOBJECT_H
+#define STARWARS_DROIDOBJECT_H
 
 #include "StarWarsSchema.h"
 
@@ -248,4 +248,4 @@ class [[nodiscard("unnecessary construction")]] Droid final
 
 } // namespace graphql::learn::object
 
-#endif // DROIDOBJECT_H
+#endif // STARWARS_DROIDOBJECT_H
diff --git a/samples/learn/schema/HumanObject.h b/samples/learn/schema/HumanObject.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#ifndef HUMANOBJECT_H
-#define HUMANOBJECT_H
+#ifndef STARWARS_HUMANOBJECT_H
+#define STARWARS_HUMANOBJECT_H
 
 #include "StarWarsSchema.h"
 
@@ -248,4 +248,4 @@ class [[nodiscard("unnecessary construction")]] Human final
 
 } // namespace graphql::learn::object
 
-#endif // HUMANOBJECT_H
+#endif // STARWARS_HUMANOBJECT_H
diff --git a/samples/learn/schema/MutationObject.h b/samples/learn/schema/MutationObject.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#ifndef MUTATIONOBJECT_H
-#define MUTATIONOBJECT_H
+#ifndef STARWARS_MUTATIONOBJECT_H
+#define STARWARS_MUTATIONOBJECT_H
 
 #include "StarWarsSchema.h"
 
@@ -124,4 +124,4 @@ class [[nodiscard("unnecessary construction")]] Mutation final
 
 } // namespace graphql::learn::object
 
-#endif // MUTATIONOBJECT_H
+#endif // STARWARS_MUTATIONOBJECT_H
diff --git a/samples/learn/schema/QueryObject.h b/samples/learn/schema/QueryObject.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#ifndef QUERYOBJECT_H
-#define QUERYOBJECT_H
+#ifndef STARWARS_QUERYOBJECT_H
+#define STARWARS_QUERYOBJECT_H
 
 #include "StarWarsSchema.h"
 
@@ -182,4 +182,4 @@ class [[nodiscard("unnecessary construction")]] Query final
 
 } // namespace graphql::learn::object
 
-#endif // QUERYOBJECT_H
+#endif // STARWARS_QUERYOBJECT_H
diff --git a/samples/learn/schema/ReviewObject.h b/samples/learn/schema/ReviewObject.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#ifndef REVIEWOBJECT_H
-#define REVIEWOBJECT_H
+#ifndef STARWARS_REVIEWOBJECT_H
+#define STARWARS_REVIEWOBJECT_H
 
 #include "StarWarsSchema.h"
 
@@ -151,4 +151,4 @@ class [[nodiscard("unnecessary construction")]] Review final
 
 } // namespace graphql::learn::object
 
-#endif // REVIEWOBJECT_H
+#endif // STARWARS_REVIEWOBJECT_H
diff --git a/samples/learn/schema/SubscriptionObject.h b/samples/learn/schema/SubscriptionObject.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#ifndef SUBSCRIPTIONOBJECT_H
-#define SUBSCRIPTIONOBJECT_H
+#ifndef STARWARS_SUBSCRIPTIONOBJECT_H
+#define STARWARS_SUBSCRIPTIONOBJECT_H
 
 #include "StarWarsSchema.h"
 
@@ -161,4 +161,4 @@ class [[nodiscard("unnecessary construction")]] Subscription final
 
 } // namespace graphql::learn::object
 
-#endif // SUBSCRIPTIONOBJECT_H
+#endif // STARWARS_SUBSCRIPTIONOBJECT_H
diff --git a/samples/proxy/schema/QueryObject.h b/samples/proxy/schema/QueryObject.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#ifndef QUERYOBJECT_H
-#define QUERYOBJECT_H
+#ifndef PROXY_QUERYOBJECT_H
+#define PROXY_QUERYOBJECT_H
 
 #include "ProxySchema.h"
 
@@ -128,4 +128,4 @@ class [[nodiscard("unnecessary construction")]] Query final
 
 } // namespace graphql::proxy::object
 
-#endif // QUERYOBJECT_H
+#endif // PROXY_QUERYOBJECT_H
diff --git a/samples/proxy/schema/QueryResultsObject.h b/samples/proxy/schema/QueryResultsObject.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#ifndef QUERYRESULTSOBJECT_H
-#define QUERYRESULTSOBJECT_H
+#ifndef PROXY_QUERYRESULTSOBJECT_H
+#define PROXY_QUERYRESULTSOBJECT_H
 
 #include "ProxySchema.h"
 
@@ -151,4 +151,4 @@ class [[nodiscard("unnecessary construction")]] QueryResults final
 
 } // namespace graphql::proxy::object
 
-#endif // QUERYRESULTSOBJECT_H
+#endif // PROXY_QUERYRESULTSOBJECT_H
diff --git a/samples/stitched/StitchedSchema.cpp b/samples/stitched/StitchedSchema.cpp
@@ -4,9 +4,7 @@
 #include "StitchedSchema.h"
 
 #include "StarWarsData.h"
-#include "StarWarsSchema.h"
-
-import GraphQL.Today.Mock;
+#include "TodayMock.h"
 
 namespace graphql::stitched {
 

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)
-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 @@