Skip to content

Commit 31150a2

Browse files
wraverywravery
committed
fix(modules): re-export transitive module dependencies
1 parent ec2a29d commit 31150a2

File tree

18 files changed

+123
-171
lines changed

18 files changed

+123
-171
lines changed

‎include/graphqlservice/Client.ixx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ module;
77

88
export module GraphQL.Client;
99

10+
export import GraphQL.Response;
11+
1012
export namespace graphql::client {
1113

1214
// clang-format off

‎include/graphqlservice/JSONResponse.ixx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ module;
77

88
export module GraphQL.JSONResponse;
99

10+
export import GraphQL.Response;
11+
1012
export namespace graphql::response {
1113

1214
// clang-format off

‎include/graphqlservice/Service.ixx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ module;
77

88
export module GraphQL.Service;
99

10+
export import GraphQL.Parse;
11+
export import GraphQL.Response;
12+
1013
export namespace graphql {
1114

1215
namespace schema {

‎include/graphqlservice/introspection/IntrospectionSchema.ixx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,12 @@ module;
99

1010
export module GraphQL.Introspection.IntrospectionSchema;
1111

12-
namespace included = graphql::introspection;
12+
export import GraphQL.Introspection.SchemaObject;
13+
export import GraphQL.Introspection.TypeObject;
14+
export import GraphQL.Introspection.FieldObject;
15+
export import GraphQL.Introspection.InputValueObject;
16+
export import GraphQL.Introspection.EnumValueObject;
17+
export import GraphQL.Introspection.DirectiveObject;
1318

1419
export namespace graphql::introspection {
1520

‎samples/client/benchmark.cpp

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,8 @@
1212
#include <string_view>
1313

1414
import GraphQL.Client;
15-
import GraphQL.Response;
1615
import GraphQL.Service;
1716

18-
import GraphQL.Today.TodaySchema;
19-
20-
import GraphQL.Today.QueryObject;
21-
import GraphQL.Today.MutationObject;
22-
import GraphQL.Today.SubscriptionObject;
23-
24-
import GraphQL.Today.AppointmentEdgeObject;
25-
import GraphQL.Today.AppointmentObject;
26-
import GraphQL.Today.AppointmentConnectionObject;
27-
import GraphQL.Today.CompleteTaskPayloadObject;
28-
import GraphQL.Today.ExpensiveObject;
29-
import GraphQL.Today.FolderEdgeObject;
30-
import GraphQL.Today.FolderObject;
31-
import GraphQL.Today.FolderConnectionObject;
32-
import GraphQL.Today.NestedTypeObject;
33-
import GraphQL.Today.NodeObject;
34-
import GraphQL.Today.PageInfoObject;
35-
import GraphQL.Today.TaskConnectionObject;
36-
import GraphQL.Today.TaskEdgeObject;
37-
import GraphQL.Today.TaskObject;
38-
import GraphQL.Today.UnionTypeObject;
39-
4017
import GraphQL.Today.Mock;
4118

4219
import GraphQL.Benchmark.BenchmarkClient;

‎samples/learn/schema/StarWarsSchema.ixx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,12 @@ module;
99

1010
export module GraphQL.StarWars.StarWarsSchema;
1111

12-
namespace included = graphql::learn;
12+
export import GraphQL.StarWars.CharacterObject;
13+
export import GraphQL.StarWars.HumanObject;
14+
export import GraphQL.StarWars.DroidObject;
15+
export import GraphQL.StarWars.QueryObject;
16+
export import GraphQL.StarWars.ReviewObject;
17+
export import GraphQL.StarWars.MutationObject;
1318

1419
export namespace graphql::learn {
1520

‎samples/today/TodayMock.ixx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ module;
77

88
export module GraphQL.Today.Mock;
99

10+
export import GraphQL.Today.TodaySchema;
11+
1012
export namespace graphql::today {
1113

1214
// clang-format off

‎samples/today/benchmark.cpp

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,9 @@
1111
#include <string_view>
1212

1313
import GraphQL.Parse;
14-
import GraphQL.Response;
1514
import GraphQL.JSONResponse;
1615
import GraphQL.Service;
1716

18-
import GraphQL.Today.TodaySchema;
19-
20-
import GraphQL.Today.QueryObject;
21-
import GraphQL.Today.MutationObject;
22-
import GraphQL.Today.SubscriptionObject;
23-
24-
import GraphQL.Today.AppointmentEdgeObject;
25-
import GraphQL.Today.AppointmentObject;
26-
import GraphQL.Today.AppointmentConnectionObject;
27-
import GraphQL.Today.CompleteTaskPayloadObject;
28-
import GraphQL.Today.ExpensiveObject;
29-
import GraphQL.Today.FolderEdgeObject;
30-
import GraphQL.Today.FolderObject;
31-
import GraphQL.Today.FolderConnectionObject;
32-
import GraphQL.Today.NestedTypeObject;
33-
import GraphQL.Today.NodeObject;
34-
import GraphQL.Today.PageInfoObject;
35-
import GraphQL.Today.TaskConnectionObject;
36-
import GraphQL.Today.TaskEdgeObject;
37-
import GraphQL.Today.TaskObject;
38-
import GraphQL.Today.UnionTypeObject;
39-
4017
import GraphQL.Today.Mock;
4118

4219
using namespace graphql;

‎samples/today/nointrospection/TodaySchema.ixx

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,24 @@ module;
99

1010
export module GraphQL.Today.TodaySchema;
1111

12-
namespace included = graphql::today;
12+
export import GraphQL.Today.NodeObject;
13+
export import GraphQL.Today.UnionTypeObject;
14+
export import GraphQL.Today.QueryObject;
15+
export import GraphQL.Today.PageInfoObject;
16+
export import GraphQL.Today.AppointmentEdgeObject;
17+
export import GraphQL.Today.AppointmentConnectionObject;
18+
export import GraphQL.Today.TaskEdgeObject;
19+
export import GraphQL.Today.TaskConnectionObject;
20+
export import GraphQL.Today.FolderEdgeObject;
21+
export import GraphQL.Today.FolderConnectionObject;
22+
export import GraphQL.Today.CompleteTaskPayloadObject;
23+
export import GraphQL.Today.MutationObject;
24+
export import GraphQL.Today.SubscriptionObject;
25+
export import GraphQL.Today.AppointmentObject;
26+
export import GraphQL.Today.TaskObject;
27+
export import GraphQL.Today.FolderObject;
28+
export import GraphQL.Today.NestedTypeObject;
29+
export import GraphQL.Today.ExpensiveObject;
1330

1431
export namespace graphql::today {
1532

‎samples/today/sample.cpp

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,9 @@
77
#include <stdexcept>
88

99
import GraphQL.Parse;
10-
import GraphQL.Response;
1110
import GraphQL.JSONResponse;
1211
import GraphQL.Service;
1312

14-
import GraphQL.Today.TodaySchema;
15-
16-
import GraphQL.Today.QueryObject;
17-
import GraphQL.Today.MutationObject;
18-
import GraphQL.Today.SubscriptionObject;
19-
20-
import GraphQL.Today.AppointmentEdgeObject;
21-
import GraphQL.Today.AppointmentObject;
22-
import GraphQL.Today.AppointmentConnectionObject;
23-
import GraphQL.Today.CompleteTaskPayloadObject;
24-
import GraphQL.Today.ExpensiveObject;
25-
import GraphQL.Today.FolderEdgeObject;
26-
import GraphQL.Today.FolderObject;
27-
import GraphQL.Today.FolderConnectionObject;
28-
import GraphQL.Today.NestedTypeObject;
29-
import GraphQL.Today.NodeObject;
30-
import GraphQL.Today.PageInfoObject;
31-
import GraphQL.Today.TaskConnectionObject;
32-
import GraphQL.Today.TaskEdgeObject;
33-
import GraphQL.Today.TaskObject;
34-
import GraphQL.Today.UnionTypeObject;
35-
3613
import GraphQL.Today.Mock;
3714

3815
using namespace graphql;

0 commit comments

Comments
 (0)