refactor: due changes in [email protected]

BREAKING CHANGE: Using API from [email protected]

Author: nodkz

.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+  "prettier.eslintIntegration": true,
+  "eslint.validate": [
+    "javascript",
+  ],
+  "javascript.validate.enable": false
+}

README.md

@@ -2,8 +2,8 @@
 
 [![travis build](https://img.shields.io/travis/graphql-compose/graphql-compose-json.svg)](https://travis-ci.org/graphql-compose/graphql-compose-json)
 [![codecov coverage](https://img.shields.io/codecov/c/github/graphql-compose/graphql-compose-json.svg)](https://codecov.io/github/graphql-compose/graphql-compose-json)
-[![](https://img.shields.io/npm/v/graphql-compose-json.svg)](https://www.npmjs.com/package/graphql-compose-json)
-[![npm](https://img.shields.io/npm/dt/graphql-compose-json.svg)](http://www.npmtrends.com/graphql-compose-json)
+[![npm](https://img.shields.io/npm/v/graphql-compose-json.svg)](https://www.npmjs.com/package/graphql-compose-json)
+[![trends](https://img.shields.io/npm/dt/graphql-compose-json.svg)](http://www.npmtrends.com/graphql-compose-json)
 [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
 [![Greenkeeper badge](https://badges.greenkeeper.io/graphql-compose/graphql-compose-json.svg)](https://greenkeeper.io/)
 
@@ -78,7 +78,9 @@ const restApiResponse = {
 export const CustomPersonTC = composeWithJson('CustomPerson', restApiResponse);
 export const CustomPersonGraphQLType = CustomPersonTC.getType();
 ```
+
 Will be produced following GraphQL Type from upper shape:
+
 ```js
 const CustomPersonGraphQLType = new GraphQLObjectType({
   name: 'CustomPerson',
@@ -135,9 +137,9 @@ const schema = new GraphQLSchema({
 Or do the same via `graphql-compose`:
 
 ```js
-import { GQC } from 'graphql-compose';
+import { schemaComposer } from 'graphql-compose';
 
-GQC.rootQuery().addFields({
+schemaComposer.Query.addFields({
   person: {
     type: PersonTC,
     args: {
@@ -148,12 +150,13 @@ GQC.rootQuery().addFields({
   },
 }
 
-const schema = GQC.buildSchema(); // returns GraphQLSchema
+const schema = schemaComposer.buildSchema(); // returns GraphQLSchema
 ```
 
 ## Building schema asynchronously
 
 To build the schema at the runtime, you should rewrite the `Schema.js` and insert there an async function which will return a promise:
+
 ```js
 export const buildAsyncSchema = async (): Promise<GraphQLSchema> => {
   const url = `https://swapi.co/api/people/1`;
@@ -172,11 +175,11 @@ export const buildAsyncSchema = async (): Promise<GraphQLSchema> => {
     },
   });
 
-  GQC.rootQuery().addFields({
+  schemaComposer.Query.addFields({
     person: PeopleTC.getResolver('findById'),
   });
 
-  const schema = GQC.buildSchema();
+  const schema = schemaComposer.buildSchema();
   return schema;
 };
 ```
@@ -202,8 +205,6 @@ app.use(
 );
 ```
 
-
-
 ## Further customization with `graphql-compose`
 
 Moreover, `graphql-compose` allows you to pass pre-defined resolvers of other types to the response object and customize them:

package.json

@@ -23,37 +23,37 @@
   },
   "homepage": "https://github.com/graphql-compose/graphql-compose-json",
   "peerDependencies": {
-    "graphql-compose": ">=5.0.1 || >=4.0.0 || >=3.0.0 || >=2.9.5"
+    "graphql-compose": ">=6.0.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.0.0",
-    "@babel/core": "^7.0.0",
-    "@babel/node": "^7.0.0",
-    "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
-    "@babel/plugin-transform-flow-strip-types": "^7.0.0",
-    "@babel/plugin-transform-runtime": "^7.0.0",
-    "@babel/preset-env": "^7.0.0",
+    "@babel/cli": "^7.2.3",
+    "@babel/core": "^7.3.4",
+    "@babel/node": "^7.2.2",
+    "@babel/plugin-proposal-object-rest-spread": "^7.3.4",
+    "@babel/plugin-transform-flow-strip-types": "^7.3.4",
+    "@babel/plugin-transform-runtime": "^7.3.4",
+    "@babel/preset-env": "^7.3.4",
     "@babel/preset-flow": "^7.0.0",
     "babel-core": "^7.0.0-bridge.0",
-    "babel-eslint": "^9.0.0",
-    "babel-jest": "^23.4.2",
+    "babel-eslint": "^10.0.1",
+    "babel-jest": "^24.5.0",
     "cz-conventional-changelog": "^2.1.0",
-    "eslint": "^5.5.0",
+    "eslint": "^5.15.2",
     "eslint-config-airbnb-base": "^13.1.0",
-    "eslint-config-prettier": "^3.0.1",
-    "eslint-plugin-flowtype": "^2.50.0",
-    "eslint-plugin-import": "^2.14.0",
-    "eslint-plugin-prettier": "^2.6.2",
-    "express": "^4.16.3",
-    "express-graphql": "^0.6.12",
-    "flow-bin": "^0.80.0",
-    "graphql": "14.0.0",
-    "graphql-compose": "^5.0.1",
-    "jest": "^23.5.0",
-    "node-fetch": "^2.2.0",
-    "prettier": "^1.14.2",
-    "rimraf": "^2.6.2",
-    "semantic-release": "^15.9.12"
+    "eslint-config-prettier": "^4.1.0",
+    "eslint-plugin-flowtype": "^3.4.2",
+    "eslint-plugin-import": "^2.16.0",
+    "eslint-plugin-prettier": "^3.0.1",
+    "express": "^4.16.4",
+    "express-graphql": "^0.7.1",
+    "flow-bin": "^0.95.1",
+    "graphql": "14.1.1",
+    "graphql-compose": "^6.0.1",
+    "jest": "^24.5.0",
+    "node-fetch": "^2.3.0",
+    "prettier": "^1.16.4",
+    "rimraf": "^2.6.3",
+    "semantic-release": "^15.13.3"
   },
   "config": {
     "commitizen": {

src/ObjectParser.js

@@ -1,18 +1,18 @@
 /* @flow */
 
-import { TypeComposer, upperFirst, type ComposeFieldConfig } from 'graphql-compose';
+import { ObjectTypeComposer, upperFirst, type ComposeFieldConfig } from 'graphql-compose';
 
 type GetValueOpts = {
   typeName: string,
   fieldName: string,
 };
 
 export default class ObjectParser {
-  static createTC(name: string, json: Object): TypeComposer {
+  static createTC(name: string, json: Object): ObjectTypeComposer<any, any> {
     if (!json || typeof json !== 'object') {
       throw new Error('You provide empty object in second arg for `createTC` method.');
     }
-    const tc = TypeComposer.create(name);
+    const tc = ObjectTypeComposer.createTemp(name);
 
     const fields = {};
     Object.keys(json).forEach(k => {

src/__fixtures__/Schema.js

@@ -1,16 +1,16 @@
 /* @flow */
 
-import { GQC } from 'graphql-compose';
+import { schemaComposer } from 'graphql-compose';
 import { FilmTC } from './Film';
 import { PeopleTC } from './People';
 
-GQC.rootQuery().addFields({
+schemaComposer.Query.addFields({
   film: FilmTC.getResolver('findById'),
   people: PeopleTC.getResolver('findById'),
   peopleByUrl: PeopleTC.getResolver('findByUrl'),
   peopleByUrls: PeopleTC.getResolver('findByUrlList'),
 });
 
-const schema = GQC.buildSchema();
+const schema = schemaComposer.buildSchema();
 
 export default schema;

src/__tests__/ObjectParser-test.js

@@ -1,6 +1,6 @@
 /* @flow */
 
-import { graphql, TypeComposer } from 'graphql-compose';
+import { graphql, ObjectTypeComposer } from 'graphql-compose';
 import OP from '../ObjectParser';
 
 const { GraphQLFloat, GraphQLBoolean } = graphql;
@@ -61,9 +61,9 @@ describe('ObjectParser', () => {
   });
 
   describe('createTC()', () => {
-    it('return TypeComposer', () => {
+    it('return ObjectTypeComposer', () => {
       const tc = OP.createTC('MyType', { a: 1 });
-      expect(tc).toBeInstanceOf(TypeComposer);
+      expect(tc).toBeInstanceOf(ObjectTypeComposer);
       expect(tc.getTypeName()).toBe('MyType');
     });