@opengis/fastify-table 2.5.42 → 2.5.44

package/dist/server/routes/crud/functions/readTableRelations.js

@@ -0,0 +1,76 @@
+// import config from "../../../../config.js";
+import pgClients from "../../../plugins/pg/pgClients.js";
+import getAccess from "../../../plugins/crud/funcs/getAccess.js";
+import getTemplate from "../../../plugins/table/funcs/getTemplate.js";
+import getData from "../../../plugins/table/funcs/getData.js";
+import { resourcesObject } from "../../../plugins/access/funcs/getResources.js";
+import { BadRequestError, ForbiddenError, NotFoundError, } from "../../../../errors.js";
+export default async function readTableRelations({ table: paramsTable, id, relname, relationId, uid, userType, referer, limit = 10, page = 1, called = false, }, pg = pgClients.client) {
+    if (!paramsTable) {
+        throw BadRequestError("not enough params: table  ");
+    }
+    const resource = resourcesObject[paramsTable]?.table
+        ? paramsTable
+        : undefined;
+    const templateName = resourcesObject[paramsTable]?.table || paramsTable;
+    const loadTable = await getTemplate("table", templateName);
+    if (!loadTable && !(pg.pk?.[templateName] && called)) {
+        throw NotFoundError("table not found");
+    }
+    const { relations = {} } = loadTable || {};
+    if (!relations[relname]) {
+        throw NotFoundError("table relation not found");
+    }
+    const { table: relationTable, form: relationForm, 
+    // localKey = relations[relname]?.localKey,
+    foreignKey = relations[relname]?.foreignKey, } = relations[relname]?.resource
+        ? resourcesObject[relations[relname].resource]
+        : relations[relname];
+    if (!foreignKey) {
+        throw new Error("invalid relation: foreignKey not set");
+    }
+    // check if user has permission to modify main object/row
+    const { actions = [], message: accessMessage } = (await getAccess({
+        resource,
+        table: templateName,
+        form: loadTable?.form,
+        id,
+        user: { uid, user_type: userType },
+        method: "GET",
+    }, pg)) || {};
+    if (accessMessage) {
+        throw ForbiddenError(accessMessage);
+    }
+    if (!actions.includes("edit") && !called) {
+        throw ForbiddenError("access restricted: actions");
+    }
+    const relationTableTemplate = await getTemplate("table", relationTable);
+    const formData = await getTemplate("form", relationTableTemplate?.form || relationForm);
+    const schema = formData?.schema || formData || {};
+    const { count, filtered, total, rows } = await getData({
+        table: relationTable,
+        id: relationId,
+        page: relationId ? undefined : page,
+        limit: relationId ? undefined : limit,
+        uid,
+        userType,
+        referer,
+        columns: Object.keys(schema).concat([foreignKey]),
+        contextQuery: `${foreignKey}=$1`,
+        args: [id],
+        called: true,
+    }, pg);
+    if (relationId) {
+        return { id: relationId, data: rows[0], schema };
+    }
+    const data = {
+        count,
+        filtered,
+        total,
+        limit,
+        page,
+        rows,
+        schema,
+    };
+    return data;
+}

package/dist/server/routes/crud/functions/updateTableRelation.d.ts

@@ -0,0 +1,14 @@
+export default function updateTableRelation({ table: paramsTable, id: paramsId, form: paramsForm, relname, relationId, body, uid, userType, referer, ignoreCheck, called, }: {
+    table: string;
+    id: string;
+    form?: string;
+    relname: string;
+    relationId: string;
+    body: Record<string, any>;
+    uid?: string;
+    userType?: string;
+    referer?: string;
+    ignoreCheck?: boolean;
+    called?: boolean;
+}, pg?: any): Promise<any>;
+//# sourceMappingURL=updateTableRelation.d.ts.map

package/dist/server/routes/crud/functions/updateTableRelation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"updateTableRelation.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/functions/updateTableRelation.ts"],"names":[],"mappings":"AAqBA,wBAA8B,mBAAmB,CAC/C,EACE,KAAK,EAAE,WAAW,EAClB,EAAE,EAAE,QAAQ,EACZ,IAAI,EAAE,UAAU,EAChB,OAAO,EACP,UAAU,EACV,IAAI,EACJ,GAAG,EACH,QAAQ,EACR,OAAO,EACP,WAAmB,EACnB,MAAc,GACf,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,EACD,EAAE,MAAmB,gBA+JtB"}

package/dist/server/routes/crud/functions/updateTableRelation.js

@@ -0,0 +1,117 @@
+// import config from "../../../../config.js";
+import pgClients from "../../../plugins/pg/pgClients.js";
+import getTemplate from "../../../plugins/table/funcs/getTemplate.js";
+import dataUpdate from "../../../plugins/crud/funcs/dataUpdate.js";
+import getAccess from "../../../plugins/crud/funcs/getAccess.js";
+import checkXSS from "../../../plugins/policy/funcs/checkXSS.js";
+import validateData from "../../../plugins/crud/funcs/validateData.js";
+import logger from "../../../plugins/logger/getLogger.js";
+import { resourcesObject } from "../../../plugins/access/funcs/getResources.js";
+import { BadRequestError, ConflictError, ForbiddenError, NotFoundError, UnauthorizedError, } from "../../../../errors.js";
+export default async function updateTableRelation({ table: paramsTable, id: paramsId, form: paramsForm, relname, relationId, body, uid, userType, referer, ignoreCheck = false, called = false, }, pg = pgClients.client) {
+    if (!uid) {
+        throw UnauthorizedError("unauthorized");
+    }
+    if (!relationId) {
+        throw BadRequestError("not enough params: relationId");
+    }
+    const resource = resourcesObject[paramsTable] ? paramsTable : undefined;
+    const mainTable = resourcesObject[paramsTable]?.table || paramsTable;
+    const id = paramsId;
+    const { actions = [], message: accessMessage } = (await getAccess({
+        resource,
+        table: mainTable,
+        form: resourcesObject[paramsTable]?.form || paramsForm,
+        id: paramsId,
+        user: { uid, user_type: userType },
+        method: "PUT",
+    }, pg)) || {};
+    if (accessMessage && !called) {
+        throw ForbiddenError(accessMessage);
+    }
+    if (!actions.includes("edit") && !called) {
+        throw ForbiddenError("access restricted: actions");
+    }
+    const loadTemplate = await getTemplate("table", mainTable);
+    if (!loadTemplate) {
+        throw NotFoundError(`table not found: ${mainTable}`);
+    }
+    const { relations = {} } = loadTemplate || {};
+    if (!relations[relname]) {
+        throw NotFoundError(`table relation not found: ${relname}`);
+    }
+    const { table: relationTable, form: relationForm, 
+    // localKey = relations[relname]?.localKey,
+    foreignKey = relations[relname]?.foreignKey, } = relations[relname]?.resource
+        ? resourcesObject[relations[relname].resource]
+        : relations[relname];
+    if (!foreignKey) {
+        throw new Error("invalid relation: foreignKey not set");
+    }
+    const pks = await pg
+        .query(`
+    SELECT
+      connamespace::regnamespace::text,
+      conrelid::regclass,
+      (
+        SELECT attname FROM pg_attribute WHERE attrelid = c.conrelid AND attnum = c.conkey[1]
+      ) as pk
+    FROM pg_constraint c
+    WHERE contype = 'p'
+    AND connamespace::regnamespace::text NOT IN ('sde')`)
+        .then((r) => r.rows || []);
+    const pkList = pks.reduce((acc, curr) => ({
+        ...acc,
+        [curr.connamespace === "public"
+            ? `${curr.connamespace}.${curr.conrelid}`
+            : curr.conrelid]: curr.pk,
+    }), {});
+    const relationTableTemplate = await getTemplate("table", relationTable);
+    const relationPk = pkList[relationTableTemplate?.table || relationTable];
+    if (!relationPk) {
+        throw NotFoundError("invalid relation: primary key column not found");
+    }
+    const existsAndRelated = await pg
+        .query(`select 1 from ${relationTableTemplate?.table || relationTable} where ${foreignKey}=$1 and ${relationPk}=$2`, [paramsId, relationId])
+        .then((r) => r.rowCount > 0);
+    if (!existsAndRelated) {
+        throw NotFoundError(`relation row not found: ${relationId}`);
+    }
+    const formData = await getTemplate("form", relationTableTemplate?.form || relationForm);
+    const schema = formData?.schema || formData;
+    // skip non-present fields in form schema
+    if (!ignoreCheck) {
+        Object.keys(body || {})
+            .filter((key) => !Object.keys(schema || {}).includes(key))
+            .forEach((key) => delete body[key]);
+    }
+    const xssCheck = checkXSS({ body, schema });
+    if (xssCheck.error && formData?.xssCheck !== false) {
+        logger.file("injection/xss", {
+            msg: xssCheck.error,
+            table: relationTable,
+            form: relationForm,
+            uid,
+        });
+        throw ConflictError("Дані не пройшли валідацію. Приберіть некоректні дані та спробуйте ще раз");
+    }
+    const fieldCheck = validateData({ body, schema, update: true });
+    if (fieldCheck.error) {
+        logger.file("injection/formdata", {
+            table: relationTable,
+            form: relationForm,
+            uid,
+            ...fieldCheck,
+        });
+        throw ConflictError("Дані не пройшли валідацію. Приберіть некоректні дані та спробуйте ще раз");
+    }
+    const res = await dataUpdate({
+        pg,
+        table: relationTableTemplate?.table || relationTable,
+        id: relationId,
+        data: body,
+        uid,
+        referer,
+    });
+    return res;
+}

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.42",
+  "version": "2.5.44",
   "type": "module",
   "description": "core-plugins",
   "keywords": [