@opengis/fastify-table 1.1.90 → 1.1.91

package/server/plugins/crud/funcs/utils/logChanges.js

@@ -1,62 +1,62 @@
-import getMeta from '../../../pg/funcs/getMeta.js';
-
-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 { columns = [] } = await getMeta({ table: 'log.table_changes_data' });
-    const names = columns.map((el) => el.name);
-
-    const res = await Promise.all(Object.keys(data || {}).map(async (el) => {
-      const filterData = Object.entries({
-        change_id: changeId, entity_key: el, value_old: old[el], value_new: data[el], uid,
-      })
-        .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((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];
-    }));
-
-    const newData = type === 'DELETE' ? {} : (Array.isArray(res) ? res : [res]).reduce((acc, curr) => Object.assign(acc, { [curr.entity_key]: curr.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,
-    };
-  }
-}
+import getMeta from '../../../pg/funcs/getMeta.js';
+
+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 { columns = [] } = await getMeta({ table: 'log.table_changes_data' });
+    const names = columns.map((el) => el.name);
+
+    const res = await Promise.all(Object.keys(data || {}).map(async (el) => {
+      const filterData = Object.entries({
+        change_id: changeId, entity_key: el, value_old: old[el], value_new: data[el], uid,
+      })
+        .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((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];
+    }));
+
+    const newData = type === 'DELETE' ? {} : (Array.isArray(res) ? res : [res]).reduce((acc, curr) => Object.assign(acc, { [curr.entity_key]: curr.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/server/plugins/crud/index.js

@@ -1,23 +1,23 @@
-// 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 getAccessFunc from './funcs/getAccess.js';
-
-async function plugin(fastify) {
-  // fastify.decorate('setOpt', setOpt);
-  // fastify.decorate('getOpt', getOpt);
-
-  // fastify.decorate('dataUpdate', dataUpdate);
-  // fastify.decorate('dataInsert', dataInsert);
-
-  // fastify.decorate('getAccess', getAccessFunc);
-
-  // fastify.decorate('isFileExists', isFileExists);
-}
-
-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 getAccessFunc from './funcs/getAccess.js';
+
+async function plugin(fastify) {
+  // fastify.decorate('setOpt', setOpt);
+  // fastify.decorate('getOpt', getOpt);
+
+  // fastify.decorate('dataUpdate', dataUpdate);
+  // fastify.decorate('dataInsert', dataInsert);
+
+  // fastify.decorate('getAccess', getAccessFunc);
+
+  // fastify.decorate('isFileExists', isFileExists);
+}
+
+export default plugin;

package/server/plugins/hook/index.js

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

package/server/plugins/logger/errorStatus.js

@@ -1,19 +1,19 @@
-import applyHookSync from '../hook/funcs/applyHookSync.js';
-
-function errorStatus(error) {
-  const hook = applyHookSync('errorStatus', error);
-  if (hook) return hook;
-
-  if (error.routine === 'exec_stmt_raise' && error.file === 'pl_exec.c') {
-    return 601;
-  }
-  if (error.routine === 'ExecConstraints') {
-    return 602;
-  }
-  if (error.type === 'DatabaseError') {
-    return 600;
-  }
-
-  return 500;
-}
-export default errorStatus;
+import applyHookSync from '../hook/funcs/applyHookSync.js';
+
+function errorStatus(error) {
+  const hook = applyHookSync('errorStatus', error);
+  if (hook) return hook;
+
+  if (error.routine === 'exec_stmt_raise' && error.file === 'pl_exec.c') {
+    return 601;
+  }
+  if (error.routine === 'ExecConstraints') {
+    return 602;
+  }
+  if (error.type === 'DatabaseError') {
+    return 600;
+  }
+
+  return 500;
+}
+export default errorStatus;

package/server/plugins/logger/index.js

@@ -1,21 +1,21 @@
-import errorMessage from './errorMessage.js';
-
-async function plugin(fastify) {
-  fastify.setErrorHandler(async (error, request, reply) => {
-    // validation not error
-    if (error.validation) {
-      request.log.warn(request, { code: error?.code, status: 422, error: error.toString() });
-      return reply.status(422).send(error.toString());
-    }
-
-    // logger
-    request.log.error(error, request);
-    console.error({ msg: error.message, where: error.where, stack: error.stack });
-
-    // errorMessage
-    const msg = errorMessage(error);
-
-    return reply.status(error.statusCode || 500).send(msg);
-  });
-}
-export default plugin;
+import errorMessage from './errorMessage.js';
+
+async function plugin(fastify) {
+  fastify.setErrorHandler(async (error, request, reply) => {
+    // validation not error
+    if (error.validation) {
+      request.log.warn(request, { code: error?.code, status: 422, error: error.toString() });
+      return reply.status(422).send(error.toString());
+    }
+
+    // logger
+    request.log.error(error, request);
+    console.error({ msg: error.message, where: error.where, stack: error.stack });
+
+    // errorMessage
+    const msg = errorMessage(error);
+
+    return reply.status(error.statusCode || 500).send(msg);
+  });
+}
+export default plugin;

package/server/plugins/migration/funcs/exec.migrations.js

@@ -1,86 +1,86 @@
-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 subdir = () => {
-      if (rootDir.endsWith('plugins')) {
-        return '../..';
-      } if (path.basename(rootDir) === 'server') {
-        return '..';
-      }
-    };
-    const dir = path.join(rootDir.replace(/\\/g, '/').replace(/^file:\/\/\//, ''), subdir() || '', '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 subdir = () => {
+      if (rootDir.endsWith('plugins')) {
+        return '../..';
+      } if (path.basename(rootDir) === 'server') {
+        return '..';
+      }
+    };
+    const dir = path.join(rootDir.replace(/\\/g, '/').replace(/^file:\/\/\//, ''), subdir() || '', '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);
+  }
+}

package/server/plugins/migration/index.js

@@ -1,7 +1,7 @@
-import execMigrations from './funcs/exec.migrations.js';
-
-async function plugin(fastify) {
-//   fastify.decorate('execMigrations', execMigrations);
-}
-
-export default plugin;
+import execMigrations from './funcs/exec.migrations.js';
+
+async function plugin(fastify) {
+//   fastify.decorate('execMigrations', execMigrations);
+}
+
+export default plugin;

package/server/plugins/pg/funcs/getMeta.js

@@ -1,29 +1,29 @@
-import getPG from './getPG.js';
-
-const data = {};
-
-// decorator
-export default async function getMeta(opt) {
-  const pg = opt?.pg || getPG({ name: 'client' });
-  const table = opt?.table || opt;
-
-  if (data[table]) return data[table];
-
-  if (!pg.tlist?.includes(table)) {
-    return { error: `${table} - not found`, status: 400 };
-  }
-
-  const { fields } = await pg.query(`select * from ${table} where $1=$1 limit 0`, [1]);
-  const { pks1 } = await pg.query(`SELECT json_object_agg(c.conrelid::regclass, a.attname) as pks1 FROM pg_constraint c 
-    left join pg_attribute a on c.conrelid=a.attrelid and a.attnum = c.conkey[1] WHERE c.contype='p'::"char" and c.conrelid::regclass = $1::regclass`, [table]).then(el => el.rows[0]) || {};
-
-  const pk = table.startsWith('public.') ? pks1[table.replace('public.', '')] : pks1[table];
-
-  const geomAttr = fields.find((el) => pg.pgType[el.dataTypeID] === 'geometry')?.name; // change geometry text to geometry code
-
-  const res = {
-    pk, columns: fields, geom: geomAttr, view: pg.relkinds?.[table] === 'v',
-  };
-  data[table] = res;
-  return res;
-}
+import getPG from './getPG.js';
+
+const data = {};
+
+// decorator
+export default async function getMeta(opt) {
+  const pg = opt?.pg || getPG({ name: 'client' });
+  const table = opt?.table || opt;
+
+  if (data[table]) return data[table];
+
+  if (!pg.tlist?.includes(table)) {
+    return { error: `${table} - not found`, status: 400 };
+  }
+
+  const { fields } = await pg.query(`select * from ${table} where $1=$1 limit 0`, [1]);
+  const { pks1 } = await pg.query(`SELECT json_object_agg(c.conrelid::regclass, a.attname) as pks1 FROM pg_constraint c 
+    left join pg_attribute a on c.conrelid=a.attrelid and a.attnum = c.conkey[1] WHERE c.contype='p'::"char" and c.conrelid::regclass = $1::regclass`, [table]).then(el => el.rows[0]) || {};
+
+  const pk = table.startsWith('public.') ? pks1[table.replace('public.', '')] : pks1[table];
+
+  const geomAttr = fields.find((el) => pg.pgType[el.dataTypeID] === 'geometry')?.name; // change geometry text to geometry code
+
+  const res = {
+    pk, columns: fields, geom: geomAttr, view: pg.relkinds?.[table] === 'v',
+  };
+  data[table] = res;
+  return res;
+}

package/server/plugins/pg/funcs/getPG.js

@@ -1,33 +1,33 @@
-import pg from 'pg';
-
-const { types } = pg;
-types.setTypeParser(1082, (stringValue) => stringValue);
-
-import config from '../../../../config.js';
-import pgClients from '../pgClients.js';
-import init from './init.js';
-
-function getPG(param) {
-  const {
-    user, password, host, port, db, database, name: origin,
-  } = param || {};
-  const name = origin || db || database || param || 'client';
-  if (pgClients[name]) return pgClients[name];
-
-  const dbConfig = {
-    user: user || config.pg?.user,
-    password: password || config.pg?.password,
-    host: host || config.pg?.host,
-    port: port || config.pg?.port,
-    database: db || database || config.pg?.db || config.pg?.database,
-  };
-
-  pgClients[name] = new pg.Pool(dbConfig);
-  pgClients[name].init = async () => {
-    await init(pgClients[name]);
-  };
-  init(pgClients[name]);
-  return pgClients[name];
-}
-
-export default getPG;
+import pg from 'pg';
+
+const { types } = pg;
+types.setTypeParser(1082, (stringValue) => stringValue);
+
+import config from '../../../../config.js';
+import pgClients from '../pgClients.js';
+import init from './init.js';
+
+function getPG(param) {
+  const {
+    user, password, host, port, db, database, name: origin,
+  } = param || {};
+  const name = origin || db || database || param || 'client';
+  if (pgClients[name]) return pgClients[name];
+
+  const dbConfig = {
+    user: user || config.pg?.user,
+    password: password || config.pg?.password,
+    host: host || config.pg?.host,
+    port: port || config.pg?.port,
+    database: db || database || config.pg?.db || config.pg?.database,
+  };
+
+  pgClients[name] = new pg.Pool(dbConfig);
+  pgClients[name].init = async () => {
+    await init(pgClients[name]);
+  };
+  init(pgClients[name]);
+  return pgClients[name];
+}
+
+export default getPG;

package/server/plugins/pg/pgClients.js

@@ -1,21 +1,21 @@
-import pg from 'pg';
-
-import config from '../../../config.js';
-import init from './funcs/init.js';
-
-const pgClients = {};
-if (config.pg) {
-  const client = new pg.Pool({
-    host: config.pg?.host || '127.0.0.1',
-    port: config.pg?.port || 5432,
-    database: config.pg?.database || 'postgres',
-    user: config.pg?.user || 'postgres',
-    password: config.pg?.password || 'postgres',
-  });
-  client.init = async () => {
-    await init(client);
-  };
-  client.init();
-  pgClients.client = client;
-}
-export default pgClients;
+import pg from 'pg';
+
+import config from '../../../config.js';
+import init from './funcs/init.js';
+
+const pgClients = {};
+if (config.pg) {
+  const client = new pg.Pool({
+    host: config.pg?.host || '127.0.0.1',
+    port: config.pg?.port || 5432,
+    database: config.pg?.database || 'postgres',
+    user: config.pg?.user || 'postgres',
+    password: config.pg?.password || 'postgres',
+  });
+  client.init = async () => {
+    await init(client);
+  };
+  client.init();
+  pgClients.client = client;
+}
+export default pgClients;