Skip to content

Commit 9ee939f

Browse files
committed
fix: schema definition included in schema-first approach
1 parent c2e408f commit 9ee939f

File tree

4 files changed

+14
-1
lines changed

4 files changed

+14
-1
lines changed

packages/apollo/tests/generated-definitions/federation-partial-query.fixture.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,8 @@ export interface IQuery {
1212
foo(): Nullable<boolean> | Promise<Nullable<boolean>>;
1313
}
1414

15+
export interface ISchema {
16+
Query: IQuery;
17+
}
18+
1519
type Nullable<T> = T | null;

packages/apollo/tests/generated-definitions/federation-typedef.fixture.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,8 @@ export class User {
3333
posts?: Nullable<Nullable<Post>[]>;
3434
}
3535

36+
export class ISchema {
37+
Query: IQuery;
38+
}
39+
3640
type Nullable<T> = T | null;

packages/apollo/tests/generated-definitions/federation.fixture.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,8 @@ export class User {
2828
posts?: Nullable<Nullable<Post>[]>;
2929
}
3030

31+
export class ISchema {
32+
Query: IQuery;
33+
}
34+
3135
type Nullable<T> = T | null;

packages/graphql/lib/federation/graphql-federation-definitions.factory.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ export class GraphQLFederationDefinitionsFactory extends GraphQLDefinitionsFacto
4141
// This leads to duplicated IQuery interfaces
4242
// see: https://github.com//issues/2344
4343
const mergedDefinition = mergeTypeDefs([printSubgraphSchema(schema)], {
44-
useSchemaDefinition: false,
44+
// schema-first requires the schema definition to be included for federation 2 @link to function
45+
useSchemaDefinition: true,
4546
throwOnConflict: true,
4647
commentDescriptions: true,
4748
reverseDirectives: true,

0 commit comments

Comments
 (0)