Skip to content

Commit a9041b2

Browse files
committed
fix: upgrade flow till v0.118
1 parent 3c1c17d commit a9041b2

File tree

14 files changed

+1175
-900
lines changed

14 files changed

+1175
-900
lines changed

package.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,46 +31,46 @@
3131
"object-path": "^0.11.4"
3232
},
3333
"optionalDependencies": {
34-
"graphql-compose-connection": "^6.0.3",
34+
"graphql-compose-connection": "6.0.4",
3535
"graphql-compose-pagination": "^6.0.3"
3636
},
3737
"peerDependencies": {
3838
"graphql-compose": "^7.1.0",
3939
"mongoose": "^5.0.0 || ^4.4.0"
4040
},
4141
"devDependencies": {
42-
"@babel/cli": "7.8.3",
43-
"@babel/core": "7.8.3",
42+
"@babel/cli": "7.8.4",
43+
"@babel/core": "7.8.4",
4444
"@babel/plugin-proposal-class-properties": "7.8.3",
4545
"@babel/plugin-proposal-object-rest-spread": "7.8.3",
4646
"@babel/plugin-transform-flow-strip-types": "7.8.3",
4747
"@babel/plugin-transform-runtime": "7.8.3",
48-
"@babel/preset-env": "7.8.3",
48+
"@babel/preset-env": "7.8.4",
4949
"@babel/preset-flow": "7.8.3",
5050
"@types/graphql": "^14.5.0",
51-
"@types/mongoose": "5.5.41",
51+
"@types/mongoose": "5.7.1",
5252
"babel-core": "^7.0.0-bridge.0",
5353
"babel-eslint": "^10.0.3",
54-
"babel-jest": "^24.9.0",
54+
"babel-jest": "25.1.0",
5555
"eslint": "6.8.0",
5656
"eslint-config-airbnb-base": "^14.0.0",
57-
"eslint-config-prettier": "6.9.0",
57+
"eslint-config-prettier": "6.10.0",
5858
"eslint-plugin-flowtype": "4.6.0",
59-
"eslint-plugin-import": "2.20.0",
59+
"eslint-plugin-import": "2.20.1",
6060
"eslint-plugin-prettier": "3.1.2",
61-
"flow-bin": "^0.110.0",
62-
"graphql": "14.5.8",
63-
"graphql-compose": "7.9.0",
61+
"flow-bin": "0.118.0",
62+
"graphql": "14.6.0",
63+
"graphql-compose": "7.12.0",
6464
"graphql-compose-connection": "^6.0.3",
6565
"graphql-compose-pagination": "^6.0.3",
66-
"jest": "^24.9.0",
67-
"mongodb-memory-server": "6.2.3",
68-
"mongoose": "5.8.9",
66+
"jest": "25.1.0",
67+
"mongodb-memory-server": "6.2.4",
68+
"mongoose": "5.9.1",
6969
"prettier": "^1.19.1",
70-
"request": "^2.88.0",
71-
"rimraf": "^3.0.0",
70+
"request": "2.88.2",
71+
"rimraf": "3.0.2",
7272
"semantic-release": "16.0.2",
73-
"tslint": "^5.20.1",
73+
"tslint": "6.0.0",
7474
"tslint-config-prettier": "^1.18.0",
7575
"tslint-plugin-prettier": "2.1.0",
7676
"typescript": "3.7.5"

src/discriminators/DiscriminatorTypeComposer.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {
1010
type ObjectTypeComposerFieldConfigDefinition,
1111
type ObjectTypeComposerFieldConfigMapDefinition,
1212
type ObjectTypeComposerFieldConfigAsObjectDefinition,
13-
type Thunk,
1413
} from 'graphql-compose';
1514
import type { Model } from 'mongoose';
1615
import { composeWithMongoose, type ComposeWithMongooseOpts } from '../composeWithMongoose';
@@ -109,7 +108,7 @@ export class DiscriminatorTypeComposer<TSource, TContext> extends ObjectTypeComp
109108
opts = {
110109
reorderFields: true,
111110
schemaComposer,
112-
...opts,
111+
...(opts: any),
113112
};
114113

115114
const baseTC = composeWithMongoose(baseModel, opts);
@@ -214,7 +213,7 @@ export class DiscriminatorTypeComposer<TSource, TContext> extends ObjectTypeComp
214213

215214
setField(
216215
fieldName: string,
217-
fieldConfig: Thunk<ObjectTypeComposerFieldConfigDefinition<any, any>>
216+
fieldConfig: ObjectTypeComposerFieldConfigDefinition<any, any>
218217
): DiscriminatorTypeComposer<TSource, TContext> {
219218
super.setField(fieldName, fieldConfig);
220219
this.getDInterface().setField(fieldName, (fieldConfig: any));

src/resolvers/connection.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,10 @@ export function prepareCursorQuery(
100100
criteria[k] = cursorData[k];
101101
} else if (ii === i) {
102102
if (indexData[k] === 1) {
103+
// $FlowFixMe
103104
criteria[k] = { [nextOper]: cursorData[k] };
104105
} else {
106+
// $FlowFixMe
105107
criteria[k] = { [prevOper]: cursorData[k] };
106108
}
107109
}

src/resolvers/count.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export default function count<TSource: MongooseDocument, TContext>(
2828
...filterHelperArgs(tc, model, {
2929
filterTypeName: `Filter${tc.getTypeName()}Input`,
3030
model,
31-
...(opts && opts.filter),
31+
...(opts && (opts.filter: any)),
3232
}),
3333
},
3434
resolve: (resolveParams: ExtendedResolveParams) => {

src/resolvers/findByIds.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ export default function findByIds<TSource: MongooseDocument, TContext>(
3333
kind: 'query',
3434
args: {
3535
_ids: '[MongoID]!',
36-
...limitHelperArgs({
36+
...(limitHelperArgs({
3737
...(opts && opts.limit),
38-
}),
38+
}): any),
3939
...sortHelperArgs(tc, model, {
4040
sortTypeName: `SortFindByIds${tc.getTypeName()}Input`,
4141
...(opts && opts.sort),

src/resolvers/findMany.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export default function findMany<TSource: MongooseDocument, TContext>(
3838
...filterHelperArgs(tc, model, {
3939
filterTypeName: `FilterFindMany${tc.getTypeName()}Input`,
4040
model,
41-
...(opts && opts.filter),
41+
...(opts && (opts.filter: any)),
4242
}),
4343
...skipHelperArgs(),
4444
...limitHelperArgs({

src/resolvers/findOne.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export default function findOne<TSource: MongooseDocument, TContext>(
3636
...filterHelperArgs(tc, model, {
3737
filterTypeName: `FilterFindOne${tc.getTypeName()}Input`,
3838
model,
39-
...(opts && opts.filter),
39+
...(opts && (opts.filter: any)),
4040
}),
4141
...skipHelperArgs(),
4242
...sortHelperArgs(tc, model, {

src/resolvers/pagination.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export default function pagination<TSource: MongooseDocument, TContext>(
2929
const resolver = preparePaginationResolver(tc, {
3030
findResolverName: 'findMany',
3131
countResolverName: 'count',
32-
...opts,
32+
...(opts: any),
3333
});
3434

3535
return resolver;

src/resolvers/removeMany.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export default function removeMany<TSource: MongooseDocument, TContext>(
4545
filterTypeName: `FilterRemoveMany${tc.getTypeName()}Input`,
4646
isRequired: true,
4747
model,
48-
...(opts && opts.filter),
48+
...(opts && (opts.filter: any)),
4949
}),
5050
},
5151
resolve: async (resolveParams: ExtendedResolveParams) => {

src/resolvers/removeOne.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export default function removeOne<TSource: MongooseDocument, TContext>(
5050
...filterHelperArgs(tc, model, {
5151
filterTypeName: `FilterRemoveOne${tc.getTypeName()}Input`,
5252
model,
53-
...(opts && opts.filter),
53+
...(opts && (opts.filter: any)),
5454
}),
5555
...sortHelperArgs(tc, model, {
5656
sortTypeName: `SortRemoveOne${tc.getTypeName()}Input`,

0 commit comments

Comments
 (0)