Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix subschemas merge #4549

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Fix subschemas merge #4549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
04dbcfc
Add failing test
isaackhlam Jun 30, 2022
dd01a65
Fix operetion type
isaackhlam Jun 30, 2022
8667941
suppress unused var checking
isaackhlam Jun 30, 2022
4670c14
Ignore ts-build lint error
isaackhlam Jun 30, 2022
1a12208
fix unused var
isaackhlam Jun 30, 2022
e3069ef
Fix empty object pattern
isaackhlam Jun 30, 2022
427c224
update test
isaackhlam Jul 2, 2022
b491287
rename tests
kftsehk Jul 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/stitch/src/createMergedTypeResolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export function createMergedTypeResolver<TContext extends Record<string, any> =
) {
return batchDelegateToSchema({
schema: subschema,
operation: 'query' as OperationTypeNode,
operation: info.operation.operation as OperationTypeNode,
fieldName,
returnType: new GraphQLList(type),
key,
Expand All @@ -45,7 +45,7 @@ export function createMergedTypeResolver<TContext extends Record<string, any> =
) {
return delegateToSchema({
schema: subschema,
operation: 'query' as OperationTypeNode,
operation: info.operation.operation as OperationTypeNode,
fieldName,
returnType: type,
args: args(originalResult),
Expand Down
248 changes: 248 additions & 0 deletions packages/stitch/tests/stitchMutationSchema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,248 @@
import { makeExecutableSchema } from '@graphql-tools/schema';
import { stitchSchemas } from '../src/stitchSchemas.js';
import { graphql } from 'graphql';
import { assertSome } from '@graphql-tools/utils';

describe('Mutations executed as mutation on stitched schema', () => {
test('Mutation executed when only mutation type is available', async () => {
const sub0Schema = makeExecutableSchema({
typeDefs: /* GraphQL */ `
type Query {
placeholder: Placeholder
}
type Placeholder {
id: ID!
}
type Mutation {
zeroUser(id: ID): User
}
type User {
id: ID!
zeroValue: String
user: User!
}
`,
resolvers: {
Mutation: {
zeroUser: (_p, { id }) => ({ id }),
},
User: {
zeroValue: (_p, _a, _c, i) => `0: User: ${i.operation.operation}`,
user: ({ id }) => ({ id }),
},
},
});

const sub1Schema = makeExecutableSchema({
typeDefs: /* GraphQL */ `
type Query {
placeholder: Placeholder
}
type Placeholder {
id: ID!
}
type Mutation {
oneUser(id: ID): User
}
type User {
id: ID!
oneValue: String
user: User!
}
`,
resolvers: {
Mutation: {
oneUser: (_p, { id }) => ({ id }),
},
User: {
oneValue: (_p, _a, _c, i) => `1: User: ${i.operation.operation}`,
user: ({ id }) => ({ id }),
},
},
});
const mergedSchema = stitchSchemas({
subschemas: [
{
schema: sub1Schema,
merge: {
User: {
fieldName: 'oneUser',
selectionSet: '{ id }',
args: o => ({ id: o.id }),
},
},
},
{
schema: sub0Schema,
merge: {
User: {
fieldName: 'zeroUser',
selectionSet: '{ id }',
args: o => ({ id: o.id }),
},
},
},
],
mergeTypes: true, // << default in v7
});
const { data } = await graphql({
schema: mergedSchema,
source: /* GraphQL */ `
mutation {
# or oneUser, which zeroValue becomes null
zeroUser(id: 1) {
__typename
id
zeroValue
oneValue
user {
__typename
id
zeroValue
oneValue
}
}
}
`,
});
assertSome(data);
const userData: any = data['zeroUser'];
expect(userData).toEqual({
__typename: 'User',
id: '1',
oneValue: '1: User: mutation',
zeroValue: '0: User: mutation',
user: {
__typename: 'User',
id: '1',
oneValue: '1: User: mutation',
zeroValue: '0: User: mutation',
},
});
});

test('Mutation executed when both mutation and query are available', async () => {
const sub0Schema = makeExecutableSchema({
typeDefs: /* GraphQL */ `
type Query {
placeholder: Placeholder
zeroUser(id: ID): User
}
type Placeholder {
id: ID!
}
type Mutation {
zeroUser(id: ID): User
}
type User {
id: ID!
zeroValue: String
user: User!
}
`,
resolvers: {
Query: {
zeroUser: (_p, { id }) => ({ id }),
},
Mutation: {
zeroUser: (_p, { id }) => ({ id }),
},
User: {
zeroValue: (_p, _a, _c, i) => `0: User: ${i.operation.operation}`,
user: ({ id }) => ({ id }),
},
},
});

const sub1Schema = makeExecutableSchema({
typeDefs: /* GraphQL */ `
type Query {
placeholder: Placeholder
oneUser(id: ID): User
}
type Placeholder {
id: ID!
}
type Mutation {
oneUser(id: ID): User
}
type User {
id: ID!
oneValue: String
user: User!
}
`,
resolvers: {
Query: {
oneUser: (_p, { id }) => ({ id }),
},
Mutation: {
oneUser: (_p, { id }) => ({ id }),
},
User: {
oneValue: (_p, _a, _c, i) => `1: User: ${i.operation.operation}`,
user: ({ id }) => ({ id }),
},
},
});
const mergedSchema = stitchSchemas({
subschemas: [
{
schema: sub1Schema,
merge: {
User: {
fieldName: 'oneUser',
selectionSet: '{ id }',
args: o => ({ id: o.id }),
},
},
},
{
schema: sub0Schema,
merge: {
User: {
fieldName: 'zeroUser',
selectionSet: '{ id }',
args: o => ({ id: o.id }),
},
},
},
],
mergeTypes: true, // << default in v7
});
const { data } = await graphql({
schema: mergedSchema,
source: /* GraphQL */ `
mutation {
# or oneUser, which zeroValue becomes null
zeroUser(id: 1) {
__typename
id
zeroValue
oneValue
user {
__typename
id
zeroValue
oneValue
}
}
}
`,
});
assertSome(data);
const userData: any = data['zeroUser'];
expect(userData).toEqual({
__typename: 'User',
id: '1',
oneValue: '1: User: mutation',
zeroValue: '0: User: mutation',
user: {
__typename: 'User',
id: '1',
oneValue: '1: User: mutation',
zeroValue: '0: User: mutation',
},
});
});
});