@opengis/fastify-table 1.0.59 → 1.0.61

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/Changelog.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # fastify-table
2
2
 
3
+ ## 1.0.61 - 18.07.2024
4
+
5
+ - add custom actions for table
6
+
7
+ ## 1.0.60 - 12.07.2024
8
+
9
+ - code optimization
10
+
3
11
  ## 1.0.59 - 12.07.2024
4
12
 
5
13
  - code optimization
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opengis/fastify-table",
3
- "version": "1.0.59",
3
+ "version": "1.0.61",
4
4
  "type": "module",
5
5
  "description": "core-plugins",
6
6
  "main": "index.js",
@@ -1,63 +1,63 @@
1
- import getTemplate from './utils/getTemplate.js';
2
- import getFilterSQL from '../funcs/getFilterSQL/index.js';
3
- import getMeta from '../../pg/funcs/getMeta.js';
4
- import metaFormat from '../funcs/metaFormat/index.js';
5
-
6
- const maxLimit = 100;
7
- export default async function data(req) {
8
- const time = Date.now();
9
- const {
10
- pg, params, query = {},
11
- } = req;
12
-
13
- const loadTable = await getTemplate('table', params.table);
14
-
15
- if (!loadTable) { return { status: 404, message: 'not found' }; }
16
-
17
- const {
18
- table, columns, sql, cardSql, filters, form, meta,
19
- } = loadTable;
20
- const { pk, columns: dbColumns = [] } = await getMeta(table);
21
-
22
- if (!pk) return { message: `table not found: ${table}`, status: 404 };
23
-
24
- const cols = columns.map((el) => el.name || el).join(',');
25
- const columnList = dbColumns.map((el) => el.name || el).join(',');
26
- 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('') || '';
27
- const cardSqlFiltered = params.id ? (cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) || []) : [];
28
- const cardSqlTable = cardSqlFiltered.length ? cardSqlFiltered.map((el, i) => ` left join lateral (select json_agg(row_to_json(q)) as ${el.name} from (${el.sql})q) ct${i} on 1=1 `).join('') || '' : '';
29
-
30
- const fData = query.filter ? await getFilterSQL({
31
- filter: query.filter,
32
- table: params.table,
33
- json: 1,
34
- }) : {};
35
-
36
- const keyQuery = query.key && loadTable.key && !params.id ? `${loadTable.key}=$1` : null;
37
-
38
- const limit = Math.min(maxLimit, +(query.limit || 20));
39
-
40
- const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
41
- // id, query, filter
42
- const [orderColumn, orderDir] = (query.order || loadTable.order || '').split(/[- ]/);
43
-
44
- const order = columnList.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
45
- const state = loadTable.filterState && query.state ? loadTable.filterState[query.state]?.sql : null;
46
- const custom = loadTable.filterCustom && query.custom ? loadTable.filterCustom[query.custom]?.sql : null;
47
- const search = loadTable.meta?.search && query.search ? `(${loadTable.meta?.search.split(',').map(el => `${el} ilike '%${query.search}%'`).join(' or ')})` : null;
48
-
49
- const where = [(params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, state, custom, search].filter((el) => el);
50
- const cardColumns = cardSqlFiltered.length ? `,${cardSqlFiltered.map((el) => el.name)}` : '';
51
- const q = `select ${pk ? `"${pk}" as id,` : ''} ${columnList.includes('geom') ? `st_asgeojson(geom)::json as geom,` : ''} ${query.id || query.key ? '*' : cols || '*'} ${cardColumns} from ${table} t ${sqlTable} ${cardSqlTable} where ${where.join(' and ') || 'true'} ${order} ${offset} limit ${limit}`;
52
-
53
- if (query.sql === '1') { return q; }
54
-
55
- const { rows } = await pg.query(q, (params.id ? [params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
56
-
57
- 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);
58
-
59
- await metaFormat({ rows, table: params.table });
60
- return {
61
- time: Date.now() - time, total, count: rows.length, pk, form, rows, meta, columns, filters,
62
- };
63
- }
1
+ import getTemplate from './utils/getTemplate.js';
2
+ import getFilterSQL from '../funcs/getFilterSQL/index.js';
3
+ import getMeta from '../../pg/funcs/getMeta.js';
4
+ import metaFormat from '../funcs/metaFormat/index.js';
5
+
6
+ const maxLimit = 100;
7
+ export default async function data(req) {
8
+ const time = Date.now();
9
+ const {
10
+ pg, params, query = {},
11
+ } = req;
12
+
13
+ const loadTable = await getTemplate('table', params.table);
14
+
15
+ if (!loadTable) { return { status: 404, message: 'not found' }; }
16
+
17
+ const {
18
+ table, columns, sql, cardSql, filters, form, meta,
19
+ } = loadTable;
20
+ const { pk, columns: dbColumns = [] } = await getMeta(table);
21
+
22
+ if (!pk) return { message: `table not found: ${table}`, status: 404 };
23
+
24
+ const cols = columns.filter((el) => el.name !== 'geom').map((el) => el.name || el).join(',');
25
+ const columnList = dbColumns.map((el) => el.name || el).join(',');
26
+ 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('') || '';
27
+ const cardSqlFiltered = params.id ? (cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) || []) : [];
28
+ const cardSqlTable = cardSqlFiltered.length ? cardSqlFiltered.map((el, i) => ` left join lateral (select json_agg(row_to_json(q)) as ${el.name} from (${el.sql})q) ct${i} on 1=1 `).join('') || '' : '';
29
+
30
+ const fData = query.filter ? await getFilterSQL({
31
+ filter: query.filter,
32
+ table: params.table,
33
+ json: 1,
34
+ }) : {};
35
+
36
+ const keyQuery = query.key && loadTable.key && !params.id ? `${loadTable.key}=$1` : null;
37
+
38
+ const limit = Math.min(maxLimit, +(query.limit || 20));
39
+
40
+ const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
41
+ // id, query, filter
42
+ const [orderColumn, orderDir] = (query.order || loadTable.order || '').split(/[- ]/);
43
+
44
+ const order = columnList.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
45
+ const state = loadTable.filterState && query.state ? loadTable.filterState[query.state]?.sql : null;
46
+ const custom = loadTable.filterCustom && query.custom ? loadTable.filterCustom[query.custom]?.sql : null;
47
+ const search = loadTable.meta?.search && query.search ? `(${loadTable.meta?.search.split(',').map(el => `${el} ilike '%${query.search}%'`).join(' or ')})` : null;
48
+
49
+ const where = [(params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, state, custom, search].filter((el) => el);
50
+ const cardColumns = cardSqlFiltered.length ? `,${cardSqlFiltered.map((el) => el.name)}` : '';
51
+ const q = `select ${pk ? `"${pk}" as id,` : ''} ${columnList.includes('geom') ? 'st_asgeojson(geom)::json as geom,' : ''} ${query.id || query.key ? '*' : cols || '*'} ${cardColumns} from ${table} t ${sqlTable} ${cardSqlTable} where ${where.join(' and ') || 'true'} ${order} ${offset} limit ${limit}`;
52
+
53
+ if (query.sql === '1') { return q; }
54
+
55
+ const { rows } = await pg.query(q, (params.id ? [params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
56
+
57
+ 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);
58
+
59
+ await metaFormat({ rows, table: params.table });
60
+ return {
61
+ time: Date.now() - time, card: loadTable.card, actions: loadTable.actions, total, count: rows.length, pk, form, rows, meta, columns, filters,
62
+ };
63
+ }