@opengis/fastify-table 2.5.22 → 2.5.24

package/dist/server/plugins/pg/funcs/autoIndex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"autoIndex.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/autoIndex.ts"],"names":[],"mappings":"AAaA,wBAA8B,SAAS,CAAC,EACtC,KAAK,EACL,OAAO,EAAE,OAAO,EAChB,EAAoB,EACpB,GAAG,GACJ,EAAE,GAAG,6CAwJL"}
+{"version":3,"file":"autoIndex.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/autoIndex.ts"],"names":[],"mappings":"AAaA,wBAA8B,SAAS,CAAC,EACtC,KAAK,EACL,OAAO,EAAE,OAAO,EAChB,EAAoB,EACpB,GAAG,GACJ,EAAE,GAAG,6CAmKL"}

package/dist/server/plugins/pg/funcs/autoIndex.js

@@ -73,8 +73,8 @@ export default async function autoIndex({ table, columns: filter1, pg = pgClient
         if (exists?.length <= (isGin ? 2 : 1)) {
             // console.log(`${name} - ${el.datatype}`);
             const suffix = isGin ? "gin_trgm_ops" : "";
-            qIndex.push(`CREATE INDEX if not exists ${name} ON ${el.nspname}.${el.relname} USING ${indexUsing} (${el.aname} ${suffix})`);
-            if (isGin) {
+            qIndex.push(`CREATE INDEX if not exists ${name} ON ${el.nspname}.${el.relname} USING ${indexUsing} (${el.aname} ${el.datatype?.endsWith?.("[]") ? "" : suffix})`);
+            if (isGin && !el.datatype?.endsWith?.("[]")) {
                 qIndex.push(`CREATE INDEX if not exists ${name}_lower ON ${el.nspname}.${el.relname} USING ${indexUsing} (lower(${el.aname}) ${suffix})`);
             }
             if (indexUsing === "gist") {
@@ -92,8 +92,13 @@ export default async function autoIndex({ table, columns: filter1, pg = pgClient
     loadedIndex[redisKey] = 1;
     if (!qIndex.length)
         return null;
+    if (process.env.trace === "true") {
+        console.log("autoindex", qIndex.join(";\n"));
+    }
     qIndex
         .filter((el, idx, arr) => arr.indexOf(el) === idx)
-        .map((el) => pg.query(el).catch((err) => console.log(err.toString())));
+        .map((el) => pg.query(el).catch((err) => {
+        console.error("autoindex error", el, err.toString());
+    }));
     return "ok";
 }

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

@@ -170,7 +170,7 @@ export default async function getFilterSQL({ table, filter, pg = pgClients.clien
             if (Array.isArray(cls?.arr) && cls.arr.length) {
                 Object.assign(el, {
                     cls: el.data,
-                    options: cls,
+                    options: cls.arr,
                     select: `select code, name from admin.cls where parent='${el.data}'`,
                 });
             }

package/dist/server/plugins/table/funcs/getFilterSQLParametrized/formatValue.d.ts

@@ -0,0 +1,2 @@
+export default function formatValue({ table, filter, name, value, dataTypeID, uid, optimize, args: argsParams, }: any, pg?: any): any;
+//# sourceMappingURL=formatValue.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"formatValue.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/table/funcs/getFilterSQLParametrized/formatValue.ts"],"names":[],"mappings":"AAaA,MAAM,CAAC,OAAO,UAAU,WAAW,CACjC,EACE,KAAK,EACL,MAAW,EACX,IAAI,EACJ,KAAK,EACL,UAAU,EACV,GAAS,EACT,QAAQ,EACR,IAAI,EAAE,UAAU,GACjB,EAAE,GAAG,EACN,EAAE,MAAmB,OAyPtB"}

package/dist/server/plugins/table/funcs/getFilterSQLParametrized/formatValue.js

@@ -0,0 +1,211 @@
+import pgClients from "../../../pg/pgClients.js";
+import applyHookSync from "../../../hook/applyHookSync.js";
+import getRangeQuery from "./getRangeQuery.js";
+const selectFilterTypes = [
+    "check",
+    "autocomplete",
+    "tags",
+    "avatar",
+    "radio",
+    "select",
+    "button",
+];
+export default function formatValue({ table, filter = {}, name, value, dataTypeID, uid = "1", optimize, args: argsParams, }, pg = pgClients.client) {
+    const { extra, sql, select, strict, options, optionsFromColumns } = filter;
+    const pk = pg?.pk && table ? pg.pk[table] : undefined;
+    const filterType = filter.type?.toLowerCase?.() || "text";
+    const args = Array.from(argsParams || []);
+    const sval = typeof value === "string"
+        ? `%${decodeURIComponent(value.replace(/%/g, "%25")).replace(/%/g, "\\%")}%`
+        : undefined;
+    if (filterType === "text" && typeof value === "string" && filter?.columns) {
+        args.push(sval);
+        const columns = filter.columns.split(",");
+        const query = `(${columns
+            .map((el) => `"${el}"::text ilike $${args.length}`)
+            .join(" or ")})`;
+        return { op: "~", query, values: [sval] };
+    }
+    const fieldType = pg?.pgType?.[dataTypeID] ||
+        pg?.pgType?.[{ date: 1114 }[filterType] || 25];
+    const hookData = applyHookSync("onFormatValue", {
+        pg,
+        pk,
+        table,
+        name,
+        value,
+        filterType,
+        fieldType,
+        filter,
+        dataTypeID,
+        uid,
+        optimize,
+    });
+    if (hookData) {
+        return hookData?.query ? hookData : { op: "=", query: hookData };
+    }
+    if (!name ||
+        !value ||
+        (!dataTypeID && !extra && !sql && !options) ||
+        extra?.input?.toLowerCase?.() === "datatable" ||
+        (!selectFilterTypes.includes(filterType) &&
+            options?.find?.((el) => el?.sql))) {
+        return {};
+    }
+    // my rows
+    if (value === "me" && uid) {
+        args.push(uid);
+        return { op: "=", query: `${name}::text = $${args.length}`, values: [uid] };
+    }
+    const matchNull = { null: "is null", notnull: "is not null" }[value];
+    // geometry
+    if (["geometry"].includes(fieldType || "")) {
+        if (matchNull) {
+            return { op: "nullable", query: `${name} ${matchNull}` };
+        }
+        const bbox = value?.[0]?.split?.("_");
+        if (bbox?.length !== 4) {
+            return {};
+        }
+        const query = ` ${name} && 'box(${bbox[0]} ${bbox[1]},${bbox[2]} ${bbox[3]})'::box2d `;
+        return { op: "&&", query };
+    }
+    const op = filterType === "text" && !strict ? "~" : "=";
+    // text
+    if (["text"].includes(filterType)) {
+        // with sql subquery
+        if (typeof sql === "string") {
+            args.push(value);
+            const querysql = sql
+                .replace(/= ?any\(\$1\)/g, `::text=any($${args.length}::text[])`)
+                .replace(/\$1/g, `$${args.length}`);
+            return { op: "=", query: querysql, values: [[value]] };
+        }
+        // extra table, example: crm.extra_data
+        if (extra?.table && pk) {
+            args.push(name);
+            if (!matchNull)
+                args.push(value);
+            const query = `${pk} in (select object_id from ${extra.table} where property_key=$${args.length - 1} and value_text ${matchNull || `${op} $${args.length}`} )`;
+            return { op, query, values: matchNull ? [name] : [name, value] };
+        }
+        // default
+        if (!select) {
+            const value1 = op === "~" ? `%${value}%` : value;
+            args.push(value1);
+            const query = `${name}::text ${op === "~" ? "ilike" : "="} $${args.length}`;
+            return {
+                op,
+                query,
+                values: [value1],
+            };
+        }
+    }
+    // nullable
+    if (matchNull) {
+        const query = `${name} ${matchNull}`;
+        return { op, query };
+    }
+    // boolean
+    if (fieldType === "boolean" && ["true", "false"].includes(value)) {
+        const query = `${name} IS ${value === "true" ? "TRUE" : "FALSE"}`;
+        return { op, query };
+    }
+    // select / cls - any filter type w/ out sql subquery
+    if (value &&
+        select &&
+        Array.isArray(options) &&
+        !options.find((el) => el?.sql)) {
+        const value1 = value.split(",");
+        // by id (checkbox)
+        if (options.find((el) => el?.id && value1.includes(el.id))) {
+            args.push(value1);
+            if (fieldType && fieldType.endsWith("[]")) {
+                const query = `EXISTS ( SELECT 1 FROM unnest(${name}) AS elem WHERE elem in (with q(id, name) as (${select}) select id from q where id = any($${args.length}) ) )`;
+                return {
+                    op,
+                    query,
+                    values: [value1],
+                };
+            }
+            const query = `${name}::text in ( ( with q(id,name) as (${select}) select id from q where id = any($${args.length}) ) )`;
+            return {
+                op,
+                query,
+                values: [value1],
+            };
+        }
+        // by text
+        args.push(`%${value1[0]}%`);
+        return {
+            op,
+            query: `${name}::text in ( ( with q(id,name) as (${select}) select id from q where name::text ilike $${args.length} ) )`,
+            values: [`%${value1[0]}%`],
+        };
+    }
+    // date: 01.01.2024-31.12.2024 / number range: 100-500
+    if (["date", "datepicker", "range"].includes(filterType)) {
+        const { query, values } = getRangeQuery({
+            value,
+            name,
+            fieldType,
+            filterType,
+            sql,
+            extra,
+            pk,
+            args,
+        });
+        return { op: "between", query, values };
+    }
+    /* select query - from admin.cls / filter options */
+    if (selectFilterTypes.includes(filterType)) {
+        // multiple checks with predefined query
+        if (options?.find?.((el) => el?.sql)) {
+            const query = options
+                .filter((el) => value.split(",").includes(el.id?.toString?.()))
+                .map((el) => el.sql || "false")
+                .join(" and ") || "false";
+            return { op: "=", query };
+        }
+        // with sql subquery
+        if (sql) {
+            args.push(value);
+            const querysql = sql
+                .replace(/= ?any\(\$1\)/g, `::text=any($${args.length}::text[])`)
+                .replace(/\$1/g, `$${args.length}`);
+            return { op: "=", query: querysql, values: [[value]] };
+        }
+        // extra table, example: crm.extra_data
+        if (extra?.table && pk) {
+            args.push(name);
+            if (!matchNull)
+                args.push(value);
+            const query = `${pk} in (select object_id from ${extra.table} where property_key=$${args.length - 1} and value_text ${matchNull || `=$${args.length}`} )`;
+            return { op: "=", query, values: matchNull ? [name] : [name, value] };
+        }
+        // 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));
+            args.push(vals);
+            return {
+                op: "=",
+                query: `${name}::text=any($${args.length}::text[])`,
+                values: vals,
+            };
+        }
+        // default
+        args.push(value);
+        if (fieldType?.includes("[]")) {
+            const query = `${name}::text[] && $${args.length}::text[]`;
+            return {
+                op: "=",
+                query,
+                values: [value],
+            };
+        }
+        const query = `${name}::text=any($${args.length})`;
+        return { op: "=", query, values: [[value]] };
+    }
+    return {};
+}

package/dist/server/plugins/table/funcs/getFilterSQLParametrized/getFilterList.d.ts

@@ -0,0 +1,8 @@
+export default function getFilterList({ table, uid, filterList, extraDataTable, extraColumns, }: {
+    table: string;
+    uid?: string;
+    filterList?: Record<string, any>[];
+    extraDataTable?: string;
+    extraColumns: Record<string, any>[];
+}, pg?: any): Promise<any[]>;
+//# sourceMappingURL=getFilterList.d.ts.map

package/dist/server/plugins/table/funcs/getFilterSQLParametrized/getFilterList.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getFilterList.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/table/funcs/getFilterSQLParametrized/getFilterList.ts"],"names":[],"mappings":"AAyBA,wBAA8B,aAAa,CACzC,EACE,KAAK,EACL,GAAG,EACH,UAAU,EACV,cAAc,EACd,YAAiB,GAClB,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;IACnC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;CACrC,EACD,EAAE,MAAmB,kBAqFtB"}

package/dist/server/plugins/table/funcs/getFilterSQLParametrized/getFilterList.js

@@ -0,0 +1,90 @@
+import getSelect from "../getSelect.js";
+import getTemplate from "../getTemplate.js";
+import getMeta from "../../../pg/funcs/getMeta.js";
+import pgClients from "../../../pg/pgClients.js";
+import { getTableColumnMeta } from "../../../../routes/table/controllers/suggest.js";
+import getFilter from "../getFilter.js";
+const reply1 = {
+    response: {},
+    // redirect: (txt) => txt,
+    redirect: (txt) => Object.assign(reply1.response, {
+        body: txt,
+        statusCode: reply1.response.statusCode || 200,
+    }),
+    status: (statusCode) => {
+        Object.assign(reply1.response, { status: statusCode });
+        return reply1;
+    },
+    send: (txt) => Object.assign(reply1.response, txt),
+};
+export default async function getFilterList({ table, uid, filterList, extraDataTable, extraColumns = [], }, pg = pgClients.client) {
+    const filterResponse = await getFilter({
+        pg,
+        table,
+        user: { uid },
+    }, null);
+    return Promise.all((filterList || [])
+        .concat(filterResponse?.inline || [])
+        .concat(filterResponse?.custom || [])
+        .concat(filterResponse?.state || [])
+        .concat(filterResponse?.list || [])
+        ?.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)) {
+            Object.assign(el, {
+                extra: {
+                    table: extraDataTable,
+                    input: extraColumns.find((item) => item?.name === el?.name)?.type,
+                },
+            });
+        }
+        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,
+                })) || {}
+                : { arr: null, original: null };
+            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
+        const cls = await getSelect(el.data, pg); // git + db cls
+        if (Array.isArray(cls?.arr) && cls.arr.length) {
+            Object.assign(el, {
+                cls: el.data,
+                options: cls.arr,
+                select: `select code, name from admin.cls where parent='${el.data}'`,
+            });
+        }
+        else if (typeof (cls?.sql || cls) === "string") {
+            Object.assign(el, { select: cls?.sql || cls });
+        }
+        return el;
+    }));
+}

package/dist/server/plugins/table/funcs/getFilterSQLParametrized/getFilterQuery.d.ts

@@ -0,0 +1,17 @@
+/**
+ * @param {Number} opt.json - (1|0) 1 - Результат - Object, 0 - String
+ * @param {String} opt.query - запит до таблиці
+ * @param {String} opt.hash - інформація з хешу по запиту
+ */
+declare function getFilterQuery({ filter: filterStr, table, tableSQL, fields, filterList, uid, objectId, args, }: {
+    filter: string | undefined;
+    table: string;
+    tableSQL: any[];
+    fields?: any[];
+    filterList?: any[];
+    uid?: string | number;
+    objectId?: string;
+    args?: any[];
+}, pg?: any): any;
+export default getFilterQuery;
+//# sourceMappingURL=getFilterQuery.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"getFilterQuery.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/table/funcs/getFilterSQLParametrized/getFilterQuery.ts"],"names":[],"mappings":"AAKA;;;;GAIG;AAEH,iBAAS,cAAc,CACrB,EACE,MAAM,EAAE,SAAc,EACtB,KAAU,EACV,QAAa,EACb,MAAM,EACN,UAAU,EACV,GAAG,EACH,QAAQ,EACR,IAAI,GACL,EAAE;IACD,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;IAClB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;CACd,EACD,EAAE,MAAmB,OA4GtB;AAED,eAAe,cAAc,CAAC"}

package/dist/server/plugins/table/funcs/getFilterSQLParametrized/getFilterQuery.js

@@ -0,0 +1,90 @@
+/* eslint-disable no-continue */
+import pgClients from "../../../pg/pgClients.js";
+import formatValue from "./formatValue.js";
+/**
+ * @param {Number} opt.json - (1|0) 1 - Результат - Object, 0 - String
+ * @param {String} opt.query - запит до таблиці
+ * @param {String} opt.hash - інформація з хешу по запиту
+ */
+function getFilterQuery({ filter: filterStr = "", table = "", tableSQL = [], fields, filterList, uid, objectId, args, }, pg = pgClients.client) {
+    // if (!filterStr) return null; // filter list API
+    const mainOperators = ["=", "~", ">", "<"];
+    const filterQueryArray = decodeURIComponent(filterStr
+        ?.replace?.(/%/g, "%25")
+        ?.replace?.(/%/g, "\\%")
+        ?.replace?.(/(^,)|(,$)/g, ""))
+        ?.replace?.(/'/g, "''")
+        ?.split?.(/[;|]/) || [];
+    // default filter value form checkboxes, autocomplete or sql-defined only - if not called from card
+    const filterDefaultQueryArray = !objectId
+        ? filterList
+            ?.filter?.((el) => el.name &&
+            !filterStr?.includes?.(`${el.name}=`) &&
+            el.default &&
+            (el.options || el.sql))
+            ?.map?.((el) => `${el.name}=${el.default}`) || []
+        : [];
+    // concat default + request filters
+    const arr = filterQueryArray.concat(filterDefaultQueryArray).filter(Boolean);
+    const resultList = [];
+    for (let i = 0; i < arr.length; i += 1) {
+        const item = arr[i];
+        if (!item) {
+            continue;
+        }
+        const splitby = mainOperators?.find((el) => item.indexOf(el) !== -1) || "=";
+        const [name] = item.split(splitby);
+        // skip already added filter
+        if (resultList.find((el) => el.name === name)) {
+            continue;
+        }
+        // filter
+        const filter = filterList?.find?.((el) => el.type && el.name === name) || {
+            type: "text",
+        };
+        const { strict, extra } = filter;
+        // find all value
+        const value = arr
+            .filter((el) => el.split(splitby)?.[0] === name)
+            .map((el) => el.substring((name?.length || 0) + 1))
+            .join(",");
+        const optimize = fields?.find((el) => el.name === name)
+            ? null
+            : tableSQL.find((el) => el.name === name);
+        // find field and skip not exists
+        const { dataTypeID } = fields?.find((el) => el.name === name) ||
+            fields?.find((el) => el.name === optimize?.pk) ||
+            {};
+        // format query
+        const { op, query, values: filterValues, } = formatValue({
+            table,
+            filter,
+            name,
+            value,
+            dataTypeID,
+            uid,
+            optimize,
+            args,
+        }, pg) || {};
+        if (!query) {
+            continue;
+        }
+        if (args &&
+            filterValues &&
+            Array.isArray(filterValues) &&
+            filterValues.length) {
+            filterValues.forEach((val) => args.push(val));
+        }
+        resultList.push({
+            name,
+            value,
+            values: filterValues,
+            query,
+            operator: op,
+            strict,
+            extra,
+        });
+    }
+    return resultList;
+}
+export default getFilterQuery;

package/dist/server/plugins/table/funcs/getFilterSQLParametrized/getRangeQuery.d.ts

@@ -0,0 +1,17 @@
+export default function getRangeQuery({ value, name, fieldType, filterType, sql, extra, pk, args: argsParams, }: {
+    value?: any;
+    name?: string;
+    fieldType?: string;
+    filterType?: string;
+    sql?: any;
+    extra?: any;
+    pk?: string;
+    args: any[];
+}): {
+    query: string;
+    values?: undefined;
+} | {
+    query: any;
+    values: any[];
+};
+//# sourceMappingURL=getRangeQuery.d.ts.map

package/dist/server/plugins/table/funcs/getFilterSQLParametrized/getRangeQuery.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getRangeQuery.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/table/funcs/getFilterSQLParametrized/getRangeQuery.ts"],"names":[],"mappings":"AA0NA,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,EACpC,KAAK,EACL,IAAI,EACJ,SAAS,EACT,UAAU,EACV,GAAG,EACH,KAAK,EACL,EAAE,EACF,IAAI,EAAE,UAAU,GACjB,EAAE;IACD,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,GAAG,EAAE,CAAC;CACb;;;;;;EAkNA"}