@opengis/fastify-table 2.0.118 → 2.0.119

package/dist/server/routes/table/controllers/suggest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"suggest.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/suggest.ts"],"names":[],"mappings":"AA+DA,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAqXzD"}
+{"version":3,"file":"suggest.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/suggest.ts"],"names":[],"mappings":"AAmEA,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAsWzD"}

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

@@ -1,17 +1,21 @@
 import path from "node:path";
 import { existsSync, readFileSync } from "node:fs";
-import { config, getPG, getTemplate, getSelectMeta, getMeta, applyHook, getSelectVal, logger, getSelect, metaFormat, getColumnCLS, } from "../../../../utils.js";
+import { config, getPGAsync, getTemplate, getSelectMeta, getMeta, applyHook, getSelectVal, logger, getSelect, metaFormat, getColumnCLS, pgClients, } from "../../../../utils.js";
 const defaultLimit = 50;
-async function getTableColumnMeta({ table, column, filtered, startsWith, key, pg, }) {
+async function getTableColumnMeta({ table, template, column, selectName, filtered, startsWith, key, pg = pgClients.client, }) {
     if (!table || !column) {
         return null;
     }
-    const loadTable = await getTemplate("table", table);
-    const { data: clsName } = loadTable?.columns?.find?.((el) => el.name === column) || {};
-    const { arr } = (await getSelect(clsName, pg)) || {};
+    const { columns, table: tableName } = template
+        ? await getTemplate("table", template)
+        : { table, columns: [] };
+    const { data: clsName } = selectName
+        ? { data: selectName }
+        : columns.find((el) => el.name === column) || {};
+    const { arr } = (await getSelect(clsName || column, pg)) || {};
     const original = filtered
-        ? `with c(id,text) as (select ${column} as id, ${column} as text from ${loadTable?.table || table} group by ${column}) select id, text from c`
-        : `with c(id,text) as (select ${column}  as id, ${column} as text, count(*) from ${loadTable?.table || table} group by ${column} limit ${defaultLimit}) select * from c`;
+        ? `with c(id,text) as (select ${column} as id, ${column} as text from ${tableName} group by ${column}) select id, text from c`
+        : `with c(id,text) as (select ${column}  as id, ${column} as text, count(*) from ${tableName} group by ${column} limit ${defaultLimit}) select * from c`;
     return {
         arr,
         original,
@@ -22,10 +26,13 @@ async function getTableColumnMeta({ table, column, filtered, startsWith, key, pg
     };
 }
 export default async function suggest(req, reply) {
-    const { params, query, pg: pg1, user } = req;
-    const lang = query.lang || "ua";
     const time = Date.now();
-    const parent = query.parent || "";
+    const { params, user, query = {}, pg: pg1 = pgClients.client } = req;
+    const { lang = "ua", parent = "" } = query;
+    const debugMode = config.local ||
+        user?.user_type?.includes?.("admin") ||
+        process.env.NODE_ENV === "test" ||
+        process.env.VITEST;
     if (params?.data && params.data?.startsWith?.("hash-")) {
         const filepath = path.join(process.cwd(), `/log/suggest/${params.data.replace("hash-", "")}.json`);
         if (existsSync(filepath)) {
@@ -33,40 +40,26 @@ export default async function suggest(req, reply) {
             params.data = `${table}:${column}`;
         }
     }
-    const [table, column] = params.data?.includes(":")
+    const [table1, column1] = params.data?.includes(":")
         ? params.data.split(":")
         : [query.token, query.column];
     const selectName = query.sel || params.data;
+    const table = table1 || query.token;
+    const column = column1 || query.column;
     if (!selectName) {
         return reply.status(400).send({
             error: "name is required",
             code: 400,
         });
     }
-    const { body: hookBody } = table || query.token
+    const { body: hookBody } = table
         ? (await applyHook("preSuggest", {
             pg: pg1,
-            table: table || query.token,
+            table,
         })) || {}
         : {};
-    const body = await getTemplate("table", table || query.token);
-    const tableName = hookBody?.table || body?.table || table || query.token;
-    if (table && !pg1.pk?.[tableName]) {
-        return reply.status(400).send({
-            error: "param name is invalid: 1",
-            code: 400,
-        });
-    }
-    const tableMeta = await getMeta({ pg: pg1, table: tableName });
-    const columnExists = (hookBody?.columns ||
-        body?.columns ||
-        tableMeta?.columns)?.find((col) => col?.name === (column || query.column));
-    if (table && (!column || !columnExists)) {
-        return reply.status(400).send({
-            error: "param name is invalid: 2",
-            code: 400,
-        });
-    }
+    const body = await getTemplate("table", table);
+    const tableName = hookBody?.table || body?.table || table;
     if (query.limit && query.limit < 0) {
         return reply.status(400).send({
             error: "param limit is invalid",
@@ -75,20 +68,20 @@ export default async function suggest(req, reply) {
     }
     const meta = tableName && column
         ? await getTableColumnMeta({
-            table,
+            table: tableName,
+            template: tableName && table && tableName !== table ? table : undefined,
             column,
-            filtered: query?.key || query?.val,
+            selectName,
+            filtered: query.key || query.val,
             startsWith: !!query.start,
             key: query.key,
-            pg: pg1,
         })
         : await getSelectMeta({
             name: selectName,
-            nocache: query?.nocache,
+            nocache: query.nocache,
             startsWith: !!query.start,
             key: query.key,
             parent,
-            pg: pg1,
         });
     if (meta?.minLength && query.key && query.key.length < meta?.minLength) {
         return reply.status(400).send({
@@ -97,7 +90,32 @@ export default async function suggest(req, reply) {
         });
     }
     const limit = meta?.limit || defaultLimit;
-    const pg = meta?.db ? getPG(meta.db) : pg1;
+    const pg = meta?.db ? await getPGAsync(meta.db) : pg1;
+    if (!pg || !pg.pk || !pg.pgType) {
+        return reply.status(400).send({
+            error: "pg connection not established",
+            code: 400,
+        });
+    }
+    if (table && !pg?.pk?.[tableName]) {
+        return reply.status(400).send({
+            error: "param name is invalid: 1",
+            code: 400,
+        });
+    }
+    const columns = hookBody?.columns || body?.columns
+        ? hookBody?.columns || body?.columns
+        : await getMeta({
+            pg,
+            table: tableName,
+        }).then((el) => el?.columns || []);
+    const { name: columnName, dataTypeID } = (columns || []).find((col) => col?.name === column) || {};
+    if (table && (!column || !columnName)) {
+        return reply.status(400).send({
+            error: "param name is invalid: 2",
+            code: 400,
+        });
+    }
     if (!meta) {
         return reply.status(404).send({
             error: "Not found query select",
@@ -108,28 +126,19 @@ export default async function suggest(req, reply) {
         return meta;
     }
     const { arr, searchQuery } = meta;
-    if (arr && query.token && query.column) {
-        const loadTable = await getTemplate("table", query.token);
-        const { columns = [] } = await getMeta({
-            pg,
-            table: loadTable?.table || tableName,
-        });
-        const column1 = columns.find((el) => el.name === query.column);
-        const args = { table: tableName };
-        if (!column1)
-            return [];
+    if (arr && table && column) {
         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"))) {
+            ? `select value, count(*) from (select ${pg.pgType?.[dataTypeID]?.includes("[]")
+                ? `unnest(${columnName})`
+                : `${columnName}`} as value from ${tableName.replace(/'/g, "''")} where ${hookBody?.query || body?.query || "1=1"})q group by value`
+            : `select array_agg(distinct value)::text[] from (select ${pg.pgType?.[dataTypeID]?.includes("[]")
+                ? `unnest(${columnName})`
+                : `${columnName}`} as value from ${tableName.replace(/'/g, "''")} where ${hookBody?.query || body?.query || "1=1"})q`;
+        if (query.sql && debugMode) {
             return sqlCls;
         }
-        if (pg.pk?.[loadTable?.table || tableName] && column1?.name) {
-            const qRes = await pg.queryCache(sqlCls, args);
+        if (tableName && pg?.pk?.[tableName] && columnName) {
+            const qRes = await pg.queryCache(sqlCls, { table: tableName });
             const vals = (query.count
                 ? qRes.rows?.map?.((el) => el.value?.toString?.())
                 : qRes.rows?.[0]?.array_agg) || [];
@@ -152,9 +161,9 @@ export default async function suggest(req, reply) {
             if (config.debug) {
                 logger.file("suggest/debug", {
                     type: 1,
-                    loadTable: loadTable?.table,
+                    table,
                     tableName,
-                    column: column?.name,
+                    column: columnName,
                     data,
                     data1,
                     data2,
@@ -167,9 +176,7 @@ export default async function suggest(req, reply) {
                 count: data.length,
                 total: arr.length,
                 mode: "array",
-                sql: config.local || user?.user_type?.includes?.("admin")
-                    ? sqlCls
-                    : undefined,
+                sql: debugMode ? sqlCls : undefined,
                 data,
             };
         }
@@ -211,22 +218,13 @@ export default async function suggest(req, reply) {
     const where = [search, val, meta.pk ? `${meta.pk} is not null` : null]
         .filter(Boolean)
         .join(" and ") || "true";
-    const loadTable = await getTemplate("table", query.token);
-    const tableName1 = hookBody?.table || loadTable?.table || query.token;
-    const { columns = [] } = await getMeta({ pg: pg1, table: tableName1 });
-    const { name: filterColumn, dataTypeID } = query.column
-        ? columns.find((el) => el.name === query.column) || {}
-        : {};
-    const filter = query.token &&
-        pg.pk?.[loadTable?.table || query.token] &&
-        filterColumn &&
-        dataTypeID
+    const filter = table && pg.pk?.[table] && columnName && dataTypeID
         ? `id in (select ${pg.pgType[dataTypeID]?.includes("[]")
-            ? `unnest(${filterColumn})`
-            : filterColumn} from ${(loadTable?.table || query.token).replace(/'/g, "''")})`
+            ? `unnest(${columnName})`
+            : columnName} from ${table.replace(/'/g, "''")})`
         : "true";
     const sqlSuggest = `with c(id,text) as ( ${meta.original.replace(/{{parent}}/gi, parent)} where ${where} ${meta.original.includes("order by") ? "" : "order by 2"}) select * from c where ${filter} limit ${Math.min(query.limit || meta.limit || limit, limit)}`.replace(/{{uid}}/g, user?.uid || "0");
-    if (query.sql && (config.local || user?.user_type?.includes?.("admin"))) {
+    if (query.sql && debugMode) {
         return sqlSuggest;
     }
     // query
@@ -248,9 +246,7 @@ export default async function suggest(req, reply) {
             total: meta.count - 0,
             mode: type === "cls" ? "array" : "sql",
             db: meta.db,
-            sql: config.local || user?.user_type?.includes?.("admin")
-                ? sqlSuggest
-                : undefined,
+            sql: debugMode ? sqlSuggest : undefined,
             data: data.map((el) => ({
                 count: el.count,
                 id: el.id,
@@ -284,9 +280,7 @@ export default async function suggest(req, reply) {
         total: meta.count - 0,
         mode: "sql",
         db: meta.db,
-        sql: config.local || user?.user_type?.includes?.("admin")
-            ? sqlSuggest
-            : undefined,
+        sql: debugMode ? sqlSuggest : undefined,
         data,
     };
     return message;

package/package.json

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