@opengis/fastify-table 1.1.59 → 1.1.61

package/server/plugins/table/funcs/getFilterSQL/util/getFilterQuery.js

@@ -1,66 +1,66 @@
-/* eslint-disable no-continue */
-
-/**
-* @param {Number} opt.json - (1|0) 1 - Результат - Object, 0 - String
-* @param {String} opt.query - запит до таблиці
-* @param {String} opt.hash - інформація з хешу по запиту
-*/
-
-import formatValue from './formatValue.js';
-
-function getQuery({
-  pg, filter: filterStr, table, tableSQL, fields, filterList,
-}) {
-  if (!filterStr) return null; // filter list API
-
-  const mainOperators = ['=', '~', '>', '<'];
-
-  const filterQueryArray = decodeURI(filterStr?.replace(/(^,)|(,$)/g, '')).replace(/'/g, '').split(/[;|]/);
-
-  const resultList = [];
-
-  for (let i = 0; i < filterQueryArray.length; i += 1) {
-    const item = filterQueryArray[i];
-    const operator = mainOperators?.find((el) => item.indexOf(el) !== -1) || '=';
-    const [name] = item.split(operator);
-
-    // skip already added filter
-    if (resultList.find((el) => el.name === name)) {
-      continue;
-    }
-
-    // filter
-    const filter = filterList?.find((el) => [el.id, el.name].includes(name)) || { type: 'text' };
-
-    // find all value
-    const value = filterQueryArray.filter((el) => el.startsWith(name)).map((el) => el.substring(name.length + 1)).join(',');
-
-    const optimize = fields?.find((el) => el.name === name) ? null : tableSQL.find((el) => el.name === name);
-
-    // find field and skip not exists
-    const { dataTypeID } = fields?.find((el) => el.name === name) || fields?.find((el) => el.name === optimize?.pk) || {};
-
-    // format query
-    const {
-      op, query, filterType, fieldType,
-    } = formatValue({
-      pg,
-      table,
-      filter,
-      optimize,
-      name,
-      value: decodeURIComponent(value),
-      operator,
-      dataTypeID,
-    }) || {};
-    if (!query) continue;
-
-    resultList.push({
-      name, value, query, operator: op, filterType, type: fieldType,
-    });
-  }
-
-  return resultList;
-}
-
-export default getQuery;
+/* eslint-disable no-continue */
+
+/**
+* @param {Number} opt.json - (1|0) 1 - Результат - Object, 0 - String
+* @param {String} opt.query - запит до таблиці
+* @param {String} opt.hash - інформація з хешу по запиту
+*/
+
+import formatValue from './formatValue.js';
+
+function getQuery({
+  pg, filter: filterStr, table, tableSQL, fields, filterList,
+}) {
+  if (!filterStr) return null; // filter list API
+
+  const mainOperators = ['=', '~', '>', '<'];
+
+  const filterQueryArray = decodeURI(filterStr?.replace(/(^,)|(,$)/g, '')).replace(/'/g, '').split(/[;|]/);
+
+  const resultList = [];
+
+  for (let i = 0; i < filterQueryArray.length; i += 1) {
+    const item = filterQueryArray[i];
+    const operator = mainOperators?.find((el) => item.indexOf(el) !== -1) || '=';
+    const [name] = item.split(operator);
+
+    // skip already added filter
+    if (resultList.find((el) => el.name === name)) {
+      continue;
+    }
+
+    // filter
+    const filter = filterList?.find((el) => [el.id, el.name].includes(name)) || { type: 'text' };
+
+    // find all value
+    const value = filterQueryArray.filter((el) => el.startsWith(name)).map((el) => el.substring(name.length + 1)).join(',');
+
+    const optimize = fields?.find((el) => el.name === name) ? null : tableSQL.find((el) => el.name === name);
+
+    // find field and skip not exists
+    const { dataTypeID } = fields?.find((el) => el.name === name) || fields?.find((el) => el.name === optimize?.pk) || {};
+
+    // format query
+    const {
+      op, query, filterType, fieldType,
+    } = formatValue({
+      pg,
+      table,
+      filter,
+      optimize,
+      name,
+      value: decodeURIComponent(value),
+      operator,
+      dataTypeID,
+    }) || {};
+    if (!query) continue;
+
+    resultList.push({
+      name, value, query, operator: op, filterType, type: fieldType,
+    });
+  }
+
+  return resultList;
+}
+
+export default getQuery;

package/server/plugins/table/funcs/getFilterSQL/util/getOptimizedQuery.js

@@ -1,12 +1,12 @@
-function getOptimizedQuery({ body, table, q }, count) {
-  const order = body?.orderby || body?.order ? `order by ${body?.orderby || body?.order}` : '';
-
-  const tableName = body?.table || body?.model || table;
-
-  const sqlList = body?.sql?.filter((el) => !el.disabled && el?.sql?.replace && (count ? el.count !== false : true))
-    .map((el) => ` left join lateral (${el.filter ? el.sql.replace(/limit 1/ig, '') : el.sql}) as ${el.name} on 1=1 `).join(' ');
-
-  return `(select * from ${tableName} ${sqlList ? ` t ${sqlList}` : ''} where 1=1 and ${q?.replace('q.', 't.') || '1=1'} ${order})q`;
-}
-
-export default getOptimizedQuery;
+function getOptimizedQuery({ body, table, q }, count) {
+  const order = body?.orderby || body?.order ? `order by ${body?.orderby || body?.order}` : '';
+
+  const tableName = body?.table || body?.model || table;
+
+  const sqlList = body?.sql?.filter((el) => !el.disabled && el?.sql?.replace && (count ? el.count !== false : true))
+    .map((el) => ` left join lateral (${el.filter ? el.sql.replace(/limit 1/ig, '') : el.sql}) as ${el.name} on 1=1 `).join(' ');
+
+  return `(select * from ${tableName} ${sqlList ? ` t ${sqlList}` : ''} where 1=1 and ${q?.replace('q.', 't.') || '1=1'} ${order})q`;
+}
+
+export default getOptimizedQuery;

package/server/plugins/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;

package/server/plugins/table/funcs/getSelect.js

@@ -1,19 +1,19 @@
-import getTemplate from './getTemplate.js';
-
-const loadCls = {};
-
-export default async function getSelect(name) {
-  if (loadCls[name]) return loadCls[name];
-
-  const clsData = await getTemplate(['cls', 'select'], name);
-  if (!clsData) { return null; }
-
-  //  console.log(clsData);
-  if (clsData && Array.isArray(clsData)) {
-    loadCls[name] = { arr: clsData };
-    return loadCls[name];
-  }
-
-  loadCls[name] = clsData.sql ? clsData : { sql: clsData };
-  return loadCls[name];
-}
+import getTemplate from './getTemplate.js';
+
+const loadCls = {};
+
+export default async function getSelect(name) {
+  if (loadCls[name]) return loadCls[name];
+
+  const clsData = await getTemplate(['cls', 'select'], name);
+  if (!clsData) { return null; }
+
+  //  console.log(clsData);
+  if (clsData && Array.isArray(clsData)) {
+    loadCls[name] = { arr: clsData };
+    return loadCls[name];
+  }
+
+  loadCls[name] = clsData.sql ? clsData : { sql: clsData };
+  return loadCls[name];
+}

package/server/plugins/table/funcs/getSelectMeta.js

@@ -1,57 +1,57 @@
-import getPG from '../../pg/funcs/getPG.js';
-
-import getSelect from './getSelect.js';
-
-const selectMeta = {};
-
-export default async function getSelectMeta({ name, pg: pg1, nocache }) {
-  if (selectMeta[name] && !nocache) return selectMeta[name];
-
-  const cls = await getSelect(name);
-
-  if (!cls) return null;
-  if (cls.arr) return cls;
-  if (!cls.sql) return null;
-
-  const pg = pg1 || getPG({ db: cls.db || 'client' });
-  const { sql: original } = cls;
-  const sql = `with c(id,text) as (${original} ) select * from c  `;
-
-  /*= == 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.query(`select count(*) from (${original})q`).then((el) => el?.rows?.[0].count);
-
-  // column name
-  const cols = dataOrigin.fields.map((el) => el.name);
-  const type = dataOrigin.fields.map((el) => pg.pgType?.[el.dataTypeID] || 'text');
-
-  const searchColumn = cls?.searchColumn || (
-    dataOrigin.fields.find((el) => el.name === 'search') ? 'search' : dataOrigin.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(','),
-    db: cls.db,
-    original: original?.includes('where') ? `select * from (${sql})q` : sql,
-    sql,
-    count,
-    searchQuery,
-    table: tableNew.join(','),
-    time: new Date().toISOString(),
-
-  };
-
-  selectMeta[name] = data;
-  return data;
-}
+import getPG from '../../pg/funcs/getPG.js';
+
+import getSelect from './getSelect.js';
+
+const selectMeta = {};
+
+export default async function getSelectMeta({ name, pg: pg1, nocache }) {
+  if (selectMeta[name] && !nocache) return selectMeta[name];
+
+  const cls = await getSelect(name);
+
+  if (!cls) return null;
+  if (cls.arr) return cls;
+  if (!cls.sql) return null;
+
+  const pg = pg1 || getPG({ db: cls.db || 'client' });
+  const { sql: original } = cls;
+  const sql = `with c(id,text) as (${original} ) select * from c  `;
+
+  /*= == 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.query(`select count(*) from (${original})q`).then((el) => el?.rows?.[0].count);
+
+  // column name
+  const cols = dataOrigin.fields.map((el) => el.name);
+  const type = dataOrigin.fields.map((el) => pg.pgType?.[el.dataTypeID] || 'text');
+
+  const searchColumn = cls?.searchColumn || (
+    dataOrigin.fields.find((el) => el.name === 'search') ? 'search' : dataOrigin.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(','),
+    db: cls.db,
+    original: original?.includes('where') ? `select * from (${sql})q` : sql,
+    sql,
+    count,
+    searchQuery,
+    table: tableNew.join(','),
+    time: new Date().toISOString(),
+
+  };
+
+  selectMeta[name] = data;
+  return data;
+}

package/server/plugins/table/funcs/getTemplates.js

@@ -1,19 +1,19 @@
-import fs from 'fs';
-import path from 'path';
-
-import config from '../../../../config.js';
-
-const loadTemplate = {};
-
-export default async function getTemplateDir(type) {
-  if (!type) 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;
-  }
-  return loadTemplate[type];
-}
+import fs from 'fs';
+import path from 'path';
+
+import config from '../../../../config.js';
+
+const loadTemplate = {};
+
+export default async function getTemplateDir(type) {
+  if (!type) 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;
+  }
+  return loadTemplate[type];
+}

package/server/plugins/table/funcs/gisIRColumn.js

@@ -1,69 +1,72 @@
-import {
-  config, pgClients, getTemplate, getSelect, getFilterSQL,
-} from '../../../../utils.js';
-
-export default async function gisIRColumn({
-  pg = pgClients.client, layer, column, sql, query = '1=1', filter, state, search, custom,
-}) {
-  const time = Date.now();
-
-  const sel = await getSelect(query.cls || column);
-
-  const body = await getTemplate('table', layer);
-  const fData = await getFilterSQL({
-    table: layer,
-    filter,
-    state,
-    search,
-    custom,
-  });
-
-  const { tlist } = await pg.one(`select array_agg((select nspname from pg_namespace where oid=relnamespace)||'.'||relname) tlist from pg_class 
-  where relkind in ('r','v','m')`);
-
-  const tableName = body?.table || layer;
-  if (!tlist.includes(tableName)) return { error: `table not found: ${tableName}`, status: 400 };
-
-  // eslint-disable-next-line max-len
-  const { fields } = await pg.query(`select * from (${fData?.optimizedSQL || `select * from ${tableName}`})q limit 0`);
-
-  const col = fields.find((el) => el.name === column);
-
-  if (!col) return { status: 404, message: 'not found' };
-  const colField = pg.pgType[col.dataTypeID]?.includes('[]') ? `unnest(${column})` : column;
-
-  const q = `select ${colField} as id, count(*)::int from (
-    ${fData?.optimizedSQL || `select * from ${tableName} where ${body?.query || 'true'}`}
-  )t group by ${colField} order by count desc limit 15`;
-
-  if (sql) return q;
-
-  if (!body?.columns?.length) {
-    const { rows } = await pg.query(q);
-    if (sel?.arr?.length) {
-      rows.forEach((el) => {
-        const data = sel?.find((item) => item.id?.toString() === el.id?.toString());
-        Object.assign(el, data || {});
-      });
-    }
-    return {
-      count: rows?.reduce((acc, el) => acc + el.count, 0),
-      sql: config.local ? q : undefined,
-      rows,
-    };
-  }
-
-  const { rows } = await pg.query(q);
-  const cls = query.cls || body?.columns?.find((el) => el.name === column)?.data || col.data || col.option;
-  const select = await getSelect(cls, { val: rows.map((el) => el.id), ar: 1 });
-  rows.forEach((el) => {
-    const data = select?.arr ? select.arr?.find((item) => item.id?.toString() === el.id?.toString()) : undefined;
-    Object.assign(el, data || {});
-  });
-  return {
-    time: Date.now() - time,
-    count: rows.reduce((acc, el) => acc + el.count, 0),
-    sql: config.local ? q : undefined,
-    rows,
-  };
-}
+import getSelect from './getSelect.js';
+
+import getFilterSQL from './getFilterSQL/index.js';
+import getTemplate from './getTemplate.js';
+import pgClients from '../../pg/pgClients.js';
+import config from '../../../../config.js';
+
+export default async function gisIRColumn({
+  pg = pgClients.client, layer, column, sql, query = '1=1', filter, state, search, custom,
+}) {
+  const time = Date.now();
+
+  const sel = await getSelect(query.cls || column);
+
+  const body = await getTemplate('table', layer);
+  const fData = await getFilterSQL({
+    table: layer,
+    filter,
+    state,
+    search,
+    custom,
+  });
+
+  const { tlist } = await pg.one(`select array_agg((select nspname from pg_namespace where oid=relnamespace)||'.'||relname) tlist from pg_class 
+  where relkind in ('r','v','m')`);
+
+  const tableName = body?.table || layer;
+  if (!tlist.includes(tableName)) return { error: `table not found: ${tableName}`, status: 400 };
+
+  // eslint-disable-next-line max-len
+  const { fields } = await pg.query(`select * from (${fData?.optimizedSQL || `select * from ${tableName}`})q limit 0`);
+
+  const col = fields.find((el) => el.name === column);
+
+  if (!col) return { status: 404, message: 'not found' };
+  const colField = pg.pgType[col.dataTypeID]?.includes('[]') ? `unnest(${column})` : column;
+
+  const q = `select ${colField} as id, count(*)::int from (
+    ${fData?.optimizedSQL || `select * from ${tableName} where ${body?.query || 'true'}`}
+  )t group by ${colField} order by count desc limit 15`;
+
+  if (sql) return q;
+
+  if (!body?.columns?.length) {
+    const { rows } = await pg.query(q);
+    if (sel?.arr?.length) {
+      rows.forEach((el) => {
+        const data = sel?.find((item) => item.id?.toString() === el.id?.toString());
+        Object.assign(el, data || {});
+      });
+    }
+    return {
+      count: rows?.reduce((acc, el) => acc + el.count, 0),
+      sql: config.local ? q : undefined,
+      rows,
+    };
+  }
+
+  const { rows } = await pg.query(q);
+  const cls = query.cls || body?.columns?.find((el) => el.name === column)?.data || col.data || col.option;
+  const select = await getSelect(cls, { val: rows.map((el) => el.id), ar: 1 });
+  rows.forEach((el) => {
+    const data = select?.arr ? select.arr?.find((item) => item.id?.toString() === el.id?.toString()) : undefined;
+    Object.assign(el, data || {});
+  });
+  return {
+    time: Date.now() - time,
+    count: rows.reduce((acc, el) => acc + el.count, 0),
+    sql: config.local ? q : undefined,
+    rows,
+  };
+}

package/server/plugins/table/funcs/loadTemplate.js

@@ -1 +1 @@
-export default {};
+export default {};

package/server/plugins/table/funcs/loadTemplatePath.js

@@ -1 +1 @@
-export default {};
+export default {};

package/server/plugins/table/funcs/metaFormat/getSelectVal.js

@@ -1,23 +1,23 @@
-import getSelect from '../getSelect.js';
-import pgClients from '../../../pg/pgClients.js';
-import redis from '../../../redis/client.js';
-
-// import { pgClients, getSelect } from '../../../../../utils.js';
-
-export default async function getSelectVal({ pg: pg1, name, values }) {
-  const pg = pg1 || pgClients.client;
-  const cls = await getSelect(name);
-  if (!cls?.arr && !cls?.sql) return null;
-  const key = `select:${name}`;
-  const cache = !cls.arr ? (await redis.hmget(key, values)).reduce((p, el, i) => ({ ...p, [values[i]]: el }), {}) : {};
-
-  const data = cls.arr || (values.filter(el => !cache[el]).length
-    ? await pg.query(`with c(id,text) as (${cls.sql}) select * from c where id = any('{${values.filter(el => !cache[el])}}')`).then(el => el.rows)
-    : []);
-
-  const clsAr = { ...cache, ...data.reduce((p, el) => ({ ...p, [el.id.toString()]: el.color ? el : el.text }), {}) };
-  if (!cls.arr && data.length) {
-    redis.hmset(key, clsAr);
-  }
-  return clsAr;
-}
+import getSelect from '../getSelect.js';
+import pgClients from '../../../pg/pgClients.js';
+import redis from '../../../redis/client.js';
+
+// import { pgClients, getSelect } from '../../../../../utils.js';
+
+export default async function getSelectVal({ pg: pg1, name, values }) {
+  const pg = pg1 || pgClients.client;
+  const cls = await getSelect(name);
+  if (!cls?.arr && !cls?.sql) return null;
+  const key = `select:${name}`;
+  const cache = !cls.arr ? (await redis.hmget(key, values)).reduce((p, el, i) => ({ ...p, [values[i]]: el }), {}) : {};
+
+  const data = cls.arr || (values.filter(el => !cache[el]).length
+    ? await pg.query(`with c(id,text) as (${cls.sql}) select * from c where id = any('{${values.filter(el => !cache[el])}}')`).then(el => el.rows)
+    : []);
+
+  const clsAr = { ...cache, ...data.reduce((p, el) => ({ ...p, [el.id.toString()]: el.color ? el : el.text }), {}) };
+  if (!cls.arr && data.length) {
+    redis.hmset(key, clsAr);
+  }
+  return clsAr;
+}