@opengis/fastify-table 1.4.50 → 1.4.51

package/package.json

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

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

@@ -56,6 +56,7 @@ function checkBody({ body = {}, arr = [], idx }) {
                 acc.push(check);
                 return acc;
             }, []);
+            // acc1.push(result);
             acc1 = acc1.concat(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';

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';

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/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

@@ -136,14 +136,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

@@ -12,7 +12,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 +21,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/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);
-}