Fix issues

Author: stephentuso

.babelrc

@@ -5,5 +5,5 @@
     }],
     "stage-3"
   ],
-  "plugins": ["add-module-exports"]
+  "plugins": ["add-module-exports", "transform-runtime"]
 }

package.json

@@ -1,14 +1,16 @@
 {
   "name": "parse-server-graphql",
   "version": "0.0.0",
-  "main": "index.js",
+  "main": "lib/index.js",
   "author": "stephentuso",
   "license": "MIT",
   "scripts": {
-    "build": "babel src -d lib"
+    "build": "babel src -d lib",
+    "prepublishOnly": "npm run build"
   },
   "dependencies": {
     "axios": "^0.18.0",
+    "babel-runtime": "^6.26.0",
     "express-graphql": "^0.6.12",
     "graphql": "^0.13.1",
     "graphql-list-fields": "^2.0.1",
@@ -19,6 +21,7 @@
   "devDependencies": {
     "babel-cli": "^6.26.0",
     "babel-plugin-add-module-exports": "^0.2.1",
+    "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-env": "^1.6.1",
     "babel-preset-stage-3": "^6.24.1"
   }

src/baseMapping.js

@@ -1,4 +1,5 @@
 import { mapValues, constant } from 'lodash/fp';
+import JSON from 'graphql-type-json';
 import File from './types/File';
 import Date from './types/Date';
 import ACL from './types/ACL';
@@ -8,11 +9,15 @@ import {
   GraphQLFloat,
 } from 'graphql';
 
-export default mapValues(constant, {
-  File,
-  Date,
-  ACL,
-  String: GraphQLString,
-  Boolean: GraphQLBoolean,
-  Number: GraphQLFloat,
-});
+export default {
+  ...mapValues(constant, {
+    File,
+    Date,
+    ACL,
+    Object: JSON,
+    String: GraphQLString,
+    Boolean: GraphQLBoolean,
+    Number: GraphQLFloat,
+  }),
+  Pointer: ({ targetClass }, mapping) => mapping[targetClass](),
+};

src/fetchParseSchema.js

@@ -1,10 +1,10 @@
 import axios from 'axios';
 import { get } from 'lodash';
 
-export default async function fetchParseSchema({ serverUrl, appId, masterKey }) {
+export default async function fetchParseSchema({ serverURL, appId, masterKey }) {
   const response = await axios({
     method: 'get',
-    url: `${serverUrl}/schemas`,
+    url: `${serverURL}/schemas`,
     headers: {
       'X-Parse-Application-Id': appId,
       'X-Parse-Master-Key': masterKey,

src/generateSchema.js

@@ -1,19 +1,27 @@
-import { mapValues } from 'lodash';
+import { flow, reduce, mapValues } from 'lodash/fp';
 import { GraphQLSchema, GraphQLObjectType } from 'graphql';
 import typeForClass from './typeForClass';
 import dependencyHelper from './utils/dependencyHelper';
 import baseMapping from './baseMapping';
-import queryForType from './queryForType'
+import queryForType from './queryForType';
 
 export default function generateSchema(parseSchema) {
   const types = dependencyHelper(
     baseMapping,
-    mapValues(parseSchema, typeForClass),
+    flow(
+      reduce((obj, data) => ({
+        ...obj,
+        [data.className]: data,
+      }), {}),
+      mapValues(typeForClass),
+    )(parseSchema),
   );
 
+  console.log(types);
+
   const queryFields = parseSchema.reduce((acc, { className }) => ({
     ...acc,
-    [className]: queryForType(types[className]),
+    [className]: queryForType(className, types[className]()),
   }), {});
 
   const query = new GraphQLObjectType({

src/index.js

@@ -1,20 +1,32 @@
 import graphqlHTTP from 'express-graphql';
 import generateSchema from './generateSchema';
 import fetchParseSchema from './fetchParseSchema';
+import Parse from 'parse/node';
+
+console.log('TEST');
 
 const getSchema = (() => {
   let schema;
   return async (options, alwaysRecreate) => {
     if (!schema || alwaysRecreate) {
       schema = generateSchema(await fetchParseSchema(options));
     }
+    console.log(schema);
     return schema;
   }
-});
+})();
 
 export default function parseGraphQL(options) {
-  return graphqlHTTP(async () => ({
-    schema: await getSchema(options, options.dynamicSchema),
-    graphiql: true,
-  }));
+  Parse.initialize(options.appId);
+  Parse.serverURL = options.serverURL;
+  return graphqlHTTP(async () => {
+    try {
+      return ({
+        schema: await getSchema(options, options.dynamicSchema),
+        graphiql: true,
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  });
 };

src/mapType.js

@@ -1,3 +1,7 @@
+import JSON from 'graphql-type-json';
+
 export default function mapType({ type, ...params }, mapping) {
-  return mapping[type](params);
+  console.log(type, params);
+  const getType = mapping[type];
+  return getType ? getType(params, mapping) : JSON;
 }

src/queryForType.js

@@ -3,7 +3,7 @@ import JSON from 'graphql-type-json';
 import getFieldNames from 'graphql-list-fields';
 import Parse from 'parse/node';
 
-export default (Type) => ({
+export default (parseClass, Type) => ({
   type: GraphQLList(Type),
   args: {
     json: {
@@ -12,7 +12,7 @@ export default (Type) => ({
   },
   resolve(_, { json }, context, info) {
     const fields = getFieldNames(info);
-    const query = Parse.Query.from(json);
+    const query = Parse.Query.fromJSON(parseClass, { ...json } || { where: {} });
     fields.forEach(field => query.include(field));
     return query.find();
   }

src/typeForClass.js

@@ -1,7 +1,7 @@
 import { GraphQLObjectType } from 'graphql';
 import JSON from 'graphql-type-json';
 import { mapValues } from 'lodash';
-import { property } from 'lodash/fp';
+import { property, constant } from 'lodash/fp';
 import mapType from './mapType';
 
 const specialResolvers = {
@@ -13,7 +13,7 @@ const specialResolvers = {
 
 const standardResolver = key => item => item.get(key);
 
-export default ({ className, fields }) => (typeMap) => () => {
+export default ({ className, fields }) => (typeMap) => constant((() => {
   const propertyFields = () => mapValues(fields, (data, key) => ({
     type: mapType(data, typeMap),
     resolve: specialResolvers[key] || standardResolver(key),
@@ -29,4 +29,4 @@ export default ({ className, fields }) => (typeMap) => () => {
       },
     }),
   });
-};
+})());

src/types/Date.js

@@ -1,7 +1,5 @@
 import { GraphQLScalarType } from 'graphql';
 import { Kind } from 'graphql/language';
-import moment from 'moment';
-import { identity } from 'lodash';
 
 const parseValue = dateString => new Date(dateString);
 

src/utils/defineLazyProperty.js

@@ -16,6 +16,7 @@ function defineLazyProperty(object, key, valueFunc) {
         enumerable: true,
         value: valueFunc(),
       });
+      console.log(key, this[key]);
       return this[key];
     },
   });

src/utils/dependencyHelper.js

@@ -18,6 +18,7 @@ function dependencyHelper(defaultData, initializerMap) {
       key,
       () => initializerMap[key](dependencies)
     );
+    return dependencies;
   }, { ...defaultData });
 }
 

yarn.lock

@@ -507,6 +507,12 @@ babel-plugin-transform-regenerator@^6.22.0:
   dependencies:
     regenerator-transform "^0.10.0"
 
+babel-plugin-transform-runtime@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz#88490d446502ea9b8e7efb0fe09ec4d99479b1ee"
+  dependencies:
+    babel-runtime "^6.22.0"
+
 babel-plugin-transform-strict-mode@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"