createFetch: reduce client.js size, use Promise.resolve() (kriasoft#…

…1517)

* createFetch: reduce client.js size, use Promise.resolve()
Fixes kriasoft#1513
* Improve Flow types in createFetch

src/createFetch.js

@@ -8,13 +8,16 @@
  */
 
 /* @flow */
-import { graphql } from 'graphql';
+
+import type { graphql as graphqType, GraphQLSchema } from 'graphql';
 
 type Fetch = (url: string, options: ?any) => Promise<any>;
 
 type Options = {
   baseUrl: string,
   cookie?: string,
+  schema?: GraphQLSchema,
+  graphql?: graphqType,
 };
 
 /**
@@ -23,7 +26,10 @@ type Options = {
  * of boilerplate code in the application.
  * https://developer.mozilla.org/docs/Web/API/Fetch_API/Using_Fetch
  */
-function createFetch(fetch: Fetch, { baseUrl, cookie, schema }: Options) {
+function createFetch(
+  fetch: Fetch,
+  { baseUrl, cookie, schema, graphql }: Options,
+) {
   // NOTE: Tweak the default options to suite your application needs
   const defaults = {
     method: 'POST', // handy with GraphQL backends
@@ -38,8 +44,8 @@ function createFetch(fetch: Fetch, { baseUrl, cookie, schema }: Options) {
 
   return async (url: string, options: any) => {
     const isGraphQL = url.startsWith('/graphql');
-    if (schema && isGraphQL) {
-      // We're SSR, so route the graphql internall to avoid latency
+    if (schema && graphql && isGraphQL) {
+      // We're SSR, so route the graphql internal to avoid latency
       const query = JSON.parse(options.body);
       const result = await graphql(
         schema,
@@ -48,13 +54,12 @@ function createFetch(fetch: Fetch, { baseUrl, cookie, schema }: Options) {
         null,
         query.variables,
       );
-      return new Promise(resolve =>
-        resolve({
-          status: result.errors ? 400 : 200,
-          json: () => new Promise(resolveJson => resolveJson(result)),
-        }),
-      );
+      return Promise.resolve({
+        status: result.errors ? 400 : 200,
+        json: () => Promise.resolve(result),
+      });
     }
+
     return isGraphQL || url.startsWith('/api')
       ? fetch(`${baseUrl}${url}`, {
           ...defaults,

src/server.js

@@ -12,6 +12,7 @@ import express from 'express';
 import cookieParser from 'cookie-parser';
 import bodyParser from 'body-parser';
 import expressJwt, { UnauthorizedError as Jwt401Error } from 'express-jwt';
+import { graphql } from 'graphql';
 import expressGraphQL from 'express-graphql';
 import jwt from 'jsonwebtoken';
 import fetch from 'node-fetch';
@@ -128,6 +129,7 @@ app.get('*', async (req, res, next) => {
         baseUrl: config.api.serverUrl,
         cookie: req.headers.cookie,
         schema,
+        graphql,
       }),
     };