@opengis/fastify-table 1.1.133 → 1.1.135

package/server/routes/logger/controllers/utils/checkUserAccess.js

@@ -1,19 +1,19 @@
-import config from '../../../../../config.js';
-
-/**
- *
- * @summary check user access to logger interface - per admin user type or user group
- * @returns {Object} message, status
- */
-
-export default function checkUserAccess({ user = {} }) {
-  // console.log(user);
-  if (user.user_type !== 'admin' && !config?.local) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  /* if (!['admin', 'superadmin']?.includes(user.user_type) && count === '0') {
-    return { message: 'access restricted', status: 403 };
-  } */
-  return { message: 'access granted', status: 200 };
-}
+import config from '../../../../../config.js';
+
+/**
+ *
+ * @summary check user access to logger interface - per admin user type or user group
+ * @returns {Object} message, status
+ */
+
+export default function checkUserAccess({ user = {} }) {
+  // console.log(user);
+  if (user.user_type !== 'admin' && !config?.local) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  /* if (!['admin', 'superadmin']?.includes(user.user_type) && count === '0') {
+    return { message: 'access restricted', status: 403 };
+  } */
+  return { message: 'access granted', status: 200 };
+}

package/server/routes/logger/controllers/utils/getRootDir.js

@@ -1,26 +1,26 @@
-import fs from 'node:fs';
-import path from 'node:path';
-
-import config from '../../../../../config.js';
-
-// import { existsSync } from 'fs';
-let logDir = null;
-export default function getRootDir() {
-  // absolute / relative path
-  if (logDir) return logDir;
-  const file = ['config.json', '/data/local/config.json'].find(el => (fs.existsSync(el) ? el : null));
-  const root = file === 'config.json' ? process.cwd() : '/data/local';
-  logDir = config.logDir || path.join(root, config.log?.dir || 'log');
-  console.log({ logDir });
-  return logDir;
-
-  // windows debug support
-  /* const customLogDir = process.cwd().includes(':') ? 'c:/data/local' : '/data/local';
-  // docker default path
-  if (existsSync(customLogDir)) {
-    return path.join(customLogDir, config.folder || '', 'log');
-  }
-
-  // non-docker default path
-  return path.join(config.root || '/data/local', config.folder || '', 'log'); */
-}
+import fs from 'node:fs';
+import path from 'node:path';
+
+import config from '../../../../../config.js';
+
+// import { existsSync } from 'fs';
+let logDir = null;
+export default function getRootDir() {
+  // absolute / relative path
+  if (logDir) return logDir;
+  const file = ['config.json', '/data/local/config.json'].find(el => (fs.existsSync(el) ? el : null));
+  const root = file === 'config.json' ? process.cwd() : '/data/local';
+  logDir = config.logDir || path.join(root, config.log?.dir || 'log');
+  console.log({ logDir });
+  return logDir;
+
+  // windows debug support
+  /* const customLogDir = process.cwd().includes(':') ? 'c:/data/local' : '/data/local';
+  // docker default path
+  if (existsSync(customLogDir)) {
+    return path.join(customLogDir, config.folder || '', 'log');
+  }
+
+  // non-docker default path
+  return path.join(config.root || '/data/local', config.folder || '', 'log'); */
+}

package/server/routes/logger/index.js

@@ -1,17 +1,17 @@
-import loggerFile from './controllers/logger.file.js';
-
-// import loggerTest from './controllers/logger.test.api.js';
-
-const loggerSchema = {
-  querystring: {
-    download: { type: 'string', pattern: '^(\\d+)$' },
-    full: { type: 'string', pattern: '^(\\d+)$' },
-    dir: { type: 'string', pattern: '^(\\d+)$' },
-  },
-};
-
-async function plugin(fastify) {
-  fastify.get('/logger-file/*', { config: { policy: ['site'] }, schema: loggerSchema }, loggerFile);
-}
-
-export default plugin;
+import loggerFile from './controllers/logger.file.js';
+
+// import loggerTest from './controllers/logger.test.api.js';
+
+const loggerSchema = {
+  querystring: {
+    download: { type: 'string', pattern: '^(\\d+)$' },
+    full: { type: 'string', pattern: '^(\\d+)$' },
+    dir: { type: 'string', pattern: '^(\\d+)$' },
+  },
+};
+
+async function plugin(fastify) {
+  fastify.get('/logger-file/*', { config: { policy: ['site'] }, schema: loggerSchema }, loggerFile);
+}
+
+export default plugin;

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(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;

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

@@ -1,156 +1,156 @@
-import {
-  config, getTemplate, getFilterSQL, getMeta, metaFormat, getAccess, setToken, gisIRColumn, applyHook,
-  handlebars,
-} from '../../../../utils.js';
-
-const maxLimit = 100;
-export default async function dataAPI(req) {
-  const {
-    pg, params, query = {}, user = {},
-  } = req;
-
-  const time = Date.now();
-
-  const { uid } = user;
-
-  const hookData = await applyHook('preData', {
-    table: params?.table, id: params?.id, user,
-  });
-  if (hookData?.message && hookData?.status) {
-    return { message: hookData?.message, status: hookData?.status };
-  }
-
-  const loadTable = await getTemplate('table', hookData?.table || params.table);
-  if (!loadTable) { return { message: 'template not found', status: 404 }; }
-
-  const id = hookData?.id || params?.id;
-  const { actions = [], query: accessQuery } = await getAccess({ table: hookData?.table || params.table, id, user }) || {};
-
-  if (!actions.includes('view') && !config?.local) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  const {
-    table, columns = [], sql, cardSql, filters, form, meta, sqlColumns, public: ispublic,
-  } = loadTable;
-
-  const tableMeta = await getMeta(table);
-  if (tableMeta?.view) {
-    if (!loadTable?.key) return { message: `key not found: ${table}`, status: 404 };
-    Object.assign(tableMeta, { pk: loadTable?.key });
-  }
-  const { pk, columns: dbColumns = [] } = tableMeta || {};
-
-  if (!pk) return { message: `table not found: ${table}`, status: 404 };
-
-  const cols = columns.filter((el) => el.name !== 'geom').map((el) => el.name || el).join(',');
-  const metaCols = Object.keys(loadTable?.meta?.cls || {}).filter((el) => !cols.includes(el)).length
-    ? `,${Object.keys(loadTable?.meta?.cls || {})?.filter((el) => !cols.includes(el)).join(',')}`
-    : '';
-  const columnList = dbColumns.map((el) => el.name || el).join(',');
-  const sqlTable = sql?.filter?.((el) => !el?.disabled && el?.sql?.replace).map((el, i) => ` left join lateral (${el.sql.replace('{{uid}}', uid)}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
-  const cardSqlFiltered = hookData?.id || params.id ? (cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) || []) : [];
-  const cardSqlTable = cardSqlFiltered.length ? cardSqlFiltered.map((el, i) => ` left join lateral (${el.sql.replace('{{uid}}', uid)}) ct${i}  on 1=1 `).join('\n') || '' : '';
-
-  if (params.id && columnList.includes(params.id)) {
-    return gisIRColumn({
-      pg,
-      layer: params.table,
-      column: params.id,
-      sql: query.sql,
-      filter: query.filter,
-      search: query.search,
-      state: query.state,
-      custom: query.custom,
-    });
-  }
-
-  const checkFilter = [query.filter, query.search, query.state, query.custom].filter((el) => el).length;
-  const fData = checkFilter ? await getFilterSQL({
-    table: params.table,
-    filter: query.filter,
-    search: query.search,
-    state: query.state,
-    custom: query.custom,
-    json: 1,
-  }) : {};
-
-  const keyQuery = query.key && loadTable.key && !(hookData?.id || params.id) ? `${loadTable.key}=$1` : null;
-
-  const limit = Math.min(maxLimit, +(query.limit || 20));
-
-  const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
-  // id, query, filter
-  const [orderColumn, orderDir] = (query.order || loadTable.order || '').split(/[- ]/);
-
-  const order = columnList.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
-  const search = loadTable.meta?.search && query.search
-    ? `(${loadTable.meta?.search.split(',').map(el => `${el} ilike '%${query.search.replace(/%/g, '\\%')}%'`).join(' or ')})`
-    : null;
-  const queryBbox = query?.bbox ? query.bbox.replace(/ /g, ',').split(',')?.map((el) => el - 0) : [];
-  const queryPolyline = meta?.bbox && query?.polyline ? `ST_Contains(ST_MakePolygon(ST_LineFromEncodedPolyline('${query?.polyline}')),${meta.bbox})` : undefined;
-  const bbox = meta?.bbox && queryBbox.filter((el) => !Number.isNaN(el))?.length === 4 ? `${meta.bbox} && 'box(${queryBbox[0]} ${queryBbox[1]},${queryBbox[2]} ${queryBbox[3]})'::box2d ` : undefined;
-
-  const interfaceQuery = params?.query ? await handlebars.compile(params?.query)({ user, uid }) : undefined;
-  const where = [(hookData?.id || params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, search, accessQuery || '1=1', bbox, queryPolyline, interfaceQuery].filter((el) => el).filter((el) => (user?.user_type === 'superadmin' ? !el.includes('{{uid}}') : true));
-
-  // const cardColumns = cardSqlFiltered.length ? `,${cardSqlFiltered.map((el) => el.name)}` : '';
-  const q = `select  ${pk ? `"${pk}" as id,` : ''} 
-                     ${params.id || query.key ? '*' : sqlColumns || cols || '*'} 
-                     ${metaCols} 
-                     
-                     ${dbColumns.find((el) => el.name === 'geom' && pg.pgType[el.dataTypeID] === 'geometry') ? ',st_asgeojson(geom)::json as geom' : ''} 
-                     from (select * from ${table} where ${sqlTable ? 'true' : (where.join(' and ') || 'true')}  ${order}) t 
-                     ${sqlTable} 
-                     ${cardSqlTable} 
-                     where ${where.join(' and ') || 'true'} 
-                     ${order} ${offset}  limit ${limit}`
-    .replace(/{{uid}}/g, uid);
-
-  // if (user?.user_type === 'superadmin') console.log(q);
-
-  if (query.sql === '1') { return q; }
-
-  const { rows } = await pg.query(q, (hookData?.id || params.id ? [hookData?.id || params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
-
-  const filterWhere = [fData.q, search, bbox, queryPolyline, interfaceQuery, loadTable.query].filter((el) => el);
-
-  const aggregates = dbColumns.map((el) => ({ name: el.name, type: pg.pgType[el.dataTypeID] })).filter((el) => ['numeric', 'double precision'].includes(el.type));
-  const qCount = `select 
-            count(*)::int as total,  
-            count(*) FILTER(WHERE ${filterWhere.join(' and ') || 'true'})::int as filtered
-            ${aggregates.length ? `,${aggregates.map((el) => `sum(${el.name}) FILTER(WHERE ${filterWhere.join(' and ') || 'true'}) as ${el.name}`).join(',')}` : ''}
-            from ${table} t ${sqlTable} 
-            where ${[loadTable.query, accessQuery].filter(el => el).join(' and ') || 'true'} `
-    .replace(/{{uid}}/g, uid);
-
-  if (query.sql === '2') { return qCount; }
-
-  const counts = keyQuery || hookData?.id || params.id
-    ? { total: rows.length, filtered: rows.length }
-    : await pg.queryCache(qCount, { table: loadTable.table, time: 5 }).then(el => el?.rows[0] || {});
-
-  const { total, filtered } = counts;
-  const agg = Object.keys(counts).filter(el => !['total', 'filtered'].includes(el)).reduce((acc, el) => ({ ...acc, [el]: counts[el] }), {});
-
-  await metaFormat({ rows, table: hookData?.table || params.table });
-  const res = {
-    time: Date.now() - time, public: ispublic, card: loadTable.card, actions, total, filtered, count: rows.length, pk, form, agg, rows, meta, columns, filters,
-  };
-
-  // console.log({ add: loadTable.table, form: loadTable.form });
-  if (uid && actions.includes('add')) {
-    const addTokens = setToken({
-      ids: [JSON.stringify({ table: hookData?.table || params.table, form: loadTable.form })],
-      uid,
-      array: 1,
-    });
-    Object.assign(res, { addToken: addTokens[0] });
-  }
-
-  const result = await applyHook('afterData', {
-    table: loadTable.table, payload: res, user,
-  });
-
-  return result || res;
-}
+import {
+  config, getTemplate, getFilterSQL, getMeta, metaFormat, getAccess, setToken, gisIRColumn, applyHook,
+  handlebars,
+} from '../../../../utils.js';
+
+const maxLimit = 100;
+export default async function dataAPI(req) {
+  const {
+    pg, params, query = {}, user = {},
+  } = req;
+
+  const time = Date.now();
+
+  const { uid } = user;
+
+  const hookData = await applyHook('preData', {
+    table: params?.table, id: params?.id, user,
+  });
+  if (hookData?.message && hookData?.status) {
+    return { message: hookData?.message, status: hookData?.status };
+  }
+
+  const loadTable = await getTemplate('table', hookData?.table || params.table);
+  if (!loadTable) { return { message: 'template not found', status: 404 }; }
+
+  const id = hookData?.id || params?.id;
+  const { actions = [], query: accessQuery } = await getAccess({ table: hookData?.table || params.table, id, user }) || {};
+
+  if (!actions.includes('view') && !config?.local) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  const {
+    table, columns = [], sql, cardSql, filters, form, meta, sqlColumns, public: ispublic,
+  } = loadTable;
+
+  const tableMeta = await getMeta(table);
+  if (tableMeta?.view) {
+    if (!loadTable?.key) return { message: `key not found: ${table}`, status: 404 };
+    Object.assign(tableMeta, { pk: loadTable?.key });
+  }
+  const { pk, columns: dbColumns = [] } = tableMeta || {};
+
+  if (!pk) return { message: `table not found: ${table}`, status: 404 };
+
+  const cols = columns.filter((el) => el.name !== 'geom').map((el) => el.name || el).join(',');
+  const metaCols = Object.keys(loadTable?.meta?.cls || {}).filter((el) => !cols.includes(el)).length
+    ? `,${Object.keys(loadTable?.meta?.cls || {})?.filter((el) => !cols.includes(el)).join(',')}`
+    : '';
+  const columnList = dbColumns.map((el) => el.name || el).join(',');
+  const sqlTable = sql?.filter?.((el) => !el?.disabled && el?.sql?.replace).map((el, i) => ` left join lateral (${el.sql.replace('{{uid}}', uid)}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
+  const cardSqlFiltered = hookData?.id || params.id ? (cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) || []) : [];
+  const cardSqlTable = cardSqlFiltered.length ? cardSqlFiltered.map((el, i) => ` left join lateral (${el.sql.replace('{{uid}}', uid)}) ct${i}  on 1=1 `).join('\n') || '' : '';
+
+  if (params.id && columnList.includes(params.id)) {
+    return gisIRColumn({
+      pg,
+      layer: params.table,
+      column: params.id,
+      sql: query.sql,
+      filter: query.filter,
+      search: query.search,
+      state: query.state,
+      custom: query.custom,
+    });
+  }
+
+  const checkFilter = [query.filter, query.search, query.state, query.custom].filter((el) => el).length;
+  const fData = checkFilter ? await getFilterSQL({
+    table: params.table,
+    filter: query.filter,
+    search: query.search,
+    state: query.state,
+    custom: query.custom,
+    json: 1,
+  }) : {};
+
+  const keyQuery = query.key && loadTable.key && !(hookData?.id || params.id) ? `${loadTable.key}=$1` : null;
+
+  const limit = Math.min(maxLimit, +(query.limit || 20));
+
+  const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
+  // id, query, filter
+  const [orderColumn, orderDir] = (query.order || loadTable.order || '').split(/[- ]/);
+
+  const order = columnList.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
+  const search = loadTable.meta?.search && query.search
+    ? `(${loadTable.meta?.search.split(',').map(el => `${el} ilike '%${query.search.replace(/%/g, '\\%')}%'`).join(' or ')})`
+    : null;
+  const queryBbox = query?.bbox ? query.bbox.replace(/ /g, ',').split(',')?.map((el) => el - 0) : [];
+  const queryPolyline = meta?.bbox && query?.polyline ? `ST_Contains(ST_MakePolygon(ST_LineFromEncodedPolyline('${query?.polyline}')),${meta.bbox})` : undefined;
+  const bbox = meta?.bbox && queryBbox.filter((el) => !Number.isNaN(el))?.length === 4 ? `${meta.bbox} && 'box(${queryBbox[0]} ${queryBbox[1]},${queryBbox[2]} ${queryBbox[3]})'::box2d ` : undefined;
+
+  const interfaceQuery = params?.query ? await handlebars.compile(params?.query)({ user, uid }) : undefined;
+  const where = [(hookData?.id || params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, search, accessQuery || '1=1', bbox, queryPolyline, interfaceQuery].filter((el) => el).filter((el) => (user?.user_type === 'superadmin' ? !el.includes('{{uid}}') : true));
+
+  // const cardColumns = cardSqlFiltered.length ? `,${cardSqlFiltered.map((el) => el.name)}` : '';
+  const q = `select  ${pk ? `"${pk}" as id,` : ''} 
+                     ${params.id || query.key ? '*' : sqlColumns || cols || '*'} 
+                     ${metaCols} 
+                     
+                     ${dbColumns.find((el) => el.name === 'geom' && pg.pgType[el.dataTypeID] === 'geometry') ? ',st_asgeojson(geom)::json as geom' : ''} 
+                     from (select * from ${table} where ${sqlTable ? 'true' : (where.join(' and ') || 'true')}  ${order}) t 
+                     ${sqlTable} 
+                     ${cardSqlTable} 
+                     where ${where.join(' and ') || 'true'} 
+                     ${order} ${offset}  limit ${limit}`
+    .replace(/{{uid}}/g, uid);
+
+  // if (user?.user_type === 'superadmin') console.log(q);
+
+  if (query.sql === '1') { return q; }
+
+  const { rows } = await pg.query(q, (hookData?.id || params.id ? [hookData?.id || params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
+
+  const filterWhere = [fData.q, search, bbox, queryPolyline, interfaceQuery, loadTable.query].filter((el) => el);
+
+  const aggregates = dbColumns.map((el) => ({ name: el.name, type: pg.pgType[el.dataTypeID] })).filter((el) => ['numeric', 'double precision'].includes(el.type));
+  const qCount = `select 
+            count(*)::int as total,  
+            count(*) FILTER(WHERE ${filterWhere.join(' and ') || 'true'})::int as filtered
+            ${aggregates.length ? `,${aggregates.map((el) => `sum(${el.name}) FILTER(WHERE ${filterWhere.join(' and ') || 'true'}) as ${el.name}`).join(',')}` : ''}
+            from ${table} t ${sqlTable} 
+            where ${[loadTable.query, accessQuery].filter(el => el).join(' and ') || 'true'} `
+    .replace(/{{uid}}/g, uid);
+
+  if (query.sql === '2') { return qCount; }
+
+  const counts = keyQuery || hookData?.id || params.id
+    ? { total: rows.length, filtered: rows.length }
+    : await pg.queryCache(qCount, { table: loadTable.table, time: 5 }).then(el => el?.rows[0] || {});
+
+  const { total, filtered } = counts;
+  const agg = Object.keys(counts).filter(el => !['total', 'filtered'].includes(el)).reduce((acc, el) => ({ ...acc, [el]: counts[el] }), {});
+
+  await metaFormat({ rows, table: hookData?.table || params.table });
+  const res = {
+    time: Date.now() - time, public: ispublic, card: loadTable.card, actions, total, filtered, count: rows.length, pk, form, agg, rows, meta, columns, filters,
+  };
+
+  // console.log({ add: loadTable.table, form: loadTable.form });
+  if (uid && actions.includes('add')) {
+    const addTokens = setToken({
+      ids: [JSON.stringify({ table: hookData?.table || params.table, form: loadTable.form })],
+      uid,
+      array: 1,
+    });
+    Object.assign(res, { addToken: addTokens[0] });
+  }
+
+  const result = await applyHook('afterData', {
+    table: loadTable.table, payload: res, user,
+  });
+
+  return result || res;
+}