@opengis/fastify-table 1.0.34 → 1.0.36

package/.eslintrc.cjs

@@ -1,42 +1,42 @@
-/* eslint-env node */
-
-module.exports = {
-  env: {
-    node: true,
-  },
-  root: true,
-  extends: [
-    'eslint:recommended',
-    'airbnb-base',
-
-  ],
-  rules: {
-    'brace-style': [2, 'stroustrup', { allowSingleLine: true }],
-    'vue/max-attributes-per-line': 0,
-    'vue/valid-v-for': 0,
-
-    // allow async-await
-    'generator-star-spacing': 'off',
-
-    // allow paren-less arrow functions
-    'arrow-parens': 0,
-    'one-var': 0,
-    'max-len': 0,
-    'import/first': 0,
-    'import/named': 2,
-    'import/namespace': 2,
-    'import/default': 2,
-    'import/export': 2,
-    'import/extensions': 0,
-    'no-console': ['warn', { allow: ['warn', 'error'] }],
-    'import/no-unresolved': 0,
-    'import/no-extraneous-dependencies': 0,
-    'linebreak-style': ['error', 'unix'],
-    // allow debugger during development
-    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
-  },
-
-  parserOptions: {
-    ecmaVersion: 'latest',
-  },
-};
+/* eslint-env node */
+
+module.exports = {
+  env: {
+    node: true,
+  },
+  root: true,
+  extends: [
+    'eslint:recommended',
+    'airbnb-base',
+
+  ],
+  rules: {
+    'brace-style': [2, 'stroustrup', { allowSingleLine: true }],
+    'vue/max-attributes-per-line': 0,
+    'vue/valid-v-for': 0,
+
+    // allow async-await
+    'generator-star-spacing': 'off',
+
+    // allow paren-less arrow functions
+    'arrow-parens': 0,
+    'one-var': 0,
+    'max-len': 0,
+    'import/first': 0,
+    'import/named': 2,
+    'import/namespace': 2,
+    'import/default': 2,
+    'import/export': 2,
+    'import/extensions': 0,
+    'no-console': ['warn', { allow: ['warn', 'error'] }],
+    'import/no-unresolved': 0,
+    'import/no-extraneous-dependencies': 0,
+    'linebreak-style': ['error', 'unix'],
+    // allow debugger during development
+    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
+  },
+
+  parserOptions: {
+    ecmaVersion: 'latest',
+  },
+};

package/Changelog.md

@@ -1,101 +1,105 @@
-# fastify-table
-
-## 1.0.31 - 20.05.2024
-
-- widget db structure refactor
-
-## 1.0.30 - 17.05.2024
-
-- code optimization
-
-## 1.0.29 - 17.05.2024
-
-- widget api post (file)
-
-## 1.0.28 - 14.05.2024
-
-- dblist api set
-
-## 1.0.27 - 12.05.2024
-
-- code optimization
-
-## 1.0.26 - 09.05.2024
-
-- fix getTableSql
-  
-## 1.0.25 - 08.05.2024
-
-- decorator to hook
-
-## 1.0.24 - 07.05.2024
-
-- getTemplate page
-
-## 1.0.23 - 07.05.2024
-
-- getTemplate funcs
-- dblist api
-
-## 1.0.22 - 03.05.2024
-
-- getFilterSQL funcs
-
-## 1.0.21 - 03.05.2024
-
-- fix widget db structure
-
-## 1.0.20 - 03.05.2024
-
-- fix filter separator
-
-## 1.0.19 - 02.05.2024
-
-- widget plugin
-- notification plugin
-
-## 1.0.9 - 29.04.2024
-
-- crud token support
-- security - xss restriction
-
-## 1.0.8 - 29.04.2024
-
-- filter fix
-
-## 1.0.7 - 26.04.2024
-
-- code optimization
-
-## 1.0.6 - 25.04.2024
-
-- code optimization
-
-## 1.0.5 - 24.04.2024
-
-- code optimization
-
-## 1.0.4 - 20.04.2024
-
-- data api - order
-- suggest api - db support
-- del api fix  
-
-## 1.0.3 - 17.04.2024
-
-- fix unit test
-
-## 1.0.2 - 14.04.2024
-
-- fix redis
-
-## 1.0.1 - 14.04.2024
-
-- fix redis
-
-## 1.0.0 - 14.04.2024
-
-- crud
-- pg
-- redis
-- table
+# fastify-table
+
+## 1.0.36 - 22.05.2024
+
+- fix filter api array processing
+
+## 1.0.31 - 20.05.2024
+
+- widget db structure refactor
+
+## 1.0.30 - 17.05.2024
+
+- code optimization
+
+## 1.0.29 - 17.05.2024
+
+- widget api post (file)
+
+## 1.0.28 - 14.05.2024
+
+- dblist api set
+
+## 1.0.27 - 12.05.2024
+
+- code optimization
+
+## 1.0.26 - 09.05.2024
+
+- fix getTableSql
+  
+## 1.0.25 - 08.05.2024
+
+- decorator to hook
+
+## 1.0.24 - 07.05.2024
+
+- getTemplate page
+
+## 1.0.23 - 07.05.2024
+
+- getTemplate funcs
+- dblist api
+
+## 1.0.22 - 03.05.2024
+
+- getFilterSQL funcs
+
+## 1.0.21 - 03.05.2024
+
+- fix widget db structure
+
+## 1.0.20 - 03.05.2024
+
+- fix filter separator
+
+## 1.0.19 - 02.05.2024
+
+- widget plugin
+- notification plugin
+
+## 1.0.9 - 29.04.2024
+
+- crud token support
+- security - xss restriction
+
+## 1.0.8 - 29.04.2024
+
+- filter fix
+
+## 1.0.7 - 26.04.2024
+
+- code optimization
+
+## 1.0.6 - 25.04.2024
+
+- code optimization
+
+## 1.0.5 - 24.04.2024
+
+- code optimization
+
+## 1.0.4 - 20.04.2024
+
+- data api - order
+- suggest api - db support
+- del api fix  
+
+## 1.0.3 - 17.04.2024
+
+- fix unit test
+
+## 1.0.2 - 14.04.2024
+
+- fix redis
+
+## 1.0.1 - 14.04.2024
+
+- fix redis
+
+## 1.0.0 - 14.04.2024
+
+- crud
+- pg
+- redis
+- table

package/README.md

@@ -1,26 +1,26 @@
-# fastify-table
-
-[![NPM version](https://img.shields.io/npm/v/@opengis/fastify-table)](https://www.npmjs.com/package/@opengis/fastify-table)
-[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](http://standardjs.com/)
-
-It standardizes the entire form building process, while taking care of everything from rendering to validation and processing:
-
-- pg
-- redis
-- crud
-
-## Install
-
-```bash
-npm i @opengis/fastify-table
-```
-
-## Usage
-
-```js
-fastify.register(import('@opengis/fastify-table'), config);
-```
-
-## Documenation
-
-For a detailed understanding fastify-table, its features, and how to use them, refer to our [Documentation](https://apidocs.softpro.ua/gis.storage/).
+# fastify-table
+
+[![NPM version](https://img.shields.io/npm/v/@opengis/fastify-table)](https://www.npmjs.com/package/@opengis/fastify-table)
+[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](http://standardjs.com/)
+
+It standardizes the entire form building process, while taking care of everything from rendering to validation and processing:
+
+- pg
+- redis
+- crud
+
+## Install
+
+```bash
+npm i @opengis/fastify-table
+```
+
+## Usage
+
+```js
+fastify.register(import('@opengis/fastify-table'), config);
+```
+
+## Documenation
+
+For a detailed understanding fastify-table, its features, and how to use them, refer to our [Documentation](https://apidocs.softpro.ua/gis.storage/).

package/config.js

@@ -1,12 +1,12 @@
-import fs from 'fs';
-
-import { readFile } from 'fs/promises';
-
-const fileName = ['/data/local/config.json', 'config.json'].find(el => (fs.existsSync(el) ? el : null));
-const config = await readFile(fileName).then(el => JSON.parse(el)) || {};
-
-Object.assign(config, {
-  allTemplates: config?.allTemplates || {},
-});
-
-export default config;
+import fs from 'fs';
+
+import { readFile } from 'fs/promises';
+
+const fileName = ['/data/local/config.json', 'config.json'].find(el => (fs.existsSync(el) ? el : null));
+const config = fileName ? await readFile(fileName).then(el => JSON.parse(el)) : {};
+
+Object.assign(config, {
+  allTemplates: config?.allTemplates || {},
+});
+
+export default config;

package/crud/controllers/deleteCrud.js

@@ -1,14 +1,14 @@
-import dataDelete from '../funcs/dataDelete.js';
-import getTemplate from '../../table/controllers/utils/getTemplate.js';
-
-export default async function deleteCrud(req) {
-  const loadTemplate = await getTemplate('table', req.params.table);
-  const { table } = loadTemplate || req.params || {};
-  const { id } = req.params || {};
-
-  if (!table) return { status: 404, message: 'table is required' };
-
-  const data = await dataDelete({ table, id });
-
-  return { rowCount: data.rowCount, msg: !data.rowCount ? data : null };
-}
+import dataDelete from '../funcs/dataDelete.js';
+import getTemplate from '../../table/controllers/utils/getTemplate.js';
+
+export default async function deleteCrud(req) {
+  const loadTemplate = await getTemplate('table', req.params.table);
+  const { table } = loadTemplate || req.params || {};
+  const { id } = req.params || {};
+
+  if (!table) return { status: 404, message: 'table is required' };
+
+  const data = await dataDelete({ table, id });
+
+  return { rowCount: data.rowCount, msg: !data.rowCount ? data : null };
+}

package/crud/controllers/insert.js

@@ -1,29 +1,29 @@
-import dataInsert from '../funcs/dataInsert.js';
-import getToken from '../funcs/getToken.js';
-import checkXSS from './utils/checkXSS.js';
-import getTemplate from '../../table/controllers/utils/getTemplate.js';
-
-export default async function insert(req) {
-  const loadTemplate = await getTemplate('table', req.params.table);
-  const { table } = loadTemplate || req.params || {};
-  if (!table) return { status: 404, message: 'table is required' };
-
-  const { funcs, session, params } = req;
-  const tokenDataString = await getToken({
-    funcs, session, token: params.table, mode: 'a', json: 0,
-  });
-
-  const { form, add } = JSON.parse(tokenDataString || '{}');
-
-  const formData = form ? await getTemplate('form', form) : {};
-
-  const xssCheck = checkXSS({ body: req.body, schema: formData?.schema });
-
-  if (xssCheck.error && formData?.xssCheck !== false) {
-    req.log.warn({ name: 'injection/xss', msg: xssCheck.error, table }, req);
-    return { message: 'Дані містять заборонені символи. Приберіть їх та спробуйте ще раз', status: 409 };
-  }
-
-  const res = await dataInsert({ table: add || table, data: req.body });
-  return { rows: res.rows };
-}
+import dataInsert from '../funcs/dataInsert.js';
+import getToken from '../funcs/getToken.js';
+import checkXSS from './utils/checkXSS.js';
+import getTemplate from '../../table/controllers/utils/getTemplate.js';
+
+export default async function insert(req) {
+  const loadTemplate = await getTemplate('table', req.params.table);
+  const { table } = loadTemplate || req.params || {};
+  if (!table) return { status: 404, message: 'table is required' };
+
+  const { funcs, session, params } = req;
+  const tokenDataString = await getToken({
+    funcs, session, token: params.table, mode: 'a', json: 0,
+  });
+
+  const { form, add } = JSON.parse(tokenDataString || '{}');
+
+  const formData = form ? await getTemplate('form', form) : {};
+
+  const xssCheck = checkXSS({ body: req.body, schema: formData?.schema });
+
+  if (xssCheck.error && formData?.xssCheck !== false) {
+    req.log.warn({ name: 'injection/xss', msg: xssCheck.error, table }, req);
+    return { message: 'Дані містять заборонені символи. Приберіть їх та спробуйте ще раз', status: 409 };
+  }
+
+  const res = await dataInsert({ table: add || table, data: req.body });
+  return { rows: res.rows };
+}

package/crud/controllers/update.js

@@ -1,31 +1,31 @@
-import dataUpdate from '../funcs/dataUpdate.js';
-import getToken from '../funcs/getToken.js';
-import checkXSS from './utils/checkXSS.js';
-import getTemplate from '../../table/controllers/utils/getTemplate.js';
-
-export default async function update(req) {
-  const loadTemplate = await getTemplate('table', req.params.table);
-  const { table } = loadTemplate || req.params || {};
-  const { id } = req.params || {};
-  if (!req.params?.table) return { message: 'table is required', status: 404 };
-  if (!id) return { message: 'id is required', status: 404 };
-
-  const { funcs, session, params } = req;
-  const tokenDataString = await getToken({
-    funcs, session, token: params.table, mode: 'w', json: 0,
-  });
-
-  const tokenData = JSON.parse(tokenDataString || '{}');
-
-  const formData = tokenData?.form ? await getTemplate('form', tokenData.form) : {};
-
-  const xssCheck = checkXSS({ body: req.body, schema: formData?.schema });
-
-  if (xssCheck.error && formData?.xssCheck !== false) {
-    req.log.warn({ name: 'injection/xss', msg: xssCheck.error, table }, req);
-    return { message: 'Дані містять заборонені символи. Приберіть їх та спробуйте ще раз', status: 409 };
-  }
-
-  const res = await dataUpdate({ table: tokenData?.table || table, id: tokenData?.id || id, data: req.body });
-  return res;
-}
+import dataUpdate from '../funcs/dataUpdate.js';
+import getToken from '../funcs/getToken.js';
+import checkXSS from './utils/checkXSS.js';
+import getTemplate from '../../table/controllers/utils/getTemplate.js';
+
+export default async function update(req) {
+  const loadTemplate = await getTemplate('table', req.params.table);
+  const { table } = loadTemplate || req.params || {};
+  const { id } = req.params || {};
+  if (!req.params?.table) return { message: 'table is required', status: 404 };
+  if (!id) return { message: 'id is required', status: 404 };
+
+  const { funcs, session, params } = req;
+  const tokenDataString = await getToken({
+    funcs, session, token: params.table, mode: 'w', json: 0,
+  });
+
+  const tokenData = JSON.parse(tokenDataString || '{}');
+
+  const formData = tokenData?.form ? await getTemplate('form', tokenData.form) : {};
+
+  const xssCheck = checkXSS({ body: req.body, schema: formData?.schema });
+
+  if (xssCheck.error && formData?.xssCheck !== false) {
+    req.log.warn({ name: 'injection/xss', msg: xssCheck.error, table }, req);
+    return { message: 'Дані містять заборонені символи. Приберіть їх та спробуйте ще раз', status: 409 };
+  }
+
+  const res = await dataUpdate({ table: tokenData?.table || table, id: tokenData?.id || id, data: req.body });
+  return res;
+}

package/crud/controllers/utils/checkXSS.js

@@ -1,45 +1,45 @@
-/* import sqlInjection from '../../../policy/funcs/sqlInjection.js'; */
-import xssInjection from './xssInjection.js';
-
-/* const checkList = xssInjection.concat(sqlInjection); */
-
-// RTE - rich text editor
-
-function checkXSS({ body, schema = {} }) {
-  const data = typeof body === 'string' ? body : JSON.stringify(body);
-  const stopWords = xssInjection.filter((el) => data.toLowerCase().includes(el));
-
-  // check sql injection
-  const stopSpecialSymbols = data.match(/\p{S}OR\p{S}|\p{P}OR\p{P}| OR |\+OR\+/gi);
-  if (stopSpecialSymbols?.length) stopSpecialSymbols?.forEach((el) => stopWords.push(el));
-
-  // escape arrows on non-RTE
-  Object.keys(body)
-    .filter((key) => ['<', '>'].find((el) => body[key]?.includes?.(el))
-  && !['Summernote', 'Tiny', 'Ace'].includes(schema[key]?.type))
-    ?.forEach((key) => {
-      Object.assign(body, { [key]: body[key].replace(/</g, '&lt;').replace(/>/g, '&gt;') });
-    });
-  // try { } catch (err) { return { error: err.toString() }; }
-
-  if (!stopWords.length) return { body };
-
-  const disabledCheckFields = Object.keys(schema)?.filter((el) => schema[el]?.xssCheck === false); // exclude specific columns
-
-  // check RTE
-  /* const richTextFields = Object.keys(schema).filter((el) => ['Summernote', 'Tiny', 'Ace'].includes(schema[el]?.type));
-  richTextFields.filter((key) => !checkList.find((el) => body[key].includes(el)))?.forEach((key) => {
-    disabledCheckFields.push(key);
-  }); */
-
-  const field = Object.keys(body)
-    ?.find((key) => body[key]
-        && !disabledCheckFields.includes(key)
-        && body[key].toLowerCase().includes(stopWords[0]));
-  if (field) {
-    return { error: `rule: ${stopWords[0]} | attr: ${field} | val: ${body[field]}`, body };
-  }
-  return { body };
-}
-
-export default checkXSS;
+/* import sqlInjection from '../../../policy/funcs/sqlInjection.js'; */
+import xssInjection from './xssInjection.js';
+
+/* const checkList = xssInjection.concat(sqlInjection); */
+
+// RTE - rich text editor
+
+function checkXSS({ body, schema = {} }) {
+  const data = typeof body === 'string' ? body : JSON.stringify(body);
+  const stopWords = xssInjection.filter((el) => data.toLowerCase().includes(el));
+
+  // check sql injection
+  const stopSpecialSymbols = data.match(/\p{S}OR\p{S}|\p{P}OR\p{P}| OR |\+OR\+/gi);
+  if (stopSpecialSymbols?.length) stopSpecialSymbols?.forEach((el) => stopWords.push(el));
+
+  // escape arrows on non-RTE
+  Object.keys(body)
+    .filter((key) => ['<', '>'].find((el) => body[key]?.includes?.(el))
+  && !['Summernote', 'Tiny', 'Ace'].includes(schema[key]?.type))
+    ?.forEach((key) => {
+      Object.assign(body, { [key]: body[key].replace(/</g, '&lt;').replace(/>/g, '&gt;') });
+    });
+  // try { } catch (err) { return { error: err.toString() }; }
+
+  if (!stopWords.length) return { body };
+
+  const disabledCheckFields = Object.keys(schema)?.filter((el) => schema[el]?.xssCheck === false); // exclude specific columns
+
+  // check RTE
+  /* const richTextFields = Object.keys(schema).filter((el) => ['Summernote', 'Tiny', 'Ace'].includes(schema[el]?.type));
+  richTextFields.filter((key) => !checkList.find((el) => body[key].includes(el)))?.forEach((key) => {
+    disabledCheckFields.push(key);
+  }); */
+
+  const field = Object.keys(body)
+    ?.find((key) => body[key]
+        && !disabledCheckFields.includes(key)
+        && body[key].toLowerCase().includes(stopWords[0]));
+  if (field) {
+    return { error: `rule: ${stopWords[0]} | attr: ${field} | val: ${body[field]}`, body };
+  }
+  return { body };
+}
+
+export default checkXSS;