@opengis/fastify-table 1.1.49 → 1.1.51

package/table/controllers/data.js

@@ -1,134 +1,150 @@
-import getTemplate from './utils/getTemplate.js';
-import getFilterSQL from '../funcs/getFilterSQL/index.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-import metaFormat from '../funcs/metaFormat/index.js';
-import getAccess from '../../crud/funcs/getAccess.js';
-import setToken from '../../crud/funcs/setToken.js';
-import gisIRColumn from './utils/gisIRColumn.js';
-import applyHook from '../../hook/funcs/applyHook.js';
-import config from '../../config.js';
-
-const maxLimit = 100;
-export default async function dataAPI(req) {
-  const {
-    pg, params, query = {}, user,
-  } = req;
-  const time = Date.now();
-
-  const uid = user?.uid || query.uid || 0;
-
-  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 {
-    actions = [], scope, my, query: access,
-  } = await getAccess({
-    table: hookData?.table || params.table,
-    id: hookData?.id || params?.id,
-    user,
-  }) || {};
-
-  if (!actions.includes('get') || (scope === 'my' && !my)) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  const loadTable = await getTemplate('table', hookData?.table || params.table);
-
-  if (!loadTable) { return { message: 'template not found', status: 404 }; }
-
-  const {
-    table, columns, sql, cardSql, filters, form, meta, sqlColumns, 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 (select json_agg(row_to_json(q)) as ${el.name} from (${el.sql})q) ct${i}  on 1=1 `).join('') || '' : '';
-
-  if (params.id && columnList.includes(params.id)) {
-    return gisIRColumn({
-      pg, layer: params.table, column: params.id, sql: query.sql,
-    });
-  }
-
-  const checkFilter = [query.filter, query.state, query.search, query.custom].filter((el) => el).length;
-  const fData = checkFilter ? await getFilterSQL({
-    table: params.table,
-    filter: query.filter,
-    state: query.state,
-    search: query.search,
-    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}%'`).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 where = [(hookData?.id || params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, search, access?.query || '1=1', bbox, queryPolyline].filter((el) => el);
-  const cardColumns = cardSqlFiltered.length ? `,${cardSqlFiltered.map((el) => el.name)}` : '';
-  const q = `select  ${pk ? `"${pk}" as id,` : ''} ${columnList.includes('geom') ? 'st_asgeojson(geom)::json as geom,' : ''} ${query.id || query.key ? '*' : sqlColumns || cols || '*'} ${metaCols} ${cardColumns} from ${table} t ${sqlTable} ${cardSqlTable} where ${where.join(' and ') || 'true'} ${order} ${offset}  limit ${limit}`;
-
-  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 total = keyQuery || hookData?.id || params.id ? rows.length : await pg.queryCache(`select count(*) from ${table} t ${sqlTable} where ${where.join(' and ') || 'true'}`).then((el) => (el?.rows[0]?.count || 0) - 0);
-
-  await metaFormat({ rows, table: params.table });
-  const res = {
-    time: Date.now() - time, card: loadTable.card, actions: loadTable.actions, access, total, count: rows.length, pk, form, rows, meta, columns, filters,
-  };
-
-  if (!config?.security?.disableToken) {
-    const addTokens = setToken({
-      ids: [JSON.stringify({ add: loadTable.table, form: loadTable.form })],
-      mode: 'a',
-      uid: config?.auth?.disable || ispublic ? '1' : uid,
-      array: 1,
-    });
-    Object.assign(res, { addToken: addTokens[0] });
-
-    rows.forEach((row) => {
-      const editTokens = setToken({
-        ids: [JSON.stringify({ id: row.id, table: loadTable.table, form: loadTable.form })],
-        mode: 'w',
-        uid: config?.auth?.disable || ispublic ? '1' : uid,
-        array: 1,
-      });
-      Object.assign(row, { token: editTokens[0] });
-    });
-  }
-
-  const result = await applyHook('afterData', {
-    table: loadTable.table, payload: res, user,
-  });
-
-  return result || res;
-}
+import getTemplate from './utils/getTemplate.js';
+import getFilterSQL from '../funcs/getFilterSQL/index.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+import metaFormat from '../funcs/metaFormat/index.js';
+import getAccess from '../../crud/funcs/getAccess.js';
+import setToken from '../../crud/funcs/setToken.js';
+import gisIRColumn from './utils/gisIRColumn.js';
+import applyHook from '../../hook/funcs/applyHook.js';
+// import config from '../../config.js';
+
+const maxLimit = 100;
+export default async function dataAPI(req) {
+  const {
+    pg, params, query = {}, user,
+  } = req;
+
+  const time = Date.now();
+
+  const uid = user?.uid || query.uid || 0;
+
+  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('get')) {
+    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 (select json_agg(row_to_json(q)) as ${el.name} from (${el.sql})q) ct${i}  on 1=1 `).join('') || '' : '';
+
+  if (params.id && columnList.includes(params.id)) {
+    return gisIRColumn({
+      pg, layer: params.table, column: params.id, sql: query.sql,
+    });
+  }
+
+  const checkFilter = [query.filter, query.state, query.search, query.custom].filter((el) => el).length;
+  const fData = checkFilter ? await getFilterSQL({
+    table: params.table,
+    filter: query.filter,
+    state: query.state,
+    search: query.search,
+    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}%'`).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 where = [(hookData?.id || params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, search, accessQuery || '1=1', bbox, queryPolyline].filter((el) => el);
+
+  const cardColumns = cardSqlFiltered.length ? `,${cardSqlFiltered.map((el) => el.name)}` : '';
+  const q = `select  ${pk ? `"${pk}" as id,` : ''} 
+                     ${columnList.includes('geom') ? 'st_asgeojson(geom)::json as geom,' : ''} 
+                     ${query.id || query.key ? '*' : sqlColumns || cols || '*'} 
+                     ${metaCols} 
+                     ${cardColumns} 
+                     from ${table} t ${sqlTable} ${cardSqlTable} 
+                     where ${where.join(' and ') || 'true'} 
+                     ${order} ${offset}  limit ${limit}`
+    .replace(/{{uid}}/g, user.uid);
+
+  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].filter((el) => el);
+
+  const qCount = `select 
+            count(*)::int as total,  
+            count(*) FILTER(WHERE ${filterWhere.filter(el => el).join(' and ') || 'true'})::int as filtered 
+            from ${table} t ${sqlTable} 
+            where ${[loadTable.query, accessQuery].filter(el => el).join(' and ') || 'true'} `
+    .replace(/{{uid}}/g, user.uid);
+
+  const { total, filtered } = keyQuery || hookData?.id || params.id ? rows.length
+    : await pg.queryCache(qCount).then((el) => el?.rows[0]);
+
+  await metaFormat({ rows, table: params.table });
+  const res = {
+    time: Date.now() - time, public: ispublic, card: loadTable.card, actions: loadTable.actions, total, filtered, count: rows.length, pk, form, rows, meta, columns, filters,
+  };
+
+  // console.log({ add: loadTable.table, form: loadTable.form });
+  if (user.uid && actions.includes('add')) {
+    const addTokens = setToken({
+      ids: [JSON.stringify({ table: hookData?.table || params.table, form: loadTable.form })],
+      mode: 'a',
+      uid,
+      array: 1,
+    });
+    Object.assign(res, { addToken: addTokens[0] });
+
+    /* rows.forEach((row) => {
+      const editTokens = setToken({
+        ids: [JSON.stringify({ id: row.id, table: loadTable.table, form: loadTable.form })],
+        mode: 'w',
+        uid: config?.auth?.disable ? '1' : uid,
+        array: 1,
+      });
+      Object.assign(row, { token: editTokens[0] });
+    }); */
+  }
+
+  const result = await applyHook('afterData', {
+    table: loadTable.table, payload: res, user,
+  });
+
+  return result || res;
+}

package/table/controllers/filter.js

@@ -1,50 +1,50 @@
-import getTemplate from './utils/getTemplate.js';
-import getSelect from './utils/getSelect.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-import getFilterSQL from '../funcs/getFilterSQL/index.js';
-
-export default async function filter(req) {
-  const time = Date.now();
-
-  const {
-    params,
-  } = req;
-  const loadTable = await getTemplate('table', params.table);
-  if (!loadTable) { return { status: 404, message: 'not found' }; }
-  const { columns } = await getMeta({ table: loadTable.table });
-
-  const { optimizedSQL = `select * from ${loadTable.table}` } = loadTable?.sql ? await getFilterSQL({ table: params.table, pg: req.pg }) : {};
-
-  const filters = loadTable?.filters || loadTable?.filterList || [];
-  await Promise.all(filters.filter((el) => el.data).map(async (el) => {
-    const cls = await getSelect(el.data);
-    if (!cls?.arr || !loadTable.table) return;
-    const { dataTypeID } = columns.find((item) => item.name === el.id) || {};
-    const countArr = req.pg.pgType[dataTypeID]?.includes('[]')
-      ? await req.pg.queryCache(`select unnest(${el.id})::text as id,count(*) from (${optimizedSQL})q group by unnest(${el.id})`)
-      : await req.pg.queryCache(`select ${el.id}::text as id,count(*) from (${optimizedSQL})q group by ${el.id}`);
-
-    const options = countArr.rows.map(cel => {
-      const data = cls?.arr.find(c => c.id === cel.id);
-      return { ...cel, ...data };
-    });
-    Object.assign(el, { options });
-  }));
-
-  const q = ((loadTable?.filterState || []).concat(loadTable?.filterCustom || [])).filter((el) => el.name && el.sql).map((el) => `select count(*), '${el.name}' as name from (${optimizedSQL})q where ${el.sql}`).join(' union all ');
-  const { rows = [] } = q ? await req.pg.query(q) : {};
-  if (rows?.length) {
-    ((loadTable?.filterState || []).concat(loadTable?.filterCustom || [])).filter((el) => el.name && el.sql).forEach((el) => {
-      const { count } = rows.find((row) => row.name === el.name) || {};
-      Object.assign(el, { count, sql: undefined });
-    });
-  }
-
-  return {
-    time: Date.now() - time,
-    list: filters,
-    custom: loadTable?.filterCustom,
-    inline: loadTable?.filterInline,
-    state: loadTable?.filterState,
-  };
-}
+import getTemplate from './utils/getTemplate.js';
+import getSelect from './utils/getSelect.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+import getFilterSQL from '../funcs/getFilterSQL/index.js';
+
+export default async function filter(req) {
+  const time = Date.now();
+
+  const {
+    params,
+  } = req;
+  const loadTable = await getTemplate('table', params.table);
+  if (!loadTable) { return { status: 404, message: 'not found' }; }
+  const { columns } = await getMeta({ table: loadTable.table });
+
+  const { optimizedSQL = `select * from ${loadTable.table}` } = loadTable?.sql ? await getFilterSQL({ table: params.table, pg: req.pg }) : {};
+
+  const filters = loadTable?.filters || loadTable?.filterList || [];
+  await Promise.all(filters.filter((el) => el.data).map(async (el) => {
+    const cls = await getSelect(el.data);
+    if (!cls?.arr || !loadTable.table) return;
+    const { dataTypeID } = columns.find((item) => item.name === el.id) || {};
+    const countArr = req.pg.pgType[dataTypeID]?.includes('[]')
+      ? await req.pg.queryCache(`select unnest(${el.id})::text as id,count(*) from (${optimizedSQL})q group by unnest(${el.id})`)
+      : await req.pg.queryCache(`select ${el.id}::text as id,count(*) from (${optimizedSQL})q group by ${el.id}`);
+
+    const options = countArr.rows.map(cel => {
+      const data = cls?.arr.find(c => c.id === cel.id);
+      return { ...cel, ...data };
+    });
+    Object.assign(el, { options });
+  }));
+
+  const q = ((loadTable?.filterState || []).concat(loadTable?.filterCustom || [])).filter((el) => el.name && el.sql).map((el) => `select count(*), '${el.name}' as name from (${optimizedSQL})q where ${el.sql}`).join(' union all ');
+  const { rows = [] } = q ? await req.pg.query(q) : {};
+  if (rows?.length) {
+    ((loadTable?.filterState || []).concat(loadTable?.filterCustom || [])).filter((el) => el.name && el.sql).forEach((el) => {
+      const { count } = rows.find((row) => row.name === el.name) || {};
+      Object.assign(el, { count, sql: undefined });
+    });
+  }
+
+  return {
+    time: Date.now() - time,
+    list: filters,
+    custom: loadTable?.filterCustom,
+    inline: loadTable?.filterInline,
+    state: loadTable?.filterState,
+  };
+}

package/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/table/controllers/search.js

@@ -1,80 +1,80 @@
-import getTemplate from './utils/getTemplate.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-import metaFormat from '../funcs/metaFormat/index.js';
-import getTemplates from './utils/getTemplates.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, funcs, 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 ? funcs.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();
-
-  try {
-    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,
-    };
-  }
-  catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}
+import getTemplate from './utils/getTemplate.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+import metaFormat from '../funcs/metaFormat/index.js';
+import getTemplates from './utils/getTemplates.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, funcs, 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 ? funcs.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();
+
+  try {
+    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,
+    };
+  }
+  catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
+}