Refactor to remove all getTypeByName() calls

Author: mattbretl

src/PgConnectionArgFilterBackwardRelationsPlugin.js

@@ -17,7 +17,7 @@ module.exports = function PgConnectionArgFilterBackwardRelationsPlugin(
       connectionFilterResolve,
       connectionFilterFieldResolversByTypeNameAndFieldName,
       connectionFilterTypesByTypeName,
-      newFilterType,
+      connectionFilterType,
     } = build;
     const {
       fieldWithHooks,
@@ -153,9 +153,12 @@ module.exports = function PgConnectionArgFilterBackwardRelationsPlugin(
       const [fieldName, { table }] = curr;
       const tableTypeName = inflection.tableType(table);
       const tableFilterTypeName = inflection.filterType(tableTypeName);
-      const FilterType =
-        connectionFilterTypesByTypeName[tableFilterTypeName] ||
-        newFilterType(newWithHooks, tableFilterTypeName, table, tableTypeName);
+      const FilterType = connectionFilterType(
+        newWithHooks,
+        tableFilterTypeName,
+        table,
+        tableTypeName
+      );
       if (FilterType != null) {
         memo[fieldName] = fieldWithHooks(
           fieldName,

src/PgConnectionArgFilterColumnsPlugin.js

@@ -10,8 +10,9 @@ module.exports = function PgConnectionArgFilterColumnsPlugin(builder) {
       pgColumnFilter,
       pgOmit: omit,
       inflection,
-      connectionFilterField,
+      connectionFilterOperatorsType,
       resolveWhereComparison,
+      connectionFilterTypesByTypeName,
       connectionFilterFieldResolversByTypeNameAndFieldName,
     } = build;
     const {
@@ -22,6 +23,8 @@ module.exports = function PgConnectionArgFilterColumnsPlugin(builder) {
 
     if (!isPgConnectionFilter) return fields;
 
+    connectionFilterTypesByTypeName[Self.name] = Self;
+
     connectionFilterFieldResolversByTypeNameAndFieldName[Self.name] = {};
 
     const attrByFieldName = introspectionResultsByKind.attribute
@@ -41,16 +44,25 @@ module.exports = function PgConnectionArgFilterColumnsPlugin(builder) {
             attr.typeId,
             attr.typeModifier
           ) || GraphQLString; // TODO: Remove `|| GraphQLString` before v1.0.0
-        const fieldSpec = connectionFilterField(
-          fieldName,
+        const OperatorsType = connectionFilterOperatorsType(
           fieldType,
-          fieldWithHooks,
           newWithHooks
         );
-        if (!fieldSpec) {
+        if (!OperatorsType) {
           return memo;
         }
-        return extend(memo, { [fieldName]: fieldSpec });
+        return extend(memo, {
+          [fieldName]: fieldWithHooks(
+            fieldName,
+            {
+              description: `Filter by the object’s \`${fieldName}\` field.`,
+              type: OperatorsType,
+            },
+            {
+              isPgConnectionFilterField: true,
+            }
+          ),
+        });
       },
       {}
     );

src/PgConnectionArgFilterComputedColumnsPlugin.js

@@ -9,7 +9,8 @@ module.exports = function PgConnectionArgFilterComputedColumnsPlugin(builder) {
       pgSql: sql,
       resolveWhereComparison,
       inflection,
-      connectionFilterField,
+      connectionFilterTypesByTypeName,
+      connectionFilterOperatorsType,
       connectionFilterFieldResolversByTypeNameAndFieldName,
     } = build;
     const {
@@ -20,6 +21,8 @@ module.exports = function PgConnectionArgFilterComputedColumnsPlugin(builder) {
 
     if (!isPgConnectionFilter) return fields;
 
+    connectionFilterTypesByTypeName[Self.name] = Self;
+
     const procByFieldName = introspectionResultsByKind.procedure
       .filter(proc => proc.isStable)
       .filter(proc => proc.namespaceId === table.namespaceId)
@@ -65,16 +68,25 @@ module.exports = function PgConnectionArgFilterComputedColumnsPlugin(builder) {
           proc.returnTypeId,
           null
         );
-        const fieldSpec = connectionFilterField(
-          fieldName,
+        const OperatorsType = connectionFilterOperatorsType(
           fieldType,
-          fieldWithHooks,
           newWithHooks
         );
-        if (!fieldSpec) {
+        if (!OperatorsType) {
           return memo;
         }
-        return extend(memo, { [fieldName]: fieldSpec });
+        return extend(memo, {
+          [fieldName]: fieldWithHooks(
+            fieldName,
+            {
+              description: `Filter by the object’s \`${fieldName}\` field.`,
+              type: OperatorsType,
+            },
+            {
+              isPgConnectionFilterField: true,
+            }
+          ),
+        });
       },
       {}
     );

src/PgConnectionArgFilterForwardRelationsPlugin.js

@@ -10,7 +10,7 @@ module.exports = function PgConnectionArgFilterForwardRelationsPlugin(builder) {
       connectionFilterResolve,
       connectionFilterFieldResolversByTypeNameAndFieldName,
       connectionFilterTypesByTypeName,
-      newFilterType,
+      connectionFilterType,
     } = build;
     const {
       fieldWithHooks,
@@ -92,14 +92,12 @@ module.exports = function PgConnectionArgFilterForwardRelationsPlugin(builder) {
       const foreignTableFilterTypeName = inflection.filterType(
         foreignTableTypeName
       );
-      const FilterType =
-        connectionFilterTypesByTypeName[foreignTableFilterTypeName] ||
-        newFilterType(
-          newWithHooks,
-          foreignTableFilterTypeName,
-          foreignTable,
-          foreignTableTypeName
-        );
+      const FilterType = connectionFilterType(
+        newWithHooks,
+        foreignTableFilterTypeName,
+        foreignTable,
+        foreignTableTypeName
+      );
       if (FilterType != null) {
         memo[fieldName] = fieldWithHooks(
           fieldName,

src/PgConnectionArgFilterLogicalOperatorsPlugin.js

@@ -4,6 +4,7 @@ module.exports = function PgConnectionArgFilterLogicalOperatorsPlugin(builder) {
       extend,
       graphql: { GraphQLList, GraphQLNonNull },
       pgSql: sql,
+      connectionFilterTypesByTypeName,
       connectionFilterResolve,
       connectionFilterFieldResolversByTypeNameAndFieldName,
     } = build;
@@ -15,6 +16,8 @@ module.exports = function PgConnectionArgFilterLogicalOperatorsPlugin(builder) {
 
     if (!isPgConnectionFilter) return fields;
 
+    connectionFilterTypesByTypeName[Self.name] = Self;
+
     if (Object.keys(fields).length === 0) {
       // Skip adding these operators if they would be the only fields
       return fields;