@opengis/fastify-table 1.1.97 → 1.1.98

package/server/plugins/table/funcs/getSelect.js

@@ -1,29 +1,29 @@
-import pgClients from '../../pg/pgClients.js';
-import getTemplate from './getTemplate.js';
-
-const loadCls = {};
-
-const sqls = {
-  sql: 'select data from admin.cls where name=$1',
-  json: 'select json_agg(json_build_object(\'id\', code, \'text\', name, \'icon\', icon, \'color\', color)) as data from admin.cls where parent=$1',
-};
-
-export default async function getSelect(name, pg = pgClients.client) {
-  if (loadCls[name]) return loadCls[name];
-
-  const clsDataGIT = await getTemplate(['cls', 'select'], name);
-  const { type } = !clsDataGIT && pg.pk?.['admin.cls'] ? await pg.query('select type from admin.cls where parent is null and name=$1 limit 1', [name]).then(el => el.rows?.[0] || {}) : {};
-  const q = !clsDataGIT && type && ['sql', 'json'].includes(type) ? sqls[type] : undefined;
-  const clsDataDB = q ? await pg.query(q, [name]).then(el => el.rows?.[0]?.data) : undefined;
-  const clsData = clsDataGIT || clsDataDB;
-  if (!clsData) return null;
-
-  //  console.log(clsData);
-  if (clsData && Array.isArray(clsData)) {
-    loadCls[name] = { arr: clsData };
-    return loadCls[name];
-  }
-
-  loadCls[name] = clsData.sql ? clsData : { sql: clsData };
-  return loadCls[name];
-}
+import pgClients from '../../pg/pgClients.js';
+import getTemplate from './getTemplate.js';
+
+const loadCls = {};
+
+const sqls = {
+  sql: 'select data from admin.cls where name=$1',
+  json: 'select json_agg(json_build_object(\'id\', code, \'text\', name, \'icon\', icon, \'color\', color)) as data from admin.cls where parent=$1',
+};
+
+export default async function getSelect(name, pg = pgClients.client) {
+  if (loadCls[name]) return loadCls[name];
+
+  const clsDataGIT = await getTemplate(['cls', 'select'], name);
+  const { type } = !clsDataGIT && pg.pk?.['admin.cls'] ? await pg.query('select type from admin.cls where parent is null and name=$1 limit 1', [name]).then(el => el.rows?.[0] || {}) : {};
+  const q = !clsDataGIT && type && ['sql', 'json'].includes(type) ? sqls[type] : undefined;
+  const clsDataDB = q ? await pg.query(q, [name]).then(el => el.rows?.[0]?.data) : undefined;
+  const clsData = clsDataGIT || clsDataDB;
+  if (!clsData) return null;
+
+  //  console.log(clsData);
+  if (clsData && Array.isArray(clsData)) {
+    loadCls[name] = { arr: clsData };
+    return loadCls[name];
+  }
+
+  loadCls[name] = clsData.sql ? clsData : { sql: clsData };
+  return loadCls[name];
+}

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

@@ -1,67 +1,67 @@
-import logger from '../../logger/getLogger.js';
-import autoIndex from '../../pg/funcs/autoIndex.js';
-import pgClients from '../../pg/pgClients.js';
-
-import getSelect from './getSelect.js';
-
-const limit = 50;
-const selectMeta = {};
-
-export default async function getSelectMeta({ name, pg = pgClients.client, nocache }) {
-  if (selectMeta[name] && !nocache) return selectMeta[name];
-
-  const cls = await getSelect(name, pg);
-
-  if (!cls) return null;
-  if (cls.arr) return cls;
-  if (!cls.sql) return null;
-
-  const { sql: original } = cls;
-  if (!original.toLowerCase) { console.log(`sql select null: ${name}`); return null; }
-
-  const sql = `with c(id,text) as (select * from (${original})q limit ${limit}) select * from c`;
-
-  /*= == 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?.replace(`limit ${limit}`, '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 originalCols = dataOrigin1.fields.map((el) => el.name);
-  const type = dataOrigin.fields.map((el) => pg.pgType?.[el.dataTypeID] || 'text');
-
-  autoIndex({ table: tableNew[0], columns: [originalCols[1]].concat(cls?.searchColumn?.split(',')), gin: 1 }).catch(err => logger.error(err));
-
-  const searchColumn = cls?.searchColumn || (
-    dataOrigin.fields.find((el) => el.name === 'search') ? 'search' : dataOrigin1.fields[1].name);
-
-  const searchQuery = `(${searchColumn.split(',').map((el) => `lower("${el}") ~ $1 `).join(' or ')})`;
-  // console.log(dataOrigin1.fields.map((el) => el.name).join(','));
-  const data = {
-    minLength: cls.minLength,
-    limit: cls.limit,
-    type: type.join(','),
-    cols: cols.join(','),
-    originalCols: originalCols.join(','),
-    pk: originalCols[0],
-    db: cls.db,
-    original: `select * from (${original})q`,
-    sql,
-    count,
-    searchQuery,
-    table: tableNew.join(','),
-    time: new Date().toISOString(),
-
-  };
-
-  selectMeta[name] = data;
-  return data;
-}
+import logger from '../../logger/getLogger.js';
+import autoIndex from '../../pg/funcs/autoIndex.js';
+import pgClients from '../../pg/pgClients.js';
+
+import getSelect from './getSelect.js';
+
+const limit = 50;
+const selectMeta = {};
+
+export default async function getSelectMeta({ name, pg = pgClients.client, nocache }) {
+  if (selectMeta[name] && !nocache) return selectMeta[name];
+
+  const cls = await getSelect(name, pg);
+
+  if (!cls) return null;
+  if (cls.arr) return cls;
+  if (!cls.sql) return null;
+
+  const { sql: original } = cls;
+  if (!original.toLowerCase) { console.log(`sql select null: ${name}`); return null; }
+
+  const sql = `with c(id,text) as (select * from (${original})q limit ${limit}) select * from c`;
+
+  /*= == 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?.replace(`limit ${limit}`, '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 originalCols = dataOrigin1.fields.map((el) => el.name);
+  const type = dataOrigin.fields.map((el) => pg.pgType?.[el.dataTypeID] || 'text');
+
+  autoIndex({ table: tableNew[0], columns: [originalCols[1]].concat(cls?.searchColumn?.split(',')), gin: 1 }).catch(err => logger.error(err));
+
+  const searchColumn = cls?.searchColumn || (
+    dataOrigin.fields.find((el) => el.name === 'search') ? 'search' : dataOrigin1.fields[1].name);
+
+  const searchQuery = `(${searchColumn.split(',').map((el) => `lower("${el}") ~ $1 `).join(' or ')})`;
+  // console.log(dataOrigin1.fields.map((el) => el.name).join(','));
+  const data = {
+    minLength: cls.minLength,
+    limit: cls.limit,
+    type: type.join(','),
+    cols: cols.join(','),
+    originalCols: originalCols.join(','),
+    pk: originalCols[0],
+    db: cls.db,
+    original: `select * from (${original})q`,
+    sql,
+    count,
+    searchQuery,
+    table: tableNew.join(','),
+    time: new Date().toISOString(),
+
+  };
+
+  selectMeta[name] = data;
+  return data;
+}

package/server/plugins/table/funcs/getTemplates.js

@@ -1,19 +1,19 @@
-import fs from 'fs';
-import path from 'path';
-
-import config from '../../../../config.js';
-
-const loadTemplate = {};
-
-export default async function getTemplateDir(type) {
-  if (!type) 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;
-  }
-  return loadTemplate[type];
-}
+import fs from 'fs';
+import path from 'path';
+
+import config from '../../../../config.js';
+
+const loadTemplate = {};
+
+export default async function getTemplateDir(type) {
+  if (!type) 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;
+  }
+  return loadTemplate[type];
+}

package/server/plugins/table/funcs/gisIRColumn.js

@@ -1,82 +1,82 @@
-import getSelect from './getSelect.js';
-
-import getFilterSQL from './getFilterSQL/index.js';
-import getTemplate from './getTemplate.js';
-import pgClients from '../../pg/pgClients.js';
-import config from '../../../../config.js';
-import getSelectVal from './metaFormat/getSelectVal.js';
-
-export default async function gisIRColumn({
-  pg = pgClients.client, layer, column, sql, query = '1=1', filter, state, search, custom,
-}) {
-  const time = Date.now();
-
-  const sel = await getSelect(query.cls || column, pg);
-
-  const body = await getTemplate('table', layer);
-  const fData = await getFilterSQL({
-    table: layer,
-    filter,
-    state,
-    search,
-    custom,
-  });
-
-  const { tlist } = await pg.one(`select array_agg((select nspname from pg_namespace where oid=relnamespace)||'.'||relname) tlist from pg_class 
-  where relkind in ('r','v','m')`);
-
-  const tableName = body?.table || layer;
-  if (!tlist.includes(tableName)) return { error: `table not found: ${tableName}`, status: 400 };
-
-  // eslint-disable-next-line max-len
-  const { fields } = await pg.query(`select * from (${fData?.optimizedSQL || `select * from ${tableName}`})q limit 0`);
-
-  const col = fields.find((el) => el.name === column);
-
-  if (!col) return { status: 404, message: 'not found' };
-  const colField = pg.pgType[col.dataTypeID]?.includes('[]') ? `unnest(${column})` : column;
-
-  const q = `select ${colField} as id, count(*)::int from (
-    ${fData?.optimizedSQL || `select * from ${tableName} where ${body?.query || 'true'}`}
-  )t group by ${colField} order by count desc limit 15`;
-
-  if (sql) return q;
-
-  if (!body?.columns?.length) {
-    const { rows } = await pg.query(q);
-    if (sel?.arr?.length) {
-      rows.forEach((el) => {
-        const data = sel?.find((item) => item.id?.toString() === el.id?.toString());
-        Object.assign(el, data || {});
-      });
-    }
-    return {
-      count: rows?.reduce((acc, el) => acc + el.count, 0),
-      sql: config.local ? q : undefined,
-      rows,
-    };
-  }
-
-  const { rows } = await pg.query(q);
-  const cls = query.cls || body?.columns?.find((el) => el.name === column)?.data || col.data || col.option;
-  const select = await getSelectVal({
-    pg, name: cls, values: rows.map((el) => el.id), ar: 1,
-  });
-  rows.forEach((el) => {
-    if (Array.isArray(select)) {
-      Object.assign(el, select.find((item) => item.id?.toString() === el.id?.toString()) || {});
-    }
-    else if (typeof select?.[el.id] === 'string') {
-      Object.assign(el, { text: select?.[el.id] });
-    }
-    else {
-      Object.assign(el, select?.[el.id] || {});
-    }
-  });
-  return {
-    time: Date.now() - time,
-    count: rows.reduce((acc, el) => acc + el.count, 0),
-    sql: config.local ? q : undefined,
-    rows,
-  };
-}
+import getSelect from './getSelect.js';
+
+import getFilterSQL from './getFilterSQL/index.js';
+import getTemplate from './getTemplate.js';
+import pgClients from '../../pg/pgClients.js';
+import config from '../../../../config.js';
+import getSelectVal from './metaFormat/getSelectVal.js';
+
+export default async function gisIRColumn({
+  pg = pgClients.client, layer, column, sql, query = '1=1', filter, state, search, custom,
+}) {
+  const time = Date.now();
+
+  const sel = await getSelect(query.cls || column, pg);
+
+  const body = await getTemplate('table', layer);
+  const fData = await getFilterSQL({
+    table: layer,
+    filter,
+    state,
+    search,
+    custom,
+  });
+
+  const { tlist } = await pg.one(`select array_agg((select nspname from pg_namespace where oid=relnamespace)||'.'||relname) tlist from pg_class 
+  where relkind in ('r','v','m')`);
+
+  const tableName = body?.table || layer;
+  if (!tlist.includes(tableName)) return { error: `table not found: ${tableName}`, status: 400 };
+
+  // eslint-disable-next-line max-len
+  const { fields } = await pg.query(`select * from (${fData?.optimizedSQL || `select * from ${tableName}`})q limit 0`);
+
+  const col = fields.find((el) => el.name === column);
+
+  if (!col) return { status: 404, message: 'not found' };
+  const colField = pg.pgType[col.dataTypeID]?.includes('[]') ? `unnest(${column})` : column;
+
+  const q = `select ${colField} as id, count(*)::int from (
+    ${fData?.optimizedSQL || `select * from ${tableName} where ${body?.query || 'true'}`}
+  )t group by ${colField} order by count desc limit 15`;
+
+  if (sql) return q;
+
+  if (!body?.columns?.length) {
+    const { rows } = await pg.query(q);
+    if (sel?.arr?.length) {
+      rows.forEach((el) => {
+        const data = sel?.find((item) => item.id?.toString() === el.id?.toString());
+        Object.assign(el, data || {});
+      });
+    }
+    return {
+      count: rows?.reduce((acc, el) => acc + el.count, 0),
+      sql: config.local ? q : undefined,
+      rows,
+    };
+  }
+
+  const { rows } = await pg.query(q);
+  const cls = query.cls || body?.columns?.find((el) => el.name === column)?.data || col.data || col.option;
+  const select = await getSelectVal({
+    pg, name: cls, values: rows.map((el) => el.id), ar: 1,
+  });
+  rows.forEach((el) => {
+    if (Array.isArray(select)) {
+      Object.assign(el, select.find((item) => item.id?.toString() === el.id?.toString()) || {});
+    }
+    else if (typeof select?.[el.id] === 'string') {
+      Object.assign(el, { text: select?.[el.id] });
+    }
+    else {
+      Object.assign(el, select?.[el.id] || {});
+    }
+  });
+  return {
+    time: Date.now() - time,
+    count: rows.reduce((acc, el) => acc + el.count, 0),
+    sql: config.local ? q : undefined,
+    rows,
+  };
+}

package/server/plugins/table/funcs/loadTemplate.js

@@ -1 +1 @@
-export default {};
+export default {};

package/server/plugins/table/funcs/loadTemplatePath.js

@@ -1 +1 @@
-export default {};
+export default {};

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

@@ -1,50 +1,50 @@
-import getSelect from '../getSelect.js';
-import pgClients from '../../../pg/pgClients.js';
-import redis from '../../../redis/client.js';
-
-const selectIds = {};
-export default async function getSelectVal({
-  pg = pgClients.client, name, values: valuesOrigin, ar = false,
-}) {
-  if (!valuesOrigin?.length) return null;
-  const values = valuesOrigin.map(el => el.toString());
-  const cls = await getSelect(name, pg);
-
-  // === array  ===
-  if (cls?.arr && Array.isArray(cls?.arr)) {
-    const resultArr = cls.arr.filter(el => values.includes(el.id.toString()));
-    if (ar) return resultArr;
-    return resultArr.reduce((p, el) => ({ ...p, [el.id.toString()]: el.color ? el : el.text }), {});
-  }
-
-  // === sql ===
-  if (!cls?.sql) return null;
-
-  // select id column name
-  if (!selectIds[name]) selectIds[name] = await pg.queryCache(`select * from (${cls.sql})q limit 0`).then((res) => res.fields?.[0]?.name);
-  const id = selectIds[name];
-
-  // cache
-  const key = `select:${name}`;
-  const cache = (await redis.hmget(key, values)).reduce((p, el, i) => ({ ...p, [values[i]]: el }), {});
-  const filteredValues = values.filter(el => !cache[el]);
-
-  // query select
-  const q = `with c(id,text) as (select * from (${cls.sql})q where ${id} = any('{${filteredValues}}')) select * from c`;
-  const data = filteredValues.length ? await pg.query(q).then(el => el.rows) : [];
-
-  const clsObj = { ...cache, ...data.reduce((p, el) => ({ ...p, [el.id.toString()]: el.color ? el : el.text }), {}) };
-
-  if (data?.length) {
-    redis.hmset(key, clsObj);
-  }
-
-  if (ar) {
-    return Object.keys(clsObj).reduce((acc, el) => {
-      acc.push({ id: el, text: typeof clsObj[el] === 'string' ? clsObj[el] : clsObj[el]?.text, color: clsObj[el]?.color });
-      return acc;
-    }, []);
-  }
-
-  return clsObj;
-}
+import getSelect from '../getSelect.js';
+import pgClients from '../../../pg/pgClients.js';
+import redis from '../../../redis/client.js';
+
+const selectIds = {};
+export default async function getSelectVal({
+  pg = pgClients.client, name, values: valuesOrigin, ar = false,
+}) {
+  if (!valuesOrigin?.length) return null;
+  const values = valuesOrigin.filter(el => el).map(el => el.toString());
+  const cls = await getSelect(name, pg);
+
+  // === array  ===
+  if (cls?.arr && Array.isArray(cls?.arr)) {
+    const resultArr = cls.arr.filter(el => values.includes(el.id.toString()));
+    if (ar) return resultArr;
+    return resultArr.reduce((p, el) => ({ ...p, [el.id.toString()]: el.color ? el : el.text }), {});
+  }
+
+  // === sql ===
+  if (!cls?.sql) return null;
+
+  // select id column name
+  if (!selectIds[name]) selectIds[name] = await pg.queryCache(`select * from (${cls.sql})q limit 0`).then((res) => res.fields?.[0]?.name);
+  const id = selectIds[name];
+
+  // cache
+  const key = `select:${name}`;
+  const cache = (await redis.hmget(key, values)).reduce((p, el, i) => ({ ...p, [values[i]]: el }), {});
+  const filteredValues = values.filter(el => !cache[el]);
+
+  // query select
+  const q = `with c(id,text) as (select * from (${cls.sql})q where ${id} = any('{${filteredValues}}')) select * from c`;
+  const data = filteredValues.length ? await pg.query(q).then(el => el.rows) : [];
+
+  const clsObj = { ...cache, ...data.reduce((p, el) => ({ ...p, [el.id.toString()]: el.color ? el : el.text }), {}) };
+
+  if (data?.length) {
+    redis.hmset(key, clsObj);
+  }
+
+  if (ar) {
+    return Object.keys(clsObj).reduce((acc, el) => {
+      acc.push({ id: el, text: typeof clsObj[el] === 'string' ? clsObj[el] : clsObj[el]?.text, color: clsObj[el]?.color });
+      return acc;
+    }, []);
+  }
+
+  return clsObj;
+}

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

@@ -1,31 +1,31 @@
-import getTemplate from '../getTemplate.js';
-import getSelectVal from './getSelectVal.js';
-
-// import { getTemplate, getSelectVal } from '../../../../../utils.js';
-
-export default async function metaFormat({ rows, table }) {
-  const loadTable = await getTemplate('table', table);
-  const selectCols = loadTable?.columns?.filter((e) => e.data);
-  const metaCls = Object.keys(loadTable?.meta?.cls || {}).map((el) => ({ name: el, data: loadTable?.meta?.cls[el] }));
-  if (!selectCols?.length && !metaCls?.length) return rows;
-
-  // cls & select format
-
-  await Promise.all(selectCols.concat(metaCls)?.map(async (attr) => {
-    const values = [...new Set(rows?.map((el) => el[attr.name]).flat())].filter((el) => (typeof el === 'boolean' ? true : el));
-    if (!values.length) return null;
-
-    const cls = await getSelectVal({ name: attr.data, values });
-    if (!cls) return null;
-
-    rows.forEach(el => {
-      const val = el[attr.name]?.map?.(c => cls[c.toString()] || cls[c] || c) || cls[el[attr.name]?.toString()] || cls[el[attr.name]] || el[attr.name];
-      if (!val) return;
-      Object.assign(el, { [val?.color ? `${attr.name}_data` : `${attr.name}_text`]: (val.color ? val : val.text || val) });
-    });
-
-    return null;
-  }));
-
-  return rows;
-}
+import getTemplate from '../getTemplate.js';
+import getSelectVal from './getSelectVal.js';
+
+// import { getTemplate, getSelectVal } from '../../../../../utils.js';
+
+export default async function metaFormat({ rows, table }) {
+  const loadTable = await getTemplate('table', table);
+  const selectCols = loadTable?.columns?.filter((e) => e.data);
+  const metaCls = Object.keys(loadTable?.meta?.cls || {}).map((el) => ({ name: el, data: loadTable?.meta?.cls[el] }));
+  if (!selectCols?.length && !metaCls?.length) return rows;
+
+  // cls & select format
+
+  await Promise.all(selectCols.concat(metaCls)?.map(async (attr) => {
+    const values = [...new Set(rows?.map((el) => el[attr.name]).flat())].filter((el) => (typeof el === 'boolean' ? true : el));
+    if (!values.length) return null;
+
+    const cls = await getSelectVal({ name: attr.data, values });
+    if (!cls) return null;
+
+    rows.forEach(el => {
+      const val = el[attr.name]?.map?.(c => cls[c.toString()] || cls[c] || c) || cls[el[attr.name]?.toString()] || cls[el[attr.name]] || el[attr.name];
+      if (!val) return;
+      Object.assign(el, { [val?.color ? `${attr.name}_data` : `${attr.name}_text`]: (val.color ? val : val.text || val) });
+    });
+
+    return null;
+  }));
+
+  return rows;
+}

package/server/plugins/table/funcs/userTemplateDir.js

@@ -1 +1 @@
-export default [];
+export default [];

package/server/plugins/table/index.js

@@ -1,13 +1,13 @@
-import metaFormat from './funcs/metaFormat/index.js';
-import getFilterSQL from './funcs/getFilterSQL/index.js';
-import getTemplate from './funcs/getTemplate.js';
-import getSelect from './funcs/getSelect.js';
-
-async function plugin(fastify) {
-  // fastify.decorate('metaFormat', metaFormat);
-  // fastify.decorate('getFilterSQL', getFilterSQL);
-  // fastify.decorate('getTemplate', getTemplate);
-  // fastify.decorate('getSelect', getSelect);
-}
-
-export default plugin;
+import metaFormat from './funcs/metaFormat/index.js';
+import getFilterSQL from './funcs/getFilterSQL/index.js';
+import getTemplate from './funcs/getTemplate.js';
+import getSelect from './funcs/getSelect.js';
+
+async function plugin(fastify) {
+  // fastify.decorate('metaFormat', metaFormat);
+  // fastify.decorate('getFilterSQL', getFilterSQL);
+  // fastify.decorate('getTemplate', getTemplate);
+  // fastify.decorate('getSelect', getSelect);
+}
+
+export default plugin;