@opengis/fastify-table 2.1.10 → 2.1.12

package/dist/server/plugins/table/funcs/getFilterSQL/index.d.ts

@@ -30,7 +30,7 @@ export default function getFilterSQL({ table, filter, pg, search, searchColumn:
     q: string;
     optimizedSQL: string;
     sqlTable: any;
-    extraSqlColumns: any;
+    extraSqlColumns: string | undefined;
     tableCount: string;
     table: any;
     searchQuery: string;

package/dist/server/plugins/table/funcs/getFilterSQL/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/table/funcs/getFilterSQL/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAsC5D,wBAA8B,YAAY,CAAC,EACzC,KAAK,EACL,MAAM,EACN,EAAqB,EACrB,MAAM,EACN,YAAY,EAAE,aAAa,EAC3B,UAAU,EACV,KAAK,EACL,MAAM,EACN,KAAK,EACL,GAAG,EACH,QAAQ,EACR,KAAK,GACN,EAAE;IACD,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;;;;;;;;;;;;;;;;;;;;;;;;GAsPA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/table/funcs/getFilterSQL/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAuC5D,wBAA8B,YAAY,CAAC,EACzC,KAAK,EACL,MAAM,EACN,EAAqB,EACrB,MAAM,EACN,YAAY,EAAE,aAAa,EAC3B,UAAU,EACV,KAAK,EACL,MAAM,EACN,KAAK,EACL,GAAG,EACH,QAAQ,EACR,KAAK,GACN,EAAE;IACD,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;;;;;;;;;;;;;;;;;;;;;;;;GAwRA"}

package/dist/server/plugins/table/funcs/getFilterSQL/index.js

@@ -5,8 +5,10 @@ import config from "../../../../../config.js";
 // filter util
 import getTableSql from "./util/getTableSql.js";
 import getFilterQuery from "./util/getFilterQuery.js";
+import { getTableColumnMeta } from "../../../../routes/table/controllers/suggest.js";
 import getOptimizedQuery from "./util/getOptimizedQuery.js";
 import getFilter from "../getFilter.js";
+import getMeta from "../../../pg/funcs/getMeta.js";
 const checkInline = {};
 const defaultTable = "crm.extra_data";
 function getExtraQuery(mainColumns, schema, table, pk) {
@@ -105,11 +107,11 @@ export default async function getFilterSQL({ table, filter, pg = pgClients.clien
             })
                 .join(" or ")} )`
             : "";
-        const filterResponse = (await getFilter({
+        const filterResponse = await getFilter({
             pg,
             table,
             user: { uid },
-        }, null));
+        }, null);
         const filterList1 = await Promise.all((filterList || [])
             .concat(filterResponse?.inline || [])
             .concat(filterResponse?.custom || [])
@@ -118,8 +120,7 @@ export default async function getFilterSQL({ table, filter, pg = pgClients.clien
             ?.filter((el) => el.id || el.name)
             ?.map(async (el) => {
             Object.assign(el, { name: el.name || el.id });
-            if (el.name &&
-                extraColumns.find((item) => item?.name === el?.name)) {
+            if (el.name && extraColumns.find((item) => item?.name === el?.name)) {
                 Object.assign(el, {
                     extra: {
                         table: extraDataTable,
@@ -128,6 +129,38 @@ export default async function getFilterSQL({ table, filter, pg = pgClients.clien
                     },
                 });
             }
+            if (el.api?.split?.("/")?.[2] === "suggest" &&
+                el.api?.split?.("/")?.[3]?.split?.(":")?.length === 2 &&
+                !el.api.includes("?") // skip /suggest/table:column?sel=selectName
+            ) {
+                const [table, column] = el.api.split("/")[3].split(":");
+                const body = await getTemplate("table", table);
+                const columns = await getMeta({ pg, table }).then((el) => el?.columns || []);
+                const { arr, original } = columns?.find((el) => el.name === column)
+                    ? (await getTableColumnMeta({
+                        table: body?.table || table,
+                        template: body ? table : undefined,
+                        column: column?.split?.("?")?.shift?.(),
+                        selectName: body?.columns?.find?.((el) => el.name === column)
+                            ?.data ||
+                            body?.meta?.cls?.[column] ||
+                            column?.split?.("?")?.pop?.(),
+                        pg,
+                    })) || {}
+                    : {};
+                const arr1 = arr ||
+                    (original && pg?.queryCache
+                        ? await pg
+                            .queryCache(original, { table: body?.table || table })
+                            .catch((err) => console.error("getFilterSQL error", err.toString()))
+                            .then((el) => el?.rows || [])
+                        : undefined);
+                Object.assign(el, {
+                    optionsFromColumns: true,
+                    options: arr1,
+                    select: original,
+                });
+            }
             if (!el?.data)
                 return el;
             // const cls = await getTemplate(['cls', 'select'], el.data); // only git cls
@@ -174,7 +207,7 @@ export default async function getFilterSQL({ table, filter, pg = pgClients.clien
             stateQuery,
             customQuery,
         ]
-            .filter((el) => el)
+            .filter(Boolean)
             .join(" and ");
         // table
         const obj = {

package/dist/server/plugins/table/funcs/getFilterSQL/util/formatValue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"formatValue.d.ts","sourceRoot":"","sources":["../../../../../../../server/plugins/table/funcs/getFilterSQL/util/formatValue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAe/D,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,EAAE,EACF,KAAK,EACL,MAAW,EACX,IAAI,EACJ,KAAK,EACL,UAAU,EACV,GAAO,EACP,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,OAmLA"}
+{"version":3,"file":"formatValue.d.ts","sourceRoot":"","sources":["../../../../../../../server/plugins/table/funcs/getFilterSQL/util/formatValue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAe/D,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,EAAE,EACF,KAAK,EACL,MAAW,EACX,IAAI,EACJ,KAAK,EACL,UAAU,EACV,GAAO,EACP,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,OAqMA"}

package/dist/server/plugins/table/funcs/getFilterSQL/util/formatValue.js

@@ -10,7 +10,7 @@ const selectFilterTypes = [
     "button",
 ];
 export default function formatValue({ pg, table, filter = {}, name, value, dataTypeID, uid = 1, optimize, }) {
-    const { extra, sql, select, strict, options /* default: defaultValue, */ } = filter;
+    const { extra, sql, select, strict, options, optionsFromColumns /* default: defaultValue, */, } = filter;
     const pk = pg?.pk && table ? pg.pk[table] : undefined;
     const filterType = filter.type?.toLowerCase?.() || "text";
     if (filterType === "text" && value && filter?.columns) {
@@ -132,6 +132,17 @@ export default function formatValue({ pg, table, filter = {}, name, value, dataT
             const query = `${pk} in (select object_id from ${extra.table} where property_key='${name}' and value_text ${matchNull || `='${value}'`} )`;
             return { op: "=", query };
         }
+        // if pseudo-suggest column contain commas
+        if (optionsFromColumns && options?.length) {
+            const optionValues = options.map((e) => e.id);
+            const vals = optionValues.filter((e) => value.includes(e));
+            return {
+                op: "=",
+                query: `${name}::text=any('{${vals
+                    .map((v) => `"${v}"`)
+                    .join(",")}}'::text[])`,
+            };
+        }
         // nullable + default
         const query = `${name} ${match}`;
         return { op: "=", query };

package/dist/server/plugins/table/funcs/getFilterSQL/util/getFilterQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getFilterQuery.d.ts","sourceRoot":"","sources":["../../../../../../../server/plugins/table/funcs/getFilterSQL/util/getFilterQuery.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAK/D;;;;GAIG;AAEH,iBAAS,cAAc,CAAC,EACtB,EAAqB,EACrB,MAAM,EAAE,SAAc,EACtB,KAAU,EACV,QAAa,EACb,MAAM,EACN,UAAU,EACV,GAAG,EACH,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,GAAG,EAAE,CAAC;IAChB,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,OAgGA;AAED,eAAe,cAAc,CAAC"}
+{"version":3,"file":"getFilterQuery.d.ts","sourceRoot":"","sources":["../../../../../../../server/plugins/table/funcs/getFilterSQL/util/getFilterQuery.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAK/D;;;;GAIG;AAEH,iBAAS,cAAc,CAAC,EACtB,EAAqB,EACrB,MAAM,EAAE,SAAc,EACtB,KAAU,EACV,QAAa,EACb,MAAM,EACN,UAAU,EACV,GAAG,EACH,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,GAAG,EAAE,CAAC;IAChB,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,OA8FA;AAED,eAAe,cAAc,CAAC"}

package/dist/server/plugins/table/funcs/getFilterSQL/util/getFilterQuery.js

@@ -25,9 +25,7 @@ function getFilterQuery({ pg = pgClients.client, filter: filterStr = "", table =
             ?.map?.((el) => `${el.name}=${el.default}`) || []
         : [];
     // concat default + request filters
-    const arr = filterQueryArray
-        .concat(filterDefaultQueryArray)
-        .filter((el) => el);
+    const arr = filterQueryArray.concat(filterDefaultQueryArray).filter(Boolean);
     const resultList = [];
     for (let i = 0; i < arr.length; i += 1) {
         const item = arr[i];

package/dist/server/routes/table/controllers/suggest.d.ts

@@ -1,2 +1,18 @@
+import { ExtendedPG } from "../../../types/core.js";
+export declare function getTableColumnMeta({ table, template, column, selectName, filtered, startsWith, key, pg, }: {
+    table: string;
+    template?: string;
+    column: any;
+    selectName?: string;
+    filtered?: any;
+    startsWith?: boolean;
+    key?: string;
+    pg?: ExtendedPG;
+}): Promise<{
+    arr: any;
+    original: string;
+    searchQuery: string;
+    pk: string;
+} | null>;
 export default function suggest(req: any, reply: any): Promise<any>;
 //# sourceMappingURL=suggest.d.ts.map

package/dist/server/routes/table/controllers/suggest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"suggest.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/suggest.ts"],"names":[],"mappings":"AA0HA,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBA6WzD"}
+{"version":3,"file":"suggest.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/suggest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAuBpD,wBAAsB,kBAAkB,CAAC,EACvC,KAAK,EACL,QAAQ,EACR,MAAM,EACN,UAAU,EACV,QAAQ,EACR,UAAU,EACV,GAAG,EACH,EAAqB,GACtB,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,GAAG,CAAC;IACZ,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,UAAU,CAAC;CACjB;;;;;UA+EA;AAED,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBA6WzD"}

package/dist/server/routes/table/controllers/suggest.js

@@ -2,7 +2,7 @@ import path from "node:path";
 import { existsSync, readFileSync } from "node:fs";
 import { config, getPGAsync, getTemplate, getSelectMeta, getMeta, applyHook, getSelectVal, logger, getSelect, metaFormat, getColumnCLS, pgClients, getFilter, } from "../../../../utils.js";
 const defaultLimit = 50;
-async function getTableColumnMeta({ table, template, column, selectName, filtered, startsWith, key, pg = pgClients.client, }) {
+export async function getTableColumnMeta({ table, template, column, selectName, filtered, startsWith, key, pg = pgClients.client, }) {
     if (!table || !column) {
         return null;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "2.1.10",
+  "version": "2.1.12",
   "type": "module",
   "description": "core-plugins",
   "keywords": [