prostgles-server 4.2.483 → 4.2.484

package/dist/Filtering/getFilterItemCondition.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getFilterItemCondition.d.ts","sourceRoot":"","sources":["../../lib/Filtering/getFilterItemCondition.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAGnF,eAAO,MAAM,sBAAsB,GAAI,6BAIpC;IACD,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,mBAAmB,CAAC;IAC7B,MAAM,EAAE,OAAO,CAAC;CACjB,KAAG,MAsLH,CAAC"}

package/dist/Filtering/getFilterItemCondition.js

@@ -0,0 +1,186 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFilterItemCondition = void 0;
+const prostgles_types_1 = require("prostgles-types");
+const parseFilterRightValue_1 = require("./parseFilterRightValue");
+const Filtering_1 = require("./Filtering");
+const DboBuilderTypes_1 = require("../DboBuilder/DboBuilderTypes");
+const getFilterItemCondition = ({ selItem, leftQ, rightF, }) => {
+    const asValue = (v) => DboBuilderTypes_1.pgp.as.format("$1", [v]);
+    const parseRightVal = (val, expect) => {
+        try {
+            return (0, parseFilterRightValue_1.parseFilterRightValue)(val, { selectItem: selItem, expect });
+        }
+        catch (e) {
+            throw new Error(e);
+        }
+    };
+    /* Matching sel item */
+    if ((0, prostgles_types_1.isObject)(rightF)) {
+        const filterKeys = Object.keys(rightF);
+        let filterOperand = filterKeys[0];
+        /** JSON cannot be compared so we'll cast it to TEXT */
+        if (selItem.column_udt_type === "json" || (0, prostgles_types_1.includes)(prostgles_types_1.TextFilterKeys, filterOperand)) {
+            leftQ += "::TEXT ";
+        }
+        /** It's an object key which means it's an equality comparison against a json object */
+        if (selItem.column_udt_type?.startsWith("json") && !(0, prostgles_types_1.includes)(Filtering_1.FILTER_OPERANDS, filterOperand)) {
+            return leftQ + " = " + parseRightVal(rightF);
+        }
+        let filterValue = rightF[filterOperand];
+        const ALLOWED_FUNCS = [...prostgles_types_1.GeomFilter_Funcs, ...prostgles_types_1.TextFilter_FullTextSearchFilterKeys];
+        let funcName;
+        let funcArgs;
+        if (selItem.column_udt_type === "interval" &&
+            (0, prostgles_types_1.isObject)(rightF) &&
+            Object.values(rightF).every((v) => Number.isFinite(v))) {
+            filterOperand = "=";
+            filterValue = Object.entries(rightF)
+                .map(([k, v]) => `${v}${k}`)
+                .join(" ");
+        }
+        else if ((filterKeys.length !== 1 || !(0, prostgles_types_1.isDefined)(filterOperand)) &&
+            selItem.column_udt_type !== "jsonb") {
+            throw new Error("Bad filter. Expecting one key only");
+        }
+        else if ((0, prostgles_types_1.isObject)(filterValue) && !(filterValue instanceof Date)) {
+            /**
+             * Filter notation
+             * geom && st_makeenvelope(funcArgs)
+             */
+            const filterValueKeys = Object.keys(filterValue);
+            funcName = filterValueKeys[0];
+            if ((0, prostgles_types_1.includes)(ALLOWED_FUNCS, funcName)) {
+                funcArgs = filterValue[funcName];
+            }
+            else {
+                funcName = undefined;
+            }
+        }
+        /** st_makeenvelope */
+        if ((0, prostgles_types_1.includes)(prostgles_types_1.GeomFilterKeys, filterOperand) &&
+            funcName &&
+            (0, prostgles_types_1.includes)(prostgles_types_1.GeomFilter_Funcs, funcName)) {
+            /**
+             * If leftQ is geography then:
+             * - err can happen: 'Antipodal (180 degrees long) edge detected!'
+             * - inacurrate results at large envelopes due to the curvature of the earth
+             * https://gis.stackexchange.com/questions/78816/maximum-size-on-the-bounding-box-with-st-makeenvelope-and-and-geography-colum
+             */
+            if (funcName.toLowerCase() === "st_makeenvelope") {
+                leftQ += "::geometry";
+            }
+            return `${leftQ} ${filterOperand} ${funcName}${parseRightVal(funcArgs, "csv")}`;
+        }
+        else if (["=", "$eq"].includes(filterOperand) && !funcName) {
+            if (filterValue === null)
+                return leftQ + " IS NULL ";
+            return leftQ + " = " + parseRightVal(filterValue);
+        }
+        else if (["<>", "$ne"].includes(filterOperand)) {
+            if (filterValue === null)
+                return leftQ + " IS NOT NULL ";
+            return leftQ + " <> " + parseRightVal(filterValue);
+        }
+        else if ([">", "$gt"].includes(filterOperand)) {
+            return leftQ + " > " + parseRightVal(filterValue);
+        }
+        else if (["<", "$lt"].includes(filterOperand)) {
+            return leftQ + " < " + parseRightVal(filterValue);
+        }
+        else if ([">=", "$gte"].includes(filterOperand)) {
+            return leftQ + " >=  " + parseRightVal(filterValue);
+        }
+        else if (["<=", "$lte"].includes(filterOperand)) {
+            return leftQ + " <= " + parseRightVal(filterValue);
+        }
+        else if (["$in", "$nin"].includes(filterOperand)) {
+            const isIn = filterOperand === "$in";
+            if (filterValue !== null && !Array.isArray(filterValue)) {
+                throw new Error("In filter expects an array");
+            }
+            if (!filterValue?.length) {
+                return isIn ? " FALSE " : " TRUE ";
+            }
+            const nonNullFilterValues = filterValue.filter((v) => v !== null);
+            const conditions = [];
+            if (nonNullFilterValues.length) {
+                conditions.push(leftQ + (isIn ? " IN " : " NOT IN ") + parseRightVal(nonNullFilterValues, "csv"));
+            }
+            if (filterValue.includes(null)) {
+                const comparator = isIn ? " IS NULL " : " IS NOT NULL ";
+                conditions.push(` ${leftQ} ${comparator} `);
+            }
+            const joinedConditions = conditions.join(isIn ? " OR " : " AND ");
+            return conditions.length > 1 ? `(${joinedConditions})` : joinedConditions;
+        }
+        else if (["$between"].includes(filterOperand)) {
+            if (!Array.isArray(filterValue) || filterValue.length !== 2) {
+                throw new Error("Between filter expects an array of two values");
+            }
+            return leftQ + " BETWEEN " + asValue(filterValue[0]) + " AND " + asValue(filterValue[1]);
+        }
+        else if (["$ilike"].includes(filterOperand)) {
+            return leftQ + " ILIKE " + asValue(filterValue);
+        }
+        else if (["$like"].includes(filterOperand)) {
+            return leftQ + " LIKE " + asValue(filterValue);
+        }
+        else if (["$nilike"].includes(filterOperand)) {
+            return leftQ + " NOT ILIKE " + asValue(filterValue);
+        }
+        else if (["$nlike"].includes(filterOperand)) {
+            return leftQ + " NOT LIKE " + asValue(filterValue);
+        }
+        else if (filterOperand === "$isDistinctFrom" || filterOperand === "$isNotDistinctFrom") {
+            const operator = Filtering_1.FILTER_OPERAND_TO_SQL_OPERAND[filterOperand];
+            return leftQ + ` ${operator} ` + asValue(filterValue);
+            /* MAYBE TEXT OR MAYBE ARRAY */
+        }
+        else if (["@>", "<@", "$contains", "$containedBy", "$overlaps", "&&", "@@"].includes(filterOperand)) {
+            const operand = filterOperand === "@@" ? "@@"
+                : ["@>", "$contains"].includes(filterOperand) ? "@>"
+                    : ["&&", "$overlaps"].includes(filterOperand) ? "&&"
+                        : "<@";
+            if (operand === "<@" || operand === "@>") {
+                if (selItem.column_udt_type === "jsonb") {
+                    const filterValueAsString = typeof filterValue === "string" ? filterValue : JSON.stringify(filterValue);
+                    return leftQ + operand + parseRightVal(filterValueAsString);
+                }
+            }
+            /* Array for sure */
+            if (Array.isArray(filterValue)) {
+                return leftQ + operand + parseRightVal(filterValue, "array");
+                /* FTSQuery */
+            }
+            else if (["@@"].includes(filterOperand) &&
+                (0, prostgles_types_1.includes)(prostgles_types_1.TextFilter_FullTextSearchFilterKeys, funcName)) {
+                let lq = `to_tsvector(${leftQ}::text)`;
+                if (selItem.columnPGDataType === "tsvector")
+                    lq = leftQ;
+                const res = `${lq} ${operand} ` + `${funcName}${parseRightVal(funcArgs, "csv")}`;
+                return res;
+            }
+            else {
+                throw new Error("Unrecognised filter operand: " + filterOperand + " ");
+            }
+        }
+        else {
+            throw new Error("Unrecognised filter operand: " + filterOperand + " ");
+        }
+    }
+    /* Is an equal filter */
+    if (rightF === null) {
+        return leftQ + " IS NULL ";
+    }
+    /**
+     * Ensure that when comparing an array to a json column, the array is cast to json
+     */
+    let valueStr = asValue(rightF);
+    if (selItem.column_udt_type?.startsWith("json") && Array.isArray(rightF)) {
+        valueStr = DboBuilderTypes_1.pgp.as.format(`$1::jsonb`, [JSON.stringify(rightF)]);
+    }
+    return `${leftQ} = ${valueStr}`;
+};
+exports.getFilterItemCondition = getFilterItemCondition;
+//# sourceMappingURL=getFilterItemCondition.js.map

package/dist/Filtering/getFilterItemCondition.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getFilterItemCondition.js","sourceRoot":"","sources":["../../lib/Filtering/getFilterItemCondition.ts"],"names":[],"mappings":"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"}

package/dist/Filtering/parseFilterRightValue.d.ts

@@ -0,0 +1,8 @@
+import { type SelectItemValidated } from "../DboBuilder/QueryBuilder/QueryBuilder";
+type ParseRightValOpts = {
+    expect?: "csv" | "array" | "json" | "jsonb";
+    selectItem: SelectItemValidated | undefined;
+};
+export declare const parseFilterRightValue: (val: any, { expect, selectItem }: ParseRightValOpts) => string;
+export {};
+//# sourceMappingURL=parseFilterRightValue.d.ts.map

package/dist/Filtering/parseFilterRightValue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parseFilterRightValue.d.ts","sourceRoot":"","sources":["../../lib/Filtering/parseFilterRightValue.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAEnF,KAAK,iBAAiB,GAAG;IACvB,MAAM,CAAC,EAAE,KAAK,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC;IAC5C,UAAU,EAAE,mBAAmB,GAAG,SAAS,CAAC;CAC7C,CAAC;AACF,eAAO,MAAM,qBAAqB,GAAI,KAAK,GAAG,EAAE,wBAAwB,iBAAiB,WAgBxF,CAAC"}

package/dist/Filtering/parseFilterRightValue.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseFilterRightValue = void 0;
+const DboBuilderTypes_1 = require("../DboBuilder/DboBuilderTypes");
+const parseFilterRightValue = (val, { expect, selectItem }) => {
+    const asValue = (v) => DboBuilderTypes_1.pgp.as.format("$1", [v]);
+    const checkIfArr = () => {
+        if (!Array.isArray(val)) {
+            throw "This type of filter/column expects an Array of items";
+        }
+    };
+    if (expect === "csv" || expect?.startsWith("json")) {
+        checkIfArr();
+        return DboBuilderTypes_1.pgp.as.format(`($1:${expect})`, [val]);
+    }
+    else if (expect === "array" || selectItem?.columnPGDataType === "ARRAY") {
+        checkIfArr();
+        return DboBuilderTypes_1.pgp.as.format(" ARRAY[$1:csv]", [val]);
+    }
+    return asValue(val);
+};
+exports.parseFilterRightValue = parseFilterRightValue;
+//# sourceMappingURL=parseFilterRightValue.js.map

package/dist/Filtering/parseFilterRightValue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parseFilterRightValue.js","sourceRoot":"","sources":["../../lib/Filtering/parseFilterRightValue.ts"],"names":[],"mappings":";;;AAAA,mEAAoD;AAO7C,MAAM,qBAAqB,GAAG,CAAC,GAAQ,EAAE,EAAE,MAAM,EAAE,UAAU,EAAqB,EAAE,EAAE;IAC3F,MAAM,OAAO,GAAG,CAAC,CAAM,EAAE,EAAE,CAAC,qBAAG,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACrD,MAAM,UAAU,GAAG,GAAG,EAAE;QACtB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,sDAAsD,CAAC;QAC/D,CAAC;IACH,CAAC,CAAC;IACF,IAAI,MAAM,KAAK,KAAK,IAAI,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QACnD,UAAU,EAAE,CAAC;QACb,OAAO,qBAAG,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,MAAM,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAChD,CAAC;SAAM,IAAI,MAAM,KAAK,OAAO,IAAI,UAAU,EAAE,gBAAgB,KAAK,OAAO,EAAE,CAAC;QAC1E,UAAU,EAAE,CAAC;QACb,OAAO,qBAAG,CAAC,EAAE,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAChD,CAAC;IAED,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC;AACtB,CAAC,CAAC;AAhBW,QAAA,qBAAqB,yBAgBhC"}

package/lib/DboBuilder/ViewHandler/parseComplexFilter.ts

@@ -1,16 +1,13 @@
 import type { AnyObject } from "prostgles-types";
 import { isObject } from "prostgles-types";
-import {
-  FILTER_OPERANDS,
-  FILTER_OPERAND_TO_SQL_OPERAND,
-  parseFilterRightValue,
-} from "../../Filtering";
+import { FILTER_OPERANDS, FILTER_OPERAND_TO_SQL_OPERAND } from "../../Filtering/Filtering";
 import { FUNCTIONS } from "../QueryBuilder/Functions/Functions";
 import { parseFunctionObject } from "../QueryBuilder/QueryBuilder";
 import type { TableSchemaColumn } from "../DboBuilderTypes";
 import { asValue } from "../../PubSubManager/PubSubManagerUtils";
 import { parseFunction } from "../QueryBuilder/Functions/parseFunction";
 import { asNameAlias } from "../../utils/asNameAlias";
+import { parseFilterRightValue } from "../../Filtering/parseFilterRightValue";
 
 const allowedComparators = FILTER_OPERANDS; //[">", "<", "=", "<=", ">=", "<>", "!="]
 type Args = {

package/lib/DboBuilder/ViewHandler/prepareWhere.ts

@@ -22,6 +22,7 @@ export async function prepareWhere(
   this: ViewHandler,
   params: PrepareWhereParams,
 ): Promise<{
+  columnsUsed: string[];
   condition: string;
   where: string;
   filter: AnyObject;
@@ -45,14 +46,15 @@ export async function prepareWhere(
 
   const exists: ExistsFilterConfig[] = [];
 
+  type FilterItemResult = { condition: string; columnsUsed: string[] };
   const parseFullFilter = async (
     f: any,
     parentFilter: AnyObject | null = null,
     isForcedFilterBypass: boolean,
-  ): Promise<string> => {
+  ): Promise<FilterItemResult> => {
     if (!f) throw "Invalid/missing group filter provided";
     if (!isObject(f)) throw "\nInvalid filter\nExpecting an object but got -> " + JSON.stringify(f);
-    let result = "";
+    const result = { condition: "", columnsUsed: [] as string[] };
     const keys = getKeys(f);
     if (!keys.length) {
       return result;
@@ -69,19 +71,21 @@ export async function prepareWhere(
 
     if (group && group.length) {
       const operand = $and ? " AND " : " OR ";
-      const conditions = (
+      const conditionItems = (
         await Promise.all(
           group.map(async (gf) => await parseFullFilter(gf, group, isForcedFilterBypass)),
         )
-      ).filter((c) => c);
+      ).filter((c) => c.condition);
 
-      if (conditions.length) {
-        if (conditions.length === 1) return conditions.join(operand);
-        else return ` ( ${conditions.sort().join(operand)} ) `;
+      if (conditionItems.length) {
+        const conditions = conditionItems.map((c) => c.condition);
+        const columnsUsed = conditionItems.map((c) => c.columnsUsed).flat();
+        if (conditions.length === 1) return { columnsUsed, condition: conditions.join(operand) };
+        else return { columnsUsed, condition: ` ( ${conditions.sort().join(operand)} ) ` };
       }
     } else if (!group) {
       /** forcedFilters do not get checked against publish and are treated as server-side requests */
-      const cond = await getCondition.bind(this)({
+      const { condition, exists, columnsUsed } = await getCondition.bind(this)({
         filter: { ...f },
         select,
         allowed_colnames:
@@ -91,8 +95,9 @@ export async function prepareWhere(
         tableRules: isForcedFilterBypass ? undefined : tableRule,
         isHaving: params.isHaving,
       });
-      result = cond.condition;
-      exists.push(...cond.exists);
+      result.condition = condition;
+      result.columnsUsed = columnsUsed;
+      exists.push(...exists);
     }
     return result;
   };
@@ -101,8 +106,12 @@ export async function prepareWhere(
   const forcedFilterCond =
     forcedFilter ? await parseFullFilter(forcedFilter, null, true) : undefined;
   const filterCond = await parseFullFilter(filter, null, false);
-  let cond = [forcedFilterCond, filterCond].filter((c) => c).join(" AND ");
+  let combinedConditions = [forcedFilterCond, filterCond]
+    .map((c) => (c?.condition ? c.condition : undefined))
+    .filter(isDefined)
+    .join(" AND ");
 
+  const combinedColumnsUsed = [...(forcedFilterCond?.columnsUsed ?? []), ...filterCond.columnsUsed];
   const finalFilter =
     forcedFilter ?
       {
@@ -110,9 +119,15 @@ export async function prepareWhere(
       }
     : { ...filter };
 
-  const condition = cond;
-  if (cond && addKeywords) {
-    cond = `WHERE ${cond}`;
+  const condition = combinedConditions;
+  if (combinedConditions && addKeywords) {
+    combinedConditions = `WHERE ${combinedConditions}`;
   }
-  return { condition, where: cond || "", filter: finalFilter, exists };
+  return {
+    columnsUsed: combinedColumnsUsed,
+    condition,
+    where: combinedConditions || "",
+    filter: finalFilter,
+    exists,
+  };
 }

package/lib/DboBuilder/getCondition.ts

@@ -1,5 +1,5 @@
-import { asName, pickKeys } from "prostgles-types";
-import { parseFilterItem } from "../Filtering";
+import { pickKeys } from "prostgles-types";
+import { parseFilterItem } from "../Filtering/Filtering";
 import type { ParsedTableRule } from "../PublishParser/PublishParser";
 import type { ExistsFilterConfig, LocalParams, PGIdentifier } from "./DboBuilder";
 import { pgp } from "./DboBuilder";
@@ -29,7 +29,7 @@ export async function getCondition(
     tableRules?: ParsedTableRule;
     isHaving?: boolean;
   },
-): Promise<{ exists: ExistsFilterConfig[]; condition: string }> {
+): Promise<{ exists: ExistsFilterConfig[]; condition: string; columnsUsed: string[] }> {
   const {
     filter: rawFilter,
     select,
@@ -179,21 +179,22 @@ export async function getCondition(
       !existsConfigs.find((ek) => ek.existType === k),
   );
 
-  const validFieldNames = allowedSelect.map((s) => s.alias);
+  const selectAliases = 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("."))),
+    (filterKey) =>
+      !selectAliases.find(
+        (alias) =>
+          alias === filterKey ||
+          (filterKey.startsWith(alias) &&
+            (filterKey.slice(alias.length).includes("->") ||
+              filterKey.slice(alias.length).includes("."))),
       ),
   );
 
   if (invalidColumn) {
-    const selItem = select?.find((s) => s.alias === invalidColumn);
+    const selectItem = select?.find((s) => s.alias === invalidColumn);
     let isComplexFilter = false;
-    if (selItem?.type === "aggregation") {
+    if (selectItem?.type === "aggregation") {
       if (!params.isHaving) {
         throw new Error(
           `Filtering by ${this.name}.${invalidColumn} is not allowed. Aggregations cannot be filtered. Use HAVING clause instead.`,
@@ -227,7 +228,7 @@ export async function getCondition(
       : this.parseFieldFilter(tableRules.select?.filterFields ?? tableRules.select?.fields),
   });
 
-  let templates: string[] = [q].filter((q) => q);
+  let templates: string[] = q?.condition ? [q.condition] : [];
 
   if (existsCond) templates.push(existsCond);
   templates = templates.concat(funcConds);
@@ -236,6 +237,7 @@ export async function getCondition(
 
   /*  sorted to ensure duplicate subscription channels are not created due to different condition order */
   return {
+    columnsUsed: q?.columnsUsed ?? [],
     exists: existsConfigs,
     condition: templates.sort().join(" AND \n"),
   };

package/lib/DboBuilder/getSubscribeRelatedTables.ts

@@ -80,7 +80,9 @@ export async function getSubscribeRelatedTables(
       const joinColumns =
         relatedTableJoinPathItem?.on.map((columnPair) => Object.values(columnPair)).flat() ?? [];
 
-      const trackedColumns = Array.from(new Set([...(selectedColumnNames ?? []), ...joinColumns]));
+      const trackedColumns = Array.from(
+        new Set([...(selectedColumnNames ?? []), ...joinColumns, ...joinConditionInfo.columnsUsed]),
+      );
 
       viewOptions.relatedTables.push({
         tableName: relatedTableName,