@opengis/fastify-table 2.3.5 → 2.4.0

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

@@ -1 +1 @@
-{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/filter.ts"],"names":[],"mappings":"AAaA,UAAU,OAAO;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;IAC3B,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;IAC3B,KAAK,CAAC,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;CAC3B;AAED,wBAA8B,SAAS,CACrC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,GAAG,EACV,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,GAAG,IAAI,GAC5C,OAAO,CAAC,OAAO,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,GAAG,GAAG,CAAC,CAqSvE"}
+{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/filter.ts"],"names":[],"mappings":"AAcA,UAAU,OAAO;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;IAC3B,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;IAC3B,KAAK,CAAC,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;CAC3B;AAED,wBAA8B,SAAS,CACrC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,GAAG,EACV,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,GAAG,IAAI,GAC5C,OAAO,CAAC,OAAO,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,GAAG,GAAG,CAAC,CAqSvE"}

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

@@ -8,6 +8,7 @@ import pgClients from "../../../plugins/pg/pgClients.js";
 import { applyHook } from "../../../../utils.js";
 import getTemplate from "../../../plugins/table/funcs/getTemplate.js";
 import getMeta from "../../../plugins/pg/funcs/getMeta.js";
+import { NotFoundError } from "../../../../errors.js";
 const { prefix = "/api" } = config;
 export default async function filterAPI(req, reply, iscalled) {
     const time = Date.now();
@@ -19,13 +20,13 @@ export default async function filterAPI(req, reply, iscalled) {
     const loadTable = await getTemplate("table", params.table);
     const { key, table, sql, query: tableQuery, form, extra, filterState, filterCustom, } = hookData || loadTable || {};
     if (!table) {
-        return reply.status(404).send({ error: "table not found", code: 404 });
+        throw NotFoundError("table not found");
     }
     const { pk: pk1, view } = await getMeta({ pg, table });
     // const pk = pg.pk?.[table] || pg.pk?.[table.replace(/"/g, "")];
     const pk = !pk1 && view ? key : pk1;
     if (!pk) {
-        return reply.status(404).send({ error: "table pk not found", code: 404 });
+        throw NotFoundError("table pkey not found");
     }
     const sqlTable = sql
         ?.filter?.((el) => !el?.disabled && el?.sql?.replace)

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

@@ -1,2 +1,2 @@
-export default function formFunction(req: any, reply: any): Promise<any>;
+export default function formFunction(req: any, reply: any): Promise<{}>;
 //# sourceMappingURL=form.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/form.ts"],"names":[],"mappings":"AAiBA,wBAA8B,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAkD9D"}
+{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/form.ts"],"names":[],"mappings":"AAkBA,wBAA8B,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,eAkD9D"}

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

@@ -1,3 +1,4 @@
+import { NotFoundError } from "../../../../errors.js";
 import { applyHook, getTemplate, pgClients } from "../../../../utils.js";
 const q = `select property_key as key, property_json as json, property_int as int,
 property_text as text from admin.properties where 1=1`;
@@ -15,15 +16,16 @@ export default async function formFunction(req, reply) {
         form: params?.name,
         user,
     }));
+    // hooks should throw custom errors instead, this is temp solution to avoid breaking changes in hooks
     if (hookData?.message && hookData?.status) {
-        const response = hookData.status >= 400
-            ? { error: hookData.message, code: hookData.status }
-            : hookData.message;
-        return reply.status(hookData.status).send(response);
+        if (hookData.status >= 400) {
+            throw new Error(hookData.message);
+        }
+        return hookData.message;
     }
     const form = await getTemplate("form", hookData?.form || params?.name);
     if (!form) {
-        return reply.status(404).send({ error: "form not found", code: 404 });
+        throw NotFoundError("form not found");
     }
     // replace settings
     const arr = JSON.stringify(form).match(/{{settings.([^}]*)}}/g);

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;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,gBAmLpB"}
+{"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;AAezD,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,gBAkLpB"}

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

@@ -8,6 +8,7 @@ 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";
+import { ForbiddenError, NotFoundError, UnauthorizedError, } from "../../../../errors.js";
 const q = `select
     property_key as key,
     property_json as json,
@@ -19,14 +20,18 @@ export default async function getForm({ pg = pgClients.client, params, user = {}
     const time = Date.now();
     const edit = query.edit || params.id;
     if (!user?.uid) {
-        return reply.status(401).send("unauthorized");
+        throw UnauthorizedError("unauthorized");
     }
     const hookData = (await applyHook("preForm", {
         table: params.name,
         user,
     }));
+    // hooks should throw custom errors instead, this is temp solution to avoid breaking changes in hooks
     if (hookData?.message && hookData?.status) {
-        return reply.status(hookData?.status).send(hookData?.message);
+        if (hookData.status >= 400) {
+            throw new Error(hookData.message);
+        }
+        return hookData.message;
     }
     const tokenData = (await getToken({ token: params.name, uid: user?.uid, json: 1 })) || {};
     const table = tokenData?.table || hookData?.table || params.name;
@@ -34,18 +39,15 @@ export default async function getForm({ pg = pgClients.client, params, user = {}
     const { title = loadTable.ua, description } = loadTable;
     const form = tokenData?.form || hookData?.form || loadTable.form;
     if (!form) {
-        // return reply.status(404).send("form not found");
+        // throw NotFoundError("form not found");
     }
     const { actions = [], message: accessMessage } = (await getAccess({ table, id: edit, form, user, method }, pg)) || {};
     if (accessMessage) {
-        return reply.status(403).send({
-            error: accessMessage,
-            code: 403,
-        });
+        throw ForbiddenError(accessMessage);
     }
     const loadTemplate = await getTemplate("form", form || params.name);
     if (!loadTemplate) {
-        return reply.status(404).send("form template not found");
+        throw NotFoundError("form template not found");
     }
     const { schema = loadTemplate } = loadTemplate;
     await Promise.all(Object.keys(schema || {})
@@ -84,9 +86,7 @@ export default async function getForm({ pg = pgClients.client, params, user = {}
             process.env.NODE_ENV !== "test" &&
             !(tokenData?.form || hookData?.form) &&
             form) {
-            return reply
-                .status(403)
-                .send({ error: "access restricted: actions", code: 403 });
+            throw ForbiddenError("access restricted: actions");
         }
         const token = setToken({
             ids: [JSON.stringify({ id, table, form })],
@@ -138,5 +138,5 @@ export default async function getForm({ pg = pgClients.client, params, user = {}
         payload: res,
         user,
     });
-    return reply.status(200).send(res1 || res);
+    return res1 || res;
 }

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

@@ -14,5 +14,5 @@ export declare function getTableColumnMeta({ table, template, column, selectName
     searchQuery: string;
     pk: string;
 } | null>;
-export default function suggest(req: any, reply: any): Promise<any>;
+export default function suggest(req: 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":"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;;;;;UAwFA;AAED,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAuYzD"}
+{"version":3,"file":"suggest.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/suggest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAwBpD,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;;;;;UAwFA;AAED,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,gBAuX7C"}

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

@@ -1,6 +1,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";
+import { BadRequestError, NotFoundError } from "../../../../errors.js";
 const defaultLimit = 50;
 export async function getTableColumnMeta({ table, template, column, selectName, filtered, startsWith, key, pg = pgClients.client, }) {
     if (!table || !column) {
@@ -64,7 +65,7 @@ export async function getTableColumnMeta({ table, template, column, selectName,
         pk: "id",
     };
 }
-export default async function suggest(req, reply) {
+export default async function suggest(req) {
     const time = Date.now();
     const { params, user, query = {}, pg: pg1 = pgClients.client } = req;
     const { lang = "ua", parent = "" } = query;
@@ -93,10 +94,7 @@ export default async function suggest(req, reply) {
     const body = await getTemplate("table", table);
     const tableName = hookBody?.table || body?.table || table;
     if (query.limit && query.limit < 0) {
-        return reply.status(400).send({
-            error: "param limit is invalid",
-            code: 400,
-        });
+        throw BadRequestError("param limit is invalid");
     }
     const selectName = query.sel ||
         (tableName && column && body
@@ -122,30 +120,23 @@ export default async function suggest(req, reply) {
             parent,
         });
     if (meta?.minLength && query.key && query.key.length < meta?.minLength) {
-        return reply.status(400).send({
-            error: `min length: ${meta.minLength}`,
-            code: 400,
-        });
+        throw BadRequestError(`min length: ${meta.minLength}`);
     }
     const limit = meta?.limit || defaultLimit;
     const pg = meta?.db ? await getPGAsync(meta.db) : pg1;
     if (!pg || !pg.pk || !pg.pgType) {
-        return reply.status(400).send({
-            error: "pg connection not established",
-            code: 400,
-        });
+        throw Error("empty pg");
     }
     if (table && !pg?.pk?.[tableName]) {
-        return reply.status(400).send({
-            error: "param name is invalid: 1",
-            code: 400,
-        });
+        throw BadRequestError("param name is invalid: 1");
     }
     const columns = hookBody?.columns || body?.columns;
-    const metaColumns = await getMeta({
-        pg,
-        table: tableName,
-    }).then((el) => el?.columns || []);
+    const metaColumns = tableName
+        ? await getMeta({
+            pg,
+            table: tableName,
+        }).then((el) => el?.columns || [])
+        : [];
     const { name: columnName } = (columns || []).find((col) => col?.name === column) ||
         (metaColumns || []).find((col) => col?.name === column) ||
         {};
@@ -154,16 +145,10 @@ export default async function suggest(req, reply) {
     //   hookBody?.filters ||
     //   (body ? await getFilter({ pg, table }).then((el) => el.list) : null);
     if (table && (!column || !columnName)) {
-        return reply.status(400).send({
-            error: "param name is invalid: 2",
-            code: 400,
-        });
+        throw BadRequestError("param name is invalid: 2");
     }
     if (!meta) {
-        return reply.status(404).send({
-            error: "Not found query select",
-            code: 404,
-        });
+        throw NotFoundError("Not found query select");
     }
     if (query.meta) {
         return meta;

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

@@ -1,4 +1,3 @@
-import type { FastifyReply } from "fastify";
 import type { ExtendedPG } from "../../../types/core.js";
 export default function tableInfo({ pg, params, query, user, }: {
     pg: ExtendedPG;
@@ -11,5 +10,5 @@ export default function tableInfo({ pg, params, query, user, }: {
         sql?: any;
     };
     user?: Record<string, any>;
-}, reply: FastifyReply): Promise<{}>;
+}): Promise<{}>;
 //# sourceMappingURL=tableInfo.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"tableInfo.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/tableInfo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAU5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,wBAA8B,SAAS,CACrC,EACE,EAAqB,EACrB,MAAM,EACN,KAAU,EACV,IAAS,GACV,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACtD,KAAK,EAAE;QAAE,GAAG,CAAC,EAAE,GAAG,CAAA;KAAE,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC5B,EACD,KAAK,EAAE,YAAY,eAiLpB"}
+{"version":3,"file":"tableInfo.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/tableInfo.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAOzD,wBAA8B,SAAS,CAAC,EACtC,EAAqB,EACrB,MAAM,EACN,KAAU,EACV,IAAS,GACV,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACtD,KAAK,EAAE;QAAE,GAAG,CAAC,EAAE,GAAG,CAAA;KAAE,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC5B,eAgLA"}

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

@@ -1,31 +1,32 @@
 import { getTemplate, getMeta, metaFormat, applyHook, handlebars, pgClients, } from "../../../../utils.js";
-export default async function tableInfo({ pg = pgClients.client, params, query = {}, user = {}, }, reply) {
+import { BadRequestError, NotFoundError, UnauthorizedError, } from "../../../../errors.js";
+export default async function tableInfo({ pg = pgClients.client, params, query = {}, user = {}, }) {
     const time = Date.now();
     const { uid } = user;
     if (!uid) {
-        return reply.status(403).send("access restricted: uid");
+        throw UnauthorizedError("unauthorized");
     }
     if (!params?.id || !params?.table) {
-        return reply.status(400).send("not enougn params");
+        throw BadRequestError("not enough params");
     }
     const loadTable = await getTemplate("table", params.table);
     if (!loadTable) {
-        return reply.status(404).send("template not found");
+        throw NotFoundError("template not found");
     }
     const { table, columns = [], sql, cardSql, filters, form, meta, public: ispublic, } = loadTable;
     if (!meta?.info) {
-        return reply.status(400).send("empty meta info");
+        throw BadRequestError("empty meta info");
     }
     const tableMeta = await getMeta({ pg, table });
     if (tableMeta?.view) {
         if (!loadTable?.key) {
-            return reply.status(404).send(`key not found: ${table}`);
+            throw NotFoundError(`key not found: ${table}`);
         }
         Object.assign(tableMeta, { pk: loadTable?.key });
     }
     const { pk } = tableMeta || {};
     if (!pk) {
-        return reply.status(404).send(`table not found: ${table}`);
+        throw NotFoundError(`table not found: ${table}`);
     }
     const sqlTable = sql
         ?.filter?.((el) => !el?.disabled && el?.sql?.replace)
@@ -56,7 +57,7 @@ export default async function tableInfo({ pg = pgClients.client, params, query =
         .filter((el) => columnList.includes(el))
         .map((el) => `"${el}"`);
     if (!metaInfoCols.length) {
-        return reply.status(400).send("invalid meta info: columns not found");
+        throw BadRequestError("invalid meta info: columns not found");
     }
     const q = `select  ${pk ? `"${pk}" as id,` : ""} 
                         ${metaInfoCols.join(",")} 

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

@@ -1 +1 @@
-{"version":3,"file":"tokenInfo.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/tokenInfo.ts"],"names":[],"mappings":"AAEA,wBAA8B,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAW3D"}
+{"version":3,"file":"tokenInfo.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/tokenInfo.ts"],"names":[],"mappings":"AAGA,wBAA8B,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAW3D"}

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

@@ -1,8 +1,9 @@
+import { ForbiddenError } from "../../../../errors.js";
 import { getOpt, getToken } from "../../../../utils.js";
 export default async function tokenInfo(req, reply) {
     const { params = {}, user } = req;
     if (user.user_type !== "admin") {
-        return reply.status(403).send("access restricted");
+        throw ForbiddenError("access restricted");
     }
     const tokenData = (await getToken({ uid: user.uid, token: params.token })) ||
         (await getOpt(params.token, user.uid));

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;AAkFzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,KAAK,EACL,EAAE,EACF,OAAY,EACZ,KAAU,EACV,IAAS,EACT,YAAY,EACZ,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,gBAAgB,EAC7B,OAAO,EAAE,YAAY,EACrB,QAAgB,GACjB,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,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;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,EACD,MAAM,CAAC,EAAE,YAAY,EACrB,MAAM,CAAC,EAAE,GAAG,gBA23Bb"}
+{"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;AAwFzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,KAAK,EACL,EAAE,EACF,OAAY,EACZ,KAAU,EACV,IAAS,EACT,YAAY,EACZ,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,gBAAgB,EAC7B,OAAO,EAAE,YAAY,EACrB,QAAgB,GACjB,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,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;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,EACD,MAAM,CAAC,EAAE,YAAY,EACrB,MAAM,CAAC,EAAE,GAAG,gBAq3Bb"}

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

@@ -19,6 +19,7 @@ import extraDataGet from "../../../plugins/extra/extraDataGet.js";
 import locales from "../controllers/utils/locales.js";
 import conditions from "../controllers/utils/conditions.js";
 import { resources } from "../../../plugins/access/funcs/getResources.js";
+import { BadRequestError, ForbiddenError, NotFoundError, UnauthorizedError, } from "../../../../errors.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",
@@ -62,9 +63,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
     const checkQuery = (item) => user?.user_type === "superadmin" ? !item.includes("{{uid}}") : true;
     const paramsTable = params?.table || table;
     if (!paramsTable) {
-        return reply
-            .status(400)
-            .send({ error: "not enough params: table", code: 400 });
+        throw BadRequestError("not enough params: table");
     }
     const hookData = (await applyHook("preData", {
         pg,
@@ -72,11 +71,12 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         id: params?.id || id,
         user,
     }));
+    // hooks should throw custom errors instead, this is temp solution to avoid breaking changes in hooks
     if (hookData?.message && hookData?.status) {
-        const response = hookData.status >= 400
-            ? { error: hookData.message, code: hookData.status }
-            : hookData.message;
-        return reply.status(hookData.status).send(response);
+        if (hookData.status >= 400) {
+            throw new Error(hookData.message);
+        }
+        return hookData.message;
     }
     /* from tableData START */
     const tokenData1 = await getOpt(paramsTable, uid);
@@ -126,15 +126,18 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
     if (query?.sql === "0")
         return loadTable;
     if (!pg) {
-        return reply.status(500).send("empty pg");
+        throw Error("empty pg");
     }
     const pkey = pg.pk?.[resources[paramsTable] || paramsTable] ||
         pg.pk?.[resources[paramsTable] || paramsTable.replace(/"/g, "")] ||
-        (await getMeta({ pg, table: resources[paramsTable] || paramsTable }))?.pk;
+        (await getMeta({
+            pg,
+            table: resources[paramsTable] || loadTable?.table || paramsTable,
+        }))?.pk;
     if (!loadTable &&
         !(tokenData?.table && pg.pk?.[tokenData?.table]) &&
         !(called && pkey)) {
-        return reply.status(404).send("template not found");
+        throw NotFoundError("template not found");
     }
     const objectId = tokenData?.id || hookData?.id || params?.id || id;
     const { actions = [], query: accessQuery, message: accessMessage, } = actionsParam
@@ -151,10 +154,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
             method,
         }, pg)) || {};
     if (accessMessage) {
-        return reply.status(403).send({
-            error: accessMessage,
-            code: 403,
-        });
+        throw ForbiddenError(accessMessage);
     }
     // const body = loadTable || hookData || tokenData;
     const { table: table1, columns = [], sql, cardSql, form, meta, sqlColumns, editable = false, } = loadTable || hookData || tokenData || params || { table };
@@ -168,10 +168,10 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         !called &&
         !accessQueryParam &&
         !actionsParam) {
-        return reply.status(401).send({ error: "unauthorized", code: 401 });
+        throw UnauthorizedError("unauthorized");
     }
     if (!ispublic && !actions.includes("view") && !config?.local && !called) {
-        return reply.status(403).send({ error: "access restricted", code: 403 });
+        throw ForbiddenError("access restricted");
     }
     const { list: filters = [] } = objectId
         ? {}
@@ -185,9 +185,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
     timeArr.push(Date.now());
     if (tableMeta?.view) {
         if (!loadTable?.key && !tokenData?.key) {
-            return reply
-                .status(404)
-                .send({ error: `key  not found: ${table1}`, code: 404 });
+            throw NotFoundError(`key  not found: ${table1}`);
         }
         Object.assign(tableMeta, { pk: loadTable?.key || tokenData?.key });
     }
@@ -204,9 +202,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         Object.assign(col, locales[`${table1 || paramsTable}.${col.name}`] || {});
     });
     if (!pk) {
-        return reply
-            .status(404)
-            .send({ error: `table not found: ${table1}`, code: 404 });
+        throw NotFoundError(`table not found: ${table1}`);
     }
     const columnList = dbColumns.map((el) => el.name || el).join(",");
     const sqlTable = sql
@@ -371,9 +367,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
     if (!rows.length &&
         headers?.referer?.includes?.("/card/") &&
         headers?.referer?.includes?.(templateName)) {
-        return reply
-            .status(403)
-            .send({ error: "access restricted: empty rows", code: 403 });
+        throw ForbiddenError("access restricted: empty rows");
     }
     timeArr.push(Date.now());
     if (uid &&

package/dist/server/routes/table/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/table/index.ts"],"names":[],"mappings":"AA+BA,iBAAS,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,GAAE,GAAQ,QA4EtC;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/table/index.ts"],"names":[],"mappings":"AAgCA,iBAAS,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,GAAE,GAAQ,QAiFtC;AAED,eAAe,MAAM,CAAC"}

package/dist/server/routes/table/index.js

@@ -14,12 +14,14 @@ import form from "./controllers/getFormByTable.js";
 import loadTemplatePath from "../../plugins/table/funcs/loadTemplatePath.js";
 import { tableDataSchema, tableSchema, searchSchema, suggestSchema, formSchema, filterSchema, cardTabDataSchema, tableDataIdSchema, } from "./schema.js";
 const policy = "L0";
+const tags = ["core", "table"];
 function plugin(app, opt = {}) {
-    app.get("/token-info/:token", { config: { role: "admin" } }, tokenInfo);
-    app.get("/table-filter/:table", { config: { policy }, schema: filterSchema }, filter);
-    app.get("/table-info/:table/:id?", { config: { policy }, schema: tableDataSchema }, tableInfo);
+    app.get("/token-info/:token", { config: { tags, role: "admin" } }, tokenInfo);
+    app.get("/table-filter/:table", { config: { tags, policy }, schema: filterSchema }, filter);
+    app.get("/table-info/:table/:id?", { config: { tags, policy }, schema: tableDataSchema }, tableInfo);
     app.get("/suggest/:data", {
         config: {
+            tags,
             policy,
             rateLimit: config.rateLimit
                 ? {
@@ -30,15 +32,15 @@ function plugin(app, opt = {}) {
         },
         schema: suggestSchema,
     }, suggest);
-    app.get("/data/:table/:id?", { config: { policy }, schema: tableSchema }, data);
-    app.get("/table-data/:table", { config: { auth: "creds", policy: "L2" }, schema: tableDataSchema }, data);
-    app.get("/table-data/:table/:id", { config: { policy }, schema: tableDataIdSchema }, cardData);
-    app.get("/data-info/:id?", { config: { policy }, schema: tableSchema }, dataInfo);
-    app.get("/card-data/:token", { config: { policy }, scheme: cardTabDataSchema }, cardTabData);
-    app.get("/card/:table/:id", { config: { policy }, schema: tableSchema }, card);
-    app.get("/search", { config: { policy }, schema: searchSchema }, search);
-    app.get("/templates", () => loadTemplatePath);
-    app.get("/filter/:table", { config: { policy }, schema: filterSchema }, filter);
-    app.get("/form/:name/:id?", { config: { auth: "creds", policy: "L2" }, schema: formSchema }, form);
+    app.get("/data/:table/:id?", { config: { tags, policy }, schema: tableSchema }, data);
+    app.get("/table-data/:table", { config: { tags, auth: "creds", policy: "L2" }, schema: tableDataSchema }, data);
+    app.get("/table-data/:table/:id", { config: { tags, policy }, schema: tableDataIdSchema }, cardData);
+    app.get("/data-info/:id?", { config: { tags, policy }, schema: tableSchema }, dataInfo);
+    app.get("/card-data/:token", { config: { tags, policy }, schema: cardTabDataSchema }, cardTabData);
+    app.get("/card/:table/:id", { config: { tags, policy }, schema: tableSchema }, card);
+    app.get("/search", { config: { tags, policy }, schema: searchSchema }, search);
+    app.get("/templates", { config: { tags } }, () => loadTemplatePath);
+    app.get("/filter/:table", { config: { tags, policy }, schema: filterSchema }, filter);
+    app.get("/form/:name/:id?", { config: { tags, auth: "creds", policy: "L2" }, schema: formSchema }, form);
 }
 export default plugin;

package/dist/server/routes/templates/controllers/getTemplate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getTemplate.d.ts","sourceRoot":"","sources":["../../../../../server/routes/templates/controllers/getTemplate.ts"],"names":[],"mappings":"AAyCA,wBAA8B,cAAc,CAAC,GAAG,EAAE,GAAG,gBAgDpD"}
+{"version":3,"file":"getTemplate.d.ts","sourceRoot":"","sources":["../../../../../server/routes/templates/controllers/getTemplate.ts"],"names":[],"mappings":"AAyCA,wBAA8B,cAAc,CAAC,GAAG,EAAE,GAAG,gBAsDpD"}

package/dist/server/routes/templates/controllers/getTemplate.js

@@ -32,17 +32,21 @@ function formatSchema(schema, user, opt) {
         .forEach(parseDataTables);
 }
 export default async function getTemplateApi(req) {
-    const { user } = req || {};
-    const { params = {} } = req;
-    const { type, name } = params;
+    const { params, user } = req || {};
+    const { type, name } = params || {};
     const tokenData = (await getToken({ token: name, uid: user?.uid, json: 1 })) || {};
     const hookData = (await applyHook("preTemplate", {
         name: tokenData.name || name,
         type,
         user,
     }));
-    if (hookData?.message && hookData?.status)
-        return hookData;
+    // hooks should throw custom errors instead, this is temp solution to avoid breaking changes in hooks
+    if (hookData?.message && hookData?.status) {
+        if (hookData.status >= 400) {
+            throw new Error(hookData.message);
+        }
+        return hookData.message;
+    }
     const data = await getTemplate(type, hookData?.name || tokenData.form || name);
     if (data && tokenData.obj) {
         const obj = tokenData.obj.split("#").reduce((p, el) => ({

package/dist/server/routes/templates/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/templates/index.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,GAAE,GAAQ,QAMpD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/templates/index.ts"],"names":[],"mappings":"AAOA,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,GAAE,GAAQ,QAMpD"}

package/dist/server/routes/templates/index.js

@@ -1,6 +1,7 @@
 import getTemplateApi from "./controllers/getTemplate.js";
 import { getTemplateSchema } from "./schema.js";
 const policy = "L0";
+const tags = ["core", "templates"];
 export default function route(app, opt = {}) {
-    app.get("/template/:type/:name", { config: { policy }, schema: getTemplateSchema }, getTemplateApi);
+    app.get("/template/:type/:name", { config: { tags, policy }, schema: getTemplateSchema }, getTemplateApi);
 }

package/dist/server/routes/upload/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/upload/index.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,GAAG,EAAE,GAAG,QAwFtC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/upload/index.ts"],"names":[],"mappings":"AAaA,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,GAAG,EAAE,GAAG,QAmGtC"}