From 68db423f34bed56db1bf3b3bf0e2c5b33fb053d2 Mon Sep 17 00:00:00 2001
From: Alex Gaspar <al.gaspar@gmail.com>
Date: Thu, 19 Jan 2017 17:33:21 +0100
Subject: [PATCH] Expose and prefix JSON type to avoid conflict with other
 libraries (#343)

---
 src/index.js          | 3 ++-
 src/types/jsonType.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/index.js b/src/index.js
index 77d305e0..d33aeabd 100644
--- a/src/index.js
+++ b/src/index.js
@@ -5,5 +5,6 @@ module.exports = {
   typeMapper: require('./typeMapper'),
   attributeFields: require('./attributeFields'),
   simplifyAST: require('./simplifyAST'),
-  relay: require('./relay')
+  relay: require('./relay'),
+  JSONType: require('./types/jsonType')
 };
diff --git a/src/types/jsonType.js b/src/types/jsonType.js
index ad3eeb9f..1862be79 100644
--- a/src/types/jsonType.js
+++ b/src/types/jsonType.js
@@ -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,