fix: solve hoisting problem by removing getFieldConfigFromFunction

Author: borodayev

src/ObjectParser.js

@@ -1,8 +1,6 @@
 /* @flow */
 
-import { graphql, TypeComposer, upperFirst, type ComposeFieldConfig } from 'graphql-compose';
-
-const { isOutputType } = graphql;
+import { TypeComposer, upperFirst, type ComposeFieldConfig } from 'graphql-compose';
 
 type GetValueOpts = {
   typeName: string,
@@ -48,22 +46,8 @@ export default class ObjectParser {
     }
 
     if (typeOf === 'function') {
-      return this.getFieldConfigFromFunction(value);
+      return value;
     }
-
     return 'JSON';
   }
-
-  static getFieldConfigFromFunction(value: () => any): ComposeFieldConfig<any, any> {
-    const fc = value();
-
-    if (typeof fc === 'string') return fc;
-    if (isOutputType(fc)) return fc;
-    if (fc instanceof TypeComposer) return fc;
-    if (fc && typeof fc === 'object' && fc.type) return fc;
-
-    throw new Error(
-      'Your type function should return: `string`, `GraphQLOutputType`, `TypeComposer`, `FieldConfig`.'
-    );
-  }
 }

src/__tests__/ObjectParser-test.js

@@ -43,13 +43,6 @@ describe('ObjectParser', () => {
       });
     });
 
-    it('process function', () => {
-      const spy = jest.spyOn(OP, 'getFieldConfigFromFunction');
-      const valueAsFn = () => 'String';
-      OP.getFieldConfig(valueAsFn);
-      expect(spy).toHaveBeenCalledWith(valueAsFn);
-    });
-
     it('process object', () => {
       const spy = jest.spyOn(OP, 'createTC');
       const valueAsObj = { a: 123 };
@@ -61,50 +54,6 @@ describe('ObjectParser', () => {
     });
   });
 
-  describe('getFieldConfigFromFunction()', () => {
-    it('accept type as string', () => {
-      const fn = () => 'Int';
-      expect(OP.getFieldConfigFromFunction(fn)).toEqual('Int');
-    });
-
-    it('accept GraphQLOutputType', () => {
-      const fn = () => graphql.GraphQLBoolean;
-      expect(OP.getFieldConfigFromFunction(fn)).toEqual(graphql.GraphQLBoolean);
-
-      const fn2 = () =>
-        new graphql.GraphQLObjectType({
-          name: 'MyType',
-          fields: () => ({
-            field1: { type: graphql.GraphQLFloat },
-          }),
-        });
-      expect(OP.getFieldConfigFromFunction(fn2)).toBeInstanceOf(graphql.GraphQLObjectType);
-    });
-
-    it('accept TypeComposer', () => {
-      const fn = () =>
-        TypeComposer.create(`
-          type MyOtherType {
-            f1: Int!
-          }
-        `);
-      expect(OP.getFieldConfigFromFunction(fn)).toBeInstanceOf(TypeComposer);
-    });
-
-    it('accept FieldConfig', () => {
-      const fn = () => ({
-        type: 'String',
-        args: { a1: 'Int' },
-        resolve: 123,
-      });
-      expect(OP.getFieldConfigFromFunction(fn)).toEqual({
-        type: 'String',
-        args: { a1: 'Int' },
-        resolve: 123,
-      });
-    });
-  });
-
   describe('createTC()', () => {
     it('return TypeComposer', () => {
       const tc = OP.createTC('MyType', { a: 1 });

src/__tests__/__snapshots__/ObjectParser-test.js.snap

@@ -11,6 +11,7 @@ Object {
     "type": "String",
   },
   "created": Object {
+    "_fieldAsThunk": [Function],
     "args": Array [],
     "isDeprecated": false,
     "name": "created",
@@ -47,6 +48,7 @@ Object {
     "type": "String",
   },
   "height": Object {
+    "_fieldAsThunk": [Function],
     "args": Array [],
     "isDeprecated": false,
     "name": "height",
@@ -60,6 +62,7 @@ Object {
     "type": "PeopleType_Homeworld",
   },
   "mass": Object {
+    "_fieldAsThunk": [Function],
     "args": Array [],
     "isDeprecated": false,
     "name": "mass",
@@ -97,6 +100,7 @@ Object {
     "type": "String",
   },
   "population": Object {
+    "_fieldAsThunk": [Function],
     "args": Array [],
     "isDeprecated": false,
     "name": "population",