@opengis/fastify-table 1.2.11 → 1.2.13

package/utils.js

@@ -1,127 +1,129 @@
-// This file contains code that we reuse
-// between our tests.
-
-// hb for html format (notifications etc.)
-import { handlebars, handlebarsSync } from '@opengis/fastify-hb/utils.js';
-
-// pg
-import getPG from './server/plugins/pg/funcs/getPG.js';
-import getPGAsync from './server/plugins/pg/funcs/getPGAsync.js';
-import initPG from './server/plugins/pg/funcs/init.js';
-import pgClients from './server/plugins/pg/pgClients.js';
-import getMeta from './server/plugins/pg/funcs/getMeta.js';
-import getAccess from './server/plugins/crud/funcs/getAccess.js';
-
-// redis
-import getRedis from './server/plugins/redis/funcs/getRedis.js';
-import redisClients from './server/plugins/redis/funcs/redisClients.js';
-
-// template
-import getTemplate from './server/plugins/table/funcs/getTemplate.js';
-import getTemplates from './server/plugins/table/funcs/getTemplates.js';
-import getTemplatePath from './server/plugins/table/funcs/getTemplatePath.js';
-import addTemplateDir from './server/plugins/table/funcs/addTemplateDir.js';
-import userTemplateDir from './server/plugins/table/funcs/userTemplateDir.js';
-
-// table
-import metaFormat from './server/plugins/table/funcs/metaFormat/index.js';
-import autoIndex from './server/plugins/pg/funcs/autoIndex.js';
-import getSelectVal from './server/plugins/table/funcs/metaFormat/getSelectVal.js';
-import getFilterSQL from './server/plugins/table/funcs/getFilterSQL/index.js';
-import getSelect from './server/plugins/table/funcs/getSelect.js';
-import getSelectMeta from './server/plugins/table/funcs/getSelectMeta.js';
-import gisIRColumn from './server/plugins/table/funcs/gisIRColumn.js';
-
-// crud
-import dataInsert from './server/plugins/crud/funcs/dataInsert.js';
-import dataUpdate from './server/plugins/crud/funcs/dataUpdate.js';
-import dataDelete from './server/plugins/crud/funcs/dataDelete.js';
-import getToken from './server/plugins/crud/funcs/getToken.js';
-import setToken from './server/plugins/crud/funcs/setToken.js';
-import getOpt from './server/plugins/crud/funcs/getOpt.js';
-import setOpt from './server/plugins/crud/funcs/setOpt.js';
-import validateData from './server/plugins/crud/funcs/validateData.js';
-
-// policy
-import checkXSS from './server/plugins/policy/funcs/checkXSS.js';
-
-// hook
-import applyHook from './server/plugins/hook/funcs/applyHook.js';
-import applyHookSync from './server/plugins/hook/funcs/applyHookSync.js';
-import addHook from './server/plugins/hook/funcs/addHook.js';
-import execMigrations from './server/plugins/migration/funcs/exec.migrations.js';
-
-// cron
-import addCron from './server/plugins/cron/funcs/addCron.js';
-
-// logger
-import logger from './server/plugins/logger/getLogger.js';
-
-// utils
-import config from './config.js';
-import eventStream from './server/plugins/util/funcs/eventStream.js';
-import isFileExists from './server/plugins/crud/funcs/isFileExists.js';
-import getFolder from './server/plugins/crud/funcs/utils/getFolder.js';
-
-import logChanges from './server/plugins/crud/funcs/utils/logChanges.js';
-
-export default null;
-export {
-  config,
-  getFolder,
-  handlebars,
-  handlebarsSync,
-  getFilterSQL,
-  addCron,
-  execMigrations,
-  getRedis,
-  redisClients,
-  logger,
-  isFileExists,
-  eventStream,
-
-  // hook
-  addHook,
-  applyHook,
-  applyHookSync,
-
-  // template
-  getTemplate,
-  getTemplates,
-  getTemplatePath,
-  addTemplateDir,
-  userTemplateDir,
-
-  // security
-  checkXSS,
-  getAccess,
-  getToken,
-  getOpt,
-  setOpt,
-  setToken,
-  validateData,
-
-  // crud
-  dataInsert,
-  dataUpdate,
-  dataDelete,
-
-  // table
-  autoIndex,
-  metaFormat,
-  getMeta,
-  gisIRColumn,
-
-  // pg
-  initPG,
-  getPG,
-  getPGAsync,
-  pgClients,
-
-  // select
-  getSelectVal,
-  getSelectMeta,
-  getSelect,
-
-  logChanges,
-};
+// This file contains code that we reuse
+// between our tests.
+
+// hb for html format (notifications etc.)
+import { handlebars, handlebarsSync } from '@opengis/fastify-hb/utils.js';
+
+// pg
+import getPG from './server/plugins/pg/funcs/getPG.js';
+import getPGAsync from './server/plugins/pg/funcs/getPGAsync.js';
+import initPG from './server/plugins/pg/funcs/init.js';
+import pgClients from './server/plugins/pg/pgClients.js';
+import getMeta from './server/plugins/pg/funcs/getMeta.js';
+import getAccess from './server/plugins/crud/funcs/getAccess.js';
+
+// redis
+import getRedis from './server/plugins/redis/funcs/getRedis.js';
+import redisClients from './server/plugins/redis/funcs/redisClients.js';
+
+// template
+import getTemplate from './server/plugins/table/funcs/getTemplate.js';
+import getTemplates from './server/plugins/table/funcs/getTemplates.js';
+import getTemplatePath from './server/plugins/table/funcs/getTemplatePath.js';
+import addTemplateDir from './server/plugins/table/funcs/addTemplateDir.js';
+import userTemplateDir from './server/plugins/table/funcs/userTemplateDir.js';
+
+// table
+import metaFormat from './server/plugins/table/funcs/metaFormat/index.js';
+import autoIndex from './server/plugins/pg/funcs/autoIndex.js';
+import getSelectVal from './server/plugins/table/funcs/metaFormat/getSelectVal.js';
+import getFilterSQL from './server/plugins/table/funcs/getFilterSQL/index.js';
+import getSelect from './server/plugins/table/funcs/getSelect.js';
+import getSelectMeta from './server/plugins/table/funcs/getSelectMeta.js';
+import gisIRColumn from './server/plugins/table/funcs/gisIRColumn.js';
+
+// crud
+import dataInsert from './server/plugins/crud/funcs/dataInsert.js';
+import dataUpdate from './server/plugins/crud/funcs/dataUpdate.js';
+import dataDelete from './server/plugins/crud/funcs/dataDelete.js';
+import getToken from './server/plugins/crud/funcs/getToken.js';
+import setToken from './server/plugins/crud/funcs/setToken.js';
+import getOpt from './server/plugins/crud/funcs/getOpt.js';
+import setOpt from './server/plugins/crud/funcs/setOpt.js';
+import validateData from './server/plugins/crud/funcs/validateData.js';
+
+// policy
+import checkXSS from './server/plugins/policy/funcs/checkXSS.js';
+
+// hook
+import applyHook from './server/plugins/hook/funcs/applyHook.js';
+import applyHookSync from './server/plugins/hook/funcs/applyHookSync.js';
+import addHook from './server/plugins/hook/funcs/addHook.js';
+import execMigrations from './server/plugins/migration/exec.migrations.js';
+import execSql from './server/plugins/migration/exec.sql.js';
+
+// cron
+import addCron from './server/plugins/cron/funcs/addCron.js';
+
+// logger
+import logger from './server/plugins/logger/getLogger.js';
+
+// utils
+import config from './config.js';
+import eventStream from './server/plugins/util/funcs/eventStream.js';
+import isFileExists from './server/plugins/crud/funcs/isFileExists.js';
+import getFolder from './server/plugins/crud/funcs/utils/getFolder.js';
+
+import logChanges from './server/plugins/crud/funcs/utils/logChanges.js';
+
+export default null;
+export {
+  config,
+  getFolder,
+  handlebars,
+  handlebarsSync,
+  getFilterSQL,
+  addCron,
+  execMigrations,
+  execSql,
+  getRedis,
+  redisClients,
+  logger,
+  isFileExists,
+  eventStream,
+
+  // hook
+  addHook,
+  applyHook,
+  applyHookSync,
+
+  // template
+  getTemplate,
+  getTemplates,
+  getTemplatePath,
+  addTemplateDir,
+  userTemplateDir,
+
+  // security
+  checkXSS,
+  getAccess,
+  getToken,
+  getOpt,
+  setOpt,
+  setToken,
+  validateData,
+
+  // crud
+  dataInsert,
+  dataUpdate,
+  dataDelete,
+
+  // table
+  autoIndex,
+  metaFormat,
+  getMeta,
+  gisIRColumn,
+
+  // pg
+  initPG,
+  getPG,
+  getPGAsync,
+  pgClients,
+
+  // select
+  getSelectVal,
+  getSelectMeta,
+  getSelect,
+
+  logChanges,
+};

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

@@ -1,86 +0,0 @@
-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);
-  }
-}