@opengis/fastify-table 1.1.78 → 1.1.79

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

@@ -1,60 +1,60 @@
-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);
-
-  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 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 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);
+
+  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 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/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,72 +1,72 @@
-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';
-
-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);
-
-  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 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 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';
+
+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);
+
+  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 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/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,22 +1,38 @@
-import getSelect from '../getSelect.js';
-import pgClients from '../../../pg/pgClients.js';
-import redis from '../../../redis/client.js';
-
-// import { pgClients, getSelect } from '../../../../../utils.js';
-
-export default async function getSelectVal({ pg = pgClients.client, name, values }) {
-  const cls = await getSelect(name);
-  if (!cls?.arr && !cls?.sql) return null;
-  const key = `select:${name}`;
-  const cache = !cls.arr ? (await redis.hmget(key, values)).reduce((p, el, i) => ({ ...p, [values[i]]: el }), {}) : {};
-
-  const { name: id } = cls?.sql ? await pg.queryCache(`select * from (${cls.sql})q limit 0`).then((res) => res.fields?.[0] || {}) : {};
-  const q = cls?.sql ? `with c(id,text) as (select * from (${cls.sql})q where ${id} = any('{${values.filter(el => !cache[el])}}')) select * from c` : '';
-  const data = (cls.sql && values.filter(el => !cache[el]).length ? await pg.query(q).then(el => el.rows) : cls?.arr?.filter((el) => values.filter(el => !cache[el])?.includes(el?.id))) || [];
-
-  const clsAr = { ...cache, ...data.reduce((p, el) => ({ ...p, [el.id.toString()]: el.color ? el : el.text }), {}) };
-  if (!cls.arr && data?.length) {
-    redis.hmset(key, clsAr);
-  }
-  return clsAr;
-}
+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 }) {
+  if (!valuesOrigin?.length) return null;
+  const values = valuesOrigin.map(el => el.toString());
+  const cls = await getSelect(name);
+
+  // === array  ===
+  if (cls.arr) {
+    //  console.log(name, cls?.arr, values);
+    return cls?.arr.filter(el => values.includes(el.id.toString())).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 clsAr = { ...cache, ...data.reduce((p, el) => ({ ...p, [el.id.toString()]: el.color ? el : el.text }), {}) };
+  if (data?.length) {
+    redis.hmset(key, clsAr);
+  }
+  return clsAr;
+}

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

@@ -1,30 +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] || c) || 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;
+    console.log(cls);
+    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;

package/server/plugins/util/funcs/eventStream.js

@@ -1,28 +1,28 @@
-/* eslint-disable no-param-reassign */
-export default function eventStream(res) {
-  if (!res) return console.log;
-  const time = Date.now();
-
-  // eslint-disable-next-line no-underscore-dangle
-  if (!res?._headerSent) {
-    res.raw.writeHead(200, {
-      'Content-Type': 'text/event-stream; charset=utf-8',
-      'Cache-Control': 'no-cache',
-      Connection: 'keep-alive',
-      'X-Accel-Buffering': 'no',
-    });
-    res.hijack();
-  }
-  let prev = time;
-  function send(mes, finish) {
-    const t1 = Date.now();
-    res.raw.write(`data: ${finish ? 'finish' : ''} ${typeof mes === 'object' ? JSON.stringify(mes) : mes} ${t1 - prev}/${t1 - time}ms\n\n`);
-    prev = t1;
-    if (finish) {
-      res.raw.write('data: finish');
-      res.raw.end('');
-    }
-  }
-
-  return send;
-}
+/* eslint-disable no-param-reassign */
+export default function eventStream(res) {
+  if (!res) return console.log;
+  const time = Date.now();
+
+  // eslint-disable-next-line no-underscore-dangle
+  if (!res?._headerSent) {
+    res.raw.writeHead(200, {
+      'Content-Type': 'text/event-stream; charset=utf-8',
+      'Cache-Control': 'no-cache',
+      Connection: 'keep-alive',
+      'X-Accel-Buffering': 'no',
+    });
+    res.hijack();
+  }
+  let prev = time;
+  function send(mes, finish) {
+    const t1 = Date.now();
+    res.raw.write(`data: ${finish ? 'finish' : ''} ${typeof mes === 'object' ? JSON.stringify(mes) : mes} ${t1 - prev}/${t1 - time}ms\n\n`);
+    prev = t1;
+    if (finish) {
+      res.raw.write('data: finish');
+      res.raw.end('');
+    }
+  }
+
+  return send;
+}

package/server/plugins/util/index.js

@@ -1,7 +1,7 @@
-import eventStream from './funcs/eventStream.js';
-
-async function plugin(fastify) {
-//   fastify.decorate('eventStream', eventStream);
-}
-
-export default plugin;
+import eventStream from './funcs/eventStream.js';
+
+async function plugin(fastify) {
+//   fastify.decorate('eventStream', eventStream);
+}
+
+export default plugin;

package/server/routes/cron/index.js

@@ -1,14 +1,14 @@
-import cronApi from './controllers/cronApi.js';
-
-const cronSchema = {
-  params: {
-    name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-  },
-};
-
-async function plugin(fastify, config = {}) {
-  const prefix = config.prefix || '/api';
-  fastify.get(`${prefix}/cron/:name`, { schema: cronSchema }, cronApi);
-}
-
-export default plugin;
+import cronApi from './controllers/cronApi.js';
+
+const cronSchema = {
+  params: {
+    name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+  },
+};
+
+async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
+  fastify.get(`${prefix}/cron/:name`, { schema: cronSchema }, cronApi);
+}
+
+export default plugin;

package/server/routes/crud/controllers/deleteCrud.js

@@ -1,36 +1,36 @@
-import {
-  dataDelete, getTemplate, getAccess, applyHook, getToken, config,
-} from '../../../../utils.js';
-
-export default async function deleteCrud(req) {
-  const { user, params = {} } = req || {};
-  const hookData = await applyHook('preDelete', {
-    table: params?.table, id: params?.id, user,
-  });
-  if (hookData?.message && hookData?.status) {
-    return { message: hookData?.message, status: hookData?.status };
-  }
-
-  const tokenData = await getToken({
-    uid: user.uid, token: params.table, json: 1,
-  });
-
-  const { table: del, id } = hookData || tokenData || (config.auth?.disable ? req.params : {});
-  const { actions = [] } = await getAccess({ table: del, id, user }) || {};
-
-  if (!actions.includes('del') && !config?.local && !tokenData) {
-    return { message: 'access restricted', status: 403 };
-  }
-  const loadTemplate = await getTemplate('table', del);
-
-  const { table } = loadTemplate || hookData || tokenData || req.params || {};
-
-  if (!table) return { status: 404, message: 'table is required' };
-  if (!id) return { status: 404, message: 'id is required' };
-
-  const data = await dataDelete({
-    table, id, uid: user?.uid,
-  });
-
-  return { rowCount: data.rowCount, msg: !data.rowCount ? data : null };
-}
+import {
+  dataDelete, getTemplate, getAccess, applyHook, getToken, config,
+} from '../../../../utils.js';
+
+export default async function deleteCrud(req) {
+  const { user, params = {} } = req || {};
+  const hookData = await applyHook('preDelete', {
+    table: params?.table, id: params?.id, user,
+  });
+  if (hookData?.message && hookData?.status) {
+    return { message: hookData?.message, status: hookData?.status };
+  }
+
+  const tokenData = await getToken({
+    uid: user.uid, token: params.table, json: 1,
+  });
+
+  const { table: del, id } = hookData || tokenData || (config.auth?.disable ? req.params : {});
+  const { actions = [] } = await getAccess({ table: del, id, user }) || {};
+
+  if (!actions.includes('del') && !config?.local && !tokenData) {
+    return { message: 'access restricted', status: 403 };
+  }
+  const loadTemplate = await getTemplate('table', del);
+
+  const { table } = loadTemplate || hookData || tokenData || req.params || {};
+
+  if (!table) return { status: 404, message: 'table is required' };
+  if (!id) return { status: 404, message: 'id is required' };
+
+  const data = await dataDelete({
+    table, id, uid: user?.uid,
+  });
+
+  return { rowCount: data.rowCount, msg: !data.rowCount ? data : null };
+}