prostgles-server 3.0.86 → 3.0.88

package/lib/DboBuilder/TableHandler.ts

@@ -97,7 +97,7 @@ export class TableHandler extends ViewHandler {
       row[synced_field] = Date.now();
     }
 
-    let data = this.prepareFieldValues(row, forcedData, allowedFields, fixIssues);
+    const data = this.prepareFieldValues(row, forcedData, allowedFields, fixIssues);
     const dataKeys = getKeys(data);
 
     dataKeys.map(col => {
@@ -122,9 +122,9 @@ export class TableHandler extends ViewHandler {
   }
 
   prepareReturning = async (returning: Select | undefined, allowedFields: string[]): Promise<SelectItem[]> => {
-    let result: SelectItem[] = [];
+    const result: SelectItem[] = [];
     if (returning) {
-      let sBuilder = new SelectItemBuilder({
+      const sBuilder = new SelectItemBuilder({
         allFields: this.column_names.slice(0),
         allowedFields,
         allowedOrderByFields: allowedFields,
@@ -148,7 +148,7 @@ export class TableHandler extends ViewHandler {
 
   async delete(filter?: Filter, params?: DeleteParams, param3_unused?: undefined, table_rules?: TableRule, localParams?: LocalParams): Promise<any> {
     return _delete.bind(this)(filter, params, param3_unused, table_rules, localParams);
-  };
+  } 
 
   remove(filter: Filter, params?: UpdateParams, param3_unused?: undefined, tableRules?: TableRule, localParams?: LocalParams) {
     return this.delete(filter, params, param3_unused, tableRules, localParams);
@@ -156,14 +156,7 @@ export class TableHandler extends ViewHandler {
 
   async upsert(filter: Filter, newData: AnyObject, params?: UpdateParams, table_rules?: TableRule, localParams?: LocalParams): Promise<any> {
     try {
-      /* Do it within a transaction to ensure consisency */
-      if (!this.t) {
-        return this.dboBuilder.getTX(dbTX => _upsert(dbTX[this.name] as TableHandler))
-      } else {
-        return _upsert(this);
-      }
-
-      async function _upsert(tblH: TableHandler) {
+      const _upsert = async function (tblH: TableHandler) {
         return tblH.find(filter, { select: "", limit: 1 }, undefined, table_rules, localParams)
           .then(exists => {
             if (exists && exists.length) {
@@ -173,11 +166,19 @@ export class TableHandler extends ViewHandler {
             }
           });
       }
+
+      /* Do it within a transaction to ensure consisency */
+      if (!this.t) {
+        return this.dboBuilder.getTX(dbTX => _upsert(dbTX[this.name] as TableHandler))
+      } else {
+        return _upsert(this);
+      }
+
     } catch (e) {
       if (localParams && localParams.testRule) throw e;
       throw parseError(e, `dbo.${this.name}.upsert()`);
     }
-  };
+  } 
 
   /* External request. Cannot sync from server */
   async sync(filter: Filter, params: SelectParams, param3_unused: undefined, table_rules: TableRule, localParams: LocalParams) {
@@ -197,22 +198,22 @@ export class TableHandler extends ViewHandler {
     try {
 
 
-      let { id_fields, synced_field, allow_delete }: SyncRule = table_rules.sync;
-      const syncFields = [...id_fields, synced_field];
+      const { synced_field, allow_delete }: SyncRule = table_rules.sync;
 
-      if (!id_fields || !synced_field) {
+      if (!table_rules.sync.id_fields.length || !synced_field) {
         const err = "INTERNAL ERROR: id_fields OR synced_field missing from publish";
         console.error(err);
         throw err;
       }
 
-      id_fields = this.parseFieldFilter(id_fields, false);
+      const id_fields = this.parseFieldFilter(table_rules.sync.id_fields, false);
+      const syncFields = [...id_fields, synced_field];
 
-      let allowedSelect = this.parseFieldFilter(table_rules?.select.fields ?? false);
+      const allowedSelect = this.parseFieldFilter(table_rules?.select.fields ?? false);
       if (syncFields.find(f => !allowedSelect.includes(f))) {
         throw `INTERNAL ERROR: sync field missing from publish.${this.name}.select.fields`;
       }
-      let select = this.getAllowedSelectFields(
+      const select = this.getAllowedSelectFields(
         (params || {})?.select || "*",
         allowedSelect,
         false
@@ -226,7 +227,7 @@ export class TableHandler extends ViewHandler {
 
       /* Step 1: parse command and params */
       return this.find(filter, { select, limit: 0 }, undefined, table_rules, localParams)
-        .then(async isValid => {
+        .then(async _isValid => {
 
           const { filterFields, forcedFilter } = table_rules?.select || {};
           const condition = (await this.prepareWhere({ filter, forcedFilter, filterFields, addKeywords: false, localParams, tableRule: table_rules })).where;

package/lib/DboBuilder/ViewHandler.d.ts

@@ -6,7 +6,7 @@ import { Graph } from "../shortestPath";
 import { TableRule, UpdateRule, ValidateRow } from "../PublishParser";
 import { SelectItem, SelectItemValidated } from "./QueryBuilder/QueryBuilder";
 import { LocalFunc } from "./subscribe";
-export declare type JoinPaths = {
+export type JoinPaths = {
     t1: string;
     t2: string;
     path: string[];
@@ -75,16 +75,6 @@ export declare class ViewHandler {
     getAllowedSelectFields(selectParams: FieldFilter, allowed_cols: FieldFilter, allow_empty?: boolean): string[];
     prepareColumnSet(selectParams: FieldFilter, allowed_cols: FieldFilter, allow_empty?: boolean, onlyNames?: boolean): string | pgPromise.ColumnSet;
     prepareSelect(selectParams: FieldFilter, allowed_cols: FieldFilter, allow_empty?: boolean, tableAlias?: string): string;
-    prepareHaving(params: {
-        having: Filter;
-        select: SelectItem[];
-        forcedFilter: object;
-        filterFields: FieldFilter;
-        addKeywords?: boolean;
-        tableAlias?: string;
-        localParams: LocalParams;
-        tableRule: TableRule;
-    }): Promise<string>;
     /**
      * Parses group or simple filter
      */

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

@@ -1 +1 @@
-{"version":3,"file":"ViewHandler.d.ts","sourceRoot":"","sources":["ViewHandler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ViewHandler.d.ts","sourceRoot":"","sources":["ViewHandler.ts"],"names":[],"mappings":"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"}

package/lib/DboBuilder/ViewHandler.js

@@ -138,7 +138,7 @@ class ViewHandler {
         // fix this
         // and also make hot schema reload over ws 
         this.colSet = new ColSet(this.columns, this.name);
-        const { $and: $and_key, $or: $or_key } = this.dboBuilder.prostgles.keywords;
+        // const { $and: $and_key, $or: $or_key } = this.dboBuilder.prostgles.keywords;
         // this.tsDataName = snakify(this.name, true);
         // if(this.tsDataName === "T") this.tsDataName = this.tsDataName + "_";
         // this.tsDataDef = `export type ${this.tsDataName} = {\n`;
@@ -237,7 +237,8 @@ class ViewHandler {
         const getJoinCondition = (on, leftTable, rightTable) => {
             return on.map(cond => Object.keys(cond).map(lKey => `${leftTable}.${lKey} = ${rightTable}.${cond[lKey]}`).join("\nAND ")).join(" OR ");
         };
-        let toOne = true, query = this.joins.map(({ tables, on, type }, i) => {
+        let toOne = true;
+        const query = this.joins.map(({ tables, on, type }, i) => {
             if (type.split("-")[1] === "many") {
                 toOne = false;
             }
@@ -300,9 +301,9 @@ class ViewHandler {
             if (!jo)
                 throw `Joining ${t1} <-> ${t2} dissallowed or missing`;
             ;
-            let on = [];
+            const on = [];
             jo.on.map(cond => {
-                let condArr = [];
+                const condArr = [];
                 Object.keys(cond).map(leftKey => {
                     const rightKey = cond[leftKey];
                     /* Left table is joining on keys */
@@ -323,7 +324,7 @@ class ViewHandler {
                 on
             };
         });
-        let expectOne = false;
+        const expectOne = false;
         // paths.map(({ source, target, on }, i) => {
         // if(expectOne && on.length === 1){
         //     const sourceCol = on[0][1];
@@ -424,7 +425,7 @@ class ViewHandler {
                 const firstValid = fieldParams.find(fp => fp !== undefined);
                 return this.parseFieldFilter(firstValid);
             };
-            let res = {
+            const res = {
                 allColumns,
                 getColumns: tableRules?.getColumns ?? true,
                 getInfo: tableRules?.getColumns ?? true,
@@ -541,13 +542,10 @@ class ViewHandler {
             }
             /* Validate publish */
             if (tableRules) {
-                let fields, filterFields, forcedFilter, maxLimit;
                 if (!tableRules.select)
                     throw "select rules missing for " + this.name;
-                fields = tableRules.select.fields;
-                forcedFilter = tableRules.select.forcedFilter;
-                filterFields = tableRules.select.filterFields;
-                maxLimit = tableRules.select.maxLimit;
+                const fields = tableRules.select.fields;
+                const maxLimit = tableRules.select.maxLimit;
                 if (tableRules.select !== "*" && typeof tableRules.select !== "boolean" && !(0, DboBuilder_1.isPlainObject)(tableRules.select))
                     throw `\nINVALID publish.${this.name}.select\nExpecting any of: "*" | { fields: "*" } | true | false`;
                 if (!fields)
@@ -555,7 +553,7 @@ class ViewHandler {
                 if (maxLimit && !Number.isInteger(maxLimit))
                     throw ` invalid publish.${this.name}.select.maxLimit -> expecting integer but got ` + maxLimit;
             }
-            let q = await (0, QueryBuilder_1.getNewQuery)(this, filter, selectParams, param3_unused, tableRules, localParams, this.columns), _query = (0, makeSelectQuery_1.makeSelectQuery)(this, q, undefined, undefined, selectParams);
+            const q = await (0, QueryBuilder_1.getNewQuery)(this, filter, selectParams, param3_unused, tableRules, localParams, this.columns), _query = (0, makeSelectQuery_1.makeSelectQuery)(this, q, undefined, undefined, selectParams);
             // console.log(_query, JSON.stringify(q, null, 2))
             if (testRule) {
                 try {
@@ -620,7 +618,7 @@ class ViewHandler {
     }
     subscribeOne(filter, params = {}, localFunc, table_rules, localParams) {
         //@ts-ignore
-        let func = localParams ? undefined : (rows) => localFunc(rows[0]);
+        const func = localParams ? undefined : (rows) => localFunc(rows[0]);
         //@ts-ignore
         return this.subscribe(filter, { ...params, limit: 2 }, func, table_rules, localParams);
     }
@@ -628,10 +626,10 @@ class ViewHandler {
         filter = filter || {};
         try {
             return await this.find(filter, { select: "", limit: 0 }, undefined, table_rules, localParams)
-                .then(async (allowed) => {
+                .then(async (_allowed) => {
                 const { filterFields, forcedFilter } = table_rules?.select || {};
                 const where = (await this.prepareWhere({ filter, forcedFilter, filterFields, addKeywords: true, localParams, tableRule: table_rules })).where;
-                let query = "SELECT COUNT(*) FROM " + this.escapedName + " " + where;
+                const query = "SELECT COUNT(*) FROM " + this.escapedName + " " + where;
                 return (this.t || this.db).one(query, { _psqlWS_tableName: this.name }).then(({ count }) => +count);
             });
         }
@@ -666,7 +664,8 @@ class ViewHandler {
         }
     }
     getAllowedSelectFields(selectParams = "*", allowed_cols, allow_empty = true) {
-        let all_columns = this.column_names.slice(0), allowedFields = all_columns.slice(0), resultFields = [];
+        const all_columns = this.column_names.slice(0);
+        let allowedFields = all_columns.slice(0), resultFields = [];
         if (selectParams) {
             resultFields = this.parseFieldFilter(selectParams, allow_empty);
         }
@@ -680,32 +679,24 @@ class ViewHandler {
         return col_names;
     }
     prepareColumnSet(selectParams = "*", allowed_cols, allow_empty = true, onlyNames = true) {
-        let all_columns = this.column_names.slice(0);
+        const all_columns = this.column_names.slice(0);
         let col_names = this.getAllowedSelectFields(selectParams, all_columns, allow_empty);
         /** Ensure order is maintained */
         if (selectParams && Array.isArray(selectParams) && typeof selectParams[0] === "string") {
             col_names = col_names.sort((a, b) => selectParams.indexOf(a) - selectParams.indexOf(b));
         }
-        try {
-            let colSet = new DboBuilder_1.pgp.helpers.ColumnSet(col_names);
-            return onlyNames ? colSet.names : colSet;
-        }
-        catch (e) {
-            throw e;
-        }
+        const colSet = new DboBuilder_1.pgp.helpers.ColumnSet(col_names);
+        return onlyNames ? colSet.names : colSet;
     }
     prepareSelect(selectParams = "*", allowed_cols, allow_empty = true, tableAlias) {
         if (tableAlias) {
-            let cs = this.prepareColumnSet(selectParams, allowed_cols, true, false);
+            const cs = this.prepareColumnSet(selectParams, allowed_cols, true, false);
             return cs.columns.map(col => `${this.escapedName}.${(0, prostgles_types_1.asName)(col.name)}`).join(", ");
         }
         else {
             return this.prepareColumnSet(selectParams, allowed_cols, true, true);
         }
     }
-    async prepareHaving(params) {
-        return "";
-    }
     /**
      * Parses group or simple filter
      */
@@ -720,7 +711,7 @@ class ViewHandler {
             if (!f)
                 throw "Invalid/missing group filter provided";
             let result = "";
-            let keys = (0, prostgles_types_1.getKeys)(f);
+            const keys = (0, prostgles_types_1.getKeys)(f);
             if (!keys.length)
                 return result;
             if ((keys.includes($and_key) || keys.includes($or_key))) {
@@ -732,7 +723,7 @@ class ViewHandler {
             const { [$and_key]: $and, [$or_key]: $or } = f, group = $and || $or;
             if (group && group.length) {
                 const operand = $and ? " AND " : " OR ";
-                let conditions = (await Promise.all(group.map(async (gf) => await parseFullFilter(gf, group, isForcedFilterBypass)))).filter(c => c);
+                const conditions = (await Promise.all(group.map(async (gf) => await parseFullFilter(gf, group, isForcedFilterBypass)))).filter(c => c);
                 if (conditions && conditions.length) {
                     if (conditions.length === 1)
                         return conditions.join(operand);
@@ -772,8 +763,8 @@ class ViewHandler {
         let res = "";
         const thisTable = this.name;
         const isNotExists = ["$notExists", "$notExistsJoined"].includes(eConfig.existType);
-        let { f2, tables, isJoined } = eConfig;
-        let t2 = tables[tables.length - 1];
+        const { f2, tables, isJoined } = eConfig;
+        const t2 = tables[tables.length - 1];
         tables.forEach(t => {
             if (!this.dboBuilder.dbo[t])
                 throw { stack: ["prepareExistCondition()"], message: `Invalid or dissallowed table: ${t}` };
@@ -786,7 +777,7 @@ class ViewHandler {
             let joinPaths = [];
             let expectOne = true;
             tables.map((t2, depth) => {
-                let t1 = depth ? tables[depth - 1] : thisTable;
+                const t1 = depth ? tables[depth - 1] : thisTable;
                 let exactPaths = [t1, t2];
                 if (!depth && eConfig.shortestJoin)
                     exactPaths = undefined;
@@ -794,16 +785,16 @@ class ViewHandler {
                 expectOne = Boolean(expectOne && jinf.expectOne);
                 joinPaths = joinPaths.concat(jinf.paths);
             });
-            let r = makeJoin({ paths: joinPaths, expectOne }, 0);
+            const r = makeJoin({ paths: joinPaths, expectOne }, 0);
             return r;
             function makeJoin(joinInfo, ji) {
                 const { paths } = joinInfo;
                 const jp = paths[ji];
                 // let prevTable = ji? paths[ji - 1].table : jp.source;
-                let table = paths[ji].table;
-                let tableAlias = (0, prostgles_types_1.asName)(ji < paths.length - 1 ? `jd${ji}` : table);
-                let prevTableAlias = (0, prostgles_types_1.asName)(ji ? `jd${ji - 1}` : thisTable);
-                let cond = `${jp.on.map(c => {
+                const table = paths[ji].table;
+                const tableAlias = (0, prostgles_types_1.asName)(ji < paths.length - 1 ? `jd${ji}` : table);
+                const prevTableAlias = (0, prostgles_types_1.asName)(ji ? `jd${ji - 1}` : thisTable);
+                const cond = `${jp.on.map(c => {
                     return c.map(([c1, c2]) => `${prevTableAlias}.${(0, prostgles_types_1.asName)(c1)} = ${tableAlias}.${(0, prostgles_types_1.asName)(c2)}`).join(" AND ");
                 }).join("\n OR ")}`;
                 let j = `SELECT 1 \n` +
@@ -818,7 +809,7 @@ class ViewHandler {
                     j += `AND ${makeJoin(joinInfo, ji + 1)} \n`;
                 }
                 j = indent(j, ji + 1);
-                let res = `${isNotExists ? " NOT " : " "} EXISTS ( \n` +
+                const res = `${isNotExists ? " NOT " : " "} EXISTS ( \n` +
                     j +
                     `) \n`;
                 return indent(res, ji);
@@ -835,21 +826,15 @@ class ViewHandler {
                 throw "Dissallowed";
             ({ forcedFilter, filterFields } = t2Rules.select);
         }
-        try {
-            finalWhere = (await this.dboBuilder.dbo[t2].prepareWhere({
-                filter: f2,
-                forcedFilter,
-                filterFields,
-                addKeywords: false,
-                tableAlias,
-                localParams,
-                tableRule: t2Rules
-            })).where;
-        }
-        catch (err) {
-            // console.trace(err)
-            throw err;
-        }
+        finalWhere = (await this.dboBuilder.dbo[t2].prepareWhere({
+            filter: f2,
+            forcedFilter,
+            filterFields,
+            addKeywords: false,
+            tableAlias,
+            localParams,
+            tableRule: t2Rules
+        })).where;
         if (!isJoined) {
             res = `${isNotExists ? " NOT " : " "} EXISTS (SELECT 1 \nFROM ${(0, prostgles_types_1.asName)(t2)} \n${finalWhere ? `WHERE ${finalWhere}` : ""}) `;
         }
@@ -914,7 +899,7 @@ class ViewHandler {
         }
         else if (Array.isArray(orderBy)) {
             /* Order by is formed of a list of ascending field names */
-            let _orderBy = orderBy;
+            const _orderBy = orderBy;
             if (_orderBy && !_orderBy.find(v => typeof v !== "string")) {
                 /* [string] */
                 _ob = _orderBy.map(key => ({ key, asc: true }));
@@ -931,7 +916,7 @@ class ViewHandler {
             return [];
         const validatedAggAliases = select.filter(s => s.type !== "joinedColumn" &&
             (!s.fields.length || s.fields.every(f => allowed_cols.includes(f)))).map(s => s.alias);
-        let bad_param = _ob.find(({ key }) => !(validatedAggAliases || []).includes(key) &&
+        const bad_param = _ob.find(({ key }) => !(validatedAggAliases || []).includes(key) &&
             !allowed_cols.includes(key));
         if (!bad_param) {
             const selectedAliases = select.filter(s => s.selected).map(s => s.alias);
@@ -1016,15 +1001,16 @@ class ViewHandler {
     * @param {string[]} allowed_cols - allowed columns (excluding forcedData) from table rules
     */
     prepareFieldValues(obj = {}, forcedData = {}, allowed_cols, fixIssues = false) {
-        let column_names = this.column_names.slice(0);
+        const column_names = this.column_names.slice(0);
         if (!column_names || !column_names.length)
             throw "table column_names mising";
         let _allowed_cols = column_names.slice(0);
-        let _obj = { ...obj };
+        const _obj = { ...obj };
         if (allowed_cols) {
             _allowed_cols = this.parseFieldFilter(allowed_cols, false);
         }
-        let final_filter = { ..._obj }, filter_keys = Object.keys(final_filter);
+        let final_filter = { ..._obj };
+        const filter_keys = Object.keys(final_filter);
         if (fixIssues && filter_keys.length) {
             final_filter = {};
             filter_keys
@@ -1055,7 +1041,8 @@ class ViewHandler {
         if (!all_cols)
             throw "all_cols missing";
         const all_fields = all_cols; // || this.column_names.slice(0);
-        let colNames = [], initialParams = JSON.stringify(fieldParams);
+        let colNames = [];
+        const initialParams = JSON.stringify(fieldParams);
         if (fieldParams) {
             /*
                 "field1, field2, field4" | "*"
@@ -1097,7 +1084,7 @@ class ViewHandler {
                 if (!(0, prostgles_types_1.getKeys)(fieldParams).length) {
                     return []; //all_fields.slice(0) as typeof all_fields;
                 }
-                let keys = (0, prostgles_types_1.getKeys)(fieldParams);
+                const keys = (0, prostgles_types_1.getKeys)(fieldParams);
                 if (keys[0] === "") {
                     if (allow_empty) {
                         return [""];
@@ -1112,7 +1099,7 @@ class ViewHandler {
                     if (!allowedVals.includes(fieldParams[key]))
                         throw `Invalid field selection value for: { ${key}: ${fieldParams[key]} }. \n Allowed values: ${allowedVals.join(" OR ")}`;
                 });
-                let allowed = keys.filter(key => fieldParams[key]), disallowed = keys.filter(key => !fieldParams[key]);
+                const allowed = keys.filter(key => fieldParams[key]), disallowed = keys.filter(key => !fieldParams[key]);
                 if (disallowed && disallowed.length) {
                     return all_fields.filter(col => !disallowed.includes(col));
                 }
@@ -1127,7 +1114,7 @@ class ViewHandler {
         }
         return colNames;
         function validate(cols) {
-            let bad_keys = cols.filter(col => !all_fields.includes(col));
+            const bad_keys = cols.filter(col => !all_fields.includes(col));
             if (bad_keys && bad_keys.length) {
                 throw "\nUnrecognised or illegal fields: " + bad_keys.join(", ");
             }