Skip to content

Commit b1a4d0a

Browse files
wraverywravery
authored
Merge pull request #333 from wravery/next
2 parents 150387a + 11426ca commit b1a4d0a

File tree

155 files changed

+416
-384
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+416
-384
lines changed

‎include/SchemaGenerator.h

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ struct [[nodiscard("unnecessary construction")]] GeneratorOptions
2424
const bool verbose = false;
2525
const bool stubs = false;
2626
const bool noIntrospection = false;
27+
const bool prefixedHeaders = false;
2728
};
2829

2930
class [[nodiscard("unnecessary construction")]] Generator

‎include/graphqlservice/introspection/DirectiveObject.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#pragma once
77

8-
#ifndef DIRECTIVEOBJECT_H
9-
#define DIRECTIVEOBJECT_H
8+
#ifndef INTROSPECTION_DIRECTIVEOBJECT_H
9+
#define INTROSPECTION_DIRECTIVEOBJECT_H
1010

1111
#include "IntrospectionSchema.h"
1212

@@ -85,4 +85,4 @@ class [[nodiscard("unnecessary construction")]] Directive final
8585

8686
} // namespace graphql::introspection::object
8787

88-
#endif // DIRECTIVEOBJECT_H
88+
#endif // INTROSPECTION_DIRECTIVEOBJECT_H

‎include/graphqlservice/introspection/EnumValueObject.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#pragma once
77

8-
#ifndef ENUMVALUEOBJECT_H
9-
#define ENUMVALUEOBJECT_H
8+
#ifndef INTROSPECTION_ENUMVALUEOBJECT_H
9+
#define INTROSPECTION_ENUMVALUEOBJECT_H
1010

1111
#include "IntrospectionSchema.h"
1212

@@ -78,4 +78,4 @@ class [[nodiscard("unnecessary construction")]] EnumValue final
7878

7979
} // namespace graphql::introspection::object
8080

81-
#endif // ENUMVALUEOBJECT_H
81+
#endif // INTROSPECTION_ENUMVALUEOBJECT_H

‎include/graphqlservice/introspection/FieldObject.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#pragma once
77

8-
#ifndef FIELDOBJECT_H
9-
#define FIELDOBJECT_H
8+
#ifndef INTROSPECTION_FIELDOBJECT_H
9+
#define INTROSPECTION_FIELDOBJECT_H
1010

1111
#include "IntrospectionSchema.h"
1212

@@ -92,4 +92,4 @@ class [[nodiscard("unnecessary construction")]] Field final
9292

9393
} // namespace graphql::introspection::object
9494

95-
#endif // FIELDOBJECT_H
95+
#endif // INTROSPECTION_FIELDOBJECT_H

‎include/graphqlservice/introspection/InputValueObject.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#pragma once
77

8-
#ifndef INPUTVALUEOBJECT_H
9-
#define INPUTVALUEOBJECT_H
8+
#ifndef INTROSPECTION_INPUTVALUEOBJECT_H
9+
#define INTROSPECTION_INPUTVALUEOBJECT_H
1010

1111
#include "IntrospectionSchema.h"
1212

@@ -78,4 +78,4 @@ class [[nodiscard("unnecessary construction")]] InputValue final
7878

7979
} // namespace graphql::introspection::object
8080

81-
#endif // INPUTVALUEOBJECT_H
81+
#endif // INTROSPECTION_INPUTVALUEOBJECT_H

‎include/graphqlservice/introspection/SchemaObject.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#pragma once
77

8-
#ifndef SCHEMAOBJECT_H
9-
#define SCHEMAOBJECT_H
8+
#ifndef INTROSPECTION_SCHEMAOBJECT_H
9+
#define INTROSPECTION_SCHEMAOBJECT_H
1010

1111
#include "IntrospectionSchema.h"
1212

@@ -92,4 +92,4 @@ class [[nodiscard("unnecessary construction")]] Schema final
9292

9393
} // namespace graphql::introspection::object
9494

95-
#endif // SCHEMAOBJECT_H
95+
#endif // INTROSPECTION_SCHEMAOBJECT_H

‎include/graphqlservice/introspection/TypeObject.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#pragma once
77

8-
#ifndef TYPEOBJECT_H
9-
#define TYPEOBJECT_H
8+
#ifndef INTROSPECTION_TYPEOBJECT_H
9+
#define INTROSPECTION_TYPEOBJECT_H
1010

1111
#include "IntrospectionSchema.h"
1212

@@ -120,4 +120,4 @@ class [[nodiscard("unnecessary construction")]] Type final
120120

121121
} // namespace graphql::introspection::object
122122

123-
#endif // TYPEOBJECT_H
123+
#endif // INTROSPECTION_TYPEOBJECT_H

‎samples/learn/schema/CharacterObject.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#pragma once
77

8-
#ifndef CHARACTEROBJECT_H
9-
#define CHARACTEROBJECT_H
8+
#ifndef STARWARS_CHARACTEROBJECT_H
9+
#define STARWARS_CHARACTEROBJECT_H
1010

1111
#include "StarWarsSchema.h"
1212

@@ -78,4 +78,4 @@ class [[nodiscard("unnecessary construction")]] Character final
7878

7979
} // namespace graphql::learn::object
8080

81-
#endif // CHARACTEROBJECT_H
81+
#endif // STARWARS_CHARACTEROBJECT_H

‎samples/learn/schema/DroidObject.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#pragma once
77

8-
#ifndef DROIDOBJECT_H
9-
#define DROIDOBJECT_H
8+
#ifndef STARWARS_DROIDOBJECT_H
9+
#define STARWARS_DROIDOBJECT_H
1010

1111
#include "StarWarsSchema.h"
1212

@@ -248,4 +248,4 @@ class [[nodiscard("unnecessary construction")]] Droid final
248248

249249
} // namespace graphql::learn::object
250250

251-
#endif // DROIDOBJECT_H
251+
#endif // STARWARS_DROIDOBJECT_H

‎samples/learn/schema/HumanObject.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#pragma once
77

8-
#ifndef HUMANOBJECT_H
9-
#define HUMANOBJECT_H
8+
#ifndef STARWARS_HUMANOBJECT_H
9+
#define STARWARS_HUMANOBJECT_H
1010

1111
#include "StarWarsSchema.h"
1212

@@ -248,4 +248,4 @@ class [[nodiscard("unnecessary construction")]] Human final
248248

249249
} // namespace graphql::learn::object
250250

251-
#endif // HUMANOBJECT_H
251+
#endif // STARWARS_HUMANOBJECT_H

‎samples/learn/schema/MutationObject.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#pragma once
77

8-
#ifndef MUTATIONOBJECT_H
9-
#define MUTATIONOBJECT_H
8+
#ifndef STARWARS_MUTATIONOBJECT_H
9+
#define STARWARS_MUTATIONOBJECT_H
1010

1111
#include "StarWarsSchema.h"
1212

@@ -124,4 +124,4 @@ class [[nodiscard("unnecessary construction")]] Mutation final
124124

125125
} // namespace graphql::learn::object
126126

127-
#endif // MUTATIONOBJECT_H
127+
#endif // STARWARS_MUTATIONOBJECT_H

‎samples/learn/schema/QueryObject.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#pragma once
77

8-
#ifndef QUERYOBJECT_H
9-
#define QUERYOBJECT_H
8+
#ifndef STARWARS_QUERYOBJECT_H
9+
#define STARWARS_QUERYOBJECT_H
1010

1111
#include "StarWarsSchema.h"
1212

@@ -182,4 +182,4 @@ class [[nodiscard("unnecessary construction")]] Query final
182182

183183
} // namespace graphql::learn::object
184184

185-
#endif // QUERYOBJECT_H
185+
#endif // STARWARS_QUERYOBJECT_H

‎samples/learn/schema/ReviewObject.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#pragma once
77

8-
#ifndef REVIEWOBJECT_H
9-
#define REVIEWOBJECT_H
8+
#ifndef STARWARS_REVIEWOBJECT_H
9+
#define STARWARS_REVIEWOBJECT_H
1010

1111
#include "StarWarsSchema.h"
1212

@@ -151,4 +151,4 @@ class [[nodiscard("unnecessary construction")]] Review final
151151

152152
} // namespace graphql::learn::object
153153

154-
#endif // REVIEWOBJECT_H
154+
#endif // STARWARS_REVIEWOBJECT_H

‎samples/learn/schema/SubscriptionObject.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#pragma once
77

8-
#ifndef SUBSCRIPTIONOBJECT_H
9-
#define SUBSCRIPTIONOBJECT_H
8+
#ifndef STARWARS_SUBSCRIPTIONOBJECT_H
9+
#define STARWARS_SUBSCRIPTIONOBJECT_H
1010

1111
#include "StarWarsSchema.h"
1212

@@ -161,4 +161,4 @@ class [[nodiscard("unnecessary construction")]] Subscription final
161161

162162
} // namespace graphql::learn::object
163163

164-
#endif // SUBSCRIPTIONOBJECT_H
164+
#endif // STARWARS_SUBSCRIPTIONOBJECT_H

‎samples/proxy/schema/QueryObject.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#pragma once
77

8-
#ifndef QUERYOBJECT_H
9-
#define QUERYOBJECT_H
8+
#ifndef PROXY_QUERYOBJECT_H
9+
#define PROXY_QUERYOBJECT_H
1010

1111
#include "ProxySchema.h"
1212

@@ -128,4 +128,4 @@ class [[nodiscard("unnecessary construction")]] Query final
128128

129129
} // namespace graphql::proxy::object
130130

131-
#endif // QUERYOBJECT_H
131+
#endif // PROXY_QUERYOBJECT_H

‎samples/proxy/schema/QueryResultsObject.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#pragma once
77

8-
#ifndef QUERYRESULTSOBJECT_H
9-
#define QUERYRESULTSOBJECT_H
8+
#ifndef PROXY_QUERYRESULTSOBJECT_H
9+
#define PROXY_QUERYRESULTSOBJECT_H
1010

1111
#include "ProxySchema.h"
1212

@@ -151,4 +151,4 @@ class [[nodiscard("unnecessary construction")]] QueryResults final
151151

152152
} // namespace graphql::proxy::object
153153

154-
#endif // QUERYRESULTSOBJECT_H
154+
#endif // PROXY_QUERYRESULTSOBJECT_H

‎samples/stitched/StitchedSchema.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
#include "StitchedSchema.h"
55

66
#include "StarWarsData.h"
7-
#include "StarWarsSchema.h"
8-
9-
import GraphQL.Today.Mock;
7+
#include "TodayMock.h"
108

119
namespace graphql::stitched {
1210

‎samples/today/TodayMock.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33

44
#include "TodayMock.h"
55

6-
#include "AppointmentConnectionObject.h"
7-
#include "CompleteTaskPayloadObject.h"
8-
#include "ExpensiveObject.h"
9-
#include "FolderConnectionObject.h"
10-
#include "NestedTypeObject.h"
11-
#include "TaskConnectionObject.h"
12-
#include "UnionTypeObject.h"
6+
#include "TodayAppointmentConnectionObject.h"
7+
#include "TodayCompleteTaskPayloadObject.h"
8+
#include "TodayExpensiveObject.h"
9+
#include "TodayFolderConnectionObject.h"
10+
#include "TodayNestedTypeObject.h"
11+
#include "TodayTaskConnectionObject.h"
12+
#include "TodayUnionTypeObject.h"
1313

1414
#include <algorithm>
1515
#include <chrono>

‎samples/today/TodayMock.h

+11-11
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88

99
#include "TodaySchema.h"
1010

11-
#include "AppointmentEdgeObject.h"
12-
#include "AppointmentObject.h"
13-
#include "FolderEdgeObject.h"
14-
#include "FolderObject.h"
15-
#include "MutationObject.h"
16-
#include "NodeObject.h"
17-
#include "PageInfoObject.h"
18-
#include "QueryObject.h"
19-
#include "SubscriptionObject.h"
20-
#include "TaskEdgeObject.h"
21-
#include "TaskObject.h"
11+
#include "TodayAppointmentEdgeObject.h"
12+
#include "TodayAppointmentObject.h"
13+
#include "TodayFolderEdgeObject.h"
14+
#include "TodayFolderObject.h"
15+
#include "TodayMutationObject.h"
16+
#include "TodayNodeObject.h"
17+
#include "TodayPageInfoObject.h"
18+
#include "TodayQueryObject.h"
19+
#include "TodaySubscriptionObject.h"
20+
#include "TodayTaskEdgeObject.h"
21+
#include "TodayTaskObject.h"
2222

2323
#include <atomic>
2424
#include <memory>

‎samples/today/nointrospection/AppointmentConnectionObject.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
// WARNING! Do not edit this file manually, your changes will be overwritten.
55

6-
#include "AppointmentConnectionObject.h"
7-
#include "PageInfoObject.h"
8-
#include "AppointmentEdgeObject.h"
6+
#include "TodayAppointmentConnectionObject.h"
7+
#include "TodayPageInfoObject.h"
8+
#include "TodayAppointmentEdgeObject.h"
99

1010
#include "graphqlservice/internal/Schema.h"
1111

‎samples/today/nointrospection/AppointmentConnectionObject.ixx

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
module;
77

8-
#include "AppointmentConnectionObject.h"
8+
#include "TodayAppointmentConnectionObject.h"
99

1010
export module GraphQL.Today.AppointmentConnectionObject;
1111

‎samples/today/nointrospection/AppointmentEdgeObject.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
// WARNING! Do not edit this file manually, your changes will be overwritten.
55

6-
#include "AppointmentEdgeObject.h"
7-
#include "AppointmentObject.h"
6+
#include "TodayAppointmentEdgeObject.h"
7+
#include "TodayAppointmentObject.h"
88

99
#include "graphqlservice/internal/Schema.h"
1010

‎samples/today/nointrospection/AppointmentEdgeObject.ixx

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
module;
77

8-
#include "AppointmentEdgeObject.h"
8+
#include "TodayAppointmentEdgeObject.h"
99

1010
export module GraphQL.Today.AppointmentEdgeObject;
1111

‎samples/today/nointrospection/AppointmentObject.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
// WARNING! Do not edit this file manually, your changes will be overwritten.
55

6-
#include "AppointmentObject.h"
6+
#include "TodayAppointmentObject.h"
77

88
#include "graphqlservice/internal/Schema.h"
99

‎samples/today/nointrospection/AppointmentObject.ixx

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
module;
77

8-
#include "AppointmentObject.h"
8+
#include "TodayAppointmentObject.h"
99

1010
export module GraphQL.Today.AppointmentObject;
1111

‎samples/today/nointrospection/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.28)
77
include(${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/cppgraphqlgen-functions.cmake)
88

99
if(GRAPHQL_UPDATE_SAMPLES)
10-
update_graphql_schema_files(today_nointrospection ../schema.today.graphql Today today --stubs --no-introspection)
10+
update_graphql_schema_files(today_nointrospection ../schema.today.graphql Today today --stubs --no-introspection --prefix-headers)
1111
endif()
1212

1313
add_graphql_schema_target(today_nointrospection)

0 commit comments

Comments
 (0)