Skip to content

Commit 44a9a5c

Browse files
nodkznodkz
committed
refactor: update graphql-compose
BREAKING CHANGE: now min required `graphql-compose` version is `4.0.0`
1 parent 400b22c commit 44a9a5c

File tree

12 files changed

+132
-126
lines changed

12 files changed

+132
-126
lines changed

‎package.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
3333
"graphql-compose-pagination": ">=3.0.0"
3434
},
3535
"peerDependencies": {
36-
"graphql-compose": ">=3.0.3",
36+
"graphql-compose": ">=4.0.0",
3737
"mongoose": ">=4.0.0 || >=5.0.0"
3838
},
3939
"devDependencies": {
4040
"babel-cli": "^6.26.0",
4141
"babel-core": "^6.26.0",
42-
"babel-eslint": "^8.2.2",
42+
"babel-eslint": "^8.2.3",
4343
"babel-jest": "^22.4.3",
4444
"babel-plugin-transform-flow-strip-types": "^6.22.0",
4545
"babel-plugin-transform-object-rest-spread": "^6.13.0",
@@ -49,21 +49,21 @@
4949
"eslint": "^4.19.1",
5050
"eslint-config-airbnb-base": "^12.1.0",
5151
"eslint-config-prettier": "^2.9.0",
52-
"eslint-plugin-flowtype": "^2.46.1",
53-
"eslint-plugin-import": "^2.10.0",
52+
"eslint-plugin-flowtype": "^2.46.2",
53+
"eslint-plugin-import": "^2.11.0",
5454
"eslint-plugin-prettier": "^2.6.0",
55-
"flow-bin": "^0.69.0",
55+
"flow-bin": "^0.70.0",
5656
"graphql": "0.13.2",
57-
"graphql-compose": "^3.1.1",
57+
"graphql-compose": "^4.0.0",
5858
"graphql-compose-connection": ">=3.0.0",
5959
"graphql-compose-pagination": ">=3.0.0",
6060
"jest": "^22.4.3",
6161
"mongodb-memory-server": "^1.7.3",
62-
"mongoose": "^5.0.14",
63-
"prettier": "^1.11.1",
62+
"mongoose": "^5.0.15",
63+
"prettier": "^1.12.0",
6464
"request": "^2.85.0",
6565
"rimraf": "^2.6.2",
66-
"semantic-release": "^15.1.5"
66+
"semantic-release": "^15.1.7"
6767
},
6868
"config": {
6969
"commitizen": {

‎src/__tests__/composeWithMongoose-test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ describe('composeWithMongoose ->', () => {
188188
const tc2 = composeWithMongoose(UserModel, { resolvers: { pagination: { perPage: 333 } } });
189189
const resolver = tc2.getResolver('pagination');
190190
expect(resolver).toBeDefined();
191-
expect(resolver.getArg('perPage').defaultValue).toBe(333);
191+
expect(resolver.getArgConfig('perPage').defaultValue).toBe(333);
192192
});
193193
});
194194
});

‎src/composeWithMongoose.js‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
import type { TypeComposer, InputTypeComposer, SchemaComposer } from 'graphql-compose';
55
import { schemaComposer } from 'graphql-compose';
6-
import { GraphQLNonNull } from 'graphql-compose/lib/graphql';
76
import type { MongooseModel } from 'mongoose';
87
import type { ConnectionSortMapOpts } from 'graphql-compose-connection';
98
import { convertModelToGraphQL } from './fieldsConverter';
@@ -139,13 +138,7 @@ export function composeWithMongoose(
139138
createResolvers(model, tc, opts.resolvers || {});
140139
}
141140

142-
if (tc.hasField('_id')) {
143-
const fc = tc.getField('_id');
144-
if (fc.type && !(fc.type instanceof GraphQLNonNull)) {
145-
fc.type = new GraphQLNonNull(fc.type);
146-
tc.setField('_id', fc);
147-
}
148-
}
141+
tc.makeFieldNonNull('_id');
149142

150143
return tc;
151144
}

‎src/resolvers/__tests__/createOne-test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,13 @@ describe('createOne() ->', () => {
121121

122122
it('should have recordId field', () => {
123123
const outputType: any = createOne(UserModel, UserTC).getType();
124-
const recordIdField = new TypeComposer(outputType).getField('recordId');
124+
const recordIdField = new TypeComposer(outputType).getFieldConfig('recordId');
125125
expect(recordIdField.type).toBe(GraphQLMongoID);
126126
});
127127

128128
it('should have record field', () => {
129129
const outputType: any = createOne(UserModel, UserTC).getType();
130-
const recordField = new TypeComposer(outputType).getField('record');
130+
const recordField = new TypeComposer(outputType).getFieldConfig('record');
131131
expect(recordField.type).toBe(UserTC.getType());
132132
});
133133

‎src/resolvers/__tests__/removeById-test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,14 +160,14 @@ describe('removeById() ->', () => {
160160
const outputType: any = removeById(UserModel, UserTC).getType();
161161
const typeComposer = new TypeComposer(outputType);
162162
expect(typeComposer.hasField('recordId')).toBe(true);
163-
expect(typeComposer.getField('recordId').type).toBe(GraphQLMongoID);
163+
expect(typeComposer.getFieldType('recordId')).toBe(GraphQLMongoID);
164164
});
165165

166166
it('should have record field', () => {
167167
const outputType: any = removeById(UserModel, UserTC).getType();
168168
const typeComposer = new TypeComposer(outputType);
169169
expect(typeComposer.hasField('record')).toBe(true);
170-
expect(typeComposer.getField('record').type).toBe(UserTC.getType());
170+
expect(typeComposer.getFieldType('record')).toBe(UserTC.getType());
171171
});
172172

173173
it('should reuse existed outputType', () => {

‎src/resolvers/__tests__/removeMany-test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ describe('removeMany() ->', () => {
5858
describe('Resolver.args', () => {
5959
it('should have required `filter` arg', () => {
6060
const resolver = removeMany(UserModel, UserTC);
61-
const filterField = resolver.getArg('filter');
61+
const filterField = resolver.getArgConfig('filter');
6262
expect(filterField).toBeTruthy();
6363
expect(filterField.type).toBeInstanceOf(GraphQLNonNull);
6464
});
@@ -129,7 +129,7 @@ describe('removeMany() ->', () => {
129129

130130
it('should have numAffected field', () => {
131131
const outputType: any = removeMany(UserModel, UserTC).getType();
132-
const numAffectedField = new TypeComposer(outputType).getField('numAffected');
132+
const numAffectedField = new TypeComposer(outputType).getFieldConfig('numAffected');
133133
expect(numAffectedField.type).toBe(GraphQLInt);
134134
});
135135

‎src/resolvers/__tests__/removeOne-test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,13 +200,13 @@ describe('removeOne() ->', () => {
200200

201201
it('should have recordId field', () => {
202202
const outputType: any = removeOne(UserModel, UserTC).getType();
203-
const recordIdField = new TypeComposer(outputType).getField('recordId');
203+
const recordIdField = new TypeComposer(outputType).getFieldConfig('recordId');
204204
expect(recordIdField.type).toBe(GraphQLMongoID);
205205
});
206206

207207
it('should have record field', () => {
208208
const outputType: any = removeOne(UserModel, UserTC).getType();
209-
const recordField = new TypeComposer(outputType).getField('record');
209+
const recordField = new TypeComposer(outputType).getFieldConfig('record');
210210
expect(recordField.type).toBe(UserTC.getType());
211211
});
212212

‎src/resolvers/__tests__/updateById-test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,14 +197,14 @@ describe('updateById() ->', () => {
197197
const outputType: any = updateById(UserModel, UserTC).getType();
198198
const typeComposer = new TypeComposer(outputType);
199199
expect(typeComposer.hasField('recordId')).toBe(true);
200-
expect(typeComposer.getField('recordId').type).toBe(GraphQLMongoID);
200+
expect(typeComposer.getFieldType('recordId')).toBe(GraphQLMongoID);
201201
});
202202

203203
it('should have record field', () => {
204204
const outputType: any = updateById(UserModel, UserTC).getType();
205205
const typeComposer = new TypeComposer(outputType);
206206
expect(typeComposer.hasField('record')).toBe(true);
207-
expect(typeComposer.getField('record').type).toBe(UserTC.getType());
207+
expect(typeComposer.getFieldType('record')).toBe(UserTC.getType());
208208
});
209209

210210
it('should reuse existed outputType', () => {

‎src/resolvers/__tests__/updateMany-test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ describe('updateMany() ->', () => {
137137

138138
it('should have numAffected field', () => {
139139
const outputType: any = updateMany(UserModel, UserTC).getType();
140-
const numAffectedField = new TypeComposer(outputType).getField('numAffected');
140+
const numAffectedField = new TypeComposer(outputType).getFieldConfig('numAffected');
141141
expect(numAffectedField.type).toBe(GraphQLInt);
142142
});
143143

‎src/resolvers/__tests__/updateOne-test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,13 +221,13 @@ describe('updateOne() ->', () => {
221221

222222
it('should have recordId field', () => {
223223
const outputType: any = updateOne(UserModel, UserTC).getType();
224-
const recordIdField = new TypeComposer(outputType).getField('recordId');
224+
const recordIdField = new TypeComposer(outputType).getFieldConfig('recordId');
225225
expect(recordIdField.type).toBe(GraphQLMongoID);
226226
});
227227

228228
it('should have record field', () => {
229229
const outputType: any = updateOne(UserModel, UserTC).getType();
230-
const recordField = new TypeComposer(outputType).getField('record');
230+
const recordField = new TypeComposer(outputType).getFieldConfig('record');
231231
expect(recordField.type).toBe(UserTC.getType());
232232
});
233233

0 commit comments

Comments
 (0)