@opengis/fastify-table 1.0.26 → 1.0.27

package/dblist/controllers/updateItem.js

@@ -1,22 +1,22 @@
-import { existsSync } from 'fs';
-import { readFile, writeFile } from 'fs/promises';
-
-import checkItem from './utils/checkItem.js';
-
-export default async function updateItem({ body = {}, params = {} }) {
-  const { id } = params;
-  if (!id) return { error: 'not enough params', status: 400 };
-
-  if (!existsSync('dblist.json')) {
-    return { error: 'nothing to update: 1', status: 400 };
-  }
-
-  const check = checkItem(body.data);
-  if (check?.error) return check;
-
-  const data = JSON.parse(await readFile('dblist.json') || '[]');
-  data.filter((el) => el.id === id)?.forEach((el) => Object.assign(el, body.data));
-
-  await writeFile('dblist.json', JSON.stringify(data));
-  return { data };
-}
+import { existsSync } from 'fs';
+import { readFile, writeFile } from 'fs/promises';
+
+import checkItem from './utils/checkItem.js';
+
+export default async function updateItem({ body = {}, params = {} }) {
+  const { id } = params;
+  if (!id) return { error: 'not enough params', status: 400 };
+
+  if (!existsSync('dblist.json')) {
+    return { error: 'nothing to update: 1', status: 400 };
+  }
+
+  const check = checkItem(body.data);
+  if (check?.error) return check;
+
+  const data = JSON.parse(await readFile('dblist.json') || '[]');
+  data.filter((el) => el.id === id)?.forEach((el) => Object.assign(el, body.data));
+
+  await writeFile('dblist.json', JSON.stringify(data));
+  return { data };
+}

package/dblist/controllers/utils/checkItem.js

@@ -1,9 +1,9 @@
-export default function validateItem(item) {
-  if (!item || typeof item !== 'object' || Array.isArray(item)) {
-    return { error: 'param data is invalid: 1', status: 400 };
-  }
-  if (!item.options?.database || Object.keys(item).filter((key) => !['key', 'name', 'options'].includes(key) || (typeof item[key] !== 'string' && key !== 'options')).length) {
-    return { error: 'param data is invalid: 2', status: 400 };
-  }
-  return null;
-}
+export default function validateItem(item) {
+  if (!item || typeof item !== 'object' || Array.isArray(item)) {
+    return { error: 'param data is invalid: 1', status: 400 };
+  }
+  if (!item.options?.database || Object.keys(item).filter((key) => !['key', 'name', 'options'].includes(key) || (typeof item[key] !== 'string' && key !== 'options')).length) {
+    return { error: 'param data is invalid: 2', status: 400 };
+  }
+  return null;
+}

package/dblist/index.js

@@ -1,40 +1,40 @@
-import createItem from './controllers/createItem.js';
-import readItemList from './controllers/readItems.js';
-import updateItem from './controllers/updateItem.js';
-import deleteItem from './controllers/deleteItem.js';
-
-export default async function plugin(fastify, config = {}) {
-  const prefix = config.prefix || '/api';
-  fastify.route({
-    method: 'POST',
-    url: `${prefix}/list`,
-    config: {
-      policy: [],
-    },
-    handler: createItem,
-  });
-  fastify.route({
-    method: 'GET',
-    url: `${prefix}/list`,
-    config: {
-      policy: [],
-    },
-    handler: readItemList,
-  });
-  fastify.route({
-    method: 'PUT',
-    url: `${prefix}/list/:id`,
-    config: {
-      policy: [],
-    },
-    handler: updateItem,
-  });
-  fastify.route({
-    method: 'DELETE',
-    url: `${prefix}/list/:id`,
-    config: {
-      policy: [],
-    },
-    handler: deleteItem,
-  });
-}
+import createItem from './controllers/createItem.js';
+import readItemList from './controllers/readItems.js';
+import updateItem from './controllers/updateItem.js';
+import deleteItem from './controllers/deleteItem.js';
+
+export default async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
+  fastify.route({
+    method: 'POST',
+    url: `${prefix}/list`,
+    config: {
+      policy: [],
+    },
+    handler: createItem,
+  });
+  fastify.route({
+    method: 'GET',
+    url: `${prefix}/list`,
+    config: {
+      policy: [],
+    },
+    handler: readItemList,
+  });
+  fastify.route({
+    method: 'PUT',
+    url: `${prefix}/list/:id`,
+    config: {
+      policy: [],
+    },
+    handler: updateItem,
+  });
+  fastify.route({
+    method: 'DELETE',
+    url: `${prefix}/list/:id`,
+    config: {
+      policy: [],
+    },
+    handler: deleteItem,
+  });
+}

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,41 +1,41 @@
-// import pg from 'pg';
-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 dbListPlugin from './dblist/index.js';
-
-async function plugin(fastify, opt) {
-  // console.log(opt);
-  config.pg = opt.pg;
-  config.redis = opt.redis;
-
-  // independent npm start / unit test
-  if (!fastify.config) {
-    fastify.decorate('config', config);
-  }
-  if (!fastify.funcs) {
-    fastify.addHook('onRequest', async (req) => {
-      req.funcs = fastify;
-    });
-    // fastify.decorateRequest('funcs', fastify);
-  }
-
-  policyPlugin(fastify);
-  redisPlugin(fastify);
-  await pgPlugin(fastify, opt);
-  tablePlugin(fastify, opt);
-  crudPlugin(fastify, opt);
-  notificationPlugin(fastify, opt);
-  widgetPlugin(fastify, opt);
-  dbListPlugin(fastify, opt);
-}
-export default fp(plugin);
-// export { rclient };
+// import pg from 'pg';
+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 dbListPlugin from './dblist/index.js';
+
+async function plugin(fastify, opt) {
+  // console.log(opt);
+  config.pg = opt.pg;
+  config.redis = opt.redis;
+
+  // independent npm start / unit test
+  if (!fastify.config) {
+    fastify.decorate('config', config);
+  }
+  if (!fastify.funcs) {
+    fastify.addHook('onRequest', async (req) => {
+      req.funcs = fastify;
+    });
+    // fastify.decorateRequest('funcs', fastify);
+  }
+
+  policyPlugin(fastify);
+  redisPlugin(fastify);
+  await pgPlugin(fastify, opt);
+  tablePlugin(fastify, opt);
+  crudPlugin(fastify, opt);
+  notificationPlugin(fastify, opt);
+  widgetPlugin(fastify, opt);
+  dbListPlugin(fastify, opt);
+}
+export default fp(plugin);
+// export { rclient };

package/notification/controllers/userNotifications.js

@@ -1,19 +1,19 @@
-export default async function userNotifications({
-  pg, session = {}, query = {},
-}) {
-  const time = Date.now();
-  try {
-    const { uid } = session.passport?.user || {};
-    if (!uid) return { error: 'access restricted', status: 403 };
-
-    const queryFunc = query.nocache ? pg.query : pg.queryCache;
-
-    // queryCache not supports $1 params
-    const { rows } = await queryFunc(`select notification_id as id, notification_type as type, 
-      notification_status as status, title, body, link, uid from crm.notification where uid='${uid}'`);
-    return { time: Date.now() - time, total: rows?.length, rows };
-  }
-  catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}
+export default async function userNotifications({
+  pg, session = {}, query = {},
+}) {
+  const time = Date.now();
+  try {
+    const { uid } = session.passport?.user || {};
+    if (!uid) return { error: 'access restricted', status: 403 };
+
+    const queryFunc = query.nocache ? pg.query : pg.queryCache;
+
+    // queryCache not supports $1 params
+    const { rows } = await queryFunc(`select notification_id as id, notification_type as type, 
+      notification_status as status, title, body, link, uid from crm.notification where uid='${uid}'`);
+    return { time: Date.now() - time, total: rows?.length, rows };
+  }
+  catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
+}

package/notification/funcs/addNotification.js

@@ -1,8 +1,8 @@
-export default async function addNotification({
-  pg, session = {}, title, body, link, notificationType, uid: uid1,
-}) {
-  const uid = uid1 || session.passport?.user?.uid || {};
-  const { id, status } = await pg.one(`insert into crm.notification(title, body, link, notification_type, uid) 
-  values($1,$2,$3,$4,$5) returning notification_id as id, notification_status as status`, [title, body, link, notificationType, uid]);
-  return { id, status };
-}
+export default async function addNotification({
+  pg, session = {}, title, body, link, notificationType, uid: uid1,
+}) {
+  const uid = uid1 || session.passport?.user?.uid || {};
+  const { id, status } = await pg.one(`insert into crm.notification(title, body, link, notification_type, uid) 
+  values($1,$2,$3,$4,$5) returning notification_id as id, notification_status as status`, [title, body, link, notificationType, uid]);
+  return { id, status };
+}

package/notification/index.js

@@ -1,19 +1,19 @@
-// api
-import userNotifications from './controllers/userNotifications.js';
-// funcs
-import addNotification from './funcs/addNotification.js';
-
-async function plugin(fastify, config = {}) {
-  const prefix = config.prefix || '/api';
-  fastify.route({
-    method: 'GET',
-    url: `${prefix}/notification`,
-    config: {
-      policy: ['user'], // implement user auth check policy??
-    },
-    handler: userNotifications,
-  });
-  fastify.decorate('addNotification', addNotification);
-}
-
-export default plugin;
+// api
+import userNotifications from './controllers/userNotifications.js';
+// funcs
+import addNotification from './funcs/addNotification.js';
+
+async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
+  fastify.route({
+    method: 'GET',
+    url: `${prefix}/notification`,
+    config: {
+      policy: ['user'], // implement user auth check policy??
+    },
+    handler: userNotifications,
+  });
+  fastify.decorate('addNotification', addNotification);
+}
+
+export default plugin;

package/package.json

@@ -1,23 +1,23 @@
-{
-  "name": "@opengis/fastify-table",
-  "version": "1.0.26",
-  "type": "module",
-  "description": "core-plugins",
-  "main": "index.js",
-  "scripts": {
-    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "dependencies": {
-    "ioredis": "^5.3.2",
-    "fastify": "^4.26.1",
-    "fastify-plugin": "^4.0.0",
-    "pg": "^8.11.3"
-  },
-  "devDependencies": {
-    "eslint": "^8.49.0",
-    "eslint-config-airbnb": "^19.0.4"
-  },
-  "author": "Softpro",
-  "license": "ISC"
+{
+  "name": "@opengis/fastify-table",
+  "version": "1.0.27",
+  "type": "module",
+  "description": "core-plugins",
+  "main": "index.js",
+  "scripts": {
+    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "dependencies": {
+    "ioredis": "^5.3.2",
+    "fastify": "^4.26.1",
+    "fastify-plugin": "^4.0.0",
+    "pg": "^8.11.3"
+  },
+  "devDependencies": {
+    "eslint": "^8.49.0",
+    "eslint-config-airbnb": "^19.0.4"
+  },
+  "author": "Softpro",
+  "license": "ISC"
 }

package/pg/funcs/getPG.js

@@ -1,29 +1,29 @@
-import pg from 'pg';
-import config from '../../config.js';
-import pgClients from '../pgClients.js';
-import init from './init.js';
-
-function getPG({
-  user, password, host, port, db, database, name: origin, funcs,
-}) {
-  if (funcs?.config) Object.assign(config, { ...funcs.config }); // unit test
-  const name = origin || db || database;
-  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';
+import config from '../../config.js';
+import pgClients from '../pgClients.js';
+import init from './init.js';
+
+function getPG({
+  user, password, host, port, db, database, name: origin, funcs,
+} = { name: 'client' }) {
+  if (funcs?.config) Object.assign(config, { ...funcs.config }); // unit test
+  const name = origin || db || database;
+  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/pg/pgClients.js

@@ -1,20 +1,20 @@
-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;