@@ -30,11 +30,11 @@ export function composeWithDataLoader(
30
30
* Add DataLoader to FindById
31
31
*/
32
32
let findByIdResolver = typeComposer . get ( '$findById' )
33
- let findByIdLoader = new DataLoader ( ( resolveParamsArray ) => {
34
- if ( options . debug ) console . log ( 'New db request (findById)' )
35
- //response
36
- return findByIdResolver . resolve ( resolveParamsArray [ 0 ] ) . then ( res => [ res ] )
37
- } ,
33
+ let findByIdLoader = new DataLoader ( ( resolveParamsArray ) =>
34
+ new Promise ( ( resolve , reject ) => {
35
+ if ( options . debug ) console . log ( 'New db request (findById)' )
36
+ resolve ( resolveParamsArray . map ( rp => findByIdResolver . resolve ( rp ) ) )
37
+ } ) ,
38
38
{ cacheKeyFn : key => {
39
39
let newKey = getHashKey ( key )
40
40
return newKey
@@ -53,10 +53,11 @@ export function composeWithDataLoader(
53
53
* Add DataLoader to FindByIds
54
54
*/
55
55
let findByIdsResolver = typeComposer . get ( '$findByIds' )
56
- let findByIdsLoader = new DataLoader ( ( resolveParamsArray ) => {
57
- if ( options . debug ) console . log ( 'New db request (findByIds)' )
58
- return findByIdsResolver . resolve ( resolveParamsArray [ 0 ] ) . then ( res => [ res ] )
59
- } ,
56
+ let findByIdsLoader = new DataLoader ( ( resolveParamsArray ) =>
57
+ new Promise ( ( resolve , reject ) => {
58
+ if ( options . debug ) console . log ( 'New db request (findByIds)' )
59
+ resolve ( resolveParamsArray . map ( rp => findByIdResolver . resolve ( rp ) ) )
60
+ } ) ,
60
61
{ cacheKeyFn : key => getHashKey ( key ) } )
61
62
62
63
typeComposer . setResolver (
@@ -72,10 +73,11 @@ export function composeWithDataLoader(
72
73
* Add DataLoader to Count
73
74
*/
74
75
let countResolver = typeComposer . get ( '$count' )
75
- let countLoader = new DataLoader ( ( resolveParamsArray ) => {
76
- if ( options . debug ) console . log ( 'New db request (count)' )
77
- return countResolver . resolve ( resolveParamsArray [ 0 ] ) . then ( res => [ res ] )
78
- } ,
76
+ let countLoader = new DataLoader ( ( resolveParamsArray ) =>
77
+ new Promise ( ( resolve , reject ) => {
78
+ if ( options . debug ) console . log ( 'New db request (count)' )
79
+ resolve ( resolveParamsArray . map ( rp => countResolver . resolve ( rp ) ) )
80
+ } ) ,
79
81
{ cacheKeyFn : key => getHashKey ( key ) } )
80
82
81
83
typeComposer . setResolver (
@@ -91,10 +93,11 @@ export function composeWithDataLoader(
91
93
* Add DataLoader to FindOne
92
94
*/
93
95
let findOneResolver = typeComposer . get ( '$findOne' )
94
- let findOneLoader = new DataLoader ( ( resolveParamsArray ) => {
95
- if ( options . debug ) console . log ( 'New db request (findOne)' )
96
- return findOneResolver . resolve ( resolveParamsArray [ 0 ] ) . then ( res => [ res ] )
97
- } ,
96
+ let findOneLoader = new DataLoader ( ( resolveParamsArray ) =>
97
+ new Promise ( ( resolve , reject ) => {
98
+ if ( options . debug ) console . log ( 'New db request (findOne)' )
99
+ resolve ( resolveParamsArray . map ( rp => findOneResolver . resolve ( rp ) ) )
100
+ } ) ,
98
101
{ cacheKeyFn : key => getHashKey ( key ) } )
99
102
100
103
typeComposer . setResolver (
@@ -109,12 +112,12 @@ export function composeWithDataLoader(
109
112
* Add DataLoader to FindMany
110
113
*/
111
114
let findManyResolver = typeComposer . get ( '$findMany' )
112
- let findManyLoader = new DataLoader ( ( resolveParamsArray ) => {
113
- if ( options . debug ) console . log ( 'New db request (findMany)' )
114
- //response
115
- return findManyResolver . resolve ( resolveParamsArray [ 0 ] ) . then ( res => [ res ] )
116
- } ,
117
- { cacheKeyFn : key => getHashKey ( key ) } )
115
+ let findManyLoader = new DataLoader ( resolveParamsArray =>
116
+ new Promise ( ( resolve , reject ) => {
117
+ if ( options . debug ) console . log ( 'New db request (findMany)' )
118
+ resolve ( resolveParamsArray . map ( rp => findManyResolver . resolve ( rp ) ) )
119
+ } ) ,
120
+ { cacheKeyFn : key => getHashKey ( key ) } )
118
121
119
122
typeComposer . setResolver (
120
123
'findMany' ,
@@ -131,17 +134,17 @@ export function composeWithDataLoader(
131
134
*/
132
135
let connectionResolver = typeComposer . get ( '$connection' )
133
136
let connectionFieldNames = typeComposer . getFieldNames ( )
134
- let connectionLoader = new DataLoader ( ( resolveParamsArray ) => {
135
- if ( options . debug ) console . log ( 'New db request (connection)' )
136
- //response
137
- return connectionResolver . resolve ( resolveParamsArray [ 0 ] ) . then ( res => [ res ] )
138
- } ,
137
+ let connectionLoader = new DataLoader ( resolveParamsArray =>
138
+ new Promise ( ( resolve , reject ) => {
139
+ if ( options . debug ) console . log ( 'New db request (connection)' )
140
+ resolve ( resolveParamsArray . map ( rp => connectionResolver . resolve ( rp ) ) )
141
+ } ) ,
139
142
{ cacheKeyFn : key => getHashKey ( key ) } )
140
143
141
144
typeComposer . setResolver ( 'connection' ,
142
145
connectionResolver . wrapResolve ( next => rp => {
143
146
if ( options . removeProjection ) {
144
- let projection = { edges : { node : { } } }
147
+ let projection = { edges : { node : { } } }
145
148
connectionFieldNames . map ( field => projection . edges . node [ field ] = true )
146
149
rp . projection = projection
147
150
}
0 commit comments