@opengis/fastify-table 1.3.73 → 1.3.75

package/index.js

@@ -35,9 +35,11 @@ import execMigrations from './server/plugins/migration/exec.migrations.js';
 import locales from './server/routes/table/controllers/utils/locales.js';
 import pgClients from './server/plugins/pg/pgClients.js';
 
-import dataPlugin from './server/routes/data/index.mjs';
-import menuPlugin from './server/routes/menu/index.mjs';
-import templatesPlugin from './server/routes/templates/index.mjs';
+import dblistRoutes from './server/routes/dblist/index.mjs';
+
+import dataRoutes from './server/routes/data/index.mjs';
+import menuRoutes from './server/routes/menu/index.mjs';
+import templatesRoutes from './server/routes/templates/index.mjs';
 
 // core templates && cls
 const filename = fileURLToPath(import.meta.url);
@@ -99,6 +101,10 @@ async function plugin(fastify, opt) {
   cronPlugin(fastify, opt);
   loggerPlugin(fastify, opt);
 
+  if (config.dblist) {
+    dblistRoutes(fastify, opt);
+  }
+
   // routes / api
   cronRoutes(fastify, opt);
   crudRoutes(fastify, opt);
@@ -107,9 +113,9 @@ async function plugin(fastify, opt) {
   tableRoutes(fastify, opt);
   utilRoutes(fastify, opt);
 
-  dataPlugin(fastify, opt);
-  menuPlugin(fastify, opt);
-  templatesPlugin(fastify, opt);
+  dataRoutes(fastify, opt);
+  menuRoutes(fastify, opt);
+  templatesRoutes(fastify, opt);
 
   fastify.get('/api/test-proxy', {}, (req) => ({ ...req.headers || {}, sessionId: req.session?.sessionId }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.3.73",
+  "version": "1.3.75",
   "type": "module",
   "description": "core-plugins",
   "keywords": [

package/server/plugins/table/funcs/addMenu.js

@@ -0,0 +1,16 @@
+import { basename } from 'node:path';
+import { existsSync } from 'node:fs';
+
+import menuDirs from './menuDirs.js';
+
+export default function addMenu(filepath) {
+    if (basename(filepath) !== 'menu.json') {
+        throw new Error('addMenu: filepath must be a menu.json file');
+    }
+
+    if (filepath && !menuDirs.includes(filepath) && existsSync(filepath)) {
+        menuDirs.push(filepath);
+    }
+
+  return menuDirs;
+}

package/server/plugins/table/funcs/addTemplateDir.js

@@ -2,7 +2,7 @@ import { existsSync, readFileSync } from 'node:fs';
 
 import userTemplateDir from './userTemplateDir.js';
 import customTokens from './customTokens.js';
-import yml2json from '../../yml/funcs/yml2json.js'
+import yml2json from '../../yml/funcs/yml2json.js';
 
 export default function addTemplateDir(dir) {
   if (dir && !userTemplateDir.includes(dir)) {

package/server/plugins/table/funcs/menuDirs.js

@@ -0,0 +1 @@
+export default [];

package/server/routes/dblist/index.mjs

@@ -4,16 +4,15 @@ import setItem from './controllers/setItem.js';
 const policy = ['site'];
 
 export default async function plugin(app, config = {}) {
-  const { prefix = '/api' } = config;
   app.route({
     method: 'GET',
-    url: `${prefix}/db-list`,
+    url: '/db-list',
     config: { policy },
     handler: readItemList,
   });
   app.route({
     method: 'GET',
-    url: `${prefix}/db-list/:id`,
+    url: '/db-list/:id',
     config: { policy },
     handler: setItem,
   });

package/server/routes/menu/controllers/getMenu.js

@@ -5,7 +5,7 @@ import { join } from 'node:path';
 import { existsSync, readdirSync, readFileSync } from 'node:fs';
 
 import {
- userTemplateDir, pgClients, applyHook, config,
+ menuDirs, pgClients, applyHook, config,
 } from '../../../../utils.js';
 
 const menuCache = [];
@@ -13,17 +13,16 @@ const menuCache = [];
 // check module dir
 const moduleDir = join(process.cwd(), 'module');
 const dirs = existsSync(moduleDir)
-    ? readdirSync(moduleDir).map(el => join(moduleDir, el))
+    ? readdirSync(moduleDir).map(el => join(moduleDir, el, 'menu.json'))
     : [];
 
 const isProduction = process.env.NODE_ENV === 'production';
 // readMenu();
 
 async function readMenu() {
-    const menuList = dirs.concat(userTemplateDir)
-        .map(el => join(el, 'menu.json'))
+    const menuList = dirs.concat(menuDirs)
         .filter(el => existsSync(el));
-    // const list = menuList.map(el => readFileSync(el, 'utf-8')); // sync
+
     const list = menuList.filter((el, idx, arr) => el && arr.indexOf(el) === idx).map(el => readFileSync(el, 'utf-8')); // sync
     const menus = list.reduce((p, el) => p.concat(JSON.parse(el)), [])
         .map(el => ({ order: 0, ...el }))
@@ -32,11 +31,12 @@ async function readMenu() {
     if (!menuCache.length) {
         menus.forEach(el => menuCache.push(el));
     }
-
     return menus;
 }
 
-export default async function adminMenu({ user = {}, session, pg = pgClients.client }, reply) {
+export default async function adminMenu({
+    user = {}, session, pg = pgClients.client,
+}, reply) {
     const time = Date.now();
 
     if (!user.uid) {

package/utils.js

@@ -23,6 +23,8 @@ import getTemplateSync from './server/plugins/table/funcs/getTemplateSync.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 addMenu from './server/plugins/table/funcs/addMenu.js';
+import menuDirs from './server/plugins/table/funcs/menuDirs.js';
 import userTemplateDir from './server/plugins/table/funcs/userTemplateDir.js';
 import customTokens from './server/plugins/table/funcs/customTokens.js';
 import userTokens from './server/plugins/table/funcs/userTokens.js';
@@ -110,6 +112,8 @@ export {
   getTemplates,
   getTemplatePath,
   addTemplateDir,
+  menuDirs,
+  addMenu,
   userTemplateDir,
   customTokens,
   userTokens,