@opengis/fastify-table 1.2.36 → 1.2.38

package/package.json

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

package/server/plugins/pg/funcs/getDBParams.js

@@ -0,0 +1,13 @@
+export default function getDBParams(str) {
+    if (typeof str !== 'string') return str;
+    if (str.includes('/')) {
+        const arr = str.match(/(([A-z_0-9]+):([A-z0-9_]+)@)?([a-z0-9._]+):([0-9]+)(\/([a-z0-9_]+))?/) || [];
+        const [, , user, password, host, port, , db] = arr;
+        return { name: str, user, password, host, port, db };
+    }
+    if (str.includes(':')) {
+        const [db, port] = str.split(':') || [];
+        return { name: str, port, db };
+    }
+    return { name: str, db: str };
+}

package/server/plugins/pg/funcs/getPG.js

@@ -8,15 +8,7 @@ import config from '../../../../config.js';
 import dblist from '../../../../dblist.js';
 import pgClients from '../pgClients.js';
 import init from './init.js';
-
-function getDBParams(str) {
-  if (typeof str === 'string' && !str.includes(':')) {
-    return { name: str, db: str };
-  }
-  const arr = str?.match(/(([A-z_0-9]+):([A-z0-9_]+)@)?([a-z0-9._]+):([0-9]+)(\/([a-z0-9_]+))?/) || [];
-  const [, , user, password, host, port, , db] = arr;
-  return { user, password, host, port, db };
-}
+import getDBParams from './getDBParams.js';
 
 function getPG(param) {
   const dbListParams = dblist.find(el => el.database === (param?.db || param?.database || param));

package/server/plugins/pg/funcs/getPGAsync.js

@@ -8,15 +8,7 @@ import config from '../../../../config.js';
 import dblist from '../../../../dblist.js';
 import pgClients from '../pgClients.js';
 import init from './init.js';
-
-function getDBParams(str) {
-  if (typeof str === 'string' && !str.includes(':')) {
-    return { name: str, db: str };
-  }
-  const arr = str?.match(/(([A-z_0-9]+):([A-z0-9_]+)@)?([a-z0-9._]+):([0-9]+)(\/([a-z0-9_]+))?/) || [];
-  const [, , user, password, host, port, , db] = arr;
-  return { user, password, host, port, db };
-}
+import getDBParams from './getDBParams.js';
 
 async function getPGAsync(param) {
   const dbListParams = dblist.find(el => el.database === (param?.db || param?.database || param));

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

@@ -1,5 +1,5 @@
 import {
-  config, getPG, getTemplate, getSelectMeta, getMeta, applyHook,
+  config, getPG, getTemplate, getSelectMeta, getMeta, applyHook, getSelectVal,
 } from '../../../../utils.js';
 
 const limit = 50;
@@ -151,6 +151,15 @@ export default async function suggest(req) {
   const ids = dataNew.map((el) => el.id);
   const data = dataNew.concat((/* dataNew1 || */[]).filter((el) => !ids?.includes(el.id)));
 
+  if (query.cls) {
+    const clsData = await getSelectVal({
+      pg,
+      name: query.cls,
+      values: data.map((el) => el.id),
+    });
+    data.forEach(el => Object.assign(el, { text: clsData?.[el.id || ''] || el.id }));
+  }
+
   const message = {
     time: Date.now() - time,
     limit: Math.min(query.limit || meta.limit || limit, limit),

package/utils.js

@@ -7,6 +7,7 @@ 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 getDBParams from './server/plugins/pg/funcs/getDBParams.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';
@@ -119,6 +120,7 @@ export {
   getPG,
   getPGAsync,
   pgClients,
+  getDBParams,
 
   // select
   getSelectVal,