Skip to content

Commit 42fa0b1

Browse files
committed
fix: Flowtype definitions for graphql-compose@3.0.0
1 parent 007e902 commit 42fa0b1

File tree

15 files changed

+128
-782
lines changed

15 files changed

+128
-782
lines changed

package.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,18 @@
2727
"object-path": "^0.11.4"
2828
},
2929
"optionalDependencies": {
30-
"graphql-compose-connection": ">=2.5.3",
31-
"graphql-compose-pagination": ">=1.1.1"
30+
"graphql-compose-connection": ">=2.5.7",
31+
"graphql-compose-pagination": ">=1.1.5"
3232
},
3333
"peerDependencies": {
3434
"graphql-compose": ">=2.9.0 || >=3.0.0",
3535
"mongoose": ">=4.0.0 || >=5.0.0"
3636
},
3737
"devDependencies": {
3838
"babel-cli": "^6.26.0",
39+
"babel-core": "^6.26.0",
3940
"babel-eslint": "^8.2.1",
40-
"babel-jest": "^22.2.0",
41+
"babel-jest": "^22.2.2",
4142
"babel-plugin-transform-flow-strip-types": "^6.22.0",
4243
"babel-plugin-transform-object-rest-spread": "^6.13.0",
4344
"babel-plugin-transform-runtime": "^6.23.0",
@@ -51,13 +52,14 @@
5152
"eslint-plugin-prettier": "^2.6.0",
5253
"flow-bin": "^0.65.0",
5354
"graphql": "0.13.0",
54-
"graphql-compose": "^3.0.0-beta.2",
55-
"graphql-compose-connection": ">=2.5.3",
56-
"graphql-compose-pagination": ">=1.1.1",
57-
"jest": "^22.2.1",
55+
"graphql-compose": "^3.0.0-beta.5",
56+
"graphql-compose-connection": ">=2.5.7",
57+
"graphql-compose-pagination": ">=1.1.5",
58+
"jest": "^22.2.2",
5859
"mongodb-memory-server": "^1.6.5",
5960
"mongoose": "^5.0.4",
6061
"prettier": "^1.10.2",
62+
"request": "^2.83.0",
6163
"rimraf": "^2.6.2",
6264
"semantic-release": "^12.4.1"
6365
},

src/resolvers/count.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export default function count(
1010
model: MongooseModel,
1111
typeComposer: TypeComposer,
1212
opts?: GenResolverOpts
13-
): Resolver<*, *> {
13+
): Resolver {
1414
if (!model || !model.modelName || !model.schema) {
1515
throw new Error('First arg for Resolver count() should be instance of Mongoose Model.');
1616
}

src/resolvers/createOne.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default function createOne(
1212
model: MongooseModel,
1313
typeComposer: TypeComposer,
1414
opts?: GenResolverOpts
15-
): Resolver<*, *> {
15+
): Resolver {
1616
if (!model || !model.modelName || !model.schema) {
1717
throw new Error('First arg for Resolver createOne() should be instance of Mongoose Model.');
1818
}

src/resolvers/findById.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default function findById(
1111
model: MongooseModel,
1212
typeComposer: TypeComposer,
1313
opts?: GenResolverOpts // eslint-disable-line no-unused-vars
14-
): Resolver<*, *> {
14+
): Resolver {
1515
if (!model || !model.modelName || !model.schema) {
1616
throw new Error('First arg for Resolver findById() should be instance of Mongoose Model.');
1717
}

src/resolvers/findByIds.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export default function findByIds(
1717
model: MongooseModel,
1818
typeComposer: TypeComposer,
1919
opts?: GenResolverOpts
20-
): Resolver<*, *> {
20+
): Resolver {
2121
if (!model || !model.modelName || !model.schema) {
2222
throw new Error('First arg for Resolver findByIds() should be instance of Mongoose Model.');
2323
}

src/resolvers/findMany.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export default function findMany(
2020
model: MongooseModel,
2121
typeComposer: TypeComposer,
2222
opts?: GenResolverOpts
23-
): Resolver<*, *> {
23+
): Resolver {
2424
if (!model || !model.modelName || !model.schema) {
2525
throw new Error('First arg for Resolver findMany() should be instance of Mongoose Model.');
2626
}

src/resolvers/findOne.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export default function findOne(
1818
model: MongooseModel,
1919
typeComposer: TypeComposer,
2020
opts?: GenResolverOpts
21-
): Resolver<*, *> {
21+
): Resolver {
2222
if (!model || !model.modelName || !model.schema) {
2323
throw new Error('First arg for Resolver findOne() should be instance of Mongoose Model.');
2424
}

src/resolvers/helpers/__tests__/filter-test.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ describe('Resolver helper `filter` ->', () => {
5050

5151
it('should by default have only indexed fields', () => {
5252
addFieldsWithOperator('testTypeName', inputTypeComposer, UserModel, {});
53-
const operatorsType = inputTypeComposer.getFieldType(OPERATORS_FIELDNAME);
53+
const operatorsType: any = inputTypeComposer.getFieldType(OPERATORS_FIELDNAME);
5454
const opComposer = new InputTypeComposer(operatorsType);
5555
expect(opComposer.getFieldNames()).toEqual(
5656
expect.arrayContaining(['name', '_id', 'employment'])
@@ -59,16 +59,17 @@ describe('Resolver helper `filter` ->', () => {
5959

6060
it('should have only provided fields via options', () => {
6161
addFieldsWithOperator('testTypeName', inputTypeComposer, UserModel, { age: ['lt'] });
62-
const operatorsType = inputTypeComposer.getFieldType(OPERATORS_FIELDNAME);
62+
const operatorsType: any = inputTypeComposer.getFieldType(OPERATORS_FIELDNAME);
6363
const opComposer = new InputTypeComposer(operatorsType);
6464
expect(opComposer.getFieldNames()).toEqual(expect.arrayContaining(['age']));
6565
});
6666

6767
it('should have only provided operators via options for field', () => {
6868
addFieldsWithOperator('testTypeName', inputTypeComposer, UserModel, { age: ['lt', 'gte'] });
69-
const operatorsType = inputTypeComposer.getFieldType(OPERATORS_FIELDNAME);
69+
const operatorsType: any = inputTypeComposer.getFieldType(OPERATORS_FIELDNAME);
7070
const opComposer = new InputTypeComposer(operatorsType);
71-
const ageComposer = new InputTypeComposer(opComposer.getFieldType('age'));
71+
const ageType: any = opComposer.getFieldType('age');
72+
const ageComposer = new InputTypeComposer(ageType);
7273
expect(ageComposer.getFieldNames()).toEqual(expect.arrayContaining(['lt', 'gte']));
7374
});
7475

@@ -118,8 +119,9 @@ describe('Resolver helper `filter` ->', () => {
118119
filterTypeName: 'FilterUserType',
119120
});
120121
const itc = new InputTypeComposer(args.filter.type);
121-
expect(itc.getFieldType('_ids')).toBeInstanceOf(GraphQLList);
122-
expect(itc.getFieldType('_ids').ofType).toBe(GraphQLMongoID);
122+
const ft: any = itc.getFieldType('_ids');
123+
expect(ft).toBeInstanceOf(GraphQLList);
124+
expect(ft.ofType).toBe(GraphQLMongoID);
123125
});
124126

125127
it('should for opts.isRequired=true return GraphQLNonNull', () => {

src/resolvers/removeById.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export default function removeById(
1313
model: MongooseModel,
1414
typeComposer: TypeComposer,
1515
opts?: GenResolverOpts // eslint-disable-line no-unused-vars
16-
): Resolver<*, *> {
16+
): Resolver {
1717
if (!model || !model.modelName || !model.schema) {
1818
throw new Error('First arg for Resolver removeById() should be instance of Mongoose Model.');
1919
}

src/resolvers/removeMany.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default function removeMany(
1111
model: MongooseModel,
1212
typeComposer: TypeComposer,
1313
opts?: GenResolverOpts
14-
): Resolver<*, *> {
14+
): Resolver {
1515
if (!model || !model.modelName || !model.schema) {
1616
throw new Error('First arg for Resolver removeMany() should be instance of Mongoose Model.');
1717
}

0 commit comments

Comments
 (0)