@opengis/fastify-table 1.3.72 → 1.3.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.3.72",
+  "version": "1.3.74",
   "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/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/server/routes/table/controllers/suggest.js

@@ -2,7 +2,7 @@ import path from 'node:path';
 import { existsSync, readFileSync } from 'node:fs';
 
 import {
-  config, getPG, getTemplate, getSelectMeta, getMeta, applyHook, getSelectVal, logger,
+  config, getPG, getTemplate, getSelectMeta, getMeta, applyHook, getSelectVal, logger, getSelect,
 } from '../../../../utils.js';
 
 const limit = 50;
@@ -12,12 +12,19 @@ const headers = {
   'Cache-Control': 'no-cache',
 };
 
-function getTableColumnMeta(table, column, filtered) {
+async function getTableColumnMeta(tableName, column, filtered, pg) {
+  if (!tableName || !column) { return null; }
+
+  const loadTable = await getTemplate('table', tableName);
+  const { data: clsName } = loadTable?.columns?.find?.(el => el.name === column) || {};
+  const { arr } = await getSelect(clsName, pg) || {};
+
   const original = {
-    true: `with c(id,text) as (select ${column}, ${column} from ${table} group by ${column}) select id, text from c`,
-    false: `with c(id,text) as (select ${column}, ${column}, count(*) from ${table} group by ${column} limit ${limit}) select * from c`,
+    true: `with c(id,text) as (select ${column} as id, ${column} as text from ${loadTable?.table || tableName} group by ${column}) select id, text from c`,
+    false: `with c(id,text) as (select ${column}  as id, ${column} as text, count(*) from ${loadTable?.table || tableName} group by ${column} limit ${limit}) select * from c`,
   }[!!filtered];
   return {
+    arr,
     original,
     searchQuery: '(lower("text") ~ $1 )',
     pk: 'id',
@@ -41,13 +48,13 @@ export default async function suggest(req) {
     }
   }
 
-  const [table, column] = params.data?.includes(':') ? params.data.split(':') : [];
+  const [table, column] = params.data?.includes(':') ? params.data.split(':') : [query.token, query.column];
   const selectName = query.sel || query.name || params.data;
 
   if (!selectName) return { status: 400, message: 'name is required' };
 
   const { body: hookBody } = table || query.token ? await applyHook('preSuggest', { pg: pg1, table: table || query.token }) || {} : {};
-  const body = await getTemplate('table', table);
+  const body = await getTemplate('table', table || query.token);
   const tableName = hookBody?.table || body?.table || table || query.token;
 
   if (table && !pg1.pk?.[tableName]) {
@@ -55,7 +62,7 @@ export default async function suggest(req) {
   }
 
   const tableMeta = await getMeta({ pg: pg1, table: tableName });
-  const columnExists = (hookBody?.columns || body?.columns || tableMeta?.columns)?.find((col) => col?.name === column);
+  const columnExists = (hookBody?.columns || body?.columns || tableMeta?.columns)?.find(col => col?.name === (column || query.column));
 
   if (table && (!column || !columnExists)) {
     return { status: 400, message: 'param name is invalid: 2' };
@@ -65,8 +72,8 @@ export default async function suggest(req) {
     return { status: 400, message: 'param limit is invalid' };
   }
 
-  const meta = table && column
-    ? getTableColumnMeta(table, column, query?.key || query?.val)
+  const meta = tableName && column
+    ? await getTableColumnMeta(table, column, query?.key || query?.val, pg1)
     : await getSelectMeta({
       pg: pg1, name: selectName, nocache: query?.nocache, parent,
     });
@@ -95,17 +102,19 @@ export default async function suggest(req) {
     const column1 = columns.find(el => el.name === query.column);
     const args = { table: tableName };
     if (!column1) return [];
-    const sqlCls = `select array_agg(distinct value)::text[] from (select ${pg.pgType?.[column1.dataTypeID]?.includes('[]') ? `unnest(${column1.name})` : `${column1.name}`} as value from ${(loadTable?.table || tableName).replace(/'/g, "''")} where ${hookBody?.query || loadTable?.query || '1=1'})q`;
+    const sqlCls = query.count
+    ? `select value, count(*) from (select ${pg.pgType?.[column1.dataTypeID]?.includes('[]') ? `unnest(${column1.name})` : `${column1.name}`} as value from ${(loadTable?.table || tableName).replace(/'/g, "''")} where ${hookBody?.query || loadTable?.query || '1=1'})q group by value`
+    : `select array_agg(distinct value)::text[] from (select ${pg.pgType?.[column1.dataTypeID]?.includes('[]') ? `unnest(${column1.name})` : `${column1.name}`} as value from ${(loadTable?.table || tableName).replace(/'/g, "''")} where ${hookBody?.query || loadTable?.query || '1=1'})q`;
 
     if (query.sql && (config.local || user?.user_type?.includes?.('admin'))) {
       return sqlCls;
     }
 
-    if (pg.pk?.[loadTable?.table || tableName] && column?.name) {
-      const vals = await pg.queryCache(sqlCls, args).then(el => el.rows?.[0]?.array_agg || []);
-      // console.log(vals);
+    if (pg.pk?.[loadTable?.table || tableName] && column1?.name) {
+      const qRes = await pg.queryCache(sqlCls, args);
+      const vals = (query.count ? qRes.rows?.map?.(el => el.value?.toString?.()) : qRes.rows?.[0]?.array_agg) || [];
 
-      const lower = query.key?.toLowerCase();
+      const lower = query.key?.toLowerCase?.();
       const data1 = query.key || query.val
         ? arr?.filter((el) => !lower || (el[lang] || el.text)?.toLowerCase()?.indexOf(lower) !== -1)?.filter((el) => !query.val || el.id === query.val)
         : arr;
@@ -113,6 +122,11 @@ export default async function suggest(req) {
       const data2 = data1.filter((el) => el.id && vals.includes(el.id.toString()));
       const data = data2.slice(0, Math.min(query.limit || limit, limit));
 
+      if (data.length && query.count) {
+        const counts = qRes.rows?.reduce?.((acc, curr) => ({ ...acc, [curr.value]: curr.count }), {});
+        data.forEach(el => Object.assign(el, { count: counts?.[el.id] || 0 }));
+      }
+
       if (config.debug) {
         logger.file('suggest/debug', {
           type: 1,

package/server/routes/table/schema.js

@@ -41,6 +41,7 @@ const suggestSchema = {
     // key: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
     val: { type: 'string', pattern: '([\\d\\w]+)$' },
     sql: { type: 'string', pattern: '^(\\d)$' },
+    count: { type: 'string', pattern: '^(\\d)$' },
   },
   params: {
   //  data: { type: 'string', pattern: '^([\\d\\w]+)$' },

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';
@@ -36,6 +38,7 @@ 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';
 import getData from './server/plugins/table/funcs/getData.js';
+import getMenu from './server/routes/menu/controllers/getMenu.js';
 import getFilter from './server/plugins/table/funcs/getFilter.js';
 
 // crud
@@ -109,6 +112,8 @@ export {
   getTemplates,
   getTemplatePath,
   addTemplateDir,
+  menuDirs,
+  addMenu,
   userTemplateDir,
   customTokens,
   userTokens,
@@ -134,6 +139,7 @@ export {
   gisIRColumn,
   getData,
   getFilter,
+  getMenu,
 
   // pg
   initPG,