@opengis/fastify-table 1.1.60 → 1.1.61

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

@@ -1,30 +1,30 @@
-import getTemplate from '../getTemplate.js';
-import getSelectVal from './getSelectVal.js';
-
-// import { getTemplate, getSelectVal } from '../../../../../utils.js';
-
-export default async function metaFormat({ rows, table }) {
-  const loadTable = await getTemplate('table', table);
-  const selectCols = loadTable?.columns?.filter((e) => e.data);
-  const metaCls = Object.keys(loadTable?.meta?.cls || {}).map((el) => ({ name: el, data: loadTable?.meta?.cls[el] }));
-  if (!selectCols?.length && !metaCls?.length) return rows;
-
-  // cls & select format
-
-  await Promise.all(selectCols.concat(metaCls)?.map(async (attr) => {
-    const values = [...new Set(rows?.map((el) => el[attr.name]).flat())].filter((el) => el);
-    if (!values.length) return null;
-
-    const cls = await getSelectVal({ name: attr.data, values });
-    if (!cls) return null;
-    rows.forEach(el => {
-      const val = el[attr.name]?.map?.(c => cls[c] || c) || cls[el[attr.name]] || el[attr.name];
-      if (!val) return;
-      Object.assign(el, { [val?.color ? `${attr.name}_data` : `${attr.name}_text`]: (val.color ? val : val.text || val) });
-    });
-
-    return null;
-  }));
-
-  return rows;
-}
+import getTemplate from '../getTemplate.js';
+import getSelectVal from './getSelectVal.js';
+
+// import { getTemplate, getSelectVal } from '../../../../../utils.js';
+
+export default async function metaFormat({ rows, table }) {
+  const loadTable = await getTemplate('table', table);
+  const selectCols = loadTable?.columns?.filter((e) => e.data);
+  const metaCls = Object.keys(loadTable?.meta?.cls || {}).map((el) => ({ name: el, data: loadTable?.meta?.cls[el] }));
+  if (!selectCols?.length && !metaCls?.length) return rows;
+
+  // cls & select format
+
+  await Promise.all(selectCols.concat(metaCls)?.map(async (attr) => {
+    const values = [...new Set(rows?.map((el) => el[attr.name]).flat())].filter((el) => el);
+    if (!values.length) return null;
+
+    const cls = await getSelectVal({ name: attr.data, values });
+    if (!cls) return null;
+    rows.forEach(el => {
+      const val = el[attr.name]?.map?.(c => cls[c] || c) || cls[el[attr.name]] || el[attr.name];
+      if (!val) return;
+      Object.assign(el, { [val?.color ? `${attr.name}_data` : `${attr.name}_text`]: (val.color ? val : val.text || val) });
+    });
+
+    return null;
+  }));
+
+  return rows;
+}

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

@@ -1 +1 @@
-export default [];
+export default [];

package/server/plugins/table/index.js

@@ -1,13 +1,13 @@
-import metaFormat from './funcs/metaFormat/index.js';
-import getFilterSQL from './funcs/getFilterSQL/index.js';
-import getTemplate from './funcs/getTemplate.js';
-import getSelect from './funcs/getSelect.js';
-
-async function plugin(fastify) {
-  // fastify.decorate('metaFormat', metaFormat);
-  // fastify.decorate('getFilterSQL', getFilterSQL);
-  // fastify.decorate('getTemplate', getTemplate);
-  // fastify.decorate('getSelect', getSelect);
-}
-
-export default plugin;
+import metaFormat from './funcs/metaFormat/index.js';
+import getFilterSQL from './funcs/getFilterSQL/index.js';
+import getTemplate from './funcs/getTemplate.js';
+import getSelect from './funcs/getSelect.js';
+
+async function plugin(fastify) {
+  // fastify.decorate('metaFormat', metaFormat);
+  // fastify.decorate('getFilterSQL', getFilterSQL);
+  // fastify.decorate('getTemplate', getTemplate);
+  // fastify.decorate('getSelect', getSelect);
+}
+
+export default plugin;

package/server/plugins/util/funcs/eventStream.js

@@ -1,28 +1,28 @@
-/* eslint-disable no-param-reassign */
-export default function eventStream(res) {
-  if (!res) return console.log;
-  const time = Date.now();
-
-  // eslint-disable-next-line no-underscore-dangle
-  if (!res?._headerSent) {
-    res.raw.writeHead(200, {
-      'Content-Type': 'text/event-stream; charset=utf-8',
-      'Cache-Control': 'no-cache',
-      Connection: 'keep-alive',
-      'X-Accel-Buffering': 'no',
-    });
-    res.hijack();
-  }
-  let prev = time;
-  function send(mes, finish) {
-    const t1 = Date.now();
-    res.raw.write(`data: ${finish ? 'finish' : ''} ${typeof mes === 'object' ? JSON.stringify(mes) : mes} ${t1 - prev}/${t1 - time}ms\n\n`);
-    prev = t1;
-    if (finish) {
-      res.raw.write('data: finish');
-      res.raw.end('');
-    }
-  }
-
-  return send;
-}
+/* eslint-disable no-param-reassign */
+export default function eventStream(res) {
+  if (!res) return console.log;
+  const time = Date.now();
+
+  // eslint-disable-next-line no-underscore-dangle
+  if (!res?._headerSent) {
+    res.raw.writeHead(200, {
+      'Content-Type': 'text/event-stream; charset=utf-8',
+      'Cache-Control': 'no-cache',
+      Connection: 'keep-alive',
+      'X-Accel-Buffering': 'no',
+    });
+    res.hijack();
+  }
+  let prev = time;
+  function send(mes, finish) {
+    const t1 = Date.now();
+    res.raw.write(`data: ${finish ? 'finish' : ''} ${typeof mes === 'object' ? JSON.stringify(mes) : mes} ${t1 - prev}/${t1 - time}ms\n\n`);
+    prev = t1;
+    if (finish) {
+      res.raw.write('data: finish');
+      res.raw.end('');
+    }
+  }
+
+  return send;
+}

package/server/plugins/util/index.js

@@ -1,7 +1,7 @@
-import eventStream from './funcs/eventStream.js';
-
-async function plugin(fastify) {
-//   fastify.decorate('eventStream', eventStream);
-}
-
-export default plugin;
+import eventStream from './funcs/eventStream.js';
+
+async function plugin(fastify) {
+//   fastify.decorate('eventStream', eventStream);
+}
+
+export default plugin;

package/server/routes/cron/index.js

@@ -1,14 +1,14 @@
-import cronApi from './controllers/cronApi.js';
-
-const cronSchema = {
-  params: {
-    name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-  },
-};
-
-async function plugin(fastify, config = {}) {
-  const prefix = config.prefix || '/api';
-  fastify.get(`${prefix}/cron/:name`, { schema: cronSchema }, cronApi);
-}
-
-export default plugin;
+import cronApi from './controllers/cronApi.js';
+
+const cronSchema = {
+  params: {
+    name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+  },
+};
+
+async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
+  fastify.get(`${prefix}/cron/:name`, { schema: cronSchema }, cronApi);
+}
+
+export default plugin;

package/server/routes/crud/controllers/deleteCrud.js

@@ -1,36 +1,36 @@
-import {
-  dataDelete, getTemplate, getAccess, applyHook, getToken, config,
-} from '../../../../utils.js';
-
-export default async function deleteCrud(req) {
-  const { user, params = {} } = req || {};
-  const hookData = await applyHook('preDelete', {
-    table: params?.table, id: params?.id, user,
-  });
-  if (hookData?.message && hookData?.status) {
-    return { message: hookData?.message, status: hookData?.status };
-  }
-
-  const tokenData = await getToken({
-    uid: user.uid, token: params.table, mode: 'w', json: 1,
-  });
-
-  const { table: del, id } = hookData || tokenData || (config.auth?.disable ? req.params : {});
-  const { actions = [] } = await getAccess({ table: del, id, user }) || {};
-
-  if (!actions.includes('del') && !config?.local) {
-    return { message: 'access restricted', status: 403 };
-  }
-  const loadTemplate = await getTemplate('table', del);
-
-  const { table } = loadTemplate || hookData || req.params || {};
-
-  if (!table) return { status: 404, message: 'table is required' };
-  if (!id) return { status: 404, message: 'id is required' };
-
-  const data = await dataDelete({
-    table, id, uid: user?.uid,
-  });
-
-  return { rowCount: data.rowCount, msg: !data.rowCount ? data : null };
-}
+import {
+  dataDelete, getTemplate, getAccess, applyHook, getToken, config,
+} from '../../../../utils.js';
+
+export default async function deleteCrud(req) {
+  const { user, params = {} } = req || {};
+  const hookData = await applyHook('preDelete', {
+    table: params?.table, id: params?.id, user,
+  });
+  if (hookData?.message && hookData?.status) {
+    return { message: hookData?.message, status: hookData?.status };
+  }
+
+  const tokenData = await getToken({
+    uid: user.uid, token: params.table, mode: 'w', json: 1,
+  });
+
+  const { table: del, id } = hookData || tokenData || (config.auth?.disable ? req.params : {});
+  const { actions = [] } = await getAccess({ table: del, id, user }) || {};
+
+  if (!actions.includes('del') && !config?.local) {
+    return { message: 'access restricted', status: 403 };
+  }
+  const loadTemplate = await getTemplate('table', del);
+
+  const { table } = loadTemplate || hookData || req.params || {};
+
+  if (!table) return { status: 404, message: 'table is required' };
+  if (!id) return { status: 404, message: 'id is required' };
+
+  const data = await dataDelete({
+    table, id, uid: user?.uid,
+  });
+
+  return { rowCount: data.rowCount, msg: !data.rowCount ? data : null };
+}

package/server/routes/crud/controllers/insert.js

@@ -1,73 +1,73 @@
-import {
-  applyHook, getAccess, getTemplate, checkXSS, dataInsert, getToken, config,
-} from '../../../../utils.js';
-
-export default async function insert(req) {
-  const {
-    user, params = {}, body = {},
-  } = req || {};
-  const hookData = await applyHook('preInsert', { table: params?.table, user });
-  if (hookData?.message && hookData?.status) {
-    return { message: hookData?.message, status: hookData?.status };
-  }
-  const tokenData = await getToken({
-    uid: user.uid, token: params.table, mode: 'a', json: 1,
-  });
-
-  const { form, table: add } = hookData || tokenData || (config.auth?.disable ? req.params : {});
-
-  const { actions = [] } = await getAccess({ table: add, user }) || {};
-
-  if (!actions.includes('add') && !config?.local) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  if (!add) {
-    return { message: 'table is required', status: 400 };
-  }
-
-  const loadTemplate = await getTemplate('table', add);
-  const { table } = loadTemplate || hookData || req.params || {};
-  if (!table) {
-    return { message: 'table not found', status: 404 };
-  }
-
-  const formData = form || loadTemplate?.form ? (await getTemplate('form', form || loadTemplate?.form) || {}) : {};
-
-  const xssCheck = checkXSS({ body, schema: formData?.schema || formData });
-
-  if (xssCheck.error && formData?.xssCheck !== false) {
-    req.log.warn({ name: 'injection/xss', msg: xssCheck.error, table }, req);
-    return { message: 'Дані містять заборонені символи. Приберіть їх та спробуйте ще раз', status: 409 };
-  }
-
-  const uid = user?.uid;
-  if (![add, table].filter((el) => el !== 'admin.users')?.length) {
-    Object.assign(body, { uid, editor_id: uid });
-  }
-  const res = await dataInsert({
-    table: loadTemplate?.table, data: body, uid,
-  });
-
-  // admin.custom_column
-  await applyHook('afterInsert', {
-    table, body, payload: res, user,
-  });
-  // form DataTable
-  const extraKeys = Object.keys(formData)?.filter((key) => formData?.[key]?.type === 'DataTable' && formData?.[key]?.table && formData?.[key]?.parent_id && body[key].length);
-  if (extraKeys?.length) {
-    res.extra = {};
-    await Promise.all(extraKeys?.map(async (key) => {
-      const objId = body[formData[key].parent_id] || req.body?.id;
-      const extraRows = await Promise.all(body[key].map(async (row) => {
-        const extraRes = await dataInsert({
-          table: formData[key].table, data: { ...row, [formData[key].parent_id]: objId }, uid,
-        });
-        return extraRes?.rows?.[0];
-      }));
-      Object.assign(res.extra, { [key]: extraRows.filter((el) => el) });
-    }));
-  }
-
-  return { rows: res.rows, extra: res.extra };
-}
+import {
+  applyHook, getAccess, getTemplate, checkXSS, dataInsert, getToken, config,
+} from '../../../../utils.js';
+
+export default async function insert(req) {
+  const {
+    user, params = {}, body = {},
+  } = req || {};
+  const hookData = await applyHook('preInsert', { table: params?.table, user });
+  if (hookData?.message && hookData?.status) {
+    return { message: hookData?.message, status: hookData?.status };
+  }
+  const tokenData = await getToken({
+    uid: user.uid, token: params.table, mode: 'a', json: 1,
+  });
+
+  const { form, table: add } = hookData || tokenData || (config.auth?.disable ? req.params : {});
+
+  const { actions = [] } = await getAccess({ table: add, user }) || {};
+
+  if (!actions.includes('add') && !config?.local) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  if (!add) {
+    return { message: 'table is required', status: 400 };
+  }
+
+  const loadTemplate = await getTemplate('table', add);
+  const { table } = loadTemplate || hookData || req.params || {};
+  if (!table) {
+    return { message: 'table not found', status: 404 };
+  }
+
+  const formData = form || loadTemplate?.form ? (await getTemplate('form', form || loadTemplate?.form) || {}) : {};
+
+  const xssCheck = checkXSS({ body, schema: formData?.schema || formData });
+
+  if (xssCheck.error && formData?.xssCheck !== false) {
+    req.log.warn({ name: 'injection/xss', msg: xssCheck.error, table }, req);
+    return { message: 'Дані містять заборонені символи. Приберіть їх та спробуйте ще раз', status: 409 };
+  }
+
+  const uid = user?.uid;
+  if (![add, table].filter((el) => el !== 'admin.users')?.length) {
+    Object.assign(body, { uid, editor_id: uid });
+  }
+  const res = await dataInsert({
+    table: loadTemplate?.table, data: body, uid,
+  });
+
+  // admin.custom_column
+  await applyHook('afterInsert', {
+    table, body, payload: res, user,
+  });
+  // form DataTable
+  const extraKeys = Object.keys(formData)?.filter((key) => formData?.[key]?.type === 'DataTable' && formData?.[key]?.table && formData?.[key]?.parent_id && body[key].length);
+  if (extraKeys?.length) {
+    res.extra = {};
+    await Promise.all(extraKeys?.map(async (key) => {
+      const objId = body[formData[key].parent_id] || req.body?.id;
+      const extraRows = await Promise.all(body[key].map(async (row) => {
+        const extraRes = await dataInsert({
+          table: formData[key].table, data: { ...row, [formData[key].parent_id]: objId }, uid,
+        });
+        return extraRes?.rows?.[0];
+      }));
+      Object.assign(res.extra, { [key]: extraRows.filter((el) => el) });
+    }));
+  }
+
+  return { rows: res.rows, extra: res.extra };
+}

package/server/routes/crud/controllers/update.js

@@ -1,76 +1,76 @@
-import {
-  pgClients, applyHook, getAccess, getTemplate, checkXSS, dataInsert, dataUpdate, logger, getToken,
-} from '../../../../utils.js';
-import config from '../../../../config.js';
-
-export default async function update(req) {
-  const { user, params = {}, body = {} } = req;
-  const hookData = await applyHook('preUpdate', {
-    table: params?.table, id: params?.id, user,
-  });
-
-  if (hookData?.message && hookData?.status) {
-    return { message: hookData?.message, status: hookData?.status };
-  }
-  const tokenData = await getToken({
-    uid: user.uid, token: body.token || params.table, mode: 'w', json: 1,
-  });
-
-  const { form, table: edit, id } = hookData || tokenData || (config.auth?.disable ? params : {});
-
-  const { actions = [] } = await getAccess({ table: edit, id, user }) || {};
-
-  if (!actions.includes('edit') && !config?.local) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  if (!edit) {
-    return { message: 'table is required', status: 400 };
-  }
-
-  if (!id) {
-    return { message: 'id is required', status: 404 };
-  }
-
-  const loadTemplate = await getTemplate('table', edit);
-  const { table } = loadTemplate || hookData || params || {};
-
-  const uid = user?.uid;
-
-  const formData = form || loadTemplate?.form ? await getTemplate('form', form || loadTemplate?.form) : {};
-
-  const xssCheck = checkXSS({ body, schema: formData?.schema || formData });
-
-  if (xssCheck.error && formData?.xssCheck !== false) {
-    logger.warn({ name: 'injection/xss', msg: xssCheck.error, table }, req);
-    return { message: 'Дані містять заборонені символи. Приберіть їх та спробуйте ще раз', status: 409 };
-  }
-
-  const res = await dataUpdate({
-    table: loadTemplate?.table || table, id, data: body, uid,
-  });
-
-  // admin.custom_column
-  await applyHook('afterUpdate', {
-    table: params?.table, body, payload: res, user,
-  });
-
-  // form DataTable
-  const extraKeys = Object.keys(formData)?.filter((key) => formData?.[key]?.type === 'DataTable' && formData?.[key]?.table && formData?.[key]?.parent_id && body[key].length);
-  if (extraKeys?.length) {
-    res.extra = {};
-    await Promise.all(extraKeys?.map(async (key) => {
-      const objId = body[formData[key].parent_id] || body?.id;
-      // delete old extra data
-      await pgClients.client.query(`delete from ${formData[key].table} where ${formData[key].parent_id}=$1`, [objId]); // rewrite?
-      // insert new extra data
-      const extraRows = await Promise.all(body[key].map(async (row) => {
-        const extraRes = await dataInsert({ table: formData[key].table, data: { ...row, [formData[key].parent_id]: objId }, uid });
-        return extraRes?.rows?.[0];
-      }));
-      Object.assign(res.extra, { [key]: extraRows.filter((el) => el) });
-    }));
-  }
-
-  return res;
-}
+import {
+  pgClients, applyHook, getAccess, getTemplate, checkXSS, dataInsert, dataUpdate, logger, getToken,
+} from '../../../../utils.js';
+import config from '../../../../config.js';
+
+export default async function update(req) {
+  const { user, params = {}, body = {} } = req;
+  const hookData = await applyHook('preUpdate', {
+    table: params?.table, id: params?.id, user,
+  });
+
+  if (hookData?.message && hookData?.status) {
+    return { message: hookData?.message, status: hookData?.status };
+  }
+  const tokenData = await getToken({
+    uid: user.uid, token: body.token || params.table, mode: 'w', json: 1,
+  });
+
+  const { form, table: edit, id } = hookData || tokenData || (config.auth?.disable ? params : {});
+
+  const { actions = [] } = await getAccess({ table: edit, id, user }) || {};
+
+  if (!actions.includes('edit') && !config?.local) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  if (!edit) {
+    return { message: 'table is required', status: 400 };
+  }
+
+  if (!id) {
+    return { message: 'id is required', status: 404 };
+  }
+
+  const loadTemplate = await getTemplate('table', edit);
+  const { table } = loadTemplate || hookData || params || {};
+
+  const uid = user?.uid;
+
+  const formData = form || loadTemplate?.form ? await getTemplate('form', form || loadTemplate?.form) : {};
+
+  const xssCheck = checkXSS({ body, schema: formData?.schema || formData });
+
+  if (xssCheck.error && formData?.xssCheck !== false) {
+    logger.warn({ name: 'injection/xss', msg: xssCheck.error, table }, req);
+    return { message: 'Дані містять заборонені символи. Приберіть їх та спробуйте ще раз', status: 409 };
+  }
+
+  const res = await dataUpdate({
+    table: loadTemplate?.table || table, id, data: body, uid,
+  });
+
+  // admin.custom_column
+  await applyHook('afterUpdate', {
+    table: params?.table, body, payload: res, user,
+  });
+
+  // form DataTable
+  const extraKeys = Object.keys(formData)?.filter((key) => formData?.[key]?.type === 'DataTable' && formData?.[key]?.table && formData?.[key]?.parent_id && body[key].length);
+  if (extraKeys?.length) {
+    res.extra = {};
+    await Promise.all(extraKeys?.map(async (key) => {
+      const objId = body[formData[key].parent_id] || body?.id;
+      // delete old extra data
+      await pgClients.client.query(`delete from ${formData[key].table} where ${formData[key].parent_id}=$1`, [objId]); // rewrite?
+      // insert new extra data
+      const extraRows = await Promise.all(body[key].map(async (row) => {
+        const extraRes = await dataInsert({ table: formData[key].table, data: { ...row, [formData[key].parent_id]: objId }, uid });
+        return extraRes?.rows?.[0];
+      }));
+      Object.assign(res.extra, { [key]: extraRows.filter((el) => el) });
+    }));
+  }
+
+  return res;
+}

package/server/routes/crud/index.js

@@ -1,19 +1,19 @@
-import update from './controllers/update.js';
-import insert from './controllers/insert.js';
-import deleteCrud from './controllers/deleteCrud.js';
-
-const tableSchema = {
-  params: {
-    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    table: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
-  },
-};
-
-async function plugin(fastify, config = {}) {
-  const prefix = config.prefix || '/api';
-  fastify.put(`${prefix}/table/:table/:id?`, { schema: tableSchema }, update);
-  fastify.delete(`${prefix}/table/:table/:id?`, { schema: tableSchema }, deleteCrud);
-  fastify.post(`${prefix}/table/:table?`, { schema: tableSchema }, insert);
-}
-
-export default plugin;
+import update from './controllers/update.js';
+import insert from './controllers/insert.js';
+import deleteCrud from './controllers/deleteCrud.js';
+
+const tableSchema = {
+  params: {
+    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    table: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
+  },
+};
+
+async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
+  fastify.put(`${prefix}/table/:table/:id?`, { schema: tableSchema }, update);
+  fastify.delete(`${prefix}/table/:table/:id?`, { schema: tableSchema }, deleteCrud);
+  fastify.post(`${prefix}/table/:table?`, { schema: tableSchema }, insert);
+}
+
+export default plugin;