refactor: migrate code to graphql-compose@7.0.0

nodkz · nodkz · commit e019590a17e3 · 2019-04-29T01:29:33.000+06:00
BREAKING CHANGE: required graphql-compose@7.0.0
diff --git a/src/AwsParam.js b/src/AwsParam.js
@@ -5,8 +5,8 @@ import {
   ObjectTypeComposer,
   InputTypeComposer,
   upperFirst,
-  type ComposeOutputType,
-  type ComposeInputType,
+  type ComposeOutputTypeDefinition,
+  type ComposeInputTypeDefinition,
 } from 'graphql-compose';
 
 type ParamsMap = {
@@ -156,7 +156,7 @@ export class AwsParam<TContext = any> {
     name: string,
     isInput?: boolean,
     shapes?: AwsShapes
-  ): ComposeOutputType<any, TContext> | ComposeInputType {
+  ): ComposeOutputTypeDefinition<TContext> | ComposeInputTypeDefinition {
     if (param.type) {
       switch (param.type) {
         case 'boolean':
@@ -199,7 +199,7 @@ export class AwsParam<TContext = any> {
     param: ParamShape,
     isInput?: boolean,
     shapes?: AwsShapes
-  ): ComposeOutputType<any, TContext> | ComposeInputType {
+  ): ComposeOutputTypeDefinition<TContext> | ComposeInputTypeDefinition {
     if (shapes) {
       return isInput ? shapes.getInputShape(param.shape) : shapes.getOutputShape(param.shape);
     }
diff --git a/src/AwsShapes.js b/src/AwsShapes.js
@@ -1,6 +1,6 @@
 /* @flow */
 
-import { type ComposeOutputType, type ComposeInputType } from 'graphql-compose';
+import { type ComposeOutputTypeDefinition, type ComposeInputTypeDefinition } from 'graphql-compose';
 import { AwsParam, type Param } from './AwsParam';
 
 export type ShapesMap = {
@@ -10,8 +10,8 @@ export type ShapesMap = {
 export class AwsShapes<TContext> {
   shapes: ShapesMap;
   prefix: string;
-  shapesInput: { [name: string]: ComposeInputType };
-  shapesOutput: { [name: string]: ComposeOutputType<any, TContext> };
+  shapesInput: { [name: string]: ComposeInputTypeDefinition };
+  shapesOutput: { [name: string]: ComposeOutputTypeDefinition<TContext> };
 
   constructor(shapes: ShapesMap, prefix: string) {
     this.shapes = shapes;
@@ -20,7 +20,7 @@ export class AwsShapes<TContext> {
     this.shapesOutput = {};
   }
 
-  getInputShape(name: string): ComposeInputType {
+  getInputShape(name: string): ComposeInputTypeDefinition {
     if (!this.shapesInput[name]) {
       if (!this.shapes[name]) {
         throw new Error(`Shape with name '${name}' not found in service config ${this.prefix}`);
@@ -39,7 +39,7 @@ export class AwsShapes<TContext> {
     return this.shapesInput[name];
   }
 
-  getOutputShape(name: string): ComposeOutputType<any, TContext> {
+  getOutputShape(name: string): ComposeOutputTypeDefinition<TContext> {
     if (!this.shapesOutput[name]) {
       if (!this.shapes[name]) {
         throw new Error(`Shape with name '${name}' not found in service config ${this.prefix}`);
diff --git a/src/__tests__/AwsParam-test.js b/src/__tests__/AwsParam-test.js
@@ -1,7 +1,6 @@
 /* @flow */
 
 import { ObjectTypeComposer, InputTypeComposer } from 'graphql-compose';
-import { GraphQLNonNull, GraphQLString } from 'graphql-compose/lib/graphql';
 import { AwsParam } from '../AwsParam';
 
 describe('AwsParam', () => {
@@ -84,9 +83,8 @@ describe('AwsParam', () => {
     const itc = AwsParam.convertInputStructure(param, 'AwsS3Bucket');
     expect(itc).toBeInstanceOf(InputTypeComposer);
     expect(itc.getTypeName()).toBe('AwsS3BucketInput');
-    expect(itc.getFieldType('Bucket')).toBeInstanceOf(GraphQLNonNull);
-    expect((itc.getFieldType('Bucket'): any).ofType).toBe(GraphQLString);
-    expect(itc.getFieldType('Delimiter')).toBe(GraphQLString);
+    expect(itc.getFieldTypeName('Bucket')).toBe('String!');
+    expect(itc.getFieldTypeName('Delimiter')).toBe('String');
   });
 
   it('static convertOutputStructure()', () => {
@@ -108,8 +106,7 @@ describe('AwsParam', () => {
     const tc = AwsParam.convertOutputStructure(param, 'AwsS3Bucket');
     expect(tc).toBeInstanceOf(ObjectTypeComposer);
     expect(tc.getTypeName()).toBe('AwsS3Bucket');
-    expect(tc.getFieldType('Bucket')).toBeInstanceOf(GraphQLNonNull);
-    expect((tc.getFieldType('Bucket'): any).ofType).toBe(GraphQLString);
-    expect(tc.getFieldType('Delimiter')).toBe(GraphQLString);
+    expect(tc.getFieldTypeName('Bucket')).toBe('String!');
+    expect(tc.getFieldTypeName('Delimiter')).toBe('String');
   });
 });
diff --git a/src/__tests__/AwsServiceOperation-test.js b/src/__tests__/AwsServiceOperation-test.js
@@ -1,12 +1,8 @@
 /* @flow */
 /* eslint-disable class-methods-use-this */
 
-import {
-  GraphQLInputObjectType,
-  GraphQLObjectType,
-  GraphQLNonNull,
-  isOutputType,
-} from 'graphql-compose/lib/graphql';
+import { NonNullComposer, InputTypeComposer } from 'graphql-compose';
+import { GraphQLObjectType } from 'graphql';
 import { AwsServiceOperation } from '../AwsServiceOperation';
 import AwsConfigITC from '../types/AwsConfigITC';
 
@@ -96,16 +92,16 @@ describe('AwsJsonParserOperation', () => {
 
   it('getType()', () => {
     const tc = oper.getType();
-    expect(isOutputType(tc)).toBeTruthy();
+    expect(tc).toBeInstanceOf(GraphQLObjectType);
   });
 
   it('getArgs()', () => {
     const args: any = oper.getArgs();
     expect(args.input).toBeDefined();
-    // input arg has required fields, so it wrapped by GraphQLNonNull
-    expect(args.input.type).toBeInstanceOf(GraphQLNonNull);
-    expect(args.input.type.ofType).toBeInstanceOf(GraphQLInputObjectType);
-    expect(args.input.type.ofType.name).toBe('AWSS3CreateBucketInput');
+    // input arg has required fields, so it wrapped by NonNullComposer
+    expect(args.input.type).toBeInstanceOf(NonNullComposer);
+    expect(args.input.type.ofType).toBeInstanceOf(InputTypeComposer);
+    expect(args.input.type.ofType.getTypeName()).toBe('AWSS3CreateBucketInput');
   });
 
   describe('getResolve()', () => {
diff --git a/src/__tests__/AwsShapes-test.js b/src/__tests__/AwsShapes-test.js
@@ -16,7 +16,7 @@ describe('AwsShapes', () => {
   });
 
   it('getInputShape() from cache', () => {
-    shapes.shapesInput.cachedS1 = 'Cached';
+    (shapes: any).shapesInput.cachedS1 = 'Cached';
     expect(shapes.getInputShape('cachedS1')).toBe('Cached');
   });
 
@@ -25,7 +25,7 @@ describe('AwsShapes', () => {
   });
 
   it('getOutputShape() from cache', () => {
-    shapes.shapesOutput.cachedS2 = 'Cached';
+    (shapes: any).shapesOutput.cachedS2 = 'Cached';
     expect(shapes.getOutputShape('cachedS2')).toBe('Cached');
   });
 });
