@opengis/fastify-table 1.4.5 → 1.4.7

package/README.md

@@ -1,87 +1,87 @@
-# fastify-table
-
-<!-- ![alt text](https://cdn.softpro.ua/data/npm/admin/opengis-admin.png) -->
-
-[![NPM version](https://img.shields.io/npm/v/@opengis/fastify-table?style=plain)](https://www.npmjs.com/package/@opengis/fastify-table)
-[![NPM last update](https://img.shields.io/npm/last-update/@opengis/fastify-table?style=plain)]()
-[![NPM downloads](https://img.shields.io/npm/dw/@opengis/fastify-table?style=plain)]()
-[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=plain)](http://standardjs.com/)
-
-This is a backend toolkit for database management and more.
-
-### Why fastify-table?
-
-- **Logger** - Monitoring user activity and system status.
-- **Redis cache** - Optimizes web page rendering for lightning-fast performance.
-- **Secure** - Ensures protection against XSS attacks in queries.
-- **SQL Migration** - Automatically adds all necessary tables to your project's database.
-
-
-### Features 
-
-- CRUD
-- cron
-- Logger
-- Redis
-- pg
-
----
-
-### 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/fastify-table/).
-
----
-
-### Technology stack
-
-<a href="https://fastify.dev/" target="_blank">
-<img src="https://img.shields.io/badge/Fastify-323330?style=for-the-badge&logo=fastify" /></a>
-
-<a href="https://www.postgresql.org/" target="_blank">
-<img src="https://img.shields.io/badge/PostgreSQL-323330?style=for-the-badge&logo=postgresql&logoColor=white" /></a>
-
-<a href="https://redis.io/" target="_blank">
-<img src="https://img.shields.io/badge/redis-323330.svg?&style=for-the-badge&logo=redis&logoColor=" /></a>
-
-<a href="https://www.npmjs.com/package/pino" target="_blank">
-<img src="https://img.shields.io/badge/pino-323330.svg?&style=for-the-badge&logo=pino&logoColor=" /></a>
-
----
-
-### Contribute
-
-Feel free to contact us through our website [SOFTPRO.UA](https://softpro.ua) or email <info@softpro.ua>
-
-- Report bugs
-- Share your ideas
-- Ask questions
-
-### Follow Us
-
-[Official site](https://softpro.ua)
-
-<p>
-  <a href="https://www.instagram.com/gissoftpro/" target="_blank"><img src="https://cdn.softpro.ua/data/npm/instagram.png" alt="Softpro Instagram" title="oftpro Instagram"></a>&nbsp;&nbsp;
-  <a href="https://www.facebook.com/gissoftpro" target="_blank"><img src="https://cdn.softpro.ua/data/npm/facebook.png" alt="Softpro Facebook" title="Softpro Facebook"></a>&nbsp;&nbsp;
-  <a href="https://t.me/softprogis" target="_blank"><img src="https://cdn.softpro.ua/data/npm/telegram.png" alt="Softpro Telegram" title="Softpro Telegram"></a>&nbsp;&nbsp;
-  <a href="https://www.linkedin.com/in/softpro-ukraine-a8876b282/recent-activity/all/" target="_blank"><img src="https://cdn.softpro.ua/data/npm/social/linkedin.png" alt="Softpro Linkedin" title="Softpro LinkedIn"></a>&nbsp;&nbsp;
-</p>
-
-### License
-
+# fastify-table
+
+<!-- ![alt text](https://cdn.softpro.ua/data/npm/admin/opengis-admin.png) -->
+
+[![NPM version](https://img.shields.io/npm/v/@opengis/fastify-table?style=plain)](https://www.npmjs.com/package/@opengis/fastify-table)
+[![NPM last update](https://img.shields.io/npm/last-update/@opengis/fastify-table?style=plain)]()
+[![NPM downloads](https://img.shields.io/npm/dw/@opengis/fastify-table?style=plain)]()
+[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=plain)](http://standardjs.com/)
+
+This is a backend toolkit for database management and more.
+
+### Why fastify-table?
+
+- **Logger** - Monitoring user activity and system status.
+- **Redis cache** - Optimizes web page rendering for lightning-fast performance.
+- **Secure** - Ensures protection against XSS attacks in queries.
+- **SQL Migration** - Automatically adds all necessary tables to your project's database.
+
+
+### Features 
+
+- CRUD
+- cron
+- Logger
+- Redis
+- pg
+
+---
+
+### 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/fastify-table/).
+
+---
+
+### Technology stack
+
+<a href="https://fastify.dev/" target="_blank">
+<img src="https://img.shields.io/badge/Fastify-323330?style=for-the-badge&logo=fastify" /></a>
+
+<a href="https://www.postgresql.org/" target="_blank">
+<img src="https://img.shields.io/badge/PostgreSQL-323330?style=for-the-badge&logo=postgresql&logoColor=white" /></a>
+
+<a href="https://redis.io/" target="_blank">
+<img src="https://img.shields.io/badge/redis-323330.svg?&style=for-the-badge&logo=redis&logoColor=" /></a>
+
+<a href="https://www.npmjs.com/package/pino" target="_blank">
+<img src="https://img.shields.io/badge/pino-323330.svg?&style=for-the-badge&logo=pino&logoColor=" /></a>
+
+---
+
+### Contribute
+
+Feel free to contact us through our website [SOFTPRO.UA](https://softpro.ua) or email <info@softpro.ua>
+
+- Report bugs
+- Share your ideas
+- Ask questions
+
+### Follow Us
+
+[Official site](https://softpro.ua)
+
+<p>
+  <a href="https://www.instagram.com/gissoftpro/" target="_blank"><img src="https://cdn.softpro.ua/data/npm/instagram.png" alt="Softpro Instagram" title="oftpro Instagram"></a>&nbsp;&nbsp;
+  <a href="https://www.facebook.com/gissoftpro" target="_blank"><img src="https://cdn.softpro.ua/data/npm/facebook.png" alt="Softpro Facebook" title="Softpro Facebook"></a>&nbsp;&nbsp;
+  <a href="https://t.me/softprogis" target="_blank"><img src="https://cdn.softpro.ua/data/npm/telegram.png" alt="Softpro Telegram" title="Softpro Telegram"></a>&nbsp;&nbsp;
+  <a href="https://www.linkedin.com/in/softpro-ukraine-a8876b282/recent-activity/all/" target="_blank"><img src="https://cdn.softpro.ua/data/npm/social/linkedin.png" alt="Softpro Linkedin" title="Softpro LinkedIn"></a>&nbsp;&nbsp;
+</p>
+
+### License
+
 Copyright © SOFTPRO. All rights reserved.

package/config.js

@@ -1,11 +1,33 @@
-import fs from 'fs';
+import dotenv from 'dotenv';
 
-const fileName = ['config.json', '/data/local/config.json'].find(el => (fs.existsSync(el) ? el : null));
-const config = fileName ? JSON.parse(fs.readFileSync(fileName)) : {};
+import { existsSync, readFileSync } from 'node:fs';
 
+import unflattenObject from './server/plugins/util/funcs/unflattenObject.js';
+
+const fileName = ['config.json', '/data/local/config.json'].find(el => (existsSync(el) ? el : null));
+const config = fileName ? JSON.parse(readFileSync(fileName)) : {};
+
+// npm run dev === cross-env NODE_ENV=development
+// alt: node --env=development
 Object.assign(config, {
   allTemplates: config?.allTemplates || {},
   skipCheckPolicyRoutes: [],
+  env: process.env?.NODE_ENV || process.argv[2]?.split?.('=')?.pop?.(),
 });
 
+if (config.env && existsSync(`.env.${config.env}`)) {
+  const { parsed } = dotenv.config({ path: `.env.${config.env}` });
+  console.log('start with env:', config.env);
+
+  const obj = unflattenObject(parsed);
+
+  Object.keys(obj)
+    .filter(key => typeof obj[key] === 'string'
+      && (obj[key].startsWith('[') || ['true', 'false'].includes(obj[key]))) // json array / boolean
+    .forEach(key => {
+      obj[key] = JSON.parse(obj[key]);
+    });
+  Object.assign(config, { ...obj });
+}
+
 export default config;

package/index.js

@@ -113,5 +113,6 @@ async function plugin(fastify, opt) {
   templatesRoutes(fastify, opt);
 
   fastify.get('/api/test-proxy', {}, (req) => ({ ...req.headers || {}, sessionId: req.session?.sessionId }));
+  fastify.get('/api/config', { config: { policy: ['admin', 'site'] } }, () => config);
 }
 export default fp(plugin);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.4.5",
+  "version": "1.4.7",
   "type": "module",
   "description": "core-plugins",
   "keywords": [
@@ -25,10 +25,12 @@
     "test:helpers": "node --test .\\test\\helpers",
     "test:routes": "node --test .\\test\\routes",
     "test:functions": "node --test .\\test\\functions",
-    "compress": "node compress.js"
+    "compress": "node compress.js",
+    "dev": "cross-env NODE_ENV=development node server.js"
   },
   "dependencies": {
     "@fastify/http-proxy": "11.1.2",
+    "dotenv": "16.5.0",
     "fastify": "5.3.3",
     "fastify-plugin": "5.0.1",
     "handlebars": "4.7.8",
@@ -43,9 +45,10 @@
     "uglify-js": "3.19.3"
   },
   "devDependencies": {
+    "cross-env": "7.0.3",
     "eslint": "8.49.0",
     "eslint-config-airbnb": "19.0.4"
   },
   "author": "Softpro",
   "license": "ISC"
-}
+}

package/server/helpers/format/formatAuto.js

@@ -1,13 +1,13 @@
-import formatDate from './formatDate.js'
-
-export default function formatAuto(data, options = {}) {
-  const format = options.hash?.format || 'text';
-  const auto = { true: 'так', false: 'ні' };
-  if (auto[data]) return auto[data];
-  if (['date'].includes(format)) {
-    return formatDate(data, options);
-  }
-
-  if (typeof data === 'object') { return null; }
-  return data;
-};
+import formatDate from './formatDate.js'
+
+export default function formatAuto(data, options = {}) {
+  const format = options.hash?.format || 'text';
+  const auto = { true: 'так', false: 'ні' };
+  if (auto[data]) return auto[data];
+  if (['date'].includes(format)) {
+    return formatDate(data, options);
+  }
+
+  if (typeof data === 'object') { return null; }
+  return data;
+};