@opengis/fastify-table 1.1.37 → 1.1.39

package/table/funcs/getFilterSQL/util/formatValue.js

@@ -19,9 +19,15 @@ function formatDateISOString(date) {
 }
 
 function formatValue({
-  filterType, filter, name, value, operator = '=', fieldType = 'text', uid = 1, optimize,
+  pg, table, filter = {}, name, value, operator = '=', dataTypeID, uid = 1, optimize,
 }) {
-  if (!name || !value) return {};
+  const { data, sql, extra } = filter;
+  const pk = pg?.pk && table ? pg.pk[table] : undefined;
+
+  if (!dataTypeID && !extra) return {};
+  const fieldType = extra ? pg.pgType?.[{ Date: 1114 }[filter?.type] || 25] : pg.pgType?.[dataTypeID];
+  if (!name || !value || !fieldType) return {};
+  const filterType = filter.type?.toLowerCase();
 
   // current day, week, month, year etc.
   if (dateTypeList.includes(fieldType) && !value?.includes('_') && ['cd', 'cw', 'cm', 'cq', 'cy'].includes(value)) {
@@ -32,26 +38,32 @@ function formatValue({
       cq: `${name}::date >= '${dt(dp.y, dp.q, 1)}'::date and ${name} <= '${dt(dp.y, dp.q + 3, 0)}'::date`,
       cy: `${name}::date >= '${dt(dp.y, 0, 1)}'::date and ${name}::date <= '${dt(dp.y, 11, 31)}'::date`,
     }[value];
-    return { op: '=', query };
+    return { op: '=', query, extra };
   }
+
   // date range
   if (dateTypeList.includes(fieldType) && value?.includes('_')) {
     const [min, max] = value.split('_');
     const query = `${name} >= '${min}'::date and ${name} <= '${max}'::date`;
-    return { op: 'between', query };
+    return { op: 'between', query, extra };
   }
+
   // v3 filter date range, example - "01.01.2024-31.12.2024"
   if (dateTypeList.includes(fieldType) && value?.includes('.') && value?.indexOf('-') === 10 && value?.length === 21) {
     const [startDate, endDate] = value.split('-');
     const min = formatDateISOString(startDate);
     const max = formatDateISOString(endDate);
-    const query = `${name}::date >= '${min}'::date and ${name}::date <= '${max}'::date`;
-    return { op: 'between', query };
+    const query = extra && pk
+      ? `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_date::date >= '${min}'::date and value_date::date <= '${max}'::date)`
+      : `${name}::date >= '${min}'::date and ${name}::date <= '${max}'::date`;
+    return { op: 'between', query, extra };
   }
+
   // my rows
   if (value === 'me' && uid && fieldType === 'text') {
-    return { op: '=', query: `${name}::text = '${uid}'` };
+    return { op: '=', query: extra ? `uid = '${uid}'` : `${name}::text = '${uid}'`, extra };
   }
+
   const formatType = {
     float8: 'numeric',
     int4: 'numeric',
@@ -68,41 +80,47 @@ function formatValue({
       query: fieldType?.includes('[]')
         ? `${optimize.pk} && (select array_agg(${optimize.pk}) from ${optimize.table} where ${name} ${val} )`
         : `${optimize.pk} in (select ${optimize.pk} from ${optimize.table} where ${name} ${val} )`,
+      extra,
     };
   }
 
-  if (filter.sql) {
-    return { op: '~', query: filter.sql.replace('{val}', value) };
-  }
   if (fieldType?.includes('[]')) {
-    return { op: 'in', query: `'{${value}}'::text[] && ${name}::text[]` };
+    return { op: 'in', query: `'{${value}}'::text[] && ${name}::text[]`, extra };
   }
+
   // multiple items of 1 param
   if (value?.indexOf(',') !== -1) {
     const values = value.split(',').filter((el) => el !== 'null');
-    const query = value?.indexOf('null' !== -1)
+    if (extra && pk) {
+      const query = value?.indexOf('null') !== -1
+        ? `${pk} in (select object_id from crm.extra_data where property_key='${name}' and ( value_text is null or value_text in (${values?.map((el) => `'"${el}"'`).join(',')}) ) )`
+        : `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_text in (${values?.map((el) => `'"${el}"'`).join(',')}) )`;
+      return { op: 'in', query, extra };
+    }
+    const query = value?.indexOf('null') !== -1
       ? `( ${name} is null or ${name}::text in (${values?.map((el) => `'${el}'`).join(',')}) )`
       : `${name}::text in (${value.split(',')?.map((el) => `'${el}'`).join(',')})`;
-    return { op: 'in', query };
+    return { op: 'in', query, extra };
   }
 
   // v3 filter number range, example - "100_500"
   if (numberTypeList.includes(fieldType) && value?.indexOf('_') !== -1) {
     const [min, max] = value.split('_');
     const query = (max === 'max' ? `${name} > ${min}` : null) || (min === 'min' ? `${name} < ${max}` : null) || `${name} between ${min} and ${max}`;
-    return { op: 'between', query };
+    return { op: 'between', query, extra };
   }
+
   // number range
   if (numberTypeList.includes(fieldType) && value?.indexOf('-') !== -1) {
     const [min, max] = value.split('-');
     if (min === 'min' && max === 'max') return {};
     const query = (max === 'max' ? `${name} > ${min}` : null) || (min === 'min' ? `${name} < ${max}` : null) || `${name} between ${min} and ${max}`;
-    return { op: 'between', query };
+    return { op: 'between', query, extra };
   }
 
   if (['<', '>'].includes(operator)) {
     const query = `${name} ${operator} '${value}'::${formatType}`;
-    return { op: operator, query };
+    return { op: operator, query, extra };
   }
 
   if (operator === '=' && filterType !== 'text' && !filter?.data) {
@@ -110,12 +128,19 @@ function formatValue({
       null: `${name} is null`,
       notnull: `${name} is not null`,
     }[value] || `${name}::${formatType}='${value}'::${formatType}`;
-    return { op: '=', query };
+    return { op: '=', query, extra };
   }
 
   if (['~', '='].includes(operator)) {
     const operator1 = (filterType === 'text' && (filter?.id || filter?.name) && operator === '=' ? '~' : operator);
     const match = operator1 === '=' ? `='${value}'` : `ilike '%${value}%'`;
+    if (extra && pk) {
+      const query = data && sql
+        ? `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_text in ( ( with q(id,name)  as  (${sql}) select id from q where name ${match})))`
+        : `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_text ${match})`;
+      return { op: 'ilike', query, extra };
+    }
+
     const query = filter?.data && filter?.sql
       ? `${filter?.name || filter?.id} in ( ( with q(id,name)  as  (${filter?.sql}) select id from q where name::text ${match}) )` // filter with cls
       : `${name}::text ${match}`; // simple filter
@@ -127,7 +152,7 @@ function formatValue({
   if (name.includes('.')) {
     const [col, prop] = name.split('.');
     const query = ` ${col}->>'${prop}' in ('${value.join("','")}')`;
-    return { op: 'in', query };
+    return { op: 'in', query, extra };
   }
 
   // geometry
@@ -136,7 +161,7 @@ function formatValue({
 
     if (bbox?.length === 4) {
       const query = ` ${name} && 'box(${bbox[0]} ${bbox[1]},${bbox[2]} ${bbox[3]})'::box2d `;
-      return { op: '&&', query };
+      return { op: '&&', query, extra };
     }
   }
   return {};

package/table/funcs/getFilterSQL/util/getFilterQuery.js

@@ -1,4 +1,5 @@
 /* eslint-disable no-continue */
+
 /**
 * @param {Number} opt.json - (1|0) 1 - Результат - Object, 0 - String
 * @param {String} opt.query - запит до таблиці
@@ -8,18 +9,13 @@
 import formatValue from './formatValue.js';
 
 function getQuery({
-  filter: filterStr, tableSQL, fields, filterList, config = {}, pg,
+  pg, filter: filterStr, table, tableSQL, fields, filterList,
 }) {
   if (!filterStr) return null; // filter list API
 
   const mainOperators = ['=', '~', '>', '<'];
 
-  // v3 filter
-  const { allTemplates } = config;
-
-  const filterQueryArray = config.v3?.filter
-    ? decodeURI(filterStr?.replace(/(^,)|(,$)/g, '')).replace(/'/g, '').split(/[;|]/)
-    : decodeURI(filterStr?.replace(/(^,)|(,$)/g, '')?.replace(/,null/g, '')).replace(/'/g, '').split(/[;|]/);
+  const filterQueryArray = decodeURI(filterStr?.replace(/(^,)|(,$)/g, '')).replace(/'/g, '').split(/[;|]/);
 
   const resultList = [];
 
@@ -33,6 +29,9 @@ function getQuery({
       continue;
     }
 
+    // filter
+    const filter = filterList?.find((el) => [el.id, el.name].includes(name)) || { type: 'text' };
+
     // find all value
     const value = filterQueryArray.filter((el) => el.startsWith(name)).map((el) => el.substring(name.length + 1)).join(',');
 
@@ -40,30 +39,24 @@ function getQuery({
 
     // find field and skip not exists
     const { dataTypeID } = fields?.find((el) => el.name === name) || fields?.find((el) => el.name === optimize?.pk) || {};
-    if (!dataTypeID) continue;
 
-    const type = pg.pgType?.[dataTypeID];
-
-    // filter
-    const filter = filterList?.find((el) => el.id === name) || { type: 'text' };
-    const filterType = filter.type?.toLowerCase();
     // format query
-
-    const { op, query } = formatValue({
-      clsList: allTemplates?.cls || [],
+    const {
+      op, query, filterType, fieldType,
+    } = formatValue({
+      pg,
+      table,
       filter,
       optimize,
-      filterType,
       name,
-      value: decodeURIComponent(value), // decodeURIComponent(value)?.replace(new RegExp(String.raw`\b${name}=\b`, 'g'), '') for checkboxes?
+      value: decodeURIComponent(value),
       operator,
-      fieldType: type || 'text',
+      dataTypeID,
     }) || {};
-    // console.log({ query, value });
     if (!query) continue;
 
     resultList.push({
-      name, value, query, operator: op, filterType, type,
+      name, value, query, operator: op, filterType, type: fieldType,
     });
   }
 

package/test/api/crud.xss.test.js

@@ -1,72 +1,72 @@
-import { test } from 'node:test';
-import assert from 'node:assert';
-
-import build from '../../helper.js';
-
-import setToken from '../../crud/funcs/setToken.js';
-import config from '../config.js';
-
-test('api crud xss', async (t) => {
-  const app = await build(t);
-  const session = { passport: { user: { uid: '1' } } };
-  app.addHook('onRequest', async (req) => {
-    req.session = session;
-  });
-  // app.decorateRequest('session', session);
-
-  const prefix = config.prefix || '/api';
-
-  let addTokens;
-  let editTokens;
-
-  // before
-  t.test('setToken', async () => {
-    addTokens = setToken({
-      ids: [JSON.stringify({ add: 'gis.dataset', form: 'test.dataset.form' })],
-      mode: 'a',
-      uid: 1,
-      array: 1,
-    });
-    editTokens = setToken({
-      ids: [JSON.stringify({ id: '5400000', table: 'gis.dataset', form: 'test.dataset.form' })],
-      mode: 'w',
-      uid: 1,
-      array: 1,
-    });
-    assert.ok(addTokens.length === 1 && editTokens.length === 1, 'invalid token');
-  });
-
-  await t.test('POST /insert', async () => {
-    const res = await app.inject({
-      method: 'POST',
-      url: `${prefix}/table/${addTokens[0]}`,
-      body: { dataset_name: '<a onClick="alert("XSS Injection")">xss injection</a>', dataset_id: '5400000' },
-    });
-
-    const rep = JSON.parse(res?.body);
-    console.log(rep)
-    assert.ok(rep.status, 409);
-  });
-
-  await t.test('PUT /update', async () => {
-    const res = await app.inject({
-      method: 'PUT',
-      url: `${prefix}/table/${editTokens[0]}/${editTokens[0]}`,
-      body: { editor_id: '11', dataset_name: '<a onClick="alert("XSS Injection")">xss injection</a>' },
-    });
-
-    const rep = JSON.parse(res?.body);
-    console.log(rep)
-    assert.equal(rep.status, 409);
-  });
-  await t.test('DELETE /delete', async () => {
-    const res = await app.inject({
-      method: 'DELETE',
-      url: `${prefix}/table/gis.dataset/5400000`,
-    });
-
-    const rep = JSON.parse(res?.body);
-    console.log(rep)
-    assert.ok(rep);
-  });
-});
+import { test } from 'node:test';
+import assert from 'node:assert';
+
+import build from '../../helper.js';
+
+import setToken from '../../crud/funcs/setToken.js';
+import config from '../config.js';
+
+test('api crud xss', async (t) => {
+  const app = await build(t);
+  const session = { passport: { user: { uid: '1' } } };
+  app.addHook('onRequest', async (req) => {
+    req.session = session;
+  });
+  // app.decorateRequest('session', session);
+
+  const prefix = config.prefix || '/api';
+
+  let addTokens;
+  let editTokens;
+
+  // before
+  t.test('setToken', async () => {
+    addTokens = setToken({
+      ids: [JSON.stringify({ add: 'gis.dataset', form: 'test.dataset.form' })],
+      mode: 'a',
+      uid: 1,
+      array: 1,
+    });
+    editTokens = setToken({
+      ids: [JSON.stringify({ id: '5400000', table: 'gis.dataset', form: 'test.dataset.form' })],
+      mode: 'w',
+      uid: 1,
+      array: 1,
+    });
+    assert.ok(addTokens.length === 1 && editTokens.length === 1, 'invalid token');
+  });
+
+  await t.test('POST /insert', async () => {
+    const res = await app.inject({
+      method: 'POST',
+      url: `${prefix}/table/${addTokens[0]}`,
+      body: { dataset_name: '<a onClick="alert("XSS Injection")">xss injection</a>', dataset_id: '5400000' },
+    });
+
+    const rep = JSON.parse(res?.body);
+    console.log(rep)
+    assert.ok(rep.status, 409);
+  });
+
+  await t.test('PUT /update', async () => {
+    const res = await app.inject({
+      method: 'PUT',
+      url: `${prefix}/table/${editTokens[0]}/${editTokens[0]}`,
+      body: { editor_id: '11', dataset_name: '<a onClick="alert("XSS Injection")">xss injection</a>' },
+    });
+
+    const rep = JSON.parse(res?.body);
+    console.log(rep)
+    assert.equal(rep.status, 409);
+  });
+  await t.test('DELETE /delete', async () => {
+    const res = await app.inject({
+      method: 'DELETE',
+      url: `${prefix}/table/gis.dataset/5400000`,
+    });
+
+    const rep = JSON.parse(res?.body);
+    console.log(rep)
+    assert.ok(rep);
+  });
+});

package/test/api/table.test.js

@@ -5,34 +5,72 @@ import init from '../../pg/funcs/init.js';
 
 import build from '../../helper.js';
 import config from '../config.js';
+import { getTemplate } from '../../utils.js';
+
+const table = 'test.rest_zone.table';
 
 test('api table', async (t) => {
   const app = await build(t);
   await init(pgClients.client);
 
+  const body = await getTemplate('table', table);
+  assert.equal(body?.table, 'itree.rest_zones');
+  assert.ok(pgClients.client?.pk?.[body?.table], 'invalid db - skip filter unit test');
+
+  if (pgClients.client?.pk?.[body?.table]) {
+    const custom = body?.filterCustom?.[0] || {};
+    assert.ok(custom.name && custom.sql, 'invalid test template - empty filterCustom');
+    const state = body?.filterState?.[0] || {};
+    assert.ok(state.name && state.sql, 'invalid test template - empty filterState');
+
+    await t.test('GET /data (filter + custom + state + sql)', async () => {
+      const res = await app.inject({
+        method: 'GET',
+        url: `${config.prefix || '/api'}/data/${table}`,
+        query: {
+          custom: custom.name,
+          state: state.name,
+          filter: 'balancer~1;composition=1',
+          sql: 1,
+        },
+      });
+      assert.ok(res.body?.includes(custom.sql), 'filterCustom not ok');
+      assert.ok(res.body?.includes(state.sql), 'filterState not ok');
+      assert.ok(res.body?.includes('balancer::text ilike \'%1%\'  and \'{1}\'::text[] && composition::text[]'), 'filter not ok');
+    });
+  }
+
   const bbox = '20.276526313524393 40.6651677831094,35.27752631352439 50.66616778310941';
-  const { count = 0 } = await pgClients.client.query(`select count(*) from gis.dataset 
-  where geom && 'box(${bbox})'::box2d`)
-    .then((res) => res.rows[0] || {});
+  const { count = 0 } = pgClients.client?.pk[body?.table] ? await pgClients.client.query(`select count(*) from itree.rest_zones
+  where verif and '{1}'::text[] && composition::text[] and geom && 'box(${bbox})'::box2d`).then((res) => res.rows[0] || {}) : {};
 
   await t.test('GET /data (meta bbox / cls)', async () => {
     const res = await app.inject({
       method: 'GET',
-      url: `${config.prefix || '/api'}/data/test.dataset.table?bbox=${bbox}`,
+      url: `${config.prefix || '/api'}/data/${table}`,
+      query: { bbox, filter: 'composition=1' },
     });
     const json = res.json();
-    assert.ok(json?.rows?.length === +count, 'meta bbox - not ok');
-    assert.ok(json?.rows?.length ? json?.rows?.[0]?.dataset_id_text : true, 'meta cls - not ok');
+    const res1 = await app.inject({
+      method: 'GET',
+      url: `${config.prefix || '/api'}/data/${table}`,
+      query: { bbox, sql: 1 },
+    });
+    const { body: sql } = res1;
+    assert.ok(sql?.includes(bbox), 'meta bbox sql - not ok');
+    assert.ok(json?.rows?.length && +count >= json?.rows?.length, 'meta bbox - not ok');
+    assert.ok(json?.rows?.length ? json?.rows?.[0]?.composition_text : true, 'meta cls - not ok');
   });
 
   const polyline = 'wfvkH_jsvCoKvj@oKfiB?fw@?nd@?nK?nK~WgEfE?wQfw@gEfE?vQwQvj@wQvcAoKvQoKnKgEnd@_cBgw@wj@fEwj@nKg^vQg^oK?vQgEnKgpAvj@?vcAfEf^fEf^?vj@vQvj@vQgE~Wvj@?~p@gE~iAfEnK?~iA_XnvA?nd@fEf^~p@~bBvQ?nd@wQ?vQfEf^fEnK?vQ?vj@oKfEoKfEvQnd@nKvj@?vQfEvQgEf^gEf^?vQfEvQfEvQfE~W?fE?fE?~W?f^?nd@?nK?nKfEfEg^oKwj@nK_X~W~p@~WvQnKoKn}@wQvj@oK~Wg^vcAgEnK?~Wfw@vgD~p@oKfpAvQnd@nKoKvQoKvQ?fE?fEnKvj@wQvQ?fEod@fw@~Wn}@fEn}@_Xv|A_jA~fEwQwQ_XoKwQoKoKoKoKoKg^gE_XgEoKg^gEgEgE?gEfEgEfEgEf^_XoKwQ?gEgEoK?wQ?gE~WoKoKoKwQfEgEnK_X?gEgE?oKfEoKoKgE_XgEgEwQfEoKod@_Xgw@gEoKgE_Xg^wQoKg^_XnvAgE?gEvQgE?od@fpA?vQ?f^oKvcAwj@oKg^?wQn}@gEf^oK?w|AnKgE??nKwj@gEgEg^oKwQoKoK?gEwQoaD?oKod@oKod@gEod@wQo}@oKfEf^gEfEgpAnd@_XfEgE?wQnKo}@_q@?gEgEwj@?oK?oK?_X?oKfEoK?oKfEoK?oK?oK?gEfEoKwQfEoK?gEwQwj@nKo}@nKwQ~Wod@nKoKfEgw@ovAgEwQgE??oKoKgEoKgEgEwQ?oKfEoKnKwQfEwQoK?g^fE?wQfEg^fEod@gE??fEoKvQ?nKoKnKgEfEgEgE?g^nK_q@nKod@?oKoKoK~Wgw@fEoKnd@fE?_XfEoKfEwQfEoKfEwQfEoKvQ?fEfE?vj@gE~W~WvQvQwj@vQvQf^o}@nKvQ?_XgEg^gEg^nKod@?wQgEgEgE?oK_XgEoK?oKgEoKgE_XoKg^oKg^oKod@?gEfEoKvQgEnK?nKfE?_Xnd@gw@fEwQf^wj@fEwQnd@w|A?gEgEgEgEwQfEoKfEgEnKoKnKwQfEgE?oKfEoKnKgEnKwQ_XwQnKwcAod@wQvQod@~Wgw@nKgw@oKg^f^ovAgEwQ?_X?od@gEwj@gEwQvQg^fEoKnKoKvQnK~WfEnKvQ~Wod@f^wj@~WoKnKg^~W?vQgE~WoKnKoK~WoKfEwQvQwQfEgEnKwQnKwQvQwQnKoKnKgEnKgEnKgEvQnKnK?fE?fE?~WwQnKgEnKgEfE?fE?nK?fE?fE?vQgEfE?nKfEfE?fE?vQ?~W?~WgEfEgEnKgEnKwQfEnKnKfE?wj@?o}@g^o}@_Xod@?gEf^_X?o}@?wQ~W?~WgE~WgEfE?f^gEf^oK~Wg^nKgE?oK~WwQ?od@nK_XfEwQnKoKfEgEfE~W?f^f^fEfEfEnKfEnK?gEf^vQfEnK?~WnKvQnK?vQf^nKfEfEgE~WnKfEnK?fEgEfE?nK?fEfEfEgEnK?nKgEnK?nKfEf^?vQgEvQ?nd@gEnKo}@vQgE~WgEf^gE'; // UA26040270000047749
 
-  const { count1 } = await pgClients.client.query('select count(*) as count1 from gis.dataset where ST_Contains(ST_MakePolygon(ST_LineFromEncodedPolyline($1)),geom)', [polyline])
+  const { count1 } = await pgClients.client.query('select count(*) as count1 from itree.rest_zones where verif and ST_Contains(ST_MakePolygon(ST_LineFromEncodedPolyline($1)),geom)', [polyline])
     .then((res) => res.rows[0] || {});
   await t.test('GET /data (meta polyline)', async () => {
     const res = await app.inject({
       method: 'GET',
-      url: `${config.prefix || '/api'}/data/test.dataset.table?polyline=${polyline}`,
+      url: `${config.prefix || '/api'}/data/${table}`,
+      query: { polyline },
     });
     const json = res.json();
     assert.ok(json?.rows?.length === +count1, 'meta bbox (polyline) - not ok');

package/test/config.example

@@ -1,18 +1,18 @@
-import config from '../config.js';
-
-Object.assign(config, {
-  folder: 'test/templates',
-  pg: {
-    host: '192.168.3.160',
-    port: 5434,
-    database: 'mbk_rivne_dma',
-    user: 'postgres',
-    password: 'postgres',
-  },
-  redis: {
-    host: '192.168.3.160',
-    port: 6379,
-    family: 4,
-  },
-});
-export default config;
+import config from '../config.js';
+
+Object.assign(config, {
+  folder: 'test/templates',
+  pg: {
+    host: '192.168.3.160',
+    port: 5434,
+    database: 'mbk_rivne_dma',
+    user: 'postgres',
+    password: 'postgres',
+  },
+  redis: {
+    host: '192.168.3.160',
+    port: 6379,
+    family: 4,
+  },
+});
+export default config;

package/test/funcs/pg.test.js

@@ -1,34 +1,34 @@
-import { test } from 'node:test';
-import assert from 'node:assert';
-
-import '../config.js';
-
-import getMeta from '../../pg/funcs/getMeta.js';
-import autoIndex from '../../pg/funcs/autoIndex.js';
-import pgClients from '../../pg/pgClients.js';
-import rclient from '../../redis/client.js';
-// import pgClients from '../../pg/funcs/pgClients.js';
-
-test('funcs pg', async (t) => {
-  await pgClients.client.init();
-  await t.test('getMeta', async () => {
-    const { columns } = await getMeta({ table: 'gis.dataset' });
-    // console.log(columns)
-    assert.ok(columns);
-  });
-
-  /* await t.test('getPG', async (t) => {
-    const data = await getPG({});
-    assert.ok(data);
-  }); */
-
-  await t.test('autoIndex', async () => {
-    await autoIndex({ table: 'gis.dataset', columns: ['service_type'] });
-    assert.ok(1);
-  });
-  t.after(() => {
-    pgClients.client.end();
-
-    rclient.quit();
-  });
-});
+import { test } from 'node:test';
+import assert from 'node:assert';
+
+import '../config.js';
+
+import getMeta from '../../pg/funcs/getMeta.js';
+import autoIndex from '../../pg/funcs/autoIndex.js';
+import pgClients from '../../pg/pgClients.js';
+import rclient from '../../redis/client.js';
+// import pgClients from '../../pg/funcs/pgClients.js';
+
+test('funcs pg', async (t) => {
+  await pgClients.client.init();
+  await t.test('getMeta', async () => {
+    const { columns } = await getMeta({ table: 'gis.dataset' });
+    // console.log(columns)
+    assert.ok(columns);
+  });
+
+  /* await t.test('getPG', async (t) => {
+    const data = await getPG({});
+    assert.ok(data);
+  }); */
+
+  await t.test('autoIndex', async () => {
+    await autoIndex({ table: 'gis.dataset', columns: ['service_type'] });
+    assert.ok(1);
+  });
+  t.after(() => {
+    pgClients.client.end();
+
+    rclient.quit();
+  });
+});

package/test/funcs/redis.test.js

@@ -1,19 +1,19 @@
-import { test } from 'node:test';
-import assert from 'node:assert';
-
-import '../config.js';
-
-import rclient from '../../redis/client.js';
-
-test('funcs redis', async (t) => {
-  await t.test('get/set', async () => {
-    await rclient.set('test', '1');
-    const d = await rclient.get('test');
-    // console.log(columns)
-    assert.equal(d, '1');
-  });
-
-  t.after(() => {
-    rclient.quit();
-  });
-});
+import { test } from 'node:test';
+import assert from 'node:assert';
+
+import '../config.js';
+
+import rclient from '../../redis/client.js';
+
+test('funcs redis', async (t) => {
+  await t.test('get/set', async () => {
+    await rclient.set('test', '1');
+    const d = await rclient.get('test');
+    // console.log(columns)
+    assert.equal(d, '1');
+  });
+
+  t.after(() => {
+    rclient.quit();
+  });
+});

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"
+    }
 ]