@opengis/fastify-table 1.1.55 → 1.1.57

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,10 +1,10 @@
-import fs from 'fs';
-
-const fileName = ['config.json', '/data/local/config.json'].find(el => (fs.existsSync(el) ? el : null));
-const config = fileName ? JSON.parse(fs.readFileSync(fileName)) : {};
-
-Object.assign(config, {
-  allTemplates: config?.allTemplates || {},
-});
-
-export default config;
+import fs from 'fs';
+
+const fileName = ['config.json', '/data/local/config.json'].find(el => (fs.existsSync(el) ? el : null));
+const config = fileName ? JSON.parse(fs.readFileSync(fileName)) : {};
+
+Object.assign(config, {
+  allTemplates: config?.allTemplates || {},
+});
+
+export default config;

package/index.js

@@ -7,20 +7,27 @@ import fp from 'fastify-plugin';
 import config from './config.js';
 // import rclient from './redis/client.js';
 
-import redisPlugin from './redis/index.js';
-import pgPlugin from './pg/index.js';
-import tablePlugin from './table/index.js';
-import notificationPlugin from './notification/index.js';
-import widgetPlugin from './widget/index.js';
-import crudPlugin from './crud/index.js';
-import policyPlugin from './policy/index.js';
-import utilPlugin from './util/index.js';
-import cronPlugin from './cron/index.js';
-import userPlugin from './user/index.js';
+// plugins
+import cronPlugin from './server/plugins/cron/index.js';
+import crudPlugin from './server/plugins/crud/index.js';
+// hook, logger, migration - utils only
+import pgPlugin from './server/plugins/pg/index.js';
+import policyPlugin from './server/plugins/policy/index.js';
+import redisPlugin from './server/plugins/redis/index.js';
+import tablePlugin from './server/plugins/table/index.js';
+import utilPlugin from './server/plugins/util/index.js';
+
+// routes
+import cronRoutes from './server/routes/cron/index.js';
+import crudRoutes from './server/routes/crud/index.js';
+import loggerRoutes from './server/routes/logger/index.js';
+import propertiesRoutes from './server/routes/properties/index.js';
+import tableRoutes from './server/routes/table/index.js';
+import utilRoutes from './server/routes/util/index.js';
 
 // import pgClients from './pg/pgClients.js';
 
-import { addTemplateDir, execMigrations, logger } from './utils.js';
+import { addTemplateDir, execMigrations } from './utils.js';
 
 async function plugin(fastify, opt) {
   // console.log(opt);
@@ -85,16 +92,22 @@ async function plugin(fastify, opt) {
     // fastify.decorateRequest('funcs', fastify);
   }
 
+  // plugins / utils / funcs
   policyPlugin(fastify);
   redisPlugin(fastify);
   await pgPlugin(fastify, opt);
   tablePlugin(fastify, opt);
   crudPlugin(fastify, opt);
-  notificationPlugin(fastify, opt);
-  widgetPlugin(fastify, opt);
   utilPlugin(fastify, opt);
   cronPlugin(fastify, opt);
-  userPlugin(fastify, opt);
+
+  // routes / api
+  cronRoutes(fastify, opt);
+  crudRoutes(fastify, opt);
+  loggerRoutes(fastify, opt);
+  propertiesRoutes(fastify, opt);
+  tableRoutes(fastify, opt);
+  utilRoutes(fastify, opt);
 
   // core templates && cls
   const filename = fileURLToPath(import.meta.url);

package/package.json

@@ -1,9 +1,15 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.1.55",
+  "version": "1.1.57",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",
+  "files": [
+    "server/*",
+    "index.js",
+    "utils.js",
+    "config.js"
+  ],
   "scripts": {
     "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
     "test": "node --test",
@@ -14,15 +20,13 @@
   "dependencies": {
     "@fastify/sensible": "^5.0.0",
     "@fastify/url-data": "^5.4.0",
-    "@opengis/fastify-hb": "^1.4.2",
-    "@opengis/fastify-table": "^1.1.47",
+    "@opengis/fastify-hb": "^1.4.4",
     "fastify": "^4.26.1",
     "fastify-plugin": "^4.0.0",
     "ioredis": "^5.3.2",
     "nodemailer": "^6.5.0",
     "pg": "^8.11.3",
-    "pino-abstract-transport": "^2.0.0",
-    "rotating-file-stream": "^3.2.3"
+    "pino-abstract-transport": "^2.0.0"
   },
   "devDependencies": {
     "@panzoom/panzoom": "^4.5.1",
@@ -39,4 +43,4 @@
   },
   "author": "Softpro",
   "license": "ISC"
-}
+}

package/server/migrations/log.sql

@@ -1,81 +1,81 @@
-create schema if not exists log;
-
--- DROP TABLE IF EXISTS log.table_changes cascade;
-CREATE TABLE IF NOT EXISTS log.table_changes();
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS change_id text NOT NULL DEFAULT next_id();
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS change_type text;
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS change_date date;
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS change_user_id text;
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS entity_type text; -- table_name
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS entity_id text; -- object_id
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS uid text;
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT (now())::timestamp without time zone;
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS editor_id text;
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
-
--- DROP TABLE IF EXISTS log.table_changes_data;
-CREATE TABLE IF NOT EXISTS log.table_changes_data();
-ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS change_data_id text NOT NULL DEFAULT next_id();
-ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS change_id text not null;
-ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS entity_key text; -- column_name
-ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS value_old text;
-ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS value_new text;
-ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS uid text;
-ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT (now())::timestamp without time zone;
-ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS editor_id text;
-ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
-
--- DROP TABLE IF EXISTS log.user_auth;
-CREATE TABLE IF NOT EXISTS log.user_auth();
-ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS user_auth_id text NOT NULL DEFAULT next_id();
-ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS user_id text;
-ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS auth_date timestamp without time zone;
-ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS auth_type text;
-ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS uid text;
-ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT (now())::timestamp without time zone;
-ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS editor_id text;
-ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
-
-COMMENT ON TABLE log.table_changes IS 'Логи подій змін в БД';
-COMMENT ON COLUMN log.table_changes.change_type IS 'Тип події (insert / update / delete)';
-COMMENT ON COLUMN log.table_changes.change_date IS 'Дата внесення змін до БД';
-COMMENT ON COLUMN log.table_changes.entity_type IS 'Таблиця, до якої вносяться зміни';
-COMMENT ON COLUMN log.table_changes.entity_id IS 'ID строки, до якої вносяться зміни';
-COMMENT ON COLUMN log.table_changes.change_user_id IS 'Ініціатор внесення змін';
-
-COMMENT ON TABLE log.table_changes_data IS 'Логи змін в таблицях БД';
-COMMENT ON COLUMN log.table_changes_data.change_id IS 'ID події зміни в БД';
-COMMENT ON COLUMN log.table_changes_data.entity_key IS 'Колонка таблиці, до якої вносяться зміни';
-COMMENT ON COLUMN log.table_changes_data.value_old IS 'Старе значення';
-COMMENT ON COLUMN log.table_changes_data.value_new IS 'Нове значення';
-
-COMMENT ON TABLE log.user_auth IS 'Логи авторизації';
-COMMENT ON COLUMN log.user_auth.user_id IS 'ID користувача';
-COMMENT ON COLUMN log.user_auth.auth_date IS 'Дата авторизації';
-COMMENT ON COLUMN log.user_auth.auth_type IS 'Тип авторизації';
-
-ALTER TABLE log.table_changes DROP CONSTRAINT IF EXISTS log_table_changes_pkey cascade;
-ALTER TABLE log.table_changes_data DROP CONSTRAINT IF EXISTS log_table_changes_data_pkey;
-ALTER TABLE log.table_changes_data DROP CONSTRAINT IF EXISTS log_table_changes_data_change_id_fkey;
-ALTER TABLE log.user_auth DROP CONSTRAINT IF EXISTS log_user_auth_pkey;
-ALTER TABLE log.user_auth DROP CONSTRAINT IF EXISTS log_user_auth_user_id_fkey;
-
-ALTER TABLE log.table_changes ADD CONSTRAINT log_table_changes_pkey PRIMARY KEY (change_id);
-ALTER TABLE log.table_changes_data ADD CONSTRAINT log_table_changes_data_pkey PRIMARY KEY (change_data_id);
-ALTER TABLE log.table_changes_data ADD CONSTRAINT log_table_changes_data_change_id_fkey FOREIGN KEY (change_id)
-REFERENCES log.table_changes (change_id);
-ALTER TABLE log.user_auth ADD CONSTRAINT log_user_auth_pkey PRIMARY KEY (user_auth_id);
--- ALTER TABLE log.user_auth ADD CONSTRAINT log_user_auth_user_id_fkey FOREIGN KEY (user_id) REFERENCES admin.users (uid) MATCH SIMPLE;
-
-/* drop old columns */
-alter table log.table_changes drop column if exists date_new;
-alter table log.table_changes drop column if exists date_old;
-alter table log.table_changes drop column if exists number_new;
-alter table log.table_changes drop column if exists number_old;
-alter table log.table_changes drop column if exists json_new;
-alter table log.table_changes drop column if exists json_old;
-alter table log.table_changes drop column if exists text_new;
-alter table log.table_changes drop column if exists text_old;
-alter table log.table_changes drop column if exists bool_new;
-alter table log.table_changes drop column if exists bool_old;
+create schema if not exists log;
+
+-- DROP TABLE IF EXISTS log.table_changes cascade;
+CREATE TABLE IF NOT EXISTS log.table_changes();
+ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS change_id text NOT NULL DEFAULT next_id();
+ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS change_type text;
+ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS change_date date;
+ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS change_user_id text;
+ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS entity_type text; -- table_name
+ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS entity_id text; -- object_id
+ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS uid text;
+ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT (now())::timestamp without time zone;
+ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+
+-- DROP TABLE IF EXISTS log.table_changes_data;
+CREATE TABLE IF NOT EXISTS log.table_changes_data();
+ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS change_data_id text NOT NULL DEFAULT next_id();
+ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS change_id text not null;
+ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS entity_key text; -- column_name
+ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS value_old text;
+ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS value_new text;
+ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS uid text;
+ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT (now())::timestamp without time zone;
+ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+
+-- DROP TABLE IF EXISTS log.user_auth;
+CREATE TABLE IF NOT EXISTS log.user_auth();
+ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS user_auth_id text NOT NULL DEFAULT next_id();
+ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS user_id text;
+ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS auth_date timestamp without time zone;
+ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS auth_type text;
+ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS uid text;
+ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT (now())::timestamp without time zone;
+ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+
+COMMENT ON TABLE log.table_changes IS 'Логи подій змін в БД';
+COMMENT ON COLUMN log.table_changes.change_type IS 'Тип події (insert / update / delete)';
+COMMENT ON COLUMN log.table_changes.change_date IS 'Дата внесення змін до БД';
+COMMENT ON COLUMN log.table_changes.entity_type IS 'Таблиця, до якої вносяться зміни';
+COMMENT ON COLUMN log.table_changes.entity_id IS 'ID строки, до якої вносяться зміни';
+COMMENT ON COLUMN log.table_changes.change_user_id IS 'Ініціатор внесення змін';
+
+COMMENT ON TABLE log.table_changes_data IS 'Логи змін в таблицях БД';
+COMMENT ON COLUMN log.table_changes_data.change_id IS 'ID події зміни в БД';
+COMMENT ON COLUMN log.table_changes_data.entity_key IS 'Колонка таблиці, до якої вносяться зміни';
+COMMENT ON COLUMN log.table_changes_data.value_old IS 'Старе значення';
+COMMENT ON COLUMN log.table_changes_data.value_new IS 'Нове значення';
+
+COMMENT ON TABLE log.user_auth IS 'Логи авторизації';
+COMMENT ON COLUMN log.user_auth.user_id IS 'ID користувача';
+COMMENT ON COLUMN log.user_auth.auth_date IS 'Дата авторизації';
+COMMENT ON COLUMN log.user_auth.auth_type IS 'Тип авторизації';
+
+ALTER TABLE log.table_changes DROP CONSTRAINT IF EXISTS log_table_changes_pkey cascade;
+ALTER TABLE log.table_changes_data DROP CONSTRAINT IF EXISTS log_table_changes_data_pkey;
+ALTER TABLE log.table_changes_data DROP CONSTRAINT IF EXISTS log_table_changes_data_change_id_fkey;
+ALTER TABLE log.user_auth DROP CONSTRAINT IF EXISTS log_user_auth_pkey;
+ALTER TABLE log.user_auth DROP CONSTRAINT IF EXISTS log_user_auth_user_id_fkey;
+
+ALTER TABLE log.table_changes ADD CONSTRAINT log_table_changes_pkey PRIMARY KEY (change_id);
+ALTER TABLE log.table_changes_data ADD CONSTRAINT log_table_changes_data_pkey PRIMARY KEY (change_data_id);
+ALTER TABLE log.table_changes_data ADD CONSTRAINT log_table_changes_data_change_id_fkey FOREIGN KEY (change_id)
+REFERENCES log.table_changes (change_id);
+ALTER TABLE log.user_auth ADD CONSTRAINT log_user_auth_pkey PRIMARY KEY (user_auth_id);
+-- ALTER TABLE log.user_auth ADD CONSTRAINT log_user_auth_user_id_fkey FOREIGN KEY (user_id) REFERENCES admin.users (uid) MATCH SIMPLE;
+
+/* drop old columns */
+alter table log.table_changes drop column if exists date_new;
+alter table log.table_changes drop column if exists date_old;
+alter table log.table_changes drop column if exists number_new;
+alter table log.table_changes drop column if exists number_old;
+alter table log.table_changes drop column if exists json_new;
+alter table log.table_changes drop column if exists json_old;
+alter table log.table_changes drop column if exists text_new;
+alter table log.table_changes drop column if exists text_old;
+alter table log.table_changes drop column if exists bool_new;
+alter table log.table_changes drop column if exists bool_old;
 alter table log.table_changes drop column if exists table_change_id;

package/{cron → server/plugins/cron}/funcs/addCron.js

@@ -1,9 +1,10 @@
 import { createHash } from 'crypto';
 
-import cronList from '../controllers/utils/cronList.js';
+import config from '../../../../config.js';
 import getRedis from '../../redis/funcs/getRedis.js';
 import getPG from '../../pg/funcs/getPG.js';
-import config from '../../config.js';
+import logger from '../../logger/getLogger.js';
+import cronList from '../cronList.js';
 
 const md5 = (string) => createHash('md5').update(string).digest('hex');
 
@@ -58,21 +59,21 @@ const interval2ms = {
 };
 
 async function runCron({
-  pg, funcs, func, name, rclient, log,
+  pg, func, name, rclient,
 }) {
   const unique = await verifyUnique(name, rclient);
 
   if (!unique) return;
   const db = pg.options.database;
-  log.debug(`cron.${name}`, 1, db);
+  logger.debug(`cron.${name}`, 1, db);
   try {
-    const data = await func({ pg, funcs, log });
-    log.debug('cron', { db, name, result: data });
-    log.info('cron', { db, name, result: data });
+    const data = await func({ pg });
+    logger.debug('cron', { db, name, result: data });
+    logger.info('cron', { db, name, result: data });
   }
   catch (err) {
-    log.debug('cron', { db, name, error: err.toString() });
-    log.error('cron', { db, name, error: err.toString() });
+    logger.debug('cron', { db, name, error: err.toString() });
+    logger.error('cron', { db, name, error: err.toString() });
   }
 }
 
@@ -88,12 +89,7 @@ async function runCron({
  * - 10 * 60 - every 10 minutes
  */
 
-export default async function addCron(func, interval, fastify) {
-  if (!fastify) {
-    throw new Error('not enough params: fastify');
-  }
-
-  const { log } = fastify;
+export default async function addCron(func, interval) {
   const { time = {}, disabled = [] } = config.cron || {};
   const pg = getPG();
   const rclient = getRedis();
@@ -103,7 +99,7 @@ export default async function addCron(func, interval, fastify) {
   // if (!config.isServer) return;
 
   if (disabled.includes(name)) {
-    log.debug('cron', { name, message: 'cron disabled' });
+    logger.debug('cron', { name, message: 'cron disabled' });
     return;
   }
 
@@ -113,19 +109,19 @@ export default async function addCron(func, interval, fastify) {
   const [waitMs, intervalMs] = interval2ms[typeof interval](userInterval);
 
   if (intervalMs < 1000) {
-    log.warn('cron', { name, error: `interval ${interval} to small` });
+    logger.warn('cron', { name, error: `interval ${interval} to small` });
     return;
   }
 
   // setTimeout to w8 for the time to start
   setTimeout(() => {
     runCron({
-      pg, funcs: fastify, func, name, rclient, log,
+      pg, func, name, rclient, logger,
     });
     // interval
     setInterval(() => {
       runCron({
-        pg, funcs: fastify, func, name, rclient, log,
+        pg, func, name, rclient, logger,
       });
     }, intervalMs);
   }, waitMs);

package/server/plugins/cron/index.js

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

package/{crud → server/plugins/crud}/funcs/dataDelete.js

@@ -1,6 +1,8 @@
 import getPG from '../../pg/funcs/getPG.js';
-
 import getMeta from '../../pg/funcs/getMeta.js';
+
+// import { getPG, getMeta } from '../../../../utils.js';
+
 import logChanges from './utils/logChanges.js';
 
 export default async function dataDelete({

package/{crud → server/plugins/crud}/funcs/dataInsert.js

@@ -1,5 +1,8 @@
 import getPG from '../../pg/funcs/getPG.js';
 import getMeta from '../../pg/funcs/getMeta.js';
+
+// import { getPG, getMeta } from '../../../../utils.js';
+
 import logChanges from './utils/logChanges.js';
 
 export default async function dataInsert({

package/{crud → server/plugins/crud}/funcs/dataUpdate.js

@@ -1,6 +1,8 @@
 import getPG from '../../pg/funcs/getPG.js';
-
 import getMeta from '../../pg/funcs/getMeta.js';
+
+// import { getPG, getMeta } from '../../../../utils.js';
+
 import logChanges from './utils/logChanges.js';
 
 const srids = {};

package/{crud → server/plugins/crud}/funcs/getAccess.js

@@ -1,9 +1,11 @@
-// import getMeta from '../../pg/funcs/getMeta.js';
-import getTemplate from '../../table/controllers/utils/getTemplate.js';
-import config from '../../config.js';
+import config from '../../../../config.js';
 import pgClients from '../../pg/pgClients.js';
+
+import getTemplate from '../../table/funcs/getTemplate.js';
 import applyHook from '../../hook/funcs/applyHook.js';
 
+// import { config, pgClients, getTemplate, applyHook } from '../../../../utils.js';
+
 const q = `select a.route_id as id, coalesce(b.actions,array['get']) as actions, b.scope 
 from admin.routes a 
 left join admin.access b on 

package/{crud → server/plugins/crud}/funcs/getOpt.js

@@ -1,5 +1,7 @@
 import getRedis from '../../redis/funcs/getRedis.js';
 
+// import { getRedis } from '../../../../utils.js';
+
 export default async function getOpt(token, funcs) {
   const rclient = getRedis({ db: 0, funcs });
 

package/{crud → server/plugins/crud}/funcs/getToken.js

@@ -1,27 +1,30 @@
-import getRedis from '../../redis/funcs/getRedis.js';
-import config from '../../config.js';
-
-function sprintf(str, ...args) {
-  return str.replace(/%s/g, () => args.shift());
-}
-
-const keys = {
-  r: '%s:token:view:%s',
-  a: '%s:token:add:%s',
-  w: '%s:token:edit:%s',
-  e: '%s:token:exec:%s',
-};
-
-async function getToken({
-  uid, token, mode = 'r', json,
-}) {
-  if (mode === 'r') return token;
-
-  const rclient = getRedis({ db: 0 });
-
-  const key = sprintf(keys[mode], config?.pg?.database, uid?.toString());
-  const id = await rclient.hget(key, token);
-  return json && id?.[0] === '{' ? JSON.parse(id) : id;
-}
-
-export default getToken;
+import config from '../../../../config.js';
+
+import getRedis from '../../redis/funcs/getRedis.js';
+
+// import { config, getRedis } from '../../../../utils.js';
+
+function sprintf(str, ...args) {
+  return str.replace(/%s/g, () => args.shift());
+}
+
+const keys = {
+  r: '%s:token:view:%s',
+  a: '%s:token:add:%s',
+  w: '%s:token:edit:%s',
+  e: '%s:token:exec:%s',
+};
+
+async function getToken({
+  uid, token, mode = 'r', json,
+}) {
+  if (mode === 'r') return token;
+
+  const rclient = getRedis({ db: 0 });
+
+  const key = sprintf(keys[mode], config?.pg?.database, uid?.toString());
+  const id = await rclient.hget(key, token);
+  return json && id?.[0] === '{' ? JSON.parse(id) : id;
+}
+
+export default getToken;

package/{crud → server/plugins/crud}/funcs/isFileExists.js

@@ -1,13 +1,13 @@
-import { access } from 'fs/promises';
-
-const isFileExists = async (filepath) => {
-  try {
-    await access(filepath);
-    return true;
-  }
-  catch (err) {
-    return false;
-  }
-};
-
-export default isFileExists;
+import { access } from 'fs/promises';
+
+const isFileExists = async (filepath) => {
+  try {
+    await access(filepath);
+    return true;
+  }
+  catch (err) {
+    return false;
+  }
+};
+
+export default isFileExists;

package/{crud → server/plugins/crud}/funcs/setOpt.js

@@ -1,6 +1,9 @@
 import { createHash } from 'crypto';
+
 import getRedis from '../../redis/funcs/getRedis.js';
 
+// import { getRedis } from '../../../../utils.js';
+
 function md5(string) {
   return createHash('md5').update(string).digest('hex');
 }

package/{crud → server/plugins/crud}/funcs/setToken.js

@@ -1,8 +1,11 @@
 import { createHash, randomUUID } from 'crypto';
 
-import config from '../../config.js';
+import config from '../../../../config.js';
+
 import getRedis from '../../redis/funcs/getRedis.js';
 
+// import { config, getRedis } from '../../../../utils.js';
+
 const generateCodes = (ids, userToken) => {
   const token = userToken || randomUUID();
   const notNullIds = ids.filter((el) => el);

package/{crud → server/plugins/crud}/funcs/utils/getFolder.js

@@ -1,5 +1,6 @@
 import path from 'node:path';
-import config from '../../../config.js';
+
+import config from '../../../../../config.js';
 
 export default function getFolder(req, type = 'server') {
   if (!['server', 'local'].includes(type)) throw new Error('params type is invalid');

package/{crud → server/plugins/crud}/funcs/utils/logChanges.js

@@ -38,12 +38,12 @@ export default async function logChanges({
       const filterData = Object.entries({
         change_id: changeId, entity_key: el, value_old: old[el], value_new: data[el], uid,
       })
-        .filter((el) => el[1] && names.includes(el[0]));
+        .filter((el1) => el1[1] && names.includes(el1[0]));
 
       const insertQuery = `insert into log.table_changes_data (${filterData?.map((key) => `"${key[0]}"`).join(',')}) 
       values (${filterData?.map((key, i) => `$${i + 1}`).join(',')}) returning *`;
 
-      const { rows = [] } = await pg.query(insertQuery, [...filterData.map((el) => (el[1] && typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]))]) || {};
+      const { rows = [] } = await pg.query(insertQuery, [...filterData.map((el1) => (el1[1] && typeof el1[1] === 'object' && (!Array.isArray(el1[1]) || typeof el1[1]?.[0] === 'object') ? JSON.stringify(el1[1]) : el1[1]))]) || {};
       return rows[0];
     }));