@opengis/fastify-table 2.0.128 → 2.0.131

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/crud/funcs/getAccess.d.ts

@@ -8,5 +8,5 @@
  * @param {String} user.user_type User type
  * @returns { scope: String, roles: String[], actions: String[], query: String }
  */
-export default function getAccess({ table, form, user }: any, pg?: any): Promise<{} | null>;
+export default function getAccess({ table, form, user, method }: any, pg?: any): Promise<{} | null>;
 //# sourceMappingURL=getAccess.d.ts.map

package/dist/server/plugins/crud/funcs/getAccess.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getAccess.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/getAccess.ts"],"names":[],"mappings":"AAuBA;;;;;;;;;GASG;AAEH,wBAA8B,SAAS,CACrC,EAAE,KAAK,EAAE,IAAI,EAAE,IAAS,EAAE,EAAE,GAAG,EAC/B,EAAE,MAAmB,sBAwFtB"}
+{"version":3,"file":"getAccess.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/getAccess.ts"],"names":[],"mappings":"AAuBA;;;;;;;;;GASG;AAEH,wBAA8B,SAAS,CACrC,EAAE,KAAK,EAAE,IAAI,EAAE,IAAS,EAAE,MAAc,EAAE,EAAE,GAAG,EAC/C,EAAE,MAAmB,sBAwFtB"}

package/dist/server/plugins/crud/funcs/getAccess.js

@@ -28,7 +28,7 @@ where $1 in (a.route_id, a.alias, a.table_name) and $2 in (b.user_uid, d.user_ui
  * @param {String} user.user_type User type
  * @returns { scope: String, roles: String[], actions: String[], query: String }
  */
-export default async function getAccess({ table, form, user = {} }, pg = pgClients.client) {
+export default async function getAccess({ table, form, user = {}, method = 'GET' }, pg = pgClients.client) {
     if (!table)
         return null;
     const hookData = await applyHook("getAccess", { table, user, pg });

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

@@ -0,0 +1,39 @@
+import config from "../../../config.js";
+export const hookList = {};
+export async function applyHook(name, data) {
+    if (config.trace)
+        console.log("applyHook", name);
+    if (!hookList[name]?.length)
+        return null;
+    const result = {};
+    await Promise.all(hookList[name].map(async (hook) => {
+        const hookData = await hook({ ...data, config });
+        if (hookData) {
+            if (config.trace)
+                console.log("applyHook", name, hookData);
+            Object.assign(result, hookData);
+        }
+    })).catch((err) => {
+        console.error("applyHook", name, err.toString());
+    });
+    if (Object.keys(result).length) {
+        return result;
+    }
+    return null;
+}
+export function addHook(name, fn) {
+    if (!hookList[name]) {
+        hookList[name] = [];
+    }
+    if (config.trace)
+        console.log("addHook", name);
+    hookList[name].push(fn);
+}
+export function applyHookSync(name, data) {
+    if (!hookList[name]?.length)
+        return null;
+    if (config.trace)
+        console.log("applyHookSync", name);
+    const hookData = hookList[name].map((hook) => hook(data))[0];
+    return hookData;
+}

package/dist/server/plugins/redis/funcs/getRedis.d.ts

@@ -3,7 +3,7 @@ declare function getRedis({ db, host, port, closeClient, retryStrategy, enableOf
     host?: string;
     port?: number;
     closeClient?: boolean;
-    retryStrategy?: any;
+    retryStrategy?: Function | any;
     enableOfflineQueue?: boolean;
     lazyConnect?: boolean;
     connectTimeout?: number;

package/dist/server/plugins/redis/funcs/getRedis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getRedis.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/redis/funcs/getRedis.ts"],"names":[],"mappings":"AAQA,iBAAS,QAAQ,CACf,EACE,EAAE,EACF,IAAI,EACJ,IAAI,EACJ,WAAmB,EACnB,aAA8D,EAC9D,kBAAyB,EACzB,WAAkB,EAClB,cAAqB,EACrB,oBAAwB,GACzB,GAAE;IACD,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;CACnB,OA6Cd;AAED,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"getRedis.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/redis/funcs/getRedis.ts"],"names":[],"mappings":"AAQA,iBAAS,QAAQ,CACf,EACE,EAAE,EACF,IAAI,EACJ,IAAI,EACJ,WAAW,EACX,aAAa,EACb,kBAAkB,EAClB,WAAW,EACX,cAAc,EACd,oBAAoB,GACrB,GAAE;IACD,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,QAAQ,GAAG,GAAG,CAAC;IAC/B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;CACnB,OAoDd;AAED,eAAe,QAAQ,CAAC"}

package/dist/server/plugins/redis/funcs/getRedis.js

@@ -3,7 +3,7 @@ import config from "../../../../config.js";
 import logger from "../../logger/getLogger.js";
 import redisClients from "./redisClients.js";
 config.ready = config.ready || {};
-function getRedis({ db, host, port, closeClient = false, retryStrategy = (times) => Math.min(times * 500, 5000), enableOfflineQueue = true, lazyConnect = true, connectTimeout = 2000, maxRetriesPerRequest = 1, } = { db: 0 }) {
+function getRedis({ db, host, port, closeClient, retryStrategy, enableOfflineQueue, lazyConnect, connectTimeout, maxRetriesPerRequest, } = { db: 0 }) {
     if (!config.redis && !host)
         return null;
     const key = host || port ? [host, port, db].join("-") : db;
@@ -21,12 +21,16 @@ function getRedis({ db, host, port, closeClient = false, retryStrategy = (times)
         host: host || config.redis?.host || "127.0.0.1",
         port: port || config.redis?.port || 6379, // Redis port
         family: 4, // 4 (IPv4) or 6 (IPv6)
-        closeClient,
-        retryStrategy,
-        enableOfflineQueue,
-        lazyConnect,
-        connectTimeout,
-        maxRetriesPerRequest,
+        closeClient: closeClient || config.redis?.closeClient || false,
+        retryStrategy: retryStrategy
+            ? retryStrategy
+            : (times) => Math.min(times * 500, 5000),
+        enableOfflineQueue: enableOfflineQueue || config.redis?.enableOfflineQueue || true,
+        lazyConnect: lazyConnect || config.redis?.lazyConnect || true,
+        connectTimeout: +(connectTimeout || config.redis?.connectTimeout || 2000),
+        maxRetriesPerRequest: +(maxRetriesPerRequest ||
+            config.redis?.maxRetriesPerRequest ||
+            1),
     };
     redisClients[key] = new Redis(redisConfig);
     redisClients[key].on("ready", () => {

package/dist/server/routes/auth/controllers/2factor/generate.js

@@ -0,0 +1,38 @@
+import config from "../../../../../config.js";
+import pgClients from "../../../../plugins/pg/pgClients.js";
+import { generate } from "./providers/totp.js";
+/**
+ * Генерація secret для двохфакторної авторизації користувача
+ *
+ * @method GET
+ * @summary Генерація user secret для двохфакторної авторизації
+ * @priority 3
+ * @alias generate
+ * @type api
+ * @tag auth
+ * @requires 2fa
+ * @errors 500
+ * @returns {Number} status Номер помилки
+ * @returns {String|Object} error Опис помилки
+ * @returns {String|Object} message Повідомлення про успішне виконання або об'єкт з параметрами
+ */
+export default async function generateFunction({ pg = pgClients.client, user = {} }, reply) {
+    if (!user?.uid) {
+        return reply.status(401).send("unauthorized");
+    }
+    const { uid } = user;
+    if (!config?.auth?.["2factor"]) {
+        return reply.status(400).send("2fa not enabled");
+    }
+    if (!config.pg) {
+        return reply.status(400).send("empty pg");
+    }
+    if (!uid) {
+        return reply.status(401).send("access restricted: unauthorized");
+    }
+    const res = await generate({ pg, uid });
+    if (res?.enabled) {
+        return reply.status(400).send("already created 2fa");
+    }
+    return reply.status(200).send(res);
+}

package/dist/server/routes/auth/controllers/2factor/toggle.js

@@ -0,0 +1,39 @@
+import config from '../../../../../config.js';
+import pgClients from '../../../../plugins/pg/pgClients.js';
+import { toggle } from './providers/totp.js';
+/**
+ * Включення/виключення двохфакторної авторизації для користувача
+ *
+ * @method GET
+ * @summary Включення/виключення двохфакторної авторизації
+ * @priority 2
+ * @alias toggle
+ * @type api
+ * @tag auth
+ * @requires 2fa
+ * @errors 500
+ * @returns {Number} status Номер помилки
+ * @returns {String|Object} error Опис помилки
+ * @returns {String|Object} message Повідомлення про успішне виконання або об'єкт з параметрами
+ */
+export default async function toggleFunction(req, reply) {
+    const { pg = pgClients.client, session = {}, query = {}, } = req;
+    const { uid } = session?.passport?.user || {};
+    const { code, enable } = query;
+    if (!config.pg) {
+        return reply.status(400).send('empty pg');
+    }
+    if (!uid) {
+        return reply.status(401).send('access restricted: unauthorized');
+    }
+    if (!code) {
+        return reply.status(400).send('param "code" is required');
+    }
+    if (!Object.hasOwn(query, 'enable')) {
+        return reply.status(400).send('param "enable" is required');
+    }
+    const data = await toggle({
+        pg, code, enable: enable === 'true', uid,
+    });
+    return reply.status(200).send(data);
+}

package/dist/server/routes/crud/controllers/deleteCrud.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deleteCrud.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/deleteCrud.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAa5C,wBAA8B,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBA6HrE"}
+{"version":3,"file":"deleteCrud.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/deleteCrud.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAa5C,wBAA8B,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBA8HrE"}

package/dist/server/routes/crud/controllers/deleteCrud.js

@@ -1,6 +1,13 @@
-import { dataDelete, getTemplate, getAccess, applyHook, getToken, config, pgClients, getOpt, } from "../../../../utils.js";
+import config from "../../../../config.js";
+import pgClients from "../../../plugins/pg/pgClients.js";
+import getAccess from "../../../plugins/crud/funcs/getAccess.js";
+import getToken from "../../../plugins/crud/funcs/getToken.js";
+import applyHook from "../../../plugins/hook/applyHook.js";
+import getOpt from "../../../plugins/crud/funcs/getOpt.js";
+import getTemplate from "../../../plugins/table/funcs/getTemplate.js";
+import dataDelete from "../../../plugins/crud/funcs/dataDelete.js";
 export default async function deleteCrud(req, reply) {
-    const { pg = pgClients.client, user = {}, params = {}, headers = {}, } = req || {};
+    const { pg = pgClients.client, user = {}, params = {}, headers = {}, method, } = req || {};
     const hookData = (await applyHook("preDelete", {
         pg,
         table: params?.table,
@@ -29,7 +36,7 @@ export default async function deleteCrud(req, reply) {
             code: 403,
         });
     }
-    const { actions = [] } = (await getAccess({ table: del, id, user }, pg)) || {};
+    const { actions = [] } = (await getAccess({ table: del, id, user, method }, pg)) || {};
     if (!tokenData &&
         !config?.local &&
         !config.security?.disableToken &&

package/dist/server/routes/crud/controllers/insert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/insert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAgB5C,wBAA8B,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBA4KjE"}
+{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/insert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAe5C,wBAA8B,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBA6KjE"}

package/dist/server/routes/crud/controllers/insert.js

@@ -1,6 +1,16 @@
-import { applyHook, getAccess, getTemplate, checkXSS, checkSQL, dataInsert, getToken, config, pgClients, logger, validateData, } from "../../../../utils.js";
+import config from "../../../../config.js";
+import applyHook from "../../../plugins/hook/applyHook.js";
+import logger from "../../../plugins/logger/getLogger.js";
+import pgClients from "../../../plugins/pg/pgClients.js";
+import checkXSS from "../../../plugins/policy/funcs/checkXSS.js";
+import checkSQL from "../../../plugins/policy/funcs/checkSQL.js";
+import dataInsert from "../../../plugins/crud/funcs/dataInsert.js";
+import validateData from "../../../plugins/crud/funcs/validateData.js";
+import getAccess from "../../../plugins/crud/funcs/getAccess.js";
+import getToken from "../../../plugins/crud/funcs/getToken.js";
+import getTemplate from "../../../plugins/table/funcs/getTemplate.js";
 export default async function insert(req, reply) {
-    const { pg = pgClients.client, user = {}, params = {}, body = {}, headers = {}, } = req || {};
+    const { pg = pgClients.client, user = {}, params = {}, body = {}, headers = {}, method, } = req || {};
     if (!user) {
         return reply.status(403).send({ error: "access restricted", code: 403 });
     }
@@ -28,7 +38,7 @@ export default async function insert(req, reply) {
         (config.security?.disableToken || config.local || config.auth?.disable
             ? req.params
             : {});
-    const { actions = [] } = (await getAccess({ table: add, form, user }, pg)) || {};
+    const { actions = [] } = (await getAccess({ table: add, form, user, method }, pg)) || {};
     if (!tokenData &&
         !config.local &&
         !config.security?.disableToken &&
@@ -126,5 +136,5 @@ export default async function insert(req, reply) {
     const pk = pg.pk?.[loadTemplate?.table || table];
     return reply
         .status(200)
-        .send({ id: res?.rows?.[0]?.[pk], rows: res.rows, extra: res.extra });
+        .send({ id: res?.rows?.[0]?.[pk], rows: res.rows, extra: res.extra, ...(res.rows?.[0] || {}) });
 }

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

@@ -1 +1 @@
-{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/table.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAe5C,wBAA8B,QAAQ,CACpC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,GAAG,gBAkOZ"}
+{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/table.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAc5C,wBAA8B,QAAQ,CACpC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,GAAG,gBAmOZ"}

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

@@ -1,7 +1,14 @@
-import { config, getAccess, getTemplate, getMeta, setToken, applyHook, getToken, pgClients, } from "../../../../utils.js";
+import config from "../../../../config.js";
+import applyHook from "../../../plugins/hook/applyHook.js";
+import pgClients from "../../../plugins/pg/pgClients.js";
+import getMeta from "../../../plugins/pg/funcs/getMeta.js";
+import getAccess from "../../../plugins/crud/funcs/getAccess.js";
+import getToken from "../../../plugins/crud/funcs/getToken.js";
+import setToken from "../../../plugins/crud/funcs/setToken.js";
+import getTemplate from "../../../plugins/table/funcs/getTemplate.js";
 import extraDataGet from "../../../plugins/extra/extraDataGet.js";
 export default async function tableAPI(req, reply, called) {
-    const { pg = pgClients.client, params, user = {}, query = {} } = req;
+    const { pg = pgClients.client, params, user = {}, query = {}, method } = req;
     const tokenData = await getToken({
         token: params?.table,
         uid: user.uid,
@@ -39,6 +46,7 @@ export default async function tableAPI(req, reply, called) {
         form,
         id,
         user,
+        method,
     }, pg)) || {};
     if (!tokenData &&
         !config?.local &&

package/dist/server/routes/crud/controllers/update.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/update.ts"],"names":[],"mappings":"AAeA,wBAA8B,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBA4LxD"}
+{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/update.ts"],"names":[],"mappings":"AAeA,wBAA8B,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBA8LxD"}

package/dist/server/routes/crud/controllers/update.js

@@ -1,8 +1,19 @@
-import { pgClients, applyHook, getAccess, getTemplate, checkXSS, checkSQL, dataUpdate, logger, getToken, validateData, } from "../../../../utils.js";
 import config from "../../../../config.js";
+import applyHook from "../../../plugins/hook/applyHook.js";
+import logger from "../../../plugins/logger/getLogger.js";
+import pgClients from "../../../plugins/pg/pgClients.js";
+import checkXSS from "../../../plugins/policy/funcs/checkXSS.js";
+import checkSQL from "../../../plugins/policy/funcs/checkSQL.js";
+import dataUpdate from "../../../plugins/crud/funcs/dataUpdate.js";
+import validateData from "../../../plugins/crud/funcs/validateData.js";
+import getAccess from "../../../plugins/crud/funcs/getAccess.js";
+import getToken from "../../../plugins/crud/funcs/getToken.js";
+import getTemplate from "../../../plugins/table/funcs/getTemplate.js";
 import insert from "./insert.js";
 export default async function update(req, reply) {
-    const { pg = pgClients.client, user, params = {}, body = {}, headers = {}, unittest, } = req;
+    const { pg = pgClients.client, user, params = {}, body = {}, headers = {}, method, } = req;
+    const { referer } = headers;
+    const unittest = process.env.NODE_ENV === 'test' || process.env.VITEST;
     if (!user) {
         return reply.status(403).send({ error: "access restricted", code: 403 });
     }
@@ -18,7 +29,6 @@ export default async function update(req, reply) {
             : hookData.message;
         return reply.status(hookData.status).send(response);
     }
-    const { referer } = headers;
     const tokenData = await getToken({
         uid: user.uid,
         token: body.token || params.id || params.table,
@@ -35,6 +45,7 @@ export default async function update(req, reply) {
         form,
         id,
         user,
+        method,
     }, pg)) || {};
     if (!tokenData &&
         !config.local &&

package/dist/server/routes/logger/controllers/utils/checkUserAccess.js

@@ -0,0 +1,22 @@
+import config from "../../../../../config.js";
+const { accessToken = "0NWcGQxKRP8AsRxD" } = config.auth || {};
+/**
+ *
+ * @summary check user access to logger interface - per admin user type or user group
+ * @returns {Object} message, status
+ */
+export default function checkUserAccess({ user = {}, token, }) {
+    if (token && token === accessToken) {
+        return { message: "access granted", status: 200 };
+    }
+    // console.log(user);
+    if (!user.user_type?.includes?.("admin") &&
+        !config?.local &&
+        !config.auth?.disable) {
+        return { message: "access restricted", status: 403 };
+    }
+    /* if (!['admin', 'superadmin']?.includes(user.user_type) && count === '0') {
+      return { message: 'access restricted', status: 403 };
+    } */
+    return { message: "access granted", status: 200 };
+}

package/dist/server/routes/logger/controllers/utils/getRootDir.js

@@ -0,0 +1,25 @@
+/* eslint-disable no-console */
+import fs from "node:fs";
+import path from "node:path";
+import config from "../../../../../config.js";
+// import { existsSync } from 'fs';
+let logDir = null;
+export default function getRootDir() {
+    // absolute / relative path
+    if (logDir)
+        return logDir;
+    const file = ["config.json", "/data/local/config.json"].find((el) => fs.existsSync(el) ? el : null);
+    const root = file === "config.json" ? process.cwd() : "/data/local";
+    logDir = config.logDir || path.join(root, config.log?.dir || "log");
+    console.log({ logDir });
+    return logDir;
+    // windows debug support
+    /* const customLogDir = process.cwd().includes(':') ? 'c:/data/local' : '/data/local';
+    // docker default path
+    if (existsSync(customLogDir)) {
+      return path.join(customLogDir, config.folder || '', 'log');
+    }
+  
+    // non-docker default path
+    return path.join(config.root || '/data/local', config.folder || '', 'log'); */
+}

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

@@ -1 +1 @@
-{"version":3,"file":"card.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/card.ts"],"names":[],"mappings":"AASA,wBAA8B,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAgItD"}
+{"version":3,"file":"card.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/card.ts"],"names":[],"mappings":"AAOA,wBAA8B,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAmItD"}

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

@@ -1,7 +1,12 @@
-import { getTemplate, getMeta, metaFormat, getAccess, applyHook, pgClients, } from "../../../../utils.js";
+import getAccess from "../../../plugins/crud/funcs/getAccess.js";
+import applyHook from "../../../plugins/hook/applyHook.js";
+import getTemplate from "../../../plugins/table/funcs/getTemplate.js";
+import getMeta from "../../../plugins/pg/funcs/getMeta.js";
+import pgClients from "../../../plugins/pg/pgClients.js";
+import metaFormat from "../../../plugins/table/funcs/metaFormat/index.js";
 export default async function card(req, reply) {
     const time = Date.now();
-    const { pg = pgClients.client, user, params = {}, query = {} } = req;
+    const { pg = pgClients.client, user, params = {}, query = {}, method } = req;
     const hookData = (await applyHook("preCard", {
         table: params?.table,
         id: params?.id,
@@ -17,6 +22,7 @@ export default async function card(req, reply) {
         table: hookData?.table || params.table,
         id: hookData?.id || params?.id,
         user,
+        method,
     })) || {};
     if (!actions.includes("view") || (scope === "my" && !my)) {
         return reply.status(403).send({ error: "access restricted", code: 403 });
@@ -74,12 +80,14 @@ export default async function card(req, reply) {
         id: hookData?.id || params?.id,
         user,
         payload: {
+            id: hookData?.id || params?.id,
             time: Date.now() - time,
             data,
         },
     });
     return (afterHookData || {
         time: Date.now() - time,
+        id: hookData?.id || params?.id,
         data,
     });
 }

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

@@ -1 +1 @@
-{"version":3,"file":"cardData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/cardData.ts"],"names":[],"mappings":"AAwBA,wBAA8B,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAuO7D"}
+{"version":3,"file":"cardData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/cardData.ts"],"names":[],"mappings":"AAuBA,wBAA8B,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAuO7D"}

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

@@ -1,13 +1,20 @@
 /* eslint-disable no-param-reassign */
 import path from "node:path";
-import { config, getAccess, handlebars, setOpt, setToken, getTemplate, handlebarsSync, applyHook, getData, } from "../../../../utils.js";
+import config from "../../../../config.js";
+import { handlebars, handlebarsSync } from "../../../helpers/index.js";
+import getAccess from "../../../plugins/crud/funcs/getAccess.js";
+import setToken from "../../../plugins/crud/funcs/setToken.js";
+import applyHook from "../../../plugins/hook/applyHook.js";
+import setOpt from "../../../plugins/crud/funcs/setOpt.js";
+import getTemplate from "../../../plugins/table/funcs/getTemplate.js";
+import getData from "../functions/getData.js";
 import conditions from "./utils/conditions.js";
 const components = {
     "vs-widget-file": "select 'vs-widget-file' as component, count(*) from crm.files where entity_id=$1 and file_status<>3",
     "vs-widget-comments": "select 'vs-widget-comments' as component, count(*) from crm.communications where entity_id=$1",
 };
 export default async function getCardData(req, reply) {
-    const { pg, headers, params = {}, user = {} } = req;
+    const { pg, headers, params = {}, user = {}, method } = req;
     const { table, id } = params;
     const { uid } = user;
     const res = await applyHook("cardData", { table, id, user });
@@ -15,7 +22,7 @@ export default async function getCardData(req, reply) {
         return res;
     const time = Date.now();
     const template = await getTemplate("card", table);
-    const access = (await getAccess({ table, user }, pg));
+    const access = (await getAccess({ table, id, user, method }, pg));
     if (!access?.actions?.length) {
         return reply.status(403).send("access restricted");
     }

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

@@ -1,6 +1,6 @@
 import type { FastifyReply } from "fastify";
 import type { ExtendedPG } from "../../../types/core.js";
-export default function getForm({ pg, params, user, query, }: {
+export default function getForm({ pg, params, user, query, method, }: {
     pg: ExtendedPG;
     params: {
         name: string;
@@ -10,5 +10,6 @@ export default function getForm({ pg, params, user, query, }: {
     query: {
         edit?: any;
     };
+    method: string;
 }, reply: FastifyReply): Promise<any>;
 //# sourceMappingURL=getFormByTable.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getFormByTable.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/getFormByTable.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAc5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAUzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,IAAS,EACT,KAAU,GACX,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACtC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,KAAK,EAAE;QAAE,IAAI,CAAC,EAAE,GAAG,CAAA;KAAE,CAAC;CACvB,EACD,KAAK,EAAE,YAAY,gBAsKpB"}
+{"version":3,"file":"getFormByTable.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/getFormByTable.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAY5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAUzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,IAAS,EACT,KAAU,EACV,MAAM,GACP,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACtC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,KAAK,EAAE;QAAE,IAAI,CAAC,EAAE,GAAG,CAAA;KAAE,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;CAChB,EACD,KAAK,EAAE,YAAY,gBAsKpB"}

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

@@ -1,4 +1,11 @@
-import { config, applyHook, getTemplate, pgClients, getAccess, setToken, getSelectMeta, getToken, } from "../../../../utils.js";
+import getToken from "../../../plugins/crud/funcs/getToken.js";
+import getSelectMeta from "../../../plugins/table/funcs/getSelectMeta.js";
+import pgClients from "../../../plugins/pg/pgClients.js";
+import config from "../../../../config.js";
+import getAccess from "../../../plugins/crud/funcs/getAccess.js";
+import setToken from "../../../plugins/crud/funcs/setToken.js";
+import applyHook from "../../../plugins/hook/applyHook.js";
+import getTemplate from "../../../plugins/table/funcs/getTemplate.js";
 import getEditData from "../../crud/controllers/table.js";
 import formatSchema from "./utils/formatSchema.js";
 const q = `select
@@ -8,7 +15,7 @@ const q = `select
     property_text as text
 from admin.properties
 where 1=1`;
-export default async function getForm({ pg = pgClients.client, params, user = {}, query = {}, }, reply) {
+export default async function getForm({ pg = pgClients.client, params, user = {}, query = {}, method, }, reply) {
     const time = Date.now();
     const edit = query.edit || params.id;
     if (!user?.uid) {
@@ -29,7 +36,7 @@ export default async function getForm({ pg = pgClients.client, params, user = {}
     if (!form) {
         // return reply.status(404).send("form not found");
     }
-    const { actions = [] } = (await getAccess({ table, form, user }, pg)) || {};
+    const { actions = [] } = (await getAccess({ table, id: edit, form, user, method }, pg)) || {};
     const loadTemplate = await getTemplate("form", form || params.name);
     if (!loadTemplate) {
         return reply.status(404).send("form template not found");

package/dist/server/routes/table/functions/getData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/functions/getData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA4EzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,KAAK,EACL,EAAE,EACF,OAAY,EACZ,KAAU,EACV,IAAS,EACT,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,gBAAgB,EAC7B,OAAO,EAAE,YAAY,GACtB,EAAE;IACD,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,MAAM,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,EACD,MAAM,CAAC,EAAE,YAAY,EACrB,MAAM,CAAC,EAAE,GAAG,gBAo0Bb"}
+{"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/functions/getData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA4EzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,KAAK,EACL,EAAE,EACF,OAAY,EACZ,KAAU,EACV,IAAS,EACT,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,gBAAgB,EAC7B,OAAO,EAAE,YAAY,GACtB,EAAE;IACD,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,MAAM,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,EACD,MAAM,CAAC,EAAE,YAAY,EACrB,MAAM,CAAC,EAAE,GAAG,gBAs0Bb"}

package/dist/server/routes/table/functions/getData.js

@@ -5,7 +5,7 @@ import getAccess from "../../../plugins/crud/funcs/getAccess.js";
 import setToken from "../../../plugins/crud/funcs/setToken.js";
 import getToken from "../../../plugins/crud/funcs/getToken.js";
 import gisIRColumn from "../../../plugins/table/funcs/gisIRColumn.js";
-import { applyHook } from "../../../../utils.js";
+import applyHook from "../../../plugins/hook/applyHook.js";
 import getSelect from "../../../plugins/table/funcs/getSelect.js";
 import setOpt from "../../../plugins/crud/funcs/setOpt.js";
 import getOpt from "../../../plugins/crud/funcs/getOpt.js";
@@ -57,6 +57,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
     const timeArr = [Date.now()];
     const { uid } = user;
     const reply = reply1 || mockReply;
+    const method = 'GET';
     const checkQuery = (item) => user?.user_type === "superadmin" ? !item.includes("{{uid}}") : true;
     const paramsTable = params?.table || table;
     if (!paramsTable) {
@@ -133,6 +134,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
             table: templateName,
             id: objectId,
             user,
+            method,
         }, pg));
     const body = loadTable || hookData || tokenData;
     const { table: table1, columns = [], sql, cardSql, form, meta, sqlColumns, public: ispublic, editable = false, } = loadTable || hookData || tokenData || params || { table };

package/package.json

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

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

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

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

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