@opengis/fastify-table 2.5.59 → 2.5.61

package/dist/server/plugins/crud/funcs/validateData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validateData.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/validateData.ts"],"names":[],"mappings":"AAmJA,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,EACnC,IAAS,EACT,MAAW,EACX,MAAc,GACf,EAAE;IACD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,OASA"}
+{"version":3,"file":"validateData.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/validateData.ts"],"names":[],"mappings":"AAqJA,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,EACnC,IAAS,EACT,MAAW,EACX,MAAc,GACf,EAAE;IACD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,OASA"}

package/dist/server/plugins/crud/funcs/validateData.js

@@ -99,7 +99,10 @@ function checkBody({ body = {}, arr = [], idx }) {
             const result = body[key]?.reduce?.((acc, item, i) => {
                 const check = checkBody({
                     body: item,
-                    arr: input.colModel,
+                    arr: input.colModel.map((el) => ({
+                        ...el,
+                        key: el.key || el.name,
+                    })),
                     idx: i,
                 });
                 acc.push(check);

package/dist/server/plugins/table/funcs/metaFormat/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/table/funcs/metaFormat/index.ts"],"names":[],"mappings":"AAOA,wBAA8B,UAAU,CACtC,EACE,IAAI,EAAE,QAAQ,EACd,KAAK,EACL,GAAQ,EACR,KAAU,EACV,KAAY,EACZ,QAAe,GAChB,EAAE;IACD,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,EACD,EAAE,MAAmB,gBAwGtB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/table/funcs/metaFormat/index.ts"],"names":[],"mappings":"AAOA,wBAA8B,UAAU,CACtC,EACE,IAAI,EAAE,QAAQ,EACd,KAAK,EACL,GAAQ,EACR,KAAU,EACV,KAAY,EACZ,QAAe,GAChB,EAAE;IACD,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,EACD,EAAE,MAAmB,gBAiHtB"}

package/dist/server/plugins/table/funcs/metaFormat/index.js

@@ -68,6 +68,15 @@ export default async function metaFormat({ rows: original, table, cls = {}, html
             if (!sufix) {
                 Object.assign(el, { [attr.name]: val.text || val });
             }
+            else if (Array.isArray(val)) {
+                Object.assign(el, {
+                    [val?.[0]?.color ? `${attr.name}_data` : `${attr.name}_text`]: val?.[0]?.color
+                        ? val
+                        : val?.[0]?.text
+                            ? val.map((e) => e.text)
+                            : val,
+                });
+            }
             else {
                 Object.assign(el, {
                     [val?.color ? `${attr.name}_data` : `${attr.name}_text`]: val.color ? val : val.text || val,

package/dist/server/routes/crud/controllers/insert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/insert.ts"],"names":[],"mappings":"AAqBA,wBAA8B,MAAM,CAAC,GAAG,EAAE,GAAG,gBAgM5C"}
+{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/insert.ts"],"names":[],"mappings":"AAmBA,wBAA8B,MAAM,CAAC,GAAG,EAAE,GAAG,gBAgM5C"}

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

@@ -9,6 +9,7 @@ export declare function getTableColumnMeta({ table, template, column, selectName
     key?: string;
     pg?: ExtendedPG;
 }): Promise<{
+    count: any;
     arr: any;
     original: string;
     searchQuery: string;

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;AA+BpD,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,gBA6d7C"}
+{"version":3,"file":"suggest.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/suggest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA+BpD,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;;;;;;UAyGA;AAED,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,gBA6d7C"}

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

@@ -45,11 +45,24 @@ export async function getTableColumnMeta({ table, template, column, selectName,
     const searchQuerySelect = startsWith && key
         ? `id in ( with cc(id, text) as (${select}) select id from cc where (left(lower("text"),${key.length})=$1) )`
         : `id in ( with cc(id, text) as (${select}) select id from cc where (lower("text") ~ $1) )`;
+    const counts = pg.queryCache
+        ? await pg
+            .queryCache(`SELECT json_object_agg(          (
+            SELECT
+              nspname
+            FROM
+              pg_namespace
+            WHERE
+              oid = relnamespace
+          ) || '.' || relname, reltuples::bigint) FROM pg_class WHERE relkind = 'r'`)
+            .then((r) => r.rows[0].json_object_agg)
+        : {};
     if (pg.pgType?.[dataTypeID]?.includes("[]")) {
         const original = filtered
             ? `with c(id,text) as (select id, id as text from (select unnest(${column}) as id from ${tableName} t ${sqlTable})q group by id) select id, text from c`
             : `with c(id,text) as (select id, id as text, count(*) from (select unnest(${column}) as id from ${tableName} t ${sqlTable})q group by id limit ${defaultLimit}) select * from c`;
         return {
+            count: counts[tableName] || 0,
             arr,
             original,
             searchQuery: select ? searchQuerySelect : searchQueryDefault,
@@ -60,6 +73,7 @@ export async function getTableColumnMeta({ table, template, column, selectName,
         ? `with c(id,text) as (select ${column} as id, ${column} as text from ${tableName} t ${sqlTable} group by ${column}) select id, text from c`
         : `with c(id,text) as (select ${column}  as id, ${column} as text, count(*) from ${tableName} t ${sqlTable} group by ${column} limit ${defaultLimit}) select * from c`;
     return {
+        count: counts[tableName] || 0,
         arr,
         original,
         searchQuery: select ? searchQuerySelect : searchQueryDefault,

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