@opengis/fastify-table 1.0.83 → 1.0.84

package/Changelog.md

@@ -1,5 +1,9 @@
 # fastify-table
 
+## 1.0.84 - 22.08.2024
+
+- suggest table:column support
+
 ## 1.0.83 - 20.08.2024
 
 - code optimization

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.0.83",
+  "version": "1.0.84",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",

package/table/controllers/suggest.js

@@ -1,62 +1,79 @@
-import getSelectMeta from './utils/getSelectMeta.js';
-import getPG from '../../pg/funcs/getPG.js';
-import config from '../../config.js';
-
-const limit = 50;
-const headers = { 'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Methods': 'GET', 'Cache-Control': 'no-cache' };
-
-export default async function suggest(req) {
-  const { params, query, pg: pg1 } = req;
-
-  const lang = query.lang || 'ua';
-  const time = Date.now();
-  const parent = query.parent || '';
-
-  const selectName = query.sel || query.name || params.data;
-  if (!selectName) return { headers, status: 400, message: 'name is required' };
-
-  const meta = await getSelectMeta({ name: selectName });
-  const pg = meta?.db ? getPG(meta.db) : pg1;
-  if (!meta) return { headers, status: 404, message: 'Not found query select ' };
-  if (query.meta) return meta;
-
-  const { arr, searchQuery } = meta;
-
-  if (arr) {
-    const lower = query.key?.toLowerCase();
-    const data = 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;
-    return {
-      limit, count: data.length, mode: 'array', time: Date.now() - time, data,
-    };
-  }
-
-  // search
-  const search = query.key ? searchQuery : null;
-
-  // val
-  // const pk = meta.originalCols.split(',')[0];
-  const val = query.val ? ` id=any('{${query.val.replace(/'/g, "''")}}')` : '';
-
-  const sqlSuggest = `${meta.original.replace(/{{parent}}/gi, parent)} where ${[search, val, 'id is not null'].filter((el) => el).join(' and ') || 'true'} limit ${limit}`;
-  if (query.sql) return sqlSuggest;
-
-  // query
-  const { rows: dataNew } = meta.searchColumn ? { rows: [] } : await pg.query(sqlSuggest, query.key ? [`${query.key}%`] : []);
-  const { rows: dataNew1 } = dataNew.length < limit ? await pg.query(sqlSuggest, query.key ? [`%${query.key}%`] : []) : {};
-  const ids = dataNew.map((el) => el.id);
-  const data = dataNew.concat((dataNew1 || []).filter((el) => !ids?.includes(el.id)));
-
-  const message = {
-    time: Date.now() - time,
-    count: data.length,
-    total: meta.count - 0,
-    mode: 'sql',
-    db: meta.db,
-    sql: config.local ? sqlSuggest : undefined,
-    data,
-  };
-
-  return message;
-}
+import getSelectMeta from './utils/getSelectMeta.js';
+import getPG from '../../pg/funcs/getPG.js';
+import config from '../../config.js';
+import getTemplate from './utils/getTemplate.js';
+import getTableSql from '../funcs/getFilterSQL/util/getTableSql.js';
+
+const limit = 50;
+const headers = { 'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Methods': 'GET', 'Cache-Control': 'no-cache' };
+
+export default async function suggest(req) {
+  const { params, query, pg: pg1 } = req;
+
+  const lang = query.lang || 'ua';
+  const time = Date.now();
+  const parent = query.parent || '';
+
+  const [table, column] = params.data?.includes(':') ? params.data.split(':') : [];
+  const selectName = query.sel || query.name || params.data;
+  if (!selectName) return { headers, status: 400, message: 'name is required' };
+
+  const body = await getTemplate('table', table);
+  if (table && !pg1.pk[body?.table || table]) {
+    return { headers, status: 400, message: 'param name is invalid: 1' };
+  }
+  const columnExists = true;
+  if (table && (!column || !columnExists)) {
+    return { headers, status: 400, message: 'param name is invalid: 2' };
+  }
+
+  const meta = table && column
+    ? {
+      original: `with c(id,text) as (select row_number() over(), ${column} from ${body?.table || table} group by ${column} ) select * from c`,
+      searchQuery: '("text" ilike $1 )',
+    }
+    : await getSelectMeta({ name: selectName });
+  const pg = meta?.db ? getPG(meta.db) : pg1;
+  if (!meta) return { headers, status: 404, message: 'Not found query select ' };
+  if (query.meta) return meta;
+
+  const { arr, searchQuery } = meta;
+
+  if (arr) {
+    const lower = query.key?.toLowerCase();
+    const data = 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;
+    return {
+      limit, count: data.length, mode: 'array', time: Date.now() - time, data,
+    };
+  }
+
+  // search
+  const search = query.key ? searchQuery : null;
+
+  // val
+  // const pk = meta.originalCols.split(',')[0];
+  const val = query.val ? ` id=any('{${query.val.replace(/'/g, "''")}}')` : '';
+
+  const sqlSuggest = `${meta.original.replace(/{{parent}}/gi, parent)} where ${[search, val, 'id is not null'].filter((el) => el).join(' and ') || 'true'} limit ${limit}`;
+  if (query.sql) return sqlSuggest;
+
+  // query
+  const { rows: dataNew } = meta.searchColumn ? { rows: [] } : await pg.query(sqlSuggest, query.key ? [`${query.key}%`] : []);
+  const { rows: dataNew1 } = dataNew.length < limit ? await pg.query(sqlSuggest, query.key ? [`%${query.key}%`] : []) : {};
+  const ids = dataNew.map((el) => el.id);
+  const data = dataNew.concat((dataNew1 || []).filter((el) => !ids?.includes(el.id)));
+
+  const message = {
+    time: Date.now() - time,
+    count: data.length,
+    total: meta.count - 0,
+    mode: 'sql',
+    db: meta.db,
+    sql: config.local ? sqlSuggest : undefined,
+    data,
+  };
+
+  return message;
+}

package/table/funcs/getFilterSQL/util/getTableSql.js

@@ -1,34 +1,34 @@
-function getTable(table) {
-  const result = table?.toLowerCase()?.replace(/[\n\r]+/g, ' ')?.split(' from ')?.filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
-    ?.map((el) => el.split(/[ )]/)[0]);
-  return result;
-}
-
-/**
-* @param {Number} opt.json - (1|0) 1 - Результат - Object, 0 - String
-* @param {String} opt.query - запит до таблиці
-* @param {String} opt.hash - інформація з хешу по запиту
-*/
-const tableSql = {};
-async function getTableSql({
-  pg, body, table, fields,
-}) {
-  if (tableSql[table]) return tableSql[table];
-
-  const fieldList = fields.map((el) => el.name);
-
-  const tableList = body?.sql?.map((el) => getTable(el.sql)).reduce((acc, el) => acc.concat(el), []).filter((el) => fieldList.includes(pg.pk[el]));
-
-  if (!tableList) { tableSql[table] = []; return []; }
-
-  const data = await Promise.all(tableList?.map(async (tableEl) => {
-    const { fields: fieldsEl } = await pg.query(`select * from ${tableEl} limit 0`);
-    return fieldsEl.map((el) => ({ name: el.name, table: tableEl, pk: pg.pk[tableEl] }));
-  }));
-
-  tableSql[table] = data.reduce((acc, el) => acc.concat(el), []);
-
-  return tableSql[table];
-}
-
-export default getTableSql;
+function getTable(table) {
+  const result = table?.toLowerCase()?.replace(/[\n\r]+/g, ' ')?.split(' from ')?.filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
+    ?.map((el) => el.split(/[ )]/)[0]);
+  return result;
+}
+
+/**
+* @param {Number} opt.json - (1|0) 1 - Результат - Object, 0 - String
+* @param {String} opt.query - запит до таблиці
+* @param {String} opt.hash - інформація з хешу по запиту
+*/
+const tableSql = {};
+async function getTableSql({
+  pg, body, table, fields,
+}) {
+  if (tableSql[table]) return tableSql[table];
+
+  const fieldList = fields.map((el) => el.name);
+
+  const tableList = body?.sql?.map((el) => getTable(el.sql)).reduce((acc, el) => acc.concat(el), []).filter((el) => fieldList.includes(pg.pk[el]));
+
+  if (!tableList) { tableSql[table] = []; return []; }
+
+  const data = await Promise.all(tableList?.map(async (tableEl) => {
+    const { fields: fieldsEl } = await pg.query(`select * from ${tableEl} limit 0`);
+    return fieldsEl.map((el) => ({ name: el.name, table: tableEl, pk: pg.pk[tableEl] }));
+  }));
+
+  tableSql[table] = data.reduce((acc, el) => acc.concat(el), []);
+
+  return tableSql[table];
+}
+
+export default getTableSql;