Skip to content

Commit

Permalink
Expose and prefix JSON type to avoid conflict with other libraries (#343
Browse files Browse the repository at this point in the history
)
  • Loading branch information
AlexGaspar committed Jan 19, 2017
1 parent cc93df7 commit 1b66552
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ module.exports = {
typeMapper: require('./typeMapper'),
attributeFields: require('./attributeFields'),
simplifyAST: require('./simplifyAST'),
relay: require('./relay')
relay: require('./relay'),
GraphQLJSON: require('./types/jsonType')
};
2 changes: 1 addition & 1 deletion src/types/jsonType.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const astToJson = {


const JSONType = new GraphQLScalarType({
name: 'JSON',
name: 'SequelizeJSON',
description: 'The `JSON` scalar type represents raw JSON as values.',
serialize: value => value,
parseValue: value => value,
Expand Down

0 comments on commit 1b66552

Please sign in to comment.