fix for Objects creation

Closes #484
graphql · Sep 24, 2016 · b64a5f8 · b64a5f8
1 parent a725499
commit b64a5f8
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 7 deletions.
diff --git a/src/execution/__tests__/executor-test.js b/src/execution/__tests__/executor-test.js
@@ -843,4 +843,58 @@ describe('Execute: Handles basic execution tasks', () => {
     });
   });
 
+  it('returns proper Javascript Objects', async () => {
+    const Thread = new GraphQLObjectType({
+      name: 'Thread',
+      fields: {
+        id: {
+          type: GraphQLString,
+          resolve(thread) {
+            return thread.id;
+          },
+        },
+        name: {
+          type: GraphQLString,
+          resolve() {
+            return 'Lorem Lipsum';
+          },
+        },
+      },
+    });
+    const Query = new GraphQLObjectType({
+      name: 'Query',
+      fields: {
+        thread: {
+          type: Thread,
+          args: {
+            id: {
+              type: GraphQLString,
+            },
+          },
+          resolve(root, args) {
+            return {id: args.id};
+          }
+        },
+      },
+    });
+    const jsSchema = new GraphQLSchema({
+      query: Query,
+    });
+    const testQuery = `query abc{
+      thread(id: "67"){
+        id
+        name
+      }
+    }`;
+    const expected = {
+      thread: {
+        id: '67',
+        name: 'Lorem Ipsum',
+      },
+    };
+    const res = await execute(jsSchema, parse(testQuery));
+    expect(Object.getPrototypeOf(res.data.thread)).to.deep.equal(
+      Object.getPrototypeOf(expected)
+    );
+  });
 });
diff --git a/src/execution/execute.js b/src/execution/execute.js
@@ -183,7 +183,7 @@ function buildExecutionContext(
 ): ExecutionContext {
   const errors: Array<GraphQLError> = [];
   let operation: ?OperationDefinition;
-  const fragments: {[name: string]: FragmentDefinition} = Object.create(null);
+  const fragments: {[name: string]: FragmentDefinition} = Object.create({});
   documentAST.definitions.forEach(definition => {
     switch (definition.kind) {
       case Kind.OPERATION_DEFINITION:
@@ -243,8 +243,8 @@ function executeOperation(
     exeContext,
     type,
     operation.selectionSet,
-    Object.create(null),
-    Object.create(null)
+    Object.create({}),
+    Object.create({})
   );
 
   const path = [];
@@ -362,7 +362,7 @@ function executeFields(
       }
       return results;
     },
-    Object.create(null)
+    Object.create({})
   );
 
   // If there are no promises, we can just return the object
@@ -523,7 +523,7 @@ function promiseForObject<T>(
     values => values.reduce((resolvedObject, value, i) => {
       resolvedObject[keys[i]] = value;
       return resolvedObject;
-    }, Object.create(null))
+    }, Object.create({}))
   );
 }
 
@@ -957,8 +957,8 @@ function completeObjectValue(
   }
 
   // Collect sub-fields to execute to complete this value.
-  let subFieldASTs = Object.create(null);
-  const visitedFragmentNames = Object.create(null);
+  let subFieldASTs = Object.create({});
+  const visitedFragmentNames = Object.create({});
   for (let i = 0; i < fieldASTs.length; i++) {
     const selectionSet = fieldASTs[i].selectionSet;
     if (selectionSet) {