@opengis/fastify-table 1.0.51 → 1.0.53

package/Changelog.md

@@ -1,5 +1,13 @@
 # fastify-table
 
+## 1.0.53 - 28.06.2024
+
+- add migrations support
+
+## 1.0.52 - 28.06.2024
+
+- add table get api
+
 ## 1.0.51 - 27.06.2024
 
 - add next-id api

package/index.js

@@ -16,6 +16,8 @@ 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;
@@ -56,6 +58,10 @@ async function plugin(fastify, opt) {
         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) => {

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:\/\/\//, ''), '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.51",
+  "version": "1.0.53",
   "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({
@@ -54,18 +54,6 @@ export default async function data(req) {
 
   const { rows } = await pg.query(q, (params.id ? [params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
 
-  const formData = form ? (await getTemplate('form', form) || {}) : {};
-  const extraKeys = Object.keys(formData)?.filter((key) => formData?.[key]?.type === 'DataTable' && formData?.[key]?.table && formData?.[key]?.parent_id && formData[key]?.colModel);
-  if (extraKeys?.length) {
-    await Promise.all(rows?.map(async (row) => {
-      await Promise.all(extraKeys?.map(async (key) => {
-        const { colModel, table: extraTable, parent_id: parentId } = formData[key];
-        const { rows: extraRows } = await pg.query(`select ${parentId} as parent, ${colModel.map((col) => col.name).join(',')} from ${extraTable} a where ${parentId}=$1`, [row.id]);
-        Object.assign(row, { [key]: extraRows });
-      }));
-    }));
-  }
-
   const total = keyQuery || params.id ? rows.length : await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count);
 
   await metaFormat({ rows, table: params.table });

package/table/controllers/table.js

@@ -0,0 +1,40 @@
+import getTemplate from './utils/getTemplate.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+
+export default async function table(req) {
+  const { pg, params = {}, query = {} } = req;
+  if (!params.id) return { message: 'not enough params', status: 400 };
+
+  const loadTable = await getTemplate('table', params.table);
+  if (!loadTable) { return { message: 'not found', status: 404 }; }
+
+  const { table, columns, form } = loadTable;
+
+  const { pk, columns: dbColumns = [] } = await getMeta(table);
+  if (!pk) return { message: `table not found: ${table}`, status: 404 };
+
+  const cols = columns.map((el) => el.name || el).join(',');
+  const columnList = dbColumns.map((el) => el.name || el).join(',');
+
+  const where = [`"${pk}" = $1`, loadTable.query].filter((el) => el);
+  const geom = columnList.includes('geom') ? `st_asgeojson(geom)::json as geom,` : '';
+  const q = `select "${pk}" as id, ${geom} ${cols || '*'} from ${table} t where ${where.join(' and ') || 'true'} limit 1`;
+
+  if (query.sql === '1') return q;
+
+  const { rows } = await pg.query(q, [params.id]);
+
+  const formData = form ? (await getTemplate('form', form) || {}) : {};
+  const extraKeys = Object.keys(formData)?.filter((key) => formData?.[key]?.type === 'DataTable' && formData?.[key]?.table && formData?.[key]?.parent_id && formData[key]?.colModel);
+  if (extraKeys?.length) {
+    await Promise.all(rows?.map(async (row) => {
+      await Promise.all(extraKeys?.map(async (key) => {
+        const { colModel, table: extraTable, parent_id: parentId } = formData[key];
+        const { rows: extraRows } = await pg.query(`select ${parentId} as parent, ${colModel.map((col) => col.name).join(',')} from ${extraTable} a where ${parentId}=$1`, [row.id]);
+        Object.assign(row, { [key]: extraRows });
+      }));
+    }));
+  }
+
+  return rows?.[0] || {};
+}

package/table/index.js

@@ -1,5 +1,6 @@
 import suggest from './controllers/suggest.js';
 import data from './controllers/data.js';
+import table from './controllers/table.js';
 import card from './controllers/card.js';
 import search from './controllers/search.js';
 import filter from './controllers/filter.js';
@@ -35,6 +36,7 @@ async function plugin(fastify, config = {}) {
 
   fastify.get(`${prefix}/suggest/:data`, {}, suggest);
   fastify.get(`${prefix}/data/:table/:id?`, { schema: tableSchema }, data); // vs.crm.data.api с node
+  fastify.get(`${prefix}/table/:table/:id`, { schema: tableSchema }, table);
   fastify.get(`${prefix}/card/:table/:id`, { schema: tableSchema }, card);
   fastify.get(`${prefix}/search`, { schema: searchTableSchema }, search);
   fastify.get(`${prefix}/filter/:table`, {}, filter);