@opengis/fastify-table 1.4.49 → 1.4.51

package/server/plugins/yml/funcs/yml2json.js

@@ -1,13 +1,14 @@
-import { load } from "js-yaml";
+import { load } from 'js-yaml';
 
 function loadSafe(yml) {
     try {
         return load(yml);
-    } catch (err) {
+    }
+ catch (err) {
         return { error: err.toString() };
     }
-};
+}
 
 const yml2json = (yml) => loadSafe(yml);
 
-export default yml2json;
+export default yml2json;

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

@@ -1,5 +1,5 @@
 import {
-  pgClients, applyHook, getAccess, getTemplate, checkXSS, dataInsert, dataUpdate, logger, getToken, validateData,
+  pgClients, applyHook, getAccess, getTemplate, checkXSS, dataUpdate, logger, getToken, validateData,
 } from '../../../../utils.js';
 import config from '../../../../config.js';
 import insert from './insert.js';

package/server/routes/dblist/index.mjs

@@ -3,7 +3,7 @@ import setItem from './controllers/setItem.js';
 
 const policy = ['site'];
 
-export default async function plugin(app, config = {}) {
+export default async function plugin(app) {
   app.route({
     method: 'GET',
     url: '/db-list',

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

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 /* eslint-disable no-param-reassign */
 /* eslint-disable no-plusplus */
 /* eslint-disable no-await-in-loop */

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/file/controllers/resizeAll.js

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

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/logger/controllers/utils/getRootDir.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import fs from 'node:fs';
 import path from 'node:path';
 

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

@@ -1,9 +1,10 @@
 import { readFileSync } from 'node:fs';
 
 import getMeta from '../../../plugins/pg/funcs/getMeta.js';
-import metaFormat from "../../../plugins/table/funcs/metaFormat/index.js";
-import getTemplatePath from "../../../plugins/table/funcs/getTemplatePath.js";
-import yml2json from "../../../plugins/yml/funcs/yml2json.js";
+import pgClients from '../../../plugins/pg/pgClients.js';
+import metaFormat from '../../../plugins/table/funcs/metaFormat/index.js';
+import getTemplatePath from '../../../plugins/table/funcs/getTemplatePath.js';
+import yml2json from '../../../plugins/yml/funcs/yml2json.js';
 
 const infoList = [];
 
@@ -14,7 +15,7 @@ infoTemplateList?.forEach?.(el => {
 });
 
 export default async function dataInfo({
-  pg = pgClients.client, params = {}, query = {}, user = {},
+  pg = pgClients.client, params = {}, query = {},
 }, reply) {
   const timeStart = Date.now();
   const { id } = params;
@@ -31,18 +32,19 @@ export default async function dataInfo({
   }
 
   const result = await Promise.all(filteredList.filter(el => el.table && pg.pk?.[el.table]).map(async (el) => {
-    const { table, cls } = el;
-    const { rowCount = 0, rows = [] } = await pg.query(`select ${pg.pk?.[el.table]} as id, ${el.columns?.map?.(el => el?.replace?.(/'/g, "''")) || '*'} from ${table} where ${el.query || 'true'} and ${pg.pk?.[table]}=$1`, [id]);
+    const { rowCount = 0, rows = [] } = await pg.query(`select ${pg.pk?.[el.table]} as id, ${el.columns?.map?.(item => item?.replace?.(/'/g, "''")) || '*'} from ${el.table} where ${el.query || 'true'} and ${pg.pk?.[el.table]}=$1`, [id]);
     if (rowCount > 0) {
-      const meta = await getMeta({ pg, table });
+      const meta = await getMeta({ pg, table: el.table });
       const columns = meta?.columns?.filter(item => el.columns?.includes?.(item.name))?.map?.(({ name, title, dataTypeID }) => ({ name, title, type: pg.pgType[dataTypeID] }));
-      return { table, columns, rows, cls, sufix: false };
+      return {
+        table: el.table, columns, rows, cls: el.cls, sufix: false,
+      };
     }
     return null;
   }));
 
   if (!result[0]?.table) {
-    return reply.status(404).send('object not found: ' + id);
+    return reply.status(404).send(`object not found: ${id}`);
   }
 
   await metaFormat(result[0], pg);

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

@@ -1,6 +1,4 @@
-/* import {
-  logger, autoIndex, getSelect, getTemplate, getSelectVal, pgClients, applyHook,
-} from '../../../../utils.js'; */
+/* eslint-disable no-console */
 
 import logger from '../../../plugins/logger/getLogger.js';
 import autoIndex from '../../../plugins/pg/funcs/autoIndex.js';
@@ -107,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) => {
@@ -121,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/controllers/tableInfo.js

@@ -59,7 +59,7 @@ export default async function tableInfo(req, reply) {
     const interfaceQuery = params?.query ? await handlebars.compile(params?.query)({ user, uid }) : undefined;
     const where = [params.id ? `"${pk}" = $1` : null, loadTable.query, interfaceQuery].filter((el) => el).filter((el) => (user?.user_type === 'superadmin' ? !el.includes('{{uid}}') : true));
 
-    const { fields = [] } = await pg.query(`select * from ${table} where ${sqlTable ? 'true' : (where.join(' and ') || 'true')} limit 0`, ([sqlTable ? null : params.id].filter(el => el)) );
+    const { fields = [] } = await pg.query(`select * from ${table} where ${sqlTable ? 'true' : (where.join(' and ') || 'true')} limit 0`, ([sqlTable ? null : params.id].filter(el => el)));
     const columnList = fields.map(el => el.name);
 
     const metaInfoCols = meta.info.split(',').filter(el => columnList.includes(el)).map((el) => `"${el}"`);

package/server/routes/table/controllers/utils/conditions.js

@@ -11,11 +11,11 @@ function onCheck(rule, data) {
 
     if (rule[1] === '>') return val > rule[2];
     if (rule[1] === '<') return val < rule[2];
+    return null;
 }
 export default function conditions(rules, data) {
     if (!rules?.length) return true;
-    const result = Array.isArray(rules[0]) ? !rules.filter(el => !onCheck(el, data)).length : onCheck(rules, data)
+    const result = Array.isArray(rules[0]) ? !rules.filter(el => !onCheck(el, data)).length : onCheck(rules, data);
     // console.log(rules, result)
     return result;
-
-}
+}

package/server/routes/table/controllers/utils/locales.js

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

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

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import config from '../../../../config.js';
 import { handlebars, handlebarsSync } from '../../../helpers/index.js';
 
@@ -226,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],
+      });
     });
   }
 
@@ -307,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/routes/util/controllers/status.monitor.js

@@ -1,4 +1,4 @@
-const formatMemoryUsage = (data) => `${Math.round(data / 1024 / 1024 * 100) / 100} MB`;
+const formatMemoryUsage = (data) => `${Math.round((data / 1024 / 1024) * 100) / 100} MB`;
 
 export default async function statusMonitor() {
   const memoryUsage = process.memoryUsage();

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);
-}