@opengis/fastify-table 2.3.6 → 2.4.0

package/dist/server/routes/notifications/controllers/userNotifications.js

@@ -1,15 +1,16 @@
 import pgClients from "../../../plugins/pg/pgClients.js";
 import getSelectVal from "../../../plugins/table/funcs/metaFormat/getSelectVal.js";
+import { UnauthorizedError } from "../../../../errors.js";
 const maxLimit = 100;
 const q = `select notification_id as id, subject, body, created_at,
 author_id, read, link, entity_id, (select avatar from admin.users where uid=a.author_id limit 1) as avatar
 from crm.notifications a
 where addressee_id=$1 order by created_at desc limit $2 offset $3`;
-export default async function userNotifications(req, reply) {
+export default async function userNotifications(req) {
     const { pg = pgClients.client, query, user, } = req;
     const t1 = Date.now();
     if (!user?.uid) {
-        return reply.status(401).send({ error: "unauthorized", code: 401 });
+        throw UnauthorizedError("unauthorized");
     }
     const limit = Math.min(maxLimit, +(query.limit || 5));
     const offset = query.page && query.page > 0 ? (query.page - 1) * limit : 0;
@@ -27,7 +28,5 @@ export default async function userNotifications(req, reply) {
             Object.assign(row, { author: vals?.[row.author_id] });
         });
     }
-    return reply
-        .status(200)
-        .send({ time: Date.now() - t1, total: rows.length, rows });
+    return { time: Date.now() - t1, total: rows.length, rows };
 }

package/dist/server/routes/properties/controllers/properties.get.d.ts

@@ -1,4 +1,3 @@
-import type { FastifyReply } from "fastify";
 import type { ExtendedPG } from "../../../types/core.js";
 export default function getAppSettings({ pg, query, params, user, }: {
     pg: ExtendedPG;
@@ -9,5 +8,9 @@ export default function getAppSettings({ pg, query, params, user, }: {
         entity: string;
     };
     user: Record<string, any>;
-}, reply: FastifyReply): Promise<never>;
+}): Promise<{
+    time: number;
+    uid: any;
+    settings: any;
+}>;
 //# sourceMappingURL=properties.get.d.ts.map

package/dist/server/routes/properties/controllers/properties.get.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"properties.get.d.ts","sourceRoot":"","sources":["../../../../../server/routes/properties/controllers/properties.get.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIzD,wBAA8B,cAAc,CAC1C,EACE,EAAqB,EACrB,KAAK,EACL,MAAM,EACN,IAAS,GACV,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,KAAK,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACzB,MAAM,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC3B,EACD,KAAK,EAAE,YAAY,kBA0CpB"}
+{"version":3,"file":"properties.get.d.ts","sourceRoot":"","sources":["../../../../../server/routes/properties/controllers/properties.get.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAKzD,wBAA8B,cAAc,CAAC,EAC3C,EAAqB,EACrB,KAAK,EACL,MAAM,EACN,IAAS,GACV,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,KAAK,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACzB,MAAM,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC3B;;;;GAyCA"}

package/dist/server/routes/properties/controllers/properties.get.js

@@ -1,14 +1,15 @@
 import pgClients from "../../../plugins/pg/pgClients.js";
-export default async function getAppSettings({ pg = pgClients.client, query, params, user = {}, }, reply) {
+import { NotFoundError, UnauthorizedError } from "../../../../errors.js";
+export default async function getAppSettings({ pg = pgClients.client, query, params, user = {}, }) {
     const t1 = Date.now();
     if (!pg) {
-        return reply.status(500).send("empty pg");
+        throw Error("empty pg");
     }
     if (!pg.pk?.["admin.properties"]) {
-        return reply.status(404).send("properties table not found");
+        throw NotFoundError("properties table not found");
     }
     if (params?.entity === "user" && !user.uid) {
-        return reply.status(401).send("unauthorized");
+        throw UnauthorizedError("unauthorized");
     }
     const { uid } = user;
     const args = params?.entity === "user" ? [user.uid] : [params?.entity || "app"];
@@ -19,5 +20,5 @@ export default async function getAppSettings({ pg = pgClients.client, query, par
         ...acc,
         [key]: property_text || property_json,
     }), {});
-    return reply.status(200).send({ time: Date.now() - t1, uid, settings });
+    return { time: Date.now() - t1, uid, settings };
 }

package/dist/server/routes/properties/controllers/properties.post.d.ts

@@ -7,5 +7,5 @@ export default function postAppSettings({ pg, body, user, params, }: {
     params?: {
         entity: string;
     };
-}, reply: FastifyReply): Promise<never>;
+}, reply: FastifyReply): Promise<string>;
 //# sourceMappingURL=properties.post.d.ts.map

package/dist/server/routes/properties/controllers/properties.post.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"properties.post.d.ts","sourceRoot":"","sources":["../../../../../server/routes/properties/controllers/properties.post.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAmBzD,wBAA8B,eAAe,CAC3C,EACE,EAAqB,EACrB,IAAI,EACJ,IAAI,EACJ,MAAM,GACP,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,MAAM,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CAC7B,EACD,KAAK,EAAE,YAAY,kBA0EpB"}
+{"version":3,"file":"properties.post.d.ts","sourceRoot":"","sources":["../../../../../server/routes/properties/controllers/properties.post.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAwBzD,wBAA8B,eAAe,CAC3C,EACE,EAAqB,EACrB,IAAI,EACJ,IAAI,EACJ,MAAM,GACP,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,MAAM,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CAC7B,EACD,KAAK,EAAE,YAAY,mBA0EpB"}

package/dist/server/routes/properties/controllers/properties.post.js

@@ -1,4 +1,5 @@
 import { config, logger, dataInsert, pgClients } from "../../../../utils.js";
+import { BadRequestError, ForbiddenError, NotFoundError, } from "../../../../errors.js";
 function checkValueType(val) {
     if (val && typeof val === "object") {
         return "property_json";
@@ -16,17 +17,17 @@ export default async function postAppSettings({ pg = pgClients.client, body, use
     if ((!params?.entity || params.entity === "app") &&
         !user?.user_type?.includes?.("admin") &&
         !config.local) {
-        return reply.status(403).send("access restricted");
+        throw ForbiddenError("access restricted");
     }
     if (!pg) {
-        return reply.status(500).send("empty pg");
+        throw Error("empty pg");
     }
     if (!pg?.pk?.["admin.properties"]) {
-        return reply.status(404).send("table not found");
+        throw NotFoundError("table not found");
     }
     const { key, val } = body;
     if ((!key || !val) && !Object.keys(body).length) {
-        return reply.status(400).send("not enough body params");
+        throw BadRequestError("not enough body params");
     }
     const keys = Object.keys(body);
     const entity = params?.entity === "user" ? user.uid : params?.entity || "app";
@@ -50,7 +51,7 @@ export default async function postAppSettings({ pg = pgClients.client, body, use
             });
         }));
         await client.query("commit;");
-        return reply.status(200).send("ok");
+        return "ok";
     }
     catch (err) {
         logger.file("properties/error", {
@@ -60,7 +61,7 @@ export default async function postAppSettings({ pg = pgClients.client, body, use
             user,
             entity,
         });
-        return reply.status(500).send(err.toString());
+        throw err;
     }
     finally {
         client.release();

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

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

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":"AAOA,wBAA8B,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAoItD"}
+{"version":3,"file":"card.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/card.ts"],"names":[],"mappings":"AAQA,wBAA8B,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,eAyItD"}

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

@@ -4,6 +4,7 @@ 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";
+import { ForbiddenError, NotFoundError } from "../../../../errors.js";
 export default async function card(req, reply) {
     const time = Date.now();
     const { pg = pgClients.client, user, params = {}, query = {}, method } = req;
@@ -12,11 +13,12 @@ export default async function card(req, reply) {
         id: params?.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;
     }
     const { actions = [], scope, my, message: accessMessage, } = (await getAccess({
         table: hookData?.table || params.table,
@@ -25,16 +27,16 @@ export default async function card(req, reply) {
         method,
     })) || {};
     if (!actions.includes("view") || (scope === "my" && !my)) {
-        return reply.status(403).send({ error: "access restricted", code: 403 });
+        throw ForbiddenError("access restricted");
     }
     const loadTable = await getTemplate("table", hookData?.table || params.table);
     if (!loadTable) {
-        return reply.status(404).send({ error: "table not found", code: 404 });
+        throw NotFoundError("table not found");
     }
     const { table, columns, meta, sql, cardSql } = loadTable;
     const { pk, columns: dbColumns = [] } = await getMeta(table);
     if (!pk) {
-        return reply.status(404).send({ error: "table pk not found", code: 404 });
+        throw NotFoundError("table pkey not found");
     }
     const cols = columns.map((el) => el.name || el).join(",");
     const sqlTable = sql

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":"AAuBA,wBAA8B,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBA8O7D"}
+{"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,gBA4O7D"}

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

@@ -9,6 +9,7 @@ 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";
+import { ForbiddenError } 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",
@@ -24,13 +25,10 @@ export default async function getCardData(req, reply) {
     const template = await getTemplate("card", table);
     const access = (await getAccess({ table, id, user, method }, pg));
     if (access?.message) {
-        return reply.status(403).send({
-            error: access.message,
-            code: 403,
-        });
+        throw ForbiddenError(access.message);
     }
     if (!access?.actions?.length) {
-        return reply.status(403).send("access restricted");
+        throw ForbiddenError("access restricted");
     }
     const tableTemplate = await getTemplate("table", table);
     const index = template?.find((el) => el[0] === "index.yml")?.[1] || {};
@@ -46,7 +44,7 @@ export default async function getCardData(req, reply) {
     if (result?.message)
         return result?.message;
     if (!result?.rows?.length) {
-        return reply.status(403).send("access restricted: empty rows");
+        throw ForbiddenError("access restricted: empty rows");
     }
     const { rows = [] } = result;
     const panels = (index.table && index.query ? index.panels : result?.panels) || [];

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

@@ -1 +1 @@
-{"version":3,"file":"cardTabData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/cardTabData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAW5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,wBAA8B,WAAW,CACvC,EACE,EAAqB,EACrB,KAAU,EACV,MAAW,EACX,IAAS,GACV,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC3B,EACD,KAAK,EAAE,YAAY;;;;;;;;;;GAiEpB"}
+{"version":3,"file":"cardTabData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/cardTabData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAW5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAGzD,wBAA8B,WAAW,CACvC,EACE,EAAqB,EACrB,KAAU,EACV,MAAW,EACX,IAAS,GACV,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC3B,EACD,KAAK,EAAE,YAAY;;;;;;;;;;GAiEpB"}

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

@@ -1,11 +1,12 @@
 import { handlebars, getToken, getTemplate, getMeta, pgClients, } from "../../../../utils.js";
 import getTableData from "./tableData.js";
+import { BadRequestError, ForbiddenError } from "../../../../errors.js";
 export default async function cardTabData({ pg = pgClients.client, query = {}, params = {}, user = {}, }, reply) {
     const { token } = params;
     const { sql } = query;
     const { uid } = user;
     if (!token) {
-        return reply.status(400).send("not enough params: token");
+        throw BadRequestError("not enough params: token");
     }
     const time = Date.now();
     const props = await getToken({
@@ -15,7 +16,7 @@ export default async function cardTabData({ pg = pgClients.client, query = {}, p
         json: 1,
     });
     if (!props || !props?.table) {
-        return reply.status(403).send("token is invalid");
+        throw ForbiddenError("token is invalid");
     }
     const tableTemplate = await getTemplate("table", props.table);
     const { columns = [] } = tableTemplate?.columns || tableTemplate?.colModel

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

@@ -1 +1 @@
-{"version":3,"file":"dataInfo.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/dataInfo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAYzD,wBAA8B,QAAQ,CACpC,EACE,EAAqB,EACrB,MAAW,EACX,KAAU,GACX,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACxB,KAAK,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC3B,EACD,KAAK,EAAE,YAAY;;;;;;;GA0EpB"}
+{"version":3,"file":"dataInfo.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/dataInfo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAazD,wBAA8B,QAAQ,CACpC,EACE,EAAqB,EACrB,MAAW,EACX,KAAU,GACX,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACxB,KAAK,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC3B,EACD,KAAK,EAAE,YAAY;;;;;;;GA0EpB"}

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

@@ -4,6 +4,7 @@ import pgClients from "../../../plugins/pg/pgClients.js";
 import metaFormat from "../../../plugins/table/funcs/metaFormat/index.js";
 import getTemplatePath from "../../../plugins/table/funcs/getTemplatePath.js";
 import yml2json from "../../../plugins/yml/funcs/yml2json.js";
+import { BadRequestError, NotFoundError } from "../../../../errors.js";
 const infoList = [];
 export default async function dataInfo({ pg = pgClients.client, params = {}, query = {}, }, reply) {
     if (!infoList.length) {
@@ -20,10 +21,10 @@ export default async function dataInfo({ pg = pgClients.client, params = {}, que
         ? infoList.filter((el) => el.table === table)
         : infoList;
     if (!filteredList?.length) {
-        return reply.status(404).send("empty info templates list");
+        throw NotFoundError("empty info templates list");
     }
     if (!id) {
-        return reply.status(400).send("not enough params: id");
+        throw BadRequestError("not enough params: id");
     }
     const result = await Promise.all(filteredList
         .filter((el) => el.table && pg.pk?.[el.table])
@@ -49,7 +50,7 @@ export default async function dataInfo({ pg = pgClients.client, params = {}, que
         return null;
     }));
     if (!result[0]?.table) {
-        return reply.status(404).send(`object not found: ${id}`);
+        throw NotFoundError(`object not found: ${id}`);
     }
     await metaFormat(result[0], pg);
     return {

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