@opengis/fastify-table 1.1.9 → 1.1.11

package/table/controllers/table.js

@@ -1,52 +1,52 @@
-import getTemplate from './utils/getTemplate.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-
-export default async function tableAPI(req) {
-  const {
-    pg, params = {}, query = {}, opt = {},
-  } = req;
-  if (!params.id) return { message: 'not enough params', status: 400 };
-
-  const loadTable = await getTemplate('table', opt?.table || params.table) || {};
-  if (!loadTable) {
-    if (!pg.pk?.[opt?.table || params.table]) { return { message: 'not found', status: 404 }; }
-  }
-
-  const {
-    table, /* columns, */ form,
-  } = loadTable;
-
-  const { pk, columns: dbColumns = [] } = await getMeta(table || opt?.table || params.table);
-  if (!pk) return { message: `table not found: ${table}`, status: 404 };
-
-  // const cols = columns.map((el) => el.name || el).join(',');
-  const schema = await getTemplate('form', opt?.form || form) || {};
-  // skip DataTable from another table
-  const extraKeys = Object.keys(schema)?.filter((key) => schema[key]?.type === 'DataTable' && schema[key]?.table && schema[key]?.parent_id && schema[key]?.colModel?.length);
-  // skip non-existing columns
-  const columnList = dbColumns.map((el) => el.name || el).join(',');
-
-  const { fields = [] } = !loadTable?.table ? await pg.query(`select * from ${table || opt?.table || params.table} limit 0`) : {};
-  const cols = loadTable?.table
-    ? Object.keys(schema || {}).filter((col) => columnList.includes(col) && !extraKeys.includes(col))?.join(',')
-    : fields.map((el) => (el?.name?.includes('geom') ? `st_asgeojson(${el.name})::json as "${el.name}"` : `"${el?.name}"`)).join(',');
-  const where = [`"${pk}" = $1`, loadTable.query].filter((el) => el);
-  const geom = columnList.includes('geom') ? 'st_asgeojson(geom)::json as geom,' : '';
-  const q = `select "${pk}" as id, ${geom} ${cols || '*'} from ${table || opt?.table || params.table} t where ${where.join(' and ') || 'true'} limit 1`;
-
-  if (query.sql === '1') return q;
-
-  const { rows } = await pg.query(q, [opt?.id || params.id]);
-
-  if (extraKeys?.length) {
-    await Promise.all(rows?.map(async (row) => {
-      await Promise.all(extraKeys?.map(async (key) => {
-        const { colModel, table: extraTable, parent_id: parentId } = schema[key];
-        const { rows: extraRows } = await pg.query(`select ${parentId} as parent, ${colModel.map((col) => col.name).join(',')} from ${extraTable} a where ${parentId}=$1`, [row.id]);
-        Object.assign(row, { [key]: extraRows });
-      }));
-    }));
-  }
-
-  return rows?.[0] || {};
-}
+import getTemplate from './utils/getTemplate.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+
+export default async function tableAPI(req) {
+  const {
+    pg, params = {}, query = {}, opt = {},
+  } = req;
+  if (!params.id) return { message: 'not enough params', status: 400 };
+
+  const loadTable = await getTemplate('table', opt?.table || params.table) || {};
+  if (!loadTable) {
+    if (!pg.pk?.[opt?.table || params.table]) { return { message: 'not found', status: 404 }; }
+  }
+
+  const {
+    table, /* columns, */ form,
+  } = loadTable;
+
+  const { pk, columns: dbColumns = [] } = await getMeta(table || opt?.table || params.table);
+  if (!pk) return { message: `table not found: ${table}`, status: 404 };
+
+  // const cols = columns.map((el) => el.name || el).join(',');
+  const schema = await getTemplate('form', opt?.form || form) || {};
+  // skip DataTable from another table
+  const extraKeys = Object.keys(schema)?.filter((key) => schema[key]?.type === 'DataTable' && schema[key]?.table && schema[key]?.parent_id && schema[key]?.colModel?.length);
+  // skip non-existing columns
+  const columnList = dbColumns.map((el) => el.name || el).join(',');
+
+  const { fields = [] } = !loadTable?.table ? await pg.query(`select * from ${table || opt?.table || params.table} limit 0`) : {};
+  const cols = loadTable?.table
+    ? Object.keys(schema || {}).filter((col) => columnList.includes(col) && !extraKeys.includes(col))?.join(',')
+    : fields.map((el) => (el?.name?.includes('geom') ? `st_asgeojson(${el.name})::json as "${el.name}"` : `"${el?.name}"`)).join(',');
+  const where = [`"${pk}" = $1`, loadTable.query].filter((el) => el);
+  const geom = columnList.includes('geom') ? 'st_asgeojson(geom)::json as geom,' : '';
+  const q = `select "${pk}" as id, ${geom} ${cols || '*'} from ${table || opt?.table || params.table} t where ${where.join(' and ') || 'true'} limit 1`;
+
+  if (query.sql === '1') return q;
+
+  const { rows } = await pg.query(q, [opt?.id || params.id]);
+
+  if (extraKeys?.length) {
+    await Promise.all(rows?.map(async (row) => {
+      await Promise.all(extraKeys?.map(async (key) => {
+        const { colModel, table: extraTable, parent_id: parentId } = schema[key];
+        const { rows: extraRows } = await pg.query(`select ${parentId} as parent, ${colModel.map((col) => col.name).join(',')} from ${extraTable} a where ${parentId}=$1`, [row.id]);
+        Object.assign(row, { [key]: extraRows });
+      }));
+    }));
+  }
+
+  return rows?.[0] || {};
+}

package/table/controllers/utils/addTemplateDir.js

@@ -1,8 +1,8 @@
-import userTemplateDir from './userTemplateDir.js';
-
-export default function addTemplateDir(dir) {
-  if (dir) {
-    userTemplateDir.push(dir);
-  }
-  return userTemplateDir;
-}
+import userTemplateDir from './userTemplateDir.js';
+
+export default function addTemplateDir(dir) {
+  if (dir) {
+    userTemplateDir.push(dir);
+  }
+  return userTemplateDir;
+}

package/table/controllers/utils/getSelect.js

@@ -1,19 +1,19 @@
-import getTemplate from './getTemplate.js';
-
-const loadCls = {};
-
-export default async function getSelect(name) {
-  if (loadCls[name]) return loadCls[name];
-
-  const clsData = await getTemplate(['cls', 'select'], name);
-  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 getTemplate from './getTemplate.js';
+
+const loadCls = {};
+
+export default async function getSelect(name) {
+  if (loadCls[name]) return loadCls[name];
+
+  const clsData = await getTemplate(['cls', 'select'], name);
+  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/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, nocache }) {
-  if (selectMeta[name] && !nocache) 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  `;
-
-  /*= == 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' : dataOrigin.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 (${sql})q` : sql,
-    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, nocache }) {
+  if (selectMeta[name] && !nocache) 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  `;
+
+  /*= == 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' : dataOrigin.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 (${sql})q` : sql,
+    sql,
+    count,
+    searchQuery,
+    table: tableNew.join(','),
+    time: new Date().toISOString(),
+
+  };
+
+  selectMeta[name] = data;
+  return data;
+}

package/table/controllers/utils/getTemplate_old.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 { 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 { sql };
+  return data;
+}

package/table/controllers/utils/getTemplates.js

@@ -1,18 +1,18 @@
-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/table/controllers/utils/gisIRColumn.js

@@ -1,68 +1,68 @@
-import pgClients from '../../../pg/pgClients.js';
-
-import getTemplate from './getTemplate.js';
-import getSelect from './getSelect.js';
-import getFilterSQL from '../../funcs/getFilterSQL/index.js';
-
-export default async function gisIRColumn({
-  pg = pgClients.client, funcs = {}, layer, column, sql, query = '1=1',
-}) {
-  const time = Date.now();
-
-  const { config = {} } = funcs;
-
-  const sel = await getSelect(query.cls || column);
-
-  const body = await getTemplate('table', layer);
-  const fData = await getFilterSQL({
-    table: body?.table || layer, query: body?.query,
-  });
-
-  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(body?.table || layer)) 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 ${body?.table || layer}`})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 ${tableName} t where ${body?.query || 'true'} 
-  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 getSelect(cls, { val: rows.map((el) => el.id), ar: 1 });
-  rows.forEach((el) => {
-    const data = select?.arr ? select.arr?.find((item) => item.id?.toString() === el.id?.toString()) : undefined;
-    Object.assign(el, data || {});
-  });
-  return {
-    time: Date.now() - time,
-    count: rows.reduce((acc, el) => acc + el.count, 0),
-    sql: config.local ? q : undefined,
-    rows,
-  };
-}
+import pgClients from '../../../pg/pgClients.js';
+
+import getTemplate from './getTemplate.js';
+import getSelect from './getSelect.js';
+import getFilterSQL from '../../funcs/getFilterSQL/index.js';
+
+export default async function gisIRColumn({
+  pg = pgClients.client, funcs = {}, layer, column, sql, query = '1=1',
+}) {
+  const time = Date.now();
+
+  const { config = {} } = funcs;
+
+  const sel = await getSelect(query.cls || column);
+
+  const body = await getTemplate('table', layer);
+  const fData = await getFilterSQL({
+    table: body?.table || layer, query: body?.query,
+  });
+
+  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(body?.table || layer)) 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 ${body?.table || layer}`})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 ${tableName} t where ${body?.query || 'true'} 
+  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 getSelect(cls, { val: rows.map((el) => el.id), ar: 1 });
+  rows.forEach((el) => {
+    const data = select?.arr ? select.arr?.find((item) => item.id?.toString() === el.id?.toString()) : undefined;
+    Object.assign(el, data || {});
+  });
+  return {
+    time: Date.now() - time,
+    count: rows.reduce((acc, el) => acc + el.count, 0),
+    sql: config.local ? q : undefined,
+    rows,
+  };
+}

package/table/controllers/utils/loadTemplate.js

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

package/table/controllers/utils/loadTemplatePath.js

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

package/table/controllers/utils/userTemplateDir.js

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