prostgles-server 4.0.57 → 4.0.59

package/lib/DboBuilder/delete.d.ts

@@ -1,6 +0,0 @@
-import { DeleteParams } from "prostgles-types";
-import { Filter, LocalParams } from "../DboBuilder";
-import { TableRule } from "../PublishParser";
-import { TableHandler } from "./TableHandler";
-export declare function _delete(this: TableHandler, filter?: Filter, params?: DeleteParams, param3_unused?: undefined, table_rules?: TableRule, localParams?: LocalParams): Promise<any>;
-//# sourceMappingURL=delete.d.ts.map

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

@@ -1 +0,0 @@
-{"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,EAA2B,MAAM,eAAe,CAAC;AAC7E,OAAO,EAAc,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,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,CAiIrL"}

package/lib/DboBuilder/delete.js

@@ -1,128 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports._delete = void 0;
-const prostgles_types_1 = require("prostgles-types");
-const DboBuilder_1 = require("../DboBuilder");
-const PubSubManager_1 = require("../PubSubManager/PubSubManager");
-const find_1 = require("./find");
-async function _delete(filter, params, param3_unused, table_rules, localParams) {
-    try {
-        const { returning } = params || {};
-        filter = filter || {};
-        this.checkFilter(filter);
-        // table_rules = table_rules || {};
-        let forcedFilter = {}, filterFields = "*", returningFields = "*", validate;
-        const { testRule = false, returnQuery = false } = localParams || {};
-        if (table_rules) {
-            if (!table_rules.delete)
-                throw "delete rules missing";
-            forcedFilter = table_rules.delete.forcedFilter;
-            filterFields = table_rules.delete.filterFields;
-            returningFields = table_rules.delete.returningFields;
-            validate = table_rules.delete.validate;
-            if (!returningFields)
-                returningFields = table_rules?.select?.fields;
-            if (!returningFields)
-                returningFields = table_rules?.delete?.filterFields;
-            if (!filterFields)
-                throw ` Invalid delete rule for ${this.name}. filterFields missing `;
-            /* Safely test publish rules */
-            if (testRule) {
-                await this.validateViewRules({ filterFields, returningFields, forcedFilter, rule: "delete" });
-                return true;
-            }
-        }
-        if (params) {
-            const good_paramsObj = { returning: 1, returnType: 1 };
-            const good_params = Object.keys(good_paramsObj);
-            const bad_params = Object.keys(params).filter(k => !good_params.includes(k));
-            if (bad_params && bad_params.length)
-                throw "Invalid params: " + bad_params.join(", ") + " \n Expecting: " + good_params.join(", ");
-        }
-        let queryType = 'none';
-        let _query = "DELETE FROM " + this.escapedName;
-        const filterOpts = (await this.prepareWhere({
-            filter,
-            forcedFilter,
-            filterFields,
-            localParams,
-            tableRule: table_rules
-        }));
-        _query += filterOpts.where;
-        if (validate) {
-            const _filter = filterOpts.filter;
-            await validate(_filter);
-        }
-        let returningQuery = "";
-        if (returning) {
-            queryType = "any";
-            if (!returningFields) {
-                throw "Returning dissallowed";
-            }
-            returningQuery = this.makeReturnQuery(await this.prepareReturning(returning, this.parseFieldFilter(returningFields)));
-            _query += returningQuery;
-        }
-        _query = (0, DboBuilder_1.withUserRLS)(localParams, _query);
-        if (returnQuery)
-            return _query;
-        /**
-         * Delete file
-         */
-        const dbHandler = (this.t || this.db);
-        if (this.is_media) {
-            if (!this.dboBuilder.prostgles.fileManager)
-                throw new Error("fileManager missing");
-            if (this.dboBuilder.prostgles.opts.fileTable?.delayedDelete) {
-                return dbHandler[queryType](`UPDATE ${(0, prostgles_types_1.asName)(this.name)} SET deleted = now() ${filterOpts.where} ${returningQuery};`);
-            }
-            else {
-                const txDelete = async (tbl) => {
-                    if (!tbl.t)
-                        throw new Error("Missing transaction object t");
-                    let files = [];
-                    const totalFiles = await tbl.count(filterOpts.filter);
-                    do {
-                        const batch = await tbl.find(filterOpts.filter, { limit: 100, offset: files.length });
-                        files = files.concat(batch);
-                    } while (files.length < totalFiles);
-                    const fileManager = tbl.dboBuilder.prostgles.fileManager;
-                    if (!fileManager)
-                        throw new Error("fileManager missing");
-                    for await (const file of files) {
-                        await tbl.t?.any(`DELETE FROM ${(0, prostgles_types_1.asName)(this.name)} WHERE id = ` + "${id}", file);
-                    }
-                    /** If any table delete fails then do not delete files */
-                    for await (const file of files) {
-                        await fileManager.deleteFile(file.name);
-                        /** TODO: Keep track of deleted files in case of failure */
-                        // await tbl.t?.any(`UPDATE ${asName(this.name)} SET deleted = NOW(), deleted_from_storage = NOW()  WHERE id = ` + "${id}", file);
-                    }
-                    if (returning) {
-                        return files.map(f => (0, PubSubManager_1.pickKeys)(f, ["id", "name"]));
-                    }
-                    return undefined;
-                };
-                if (localParams?.tx?.dbTX) {
-                    return txDelete(localParams.tx.dbTX[this.name]);
-                }
-                else if (this.t) {
-                    return txDelete(this);
-                }
-                else {
-                    return this.dboBuilder.getTX(tx => {
-                        return txDelete(tx[this.name]);
-                    });
-                }
-            }
-        }
-        return (0, find_1.runQueryReturnType)(_query, params?.returnType, this, localParams);
-        // return dbHandler[queryType](_query).catch((err: any) => makeErrorFromPGError(err, localParams));
-    }
-    catch (e) {
-        // console.trace(e)
-        if (localParams && localParams.testRule)
-            throw e;
-        throw (0, DboBuilder_1.parseError)(e, `dbo.${this.name}.delete(${JSON.stringify(filter || {}, null, 2)}, ${JSON.stringify(params || {}, null, 2)})`);
-    }
-}
-exports._delete = _delete;

package/lib/DboBuilder/find.d.ts

@@ -1,8 +0,0 @@
-import { SelectParams } from "prostgles-types";
-import { Filter, LocalParams } from "../DboBuilder";
-import { TableRule } from "../PublishParser";
-import { TableHandler } from "./TableHandler";
-import { ViewHandler } from "./ViewHandler";
-export declare const find: (this: ViewHandler, filter?: Filter, selectParams?: SelectParams, param3_unused?: undefined, tableRules?: TableRule, localParams?: LocalParams) => Promise<any[]>;
-export declare const runQueryReturnType: (query: string, returnType: SelectParams["returnType"], handler: ViewHandler | TableHandler, localParams: LocalParams | undefined) => Promise<any>;
-//# sourceMappingURL=find.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["find.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAY,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAiD,MAAM,eAAe,CAAC;AAGnG,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,eAAO,MAAM,IAAI,SAAwB,WAAW,WAAW,MAAM,iBAAiB,YAAY,kBAAkB,SAAS,eAAe,SAAS,gBAAgB,WAAW,KAAG,QAAQ,GAAG,EAAE,CA2D/L,CAAA;AAGD,eAAO,MAAM,kBAAkB,UAAiB,MAAM,cAAc,YAAY,CAAC,YAAY,CAAC,WAAW,WAAW,GAAG,YAAY,eAAe,WAAW,GAAG,SAAS,iBAoBxK,CAAA"}

package/lib/DboBuilder/find.js

@@ -1,91 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.runQueryReturnType = exports.find = void 0;
-const prostgles_types_1 = require("prostgles-types");
-const DboBuilder_1 = require("../DboBuilder");
-const makeSelectQuery_1 = require("../DboBuilder/QueryBuilder/makeSelectQuery");
-const runSQL_1 = require("../DboBuilder/runSQL");
-const QueryBuilder_1 = require("./QueryBuilder/QueryBuilder");
-const find = async function (filter, selectParams, param3_unused, tableRules, localParams) {
-    try {
-        filter = filter || {};
-        const allowedReturnTypes = ["row", "value", "values", "statement"];
-        const { returnType } = selectParams || {};
-        if (returnType && !allowedReturnTypes.includes(returnType)) {
-            throw `returnType (${returnType}) can only be ${allowedReturnTypes.join(" OR ")}`;
-        }
-        const { testRule = false, returnQuery = false, returnNewQuery } = localParams || {};
-        if (testRule)
-            return [];
-        if (selectParams) {
-            const good_params = ["select", "orderBy", "offset", "limit", "returnType", "groupBy"];
-            const bad_params = Object.keys(selectParams).filter(k => !good_params.includes(k));
-            if (bad_params && bad_params.length)
-                throw "Invalid params: " + bad_params.join(", ") + " \n Expecting: " + good_params.join(", ");
-        }
-        /* Validate publish */
-        if (tableRules) {
-            if (!tableRules.select)
-                throw "select rules missing for " + this.name;
-            const fields = tableRules.select.fields;
-            const maxLimit = tableRules.select.maxLimit;
-            if (tableRules.select !== "*" && typeof tableRules.select !== "boolean" && !(0, prostgles_types_1.isObject)(tableRules.select))
-                throw `\nINVALID publish.${this.name}.select\nExpecting any of: "*" | { fields: "*" } | true | false`;
-            if (!fields)
-                throw ` invalid ${this.name}.select rule -> fields (required) setting missing.\nExpecting any of: "*" | { col_name: false } | { col1: true, col2: true }`;
-            if (maxLimit && !Number.isInteger(maxLimit))
-                throw ` invalid publish.${this.name}.select.maxLimit -> expecting integer but got ` + maxLimit;
-        }
-        const q = await (0, QueryBuilder_1.getNewQuery)(this, filter, selectParams, param3_unused, tableRules, localParams, this.columns);
-        const queryWithoutRLS = (0, makeSelectQuery_1.makeSelectQuery)(this, q, undefined, undefined, selectParams);
-        const queryWithRLS = (0, DboBuilder_1.withUserRLS)(localParams, queryWithoutRLS);
-        // console.log(_query, JSON.stringify(q, null, 2))
-        if (testRule) {
-            try {
-                await this.db.any((0, DboBuilder_1.withUserRLS)(localParams, "EXPLAIN " + queryWithRLS));
-                return [];
-            }
-            catch (e) {
-                console.error(e);
-                throw `INTERNAL ERROR: Publish config is not valid for publish.${this.name}.select `;
-            }
-        }
-        /** Used for subscribe  */
-        if (returnNewQuery)
-            return q;
-        if (returnQuery) {
-            return (returnQuery === "noRLS" ? queryWithoutRLS : queryWithRLS);
-        }
-        return (0, exports.runQueryReturnType)(queryWithRLS, returnType, this, localParams);
-    }
-    catch (e) {
-        // console.trace(e)
-        if (localParams && localParams.testRule)
-            throw e;
-        throw (0, DboBuilder_1.parseError)(e, `dbo.${this.name}.find()`);
-        // throw { err: parseError(e), msg: `Issue with dbo.${this.name}.find()`, args: { filter, selectParams} };
-    }
-};
-exports.find = find;
-const runQueryReturnType = async (query, returnType, handler, localParams) => {
-    if (returnType === "statement") {
-        if (!(await (0, runSQL_1.canRunSQL)(handler.dboBuilder.prostgles, localParams))) {
-            throw `Not allowed:  {returnType: "statement"} requires sql privileges `;
-        }
-        return query;
-    }
-    else if (["row", "value"].includes(returnType)) {
-        return (handler.t || handler.db).oneOrNone(query).then(data => {
-            return (data && returnType === "value") ? Object.values(data)[0] : data;
-        }).catch(err => (0, DboBuilder_1.makeErrorFromPGError)(err, localParams, this));
-    }
-    else {
-        return (handler.t || handler.db).any(query).then(data => {
-            if (returnType === "values") {
-                return data.map(d => Object.values(d)[0]);
-            }
-            return data;
-        }).catch(err => (0, DboBuilder_1.makeErrorFromPGError)(err, localParams, this));
-    }
-};
-exports.runQueryReturnType = runQueryReturnType;

package/lib/DboBuilder/getColumns.d.ts

@@ -1,12 +0,0 @@
-import { AnyObject, ValidatedColumnInfo } from "prostgles-types";
-import { LocalParams } from "../DboBuilder";
-import { TableRule } from "../PublishParser";
-import { TableHandler } from "./TableHandler";
-import { ViewHandler } from "./ViewHandler";
-export declare const isTableHandler: (v: any) => v is TableHandler;
-export declare function getColumns(this: ViewHandler, lang?: string, params?: {
-    rule: "update";
-    filter: AnyObject;
-    data: AnyObject;
-}, _param3?: undefined, tableRules?: TableRule, localParams?: LocalParams): Promise<ValidatedColumnInfo[]>;
-//# sourceMappingURL=getColumns.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"getColumns.d.ts","sourceRoot":"","sources":["getColumns.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,mBAAmB,EACpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAiB,WAAW,EAAgC,MAAM,eAAe,CAAC;AACzF,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,eAAO,MAAM,cAAc,MAAO,GAAG,sBAA+C,CAAC;AAErF,wBAAsB,UAAU,CAC9B,IAAI,EAAE,WAAW,EACjB,IAAI,CAAC,EAAE,MAAM,EACb,MAAM,CAAC,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,SAAS,CAAC;IAAC,IAAI,EAAE,SAAS,CAAA;CAAE,EAC/D,OAAO,CAAC,EAAE,SAAS,EACnB,UAAU,CAAC,EAAE,SAAS,EACtB,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAmGhC"}

package/lib/DboBuilder/getColumns.js

@@ -1,92 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getColumns = exports.isTableHandler = void 0;
-const prostgles_types_1 = require("prostgles-types");
-const DboBuilder_1 = require("../DboBuilder");
-const isTableHandler = (v) => "parseUpdateRules" in v;
-exports.isTableHandler = isTableHandler;
-async function getColumns(lang, params, _param3, tableRules, localParams) {
-    try {
-        const p = this.getValidatedRules(tableRules, localParams);
-        if (!p.getColumns)
-            throw "Not allowed";
-        // console.log("getColumns", this.name, this.columns.map(c => c.name))
-        let dynamicUpdateFields = this.column_names;
-        if (params && tableRules && (0, exports.isTableHandler)(this)) {
-            if (!(0, DboBuilder_1.isPlainObject)(params) ||
-                (params.data && !(0, DboBuilder_1.isPlainObject)(params.data)) ||
-                !(0, DboBuilder_1.isPlainObject)(params.filter) ||
-                params.rule !== "update") {
-                throw "params must be { rule: 'update', filter: object, data?: object } but got: " + JSON.stringify(params);
-            }
-            if (!tableRules?.update) {
-                dynamicUpdateFields = [];
-            }
-            else {
-                const { data, filter } = params;
-                const updateRules = await this.parseUpdateRules(filter, data, undefined, tableRules, localParams);
-                dynamicUpdateFields = updateRules.fields;
-            }
-        }
-        const columns = this.columns
-            .filter(c => {
-            const { insert, select, update } = p || {};
-            return [
-                ...(insert?.fields || []),
-                ...(select?.fields || []),
-                ...(update?.fields || []),
-            ].includes(c.name);
-        })
-            .map(_c => {
-            const c = { ..._c };
-            const label = c.comment || capitalizeFirstLetter(c.name, " ");
-            const select = c.privileges.some(p => p.privilege_type === "SELECT"), insert = c.privileges.some(p => p.privilege_type === "INSERT"), _delete = this.tableOrViewInfo.privileges.delete; // c.privileges.some(p => p.privilege_type === "DELETE");
-            let update = c.privileges.some(p => p.privilege_type === "UPDATE");
-            delete c.privileges;
-            const prostgles = this.dboBuilder?.prostgles;
-            const fileConfig = prostgles.fileManager?.getColInfo({ colName: c.name, tableName: this.name });
-            /** Do not allow updates to file table unless it's to delete fields */
-            if (prostgles.fileManager?.config && prostgles.fileManager.tableName === this.name) {
-                update = false;
-            }
-            const nonOrderableUD_Types = [...prostgles_types_1._PG_geometric, "xml"];
-            const result = {
-                ...c,
-                label,
-                tsDataType: (0, DboBuilder_1.postgresToTsType)(c.udt_name),
-                insert: insert && Boolean(p.insert?.fields?.includes(c.name)) && tableRules?.insert?.forcedData?.[c.name] === undefined && c.is_updatable,
-                select: select && Boolean(p.select?.fields?.includes(c.name)),
-                orderBy: select && Boolean(p.select?.fields && p.select.orderByFields.includes(c.name)) && !nonOrderableUD_Types.includes(c.udt_name),
-                filter: Boolean(p.select?.filterFields?.includes(c.name)),
-                update: update && Boolean(p.update?.fields?.includes(c.name)) && tableRules?.update?.forcedData?.[c.name] === undefined && c.is_updatable && dynamicUpdateFields.includes(c.name),
-                delete: _delete && Boolean(p.delete && p.delete.filterFields && p.delete.filterFields.includes(c.name)),
-                ...(prostgles?.tableConfigurator?.getColInfo({ table: this.name, col: c.name, lang }) || {}),
-                ...(fileConfig && { file: fileConfig })
-            };
-            return result;
-        }).filter(c => c.select || c.update || c.delete || c.insert);
-        //.sort((a, b) => a.ordinal_position - b.ordinal_position);
-        // const tblInfo = await this.getInfo();
-        // if(tblInfo && tblInfo.media_table_name && tblInfo.has_media){
-        //     const mediaRules = this.dboBuilder.dbo[tblInfo.media_table_name]?.
-        //     return columns.concat({
-        //         comment: "",
-        //         data_type: "file",
-        //         delete: false,
-        //     });
-        // }
-        return columns;
-    }
-    catch (e) {
-        throw (0, DboBuilder_1.parseError)(e, `db.${this.name}.getColumns()`);
-        // throw "Something went wrong in " + `db.${this.name}.getColumns()`;
-    }
-}
-exports.getColumns = getColumns;
-function replaceNonAlphaNumeric(string, replacement = "_") {
-    return string.replace(/[\W_]+/g, replacement);
-}
-function capitalizeFirstLetter(string, nonalpha_replacement) {
-    const str = replaceNonAlphaNumeric(string, nonalpha_replacement);
-    return str.charAt(0).toUpperCase() + str.slice(1);
-}

package/lib/DboBuilder/getCondition.d.ts

@@ -1,22 +0,0 @@
-import { ExistsFilterConfig, 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<{
-    exists: ExistsFilterConfig[];
-    condition: string;
-}>;
-//# sourceMappingURL=getCondition.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"getCondition.d.ts","sourceRoot":"","sources":["getCondition.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAO,MAAM,eAAe,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAG7C,OAAO,EAAoC,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC3F,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAM5C;;;;;GAKG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE;IACN,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC;IACtB,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,SAAS,CAAA;CACvB,GACA,OAAO,CAAC;IAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAuQ9D"}

package/lib/DboBuilder/getCondition.js

@@ -1,236 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCondition = void 0;
-const prostgles_types_1 = require("prostgles-types");
-const DboBuilder_1 = require("../DboBuilder");
-const PubSubManager_1 = require("../PubSubManager/PubSubManager");
-const Functions_1 = require("./QueryBuilder/Functions");
-const QueryBuilder_1 = require("./QueryBuilder/QueryBuilder");
-const Filtering_1 = require("../Filtering");
-const FILTER_FUNCS = Functions_1.FUNCTIONS.filter(f => f.canBeUsedForFilter);
-/**
- * parses a single filter
- * @example
- *  { fff: 2 } => "fff" = 2
- *  { fff: { $ilike: 'abc' } } => "fff" ilike 'abc'
- */
-async function getCondition(params) {
-    const { filter: rawFilter, select, allowed_colnames, tableAlias, localParams, tableRules } = params;
-    const filter = { ...rawFilter };
-    /* 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 = "**";
-    const exists = (0, prostgles_types_1.getKeys)(filter)
-        .filter((k) => prostgles_types_1.EXISTS_KEYS.includes(k) && !!Object.keys(filter[k] ?? {}).length)
-        .map(key => {
-        const isJoined = key.toLowerCase().includes("join");
-        const filterValue = filter[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("."));
-        const 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(".")
-    //         });
-    //     }
-    // });
-    const funcConds = [];
-    const funcFilter = FILTER_FUNCS.filter(f => f.name in filter);
-    funcFilter.map(f => {
-        const funcArgs = filter[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)(filter, [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 (exists.length) {
-        existsCond = (await Promise.all(exists.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");
-    const computedColConditions = [];
-    Object.keys(filter || {}).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", [filter[key]])}`);
-            delete filter[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 filter) {
-        /**
-         * { $funcName: [arg1, arg2] }
-         * { $column: "column_name" }
-         */
-        const getFuncQuery = (funcData) => {
-            if ((0, prostgles_types_1.isObject)(funcData) && "$column" in funcData) {
-                const column = funcData["$column"];
-                if (typeof column !== "string") {
-                    throw `expecting: \n  { $column: "column_name" } received:\n ${JSON.stringify(funcData)}`;
-                }
-                if (!allowed_colnames.includes(column)) {
-                    throw `Dissallowed or Invalid column ${column}. Allowed columns: ${allowed_colnames}`;
-                }
-                return (0, QueryBuilder_1.asNameAlias)(column, tableAlias);
-            }
-            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 = filter[complexFilterKey];
-        if (!Array.isArray(complexFilter)) {
-            throw `Invalid $filter. Must contain an array of at least element but got: ${JSON.stringify(complexFilter)} `;
-        }
-        const [leftFilter, comparator, rightFilterOrValue] = complexFilter;
-        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
-    */
-    const filterKeys = Object.keys(filter).filter(k => k !== complexFilterKey && !funcFilter.find(ek => ek.name === k) && !computedFields.find(cf => cf.name === k) && !exists.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)(filter, 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 {
-        exists,
-        condition: templates.sort().join(" AND \n")
-    };
-}
-exports.getCondition = getCondition;

package/lib/DboBuilder/getSubscribeRelatedTables.d.ts

@@ -1,20 +0,0 @@
-import { AnyObject, SubscribeParams } from "prostgles-types";
-import { ExistsFilterConfig, Filter, LocalParams } from "../DboBuilder";
-import { TableRule } from "../PublishParser";
-import { ViewSubscriptionOptions } from "../PubSubManager/PubSubManager";
-import { ViewHandler } from "./ViewHandler";
-type Args = {
-    selectParams: Omit<SubscribeParams, "throttle">;
-    filter: Filter;
-    table_rules: TableRule<AnyObject, void> | undefined;
-    localParams: LocalParams | undefined;
-    condition: string;
-    filterOpts: {
-        where: string;
-        filter: AnyObject;
-        exists: ExistsFilterConfig[];
-    };
-};
-export declare function getSubscribeRelatedTables(this: ViewHandler, { selectParams, filter, localParams, table_rules, condition, filterOpts }: Args): Promise<ViewSubscriptionOptions>;
-export {};
-//# sourceMappingURL=getSubscribeRelatedTables.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"getSubscribeRelatedTables.d.ts","sourceRoot":"","sources":["getSubscribeRelatedTables.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,WAAW,EAAwB,MAAM,eAAe,CAAC;AAC9F,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAO,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAE9E,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,KAAK,IAAI,GAAG;IACV,YAAY,EAAE,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;IAChD,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,SAAS,CAAC;IACpD,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE;QACV,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,SAAS,CAAC;QAClB,MAAM,EAAE,kBAAkB,EAAE,CAAC;KAC9B,CAAC;CACH,CAAA;AACD,wBAAsB,yBAAyB,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,IAAI,oCAmKjJ"}