support for enum types inside nested

gyzerok · Oct 20, 2015 · ad56e8d · ad56e8d
1 parent a11b262
commit ad56e8d
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 4 deletions.
diff --git a/example/src/client/index.js b/example/src/client/index.js
@@ -9,6 +9,8 @@ import { Adrenaline } from '../../../src';
 import schema from 'shared/schema';
 import Loader from './components/Loader';
 
+console.log(schema.getTypeMap());
+
 const rootNode = document.getElementById('root');
 React.render(
   <Adrenaline schema={schema} renderLoading={Loader}>

diff --git a/example/src/shared/schema.js b/example/src/shared/schema.js
@@ -7,6 +7,7 @@ import {
   GraphQLInt,
   GraphQLList,
   GraphQLNonNull,
+  GraphQLEnumType,
   GraphQLSchema,
 } from 'graphql';
 
@@ -66,6 +67,18 @@ const userType = new GraphQLObjectType({
   }),
 });
 
+const enumType = new GraphQLEnumType({
+  name: 'Test',
+  values: {
+    ONE: {
+      value: 1,
+    },
+    TWO: {
+      value: 2,
+    },
+  },
+});
+
 export default new GraphQLSchema({
   query: new GraphQLObjectType({
     name: 'Query',
@@ -79,6 +92,10 @@ export default new GraphQLSchema({
           return root.findUser();
         },
       },
+      test: {
+        type: enumType,
+        resolve: () => 1,
+      },
     }),
   }),
   mutation: new GraphQLObjectType({

diff --git a/src/utils/parseSchema.js b/src/utils/parseSchema.js
@@ -1,14 +1,18 @@
 /* @flow */
 
 import { reduce } from 'lodash';
-import { GraphQLList, GraphQLNonNull, GraphQLScalarType } from 'graphql';
+import {
+  GraphQLList,
+  GraphQLNonNull,
+  GraphQLScalarType,
+  GraphQLEnumType,
+} from 'graphql';
 
 export default function parseSchema(schema) {
   const typeMap = schema.getTypeMap();
   const userTypes = reduce(typeMap, (acc, val, key) => {
     if (key.startsWith('__')) return acc;
-    if (isScalar(val)) return acc;
-    if (isNested(val)) return acc;
+    if (isScalar(val) || isEnum(val) || isNested(val)) return acc;
 
     return {
       ...acc,
@@ -44,6 +48,10 @@ function isScalar(type) {
   return type instanceof GraphQLScalarType;
 }
 
+function isEnum(type) {
+  return type instanceof GraphQLEnumType;
+}
+
 function isDefined(type) {
   return !(
     isList(type)
@@ -54,7 +62,9 @@ function isDefined(type) {
 
 function isNested(type) {
   return (
-    !type.getFields().hasOwnProperty('id')
+    !isScalar(type)
+    && !isEnum(type)
+    && !type.getFields().hasOwnProperty('id')
     && type.name !== 'Query'
     && type.name !== 'Mutation'
   );