@opengis/fastify-table 1.2.81 → 1.2.83

package/package.json

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

package/server/plugins/crud/funcs/dataDelete.js

@@ -1,6 +1,7 @@
 import getPG from '../../pg/funcs/getPG.js';
 import getMeta from '../../pg/funcs/getMeta.js';
 import getRedis from '../../redis/funcs/getRedis.js';
+import pgClients from '../../pg/pgClients.js';
 
 import extraData from '../../extra/extraData.js';
 import logChanges from './utils/logChanges.js';
@@ -11,6 +12,16 @@ export default async function dataDelete({
   table, tokenData, referer, id, pg: pg1, uid,
 }) {
   const pg = pg1 || getPG({ name: 'client' });
+
+  // pg client single transaction support
+  if (!pg.pk) {
+    pg.options = pgClients.client?.options;
+    pg.tlist = pgClients.client?.tlist;
+    pg.pgType = pgClients.client?.pgType;
+    pg.relkinds = pgClients.client?.relkinds;
+    pg.pk = pgClients.client?.pk;
+  }
+
   const { pk } = await getMeta({ pg, table });
   const table1 = table.replace(/"/g, '');
   if (!pg.tlist?.includes(table1)) return 'table not exist';

package/server/plugins/crud/funcs/dataInsert.js

@@ -1,6 +1,7 @@
 import getPG from '../../pg/funcs/getPG.js';
 import getMeta from '../../pg/funcs/getMeta.js';
 import getRedis from '../../redis/funcs/getRedis.js';
+import pgClients from '../../pg/pgClients.js';
 
 import logChanges from './utils/logChanges.js';
 import extraData from '../../extra/extraData.js';
@@ -11,6 +12,16 @@ export default async function dataInsert({
   id, table, tokenData, referer, data, pg: pg1, uid,
 }) {
   const pg = pg1 || getPG({ name: 'client' });
+
+  // pg client single transaction support
+  if (!pg.pk) {
+    pg.options = pgClients.client?.options;
+    pg.tlist = pgClients.client?.tlist;
+    pg.pgType = pgClients.client?.pgType;
+    pg.relkinds = pgClients.client?.relkinds;
+    pg.pk = pgClients.client?.pk;
+  }
+
   if (!data) return null;
   const { columns } = await getMeta({ pg, table });
   if (!columns) return null;

package/server/plugins/crud/funcs/dataUpdate.js

@@ -1,6 +1,7 @@
 import getPG from '../../pg/funcs/getPG.js';
 import getMeta from '../../pg/funcs/getMeta.js';
 import getRedis from '../../redis/funcs/getRedis.js';
+import pgClients from '../../pg/pgClients.js';
 
 import extraData from '../../extra/extraData.js';
 import logChanges from './utils/logChanges.js';
@@ -24,6 +25,16 @@ export default async function dataUpdate({
   if (!data || !table || !id) return null;
 
   const pg = pg1 || getPG({ name: 'client' });
+
+  // pg client single transaction support
+  if (!pg.pk) {
+    pg.options = pgClients.client?.options;
+    pg.tlist = pgClients.client?.tlist;
+    pg.pgType = pgClients.client?.pgType;
+    pg.relkinds = pgClients.client?.relkinds;
+    pg.pk = pgClients.client?.pk;
+  }
+
   const { columns, pk } = await getMeta({ pg, table });
 
   const names = columns?.map((el) => el.name);

package/server/plugins/crud/funcs/utils/logChanges.js

@@ -1,5 +1,5 @@
 import getTemplate from '../../..//table/funcs/getTemplate.js';
-import { metaFormat } from '@opengis/fastify-table/utils.js';
+import metaFormat from '../../../table/funcs/metaFormat/index.js';
 
 const defaultTitles = {
   editor_date: 'Дата оновлення',
@@ -82,11 +82,9 @@ export default async function logChanges({
       .filter(el => schema[el]?.data)
       .reduce((acc, curr) => Object.assign(acc, { [curr]: schema[curr].data }), {});
 
-    if (data) {
-      await metaFormat({ rows: [data], cls, sufix: false });
-    }
+    const data1 = data ? await metaFormat({ rows: [data], cls, sufix: false, reassign: false }) : null;
 
-    const newObj = Object.fromEntries(Object.entries(data || {}).map(el => ([[titles[el[0]] || defaultTitles[el[0]] || el[0]], el[1]])));
+    const newObj = Object.fromEntries(Object.entries(data1 || {}).map(el => ([[titles[el[0]] || defaultTitles[el[0]] || el[0]], el[1]])));
     const changesData = Object.keys(newObj || {}).map(el => ({
       change_id: changeId,
       entity_key: el,

package/server/plugins/table/funcs/metaFormat/index.js

@@ -1,3 +1,5 @@
+'use strict';
+
 import { handlebars } from '@opengis/fastify-hb/utils.js';
 
 import getTemplate from '../getTemplate.js';
@@ -5,13 +7,15 @@ import getSelectVal from './getSelectVal.js';
 import pgClients from '../../../pg/pgClients.js';
 
 export default async function metaFormat({
-  rows, table, cls, sufix = true,
+  rows: original, table, cls, sufix = true, reassign = true,
 }, pg = pgClients.client) {
   const loadTable = table ? await getTemplate('table', table) : {};
   const selectCols = Object.keys(cls || {}).map(key => ({ name: key, data: cls[key] })).concat(loadTable?.columns?.filter((e) => e.data) || []);
   const metaCls = Object.keys(loadTable?.meta?.cls || {}).map((el) => ({ name: el, data: loadTable?.meta?.cls[el] }));
   const htmlCols = loadTable?.columns?.filter?.((e) => e.name && e.format === 'html' && e.html) || [];
-  if (!selectCols?.length && !metaCls?.length && !htmlCols?.length) return rows;
+  if (!original?.length || !selectCols?.length && !metaCls?.length && !htmlCols?.length) return original;
+
+  const rows = reassign ? original : JSON.parse(JSON.stringify(original));
 
   await Promise.all(htmlCols.map(async (attr) => {
     await Promise.all(rows.filter(row => row?.[attr.name])?.map(async (row) => {