@opengis/fastify-table 1.0.96 → 1.1.0

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

package/table/controllers/utils/getTemplatePath.js

@@ -0,0 +1,40 @@
+// import { readFile } from 'fs/promises';
+import fs, { existsSync, readdirSync } from 'fs';
+import path from 'path';
+import config from '../../../config.js';
+
+import loadTemplatePath from './loadTemplatePath.js';
+
+const cwd = process.cwd();
+
+export default function getTemplatePath(type) {
+  if (!type) return null;
+
+  // form cache
+
+  if (loadTemplatePath[type]) return loadTemplatePath[type];
+  loadTemplatePath[type] = [];
+
+  const moduleList = [];
+  const moduleDir = path.join(cwd, 'module');
+  if (fs.existsSync(moduleDir) && !moduleList.length) {
+    readdirSync(moduleDir).forEach(el => moduleList.push(path.join(moduleDir, el, type)));
+  }
+  moduleList.push(path.join(cwd, config.templateDir || 'server/templates', type));
+
+  moduleList.forEach(el => {
+    const templateDir = el;
+    if (!existsSync(templateDir)) return;
+
+    const list = readdirSync(templateDir, { withFileTypes: true });
+
+    list.forEach(file => {
+      const isDir = file.isDirectory();
+      const name = isDir ? file.name : file.name.substring(0, file.name.lastIndexOf('.'));
+      const ext = isDir ? null : file.name.substring(file.name.lastIndexOf('.') + 1);
+      loadTemplatePath[type].push([name, path.join(templateDir, file.name), ext, isDir]);
+    });
+  });
+
+  return loadTemplatePath[type];
+}

package/table/controllers/utils/getTemplate_old.js

@@ -0,0 +1,28 @@
+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;
+}

package/table/controllers/utils/getTemplates.js

@@ -1,18 +1,18 @@
-import fs from 'fs';
-import path from 'path';
-import config from '../../../config.js';
-
-const loadTemplate = {};
-
-export default async function getTemplateDir(type) {
-    if (!type) 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;
-    }
-    return loadTemplate[type];
-}
+import fs from 'fs';
+import path from 'path';
+import config from '../../../config.js';
+
+const loadTemplate = {};
+
+export default async function getTemplateDir(type) {
+  if (!type) 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;
+  }
+  return loadTemplate[type];
+}

package/table/controllers/utils/loadTemplate.js

@@ -0,0 +1 @@
+export default {};

package/table/controllers/utils/loadTemplatePath.js

@@ -0,0 +1 @@
+export default {};

package/table/funcs/getFilterSQL/util/getCustomQuery.js

@@ -4,7 +4,7 @@ async function getCustomQuery({
   if (!customFilter) return null;
   const customFilterList = customFilter?.split(',')?.map((el) => el?.split('_').pop());
   const { property_json: customFilterSQL } = await pg.one(`select json_agg(json_build_object('id',property_id,'name',property_key,'query',property_text)
-  ) as property_json from setting.property where property_key is not null and property_entity='customQuery' and object_id=$1`, [table]);
+  ) as property_json from admin.properties where property_key is not null and property_entity='customQuery' and object_id=$1`, [table]);
   const data = customFilterSQL?.length ? customFilterSQL.filter((el) => customFilterList.includes(el.id)) || [] : [];
   const customQuery = data?.map((el) => el.query).join(' and ');
   return `${customQuery}`;

package/table/index.js

@@ -1,80 +1,84 @@
-import suggest from './controllers/suggest.js';
-import data from './controllers/data.js';
-import table from './controllers/table.js';
-import card from './controllers/card.js';
-import search from './controllers/search.js';
-import filter from './controllers/filter.js';
-import form from './controllers/form.js';
-import metaFormat from './funcs/metaFormat/index.js';
-import getFilterSQL from './funcs/getFilterSQL/index.js';
-import getTemplate from './controllers/utils/getTemplate.js';
-import getSelect from './controllers/utils/getSelect.js';
-
-const tableSchema = {
-  querystring1: {
-    page: { type: 'string', pattern: '^(\\d+)$' },
-    order: { type: 'string', pattern: '^(\\d+)$' },
-    filter: { type: 'string', pattern: '^([\\w\\d_-]+)=([\\w\\d_-]+)$' },
-  },
-  params: {
-    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    table: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
-  },
-};
-
-const searchSchema = {
-  querystring: {
-    page: { type: 'string', pattern: '^(\\d+)$' },
-    limit: { type: 'string', pattern: '^(\\d+)$' },
-    order: { type: 'string', pattern: '^([\\w_.]+)$' },
-    desc: { type: 'string', pattern: '^(desc)|(asc)$' },
-    key: { type: 'string', pattern: '^([\\w\\d_]+)$' },
-    table: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
-    sql: { type: 'string', pattern: '^(\\d)$' },
-  },
-};
-
-const suggestSchema = {
-  querystring: {
-    lang: { type: 'string', pattern: '^([\\w.]+)$' },
-    // parent: { type: 'string', pattern: '^([\\w,./]+)$' },
-    sel: { type: 'string', pattern: '^([\\w,./]+)$' },
-    name: { type: 'string', pattern: '^([\\w,./]+)$' },
-    // key: { type: 'string', pattern: '^([\\w\\d_]+)$' },
-    // val: { type: 'string', pattern: '^([\\w.,]+)$' },
-    sql: { type: 'string', pattern: '^(\\d)$' },
-  },
-  params: {
-    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-  },
-};
-
-const formSchema = {
-  params: {
-    form: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
-  },
-};
-
-const filterSchema = {
-  params: {
-    table: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
-  },
-};
-
-async function plugin(fastify, config = {}) {
-  const prefix = config.prefix || '/api';
-  fastify.decorate('metaFormat', metaFormat);
-  fastify.decorate('getFilterSQL', getFilterSQL);
-  fastify.decorate('getTemplate', getTemplate);
-  fastify.decorate('getSelect', getSelect);
-
-  fastify.get(`${prefix}/suggest/:data`, { schema: suggestSchema }, suggest);
-  fastify.get(`${prefix}/data/:table/:id?`, { schema: tableSchema }, data); // vs.crm.data.api с node
-  fastify.get(`${prefix}/table/:table/:id`, { schema: tableSchema }, table);
-  fastify.get(`${prefix}/card/:table/:id`, { schema: tableSchema }, card);
-  fastify.get(`${prefix}/search`, { schema: searchSchema }, search);
-  fastify.get(`${prefix}/filter/:table`, { schema: filterSchema }, filter);
-  fastify.get(`${prefix}/form/:form`, { schema: formSchema }, form);
-}
-
-export default plugin;
+import suggest from './controllers/suggest.js';
+import data from './controllers/data.js';
+import table from './controllers/table.js';
+import card from './controllers/card.js';
+import search from './controllers/search.js';
+import filter from './controllers/filter.js';
+import form from './controllers/form.js';
+import metaFormat from './funcs/metaFormat/index.js';
+import getFilterSQL from './funcs/getFilterSQL/index.js';
+import getTemplate from './controllers/utils/getTemplate.js';
+import getSelect from './controllers/utils/getSelect.js';
+
+import loadTemplatePath from './controllers/utils/loadTemplatePath.js';
+
+const tableSchema = {
+  querystring1: {
+    page: { type: 'string', pattern: '^(\\d+)$' },
+    order: { type: 'string', pattern: '^(\\d+)$' },
+    filter: { type: 'string', pattern: '^([\\w\\d_-]+)=([\\w\\d_-]+)$' },
+  },
+  params: {
+    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    table: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
+  },
+};
+
+const searchSchema = {
+  querystring: {
+    page: { type: 'string', pattern: '^(\\d+)$' },
+    limit: { type: 'string', pattern: '^(\\d+)$' },
+    order: { type: 'string', pattern: '^([\\w_.]+)$' },
+    desc: { type: 'string', pattern: '^(desc)|(asc)$' },
+    key: { type: 'string', pattern: '^([\\w\\d_]+)$' },
+    table: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
+    sql: { type: 'string', pattern: '^(\\d)$' },
+  },
+};
+
+const suggestSchema = {
+  querystring: {
+    lang: { type: 'string', pattern: '^([\\w.]+)$' },
+    // parent: { type: 'string', pattern: '^([\\w,./]+)$' },
+    sel: { type: 'string', pattern: '^([\\w,./]+)$' },
+    name: { type: 'string', pattern: '^([\\w,./]+)$' },
+    // key: { type: 'string', pattern: '^([\\w\\d_]+)$' },
+    // val: { type: 'string', pattern: '^([\\w.,]+)$' },
+    sql: { type: 'string', pattern: '^(\\d)$' },
+  },
+  params: {
+    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+  },
+};
+
+const formSchema = {
+  params: {
+    form: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
+  },
+};
+
+const filterSchema = {
+  params: {
+    table: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
+  },
+};
+
+async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
+  fastify.decorate('metaFormat', metaFormat);
+  fastify.decorate('getFilterSQL', getFilterSQL);
+  fastify.decorate('getTemplate', getTemplate);
+  fastify.decorate('getSelect', getSelect);
+
+  fastify.get(`${prefix}/suggest/:data`, { schema: suggestSchema }, suggest);
+  fastify.get(`${prefix}/data/:table/:id?`, { schema: tableSchema }, data); // vs.crm.data.api с node
+  fastify.get(`${prefix}/table/:table/:id`, { schema: tableSchema }, table);
+  fastify.get(`${prefix}/card/:table/:id`, { schema: tableSchema }, card);
+  fastify.get(`${prefix}/search`, { schema: searchSchema }, search);
+
+  fastify.get(`${prefix}/templates`, () => loadTemplatePath);
+  fastify.get(`${prefix}/filter/:table`, { schema: filterSchema }, filter);
+  fastify.get(`${prefix}/form/:form`, { schema: formSchema }, form);
+}
+
+export default plugin;