@opengis/fastify-table 1.0.52 → 1.0.54

package/Changelog.md

@@ -1,5 +1,13 @@
 # fastify-table
 
+## 1.0.54 - 01.07.2024
+
+- code optimization
+
+## 1.0.53 - 28.06.2024
+
+- add migrations support
+
 ## 1.0.52 - 28.06.2024
 
 - add table get api

package/index.js

@@ -1,80 +1,86 @@
-import path from 'path';
-import { readdir, readFile } from 'fs/promises';
-import { existsSync } from 'fs';
-
-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 pgClients from './pg/pgClients.js';
-
-async function plugin(fastify, opt) {
-  // console.log(opt);
-  config.pg = opt.pg;
-  config.redis = opt.redis;
-  config.root = opt.root;
-  config.mapServerRoot = opt.mapServerRoot;
-
-  // independent npm start / unit test
-  if (!fastify.config) {
-    fastify.decorate('config', config);
-  }
-
-  fastify.register(import('@opengis/fastify-hb'));
-  fastify.decorate('getFolder', (req, type = 'server') => {
-    if (!['server', 'local'].includes(type)) throw new Error('params type is invalid');
-    const types = { local: req.root, server: req.mapServerRoot };
-    const filepath = path.posix.join(types[type] || '/data/local', req.folder || config.folder || '');
-    return filepath;
-  });
-
-  fastify.addHook('onListen', async () => {
-    const { client } = pgClients;
-    if (client?.pk?.['crm.cls']) {
-      const clsDir = path.join(process.cwd(), 'server/templates/cls');
-      const files = existsSync(clsDir) ? await readdir(clsDir) : [];
-      if (files.length) {
-        const res = await Promise.all(files.map(async (filename) => {
-          const filepath = path.join(clsDir, filename);
-          const data = JSON.parse(await readFile(filepath));
-          return { name: path.parse(filename).name, data };
-        }));
-        await client.query('truncate table crm.cls');
-        const { rows } = await client.query(`insert into crm.cls(name, type) 
-        select value->>'name', 'json' from json_array_elements($1) returning cls_id as id, name`, [JSON.stringify(res).replace(/'/g, "''")]);
-        rows.forEach((row) => Object.assign(row, { data: res.find((cls) => row.name === cls.name)?.data }));
-        const sql = `insert into crm.cls(code, name, parent)
-        select json_array_elements(value->'data')->>'id', json_array_elements(value->'data')->>'text', value->>'name' from json_array_elements($1)`;
-        await client.query(sql, [JSON.stringify(rows).replace(/'/g, "''")]);
-      }
-    }
-  });
-  if (!fastify.funcs) {
-    fastify.addHook('onRequest', async (req) => {
-      req.funcs = fastify;
-      if (!req.user && req.session?.passport?.user) {
-        const { user } = req.session?.passport || {};
-        req.user = user;
-      }
-    });
-    // fastify.decorateRequest('funcs', fastify);
-  }
-
-  policyPlugin(fastify);
-  redisPlugin(fastify);
-  await pgPlugin(fastify, opt);
-  tablePlugin(fastify, opt);
-  crudPlugin(fastify, opt);
-  notificationPlugin(fastify, opt);
-  widgetPlugin(fastify, opt);
-}
-export default fp(plugin);
-// export { rclient };
+import path from 'path';
+import { readdir, readFile } from 'fs/promises';
+import { existsSync } from 'fs';
+
+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 pgClients from './pg/pgClients.js';
+
+import execMigrations from './migration/exec.migrations.js';
+
+async function plugin(fastify, opt) {
+  // console.log(opt);
+  config.pg = opt.pg;
+  config.redis = opt.redis;
+  config.root = opt.root;
+  config.mapServerRoot = opt.mapServerRoot;
+
+  // independent npm start / unit test
+  if (!fastify.config) {
+    fastify.decorate('config', config);
+  }
+
+  fastify.register(import('@opengis/fastify-hb'));
+  fastify.decorate('getFolder', (req, type = 'server') => {
+    if (!['server', 'local'].includes(type)) throw new Error('params type is invalid');
+    const types = { local: req.root, server: req.mapServerRoot };
+    const filepath = path.posix.join(types[type] || '/data/local', req.folder || config.folder || '');
+    return filepath;
+  });
+
+  fastify.addHook('onListen', async () => {
+    const { client } = pgClients;
+    if (client?.pk?.['crm.cls']) {
+      const clsDir = path.join(process.cwd(), 'server/templates/cls');
+      const files = existsSync(clsDir) ? await readdir(clsDir) : [];
+      if (files.length) {
+        const res = await Promise.all(files.map(async (filename) => {
+          const filepath = path.join(clsDir, filename);
+          const data = JSON.parse(await readFile(filepath));
+          return { name: path.parse(filename).name, data };
+        }));
+        await client.query('truncate table crm.cls');
+        const { rows } = await client.query(`insert into crm.cls(name, type) 
+        select value->>'name', 'json' from json_array_elements($1) returning cls_id as id, name`, [JSON.stringify(res).replace(/'/g, "''")]);
+        rows.forEach((row) => Object.assign(row, { data: res.find((cls) => row.name === cls.name)?.data }));
+        const sql = `insert into crm.cls(code, name, parent)
+        select json_array_elements(value->'data')->>'id', json_array_elements(value->'data')->>'text', value->>'name' from json_array_elements($1)`;
+        await client.query(sql, [JSON.stringify(rows).replace(/'/g, "''")]);
+      }
+    }
+    // call from another repo / project
+    fastify.execMigrations = execMigrations;
+    // execute core migrations
+    await fastify.execMigrations();
+  });
+  if (!fastify.funcs) {
+    fastify.addHook('onRequest', async (req) => {
+      req.funcs = fastify;
+      if (!req.user && req.session?.passport?.user) {
+        const { user } = req.session?.passport || {};
+        req.user = user;
+      }
+    });
+    // fastify.decorateRequest('funcs', fastify);
+  }
+
+  policyPlugin(fastify);
+  redisPlugin(fastify);
+  await pgPlugin(fastify, opt);
+  tablePlugin(fastify, opt);
+  crudPlugin(fastify, opt);
+  notificationPlugin(fastify, opt);
+  widgetPlugin(fastify, opt);
+}
+export default fp(plugin);
+// export { rclient };

package/migration/exec.migrations.js

@@ -0,0 +1,76 @@
+import fs from 'fs';
+import path from 'path';
+
+const time = Date.now();
+
+import getPG from '../pg/funcs/getPG.js';
+
+export default async function execMigrations(opt) {
+    try {
+        const pg = opt?.pg || getPG({ name: 'client' });
+        const rootDir = getCallerDir();
+        const dir = path.join(rootDir.replace(/\\/g, '/').replace(/^file:\/\/\//, ''), rootDir.endsWith('plugins') ? '../..' : '', 'server/migrations');
+
+        console.log('migrations start', dir, Date.now() - time);
+        const exists = fs.existsSync(dir);
+        if (exists) {
+            // get directory sql file list
+            const content = fs.readdirSync(dir, { withFileTypes: true })
+                ?.filter((el) => el.isFile() && path.extname(el.name) === '.sql')
+                ?.map((el) => el.name) || [];
+
+            // execute sql files
+            if (content?.length) {
+                await sequence(content, { pg, dir }, execSql);
+            }
+        }
+        console.log('migrations finish', dir, exists, Date.now() - time);
+    } catch(err) {
+        console.error('migrations error', err.toString(), Date.now() - time);
+    }
+}
+
+function getCallerDir() {
+    const originalFunc = Error.prepareStackTrace;
+
+    let callerfile;
+    try {
+        const err = new Error();
+        let currentfile;
+
+        Error.prepareStackTrace = function (err, stack) { return stack; };
+
+        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);
+}
+
+function sequence(files, data, fn) {
+    return files.reduce((promise, filename) => promise.then(() => fn({
+      ...data, filename,
+    })), Promise.resolve());
+}
+
+async function execSql({
+    pg, dir, filename,
+}) {
+    const start = Date.now();
+    const filepath = path.join(dir, filename);
+    const sql = fs.readFileSync(filepath, 'utf-8');
+    try {
+        console.log(filename, 'start', Date.now() - start);
+        await pg.query(sql);
+        console.log(filename, 'finish', Date.now() - start);
+    } catch (err) {
+        console.log(filepath, 'error', err.toString(), Date.now() - start);
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.0.52",
+  "version": "1.0.54",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",

package/table/controllers/data.js

@@ -24,7 +24,7 @@ export default async function data(req) {
   const cols = columns.map((el) => el.name || el).join(',');
   const columnList = dbColumns.map((el) => el.name || el).join(',');
   const sqlTable = sql?.filter?.((el) => !el?.disabled && el?.sql?.replace).map((el, i) => ` left join lateral (${el.sql}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
-  const cardSqlFiltered = params.id ? cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) : [];
+  const cardSqlFiltered = params.id ? (cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) || []) : [];
   const cardSqlTable = cardSqlFiltered.length ? cardSqlFiltered.map((el, i) => ` left join lateral (select json_agg(row_to_json(q)) as ${el.name} from (${el.sql})q) ct${i}  on 1=1 `).join('') || '' : '';
 
   const fData = query.filter ? await getFilterSQL({