@opengis/fastify-table 1.0.77 → 1.0.78

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/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,95 +1,95 @@
-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(req) {
-  const time = Date.now();
-  const {
-    pg, params, funcs = {}, query = {}, opt = {}, uid,
-  } = req;
-
-  const loadTable = await getTemplate('table', params.table);
-
-  if (!loadTable) { return { message: 'template not found', status: 404 }; }
-
-  const {
-    table, columns, sql, cardSql, filters, form, meta,
-  } = 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 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}) ${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 ? await getFilterSQL({
-    filter: query.filter,
-    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 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'].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 ? '*' : cols || '*'} ${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 where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count);
-
-  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,
-      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,
-        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(req) {
+  const time = Date.now();
+  const {
+    pg, params, funcs = {}, query = {}, opt = {}, uid,
+  } = req;
+
+  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,
+  } = 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 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}) ${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 ? await getFilterSQL({
+    filter: query.filter,
+    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 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'].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 || '*'} ${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 where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count);
+
+  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,
+      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,
+        array: 1,
+      });
+      Object.assign(row, { token: editTokens[0] });
+    });
+  }
+
+  return res;
+}

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];
+}

package/table/controllers/utils/gisIRColumn.js

@@ -1,68 +1,68 @@
-import pgClients from '../../../pg/pgClients.js';
-
-import getTemplate from './getTemplate.js';
-import getSelect from './getSelect.js';
-import getFilterSQL from '../../funcs/getFilterSQL/index.js';
-
-export default async function gisIRColumn({
-  pg = pgClients.client, funcs = {}, layer, column, sql, query = '1=1',
-}) {
-  const time = Date.now();
-
-  const { config = {} } = funcs;
-
-  const sel = await getSelect(query.cls || column);
-
-  const body = await getTemplate('table', layer);
-  const fData = await getFilterSQL({
-    table: body?.table || layer, query: body?.query,
-  });
-
-  const { tlist } = await pg.one(`select array_agg((select nspname from pg_namespace where oid=relnamespace)||'.'||relname) tlist from pg_class 
-  where relkind in ('r','v','m')`);
-
-  const tableName = body?.table || layer;
-  if (!tlist.includes(body?.table || layer)) return { error: `table not found: ${tableName}`, status: 400 };
-
-  // eslint-disable-next-line max-len
-  const { fields } = await pg.query(`select * from (${fData?.optimizedSQL || `select * from ${body?.table || layer}`})q limit 0`);
-
-  const col = fields.find((el) => el.name === column);
-
-  if (!col) return { status: 404, message: 'not found' };
-  const colField = pg.pgType[col.dataTypeID]?.includes('[]') ? `unnest(${column})` : column;
-
-  const q = `select ${colField} as id, count(*)::int from ${tableName} t where ${body?.query || 'true'} 
-  group by ${colField} order by count desc limit 15`;
-
-  if (sql) return q;
-
-  if (!body?.columns?.length) {
-    const { rows } = await pg.query(q);
-    if (sel?.arr?.length) {
-      rows.forEach((el) => {
-        const data = sel?.find((item) => item.id?.toString() === el.id?.toString());
-        Object.assign(el, data || {});
-      });
-    }
-    return {
-      count: rows?.reduce((acc, el) => acc + el.count, 0),
-      sql: config.local ? q : undefined,
-      rows,
-    };
-  }
-
-  const { rows } = await pg.query(q);
-  const cls = query.cls || body?.columns?.find((el) => el.name === column)?.data || col.data || col.option;
-  const select = await getSelect(cls, { val: rows.map((el) => el.id), ar: 1 });
-  rows.forEach((el) => {
-    const data = select?.arr ? select.arr?.find((item) => item.id?.toString() === el.id?.toString()) : undefined;
-    Object.assign(el, data || {});
-  });
-  return {
-    time: Date.now() - time,
-    count: rows.reduce((acc, el) => acc + el.count, 0),
-    sql: config.local ? q : undefined,
-    rows,
-  };
-}
+import pgClients from '../../../pg/pgClients.js';
+
+import getTemplate from './getTemplate.js';
+import getSelect from './getSelect.js';
+import getFilterSQL from '../../funcs/getFilterSQL/index.js';
+
+export default async function gisIRColumn({
+  pg = pgClients.client, funcs = {}, layer, column, sql, query = '1=1',
+}) {
+  const time = Date.now();
+
+  const { config = {} } = funcs;
+
+  const sel = await getSelect(query.cls || column);
+
+  const body = await getTemplate('table', layer);
+  const fData = await getFilterSQL({
+    table: body?.table || layer, query: body?.query,
+  });
+
+  const { tlist } = await pg.one(`select array_agg((select nspname from pg_namespace where oid=relnamespace)||'.'||relname) tlist from pg_class 
+  where relkind in ('r','v','m')`);
+
+  const tableName = body?.table || layer;
+  if (!tlist.includes(body?.table || layer)) return { error: `table not found: ${tableName}`, status: 400 };
+
+  // eslint-disable-next-line max-len
+  const { fields } = await pg.query(`select * from (${fData?.optimizedSQL || `select * from ${body?.table || layer}`})q limit 0`);
+
+  const col = fields.find((el) => el.name === column);
+
+  if (!col) return { status: 404, message: 'not found' };
+  const colField = pg.pgType[col.dataTypeID]?.includes('[]') ? `unnest(${column})` : column;
+
+  const q = `select ${colField} as id, count(*)::int from ${tableName} t where ${body?.query || 'true'} 
+  group by ${colField} order by count desc limit 15`;
+
+  if (sql) return q;
+
+  if (!body?.columns?.length) {
+    const { rows } = await pg.query(q);
+    if (sel?.arr?.length) {
+      rows.forEach((el) => {
+        const data = sel?.find((item) => item.id?.toString() === el.id?.toString());
+        Object.assign(el, data || {});
+      });
+    }
+    return {
+      count: rows?.reduce((acc, el) => acc + el.count, 0),
+      sql: config.local ? q : undefined,
+      rows,
+    };
+  }
+
+  const { rows } = await pg.query(q);
+  const cls = query.cls || body?.columns?.find((el) => el.name === column)?.data || col.data || col.option;
+  const select = await getSelect(cls, { val: rows.map((el) => el.id), ar: 1 });
+  rows.forEach((el) => {
+    const data = select?.arr ? select.arr?.find((item) => item.id?.toString() === el.id?.toString()) : undefined;
+    Object.assign(el, data || {});
+  });
+  return {
+    time: Date.now() - time,
+    count: rows.reduce((acc, el) => acc + el.count, 0),
+    sql: config.local ? q : undefined,
+    rows,
+  };
+}