@opengis/fastify-table 1.2.41 → 1.2.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.2.41",
+  "version": "1.2.43",
   "type": "module",
   "description": "core-plugins",
   "keywords": [

package/server/plugins/crud/funcs/dataDelete.js

@@ -2,6 +2,7 @@ import getPG from '../../pg/funcs/getPG.js';
 import getMeta from '../../pg/funcs/getMeta.js';
 import getRedis from '../../redis/funcs/getRedis.js';
 
+import extraData from '../../extra/extraData.js';
 import logChanges from './utils/logChanges.js';
 
 const rclient = getRedis();
@@ -15,10 +16,15 @@ export default async function dataDelete({
   if (!pg.tlist?.includes(table1)) return 'table not exist';
   const delQuery = `delete from ${table} WHERE ${pk} = $1 returning *`;
 
+  const extraRes = await extraData({
+    table, form: tokenData?.form, id, uid,
+  }, pg);
+
   const res = await pg.query(delQuery, [id]).then(el => el.rows?.[0] || {});
+
   await logChanges({
     pg, table, tokenData, referer, id, uid, type: 'DELETE',
   });
   rclient.incr(`pg:${table}:crud`);
-  return res;
+  return { ...res, ...extraRes || {} };
 }

package/server/plugins/crud/funcs/dataInsert.js

@@ -3,6 +3,7 @@ import getMeta from '../../pg/funcs/getMeta.js';
 import getRedis from '../../redis/funcs/getRedis.js';
 
 import logChanges from './utils/logChanges.js';
+import extraData from '../../extra/extraData.js';
 
 const rclient = getRedis();
 
@@ -37,6 +38,12 @@ export default async function dataInsert({
   const res = await pg.query(insertQuery, [...filterData.map((el) => (typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]))]) || {};
 
   const table1 = pg.pk[table] ? table : table.replace(/"/g, '');
+
+  const extraRes = await extraData({ table, form: tokenData?.form, id: res.rows?.[0]?.[pg.pk[table1]], data, uid }, pg);
+  if (extraRes && res?.rows?.[0]) {
+    Object.assign(res.rows[0], { ...extraRes });
+  }
+
   await logChanges({
     pg,
     table,

package/server/plugins/crud/funcs/dataUpdate.js

@@ -2,6 +2,7 @@ import getPG from '../../pg/funcs/getPG.js';
 import getMeta from '../../pg/funcs/getMeta.js';
 import getRedis from '../../redis/funcs/getRedis.js';
 
+import extraData from '../../extra/extraData.js';
 import logChanges from './utils/logChanges.js';
 
 const rclient = getRedis();
@@ -56,10 +57,12 @@ export default async function dataUpdate({
   // console.log(updateQuery, filterValue);
   const res = await pg.query(updateQuery, [id, ...filterValue]).then(el => el?.rows?.[0]) || {};
 
+  const extraRes = await extraData({ table, form: tokenData?.form, id, data, uid }, pg);
+
   await logChanges({
     pg, table, tokenData, referer, data, id, uid, type: 'UPDATE',
   });
 
   rclient.incr(`pg:${table}:crud`);
-  return res;
+  return { ...res, ...extraRes || {} };
 }

package/server/plugins/extra/extraData.js

@@ -0,0 +1,84 @@
+import { config, getMeta, pgClients, getTemplate, dataInsert } from '../../../utils.js';
+
+const defaultTable = 'crm.extra_data';
+
+function format(key, value, schema) {
+  if (!key || !schema?.[key]) return value;
+  if (schema?.[key]?.type && ['Number', 'Switcher'].includes(schema?.[key]?.type)) {
+    return JSON.parse(value || null);
+  }
+  return value;
+}
+
+export default async function extraData({
+  table, form, id, data, uid,
+}, pg = pgClients.client) {
+  if (!id || !table) {
+    return null;
+  }
+
+  const loadTemplate = await getTemplate('form', form);
+  if (!loadTemplate?.extra) return null;
+
+  const extraDataTable = config.extraData?.[table]
+    || config.extraData?.[table.split('.').shift()]
+    || config.extraData?.['default']
+    || config.extraData
+    || defaultTable;
+
+  const { pk: mainPK, columns: mainColumns = [] } = await getMeta({ pg, table });
+  const { pk, columns: extraColumns = [] } = await getMeta({ pg, table: extraDataTable });
+
+  if (!mainPK) {
+    return { error: `table pk not found: ${table}`, status: 404 };
+  }
+
+  if (!pk) {
+    return { error: `extra table pk not found: ${extraDataTable}`, status: 404 };
+  }
+
+  const mode = extraColumns.find((col) => col?.name === mainPK)
+    ? 'column'
+    : 'property';
+
+  if (mode === 'property') {
+    Object.assign(data || {}, { object_id: id });
+  }
+
+  const deleteRes = mode === 'property'
+    ? await pg.query(`delete from ${extraDataTable} where object_id=$1 and property_key = any($2::text[]) returning *`, [id, Object.keys(loadTemplate?.schema || {})])
+    : await pg.query(`delete from ${extraDataTable} where ${mainPK}=$1 returning *`, [id]);
+
+  if (!data) {
+    const res1 = mode === 'property'
+      ? deleteRes?.rows?.reduce((acc, curr) => Object.assign(acc, { [curr.property_key]: format(curr.property_key, curr.value_text, loadTemplate?.schema) }), {})
+      : deleteRes?.rows?.[0];
+    return res1;
+  }
+
+  if (mode === 'column') {
+    const filteredData = Object.keys(data)
+      .filter(key => Object.keys(loadTemplate?.schema || {}).includes(key))
+      .reduce((acc, curr) => Object.assign(acc, { [curr]: data[curr] }), {});
+    Object.assign(filteredData, { [mainPK]: id });
+    const res = await dataInsert({ pg, table: extraDataTable, data: filteredData, uid }).then(el => el.rows?.[0] || {});
+    Object.assign(res, { id: res?.[pg.pk?.[table || '']] });
+    return res;
+  }
+
+  const rows = Object.keys(data || {})
+    .filter(key => Object.keys(loadTemplate?.schema || {}).includes(key))
+    .filter(key => !mainColumns.map(el => el.name).concat('id', 'token').includes(key))
+    .map(key => ({
+      object_id: id,
+      property_key: key,
+      property_entity: table,
+      value_text: data[key],
+    }));
+
+  const res = await Promise.all(rows.map(async (row) => dataInsert({ pg, table: extraDataTable, data: row, uid }).then(el => el.rows?.[0] || {})));
+  return {
+    ...res.reduce((acc, curr) => Object.assign(acc, { [curr.property_key]: format(curr.property_key, curr.value_text, loadTemplate?.schema) }), {}),
+    id: res?.[0]?.object_id,
+  };
+}

package/server/plugins/extra/extraDataGet.js

@@ -0,0 +1,58 @@
+import { config, getTemplate, pgClients, getMeta } from "../../../utils.js";
+
+const defaultTable = 'crm.extra_data';
+
+function format(key, value, schema) {
+  if (!key || !schema?.[key]) return undefined; // skip non-existing
+  if (schema?.[key]?.type && ['Number', 'Switcher'].includes(schema?.[key]?.type)) {
+    return JSON.parse(value || null);
+  }
+  return value;
+}
+
+export default async function extraDataGet({
+  table: mainTable, form, id,
+}, pg = pgClients.client) {
+  if (!id || !form || !mainTable) {
+    return null;
+  }
+
+  const loadTemplate = await getTemplate('form', form);
+  if (!loadTemplate?.extra) return null;
+
+  const table = config.extraData?.[mainTable]
+    || config.extraData?.[mainTable.split('.').shift()]
+    || config.extraData?.['default']
+    || config.extraData
+    || defaultTable;
+
+  const { pk: mainPK } = await getMeta({ pg, table: mainTable });
+  const { pk, columns: extraColumns = [] } = await getMeta({ pg, table });
+
+  if (!mainPK) {
+    return { error: `table pk not found: ${mainTable}`, status: 404 };
+  }
+
+  if (!pk) {
+    return { error: `extra table pk not found: ${table}`, status: 404 };
+  }
+
+  const mode = extraColumns.find((col) => col?.name === mainPK)
+    ? 'column'
+    : 'property';
+
+  const { rows = [] } = await pg.query(`select * from ${table} where ${mode === 'column' ? mainPK : 'object_id'}=$1`, [id]);
+
+  if (mode === 'column') {
+    const res = Object.keys(rows[0] || {})
+      .map(key => [key, format(key, rows?.[0]?.[key], loadTemplate?.schema)])
+      .filter(el => el[1])
+      .reduce((acc, curr) => Object.assign(acc, { [curr[0]]: curr[1] }), {});
+    Object.assign(res, { id: rows?.[0]?.[pg.pk?.[mainTable || '']] });
+    return res;
+  }
+
+  const res = rows.reduce((acc, curr) => Object.assign(acc, { [curr.property_key]: format(curr.property_key, curr.value_text, loadTemplate?.schema) }), {});
+  Object.assign(res, { id: rows?.[0].object_id });
+  return res;
+};

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

@@ -0,0 +1,8 @@
+import routeData from '../../../routes/table/controllers/data.js';
+
+export default async function getData({ id, table, pg, filter, limit, page, search, user }) {
+  const params = { table, id };
+  const query = { filter, limit, page, search };
+  const result = await routeData({ pg, params, query, user });
+  return result;
+}

package/server/plugins/table/funcs/getFilterSQL/index.js

@@ -1,19 +1,51 @@
 import getTemplate from '../getTemplate.js';
 import pgClients from '../../../pg/pgClients.js';
-
-// import { getTemplate, pgClients } from '../../../../../utils.js';
+import config from '../../../../../config.js';
 
 // filter util
 import getTableSql from './util/getTableSql.js';
 import getFilterQuery from './util/getFilterQuery.js';
 import getOptimizedQuery from './util/getOptimizedQuery.js';
 
-async function getFilterSQL({
+const defaultTable = 'crm.extra_data';
+
+function getExtraQuery(mainColumns, extraColumns, schema, table, pk, mode = 'property') {
+  const keysExtra = Object.keys(schema || {}).filter(key => !mainColumns.map(el => el?.name).includes(key) && extraColumns.map(el => el?.name).includes(key));
+  if (mode === 'column') {
+    return { q: `left join lateral (select ${keysExtra.map(key => `"${key}"`).join(',')} from ${table} where ${pk}=t.${pk} limit 1) extra on 1=1`, keysExtra };
+  }
+  return {
+    q: `left join lateral (select ${keysExtra.map(key => `"${key}"`).join(',')} from ${table} where ${pk}=t.${pk} limit 1) extra on 1=1`,
+    keysExtra,
+  };
+}
+
+export default async function getFilterSQL({
   table, filter, pg = pgClients.client, search, filterList, query, custom, state,
 }) {
   if (!table) return { error: 'param table is required', status: 400 };
 
   const body = await getTemplate('table', table);
+  const loadTemplate = body?.form ? await getTemplate('form', body?.form) : null;
+  const { extra } = loadTemplate || {};
+
+  const extraDataTable = extra
+    ? config.extraData?.[body.table]
+    || config.extraData?.[mainTable.split('.').shift()]
+    || config.extraData?.['default']
+    || config.extraData
+    || defaultTable
+    : undefined;
+
+  const { fields: fieldsExtra = [] } = pg.pk?.[extraDataTable] ? await pg.query(`select * from ${extraDataTable} limit 0`) : {};
+  const mode = fieldsExtra.find((col) => col?.name === pg.pk?.[body?.table || table]) ? 'column' : 'property';
+
+  const { fields: fieldsModel = [] } = body?.table && pg.pk[body?.table] ? await pg.query(`select * from ${body.table} limit 0`) : {};
+  const { q: extraSqlList, keysExtra } = pg.pk?.[extraDataTable] && pg.pk?.[body?.table]
+    ? getExtraQuery(fieldsModel, fieldsExtra, loadTemplate?.schema, extraDataTable, pg.pk[body?.table || table], mode)
+    : {};
+
+  // console.log('extra getFilterSQL', extraDataTable, pg.pk?.[extraDataTable]);
 
   const sqlList = body?.sql?.length
     ? body?.sql?.filter((el) => !el.disabled && el?.sql?.replace)
@@ -22,11 +54,8 @@ async function getFilterSQL({
         return ` left join lateral (${el.filter ? el.sql.replace(/limit 1/ig, '') : el.sql}) as ${el.name} on 1=1 `;
       }).join(' ')
     : '';
-  const fieldQuery = `select * from ${body?.table || table} ${sqlList ? ` t ${sqlList}` : ''} limit 0`;
+  const fieldQuery = `select * from ${body?.table || table} t ${sqlList || ''} ${extraSqlList || ''} limit 0`;
   const { fields = [] } = await pg.query(fieldQuery);
-
-  const { fields: fieldsModel } = body?.table && 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 || body?.meta?.search || autoSearchColumn;
   const fieldsList = (fieldsModel || fields)?.map((el) => el.name);
@@ -45,6 +74,9 @@ async function getFilterSQL({
       .concat(body?.filters || [])) /* .concat(extraFilters || []).concat(customFilters || []) */
 
       ?.map(async (el) => {
+        if (el.name && keysExtra?.includes?.(el.name)) {
+          Object.assign(el, { extra: { table: extraDataTable, mode } });
+        }
         if (!el?.data) return el;
         const cls = await getTemplate(['cls', 'select'], el.data);
         if (Array.isArray(cls) && cls?.length) {
@@ -59,7 +91,7 @@ async function getFilterSQL({
     const filters = getFilterQuery({
       pg,
       filter,
-      table,
+      table: body?.table || table,
       tableSQL,
       fields,
       filterList: filterList1,
@@ -74,8 +106,8 @@ async function getFilterSQL({
 
     // table
     const modelQuery = body?.model || body?.table || table;
-    const optimizedSQL = `select * from ${getOptimizedQuery({ body, table, q })} `;
-    const tableCount = getOptimizedQuery({ body, table, q }, true);
+    const optimizedSQL = `select * from ${getOptimizedQuery({ body, extraSqlList, table, q })} `;
+    const tableCount = getOptimizedQuery({ body, extraSqlList, table, q }, true);
     // console.log(optimizedSQL);
     return {
       filterList,
@@ -92,5 +124,3 @@ async function getFilterSQL({
     throw new Error(err.toString());
   }
 }
-
-export default getFilterSQL;

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

@@ -29,7 +29,9 @@ function formatValue({
   const pk = pg?.pk && table ? pg.pk[table] : undefined;
 
   if (!dataTypeID && !extra) return {};
-  const fieldType = extra ? pg.pgType?.[{ Date: 1114 }[filter?.type] || 25] : pg.pgType?.[dataTypeID];
+  // const fieldType = extra ? pg.pgType?.[{ Date: 1114 }[filter?.type] || 25] : pg.pgType?.[dataTypeID];
+  const fieldType = pg.pgType?.[dataTypeID] || pg.pgType?.[{ Date: 1114 }[filter?.type || ''] || 25];
+
   if (!name || !value || !fieldType) return {};
   const filterType = filter.type?.toLowerCase();
 
@@ -61,15 +63,21 @@ function formatValue({
     if (!isValidDate(startDate) || !isValidDate(endDate)) {
       return { op: 'between', query: 'false', extra };
     }
-    const query = extra && pk
-      ? `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_date::date >= '${min}'::date and value_date::date <= '${max}'::date)`
-      : `${name}::date >= '${min}'::date and ${name}::date <= '${max}'::date`;
-    return { op: 'between', query, extra };
+    if (extra?.table && pk) {
+      const query = extra?.mode === 'property' && pk
+        ? `${pk} in (select object_id from ${extra.table} where property_key='${name}' and value_date::date >= '${min}'::date and value_date::date <= '${max}'::date)`
+        : `${pk} in (select ${pk} from ${extra.table} where ${name}::date >= '${min}'::date and ${name}::date <= '${max}'::date)`;
+      return { op: 'between', query, extra };
+    }
+    return { op: 'between', query: `${name}::date >= '${min}'::date and ${name}::date <= '${max}'::date`, extra };
   }
 
   // my rows
   if (value === 'me' && uid && fieldType === 'text') {
-    return { op: '=', query: extra ? `uid = '${uid}'` : `${name}::text = '${uid}'`, extra };
+    const query = extra?.table && pk
+      ? `${pk} in (select ${pk} from ${extra.table} where uid = '${uid}')`
+      : `${name}::text = '${uid}'`;
+    return { op: '=', query, extra };
   }
 
   const formatType = {
@@ -99,12 +107,18 @@ function formatValue({
   // multiple items of 1 param
   if (value?.indexOf(',') !== -1) {
     const values = value.split(',').filter((el) => el !== 'null');
-    if (extra && pk) {
+    if (extra?.mode === 'property' && pk) {
+      const query = value?.indexOf('null') !== -1
+        ? `${pk} in (select object_id from ${extra?.table} where property_key='${name}' and ( value_text is null or value_text in (${values?.map((el) => `'"${el}"'`).join(',')}) ) )`
+        : `${pk} in (select object_id from ${extra?.table} where property_key='${name}' and value_text in (${values?.map((el) => `'"${el}"'`).join(',')}) )`;
+      return { op: 'in', query, extra };
+    } else if (extra?.mode === 'property' && pk) {
       const query = value?.indexOf('null') !== -1
-        ? `${pk} in (select object_id from crm.extra_data where property_key='${name}' and ( value_text is null or value_text in (${values?.map((el) => `'"${el}"'`).join(',')}) ) )`
-        : `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_text in (${values?.map((el) => `'"${el}"'`).join(',')}) )`;
+        ? `${pk} in (select ${pk} from ${extra?.table} where ( "${name}" is null or "${name}" in (${values?.map((el) => `'"${el}"'`).join(',')}) ) )`
+        : `${pk} in (select ${pk} from ${extra?.table} where "${name}" in (${values?.map((el) => `'"${el}"'`).join(',')}) )`;
       return { op: 'in', query, extra };
     }
+
     const query = value?.indexOf('null') !== -1
       ? `( ${name} is null or ${name}::text in (${values?.map((el) => `'${el}'`).join(',')}) )`
       : `${name}::text in (${value.split(',')?.map((el) => `'${el}'`).join(',')})`;
@@ -142,19 +156,26 @@ function formatValue({
   if (['~', '='].includes(operator)) {
     const operator1 = (filterType === 'text' && (filter?.id || filter?.name) && operator === '=' ? '~' : operator);
     const matchNull = { null: 'is null', notnull: 'is not null' }[value];
-    const match = matchNull || ((operator1 === '=' || filterType === 'autocomplete') ? `='${value}'` : `ilike '%${value}%'`);
-    if (extra && pk) {
+    const matchBoolean = fieldType === 'boolean' ? { true: 'is true', false: 'is false' }[value] : null;
+    const match = matchNull || matchBoolean || ((operator1 === '=' || filterType === 'autocomplete') ? `='${value}'` : `ilike '%${value}%'`);
+
+    if (extra?.mode === 'property' && pk) {
+      const query = data && sql
+        ? `${pk} in (select object_id from ${extra?.table} where property_key='${name}' and value_text in ( ( with q(id,name)  as  (${sql}) select id from q where ${filterType === 'autocomplete' ? 'id' : 'name'} ${match})))`
+        : `${pk} in (select object_id from ${extra?.table} where property_key='${name}' and value_text ${match})`;
+      return { op: 'ilike', query, extra };
+    } else if (extra?.mode === 'column') {
       const query = data && sql
-        ? `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_text in ( ( with q(id,name)  as  (${sql}) select id from q where ${filterType === 'autocomplete' ? 'id' : 'name'} ${match})))`
-        : `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_text ${match})`;
+        ? `${pk} in (select ${pk} from ${extra?.table} where "${name}" in ( ( with q(id,name)  as  (${sql}) select id from q where ${filterType === 'autocomplete' ? 'id' : 'name'} ${match})))`
+        : `${pk} in (select ${pk} from ${extra?.table} where "${name}" ${match})`;
       return { op: 'ilike', query, extra };
     }
 
-    const query = filter?.data && filter?.sql
-      ? `${filter?.name || filter?.id} in ( ( with q(id,name)  as  (${filter?.sql}) select id from q where ${filterType === 'autocomplete' ? 'id' : 'name'}::text ${match}) )` // filter with cls
+    const query = data && sql
+      ? `${name || filter?.id} in ( ( with q(id,name)  as  (${sql}) select id from q where ${filterType === 'autocomplete' ? 'id' : 'name'}::text ${match}) )` // filter with cls
       : `${name}::text ${match}`; // simple filter
     // console.log(query);
-    return { op: 'ilike', query };
+    return { op: 'ilike', query, extra };
   }
 
   // json

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

@@ -1,4 +1,4 @@
-function getOptimizedQuery({ body, table, q }, count) {
+function getOptimizedQuery({ body, extraSqlList, table, q }, count) {
   const order = body?.orderby || body?.order ? `order by ${body?.orderby || body?.order}` : '';
 
   const tableName = body?.table || body?.model || table;
@@ -6,7 +6,7 @@ function getOptimizedQuery({ body, table, q }, count) {
   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`;
+  return `(select * from ${tableName} t ${sqlList ? ` ${sqlList}` : ''} ${extraSqlList || ''} where 1=1 and ${q?.replace('q.', 't.') || '1=1'} ${order})q`;
 }
 
 export default getOptimizedQuery;

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

@@ -2,10 +2,11 @@ import { handlebars } from '@opengis/fastify-hb/utils.js';
 
 import getTemplate from '../getTemplate.js';
 import getSelectVal from './getSelectVal.js';
+import pgClients from '../../../pg/pgClients.js';
 
 export default async function metaFormat({
   rows, table, cls, sufix = true,
-}) {
+}, pg = pgClients.client) {
   const loadTable = table ? await getTemplate('table', table) : {};
   const selectCols = Object.keys(cls || {}).map(key => ({ name: key, data: cls[key] })).concat(loadTable?.columns?.filter((e) => e.data) || []);
   const metaCls = Object.keys(loadTable?.meta?.cls || {}).map((el) => ({ name: el, data: loadTable?.meta?.cls[el] }));
@@ -24,7 +25,7 @@ export default async function metaFormat({
     const values = [...new Set(rows?.map((el) => el[attr.name]).flat())].filter((el) => (typeof el === 'boolean' ? true : el));
     if (!values.length) return null;
 
-    const clsValues = await getSelectVal({ name: attr.data, values });
+    const clsValues = await getSelectVal({ pg, name: attr.data, values });
     if (!clsValues) return null;
 
     rows.forEach(el => {

package/server/routes/table/controllers/data.js

@@ -2,6 +2,8 @@ import {
   config, getTemplate, getFilterSQL, getMeta, metaFormat, getAccess, setToken, gisIRColumn, applyHook, handlebars, handlebarsSync, getSelect, setOpt, getOpt, pgClients,
 } from '../../../../utils.js';
 
+import extraDataGet from '../../../plugins/extra/extraDataGet.js';
+
 import conditions from './utils/conditions.js';
 
 const components = {
@@ -150,7 +152,16 @@ export default async function dataAPI(req, reply, called) {
   const { total, filtered } = counts || {};
   const agg = Object.keys(counts).filter(el => !['total', 'filtered'].includes(el)).reduce((acc, el) => ({ ...acc, [el]: counts[el] }), {});
 
-  await metaFormat({ rows, table: tokenData?.table || hookData?.table || params.table });
+  if (hookData?.id || params.id) {
+    const extraData = await extraDataGet({
+      table: loadTable?.table,
+      id: hookData?.id || params.id,
+      form,
+    }, pg);
+    Object.assign(rows[0] || {}, { ...extraData || {} });
+  }
+
+  await metaFormat({ rows, table: tokenData?.table || hookData?.table || params.table }, pg);
 
   const status = [];
   if (loadTable?.meta?.status) {

package/server/routes/table/controllers/filter.js

@@ -17,7 +17,9 @@ export default async function filterAPI(req) {
     filter, custom, state, search,
   } = query;
 
-  const { optimizedSQL = `select * from ${loadTable.table}` } = loadTable?.sql || filter || custom || state || search ? await getFilterSQL({
+  const { extra } = loadTable?.form ? await getTemplate('form', loadTable?.form) : {};
+
+  const { optimizedSQL = `select * from ${loadTable.table}` } = loadTable?.sql || filter || custom || state || search || extra ? await getFilterSQL({
     pg,
     table: params.table,
     filter,

package/utils.js

@@ -32,6 +32,7 @@ import getFilterSQL from './server/plugins/table/funcs/getFilterSQL/index.js';
 import getSelect from './server/plugins/table/funcs/getSelect.js';
 import getSelectMeta from './server/plugins/table/funcs/getSelectMeta.js';
 import gisIRColumn from './server/plugins/table/funcs/gisIRColumn.js';
+import getData from './server/plugins/table/funcs/getData.js';
 
 // crud
 import dataInsert from './server/plugins/crud/funcs/dataInsert.js';
@@ -114,6 +115,7 @@ export {
   metaFormat,
   getMeta,
   gisIRColumn,
+  getData,
 
   // pg
   initPG,