@opengis/fastify-table 2.0.106 → 2.0.107

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

@@ -1,14 +1,17 @@
-import { getTemplate, getMeta, metaFormat, getAccess, applyHook, } from "../../../../utils.js";
-export default async function card(req) {
+import { getTemplate, getMeta, metaFormat, getAccess, applyHook, pgClients, } from "../../../../utils.js";
+export default async function card(req, reply) {
     const time = Date.now();
-    const { pg, user, params = {}, query = {} } = req;
+    const { pg = pgClients.client, user, params = {}, query = {} } = req;
     const hookData = (await applyHook("preCard", {
         table: params?.table,
         id: params?.id,
         user,
     }));
     if (hookData?.message && hookData?.status) {
-        return { message: hookData?.message, status: hookData?.status };
+        const response = hookData.status >= 400
+            ? { error: hookData.message, code: hookData.status }
+            : hookData.message;
+        return reply.status(hookData.status).send(response);
     }
     const { actions = [], scope, my, } = (await getAccess({
         table: hookData?.table || params.table,
@@ -16,16 +19,17 @@ export default async function card(req) {
         user,
     })) || {};
     if (!actions.includes("view") || (scope === "my" && !my)) {
-        return { message: "access restricted", status: 403 };
+        return reply.status(403).send({ error: "access restricted", code: 403 });
     }
     const loadTable = await getTemplate("table", hookData?.table || params.table);
     if (!loadTable) {
-        return { message: "template not found", status: 404 };
+        return reply.status(404).send({ error: "table not found", code: 404 });
     }
     const { table, columns, meta, sql, cardSql } = loadTable;
     const { pk, columns: dbColumns = [] } = await getMeta(table);
-    if (!pk)
-        return { message: `table not found: ${table}`, status: 404 };
+    if (!pk) {
+        return reply.status(404).send({ error: "table pk not found", code: 404 });
+    }
     const cols = columns.map((el) => el.name || el).join(",");
     const sqlTable = sql
         ?.filter?.((el) => !el?.disabled && el?.sql?.replace)
@@ -50,7 +54,9 @@ export default async function card(req) {
     if (query.sql === "1") {
         return q;
     }
-    const { rows } = await pg.query(q, [hookData?.id || params.id]);
+    const rows = await pg
+        .query(q, [hookData?.id || params.id])
+        .then((el) => el.rows || []);
     await metaFormat({ rows, table: hookData?.table || params.table });
     const data = meta?.card?.length
         ? meta.card

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

@@ -5,7 +5,7 @@ interface IFilter {
     inline?: any[] | undefined;
     state?: any[] | undefined;
 }
-export default function filterAPI(req: any, reply: any, iscalled: any): Promise<IFilter | {
+export default function filterAPI(req: any, reply: any, iscalled: number | boolean | undefined | null): Promise<IFilter | {
     message: string;
     status: number;
 } | string | any>;

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":"AAWA,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,GAAG,GACZ,OAAO,CAAC,OAAO,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,GAAG,GAAG,CAAC,CA6RvE"}
+{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/filter.ts"],"names":[],"mappings":"AAWA,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,CA6RvE"}

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

@@ -17,13 +17,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 { status: 404, message: "not found" };
+        return reply.status(404).send({ error: "table not found", code: 404 });
     }
     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 { status: 404, message: "table not found" };
+        return reply.status(404).send({ error: "table pk not found", code: 404 });
     }
     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): Promise<{}>;
+export default function formFunction(req: any, reply: any): Promise<any>;
 //# 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,eA6ClD"}
+{"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"}

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

@@ -1,4 +1,4 @@
-import { applyHook, getTemplate } from "../../../../utils.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`;
 async function getSettings({ pg }) {
@@ -8,19 +8,22 @@ async function getSettings({ pg }) {
     const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.key]: curr.json || curr.int || curr.text }), {});
     return data;
 }
-export default async function formFunction(req) {
+export default async function formFunction(req, reply) {
     const time = Date.now();
-    const { pg, params, user } = req;
+    const { pg = pgClients.client, params, user } = req;
     const hookData = (await applyHook("preForm", {
         form: params?.name,
         user,
     }));
     if (hookData?.message && hookData?.status) {
-        return { message: hookData?.message, status: hookData?.status };
+        const response = hookData.status >= 400
+            ? { error: hookData.message, code: hookData.status }
+            : hookData.message;
+        return reply.status(hookData.status).send(response);
     }
     const form = await getTemplate("form", hookData?.form || params?.name);
     if (!form) {
-        return { status: 404, message: "not found" };
+        return reply.status(404).send({ error: "form not found", code: 404 });
     }
     // replace settings
     const arr = JSON.stringify(form).match(/{{settings.([^}]*)}}/g);

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

@@ -1,4 +1,4 @@
-export default function search({ pg, funcs, query }: any): Promise<string | {
+export default function search({ pg, query, }: any): Promise<string | {
     time: number;
     total: number;
     filtered: number;

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

@@ -1 +1 @@
-{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/search.ts"],"names":[],"mappings":"AA6HA,wBAA8B,MAAM,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAU,EAAE,EAAE,GAAG;;;;;;GAoClE"}
+{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/search.ts"],"names":[],"mappings":"AAoIA,wBAA8B,MAAM,CAAC,EACnC,EAAqB,EACrB,KAAU,GACX,EAAE,GAAG;;;;;;GAmCL"}

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

@@ -1,19 +1,19 @@
-import { getMeta, metaFormat, getTemplates, getTemplate, handlebarsSync, } from "../../../../utils.js";
+import { getMeta, metaFormat, getTemplates, getTemplate, handlebarsSync, pgClients, } from "../../../../utils.js";
 function sequence(tables, data, fn) {
     return tables.reduce((promise, table) => promise.then(() => fn({
         ...data,
         tableName: table.replace(".json", ""),
     })), Promise.resolve());
 }
-async function getData({ pg, tableName, query = {}, maxLimit, res }) {
+async function getData({ pg = pgClients.client, tableName, query = {}, maxLimit, res, }) {
     const loadTable = await getTemplate("table", tableName);
     if (!loadTable) {
-        return { message: "not found", status: 404 };
+        return null;
     }
     const { table, columns, meta } = loadTable;
     const { pk, view } = await getMeta({ pg, table });
     if (!pk && !view) {
-        return { message: "table not found", status: 404 };
+        return null;
     }
     const cols = columns.map((el) => el.name || el).join(",");
     const [orderColumn, orderDir] = (query.order || loadTable.order || "").split("-");
@@ -72,7 +72,7 @@ async function getData({ pg, tableName, query = {}, maxLimit, res }) {
     });
     return null;
 }
-export default async function search({ pg, funcs, query = {} }) {
+export default async function search({ pg = pgClients.client, query = {}, }) {
     const t1 = Date.now();
     const tables = query.table
         ? [query.table]
@@ -86,7 +86,6 @@ export default async function search({ pg, funcs, query = {} }) {
     const maxLimit = Math.min(100, query.limit || "16");
     await sequence(tables, {
         pg,
-        funcs,
         query,
         maxLimit,
         res,

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"suggest.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/suggest.ts"],"names":[],"mappings":"AAoEA,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,gBA6V7C"}
+{"version":3,"file":"suggest.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/suggest.ts"],"names":[],"mappings":"AA+DA,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAmXzD"}

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

@@ -1,12 +1,7 @@
 import path from "node:path";
 import { existsSync, readFileSync } from "node:fs";
 import { config, getPG, getTemplate, getSelectMeta, getMeta, applyHook, getSelectVal, logger, getSelect, metaFormat, getColumnCLS, } from "../../../../utils.js";
-const limit = 50;
-const headers = {
-    "Access-Control-Allow-Origin": "*",
-    "Access-Control-Allow-Methods": "GET",
-    "Cache-Control": "no-cache",
-};
+const defaultLimit = 50;
 async function getTableColumnMeta({ table, column, filtered, startsWith, key, pg, }) {
     if (!table || !column) {
         return null;
@@ -16,7 +11,7 @@ async function getTableColumnMeta({ table, column, filtered, startsWith, key, pg
     const { arr } = (await getSelect(clsName, pg)) || {};
     const original = filtered
         ? `with c(id,text) as (select ${column} as id, ${column} as text from ${loadTable?.table || table} group by ${column}) select id, text from c`
-        : `with c(id,text) as (select ${column}  as id, ${column} as text, count(*) from ${loadTable?.table || table} group by ${column} limit ${limit}) select * from c`;
+        : `with c(id,text) as (select ${column}  as id, ${column} as text, count(*) from ${loadTable?.table || table} group by ${column} limit ${defaultLimit}) select * from c`;
     return {
         arr,
         original,
@@ -26,7 +21,7 @@ async function getTableColumnMeta({ table, column, filtered, startsWith, key, pg
         pk: "id",
     };
 }
-export default async function suggest(req) {
+export default async function suggest(req, reply) {
     const { params, query, pg: pg1, user } = req;
     const lang = query.lang || "ua";
     const time = Date.now();
@@ -42,8 +37,12 @@ export default async function suggest(req) {
         ? params.data.split(":")
         : [query.token, query.column];
     const selectName = query.sel || params.data;
-    if (!selectName)
-        return { status: 400, message: "name is required" };
+    if (!selectName) {
+        return reply.status(400).send({
+            error: "name is required",
+            code: 400,
+        });
+    }
     const { body: hookBody } = table || query.token
         ? (await applyHook("preSuggest", {
             pg: pg1,
@@ -53,17 +52,26 @@ export default async function suggest(req) {
     const body = await getTemplate("table", table || query.token);
     const tableName = hookBody?.table || body?.table || table || query.token;
     if (table && !pg1.pk?.[tableName]) {
-        return { status: 400, message: "param name is invalid: 1" };
+        return reply.status(400).send({
+            error: "param name is invalid: 1",
+            code: 400,
+        });
     }
     const tableMeta = await getMeta({ pg: pg1, table: tableName });
     const columnExists = (hookBody?.columns ||
         body?.columns ||
         tableMeta?.columns)?.find((col) => col?.name === (column || query.column));
     if (table && (!column || !columnExists)) {
-        return { status: 400, message: "param name is invalid: 2" };
+        return reply.status(400).send({
+            error: "param name is invalid: 2",
+            code: 400,
+        });
     }
     if (query.limit && query.limit < 0) {
-        return { status: 400, message: "param limit is invalid" };
+        return reply.status(400).send({
+            error: "param limit is invalid",
+            code: 400,
+        });
     }
     const meta = tableName && column
         ? await getTableColumnMeta({
@@ -83,11 +91,18 @@ export default async function suggest(req) {
             pg: pg1,
         });
     if (meta?.minLength && query.key && query.key.length < meta?.minLength) {
-        return { message: `min length: ${meta.minLength}` };
+        return reply.status(400).send({
+            error: `min length: ${meta.minLength}`,
+            code: 400,
+        });
     }
+    const limit = meta?.limit || defaultLimit;
     const pg = meta?.db ? getPG(meta.db) : pg1;
     if (!meta) {
-        return { headers, status: 404, message: "Not found query select " };
+        return reply.status(404).send({
+            error: "Not found query select",
+            code: 404,
+        });
     }
     if (query.meta) {
         return meta;

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

@@ -17,5 +17,5 @@ export default function dataAPI({ pg, params, table, id, headers, query, user, c
     filterList?: any[];
     actions?: string[];
     columns?: string[];
-}, reply: FastifyReply, called?: any): Promise<any>;
+}, reply1?: FastifyReply, called?: any): Promise<any>;
 //# sourceMappingURL=getData.d.ts.map

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;AA4DzD,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,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,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,EACD,KAAK,EAAE,YAAY,EACnB,MAAM,CAAC,EAAE,GAAG,gBAi0Bb"}
+{"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,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,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,EACD,MAAM,CAAC,EAAE,YAAY,EACrB,MAAM,CAAC,EAAE,GAAG,gBA+0Bb"}

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

@@ -22,6 +22,19 @@ 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",
 };
+const mockReply = {
+    response: {},
+    // redirect: (txt) => txt,
+    redirect: (txt) => Object.assign(mockReply.response, {
+        body: txt,
+        statusCode: mockReply.response.statusCode || 200,
+    }),
+    status: (statusCode) => {
+        Object.assign(mockReply.response, { status: statusCode });
+        return mockReply;
+    },
+    send: (txt) => Object.assign(mockReply.response, txt),
+};
 function getOrder(queryOrder, queryDesc, defaultOrder, columnList, iscalled = false) {
     if (iscalled && queryOrder) {
         return `order by ${queryOrder}`;
@@ -39,14 +52,17 @@ function getOrder(queryOrder, queryDesc, defaultOrder, columnList, iscalled = fa
 const checkInline = {};
 const maxLimit = 100;
 const defaultLimit = 20;
-export default async function dataAPI({ pg = pgClients.client, params, table, id, headers = {}, query = {}, user = {}, contextQuery, sufix = true, filterList, actions: actionsParam, columns: columnsParam, }, reply, called) {
+export default async function dataAPI({ pg = pgClients.client, params, table, id, headers = {}, query = {}, user = {}, contextQuery, sufix = true, filterList, actions: actionsParam, columns: columnsParam, }, reply1, called) {
     const time = Date.now();
     const timeArr = [Date.now()];
     const { uid } = user;
+    const reply = reply1 || mockReply;
     const checkQuery = (item) => user?.user_type === "superadmin" ? !item.includes("{{uid}}") : true;
     const paramsTable = params?.table || table;
     if (!paramsTable) {
-        return { message: "not enough params: table", status: 400 };
+        return reply
+            .status(400)
+            .send({ error: "not enough params: table", code: 400 });
     }
     const hookData = (await applyHook("preData", {
         pg,
@@ -55,7 +71,10 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         user,
     }));
     if (hookData?.message && hookData?.status) {
-        return { message: hookData?.message, status: hookData?.status };
+        const response = hookData.status >= 400
+            ? { error: hookData.message, code: hookData.status }
+            : hookData.message;
+        return reply.status(hookData.status).send(response);
     }
     /* from tableData START */
     const tokenData1 = await getOpt(paramsTable, uid);
@@ -96,7 +115,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
     else if (checkInline[paramsTable]) {
         loadTable.sql = checkInline[paramsTable];
     }
-    if (query.sql === "0")
+    if (query?.sql === "0")
         return loadTable;
     if (!pg) {
         return reply.status(500).send("empty pg");
@@ -143,8 +162,11 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
     const viewSql = await getTemplate("view", table1);
     timeArr.push(Date.now());
     if (tableMeta?.view) {
-        if (!loadTable?.key && !tokenData?.key)
-            return { message: `key not found: ${table1}`, status: 404 };
+        if (!loadTable?.key && !tokenData?.key) {
+            return reply
+                .status(404)
+                .send({ error: `key  not found: ${table1}`, code: 404 });
+        }
         Object.assign(tableMeta, { pk: loadTable?.key || tokenData?.key });
     }
     const { pk, columns: dbColumns = [] } = (viewSql
@@ -160,7 +182,9 @@ 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(`table not found: ${table1}`);
+        return reply
+            .status(404)
+            .send({ error: `table not found: ${table1}`, code: 404 });
     }
     const columnList = dbColumns.map((el) => el.name || el).join(",");
     const sqlTable = sql
@@ -200,57 +224,57 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
             pg,
             layer: paramsTable,
             column: objectId,
-            sql: query.sql,
-            filter: query.filter,
-            search: query.search,
-            state: query.state,
-            custom: query.custom,
+            sql: query?.sql,
+            filter: query?.filter,
+            search: query?.search,
+            state: query?.state,
+            custom: query?.custom,
         });
     }
     const isdefault = !objectId ? filters.find((el) => el.default) : null;
     const checkFilter = [
-        query.filter,
-        query.search,
-        query.state,
-        query.custom,
+        query?.filter,
+        query?.search,
+        query?.state,
+        query?.custom,
         isdefault,
     ].filter(Boolean).length;
     const fData = checkFilter
         ? await getFilterSQL({
             pg,
             table: loadTable ? paramsTable : table1,
-            filter: query.filter,
-            search: query.search,
-            state: query.state,
-            custom: query.custom,
+            filter: query?.filter,
+            search: query?.search,
+            state: query?.state,
+            custom: query?.custom,
             uid,
             objectId,
             filterList,
         })
         : {};
     timeArr.push(Date.now());
-    const keyQuery = query.key && (loadTable?.key || tokenData?.key) && !objectId
+    const keyQuery = query?.key && (loadTable?.key || tokenData?.key) && !objectId
         ? `${loadTable?.key || tokenData?.key}=$1`
         : null;
     const limit = (called
-        ? query.limit || defaultLimit
-        : Math.min(maxLimit, +(query.limit || defaultLimit))) || defaultLimit;
-    const offset = query.page && query.page > 0 && !objectId
-        ? ` offset ${(query.page - 1) * limit}`
+        ? query?.limit || defaultLimit
+        : Math.min(maxLimit, +(query?.limit || defaultLimit))) || defaultLimit;
+    const offset = query?.page && query?.page > 0 && !objectId
+        ? ` offset ${(query?.page - 1) * limit}`
         : "";
-    const order = getOrder(query.order, query.desc, loadTable?.order, columnList, !!called);
+    const order = getOrder(query?.order, query?.desc, loadTable?.order, columnList, !!called);
     if (config.trace)
         console.log(order);
-    const search = loadTable?.meta?.search && query.search
+    const search = loadTable?.meta?.search && query?.search
         ? `(${loadTable?.meta?.search
             ?.split(",")
-            ?.map((el) => `${el} ilike '%${query.search
+            ?.map((el) => `${el} ilike '%${query?.search
             .replace(/%/g, "\\%")
             .replace(/'/g, "''")}%'`)
             .join(" or ")})`
         : null;
     const queryBbox = query?.bbox
-        ? query.bbox
+        ? query?.bbox
             .replace(/ /g, ",")
             .split(",")
             ?.map((el) => el - 0)
@@ -289,7 +313,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         .filter(Boolean)
         .filter((el) => checkQuery(el));
     const q = `select  ${pk ? `"${pk}" as id,` : ""} 
-                     ${objectId || query.key
+                     ${objectId || query?.key
         ? "*"
         : columnsParam || sqlColumns || cols || "*"} 
                      ${metaCols}
@@ -309,12 +333,12 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
                      ${order} ${offset} limit ${limit}`.replace(/{{uid}}/g, uid);
     if (config.trace)
         console.log(q);
-    if (query.sql === "1") {
+    if (query?.sql === "1") {
         return q;
     }
     const { rows = [] } = await pg
         .query(q, (objectId ? [objectId] : null) ||
-        (query.key && loadTable.key ? [query.key] : []))
+        (query?.key && loadTable.key ? [query?.key] : []))
         .catch((err) => {
         console.error(err.toString());
         throw err;
@@ -322,7 +346,9 @@ 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("access restricted: empty rows");
+        return reply
+            .status(403)
+            .send({ error: "access restricted: empty rows", code: 403 });
     }
     timeArr.push(Date.now());
     if (uid &&
@@ -385,7 +411,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         .filter(Boolean)
         .filter((el) => checkQuery(el))
         .join(" and ") || "true"} `.replace(/{{uid}}/g, uid);
-    if (query.sql === "2") {
+    if (query?.sql === "2") {
         return qCount;
     }
     const counts = keyQuery || objectId

package/dist/server/types/core.d.ts

@@ -4,6 +4,13 @@ import { Pool } from "pg";
 declare let Database: any;
 export interface ExtendedPG extends Pool {
     readonly?: any;
+    connect: any;
+    query: any;
+    database: string;
+    host: string;
+    user: string;
+    password: string;
+    port: number;
     init?: () => void;
     connectionAttempt: number;
     pk?: Record<string, string>;

package/dist/server/types/core.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../server/types/core.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AACpE,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAM1B,QAAA,IAAI,QAAQ,EAAE,GAAG,CAAC;AAUlB,MAAM,WAAW,UAAW,SAAQ,IAAI;IACtC,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,IAAI,CAAC;IAClB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,EAAE,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,GAAG,CAAC;CACjE;AAYD,MAAM,WAAW,YAAY;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,eAAgB,SAAQ,oBAAoB;IAC3D,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,eAAgB,SAAQ,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC;IACnE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,OAAO,EAAE,eAAe,CAAC;IACzB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,KAAK,EAAE,GAAG,CAAC;IACX,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,YAAY,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG;QAC7C,MAAM,EAAE,0BAA0B,CAAC;KACpC,CAAC;CACH;AAED,MAAM,WAAW,cAAe,SAAQ,YAAY,CAAC,OAAO,QAAQ,CAAC;IACnE,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC5B,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,0BAA2B,SAAQ,oBAAoB;IACtE,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB"}
+{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../server/types/core.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "2.0.106",
+  "version": "2.0.107",
   "type": "module",
   "description": "core-plugins",
   "keywords": [
@@ -23,12 +23,12 @@
   "scripts": {
     "prepublishOnly": "npm run build",
     "clean": "tsc -b --clean",
-    "build": "tsc -b --clean && tsc && copyfiles server/plugins/grpc/utils/*.proto dist && copyfiles server/migrations/*.sql dist && copyfiles server/templates/**/*.html dist && copyfiles server/templates/**/*.hbs dist",
+    "build": "tsc -b --clean && tsc && copyfiles server/plugins/grpc/utils/*.proto dist && copyfiles server/migrations/*.sql dist && copyfiles server/templates/**/*.html dist && copyfiles server/templates/**/*.hbs dist && copyfiles script/* dist",
     "prod": "NODE_ENV=production bun dist/server",
     "migrate": "MIGRATE=true bun script/migrate",
     "patch": "npm version patch && git push && npm publish",
     "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
-    "test": "bun test",
+    "test": "npx vitest run",
     "compress": "node compress.js",
     "dev1": "bun --hot dist/server",
     "dev": "NODE_ENV=production bun start",