Merge pull request #11 from marmelab/resolver_map

[RFR] use makeExecutableSchema instead of rootValue

Author: djhi

package.json

@@ -63,10 +63,9 @@
     "apollo-client": "~1.2.0",
     "apollo-test-utils": "~0.3.2",
     "babel-plugin-transform-runtime": "~6.23.0",
-    "body-parser": "~1.17.2",
     "express": "~4.15.3",
-    "graphql": "~0.9.6",
-    "graphql-server-express": "~1.0.0",
+    "express-graphql": "^0.6.6",
+    "graphql": "~0.10.3",
     "graphql-tag": "~2.0.0",
     "graphql-tools": "~1.1.0",
     "inflection": "~1.12.0",

src/jsonGraphqlExpress.js

@@ -1,5 +1,6 @@
-import bodyParser from 'body-parser';
-import { graphqlExpress } from 'graphql-server-express';
+import graphqlHTTP from 'express-graphql';
+import { printSchema } from 'graphql';
+const { makeExecutableSchema } = require('graphql-tools');
 import getSchemaFromData from './introspection/getSchemaFromData';
 import resolver from './resolver';
 
@@ -47,12 +48,11 @@ import resolver from './resolver';
  * 
  * app.listen(PORT);
  */
-export default data => {
-    return [
-        bodyParser.json(),
-        graphqlExpress({
-            schema: getSchemaFromData(data),
-            rootValue: resolver(data),
+export default data =>
+    graphqlHTTP({
+        schema: makeExecutableSchema({
+            typeDefs: printSchema(getSchemaFromData(data)),
+            resolvers: resolver(data),
         }),
-    ];
-};
+        graphiql: true,
+    });

src/resolver/create.js renamed to src/resolver/Mutation/create.js

@@ -1,4 +1,4 @@
-export default entityData => entity => {
+export default entityData => (_, entity) => {
     const newEntity = {
         id: entityData[entityData.length - 1].id + 1,
         ...entity,

src/resolver/remove.js renamed to src/resolver/Mutation/remove.js

@@ -1,4 +1,4 @@
-export default entityData => ({ id }) => {
+export default entityData => (_, { id }) => {
     const parsedId = parseInt(id, 10); // FIXME fails for non-integer ids
     const indexOfEntity = entityData.findIndex(e => e.id === parsedId);
     const removedEntity = entityData[indexOfEntity];

src/resolver/update.js renamed to src/resolver/Mutation/update.js

@@ -1,4 +1,4 @@
-export default entityData => ({ id, ...updates }) => {
+export default entityData => (_, { id, ...updates }) => {
     const parsedId = parseInt(id, 10); // FIXME fails for non-integer ids
     const indexOfEntity = entityData.findIndex(e => e.id === parsedId);
 

src/resolver/all.js renamed to src/resolver/Query/all.js

@@ -1,10 +1,7 @@
-export default entityData => ({
-    sortField,
-    sortOrder = 'asc',
-    page,
-    perPage = 25,
-    filter = '{}',
-}) => {
+export default entityData => (
+    _,
+    { sortField, sortOrder = 'asc', page, perPage = 25, filter = '{}' },
+) => {
     const filters = JSON.parse(filter);
     let items = [...entityData];
 

src/resolver/meta.js renamed to src/resolver/Query/meta.js

@@ -1,4 +1,4 @@
-export default entityData => ({ page, perPage = 25, filter = '{}' }) => {
+export default entityData => (_, { page, perPage = 25, filter = '{}' }) => {
     const filters = JSON.parse(filter);
     let items = [...entityData];
 

src/resolver/Query/single.js

@@ -0,0 +1 @@
+export default entityData => (_, { id }) => entityData.find(d => d.id == id);

src/resolver/index.js

@@ -1,31 +1,43 @@
 import { pluralize, underscore } from 'inflection';
 
-import all from './all';
-import meta from './meta';
-import single from './single';
-import create from './create';
-import update from './update';
-import remove from './remove';
+import all from './Query/all';
+import meta from './Query/meta';
+import single from './Query/single';
+import create from './Mutation/create';
+import update from './Mutation/update';
+import remove from './Mutation/remove';
 import { getTypeNamesFromData } from '../introspection/getTypesFromData';
 
-const getResolversForEntity = (entityName, data) => {
-    let entityData = data[underscore(pluralize(entityName))];
+const getData = (entityName, data) => data[underscore(pluralize(entityName))];
 
+const getQueryResolvers = (entityName, data) => ({
+    [`all${pluralize(entityName)}`]: all(data),
+    [`_all${pluralize(entityName)}Meta`]: meta(data),
+    [entityName]: single(data),
+});
+
+const getMutationResolvers = (entityName, data) => ({
+    [`create${entityName}`]: create(data),
+    [`update${entityName}`]: update(data),
+    [`remove${entityName}`]: remove(data),
+});
+
+export default data => {
+    const typeNames = getTypeNamesFromData(data);
     return {
-        [`all${pluralize(entityName)}`]: all(entityData),
-        [`_all${pluralize(entityName)}Meta`]: meta(entityData),
-        [entityName]: single(entityData),
-        [`create${entityName}`]: create(entityData),
-        [`update${entityName}`]: update(entityData),
-        [`remove${entityName}`]: remove(entityData),
+        Query: typeNames.reduce(
+            (resolvers, entityName) => ({
+                ...resolvers,
+                ...getQueryResolvers(entityName, getData(entityName, data)),
+            }),
+            {},
+        ),
+        Mutation: typeNames.reduce(
+            (resolvers, entityName) => ({
+                ...resolvers,
+                ...getMutationResolvers(entityName, getData(entityName, data)),
+            }),
+            {},
+        ),
     };
 };
-
-export default data =>
-    getTypeNamesFromData(data).reduce(
-        (resolvers, entityName) => ({
-            ...resolvers,
-            ...getResolversForEntity(entityName, data),
-        }),
-        {},
-    );