@opengis/fastify-table 1.0.2 → 1.0.3

package/table/controllers/form.js

@@ -1,10 +1,10 @@
-import getTemplate from './utils/getTemplate.js';
-
-export default async function formFunction(req) {
-  const time = Date.now();
-  const { params } = req;
-  const form = await getTemplate('form', params.form);
-  if (!form) { return { status: 404, message: 'not found' }; }
-
-  return { time: Date.now() - time, form };
-}
+import getTemplate from './utils/getTemplate.js';
+
+export default async function formFunction(req) {
+  const time = Date.now();
+  const { params } = req;
+  const form = await getTemplate('form', params.form);
+  if (!form) { return { status: 404, message: 'not found' }; }
+
+  return { time: Date.now() - time, form };
+}

package/table/controllers/suggest.js

@@ -1,56 +1,56 @@
-import getSelectMeta from './utils/getSelectMeta.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 } = req;
-
-  const lang = query.lang || 'ua';
-  const time = Date.now();
-
-  const selectName = query.sel || query.name || params.data;
-  if (!selectName) return { headers, status: 400, message: 'name is required' };
-
-  const meta = await getSelectMeta({ name: selectName });
-  if (!meta) return { headers, status: 404, message: 'Not found query select ' };
-
-  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 ? ` ${pk}=any('{${query.val.replace(/'/g, "''")}}')` : '';
-
-  const sqlSuggest = `with rows(id,text) as (${meta.original} where ${[search, val].filter((el) => el).join(' and ') || 'true'}) select * from rows 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',
-    sql: sqlSuggest,
-    data,
-  };
-
-  return message;
-}
+import getSelectMeta from './utils/getSelectMeta.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 } = req;
+
+  const lang = query.lang || 'ua';
+  const time = Date.now();
+
+  const selectName = query.sel || query.name || params.data;
+  if (!selectName) return { headers, status: 400, message: 'name is required' };
+
+  const meta = await getSelectMeta({ name: selectName });
+  if (!meta) return { headers, status: 404, message: 'Not found query select ' };
+
+  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 ? ` ${pk}=any('{${query.val.replace(/'/g, "''")}}')` : '';
+
+  const sqlSuggest = `with rows(id,text) as (${meta.original} where ${[search, val].filter((el) => el).join(' and ') || 'true'}) select * from rows 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',
+    sql: sqlSuggest,
+    data,
+  };
+
+  return message;
+}

package/table/controllers/utils/getSelect.js

@@ -1,20 +1,20 @@
-import getTemplate from './getTemplate.js';
-
-const loadCls = {};
-
-export default async function getTable(name) {
-  if (loadCls[name]) return loadCls[name];
-
-  const clsData = await getTemplate('cls', name);
-
-  if (clsData) {
-    loadCls[name] = { arr: clsData };
-    return loadCls[name];
-  }
-
-  const selectData = await getTemplate('select', name);
-  if (!selectData) { return null; }
-
-  loadCls[name] = selectData;
-  return loadCls[name];
-}
+import getTemplate from './getTemplate.js';
+
+const loadCls = {};
+
+export default async function getTable(name) {
+  if (loadCls[name]) return loadCls[name];
+
+  const clsData = await getTemplate('cls', name);
+
+  if (clsData) {
+    loadCls[name] = { arr: clsData };
+    return loadCls[name];
+  }
+
+  const selectData = await getTemplate('select', name);
+  if (!selectData) { return null; }
+
+  loadCls[name] = selectData;
+  return loadCls[name];
+}

package/table/controllers/utils/getSelectMeta.js

@@ -1,65 +1,65 @@
-// import pgClients from '../../../pg/pgClients.js';
-import getPG from '../../../pg/funcs/getPG.js';
-
-import getSelect from './getSelect.js';
-/*
-function getTable(table) {
-  // eslint-disable-next-line class-methods-use-this
-  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?.pop();
-} */
-
-const selectMeta = {};
-
-export default async function getSelectMeta({ name, pg: pg1 }) {
-  if (selectMeta[name]) return selectMeta[name];
-  const pg = pg1 || getPG({ db: 'client' });
-
-  const cls = await getSelect(name);
-
-  if (!cls) return null;
-  if (cls.arr) return cls;
-  if (!cls.sql) return null;
-
-  const { sql: original } = cls;
-  const sql = `with c(id,text) as (${original} ) select * from c where id is not null `;
-
-  /*= == meta table === */
-  const tableNew = original.toLowerCase().replace(/\n/g, ' ').split(' from ').filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
-    .map((el) => el.split(/[ )]/)[0].replace(/[\r\n]+/g, ''));
-
-  const dataOrigin = await pg.query(`${sql} limit 0`);
-
-  const dataOrigin1 = await pg.query(`${original} limit 0`);
-
-  // const table = getTable(original);
-  const count = cls?.count ?? await pg.one(`select count(*) from (${original})q`).then((el) => el.count);
-
-  // column name
-  const cols = dataOrigin.fields.map((el) => el.name);
-  const type = dataOrigin.fields.map((el) => pg.pgType[el.dataTypeID]);
-
-  const searchColumn = cls?.searchColumn || (
-    dataOrigin.fields.find((el) => el.name === 'search') ? 'search' : dataOrigin1.fields[1].name);
-
-  const searchQuery = `(${searchColumn.split(',').map((el) => `"${el}" ilike $1 `).join(' or ')})`;
-
-  const data = {
-
-    type: type.join(','),
-    cols: cols.join(','),
-    originalCols: dataOrigin1.fields.map((el) => el.name).join(','),
-
-    original,
-    sql,
-    count,
-    searchQuery,
-    table: tableNew.join(','),
-    time: new Date().toISOString(),
-
-  };
-
-  selectMeta[name] = data;
-  return data;
-}
+// import pgClients from '../../../pg/pgClients.js';
+import getPG from '../../../pg/funcs/getPG.js';
+
+import getSelect from './getSelect.js';
+/*
+function getTable(table) {
+  // eslint-disable-next-line class-methods-use-this
+  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?.pop();
+} */
+
+const selectMeta = {};
+
+export default async function getSelectMeta({ name, pg: pg1 }) {
+  if (selectMeta[name]) return selectMeta[name];
+  const pg = pg1 || getPG({ db: 'client' });
+
+  const cls = await getSelect(name);
+
+  if (!cls) return null;
+  if (cls.arr) return cls;
+  if (!cls.sql) return null;
+
+  const { sql: original } = cls;
+  const sql = `with c(id,text) as (${original} ) select * from c where id is not null `;
+
+  /*= == meta table === */
+  const tableNew = original.toLowerCase().replace(/\n/g, ' ').split(' from ').filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
+    .map((el) => el.split(/[ )]/)[0].replace(/[\r\n]+/g, ''));
+
+  const dataOrigin = await pg.query(`${sql} limit 0`);
+
+  const dataOrigin1 = await pg.query(`${original} limit 0`);
+
+  // const table = getTable(original);
+  const count = cls?.count ?? await pg.one(`select count(*) from (${original})q`).then((el) => el.count);
+
+  // column name
+  const cols = dataOrigin.fields.map((el) => el.name);
+  const type = dataOrigin.fields.map((el) => pg.pgType[el.dataTypeID]);
+
+  const searchColumn = cls?.searchColumn || (
+    dataOrigin.fields.find((el) => el.name === 'search') ? 'search' : dataOrigin1.fields[1].name);
+
+  const searchQuery = `(${searchColumn.split(',').map((el) => `"${el}" ilike $1 `).join(' or ')})`;
+
+  const data = {
+
+    type: type.join(','),
+    cols: cols.join(','),
+    originalCols: dataOrigin1.fields.map((el) => el.name).join(','),
+
+    original,
+    sql,
+    count,
+    searchQuery,
+    table: tableNew.join(','),
+    time: new Date().toISOString(),
+
+  };
+
+  selectMeta[name] = data;
+  return data;
+}

package/table/controllers/utils/getTemplate.js

@@ -1,24 +1,24 @@
-import { readFile } from 'fs/promises';
-import fs from 'fs';
-import path from 'path';
-import config from '../../../config.js';
-
-const loadTemplate = {};
-
-export default async function getTemplateDir(type, name) {
-  if (!type) return null;
-  if (!name) return null;
-
-  const cwd = process.cwd();
-  const typeDir = path.join(cwd, (config.templateDir || 'server/templates'), type);
-
-  if (!loadTemplate[type]) {
-    const typeList = fs.existsSync(typeDir) ? fs.readdirSync(typeDir) : [];
-    loadTemplate[type] = typeList;
-  }
-
-  const sql = loadTemplate[type].includes(`${name}.sql`) ? await readFile(path.join(typeDir, `${name}.sql`), 'utf-8') : null;
-  const data = loadTemplate[type].includes(`${name}.json`) ? JSON.parse(await readFile(path.join(typeDir, `${name}.json`), 'utf-8')) : null;
-  if (sql) return { ...data || {}, sql };
-  return data;
-}
+import { readFile } from 'fs/promises';
+import fs from 'fs';
+import path from 'path';
+import config from '../../../config.js';
+
+const loadTemplate = {};
+
+export default async function getTemplateDir(type, name) {
+  if (!type) return null;
+  if (!name) return null;
+
+  const cwd = process.cwd();
+  const typeDir = path.join(cwd, (config.templateDir || 'server/templates'), type);
+
+  if (!loadTemplate[type]) {
+    const typeList = fs.existsSync(typeDir) ? fs.readdirSync(typeDir) : [];
+    loadTemplate[type] = typeList;
+  }
+
+  const sql = loadTemplate[type].includes(`${name}.sql`) ? await readFile(path.join(typeDir, `${name}.sql`), 'utf-8') : null;
+  const data = loadTemplate[type].includes(`${name}.json`) ? JSON.parse(await readFile(path.join(typeDir, `${name}.json`), 'utf-8')) : null;
+  if (sql) return { ...data || {}, sql };
+  return data;
+}

package/table/funcs/getFilterSQL/index.js

@@ -1,75 +1,75 @@
-/* const getTable = require('../../controllers/utils/getTable');
-const pg = require('../../../pg/client');
-const config = require('../../../../config'); */
-
-import getTemplate from '../../controllers/utils/getTemplate.js';
-import pgClients from '../../../pg/pgClients.js';
-import config from '../../../config.js';
-// filter util
-import getTableSql from './util/getTableSql.js';
-// import getCustomQuery from './util/getCustomQuery.js';
-import getFilterQuery from './util/getFilterQuery.js';
-import getOptimizedQuery from './util/getOptimizedQuery.js';
-
-async function getFilterSQL({
-  table, filter, pg = pgClients.client, search, filterList, query,
-}) {
-  if (!table) return { error: 'param table is required', status: 400 };
-
-  const body = await getTemplate('table', table);
-
-  const fieldQuery = config.allTemplates?.table?.[table] ? `${config.allTemplates?.table?.[table]} limit 0`
-    : `select * from ${body?.table || table} limit 0`;
-  const { fields = [] } = await pg.query(fieldQuery);
-
-  const { fields: fieldsModel } = pg.pk[body?.table] ? await pg.query(`select * from ${body.table} limit 0`) : {};
-
-  const autoSearchColumn = fields?.filter((el) => pg.pgType?.[el.dataTypeID] === 'text')?.map((el) => el.name).join(',');
-  const searchColumn = body?.search_column || autoSearchColumn;
-  const fieldsList = (fieldsModel || fields)?.map((el) => el.name);
-  try {
-    const tableSQL = await getTableSql({
-      pg, body, table, fields,
-    });
-    const sval = `ilike '%${decodeURIComponent(search).replace(/'/g, "''")}%'`;
-    const searchQuery = search && searchColumn
-      ? ` (${searchColumn.split(',')?.map((name) => {
-        const { pk } = tableSQL.find((el) => el.name === name) || {};
-        return pk && !fieldsList.includes(name) ? `${pk} in (select ${pk} from (${fieldQuery})q where ${name} ${sval})` : `${name} ${sval}`;
-      }).join(' or ')} )` : '';
-
-    const filters = getFilterQuery({
-      filter,
-      tableSQL,
-      fields,
-      filterList: body?.filter_list || filterList,
-      pg,
-      config,
-    });
-
-    // filter
-    const filterQuery = filters?.filter((el) => el.query)?.map((el) => `${el.query} `).join(' and ');
-    const q = [body?.query, query, searchQuery, filterQuery].filter((el) => el).join(' and ');
-
-    // table
-    const modelQuery = body?.model || body?.table || table;
-    const optimizedSQL = `select * from ${getOptimizedQuery({ body, table, q })} `;
-    const tableCount = getOptimizedQuery({ body, table, q }, true);
-    // console.log(optimizedSQL);
-    return {
-      filterList,
-
-      q,
-      optimizedSQL,
-      tableCount,
-      table: modelQuery,
-      // filter parts
-      searchQuery,
-    };
-  }
-  catch (err) {
-    throw new Error(err.toString());
-  }
-}
-
-export default getFilterSQL;
+/* const getTable = require('../../controllers/utils/getTable');
+const pg = require('../../../pg/client');
+const config = require('../../../../config'); */
+
+import getTemplate from '../../controllers/utils/getTemplate.js';
+import pgClients from '../../../pg/pgClients.js';
+import config from '../../../config.js';
+// filter util
+import getTableSql from './util/getTableSql.js';
+// import getCustomQuery from './util/getCustomQuery.js';
+import getFilterQuery from './util/getFilterQuery.js';
+import getOptimizedQuery from './util/getOptimizedQuery.js';
+
+async function getFilterSQL({
+  table, filter, pg = pgClients.client, search, filterList, query,
+}) {
+  if (!table) return { error: 'param table is required', status: 400 };
+
+  const body = await getTemplate('table', table);
+
+  const fieldQuery = config.allTemplates?.table?.[table] ? `${config.allTemplates?.table?.[table]} limit 0`
+    : `select * from ${body?.table || table} limit 0`;
+  const { fields = [] } = await pg.query(fieldQuery);
+
+  const { fields: fieldsModel } = pg.pk[body?.table] ? await pg.query(`select * from ${body.table} limit 0`) : {};
+
+  const autoSearchColumn = fields?.filter((el) => pg.pgType?.[el.dataTypeID] === 'text')?.map((el) => el.name).join(',');
+  const searchColumn = body?.search_column || autoSearchColumn;
+  const fieldsList = (fieldsModel || fields)?.map((el) => el.name);
+  try {
+    const tableSQL = await getTableSql({
+      pg, body, table, fields,
+    });
+    const sval = `ilike '%${decodeURIComponent(search).replace(/'/g, "''")}%'`;
+    const searchQuery = search && searchColumn
+      ? ` (${searchColumn.split(',')?.map((name) => {
+        const { pk } = tableSQL.find((el) => el.name === name) || {};
+        return pk && !fieldsList.includes(name) ? `${pk} in (select ${pk} from (${fieldQuery})q where ${name} ${sval})` : `${name} ${sval}`;
+      }).join(' or ')} )` : '';
+
+    const filters = getFilterQuery({
+      filter,
+      tableSQL,
+      fields,
+      filterList: body?.filter_list || filterList,
+      pg,
+      config,
+    });
+
+    // filter
+    const filterQuery = filters?.filter((el) => el.query)?.map((el) => `${el.query} `).join(' and ');
+    const q = [body?.query, query, searchQuery, filterQuery].filter((el) => el).join(' and ');
+
+    // table
+    const modelQuery = body?.model || body?.table || table;
+    const optimizedSQL = `select * from ${getOptimizedQuery({ body, table, q })} `;
+    const tableCount = getOptimizedQuery({ body, table, q }, true);
+    // console.log(optimizedSQL);
+    return {
+      filterList,
+
+      q,
+      optimizedSQL,
+      tableCount,
+      table: modelQuery,
+      // filter parts
+      searchQuery,
+    };
+  }
+  catch (err) {
+    throw new Error(err.toString());
+  }
+}
+
+export default getFilterSQL;