@opengis/fastify-table 1.0.34 → 1.0.36

package/server/templates/select/test.storage.data.json

@@ -1,3 +1,3 @@
-{
-    "key": "dataset_id"
+{
+    "key": "dataset_id"
 }

package/server/templates/table/test.dataset.table.json

@@ -1,25 +1,25 @@
-{
-    "columns": [
-        {
-            "name": "dataset_id",
-            "title": "22"
-        },
-        {
-            "name": "dataset_name",
-            "title": "dataset_name"
-        }
-    ],
-    "table": "gis.dataset",
-    "order": "dataset_name",
-    "meta": {
-        "title": "dataset_name",
-        "search": "dataset_name,dataset_id"
-    },
-    "filters": [
-        {
-            "ua": "Назва набору",
-            "name": "dataset_name",
-            "type": "text"
-        }
-    ]
+{
+    "columns": [
+        {
+            "name": "dataset_id",
+            "title": "22"
+        },
+        {
+            "name": "dataset_name",
+            "title": "dataset_name"
+        }
+    ],
+    "table": "gis.dataset",
+    "order": "dataset_name",
+    "meta": {
+        "title": "dataset_name",
+        "search": "dataset_name,dataset_id"
+    },
+    "filters": [
+        {
+            "ua": "Назва набору",
+            "name": "dataset_name",
+            "type": "text"
+        }
+    ]
 }

package/server.js

@@ -1,14 +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);
-  }
-});
+// 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,57 +1,57 @@
-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';
-
-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: params.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 && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
-  // id, query, filter
-  const [orderColumn, orderDir] = (query.order || loadTable.order || '').split('-');
-
-  const order = cols.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
-  const state = loadTable.filterState && query.state ? loadTable.filterState[query.state]?.sql : null;
-  const custom = loadTable.filterCustom && query.custom ? loadTable.filterCustom[query.custom]?.sql : null;
-  const search = loadTable.meta?.search && query.search ? `(${loadTable.meta?.search.split(',').map(el => `${el} ilike '%${query.search}%'`).join(' or ')})` : null;
-
-  const where = [(params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, state, custom, search].filter((el) => el);
-  const q = `select  ${pk ? `"${pk}" as id,` : ''} ${query.id || query.key ? '*' : cols || '*'} from ${table} t ${sqlTable} where ${where.join(' and ') || 'true'} ${order} ${offset}  limit ${limit}`;
-
-  if (query.sql === '1') { 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);
-
-  await metaFormat({ rows, table: params.table });
-  return {
-    time: Date.now() - time, total, count: rows.length, 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';
+import metaFormat from '../funcs/metaFormat/index.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: params.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 && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
+  // id, query, filter
+  const [orderColumn, orderDir] = (query.order || loadTable.order || '').split('-');
+
+  const order = cols.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
+  const state = loadTable.filterState && query.state ? loadTable.filterState[query.state]?.sql : null;
+  const custom = loadTable.filterCustom && query.custom ? loadTable.filterCustom[query.custom]?.sql : null;
+  const search = loadTable.meta?.search && query.search ? `(${loadTable.meta?.search.split(',').map(el => `${el} ilike '%${query.search}%'`).join(' or ')})` : null;
+
+  const where = [(params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, state, custom, search].filter((el) => el);
+  const q = `select  ${pk ? `"${pk}" as id,` : ''} ${query.id || query.key ? '*' : cols || '*'} from ${table} t ${sqlTable} where ${where.join(' and ') || 'true'} ${order} ${offset}  limit ${limit}`;
+
+  if (query.sql === '1') { 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);
+
+  await metaFormat({ rows, table: params.table });
+  return {
+    time: Date.now() - time, total, count: rows.length, pk, form, rows, meta, columns, filters,
+  };
+}

package/table/controllers/filter.js

@@ -1,32 +1,37 @@
-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' }; }
-
-  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 countArr = await req.pg.queryCache(`select ${el.id}::text as id,count(*) from ${loadTable.table} 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 });
-  }));
-  return {
-    time: Date.now() - time,
-    list: filters,
-    custom: loadTable?.filterCustom?.map(el => ({ label: el.label })),
-    inline: loadTable?.filterInline,
-    state: loadTable?.filterState?.map(el => ({ label: el.label })),
-  };
-}
+import getTemplate from './utils/getTemplate.js';
+import getSelect from './utils/getSelect.js';
+import getMeta from '../../pg/funcs/getMeta.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 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 ${loadTable.table} group by unnest(${el.id})`) 
+      : await req.pg.queryCache(`select ${el.id}::text as id,count(*) from ${loadTable.table} 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 });
+  }));
+  return {
+    time: Date.now() - time,
+    list: filters,
+    custom: loadTable?.filterCustom?.map(el => ({ label: el.label })),
+    inline: loadTable?.filterInline,
+    state: loadTable?.filterState?.map(el => ({ label: el.label })),
+  };
+}

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

@@ -1,41 +1,41 @@
-import getTemplate from './utils/getTemplate.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-import metaFormat from '../funcs/metaFormat/index.js';
-
-const maxLimit = 100;
-
-export default async function data({
-  pg, query = {},
-}) {
-  const time = Date.now();
-
-  const loadTable = await getTemplate('table', query.table);
-
-    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.min(maxLimit, +(query.limit || 10));
-  const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
-
-  const search = meta?.search && query.key ? `(${meta?.search.concat(meta?.title ? `,${meta?.title}` : '').split(',').map(el => `${el} ilike '%${query.key}%'`).join(' or ')})` : null;
-
-  const where = [loadTable.query, search].filter((el) => el);
-  const q = `select  ${pk ? `"${pk}" as id,` : ''} * from ${table} t where ${where.join(' and ') || 'true'} ${order} ${offset} limit ${limit}`;
-
-  if (query.sql === '1') return q;
-
-  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);
-
-  await metaFormat({ rows, table: query.table });
-  return {
-    time: Date.now() - time, total, count: rows.length, rows,
-  };
-}
+import getTemplate from './utils/getTemplate.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+import metaFormat from '../funcs/metaFormat/index.js';
+
+const maxLimit = 100;
+
+export default async function data({
+  pg, query = {},
+}) {
+  const time = Date.now();
+
+  const loadTable = await getTemplate('table', query.table);
+
+    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.min(maxLimit, +(query.limit || 10));
+  const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
+
+  const search = meta?.search && query.key ? `(${meta?.search.concat(meta?.title ? `,${meta?.title}` : '').split(',').map(el => `${el} ilike '%${query.key}%'`).join(' or ')})` : null;
+
+  const where = [loadTable.query, search].filter((el) => el);
+  const q = `select  ${pk ? `"${pk}" as id,` : ''} * from ${table} t where ${where.join(' and ') || 'true'} ${order} ${offset} limit ${limit}`;
+
+  if (query.sql === '1') return q;
+
+  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);
+
+  await metaFormat({ rows, table: query.table });
+  return {
+    time: Date.now() - time, total, count: rows.length, rows,
+  };
+}

package/table/controllers/suggest.js

@@ -1,60 +1,60 @@
-import getSelectMeta from './utils/getSelectMeta.js';
-import getPG from '../../pg/funcs/getPG.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({ db: meta.db }) : pg1;
-  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.replace(/{{parent}}/gi, parent)} 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',
-    db: meta.db,
-    sql: sqlSuggest,
-    data,
-  };
-
-  return message;
-}
+import getSelectMeta from './utils/getSelectMeta.js';
+import getPG from '../../pg/funcs/getPG.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({ db: meta.db }) : pg1;
+  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.replace(/{{parent}}/gi, parent)} 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',
+    db: meta.db,
+    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];
+}