Merge pull request #18 from marmelab/fix-graphiql

[RFR] Remove transpilation to fix GraphiQL

Author: djhi

.gitignore

@@ -3,5 +3,6 @@ node_modules
 .nvmrc
 .nyc_output
 .coverage-cache
+.reify-cache
 coverage
 yarn-error.log

Makefile

@@ -1,20 +1,14 @@
 YARN ?= $(shell which yarn)
 PKG ?= $(if $(YARN),$(YARN),$(shell which npm))
 
-.PHONY: build help
+.PHONY: help
 
 help:
 	@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
 install: package.json ## Install dependencies
 	@$(PKG) install
 
-clean: ## Clean up the lib folder for building
-	@rm -rf lib
-
-build: clean ## Compile ES6 files to JS
-	./node_modules/.bin/webpack
-
 watch: ## continuously compile ES6 files to JS
 	NODE_ENV=development ./node_modules/.bin/rollup -c --watch
 

bin/json-graphql-server.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
-var path = require('path');
-var express = require('express');
-var JsonGraphqlServer = require('../lib/');
+const path = require('path');
+const express = require('express');
+const JsonGraphqlServer = require('../src/');
 
 // fixme the build fails without those
 global.window = false;

package.json

@@ -1,43 +1,29 @@
 {
     "name": "json-graphql-server",
-    "version": "0.7.0",
-    "main": "lib/index",
+    "version": "1.0.0",
+    "main": "src/index",
     "repository": "git@github.com:marmelab/json-graphql-server.git",
-    "authors": [
-        "François Zaninotto",
-        "Gildas Garcia"
-    ],
-    "files": [
-        "*.md",
-        "lib",
-        "bin"
-    ],
+    "authors": ["François Zaninotto", "Gildas Garcia"],
+    "files": ["*.md", "src", "bin"],
     "license": "MIT",
     "scripts": {
-        "build": "make build",
-        "clean": "make clean",
         "format": "make format",
         "precommit": "lint-staged",
-        "prepublish": "make build",
         "test": "make test",
-        "watch": "make watch",
         "watch-test": "make watch-test"
     },
     "lint-staged": {
-        "src/**/*.js": [
-            "eslint --fix",
-            "git add"
-        ]
+        "src/**/*.js": ["eslint --fix", "git add"]
     },
     "devDependencies": {
         "@types/jest": "~19.2.4",
         "babel-cli": "~6.24.1",
         "babel-core": "~6.25.0",
         "babel-eslint": "~7.2.3",
         "babel-jest": "~20.0.3",
-        "babel-loader": "^7.1.1",
         "babel-plugin-add-module-exports": "^0.2.1",
         "babel-plugin-external-helpers": "~6.22.0",
+        "babel-plugin-transform-runtime": "~6.23.0",
         "babel-preset-es2015": "~6.24.1",
         "babel-preset-stage-0": "~6.24.1",
         "eslint": "~4.2.0",
@@ -57,21 +43,20 @@
         "rollup-plugin-node-globals": "~1.1.0",
         "rollup-plugin-node-resolve": "~3.0.0",
         "rollup-watch": "~4.0.0",
-        "supertest": "^3.0.0",
-        "webpack": "~3.2.0"
+        "supertest": "~3.0.0"
     },
     "dependencies": {
         "apollo-client": "~1.2.0",
         "apollo-test-utils": "~0.3.2",
-        "babel-plugin-transform-runtime": "~6.23.0",
         "express": "~4.15.3",
         "express-graphql": "~0.6.7",
         "graphql": "~0.10.5",
         "graphql-tag": "~2.0.0",
         "graphql-tools": "~1.1.0",
         "graphql-type-json": "~0.1.4",
         "inflection": "~1.12.0",
-        "lodash.merge": "~4.6.0"
+        "lodash.merge": "~4.6.0",
+        "reify": "~0.12.0"
     },
     "bin": {
         "json-graphql-server": "bin/json-graphql-server.js"

src/index.js

@@ -1,3 +1,10 @@
 //export { default as createApolloClient } from './createApolloClient';
-//export { default as graphQLClientServer } from './graphQLClientServer';
-export { default as jsonGraphqlExpress } from './jsonGraphqlExpress';
+require('reify');
+
+//const graphQLClientServer = require('./graphQLClientServer').default;
+const jsonGraphqlExpress = require('./jsonGraphqlExpress').default;
+
+module.exports = {
+    //graphQLClientServer,
+    jsonGraphqlExpress,
+};

src/introspection/getFilterTypesFromData.js

@@ -89,16 +89,18 @@ const getRangeFiltersFromEntities = entities => {
  */
 export default data =>
     Object.keys(data).reduce(
-        (types, key) => ({
-            ...types,
-            [getTypeFromKey(key)]: new GraphQLInputObjectType({
-                name: `${getTypeFromKey(key)}Filter`,
-                fields: {
-                    q: { type: GraphQLString },
-                    ...getFieldsFromEntities(data[key], false),
-                    ...getRangeFiltersFromEntities(data[key]),
-                },
+        (types, key) =>
+            Object.assign({}, types, {
+                [getTypeFromKey(key)]: new GraphQLInputObjectType({
+                    name: `${getTypeFromKey(key)}Filter`,
+                    fields: Object.assign(
+                        {
+                            q: { type: GraphQLString },
+                        },
+                        getFieldsFromEntities(data[key], false),
+                        getRangeFiltersFromEntities(data[key]),
+                    ),
+                }),
             }),
-        }),
         {},
     );

src/introspection/getSchemaFromData.js

@@ -130,14 +130,13 @@ export default data => {
             const nullableTypeFields = Object.keys(
                 typeFields,
             ).reduce((f, fieldName) => {
-                f[fieldName] = {
-                    ...typeFields[fieldName],
+                f[fieldName] = Object.assign({}, typeFields[fieldName], {
                     type:
                         fieldName !== 'id' &&
                         typeFields[fieldName].type instanceof GraphQLNonNull
                             ? typeFields[fieldName].type.ofType
                             : typeFields[fieldName].type,
-                };
+                });
                 return f;
             }, {});
             fields[`create${type.name}`] = {

src/resolver/Entity/index.js

@@ -54,32 +54,29 @@ import { isRelationshipField } from '../../relationships';
 export default (entityName, data) => {
     const entityFields = Object.keys(getFieldsFromEntities(data[entityName]));
     const manyToOneResolvers = entityFields.filter(isRelationshipField).reduce(
-        (resolvers, fieldName) => ({
-            ...resolvers,
-            [getRelatedType(fieldName)]: entity =>
-                data[getRelatedKey(fieldName)].find(
-                    relatedRecord => relatedRecord.id == entity[fieldName],
-                ),
-        }),
+        (resolvers, fieldName) =>
+            Object.assign({}, resolvers, {
+                [getRelatedType(fieldName)]: entity =>
+                    data[getRelatedKey(fieldName)].find(
+                        relatedRecord => relatedRecord.id == entity[fieldName],
+                    ),
+            }),
         {},
     );
     const relatedField = getReverseRelatedField(entityName); // 'posts' => 'post_id'
     const hasReverseRelationship = entityName =>
         getFieldsFromEntities(data[entityName]).hasOwnProperty(relatedField);
     const entities = Object.keys(data);
     const oneToManyResolvers = entities.filter(hasReverseRelationship).reduce(
-        (resolvers, entityName) => ({
-            ...resolvers,
-            [getRelationshipFromKey(entityName)]: entity =>
-                data[entityName].filter(
-                    record => record[relatedField] == entity.id,
-                ),
-        }),
+        (resolvers, entityName) =>
+            Object.assign({}, resolvers, {
+                [getRelationshipFromKey(entityName)]: entity =>
+                    data[entityName].filter(
+                        record => record[relatedField] == entity.id,
+                    ),
+            }),
         {},
     );
 
-    return {
-        ...manyToOneResolvers,
-        ...oneToManyResolvers,
-    };
+    return Object.assign({}, manyToOneResolvers, oneToManyResolvers);
 };

src/resolver/Mutation/create.js

@@ -1,10 +1,7 @@
 export default (entityData = []) => (_, entity) => {
     const newId =
         entityData.length > 0 ? entityData[entityData.length - 1].id + 1 : 0;
-    const newEntity = {
-        id: newId,
-        ...entity,
-    };
+    const newEntity = Object.assign({ id: newId }, entity);
 
     entityData.push(newEntity);
     return newEntity;

src/resolver/Mutation/update.js

@@ -1,11 +1,12 @@
-export default (entityData = []) => (_, { id, ...updates }) => {
-    const parsedId = parseInt(id, 10); // FIXME fails for non-integer ids
+export default (entityData = []) => (_, params) => {
+    const parsedId = parseInt(params.id, 10); // FIXME fails for non-integer ids
     const indexOfEntity = entityData.findIndex(e => e.id === parsedId);
     if (indexOfEntity !== -1) {
-        entityData[indexOfEntity] = {
-            ...entityData[indexOfEntity],
-            ...updates,
-        };
+        entityData[indexOfEntity] = Object.assign(
+            {},
+            entityData[indexOfEntity],
+            params,
+        );
         return entityData[indexOfEntity];
     }
 };