@opengis/fastify-table 1.2.32 → 1.2.34

package/server/routes/properties/index.js

@@ -1,16 +1,16 @@
-import getExtraProperties from './controllers/properties.get.js';
-import addExtraProperties from './controllers/properties.add.js';
-
-const propertiesSchema = {
-  params: {
-    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-  },
-};
-
-async function plugin(fastify, config = {}) {
-  const prefix = config.prefix || '/api';
-  fastify.get(`${prefix}/properties/:id`, { schema: propertiesSchema }, getExtraProperties);
-  fastify.post(`${prefix}/properties/:id`, { schema: propertiesSchema }, addExtraProperties);
-}
-
-export default plugin;
+import getExtraProperties from './controllers/properties.get.js';
+import addExtraProperties from './controllers/properties.add.js';
+
+const propertiesSchema = {
+  params: {
+    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+  },
+};
+
+async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
+  fastify.get(`${prefix}/properties/:id`, { schema: propertiesSchema }, getExtraProperties);
+  fastify.post(`${prefix}/properties/:id`, { schema: propertiesSchema }, addExtraProperties);
+}
+
+export default plugin;

package/server/routes/table/controllers/form.js

@@ -1,42 +1,42 @@
-import { applyHook, getTemplate } from '../../../../utils.js';
-
-const sql = `select property_key as key, property_json as json, property_int as int,
-property_text as text from admin.properties where 1=1`;
-
-async function getSettings({ pg }) {
-  const { rows = [] } = await pg.query(sql);
-  const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.key]: curr.json || curr.int || curr.text }), {});
-  return data;
-}
-
-export default async function formFunction(req) {
-  const time = Date.now();
-
-  const { pg, params, user } = req;
-  const hookData = await applyHook('preForm', { form: params?.form, user });
-
-  if (hookData?.message && hookData?.status) {
-    return { message: hookData?.message, status: hookData?.status };
-  }
-
-  const form = await getTemplate('form', hookData?.form || params?.form);
-  if (!form) { return { status: 404, message: 'not found' }; }
-
-  // replace settings
-  const arr = JSON.stringify(form).match(/{{settings.([^}]*)}}/g);
-  if (arr?.length) {
-    const string = JSON.stringify(form);
-    const settings = await getSettings({ pg });
-    const match = arr.reduce((acc, curr) => Object.assign(acc, { [curr]: settings[curr.replace(/^{{settings./g, '').replace(/}}$/, '')] }), {});
-    const res = Object.keys(match).reduce((s, m) => s.replace(m, match[m]), string);
-    return { time: Date.now() - time, form: JSON.parse(res) };
-  }
-
-  const res = { time: Date.now() - time, form };
-  const res1 = await applyHook('afterForm', {
-    form: hookData?.form || params?.form,
-    payload: res,
-    user,
-  });
-  return res1 || { time: Date.now() - time, form };
-}
+import { applyHook, getTemplate } from '../../../../utils.js';
+
+const sql = `select property_key as key, property_json as json, property_int as int,
+property_text as text from admin.properties where 1=1`;
+
+async function getSettings({ pg }) {
+  const { rows = [] } = await pg.query(sql);
+  const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.key]: curr.json || curr.int || curr.text }), {});
+  return data;
+}
+
+export default async function formFunction(req) {
+  const time = Date.now();
+
+  const { pg, params, user } = req;
+  const hookData = await applyHook('preForm', { form: params?.form, user });
+
+  if (hookData?.message && hookData?.status) {
+    return { message: hookData?.message, status: hookData?.status };
+  }
+
+  const form = await getTemplate('form', hookData?.form || params?.form);
+  if (!form) { return { status: 404, message: 'not found' }; }
+
+  // replace settings
+  const arr = JSON.stringify(form).match(/{{settings.([^}]*)}}/g);
+  if (arr?.length) {
+    const string = JSON.stringify(form);
+    const settings = await getSettings({ pg });
+    const match = arr.reduce((acc, curr) => Object.assign(acc, { [curr]: settings[curr.replace(/^{{settings./g, '').replace(/}}$/, '')] }), {});
+    const res = Object.keys(match).reduce((s, m) => s.replace(m, match[m]), string);
+    return { time: Date.now() - time, form: JSON.parse(res) };
+  }
+
+  const res = { time: Date.now() - time, form };
+  const res1 = await applyHook('afterForm', {
+    form: hookData?.form || params?.form,
+    payload: res,
+    user,
+  });
+  return res1 || { time: Date.now() - time, form };
+}

package/server/routes/table/controllers/search.js

@@ -1,74 +1,74 @@
-import {
-  getMeta, metaFormat, getTemplates, getTemplate, handlebars,
-} from '../../../../utils.js';
-
-function sequence(tables, data, fn) {
-  return tables.reduce((promise, table) => promise.then(() => fn({
-    ...data, tableName: table.replace('.json', ''),
-  })), Promise.resolve());
-}
-
-async function getData({
-  pg, tableName, query = {}, maxLimit, res,
-}) {
-  const loadTable = await getTemplate('table', tableName);
-
-  if (!loadTable) { return { message: 'not found', status: 404 }; }
-
-  const {
-    table, columns, meta,
-  } = loadTable;
-
-  const { pk } = await getMeta(table);
-
-  const cols = columns.map((el) => el.name || el).join(',');
-  const [orderColumn, orderDir] = (query.order || loadTable.order || '').split('-');
-  const order = cols.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
-
-  const limit = Math.max(maxLimit - res.rows.length, 0);
-  // Math.max(query.offset - res.rows.length,0)
-  const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
-
-  const search1 = meta?.search && query.key ? `(${meta?.search.concat(meta?.title ? `,${meta?.title}` : '').split(',').map(el => `${el} ilike '%${query.key}%'`).join(' or ')})` : 'false';
-
-  const where = [!pk ? 'false' : 'true', loadTable.query, search1].filter((el) => el);
-  const q = `select ${[`"${pk}" as id`, meta?.title ? `${meta.title} as title` : ''].filter((el) => el).join(',')} from ${table} t where ${where.join(' and ') || 'true'} ${order} ${offset} limit ${limit}`;
-  if (query.sql) {
-    res.sql.push(q);
-    return null;
-  }
-
-  const { rows } = await pg.query(q);
-
-  const total = await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count) || 0;
-
-  await metaFormat({ rows, table: tableName });
-  res.total += +total;
-  rows.forEach((row) => {
-    const href = meta?.href ? handlebars.compile(meta.href)({ ...row, [pk]: row.id }) : undefined;
-    res.rows.push({
-      ...row, register: tableName, register_title: loadTable.ua, href,
-    });
-  });
-  return null;
-}
-
-export default async function search({
-  pg, funcs, query = {},
-}) {
-  const time = Date.now();
-
-  const tables = query.table ? [query.table] : await getTemplates('table');
-  const res = { rows: [], sql: [], total: 0 };
-
-  const maxLimit = Math.min(100, query.limit || '16');
-  await sequence(tables, {
-    pg, funcs, query, maxLimit, res,
-  }, getData);
-
-  if (query.sql) return res.sql.join(';\n');
-
-  return {
-    time: Date.now() - time, total: res.total, count: res.rows.length, rows: res.rows,
-  };
-}
+import {
+  getMeta, metaFormat, getTemplates, getTemplate, handlebars,
+} from '../../../../utils.js';
+
+function sequence(tables, data, fn) {
+  return tables.reduce((promise, table) => promise.then(() => fn({
+    ...data, tableName: table.replace('.json', ''),
+  })), Promise.resolve());
+}
+
+async function getData({
+  pg, tableName, query = {}, maxLimit, res,
+}) {
+  const loadTable = await getTemplate('table', tableName);
+
+  if (!loadTable) { return { message: 'not found', status: 404 }; }
+
+  const {
+    table, columns, meta,
+  } = loadTable;
+
+  const { pk } = await getMeta(table);
+
+  const cols = columns.map((el) => el.name || el).join(',');
+  const [orderColumn, orderDir] = (query.order || loadTable.order || '').split('-');
+  const order = cols.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
+
+  const limit = Math.max(maxLimit - res.rows.length, 0);
+  // Math.max(query.offset - res.rows.length,0)
+  const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
+
+  const search1 = meta?.search && query.key ? `(${meta?.search.concat(meta?.title ? `,${meta?.title}` : '').split(',').map(el => `${el} ilike '%${query.key}%'`).join(' or ')})` : 'false';
+
+  const where = [!pk ? 'false' : 'true', loadTable.query, search1].filter((el) => el);
+  const q = `select ${[`"${pk}" as id`, meta?.title ? `${meta.title} as title` : ''].filter((el) => el).join(',')} from ${table} t where ${where.join(' and ') || 'true'} ${order} ${offset} limit ${limit}`;
+  if (query.sql) {
+    res.sql.push(q);
+    return null;
+  }
+
+  const { rows } = await pg.query(q);
+
+  const total = await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count) || 0;
+
+  await metaFormat({ rows, table: tableName });
+  res.total += +total;
+  rows.forEach((row) => {
+    const href = meta?.href ? handlebars.compile(meta.href)({ ...row, [pk]: row.id }) : undefined;
+    res.rows.push({
+      ...row, register: tableName, register_title: loadTable.ua, href,
+    });
+  });
+  return null;
+}
+
+export default async function search({
+  pg, funcs, query = {},
+}) {
+  const time = Date.now();
+
+  const tables = query.table ? [query.table] : await getTemplates('table');
+  const res = { rows: [], sql: [], total: 0 };
+
+  const maxLimit = Math.min(100, query.limit || '16');
+  await sequence(tables, {
+    pg, funcs, query, maxLimit, res,
+  }, getData);
+
+  if (query.sql) return res.sql.join(';\n');
+
+  return {
+    time: Date.now() - time, total: res.total, count: res.rows.length, rows: res.rows,
+  };
+}

package/server/routes/table/controllers/suggest.js

@@ -44,7 +44,7 @@ export default async function suggest(req) {
 
   const meta = table && column
     ? {
-      original: `with c(id,text) as (select ${column || 'row_number() over()'}, ${column} from ${tableName} group by ${column} limit ${limit}) select * from c`,
+      original: `with c(id,text) as (select ${column || 'row_number() over()'}, ${column}, count(*) from ${tableName} group by ${column} limit ${limit}) select * from c`,
       searchQuery: '(lower("text") ~ $1 )',
     }
     : await getSelectMeta({ name: selectName, nocache: query?.nocache });

package/server/routes/table/index.js

@@ -1,29 +1,29 @@
-import suggest from './controllers/suggest.js';
-import data from './controllers/data.js';
-
-import card from './controllers/card.js';
-import search from './controllers/search.js';
-import filter from './controllers/filter.js';
-import form from './controllers/form.js';
-
-import loadTemplatePath from '../../plugins/table/funcs/loadTemplatePath.js';
-
-import {
-  tableSchema, searchSchema, suggestSchema, formSchema, filterSchema,
-} from './schema.js';
-
-async function plugin(fastify, config = {}) {
-  const prefix = config.prefix || '/api';
-  const policy = ['public'];
-  fastify.get(`${prefix}/suggest/:data`, { config: { policy }, schema: suggestSchema }, suggest);
-  fastify.get(`${prefix}/data/:table/:id?`, { config: { policy }, schema: tableSchema }, data); // vs.crm.data.api с node
-
-  fastify.get(`${prefix}/card/:table/:id`, { config: { policy }, schema: tableSchema }, card);
-  fastify.get(`${prefix}/search`, { config: { policy }, schema: searchSchema }, search);
-
-  fastify.get(`${prefix}/templates`, () => loadTemplatePath);
-  fastify.get(`${prefix}/filter/:table`, { config: { policy }, schema: filterSchema }, filter);
-  fastify.get(`${prefix}/form/:form`, { config: { policy }, schema: formSchema }, form);
-}
-
-export default plugin;
+import suggest from './controllers/suggest.js';
+import data from './controllers/data.js';
+
+import card from './controllers/card.js';
+import search from './controllers/search.js';
+import filter from './controllers/filter.js';
+import form from './controllers/form.js';
+
+import loadTemplatePath from '../../plugins/table/funcs/loadTemplatePath.js';
+
+import {
+  tableSchema, searchSchema, suggestSchema, formSchema, filterSchema,
+} from './schema.js';
+
+async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
+  const policy = ['public'];
+  fastify.get(`${prefix}/suggest/:data`, { config: { policy }, schema: suggestSchema }, suggest);
+  fastify.get(`${prefix}/data/:table/:id?`, { config: { policy }, schema: tableSchema }, data); // vs.crm.data.api с node
+
+  fastify.get(`${prefix}/card/:table/:id`, { config: { policy }, schema: tableSchema }, card);
+  fastify.get(`${prefix}/search`, { config: { policy }, schema: searchSchema }, search);
+
+  fastify.get(`${prefix}/templates`, () => loadTemplatePath);
+  fastify.get(`${prefix}/filter/:table`, { config: { policy }, schema: filterSchema }, filter);
+  fastify.get(`${prefix}/form/:form`, { config: { policy }, schema: formSchema }, form);
+}
+
+export default plugin;

package/server/routes/table/schema.js

@@ -1,64 +1,64 @@
-const tableSchema = {
-  querystring: {
-    limit: { type: 'string', pattern: '^(\\d+)$' },
-    page: { type: 'string', pattern: '^(\\d+)$' },
-    // filter: { type: 'string', pattern: '^([\\w\\d_-]+)=([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
-    // search: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
-    order: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-    desc: { type: 'string', pattern: '^(\\d+)$' },
-    // state: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-    // custom: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-    bbox: { type: 'string', pattern: '^([\\d\\s,.-]+)$' },
-    // polyline: { type: 'string', pattern: '^([\\d\\w\\|@\\/\\{\\}~_`]+)$' },
-    key: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s_.-]+)$' },
-    uid: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-    sql: { type: 'string', pattern: '^(\\d)$' },
-  },
-  params: {
-    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    table: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-  },
-};
-
-const searchSchema = {
-  querystring: {
-    page: { type: 'string', pattern: '^(\\d+)$' },
-    limit: { type: 'string', pattern: '^(\\d+)$' },
-    order: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-    desc: { type: 'string', pattern: '^(\\d+)$' },
-    key: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s_.-]+)$' },
-    table: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-    sql: { type: 'string', pattern: '^(\\d)$' },
-  },
-};
-
-const suggestSchema = {
-  querystring: {
-    lang: { type: 'string', pattern: '^([\\w]+)$' },
-    parent: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-    sel: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-    name: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-    // key: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-    val: { type: 'string', pattern: '([\\d\\w]+)$' },
-    sql: { type: 'string', pattern: '^(\\d)$' },
-  },
-  params: {
-  //  data: { type: 'string', pattern: '^([\\d\\w]+)$' },
-  },
-};
-
-const formSchema = {
-  params: {
-    form: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-  },
-};
-
-const filterSchema = {
-  params: {
-    table: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-  },
-};
-
-export {
-  tableSchema, searchSchema, suggestSchema, formSchema, filterSchema,
-};
+const tableSchema = {
+  querystring: {
+    limit: { type: 'string', pattern: '^(\\d+)$' },
+    page: { type: 'string', pattern: '^(\\d+)$' },
+    // filter: { type: 'string', pattern: '^([\\w\\d_-]+)=([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
+    // search: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
+    order: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+    desc: { type: 'string', pattern: '^(\\d+)$' },
+    // state: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+    // custom: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+    bbox: { type: 'string', pattern: '^([\\d\\s,.-]+)$' },
+    // polyline: { type: 'string', pattern: '^([\\d\\w\\|@\\/\\{\\}~_`]+)$' },
+    key: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s_.-]+)$' },
+    uid: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+    sql: { type: 'string', pattern: '^(\\d)$' },
+  },
+  params: {
+    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    table: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+  },
+};
+
+const searchSchema = {
+  querystring: {
+    page: { type: 'string', pattern: '^(\\d+)$' },
+    limit: { type: 'string', pattern: '^(\\d+)$' },
+    order: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+    desc: { type: 'string', pattern: '^(\\d+)$' },
+    key: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s_.-]+)$' },
+    table: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+    sql: { type: 'string', pattern: '^(\\d)$' },
+  },
+};
+
+const suggestSchema = {
+  querystring: {
+    lang: { type: 'string', pattern: '^([\\w]+)$' },
+    parent: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+    sel: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+    name: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+    // key: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+    val: { type: 'string', pattern: '([\\d\\w]+)$' },
+    sql: { type: 'string', pattern: '^(\\d)$' },
+  },
+  params: {
+  //  data: { type: 'string', pattern: '^([\\d\\w]+)$' },
+  },
+};
+
+const formSchema = {
+  params: {
+    form: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+  },
+};
+
+const filterSchema = {
+  params: {
+    table: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+  },
+};
+
+export {
+  tableSchema, searchSchema, suggestSchema, formSchema, filterSchema,
+};

package/server/routes/util/controllers/status.monitor.js

@@ -1,8 +1,8 @@
-const formatMemoryUsage = (data) => `${Math.round(data / 1024 / 1024 * 100) / 100} MB`;
-
-export default async function statusMonitor() {
-  const memoryUsage = process.memoryUsage();
-  const message = Object.keys(memoryUsage)
-    .reduce((acc, curr) => Object.assign(acc, { [curr]: formatMemoryUsage(memoryUsage[curr]) }), {});
-  return { message, status: 200 };
-}
+const formatMemoryUsage = (data) => `${Math.round(data / 1024 / 1024 * 100) / 100} MB`;
+
+export default async function statusMonitor() {
+  const memoryUsage = process.memoryUsage();
+  const message = Object.keys(memoryUsage)
+    .reduce((acc, curr) => Object.assign(acc, { [curr]: formatMemoryUsage(memoryUsage[curr]) }), {});
+  return { message, status: 200 };
+}

package/server/routes/util/index.js

@@ -1,11 +1,11 @@
-import nextId from './controllers/next.id.js';
-import statusMonitor from './controllers/status.monitor.js';
-
-async function plugin(fastify, config = {}) {
-  const prefix = config.prefix || '/api';
-
-  fastify.get(`${prefix}/next-id`, {}, nextId);
-  fastify.get(`${prefix}/status-monitor`, {}, statusMonitor);
-}
-
-export default plugin;
+import nextId from './controllers/next.id.js';
+import statusMonitor from './controllers/status.monitor.js';
+
+async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
+
+  fastify.get(`${prefix}/next-id`, {}, nextId);
+  fastify.get(`${prefix}/status-monitor`, {}, statusMonitor);
+}
+
+export default plugin;