@opengis/fastify-table 2.5.43 → 2.5.46

package/dist/server/routes/dictionaries/functions/create.dictionary.item.d.ts

@@ -0,0 +1,13 @@
+/**
+ *
+ * @param {String} id Item ID, optional
+ * @param {String} code Dictionary code (filename)
+ * @param {String} body.code Item code
+ */
+export default function createDictionaryItem({ id, code, body, uid, }: {
+    id: string;
+    code: string;
+    body: Record<string, any>;
+    uid: string;
+}, pg?: any): Promise<any>;
+//# sourceMappingURL=create.dictionary.item.d.ts.map

package/dist/server/routes/dictionaries/functions/create.dictionary.item.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"create.dictionary.item.d.ts","sourceRoot":"","sources":["../../../../../server/routes/dictionaries/functions/create.dictionary.item.ts"],"names":[],"mappings":"AAMA;;;;;GAKG;AAEH,wBAA8B,oBAAoB,CAChD,EACE,EAAE,EACF,IAAI,EACJ,IAAI,EACJ,GAAG,GACJ,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,GAAG,EAAE,MAAM,CAAC;CACb,EACD,EAAE,MAAmB,gBA2DtB"}

package/dist/server/routes/dictionaries/functions/create.dictionary.item.js

@@ -0,0 +1,57 @@
+import pgClients from "../../../plugins/pg/pgClients.js";
+import dataInsert from "../../../plugins/crud/funcs/dataInsert.js";
+import { BadRequestError, NotFoundError } from "../../../../errors.js";
+import updateDictionary from "./update.dictionary.js";
+/**
+ *
+ * @param {String} id Item ID, optional
+ * @param {String} code Dictionary code (filename)
+ * @param {String} body.code Item code
+ */
+export default async function createDictionaryItem({ id, code, body, uid, }, pg = pgClients.client) {
+    if (!pg) {
+        throw new Error("empty pg");
+    }
+    if (!code) {
+        throw BadRequestError("not enough params: code");
+    }
+    if (!body) {
+        throw BadRequestError("not enough params: body");
+    }
+    if (!body.code) {
+        throw BadRequestError("not enough body params: code");
+    }
+    if (!body.name) {
+        throw BadRequestError("not enough body params: name");
+    }
+    const { system, id: dictionaryId } = await pg
+        .query("select id from admin.dictionaries where code=$1", [code])
+        .then((r) => ({ system: r.rows?.[0]?.system, id: r.rows?.[0]?.id }));
+    if (!dictionaryId) {
+        throw NotFoundError("dictionary not found");
+    }
+    // make custom
+    if (system) {
+        await updateDictionary({ id: dictionaryId, body: { system: false }, uid }, pg);
+    }
+    const { data } = await dataInsert({
+        id,
+        table: "admin.dictionary_items",
+        data: {
+            code: body.code,
+            dictionary_id: dictionaryId,
+            name: body.name,
+            description: body.description,
+            color: body.color,
+            icon: body.icon,
+            parent_id: body.parent_id,
+            sort_order: body.sort,
+            metadata: body.metadata,
+            system: false,
+            active: body.active === false ? false : true,
+        },
+        pg,
+        uid,
+    });
+    return data;
+}

package/dist/server/routes/dictionaries/functions/create.dictionary.js

@@ -0,0 +1,76 @@
+import pgClients from "../../../plugins/pg/pgClients.js";
+import dataInsert from "../../../plugins/crud/funcs/dataInsert.js";
+import deleteDictionary from "./delete.dictionary.js";
+import { BadRequestError } from "../../../../errors.js";
+/**
+ *
+ * @param {String} id Dictionary ID, optional
+ */
+export default async function createDictionary({ id, body, uid, }, pg = pgClients.client) {
+    if (!pg) {
+        throw new Error("empty pg");
+    }
+    if (!body) {
+        throw BadRequestError("not enough params: body");
+    }
+    if (!body?.values?.length) {
+        // throw BadRequestError("not enough body params: values");
+    }
+    const client = await pg.connect();
+    try {
+        const systemDictionaryId = await pg
+            .query("select id from admin.dictionaries where system and id = $1", [id])
+            .then((r) => r.rows?.[0]?.id);
+        await client.query("begin");
+        if (systemDictionaryId) {
+            await deleteDictionary({ id: systemDictionaryId, uid }, client);
+        }
+        const { data } = (await dataInsert({
+            id,
+            table: "admin.dictionaries",
+            data: {
+                code: body.code,
+                name: body.name,
+                module: body.module,
+                description: body.description,
+                source: "custom",
+                system: false,
+                editable: body.editable === false ? false : true,
+            },
+            pg: client,
+            uid,
+        })) || {};
+        if (!data) {
+            throw new Error("dictionary insert error");
+        }
+        const values = await Promise.all((body.values || []).map(async (el) => {
+            return dataInsert({
+                table: "admin.dictionary_items",
+                data: {
+                    dictionary_id: id,
+                    code: el.code,
+                    name: el.name,
+                    description: el.description,
+                    color: el.color,
+                    icon: el.icon,
+                    parent_id: el.parent_id,
+                    sort_order: el.sort_order,
+                    metadata: el.metadata,
+                    system: false,
+                    active: el.active === false ? false : true,
+                },
+                pg: client,
+                uid,
+            }).then((r) => r.data);
+        }));
+        await client.query("commit");
+        return { ...data, values };
+    }
+    catch (err) {
+        await client.query("rollback");
+        throw err;
+    }
+    finally {
+        client.release();
+    }
+}

package/dist/server/routes/dictionaries/functions/delete.dictionary.d.ts

@@ -0,0 +1,9 @@
+/**
+ *
+ * @param {String} id Dictionary ID
+ */
+export default function deleteDictionary({ id, uid, }: {
+    id: string;
+    uid: string;
+}, pg?: any): Promise<any>;
+//# sourceMappingURL=delete.dictionary.d.ts.map

package/dist/server/routes/dictionaries/functions/delete.dictionary.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"delete.dictionary.d.ts","sourceRoot":"","sources":["../../../../../server/routes/dictionaries/functions/delete.dictionary.ts"],"names":[],"mappings":"AAKA;;;GAGG;AAEH,wBAA8B,gBAAgB,CAC5C,EACE,EAAE,EACF,GAAG,GACJ,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;CACb,EACD,EAAE,MAAmB,gBA6BtB"}

package/dist/server/routes/dictionaries/functions/delete.dictionary.item.d.ts

@@ -0,0 +1,11 @@
+/**
+ *
+ * @param {String} id Item ID
+ * @param {String} code Dictionary code (filename)
+ */
+export default function deleteDictionaryItem({ id, code, uid, }: {
+    id: string;
+    code: string;
+    uid: string;
+}, pg?: any): Promise<any>;
+//# sourceMappingURL=delete.dictionary.item.d.ts.map

package/dist/server/routes/dictionaries/functions/delete.dictionary.item.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"delete.dictionary.item.d.ts","sourceRoot":"","sources":["../../../../../server/routes/dictionaries/functions/delete.dictionary.item.ts"],"names":[],"mappings":"AAKA;;;;GAIG;AAEH,wBAA8B,oBAAoB,CAChD,EACE,EAAE,EACF,IAAI,EACJ,GAAG,GACJ,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;CACb,EACD,EAAE,MAAmB,gBAiCtB"}

package/dist/server/routes/dictionaries/functions/delete.dictionary.item.js

@@ -0,0 +1,32 @@
+import pgClients from "../../../plugins/pg/pgClients.js";
+import dataDelete from "../../../plugins/crud/funcs/dataDelete.js";
+import { BadRequestError, NotFoundError } from "../../../../errors.js";
+/**
+ *
+ * @param {String} id Item ID
+ * @param {String} code Dictionary code (filename)
+ */
+export default async function deleteDictionaryItem({ id, code, uid, }, pg = pgClients.client) {
+    if (!pg) {
+        throw new Error("empty pg");
+    }
+    if (!id) {
+        throw BadRequestError("not enough params: id");
+    }
+    if (!code) {
+        throw BadRequestError("not enough params: code");
+    }
+    const itemId = await pg
+        .query("select id from admin.dictionary_items where dictionary_id in (select id from admin.dictionaries where $1 in (id,code) ) and $2 in (id,code)", [code, id])
+        .then((r) => r.rows?.[0]?.id);
+    if (!itemId) {
+        throw NotFoundError("dictionary item not found");
+    }
+    const item = await dataDelete({
+        id: itemId,
+        table: "admin.dictionary_items",
+        pg,
+        uid,
+    });
+    return item;
+}

package/dist/server/routes/dictionaries/functions/delete.dictionary.js

@@ -0,0 +1,28 @@
+import pgClients from "../../../plugins/pg/pgClients.js";
+import dataDelete from "../../../plugins/crud/funcs/dataDelete.js";
+import { BadRequestError, NotFoundError } from "../../../../errors.js";
+/**
+ *
+ * @param {String} id Dictionary ID
+ */
+export default async function deleteDictionary({ id, uid, }, pg = pgClients.client) {
+    if (!pg) {
+        throw new Error("empty pg");
+    }
+    if (!id) {
+        throw BadRequestError("not enough params: id");
+    }
+    const values = await pg
+        .query("delete from admin.dictionary_items where dictionary_id=$1 returning id,code,name,color,icon", [id])
+        .then((r) => r.rowCount || 0);
+    const row = await dataDelete({
+        table: "admin.dictionaries",
+        id,
+        uid,
+        pg,
+    });
+    if (!row) {
+        throw NotFoundError("dictionary not found");
+    }
+    return { ...row, values };
+}

package/dist/server/routes/dictionaries/functions/read.dictionaries.d.ts

@@ -0,0 +1,5 @@
+export default function readDictionaries({ code, values, }: {
+    code: string;
+    values?: boolean;
+}, pg?: any): Promise<any>;
+//# sourceMappingURL=read.dictionaries.d.ts.map

package/dist/server/routes/dictionaries/functions/read.dictionaries.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"read.dictionaries.d.ts","sourceRoot":"","sources":["../../../../../server/routes/dictionaries/functions/read.dictionaries.ts"],"names":[],"mappings":"AAIA,wBAA8B,gBAAgB,CAC5C,EACE,IAAI,EACJ,MAAc,GACf,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,EACD,EAAE,MAAmB,gBAqCtB"}

package/dist/server/routes/dictionaries/functions/read.dictionaries.js

@@ -0,0 +1,27 @@
+import pgClients from "../../../plugins/pg/pgClients.js";
+import { NotFoundError } from "../../../../errors.js";
+export default async function readDictionaries({ code, values = false, }, pg = pgClients.client) {
+    if (!pg) {
+        throw new Error("empty pg");
+    }
+    if (!code) {
+        const rows = await pg
+            .query("select code,name,module,source from admin.dictionaries")
+            .then((r) => r.rows || []);
+        return { total: rows.length, rows };
+    }
+    // code is unique
+    const rows = await pg
+        .query("select id, code, name, module, description, source, editable, system from admin.dictionaries where $1 in (code, id) limit 1", [code])
+        .then((r) => r.rows || []);
+    if (!rows.length) {
+        throw NotFoundError("dictionary not found");
+    }
+    const items = await pg
+        .query("select code, name, description, color, icon, sort_order as sort, parent_id, active, system, metadata from admin.dictionary_items where dictionary_id=$1", [rows[0].id])
+        .then((r) => r.rows || []);
+    if (values) {
+        return items;
+    }
+    return { ...rows[0], values: items };
+}

package/dist/server/routes/dictionaries/functions/update.dictionary.d.ts

@@ -0,0 +1,10 @@
+/**
+ *
+ * @param {String} id Dictionary ID
+ */
+export default function updateDictionary({ id, body, uid, }: {
+    id: string;
+    body: Record<string, any>;
+    uid: string;
+}, pg?: any): Promise<any>;
+//# sourceMappingURL=update.dictionary.d.ts.map

package/dist/server/routes/dictionaries/functions/update.dictionary.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update.dictionary.d.ts","sourceRoot":"","sources":["../../../../../server/routes/dictionaries/functions/update.dictionary.ts"],"names":[],"mappings":"AAIA;;;GAGG;AAEH,wBAA8B,gBAAgB,CAC5C,EACE,EAAE,EACF,IAAI,EACJ,GAAG,GACJ,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,GAAG,EAAE,MAAM,CAAC;CACb,EACD,EAAE,MAAmB,gBAyDtB"}

package/dist/server/routes/dictionaries/functions/update.dictionary.item.d.ts

@@ -0,0 +1,13 @@
+/**
+ *
+ * @param {String} id Item ID
+ * @param {String} code Dictionary code (filename)
+ * @param {String} body.code Item code
+ */
+export default function updateDictionaryItem({ id, code, body, uid, }: {
+    id: string;
+    code: string;
+    body: Record<string, any>;
+    uid: string;
+}, pg?: any): Promise<any>;
+//# sourceMappingURL=update.dictionary.item.d.ts.map

package/dist/server/routes/dictionaries/functions/update.dictionary.item.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update.dictionary.item.d.ts","sourceRoot":"","sources":["../../../../../server/routes/dictionaries/functions/update.dictionary.item.ts"],"names":[],"mappings":"AAOA;;;;;GAKG;AAEH,wBAA8B,oBAAoB,CAChD,EACE,EAAE,EACF,IAAI,EACJ,IAAI,EACJ,GAAG,GACJ,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,GAAG,EAAE,MAAM,CAAC;CACb,EACD,EAAE,MAAmB,gBAiDtB"}

package/dist/server/routes/dictionaries/functions/update.dictionary.item.js

@@ -0,0 +1,48 @@
+import pgClients from "../../../plugins/pg/pgClients.js";
+import dataUpdate from "../../../plugins/crud/funcs/dataUpdate.js";
+import updateDictionary from "./update.dictionary.js";
+import { BadRequestError, NotFoundError } from "../../../../errors.js";
+/**
+ *
+ * @param {String} id Item ID
+ * @param {String} code Dictionary code (filename)
+ * @param {String} body.code Item code
+ */
+export default async function updateDictionaryItem({ id, code, body, uid, }, pg = pgClients.client) {
+    if (!pg) {
+        throw new Error("empty pg");
+    }
+    if (!code) {
+        throw BadRequestError("not enough params: code");
+    }
+    if (!body) {
+        throw BadRequestError("not enough params: body");
+    }
+    const { system, id: dictionaryId } = await pg
+        .query("select id from admin.dictionaries where $1 in (id,code)", [code])
+        .then((r) => ({ system: r.rows?.[0]?.system, id: r.rows?.[0]?.id }));
+    if (!dictionaryId) {
+        throw NotFoundError("dictionary not found");
+    }
+    const itemId = await pg
+        .query("select id from admin.dictionary_items where $1 in (id,code)", [id])
+        .then((r) => r.rows?.[0]?.id);
+    if (!itemId) {
+        throw NotFoundError("dictionary item not found");
+    }
+    // make custom
+    if (system) {
+        await updateDictionary({ id: dictionaryId, body: { system: false }, uid }, pg);
+    }
+    const row = await dataUpdate({
+        id: itemId,
+        table: "admin.dictionary_items",
+        data: {
+            ...body,
+            sort_order: body.sort,
+        },
+        pg,
+        uid,
+    });
+    return row;
+}

package/dist/server/routes/dictionaries/functions/update.dictionary.js

@@ -0,0 +1,51 @@
+import pgClients from "../../../plugins/pg/pgClients.js";
+import dataInsert from "../../../plugins/crud/funcs/dataInsert.js";
+import dataUpdate from "../../../plugins/crud/funcs/dataUpdate.js";
+/**
+ *
+ * @param {String} id Dictionary ID
+ */
+export default async function updateDictionary({ id, body, uid, }, pg = pgClients.client) {
+    if (!pg) {
+        throw new Error("empty pg");
+    }
+    if (!id) {
+        throw new Error("not enough params: id");
+    }
+    if (!body) {
+        throw new Error("not enough params: body");
+    }
+    const row = await dataUpdate({
+        id,
+        table: "admin.dictionaries",
+        data: body,
+        pg,
+        uid,
+    });
+    if (body.values?.length) {
+        const client = await pg.connect();
+        try {
+            await client.query("begin");
+            await client.query("delete from admin.dictionary_items where dictionary_id = $1", [id]);
+            const values = await Promise.all(body.values.map(async (item) => dataInsert({
+                table: "admin.dictionary_items",
+                data: {
+                    ...item,
+                    dictionary_id: id,
+                },
+                pg: client,
+                uid,
+            }).then((r) => r.data)));
+            await client.query("commit");
+            return { ...row, values };
+        }
+        catch (err) {
+            await client.query("rollback");
+            throw err;
+        }
+        finally {
+            client.release();
+        }
+    }
+    return row;
+}

package/dist/server/routes/file/schema.js

@@ -3,13 +3,13 @@ const resizeSchema = {
         type: "object",
         properties: {
             filepath: { type: "string" },
-            quality: { type: "number", exclusiveMinimum: 0, maximum: 100 },
+            quality: { type: "integer", exclusiveMinimum: 0, maximum: 100 },
             size: {
                 type: "string",
                 pattern: "^((\\d{1,4})x(\\d{1,4})|(\\d{1,4})x|x(\\d{1,4}))$",
             },
-            w: { type: "number", minimum: 1, maximum: 2048 },
-            h: { type: "number", minimum: 1, maximum: 2048 },
+            w: { type: "integer", minimum: 1, maximum: 2048 },
+            h: { type: "integer", minimum: 1, maximum: 2048 },
         },
     },
 };
@@ -17,9 +17,9 @@ const exportSchema = {
     querystring: {
         type: "object",
         properties: {
-            limit: { type: "number", minimum: 1 },
-            batchLimit: { type: "number", minimum: 1 },
-            page: { type: "number", minimum: 1 },
+            limit: { type: "integer", minimum: 1 },
+            batchLimit: { type: "integer", minimum: 1 },
+            page: { type: "integer", minimum: 1 },
             key: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
         },
     },

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

@@ -1,6 +1,6 @@
 import type { FastifyReply } from "fastify";
 import type { ExtendedPG } from "../../../types/core.js";
-export default function dataAPI({ pg, params, table, id, headers, query, user, contextQuery, searchColumn, sufix, filterList, actions: actionsParam, accessQuery: accessQueryParam, columns: columnsParam, isExport, }: {
+export default function dataAPI({ pg, params, table, id, headers, query, user, contextQuery, searchColumn, sufix, filterList, actions: actionsParam, accessQuery: accessQueryParam, columns: columnsParam, isExport, called: isCalled, }: {
     pg?: ExtendedPG;
     params?: {
         id?: string;
@@ -20,5 +20,6 @@ export default function dataAPI({ pg, params, table, id, headers, query, user, c
     accessQuery?: string;
     columns?: string[];
     isExport?: boolean;
-}, reply?: FastifyReply, called?: any): Promise<any>;
+    called?: boolean;
+}, _?: FastifyReply, called1?: 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;AAuGzD,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,KAAK,CAAC,EAAE,YAAY,EACpB,MAAM,CAAC,EAAE,GAAG,gBAk5Bb"}
+{"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;AAuFzD,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,EAChB,MAAM,EAAE,QAAQ,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;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,EACD,CAAC,CAAC,EAAE,YAAY,EAChB,OAAO,CAAC,EAAE,GAAG,gBAo5Bd"}

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

@@ -25,19 +25,6 @@ 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, cols, sqlColumns, iscalled = false, }) {
     if (iscalled && queryOrder) {
         return `order by ${queryOrder}`;
@@ -59,7 +46,8 @@ function getOrder({ queryOrder, queryDesc, defaultOrder, columnList, cols, sqlCo
 const checkInline = {};
 const maxLimit = 100;
 const defaultLimit = 20;
-export default async function dataAPI({ pg = pgClients.client, params, table, id, headers = {}, query = {}, user = {}, contextQuery, searchColumn, sufix = true, filterList, actions: actionsParam, accessQuery: accessQueryParam, columns: columnsParam, isExport = false, }, reply, called) {
+export default async function dataAPI({ pg = pgClients.client, params, table, id, headers = {}, query = {}, user = {}, contextQuery, searchColumn, sufix = true, filterList, actions: actionsParam, accessQuery: accessQueryParam, columns: columnsParam, isExport = false, called: isCalled, }, _, called1) {
+    const called = called1 || isCalled;
     const time = Date.now();
     const timeArr = [Date.now()];
     const { uid } = user;

package/dist/server/routes/table/schema.d.ts

@@ -134,7 +134,7 @@ declare const searchSchema: {
             };
             sql: {
                 type: string;
-                pattern: string;
+                enum: number[];
             };
         };
     };
@@ -170,14 +170,15 @@ declare const suggestSchema: {
             };
             sql: {
                 type: string;
+                enum: number[];
             };
             count: {
                 type: string;
+                enum: number[];
             };
             json: {
                 type: string;
-                minimum: number;
-                maximum: number;
+                enum: number[];
             };
         };
     };
@@ -223,7 +224,7 @@ declare const cardTabDataSchema: {
         properties: {
             sql: {
                 type: string;
-                pattern: string;
+                enum: number[];
             };
         };
     };

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../server/routes/table/schema.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyBpB,CAAC;AAEF,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0BhB,CAAC;AAEF,QAAA,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAajB,CAAC;AAEF,QAAA,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsBlB,CAAC;AAEF,QAAA,MAAM,UAAU;;;;;;;;;;;;;;CAQf,CAAC;AAEF,QAAA,MAAM,YAAY;;;;;;;;;;CAOjB,CAAC;AAEF,QAAA,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;CAatB,CAAC;AAEF,QAAA,MAAM,iBAAiB;;;;;;;;;;;;;;CAQtB,CAAC;AAEF,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,WAAW,EACX,YAAY,EACZ,aAAa,EACb,UAAU,EACV,YAAY,EACZ,iBAAiB,GAClB,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../server/routes/table/schema.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyBpB,CAAC;AAEF,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0BhB,CAAC;AAEF,QAAA,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAajB,CAAC;AAEF,QAAA,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsBlB,CAAC;AAEF,QAAA,MAAM,UAAU;;;;;;;;;;;;;;CAQf,CAAC;AAEF,QAAA,MAAM,YAAY;;;;;;;;;;CAOjB,CAAC;AAEF,QAAA,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;CAatB,CAAC;AAEF,QAAA,MAAM,iBAAiB;;;;;;;;;;;;;;CAQtB,CAAC;AAEF,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,WAAW,EACX,YAAY,EACZ,aAAa,EACb,UAAU,EACV,YAAY,EACZ,iBAAiB,GAClB,CAAC"}

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

@@ -2,8 +2,8 @@ const tableDataSchema = {
     type: "object",
     properties: {
         querystring: {
-            limit: { type: "number", minimum: 1 },
-            page: { type: "number", minimum: 1 },
+            limit: { type: "integer", minimum: 1 },
+            page: { type: "integer", minimum: 1 },
             // filter: { type: 'string', pattern: '^([\\w\\d_-]+)=([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
             // search: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
             order: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
@@ -13,7 +13,7 @@ const tableDataSchema = {
             bbox: { type: "string", pattern: "^([\\d\\s,.-]+)$" },
             polyline: { type: "string", pattern: "^([\\d\\w|@{}~_`]+)$" },
             // key: { type: 'string', pattern: '^([\\d\\w_]+)$' },
-            sql: { type: "number" },
+            sql: { type: "integer" },
         },
     },
     params: {
@@ -28,8 +28,8 @@ const tableSchema = {
     querystring: {
         type: "object",
         properties: {
-            limit: { type: "number", minimum: 1 },
-            page: { type: "number", minimum: 1 },
+            limit: { type: "integer", minimum: 1 },
+            page: { type: "integer", minimum: 1 },
             // filter: { type: 'string', pattern: '^([\\w\\d_-]+)=([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
             // search: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
             order: { type: "string", pattern: "^$|^[\\d\\w_.-]+$" },
@@ -40,7 +40,7 @@ const tableSchema = {
             // polyline: { type: 'string', pattern: '^([\\d\\w\\|@\\/\\{\\}~_`]+)$' },
             key: { type: "string", pattern: "^([А-Яа-яҐґЄєІіЇї\\d\\w\\s_.-]+)$" },
             uid: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
-            sql: { type: "number" },
+            sql: { type: "integer" },
         },
     },
     params: {
@@ -55,13 +55,13 @@ const searchSchema = {
     querystring: {
         type: "object",
         properties: {
-            page: { type: "number", minimum: 1 },
-            limit: { type: "number", minimum: 1 },
+            page: { type: "integer", minimum: 1 },
+            limit: { type: "integer", minimum: 1 },
             order: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
             desc: { type: "string", pattern: "^(\\d+)$" },
             key: { type: "string", pattern: "^([А-Яа-яҐґЄєІіЇї\\d\\w\\s_.-]+)$" },
             table: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
-            sql: { type: "string", pattern: "^(\\d)$" },
+            sql: { type: "integer", enum: [1] },
         },
     },
 };
@@ -76,9 +76,9 @@ const suggestSchema = {
             name: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
             key: { type: "string", pattern: "^([А-Яа-яҐґЄєІіЇї\\d\\w\\s_.-]+)$" },
             val: { type: "string", pattern: "([\\d\\w]+)$" },
-            sql: { type: "number" },
-            count: { type: "number" },
-            json: { type: "number", minimum: 1, maximum: 1 }, // dummy schema param to avoid crash caused by frontend calls w/ useless json param
+            sql: { type: "integer", enum: [1] },
+            count: { type: "integer", enum: [1] },
+            json: { type: "integer", enum: [1] }, // dummy schema param to avoid crash caused by frontend calls w/ useless json param
         },
     },
     params: {
@@ -109,7 +109,7 @@ const cardTabDataSchema = {
     querystring: {
         type: "object",
         properties: {
-            sql: { type: "string", pattern: "^(\\d)$" },
+            sql: { type: "integer", enum: [1] },
         },
     },
     params: {

package/package.json

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