Skip to content

Commit 5e9aa19

Browse files
committed
Small fixes due changes in graphql-compose-connection.
1 parent 0b64672 commit 5e9aa19

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

src/composeWithMongoose.js

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* @flow */
2-
/* eslint-disable no-use-before-define */
2+
/* eslint-disable no-use-before-define, no-param-reassign */
33

44
import { convertModelToGraphQL } from './fieldsConverter';
55
import { TypeComposer, InputTypeComposer } from 'graphql-compose';
@@ -12,6 +12,7 @@ import type {
1212
typeConverterOpts,
1313
typeConverterResolversOpts,
1414
typeConverterInputTypeOpts,
15+
connectionSortMapOpts,
1516
} from './definition';
1617

1718

@@ -124,20 +125,23 @@ export function createResolvers(
124125
}
125126
});
126127

127-
if (!opts.hasOwnProperty('connection') || opts['connection'] !== false) {
128-
prepareConnectionResolver(typeComposer, opts['connection']);
128+
if (!opts.hasOwnProperty('connection') || opts.connection !== false) {
129+
prepareConnectionResolver(typeComposer, opts.connection);
129130
}
130131
}
131132

132-
export function prepareConnectionResolver(typeComposer: TypeComposer, opts) {
133+
export function prepareConnectionResolver(
134+
typeComposer: TypeComposer,
135+
opts: connectionSortMapOpts
136+
) {
133137
composeWithConnection(typeComposer, {
134138
findResolverName: 'findMany',
135139
countResolverName: 'count',
136140
sort: {
137141
_ID_DESC: {
138142
uniqueFields: ['_id'],
139143
sortValue: { _id: -1 },
140-
directionFilter: (cursorData, filter, isBefore) => {
144+
directionFilter: (filter, cursorData, isBefore) => {
141145
filter[OPERATORS_FIELDNAME] = filter[OPERATORS_FIELDNAME] || {};
142146
filter[OPERATORS_FIELDNAME]._id = filter[OPERATORS_FIELDNAME]._id || {};
143147
if (isBefore) {
@@ -151,7 +155,7 @@ export function prepareConnectionResolver(typeComposer: TypeComposer, opts) {
151155
_ID_ASC: {
152156
uniqueFields: ['_id'],
153157
sortValue: { _id: 1 },
154-
directionFilter: (cursorData, filter, isBefore) => {
158+
directionFilter: (filter, cursorData, isBefore) => {
155159
filter[OPERATORS_FIELDNAME] = filter[OPERATORS_FIELDNAME] || {};
156160
filter[OPERATORS_FIELDNAME]._id = filter[OPERATORS_FIELDNAME]._id || {};
157161
if (isBefore) {
@@ -161,7 +165,8 @@ export function prepareConnectionResolver(typeComposer: TypeComposer, opts) {
161165
}
162166
return filter;
163167
},
164-
}
168+
},
169+
...opts,
165170
},
166-
})
171+
});
167172
}

src/definition.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
/* @flow */
22
/* eslint-disable */
33

4+
import type { connectionSortMapOpts as _connectionSortMapOpts} from 'graphql-compose-connection/lib/definition';
5+
export type connectionSortMapOpts = _connectionSortMapOpts;
6+
47
export type ObjectMap = { [optName: string]: any };
58

69
export type ComplexTypesT =
@@ -172,7 +175,7 @@ export type typeConverterResolversOpts = {
172175
count?: false | {
173176
filter?: filterHelperArgsOpts | false,
174177
},
175-
connection?: false,
178+
connection?: connectionSortMapOpts | false,
176179
};
177180

178181
export type filterHelperArgsOpts = {

0 commit comments

Comments
 (0)