@opengis/fastify-table 2.5.62 → 2.5.64

package/dist/helper.d.ts

@@ -8,6 +8,7 @@ export declare function injectWithHeaders(opts: any): Promise<{
         [k: string]: string;
     };
     statusCode: number;
+    textStream(): ReadableStream<string>;
     ok: boolean;
     status: number;
     statusText: string;

package/dist/helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../helper.ts"],"names":[],"mappings":"AAEA,OAAO,MAAM,MAAM,aAAa,CAAC;AAGjC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,QAAA,MAAQ,MAAM,KAAoB,CAAC;AAInC,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,GAAG;;;;;;;;;;;;;;;;;;;GAiChD;AAED,wBAAsB,KAAK,kBAI1B;AAGD,wBAAsB,QAAQ,kBAW7B;AAED,wBAAsB,KAAK,iBA+B1B;AAED,OAAO,EAEL,MAAM,EACN,MAAM,EACN,SAAS,GACV,CAAC"}
+{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../helper.ts"],"names":[],"mappings":"AAEA,OAAO,MAAM,MAAM,aAAa,CAAC;AAGjC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,QAAA,MAAQ,MAAM,KAAoB,CAAC;AAInC,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,GAAG;;;;;;;;;;;;;;;;;;;;GAiChD;AAED,wBAAsB,KAAK,kBAI1B;AAGD,wBAAsB,QAAQ,kBAW7B;AAED,wBAAsB,KAAK,iBA+B1B;AAED,OAAO,EAEL,MAAM,EACN,MAAM,EACN,SAAS,GACV,CAAC"}

package/dist/server/plugins/table/funcs/getFilterSQLParametrized/getFilterList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getFilterList.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/table/funcs/getFilterSQLParametrized/getFilterList.ts"],"names":[],"mappings":"AAyBA,wBAA8B,aAAa,CACzC,EACE,KAAK,EACL,GAAG,EACH,UAAU,EACV,cAAc,EACd,YAAiB,GAClB,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;IACnC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;CACrC,EACD,EAAE,MAAmB,kBAqFtB"}
+{"version":3,"file":"getFilterList.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/table/funcs/getFilterSQLParametrized/getFilterList.ts"],"names":[],"mappings":"AAyBA,wBAA8B,aAAa,CACzC,EACE,KAAK,EACL,GAAG,EACH,UAAU,EACV,cAAc,EACd,YAAiB,GAClB,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;IACnC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;CACrC,EACD,EAAE,MAAmB,kBA8FtB"}

package/dist/server/plugins/table/funcs/getFilterSQLParametrized/getFilterList.js

@@ -23,6 +23,9 @@ export default async function getFilterList({ table, uid, filterList, extraDataT
         table,
         user: { uid },
     }, null);
+    const customClsList = await pg
+        .queryCache("select array_agg(name) from admin.user_cls where parent is null and type=$1", { table: "admin.user_cls", args: ["json"] })
+        .then((r) => r.rows?.[0]?.array_agg || []);
     return Promise.all((filterList || [])
         .concat(filterResponse?.inline || [])
         .concat(filterResponse?.custom || [])
@@ -79,7 +82,7 @@ export default async function getFilterList({ table, uid, filterList, extraDataT
             Object.assign(el, {
                 cls: el.data,
                 options: cls.arr,
-                select: `select code, name from admin.cls where parent='${el.data}'`,
+                select: `select code, name from ${customClsList.includes(el.data) ? "admin.user_cls" : "admin.cls"} where parent='${el.data}'`,
             });
         }
         else if (typeof (cls?.sql || cls) === "string") {

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

@@ -1,6 +1,6 @@
 const keySchema = {
     type: "string",
-    pattern: "^([А-Яа-яҐґЄєІіЇї\\d\\w\\s_.\\-:—!?%@#$,'\"; ]+)$",
+    pattern: "^([А-Яа-яҐґЄєІіЇї\\d\\w\\s_.\\-:—–!?%@#$,'\"; №/()«»’“”]+)$",
 };
 const tableDataSchema = {
     type: "object",

package/package.json

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