@opengis/fastify-table 1.0.34 → 1.0.36

package/table/controllers/utils/getSelectMeta.js

@@ -1,66 +1,66 @@
-// import pgClients from '../../../pg/pgClients.js';
-import getPG from '../../../pg/funcs/getPG.js';
-
-import getSelect from './getSelect.js';
-
-/*
-function getTable(table) {
-  // eslint-disable-next-line class-methods-use-this
-  const result = table.toLowerCase().replace(/[\n\r]+/g, ' ').split(' from ').filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
-    .map((el) => el.split(/[ )]/)[0]);
-  return result?.pop();
-} */
-
-const selectMeta = {};
-
-export default async function getSelectMeta({ name, pg: pg1 }) {
-  if (selectMeta[name]) return selectMeta[name];
-
-  const cls = await getSelect(name);
-
-  if (!cls) return null;
-  if (cls.arr) return cls;
-  if (!cls.sql) return null;
-
-  const pg = pg1 || getPG({ db: cls.db || 'client' });
-  const { sql: original } = cls;
-  const sql = `with c(id,text) as (${original} ) select * from c where id is not null `;
-
-  /*= == meta table === */
-  const tableNew = original.toLowerCase().replace(/\n/g, ' ').split(' from ').filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
-    .map((el) => el.split(/[ )]/)[0].replace(/[\r\n]+/g, ''));
-
-  const dataOrigin = await pg.query(`${sql} limit 0`);
-
-  const dataOrigin1 = await pg.query(`${original} limit 0`);
-
-  // const table = getTable(original);
-  const count = cls?.count ?? await pg.query(`select count(*) from (${original})q`).then((el) => el?.rows?.[0].count);
-
-  // column name
-  const cols = dataOrigin.fields.map((el) => el.name);
-  const type = dataOrigin.fields.map((el) => pg.pgType?.[el.dataTypeID] || 'text');
-
-  const searchColumn = cls?.searchColumn || (
-    dataOrigin.fields.find((el) => el.name === 'search') ? 'search' : dataOrigin1.fields[1].name);
-
-  const searchQuery = `(${searchColumn.split(',').map((el) => `"${el}" ilike $1 `).join(' or ')})`;
-
-  const data = {
-
-    type: type.join(','),
-    cols: cols.join(','),
-    originalCols: dataOrigin1.fields.map((el) => el.name).join(','),
-    db: cls.db,
-    original: original?.includes('where') ? `select * from (${original})q` : original,
-    sql,
-    count,
-    searchQuery,
-    table: tableNew.join(','),
-    time: new Date().toISOString(),
-
-  };
-
-  selectMeta[name] = data;
-  return data;
-}
+// import pgClients from '../../../pg/pgClients.js';
+import getPG from '../../../pg/funcs/getPG.js';
+
+import getSelect from './getSelect.js';
+
+/*
+function getTable(table) {
+  // eslint-disable-next-line class-methods-use-this
+  const result = table.toLowerCase().replace(/[\n\r]+/g, ' ').split(' from ').filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
+    .map((el) => el.split(/[ )]/)[0]);
+  return result?.pop();
+} */
+
+const selectMeta = {};
+
+export default async function getSelectMeta({ name, pg: pg1 }) {
+  if (selectMeta[name]) return selectMeta[name];
+
+  const cls = await getSelect(name);
+
+  if (!cls) return null;
+  if (cls.arr) return cls;
+  if (!cls.sql) return null;
+
+  const pg = pg1 || getPG({ db: cls.db || 'client' });
+  const { sql: original } = cls;
+  const sql = `with c(id,text) as (${original} ) select * from c where id is not null `;
+
+  /*= == meta table === */
+  const tableNew = original.toLowerCase().replace(/\n/g, ' ').split(' from ').filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
+    .map((el) => el.split(/[ )]/)[0].replace(/[\r\n]+/g, ''));
+
+  const dataOrigin = await pg.query(`${sql} limit 0`);
+
+  const dataOrigin1 = await pg.query(`${original} limit 0`);
+
+  // const table = getTable(original);
+  const count = cls?.count ?? await pg.query(`select count(*) from (${original})q`).then((el) => el?.rows?.[0].count);
+
+  // column name
+  const cols = dataOrigin.fields.map((el) => el.name);
+  const type = dataOrigin.fields.map((el) => pg.pgType?.[el.dataTypeID] || 'text');
+
+  const searchColumn = cls?.searchColumn || (
+    dataOrigin.fields.find((el) => el.name === 'search') ? 'search' : dataOrigin1.fields[1].name);
+
+  const searchQuery = `(${searchColumn.split(',').map((el) => `"${el}" ilike $1 `).join(' or ')})`;
+
+  const data = {
+
+    type: type.join(','),
+    cols: cols.join(','),
+    originalCols: dataOrigin1.fields.map((el) => el.name).join(','),
+    db: cls.db,
+    original: original?.includes('where') ? `select * from (${original})q` : original,
+    sql,
+    count,
+    searchQuery,
+    table: tableNew.join(','),
+    time: new Date().toISOString(),
+
+  };
+
+  selectMeta[name] = data;
+  return data;
+}

package/table/controllers/utils/getTemplate.js

@@ -1,28 +1,28 @@
-import { readFile } from 'fs/promises';
-import fs from 'fs';
-import path from 'path';
-import config from '../../../config.js';
-
-const loadTemplate = {};
-
-export default async function getTemplateDir(type, name) {
-  if (!type) return null;
-  if (!name) return null;
-
-  const cwd = process.cwd();
-  const typeDir = path.join(cwd, (config.templateDir || 'server/templates'), type);
-
-  if (!loadTemplate[type]) {
-    const typeList = fs.existsSync(typeDir) ? fs.readdirSync(typeDir) : [];
-    loadTemplate[type] = typeList;
-  }
-
-  const fullname = loadTemplate[type].find((el) => path.parse(el).name === name);
-  const ext = fullname ? path.extname(fullname)?.slice(1) : null;
-  if (!ext) return null;
-
-  const sql = loadTemplate[type].includes(`${name}.sql`) ? await readFile(path.join(typeDir, `${name}.sql`), 'utf-8') : null;
-  const data = loadTemplate[type].includes(`${name}.json`) ? JSON.parse(await readFile(path.join(typeDir, `${name}.json`), 'utf-8')) : await readFile(path.join(typeDir, `${name}.${ext}`), 'utf-8');
-  if (sql) return { ...data || {}, sql };
-  return data;
-}
+import { readFile } from 'fs/promises';
+import fs from 'fs';
+import path from 'path';
+import config from '../../../config.js';
+
+const loadTemplate = {};
+
+export default async function getTemplateDir(type, name) {
+  if (!type) return null;
+  if (!name) return null;
+
+  const cwd = process.cwd();
+  const typeDir = path.join(cwd, (config.templateDir || 'server/templates'), type);
+
+  if (!loadTemplate[type]) {
+    const typeList = fs.existsSync(typeDir) ? fs.readdirSync(typeDir) : [];
+    loadTemplate[type] = typeList;
+  }
+
+  const fullname = loadTemplate[type].find((el) => path.parse(el).name === name);
+  const ext = fullname ? path.extname(fullname)?.slice(1) : null;
+  if (!ext) return null;
+
+  const sql = loadTemplate[type].includes(`${name}.sql`) ? await readFile(path.join(typeDir, `${name}.sql`), 'utf-8') : null;
+  const data = loadTemplate[type].includes(`${name}.json`) ? JSON.parse(await readFile(path.join(typeDir, `${name}.json`), 'utf-8')) : await readFile(path.join(typeDir, `${name}.${ext}`), 'utf-8');
+  if (sql) return { ...data || {}, sql };
+  return data;
+}

package/table/funcs/getFilterSQL/index.js

@@ -1,75 +1,75 @@
-/* const getTable = require('../../controllers/utils/getTable');
-const pg = require('../../../pg/client');
-const config = require('../../../../config'); */
-
-import getTemplate from '../../controllers/utils/getTemplate.js';
-import pgClients from '../../../pg/pgClients.js';
-import config from '../../../config.js';
-// filter util
-import getTableSql from './util/getTableSql.js';
-// import getCustomQuery from './util/getCustomQuery.js';
-import getFilterQuery from './util/getFilterQuery.js';
-import getOptimizedQuery from './util/getOptimizedQuery.js';
-
-async function getFilterSQL({
-  table, filter, pg = pgClients.client, search, filterList, query,
-}) {
-  if (!table) return { error: 'param table is required', status: 400 };
-
-  const body = await getTemplate('table', table);
-
-  const fieldQuery = config.allTemplates?.table?.[table] ? `${config.allTemplates?.table?.[table]} limit 0`
-    : `select * from ${body?.table || table} limit 0`;
-  const { fields = [] } = await pg.query(fieldQuery);
-
-  const { fields: fieldsModel } = pg.pk[body?.table] ? await pg.query(`select * from ${body.table} limit 0`) : {};
-
-  const autoSearchColumn = fields?.filter((el) => pg.pgType?.[el.dataTypeID] === 'text')?.map((el) => el.name).join(',');
-  const searchColumn = body?.search_column || autoSearchColumn;
-  const fieldsList = (fieldsModel || fields)?.map((el) => el.name);
-  try {
-    const tableSQL = await getTableSql({
-      pg, body, table, fields,
-    });
-    const sval = `ilike '%${decodeURIComponent(search).replace(/'/g, "''")}%'`;
-    const searchQuery = search && searchColumn
-      ? ` (${searchColumn.split(',')?.map((name) => {
-        const { pk } = tableSQL.find((el) => el.name === name) || {};
-        return pk && !fieldsList.includes(name) ? `${pk} in (select ${pk} from (${fieldQuery})q where ${name} ${sval})` : `${name} ${sval}`;
-      }).join(' or ')} )` : '';
-
-    const filters = getFilterQuery({
-      filter,
-      tableSQL,
-      fields,
-      filterList: filterList || (body?.filter_list || []).concat(body?.filterInline || []).concat(body?.filterCustom || []).concat(body?.filterState || []).concat(body?.filterList || []),
-      pg,
-      config,
-    });
-
-    // filter
-    const filterQuery = filters?.filter((el) => el.query)?.map((el) => `${el.query} `).join(' and ');
-    const q = [body?.query, query, searchQuery, filterQuery].filter((el) => el).join(' and ');
-
-    // table
-    const modelQuery = body?.model || body?.table || table;
-    const optimizedSQL = `select * from ${getOptimizedQuery({ body, table, q })} `;
-    const tableCount = getOptimizedQuery({ body, table, q }, true);
-    // console.log(optimizedSQL);
-    return {
-      filterList,
-
-      q,
-      optimizedSQL,
-      tableCount,
-      table: modelQuery,
-      // filter parts
-      searchQuery,
-    };
-  }
-  catch (err) {
-    throw new Error(err.toString());
-  }
-}
-
-export default getFilterSQL;
+/* const getTable = require('../../controllers/utils/getTable');
+const pg = require('../../../pg/client');
+const config = require('../../../../config'); */
+
+import getTemplate from '../../controllers/utils/getTemplate.js';
+import pgClients from '../../../pg/pgClients.js';
+import config from '../../../config.js';
+// filter util
+import getTableSql from './util/getTableSql.js';
+// import getCustomQuery from './util/getCustomQuery.js';
+import getFilterQuery from './util/getFilterQuery.js';
+import getOptimizedQuery from './util/getOptimizedQuery.js';
+
+async function getFilterSQL({
+  table, filter, pg = pgClients.client, search, filterList, query,
+}) {
+  if (!table) return { error: 'param table is required', status: 400 };
+
+  const body = await getTemplate('table', table);
+
+  const fieldQuery = config.allTemplates?.table?.[table] ? `${config.allTemplates?.table?.[table]} limit 0`
+    : `select * from ${body?.table || table} limit 0`;
+  const { fields = [] } = await pg.query(fieldQuery);
+
+  const { fields: fieldsModel } = pg.pk[body?.table] ? await pg.query(`select * from ${body.table} limit 0`) : {};
+
+  const autoSearchColumn = fields?.filter((el) => pg.pgType?.[el.dataTypeID] === 'text')?.map((el) => el.name).join(',');
+  const searchColumn = body?.search_column || autoSearchColumn;
+  const fieldsList = (fieldsModel || fields)?.map((el) => el.name);
+  try {
+    const tableSQL = await getTableSql({
+      pg, body, table, fields,
+    });
+    const sval = `ilike '%${decodeURIComponent(search).replace(/'/g, "''")}%'`;
+    const searchQuery = search && searchColumn
+      ? ` (${searchColumn.split(',')?.map((name) => {
+        const { pk } = tableSQL.find((el) => el.name === name) || {};
+        return pk && !fieldsList.includes(name) ? `${pk} in (select ${pk} from (${fieldQuery})q where ${name} ${sval})` : `${name} ${sval}`;
+      }).join(' or ')} )` : '';
+
+    const filters = getFilterQuery({
+      filter,
+      tableSQL,
+      fields,
+      filterList: filterList || (body?.filter_list || []).concat(body?.filterInline || []).concat(body?.filterCustom || []).concat(body?.filterState || []).concat(body?.filterList || []),
+      pg,
+      config,
+    });
+
+    // filter
+    const filterQuery = filters?.filter((el) => el.query)?.map((el) => `${el.query} `).join(' and ');
+    const q = [body?.query, query, searchQuery, filterQuery].filter((el) => el).join(' and ');
+
+    // table
+    const modelQuery = body?.model || body?.table || table;
+    const optimizedSQL = `select * from ${getOptimizedQuery({ body, table, q })} `;
+    const tableCount = getOptimizedQuery({ body, table, q }, true);
+    // console.log(optimizedSQL);
+    return {
+      filterList,
+
+      q,
+      optimizedSQL,
+      tableCount,
+      table: modelQuery,
+      // filter parts
+      searchQuery,
+    };
+  }
+  catch (err) {
+    throw new Error(err.toString());
+  }
+}
+
+export default getFilterSQL;

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

@@ -1,142 +1,142 @@
-const dateTypeList = ['date', 'timestamp', 'timestamp without time zone'];
-const numberTypeList = ['float8', 'int4', 'int8', 'numeric', 'double precision', 'integer'];
-
-function dt(y, m, d) {
-  return new Date(Date.UTC(y, m, d)).toISOString().slice(0, 10);
-}
-const dp = {
-  d: new Date().getDate(),
-  w: new Date().getDate() - (new Date().getDay() || 7) + 1,
-  m: new Date().getMonth(),
-  q: (new Date().getMonth() / 4).toFixed() * 3,
-  y: new Date().getFullYear(),
-};
-
-function formatDateISOString(date) {
-  if (!date?.includes('.')) return date;
-  const [day, month, year] = date.split('.');
-  return `${year}-${month}-${day}`;
-}
-
-function formatValue({
-  clsList, filterType, filter, name, value, operator = '=', fieldType = 'text', uid = 1, optimize,
-}) {
-  if (!name || !value) return {};
-
-  // current day, week, month, year etc.
-  if (dateTypeList.includes(fieldType) && !value?.includes('_') && ['cd', 'cw', 'cm', 'cq', 'cy'].includes(value)) {
-    const query = {
-      cd: `${name}::date = '${dt(dp.y, dp.m, dp.d)}'::date`,
-      cw: `${name}::date >= '${dt(dp.y, dp.m, dp.w)}'::date and ${name} <= '${dt(dp.y, dp.m, dp.w + 6)}'::date`,
-      cm: `${name}::date >= '${dt(dp.y, dp.m, 1)}'::date and ${name} <= '${dt(dp.y, dp.m + 1, 0)}'::date`,
-      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 };
-  }
-  // 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 };
-  }
-  // 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 };
-  }
-  // my rows
-  if (value === 'me' && uid && fieldType === 'text') {
-    return { op: '=', query: `${name}::text = '${uid}'` };
-  }
-  const formatType = {
-    float8: 'numeric',
-    int4: 'numeric',
-    int8: 'numeric',
-    varchar: 'text',
-    bool: 'boolean',
-    geometry: 'geom',
-  }[fieldType] || 'text';
-
-  if (optimize && optimize.name !== optimize.pk) {
-    const val = filterType === 'text' ? `ilike '%${value}%'` : `= any('{${value}}')`;
-    return {
-      op: '~',
-      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} )`,
-    };
-  }
-
-  if (filter.sql) {
-    return { op: '~', query: filter.sql.replace('{val}', value) };
-  }
-  if (fieldType?.includes('[]')) {
-    return { op: 'in', query: `'{${value}}'::text[] && ${name}::text[]` };
-  }
-  // multiple items of 1 param
-  if (value?.indexOf(',') !== -1) {
-    const values = value.split(',').filter((el) => el !== 'null');
-    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 };
-  }
-
-  // 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 };
-  }
-  // 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 };
-  }
-
-  if (['<', '>'].includes(operator)) {
-    const query = `${name} ${operator} '${value}'::${formatType}`;
-    return { op: operator, query };
-  }
-
-  if (operator === '=' && filterType !== 'text') {
-    const query = {
-      null: `${name} is null`,
-      notnull: `${name} is not null`,
-    }[value] || `${name}::${formatType}='${value}'::${formatType}`;
-    return { op: '=', query };
-  }
-
-  if (['~', '='].includes(operator)) {
-    const query = clsList[filter?.data]
-      ? `${filter?.name} in ( ( with q(id,name)  as  (${clsList?.[filter?.data]}) select id from q where name ilike '%${value}%') )` // filter with cls
-      : `${name}::text ilike '%${value}%'`; // simple filter
-    return { op: 'ilike', query };
-  }
-
-  // json
-  if (name.includes('.')) {
-    const [col, prop] = name.split('.');
-    const query = ` ${col}->>'${prop}' in ('${value.join("','")}')`;
-    return { op: 'in', query };
-  }
-
-  // geometry
-  if (['geometry'].includes(fieldType)) {
-    const bbox = value[0].split('_');
-
-    if (bbox?.length === 4) {
-      const query = ` ${name} && 'box(${bbox[0]} ${bbox[1]},${bbox[2]} ${bbox[3]})'::box2d `;
-      return { op: '&&', query };
-    }
-  }
-  return {};
-}
-
-export default formatValue;
+const dateTypeList = ['date', 'timestamp', 'timestamp without time zone'];
+const numberTypeList = ['float8', 'int4', 'int8', 'numeric', 'double precision', 'integer'];
+
+function dt(y, m, d) {
+  return new Date(Date.UTC(y, m, d)).toISOString().slice(0, 10);
+}
+const dp = {
+  d: new Date().getDate(),
+  w: new Date().getDate() - (new Date().getDay() || 7) + 1,
+  m: new Date().getMonth(),
+  q: (new Date().getMonth() / 4).toFixed() * 3,
+  y: new Date().getFullYear(),
+};
+
+function formatDateISOString(date) {
+  if (!date?.includes('.')) return date;
+  const [day, month, year] = date.split('.');
+  return `${year}-${month}-${day}`;
+}
+
+function formatValue({
+  clsList, filterType, filter, name, value, operator = '=', fieldType = 'text', uid = 1, optimize,
+}) {
+  if (!name || !value) return {};
+
+  // current day, week, month, year etc.
+  if (dateTypeList.includes(fieldType) && !value?.includes('_') && ['cd', 'cw', 'cm', 'cq', 'cy'].includes(value)) {
+    const query = {
+      cd: `${name}::date = '${dt(dp.y, dp.m, dp.d)}'::date`,
+      cw: `${name}::date >= '${dt(dp.y, dp.m, dp.w)}'::date and ${name} <= '${dt(dp.y, dp.m, dp.w + 6)}'::date`,
+      cm: `${name}::date >= '${dt(dp.y, dp.m, 1)}'::date and ${name} <= '${dt(dp.y, dp.m + 1, 0)}'::date`,
+      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 };
+  }
+  // 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 };
+  }
+  // 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 };
+  }
+  // my rows
+  if (value === 'me' && uid && fieldType === 'text') {
+    return { op: '=', query: `${name}::text = '${uid}'` };
+  }
+  const formatType = {
+    float8: 'numeric',
+    int4: 'numeric',
+    int8: 'numeric',
+    varchar: 'text',
+    bool: 'boolean',
+    geometry: 'geom',
+  }[fieldType] || 'text';
+
+  if (optimize && optimize.name !== optimize.pk) {
+    const val = filterType === 'text' ? `ilike '%${value}%'` : `= any('{${value}}')`;
+    return {
+      op: '~',
+      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} )`,
+    };
+  }
+
+  if (filter.sql) {
+    return { op: '~', query: filter.sql.replace('{val}', value) };
+  }
+  if (fieldType?.includes('[]')) {
+    return { op: 'in', query: `'{${value}}'::text[] && ${name}::text[]` };
+  }
+  // multiple items of 1 param
+  if (value?.indexOf(',') !== -1) {
+    const values = value.split(',').filter((el) => el !== 'null');
+    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 };
+  }
+
+  // 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 };
+  }
+  // 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 };
+  }
+
+  if (['<', '>'].includes(operator)) {
+    const query = `${name} ${operator} '${value}'::${formatType}`;
+    return { op: operator, query };
+  }
+
+  if (operator === '=' && filterType !== 'text') {
+    const query = {
+      null: `${name} is null`,
+      notnull: `${name} is not null`,
+    }[value] || `${name}::${formatType}='${value}'::${formatType}`;
+    return { op: '=', query };
+  }
+
+  if (['~', '='].includes(operator)) {
+    const query = clsList[filter?.data]
+      ? `${filter?.name} in ( ( with q(id,name)  as  (${clsList?.[filter?.data]}) select id from q where name ilike '%${value}%') )` // filter with cls
+      : `${name}::text ilike '%${value}%'`; // simple filter
+    return { op: 'ilike', query };
+  }
+
+  // json
+  if (name.includes('.')) {
+    const [col, prop] = name.split('.');
+    const query = ` ${col}->>'${prop}' in ('${value.join("','")}')`;
+    return { op: 'in', query };
+  }
+
+  // geometry
+  if (['geometry'].includes(fieldType)) {
+    const bbox = value[0].split('_');
+
+    if (bbox?.length === 4) {
+      const query = ` ${name} && 'box(${bbox[0]} ${bbox[1]},${bbox[2]} ${bbox[3]})'::box2d `;
+      return { op: '&&', query };
+    }
+  }
+  return {};
+}
+
+export default formatValue;

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

@@ -1,13 +1,13 @@
-async function getCustomQuery({
-  pg, table, customFilter,
-}) {
-  if (!customFilter) return null;
-  const customFilterList = customFilter?.split(',')?.map((el) => el?.split('_').pop());
-  const { property_json: customFilterSQL } = await pg.one(`select json_agg(json_build_object('id',property_id,'name',property_key,'query',property_text)
-  ) as property_json from setting.property where property_key is not null and property_entity='customQuery' and object_id=$1`, [table]);
-  const data = customFilterSQL?.length ? customFilterSQL.filter((el) => customFilterList.includes(el.id)) || [] : [];
-  const customQuery = data?.map((el) => el.query).join(' and ');
-  return `${customQuery}`;
-}
-
-export default getCustomQuery;
+async function getCustomQuery({
+  pg, table, customFilter,
+}) {
+  if (!customFilter) return null;
+  const customFilterList = customFilter?.split(',')?.map((el) => el?.split('_').pop());
+  const { property_json: customFilterSQL } = await pg.one(`select json_agg(json_build_object('id',property_id,'name',property_key,'query',property_text)
+  ) as property_json from setting.property where property_key is not null and property_entity='customQuery' and object_id=$1`, [table]);
+  const data = customFilterSQL?.length ? customFilterSQL.filter((el) => customFilterList.includes(el.id)) || [] : [];
+  const customQuery = data?.map((el) => el.query).join(' and ');
+  return `${customQuery}`;
+}
+
+export default getCustomQuery;