prostgles-server 3.0.78 → 3.0.79

package/lib/DboBuilder/ViewHandler.js

@@ -2,16 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ViewHandler = void 0;
 const makeSelectQuery_1 = require("../DboBuilder/QueryBuilder/makeSelectQuery");
+const getCondition_1 = require("./getCondition");
 const runSQL_1 = require("../DboBuilder/runSQL");
 const prostgles_types_1 = require("prostgles-types");
 const DboBuilder_1 = require("../DboBuilder");
 const PubSubManager_1 = require("../PubSubManager/PubSubManager");
 const QueryBuilder_1 = require("./QueryBuilder/QueryBuilder");
 const Functions_1 = require("./QueryBuilder/Functions");
-const Filtering_1 = require("../Filtering");
 const getColumns_1 = require("./getColumns");
 const subscribe_1 = require("./subscribe");
-const FILTER_FUNCS = Functions_1.FUNCTIONS.filter(f => f.canBeUsedForFilter);
 class ColSet {
     opts;
     constructor(columns, tableName) {
@@ -579,7 +578,7 @@ class ViewHandler {
             if (["row", "value"].includes(returnType)) {
                 return (this.t || this.db).oneOrNone(_query).then(data => {
                     return (data && returnType === "value") ? Object.values(data)[0] : data;
-                }).catch(err => (0, DboBuilder_1.makeErr)(err, localParams, this));
+                }).catch(err => (0, DboBuilder_1.makeErrorFromPGError)(err, localParams, this));
             }
             else {
                 return (this.t || this.db).any(_query).then(data => {
@@ -587,7 +586,7 @@ class ViewHandler {
                         return data.map(d => Object.values(d)[0]);
                     }
                     return data;
-                }).catch(err => (0, DboBuilder_1.makeErr)(err, localParams, this));
+                }).catch(err => (0, DboBuilder_1.makeErrorFromPGError)(err, localParams, this));
             }
         }
         catch (e) {
@@ -780,7 +779,7 @@ class ViewHandler {
                 throw { stack: ["prepareExistCondition()"], message: `Invalid or dissallowed table: ${t}` };
         });
         /* Nested $exists not allowed */
-        if (f2 && Object.keys(f2).find(fk => DboBuilder_1.EXISTS_KEYS.includes(fk))) {
+        if (f2 && Object.keys(f2).find(fk => prostgles_types_1.EXISTS_KEYS.includes(fk))) {
             throw { stack: ["prepareExistCondition()"], message: "Nested exists dissallowed" };
         }
         const makeTableChain = (finalFilter) => {
@@ -859,208 +858,7 @@ class ViewHandler {
         }
         return res;
     }
-    /**
-     * parses a single filter
-     * @example
-     *  { fff: 2 } => "fff" = 2
-     *  { fff: { $ilike: 'abc' } } => "fff" ilike 'abc'
-     */
-    async getCondition(params) {
-        const { filter, select, allowed_colnames, tableAlias, localParams, tableRules } = params;
-        let data = { ...filter };
-        /* Exists join filter */
-        const ERR = "Invalid exists filter. \nExpecting somethibng like: \n | { $exists: { tableName.tableName2: Filter } } \n  | { $exists: { \"**.tableName3\": Filter } }\n | { path: string[]; filter: AnyObject }";
-        const SP_WILDCARD = "**";
-        let existsKeys = Object.keys(data)
-            .filter(k => DboBuilder_1.EXISTS_KEYS.includes(k) && Object.keys(data[k] || {}).length)
-            .map(key => {
-            const isJoined = DboBuilder_1.EXISTS_KEYS.slice(-2).includes(key);
-            const filterValue = data[key];
-            /**
-             * type ExistsJoined =
-             *   | { "table1.table2": { column: filterValue }  }
-             *   | { path: string[]; filter: AnyObject }
-             */
-            const dataKeys = Object.keys(filterValue);
-            const isDetailed = dataKeys.length === 2 && dataKeys.every(key => ["path", "filter"].includes(key));
-            const firstKey = dataKeys[0];
-            /**
-             * Prevent some errors with table names that contain "."
-             */
-            const firstKeyIsATable = !!this.dboBuilder.dbo[firstKey];
-            let tables = isDetailed ? filterValue.path : (firstKeyIsATable ? [firstKey] : firstKey.split("."));
-            let f2 = isDetailed ? filterValue.filter : filterValue[firstKey];
-            let shortestJoin = false;
-            if (!isJoined) {
-                if (tables.length !== 1)
-                    throw "Expecting single table in exists filter. Example: { $exists: { tableName: Filter } }";
-            }
-            else {
-                /* First part can be the ** param meaning shortest join. Will be overriden by anything in tableConfig */
-                if (!tables.length) {
-                    throw ERR + "\nBut got: " + filterValue;
-                }
-                if (tables[0] === SP_WILDCARD) {
-                    tables = tables.slice(1);
-                    shortestJoin = true;
-                }
-            }
-            return {
-                key,
-                existType: key,
-                isJoined,
-                shortestJoin,
-                f2,
-                tables
-            };
-        });
-        /* Exists with exact path */
-        // Object.keys(data).map(k => {
-        //     let isthis = isPlainObject(data[k]) && !this.column_names.includes(k) && !k.split(".").find(kt => !this.dboBuilder.dbo[kt]);
-        //     if(isthis) {
-        //         existsKeys.push({
-        //             key: k,
-        //             notJoined: false,
-        //             exactPaths: k.split(".")
-        //         });
-        //     }
-        // });
-        let funcConds = [];
-        const funcFilterkeys = FILTER_FUNCS.filter(f => {
-            return f.name in data;
-        });
-        funcFilterkeys.map(f => {
-            const funcArgs = data[f.name];
-            if (!Array.isArray(funcArgs))
-                throw `A function filter must contain an array. E.g: { $funcFilterName: ["col1"] } \n but got: ${JSON.stringify((0, prostgles_types_1.pickKeys)(data, [f.name]))} `;
-            const fields = this.parseFieldFilter(f.getFields(funcArgs), true, allowed_colnames);
-            const dissallowedCols = fields.filter(fname => !allowed_colnames.includes(fname));
-            if (dissallowedCols.length) {
-                throw `Invalid/disallowed columns found in function filter: ${dissallowedCols}`;
-            }
-            funcConds.push(f.getQuery({ args: funcArgs, allColumns: this.columns, allowedFields: allowed_colnames, tableAlias }));
-        });
-        let existsCond = "";
-        if (existsKeys.length) {
-            existsCond = (await Promise.all(existsKeys.map(async (k) => await this.prepareExistCondition(k, localParams)))).join(" AND ");
-        }
-        /* Computed field queries */
-        const p = this.getValidatedRules(tableRules, localParams);
-        const computedFields = p.allColumns.filter(c => c.type === "computed");
-        let computedColConditions = [];
-        Object.keys(data || {}).map(key => {
-            const compCol = computedFields.find(cf => cf.name === key);
-            if (compCol) {
-                computedColConditions.push(compCol.getQuery({
-                    tableAlias,
-                    allowedFields: p.select.fields,
-                    allColumns: this.columns,
-                    /* CTID not available in AFTER trigger */
-                    // ctidField: this.is_view? undefined : "ctid"
-                    ctidField: undefined,
-                }) + ` = ${DboBuilder_1.pgp.as.format("$1", [data[key]])}`);
-                delete data[key];
-            }
-        });
-        let allowedSelect = [];
-        /* Select aliases take precedence over col names. This is to ensure filters work correctly and even on computed cols*/
-        if (select) {
-            /* Allow filtering by selected fields/funcs */
-            allowedSelect = select.filter(s => {
-                /*  */
-                if (["function", "computed", "column"].includes(s.type)) {
-                    if (s.type !== "column" || allowed_colnames.includes(s.alias)) {
-                        return true;
-                    }
-                }
-                return false;
-            });
-        }
-        /* Add remaining allowed fields */
-        allowedSelect = allowedSelect.concat(p.allColumns.filter(c => allowed_colnames.includes(c.name) &&
-            !allowedSelect.find(s => s.alias === c.name)).map(f => ({
-            type: f.type,
-            alias: f.name,
-            getQuery: (tableAlias) => f.getQuery({
-                tableAlias,
-                allColumns: this.columns,
-                allowedFields: allowed_colnames
-            }),
-            selected: false,
-            getFields: () => [f.name],
-            column_udt_type: f.type === "column" ? this.columns.find(c => c.name === f.name)?.udt_name : undefined
-        })));
-        /* Parse complex filters
-            { $filter: [{ $func: [...] }, "=", value | { $func: [..] }] }
-        */
-        const complexFilters = [];
-        const complexFilterKey = "$filter";
-        const allowedComparators = [">", "<", "=", "<=", ">=", "<>", "!="];
-        if (complexFilterKey in data) {
-            const getFuncQuery = (funcData) => {
-                const { funcName, args } = (0, QueryBuilder_1.parseFunctionObject)(funcData);
-                const funcDef = (0, Functions_1.parseFunction)({ func: funcName, args, functions: Functions_1.FUNCTIONS, allowedFields: allowed_colnames });
-                return funcDef.getQuery({ args, tableAlias, allColumns: this.columns, allowedFields: allowed_colnames });
-            };
-            const complexFilter = data[complexFilterKey];
-            if (!Array.isArray(complexFilter))
-                throw `Invalid $filter. Must contain an array of at least element but got: ${JSON.stringify(complexFilter)} `;
-            const leftFilter = complexFilter[0];
-            const comparator = complexFilter[1];
-            const rightFilterOrValue = complexFilter[2];
-            const leftVal = getFuncQuery(leftFilter);
-            let result = leftVal;
-            if (comparator) {
-                if (!allowedComparators.includes(comparator))
-                    throw `Invalid $filter. comparator ${JSON.stringify(comparator)} is not valid. Expecting one of: ${allowedComparators}`;
-                if (!rightFilterOrValue)
-                    throw "Invalid $filter. Expecting a value or function after the comparator";
-                const rightVal = (0, prostgles_types_1.isObject)(rightFilterOrValue) ? getFuncQuery(rightFilterOrValue) : (0, PubSubManager_1.asValue)(rightFilterOrValue);
-                if (leftVal === rightVal)
-                    throw "Invalid $filter. Cannot compare two identical function signatures: " + JSON.stringify(leftFilter);
-                result += ` ${comparator} ${rightVal}`;
-            }
-            complexFilters.push(result);
-        }
-        /* Parse join filters
-            { $joinFilter: { $ST_DWithin: [table.col, foreignTable.col, distance] }
-            will make an exists filter
-        */
-        let filterKeys = Object.keys(data).filter(k => k !== complexFilterKey && !funcFilterkeys.find(ek => ek.name === k) && !computedFields.find(cf => cf.name === k) && !existsKeys.find(ek => ek.key === k));
-        // if(allowed_colnames){
-        //     const aliasedColumns = (select || []).filter(s => 
-        //         ["function", "computed", "column"].includes(s.type) && allowed_colnames.includes(s.alias) ||  
-        //         s.getFields().find(f => allowed_colnames.includes(f))
-        //     ).map(s => s.alias);
-        //     const validCols = [...allowed_colnames, ...aliasedColumns];
-        // }
-        const validFieldNames = allowedSelect.map(s => s.alias);
-        const invalidColumn = filterKeys
-            .find(fName => !validFieldNames.find(c => c === fName ||
-            (fName.startsWith(c) && (fName.slice(c.length).includes("->") ||
-                fName.slice(c.length).includes(".")))));
-        if (invalidColumn) {
-            throw `Table: ${this.name} -> disallowed/inexistent columns in filter: ${invalidColumn} \n  Expecting one of: ${allowedSelect.map(s => s.type === "column" ? s.getQuery() : s.alias).join(", ")}`;
-        }
-        /* TODO: Allow filter funcs */
-        // const singleFuncs = FUNCTIONS.filter(f => f.singleColArg);
-        const f = (0, prostgles_types_1.pickKeys)(data, filterKeys);
-        const q = (0, Filtering_1.parseFilterItem)({
-            filter: f,
-            tableAlias,
-            pgp: DboBuilder_1.pgp,
-            select: allowedSelect
-        });
-        let templates = [q].filter(q => q);
-        if (existsCond)
-            templates.push(existsCond);
-        templates = templates.concat(funcConds);
-        templates = templates.concat(computedColConditions);
-        templates = templates.concat(complexFilters);
-        /*  sorted to ensure duplicate subscription channels are not created due to different condition order */
-        return templates.sort()
-            .join(" AND \n");
-    }
+    getCondition = getCondition_1.getCondition.bind(this);
     /* This relates only to SELECT */
     prepareSortItems(orderBy, allowed_cols, tableAlias, select) {
         const throwErr = () => {

package/lib/DboBuilder/ViewHandler.ts

@@ -1,4 +1,5 @@
-import { makeSelectQuery } from "../DboBuilder/QueryBuilder/makeSelectQuery"
+import { makeSelectQuery } from "../DboBuilder/QueryBuilder/makeSelectQuery";
+import { getCondition } from "./getCondition";
 
 import * as pgPromise from 'pg-promise';
 import { canRunSQL, runSQL } from "../DboBuilder/runSQL";
@@ -10,12 +11,12 @@ import {
   TableInfo as TInfo,
   AnyObject,
   isObject, isDefined, getKeys,
-  _PG_geometric, pickKeys, SubscribeParams
+  _PG_geometric, pickKeys, SubscribeParams, EXISTS_KEYS, EXISTS_KEY
 } from "prostgles-types";
 import { DB, DBHandlerServer, Join } from "../Prostgles";
 import {
-  DboBuilder, escapeTSNames, ExistsFilterConfig, EXISTS_KEY, EXISTS_KEYS, Filter, isPlainObject,
-  JoinInfo, LocalParams, makeErr, parseError, pgp, postgresToTsType, SortItem,
+  DboBuilder, escapeTSNames, ExistsFilterConfig,Filter, isPlainObject,
+  JoinInfo, LocalParams, makeErrorFromPGError, parseError, pgp, postgresToTsType, SortItem,
   TableHandlers, TableSchema, ValidatedTableRules
 } from "../DboBuilder";
 import { Graph } from "../shortestPath";
@@ -23,8 +24,7 @@ import { TableRule, UpdateRule, ValidateRow } from "../PublishParser";
 import { asValue, omitKeys } from "../PubSubManager/PubSubManager";
 import { TableHandler } from "./TableHandler";
 import { asNameAlias,  getNewQuery, parseFunctionObject, SelectItem, SelectItemValidated } from "./QueryBuilder/QueryBuilder";
-import { COMPUTED_FIELDS, FieldSpec, FUNCTIONS, parseFunction,  } from "./QueryBuilder/Functions";
-import { parseFilterItem } from "../Filtering";
+import { COMPUTED_FIELDS, FieldSpec } from "./QueryBuilder/Functions"; 
 import { getColumns } from "./getColumns";
 import { LocalFunc, subscribe } from "./subscribe";
 export type JoinPaths = {
@@ -34,8 +34,6 @@ export type JoinPaths = {
 }[];
 
 
-const FILTER_FUNCS = FUNCTIONS.filter(f => f.canBeUsedForFilter);
-
 
 class ColSet {
   opts: {
@@ -684,14 +682,14 @@ export class ViewHandler {
       if (["row", "value"].includes(returnType!)) {
         return (this.t || this.db).oneOrNone(_query).then(data => {
           return (data && returnType === "value") ? Object.values(data)[0] : data;
-        }).catch(err => makeErr(err, localParams, this));
+        }).catch(err => makeErrorFromPGError(err, localParams, this));
       } else {
         return (this.t || this.db).any(_query).then(data => {
           if (returnType === "values") {
             return data.map(d => Object.values(d)[0]);
           }
           return data;
-        }).catch(err => makeErr(err, localParams, this));
+        }).catch(err => makeErrorFromPGError(err, localParams, this));
       }
 
     } catch (e) {
@@ -1027,244 +1025,7 @@ export class ViewHandler {
     return res;
   }
 
-  /**
-   * parses a single filter
-   * @example
-   *  { fff: 2 } => "fff" = 2
-   *  { fff: { $ilike: 'abc' } } => "fff" ilike 'abc'
-   */
-  async getCondition(params: { filter: any, select?: SelectItem[], allowed_colnames: string[], tableAlias?: string, localParams?: LocalParams, tableRules?: TableRule }) {
-    const { filter, select, allowed_colnames, tableAlias, localParams, tableRules } = params;
-
-
-    let data = { ... (filter as any) } as any;
-
-    /* Exists join filter */
-    const ERR = "Invalid exists filter. \nExpecting somethibng like: \n | { $exists: { tableName.tableName2: Filter } } \n  | { $exists: { \"**.tableName3\": Filter } }\n | { path: string[]; filter: AnyObject }"
-    const SP_WILDCARD = "**";
-    let existsKeys: ExistsFilterConfig[] = Object.keys(data)
-      .filter(k => EXISTS_KEYS.includes(k as EXISTS_KEY) && Object.keys(data[k] || {}).length)
-      .map(key => {
-
-        const isJoined = EXISTS_KEYS.slice(-2).includes(key as EXISTS_KEY);
-
-        const filterValue = data[key];
-        /**
-         * type ExistsJoined = 
-         *   | { "table1.table2": { column: filterValue }  }
-         *   | { path: string[]; filter: AnyObject }
-         */
-        const dataKeys = Object.keys(filterValue);
-        const isDetailed = dataKeys.length === 2 && dataKeys.every(key => ["path", "filter"].includes(key));
-
-        const firstKey = dataKeys[0];
-
-        /**
-         * Prevent some errors with table names that contain "."
-         */
-        const firstKeyIsATable = !!this.dboBuilder.dbo[firstKey];
-        let tables = isDetailed? filterValue.path : (firstKeyIsATable? [firstKey] : firstKey.split("."));
-        let f2 = isDetailed? filterValue.filter : filterValue[firstKey];
-        let shortestJoin = false;
-
-        if (!isJoined) {
-          if (tables.length !== 1) throw "Expecting single table in exists filter. Example: { $exists: { tableName: Filter } }"
-        } else {
-          /* First part can be the ** param meaning shortest join. Will be overriden by anything in tableConfig */
-
-          if (!tables.length) {
-            throw ERR + "\nBut got: " + filterValue;
-          }
-
-          if (tables[0] === SP_WILDCARD) {
-            tables = tables.slice(1);
-            shortestJoin = true;
-          }
-        }
-
-        return {
-          key,
-          existType: key as EXISTS_KEY,
-          isJoined,
-          shortestJoin,
-          f2,
-          tables
-        }
-      });
-    /* Exists with exact path */
-    // Object.keys(data).map(k => {
-    //     let isthis = isPlainObject(data[k]) && !this.column_names.includes(k) && !k.split(".").find(kt => !this.dboBuilder.dbo[kt]);
-    //     if(isthis) {
-    //         existsKeys.push({
-    //             key: k,
-    //             notJoined: false,
-    //             exactPaths: k.split(".")
-    //         });
-    //     }
-    // });
-    let funcConds: string[] = [];
-    const funcFilterkeys = FILTER_FUNCS.filter(f => {
-      return f.name in data;
-    });
-    funcFilterkeys.map(f => {
-      const funcArgs = data[f.name];
-      if (!Array.isArray(funcArgs)) throw `A function filter must contain an array. E.g: { $funcFilterName: ["col1"] } \n but got: ${JSON.stringify(pickKeys(data, [f.name]))} `;
-      const fields = this.parseFieldFilter(f.getFields(funcArgs), true, allowed_colnames);
-
-      const dissallowedCols = fields.filter(fname => !allowed_colnames.includes(fname))
-      if (dissallowedCols.length) {
-        throw `Invalid/disallowed columns found in function filter: ${dissallowedCols}`
-      }
-      funcConds.push(f.getQuery({ args: funcArgs, allColumns: this.columns, allowedFields: allowed_colnames, tableAlias }));
-    })
-
-
-    let existsCond = "";
-    if (existsKeys.length) {
-      existsCond = (await Promise.all(existsKeys.map(async k => await this.prepareExistCondition(k, localParams)))).join(" AND ");
-    }
-
-    /* Computed field queries */
-    const p = this.getValidatedRules(tableRules, localParams);
-    const computedFields = p.allColumns.filter(c => c.type === "computed");
-    let computedColConditions: string[] = [];
-    Object.keys(data || {}).map(key => {
-      const compCol = computedFields.find(cf => cf.name === key);
-      if (compCol) {
-        computedColConditions.push(
-          compCol.getQuery({
-            tableAlias,
-            allowedFields: p.select.fields,
-            allColumns: this.columns,
-
-            /* CTID not available in AFTER trigger */
-            // ctidField: this.is_view? undefined : "ctid"
-
-            ctidField: undefined,
-          }) + ` = ${pgp.as.format("$1", [(data as any)[key]])}`
-        );
-        delete (data as any)[key];
-      }
-    });
-
-    let allowedSelect: SelectItem[] = [];
-    /* Select aliases take precedence over col names. This is to ensure filters work correctly and even on computed cols*/
-    if (select) {
-      /* Allow filtering by selected fields/funcs */
-      allowedSelect = select.filter(s => {
-        /*  */
-        if (["function", "computed", "column"].includes(s.type)) {
-          if (s.type !== "column" || allowed_colnames.includes(s.alias)) {
-            return true;
-          }
-        }
-        return false;
-      })
-    }
-
-    /* Add remaining allowed fields */
-    allowedSelect = allowedSelect.concat(
-      p.allColumns.filter(c =>
-        allowed_colnames.includes(c.name) &&
-        !allowedSelect.find(s => s.alias === c.name)
-      ).map(f => ({
-        type: f.type,
-        alias: f.name,
-        getQuery: (tableAlias) => f.getQuery({
-          tableAlias,
-          allColumns: this.columns,
-          allowedFields: allowed_colnames
-        }),
-        selected: false,
-        getFields: () => [f.name],
-        column_udt_type: f.type === "column" ? this.columns.find(c => c.name === f.name)?.udt_name : undefined
-      }))
-    );
-
-    /* Parse complex filters
-        { $filter: [{ $func: [...] }, "=", value | { $func: [..] }] } 
-    */
-    const complexFilters: string[] = [];
-    const complexFilterKey = "$filter";
-    const allowedComparators = [">", "<", "=", "<=", ">=", "<>", "!="]
-    if (complexFilterKey in data) {
-      const getFuncQuery = (funcData: any): string => {
-        const { funcName, args } = parseFunctionObject(funcData);
-        const funcDef = parseFunction({ func: funcName, args, functions: FUNCTIONS, allowedFields: allowed_colnames });
-        return funcDef.getQuery({ args, tableAlias, allColumns: this.columns, allowedFields: allowed_colnames });
-      }
-
-      const complexFilter = data[complexFilterKey];
-      if (!Array.isArray(complexFilter)) throw `Invalid $filter. Must contain an array of at least element but got: ${JSON.stringify(complexFilter)} `
-      const leftFilter = complexFilter[0];
-      const comparator = complexFilter[1];
-      const rightFilterOrValue = complexFilter[2];
-      const leftVal = getFuncQuery(leftFilter);
-      let result = leftVal;
-      if (comparator) {
-        if (!allowedComparators.includes(comparator)) throw `Invalid $filter. comparator ${JSON.stringify(comparator)} is not valid. Expecting one of: ${allowedComparators}`
-        if (!rightFilterOrValue) throw "Invalid $filter. Expecting a value or function after the comparator";
-        const rightVal = isObject(rightFilterOrValue) ? getFuncQuery(rightFilterOrValue) : asValue(rightFilterOrValue);
-        if (leftVal === rightVal) throw "Invalid $filter. Cannot compare two identical function signatures: " + JSON.stringify(leftFilter);
-        result += ` ${comparator} ${rightVal}`;
-      }
-      complexFilters.push(result);
-    }
-
-
-    /* Parse join filters
-        { $joinFilter: { $ST_DWithin: [table.col, foreignTable.col, distance] } 
-        will make an exists filter
-    */
-
-    let filterKeys = Object.keys(data).filter(k => k !== complexFilterKey && !funcFilterkeys.find(ek => ek.name === k) && !computedFields.find(cf => cf.name === k) && !existsKeys.find(ek => ek.key === k));
-    // if(allowed_colnames){
-    //     const aliasedColumns = (select || []).filter(s => 
-    //         ["function", "computed", "column"].includes(s.type) && allowed_colnames.includes(s.alias) ||  
-    //         s.getFields().find(f => allowed_colnames.includes(f))
-    //     ).map(s => s.alias);
-    //     const validCols = [...allowed_colnames, ...aliasedColumns];
-
-    // }
-    const validFieldNames = allowedSelect.map(s => s.alias);
-    const invalidColumn = filterKeys
-      .find(fName => !validFieldNames.find(c =>
-        c === fName ||
-        (
-          fName.startsWith(c) && (
-            fName.slice(c.length).includes("->") ||
-            fName.slice(c.length).includes(".")
-          )
-        )
-      ));
-
-    if (invalidColumn) {
-      throw `Table: ${this.name} -> disallowed/inexistent columns in filter: ${invalidColumn} \n  Expecting one of: ${allowedSelect.map(s => s.type === "column" ? s.getQuery() : s.alias).join(", ")}`;
-    }
-
-    /* TODO: Allow filter funcs */
-    // const singleFuncs = FUNCTIONS.filter(f => f.singleColArg);
-
-    const f = pickKeys(data, filterKeys);
-    const q = parseFilterItem({
-      filter: f,
-      tableAlias,
-      pgp,
-      select: allowedSelect
-    });
-
-    let templates: string[] = [q].filter(q => q);
-
-    if (existsCond) templates.push(existsCond);
-    templates = templates.concat(funcConds);
-    templates = templates.concat(computedColConditions);
-    templates = templates.concat(complexFilters);
-
-    /*  sorted to ensure duplicate subscription channels are not created due to different condition order */
-    return templates.sort()
-      .join(" AND \n");
-
-  }
+  getCondition = getCondition.bind(this);
 
   /* This relates only to SELECT */
   prepareSortItems(orderBy: OrderBy | undefined, allowed_cols: string[], tableAlias: string | undefined, select: SelectItemValidated[]): SortItem[] {

package/lib/DboBuilder/delete.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["delete.ts"],"names":[],"mappings":"AACA,OAAO,EAAqB,YAAY,EAAe,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EAAE,MAAM,EAAE,WAAW,EAAuB,MAAM,eAAe,CAAC;AACzE,OAAO,EAAc,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,wBAAsB,OAAO,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,EAAE,aAAa,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,CA6HrL"}
+{"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["delete.ts"],"names":[],"mappings":"AACA,OAAO,EAAqB,YAAY,EAAe,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EAAE,MAAM,EAAE,WAAW,EAAoC,MAAM,eAAe,CAAC;AACtF,OAAO,EAAc,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,wBAAsB,OAAO,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,EAAE,aAAa,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,CA6HrL"}

package/lib/DboBuilder/delete.js

@@ -112,7 +112,7 @@ async function _delete(filter, params, param3_unused, table_rules, localParams)
                 }
             }
         }
-        return dbHandler[queryType](_query).catch((err) => (0, DboBuilder_1.makeErr)(err, localParams));
+        return dbHandler[queryType](_query).catch((err) => (0, DboBuilder_1.makeErrorFromPGError)(err, localParams));
     }
     catch (e) {
         // console.trace(e)

package/lib/DboBuilder/delete.ts

@@ -1,6 +1,6 @@
 import pgPromise from "pg-promise";
 import { AnyObject, asName, DeleteParams, FieldFilter } from "prostgles-types";
-import { Filter, LocalParams, makeErr, parseError } from "../DboBuilder";
+import { Filter, LocalParams, makeErrorFromPGError, parseError } from "../DboBuilder";
 import { DeleteRule, TableRule } from "../PublishParser";
 import { pickKeys } from "../PubSubManager/PubSubManager";
 import { TableHandler } from "./TableHandler";
@@ -124,7 +124,7 @@ export async function _delete(this: TableHandler, filter?: Filter, params?: Dele
       }
     }
 
-    return dbHandler[queryType](_query).catch((err: any) => makeErr(err, localParams));
+    return dbHandler[queryType](_query).catch((err: any) => makeErrorFromPGError(err, localParams));
   } catch (e) {
     // console.trace(e)
     if (localParams && localParams.testRule) throw e;

package/lib/DboBuilder/getCondition.d.ts

@@ -0,0 +1,19 @@
+import { LocalParams } from "../DboBuilder";
+import { TableRule } from "../PublishParser";
+import { SelectItem } from "./QueryBuilder/QueryBuilder";
+import { ViewHandler } from "./ViewHandler";
+/**
+ * parses a single filter
+ * @example
+ *  { fff: 2 } => "fff" = 2
+ *  { fff: { $ilike: 'abc' } } => "fff" ilike 'abc'
+ */
+export declare function getCondition(this: ViewHandler, params: {
+    filter: any;
+    select?: SelectItem[];
+    allowed_colnames: string[];
+    tableAlias?: string;
+    localParams?: LocalParams;
+    tableRules?: TableRule;
+}): Promise<string>;
+//# sourceMappingURL=getCondition.d.ts.map

package/lib/DboBuilder/getCondition.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getCondition.d.ts","sourceRoot":"","sources":["getCondition.ts"],"names":[],"mappings":"AACA,OAAO,EAAsB,WAAW,EAA6B,MAAM,eAAe,CAAC;AAC3F,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAG7C,OAAO,EAAoC,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC3F,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAM1C;;;;;GAKG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE;IAAE,MAAM,EAAE,GAAG,CAAC;IAAC,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC;IAAC,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,WAAW,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,CAAA;CAAE,mBAoQvM"}