@opengis/fastify-table 1.3.71 → 1.3.73

package/server/routes/menu/controllers/getMenu.js

@@ -0,0 +1,97 @@
+/* eslint-disable no-param-reassign */
+/* eslint-disable camelcase */
+/* eslint-disable no-nested-ternary */
+import { join } from 'node:path';
+import { existsSync, readdirSync, readFileSync } from 'node:fs';
+
+import {
+ userTemplateDir, pgClients, applyHook, config,
+} from '../../../../utils.js';
+
+const menuCache = [];
+
+// check module dir
+const moduleDir = join(process.cwd(), 'module');
+const dirs = existsSync(moduleDir)
+    ? readdirSync(moduleDir).map(el => join(moduleDir, el))
+    : [];
+
+const isProduction = process.env.NODE_ENV === 'production';
+// readMenu();
+
+async function readMenu() {
+    const menuList = dirs.concat(userTemplateDir)
+        .map(el => join(el, 'menu.json'))
+        .filter(el => existsSync(el));
+    // const list = menuList.map(el => readFileSync(el, 'utf-8')); // sync
+    const list = menuList.filter((el, idx, arr) => el && arr.indexOf(el) === idx).map(el => readFileSync(el, 'utf-8')); // sync
+    const menus = list.reduce((p, el) => p.concat(JSON.parse(el)), [])
+        .map(el => ({ order: 0, ...el }))
+        .sort((a, b) => ((a.order > b.order) ? 1 : ((b.order > a.order) ? -1 : 0)));
+
+    if (!menuCache.length) {
+        menus.forEach(el => menuCache.push(el));
+    }
+
+    return menus;
+}
+
+export default async function adminMenu({ user = {}, session, pg = pgClients.client }, reply) {
+    const time = Date.now();
+
+    if (!user.uid) {
+        return reply.status(403).send('access restricted');
+    }
+
+    const menus = isProduction && menuCache.length ? menuCache : await readMenu();
+
+    const { rows } = await pgClients.client.query(`select property_key as key,property_text as val from admin.properties where property_key~'^(${config.settingKeys || 'site|map|admin'})'`);
+    const settings = rows.reduce((p, { key, val }) => { const [k1, k2] = key.split('.'); p[k1] = p[k1] || {}; p[k1][k2] = val; return p; }, {});
+
+    if (config.settings) Object.assign(settings, config.settings);
+
+    // update user access
+    const {
+        user_name, sur_name, father_name, email, phone, uid,
+    } = user;
+
+    const result = {
+        settings,
+        user: {
+            uid, user_name, sur_name, father_name, email, phone,
+        },
+    };
+    await applyHook('userMenu', result);
+
+    if (session && user?.uid && !user.user_type?.includes?.('admin') && !user.type?.includes?.('admin') && pg.pk['admin.role_access']) {
+        const { type, gl = [], routes = [] } = await pg.query(`select user_type as type, b.gl,routes from admin.users a
+        left join lateral (
+            select array_agg(role_id) as gl from admin.user_roles 
+            where   user_uid=a.uid 
+            and     role_id in ( select role_id from admin.roles where enabled)
+        )b on 1=1
+        left join lateral (
+            select array_agg(route_id) as routes from admin.role_access where role_id=any(b.gl)
+        )r on 1=1
+        where uid=$1`, [user.uid]).then(el => el.rows[0] || {});
+        /* const { interfaces = [] } = await pg.query(`select array_agg(route_id) as interfaces from admin.role_access
+        where user_uid=$1 or role_id=any($2::text[])`, [user.uid, gl]).then((res) => res.rows?.[0] || {}); */
+
+        Object.assign(user, { type, group_list: gl, routes });
+        session?.set?.('passport', { user });
+
+        if (type?.includes?.('admin')) {
+            return { time: Date.now() - time, menus, ...result };
+        }
+
+        const userMenus = menus.map(el => (el.menu ? { ...el, menu: el.menu.filter(item => routes?.includes(item.path)) } : el));
+        const filtered = userMenus.filter(el => el.menu?.length || routes?.includes(el.path));
+        return { time: Date.now() - time, menus: filtered, ...result };
+        // .filter((el, idx, arr) => arr.map((el) => el?.ua || el?.en || el?.name).indexOf(el?.ua || el?.en || el?.name) === idx)
+    }
+
+    // skip dupes?
+    // .filter((el, idx, arr) => arr.map((el) => el?.ua || el?.en || el?.name).indexOf(el?.ua || el?.en || el?.name) === idx)
+
+    return { time: Date.now() - time, menus, ...result };
+}

package/server/routes/menu/controllers/interfaces.js

@@ -0,0 +1,21 @@
+import { pgClients, getTemplatePath } from '../../../../utils.js';
+
+export default async function getInterfaces({ pg = pgClients.client }) {
+    const { rows = [] } = await pg.query('select route_id, alias, table_name, title, enabled from admin.routes');
+
+    const interfaces = rows
+        .filter((el, idx, arr) => el.table_name && arr.findIndex(item => item.route_id === el.route_id) === idx)
+        .filter(el => pg.pk?.[el.table_name || ''])
+        .filter(el => !['log.', 'admin.', 'setting.'].find(item => el.table_name.startsWith(item)))
+        .map(el => ({
+            title: el.title,
+            alias: el.alias,
+            table: el.table_name,
+            route: el.route_id,
+            enabled: el.enabled,
+        }));
+
+    const all = getTemplatePath('table').map(el => el[0]);
+
+    return interfaces.filter(el => el.alias && all.includes(el.alias));
+}

package/server/routes/menu/index.mjs

@@ -0,0 +1,8 @@
+import getMenu from './controllers/getMenu.js';
+import interfaces from './controllers/interfaces.js';
+
+export default async function route(app, config = {}) {
+  const { prefix = '/api' } = config;
+  app.get(`${prefix}/user-menu`, getMenu);
+  app.get(`${prefix}/interfaces`, { config: { policy: ['admin'] } }, interfaces);
+}

package/server/routes/properties/controllers/properties.add.js

@@ -1,55 +1,55 @@
-import { dataInsert } from '../../../../utils.js';
-
-const table = 'crm.properties';
-
-function checkKeyType({ body, key }) {
-  if (typeof body[key] === 'number' && (!/\D/.test(body[key].toString()) && body[key].toString().length < 10)) {
-    return { [key]: 'int' };
-  } if (typeof body[key] === 'object') {
-    return { [key]: 'json' };
-  }
-  if (Date.parse(body[key], 'yyyy/MM/ddTHH:mm:ss.000Z')) {
-    return { [key]: 'date' };
-  }
-  return { [key]: 'text' };
-}
-
-export default async function addExtraProperties({
-  pg, params = {}, body = {}, user = {},
-}) {
-  const { id } = params;
-  const { uid } = user;
-  if (!uid) {
-    return { message: 'access restricted: uid', status: 403 };
-  }
-  if (!id) {
-    return { message: 'not enougn params: 1', status: 400 };
-  }
-  const extraProperties = Object.keys(body);
-  if (!extraProperties.length) {
-    return { message: 'not enougn params: 2', status: 400 };
-  }
-
-  if (!pg.pk?.[table]) {
-    return { message: 'table not found: crm.properties', status: 400 };
-  }
-
-  await pg.query('delete from crm.properties where object_id=$1', [id]); // rewrite?
-  const keyTypeMatch = extraProperties.filter((key) => body[key]).reduce((acc, curr) => Object.assign(acc, checkKeyType({ body, key: curr })), {});
-  const res = await Promise.all(Object.keys(keyTypeMatch).map(async (key) => {
-    const propertyType = keyTypeMatch[key];
-    const { rows = [] } = await dataInsert({
-      pg,
-      table,
-      data: {
-        property_type: propertyType,
-        property_key: key,
-        object_id: id,
-        [`property_${propertyType}`]: body[key],
-      },
-      uid,
-    });
-    return { id: rows[0]?.property_id, type: propertyType, value: body[key] };
-  }));
-  return { message: { rows: res }, status: 200 };
-}
+import { dataInsert } from '../../../../utils.js';
+
+const table = 'crm.properties';
+
+function checkKeyType({ body, key }) {
+  if (typeof body[key] === 'number' && (!/\D/.test(body[key].toString()) && body[key].toString().length < 10)) {
+    return { [key]: 'int' };
+  } if (typeof body[key] === 'object') {
+    return { [key]: 'json' };
+  }
+  if (Date.parse(body[key], 'yyyy/MM/ddTHH:mm:ss.000Z')) {
+    return { [key]: 'date' };
+  }
+  return { [key]: 'text' };
+}
+
+export default async function addExtraProperties({
+  pg, params = {}, body = {}, user = {},
+}) {
+  const { id } = params;
+  const { uid } = user;
+  if (!uid) {
+    return { message: 'access restricted: uid', status: 403 };
+  }
+  if (!id) {
+    return { message: 'not enougn params: 1', status: 400 };
+  }
+  const extraProperties = Object.keys(body);
+  if (!extraProperties.length) {
+    return { message: 'not enougn params: 2', status: 400 };
+  }
+
+  if (!pg.pk?.[table]) {
+    return { message: 'table not found: crm.properties', status: 400 };
+  }
+
+  await pg.query('delete from crm.properties where object_id=$1', [id]); // rewrite?
+  const keyTypeMatch = extraProperties.filter((key) => body[key]).reduce((acc, curr) => Object.assign(acc, checkKeyType({ body, key: curr })), {});
+  const res = await Promise.all(Object.keys(keyTypeMatch).map(async (key) => {
+    const propertyType = keyTypeMatch[key];
+    const { rows = [] } = await dataInsert({
+      pg,
+      table,
+      data: {
+        property_type: propertyType,
+        property_key: key,
+        object_id: id,
+        [`property_${propertyType}`]: body[key],
+      },
+      uid,
+    });
+    return { id: rows[0]?.property_id, type: propertyType, value: body[key] };
+  }));
+  return { message: { rows: res }, status: 200 };
+}

package/server/routes/properties/controllers/properties.get.js

@@ -1,17 +1,17 @@
-export default async function getExtraProperties({
-  pg, params = {},
-}) {
-  const { id } = params;
-  if (!id) {
-    return { message: 'not enougn params', status: 400 };
-  }
-
-  const { rows = [] } = pg.pk?.['crm.properties']
-    ? await pg.query(`select property_key, property_type, property_text, property_int,
-            property_json, property_date from crm.properties where property_key is not null and object_id=$1`, [id])
-    : {};
-  if (!rows.length) return {};
-
-  const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.property_key]: curr[`property_${curr.property_type}`] }), {});
-  return { message: data, status: 200 };
-}
+export default async function getExtraProperties({
+  pg, params = {},
+}) {
+  const { id } = params;
+  if (!id) {
+    return { message: 'not enougn params', status: 400 };
+  }
+
+  const { rows = [] } = pg.pk?.['crm.properties']
+    ? await pg.query(`select property_key, property_type, property_text, property_int,
+            property_json, property_date from crm.properties where property_key is not null and object_id=$1`, [id])
+    : {};
+  if (!rows.length) return {};
+
+  const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.property_key]: curr[`property_${curr.property_type}`] }), {});
+  return { message: data, status: 200 };
+}

package/server/routes/properties/index.js

@@ -1,16 +1,16 @@
-import getExtraProperties from './controllers/properties.get.js';
-import addExtraProperties from './controllers/properties.add.js';
-
-const propertiesSchema = {
-  params: {
-    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-  },
-};
-
-async function plugin(fastify, config = {}) {
-  const prefix = config.prefix || '/api';
-  fastify.get(`${prefix}/properties/:id`, { schema: propertiesSchema }, getExtraProperties);
-  fastify.post(`${prefix}/properties/:id`, { schema: propertiesSchema }, addExtraProperties);
-}
-
-export default plugin;
+import getExtraProperties from './controllers/properties.get.js';
+import addExtraProperties from './controllers/properties.add.js';
+
+const propertiesSchema = {
+  params: {
+    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+  },
+};
+
+async function plugin(app, config = {}) {
+  const { prefix = '/api' } = config;
+  app.get(`${prefix}/properties/:id`, { schema: propertiesSchema }, getExtraProperties);
+  app.post(`${prefix}/properties/:id`, { schema: propertiesSchema }, addExtraProperties);
+}
+
+export default plugin;

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

@@ -1,42 +1,42 @@
-import { applyHook, getTemplate } from '../../../../utils.js';
-
-const sql = `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 }) {
-  const { rows = [] } = await pg.query(sql);
-  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) {
-  const time = Date.now();
-
-  const { pg, params, user } = req;
-  const hookData = await applyHook('preForm', { form: params?.form, user });
-
-  if (hookData?.message && hookData?.status) {
-    return { message: hookData?.message, status: hookData?.status };
-  }
-
-  const form = await getTemplate('form', hookData?.form || params?.form);
-  if (!form) { return { status: 404, message: 'not found' }; }
-
-  // replace settings
-  const arr = JSON.stringify(form).match(/{{settings.([^}]*)}}/g);
-  if (arr?.length) {
-    const string = JSON.stringify(form);
-    const settings = await getSettings({ pg });
-    const match = arr.reduce((acc, curr) => Object.assign(acc, { [curr]: settings[curr.replace(/^{{settings./g, '').replace(/}}$/, '')] }), {});
-    const res = Object.keys(match).reduce((s, m) => s.replace(m, match[m]), string);
-    return { time: Date.now() - time, form: JSON.parse(res) };
-  }
-
-  const res = { time: Date.now() - time, form };
-  const res1 = await applyHook('afterForm', {
-    form: hookData?.form || params?.form,
-    payload: res,
-    user,
-  });
-  return res1 || { time: Date.now() - time, form };
-}
+import { applyHook, getTemplate } from '../../../../utils.js';
+
+const sql = `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 }) {
+  const { rows = [] } = await pg.query(sql);
+  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) {
+  const time = Date.now();
+
+  const { pg, params, user } = req;
+  const hookData = await applyHook('preForm', { form: params?.form, user });
+
+  if (hookData?.message && hookData?.status) {
+    return { message: hookData?.message, status: hookData?.status };
+  }
+
+  const form = await getTemplate('form', hookData?.form || params?.form);
+  if (!form) { return { status: 404, message: 'not found' }; }
+
+  // replace settings
+  const arr = JSON.stringify(form).match(/{{settings.([^}]*)}}/g);
+  if (arr?.length) {
+    const string = JSON.stringify(form);
+    const settings = await getSettings({ pg });
+    const match = arr.reduce((acc, curr) => Object.assign(acc, { [curr]: settings[curr.replace(/^{{settings./g, '').replace(/}}$/, '')] }), {});
+    const res = Object.keys(match).reduce((s, m) => s.replace(m, match[m]), string);
+    return { time: Date.now() - time, form: JSON.parse(res) };
+  }
+
+  const res = { time: Date.now() - time, form };
+  const res1 = await applyHook('afterForm', {
+    form: hookData?.form || params?.form,
+    payload: res,
+    user,
+  });
+  return res1 || { time: Date.now() - time, form };
+}

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

@@ -1,74 +1,74 @@
-import {
-  getMeta, metaFormat, getTemplates, getTemplate, handlebars,
-} 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,
-}) {
-  const loadTable = await getTemplate('table', tableName);
-
-  if (!loadTable) { return { message: 'not found', status: 404 }; }
-
-  const {
-    table, columns, meta,
-  } = loadTable;
-
-  const { pk } = await getMeta(table);
-
-  const cols = columns.map((el) => el.name || el).join(',');
-  const [orderColumn, orderDir] = (query.order || loadTable.order || '').split('-');
-  const order = cols.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
-
-  const limit = Math.max(maxLimit - res.rows.length, 0);
-  // Math.max(query.offset - res.rows.length,0)
-  const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
-
-  const search1 = meta?.search && query.key ? `(${meta?.search.concat(meta?.title ? `,${meta?.title}` : '').split(',').map(el => `${el} ilike '%${query.key}%'`).join(' or ')})` : 'false';
-
-  const where = [!pk ? 'false' : 'true', loadTable.query, search1].filter((el) => el);
-  const q = `select ${[`"${pk}" as id`, meta?.title ? `${meta.title} as title` : ''].filter((el) => el).join(',')} from ${table} t where ${where.join(' and ') || 'true'} ${order} ${offset} limit ${limit}`;
-  if (query.sql) {
-    res.sql.push(q);
-    return null;
-  }
-
-  const { rows } = await pg.query(q);
-
-  const total = await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count) || 0;
-
-  await metaFormat({ rows, table: tableName });
-  res.total += +total;
-  rows.forEach((row) => {
-    const href = meta?.href ? handlebars.compile(meta.href)({ ...row, [pk]: row.id }) : undefined;
-    res.rows.push({
-      ...row, register: tableName, register_title: loadTable.ua, href,
-    });
-  });
-  return null;
-}
-
-export default async function search({
-  pg, funcs, query = {},
-}) {
-  const time = Date.now();
-
-  const tables = query.table ? [query.table] : await getTemplates('table');
-  const res = { rows: [], sql: [], total: 0 };
-
-  const maxLimit = Math.min(100, query.limit || '16');
-  await sequence(tables, {
-    pg, funcs, query, maxLimit, res,
-  }, getData);
-
-  if (query.sql) return res.sql.join(';\n');
-
-  return {
-    time: Date.now() - time, total: res.total, count: res.rows.length, rows: res.rows,
-  };
-}
+import {
+  getMeta, metaFormat, getTemplates, getTemplate, handlebars,
+} 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,
+}) {
+  const loadTable = await getTemplate('table', tableName);
+
+  if (!loadTable) { return { message: 'not found', status: 404 }; }
+
+  const {
+    table, columns, meta,
+  } = loadTable;
+
+  const { pk } = await getMeta(table);
+
+  const cols = columns.map((el) => el.name || el).join(',');
+  const [orderColumn, orderDir] = (query.order || loadTable.order || '').split('-');
+  const order = cols.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
+
+  const limit = Math.max(maxLimit - res.rows.length, 0);
+  // Math.max(query.offset - res.rows.length,0)
+  const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
+
+  const search1 = meta?.search && query.key ? `(${meta?.search.concat(meta?.title ? `,${meta?.title}` : '').split(',').map(el => `${el} ilike '%${query.key}%'`).join(' or ')})` : 'false';
+
+  const where = [!pk ? 'false' : 'true', loadTable.query, search1].filter((el) => el);
+  const q = `select ${[`"${pk}" as id`, meta?.title ? `${meta.title} as title` : ''].filter((el) => el).join(',')} from ${table} t where ${where.join(' and ') || 'true'} ${order} ${offset} limit ${limit}`;
+  if (query.sql) {
+    res.sql.push(q);
+    return null;
+  }
+
+  const { rows } = await pg.query(q);
+
+  const total = await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count) || 0;
+
+  await metaFormat({ rows, table: tableName });
+  res.total += +total;
+  rows.forEach((row) => {
+    const href = meta?.href ? handlebars.compile(meta.href)({ ...row, [pk]: row.id }) : undefined;
+    res.rows.push({
+      ...row, register: tableName, register_title: loadTable.ua, href,
+    });
+  });
+  return null;
+}
+
+export default async function search({
+  pg, funcs, query = {},
+}) {
+  const time = Date.now();
+
+  const tables = query.table ? [query.table] : await getTemplates('table');
+  const res = { rows: [], sql: [], total: 0 };
+
+  const maxLimit = Math.min(100, query.limit || '16');
+  await sequence(tables, {
+    pg, funcs, query, maxLimit, res,
+  }, getData);
+
+  if (query.sql) return res.sql.join(';\n');
+
+  return {
+    time: Date.now() - time, total: res.total, count: res.rows.length, rows: res.rows,
+  };
+}

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

@@ -2,7 +2,7 @@ import path from 'node:path';
 import { existsSync, readFileSync } from 'node:fs';
 
 import {
-  config, getPG, getTemplate, getSelectMeta, getMeta, applyHook, getSelectVal, logger,
+  config, getPG, getTemplate, getSelectMeta, getMeta, applyHook, getSelectVal, logger, getSelect,
 } from '../../../../utils.js';
 
 const limit = 50;
@@ -12,12 +12,19 @@ const headers = {
   'Cache-Control': 'no-cache',
 };
 
-function getTableColumnMeta(table, column, filtered) {
+async function getTableColumnMeta(tableName, column, filtered, pg) {
+  if (!tableName || !column) { return null; }
+
+  const loadTable = await getTemplate('table', tableName);
+  const { data: clsName } = loadTable?.columns?.find?.(el => el.name === column) || {};
+  const { arr } = await getSelect(clsName, pg) || {};
+
   const original = {
-    true: `with c(id,text) as (select ${column}, ${column} from ${table} group by ${column}) select id, text from c`,
-    false: `with c(id,text) as (select ${column}, ${column}, count(*) from ${table} group by ${column} limit ${limit}) select * from c`,
+    true: `with c(id,text) as (select ${column} as id, ${column} as text from ${loadTable?.table || tableName} group by ${column}) select id, text from c`,
+    false: `with c(id,text) as (select ${column}  as id, ${column} as text, count(*) from ${loadTable?.table || tableName} group by ${column} limit ${limit}) select * from c`,
   }[!!filtered];
   return {
+    arr,
     original,
     searchQuery: '(lower("text") ~ $1 )',
     pk: 'id',
@@ -41,13 +48,13 @@ export default async function suggest(req) {
     }
   }
 
-  const [table, column] = params.data?.includes(':') ? params.data.split(':') : [];
+  const [table, column] = params.data?.includes(':') ? params.data.split(':') : [query.token, query.column];
   const selectName = query.sel || query.name || params.data;
 
   if (!selectName) return { status: 400, message: 'name is required' };
 
   const { body: hookBody } = table || query.token ? await applyHook('preSuggest', { pg: pg1, table: table || query.token }) || {} : {};
-  const body = await getTemplate('table', table);
+  const body = await getTemplate('table', table || query.token);
   const tableName = hookBody?.table || body?.table || table || query.token;
 
   if (table && !pg1.pk?.[tableName]) {
@@ -55,7 +62,7 @@ export default async function suggest(req) {
   }
 
   const tableMeta = await getMeta({ pg: pg1, table: tableName });
-  const columnExists = (hookBody?.columns || body?.columns || tableMeta?.columns)?.find((col) => col?.name === column);
+  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' };
@@ -65,8 +72,8 @@ export default async function suggest(req) {
     return { status: 400, message: 'param limit is invalid' };
   }
 
-  const meta = table && column
-    ? getTableColumnMeta(table, column, query?.key || query?.val)
+  const meta = tableName && column
+    ? await getTableColumnMeta(table, column, query?.key || query?.val, pg1)
     : await getSelectMeta({
       pg: pg1, name: selectName, nocache: query?.nocache, parent,
     });
@@ -95,17 +102,19 @@ export default async function suggest(req) {
     const column1 = columns.find(el => el.name === query.column);
     const args = { table: tableName };
     if (!column1) return [];
-    const sqlCls = `select array_agg(distinct value)::text[] from (select ${pg.pgType?.[column1.dataTypeID]?.includes('[]') ? `unnest(${column1.name})` : `${column1.name}`} as value from ${(loadTable?.table || tableName).replace(/'/g, "''")} where ${hookBody?.query || loadTable?.query || '1=1'})q`;
+    const sqlCls = query.count
+    ? `select value, count(*) from (select ${pg.pgType?.[column1.dataTypeID]?.includes('[]') ? `unnest(${column1.name})` : `${column1.name}`} as value from ${(loadTable?.table || tableName).replace(/'/g, "''")} where ${hookBody?.query || loadTable?.query || '1=1'})q group by value`
+    : `select array_agg(distinct value)::text[] from (select ${pg.pgType?.[column1.dataTypeID]?.includes('[]') ? `unnest(${column1.name})` : `${column1.name}`} as value from ${(loadTable?.table || tableName).replace(/'/g, "''")} where ${hookBody?.query || loadTable?.query || '1=1'})q`;
 
     if (query.sql && (config.local || user?.user_type?.includes?.('admin'))) {
       return sqlCls;
     }
 
-    if (pg.pk?.[loadTable?.table || tableName] && column?.name) {
-      const vals = await pg.queryCache(sqlCls, args).then(el => el.rows?.[0]?.array_agg || []);
-      // console.log(vals);
+    if (pg.pk?.[loadTable?.table || tableName] && column1?.name) {
+      const qRes = await pg.queryCache(sqlCls, args);
+      const vals = (query.count ? qRes.rows?.map?.(el => el.value?.toString?.()) : qRes.rows?.[0]?.array_agg) || [];
 
-      const lower = query.key?.toLowerCase();
+      const lower = query.key?.toLowerCase?.();
       const data1 = query.key || query.val
         ? arr?.filter((el) => !lower || (el[lang] || el.text)?.toLowerCase()?.indexOf(lower) !== -1)?.filter((el) => !query.val || el.id === query.val)
         : arr;
@@ -113,6 +122,11 @@ export default async function suggest(req) {
       const data2 = data1.filter((el) => el.id && vals.includes(el.id.toString()));
       const data = data2.slice(0, Math.min(query.limit || limit, limit));
 
+      if (data.length && query.count) {
+        const counts = qRes.rows?.reduce?.((acc, curr) => ({ ...acc, [curr.value]: curr.count }), {});
+        data.forEach(el => Object.assign(el, { count: counts?.[el.id] || 0 }));
+      }
+
       if (config.debug) {
         logger.file('suggest/debug', {
           type: 1,