@opengis/fastify-table 1.0.91 → 1.0.92

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

@@ -1,29 +1,29 @@
-{
-    "columns": [
-        {
-            "name": "dataset_id",
-            "title": "22"
-        },
-        {
-            "name": "dataset_name",
-            "title": "dataset_name"
-        }
-    ],
-    "table": "gis.dataset",
-    "order": "dataset_name",
-    "meta": {
-        "cls": {
-            "dataset_id": "test.storage.data"
-        },
-        "bbox": "geom",
-        "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": {
+        "cls": {
+            "dataset_id": "test.storage.data"
+        },
+        "bbox": "geom",
+        "title": "dataset_name",
+        "search": "dataset_name,dataset_id"
+    },
+    "filters": [
+        {
+            "ua": "Назва набору",
+            "name": "dataset_name",
+            "type": "text"
+        }
+    ]
 }

package/server/templates/table/test.gis.map.table.json

@@ -1,45 +1,45 @@
-{
-    "columns": [
-        {
-            "name": "map_id",
-            "title": "ID"
-        },
-        {
-            "name": "name",
-            "title": "Назва"
-        },
-        {
-            "name": "editor_id",
-            "title": "Editor ID"
-        },
-        {
-            "name": "alias",
-            "title": "Alias"
-        },
-        {
-            "name": "ord",
-            "title": "Order"
-        },
-        {
-            "name": "enabled",
-            "title": "On / off"
-        },
-        {
-            "name": "tags",
-            "title": "Tags"
-        }
-    ],
-    "table": "gis.map",
-    "order": "name",
-    "meta": {
-        "title": "name",
-        "search": "name,alias,map_id"
-    },
-    "filters": [
-        {
-            "ua": "Назва",
-            "name": "name",
-            "type": "text"
-        }
-    ]
+{
+    "columns": [
+        {
+            "name": "map_id",
+            "title": "ID"
+        },
+        {
+            "name": "name",
+            "title": "Назва"
+        },
+        {
+            "name": "editor_id",
+            "title": "Editor ID"
+        },
+        {
+            "name": "alias",
+            "title": "Alias"
+        },
+        {
+            "name": "ord",
+            "title": "Order"
+        },
+        {
+            "name": "enabled",
+            "title": "On / off"
+        },
+        {
+            "name": "tags",
+            "title": "Tags"
+        }
+    ],
+    "table": "gis.map",
+    "order": "name",
+    "meta": {
+        "title": "name",
+        "search": "name,alias,map_id"
+    },
+    "filters": [
+        {
+            "ua": "Назва",
+            "name": "name",
+            "type": "text"
+        }
+    ]
 }

package/table/controllers/data.js

@@ -1,103 +1,103 @@
-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';
-import getAccess from '../../crud/funcs/getAccess.js';
-import setToken from '../../crud/funcs/setToken.js';
-import gisIRColumn from './utils/gisIRColumn.js';
-
-const maxLimit = 100;
-export default async function dataAPI({
-  pg, params, funcs = {}, query = {}, opt = {}, uid: uid1, req, session,
-}) {
-  const time = Date.now();
-
-  const uid = session?.passport?.user?.uid || uid1 || query.uid || 0;
-
-  const loadTable = await getTemplate('table', params.table);
-
-  if (!loadTable) { return { message: 'template not found', status: 404 }; }
-
-  const {
-    table, columns, sql, cardSql, filters, form, meta, sqlColumns, ispublic,
-  } = loadTable;
-  const { pk, columns: dbColumns = [] } = await getMeta(table);
-
-  if (!pk) return { message: `table not found: ${table}`, status: 404 };
-
-  const cols = columns.filter((el) => el.name !== 'geom').map((el) => el.name || el).join(',');
-  const metaCols = Object.keys(loadTable?.meta?.cls || {}).filter((el) => !cols.includes(el)).length
-    ? `,${Object.keys(loadTable?.meta?.cls || {})?.filter((el) => !cols.includes(el)).join(',')}`
-    : '';
-  const columnList = dbColumns.map((el) => el.name || el).join(',');
-  const sqlTable = sql?.filter?.((el) => !el?.disabled && el?.sql?.replace).map((el, i) => ` left join lateral (${el.sql.replace('{{uid}}', uid)}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
-  const cardSqlFiltered = opt?.id || params.id ? (cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) || []) : [];
-  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('') || '' : '';
-
-  if (params.id && columnList.includes(params.id)) {
-    return gisIRColumn({
-      pg, funcs, layer: params.table, column: params.id, sql: query.sql,
-    });
-  }
-
-  const fData = query.filter || query.search ? await getFilterSQL({
-    filter: query.filter,
-    search: query.search,
-    table: params.table,
-    json: 1,
-  }) : {};
-
-  const keyQuery = query.key && loadTable.key && !(opt?.id || params.id) ? `${loadTable.key}=$1` : null;
-
-  const limit = Math.min(maxLimit, +(query.limit || 20));
-
-  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 = columnList.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 queryBbox = query?.bbox ? query.bbox.replace(/ /g, ',').split(',')?.map((el) => el - 0) : [];
-  const queryPolyline = meta?.bbox && query?.polyline ? `ST_Contains(ST_MakePolygon(ST_LineFromEncodedPolyline('${query?.polyline}')),${meta.bbox})` : undefined;
-  const bbox = meta?.bbox && queryBbox.filter((el) => !Number.isNaN(el))?.length === 4 ? `${meta.bbox} && 'box(${queryBbox[0]} ${queryBbox[1]},${queryBbox[2]} ${queryBbox[3]})'::box2d ` : undefined;
-
-  const access = await getAccess(req, params.table);
-  const where = [(opt?.id || params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, state, custom, search, access?.query || '1=1', bbox, queryPolyline].filter((el) => el);
-  const cardColumns = cardSqlFiltered.length ? `,${cardSqlFiltered.map((el) => el.name)}` : '';
-  const q = `select  ${pk ? `"${pk}" as id,` : ''} ${columnList.includes('geom') ? 'st_asgeojson(geom)::json as geom,' : ''} ${query.id || query.key ? '*' : sqlColumns || cols || '*'} ${metaCols} ${cardColumns} from ${table} t ${sqlTable} ${cardSqlTable} where ${where.join(' and ') || 'true'} ${order} ${offset}  limit ${limit}`;
-
-  if (query.sql === '1') { return q; }
-
-  const { rows } = await pg.query(q, (opt?.id || params.id ? [opt?.id || params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
-
-  const total = keyQuery || opt?.id || params.id ? rows.length : await pg.queryCache(`select count(*) from ${table} t ${sqlTable} where ${where.join(' and ') || 'true'}`).then((el) => (el?.rows[0]?.count || 0) - 0);
-
-  await metaFormat({ rows, table: params.table });
-  const res = {
-    time: Date.now() - time, card: loadTable.card, actions: loadTable.actions, access, total, count: rows.length, pk, form, rows, meta, columns, filters,
-  };
-
-  if (!funcs.config?.security?.disableToken) {
-    const addTokens = setToken({
-      ids: [JSON.stringify({ add: loadTable.table, form: loadTable.form })],
-      mode: 'a',
-      uid: funcs.config?.auth?.disable || ispublic ? '1' : uid,
-      array: 1,
-    });
-    Object.assign(res, { addToken: addTokens[0] });
-
-    rows.forEach((row) => {
-      const editTokens = setToken({
-        ids: [JSON.stringify({ id: row.id, table: loadTable.table, form: loadTable.form })],
-        mode: 'w',
-        uid: funcs.config?.auth?.disable || ispublic ? '1' : uid,
-        array: 1,
-      });
-      Object.assign(row, { token: editTokens[0] });
-    });
-  }
-
-  return res;
-}
+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';
+import getAccess from '../../crud/funcs/getAccess.js';
+import setToken from '../../crud/funcs/setToken.js';
+import gisIRColumn from './utils/gisIRColumn.js';
+
+const maxLimit = 100;
+export default async function dataAPI({
+  pg, params, funcs = {}, query = {}, opt = {}, uid: uid1, req, session,
+}) {
+  const time = Date.now();
+
+  const uid = session?.passport?.user?.uid || uid1 || query.uid || 0;
+
+  const loadTable = await getTemplate('table', params.table);
+
+  if (!loadTable) { return { message: 'template not found', status: 404 }; }
+
+  const {
+    table, columns, sql, cardSql, filters, form, meta, sqlColumns, ispublic,
+  } = loadTable;
+  const { pk, columns: dbColumns = [] } = await getMeta(table);
+
+  if (!pk) return { message: `table not found: ${table}`, status: 404 };
+
+  const cols = columns.filter((el) => el.name !== 'geom').map((el) => el.name || el).join(',');
+  const metaCols = Object.keys(loadTable?.meta?.cls || {}).filter((el) => !cols.includes(el)).length
+    ? `,${Object.keys(loadTable?.meta?.cls || {})?.filter((el) => !cols.includes(el)).join(',')}`
+    : '';
+  const columnList = dbColumns.map((el) => el.name || el).join(',');
+  const sqlTable = sql?.filter?.((el) => !el?.disabled && el?.sql?.replace).map((el, i) => ` left join lateral (${el.sql.replace('{{uid}}', uid)}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
+  const cardSqlFiltered = opt?.id || params.id ? (cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) || []) : [];
+  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('') || '' : '';
+
+  if (params.id && columnList.includes(params.id)) {
+    return gisIRColumn({
+      pg, funcs, layer: params.table, column: params.id, sql: query.sql,
+    });
+  }
+
+  const fData = query.filter || query.search ? await getFilterSQL({
+    filter: query.filter,
+    search: query.search,
+    table: params.table,
+    json: 1,
+  }) : {};
+
+  const keyQuery = query.key && loadTable.key && !(opt?.id || params.id) ? `${loadTable.key}=$1` : null;
+
+  const limit = Math.min(maxLimit, +(query.limit || 20));
+
+  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 = columnList.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 queryBbox = query?.bbox ? query.bbox.replace(/ /g, ',').split(',')?.map((el) => el - 0) : [];
+  const queryPolyline = meta?.bbox && query?.polyline ? `ST_Contains(ST_MakePolygon(ST_LineFromEncodedPolyline('${query?.polyline}')),${meta.bbox})` : undefined;
+  const bbox = meta?.bbox && queryBbox.filter((el) => !Number.isNaN(el))?.length === 4 ? `${meta.bbox} && 'box(${queryBbox[0]} ${queryBbox[1]},${queryBbox[2]} ${queryBbox[3]})'::box2d ` : undefined;
+
+  const access = await getAccess(req, params.table);
+  const where = [(opt?.id || params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, state, custom, search, access?.query || '1=1', bbox, queryPolyline].filter((el) => el);
+  const cardColumns = cardSqlFiltered.length ? `,${cardSqlFiltered.map((el) => el.name)}` : '';
+  const q = `select  ${pk ? `"${pk}" as id,` : ''} ${columnList.includes('geom') ? 'st_asgeojson(geom)::json as geom,' : ''} ${query.id || query.key ? '*' : sqlColumns || cols || '*'} ${metaCols} ${cardColumns} from ${table} t ${sqlTable} ${cardSqlTable} where ${where.join(' and ') || 'true'} ${order} ${offset}  limit ${limit}`;
+
+  if (query.sql === '1') { return q; }
+
+  const { rows } = await pg.query(q, (opt?.id || params.id ? [opt?.id || params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
+
+  const total = keyQuery || opt?.id || params.id ? rows.length : await pg.queryCache(`select count(*) from ${table} t ${sqlTable} where ${where.join(' and ') || 'true'}`).then((el) => (el?.rows[0]?.count || 0) - 0);
+
+  await metaFormat({ rows, table: params.table });
+  const res = {
+    time: Date.now() - time, card: loadTable.card, actions: loadTable.actions, access, total, count: rows.length, pk, form, rows, meta, columns, filters,
+  };
+
+  if (!funcs.config?.security?.disableToken) {
+    const addTokens = setToken({
+      ids: [JSON.stringify({ add: loadTable.table, form: loadTable.form })],
+      mode: 'a',
+      uid: funcs.config?.auth?.disable || ispublic ? '1' : uid,
+      array: 1,
+    });
+    Object.assign(res, { addToken: addTokens[0] });
+
+    rows.forEach((row) => {
+      const editTokens = setToken({
+        ids: [JSON.stringify({ id: row.id, table: loadTable.table, form: loadTable.form })],
+        mode: 'w',
+        uid: funcs.config?.auth?.disable || ispublic ? '1' : uid,
+        array: 1,
+      });
+      Object.assign(row, { token: editTokens[0] });
+    });
+  }
+
+  return res;
+}

package/table/controllers/suggest.js

@@ -1,79 +1,79 @@
-import getSelectMeta from './utils/getSelectMeta.js';
-import getPG from '../../pg/funcs/getPG.js';
-import config from '../../config.js';
-import getTemplate from './utils/getTemplate.js';
-import getTableSql from '../funcs/getFilterSQL/util/getTableSql.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 [table, column] = params.data?.includes(':') ? params.data.split(':') : [];
-  const selectName = query.sel || query.name || params.data;
-  if (!selectName) return { headers, status: 400, message: 'name is required' };
-
-  const body = await getTemplate('table', table);
-  if (table && !pg1.pk[body?.table || table]) {
-    return { headers, status: 400, message: 'param name is invalid: 1' };
-  }
-  const columnExists = true;
-  if (table && (!column || !columnExists)) {
-    return { headers, status: 400, message: 'param name is invalid: 2' };
-  }
-
-  const meta = table && column
-    ? {
-      original: `with c(id,text) as (select row_number() over(), ${column} from ${body?.table || table} group by ${column} ) select * from c`,
-      searchQuery: '("text" ilike $1 )',
-    }
-    : await getSelectMeta({ name: selectName });
-  const pg = meta?.db ? getPG(meta.db) : pg1;
-  if (!meta) return { headers, status: 404, message: 'Not found query select ' };
-  if (query.meta) return meta;
-
-  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 ? ` id=any('{${query.val.replace(/'/g, "''")}}')` : '';
-
-  const sqlSuggest = `${meta.original.replace(/{{parent}}/gi, parent)} where ${[search, val, 'id is not null'].filter((el) => el).join(' and ') || 'true'} 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: config.local ? sqlSuggest : undefined,
-    data,
-  };
-
-  return message;
-}
+import getSelectMeta from './utils/getSelectMeta.js';
+import getPG from '../../pg/funcs/getPG.js';
+import config from '../../config.js';
+import getTemplate from './utils/getTemplate.js';
+// import getTableSql from '../funcs/getFilterSQL/util/getTableSql.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 [table, column] = params.data?.includes(':') ? params.data.split(':') : [];
+  const selectName = query.sel || query.name || params.data;
+  if (!selectName) return { headers, status: 400, message: 'name is required' };
+
+  const body = await getTemplate('table', table);
+  if (table && !pg1.pk[body?.table || table]) {
+    return { headers, status: 400, message: 'param name is invalid: 1' };
+  }
+  const columnExists = body?.columns?.find((col) => col?.name === column);
+  if (table && (!column || !columnExists)) {
+    return { headers, status: 400, message: 'param name is invalid: 2' };
+  }
+
+  const meta = table && column
+    ? {
+      original: `with c(id,text) as (select row_number() over(), ${column} from ${body?.table || table} group by ${column} ) select * from c`,
+      searchQuery: '("text" ilike $1 )',
+    }
+    : await getSelectMeta({ name: selectName, nocache: query?.nocache });
+  const pg = meta?.db ? getPG(meta.db) : pg1;
+  if (!meta) return { headers, status: 404, message: 'Not found query select ' };
+  if (query.meta) return meta;
+
+  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 ? ` id=any('{${query.val.replace(/'/g, "''")}}')` : '';
+
+  const sqlSuggest = `${meta.original.replace(/{{parent}}/gi, parent)} where ${[search, val, 'id is not null'].filter((el) => el).join(' and ') || 'true'} 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: config.local ? sqlSuggest : undefined,
+    data,
+  };
+
+  return message;
+}

package/table/controllers/table.js

@@ -1,52 +1,52 @@
-import getTemplate from './utils/getTemplate.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-
-export default async function tableAPI(req) {
-  const {
-    pg, params = {}, query = {}, opt = {},
-  } = req;
-  if (!params.id) return { message: 'not enough params', status: 400 };
-
-  const loadTable = await getTemplate('table', opt?.table || params.table) || {};
-  if (!loadTable) {
-    if (!pg.pk?.[opt?.table || params.table]) { return { message: 'not found', status: 404 }; }
-  }
-
-  const {
-    table, /* columns, */ form,
-  } = loadTable;
-
-  const { pk, columns: dbColumns = [] } = await getMeta(table || opt?.table || params.table);
-  if (!pk) return { message: `table not found: ${table}`, status: 404 };
-
-  // const cols = columns.map((el) => el.name || el).join(',');
-  const schema = await getTemplate('form', opt?.form || form) || {};
-  // skip DataTable from another table
-  const extraKeys = Object.keys(schema)?.filter((key) => schema[key]?.type === 'DataTable' && schema[key]?.table && schema[key]?.parent_id && schema[key]?.colModel?.length);
-  // skip non-existing columns
-  const columnList = dbColumns.map((el) => el.name || el).join(',');
-
-  const { fields = [] } = !loadTable?.table ? await pg.query(`select * from ${table || opt?.table || params.table} limit 0`) : {};
-  const cols = loadTable?.table
-    ? Object.keys(schema || {}).filter((col) => columnList.includes(col) && !extraKeys.includes(col))?.join(',')
-    : fields.map((el) => (el?.name?.includes('geom') ? `st_asgeojson(${el.name})::json as "${el.name}"` : `"${el?.name}"`)).join(',');
-  const where = [`"${pk}" = $1`, loadTable.query].filter((el) => el);
-  const geom = columnList.includes('geom') ? 'st_asgeojson(geom)::json as geom,' : '';
-  const q = `select "${pk}" as id, ${geom} ${cols || '*'} from ${table || opt?.table || params.table} t where ${where.join(' and ') || 'true'} limit 1`;
-
-  if (query.sql === '1') return q;
-
-  const { rows } = await pg.query(q, [opt?.id || params.id]);
-
-  if (extraKeys?.length) {
-    await Promise.all(rows?.map(async (row) => {
-      await Promise.all(extraKeys?.map(async (key) => {
-        const { colModel, table: extraTable, parent_id: parentId } = schema[key];
-        const { rows: extraRows } = await pg.query(`select ${parentId} as parent, ${colModel.map((col) => col.name).join(',')} from ${extraTable} a where ${parentId}=$1`, [row.id]);
-        Object.assign(row, { [key]: extraRows });
-      }));
-    }));
-  }
-
-  return rows?.[0] || {};
-}
+import getTemplate from './utils/getTemplate.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+
+export default async function tableAPI(req) {
+  const {
+    pg, params = {}, query = {}, opt = {},
+  } = req;
+  if (!params.id) return { message: 'not enough params', status: 400 };
+
+  const loadTable = await getTemplate('table', opt?.table || params.table) || {};
+  if (!loadTable) {
+    if (!pg.pk?.[opt?.table || params.table]) { return { message: 'not found', status: 404 }; }
+  }
+
+  const {
+    table, /* columns, */ form,
+  } = loadTable;
+
+  const { pk, columns: dbColumns = [] } = await getMeta(table || opt?.table || params.table);
+  if (!pk) return { message: `table not found: ${table}`, status: 404 };
+
+  // const cols = columns.map((el) => el.name || el).join(',');
+  const schema = await getTemplate('form', opt?.form || form) || {};
+  // skip DataTable from another table
+  const extraKeys = Object.keys(schema)?.filter((key) => schema[key]?.type === 'DataTable' && schema[key]?.table && schema[key]?.parent_id && schema[key]?.colModel?.length);
+  // skip non-existing columns
+  const columnList = dbColumns.map((el) => el.name || el).join(',');
+
+  const { fields = [] } = !loadTable?.table ? await pg.query(`select * from ${table || opt?.table || params.table} limit 0`) : {};
+  const cols = loadTable?.table
+    ? Object.keys(schema || {}).filter((col) => columnList.includes(col) && !extraKeys.includes(col))?.join(',')
+    : fields.map((el) => (el?.name?.includes('geom') ? `st_asgeojson(${el.name})::json as "${el.name}"` : `"${el?.name}"`)).join(',');
+  const where = [`"${pk}" = $1`, loadTable.query].filter((el) => el);
+  const geom = columnList.includes('geom') ? 'st_asgeojson(geom)::json as geom,' : '';
+  const q = `select "${pk}" as id, ${geom} ${cols || '*'} from ${table || opt?.table || params.table} t where ${where.join(' and ') || 'true'} limit 1`;
+
+  if (query.sql === '1') return q;
+
+  const { rows } = await pg.query(q, [opt?.id || params.id]);
+
+  if (extraKeys?.length) {
+    await Promise.all(rows?.map(async (row) => {
+      await Promise.all(extraKeys?.map(async (key) => {
+        const { colModel, table: extraTable, parent_id: parentId } = schema[key];
+        const { rows: extraRows } = await pg.query(`select ${parentId} as parent, ${colModel.map((col) => col.name).join(',')} from ${extraTable} a where ${parentId}=$1`, [row.id]);
+        Object.assign(row, { [key]: extraRows });
+      }));
+    }));
+  }
+
+  return rows?.[0] || {};
+}

package/table/controllers/utils/getSelectMeta.js

@@ -13,8 +13,8 @@ function getTable(table) {
 
 const selectMeta = {};
 
-export default async function getSelectMeta({ name, pg: pg1 }) {
-  if (selectMeta[name]) return selectMeta[name];
+export default async function getSelectMeta({ name, pg: pg1, nocache }) {
+  if (selectMeta[name] && !nocache) return selectMeta[name];
 
   const cls = await getSelect(name);
 

package/table/controllers/utils/getTemplate.js

@@ -23,6 +23,6 @@ export default async function getTemplateDir(type, name) {
 
   const sql = loadTemplate[type].includes(`${name}.sql`) ? await readFile(path.join(typeDir, `${name}.sql`), 'utf-8') : null;
   const data = loadTemplate[type].includes(`${name}.json`) ? JSON.parse(await readFile(path.join(typeDir, `${name}.json`), 'utf-8')) : await readFile(path.join(typeDir, `${name}.${ext}`), 'utf-8');
-  if (sql) return { ...data || {}, sql };
+  if (sql) return { sql };
   return data;
 }