@opengis/fastify-table 1.1.49 → 1.1.51

package/table/funcs/metaFormat/index.js

@@ -1,28 +1,28 @@
-import getTemplate from '../../controllers/utils/getTemplate.js';
-import getSelectVal from './getSelectVal.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) => 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 '../../controllers/utils/getTemplate.js';
+import getSelectVal from './getSelectVal.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) => 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;
+}

package/table/index.js

@@ -1,84 +1,37 @@
-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 metaFormat from './funcs/metaFormat/index.js';
-import getFilterSQL from './funcs/getFilterSQL/index.js';
-import getTemplate from './controllers/utils/getTemplate.js';
-import getSelect from './controllers/utils/getSelect.js';
-
-import loadTemplatePath from './controllers/utils/loadTemplatePath.js';
-
-const tableSchema = {
-  querystring1: {
-    page: { type: 'string', pattern: '^(\\d+)$' },
-    order: { type: 'string', pattern: '^(\\d+)$' },
-    filter: { type: 'string', pattern: '^([\\w\\d_-]+)=([\\w\\d_-]+)$' },
-  },
-  params: {
-    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    table: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
-  },
-};
-
-const searchSchema = {
-  querystring: {
-    page: { type: 'string', pattern: '^(\\d+)$' },
-    limit: { type: 'string', pattern: '^(\\d+)$' },
-    order: { type: 'string', pattern: '^([\\w_.]+)$' },
-    desc: { type: 'string', pattern: '^(desc)|(asc)$' },
-    key: { type: 'string', pattern: '^([\\w\\d_]+)$' },
-    table: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
-    sql: { type: 'string', pattern: '^(\\d)$' },
-  },
-};
-
-const suggestSchema = {
-  querystring: {
-    lang: { type: 'string', pattern: '^([\\w.]+)$' },
-    // parent: { type: 'string', pattern: '^([\\w,./]+)$' },
-    sel: { type: 'string', pattern: '^([\\w,./]+)$' },
-    name: { type: 'string', pattern: '^([\\w,./]+)$' },
-    // key: { type: 'string', pattern: '^([\\w\\d_]+)$' },
-    // val: { type: 'string', pattern: '^([\\w.,]+)$' },
-    sql: { type: 'string', pattern: '^(\\d)$' },
-  },
-  params: {
-    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-  },
-};
-
-const formSchema = {
-  params: {
-    form: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
-  },
-};
-
-const filterSchema = {
-  params: {
-    table: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
-  },
-};
-
-async function plugin(fastify, config = {}) {
-  const prefix = config.prefix || '/api';
-  fastify.decorate('metaFormat', metaFormat);
-  fastify.decorate('getFilterSQL', getFilterSQL);
-  fastify.decorate('getTemplate', getTemplate);
-  fastify.decorate('getSelect', getSelect);
-
-  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 metaFormat from './funcs/metaFormat/index.js';
+import getFilterSQL from './funcs/getFilterSQL/index.js';
+import getTemplate from './controllers/utils/getTemplate.js';
+import getSelect from './controllers/utils/getSelect.js';
+
+import loadTemplatePath from './controllers/utils/loadTemplatePath.js';
+
+import {
+  tableSchema, searchSchema, suggestSchema, formSchema, filterSchema,
+} from './schema.js';
+
+async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
+  fastify.decorate('metaFormat', metaFormat);
+  fastify.decorate('getFilterSQL', getFilterSQL);
+  fastify.decorate('getTemplate', getTemplate);
+  fastify.decorate('getSelect', getSelect);
+
+  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;

package/table/schema.js

@@ -0,0 +1,54 @@
+const tableSchema = {
+  querystring1: {
+    page: { type: 'string', pattern: '^(\\d+)$' },
+    order: { type: 'string', pattern: '^(\\d+)$' },
+    filter: { type: 'string', pattern: '^([\\w\\d_-]+)=([\\w\\d_-]+)$' },
+  },
+  params: {
+    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    table: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
+  },
+};
+
+const searchSchema = {
+  querystring: {
+    page: { type: 'string', pattern: '^(\\d+)$' },
+    limit: { type: 'string', pattern: '^(\\d+)$' },
+    order: { type: 'string', pattern: '^([\\w_.]+)$' },
+    desc: { type: 'string', pattern: '^(desc)|(asc)$' },
+    key: { type: 'string', pattern: '^([\\w\\d_]+)$' },
+    table: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
+    sql: { type: 'string', pattern: '^(\\d)$' },
+  },
+};
+
+const suggestSchema = {
+  querystring: {
+    lang: { type: 'string', pattern: '^([\\w.]+)$' },
+    // parent: { type: 'string', pattern: '^([\\w,./]+)$' },
+    sel: { type: 'string', pattern: '^([\\w,./]+)$' },
+    name: { type: 'string', pattern: '^([\\w,./]+)$' },
+    // key: { type: 'string', pattern: '^([\\w\\d_]+)$' },
+    // val: { type: 'string', pattern: '^([\\w.,]+)$' },
+    sql: { type: 'string', pattern: '^(\\d)$' },
+  },
+  params: {
+    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+  },
+};
+
+const formSchema = {
+  params: {
+    form: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
+  },
+};
+
+const filterSchema = {
+  params: {
+    table: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
+  },
+};
+
+export {
+  tableSchema, searchSchema, suggestSchema, formSchema, filterSchema,
+};

package/test/api/applyHook.test.js

@@ -1,95 +1,95 @@
-import { test } from 'node:test';
-import assert from 'node:assert';
-import path from 'node:path';
-import pgClients from '../../pg/pgClients.js';
-import init from '../../pg/funcs/init.js';
-
-import build from '../../helper.js';
-import config from '../config.js';
-
-import { addTemplateDir, addHook } from '../../utils.js';
-
-const prefix = config.prefix || '/api';
-const table = 'gis.dataset.table';
-
-test('applyHook to API data/table', async (t) => {
-  const app = await build(t);
-  const cwd = process.cwd();
-  await init(pgClients.client);
-  addTemplateDir(path.join(cwd, 'test/templates'));
-
-  addHook('preData', async ({ table: table1 }) => {
-    if (table1 === `${table}1`) {
-      return { message: 'access restricted by hook', status: 403 };
-    }
-    return null;
-  });
-  addHook('preTable', async ({ table: table1 }) => {
-    if (table1 === `${table}1`) {
-      return { message: 'access restricted by hook', status: 403 };
-    }
-    return null;
-  });
-
-  addHook('afterData', async ({ res }) => {
-    Object.assign(res, { test: '1' });
-  });
-  addHook('afterTable', async ({ rows = [] }) => {
-    Object.assign(rows[0], { count: 1 });
-  });
-
-  await t.test('GET /data (preData ok)', async () => {
-    const res = await app.inject({
-      method: 'GET',
-      url: `${prefix}/data/${table}`,
-    });
-    const json = res.json();
-    assert.ok(json?.time, 'api error');
-  });
-  await t.test('GET /data (preData message)', async () => {
-    const res = await app.inject({
-      method: 'GET',
-      url: `${prefix}/data/${table}1`,
-    });
-    const json = res.json();
-    assert.ok(json.message === 'access restricted by hook', 'preData hook error');
-  });
-
-  await t.test('GET /data (afterData)', async () => {
-    const res = await app.inject({
-      method: 'GET',
-      url: `${prefix}/data/${table}`,
-    });
-    const json = res.json();
-    assert.ok(json?.test === '1', 'afterData hook error');
-  });
-
-  const { id = '1' } = pgClients.client?.pk['gis.dataset']
-    ? await pgClients.client.query('select dataset_id as id from gis.dataset limit 1')
-      .then((res) => res.rows?.[0] || {}) : {};
-  await t.test('GET /table/:id (preTable ok)', async () => {
-    const res = await app.inject({
-      method: 'GET',
-      url: `${prefix}/table/${table}1/${id}`,
-    });
-    const json = res.json();
-    assert.ok(json.message === 'access restricted by hook', 'preTable hook error');
-  });
-  await t.test('GET /table/:id (preTable message)', async () => {
-    const res = await app.inject({
-      method: 'GET',
-      url: `${prefix}/table/${table}1/${id}`,
-    });
-    const json = res.json();
-    assert.ok(json.message === 'access restricted by hook', 'preTable hook error');
-  });
-
-  await t.test('GET /table/:id (afterTable)', async () => {
-    const res = await app.inject({
-      method: 'GET',
-      url: `${prefix}/table/${table}/${id}`,
-    });
-    const json = res.json();
-    assert.equal(json?.count, 1);
-  });
-});
+import { test } from 'node:test';
+import assert from 'node:assert';
+import path from 'node:path';
+import pgClients from '../../pg/pgClients.js';
+import init from '../../pg/funcs/init.js';
+
+import build from '../../helper.js';
+import config from '../config.js';
+
+import { addTemplateDir, addHook } from '../../utils.js';
+
+const prefix = config.prefix || '/api';
+const table = 'gis.dataset.table';
+
+test('applyHook to API data/table', async (t) => {
+  const app = await build(t);
+  const cwd = process.cwd();
+  await init(pgClients.client);
+  addTemplateDir(path.join(cwd, 'test/templates'));
+
+  addHook('preData', async ({ table: table1 }) => {
+    if (table1 === `${table}1`) {
+      return { message: 'access restricted by hook', status: 403 };
+    }
+    return null;
+  });
+  addHook('preTable', async ({ table: table1 }) => {
+    if (table1 === `${table}1`) {
+      return { message: 'access restricted by hook', status: 403 };
+    }
+    return null;
+  });
+
+  addHook('afterData', async ({ res }) => {
+    Object.assign(res, { test: '1' });
+  });
+  addHook('afterTable', async ({ rows = [] }) => {
+    Object.assign(rows[0], { count: 1 });
+  });
+
+  await t.test('GET /data (preData ok)', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: `${prefix}/data/${table}`,
+    });
+    const json = res.json();
+    assert.ok(json?.time, 'api error');
+  });
+  await t.test('GET /data (preData message)', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: `${prefix}/data/${table}1`,
+    });
+    const json = res.json();
+    assert.ok(json.message === 'access restricted by hook', 'preData hook error');
+  });
+
+  await t.test('GET /data (afterData)', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: `${prefix}/data/${table}`,
+    });
+    const json = res.json();
+    assert.ok(json?.test === '1', 'afterData hook error');
+  });
+
+  const { id = '1' } = pgClients.client?.pk['gis.dataset']
+    ? await pgClients.client.query('select dataset_id as id from gis.dataset limit 1')
+      .then((res) => res.rows?.[0] || {}) : {};
+  await t.test('GET /table/:id (preTable ok)', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: `${prefix}/table/${table}1/${id}`,
+    });
+    const json = res.json();
+    assert.ok(json.message === 'access restricted by hook', 'preTable hook error');
+  });
+  await t.test('GET /table/:id (preTable message)', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: `${prefix}/table/${table}1/${id}`,
+    });
+    const json = res.json();
+    assert.ok(json.message === 'access restricted by hook', 'preTable hook error');
+  });
+
+  await t.test('GET /table/:id (afterTable)', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: `${prefix}/table/${table}/${id}`,
+    });
+    const json = res.json();
+    assert.equal(json?.count, 1);
+  });
+});

package/test/api/crud.test.js

@@ -1,89 +1,89 @@
-import { test } from 'node:test';
-import assert from 'node:assert';
-
-import build from '../../helper.js';
-
-import config from '../config.js';
-import pgClients from '../../pg/pgClients.js';
-
-const mapId = '5400000';
-
-test('api crud', async (t) => {
-  const app = await build(t);
-  assert.ok(111);
-  return;
-  const prefix = config.prefix || '/api';
-
-  // delete old test data before test
-  const { rowCount } = await pgClients.client.query('delete from gis.map where map_id=$1', [mapId]);
-  console.log(rowCount);
-
-  app.addHook('onRequest', async (req) => {
-    req.session = { passport: { user: { uid: '1' } } };
-    req.user = req.session.passport.user;
-    req.uid = req.user.uid;
-  });
-
-  await t.test('POST /insert', async () => {
-    const res = await app.inject({
-      method: 'POST',
-      url: `${prefix}/table/test.gis.map.table`,
-      body: {
-        alias: 'testMap',
-        map_id: mapId,
-        ord: 1,
-        enabled: false,
-        tags: ['unit', 'test'],
-      },
-    });
-    assert.ok(res.json().rows ? res.json().rows[0]?.map_id : res.json().map_id, res.json().status);
-    assert.ok(111);
-  });
-
-  await t.test('POST /properties/:id', async () => {
-    const res = await app.inject({
-      method: 'POST',
-      url: `${prefix}/properties/${mapId}`,
-      body: {
-        custom_alias: 'testMap',
-        custom_ord: 5,
-      },
-    });
-    assert.ok(res.json().message?.rows?.length, res.json().status);
-  });
-
-  await t.test('GET /properties/:id', async () => {
-    const res = await app.inject({
-      method: 'GET',
-      url: `${prefix}/properties/${mapId}`,
-    });
-    assert.ok(res.json().message?.custom_alias, res.json().status);
-  });
-
-  await t.test('PUT /update', async () => {
-    const res = await app.inject({
-      method: 'PUT',
-      url: `${prefix}/table/test.gis.map.table/${mapId}`,
-      body: {
-        editor_id: '11',
-        alias: 'testMapEdit',
-        map_id: mapId,
-        ord: 2,
-        enabled: true,
-        tags: ['unittest'],
-      },
-    });
-    // console.log(res);
-    assert.ok((res.json().rows ? res.json().rows[0]?.editor_id : res.json().editor_id) === '11', res.json().status);
-    assert.ok(11);
-  });
-
-  await t.test('DELETE /delete', async () => {
-    const res = await app.inject({
-      method: 'DELETE',
-      url: `${prefix}/table/test.gis.map.table/${mapId}`,
-    });
-
-    assert.ok(res.json().msg?.map_id === mapId, res.json().status);
-  });
-});
+import { test } from 'node:test';
+import assert from 'node:assert';
+
+import build from '../../helper.js';
+
+import config from '../config.js';
+import pgClients from '../../pg/pgClients.js';
+
+const mapId = '5400000';
+
+test('api crud', async (t) => {
+  const app = await build(t);
+  assert.ok(111);
+  return;
+  const prefix = config.prefix || '/api';
+
+  // delete old test data before test
+  const { rowCount } = await pgClients.client.query('delete from gis.map where map_id=$1', [mapId]);
+  console.log(rowCount);
+
+  app.addHook('onRequest', async (req) => {
+    req.session = { passport: { user: { uid: '1' } } };
+    req.user = req.session.passport.user;
+    req.uid = req.user.uid;
+  });
+
+  await t.test('POST /insert', async () => {
+    const res = await app.inject({
+      method: 'POST',
+      url: `${prefix}/table/test.gis.map.table`,
+      body: {
+        alias: 'testMap',
+        map_id: mapId,
+        ord: 1,
+        enabled: false,
+        tags: ['unit', 'test'],
+      },
+    });
+    assert.ok(res.json().rows ? res.json().rows[0]?.map_id : res.json().map_id, res.json().status);
+    assert.ok(111);
+  });
+
+  await t.test('POST /properties/:id', async () => {
+    const res = await app.inject({
+      method: 'POST',
+      url: `${prefix}/properties/${mapId}`,
+      body: {
+        custom_alias: 'testMap',
+        custom_ord: 5,
+      },
+    });
+    assert.ok(res.json().message?.rows?.length, res.json().status);
+  });
+
+  await t.test('GET /properties/:id', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: `${prefix}/properties/${mapId}`,
+    });
+    assert.ok(res.json().message?.custom_alias, res.json().status);
+  });
+
+  await t.test('PUT /update', async () => {
+    const res = await app.inject({
+      method: 'PUT',
+      url: `${prefix}/table/test.gis.map.table/${mapId}`,
+      body: {
+        editor_id: '11',
+        alias: 'testMapEdit',
+        map_id: mapId,
+        ord: 2,
+        enabled: true,
+        tags: ['unittest'],
+      },
+    });
+    // console.log(res);
+    assert.ok((res.json().rows ? res.json().rows[0]?.editor_id : res.json().editor_id) === '11', res.json().status);
+    assert.ok(11);
+  });
+
+  await t.test('DELETE /delete', async () => {
+    const res = await app.inject({
+      method: 'DELETE',
+      url: `${prefix}/table/test.gis.map.table/${mapId}`,
+    });
+
+    assert.ok(res.json().msg?.map_id === mapId, res.json().status);
+  });
+});