@opengis/fastify-table 1.1.145 → 1.1.147

package/package.json

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

package/server/routes/table/controllers/suggest.js

@@ -1,5 +1,5 @@
 import {
-  config, getPG, getTemplate, getSelectMeta, getMeta, handlebarsSync,
+  config, getPG, getTemplate, getSelectMeta, getMeta, applyHook,
 } from '../../../../utils.js';
 
 const limit = 50;
@@ -23,12 +23,16 @@ export default async function suggest(req) {
 
   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 tableName = hookBody?.table || body?.table || table || query.token;
 
-  if (table && !pg1.pk[body?.table || table]) {
+  if (table && !pg1.pk?.[tableName]) {
     return { status: 400, message: 'param name is invalid: 1' };
   }
-  const columnExists = body?.columns?.find((col) => col?.name === column);
+
+  const tableMeta = await getMeta({ pg: pg1, table: tableName });
+  const columnExists = (hookBody?.columns || body?.columns || tableMeta?.columns)?.find((col) => col?.name === column);
 
   if (table && (!column || !columnExists)) {
     return { status: 400, message: 'param name is invalid: 2' };
@@ -40,7 +44,7 @@ export default async function suggest(req) {
 
   const meta = table && column
     ? {
-      original: `with c(id,text) as (select row_number() over(), ${column} from ${body?.table || table} group by ${column} limit ${limit}) select * from c`,
+      original: `with c(id,text) as (select row_number() over(), ${column} from ${tableName} group by ${column} limit ${limit}) select * from c`,
       searchQuery: '(lower("text") ~ $1 )',
     }
     : await getSelectMeta({ name: selectName, nocache: query?.nocache });
@@ -63,18 +67,19 @@ export default async function suggest(req) {
 
   if (arr && query.token && query.column) {
     const loadTable = await getTemplate('table', query.token);
-    const { columns = [] } = await getMeta({ table: loadTable?.table || query.token });
+
+    const { columns = [] } = await getMeta({ pg, table: tableName });
 
     const column = columns.find(el => el.name === query.column);
-    const args = { table: loadTable?.table || query.token };
+    const args = { table: tableName };
 
-    const sqlCls = `select array_agg(distinct value) from (select ${pg.pgType[column.dataTypeID].includes('[]') ? `unnest(${column.name})` : `${column.name}`} as value from ${(loadTable?.table || query.token).replace(/'/g, "''")} where ${loadTable?.query || '1=1'})q`;
+    const sqlCls = `select array_agg(distinct value) from (select ${pg.pgType[column.dataTypeID].includes('[]') ? `unnest(${column.name})` : `${column.name}`} as value from ${(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 || query.token] && column?.name) {
+    if (pg.pk?.[tableName] && column?.name) {
       const vals = await pg.queryCache(sqlCls, args).then(el => el.rows?.[0]?.array_agg || []);
       // console.log(vals);
 
@@ -121,10 +126,13 @@ export default async function suggest(req) {
   // return meta;
 
   const val = query.val ? ` ${meta.pk}=any('{${query.val.replace(/'/g, "''")}}')` : '';
-  const where = [search, val, `${meta.pk} is not null`].filter((el) => el).join(' and ') || 'true';
+  const where = [search, val, meta.pk ? `${meta.pk} is not null` : null].filter((el) => el).join(' and ') || 'true';
 
   const loadTable = await getTemplate('table', query.token);
-  const { columns = [] } = await getMeta({ table: loadTable?.table || query.token });
+
+  const tableName1 = hookBody?.table || loadTable?.table || query.token;
+
+  const { columns = [] } = await getMeta({ pg: pg1, table: tableName1 });
 
   const filterColumn = query.column ? columns.find(el => el.name === query.column)?.name : null;
   const filter = query.token && pg.pk?.[loadTable?.table || query.token] && filterColumn