@opengis/fastify-table 1.0.74 → 1.0.75

package/server/templates/select/test.storage.data.json

@@ -1,3 +1,3 @@
-{
-    "key": "dataset_id"
+{
+    "key": "dataset_id"
 }

package/server/templates/table/test.dataset.table.json

@@ -1,25 +1,25 @@
-{
-    "columns": [
-        {
-            "name": "dataset_id",
-            "title": "22"
-        },
-        {
-            "name": "dataset_name",
-            "title": "dataset_name"
-        }
-    ],
-    "table": "gis.dataset",
-    "order": "dataset_name",
-    "meta": {
-        "title": "dataset_name",
-        "search": "dataset_name,dataset_id"
-    },
-    "filters": [
-        {
-            "ua": "Назва набору",
-            "name": "dataset_name",
-            "type": "text"
-        }
-    ]
+{
+    "columns": [
+        {
+            "name": "dataset_id",
+            "title": "22"
+        },
+        {
+            "name": "dataset_name",
+            "title": "dataset_name"
+        }
+    ],
+    "table": "gis.dataset",
+    "order": "dataset_name",
+    "meta": {
+        "title": "dataset_name",
+        "search": "dataset_name,dataset_id"
+    },
+    "filters": [
+        {
+            "ua": "Назва набору",
+            "name": "dataset_name",
+            "type": "text"
+        }
+    ]
 }

package/server/templates/table/test.gis.map.table.json

@@ -1,45 +1,45 @@
-{
-    "columns": [
-        {
-            "name": "map_id",
-            "title": "ID"
-        },
-        {
-            "name": "name",
-            "title": "Назва"
-        },
-        {
-            "name": "editor_id",
-            "title": "Editor ID"
-        },
-        {
-            "name": "alias",
-            "title": "Alias"
-        },
-        {
-            "name": "ord",
-            "title": "Order"
-        },
-        {
-            "name": "enabled",
-            "title": "On / off"
-        },
-        {
-            "name": "tags",
-            "title": "Tags"
-        }
-    ],
-    "table": "gis.map",
-    "order": "name",
-    "meta": {
-        "title": "name",
-        "search": "name,alias,map_id"
-    },
-    "filters": [
-        {
-            "ua": "Назва",
-            "name": "name",
-            "type": "text"
-        }
-    ]
+{
+    "columns": [
+        {
+            "name": "map_id",
+            "title": "ID"
+        },
+        {
+            "name": "name",
+            "title": "Назва"
+        },
+        {
+            "name": "editor_id",
+            "title": "Editor ID"
+        },
+        {
+            "name": "alias",
+            "title": "Alias"
+        },
+        {
+            "name": "ord",
+            "title": "Order"
+        },
+        {
+            "name": "enabled",
+            "title": "On / off"
+        },
+        {
+            "name": "tags",
+            "title": "Tags"
+        }
+    ],
+    "table": "gis.map",
+    "order": "name",
+    "meta": {
+        "title": "name",
+        "search": "name,alias,map_id"
+    },
+    "filters": [
+        {
+            "ua": "Назва",
+            "name": "name",
+            "type": "text"
+        }
+    ]
 }

package/server.js

@@ -1,14 +1,14 @@
-// This file contains code that we reuse
-// between our tests.
-import Fastify from 'fastify';
-import config from './test/config.js';
-import appService from './index.js';
-
-const app = Fastify({ logger: false });
-app.register(appService, config);
-app.listen({ host: '0.0.0.0', port: process.env.PORT || 3000 }, (err) => {
-  if (err) {
-    app.log.error(err);
-    process.exit(1);
-  }
-});
+// This file contains code that we reuse
+// between our tests.
+import Fastify from 'fastify';
+import config from './test/config.js';
+import appService from './index.js';
+
+const app = Fastify({ logger: false });
+app.register(appService, config);
+app.listen({ host: '0.0.0.0', port: process.env.PORT || 3000 }, (err) => {
+  if (err) {
+    app.log.error(err);
+    process.exit(1);
+  }
+});

package/table/controllers/card.js

@@ -1,44 +1,44 @@
-import getTemplate from './utils/getTemplate.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-import metaFormat from '../funcs/metaFormat/index.js';
-
-export default async function card(req) {
-  const time = Date.now();
-  const {
-    pg, params = {}, query = {}, opt = {},
-  } = req;
-
-  const loadTable = await getTemplate('table', params.table);
-
-  if (!loadTable) { return { message: 'template not found', status: 404 }; }
-
-  const {
-    table, columns, meta, sql, cardSql,
-  } = loadTable;
-
-  const { pk, columns: dbColumns = [] } = await getMeta(table);
-
-  if (!pk) return { message: `table not found: ${table}`, status: 404 };
-
-  const cols = columns.map((el) => el.name || el).join(',');
-  const columnList = dbColumns.map((el) => el.name || el).join(',');
-  const sqlTable = sql?.filter?.((el) => !el?.disabled && el?.sql?.replace).map((el, i) => ` left join lateral (${el.sql}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
-  const cardSqlFiltered = opt.id || params.id ? cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) : [];
-  const cardSqlTable = cardSqlFiltered?.length ? cardSqlFiltered.map((el, i) => ` left join lateral (select json_agg(row_to_json(q)) as ${el.name} from (${el.sql})q) ct${i}  on 1=1 `).join('') || '' : '';
-
-  const where = [`"${pk}" = $1`, loadTable.query].filter((el) => el);
-  const cardColumns = cardSqlFiltered?.length ? `,${cardSqlFiltered.map((el) => el.name)}` : '';
-  const q = `select  ${pk ? `"${pk}" as id,` : ''} ${columnList.includes('geom') ? 'st_asgeojson(geom)::json as geom,' : ''} ${cols || '*'} ${cardColumns} from ${table} t ${sqlTable} ${cardSqlTable} 
-  where ${where.join(' and ') || 'true'} limit 1`;
-
-  if (query.sql === '1') { return q; }
-
-  const { rows } = await pg.query(q, [opt.id || params.id]);
-
-  await metaFormat({ rows, table: params.table });
-
-  const data = meta.card?.length ? meta.card.reduce((acc, curr) => Object.assign(acc, { [columns.find((col) => col.name === curr)?.ua || '']: rows[0][curr] }), {}) : {};
-  return {
-    time: Date.now() - time, data,
-  };
-}
+import getTemplate from './utils/getTemplate.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+import metaFormat from '../funcs/metaFormat/index.js';
+
+export default async function card(req) {
+  const time = Date.now();
+  const {
+    pg, params = {}, query = {}, opt = {},
+  } = req;
+
+  const loadTable = await getTemplate('table', params.table);
+
+  if (!loadTable) { return { message: 'template not found', status: 404 }; }
+
+  const {
+    table, columns, meta, sql, cardSql,
+  } = loadTable;
+
+  const { pk, columns: dbColumns = [] } = await getMeta(table);
+
+  if (!pk) return { message: `table not found: ${table}`, status: 404 };
+
+  const cols = columns.map((el) => el.name || el).join(',');
+  const columnList = dbColumns.map((el) => el.name || el).join(',');
+  const sqlTable = sql?.filter?.((el) => !el?.disabled && el?.sql?.replace).map((el, i) => ` left join lateral (${el.sql}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
+  const cardSqlFiltered = opt.id || params.id ? cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) : [];
+  const cardSqlTable = cardSqlFiltered?.length ? cardSqlFiltered.map((el, i) => ` left join lateral (select json_agg(row_to_json(q)) as ${el.name} from (${el.sql})q) ct${i}  on 1=1 `).join('') || '' : '';
+
+  const where = [`"${pk}" = $1`, loadTable.query].filter((el) => el);
+  const cardColumns = cardSqlFiltered?.length ? `,${cardSqlFiltered.map((el) => el.name)}` : '';
+  const q = `select  ${pk ? `"${pk}" as id,` : ''} ${columnList.includes('geom') ? 'st_asgeojson(geom)::json as geom,' : ''} ${cols || '*'} ${cardColumns} from ${table} t ${sqlTable} ${cardSqlTable} 
+  where ${where.join(' and ') || 'true'} limit 1`;
+
+  if (query.sql === '1') { return q; }
+
+  const { rows } = await pg.query(q, [opt.id || params.id]);
+
+  await metaFormat({ rows, table: params.table });
+
+  const data = meta.card?.length ? meta.card.reduce((acc, curr) => Object.assign(acc, { [columns.find((col) => col.name === curr)?.ua || '']: rows[0][curr] }), {}) : {};
+  return {
+    time: Date.now() - time, data,
+  };
+}

package/table/controllers/data.js

@@ -1,95 +1,95 @@
-import getTemplate from './utils/getTemplate.js';
-import getFilterSQL from '../funcs/getFilterSQL/index.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-import metaFormat from '../funcs/metaFormat/index.js';
-import getAccess from '../../crud/funcs/getAccess.js';
-import setToken from '../../crud/funcs/setToken.js';
-import gisIRColumn from './utils/gisIRColumn.js';
-
-const maxLimit = 100;
-export default async function dataAPI(req) {
-  const time = Date.now();
-  const {
-    pg, params, funcs = {}, query = {}, opt = {}, uid,
-  } = req;
-
-  const loadTable = await getTemplate('table', params.table);
-
-  if (!loadTable) { return { message: 'template not found', status: 404 }; }
-
-  const {
-    table, columns, sql, cardSql, filters, form, meta,
-  } = loadTable;
-  const { pk, columns: dbColumns = [] } = await getMeta(table);
-
-  if (!pk) return { message: `table not found: ${table}`, status: 404 };
-
-  const cols = columns.filter((el) => el.name !== 'geom').map((el) => el.name || el).join(',');
-  const columnList = dbColumns.map((el) => el.name || el).join(',');
-  const sqlTable = sql?.filter?.((el) => !el?.disabled && el?.sql?.replace).map((el, i) => ` left join lateral (${el.sql}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
-  const cardSqlFiltered = opt?.id || params.id ? (cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) || []) : [];
-  const cardSqlTable = cardSqlFiltered.length ? cardSqlFiltered.map((el, i) => ` left join lateral (select json_agg(row_to_json(q)) as ${el.name} from (${el.sql})q) ct${i}  on 1=1 `).join('') || '' : '';
-
-  if (params.id && columnList.includes(params.id)) {
-    return gisIRColumn({
-      pg, funcs, layer: params.table, column: params.id, sql: query.sql,
-    });
-  }
-
-  const fData = query.filter ? await getFilterSQL({
-    filter: query.filter,
-    table: params.table,
-    json: 1,
-  }) : {};
-
-  const keyQuery = query.key && loadTable.key && !(opt?.id || params.id) ? `${loadTable.key}=$1` : null;
-
-  const limit = Math.min(maxLimit, +(query.limit || 20));
-
-  const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
-  // id, query, filter
-  const [orderColumn, orderDir] = (query.order || loadTable.order || '').split(/[- ]/);
-
-  const order = columnList.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
-  const state = loadTable.filterState && query.state ? loadTable.filterState[query.state]?.sql : null;
-  const custom = loadTable.filterCustom && query.custom ? loadTable.filterCustom[query.custom]?.sql : null;
-  const search = loadTable.meta?.search && query.search ? `(${loadTable.meta?.search.split(',').map(el => `${el} ilike '%${query.search}%'`).join(' or ')})` : null;
-
-  const access = await getAccess(req, params.table);
-  const where = [(opt?.id || params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, state, custom, search, access?.query || '1=1'].filter((el) => el);
-  const cardColumns = cardSqlFiltered.length ? `,${cardSqlFiltered.map((el) => el.name)}` : '';
-  const q = `select  ${pk ? `"${pk}" as id,` : ''} ${columnList.includes('geom') ? 'st_asgeojson(geom)::json as geom,' : ''} ${query.id || query.key ? '*' : cols || '*'} ${cardColumns} from ${table} t ${sqlTable} ${cardSqlTable} where ${where.join(' and ') || 'true'} ${order} ${offset}  limit ${limit}`;
-
-  if (query.sql === '1') { return q; }
-
-  const { rows } = await pg.query(q, (opt?.id || params.id ? [opt?.id || params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
-
-  const total = keyQuery || opt?.id || params.id ? rows.length : await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count);
-
-  await metaFormat({ rows, table: params.table });
-  const res = {
-    time: Date.now() - time, card: loadTable.card, actions: loadTable.actions, access, total, count: rows.length, pk, form, rows, meta, columns, filters,
-  };
-
-  if (!funcs.config?.security?.disableToken) {
-    const addTokens = setToken({
-      ids: [JSON.stringify({ add: loadTable.table, form: loadTable.form })],
-      mode: 'a',
-      uid,
-      array: 1,
-    });
-    Object.assign(res, { addToken: addTokens[0] });
-
-    rows.forEach((row) => {
-      const editTokens = setToken({
-        ids: [JSON.stringify({ id: row.id, table: loadTable.table, form: loadTable.form })],
-        mode: 'w',
-        uid,
-        array: 1,
-      });
-      Object.assign(row, { token: editTokens[0] });
-    });
-  }
-
-  return res;
-}
+import getTemplate from './utils/getTemplate.js';
+import getFilterSQL from '../funcs/getFilterSQL/index.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+import metaFormat from '../funcs/metaFormat/index.js';
+import getAccess from '../../crud/funcs/getAccess.js';
+import setToken from '../../crud/funcs/setToken.js';
+import gisIRColumn from './utils/gisIRColumn.js';
+
+const maxLimit = 100;
+export default async function dataAPI(req) {
+  const time = Date.now();
+  const {
+    pg, params, funcs = {}, query = {}, opt = {}, uid,
+  } = req;
+
+  const loadTable = await getTemplate('table', params.table);
+
+  if (!loadTable) { return { message: 'template not found', status: 404 }; }
+
+  const {
+    table, columns, sql, cardSql, filters, form, meta,
+  } = loadTable;
+  const { pk, columns: dbColumns = [] } = await getMeta(table);
+
+  if (!pk) return { message: `table not found: ${table}`, status: 404 };
+
+  const cols = columns.filter((el) => el.name !== 'geom').map((el) => el.name || el).join(',');
+  const columnList = dbColumns.map((el) => el.name || el).join(',');
+  const sqlTable = sql?.filter?.((el) => !el?.disabled && el?.sql?.replace).map((el, i) => ` left join lateral (${el.sql}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
+  const cardSqlFiltered = opt?.id || params.id ? (cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) || []) : [];
+  const cardSqlTable = cardSqlFiltered.length ? cardSqlFiltered.map((el, i) => ` left join lateral (select json_agg(row_to_json(q)) as ${el.name} from (${el.sql})q) ct${i}  on 1=1 `).join('') || '' : '';
+
+  if (params.id && columnList.includes(params.id)) {
+    return gisIRColumn({
+      pg, funcs, layer: params.table, column: params.id, sql: query.sql,
+    });
+  }
+
+  const fData = query.filter ? await getFilterSQL({
+    filter: query.filter,
+    table: params.table,
+    json: 1,
+  }) : {};
+
+  const keyQuery = query.key && loadTable.key && !(opt?.id || params.id) ? `${loadTable.key}=$1` : null;
+
+  const limit = Math.min(maxLimit, +(query.limit || 20));
+
+  const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
+  // id, query, filter
+  const [orderColumn, orderDir] = (query.order || loadTable.order || '').split(/[- ]/);
+
+  const order = columnList.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
+  const state = loadTable.filterState && query.state ? loadTable.filterState[query.state]?.sql : null;
+  const custom = loadTable.filterCustom && query.custom ? loadTable.filterCustom[query.custom]?.sql : null;
+  const search = loadTable.meta?.search && query.search ? `(${loadTable.meta?.search.split(',').map(el => `${el} ilike '%${query.search}%'`).join(' or ')})` : null;
+
+  const access = await getAccess(req, params.table);
+  const where = [(opt?.id || params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, state, custom, search, access?.query || '1=1'].filter((el) => el);
+  const cardColumns = cardSqlFiltered.length ? `,${cardSqlFiltered.map((el) => el.name)}` : '';
+  const q = `select  ${pk ? `"${pk}" as id,` : ''} ${columnList.includes('geom') ? 'st_asgeojson(geom)::json as geom,' : ''} ${query.id || query.key ? '*' : cols || '*'} ${cardColumns} from ${table} t ${sqlTable} ${cardSqlTable} where ${where.join(' and ') || 'true'} ${order} ${offset}  limit ${limit}`;
+
+  if (query.sql === '1') { return q; }
+
+  const { rows } = await pg.query(q, (opt?.id || params.id ? [opt?.id || params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
+
+  const total = keyQuery || opt?.id || params.id ? rows.length : await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count);
+
+  await metaFormat({ rows, table: params.table });
+  const res = {
+    time: Date.now() - time, card: loadTable.card, actions: loadTable.actions, access, total, count: rows.length, pk, form, rows, meta, columns, filters,
+  };
+
+  if (!funcs.config?.security?.disableToken) {
+    const addTokens = setToken({
+      ids: [JSON.stringify({ add: loadTable.table, form: loadTable.form })],
+      mode: 'a',
+      uid,
+      array: 1,
+    });
+    Object.assign(res, { addToken: addTokens[0] });
+
+    rows.forEach((row) => {
+      const editTokens = setToken({
+        ids: [JSON.stringify({ id: row.id, table: loadTable.table, form: loadTable.form })],
+        mode: 'w',
+        uid,
+        array: 1,
+      });
+      Object.assign(row, { token: editTokens[0] });
+    });
+  }
+
+  return res;
+}

package/table/controllers/filter.js

@@ -1,37 +1,37 @@
-import getTemplate from './utils/getTemplate.js';
-import getSelect from './utils/getSelect.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-
-export default async function filter(req) {
-  const time = Date.now();
-
-  const {
-    params,
-  } = req;
-  const loadTable = await getTemplate('table', params.table);
-  if (!loadTable) { return { status: 404, message: 'not found' }; }
-  const { columns } = await getMeta({ table: loadTable.table });
-
-  const filters = loadTable?.filters || loadTable?.filterList || [];
-  await Promise.all(filters.filter((el) => el.data).map(async (el) => {
-    const cls = await getSelect(el.data);
-    if (!cls?.arr || !loadTable.table) return;
-    const { dataTypeID } = columns.find((item) => item.name === el.id) || {};
-    const countArr = req.pg.pgType[dataTypeID]?.includes('[]') 
-      ? await req.pg.queryCache(`select unnest(${el.id})::text as id,count(*) from ${loadTable.table} group by unnest(${el.id})`) 
-      : await req.pg.queryCache(`select ${el.id}::text as id,count(*) from ${loadTable.table} group by ${el.id}`);
-
-    const options = countArr.rows.map(cel => {
-      const data = cls?.arr.find(c => c.id === cel.id);
-      return { ...cel, ...data };
-    });
-    Object.assign(el, { options });
-  }));
-  return {
-    time: Date.now() - time,
-    list: filters,
-    custom: loadTable?.filterCustom?.map(el => ({ label: el.label })),
-    inline: loadTable?.filterInline,
-    state: loadTable?.filterState?.map(el => ({ label: el.label })),
-  };
-}
+import getTemplate from './utils/getTemplate.js';
+import getSelect from './utils/getSelect.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+
+export default async function filter(req) {
+  const time = Date.now();
+
+  const {
+    params,
+  } = req;
+  const loadTable = await getTemplate('table', params.table);
+  if (!loadTable) { return { status: 404, message: 'not found' }; }
+  const { columns } = await getMeta({ table: loadTable.table });
+
+  const filters = loadTable?.filters || loadTable?.filterList || [];
+  await Promise.all(filters.filter((el) => el.data).map(async (el) => {
+    const cls = await getSelect(el.data);
+    if (!cls?.arr || !loadTable.table) return;
+    const { dataTypeID } = columns.find((item) => item.name === el.id) || {};
+    const countArr = req.pg.pgType[dataTypeID]?.includes('[]') 
+      ? await req.pg.queryCache(`select unnest(${el.id})::text as id,count(*) from ${loadTable.table} group by unnest(${el.id})`) 
+      : await req.pg.queryCache(`select ${el.id}::text as id,count(*) from ${loadTable.table} group by ${el.id}`);
+
+    const options = countArr.rows.map(cel => {
+      const data = cls?.arr.find(c => c.id === cel.id);
+      return { ...cel, ...data };
+    });
+    Object.assign(el, { options });
+  }));
+  return {
+    time: Date.now() - time,
+    list: filters,
+    custom: loadTable?.filterCustom?.map(el => ({ label: el.label })),
+    inline: loadTable?.filterInline,
+    state: loadTable?.filterState?.map(el => ({ label: el.label })),
+  };
+}

package/table/controllers/form.js

@@ -1,28 +1,28 @@
-import getTemplate from './utils/getTemplate.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 } = req;
-  const form = await getTemplate('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) };
-  }
-  return { time: Date.now() - time, form };
-}
+import getTemplate from './utils/getTemplate.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 } = req;
+  const form = await getTemplate('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) };
+  }
+  return { time: Date.now() - time, form };
+}