@opengis/fastify-table 1.0.3 → 1.0.4

package/pg/funcs/autoIndex.js

@@ -1,89 +1,89 @@
-// const rclient = require('../../redis/client')
-import pgClient from '../pgClients.js';
-
-// subfunc
-const getTable = ({ table }) => table.toLowerCase().replace(/[\n\r]+/g, ' ').split(' from ')
-  .filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
-  .map((el) => el.split(/[ )]/)[0]);
-
-const loadedIndex = {};
-
-// main func
-async function autoIndex({ table, columns: filter, pg = pgClient.client }) {
-  if (!filter?.length || !table) return null;
-
-  const attrs = filter.map((el) => (el.name || el).replace(/'/g, '')).sort();
-  const types = filter.map((el) => (el.name ? el : { name: el }))
-    .reduce((p, el) => ({ ...p, [el.name]: el.type || '-' }), {});
-
-  const redisKey = `autoindex1:${table}:${attrs.join(';')}`;
-  const tableList = getTable({ table });
-  const existsCache = loadedIndex[redisKey];
-  if (existsCache) { return 'ok'; }
-
-  const tbs = tableList[0];
-  const [ns, tbl] = tableList[0].split('.');
-  const { rows: index } = await pg.query(`select * from pg_indexes where tablename = '${tbl}' and schemaname = '${ns}'`);
-
-  if (existsCache && index?.length > 0) { return null; }
-  // console.log('autoindex', table, filter?.map((el) => el.name || el));
-  const { rows: cols } = await pg.query(`SELECT attrelid::regclass AS tbl, attname AS aname, atttypid::regtype  AS datatype, atttypid  
-    FROM   pg_attribute WHERE  attrelid = '${tbs}'::regclass and attname = any('{ ${attrs} }')`);
-
-  const qIndex = [];
-  const indexAr = {};
-
-  // console.log(cols);
-  for (let i = 0; i < cols.length; i += 1) {
-    const el = cols[i];
-    el.relname = tbl;
-    el.nspname = ns;
-
-    const indexUsing = (el.datatype === 'geometry' ? 'gist' : null)
-      || (types[el.aname] === 'Text' || el.datatype?.includes('[]') ? 'gin' : null)
-      || 'btree';
-
-    const name = `${el.nspname}_${el.relname}_${el.aname}_${indexUsing}_idx`;
-    const exists = index.filter((ind) => ind.tablename === el.relname && ind.schemaname === el.nspname && ind.indexdef.includes(types[el.aname] === 'Text'
-      ? `gin (${el.aname} gin_trgm_ops)` : `btree (${el.aname})`));
-
-    indexAr[el.aname] = {
-      name, type: el.datatype, exists, // exists1,
-    };
-
-    // drop
-    if (exists?.length > 1) {
-      exists.filter((ind, i1) => i1).forEach((ind) => qIndex.push(`DROP INDEX if exists ${ind.schemaname}.${ind.indexname} `));
-    }
-
-    // add
-    if (exists?.length === 0) {
-      // console.log(`${name} - ${el.datatype}`);
-
-      const suffix = types[el.aname] === 'Text' ? 'gin_trgm_ops' : '';
-      if (['text'].includes(el?.datatype)) {
-        qIndex.push(`CREATE INDEX if not exists ${name} ON ${el.nspname}.${el.relname} USING ${indexUsing} (${el.aname} ${suffix})`);
-      }
-      if (indexUsing === 'gist') {
-        qIndex.push(`CREATE INDEX if not exists ${name.replace('gist', 'gist1')}  
-          ON ${el.nspname}.${el.relname} USING gist (${el.aname})`);
-
-        qIndex.push(`CREATE INDEX if not exists ${name.replace('gist', 'area')}  
-          ON ${el.nspname}.${el.relname} USING btree (st_area(st_transform(${el.aname},3857)))`);
-        qIndex.push(`CREATE INDEX if not exists ${name.replace('gist', '4326')}  
-          ON ${el.nspname}.${el.relname} USING gist (st_transform(${el.aname},4326))`);
-      }
-    }
-  }
-
-  loadedIndex[redisKey] = 1;
-  // throw qIndex;
-  if (!qIndex.length) return null;
-
-  // console.log(qIndex.filter((v, i, a) => a.indexOf(v) === i));
-  // logger.file('index', { table, filter, sql: qIndex.filter((v, i, a) => a.indexOf(v) === i) });
-  qIndex.filter((v, i, a) => a.indexOf(v) === i).map((el) => pg.one(el).catch((err) => console.log(err.toString())));
-  return 'ok';
-}
-
-export default autoIndex;
+// const rclient = require('../../redis/client')
+import pgClient from '../pgClients.js';
+
+// subfunc
+const getTable = ({ table }) => table.toLowerCase().replace(/[\n\r]+/g, ' ').split(' from ')
+  .filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
+  .map((el) => el.split(/[ )]/)[0]);
+
+const loadedIndex = {};
+
+// main func
+async function autoIndex({ table, columns: filter, pg = pgClient.client }) {
+  if (!filter?.length || !table) return null;
+
+  const attrs = filter.map((el) => (el.name || el).replace(/'/g, '')).sort();
+  const types = filter.map((el) => (el.name ? el : { name: el }))
+    .reduce((p, el) => ({ ...p, [el.name]: el.type || '-' }), {});
+
+  const redisKey = `autoindex1:${table}:${attrs.join(';')}`;
+  const tableList = getTable({ table });
+  const existsCache = loadedIndex[redisKey];
+  if (existsCache) { return 'ok'; }
+
+  const tbs = tableList[0];
+  const [ns, tbl] = tableList[0].split('.');
+  const { rows: index } = await pg.query(`select * from pg_indexes where tablename = '${tbl}' and schemaname = '${ns}'`);
+
+  if (existsCache && index?.length > 0) { return null; }
+  // console.log('autoindex', table, filter?.map((el) => el.name || el));
+  const { rows: cols } = await pg.query(`SELECT attrelid::regclass AS tbl, attname AS aname, atttypid::regtype  AS datatype, atttypid  
+    FROM   pg_attribute WHERE  attrelid = '${tbs}'::regclass and attname = any('{ ${attrs} }')`);
+
+  const qIndex = [];
+  const indexAr = {};
+
+  // console.log(cols);
+  for (let i = 0; i < cols.length; i += 1) {
+    const el = cols[i];
+    el.relname = tbl;
+    el.nspname = ns;
+
+    const indexUsing = (el.datatype === 'geometry' ? 'gist' : null)
+      || (types[el.aname] === 'Text' || el.datatype?.includes('[]') ? 'gin' : null)
+      || 'btree';
+
+    const name = `${el.nspname}_${el.relname}_${el.aname}_${indexUsing}_idx`;
+    const exists = index.filter((ind) => ind.tablename === el.relname && ind.schemaname === el.nspname && ind.indexdef.includes(types[el.aname] === 'Text'
+      ? `gin (${el.aname} gin_trgm_ops)` : `btree (${el.aname})`));
+
+    indexAr[el.aname] = {
+      name, type: el.datatype, exists, // exists1,
+    };
+
+    // drop
+    if (exists?.length > 1) {
+      exists.filter((ind, i1) => i1).forEach((ind) => qIndex.push(`DROP INDEX if exists ${ind.schemaname}.${ind.indexname} `));
+    }
+
+    // add
+    if (exists?.length === 0) {
+      // console.log(`${name} - ${el.datatype}`);
+
+      const suffix = types[el.aname] === 'Text' ? 'gin_trgm_ops' : '';
+      if (['text'].includes(el?.datatype)) {
+        qIndex.push(`CREATE INDEX if not exists ${name} ON ${el.nspname}.${el.relname} USING ${indexUsing} (${el.aname} ${suffix})`);
+      }
+      if (indexUsing === 'gist') {
+        qIndex.push(`CREATE INDEX if not exists ${name.replace('gist', 'gist1')}  
+          ON ${el.nspname}.${el.relname} USING gist (${el.aname})`);
+
+        qIndex.push(`CREATE INDEX if not exists ${name.replace('gist', 'area')}  
+          ON ${el.nspname}.${el.relname} USING btree (st_area(st_transform(${el.aname},3857)))`);
+        qIndex.push(`CREATE INDEX if not exists ${name.replace('gist', '4326')}  
+          ON ${el.nspname}.${el.relname} USING gist (st_transform(${el.aname},4326))`);
+      }
+    }
+  }
+
+  loadedIndex[redisKey] = 1;
+  // throw qIndex;
+  if (!qIndex.length) return null;
+
+  // console.log(qIndex.filter((v, i, a) => a.indexOf(v) === i));
+  // logger.file('index', { table, filter, sql: qIndex.filter((v, i, a) => a.indexOf(v) === i) });
+  qIndex.filter((v, i, a) => a.indexOf(v) === i).map((el) => pg.one(el).catch((err) => console.log(err.toString())));
+  return 'ok';
+}
+
+export default autoIndex;

package/pg/funcs/getMeta.js

@@ -1,27 +1,27 @@
-// import pgClient from '../pgClients.js';
-import getPG from './getPG.js';
-
-const data = {};
-
-// decorator
-export default async function getMeta(opt) {
-  const pg = opt.pg || getPG({ name: 'client' });
-  const table = opt.table || opt;
-
-  if (data[table]) return data[table];
-
-  if (!pg.tlist.includes(table)) {
-    return { error: `${table} - not found`, status: 400 };
-  }
-
-  const { fields } = await pg.query(`select * from ${table} where $1=$1 limit 0`, [1]);
-  const { pks1 } = await pg.one(`SELECT json_object_agg(c.conrelid::regclass, a.attname) as pks1 FROM pg_constraint c 
-    left join pg_attribute a on c.conrelid=a.attrelid and a.attnum = c.conkey[1] WHERE c.contype='p'::"char"`, { cache: 0 });
-  const pk = pks1[table];
-
-  const geomAttr = fields.find((el) => pg.pgType[el.dataTypeID] === 'geometry')?.name; // change geometry text to geometry code
-
-  const res = { pk, columns: fields, geom: geomAttr };
-  data[table] = res;
-  return res;
-}
+// import pgClient from '../pgClients.js';
+import getPG from './getPG.js';
+
+const data = {};
+
+// decorator
+export default async function getMeta(opt) {
+  const pg = opt.pg || getPG({ name: 'client' });
+  const table = opt.table || opt;
+
+  if (data[table]) return data[table];
+
+  if (!pg.tlist.includes(table)) {
+    return { error: `${table} - not found`, status: 400 };
+  }
+
+  const { fields } = await pg.query(`select * from ${table} where $1=$1 limit 0`, [1]);
+  const { pks1 } = await pg.one(`SELECT json_object_agg(c.conrelid::regclass, a.attname) as pks1 FROM pg_constraint c 
+    left join pg_attribute a on c.conrelid=a.attrelid and a.attnum = c.conkey[1] WHERE c.contype='p'::"char"`, { cache: 0 });
+  const pk = pks1[table];
+
+  const geomAttr = fields.find((el) => pg.pgType[el.dataTypeID] === 'geometry')?.name; // change geometry text to geometry code
+
+  const res = { pk, columns: fields, geom: geomAttr };
+  data[table] = res;
+  return res;
+}

package/pg/funcs/init.js

@@ -1,42 +1,42 @@
-import crypto from 'crypto';
-
-// import pg from 'pg';
-import getRedis from '../../redis/funcs/getRedis.js';
-// import config from '../config.js';
-
-async function init(client) {
-  const textQuery = `select 
-  (select json_object_agg(conrelid::regclass  ,(SELECT attname FROM pg_attribute WHERE attrelid = c.conrelid and attnum = c.conkey[1]))
-  from   pg_constraint c where contype='p' and connamespace::regnamespace::text not in ('sde')) as pk,
-  (SELECT json_object_agg(t.oid::text,pg_catalog.format_type(t.oid, NULL)) FROM pg_catalog.pg_type t) as "pgType"`;
-  const { pgType, pk } = await client.query(textQuery).then((d) => d.rows[0]);
-
-  const tlist = await client.query(`select array_agg((select nspname from pg_namespace where oid=relnamespace)||'.'||relname) tlist 
-    from pg_class where relkind in ('r','v')`).then((d) => d.rows[0].tlist);
-
-  async function one(query, param = {}) {
-    const data = await client.query(query, Array.isArray(param) ? param : param.args || []);
-    const result = ((Array.isArray(data) ? data.pop() : data)?.rows || [])[0] || {};
-    return result;
-  }
-
-  async function queryCache(query) {
-    const rclient = getRedis({ db: 0 })
-    const hash = crypto.createHash('sha1').update(query).digest('base64');
-    const keyCache = `pg:${hash}`;
-    const cache = await rclient.get(keyCache);
-    if (cache) {
-      return JSON.parse(cache);
-    }
-    const data = await client.query(query);
-    rclient.set(keyCache, JSON.stringify(data), 'EX', 60 * 60);
-    return data;
-  }
-
-  Object.assign(client, {
-    one, pgType, pk, tlist, queryCache,
-  });
-}
-
-// export default client;
-export default init;
+import crypto from 'crypto';
+
+// import pg from 'pg';
+import getRedis from '../../redis/funcs/getRedis.js';
+// import config from '../config.js';
+
+async function init(client) {
+  const textQuery = `select 
+  (select json_object_agg(conrelid::regclass  ,(SELECT attname FROM pg_attribute WHERE attrelid = c.conrelid and attnum = c.conkey[1]))
+  from   pg_constraint c where contype='p' and connamespace::regnamespace::text not in ('sde')) as pk,
+  (SELECT json_object_agg(t.oid::text,pg_catalog.format_type(t.oid, NULL)) FROM pg_catalog.pg_type t) as "pgType"`;
+  const { pgType, pk } = await client.query(textQuery).then((d) => d.rows[0]);
+
+  const tlist = await client.query(`select array_agg((select nspname from pg_namespace where oid=relnamespace)||'.'||relname) tlist 
+    from pg_class where relkind in ('r','v')`).then((d) => d.rows[0].tlist);
+
+  async function one(query, param = {}) {
+    const data = await client.query(query, Array.isArray(param) ? param : param.args || []);
+    const result = ((Array.isArray(data) ? data.pop() : data)?.rows || [])[0] || {};
+    return result;
+  }
+
+  async function queryCache(query) {
+    const rclient = getRedis({ db: 0 })
+    const hash = crypto.createHash('sha1').update(query).digest('base64');
+    const keyCache = `pg:${hash}`;
+    const cache = await rclient.get(keyCache);
+    if (cache) {
+      return JSON.parse(cache);
+    }
+    const data = await client.query(query);
+    rclient.set(keyCache, JSON.stringify(data), 'EX', 60 * 60);
+    return data;
+  }
+
+  Object.assign(client, {
+    one, pgType, pk, tlist, queryCache,
+  });
+}
+
+// export default client;
+export default init;

package/pg/funcs/pgClients.js

@@ -1,2 +1,2 @@
-const pgClients = {};
-export default pgClients;
+const pgClients = {};
+export default pgClients;

package/pg/index.js

@@ -1,35 +1,35 @@
-// import fp from 'fastify-plugin';
-//import pg from 'pg';
-import pgClients from './funcs/pgClients.js';
-import init from './funcs/init.js';
-import autoIndex from './funcs/autoIndex.js';
-import getMeta from './funcs/getMeta.js';
-import getPG from './funcs/getPG.js';
-
-function close() {
-  // console.log('pg close');
-  Object.keys(pgClients).forEach((el) => {
-    // console.log(el);
-    pgClients[el].end();
-  });
-
-  // return pgClients.client.end();
-}
-
-async function plugin(fastify, config) {
-  const client = getPG({ ...config.pg || {}, name: 'client' })
-  await init(client);
-  fastify.addHook('onRequest', async (req) => {
-    // req.funcs = fastify;
-    req.pg = client;
-  });
-  //pgClients.client = client;
-
-  // fastify.decorate('pg', client);
-  fastify.decorate('autoIndex', autoIndex);
-  fastify.decorate('getMeta', getMeta);
-  fastify.decorate('getPG', getPG);
-  fastify.addHook('onClose', close);
-}
-
-export default plugin;
+// import fp from 'fastify-plugin';
+//import pg from 'pg';
+import pgClients from './funcs/pgClients.js';
+import init from './funcs/init.js';
+import autoIndex from './funcs/autoIndex.js';
+import getMeta from './funcs/getMeta.js';
+import getPG from './funcs/getPG.js';
+
+function close() {
+  // console.log('pg close');
+  Object.keys(pgClients).forEach((el) => {
+    // console.log(el);
+    pgClients[el].end();
+  });
+
+  // return pgClients.client.end();
+}
+
+async function plugin(fastify, config) {
+  const client = getPG({ ...config.pg || {}, name: 'client' })
+  await init(client);
+  fastify.addHook('onRequest', async (req) => {
+    // req.funcs = fastify;
+    req.pg = client;
+  });
+  //pgClients.client = client;
+
+  // fastify.decorate('pg', client);
+  fastify.decorate('autoIndex', autoIndex);
+  fastify.decorate('getMeta', getMeta);
+  fastify.decorate('getPG', getPG);
+  fastify.addHook('onClose', close);
+}
+
+export default plugin;

package/pg/pgClients.js

@@ -1,17 +1,17 @@
-import pg from 'pg';
-import config from '../config.js';
-import init from './funcs/init.js';
-
-const pgClients = {};
-if (config.pg) {
-  const client = new pg.Pool({
-    host: config.pg?.host || '127.0.0.1',
-    port: config.pg?.port || 5432,
-    database: config.pg?.database || 'postgres',
-    user: config.pg?.user || 'postgres',
-    password: config.pg?.password || 'postgres',
-  });
-  await init(client);
-  pgClients.client = client;
-}
-export default pgClients;
+import pg from 'pg';
+import config from '../config.js';
+import init from './funcs/init.js';
+
+const pgClients = {};
+if (config.pg) {
+  const client = new pg.Pool({
+    host: config.pg?.host || '127.0.0.1',
+    port: config.pg?.port || 5432,
+    database: config.pg?.database || 'postgres',
+    user: config.pg?.user || 'postgres',
+    password: config.pg?.password || 'postgres',
+  });
+  await init(client);
+  pgClients.client = client;
+}
+export default pgClients;

package/redis/client.js

@@ -1,8 +1,8 @@
-import redisClients from './funcs/redisClients.js';
-import getRedis from './funcs/getRedis.js';
-
-if (!redisClients[0]) {
-  getRedis({ db: 0 });
-}
-
-export default redisClients[0];
+import redisClients from './funcs/redisClients.js';
+import getRedis from './funcs/getRedis.js';
+
+if (!redisClients[0]) {
+  getRedis({ db: 0 });
+}
+
+export default redisClients[0];

package/redis/funcs/redisClients.js

@@ -1,2 +1,2 @@
-const redisClients = {};
-export default redisClients;
+const redisClients = {};
+export default redisClients;

package/redis/index.js

@@ -1,18 +1,19 @@
-// import client from './client.js';
-import getRedis from './funcs/getRedis.js';
-// import client from './funcs/redisClients.js';
-
-function close(fastify) {
-  fastify.rclient.quit();
-  // fastify.rclient2.quit();
-}
-
-async function plugin(fastify) {
-  const client = getRedis({ db: 0 });
-  client.getJSON = client.get;
-  fastify.decorate('rclient', client);
-  // fastify.decorate('rclient2', client2);
-  fastify.addHook('onClose', close);
-}
-
-export default plugin;
+// import client from './client.js';
+import getRedis from './funcs/getRedis.js';
+// import client from './funcs/redisClients.js';
+
+function close(fastify) {
+  fastify.rclient.quit();
+  // fastify.rclient2.quit();
+}
+
+async function plugin(fastify) {
+  const client = getRedis({ db: 0 });
+  client.getJSON = client.get;
+  fastify.decorate('rclient', client);
+  fastify.decorate('getRedis', getRedis);
+  // fastify.decorate('rclient2', client2);
+  fastify.addHook('onClose', close);
+}
+
+export default plugin;

package/server.js

@@ -0,0 +1,14 @@
+// This file contains code that we reuse
+// between our tests.
+import Fastify from 'fastify';
+import config from './test/config.js';
+import appService from './index.js';
+
+const app = Fastify({ logger: false });
+app.register(appService, config);
+app.listen({ host: '0.0.0.0', port: process.env.PORT || 3000 }, (err) => {
+  if (err) {
+    app.log.error(err);
+    process.exit(1);
+  }
+});

package/table/controllers/data.js

@@ -1,48 +1,51 @@
-import getTemplate from './utils/getTemplate.js';
-import getFilterSQL from '../funcs/getFilterSQL/index.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-
-const maxLimit = 100;
-export default async function data(req) {
-  const time = Date.now();
-  const {
-    pg, params, query = {},
-  } = req;
-
-  const loadTable = await getTemplate('table', params.table);
-
-  if (!loadTable) { return { status: 404, message: 'not found' }; }
-
-  const {
-    table, columns, sql, filters, form, meta,
-  } = loadTable;
-  const { pk } = await getMeta(table);
-
-  const cols = columns.map((el) => el.name || el).join(',');
-  const sqlTable = sql?.filter?.((el) => !el?.disabled && el?.sql?.replace).map((el, i) => ` left join lateral (${el.sql}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
-
-  const fData = query.filter ? await getFilterSQL({
-    filter: query.filter,
-    table,
-    json: 1,
-  }) : {};
-
-  const keyQuery = query.key && loadTable.key && !params.id ? `${loadTable.key}=$1` : null;
-
-  const limit = Math.min(maxLimit, +(query.limit || 10));
-
-  const offset = query.page ? ` offset ${(query.page - 1) * limit}` : '';
-  // id, query, filter
-  const where = [(params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q].filter((el) => el);
-  const q = `select  ${pk ? `"${pk}" as id,` : ''} ${query.id || query.key ? '*' : cols || '*'} from ${table} t ${sqlTable} where ${where.join(' and ') || 'true'} ${offset} limit ${limit}`;
-
-  if (query.sql) { return q; }
-
-  const { rows } = await pg.query(q, (params.id ? [params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
-
-  const total = keyQuery || params.id ? rows.length : await pg.queryCache(`select count(*) from ${table} where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count);
-
-  return {
-    time: Date.now() - time, total, pk, form, rows, meta, columns, filters,
-  };
-}
+import getTemplate from './utils/getTemplate.js';
+import getFilterSQL from '../funcs/getFilterSQL/index.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+
+const maxLimit = 100;
+export default async function data(req) {
+  const time = Date.now();
+  const {
+    pg, params, query = {},
+  } = req;
+
+  const loadTable = await getTemplate('table', params.table);
+
+  if (!loadTable) { return { status: 404, message: 'not found' }; }
+
+  const {
+    table, columns, sql, filters, form, meta,
+  } = loadTable;
+  const { pk } = await getMeta(table);
+
+  const cols = columns.map((el) => el.name || el).join(',');
+  const sqlTable = sql?.filter?.((el) => !el?.disabled && el?.sql?.replace).map((el, i) => ` left join lateral (${el.sql}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
+
+  const fData = query.filter ? await getFilterSQL({
+    filter: query.filter,
+    table,
+    json: 1,
+  }) : {};
+
+  const keyQuery = query.key && loadTable.key && !params.id ? `${loadTable.key}=$1` : null;
+
+  const limit = Math.min(maxLimit, +(query.limit || 10));
+
+  const offset = query.page ? ` offset ${(query.page - 1) * limit}` : '';
+  // id, query, filter
+  const orderColumn = query.order || loadTable.order;
+
+  const order = cols.includes(orderColumn) ? `order by ${orderColumn} ${query.desc ? 'desc' : ''}` : '';
+  const where = [(params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q].filter((el) => el);
+  const q = `select  ${pk ? `"${pk}" as id,` : ''} ${query.id || query.key ? '*' : cols || '*'} from ${table} t ${sqlTable} where ${where.join(' and ') || 'true'} ${offset} ${order} limit ${limit}`;
+
+  if (query.sql) { return q; }
+
+  const { rows } = await pg.query(q, (params.id ? [params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
+
+  const total = keyQuery || params.id ? rows.length : await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count);
+
+  return {
+    time: Date.now() - time, total, pk, form, rows, meta, columns, filters,
+  };
+}

package/table/controllers/filter.js

@@ -1,17 +1,17 @@
-import getTemplate from './utils/getTemplate.js';
-import getSelect from './utils/getSelect.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' }; }
-
-  await Promise.all(loadTable?.filters.filter((el) => el.data).map(async (el) => {
-    const cls = await getSelect(el.data);
-    Object.assign(el, { options: cls?.arr });
-  }));
-  return { time: Date.now() - time, filters: loadTable?.filters || [] };
-}
+import getTemplate from './utils/getTemplate.js';
+import getSelect from './utils/getSelect.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' }; }
+
+  await Promise.all(loadTable?.filters.filter((el) => el.data).map(async (el) => {
+    const cls = await getSelect(el.data);
+    Object.assign(el, { options: cls?.arr });
+  }));
+  return { time: Date.now() - time, filters: loadTable?.filters || [] };
+}