Skip to content

Commit 7e5ae8f

Browse files
committed
refactor: use consistent method of registering field resolvers
1 parent 942c360 commit 7e5ae8f

5 files changed

+26
-25
lines changed

src/PgConnectionArgFilterBackwardRelationsPlugin.js

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ module.exports = function PgConnectionArgFilterBackwardRelationsPlugin(
2222
pgOmit: omit,
2323
pgSql: sql,
2424
pgIntrospectionResultsByKind: introspectionResultsByKind,
25-
graphql: { GraphQLInputObjectType, GraphQLBoolean },
25+
graphql: { GraphQLInputObjectType },
2626
connectionFilterResolve,
2727
connectionFilterFieldResolversByTypeNameAndFieldName,
2828
connectionFilterTypesByTypeName,
@@ -260,9 +260,10 @@ module.exports = function PgConnectionArgFilterBackwardRelationsPlugin(
260260
};
261261

262262
for (const fieldName of Object.keys(backwardRelationSpecByFieldName)) {
263-
connectionFilterFieldResolversByTypeNameAndFieldName[Self.name][
264-
fieldName
265-
] = resolve;
263+
connectionFilterFieldResolversByTypeNameAndFieldName[Self.name] = {
264+
...connectionFilterFieldResolversByTypeNameAndFieldName[Self.name],
265+
[fieldName]: resolve,
266+
};
266267
}
267268

268269
return extend(fields, backwardRelationFields);
@@ -395,13 +396,11 @@ module.exports = function PgConnectionArgFilterBackwardRelationsPlugin(
395396
}
396397
};
397398

398-
for (const manyFieldName of Object.keys(manyFields)) {
399-
if (!connectionFilterFieldResolversByTypeNameAndFieldName[Self.name]) {
400-
connectionFilterFieldResolversByTypeNameAndFieldName[Self.name] = {};
401-
}
402-
connectionFilterFieldResolversByTypeNameAndFieldName[Self.name][
403-
manyFieldName
404-
] = resolve;
399+
for (const fieldName of Object.keys(manyFields)) {
400+
connectionFilterFieldResolversByTypeNameAndFieldName[Self.name] = {
401+
...connectionFilterFieldResolversByTypeNameAndFieldName[Self.name],
402+
[fieldName]: resolve,
403+
};
405404
}
406405

407406
return extend(fields, manyFields);

src/PgConnectionArgFilterColumnsPlugin.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ module.exports = function PgConnectionArgFilterColumnsPlugin(builder) {
2525

2626
connectionFilterTypesByTypeName[Self.name] = Self;
2727

28-
connectionFilterFieldResolversByTypeNameAndFieldName[Self.name] = {};
29-
3028
const attrByFieldName = introspectionResultsByKind.attribute
3129
.filter(attr => attr.classId === table.id)
3230
.filter(attr => pgColumnFilter(attr, build, context))
@@ -96,9 +94,10 @@ module.exports = function PgConnectionArgFilterColumnsPlugin(builder) {
9694
};
9795

9896
for (const fieldName of Object.keys(attrByFieldName)) {
99-
connectionFilterFieldResolversByTypeNameAndFieldName[Self.name][
100-
fieldName
101-
] = resolve;
97+
connectionFilterFieldResolversByTypeNameAndFieldName[Self.name] = {
98+
...connectionFilterFieldResolversByTypeNameAndFieldName[Self.name],
99+
[fieldName]: resolve,
100+
};
102101
}
103102

104103
return extend(fields, attrFields);

src/PgConnectionArgFilterComputedColumnsPlugin.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,10 @@ module.exports = function PgConnectionArgFilterComputedColumnsPlugin(builder) {
122122
};
123123

124124
for (const fieldName of Object.keys(procByFieldName)) {
125-
connectionFilterFieldResolversByTypeNameAndFieldName[Self.name][
126-
fieldName
127-
] = resolve;
125+
connectionFilterFieldResolversByTypeNameAndFieldName[Self.name] = {
126+
...connectionFilterFieldResolversByTypeNameAndFieldName[Self.name],
127+
[fieldName]: resolve,
128+
};
128129
}
129130

130131
return extend(fields, procFields);

src/PgConnectionArgFilterForwardRelationsPlugin.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,10 @@ module.exports = function PgConnectionArgFilterForwardRelationsPlugin(builder) {
164164
};
165165

166166
for (const fieldName of Object.keys(forwardRelationSpecByFieldName)) {
167-
connectionFilterFieldResolversByTypeNameAndFieldName[Self.name][
168-
fieldName
169-
] = resolve;
167+
connectionFilterFieldResolversByTypeNameAndFieldName[Self.name] = {
168+
...connectionFilterFieldResolversByTypeNameAndFieldName[Self.name],
169+
[fieldName]: resolve,
170+
};
170171
}
171172

172173
return extend(fields, forwardRelationFields);

src/PgConnectionArgFilterLogicalOperatorsPlugin.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,10 @@ module.exports = function PgConnectionArgFilterLogicalOperatorsPlugin(builder) {
9999
};
100100

101101
for (const fieldName of Object.keys(logicResolversByFieldName)) {
102-
connectionFilterFieldResolversByTypeNameAndFieldName[Self.name][
103-
fieldName
104-
] = resolve;
102+
connectionFilterFieldResolversByTypeNameAndFieldName[Self.name] = {
103+
...connectionFilterFieldResolversByTypeNameAndFieldName[Self.name],
104+
[fieldName]: resolve,
105+
};
105106
}
106107

107108
return extend(fields, logicalOperatorFields);

0 commit comments

Comments
 (0)