@opengis/fastify-table 1.1.59 → 1.1.61

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

@@ -1,84 +1,84 @@
-import {
-  config, getPG, getTemplate, getSelectMeta,
-} from '../../../../utils.js';
-
-const limit = 50;
-const headers = {
-  'Access-Control-Allow-Origin': '*',
-  'Access-Control-Allow-Methods': 'GET',
-  'Cache-Control': 'no-cache',
-};
-
-export default async function suggest(req) {
-  const {
-    params, query, pg: pg1, user,
-  } = req;
-
-  const lang = query.lang || 'ua';
-  const time = Date.now();
-  const parent = query.parent || '';
-
-  const [table, column] = params.data?.includes(':') ? params.data.split(':') : [];
-  const selectName = query.sel || query.name || params.data;
-  if (!selectName) return { headers, status: 400, message: 'name is required' };
-
-  const body = await getTemplate('table', table);
-  if (table && !pg1.pk[body?.table || table]) {
-    return { headers, status: 400, message: 'param name is invalid: 1' };
-  }
-  const columnExists = body?.columns?.find((col) => col?.name === column);
-  if (table && (!column || !columnExists)) {
-    return { headers, status: 400, message: 'param name is invalid: 2' };
-  }
-
-  const meta = table && column
-    ? {
-      original: `with c(id,text) as (select row_number() over(), ${column} from ${body?.table || table} group by ${column} ) select * from c`,
-      searchQuery: '("text" ilike $1 )',
-    }
-    : await getSelectMeta({ name: selectName, nocache: query?.nocache });
-  const pg = meta?.db ? getPG(meta.db) : pg1;
-  if (!meta) return { headers, status: 404, message: 'Not found query select ' };
-  if (query.meta) return meta;
-
-  const { arr, searchQuery } = meta;
-
-  if (arr) {
-    const lower = query.key?.toLowerCase();
-    const data = query.key || query.val
-      ? arr?.filter((el) => !lower || (el[lang] || el.text)?.toLowerCase()?.indexOf(lower) !== -1)?.filter((el) => !query.val || el.id === query.val)
-      : arr;
-    return {
-      limit, count: data.length, mode: 'array', time: Date.now() - time, data,
-    };
-  }
-
-  // search
-  const search = query.key ? searchQuery : null;
-
-  // val
-  // const pk = meta.originalCols.split(',')[0];
-
-  const val = query.val ? ` id=any('{${query.val.replace(/'/g, "''")}}')` : '';
-  const where = [search, val, 'id is not null'].filter((el) => el).join(' and ') || 'true';
-  const sqlSuggest = `${meta.original.replace(/{{parent}}/gi, parent)} where ${where} limit ${limit}`.replace(/{{uid}}/g, user?.uid || '0');
-  if (query.sql && config.local) return sqlSuggest;
-
-  // query
-  const { rows: dataNew } = meta.searchColumn ? { rows: [] } : await pg.query(sqlSuggest, query.key ? [`${query.key}%`] : []);
-  const { rows: dataNew1 } = dataNew.length < limit ? await pg.query(sqlSuggest, query.key ? [`%${query.key}%`] : []) : {};
-  const ids = dataNew.map((el) => el.id);
-  const data = dataNew.concat((dataNew1 || []).filter((el) => !ids?.includes(el.id)));
-
-  const message = {
-    time: Date.now() - time,
-    count: data.length,
-    total: meta.count - 0,
-    mode: 'sql',
-    db: meta.db,
-    sql: config.local ? sqlSuggest : undefined,
-    data,
-  };
-
-  return message;
-}
+import {
+  config, getPG, getTemplate, getSelectMeta,
+} from '../../../../utils.js';
+
+const limit = 50;
+const headers = {
+  'Access-Control-Allow-Origin': '*',
+  'Access-Control-Allow-Methods': 'GET',
+  'Cache-Control': 'no-cache',
+};
+
+export default async function suggest(req) {
+  const {
+    params, query, pg: pg1, user,
+  } = req;
+
+  const lang = query.lang || 'ua';
+  const time = Date.now();
+  const parent = query.parent || '';
+
+  const [table, column] = params.data?.includes(':') ? params.data.split(':') : [];
+  const selectName = query.sel || query.name || params.data;
+  if (!selectName) return { headers, status: 400, message: 'name is required' };
+
+  const body = await getTemplate('table', table);
+  if (table && !pg1.pk[body?.table || table]) {
+    return { headers, status: 400, message: 'param name is invalid: 1' };
+  }
+  const columnExists = body?.columns?.find((col) => col?.name === column);
+  if (table && (!column || !columnExists)) {
+    return { headers, status: 400, message: 'param name is invalid: 2' };
+  }
+
+  const meta = table && column
+    ? {
+      original: `with c(id,text) as (select row_number() over(), ${column} from ${body?.table || table} group by ${column} ) select * from c`,
+      searchQuery: '("text" ilike $1 )',
+    }
+    : await getSelectMeta({ name: selectName, nocache: query?.nocache });
+  const pg = meta?.db ? getPG(meta.db) : pg1;
+  if (!meta) return { headers, status: 404, message: 'Not found query select ' };
+  if (query.meta) return meta;
+
+  const { arr, searchQuery } = meta;
+
+  if (arr) {
+    const lower = query.key?.toLowerCase();
+    const data = query.key || query.val
+      ? arr?.filter((el) => !lower || (el[lang] || el.text)?.toLowerCase()?.indexOf(lower) !== -1)?.filter((el) => !query.val || el.id === query.val)
+      : arr;
+    return {
+      limit, count: data.length, mode: 'array', time: Date.now() - time, data,
+    };
+  }
+
+  // search
+  const search = query.key ? searchQuery : null;
+
+  // val
+  // const pk = meta.originalCols.split(',')[0];
+
+  const val = query.val ? ` id=any('{${query.val.replace(/'/g, "''")}}')` : '';
+  const where = [search, val, 'id is not null'].filter((el) => el).join(' and ') || 'true';
+  const sqlSuggest = `${meta.original.replace(/{{parent}}/gi, parent)} where ${where} limit ${limit}`.replace(/{{uid}}/g, user?.uid || '0');
+  if (query.sql && config.local) return sqlSuggest;
+
+  // query
+  const { rows: dataNew } = meta.searchColumn ? { rows: [] } : await pg.query(sqlSuggest, query.key ? [`${query.key}%`] : []);
+  const { rows: dataNew1 } = dataNew.length < limit ? await pg.query(sqlSuggest, query.key ? [`%${query.key}%`] : []) : {};
+  const ids = dataNew.map((el) => el.id);
+  const data = dataNew.concat((dataNew1 || []).filter((el) => !ids?.includes(el.id)));
+
+  const message = {
+    time: Date.now() - time,
+    count: data.length,
+    total: meta.count - 0,
+    mode: 'sql',
+    db: meta.db,
+    sql: config.local ? sqlSuggest : undefined,
+    data,
+  };
+
+  return message;
+}

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

@@ -1,81 +1,81 @@
-import {
-  config, getAccess, getTemplate, getMeta, setToken, applyHook,
-} from '../../../../utils.js';
-
-export default async function tableAPI(req) {
-  const {
-    pg, params, user, query = {},
-  } = req;
-  const hookData = await applyHook('preTable', {
-    table: params?.table, id: params?.id, user,
-  });
-
-  if (hookData?.message && hookData?.status) {
-    return { message: hookData?.message, status: hookData?.status };
-  }
-
-  if (!params?.id && !hookData?.id) {
-    return { message: 'not enough params', status: 400 };
-  }
-  const tableName = hookData?.table || params.table;
-  const loadTable = await getTemplate('table', tableName) || {};
-  if (!loadTable || (pg.pk?.[tableName])) {
-    return { message: 'not found', status: 404 };
-  }
-
-  const { actions = [], query: accessQuery } = await getAccess({
-    table: hookData?.table || params.table,
-    id: hookData?.id || params?.id,
-    user,
-  }) || {};
-
-  if (!actions.includes('edit') && !config?.local) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  const { table, /* columns, */ form } = loadTable;
-
-  const { pk, columns: dbColumns = [] } = await getMeta(table || hookData?.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', hookData?.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 || hookData?.table || params.table} limit 0`) : {};
-  const cols = loadTable?.table
-    ? Object.keys(schema || {}).filter((col) => columnList.includes(col) && !extraKeys.includes(col))?.map((col) => (col?.includes('geom') ? `st_asgeojson(${col})::json as "${col}"` : `"${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, accessQuery].filter((el) => el);
-  const geom = columnList.includes('geom') ? ',st_asgeojson(geom)::json as geom' : '';
-  const q = `select "${pk}" as id, ${cols || '*'} ${geom} from ${table || hookData?.table || params.table} t where ${where.join(' and ') || 'true'} limit 1`;
-
-  if (query?.sql === '1') return q;
-
-  const data = await pg.query(q, [hookData?.id || params.id]).then(el => el.rows[0]);
-  if (!data) return { message: 'not found', status: 404 };
-
-  if (extraKeys?.length) {
-    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`, [hookData?.id || params?.id]);
-      Object.assign(data, { [key]: extraRows });
-    }));
-  }
-  if (user.uid) {
-    const [token] = setToken({
-      ids: [JSON.stringify({ id: params?.id, table: params.table || loadTable.table, form: loadTable.form })],
-      mode: 'w',
-      uid: user.uid,
-      array: 1,
-    });
-    data.token = token;
-  }
-  const res = await applyHook('afterTable', {
-    table: loadTable?.table, payload: [data], user,
-  });
-  return res || data || {};
-}
+import {
+  config, getAccess, getTemplate, getMeta, setToken, applyHook,
+} from '../../../../utils.js';
+
+export default async function tableAPI(req) {
+  const {
+    pg, params, user, query = {},
+  } = req;
+  const hookData = await applyHook('preTable', {
+    table: params?.table, id: params?.id, user,
+  });
+
+  if (hookData?.message && hookData?.status) {
+    return { message: hookData?.message, status: hookData?.status };
+  }
+
+  if (!params?.id && !hookData?.id) {
+    return { message: 'not enough params', status: 400 };
+  }
+  const tableName = hookData?.table || params.table;
+  const loadTable = await getTemplate('table', tableName) || {};
+  if (!loadTable || (pg.pk?.[tableName])) {
+    return { message: 'not found', status: 404 };
+  }
+
+  const { actions = [], query: accessQuery } = await getAccess({
+    table: hookData?.table || params.table,
+    id: hookData?.id || params?.id,
+    user,
+  }) || {};
+
+  if (!actions.includes('edit') && !config?.local) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  const { table, /* columns, */ form } = loadTable;
+
+  const { pk, columns: dbColumns = [] } = await getMeta(table || hookData?.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', hookData?.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 || hookData?.table || params.table} limit 0`) : {};
+  const cols = loadTable?.table
+    ? Object.keys(schema || {}).filter((col) => columnList.includes(col) && !extraKeys.includes(col))?.map((col) => (col?.includes('geom') ? `st_asgeojson(${col})::json as "${col}"` : `"${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, accessQuery].filter((el) => el);
+  const geom = columnList.includes('geom') ? ',st_asgeojson(geom)::json as geom' : '';
+  const q = `select "${pk}" as id, ${cols || '*'} ${geom} from ${table || hookData?.table || params.table} t where ${where.join(' and ') || 'true'} limit 1`;
+
+  if (query?.sql === '1') return q;
+
+  const data = await pg.query(q, [hookData?.id || params.id]).then(el => el.rows[0]);
+  if (!data) return { message: 'not found', status: 404 };
+
+  if (extraKeys?.length) {
+    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`, [hookData?.id || params?.id]);
+      Object.assign(data, { [key]: extraRows });
+    }));
+  }
+  if (user.uid) {
+    const [token] = setToken({
+      ids: [JSON.stringify({ id: params?.id, table: params.table || loadTable.table, form: loadTable.form })],
+      mode: 'w',
+      uid: user.uid,
+      array: 1,
+    });
+    data.token = token;
+  }
+  const res = await applyHook('afterTable', {
+    table: loadTable?.table, payload: [data], user,
+  });
+  return res || data || {};
+}

package/server/routes/table/index.js

@@ -1,28 +1,28 @@
-import suggest from './controllers/suggest.js';
-import data from './controllers/data.js';
-import table from './controllers/table.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';
-  fastify.get(`${prefix}/suggest/:data`, { schema: suggestSchema }, suggest);
-  fastify.get(`${prefix}/data/:table/:id?`, { schema: tableSchema }, data); // vs.crm.data.api с node
-  fastify.get(`${prefix}/table/:table/:id?`, { schema: tableSchema }, table);
-  fastify.get(`${prefix}/card/:table/:id`, { schema: tableSchema }, card);
-  fastify.get(`${prefix}/search`, { schema: searchSchema }, search);
-
-  fastify.get(`${prefix}/templates`, () => loadTemplatePath);
-  fastify.get(`${prefix}/filter/:table`, { schema: filterSchema }, filter);
-  fastify.get(`${prefix}/form/:form`, { schema: formSchema }, form);
-}
-
-export default plugin;
+import suggest from './controllers/suggest.js';
+import data from './controllers/data.js';
+import table from './controllers/table.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';
+  fastify.get(`${prefix}/suggest/:data`, { schema: suggestSchema }, suggest);
+  fastify.get(`${prefix}/data/:table/:id?`, { schema: tableSchema }, data); // vs.crm.data.api с node
+  fastify.get(`${prefix}/table/:table/:id?`, { schema: tableSchema }, table);
+  fastify.get(`${prefix}/card/:table/:id`, { schema: tableSchema }, card);
+  fastify.get(`${prefix}/search`, { schema: searchSchema }, search);
+
+  fastify.get(`${prefix}/templates`, () => loadTemplatePath);
+  fastify.get(`${prefix}/filter/:table`, { schema: filterSchema }, filter);
+  fastify.get(`${prefix}/form/:form`, { schema: formSchema }, form);
+}
+
+export default plugin;