@opengis/fastify-table 1.1.51 → 1.1.52

package/test/helper/formatDate.test.js

@@ -1,62 +1,62 @@
-import { test } from 'node:test';
-import assert from 'node:assert';
-
-import { handlebars } from '../../utils.js';
-
-await test('formatDate helper', async () => {
-  await test('should format the date as "dd.mm.yy hh:mi" by default', async () => {
-    const template = handlebars.compile('{{formatDate "2021-09-08T12:22:27.983" format="dd.mm.yy hh:mi"}}');
-    const result = await template({});
-    assert.equal(result, '08.09.2021 12:22');
-  });
-
-  await test('should shift the date by 5 days', async () => {
-    const template = handlebars.compile('{{formatDate "2021-09-08T12:22:27.983" shift=5 format="dd.mm.yy"}}');
-    const result = await template({});
-    assert.equal(result, '13.09.2021');
-  });
-
-  await test('should format the date with Ukrainian month name', async () => {
-    const template = handlebars.compile('{{formatDate "2021-09-08T12:22:27.983" format="dd month yy" lang="ua"}}');
-    const result = await template({});
-    assert.equal(result, '08 Вересень 2021');
-  });
-
-  await test('should format the date with English month name', async () => {
-    const template = handlebars.compile('{{formatDate "2021-09-08T12:22:27.983" format="dd mw_en yy" lang="en"}}');
-    const result = await template({});
-    assert.equal(result, '08 september 2021');
-  });
-
-  await test('should format the current date if input is 0', async () => {
-    const template = handlebars.compile('{{formatDate 0 format="dd.mm.yy"}}');
-    const currentDate = new Date();
-    const expected = `${(`0${currentDate.getDate()}`).slice(-2)}.${(`0${currentDate.getMonth() + 1}`).slice(-2)}.${currentDate.getFullYear()}`;
-    const result = await template({});
-    assert.equal(result, expected);
-  });
-
-  await test('should format the date with time (hh:mi:sec)', async () => {
-    const template = handlebars.compile('{{formatDate "2021-09-08T12:22:27.983" format="dd.mm.yy hh:mi:sec"}}');
-    const result = await template({});
-    assert.equal(result, '08.09.2021 12:22:27');
-  });
-
-  await test('should shift the year by 1', async () => {
-    const template = handlebars.compile('{{formatDate "2021-09-08T12:22:27.983" shift_year=1 format="dd.mm.yy"}}');
-    const result = await template({});
-    assert.equal(result, '08.09.2022');
-  });
-
-  await test('should truncate the date to the first day of the year', async () => {
-    const template = handlebars.compile('{{formatDate "2021-09-08T12:22:27.983" trunc="year" format="dd.mm.yy"}}');
-    const result = await template({});
-    assert.equal(result, '01.01.2021');
-  });
-
-  await test('should truncate the date to the first day of the quarter', async () => {
-    const template = handlebars.compile('{{formatDate "2021-09-08T12:22:27.983" trunc="quarter" format="dd.mm.yy"}}');
-    const result = await template({});
-    assert.equal(result, '01.07.2021');
-  });
-});
+import { test } from 'node:test';
+import assert from 'node:assert';
+
+import { handlebars } from '../../utils.js';
+
+await test('formatDate helper', async () => {
+  await test('should format the date as "dd.mm.yy hh:mi" by default', async () => {
+    const template = handlebars.compile('{{formatDate "2021-09-08T12:22:27.983" format="dd.mm.yy hh:mi"}}');
+    const result = await template({});
+    assert.equal(result, '08.09.2021 12:22');
+  });
+
+  await test('should shift the date by 5 days', async () => {
+    const template = handlebars.compile('{{formatDate "2021-09-08T12:22:27.983" shift=5 format="dd.mm.yy"}}');
+    const result = await template({});
+    assert.equal(result, '13.09.2021');
+  });
+
+  await test('should format the date with Ukrainian month name', async () => {
+    const template = handlebars.compile('{{formatDate "2021-09-08T12:22:27.983" format="dd month yy" lang="ua"}}');
+    const result = await template({});
+    assert.equal(result, '08 Вересень 2021');
+  });
+
+  await test('should format the date with English month name', async () => {
+    const template = handlebars.compile('{{formatDate "2021-09-08T12:22:27.983" format="dd mw_en yy" lang="en"}}');
+    const result = await template({});
+    assert.equal(result, '08 september 2021');
+  });
+
+  await test('should format the current date if input is 0', async () => {
+    const template = handlebars.compile('{{formatDate 0 format="dd.mm.yy"}}');
+    const currentDate = new Date();
+    const expected = `${(`0${currentDate.getDate()}`).slice(-2)}.${(`0${currentDate.getMonth() + 1}`).slice(-2)}.${currentDate.getFullYear()}`;
+    const result = await template({});
+    assert.equal(result, expected);
+  });
+
+  await test('should format the date with time (hh:mi:sec)', async () => {
+    const template = handlebars.compile('{{formatDate "2021-09-08T12:22:27.983" format="dd.mm.yy hh:mi:sec"}}');
+    const result = await template({});
+    assert.equal(result, '08.09.2021 12:22:27');
+  });
+
+  await test('should shift the year by 1', async () => {
+    const template = handlebars.compile('{{formatDate "2021-09-08T12:22:27.983" shift_year=1 format="dd.mm.yy"}}');
+    const result = await template({});
+    assert.equal(result, '08.09.2022');
+  });
+
+  await test('should truncate the date to the first day of the year', async () => {
+    const template = handlebars.compile('{{formatDate "2021-09-08T12:22:27.983" trunc="year" format="dd.mm.yy"}}');
+    const result = await template({});
+    assert.equal(result, '01.01.2021');
+  });
+
+  await test('should truncate the date to the first day of the quarter', async () => {
+    const template = handlebars.compile('{{formatDate "2021-09-08T12:22:27.983" trunc="quarter" format="dd.mm.yy"}}');
+    const result = await template({});
+    assert.equal(result, '01.07.2021');
+  });
+});

package/test/templates/cls/test.json

@@ -1,10 +1,10 @@
-[
-    {
-        "id": 1,
-        "text": "test"
-    },
-    {
-        "id": 2,
-        "text": "test2"
-    }
+[
+    {
+        "id": 1,
+        "text": "test"
+    },
+    {
+        "id": 2,
+        "text": "test2"
+    }
 ]

package/test/templates/form/cp_building.form.json

@@ -1,33 +1,33 @@
-{
-    "schema": {
-        
-        "cp_umuni_id": {
-            "type": "Text",
-            "ua": "ID UMUNI"
-        },
-        "cp_year": {
-            "type": "Text",
-            "ua": "Рік будівництва"
-        },
-        "cp_date_en_audit": {
-            "type": "DatePicker",
-            "ua": "Дата проведення останнього енергоаудиту"
-        },
-        "cp_certificate": {
-            "type": "Text",
-            "ua": "Сертифікат енергоефективності будівлі",
-            "help": "Вкажіть посилання"
-        },
-        "cp_pkd": {
-            "type": "Autocomplete",
-            "data": "customer_name",
-            "add": {
-                "model": "crm_acc.crm_account",
-                "ua": "Додати",
-                "form": "account_light.form"
-            },
-            "ua": "Замовник ПКД"
-        }
-    },
-    "label_style": "vertical"
+{
+    "schema": {
+        
+        "cp_umuni_id": {
+            "type": "Text",
+            "ua": "ID UMUNI"
+        },
+        "cp_year": {
+            "type": "Text",
+            "ua": "Рік будівництва"
+        },
+        "cp_date_en_audit": {
+            "type": "DatePicker",
+            "ua": "Дата проведення останнього енергоаудиту"
+        },
+        "cp_certificate": {
+            "type": "Text",
+            "ua": "Сертифікат енергоефективності будівлі",
+            "help": "Вкажіть посилання"
+        },
+        "cp_pkd": {
+            "type": "Autocomplete",
+            "data": "customer_name",
+            "add": {
+                "model": "crm_acc.crm_account",
+                "ua": "Додати",
+                "form": "account_light.form"
+            },
+            "ua": "Замовник ПКД"
+        }
+    },
+    "label_style": "vertical"
 }

package/test/templates/select/account_id.json

@@ -1,4 +1,4 @@
-{
-    "db": "mbk_lviv_dma",
-    "searchColumn": "alternative_name"
+{
+    "db": "mbk_lviv_dma",
+    "searchColumn": "alternative_name"
 }

package/test/templates/select/storage.data.json

@@ -1,3 +1,3 @@
-{
-    "key": "dataset_id"
+{
+    "key": "dataset_id"
 }

package/test/templates/select/test.storage.data.json

@@ -1,4 +1,4 @@
-{   
-    "key": "dataset_id",
-    "searchColumn": "table_name"
+{   
+    "key": "dataset_id",
+    "searchColumn": "table_name"
 }

package/test/templates/select/test.suggest.ato_new.json

@@ -1,4 +1,4 @@
-{
-    "db": "mbk_state_old",
-    "port": 5437
+{
+    "db": "mbk_state_old",
+    "port": 5437
 }

package/test/templates/select/test.suggest.ato_new.sql

@@ -1,26 +1,26 @@
-select
-    codifier,
-    case
-        when object_type = 'A' then name_ua
-        else case
-            when object_type in ('P', 'H', 'O', 'B') then name_ua || ' ' || prefix_ua
-            else prefix_ua || ' ' || name_ua
-        end
-    end as title
-from
-    ato_new.ato_new_all
-    left join ato_new.ato_settings_city_and_terrytory on ato_type = object_type
-where
-    codifier is not null
-union
-all
-select
-    country_id,
-    name_ua as title
-from
-    ato_new.country
-where
-    country_id = '2845832997045798794'
-union
-all
+select
+    codifier,
+    case
+        when object_type = 'A' then name_ua
+        else case
+            when object_type in ('P', 'H', 'O', 'B') then name_ua || ' ' || prefix_ua
+            else prefix_ua || ' ' || name_ua
+        end
+    end as title
+from
+    ato_new.ato_new_all
+    left join ato_new.ato_settings_city_and_terrytory on ato_type = object_type
+where
+    codifier is not null
+union
+all
+select
+    country_id,
+    name_ua as title
+from
+    ato_new.country
+where
+    country_id = '2845832997045798794'
+union
+all
 select 'UA00000000000000000', 'Україна'

package/test/templates/select/test.suggest.data.json

@@ -1,5 +1,5 @@
-{   
-    "db": "mbk_poltava",
-    "key": "dataset_id",
-    "searchColumn": "table_name"
+{   
+    "db": "mbk_poltava",
+    "key": "dataset_id",
+    "searchColumn": "table_name"
 }

package/test/templates/select/test.suggest.parent.sql

@@ -1,2 +1,2 @@
-select dataset_id, dataset_name, table_name from gis.dataset
+select dataset_id, dataset_name, table_name from gis.dataset
 where   dataset_id = '{{parent}}'

package/test/templates/table/gis.dataset.table.json

@@ -1,21 +1,21 @@
-{
-    "columns": [
-        {
-            "name": "dataset_id",
-            "title": "22"
-        },
-        {
-            "name": "dataset_name",
-            "title": "dataset_name"
-        }
-    ],
-    "table": "gis.dataset",
-    "order": "dataset_name",
-    "filters": [
-        {
-            "ua": "Назва набору",
-            "name": "dataset_name",
-            "type": "text"
-        }
-    ]
+{
+    "columns": [
+        {
+            "name": "dataset_id",
+            "title": "22"
+        },
+        {
+            "name": "dataset_name",
+            "title": "dataset_name"
+        }
+    ],
+    "table": "gis.dataset",
+    "order": "dataset_name",
+    "filters": [
+        {
+            "ua": "Назва набору",
+            "name": "dataset_name",
+            "type": "text"
+        }
+    ]
 }

package/user/controllers/user.cls.id.js

@@ -1,14 +1,14 @@
-import userCls from './user.cls.js';
-
-export default async function userClsId(req) {
-  const { id } = req.params || {};
-  const res = await userCls(req);
-  if (req.query?.sql || res?.error) {
-    return res;
-  }
-  const { rows = [] } = res?.message || {};
-  if (!rows?.length) {
-    return { message: `cls not found: ${id}`, status: 404 };
-  }
-  return { message: rows?.[0], status: 200 };
-}
+import userCls from './user.cls.js';
+
+export default async function userClsId(req) {
+  const { id } = req.params || {};
+  const res = await userCls(req);
+  if (req.query?.sql || res?.error) {
+    return res;
+  }
+  const { rows = [] } = res?.message || {};
+  if (!rows?.length) {
+    return { message: `cls not found: ${id}`, status: 404 };
+  }
+  return { message: rows?.[0], status: 200 };
+}

package/user/controllers/user.cls.js

@@ -1,75 +1,71 @@
-import { readFile } from 'fs/promises';
-import { getSelect, getTemplatePath } from '../../utils.js';
-
-export default async function userCls(req) {
-  const {
-    pg, params = {}, query = {}, session = {},
-  } = req;
-  const { uid } = session.passport?.user || {};
-
-  if (!uid) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  if (query.type && !['json', 'sql'].includes(query.type)) {
-    return { message: 'param type is invalid', status: 400 };
-  }
-
-  const q = `select user_clsid as id, name, type, 
-  case when type='json' then (
-      ${params?.id
-    ? `(with recursive rows as (
-        select user_clsid, code as id, name as text, icon, color, parent
-        from admin.user_cls a
-        where name=u.name
-        union all
-        select a.user_clsid, a.code, a.name, a.icon, a.color, a.parent
-        from admin.user_cls a
-        join rows b on a.parent=b.text
-      ) select json_agg(row_to_json(q)) from rows q where text<>u.name
-     )`
-    : 'select count(*)::int from admin.user_cls where parent=u.name'} ) else null end as children, 
-      case when type='sql' then data else null end as sql from admin.user_cls u
-    where (case when type='json' then parent is null else true end)
-    and uid=(select uid from admin.users where $1 in (login,uid) limit 1)
-    and parent is null and ${query.type ? `type='${query.type}'` : '1=1'} and ${params?.id ? 'u.name=$2' : '1=1'}`;
-
-  if (query?.sql) return q;
-
-  try {
-    const { rows = [] } = await pg.query(q, [uid, params.id].filter((el) => el));
-
-    rows.forEach((row) => {
-      if (row.type === 'sql') delete row.children;
-      if (row.type === 'json') { delete row.sql; Object.assign(row, { children: row.children || (params?.id ? [] : 0) }); }
-    });
-
-    const clsList = query.type === 'sql' ? [] : getTemplatePath('cls'); // skip cls if type sql
-    const selectList = query.type === 'json' ? [] : getTemplatePath('select'); // skip sql if type json
-
-    const userClsNames = rows.map((el) => el.name);
-    const selectNames = selectList.map((el) => el[0]);
-
-    const arr = (clsList || []).concat(selectList || []).map((el) => ({ name: el[0], path: el[1], type: el[2] }))
-      ?.filter((el) => (params?.id ? el.name === params?.id : true))
-      ?.filter((el) => ['sql', 'json'].includes(el?.type) && !userClsNames.includes(el.name))
-      ?.filter((el) => (el?.type === 'json' ? !selectNames?.includes(el?.name) : true));
-
-    const res = await Promise.all(arr?.map(async (el) => {
-      const type = { json: 'cls', sql: 'select' }[el.type] || el.type;
-      // const clsData = await getSelect(type, el.name);
-      const str = await readFile(el.path, 'utf-8');
-      const clsData = type === 'cls' ? JSON.parse(str) : str;
-      if (type === 'cls') {
-        const children = params?.id ? clsData : clsData?.length || 0;
-        return { name: el.name, type: el.type, children };
-      }
-      return { name: el.name, type: el.type, sql: clsData?.sql || clsData };
-    }));
-
-    return { message: { rows: rows.concat(res) }, status: 200 };
-  }
-  catch (err) {
-    return { error: err.toString(), status: 200 };
-  }
-}
+import { readFile } from 'fs/promises';
+import { getSelect, getTemplatePath } from '../../utils.js';
+
+export default async function userCls(req) {
+  const {
+    pg, params = {}, query = {}, session = {},
+  } = req;
+  const { uid } = session.passport?.user || {};
+
+  if (!uid) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  if (query.type && !['json', 'sql'].includes(query.type)) {
+    return { message: 'param type is invalid', status: 400 };
+  }
+
+  const q = `select user_clsid as id, name, type, 
+  case when type='json' then (
+      ${params?.id
+    ? `(with recursive rows as (
+        select user_clsid, code as id, name as text, icon, color, parent
+        from admin.user_cls a
+        where name=u.name
+        union all
+        select a.user_clsid, a.code, a.name, a.icon, a.color, a.parent
+        from admin.user_cls a
+        join rows b on a.parent=b.text
+      ) select json_agg(row_to_json(q)) from rows q where text<>u.name
+     )`
+    : 'select count(*)::int from admin.user_cls where parent=u.name'} ) else null end as children, 
+      case when type='sql' then data else null end as sql from admin.user_cls u
+    where (case when type='json' then parent is null else true end)
+    and uid=(select uid from admin.users where $1 in (login,uid) limit 1)
+    and parent is null and ${query.type ? `type='${query.type}'` : '1=1'} and ${params?.id ? 'u.name=$2' : '1=1'}`;
+
+  if (query?.sql) return q;
+
+
+    const { rows = [] } = await pg.query(q, [uid, params.id].filter((el) => el));
+
+    rows.forEach((row) => {
+      if (row.type === 'sql') delete row.children;
+      if (row.type === 'json') { delete row.sql; Object.assign(row, { children: row.children || (params?.id ? [] : 0) }); }
+    });
+
+    const clsList = query.type === 'sql' ? [] : getTemplatePath('cls'); // skip cls if type sql
+    const selectList = query.type === 'json' ? [] : getTemplatePath('select'); // skip sql if type json
+
+    const userClsNames = rows.map((el) => el.name);
+    const selectNames = selectList.map((el) => el[0]);
+
+    const arr = (clsList || []).concat(selectList || []).map((el) => ({ name: el[0], path: el[1], type: el[2] }))
+      ?.filter((el) => (params?.id ? el.name === params?.id : true))
+      ?.filter((el) => ['sql', 'json'].includes(el?.type) && !userClsNames.includes(el.name))
+      ?.filter((el) => (el?.type === 'json' ? !selectNames?.includes(el?.name) : true));
+
+    const res = await Promise.all(arr?.map(async (el) => {
+      const type = { json: 'cls', sql: 'select' }[el.type] || el.type;
+      // const clsData = await getSelect(type, el.name);
+      const str = await readFile(el.path, 'utf-8');
+      const clsData = type === 'cls' ? JSON.parse(str) : str;
+      if (type === 'cls') {
+        const children = params?.id ? clsData : clsData?.length || 0;
+        return { name: el.name, type: el.type, children };
+      }
+      return { name: el.name, type: el.type, sql: clsData?.sql || clsData };
+    }));
+
+    return { message: { rows: rows.concat(res) }, status: 200 };
+}

package/user/controllers/user.cls.post.js

@@ -1,55 +1,52 @@
-export default async function userClsPost({
-  pg, body = {}, session = {},
-}) {
-  const { uid } = session.passport?.user || {};
-  const {
-    name, type = 'json', children = [], sql,
-  } = body;
-
-  if (!uid) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  if (!name) {
-    return { message: 'not enough params: name', status: 400 };
-  }
-
-  if (type === 'json' && (!Array.isArray(children) || !children.length || !children?.[0]?.id)) {
-    return { message: 'invalid params: children (array of objects)', status: 400 };
-  }
-
-  if (type === 'sql' && (!sql || typeof sql !== 'string')) {
-    return { message: 'invalid params: sql (string)', status: 400 };
-  }
-
-  try {
-    const { rowCount = 0 } = await pg.query(`with recursive rows as (
-      select user_clsid, name, code, icon, color, parent
-      from admin.user_cls a
-      where name=$1
-      union all
-      select a.user_clsid, a.name, a.code, a.icon, a.color, a.parent
-      from admin.user_cls a
-      join rows b on a.parent=b.name
-    ) delete from admin.user_cls where user_clsid in (select user_clsid from rows )`, [name]);
-    console.log('delete old user cls', name, rowCount);
-
-    const { id, data } = await pg.query('insert into admin.user_cls(name,type,data,uid) values($1,$2,$3,$4) returning user_clsid as id, data', [name, type, sql, uid])
-      .then((res) => res.rows?.[0] || {});
-    if (type === 'json') {
-      if (!id) { return { error: 'insert user cls error', status: 500 }; }
-      const q1 = `insert into admin.user_cls(code,name,color,icon,parent,uid)
-      
-      select value->>'id',value->>'text',value->>'color',value->>'icon', '${name.replace(/'/g, "''")}', '${uid}'
-      from json_array_elements('${JSON.stringify(children).replace(/'/g, "''")}'::json)
-      
-      returning user_clsid as id, code, name, parent`;
-      const { rows = [] } = await pg.query(q1);
-      return { id, children: rows };
-    }
-    return { id, data };
-  }
-  catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}
+export default async function userClsPost({
+  pg, body = {}, session = {},
+}) {
+  const { uid } = session.passport?.user || {};
+  const {
+    name, type = 'json', children = [], sql,
+  } = body;
+
+  if (!uid) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  if (!name) {
+    return { message: 'not enough params: name', status: 400 };
+  }
+
+  if (type === 'json' && (!Array.isArray(children) || !children.length || !children?.[0]?.id)) {
+    return { message: 'invalid params: children (array of objects)', status: 400 };
+  }
+
+  if (type === 'sql' && (!sql || typeof sql !== 'string')) {
+    return { message: 'invalid params: sql (string)', status: 400 };
+  }
+
+
+    const { rowCount = 0 } = await pg.query(`with recursive rows as (
+      select user_clsid, name, code, icon, color, parent
+      from admin.user_cls a
+      where name=$1
+      union all
+      select a.user_clsid, a.name, a.code, a.icon, a.color, a.parent
+      from admin.user_cls a
+      join rows b on a.parent=b.name
+    ) delete from admin.user_cls where user_clsid in (select user_clsid from rows )`, [name]);
+    console.log('delete old user cls', name, rowCount);
+
+    const { id, data } = await pg.query('insert into admin.user_cls(name,type,data,uid) values($1,$2,$3,$4) returning user_clsid as id, data', [name, type, sql, uid])
+      .then((res) => res.rows?.[0] || {});
+    if (type === 'json') {
+      if (!id) { return { error: 'insert user cls error', status: 500 }; }
+      const q1 = `insert into admin.user_cls(code,name,color,icon,parent,uid)
+      
+      select value->>'id',value->>'text',value->>'color',value->>'icon', '${name.replace(/'/g, "''")}', '${uid}'
+      from json_array_elements('${JSON.stringify(children).replace(/'/g, "''")}'::json)
+      
+      returning user_clsid as id, code, name, parent`;
+      const { rows = [] } = await pg.query(q1);
+      return { id, children: rows };
+    }
+    return { id, data };
+
+}