Skip to content

Consistency in trail comma placement #34

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

Merged
merged 2 commits into from
Jul 8, 2015
Merged

Consistency in trail comma placement #34

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a07493b
Make trail comma placement more consistent
enaqx Jul 8, 2015
f1cc228
Extra commas
enaqx Jul 8, 2015
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
32 changes: 16 additions & 16 deletions src/__tests__/starWarsSchema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,15 @@ var episodeEnum = new GraphQLEnumType({
values: {
NEWHOPE: {
value: 4,
description: 'Released in 1977.'
description: 'Released in 1977.',
},
EMPIRE: {
value: 5,
description: 'Released in 1980.'
description: 'Released in 1980.',
},
JEDI: {
value: 6,
description: 'Released in 1983.'
description: 'Released in 1983.',
},
}
});
Expand All @@ -114,7 +114,7 @@ var characterInterface = new GraphQLInterfaceType({
},
name: {
type: GraphQLString,
description: 'The name of the character.'
description: 'The name of the character.',
},
friends: {
type: new GraphQLList(characterInterface),
Expand All @@ -123,8 +123,8 @@ var characterInterface = new GraphQLInterfaceType({
},
appearsIn: {
type: new GraphQLList(episodeEnum),
description: 'Which movies they appear in.'
}
description: 'Which movies they appear in.',
},
}),
resolveType: (obj) => {
if (starWarsData.Humans[obj.id] !== undefined) {
Expand All @@ -134,7 +134,7 @@ var characterInterface = new GraphQLInterfaceType({
return droidType;
}
return null;
},
}
});

/**
Expand Down Expand Up @@ -168,11 +168,11 @@ var humanType = new GraphQLObjectType({
},
appearsIn: {
type: new GraphQLList(episodeEnum),
description: 'Which movies they appear in.'
description: 'Which movies they appear in.',
},
homePlanet: {
type: GraphQLString,
description: 'The home planet of the human, or null if unknown.'
description: 'The home planet of the human, or null if unknown.',
},
}),
interfaces: [characterInterface]
Expand Down Expand Up @@ -200,7 +200,7 @@ var droidType = new GraphQLObjectType({
},
name: {
type: GraphQLString,
description: 'The name of the droid.'
description: 'The name of the droid.',
},
friends: {
type: new GraphQLList(characterInterface),
Expand All @@ -210,12 +210,12 @@ var droidType = new GraphQLObjectType({
},
appearsIn: {
type: new GraphQLList(episodeEnum),
description: 'Which movies they appear in.'
description: 'Which movies they appear in.',
},
primaryFunction: {
type: GraphQLString,
description: 'The primary function of the droid.'
}
description: 'The primary function of the droid.',
},
}),
interfaces: [characterInterface]
});
Expand Down Expand Up @@ -244,13 +244,13 @@ var queryType = new GraphQLObjectType({
human: {
type: humanType,
args: {id: { name: 'id', type: new GraphQLNonNull(GraphQLString)}},
resolve: (root, {id}) => starWarsData.Humans[id]
resolve: (root, {id}) => starWarsData.Humans[id],
},
droid: {
type: droidType,
args: {id: { name: 'id', type: new GraphQLNonNull(GraphQLString)}},
resolve: (root, {id}) => starWarsData.Droids[id]
}
resolve: (root, {id}) => starWarsData.Droids[id],
},
})
});

Expand Down