@opengis/fastify-table 1.4.50 → 1.4.52

package/config.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 // import dotenv from 'dotenv';
 
 import { existsSync, readFileSync } from 'node:fs';

package/index.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import path from 'node:path';
 import { existsSync, readdirSync, readFileSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.4.50",
+  "version": "1.4.52",
   "type": "module",
   "description": "core-plugins",
   "keywords": [

package/server/helpers/format/formatNum.js

@@ -89,67 +89,67 @@ const mapNumbers = {
 };
 const mapOrders = {
   ua: [
-    { _Gender: true, _arrStates: ['', '', ''] },
-    { _Gender: true, _arrStates: ['тисяча', 'тисячі', 'тисяч'] },
-    { _Gender: false, _arrStates: ['мільйон', 'мільйона', 'мільйонів'] },
-    { _Gender: false, _arrStates: ['мільярд', 'мільярда', 'мільярдів'] },
-    { _Gender: false, _arrStates: ['триліон', 'триліона', 'триліонів'] },
+    { Gender: true, arrStates: ['', '', ''] },
+    { Gender: true, arrStates: ['тисяча', 'тисячі', 'тисяч'] },
+    { Gender: false, arrStates: ['мільйон', 'мільйона', 'мільйонів'] },
+    { Gender: false, arrStates: ['мільярд', 'мільярда', 'мільярдів'] },
+    { Gender: false, arrStates: ['триліон', 'триліона', 'триліонів'] },
     {
-      _Gender: true,
-      _arrStates: {
+      Gender: true,
+      arrStates: {
         uah: ['грн.', 'грн.', 'грн.'],
         rur: ['руб.', 'руб.', 'руб.'],
       },
-      _bAddZeroWord: true,
+      bAddZeroWord: true,
     },
     {
-      _Gender: true,
-      _arrStates: ['ціла', 'цілих', 'цілих'],
-      _bAddZeroWord: true,
+      Gender: true,
+      arrStates: ['ціла', 'цілих', 'цілих'],
+      bAddZeroWord: true,
     },
-    { _Gender: true, _arrStates: ['', '', ''], _bAddZeroWord: true },
+    { Gender: true, arrStates: ['', '', ''], bAddZeroWord: true },
     {
-      _Gender: true,
-      _arrStates: ['дол.', 'дол.', 'дол.'],
-      _bAddZeroWord: true,
+      Gender: true,
+      arrStates: ['дол.', 'дол.', 'дол.'],
+      bAddZeroWord: true,
     },
     {
-      _Gender: true,
-      _arrStates: ['грн.', 'грн.', 'грн.'],
-      _bAddZeroWord: true,
+      Gender: true,
+      arrStates: ['грн.', 'грн.', 'грн.'],
+      bAddZeroWord: true,
     },
   ],
   ru: [
-    { _Gender: true, _arrStates: ['', '', ''] },
-    { _Gender: true, _arrStates: ['тысяча', 'тысячи', 'тысяч'] },
-    { _Gender: false, _arrStates: ['миллион', 'миллиона', 'миллионов'] },
-    { _Gender: false, _arrStates: ['миллиард', 'миллиарда', 'миллиардов'] },
-    { _Gender: false, _arrStates: ['триллион', 'триллиона', 'триллионов'] },
+    { Gender: true, arrStates: ['', '', ''] },
+    { Gender: true, arrStates: ['тысяча', 'тысячи', 'тысяч'] },
+    { Gender: false, arrStates: ['миллион', 'миллиона', 'миллионов'] },
+    { Gender: false, arrStates: ['миллиард', 'миллиарда', 'миллиардов'] },
+    { Gender: false, arrStates: ['триллион', 'триллиона', 'триллионов'] },
     {
-      _Gender: true,
-      _arrStates: {
+      Gender: true,
+      arrStates: {
         uah: ['грн.', 'грн.', 'грн.'],
         rur: ['руб.', 'руб.', 'руб.'],
         usd: ['дол.', 'дол.', 'дол.'],
       },
-      _bAddZeroWord: true,
+      bAddZeroWord: true,
     },
     {
-      _Gender: true,
-      _arrStates: ['целых', 'целых', 'целых'],
-      _bAddZeroWord: true,
+      Gender: true,
+      arrStates: ['целых', 'целых', 'целых'],
+      bAddZeroWord: true,
     },
-    { _Gender: true, _arrStates: ['', '', ''], _bAddZeroWord: true },
+    { Gender: true, arrStates: ['', '', ''], bAddZeroWord: true },
     {
-      _Gender: true,
-      _arrStates: ['дол.', 'дол.', 'дол.'],
-      _bAddZeroWord: true,
+      Gender: true,
+      arrStates: ['дол.', 'дол.', 'дол.'],
+      bAddZeroWord: true,
     },
   ],
 };
 const objCur = {
-  _Gender: false,
-  _arrStates: {
+  Gender: false,
+  arrStates: {
     uah: ['грн.', 'грн.', 'грн.'],
     rur: ['руб.', 'руб.', 'руб.'],
     usd: ['дол.', 'дол.', 'дол.'],
@@ -157,15 +157,15 @@ const objCur = {
   },
 };
 const objCoin = {
-  _Gender: false,
-  _arrStates: {
+  Gender: false,
+  arrStates: {
     uah: 'коп.',
     rur: 'коп.',
     usd: 'цен.',
     num: { ru: 'сот.', ua: 'сот.', en: 'hund.' },
   },
 };
-  // функции которые отвечают за форматирование
+// функции которые отвечают за форматирование
 /**
  * Formatting from number to string
  *
@@ -197,17 +197,17 @@ function value(dVal, bGender, lang) {
  * from0To999(arrRet, 404,
  *  oObjDesc:
  *    {
- *      _Gender: true,
- *      _bAddZeroWord: undefined,
- *      _arrStates: ['','',''],
+ *      Gender: true,
+ *      bAddZeroWord: undefined,
+ *      arrStates: ['','',''],
  *    },
  *  lang: 'ru'
  * })
  * @param {Array} arrRet
  * @param {Number} fValue
- * @param {Object} [oObjDesc._Gender]
- * @param {Object} [oObjDesc._bAddZeroWord]
- * @param {Object} [oObjDesc._arrStates]
+ * @param {Object} [oObjDesc.Gender]
+ * @param {Object} [oObjDesc.bAddZeroWord]
+ * @param {Object} [oObjDesc.arrStates]
  * @param oObjDesc
  * @param {String} lang
  */
@@ -216,32 +216,32 @@ function from0To999(arrRet, fValue, oObjDesc, lang) {
   let nCurrState = 2;
   if (Math.floor(fValueNew / 100) > 0) {
     const fCurr = Math.floor(fValueNew / 100) * 100;
-    arrRet.push(value(fCurr, oObjDesc._Gender, lang));
+    arrRet.push(value(fCurr, oObjDesc.Gender, lang));
     nCurrState = mapNumbers[lang][fCurr][0];
     fValueNew -= fCurr;
   }
   if (fValueNew === 0) {
-    arrRet.push(value(fValueNew, oObjDesc._Gender, lang));
+    arrRet.push(value(fValueNew, oObjDesc.Gender, lang));
     nCurrState = mapNumbers[lang][fValueNew][0];
   }
- else if (fValueNew < 20) {
-    if (Math.floor(fValueNew) > 0 || oObjDesc._bAddZeroWord) {
-      arrRet.push(value(fValueNew, oObjDesc._Gender, lang));
+  else if (fValueNew < 20) {
+    if (Math.floor(fValueNew) > 0 || oObjDesc.bAddZeroWord) {
+      arrRet.push(value(fValueNew, oObjDesc.Gender, lang));
       nCurrState = mapNumbers[lang][fValueNew][0];
     }
   }
- else {
+  else {
     const fCurr = Math.floor(fValueNew / 10) * 10;
-    arrRet.push(value(fCurr, oObjDesc._Gender, lang));
+    arrRet.push(value(fCurr, oObjDesc.Gender, lang));
     nCurrState = mapNumbers[lang][fCurr][0];
     fValueNew -= fCurr;
 
     if (Math.floor(fValueNew) > 0) {
-      arrRet.push(value(fValueNew, oObjDesc._Gender, lang));
+      arrRet.push(value(fValueNew, oObjDesc.Gender, lang));
       nCurrState = mapNumbers[lang][fValueNew][0];
     }
   }
-  arrRet.push(oObjDesc._arrStates[nCurrState]);
+  arrRet.push(oObjDesc.arrStates[nCurrState]);
 }
 
 /**
@@ -289,11 +289,11 @@ function floatToSamplesInWordsUkr(fAmount, resultStr, exp, lang, currency) {
     /%d/,
     Math.floor(parseInt(fAmount, 10) + 0.005),
   );
-  if (currency !== 'num' && objCur._arrStates[currency]) { resultStrNew = resultStrNew.replace(/%curr/, objCur._arrStates[currency][0]); }
- else {
+  if (currency !== 'num' && objCur.arrStates[currency]) { resultStrNew = resultStrNew.replace(/%curr/, objCur.arrStates[currency][0]); }
+  else {
     resultStrNew = resultStrNew.replace(
       /%curr/,
-      objCur._arrStates[lang === 'ru' ? 'rur' : lang][0],
+      objCur.arrStates[lang === 'ru' ? 'rur' : lang][0],
     );
   }
 
@@ -309,11 +309,11 @@ function floatToSamplesInWordsUkr(fAmount, resultStr, exp, lang, currency) {
 
   resultStrNew = resultStrNew.replace(/%f/, fDec);
 
-  if (currency !== 'num' && objCur._arrStates[currency]) { resultStrNew = resultStrNew.replace(/%coin/, objCoin._arrStates[currency]); }
- else {
+  if (currency !== 'num' && objCur.arrStates[currency]) { resultStrNew = resultStrNew.replace(/%coin/, objCoin.arrStates[currency]); }
+  else {
     resultStrNew = resultStrNew.replace(
       /%coin/,
-      objCoin._arrStates[lang === 'ru' ? 'rur' : lang],
+      objCoin.arrStates[lang === 'ru' ? 'rur' : lang],
     );
   }
   return resultStrNew;

package/server/helpers/format/formatNumber.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-param-reassign */
 /**
  * Форматування до числа
  *

package/server/helpers/format/formatUnit.js

@@ -1,3 +1,5 @@
+/* eslint-disable no-restricted-globals */
+/* eslint-disable no-param-reassign */
 /**
  * Повертає розмір файлу на диску у встановлених одиницях вимірювання об'єму файлу.
  *
@@ -17,13 +19,13 @@ export default function formatUnit(data, options) {
   data = parseFloat(data);
   if (isNaN(data)) return data;
 
-  const _UNIT = {
+  const UNIT = {
     B: {
       4: 'TB', 3: 'GB', 2: 'MB', 1: 'KB', 0: 'B',
     },
   };
 
-  const unit = _UNIT[options.hash.unit] || _UNIT.B;
+  const unit = UNIT[options.hash.unit] || UNIT.B;
   const number = options.hash.number || 0;
 
   for (let i = 4; i >= 0; i -= 1) {

package/server/helpers/format/num_format.js

@@ -1,3 +1,5 @@
+/* eslint-disable no-restricted-globals */
+/* eslint-disable no-param-reassign */
 /**
  * Приведення чисел до стандартизованого виду
  *

package/server/helpers/funcs/_math.js

@@ -15,12 +15,12 @@
  * @param {Object} operator Оператор для дії з числами
  * @param {Object} arg1 Перше число для дії
  * @param {Object} arg2 Друге число для дії
- * @param {Array} args[0]] Перше число для дії
- * @param {Array} args[1]] Оператор для дії з числами
- * @param {Array} args[2]] Друге число для дії
+ * @param {Array} args[0] Перше число для дії
+ * @param {Array} args[1] Оператор для дії з числами
+ * @param {Array} args[2] Друге число для дії
  * @returns {String} Returns HTML
  */
-export default function _math(...args) {
+export default function math(...args) {
   const options = args.pop();
   const opt = options.hash;
 

package/server/helpers/funcs/contentList.js

@@ -25,9 +25,9 @@ const maxLimit = 100;
  * @returns {String} Returns HTML
  */
 export default async function contentList(options) {
-    const {
- table, limit, query, order, sql, debug,
-} = options.hash;
+    const {
+        table, limit, query, order, sql, debug,
+    } = options.hash;
     if (!table) { return 'Table undefined'; }
 
     try {
@@ -35,11 +35,7 @@ export default async function contentList(options) {
 
         const hasBrackets = table.trim().startsWith('(') && table.trim().endsWith(')');
 
-        const where = `where ${query || '1=1'}`;
-        const _limit = limit !== undefined && limit !== null ? Math.min(maxLimit, +limit) : 15;
-        const _order = order ? `order by ${order}` : '';
-
-        const SQL = `select *,${pg.pk[table] || '1'}::text from ${hasBrackets ? `${table} t` : table} ${where} ${_order} limit ${_limit}`;
+        const SQL = `select *,${pg.pk[table] || '1'}::text from ${hasBrackets ? `${table} t` : table} where ${query || '1=1'} ${order ? `order by ${order}` : ''} limit ${limit !== undefined && limit !== null ? Math.min(maxLimit, +limit) : 15}`;
         const compiledSQL = Handlebars.compile(SQL)(options.data.root);
 
         if (sql) {
@@ -54,8 +50,8 @@ export default async function contentList(options) {
         }
 
         return options.fn(data);
-    }
- catch (err) {
+    }
+    catch (err) {
         return `Сталася помилка, зверніться до відділу підтримки.<!-- err: ${err.toString()} -->`;
     }
 }

package/server/helpers/funcs/ifCond.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-param-reassign */
 /**
  * Перетинає два масиви
  *
@@ -32,75 +33,77 @@ function intersect(a, b) {
  * @example
  * {{#ifCond 'debug' 'in' @root.setting.core.setting}}Умова виконана{{^}}Не виконана умова{{/ifCond}}
  * @param {Array} args Параметри для значень і умов
- * @param {Array} args[0]] Перше значення
- * @param {Array} args[1]] Оператор
- * @param {Array} args[2]] Друге значення
+ * @param {Array} args[0] Перше значення
+ * @param {Array} args[1] Оператор
+ * @param {Array} args[2] Друге значення
  * @returns {String} Returns HTML
  */
 export default function ifCond(v1, operator, v2, options) {
-  const __obj = this;
+  const obj = this;
 
   const isEmpty = (val) => val === null || val === undefined || (Array.isArray(val) && val.length === 0) || val === '';
 
   switch (operator) {
     case '==':
-      return (v1 == v2) ? options.fn(__obj) : options.inverse(__obj);
+      // eslint-disable-next-line eqeqeq
+      return (v1 == v2) ? options.fn(obj) : options.inverse(obj);
     case '!=':
-      return (v1 != v2) ? options.fn(__obj) : options.inverse(__obj);
+      // eslint-disable-next-line eqeqeq
+      return (v1 != v2) ? options.fn(obj) : options.inverse(obj);
     case '===':
-      return (v1 === v2) ? options.fn(__obj) : options.inverse(__obj);
+      return (v1 === v2) ? options.fn(obj) : options.inverse(obj);
     case '!==':
-      return (v1 !== v2) ? options.fn(__obj) : options.inverse(__obj);
+      return (v1 !== v2) ? options.fn(obj) : options.inverse(obj);
     case '&&':
-      return (v1 && v2) ? options.fn(__obj) : options.inverse(__obj);
+      return (v1 && v2) ? options.fn(obj) : options.inverse(obj);
     case '||':
-      return (v1 || v2) ? options.fn(__obj) : options.inverse(__obj);
+      return (v1 || v2) ? options.fn(obj) : options.inverse(obj);
     case '<':
-      return (v1 < v2) ? options.fn(__obj) : options.inverse(__obj);
+      return (v1 < v2) ? options.fn(obj) : options.inverse(obj);
     case '<=':
-      return (v1 <= v2) ? options.fn(__obj) : options.inverse(__obj);
+      return (v1 <= v2) ? options.fn(obj) : options.inverse(obj);
     case '>':
-      return (v1 > v2) ? options.fn(__obj) : options.inverse(__obj);
+      return (v1 > v2) ? options.fn(obj) : options.inverse(obj);
     case '>=':
-      return (v1 >= v2) ? options.fn(__obj) : options.inverse(__obj);
+      return (v1 >= v2) ? options.fn(obj) : options.inverse(obj);
     case '&':
       return (!isEmpty(v1) && !isEmpty(v2) && intersect(v1, v2).length !== 0)
-        ? options.fn(__obj)
-        : options.inverse(__obj);
+        ? options.fn(obj)
+        : options.inverse(obj);
     case '!~':
       return (v1 || '').indexOf(v2) === -1
-        ? options.fn(__obj)
-        : options.inverse(__obj);
+        ? options.fn(obj)
+        : options.inverse(obj);
     case '~':
       return (v1 || '').indexOf(v2) !== -1
-        ? options.fn(__obj)
-        : options.inverse(__obj);
+        ? options.fn(obj)
+        : options.inverse(obj);
     case 'period':
       return (!isEmpty(v1) && !isEmpty(v2) && new Date(v1) < new Date() && new Date(v2) > new Date())
-        ? options.fn(__obj)
-        : options.inverse(__obj);
+        ? options.fn(obj)
+        : options.inverse(obj);
     case 'in': {
       if (typeof v2 === 'string') v2 = v2.split(',').map(item => item.trim());
-      if (isEmpty(v1) || isEmpty(v2)) return options.inverse(__obj);
+      if (isEmpty(v1) || isEmpty(v2)) return options.inverse(obj);
 
       if (Array.isArray(v1)) {
         return v1.some((value) => v2.includes(value.toString()))
-          ? options.fn(__obj)
-          : options.inverse(__obj);
+          ? options.fn(obj)
+          : options.inverse(obj);
       }
       return v2.includes(v1.toString())
-        ? options.fn(__obj)
-        : options.inverse(__obj);
+        ? options.fn(obj)
+        : options.inverse(obj);
     }
     case 'not in': {
       if (typeof v2 === 'string') v2 = v2.split(',').map(item => item.trim());
-      if (isEmpty(v1) || isEmpty(v2)) return options.inverse(__obj);
+      if (isEmpty(v1) || isEmpty(v2)) return options.inverse(obj);
 
       return !v2.includes(v1.toString())
-        ? options.fn(__obj)
-        : options.inverse(__obj);
+        ? options.fn(obj)
+        : options.inverse(obj);
     }
     default:
-      return options.inverse(__obj);
+      return options.inverse(obj);
   }
 }

package/server/helpers/funcs/ifCondAnd.js

@@ -1,8 +1,23 @@
+/* eslint-disable prefer-rest-params */
 function intersect(a, b) {
-  const aN = Array.isArray(a) ? a : typeof a === 'string' ? a.split(',') : [];
-  const bN = Array.isArray(b) ? b : typeof b === 'string' ? b.split(',') : [];
+  let aN = [];
+  let bN = [];
 
-  return aN.filter((e) => bN.includes(e));
+  if (Array.isArray(a)) {
+    aN = a;
+  }
+  else if (typeof a === 'string') {
+    aN = a.split(',');
+  }
+
+  if (Array.isArray(b)) {
+    bN = b;
+  }
+  else if (typeof b === 'string') {
+    bN = b.split(',');
+  }
+
+  return aN.filter(e => bN.includes(e));
 }
 
 /**
@@ -31,9 +46,11 @@ export default function ifCondAnd() {
 
     switch (operator) {
       case '==':
+        // eslint-disable-next-line eqeqeq
         conditions.push(v1 == v2);
         break;
       case '!=':
+        // eslint-disable-next-line eqeqeq
         conditions.push(v1 != v2);
         break;
       case '===':
@@ -77,7 +94,7 @@ export default function ifCondAnd() {
         if (Array.isArray(v1)) {
           conditions.push(v1.some((value) => v2.includes(value.toString())));
         }
- else {
+        else {
           conditions.push(v2.includes(v1.toString()));
         }
         break;

package/server/helpers/funcs/ifCondOr.js

@@ -1,8 +1,23 @@
+/* eslint-disable prefer-rest-params */
 function intersect(a, b) {
-  const aN = Array.isArray(a) ? a : typeof a === 'string' ? a.split(',') : [];
-  const bN = Array.isArray(b) ? b : typeof b === 'string' ? b.split(',') : [];
+  let aN = [];
+  let bN = [];
 
-  return aN.filter((e) => bN.includes(e));
+  if (Array.isArray(a)) {
+    aN = a;
+  }
+  else if (typeof a === 'string') {
+    aN = a.split(',');
+  }
+
+  if (Array.isArray(b)) {
+    bN = b;
+  }
+  else if (typeof b === 'string') {
+    bN = b.split(',');
+  }
+
+  return aN.filter(e => bN.includes(e));
 }
 
 /**
@@ -32,9 +47,11 @@ export default function ifCondOr() {
 
     switch (operator) {
       case '==':
+        // eslint-disable-next-line eqeqeq
         conditions.push(v1 == v2);
         break;
       case '!=':
+        // eslint-disable-next-line eqeqeq
         conditions.push(v1 != v2);
         break;
       case '===':
@@ -78,7 +95,7 @@ export default function ifCondOr() {
         if (Array.isArray(v1)) {
           conditions.push(v1.some((value) => v2.includes(value.toString())));
         }
- else {
+        else {
           conditions.push(v2.includes(v1.toString()));
         }
         break;

package/server/helpers/funcs/json.js

@@ -1,3 +1,3 @@
-export default function (data) {
+export default function jsonStringify(data) {
     return JSON.stringify(data, null, 2);
 }

package/server/helpers/funcs/round.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-restricted-globals */
 /**
  * Округлення числа до певної точності
  *
@@ -15,14 +16,14 @@
  * @returns {String} Returns HTML
  */
 export default function round(data, options) {
-  const _data = parseFloat(data);
-  if (isNaN(_data)) return '';
+  const floatData = parseFloat(data);
+  if (isNaN(floatData)) return '';
 
   const dec = options.hash.dec ? parseInt(options.hash.dec, 10) : 0;
 
   if (options.hash.floor) {
-    return Math.floor(_data).toFixed(dec);
+    return Math.floor(floatData).toFixed(dec);
   }
 
-  return _data.toFixed(dec);
+  return floatData.toFixed(dec);
 }

package/server/helpers/funcs/select.js

@@ -1,5 +1,5 @@
 import getPG from '../../plugins/pg/funcs/getPG.js';
-import getSelect from '../../plugins/table/funcs/getSelect.js';
+import getSelect from '../../plugins/table/funcs/getSelect.js';
 
 const pg = getPG();
 
@@ -19,7 +19,7 @@ export default async function select(ids, options) {
     if (!classifier) return `Не знайдено класифікатор ${data}`;
 
     const arr = classifier.arr || [];
-    if (classifier.sql && typeof classifier.sql === 'string') {
+    if (classifier.sql && typeof classifier.sql === 'string') {
       const metaQuery = `SELECT * FROM (${classifier.sql})q LIMIT 0`;
       const meta = await pg.query(metaQuery);
       const idColumn = meta.fields[0].name;
@@ -29,18 +29,18 @@ export default async function select(ids, options) {
       const values = [idsArray.map(id => String(id))];
 
       const { rows } = await pg.query(q, values);
-      Object.assign(arr, rows);
+      Object.assign(arr, rows);
     }
     if (!arr.length) return idsArray;
 
     const results = idsArray.map(id => {
-      const result = arr.find(el => String(el.id) == String(id));
+      const result = arr.find(el => String(el.id) === String(id));
       return result ? result.text : '';
     });
 
     return results.filter(Boolean).join(', ');
-  }
- catch (err) {
+  }
+  catch (err) {
     return `Сталася помилка.<!-- err: ${err.toString()} -->`;
   }
 }

package/server/helpers/index.js

@@ -1,3 +1,4 @@
+/* eslint-disable prefer-rest-params */
 import handlebarsSync from 'handlebars';
 import promisedHandlebars from 'promised-handlebars';
 
@@ -54,14 +55,14 @@ function getKeysRecursive(obj, prefix = '') {
         const fullKey = prefix ? `${prefix}.${curr}` : curr;
         acc.push(curr);
         if (obj1[curr] && typeof obj1[curr] === 'object' && curr !== 'coordinates') {
-            acc = acc.concat(getKeysRecursive(obj1[curr], fullKey));
+            acc.push(...(getKeysRecursive(obj1[curr], fullKey)));
         }
         return acc;
     }, []);
 }
 
 // avoid unhandled exception if helper not registered
-handlebars.registerHelper('helperMissing', function () {
+handlebars.registerHelper('helperMissing', function hm() {
     const options = arguments[arguments.length - 1];
     const args = Array.prototype.slice.call(arguments, 0, arguments.length - 1);
     const keys = getKeysRecursive(options.data?.root);

package/server/helpers/list/tableList.js

@@ -1,3 +1,5 @@
+/* eslint-disable no-console */
+
 import setToken from '../../plugins/crud/funcs/setToken.js';
 
 import { handlebars } from '../index.js';

package/server/helpers/list/utils/buttonDel.js

@@ -4,9 +4,9 @@
 // }
 
 const newColor = 'red';
-export default function button(token, title) {
+export default function button(token) {
     return `<button onclick="window.v3plugin.$api({ api: '/api/table/${token}', method:'delete',confirm: { title:'Підтвердити операцію',  text: 'Ви впевнені що хочете вилучити запис?', cancel: 'Скасувати', confirm : 'Виконати'} })"
     class="group px-2 py-1 inline-flex border-solid justify-center items-center gap-2 rounded-md font-semibold focus:outline-none text-sm transition-all border border-transparent hover:text-white ring-offset-white bg-${newColor}-100 text-${newColor}-100 hover:bg-${newColor}-500 focus:ring-${newColor}-500">
     <svg  class="group-hover:fill-white" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512" width="13" height="13" fill="#ef4444"><path d="M135.2 17.7L128 32 32 32C14.3 32 0 46.3 0 64S14.3 96 32 96l384 0c17.7 0 32-14.3 32-32s-14.3-32-32-32l-96 0-7.2-14.3C307.4 6.8 296.3 0 284.2 0L163.8 0c-12.1 0-23.2 6.8-28.6 17.7zM416 128L32 128 53.2 467c1.6 25.3 22.6 45 47.9 45l245.8 0c25.3 0 46.3-19.7 47.9-45L416 128z"/></svg>
     </button>`;
-}
+}

package/server/helpers/list/utils/buttonEdit.js

@@ -4,9 +4,9 @@
 // }
 
 const newColor = 'blue';
-export default function button(token, title) {
+export default function button(token) {
     return `<button onclick="window.v3plugin.$form({ token: '${token}' })"
     class="group px-2 py-1 inline-flex border-solid justify-center items-center gap-2 rounded-md font-semibold focus:outline-none text-sm transition-all border border-transparent hover:text-white ring-offset-white bg-${newColor}-100 text-${newColor}-100 hover:bg-${newColor}-500 focus:ring-${newColor}-500">
     <svg class="group-hover:fill-white" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="13" height="13" fill="#3b82f6"><path d="M471.6 21.7c-21.9-21.9-57.3-21.9-79.2 0L362.3 51.7l97.9 97.9 30.1-30.1c21.9-21.9 21.9-57.3 0-79.2L471.6 21.7zm-299.2 220c-6.1 6.1-10.8 13.6-13.5 21.9l-29.6 88.8c-2.9 8.6-.6 18.1 5.8 24.6s15.9 8.7 24.6 5.8l88.8-29.6c8.2-2.7 15.7-7.4 21.9-13.5L437.7 172.3 339.7 74.3 172.4 241.7zM96 64C43 64 0 107 0 160L0 416c0 53 43 96 96 96l256 0c53 0 96-43 96-96l0-96c0-17.7-14.3-32-32-32s-32 14.3-32 32l0 96c0 17.7-14.3 32-32 32L96 448c-17.7 0-32-14.3-32-32l0-256c0-17.7 14.3-32 32-32l96 0c17.7 0 32-14.3 32-32s-14.3-32-32-32L96 64z"/></svg>
     </button>`;
-}
+}

package/server/helpers/string/coalesce.js

@@ -21,11 +21,19 @@
 export default function coalesce(...args) {
   const options = args.pop();
 
-  for (const arg of args) {
-    if (arg != null && arg !== '') {
-      return arg;
-    }
+  const value = args.find(arg => arg != null && arg !== '');
+
+  if (value !== undefined) {
+    return value;
+  }
+
+  if (options.fn) {
+    return options.fn(this);
+  }
+
+  if (options.inverse) {
+    return options.inverse(this);
   }
 
-  return options.fn ? options.fn(this) : (options.inverse ? options.inverse(this) : '');
+  return '';
 }

package/server/helpers/utils/paddingNumber.js

@@ -1,4 +1,5 @@
-export default function (num) {
+/* eslint-disable prefer-rest-params */
+export default function paddingNumber(num) {
     const padding = arguments.length === 3 ? arguments[1] : 6;
     return num.toLocaleString('en', { minimumIntegerDigits: padding, useGrouping: false });
-}
+}

package/server/plugins/crud/funcs/validateData.js

@@ -1,5 +1,6 @@
 import config from '../../../../config.js';
-
+/* eslint-disable no-console */
+// eslint-disable-next-line no-control-regex
 const emailReg = /(?:[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-zA-Z0-9-]*[a-zA-Z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/g;
 
 function checkField(key, val, options, idx, body) {
@@ -56,7 +57,8 @@ function checkBody({ body = {}, arr = [], idx }) {
                 acc.push(check);
                 return acc;
             }, []);
-            acc1 = acc1.concat(result);
+            // acc1.push(result);
+            acc1.push(...result);
             return acc1;
         }
 

package/server/plugins/grpc/grpc.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-promise-executor-return */
 /* eslint-disable no-console */
 
 import path from 'node:path';
@@ -108,6 +109,7 @@ const wrapGrpcCall = (methodName) => async (data) => new Promise((res, rej) => {
 
     return res(response);
   });
+  return null;
 });
 
 const grpcMethods = methodNames.reduce((acc, name) => {

package/server/plugins/grpc/office2pdf.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-promise-executor-return */
 /* eslint-disable no-console */
 import path from 'node:path';
 import { fileURLToPath } from 'url';
@@ -77,8 +78,9 @@ const officeToPdf = async (data) => new Promise((res, rej) => {
       }
       return rej(err);
     }
-    res(data1);
+    return res(data1);
   });
+  return null;
 });
 
 const getOffice = () => ({

package/server/plugins/md/funcs/formatMdoc.js

@@ -1,4 +1,5 @@
-function handleData(data, curr, acc, titles = {}, plain, splittype = 1) {
+/* eslint-disable no-param-reassign */
+function handleData(data, curr, acc, titles, plain, splittype = 1) {
     const titleStr = {
         1: `${(titles?.[curr] || curr)}\n`, // for lists
         2: `${(titles?.[curr] || curr)}: `, // one-liner
@@ -8,8 +9,8 @@ function handleData(data, curr, acc, titles = {}, plain, splittype = 1) {
     if (Array.isArray(data[curr])) {
         const str = `${plain ? '' : '\n\n### '}${titleStr}${data[curr].map(el => {
             if (typeof el === 'object' && !Array.isArray(el)) {
-                const str = Object.keys(el).filter(el => el !== 'id').reduce((acc1, curr1) => handleData(el, curr1, acc1, {}, 1, 3), '');
-                return `\n - ${str}`;
+                const str1 = Object.keys(el).filter(item => item !== 'id').reduce((acc1, curr1) => handleData(el, curr1, acc1, {}, 1, 3), '');
+                return `\n - ${str1}`;
             }
             return `\n - ${el}`;
         })}`;

package/server/plugins/migration/exec.migrations.js

@@ -5,7 +5,6 @@ import { readdirSync, existsSync } from 'node:fs';
 import config from '../../../config.js';
 import execSql from './exec.sql.js';
 import pgClients from '../pg/pgClients.js';
-// import getCallerDir from './get.caller.dir.js';
 
 const time = Date.now();
 const debug = config.debug || config.local;

package/server/plugins/migration/exec.sql.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import path from 'node:path';
 import { createHash } from 'node:crypto';
 import { existsSync, readFileSync } from 'node:fs';

package/server/plugins/policy/index.js

@@ -3,9 +3,8 @@ import checkPolicy from './funcs/checkPolicy.js';
 async function plugin(fastify) {
   fastify.addHook('preParsing', async (request, reply) => {
     const resp = checkPolicy(request, reply);
-    if (resp) {
-      return resp;
-    }
+    if (resp) { return resp; }
+    return null;
   });
 }
 

package/server/plugins/policy/sqlInjection.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-script-url */
 const sqlInjection = [
   '()',
   '^',

package/server/plugins/policy/xssInjection.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-script-url */
 const xssInjection = [
   'onkeypress=',
   'onkeyup=',

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

@@ -49,7 +49,7 @@ export default async function getFilterSQL({
   if (body?.table && !checkInline[body?.table] && body?.sql?.length) {
     const filterSql = body.sql.filter(el => !el?.disabled && (el.inline ?? true));
     const sqlTable = filterSql.map((el, i) => ` left join lateral (${el.sql}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
-    const d = await Promise.all(filterSql.map((el, i) => pg.query(`select  ${el.name || `t${i}`}.* from(select * from ${body.table})t ${sqlTable} limit 0`).then(el => el.fields)));
+    const d = await Promise.all(filterSql.map((el, i) => pg.query(`select  ${el.name || `t${i}`}.* from(select * from ${body.table})t ${sqlTable} limit 0`).then(item => item.fields)));
     d.forEach((el, i) => {
       filterSql[i].inline = el.length === 1;
       filterSql[i].fields = el.map(f => f.name);
@@ -97,7 +97,7 @@ export default async function getFilterSQL({
       .concat(filterResponse?.list || [])
       ?.filter(el => el.id || el.name)
       ?.map(async (el) => {
-        el.name = el.name || el.id;
+        Object.assign(el, { name: el.name || el.id });
 
         if (el.name && extraColumns.find(item => item?.name === el?.name)) {
           Object.assign(el, { extra: { table: extraDataTable, input: extraColumns.find(item => item?.name === el?.name)?.type } });

package/server/plugins/table/funcs/getFilterSQL/util/getRangeQuery.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-restricted-globals */
 const dateTypeList = ['date', 'timestamp', 'timestamp without time zone', 'timestamp with time zone'];
 const numberTypeList = ['float8', 'int4', 'int8', 'numeric', 'double precision', 'integer', 'bigint'];
 
@@ -136,14 +137,14 @@ export default function getRangeQuery(value, name, fieldType, filterType, sql, e
     // default
     if (max === 'max') {
         return ['date', 'datepicker'].includes(filterType)
-            ? `${name} > '${min}'::date`
-            : `${name} > ${min}`;
+            ? `${name} >= '${min}'::date`
+            : `${name} >= ${min}`;
     }
 
     if (min === 'min') {
         return ['date', 'datepicker'].includes(filterType)
-            ? `${name} < '${max}'::date`
-            : `${name} < ${max}`;
+            ? `${name} <= '${max}'::date`
+            : `${name} <= ${max}`;
     }
 
     if (['date', 'datepicker'].includes(filterType)) {

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

@@ -16,7 +16,7 @@ export default async function getSelect(name, pg = pgClients.client) {
   const clsDataGIT = await getTemplate(['cls', 'select'], name);
   const { type } = !clsDataGIT && pg.pk?.['admin.user_cls'] ? await pg.query('select type from admin.user_cls where parent is null and name=$1 union all select type from admin.cls where parent is null and name=$1 limit 1', [name]).then(el => el.rows?.[0] || {}) : {};
   const q = !clsDataGIT && type && ['sql', 'json'].includes(type) ? sqls[type] : undefined;
-  const clsDataDB = q ? await pg.query(q, [name]).then(el => el.rows?.find(el => el?.data)?.data) : undefined;
+  const clsDataDB = q ? await pg.query(q, [name]).then(el => el.rows?.find(item => item?.data)?.data) : undefined;
   const clsData = clsDataGIT || clsDataDB;
   if (!clsData) return null;
 

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

@@ -1,5 +1,5 @@
-export default function flattenObject(obj = {}, keys, parent = '') {
-    return Object.keys(obj).reduce((acc, key) => {
+export default function flattenObject(obj, keys, parent = '') {
+    return Object.keys(obj || {}).reduce((acc, key) => {
         const newKey = parent ? `${parent}.${key}` : key;
         if (typeof obj[key] === 'object' && obj[key] !== null && !Array.isArray(obj[key])) {
             Object.assign(acc, flattenObject(obj[key], keys, newKey));

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

@@ -1,3 +1,5 @@
+/* eslint-disable no-console */
+/* eslint-disable no-restricted-globals */
 /* eslint-disable no-param-reassign */
 // import config from '../../../../config.js';
 
@@ -12,7 +14,7 @@ export default function unflattenObject(flatObj) {
                         nestedObj[part] = JSON.parse(flatObj[key]);
                     }
                     catch (err) {
-                        if (false) console.error(`Error parsing JSON for key ${key}:`, err);
+                        console.warn(`Error parsing JSON for key ${key}:`, err.toString());
                         nestedObj[part] = flatObj[key]; // fallback to original value if parsing fails
                     }
                 }
@@ -21,7 +23,7 @@ export default function unflattenObject(flatObj) {
                         nestedObj[part] = JSON.parse(flatObj[key]);
                     }
                     catch (err) {
-                        if (false) console.error(`Error parsing JSON for key ${key}:`, err);
+                        console.warn(`Error parsing JSON for key ${key}:`, err.toString());
                         nestedObj[part] = flatObj[key]; // fallback to original value if parsing fails
                     }
                 }

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

@@ -65,11 +65,6 @@ export default async function update(req, reply) {
     Object.keys(body || {}).filter(key => !Object.keys(schema || {}).includes(key)).forEach(key => delete body[key]);
   }
 
-  if (tokenData?.obj) {
-    const objData = tokenData.obj?.split('#').reduce((p, el) => ({ ...p, [el.split('=')[0]]: el.split('=')[1] }), {}) || {};
-    Object.assign(body, objData);
-  }
-
   const xssCheck = checkXSS({ body, schema });
 
   if (xssCheck.error && formData?.xssCheck !== false) {
@@ -89,6 +84,11 @@ export default async function update(req, reply) {
     return reply.status(409).send('Дані не пройшли валідацію. Приберіть некоректні дані та спробуйте ще раз');
   }
 
+  if (tokenData?.obj) {
+    const objData = tokenData.obj?.split('#').reduce((p, el) => ({ ...p, [el.split('=')[0]]: el.split('=')[1] }), {}) || {};
+    Object.assign(body, objData);
+  }
+
   const res = await dataUpdate({
     pg,
     table: loadTemplate?.table || table,

package/server/routes/file/controllers/resize.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import path from 'node:path';
 import { imageSize } from 'image-size';
 

package/server/routes/logger/controllers/logger.test.api.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-unreachable */
 import { rename } from 'fs/promises';
 
 export default async function testLog(request) {

package/server/routes/table/controllers/filter.js

@@ -105,10 +105,10 @@ export default async function filterAPI(req, reply, iscalled) {
     });
   }
 
-  const sqlList = loadTable?.sql
+  /* const sqlList = loadTable?.sql
     ?.filter((el) => !el.disabled && el?.sql?.replace)
     ?.map((el, i) => ` left join lateral (${el.filter ? el.sql.replace(/limit 1/ig, '') : el.sql}) as ${el.name || `t${i + 1}`} on 1=1 `)
-    ?.join(' ') || '';
+    ?.join(' ') || ''; */
 
   // percentile_cont - alternative
   await Promise.all(filters.filter((el) => el.name && el.type === 'Range' && fields?.find?.((item) => item?.name === el.name)).map(async (el) => {
@@ -119,7 +119,7 @@ export default async function filterAPI(req, reply, iscalled) {
         percentile_disc(0.5) within group (order by ${el.name}),
         percentile_disc(0.75) within group (order by ${el.name}),
         max(${el.name})
-    ] as range from ${table} ${sqlList && false ? ` t ${sqlList}` : ''} where ${tableQuery || '1=1'}`,
+    ] as range from ${table} where ${tableQuery || '1=1'}`,
       { table },
     ).then(res => {
       if (res.timeout) {

package/server/routes/table/functions/getData.js

@@ -227,11 +227,13 @@ export default async function dataAPI(req, reply, called) {
 
   if (uid && rows.length && !config.security?.disableToken && (editable || actions.includes('edit') || actions.includes('del'))) {
     rows.forEach(row => {
-      row.token = setToken({
-        ids: [JSON.stringify({ id: row.id, table: tokenData?.table || hookData?.table || params.table, form: loadTable?.form })],
-        uid,
-        array: 1,
-      })?.[0];
+      Object.assign(row, {
+        token: setToken({
+          ids: [JSON.stringify({ id: row.id, table: tokenData?.table || hookData?.table || params.table, form: loadTable?.form })],
+          uid,
+          array: 1,
+        })?.[0],
+      });
     });
   }
 
@@ -308,7 +310,7 @@ export default async function dataAPI(req, reply, called) {
 
     // conditions
     panels?.filter(el => el.items).forEach(el => {
-      el.items = el.items?.filter(item => conditions(item.conditions, rows[0]));
+      Object.assign(el, { items: el.items?.filter(item => conditions(item.conditions, rows[0])) });
     });
 
     // title, count

package/server/plugins/migration/get.caller.dir.js

@@ -1,26 +0,0 @@
-import path from 'node:path';
-
-export default function getCallerDir() {
-  const originalFunc = Error.prepareStackTrace;
-
-  let callerfile;
-  try {
-    const err = new Error();
-    // let currentfile;
-
-    Error.prepareStackTrace = function (err, stack) { return stack; };
-
-    const currentfile = err.stack.shift().getFileName();
-
-    while (err.stack.length) {
-      callerfile = err.stack.shift().getFileName();
-
-      if (currentfile !== callerfile) break;
-    }
-  }
-  catch (err) { }
-
-  Error.prepareStackTrace = originalFunc;
-
-  return path.dirname(callerfile);
-}