feat: include fieldName and queryBuilder when calling resolveWhereClause (#66)

* Include fieldName and queryBuilder when calling resolveWhereClause

Author: mattbretl

src/PgConnectionArgFilterBackwardRelationsPlugin.js

@@ -174,7 +174,7 @@ module.exports = function PgConnectionArgFilterBackwardRelationsPlugin(
       return memo;
     }, {});
 
-    const resolve = ({ sourceAlias, fieldName, fieldValue }) => {
+    const resolve = ({ sourceAlias, fieldName, fieldValue, queryBuilder }) => {
       if (fieldValue == null) return null;
 
       const { table, foreignKeys, keys } = backwardRelationInfoByFieldName[
@@ -201,7 +201,8 @@ module.exports = function PgConnectionArgFilterBackwardRelationsPlugin(
       const sqlFragment = connectionFilterResolve(
         fieldValue,
         tableAlias,
-        tableFilterTypeName
+        tableFilterTypeName,
+        queryBuilder
       );
 
       return sqlFragment == null

src/PgConnectionArgFilterColumnsPlugin.js

@@ -67,7 +67,7 @@ module.exports = function PgConnectionArgFilterColumnsPlugin(builder) {
       {}
     );
 
-    const resolve = ({ sourceAlias, fieldName, fieldValue }) => {
+    const resolve = ({ sourceAlias, fieldName, fieldValue, queryBuilder }) => {
       if (fieldValue == null) return null;
 
       const attr = attrByFieldName[fieldName];
@@ -82,7 +82,9 @@ module.exports = function PgConnectionArgFilterColumnsPlugin(builder) {
             operatorName,
             input,
             attr.type,
-            attr.typeModifier
+            attr.typeModifier,
+            fieldName,
+            queryBuilder
           );
         })
         .filter(x => x != null);

src/PgConnectionArgFilterComputedColumnsPlugin.js

@@ -91,7 +91,7 @@ module.exports = function PgConnectionArgFilterComputedColumnsPlugin(builder) {
       {}
     );
 
-    const resolve = ({ sourceAlias, fieldName, fieldValue }) => {
+    const resolve = ({ sourceAlias, fieldName, fieldValue, queryBuilder }) => {
       if (fieldValue == null) return null;
 
       const proc = procByFieldName[fieldName];
@@ -108,7 +108,9 @@ module.exports = function PgConnectionArgFilterComputedColumnsPlugin(builder) {
             operatorName,
             input,
             procReturnType,
-            null
+            null,
+            fieldName,
+            queryBuilder
           );
         })
         .filter(x => x != null);

src/PgConnectionArgFilterForwardRelationsPlugin.js

@@ -113,7 +113,7 @@ module.exports = function PgConnectionArgFilterForwardRelationsPlugin(builder) {
       return memo;
     }, {});
 
-    const resolve = ({ sourceAlias, fieldName, fieldValue }) => {
+    const resolve = ({ sourceAlias, fieldName, fieldValue, queryBuilder }) => {
       if (fieldValue == null) return null;
 
       const {
@@ -147,7 +147,8 @@ module.exports = function PgConnectionArgFilterForwardRelationsPlugin(builder) {
       const sqlFragment = connectionFilterResolve(
         fieldValue,
         foreignTableAlias,
-        foreignTableFilterTypeName
+        foreignTableFilterTypeName,
+        queryBuilder
       );
 
       return sqlFragment == null

src/PgConnectionArgFilterLogicalOperatorsPlugin.js

@@ -24,27 +24,32 @@ module.exports = function PgConnectionArgFilterLogicalOperatorsPlugin(builder) {
     }
 
     const logicResolversByFieldName = {
-      and: (arr, sourceAlias) => {
+      and: (arr, sourceAlias, queryBuilder) => {
         const sqlFragments = arr
-          .map(o => connectionFilterResolve(o, sourceAlias, Self.name))
+          .map(o =>
+            connectionFilterResolve(o, sourceAlias, Self.name, queryBuilder)
+          )
           .filter(x => x != null);
         return sqlFragments.length === 0
           ? null
           : sql.query`(${sql.join(sqlFragments, ") and (")})`;
       },
-      or: (arr, sourceAlias) => {
+      or: (arr, sourceAlias, queryBuilder) => {
         const sqlFragments = arr
-          .map(o => connectionFilterResolve(o, sourceAlias, Self.name))
+          .map(o =>
+            connectionFilterResolve(o, sourceAlias, Self.name, queryBuilder)
+          )
           .filter(x => x != null);
         return sqlFragments.length === 0
           ? null
           : sql.query`(${sql.join(sqlFragments, ") or (")})`;
       },
-      not: (obj, sourceAlias) => {
+      not: (obj, sourceAlias, queryBuilder) => {
         const sqlFragment = connectionFilterResolve(
           obj,
           sourceAlias,
-          Self.name
+          Self.name,
+          queryBuilder
         );
         return sqlFragment == null ? null : sql.query`not (${sqlFragment})`;
       },
@@ -83,10 +88,14 @@ module.exports = function PgConnectionArgFilterLogicalOperatorsPlugin(builder) {
       ),
     };
 
-    const resolve = ({ sourceAlias, fieldName, fieldValue }) => {
+    const resolve = ({ sourceAlias, fieldName, fieldValue, queryBuilder }) => {
       if (fieldValue == null) return null;
 
-      return logicResolversByFieldName[fieldName](fieldValue, sourceAlias);
+      return logicResolversByFieldName[fieldName](
+        fieldValue,
+        sourceAlias,
+        queryBuilder
+      );
     };
 
     for (const fieldName of Object.keys(logicResolversByFieldName)) {

src/PgConnectionArgFilterPlugin.js

@@ -64,11 +64,12 @@ module.exports = function PgConnectionArgFilterPlugin(
               const sqlFragment = connectionFilterResolve(
                 args.filter,
                 queryBuilder.getTableAlias(),
-                filterTypeName
+                filterTypeName,
+                queryBuilder
               );
               if (sqlFragment != null) {
                 queryBuilder.where(sqlFragment);
-            }
+              }
             }
           },
         };
@@ -187,7 +188,12 @@ module.exports = function PgConnectionArgFilterPlugin(
       !Array.isArray(obj) &&
       Object.keys(obj).length === 0;
 
-    const connectionFilterResolve = (obj, sourceAlias, typeName) => {
+    const connectionFilterResolve = (
+      obj,
+      sourceAlias,
+      typeName,
+      queryBuilder
+    ) => {
       if (obj == null) return handleNullInput();
       if (isEmptyObject(obj)) return handleEmptyObjectInput();
 
@@ -203,6 +209,7 @@ module.exports = function PgConnectionArgFilterPlugin(
               sourceAlias,
               fieldName: key,
               fieldValue: value,
+              queryBuilder,
             });
           }
           throw new Error(`Unable to resolve filter field '${key}'`);
@@ -254,7 +261,7 @@ module.exports = function PgConnectionArgFilterPlugin(
           },
           true
         )
-        );
+      );
     };
 
     const sqlValueFromInput = (input, inputResolver, pgType, pgTypeModifier) =>
@@ -293,7 +300,9 @@ module.exports = function PgConnectionArgFilterPlugin(
       operatorName,
       input,
       pgType,
-      pgTypeModifier
+      pgTypeModifier,
+      fieldName,
+      queryBuilder
     ) => {
       if (input == null) return handleNullInput();
       if (isEmptyObject(input)) return handleEmptyObjectInput();
@@ -316,7 +325,13 @@ module.exports = function PgConnectionArgFilterPlugin(
       const sqlValue = operator.options.resolveWithRawInput
         ? input
         : sqlValueFromInput(input, inputResolver, pgType, pgTypeModifier);
-      return operator.resolveWhereClause(sqlIdentifier, sqlValue, input);
+      return operator.resolveWhereClause(
+        sqlIdentifier,
+        sqlValue,
+        input,
+        fieldName,
+        queryBuilder
+      );
     };
 
     const connectionFilterType = (