@opengis/fastify-table 1.0.41 → 1.0.42

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,9 @@
1
1
  # fastify-table
2
2
 
3
+ ## 1.0.42 - 12.06.2024
4
+
5
+ - table cardSql support
6
+
3
7
  ## 1.0.41 - 12.06.2024
4
8
 
5
9
  - cls to db (crm.cls)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opengis/fastify-table",
3
- "version": "1.0.41",
3
+ "version": "1.0.42",
4
4
  "type": "module",
5
5
  "description": "core-plugins",
6
6
  "main": "index.js",
@@ -1,57 +1,60 @@
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, filters, form, meta,
19
- } = loadTable;
20
- const { pk } = await getMeta(table);
21
-
22
- const cols = columns.map((el) => el.name || el).join(',');
23
- 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('') || '';
24
-
25
- const fData = query.filter ? await getFilterSQL({
26
- filter: query.filter,
27
- table: params.table,
28
- json: 1,
29
- }) : {};
30
-
31
- const keyQuery = query.key && loadTable.key && !params.id ? `${loadTable.key}=$1` : null;
32
-
33
- const limit = Math.min(maxLimit, +(query.limit || 10));
34
-
35
- const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
36
- // id, query, filter
37
- const [orderColumn, orderDir] = (query.order || loadTable.order || '').split(/[- ]/);
38
-
39
- const order = cols.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
40
- const state = loadTable.filterState && query.state ? loadTable.filterState[query.state]?.sql : null;
41
- const custom = loadTable.filterCustom && query.custom ? loadTable.filterCustom[query.custom]?.sql : null;
42
- const search = loadTable.meta?.search && query.search ? `(${loadTable.meta?.search.split(',').map(el => `${el} ilike '%${query.search}%'`).join(' or ')})` : null;
43
-
44
- const where = [(params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, state, custom, search].filter((el) => el);
45
- 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}`;
46
-
47
- if (query.sql === '1') { return q; }
48
-
49
- const { rows } = await pg.query(q, (params.id ? [params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
50
-
51
- 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);
52
-
53
- await metaFormat({ rows, table: params.table });
54
- return {
55
- time: Date.now() - time, total, count: rows.length, pk, form, rows, meta, columns, filters,
56
- };
57
- }
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 } = await getMeta(table);
21
+
22
+ const cols = columns.map((el) => el.name || el).join(',');
23
+ 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('') || '';
24
+ const cardSqlFiltered = params.id ? cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) : [];
25
+ 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('') || '' : '';
26
+
27
+ const fData = query.filter ? await getFilterSQL({
28
+ filter: query.filter,
29
+ table: params.table,
30
+ json: 1,
31
+ }) : {};
32
+
33
+ const keyQuery = query.key && loadTable.key && !params.id ? `${loadTable.key}=$1` : null;
34
+
35
+ const limit = Math.min(maxLimit, +(query.limit || 10));
36
+
37
+ const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
38
+ // id, query, filter
39
+ const [orderColumn, orderDir] = (query.order || loadTable.order || '').split(/[- ]/);
40
+
41
+ const order = cols.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
42
+ const state = loadTable.filterState && query.state ? loadTable.filterState[query.state]?.sql : null;
43
+ const custom = loadTable.filterCustom && query.custom ? loadTable.filterCustom[query.custom]?.sql : null;
44
+ const search = loadTable.meta?.search && query.search ? `(${loadTable.meta?.search.split(',').map(el => `${el} ilike '%${query.search}%'`).join(' or ')})` : null;
45
+
46
+ const where = [(params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, state, custom, search].filter((el) => el);
47
+ const cardColumns = cardSqlFiltered.length ? `,${cardSqlFiltered.map((el) => el.name)}` : '';
48
+ const q = `select ${pk ? `"${pk}" as id,` : ''} ${query.id || query.key ? '*' : cols || '*'} ${cardColumns} from ${table} t ${sqlTable} ${cardSqlTable} where ${where.join(' and ') || 'true'} ${order} ${offset} limit ${limit}`;
49
+
50
+ if (query.sql === '1') { return q; }
51
+
52
+ const { rows } = await pg.query(q, (params.id ? [params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
53
+
54
+ 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);
55
+
56
+ await metaFormat({ rows, table: params.table });
57
+ return {
58
+ time: Date.now() - time, total, count: rows.length, pk, form, rows, meta, columns, filters,
59
+ };
60
+ }