feat: Migrate on graphql-compose 2.9.0

nodkz · nodkz · commit e1b6c1155948 · 2017-09-07T11:32:10.000+06:00
diff --git a/.eslintrc b/.eslintrc
@@ -27,6 +27,7 @@
       "trailingComma": "es5",
     }],
     "no-unused-expressions": 0,
+    "prefer-destructuring": 0,
   },
   "env": {
     "jasmine": true,
diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
   },
   "homepage": "https://github.com/nodkz/graphql-compose-relay",
   "peerDependencies": {
-    "graphql-compose": ">=1.20.3 || >=2.0.0"
+    "graphql-compose": ">=1.20.3 || >=2.9.0"
   },
   "devDependencies": {
     "babel-cli": "^6.26.0",
@@ -39,9 +39,9 @@
     "eslint-plugin-flowtype": "^2.35.1",
     "eslint-plugin-import": "^2.7.0",
     "eslint-plugin-prettier": "^2.2.0",
-    "flow-bin": "^0.54.0",
+    "flow-bin": "^0.54.1",
     "graphql": "^0.11.3",
-    "graphql-compose": "^2.8.1",
+    "graphql-compose": "^2.9.0",
     "jest": "^21.0.1",
     "prettier": "^1.6.1",
     "rimraf": "^2.6.1",
diff --git a/src/__mocks__/userTypeComposer.js b/src/__mocks__/userTypeComposer.js
@@ -1,14 +1,13 @@
 /* @flow */
 
-import { TypeComposer, Resolver, graphql } from 'graphql-compose';
-
-const {
+import { TypeComposer, Resolver } from 'graphql-compose';
+import {
   GraphQLString,
   GraphQLObjectType,
   GraphQLInputObjectType,
   GraphQLNonNull,
   GraphQLInt,
-} = graphql;
+} from 'graphql-compose/lib/graphql';
 
 export const UserType = new GraphQLObjectType({
   name: 'User',
diff --git a/src/__tests__/composeWithRelay-test.js b/src/__tests__/composeWithRelay-test.js
@@ -1,14 +1,18 @@
 /* @flow */
 
-import { TypeComposer, graphql } from 'graphql-compose';
+import { TypeComposer } from 'graphql-compose';
+import {
+  GraphQLInterfaceType,
+  GraphQLSchema,
+  GraphQLNonNull,
+  graphql,
+} from 'graphql-compose/lib/graphql';
 import { composeWithRelay } from '../composeWithRelay';
 import { userTypeComposer } from '../__mocks__/userTypeComposer';
 import { rootQueryTypeComposer } from '../__mocks__/rootQueryTypeComposer';
 import { rootMutationTypeComposer } from '../__mocks__/rootMutationTypeComposer';
 import { toGlobalId } from '../globalId';
 
-const { GraphQLInterfaceType, GraphQLSchema, GraphQLNonNull } = graphql;
-
 describe('composeWithRelay', () => {
   const userComposer = composeWithRelay(userTypeComposer);
   const rootQueryComposer = composeWithRelay(rootQueryTypeComposer);
@@ -73,7 +77,7 @@ describe('composeWithRelay', () => {
           name
         }
       }`;
-      const result = await graphql.graphql(schema, query);
+      const result = await graphql(schema, query);
       // $FlowFixMe
       expect(result.data.user.id).toBe(toGlobalId('User', 1));
       // $FlowFixMe
@@ -97,7 +101,7 @@ describe('composeWithRelay', () => {
         id
         name
       }`;
-      const result = await graphql.graphql(schema, query);
+      const result = await graphql(schema, query);
       // $FlowFixMe
       expect(result.data.node.id).toBe(toGlobalId('User', 1));
       // $FlowFixMe
@@ -121,7 +125,7 @@ describe('composeWithRelay', () => {
           clientMutationId
         }
       }`;
-      const result = await graphql.graphql(schema, query);
+      const result = await graphql(schema, query);
       // $FlowFixMe
       expect(result.data.createUser.record.name).toBe('Ok');
       // $FlowFixMe
diff --git a/src/__tests__/nodeFieldConfig-test.js b/src/__tests__/nodeFieldConfig-test.js
@@ -1,12 +1,10 @@
 /* @flow */
 
-import { graphql } from 'graphql-compose';
+import { GraphQLInterfaceType, GraphQLNonNull } from 'graphql-compose/lib/graphql';
 import { findByIdResolver, userTypeComposer } from '../__mocks__/userTypeComposer';
 import { toGlobalId } from '../globalId';
 import { getNodeFieldConfig } from '../nodeFieldConfig';
 
-const { GraphQLInterfaceType, GraphQLNonNull } = graphql;
-
 describe('nodeFieldConfig', () => {
   const typeToFindByIdMap = {
     User: {
diff --git a/src/__tests__/wrapMutationResolver.js b/src/__tests__/wrapMutationResolver.js
@@ -1,12 +1,16 @@
 /* @flow */
 
-import { TypeComposer, InputTypeComposer, graphql } from 'graphql-compose';
+import { TypeComposer, InputTypeComposer } from 'graphql-compose';
+import {
+  GraphQLString,
+  GraphQLID,
+  GraphQLNonNull,
+  getNamedType,
+} from 'graphql-compose/lib/graphql';
 import { composeWithRelay } from '../composeWithRelay';
 import { userTypeComposer } from '../__mocks__/userTypeComposer';
 import { toGlobalId } from '../globalId';
 
-const { GraphQLString, GraphQLID, GraphQLNonNull, getNamedType } = graphql;
-
 describe('wrapMutationResolver', () => {
   composeWithRelay(userTypeComposer);
   const fieldConfig = userTypeComposer.getResolver('createOne').getFieldConfig();
diff --git a/src/composeWithRelay.js b/src/composeWithRelay.js
@@ -1,18 +1,17 @@
 /* @flow */
 /* eslint-disable no-use-before-define */
 
-import { TypeComposer, graphql } from 'graphql-compose';
+import { TypeComposer } from 'graphql-compose';
+import { GraphQLID, GraphQLNonNull } from 'graphql-compose/lib/graphql';
 import NodeInterface from './nodeInterface';
 import wrapMutationResolver from './wrapMutationResolver';
 import { toGlobalId } from './globalId';
 import { getNodeFieldConfig } from './nodeFieldConfig';
 
-const { GraphQLID, GraphQLNonNull } = graphql;
-
 // all wrapped typeComposers with Relay, stored in this variable
 // for futher type resolving via NodeInterface.resolveType method
-export const typeMapForNode = {};
-export const nodeFieldConfig = getNodeFieldConfig(typeMapForNode);
+export const TypeMapForRelayNode = {};
+export const nodeFieldConfig = getNodeFieldConfig(TypeMapForRelayNode);
 
 export function composeWithRelay(typeComposer: TypeComposer): TypeComposer {
   if (!(typeComposer instanceof TypeComposer)) {
@@ -43,7 +42,7 @@ export function composeWithRelay(typeComposer: TypeComposer): TypeComposer {
         'should have findById resolver.'
     );
   }
-  typeMapForNode[typeComposer.getTypeName()] = {
+  TypeMapForRelayNode[typeComposer.getTypeName()] = {
     resolver: findById,
     tc: typeComposer,
   };
diff --git a/src/definition.js b/src/definition.js
diff --git a/src/globalId.js b/src/globalId.js
@@ -1,13 +1,18 @@
 /* @flow */
 
-import type { ResolvedGlobalId, Base64String } from './definition';
+export type Base64String = string;
+
+export type ResolvedGlobalId = {
+  type: string,
+  id: string,
+};
 
 export function base64(i: string): Base64String {
-  return new Buffer(i, 'ascii').toString('base64');
+  return Buffer.from(i, 'ascii').toString('base64');
 }
 
 export function unbase64(i: Base64String): string {
-  return new Buffer(i, 'base64').toString('ascii');
+  return Buffer.from(i, 'base64').toString('ascii');
 }
 
 /**
diff --git a/src/index.js b/src/index.js
@@ -1,14 +1,14 @@
 /* @flow */
 
-import { composeWithRelay, typeMapForNode, nodeFieldConfig } from './composeWithRelay';
+import { composeWithRelay, TypeMapForRelayNode, nodeFieldConfig } from './composeWithRelay';
 import { fromGlobalId, toGlobalId } from './globalId';
 import NodeInterface from './nodeInterface';
 
 export default composeWithRelay;
 export {
   composeWithRelay,
   NodeInterface,
-  typeMapForNode,
+  TypeMapForRelayNode,
   nodeFieldConfig,
   fromGlobalId,
   toGlobalId,
diff --git a/src/nodeFieldConfig.js b/src/nodeFieldConfig.js
@@ -1,14 +1,17 @@
 /* @flow */
 /* eslint-disable no-param-reassign, import/prefer-default-export */
-import { getProjectionFromAST, graphql } from 'graphql-compose';
+import { getProjectionFromAST } from 'graphql-compose';
+import { GraphQLID, GraphQLNonNull, type GraphQLResolveInfo } from 'graphql-compose/lib/graphql';
+import type { Resolver, TypeComposer } from 'graphql-compose';
 import { fromGlobalId } from './globalId';
 import NodeInterface from './nodeInterface';
-import type { TypeMapForNode, GraphQLResolveInfo } from './definition';
 
-const { GraphQLID, GraphQLNonNull } = graphql;
+export type TypeMapForRelayNode = {
+  [typeName: string]: { resolver: Resolver<*, *>, tc: TypeComposer },
+};
 
 // this fieldConfig must be set to RootQuery.node field
-export function getNodeFieldConfig(typeMapForNode: TypeMapForNode) {
+export function getNodeFieldConfig(typeMapForRelayNode: TypeMapForRelayNode) {
   return {
     description: 'Fetches an object that has globally unique ID among all types',
     type: NodeInterface,
@@ -29,11 +32,10 @@ export function getNodeFieldConfig(typeMapForNode: TypeMapForNode) {
       }
       const { type, id } = fromGlobalId(args.id);
 
-      if (!typeMapForNode[type]) {
+      if (!typeMapForRelayNode[type]) {
         return null;
       }
-      const findById = typeMapForNode[type].resolver;
-      const tc = typeMapForNode[type].tc;
+      const { tc, resolver: findById } = typeMapForRelayNode[type];
 
       if (findById && findById.resolve && tc) {
         const graphqlType = tc.getType();
diff --git a/src/nodeInterface.js b/src/nodeInterface.js
@@ -1,8 +1,6 @@
 /* @flow */
 
-import { graphql } from 'graphql-compose';
-
-const { GraphQLID, GraphQLNonNull, GraphQLInterfaceType } = graphql;
+import { GraphQLID, GraphQLNonNull, GraphQLInterfaceType } from 'graphql-compose/lib/graphql';
 
 const NodeInterface = new GraphQLInterfaceType({
   name: 'Node',
diff --git a/src/wrapMutationResolver.js b/src/wrapMutationResolver.js
@@ -1,13 +1,22 @@
 /* @flow */
 /* eslint-disable no-param-reassign */
 
-import { TypeComposer, InputTypeComposer, graphql } from 'graphql-compose';
+import { TypeComposer, InputTypeComposer, type Resolver } from 'graphql-compose';
+import {
+  GraphQLObjectType,
+  getNamedType,
+  GraphQLInputObjectType,
+  GraphQLNonNull,
+} from 'graphql-compose/lib/graphql';
 import { toGlobalId } from './globalId';
-import type { Resolver, WrapMutationResolverOpts } from './definition';
 
-const { GraphQLObjectType, getNamedType, GraphQLInputObjectType, GraphQLNonNull } = graphql;
+export type WrapMutationResolverOpts = {
+  resolverName: string,
+  rootTypeName: string,
+  [optName: string]: mixed,
+};
 
-function upperFirst(str) {
+function upperFirst(str: string): string {
   return str.charAt(0).toUpperCase() + str.slice(1);
 }
 
@@ -47,7 +56,7 @@ export default function wrapMutationResolver<TSource, TContext>(
         type: 'String',
         description:
           'The client mutation ID used by clients like Relay to track the mutation. ' +
-            'If given, returned in the response payload of the mutation.',
+          'If given, returned in the response payload of the mutation.',
       });
     }
   }
@@ -97,7 +106,7 @@ export default function wrapMutationResolver<TSource, TContext>(
         type: 'String',
         description:
           'The client mutation ID used by clients like Relay to track the mutation. ' +
-            'If given, returned in the response payload of the mutation.',
+          'If given, returned in the response payload of the mutation.',
       });
     }
 
diff --git a/yarn.lock b/yarn.lock
@@ -1842,9 +1842,9 @@ flat-cache@^1.2.1:
     graceful-fs "^4.1.2"
     write "^0.2.1"
 
-flow-bin@^0.54.0:
-  version "0.54.0"
-  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.54.0.tgz#f2fb0478e9e99702b623c9ed84079a39903bba77"
+flow-bin@^0.54.1:
+  version "0.54.1"
+  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.54.1.tgz#7101bcccf006dc0652714a8aef0c72078a760510"
 
 follow-redirects@0.0.7:
   version "0.0.7"
@@ -2138,9 +2138,9 @@ graceful-fs@^4.1.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
 
-graphql-compose@^2.8.1:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/graphql-compose/-/graphql-compose-2.8.1.tgz#1add11f22c1fffe5ce748d05ce022f834a646ea1"
+graphql-compose@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/graphql-compose/-/graphql-compose-2.9.0.tgz#9277d69e6213dbb56983b87ef1b3b3e27f35eb92"
   dependencies:
     babel-runtime "^6.26.0"
     object-path "^0.11.4"
