@opengis/fastify-table 1.0.97 → 1.1.1

package/server/templates/select/test.suggest.ato_new.sql

@@ -1,26 +1,26 @@
-select
-    codifier,
-    case
-        when object_type = 'A' then name_ua
-        else case
-            when object_type in ('P', 'H', 'O', 'B') then name_ua || ' ' || prefix_ua
-            else prefix_ua || ' ' || name_ua
-        end
-    end as title
-from
-    ato_new.ato_new_all
-    left join ato_new.ato_settings_city_and_terrytory on ato_type = object_type
-where
-    codifier is not null
-union
-all
-select
-    country_id,
-    name_ua as title
-from
-    ato_new.country
-where
-    country_id = '2845832997045798794'
-union
-all
+select
+    codifier,
+    case
+        when object_type = 'A' then name_ua
+        else case
+            when object_type in ('P', 'H', 'O', 'B') then name_ua || ' ' || prefix_ua
+            else prefix_ua || ' ' || name_ua
+        end
+    end as title
+from
+    ato_new.ato_new_all
+    left join ato_new.ato_settings_city_and_terrytory on ato_type = object_type
+where
+    codifier is not null
+union
+all
+select
+    country_id,
+    name_ua as title
+from
+    ato_new.country
+where
+    country_id = '2845832997045798794'
+union
+all
 select 'UA00000000000000000', 'Україна'

package/server/templates/select/test.suggest.data.json

@@ -1,5 +1,5 @@
-{   
-    "db": "mbk_poltava",
-    "key": "dataset_id",
-    "searchColumn": "table_name"
+{   
+    "db": "mbk_poltava",
+    "key": "dataset_id",
+    "searchColumn": "table_name"
 }

package/server/templates/select/test.suggest.parent.sql

@@ -1,3 +1,3 @@
-select dataset_id, dataset_name, table_name from gis.dataset
-where
+select dataset_id, dataset_name, table_name from gis.dataset
+where
     dataset_id = '{{parent}}'

package/server.js

@@ -1,14 +1,14 @@
-// This file contains code that we reuse
-// between our tests.
-import Fastify from 'fastify';
-import config from './test/config.js';
-import appService from './index.js';
-
-const app = Fastify({ logger: false });
-app.register(appService, config);
-app.listen({ host: '0.0.0.0', port: process.env.PORT || 3000 }, (err) => {
-  if (err) {
-    app.log.error(err);
-    process.exit(1);
-  }
-});
+// This file contains code that we reuse
+// between our tests.
+import Fastify from 'fastify';
+import config from './test/config.js';
+import appService from './index.js';
+
+const app = Fastify({ logger: false });
+app.register(appService, config);
+app.listen({ host: '0.0.0.0', port: process.env.PORT || 3000 }, (err) => {
+  if (err) {
+    app.log.error(err);
+    process.exit(1);
+  }
+});

package/table/controllers/card.js

@@ -1,44 +1,44 @@
-import getTemplate from './utils/getTemplate.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-import metaFormat from '../funcs/metaFormat/index.js';
-
-export default async function card(req) {
-  const time = Date.now();
-  const {
-    pg, params = {}, query = {}, opt = {},
-  } = req;
-
-  const loadTable = await getTemplate('table', params.table);
-
-  if (!loadTable) { return { message: 'template not found', status: 404 }; }
-
-  const {
-    table, columns, meta, sql, cardSql,
-  } = loadTable;
-
-  const { pk, columns: dbColumns = [] } = await getMeta(table);
-
-  if (!pk) return { message: `table not found: ${table}`, status: 404 };
-
-  const cols = columns.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('') || '' : '';
-
-  const where = [`"${pk}" = $1`, loadTable.query].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,' : ''} ${cols || '*'} ${cardColumns} from ${table} t ${sqlTable} ${cardSqlTable} 
-  where ${where.join(' and ') || 'true'} limit 1`;
-
-  if (query.sql === '1') { return q; }
-
-  const { rows } = await pg.query(q, [opt.id || params.id]);
-
-  await metaFormat({ rows, table: params.table });
-
-  const data = meta.card?.length ? meta.card.reduce((acc, curr) => Object.assign(acc, { [columns.find((col) => col.name === curr)?.ua || '']: rows[0][curr] }), {}) : {};
-  return {
-    time: Date.now() - time, data,
-  };
-}
+import getTemplate from './utils/getTemplate.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+import metaFormat from '../funcs/metaFormat/index.js';
+
+export default async function card(req) {
+  const time = Date.now();
+  const {
+    pg, params = {}, query = {}, opt = {},
+  } = req;
+
+  const loadTable = await getTemplate('table', params.table);
+
+  if (!loadTable) { return { message: 'template not found', status: 404 }; }
+
+  const {
+    table, columns, meta, sql, cardSql,
+  } = loadTable;
+
+  const { pk, columns: dbColumns = [] } = await getMeta(table);
+
+  if (!pk) return { message: `table not found: ${table}`, status: 404 };
+
+  const cols = columns.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('') || '' : '';
+
+  const where = [`"${pk}" = $1`, loadTable.query].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,' : ''} ${cols || '*'} ${cardColumns} from ${table} t ${sqlTable} ${cardSqlTable} 
+  where ${where.join(' and ') || 'true'} limit 1`;
+
+  if (query.sql === '1') { return q; }
+
+  const { rows } = await pg.query(q, [opt.id || params.id]);
+
+  await metaFormat({ rows, table: params.table });
+
+  const data = meta.card?.length ? meta.card.reduce((acc, curr) => Object.assign(acc, { [columns.find((col) => col.name === curr)?.ua || '']: rows[0][curr] }), {}) : {};
+  return {
+    time: Date.now() - time, data,
+  };
+}

package/table/controllers/filter.js

@@ -1,37 +1,37 @@
-import getTemplate from './utils/getTemplate.js';
-import getSelect from './utils/getSelect.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-
-export default async function filter(req) {
-  const time = Date.now();
-
-  const {
-    params,
-  } = req;
-  const loadTable = await getTemplate('table', params.table);
-  if (!loadTable) { return { status: 404, message: 'not found' }; }
-  const { columns } = await getMeta({ table: loadTable.table });
-
-  const filters = loadTable?.filters || loadTable?.filterList || [];
-  await Promise.all(filters.filter((el) => el.data).map(async (el) => {
-    const cls = await getSelect(el.data);
-    if (!cls?.arr || !loadTable.table) return;
-    const { dataTypeID } = columns.find((item) => item.name === el.id) || {};
-    const countArr = req.pg.pgType[dataTypeID]?.includes('[]') 
-      ? await req.pg.queryCache(`select unnest(${el.id})::text as id,count(*) from ${loadTable.table} group by unnest(${el.id})`) 
-      : await req.pg.queryCache(`select ${el.id}::text as id,count(*) from ${loadTable.table} group by ${el.id}`);
-
-    const options = countArr.rows.map(cel => {
-      const data = cls?.arr.find(c => c.id === cel.id);
-      return { ...cel, ...data };
-    });
-    Object.assign(el, { options });
-  }));
-  return {
-    time: Date.now() - time,
-    list: filters,
-    custom: loadTable?.filterCustom?.map(el => ({ label: el.label })),
-    inline: loadTable?.filterInline,
-    state: loadTable?.filterState?.map(el => ({ label: el.label })),
-  };
-}
+import getTemplate from './utils/getTemplate.js';
+import getSelect from './utils/getSelect.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+
+export default async function filter(req) {
+  const time = Date.now();
+
+  const {
+    params,
+  } = req;
+  const loadTable = await getTemplate('table', params.table);
+  if (!loadTable) { return { status: 404, message: 'not found' }; }
+  const { columns } = await getMeta({ table: loadTable.table });
+
+  const filters = loadTable?.filters || loadTable?.filterList || [];
+  await Promise.all(filters.filter((el) => el.data).map(async (el) => {
+    const cls = await getSelect(el.data);
+    if (!cls?.arr || !loadTable.table) return;
+    const { dataTypeID } = columns.find((item) => item.name === el.id) || {};
+    const countArr = req.pg.pgType[dataTypeID]?.includes('[]')
+      ? await req.pg.queryCache(`select unnest(${el.id})::text as id,count(*) from ${loadTable.table} group by unnest(${el.id})`)
+      : await req.pg.queryCache(`select ${el.id}::text as id,count(*) from ${loadTable.table} group by ${el.id}`);
+
+    const options = countArr.rows.map(cel => {
+      const data = cls?.arr.find(c => c.id === cel.id);
+      return { ...cel, ...data };
+    });
+    Object.assign(el, { options });
+  }));
+  return {
+    time: Date.now() - time,
+    list: filters,
+    custom: loadTable?.filterCustom?.map(el => ({ label: el.label })),
+    inline: loadTable?.filterInline,
+    state: loadTable?.filterState?.map(el => ({ label: el.label })),
+  };
+}

package/table/controllers/form.js

@@ -1,28 +1,28 @@
-import getTemplate from './utils/getTemplate.js';
-
-const sql = `select property_key as key, property_json as json, property_int as int,
-property_text as text from admin.properties where 1=1`;
-
-async function getSettings({ pg }) {
-  const { rows = [] } = await pg.query(sql);
-  const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.key]: curr.json || curr.int || curr.text }), {});
-  return data;
-}
-
-export default async function formFunction(req) {
-  const time = Date.now();
-  const { pg, params } = req;
-  const form = await getTemplate('form', params.form);
-  if (!form) { return { status: 404, message: 'not found' }; }
-
-  // replace settings
-  const arr = JSON.stringify(form).match(/{{settings.([^}]*)}}/g);
-  if (arr?.length) {
-    const string = JSON.stringify(form);
-    const settings = await getSettings({ pg });
-    const match = arr.reduce((acc, curr) => Object.assign(acc, { [curr]: settings[curr.replace(/^{{settings./g, '').replace(/}}$/, '')] }), {});
-    const res = Object.keys(match).reduce((s, m) => s.replace(m, match[m]), string);
-    return { time: Date.now() - time, form: JSON.parse(res) };
-  }
-  return { time: Date.now() - time, form };
-}
+import getTemplate from './utils/getTemplate.js';
+
+const sql = `select property_key as key, property_json as json, property_int as int,
+property_text as text from admin.properties where 1=1`;
+
+async function getSettings({ pg }) {
+  const { rows = [] } = await pg.query(sql);
+  const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.key]: curr.json || curr.int || curr.text }), {});
+  return data;
+}
+
+export default async function formFunction(req) {
+  const time = Date.now();
+  const { pg, params } = req;
+  const form = await getTemplate('form', params.form);
+  if (!form) { return { status: 404, message: 'not found' }; }
+
+  // replace settings
+  const arr = JSON.stringify(form).match(/{{settings.([^}]*)}}/g);
+  if (arr?.length) {
+    const string = JSON.stringify(form);
+    const settings = await getSettings({ pg });
+    const match = arr.reduce((acc, curr) => Object.assign(acc, { [curr]: settings[curr.replace(/^{{settings./g, '').replace(/}}$/, '')] }), {});
+    const res = Object.keys(match).reduce((s, m) => s.replace(m, match[m]), string);
+    return { time: Date.now() - time, form: JSON.parse(res) };
+  }
+  return { time: Date.now() - time, form };
+}

package/table/controllers/search.js

@@ -1,72 +1,80 @@
-import getTemplate from './utils/getTemplate.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-import metaFormat from '../funcs/metaFormat/index.js';
-import getTemplates from './utils/getTemplates.js';
-
-function sequence(tables, data, fn) {
-  return tables.reduce((promise, table) => promise.then(() => fn({
-    ...data, tableName: table.replace('.json', ''),
-  })), Promise.resolve());
-}
-
-async function getData({
-  pg, funcs, tableName, query = {}, maxLimit, res,
-}) {
-  const loadTable = await getTemplate('table', tableName);
-
-  if (!loadTable) { return { message: 'not found', status: 404 }; }
-
-  const { table, columns, meta, ua } = loadTable;
-
-  const { pk } = await getMeta(table);
-
-  const cols = columns.map((el) => el.name || el).join(',');
-  const [orderColumn, orderDir] = (query.order || loadTable.order || '').split('-');
-  const order = cols.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
-
-  const limit = Math.max(maxLimit - res.rows.length, 0);
-  // Math.max(query.offset - res.rows.length,0)
-  const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
-
-  const search = meta?.search && query.key ? `(${meta?.search.concat(meta?.title ? `,${meta?.title}` : '').split(',').map(el => `${el} ilike '%${query.key}%'`).join(' or ')})` : 'false';
-
-  const where = [!pk ? 'false' : 'true', loadTable.query, search].filter((el) => el);
-  const q = `select ${[`"${pk}" as id`, meta?.title ? `${meta.title} as title` : ''].filter((el) => el).join(',')} from ${table} t where ${where.join(' and ') || 'true'} ${order} ${offset} limit ${limit}`;
-  if (query.sql) {
-    res.sql.push(q);
-    return;
-  }
-
-  const { rows } = await pg.query(q);
-
-  const total = await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count) || 0;
-
-  await metaFormat({ rows, table: tableName });
-  res.total += +total;
-  rows.forEach((row) => {
-    const href = meta?.href ? funcs.handlebars.compile(meta.href)({ ...row, [pk]: row.id }) : undefined;
-    res.rows.push({ ...row, register: tableName, register_title: loadTable.ua, href });
-  });
-}
-
-export default async function search({
-  pg, funcs, query = {},
-}) {
-  const time = Date.now();
-
-  try {
-    const tables = query.table ? [query.table] : await getTemplates('table');
-    const res = { rows: [], sql: [], total: 0 };
-
-    const maxLimit = Math.min(100, query.limit || '16');
-    await sequence(tables, { pg, funcs, query, maxLimit, res }, getData);
-
-    if (query.sql) return res.sql.join(';\n');
-
-    return {
-      time: Date.now() - time, total: res.total, count: res.rows.length, rows: res.rows,
-    };
-  } catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}
+import getTemplate from './utils/getTemplate.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+import metaFormat from '../funcs/metaFormat/index.js';
+import getTemplates from './utils/getTemplates.js';
+
+function sequence(tables, data, fn) {
+  return tables.reduce((promise, table) => promise.then(() => fn({
+    ...data, tableName: table.replace('.json', ''),
+  })), Promise.resolve());
+}
+
+async function getData({
+  pg, funcs, tableName, query = {}, maxLimit, res,
+}) {
+  const loadTable = await getTemplate('table', tableName);
+
+  if (!loadTable) { return { message: 'not found', status: 404 }; }
+
+  const {
+    table, columns, meta,
+  } = loadTable;
+
+  const { pk } = await getMeta(table);
+
+  const cols = columns.map((el) => el.name || el).join(',');
+  const [orderColumn, orderDir] = (query.order || loadTable.order || '').split('-');
+  const order = cols.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
+
+  const limit = Math.max(maxLimit - res.rows.length, 0);
+  // Math.max(query.offset - res.rows.length,0)
+  const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
+
+  const search1 = meta?.search && query.key ? `(${meta?.search.concat(meta?.title ? `,${meta?.title}` : '').split(',').map(el => `${el} ilike '%${query.key}%'`).join(' or ')})` : 'false';
+
+  const where = [!pk ? 'false' : 'true', loadTable.query, search1].filter((el) => el);
+  const q = `select ${[`"${pk}" as id`, meta?.title ? `${meta.title} as title` : ''].filter((el) => el).join(',')} from ${table} t where ${where.join(' and ') || 'true'} ${order} ${offset} limit ${limit}`;
+  if (query.sql) {
+    res.sql.push(q);
+    return null;
+  }
+
+  const { rows } = await pg.query(q);
+
+  const total = await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count) || 0;
+
+  await metaFormat({ rows, table: tableName });
+  res.total += +total;
+  rows.forEach((row) => {
+    const href = meta?.href ? funcs.handlebars.compile(meta.href)({ ...row, [pk]: row.id }) : undefined;
+    res.rows.push({
+      ...row, register: tableName, register_title: loadTable.ua, href,
+    });
+  });
+  return null;
+}
+
+export default async function search({
+  pg, funcs, query = {},
+}) {
+  const time = Date.now();
+
+  try {
+    const tables = query.table ? [query.table] : await getTemplates('table');
+    const res = { rows: [], sql: [], total: 0 };
+
+    const maxLimit = Math.min(100, query.limit || '16');
+    await sequence(tables, {
+      pg, funcs, query, maxLimit, res,
+    }, getData);
+
+    if (query.sql) return res.sql.join(';\n');
+
+    return {
+      time: Date.now() - time, total: res.total, count: res.rows.length, rows: res.rows,
+    };
+  }
+  catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
+}

package/table/controllers/utils/getSelect.js

@@ -1,20 +1,20 @@
-import getTemplate from './getTemplate.js';
-
-const loadCls = {};
-
-export default async function getSelect(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 getSelect(name) {
+  if (loadCls[name]) return loadCls[name];
+
+  const clsData = await getTemplate('cls', name);
+  console.log(clsData);
+  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/getTemplate.js

@@ -1,28 +1,69 @@
-import { readFile } from 'fs/promises';
-import fs from 'fs';
-import path from 'path';
-import config from '../../../config.js';
-
-const loadTemplate = {};
-
-export default async function getTemplateDir(type, name) {
-  if (!type) return null;
-  if (!name) return null;
-
-  const cwd = process.cwd();
-  const typeDir = path.join(cwd, (config.templateDir || 'server/templates'), type);
-
-  if (!loadTemplate[type]) {
-    const typeList = fs.existsSync(typeDir) ? fs.readdirSync(typeDir) : [];
-    loadTemplate[type] = typeList;
-  }
-
-  const fullname = loadTemplate[type].find((el) => path.parse(el).name === name);
-  const ext = fullname ? path.extname(fullname)?.slice(1) : null;
-  if (!ext) return null;
-
-  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 { sql };
-  return data;
-}
+import { readdir, readFile } from 'fs/promises';
+import path from 'path';
+import yaml from 'js-yaml';
+
+import getTemplatePath from './getTemplatePath.js';
+import loadTemplate from './loadTemplate.js';
+
+async function readFileData(file) {
+  const data = await readFile(file, 'utf-8');
+  const ext = file.substring(file.lastIndexOf('.') + 1);
+
+  if (ext === 'yml') {
+    return yaml.load(data);
+  }
+  if (ext === 'json') {
+    return JSON.parse(data);
+  }
+  return data;
+}
+
+const isProduction = process.env.NODE_ENV === 'production';
+
+async function getTemplateData(template) {
+  // dir template: dashboard, card
+  if (template[0][3]) {
+    const files = await readdir(template[0][1]);
+    const data = await Promise.all(files.map(async el => readFileData(path.join(template[0][1], el))));
+    return files.map((el, i) => [el, data[i]]);
+  }
+
+  // one file template: table, form
+  if (template.length === 1) {
+    const data = await readFileData(template[0][1]);
+    return data;
+  }
+
+  // multi file template: select, etc
+  if (template.length > 1) {
+    const data = await Promise.all(template.map(async el => readFileData(el[1])));
+    const result = {};
+    template.forEach((el, i) => {
+      Object.assign(result, typeof data[i] === 'object' ? data[i] : { [el[2]]: data[i] });
+    });
+    return result;
+  }
+  return null;
+}
+export default async function getTemplate(type, name) {
+  if (!type) return null;
+  if (!name) return null;
+
+  const key = `${type}:${name}`;
+  if (name === 'cache' && !isProduction) return loadTemplate; // all cache debug
+  if (loadTemplate[key] && isProduction) return loadTemplate[key]; // from cache
+
+  // type one or multi
+  const templateList = Array.isArray(type)
+    ? type.map(el => getTemplatePath(el)).filter(list => list?.filter(el => el[0] === name).length)[0] || []
+    : getTemplatePath(type);
+
+  // find template
+  const template = templateList?.filter(el => el[0] === name);
+  if (name === 'list' && !isProduction) return templateList; // all template debug
+
+  if (!template.length) return null; // not found
+
+  loadTemplate[key] = await getTemplateData(template);
+  return loadTemplate[key];
+}