Merge pull request #289 from social-native/fix/autocoerce-before-filt…

…erTransformer FilterTransformer should happen after coercion
social-native · Sep 24, 2021 · 2592db0 · 2592db0
2 parents 567bb36 + 2ac7974
commit 2592db0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "graphql-connections",
-    "version": "9.1.1",
+    "version": "9.1.2",
     "description": "Build and handle Relay-like GraphQL connections using a Knex query builder",
     "main": "dist/index.cjs.js",
     "module": "dist/index.es.js",

diff --git a/src/query_builder/knex_base.ts b/src/query_builder/knex_base.ts
@@ -117,34 +117,36 @@ export default class KnexQueryBuilder implements IQueryBuilder<Knex> {
     // [string, string, string | number | null]
     // tslint:disable-next-line: cyclomatic-complexity
     private filterArgs(filter: IFilter) {
-        const {field, operator, value} = this.filterTransformer(filter);
-
         if (this.useSuggestedValueLiteralTransforms) {
-            const coercedValue = typeof value === 'string' ? coerceStringValue(value) : value;
+            // tslint:disable-next-line: no-shadowed-variable
+            const {field, operator, value} = this.filterTransformer({
+                ...filter,
+                value:
+                    typeof filter.value === 'string'
+                        ? coerceStringValue(filter.value)
+                        : filter.value
+            });
 
-            if (coercedValue === null && operator.toLowerCase() === '=') {
+            if (value === null && operator.toLowerCase() === '=') {
                 return [
                     (builder: QueryBuilder) => {
                         builder.whereNull(this.computeFilterField(field));
                     }
                 ];
             }
 
-            if (coercedValue === null && operator.toLowerCase() === '<>') {
+            if (value === null && operator.toLowerCase() === '<>') {
                 return [
                     (builder: QueryBuilder) => {
                         builder.whereNotNull(this.computeFilterField(field));
                     }
                 ];
             }
 
-            return [
-                this.computeFilterField(field),
-                this.computeFilterOperator(operator),
-                coercedValue
-            ];
+            return [this.computeFilterField(field), this.computeFilterOperator(operator), value];
         }
 
+        const {field, operator, value} = this.filterTransformer(filter);
         return [this.computeFilterField(field), this.computeFilterOperator(operator), value];
     }
 

diff --git a/src/types.ts b/src/types.ts
@@ -79,6 +79,10 @@ export type QueryBuilderOptions = IKnexQueryBuilderOptions | IKnexMySQLQueryBuil
 
 export interface IKnexQueryBuilderOptions {
     filterMap?: {[operator: string]: string};
+    /**
+     * If given with `useSuggestedValueLiteralTransforms`
+     * note that coercion happens FIRST, and then filterTransformer.
+     */
     filterTransformer?: FilterTransformer;
     useSuggestedValueLiteralTransforms?: boolean;
 }