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 mutation name #15

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

fix mutation name #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63f2427
fix mutation name
Apr 20, 2019
8afb3f8
fix a mutation bug
Apr 20, 2019
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
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@
"name": "gqlint",
"version": "1.8.0",
"description": "GraphQL Linter",
"keywords": ["graphql", "gql", "lint", "linter"],
"keywords": [
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you remove the changes from this file? They're not related to your pr.

"graphql",
"gql",
"lint",
"linter"
],
"repository": {
"type": "git",
"url": "https://github.com/happylinks/gqlint.git"
Expand All @@ -14,7 +19,10 @@
"precommit": "lint-staged"
},
"lint-staged": {
"*.js": ["prettier --single-quote --write", "git add"]
"*.js": [
"prettier --single-quote --write",
"git add"
]
},
"bin": {
"gqlint": "./bin/gqlint.js"
Expand Down
33 changes: 32 additions & 1 deletion rules/removedelete.mutations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,43 @@ const checkWrongName = (text, node, messages, name) => {
}
};

function getMutationNames(ast) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you place this function in a new file in the "lib" folder, maybe helpers.js or mutations.js, whatever you think is best.
It's now duplicated in two places and if we are gonna have more rules for mutations we should probably use this there as well.

const mutationNames = [];

visit(ast, {
ObjectTypeExtension(node) {
if (
node.name.value !== 'Mutation' ||
node.name.value === 'GraphQLMutation'
) {
return;
}
visit(node, {
FieldDefinition(node) {
mutationNames.push(node.type.name.value);
}
});
},
ObjectTypeDefinition(node) {
if (
node.name.value === 'Mutation' ||
node.name.value === 'GraphQLMutation'
) {
mutationNames.push(node.name.value);
}
}
});
return mutationNames;
}

module.exports = function(ast, text) {
const messages = [];

const mutationNames = getMutationNames(ast);

visit(ast, {
ObjectTypeDefinition(node) {
if (node.name.value !== 'GraphQLMutation') {
if (mutationNames.indexOf(node.name.value) < 0) {
return;
}

Expand Down
33 changes: 32 additions & 1 deletion rules/singular.mutations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,43 @@ const getMessage = (text, name, start) => {
};
};

function getMutationNames(ast) {
const mutationNames = [];

visit(ast, {
ObjectTypeExtension(node) {
if (
node.name.value !== 'Mutation' ||
node.name.value === 'GraphQLMutation'
) {
return;
}
visit(node, {
FieldDefinition(node) {
mutationNames.push(node.type.name.value);
}
});
},
ObjectTypeDefinition(node) {
if (
node.name.value === 'Mutation' ||
node.name.value === 'GraphQLMutation'
) {
mutationNames.push(node.name.value);
}
}
});
return mutationNames;
}

module.exports = function(ast, text) {
const messages = [];

const mutationNames = getMutationNames(ast);

visit(ast, {
ObjectTypeDefinition(node) {
if (node.name.value !== 'GraphQLMutation') {
if (mutationNames.indexOf(node.name.value) < 0) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And lastly, would you be able to add a test for this new "extend type Mutation" in https://github.com/happylinks/gqlint/blob/master/tests/rules/removedelete.mutations.test.js and maybe also in https://github.com/happylinks/gqlint/blob/master/tests/rules/singular.mutations.test.js just to be sure.

return;
}

Expand Down