@opengis/fastify-table 1.1.9 → 1.1.11

package/crud/funcs/utils/logChanges.js

@@ -1,76 +1,76 @@
-function formatData(fieldType = 'text', value = null) {
-  if (!value) return null;
-  if (fieldType === 'geometry') {
-    return typeof value === 'object' ? `st_astext(st_geomfromgeojson('${JSON.stringify(value)}'::json))` : `st_astext('${value}'::geometry)`;
-  }
-  if (['integer', 'numeric', 'double precision'].includes(fieldType)) {
-    return value || null;
-  }
-  if (fieldType.includes('timestamp') || fieldType === 'date') {
-    if (typeof value === 'object') {
-      return value ? `'${value.toISOString()}'::${fieldType}` : null;
-    }
-    return value ? `'${value}'::${fieldType}` : null;
-  }
-  if (typeof value === 'object' || fieldType.includes('json')) {
-    if (Array.isArray(value)) {
-      return `'${JSON.stringify(value)}'`;
-    }
-    return `'${JSON.stringify(value)}'`;
-  }
-  if (Array.isArray(value)) {
-    return `'{ ${value.join(',')} }'::${fieldType}`;
-  }
-  return `'${value || null}'`;
-}
-
-export default async function logChanges({
-  pg, table, id, data, uid = 1, type,
-}) {
-  if (!id) {
-    console.error('param id is required');
-    return null;
-  }
-  if (!table || !pg.pk?.[table]) {
-    console.error('table not found');
-    return null;
-  }
-  if (!pg.pk?.['log.table_changes'] || !pg.pk?.['log.table_changes_data']) {
-    console.error('log table not found');
-    return null;
-  }
-  if (!type) {
-    console.error('invalid type');
-    return null;
-  }
-
-  try {
-    const { change_id: changeId } = await pg.query(`insert into log.table_changes(change_date,change_type,change_user_id,entity_type,entity_id) 
-    values(CURRENT_DATE, $1, $2, $3, $4) returning change_id`, [type, uid, table, id]).then((res) => res.rows?.[0] || {});
-
-    const { fields = [] } = await pg.query(`select * from ${table} limit 0`);
-    const columnList = fields.map((el) => el?.name);
-    const q = `select ${Object.keys(data || {}).filter((el) => columnList.includes(el)).join(',') || '*'} from ${table} where ${pg.pk?.[table]}=$1`;
-    // console.log(q, type, id);
-
-    const old = type !== 'INSERT' ? await pg.query(q, [id]).then((res) => res.rows?.[0] || {}) : {};
-
-    const fieldTypes = fields?.reduce((acc, curr) => Object.assign(acc, { [curr.name]: pg.pgType[curr.dataTypeID] }), {}) || {};
-    const q1 = Object.keys(data || {}).map((el) => `insert into log.table_changes_data(change_id,entity_key,value_old,value_new) 
-      values('${changeId}', '${el}', ${formatData(fieldTypes[el], old[el])}, ${formatData(fieldTypes[el], data[el])}) returning *`).join(';\n');
-    // console.log(q1);
-    const res = await pg.query(q1);
-
-    const newData = type === 'DELETE' ? {} : (Array.isArray(res) ? res : [res]).reduce((acc, curr) => Object.assign(acc, { [curr.rows?.[0].entity_key]: curr.rows?.[0].value_new }), {});
-    // console.log('logChanges OK', type);
-    return {
-      change_id: changeId, entity_type: table, entity_id: id, uid, change_type: type, old, new: newData,
-    };
-  }
-  catch (err) {
-    console.error('logChanges error', type, table, id, data, err.toString());
-    return {
-      error: err.toString(), entity_type: table, entity_id: id, uid, change_type: type,
-    };
-  }
-}
+function formatData(fieldType = 'text', value = null) {
+  if (!value) return null;
+  if (fieldType === 'geometry') {
+    return typeof value === 'object' ? `st_astext(st_geomfromgeojson('${JSON.stringify(value)}'::json))` : `st_astext('${value}'::geometry)`;
+  }
+  if (['integer', 'numeric', 'double precision'].includes(fieldType)) {
+    return value || null;
+  }
+  if (fieldType.includes('timestamp') || fieldType === 'date') {
+    if (typeof value === 'object') {
+      return value ? `'${value.toISOString()}'::${fieldType}` : null;
+    }
+    return value ? `'${value}'::${fieldType}` : null;
+  }
+  if (typeof value === 'object' || fieldType.includes('json')) {
+    if (Array.isArray(value)) {
+      return `'${JSON.stringify(value)}'`;
+    }
+    return `'${JSON.stringify(value)}'`;
+  }
+  if (Array.isArray(value)) {
+    return `'{ ${value.join(',')} }'::${fieldType}`;
+  }
+  return `'${value || null}'`;
+}
+
+export default async function logChanges({
+  pg, table, id, data, uid = 1, type,
+}) {
+  if (!id) {
+    console.error('param id is required');
+    return null;
+  }
+  if (!table || !pg.pk?.[table]) {
+    console.error('table not found');
+    return null;
+  }
+  if (!pg.pk?.['log.table_changes'] || !pg.pk?.['log.table_changes_data']) {
+    console.error('log table not found');
+    return null;
+  }
+  if (!type) {
+    console.error('invalid type');
+    return null;
+  }
+
+  try {
+    const { change_id: changeId } = await pg.query(`insert into log.table_changes(change_date,change_type,change_user_id,entity_type,entity_id) 
+    values(CURRENT_DATE, $1, $2, $3, $4) returning change_id`, [type, uid, table, id]).then((res) => res.rows?.[0] || {});
+
+    const { fields = [] } = await pg.query(`select * from ${table} limit 0`);
+    const columnList = fields.map((el) => el?.name);
+    const q = `select ${Object.keys(data || {}).filter((el) => columnList.includes(el)).join(',') || '*'} from ${table} where ${pg.pk?.[table]}=$1`;
+    // console.log(q, type, id);
+
+    const old = type !== 'INSERT' ? await pg.query(q, [id]).then((res) => res.rows?.[0] || {}) : {};
+
+    const fieldTypes = fields?.reduce((acc, curr) => Object.assign(acc, { [curr.name]: pg.pgType[curr.dataTypeID] }), {}) || {};
+    const q1 = Object.keys(data || {}).map((el) => `insert into log.table_changes_data(change_id,entity_key,value_old,value_new) 
+      values('${changeId}', '${el}', ${formatData(fieldTypes[el], old[el])}, ${formatData(fieldTypes[el], data[el])}) returning *`).join(';\n');
+    // console.log(q1);
+    const res = await pg.query(q1);
+
+    const newData = type === 'DELETE' ? {} : (Array.isArray(res) ? res : [res]).reduce((acc, curr) => Object.assign(acc, { [curr.rows?.[0].entity_key]: curr.rows?.[0].value_new }), {});
+    // console.log('logChanges OK', type);
+    return {
+      change_id: changeId, entity_type: table, entity_id: id, uid, change_type: type, old, new: newData,
+    };
+  }
+  catch (err) {
+    console.error('logChanges error', type, table, id, data, err.toString());
+    return {
+      error: err.toString(), entity_type: table, entity_id: id, uid, change_type: type,
+    };
+  }
+}

package/crud/index.js

@@ -1,36 +1,36 @@
-import getOpt from './funcs/getOpt.js';
-import setOpt from './funcs/setOpt.js';
-import isFileExists from './funcs/isFileExists.js';
-import dataUpdate from './funcs/dataUpdate.js';
-import dataInsert from './funcs/dataInsert.js';
-
-import update from './controllers/update.js';
-import insert from './controllers/insert.js';
-import deleteCrud from './controllers/deleteCrud.js';
-import getAccessFunc from './funcs/getAccess.js';
-
-const tableSchema = {
-  params: {
-    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    table: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
-  },
-};
-
-async function plugin(fastify, config = {}) {
-  const prefix = config.prefix || '/api';
-  // funcs
-  fastify.decorate('setOpt', setOpt);
-  fastify.decorate('getOpt', getOpt);
-  fastify.decorate('dataUpdate', dataUpdate);
-  fastify.decorate('dataInsert', dataInsert);
-  fastify.decorate('getAccess', getAccessFunc);
-
-  fastify.decorate('isFileExists', isFileExists);
-
-  // api
-  fastify.put(`${prefix}/table/:table/:id`, { schema: tableSchema }, update);
-  fastify.delete(`${prefix}/table/:table/:id`, { schema: tableSchema }, deleteCrud);
-  fastify.post(`${prefix}/table/:table`, { schema: tableSchema }, insert);
-}
-
-export default plugin;
+import getOpt from './funcs/getOpt.js';
+import setOpt from './funcs/setOpt.js';
+import isFileExists from './funcs/isFileExists.js';
+import dataUpdate from './funcs/dataUpdate.js';
+import dataInsert from './funcs/dataInsert.js';
+
+import update from './controllers/update.js';
+import insert from './controllers/insert.js';
+import deleteCrud from './controllers/deleteCrud.js';
+import getAccessFunc from './funcs/getAccess.js';
+
+const tableSchema = {
+  params: {
+    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    table: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
+  },
+};
+
+async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
+  // funcs
+  fastify.decorate('setOpt', setOpt);
+  fastify.decorate('getOpt', getOpt);
+  fastify.decorate('dataUpdate', dataUpdate);
+  fastify.decorate('dataInsert', dataInsert);
+  fastify.decorate('getAccess', getAccessFunc);
+
+  fastify.decorate('isFileExists', isFileExists);
+
+  // api
+  fastify.put(`${prefix}/table/:table/:id`, { schema: tableSchema }, update);
+  fastify.delete(`${prefix}/table/:table/:id`, { schema: tableSchema }, deleteCrud);
+  fastify.post(`${prefix}/table/:table`, { schema: tableSchema }, insert);
+}
+
+export default plugin;

package/helper.js

@@ -1,28 +1,28 @@
-// This file contains code that we reuse
-// between our tests.
-import Fastify from 'fastify';
-import config from './test/config.js';
-import appService from './index.js';
-
-import rclient from './redis/client.js';
-import pgClients from './pg/pgClients.js';
-
-// automatically build and tear down our instance
-async function build(t) {
-  // you can set all the options supported by the fastify CLI command
-  // const argv = [AppPath]
-  process.env.NODE_ENV = 'production';
-  const app = Fastify({ logger: false });
-  app.register(appService, config);
-  // close the app after we are done
-  t.after(() => {
-    // console.log('close app');
-    pgClients.client.end();
-    rclient.quit();
-    app.close();
-  });
-
-  return app;
-}
-
-export default build;
+// This file contains code that we reuse
+// between our tests.
+import Fastify from 'fastify';
+import config from './test/config.js';
+import appService from './index.js';
+
+import rclient from './redis/client.js';
+import pgClients from './pg/pgClients.js';
+
+// automatically build and tear down our instance
+async function build(t) {
+  // you can set all the options supported by the fastify CLI command
+  // const argv = [AppPath]
+  process.env.NODE_ENV = 'production';
+  const app = Fastify({ logger: false });
+  app.register(appService, config);
+  // close the app after we are done
+  t.after(() => {
+    // console.log('close app');
+    pgClients.client.end();
+    rclient.quit();
+    app.close();
+  });
+
+  return app;
+}
+
+export default build;

package/index.js

@@ -1,97 +1,97 @@
-import path from 'path';
-import { existsSync, readdirSync, readFileSync } 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 utilPlugin from './util/index.js';
-import cronPlugin from './cron/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('@fastify/sensible'), {
-    errorHandler: false,
-  });
-
-  fastify.register(import('@fastify/url-data'), {
-    errorHandler: false,
-  });
-
-  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 || config.root, server: req.mapServerRoot || config.mapServerRoot };
-    const filepath = path.posix.join(types[type] || `/data/local/${req.pg?.options?.database || ''}`, 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) ? readdirSync(clsDir) : [];
-      if (files.length) {
-        const res = await Promise.all(files.map(async (filename) => {
-          const filepath = path.join(clsDir, filename);
-          const data = JSON.parse(readFileSync(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);
-  utilPlugin(fastify, opt);
-  cronPlugin(fastify, opt);
-}
-export default fp(plugin);
-// export { rclient };
+import path from 'path';
+import { existsSync, readdirSync, readFileSync } 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 utilPlugin from './util/index.js';
+import cronPlugin from './cron/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('@fastify/sensible'), {
+    errorHandler: false,
+  });
+
+  fastify.register(import('@fastify/url-data'), {
+    errorHandler: false,
+  });
+
+  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 || config.root, server: req.mapServerRoot || config.mapServerRoot };
+    const filepath = path.posix.join(types[type] || `/data/local/${req.pg?.options?.database || ''}`, 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) ? readdirSync(clsDir) : [];
+      if (files.length) {
+        const res = await Promise.all(files.map(async (filename) => {
+          const filepath = path.join(clsDir, filename);
+          const data = JSON.parse(readFileSync(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);
+  utilPlugin(fastify, opt);
+  cronPlugin(fastify, opt);
+}
+export default fp(plugin);
+// export { rclient };

package/migration/exec.migrations.js

@@ -1,79 +1,79 @@
-import fs from 'fs';
-import path from 'path';
-
-const time = Date.now();
-
-import getPG from '../pg/funcs/getPG.js';
-
-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);
-}
-
-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);
-  }
-}
-
-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);
-  }
-}
+import fs from 'fs';
+import path from 'path';
+
+const time = Date.now();
+
+import getPG from '../pg/funcs/getPG.js';
+
+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);
+}
+
+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);
+  }
+}
+
+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);
+  }
+}