@opengis/fastify-table 2.0.126 → 2.0.127

package/dist/server/plugins/table/funcs/getSelectMeta.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getSelectMeta.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/table/funcs/getSelectMeta.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAWzD,wBAA8B,aAAa,CAAC,EAC1C,IAAI,EACJ,UAAU,EACV,GAAG,EACH,OAAO,EACP,MAAM,EACN,EAAqB,GACtB,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,EAAE,CAAC,EAAE,UAAU,CAAC;CACjB,gBA8GA"}
+{"version":3,"file":"getSelectMeta.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/table/funcs/getSelectMeta.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAWzD,wBAA8B,aAAa,CAAC,EAC1C,IAAI,EACJ,UAAU,EACV,GAAG,EACH,OAAO,EACP,MAAM,EACN,EAAqB,GACtB,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,EAAE,CAAC,EAAE,UAAU,CAAC;CACjB,gBA6GA"}

package/dist/server/plugins/table/funcs/getSelectMeta.js

@@ -16,9 +16,8 @@ export default async function getSelectMeta({ name, startsWith, key, nocache, pa
         return { ...selectMeta[name], searchQuery };
     }
     const cls = await getSelect(name, pg, nocache);
-    const db = typeof cls?.db === "string" ? { database: cls.db } : cls?.db;
     const pg1 = cls?.db
-        ? await getPGAsync({ database: db, port: cls?.port })
+        ? await getPGAsync({ database: cls.db, port: cls?.port })
         : pg;
     if (!cls)
         return null;

package/dist/server/routes/file/controllers/export.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"export.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/export.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAgCzD;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,wBAA8B,WAAW,CACvC,EACE,EAAqB,EACrB,OAAO,EACP,IAAI,EACJ,OAAO,EAAE,QAAQ,EACjB,GAAG,EACH,KAAU,EACV,IAAkB,EAClB,QAAQ,EACR,UAAU,GACX,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,EACD,KAAK,EAAE,YAAY,gBAsYpB"}
+{"version":3,"file":"export.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/export.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAgCzD;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,wBAA8B,WAAW,CACvC,EACE,EAAqB,EACrB,OAAO,EACP,IAAI,EACJ,OAAO,EAAE,QAAQ,EACjB,GAAG,EACH,KAAU,EACV,IAAkB,EAClB,QAAQ,EACR,UAAU,GACX,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,EACD,KAAK,EAAE,YAAY,gBA0YpB"}

package/dist/server/routes/file/controllers/export.js

@@ -187,7 +187,8 @@ export default async function exportTable({ pg = pgClients.client, headers, user
     let page = 1;
     let seq = 0;
     send(`Всього в реєстрі: ${result.total} (${filtered} з урахуванням фільтрів)`);
-    if (!cacheFileJSON || nocache || config.disableCache) {
+    const writeNewJsonl = !cacheFileJSON || nocache || config.disableCache;
+    if (writeNewJsonl) {
         // delete old json line file, prevent append
         if (existsSync(filePathJSON.replace(/.json$/, ".jsonl"))) {
             await rm(filePathJSON.replace(/.json$/, ".jsonl"), {
@@ -250,7 +251,9 @@ export default async function exportTable({ pg = pgClients.client, headers, user
         }
     }
     // convert json line to json array
-    await jsonlToJsonFile(filePathJSON.replace(/.json$/, ".jsonl"));
+    if (writeNewJsonl) {
+        await jsonlToJsonFile(filePathJSON.replace(/.json$/, ".jsonl"));
+    }
     clearInterval(interval);
     if (res.error) {
         send("finish");

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":"AAmEA,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAsWzD"}
+{"version":3,"file":"suggest.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/suggest.ts"],"names":[],"mappings":"AAiHA,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBA6WzD"}

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

@@ -1,21 +1,46 @@
 import path from "node:path";
 import { existsSync, readFileSync } from "node:fs";
-import { config, getPGAsync, getTemplate, getSelectMeta, getMeta, applyHook, getSelectVal, logger, getSelect, metaFormat, getColumnCLS, pgClients, } from "../../../../utils.js";
+import { config, getPGAsync, getTemplate, getSelectMeta, getMeta, applyHook, getSelectVal, logger, getSelect, metaFormat, getColumnCLS, pgClients, getFilter, } from "../../../../utils.js";
 const defaultLimit = 50;
 async function getTableColumnMeta({ table, template, column, selectName, filtered, startsWith, key, pg = pgClients.client, }) {
     if (!table || !column) {
         return null;
     }
-    const { columns, table: tableName } = template
-        ? await getTemplate("table", template)
-        : { table, columns: [] };
+    const metaColumns = await getMeta({
+        pg,
+        table,
+    }).then((el) => el?.columns || []);
+    const { dataTypeID } = (metaColumns || []).find((col) => col?.name === column) || {};
+    const { columns, table: tableName, sql, } = template ? await getTemplate("table", template) : { table, columns: [] };
+    const filters = template
+        ? await getFilter({ pg, table: template }).then((el) => el.list)
+        : null;
     const { data: clsName } = selectName
         ? { data: selectName }
-        : columns.find((el) => el.name === column) || {};
-    const { arr } = (await getSelect(clsName || column, pg)) || {};
+        : (columns || []).find((el) => el.name === column) ||
+            (filters || []).find((el) => el.name === column) ||
+            {};
+    const { arr, sql: select } = (await getSelect(clsName || column, pg)) || {};
+    const sqlTable = (sql || [])
+        .filter((el) => !el.disabled && el.sql && el.sql.includes(column) && false)
+        .map((el, i) => ` left join lateral (${el.sql}) ${el.name || `t${i}`} on 1=1 `)
+        ?.join("") || "";
+    if (pg.pgType?.[dataTypeID]?.includes("[]")) {
+        const original = filtered
+            ? `with c(id,text) as (select id, id as text from (select unnest(${column}) as id from ${tableName} t ${sqlTable})q group by id) select id, text from c`
+            : `with c(id,text) as (select id, id as text, count(*) from (select unnest(${column}) as id from ${tableName} t ${sqlTable})q group by id limit ${defaultLimit}) select * from c`;
+        return {
+            arr,
+            original,
+            searchQuery: startsWith && key
+                ? `(left(lower("text"::text),${key.length}) = $1 )`
+                : '(lower("text"::text) ~ $1 )',
+            pk: "id",
+        };
+    }
     const original = filtered
-        ? `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`;
+        ? `with c(id,text) as (select ${column} as id, ${column} as text from ${tableName} t ${sqlTable} group by ${column}) select id, text from c`
+        : `with c(id,text) as (select ${column}  as id, ${column} as text, count(*) from ${tableName} t ${sqlTable} group by ${column} limit ${defaultLimit}) select * from c`;
     return {
         arr,
         original,
@@ -43,15 +68,8 @@ export default async function suggest(req, reply) {
     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
         ? (await applyHook("preSuggest", {
             pg: pg1,
@@ -66,6 +84,12 @@ export default async function suggest(req, reply) {
             code: 400,
         });
     }
+    const selectName = query.sel ||
+        (tableName && column && body
+            ? body.columns?.find((el) => el.name === column)?.data ||
+                body.meta?.cls?.[column]
+            : null) ||
+        params.data;
     const meta = tableName && column
         ? await getTableColumnMeta({
             table: tableName,
@@ -103,13 +127,18 @@ export default async function suggest(req, reply) {
             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) || {};
+    const columns = hookBody?.columns || body?.columns;
+    const metaColumns = await getMeta({
+        pg,
+        table: tableName,
+    }).then((el) => el?.columns || []);
+    const { name: columnName } = (columns || []).find((col) => col?.name === column) ||
+        (metaColumns || []).find((col) => col?.name === column) ||
+        {};
+    const { dataTypeID } = (metaColumns || []).find((col) => col?.name === column) || {};
+    // const filters =
+    //   hookBody?.filters ||
+    //   (body ? await getFilter({ pg, table }).then((el) => el.list) : null);
     if (table && (!column || !columnName)) {
         return reply.status(400).send({
             error: "param name is invalid: 2",
@@ -126,7 +155,8 @@ export default async function suggest(req, reply) {
         return meta;
     }
     const { arr, searchQuery } = meta;
-    if (arr && table && column) {
+    // table:column + cls
+    if (arr && tableName && column) {
         const sqlCls = query.count
             ? `select value, count(*) from (select ${pg.pgType?.[dataTypeID]?.includes("[]")
                 ? `unnest(${columnName})`
@@ -181,6 +211,7 @@ export default async function suggest(req, reply) {
             };
         }
     }
+    // cls
     if (arr) {
         const lower = query.key?.toLowerCase();
         const data1 = query.key || query.val
@@ -207,32 +238,30 @@ export default async function suggest(req, reply) {
             data,
         };
     }
-    // search
+    // select, with search by text support
     const search = query.key ? searchQuery : null;
-    // val
-    // const pk = meta.originalCols.split(',')[0];
-    // return meta;
+    // filter by value
     const val = query.val
-        ? ` ${meta.pk}=any('{${query.val.replace(/'/g, "''")}}')`
+        ? `${meta.pk}=any('{${query.val.replace(/'/g, "''")}}')`
         : "";
-    const where = [search, val, meta.pk ? `${meta.pk} is not null` : null]
-        .filter(Boolean)
-        .join(" and ") || "true";
-    const filter = table && pg.pk?.[table] && columnName && dataTypeID
+    const filter = tableName && pg.pk?.[tableName] && columnName && dataTypeID
         ? `id in (select ${pg.pgType[dataTypeID]?.includes("[]")
             ? `unnest(${columnName})`
-            : columnName} from ${table.replace(/'/g, "''")})`
+            : columnName} from ${tableName.replace(/'/g, "''")})`
         : "true";
+    const where = [search, val, filter, meta.pk ? `${meta.pk} is not null` : null]
+        .filter(Boolean)
+        .join(" and ") || "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 && debugMode) {
         return sqlSuggest;
     }
-    // query
     const { rows: dataNew } = await pg.query(sqlSuggest, query.key ? [query.key.toLowerCase()] : []);
     // in case id / text = Boolean
     const data = dataNew.filter((el) => Object.hasOwn(el, "id") && Object.hasOwn(el, "text"));
+    // table:column + select
     if (tableName && column) {
-        const { name = query.sel || column, type = "select" } = getColumnCLS(tableName, column) || {};
+        const { name = selectName || column, type = "select" } = getColumnCLS(tableName, column) || {};
         await metaFormat({
             rows: data,
             table: tableName,
@@ -270,7 +299,6 @@ export default async function suggest(req, reply) {
             data,
             dataNew,
             sqlSuggest,
-            // ids,
         });
     }
     const message = {

package/package.json

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