@opengis/fastify-table 2.1.9 → 2.1.11

package/dist/module/core/cls/constraint_type.json

@@ -0,0 +1,14 @@
+[
+    {
+        "id": "u",
+        "text": "UK"
+    },
+    {
+        "id": "p",
+        "text": "PK"
+    },
+    {
+        "id": "f",
+        "text": "FK"
+    }
+]

package/dist/module/core/cls/constraint_type_table.json

@@ -0,0 +1,18 @@
+[
+    {
+        "id": "u",
+        "text": "UK"
+    },
+    {
+        "id": "p",
+        "text": "PK"
+    },
+    {
+        "id": "f",
+        "text": "FK"
+    },
+    {
+        "id": "c",
+        "text": "CHECK"
+    }
+]

package/dist/module/core/select/core.user_mentioned.sql

@@ -1,2 +1,2 @@
-select uid, coalesce(sur_name,'')||coalesce(' '||user_name,'') as text, email from admin.users
+select uid, coalesce(sur_name,'')||coalesce(' '||user_name,'') as text, email from admin.users
 where enabled order by coalesce(sur_name,'')||coalesce(' '||user_name,'')

package/dist/server/plugins/auth/funcs/getUserPermissions.d.ts

@@ -0,0 +1,2 @@
+export default function getUserPermissions(uid?: string, pg?: any): Promise<any>;
+//# sourceMappingURL=getUserPermissions.d.ts.map

package/dist/server/plugins/auth/funcs/getUserPermissions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getUserPermissions.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/auth/funcs/getUserPermissions.ts"],"names":[],"mappings":"AAUA,wBAA8B,kBAAkB,CAC9C,GAAG,CAAC,EAAE,MAAM,EACZ,EAAE,MAAmB,gBAoBtB"}

package/dist/server/plugins/auth/funcs/getUserPermissions.js

@@ -0,0 +1,24 @@
+import pgClients from "../../pg/pgClients.js";
+const q = `select resource_id as name,
+        array_intersect(coalesce(a.actions, array['read']), coalesce(c.actions, array['create', 'read','update','delete'])) as actions,
+        b.name as role
+from admin.role_access a
+left join admin.roles b on a.role_id=b.role_id and b.enabled
+left join admin.user_roles c on a.role_id=c.role_id
+where resource_id is not null and $1 in (a.user_uid, c.user_uid)`;
+export default async function getUserPermissions(uid, pg = pgClients.client) {
+    if (!uid)
+        return [];
+    // ? in case pg.pk not set yet
+    const pks = await pg
+        .query(`SELECT json_object_agg(conrelid::regclass, (SELECT attname FROM pg_attribute WHERE attrelid = c.conrelid AND attnum = c.conkey[1]) ) 
+      FROM pg_constraint c WHERE contype = 'p' AND connamespace::regnamespace::text = 'admin'`)
+        .then((el) => el.rows?.[0]?.json_object_agg || {});
+    const permissions = pks["admin.role_access"] &&
+        pks["admin.user_roles"] &&
+        pks["admin.users"] &&
+        uid
+        ? await pg.query(q, [uid]).then((el) => el.rows || [])
+        : [];
+    return permissions;
+}

package/dist/server/plugins/auth/onRequest.d.ts

@@ -0,0 +1,4 @@
+import { FastifyReply } from "fastify";
+import { ExtendedRequest } from "../../types/core.js";
+export default function onRequest(req: ExtendedRequest, reply: FastifyReply): Promise<null>;
+//# sourceMappingURL=onRequest.d.ts.map

package/dist/server/plugins/auth/onRequest.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"onRequest.d.ts","sourceRoot":"","sources":["../../../../server/plugins/auth/onRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAMvC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAItD,wBAA8B,SAAS,CACrC,GAAG,EAAE,eAAe,EACpB,KAAK,EAAE,YAAY,iBA+HpB"}

package/dist/server/plugins/auth/onRequest.js

@@ -0,0 +1,104 @@
+import { existsSync } from "node:fs";
+import config from "../../../config.js";
+const { prefix = "/api" } = config;
+export default async function onRequest(req, reply) {
+    const { hostname, headers, routeOptions } = req;
+    const { config: routeConfig, method, handler, url } = routeOptions || {};
+    const { policy } = routeConfig || {};
+    const isApi = method && url && typeof handler === "function" && url !== "*";
+    // handle non-api at vite/vike
+    if (!isApi) {
+        return null;
+    }
+    // proxy from old apps to editor, bi etc.
+    const validToken = (req.ip === "193.239.152.181" ||
+        req.ip === "127.0.0.1" ||
+        req.ip?.startsWith?.("192.168.") ||
+        config.debug) &&
+        req.headers?.token &&
+        config.auth?.tokens?.includes?.(headers.token);
+    if (validToken && !req?.user?.uid) {
+        req.user = {
+            uid: req.headers?.uid?.toString?.(),
+            user_type: req.headers?.user_type?.toString?.() || "regular",
+        };
+    }
+    const isAdmin = process.env.NODE_ENV === "admin" ||
+        hostname?.split?.(":")?.shift?.() === config.adminDomain ||
+        config.admin ||
+        hostname?.startsWith?.("admin");
+    const isPublic = Array.isArray(policy)
+        ? policy.includes("public")
+        : policy === "L0";
+    if (req.cookies?.["session_auth"] &&
+        !req.session?.passport?.user?.uid &&
+        (config.auth?.disable || config.auth?.user)) {
+        req.session = req.session || {};
+        req.session.passport = req.session.passport || {}; // ensure passport session exists
+        req.session.passport.user = {
+            ...(config.auth?.user || {}),
+            uid: config.auth?.user?.uid?.toString?.() || "1",
+            user_rnokpp: config.auth?.user?.rnokpp,
+            user_type: config.auth?.user?.type || "regular",
+        };
+        req.user = req.session.passport.user;
+    }
+    // ! intentional: null || undefined > undefined
+    req.user = req.user || req.session?.passport?.user || undefined; // fix for user.uid errors, by default user is null, while with express passport it was {}, unauthorized user does not trigger serializer
+    // currently 2factor + auth with passwd file not supported
+    const ispasswd = (existsSync("passwd") && !config.auth?.["2factor"]) || config.auth?.passwd;
+    const loginPageUrl = config.auth?.link?.core?.login || config?.auth?.redirect || "/login";
+    if (!req.user?.uid &&
+        !config.auth?.disable &&
+        isAdmin &&
+        !isPublic &&
+        !config.auth?.disableRedirect &&
+        !req.url.startsWith(prefix) &&
+        !req.url.startsWith("/api") &&
+        !req.url.includes(loginPageUrl) &&
+        !req.url.includes(".") &&
+        !req.url.includes("@")) {
+        if (isApi) {
+            return reply.status(401).send({ error: "unauthorized", code: 401 });
+        }
+        return reply.redirect(`${loginPageUrl}` + `?redirect=${req.url}`);
+    }
+    // by default, disable 2factor for id.gov.ua auth
+    const check = req.user?.auth_type === "govid" ? config.auth?.["2factor"]?.govid : true;
+    const login2faPage = config.auth?.link?.["2fa"]?.login || "/2factor";
+    // example: 2factor for admin env only, while public env does not require it
+    const checkEnv = () => {
+        if (!config.auth?.["2factorEnv"])
+            return true;
+        if ((config.auth?.["2factorEnv"] &&
+            process.env.NODE_ENV === config.auth?.["2factorEnv"]) ||
+            (config.auth?.["2factorEnv"] === "admin" && isAdmin)) {
+            return true;
+        }
+        return false;
+    };
+    // if 2factor is enabled globally + for user and secondFactorPassed not true => redirect to 2factor login page
+    if (req.user?.uid &&
+        req.user?.twofa &&
+        // config.auth?.["2factor"] &&
+        // !isPublic &&
+        (routeOptions?.method || "GET") === "GET" &&
+        !req.session?.secondFactorPassed &&
+        !ispasswd &&
+        !config.auth?.disableRedirect &&
+        !config.auth?.disable &&
+        check &&
+        checkEnv() &&
+        !req.url.startsWith(login2faPage) &&
+        !routeOptions.url?.includes?.("/logout") &&
+        !routeOptions.url?.includes?.("/2fa") &&
+        !routeOptions.url?.includes?.("/assets")) {
+        if (isApi) {
+            return reply
+                .status(403)
+                .send({ error: "access restricted: twofa", code: 403 });
+        }
+        return reply.redirect(login2faPage);
+    }
+    return null;
+}

package/dist/server/plugins/migration/index.d.ts

@@ -0,0 +1,3 @@
+declare function plugin(): Promise<void>;
+export default plugin;
+//# sourceMappingURL=index.d.ts.map

package/dist/server/plugins/migration/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/migration/index.ts"],"names":[],"mappings":"AAEA,iBAAe,MAAM,kBAEpB;AAED,eAAe,MAAM,CAAC"}

package/dist/server/plugins/migration/index.js

@@ -0,0 +1,5 @@
+// import execMigrations from './funcs/exec.migrations.js';
+async function plugin() {
+    //   fastify.decorate('execMigrations', execMigrations);
+}
+export default plugin;

package/dist/server/plugins/policy/funcs/checkAuth.d.ts

@@ -0,0 +1,4 @@
+import { FastifyReply } from "fastify";
+import { ExtendedRequest } from "../../../types/core.js";
+export default function onRequest(req: ExtendedRequest, reply: FastifyReply): Promise<null>;
+//# sourceMappingURL=checkAuth.d.ts.map

package/dist/server/plugins/policy/funcs/checkAuth.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"checkAuth.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/policy/funcs/checkAuth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAMvC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAIzD,wBAA8B,SAAS,CACrC,GAAG,EAAE,eAAe,EACpB,KAAK,EAAE,YAAY,iBA+HpB"}

package/dist/server/plugins/policy/funcs/checkAuth.js

@@ -0,0 +1,104 @@
+import { existsSync } from "node:fs";
+import config from "../../../../config.js";
+const { prefix = "/api" } = config;
+export default async function onRequest(req, reply) {
+    const { hostname, headers, routeOptions } = req;
+    const { config: routeConfig, method, handler, url } = routeOptions || {};
+    const { policy } = routeConfig || {};
+    const isApi = method && url && typeof handler === "function" && url !== "*";
+    // handle non-api at vite/vike
+    if (!isApi) {
+        return null;
+    }
+    // proxy from old apps to editor, bi etc.
+    const validToken = (req.ip === "193.239.152.181" ||
+        req.ip === "127.0.0.1" ||
+        req.ip?.startsWith?.("192.168.") ||
+        config.debug) &&
+        req.headers?.token &&
+        config.auth?.tokens?.includes?.(headers.token);
+    if (validToken && !req?.user?.uid) {
+        req.user = {
+            uid: req.headers?.uid?.toString?.(),
+            user_type: req.headers?.user_type?.toString?.() || "regular",
+        };
+    }
+    const isAdmin = process.env.NODE_ENV === "admin" ||
+        hostname?.split?.(":")?.shift?.() === config.adminDomain ||
+        config.admin ||
+        hostname?.startsWith?.("admin");
+    const isPublic = Array.isArray(policy)
+        ? policy.includes("public")
+        : policy === "L0";
+    if (req.cookies?.["session_auth"] &&
+        !req.session?.passport?.user?.uid &&
+        (config.auth?.disable || config.auth?.user)) {
+        req.session = req.session || {};
+        req.session.passport = req.session.passport || {}; // ensure passport session exists
+        req.session.passport.user = {
+            ...(config.auth?.user || {}),
+            uid: config.auth?.user?.uid?.toString?.() || "1",
+            user_rnokpp: config.auth?.user?.rnokpp,
+            user_type: config.auth?.user?.type || "regular",
+        };
+        req.user = req.session.passport.user;
+    }
+    // ! intentional: null || undefined > undefined
+    req.user = req.user || req.session?.passport?.user || undefined; // fix for user.uid errors, by default user is null, while with express passport it was {}, unauthorized user does not trigger serializer
+    // currently 2factor + auth with passwd file not supported
+    const ispasswd = (existsSync("passwd") && !config.auth?.["2factor"]) || config.auth?.passwd;
+    const loginPageUrl = config.auth?.link?.core?.login || config?.auth?.redirect || "/login";
+    if (!req.user?.uid &&
+        !config.auth?.disable &&
+        isAdmin &&
+        !isPublic &&
+        !config.auth?.disableRedirect &&
+        !req.url.startsWith(prefix) &&
+        !req.url.startsWith("/api") &&
+        !req.url.includes(loginPageUrl) &&
+        !req.url.includes(".") &&
+        !req.url.includes("@")) {
+        if (isApi) {
+            return reply.status(401).send({ error: "unauthorized", code: 401 });
+        }
+        return reply.redirect(`${loginPageUrl}` + `?redirect=${req.url}`);
+    }
+    // by default, disable 2factor for id.gov.ua auth
+    const check = req.user?.auth_type === "govid" ? config.auth?.["2factor"]?.govid : true;
+    const login2faPage = config.auth?.link?.["2fa"]?.login || "/2factor";
+    // example: 2factor for admin env only, while public env does not require it
+    const checkEnv = () => {
+        if (!config.auth?.["2factorEnv"])
+            return true;
+        if ((config.auth?.["2factorEnv"] &&
+            process.env.NODE_ENV === config.auth?.["2factorEnv"]) ||
+            (config.auth?.["2factorEnv"] === "admin" && isAdmin)) {
+            return true;
+        }
+        return false;
+    };
+    // if 2factor is enabled globally + for user and secondFactorPassed not true => redirect to 2factor login page
+    if (req.user?.uid &&
+        req.user?.twofa &&
+        // config.auth?.["2factor"] &&
+        // !isPublic &&
+        (routeOptions?.method || "GET") === "GET" &&
+        !req.session?.secondFactorPassed &&
+        !ispasswd &&
+        !config.auth?.disableRedirect &&
+        !config.auth?.disable &&
+        check &&
+        checkEnv() &&
+        !req.url.startsWith(login2faPage) &&
+        !routeOptions.url?.includes?.("/logout") &&
+        !routeOptions.url?.includes?.("/2fa") &&
+        !routeOptions.url?.includes?.("/assets")) {
+        if (isApi) {
+            return reply
+                .status(403)
+                .send({ error: "access restricted: twofa", code: 403 });
+        }
+        return reply.redirect(login2faPage);
+    }
+    return null;
+}

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;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;;;;;;;;;;;;;;;;;;;;;;;;GA4QA"}

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

@@ -5,6 +5,7 @@ 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";
 const checkInline = {};
@@ -105,11 +106,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 +119,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 +128,30 @@ export default async function getFilterSQL({ table, filter, pg = pgClients.clien
                     },
                 });
             }
+            if (el.api?.split?.("/")?.[2] === "suggest" &&
+                el.api?.split?.("/")?.[3]?.split?.(":")?.length === 2) {
+                const [table, column] = el.api.split("/")[3].split(":");
+                const body = await getTemplate("table", table);
+                const { arr, original, pk } = (await getTableColumnMeta({
+                    table: body?.table || table,
+                    template: body ? table : undefined,
+                    column,
+                    selectName: body?.columns?.find?.((el) => el.name === column)
+                        ?.data || body?.meta?.cls?.[column],
+                    pg,
+                })) || {};
+                const arr1 = arr ||
+                    (original && pg?.queryCache
+                        ? await pg
+                            .queryCache(original, { table: body?.table || table })
+                            .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 +198,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/access/controllers/access.group.post.js

@@ -30,7 +30,7 @@ export default async function accessGroupPost({ pg = pgClients.client, params, u
             .map((el) => pg.query("insert into admin.role_access(role_id,route_id,actions)   values ($1,$2,$3)", [id, el.path, el.actions])));
         await Promise.all(routes
             .filter((el) => el.resource && el.actions)
-            .map((el) => pg.query("insert into admin.role_access(resource_id,route_id,actions)   values ($1,$2,$3)", [id, el.path, el.actions])));
+            .map((el) => pg.query("insert into admin.role_access(role_id,resource_id,route_id,actions)   values ($1,$2,$3,$4)", [id, el.resource, el.path, el.actions])));
         const rows = await pg
             .query(`select a.route_id as path, b.actions as actions from admin.routes a 
             left join admin.role_access b on a.route_id=b.route_id

package/dist/server/routes/access/controllers/access.resources.d.ts

@@ -0,0 +1,6 @@
+declare const arr: any;
+declare const publicResources: any[];
+declare const accessResources: (req?: any) => Promise<any[]>;
+export { arr as resources, publicResources };
+export default accessResources;
+//# sourceMappingURL=access.resources.d.ts.map

package/dist/server/routes/access/controllers/access.resources.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"access.resources.d.ts","sourceRoot":"","sources":["../../../../../server/routes/access/controllers/access.resources.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,GAAG,KAEH,CAAC;AAEP,QAAA,MAAM,eAAe,EAAE,GAAG,EAIvB,CAAC;AAEJ,QAAA,MAAM,eAAe,GAAU,MAAM,GAAG,KAAG,OAAO,CAAC,GAAG,EAAE,CAEvD,CAAC;AAEF,OAAO,EAAE,GAAG,IAAI,SAAS,EAAE,eAAe,EAAE,CAAC;AAC7C,eAAe,eAAe,CAAC"}

package/dist/server/routes/access/controllers/access.resources.js

@@ -0,0 +1,14 @@
+import { existsSync, readFileSync } from "node:fs";
+const arr = existsSync("config/resources.json")
+    ? JSON.parse(readFileSync("config/resources.json", "utf-8") || "[]")
+    : [];
+const publicResources = arr.map(({ name, actions, feature }) => ({
+    name,
+    actions,
+    feature,
+}));
+const accessResources = async (req) => {
+    return publicResources;
+};
+export { arr as resources, publicResources };
+export default accessResources;

package/dist/server/routes/access/controllers/resources.d.ts

@@ -0,0 +1,11 @@
+declare const arr: any;
+interface Resource {
+    name: string;
+    actions: string[];
+    feature: string;
+}
+declare const publicResources: Resource[];
+declare const resources: (req?: any) => Promise<Resource[]>;
+export { arr as resources, publicResources };
+export default resources;
+//# sourceMappingURL=resources.d.ts.map

package/dist/server/routes/access/controllers/resources.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../../../../server/routes/access/controllers/resources.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,GAAG,KAEH,CAAC;AAEP,UAAU,QAAQ;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,QAAA,MAAM,eAAe,EAAE,QAAQ,EAM9B,CAAC;AAEF,QAAA,MAAM,SAAS,GAAU,MAAM,GAAG,KAAG,OAAO,CAAC,QAAQ,EAAE,CAEtD,CAAC;AAEF,OAAO,EAAE,GAAG,IAAI,SAAS,EAAE,eAAe,EAAE,CAAC;AAC7C,eAAe,SAAS,CAAC"}

package/dist/server/routes/access/controllers/resources.js

@@ -0,0 +1,14 @@
+import { existsSync, readFileSync } from "node:fs";
+const arr = existsSync("config/resources.json")
+    ? JSON.parse(readFileSync("config/resources.json", "utf-8") || "[]")
+    : [];
+const publicResources = arr.map(({ name, actions, feature }) => ({
+    name,
+    actions,
+    feature,
+}));
+const resources = async (req) => {
+    return publicResources;
+};
+export { arr as resources, publicResources };
+export default resources;

package/dist/server/routes/access/functions/resources.d.ts

@@ -0,0 +1,6 @@
+declare const resourcesList: any;
+declare const publicResourcesList: any[];
+export { resourcesList, publicResourcesList };
+declare const _default: null;
+export default _default;
+//# sourceMappingURL=resources.d.ts.map

package/dist/server/routes/access/functions/resources.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../../../../server/routes/access/functions/resources.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,aAAa,KAEb,CAAC;AAEP,QAAA,MAAM,mBAAmB,EAAE,GAAG,EAM7B,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,CAAC;;AAC9C,wBAAoB"}

package/dist/server/routes/access/functions/resources.js

@@ -0,0 +1,11 @@
+import { existsSync, readFileSync } from "node:fs";
+const resourcesList = existsSync("config/resources.json")
+    ? JSON.parse(readFileSync("config/resources.json", "utf-8") || "[]")
+    : [];
+const publicResourcesList = resourcesList.map(({ name, actions, feature }) => ({
+    name,
+    actions,
+    feature,
+}));
+export { resourcesList, publicResourcesList };
+export default null;

package/dist/server/routes/file/controllers/resize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resize.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/resize.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAoC5C;;GAEG;AAEH,wBAA8B,MAAM,CAClC,EACE,KAAK,GACN,EAAE;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QAC1B,IAAI,EAAE,MAAM,CAAC;QACb,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,OAAO,CAAC,EAAE,GAAG,CAAC;QACd,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,GAAG,CAAC;KACf,CAAC;CACH,EACD,KAAK,EAAE,YAAY,kBAwJpB"}
+{"version":3,"file":"resize.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/resize.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAoC5C;;GAEG;AAEH,wBAA8B,MAAM,CAClC,EACE,KAAK,GACN,EAAE;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QAC1B,IAAI,EAAE,MAAM,CAAC;QACb,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,OAAO,CAAC,EAAE,GAAG,CAAC;QACd,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,GAAG,CAAC;KACf,CAAC;CACH,EACD,KAAK,EAAE,YAAY,kBAwIpB"}

package/dist/server/routes/file/controllers/resize.js

@@ -36,21 +36,6 @@ export default async function resize({ query, }, reply) {
             .status(400)
             .send({ error: "invalid query params: filepath", code: 400 });
     }
-    // svg не підтримується
-    if (mimeType === "image/svg+xml") {
-        const fileData = await downloadFile(filepath, { buffer: true });
-        if (!fileData?.length) {
-            return reply
-                .status(404)
-                .send({ error: `Файл не знайдено - ${filepath}`, code: 400 });
-        }
-        return reply
-            .headers({
-            "Content-Type": "image/svg+xml",
-            "Cache-control": "max-age=604800",
-        })
-            .send(fileData);
-    }
     const resizePath1 = size
         ? filepath.replace(basename, `${size}_resized_${basename}`)
         : filepath.replace(basename, `${w || defaultWidth}_${h || (w ? "" : defaultHeight)}_resized_${basename}`);

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.9",
+  "version": "2.1.11",
   "type": "module",
   "description": "core-plugins",
   "keywords": [

package/dist/log/migration/dist-technical-cls.json

@@ -1 +0,0 @@
-[{"name":"core.roles","module":"admin","type":"select","hash":"d5d31d7e7fe19912d4d45bacb3aab3d3","dbhash":"d5d31d7e7fe19912d4d45bacb3aab3d3","update":false},{"name":"core.routes","module":"admin","type":"select","hash":"431032fdbe25c2db997391f61c6e944f","dbhash":"431032fdbe25c2db997391f61c6e944f","update":false},{"name":"core.user_uid","module":"admin","type":"select","hash":"45f7d8a57ecbca5b433be7937be51d5c","dbhash":"45f7d8a57ecbca5b433be7937be51d5c","update":false},{"name":"data.product","module":"shop","type":"select","hash":"9f9f99a1fb323ed0a32823cff47e59c7","dbhash":"9f9f99a1fb323ed0a32823cff47e59c7","update":false},{"name":"shop.categories","module":"shop","type":"select","hash":"549584bc96bd5ab14f872d4ef8df3d82","dbhash":"549584bc96bd5ab14f872d4ef8df3d82","update":false},{"name":"shop.products","module":"shop","type":"select","hash":"099ec0587edd16f26a1d05395a21709e","dbhash":"099ec0587edd16f26a1d05395a21709e","update":false},{"name":"shop.types","module":"shop","type":"select","hash":"a110b4d5bbe74557a7272df65ab10c3e","dbhash":"a110b4d5bbe74557a7272df65ab10c3e","update":false},{"name":"shop.types_parent","module":"shop","type":"select","hash":"14fa482423740f452139ce622f961740","dbhash":"14fa482423740f452139ce622f961740","update":false},{"name":"core.user_mentioned","module":"core","type":"select","hash":"6687f073de73a3ec4b6e0811d9310e7e","dbhash":"5a35e8ca97ce4fde93030521104ca5d3","update":true},{"name":"users.user_type","module":"admin","type":"cls","hash":"065fe92f48196a961a35f48ddd6ba9bd","dbhash":"065fe92f48196a961a35f48ddd6ba9bd","update":false},{"name":"yes_no","module":"admin","type":"cls","hash":"50c527053426248c20b0a2f112ff9046","dbhash":"50c527053426248c20b0a2f112ff9046","update":false},{"name":"currency","module":"shop","type":"cls","hash":"99ee673ab4ac2c222c0272bb7ef8079e","dbhash":"99ee673ab4ac2c222c0272bb7ef8079e","update":false},{"name":"delivery_method","module":"shop","type":"cls","hash":"953a6e6de0e83d7468393bd02e179b05","dbhash":"953a6e6de0e83d7468393bd02e179b05","update":false},{"name":"order_items.order_type","module":"shop","type":"cls","hash":"d99d36a3563ec77131b0800044df5fd0","dbhash":"d99d36a3563ec77131b0800044df5fd0","update":false},{"name":"order_status","module":"shop","type":"cls","hash":"65049e14b7d1faa6c2b0e837ff41f37d","dbhash":"65049e14b7d1faa6c2b0e837ff41f37d","update":false},{"name":"constraint_action","module":"core","type":"cls","hash":"1b7129eae9eb42106ed6e646223c806a","dbhash":"1b7129eae9eb42106ed6e646223c806a","update":false},{"name":"constraint_matchtype","module":"core","type":"cls","hash":"446ad903e69a391748a8a27bae2dc5cd","dbhash":"446ad903e69a391748a8a27bae2dc5cd","update":false},{"name":"constraint_type_full","module":"core","type":"cls","hash":"9e1cc580273f7e73fbc08ee553ad8f64","dbhash":"9e1cc580273f7e73fbc08ee553ad8f64","update":false},{"name":"core.user_type","module":"core","type":"cls","hash":"728bc9e0bcc88de83ec56d8dc7e7efff","dbhash":"728bc9e0bcc88de83ec56d8dc7e7efff","update":false}]

package/dist/log/migration/dist-technical-cls.sql

@@ -1,2 +0,0 @@
-insert into admin.cls(name,type,data,module,hash) values('core.user_mentioned','sql','select uid, coalesce(sur_name,'''')||coalesce('' ''||user_name,'''') as text, email from admin.users
-where enabled order by coalesce(sur_name,'''')||coalesce('' ''||user_name,'''')', 'core','6687f073de73a3ec4b6e0811d9310e7e')