@opengis/cms 0.0.62 → 0.0.63

package/server/routes/cms/utils/requestTranslation.js

@@ -1,135 +1,135 @@
-import { config } from "@opengis/fastify-table/utils.js";
-
-const { host = 'https://translate.softpro.ua', key = '' } = config.integrations?.translation || {};
-
-const divider = ' <divider> ';
-
-// Wrap dot notation keys in quotes
-export const arrayToPhrases = (arr, prefix = 'item', mainIdx = null) => {
-    if (!arr || !arr.length) return [];
-
-    return arr.flatMap((obj, idx) => {
-        const currentMainIdx = mainIdx ?? idx;
-
-        return Object.entries(obj).flatMap(([key, value]) => {
-            if (Array.isArray(value)) {
-                return arrayToPhrases(value, `${prefix}.${key}`, currentMainIdx);
-            }
-
-            return [{
-                prefix,
-                value,
-                key,
-                mainIdx: currentMainIdx,
-                idx,
-            }];
-        });
-    });
-};
-
-export default async function requestTranslation(entries, from = 'uk', to) {
-    // Flatten all phrases
-    const phrasesWithMeta = entries.flatMap(([key, value]) =>
-        Array.isArray(value) ? arrayToPhrases(value, key) : [{ key, value, prefix: key }]
-    );
-
-    // Translate each phrase independently
-    const translatedPhrases = await Promise.all(
-        phrasesWithMeta.map(async ({ key, idx, prefix, value, mainIdx }) => {
-            if (!value || typeof value === 'number' || value?.startsWith?.('/files/')) {
-                return { key, idx, mainIdx, prefix, value, skip: true }; // fallback to original
-            }
-
-            try {
-                const parts =
-                    typeof value === 'string' && value.startsWith('<') && value.endsWith('>')
-                        ? [...value.matchAll(/(<[^>]+>)|([^<]+)/gs)].map(([, tag, str]) =>
-                            tag
-                                ? { tag }
-                                : { str, tIndex: null, skip: !str.trim() || /^[—–\-.: ]+$/.test(str.trim()) ? true : false, preSpace: str.startsWith(' ') ? ' ' : '', postSpace: str.endsWith(' ') ? ' ' : '' }
-                        )
-                        : [{ str: value, tIndex: 0, skip: false }];
-
-                // assign translation index only to fragments that should be translated
-                const q = [];
-                parts.forEach((p) => {
-                    if (!p.tag && !p.skip) {
-                        p.tIndex = q.length;
-                        q.push(p.str);
-                    }
-                });
-
-                const resp = await fetch(`${host}/translate`, {
-                    method: "POST",
-                    headers: { "Content-Type": "application/json" },
-                    body: JSON.stringify({
-                        q,
-                        source: from || "auto",
-                        target: to,
-                        format: "text",
-                        api_key: key
-                    }),
-                });
-
-                if (resp.status !== 200 || resp.headers.get('content-type') !== 'application/json') {
-                    const err = await resp.text();
-                    console.warn('translation request error', resp.status, err);
-                    return { key, idx, prefix, value, error: err }; // fallback to original
-                }
-
-                const body = await resp.json();
-                const translated = body.translatedText || [];
-
-                const resultValue = parts
-                    .map((p) => {
-                        if (p.tag) return p.tag;
-                        if (p.skip) return p.str; // keep original punctuation/whitespace
-                        const txt = translated[p.tIndex] ?? p.str ?? '';
-                        return `${p.preSpace || ''}${txt}${p.postSpace || ''}`; // restore spaces
-                    })
-                    .join('');
-
-                return { key, idx, mainIdx, prefix, value: resultValue || value };
-            } catch (err) {
-                console.warn('translation request failed', err.toString());
-                return { key, idx, mainIdx, prefix, value, error: err.toString() }; // fallback
-            }
-        })
-    );
-
-    const result = translatedPhrases.reduce((acc, curr) => {
-        const { key, idx, prefix: prefix1, value, mainIdx } = curr;
-        const [prefix, subkey] = prefix1.split('.');
-
-        if (!acc[`${prefix}:${to}`]) {
-            acc[`${prefix}:${to}`] = Array.isArray(entries.find(e => e[0] === prefix)[1]) ? [] : null;
-        }
-
-        if (subkey && Array.isArray(entries.find(e => e[0] === prefix)[1])) {
-            if (!acc[`${prefix}:${to}`][mainIdx]) {
-                acc[`${prefix}:${to}`][mainIdx] = {};
-            }
-            if (!acc[`${prefix}:${to}`][mainIdx][subkey]) {
-                acc[`${prefix}:${to}`][mainIdx][subkey] = [];
-            }
-            if (!acc[`${prefix}:${to}`][mainIdx][subkey]?.[idx]) {
-                acc[`${prefix}:${to}`][mainIdx][subkey][idx] = {};
-            }
-            acc[`${prefix}:${to}`][mainIdx][subkey][idx][key] = value;
-            // console.log(prefix, to, idx, subkey, mainIdx, key);
-        } else if (Array.isArray(entries.find(e => e[0] === prefix)[1])) {
-            if (!acc[`${prefix}:${to}`][idx]) {
-                acc[`${prefix}:${to}`][idx] = {};
-            }
-            acc[`${prefix}:${to}`][idx][key] = value;
-        } else {
-            acc[`${prefix}:${to}`] = value;
-        }
-
-        return acc;
-    }, {});
-
-    const errors = translatedPhrases.filter(({ error }) => !!error).length;
-
-    return { result, errors };
-}
+import { config } from "@opengis/fastify-table/utils.js";
+
+const { host = 'https://translate.softpro.ua', key = '' } = config.integrations?.translation || {};
+
+const divider = ' <divider> ';
+
+// Wrap dot notation keys in quotes
+export const arrayToPhrases = (arr, prefix = 'item', mainIdx = null) => {
+    if (!arr || !arr.length) return [];
+
+    return arr.flatMap((obj, idx) => {
+        const currentMainIdx = mainIdx ?? idx;
+
+        return Object.entries(obj).flatMap(([key, value]) => {
+            if (Array.isArray(value)) {
+                return arrayToPhrases(value, `${prefix}.${key}`, currentMainIdx);
+            }
+
+            return [{
+                prefix,
+                value,
+                key,
+                mainIdx: currentMainIdx,
+                idx,
+            }];
+        });
+    });
+};
+
+export default async function requestTranslation(entries, from = 'uk', to) {
+    // Flatten all phrases
+    const phrasesWithMeta = entries.flatMap(([key, value]) =>
+        Array.isArray(value) ? arrayToPhrases(value, key) : [{ key, value, prefix: key }]
+    );
+
+    // Translate each phrase independently
+    const translatedPhrases = await Promise.all(
+        phrasesWithMeta.map(async ({ key, idx, prefix, value, mainIdx }) => {
+            if (!value || typeof value === 'number' || value?.startsWith?.('/files/')) {
+                return { key, idx, mainIdx, prefix, value, skip: true }; // fallback to original
+            }
+
+            try {
+                const parts =
+                    typeof value === 'string' && value.startsWith('<') && value.endsWith('>')
+                        ? [...value.matchAll(/(<[^>]+>)|([^<]+)/gs)].map(([, tag, str]) =>
+                            tag
+                                ? { tag }
+                                : { str, tIndex: null, skip: !str.trim() || /^[—–\-.: ]+$/.test(str.trim()) ? true : false, preSpace: str.startsWith(' ') ? ' ' : '', postSpace: str.endsWith(' ') ? ' ' : '' }
+                        )
+                        : [{ str: value, tIndex: 0, skip: false }];
+
+                // assign translation index only to fragments that should be translated
+                const q = [];
+                parts.forEach((p) => {
+                    if (!p.tag && !p.skip) {
+                        p.tIndex = q.length;
+                        q.push(p.str);
+                    }
+                });
+
+                const resp = await fetch(`${host}/translate`, {
+                    method: "POST",
+                    headers: { "Content-Type": "application/json" },
+                    body: JSON.stringify({
+                        q,
+                        source: from || "auto",
+                        target: to,
+                        format: "text",
+                        api_key: key
+                    }),
+                });
+
+                if (resp.status !== 200 || resp.headers.get('content-type') !== 'application/json') {
+                    const err = await resp.text();
+                    console.warn('translation request error', resp.status, err);
+                    return { key, idx, prefix, value, error: err }; // fallback to original
+                }
+
+                const body = await resp.json();
+                const translated = body.translatedText || [];
+
+                const resultValue = parts
+                    .map((p) => {
+                        if (p.tag) return p.tag;
+                        if (p.skip) return p.str; // keep original punctuation/whitespace
+                        const txt = translated[p.tIndex] ?? p.str ?? '';
+                        return `${p.preSpace || ''}${txt}${p.postSpace || ''}`; // restore spaces
+                    })
+                    .join('');
+
+                return { key, idx, mainIdx, prefix, value: resultValue || value };
+            } catch (err) {
+                console.warn('translation request failed', err.toString());
+                return { key, idx, mainIdx, prefix, value, error: err.toString() }; // fallback
+            }
+        })
+    );
+
+    const result = translatedPhrases.reduce((acc, curr) => {
+        const { key, idx, prefix: prefix1, value, mainIdx } = curr;
+        const [prefix, subkey] = prefix1.split('.');
+
+        if (!acc[`${prefix}:${to}`]) {
+            acc[`${prefix}:${to}`] = Array.isArray(entries.find(e => e[0] === prefix)[1]) ? [] : null;
+        }
+
+        if (subkey && Array.isArray(entries.find(e => e[0] === prefix)[1])) {
+            if (!acc[`${prefix}:${to}`][mainIdx]) {
+                acc[`${prefix}:${to}`][mainIdx] = {};
+            }
+            if (!acc[`${prefix}:${to}`][mainIdx][subkey]) {
+                acc[`${prefix}:${to}`][mainIdx][subkey] = [];
+            }
+            if (!acc[`${prefix}:${to}`][mainIdx][subkey]?.[idx]) {
+                acc[`${prefix}:${to}`][mainIdx][subkey][idx] = {};
+            }
+            acc[`${prefix}:${to}`][mainIdx][subkey][idx][key] = value;
+            // console.log(prefix, to, idx, subkey, mainIdx, key);
+        } else if (Array.isArray(entries.find(e => e[0] === prefix)[1])) {
+            if (!acc[`${prefix}:${to}`][idx]) {
+                acc[`${prefix}:${to}`][idx] = {};
+            }
+            acc[`${prefix}:${to}`][idx][key] = value;
+        } else {
+            acc[`${prefix}:${to}`] = value;
+        }
+
+        return acc;
+    }, {});
+
+    const errors = translatedPhrases.filter(({ error }) => !!error).length;
+
+    return { result, errors };
+}

package/server/routes/cms/utils/updateLocalization.js

@@ -1,43 +1,43 @@
-import { dataInsert, getTemplate } from "@opengis/fastify-table/utils.js";
-
-export default async function updateLocalization(pg, id, body, contentTypeId, uid) {
-    if (!pg || !id || !body || !contentTypeId) { return null };
-
-    const contentColumns = await pg.query('select content_type_id as ctid, name as ctname, table_name as dbtable, columns from site.content_types where content_type_id in (select content_type_id from site.contents where content_id=$1) or content_type_id=$2 order by content_type_id = \'pages\'', [id, contentTypeId]).then(el => el.rows?.[0]?.columns || []);
-
-    // const contentColumns = await pg.query('select columns from site.content_types where content_type_id=$1', [contentTypeId])
-    //     .then(el => el.rows?.[0]?.columns || []);
-
-    const loadTable = contentTypeId === 'pages'
-        ? await getTemplate('table', 'single.default.table')
-        : await getTemplate('table', 'collection.default.table');
-
-    const columns = (loadTable?.columns || []).concat((contentColumns || []).filter(col => loadTable?.columns.findIndex(el => el.name === col.name) === -1));
-
-    await pg.query('delete from site.localization where object_id=$1', [id]);
-
-    const schemaKeys = columns.filter(el => el?.name && el.localization).map(el => el.name);
-
-    const bodyKeys = Object.keys(body || {}).filter(key => body[key] && key.includes(':') && key.split(':').pop() && schemaKeys.includes(key.split(':').shift()));
-    const obj = bodyKeys.reduce((acc, curr) => ({ ...acc, [curr]: body[curr] }), {});
-
-    if (bodyKeys.length === 0) { return null; }
-
-    const arr = Object.keys(obj).reduce((acc, curr) => {
-        acc.push({
-            field_key: curr,
-            field_value: body[curr],
-            object_id: id,
-        });
-        return acc;
-    }, []);
-
-    await Promise.all(arr.map(async row => dataInsert({
-        pg,
-        table: 'site.localization',
-        data: row,
-        uid,
-    })));
-
-    return obj;
+import { dataInsert, getTemplate } from "@opengis/fastify-table/utils.js";
+
+export default async function updateLocalization(pg, id, body, contentTypeId, uid) {
+    if (!pg || !id || !body || !contentTypeId) { return null };
+
+    const contentColumns = await pg.query('select content_type_id as ctid, name as ctname, table_name as dbtable, columns from site.content_types where content_type_id in (select content_type_id from site.contents where content_id=$1) or content_type_id=$2 order by content_type_id = \'pages\'', [id, contentTypeId]).then(el => el.rows?.[0]?.columns || []);
+
+    // const contentColumns = await pg.query('select columns from site.content_types where content_type_id=$1', [contentTypeId])
+    //     .then(el => el.rows?.[0]?.columns || []);
+
+    const loadTable = contentTypeId === 'pages'
+        ? await getTemplate('table', 'single.default.table')
+        : await getTemplate('table', 'collection.default.table');
+
+    const columns = (loadTable?.columns || []).concat((contentColumns || []).filter(col => loadTable?.columns.findIndex(el => el.name === col.name) === -1));
+
+    await pg.query('delete from site.localization where object_id=$1', [id]);
+
+    const schemaKeys = columns.filter(el => el?.name && el.localization).map(el => el.name);
+
+    const bodyKeys = Object.keys(body || {}).filter(key => body[key] && key.includes(':') && key.split(':').pop() && schemaKeys.includes(key.split(':').shift()));
+    const obj = bodyKeys.reduce((acc, curr) => ({ ...acc, [curr]: body[curr] }), {});
+
+    if (bodyKeys.length === 0) { return null; }
+
+    const arr = Object.keys(obj).reduce((acc, curr) => {
+        acc.push({
+            field_key: curr,
+            field_value: body[curr],
+            object_id: id,
+        });
+        return acc;
+    }, []);
+
+    await Promise.all(arr.map(async row => dataInsert({
+        pg,
+        table: 'site.localization',
+        data: row,
+        uid,
+    })));
+
+    return obj;
 }

package/server/routes/cmsSpace/controllers/deleteSpace.js

@@ -1,27 +1,27 @@
-import { dataDelete, pgClients } from '@opengis/fastify-table/utils.js';
-
-export default async function deleteSpace({ pg = pgClients.client, user, params, headers = {} }, reply) {
-    return null;
-    if (!params?.id) { return reply.status(400).send('not enough params: id'); }
-    if (!pg?.pk) { return reply.status(400).send('empty pg'); }
-    if (!pg?.pk?.['site.spaces']) { return reply.status(400).send('table not found: site.spaces'); }
-
-    if (params?.id && params.id === 'default') {
-        return reply.status(400).send('default space cannot be deleted');
-    }
-
-    const exists = await pg.query('select space_id from site.spaces where space_id=$1', [params.id]).then(el => el.rows?.[0]?.space_id);
-    if (!exists) { return reply.status(404).send('space not found: ' + params.id); }
-
-    const { referer } = headers;
-
-    const res = await dataDelete({
-        pg,
-        table: 'site.spaces',
-        id: params?.id,
-        uid: user?.uid,
-        referer,
-    });
-
-    return { id: params.id, ...res || {} };
+import { dataDelete, pgClients } from '@opengis/fastify-table/utils.js';
+
+export default async function deleteSpace({ pg = pgClients.client, user, params, headers = {} }, reply) {
+    return null;
+    if (!params?.id) { return reply.status(400).send('not enough params: id'); }
+    if (!pg?.pk) { return reply.status(400).send('empty pg'); }
+    if (!pg?.pk?.['site.spaces']) { return reply.status(400).send('table not found: site.spaces'); }
+
+    if (params?.id && params.id === 'default') {
+        return reply.status(400).send('default space cannot be deleted');
+    }
+
+    const exists = await pg.query('select space_id from site.spaces where space_id=$1', [params.id]).then(el => el.rows?.[0]?.space_id);
+    if (!exists) { return reply.status(404).send('space not found: ' + params.id); }
+
+    const { referer } = headers;
+
+    const res = await dataDelete({
+        pg,
+        table: 'site.spaces',
+        id: params?.id,
+        uid: user?.uid,
+        referer,
+    });
+
+    return { id: params.id, ...res || {} };
 }

package/server/routes/cmsSpace/controllers/getSpaces.js

@@ -1,29 +1,29 @@
-import { pgClients } from '@opengis/fastify-table/utils.js';
-
-const maxLimit = 100;
-const defaultLimit = 20;
-
-export default async function getSpaces({ pg = pgClients.client, user, params = {}, query = {} }, reply) {
-    return null;
-    if (!pg?.pk) { return reply.status(400).send('empty pg'); }
-    if (!pg?.pk?.['site.spaces']) { return reply.status(400).send('table not found: site.spaces'); }
-
-    const limit = Math.min(maxLimit, +(query.limit || defaultLimit));
-    const offset = query.page && query.page > 0 && !params.id ? (query.page - 1) * limit : 0;
-
-    const q = `select * from site.spaces where ${params.id ? 'space_id=$1' : '1=1'} limit ${limit} offset ${offset}`;
-    if (query.sql && user?.uid) return q;
-
-    const { rows = [] } = await pg.query(q, [params.id].filter(Boolean));
-
-    const total = await pg.queryCache('select count(*) from site.spaces', { table: 'site.spaces' }).then(el => el.rows?.[0]?.count || 0);
-
-    rows.forEach(row => Object.assign(row, { id: row.space_id }));
-
-    if (params.id) {
-        if (!rows.length) { return reply.status(404).send('space not found: ' + params.id); }
-        return reply.status(200).send(rows[0]);
-    }
-
-    return { total, filtered: rows.length, rows };
+import { pgClients } from '@opengis/fastify-table/utils.js';
+
+const maxLimit = 100;
+const defaultLimit = 20;
+
+export default async function getSpaces({ pg = pgClients.client, user, params = {}, query = {} }, reply) {
+    return null;
+    if (!pg?.pk) { return reply.status(400).send('empty pg'); }
+    if (!pg?.pk?.['site.spaces']) { return reply.status(400).send('table not found: site.spaces'); }
+
+    const limit = Math.min(maxLimit, +(query.limit || defaultLimit));
+    const offset = query.page && query.page > 0 && !params.id ? (query.page - 1) * limit : 0;
+
+    const q = `select * from site.spaces where ${params.id ? 'space_id=$1' : '1=1'} limit ${limit} offset ${offset}`;
+    if (query.sql && user?.uid) return q;
+
+    const { rows = [] } = await pg.query(q, [params.id].filter(Boolean));
+
+    const total = await pg.queryCache('select count(*) from site.spaces', { table: 'site.spaces' }).then(el => el.rows?.[0]?.count || 0);
+
+    rows.forEach(row => Object.assign(row, { id: row.space_id }));
+
+    if (params.id) {
+        if (!rows.length) { return reply.status(404).send('space not found: ' + params.id); }
+        return reply.status(200).send(rows[0]);
+    }
+
+    return { total, filtered: rows.length, rows };
 }

package/server/routes/cmsSpace/controllers/insertSpace.js

@@ -1,23 +1,23 @@
-import { dataInsert, pgClients } from '@opengis/fastify-table/utils.js';
-
-export default async function insertSpace({ pg = pgClients.client, user, params, headers = {}, body = {} }, reply) {
-    return null;
-    if (!pg?.pk) { return reply.status(400).send('empty pg'); }
-    if (!pg?.pk?.['site.spaces']) { return reply.status(400).send('table not found: site.spaces'); }
-
-    const exists = params?.id ? await pg.query('select space_id from site.spaces where space_id=$1', [params.id]).then(el => el.rows?.[0]?.space_id) : false;
-    if (exists) { return reply.status(400).send('space aleady exists: ' + params?.id); }
-
-    const { referer } = headers;
-
-    const res = await dataInsert({
-        pg,
-        table: 'site.spaces',
-        data: body,
-        id: params?.id,
-        uid: user?.uid,
-        referer,
-    });
-
-    return { id: res?.rows?.[0]?.space_id, rows: res?.rows || [] };
+import { dataInsert, pgClients } from '@opengis/fastify-table/utils.js';
+
+export default async function insertSpace({ pg = pgClients.client, user, params, headers = {}, body = {} }, reply) {
+    return null;
+    if (!pg?.pk) { return reply.status(400).send('empty pg'); }
+    if (!pg?.pk?.['site.spaces']) { return reply.status(400).send('table not found: site.spaces'); }
+
+    const exists = params?.id ? await pg.query('select space_id from site.spaces where space_id=$1', [params.id]).then(el => el.rows?.[0]?.space_id) : false;
+    if (exists) { return reply.status(400).send('space aleady exists: ' + params?.id); }
+
+    const { referer } = headers;
+
+    const res = await dataInsert({
+        pg,
+        table: 'site.spaces',
+        data: body,
+        id: params?.id,
+        uid: user?.uid,
+        referer,
+    });
+
+    return { id: res?.rows?.[0]?.space_id, rows: res?.rows || [] };
 }

package/server/routes/cmsSpace/controllers/updateSpace.js

@@ -1,25 +1,25 @@
-import { dataUpdate, pgClients } from '@opengis/fastify-table/utils.js';
-
-export default async function updateSpace({ pg = pgClients.client, user, params, headers = {}, body = {} }, reply) {
-    return null;
-    // if (!params?.id) { return reply.status(400).send('not enough params: id'); }
-    if (!pg?.pk) { return reply.status(400).send('empty pg'); }
-    if (!pg?.pk?.['site.spaces']) { return reply.status(400).send('table not found: site.spaces'); }
-
-    const id = 'default';
-    const exists = await pg.query('select space_id from site.spaces where space_id=$1', [id]).then(el => el.rows?.[0]?.space_id);
-    if (!exists) { return reply.status(404).send('space not found: ' + id); }
-
-    const { referer } = headers;
-
-    const res = await dataUpdate({
-        pg,
-        table: 'site.spaces',
-        data: body,
-        id,
-        uid: user?.uid,
-        referer,
-    });
-
-    return { id, ...res || {} };
+import { dataUpdate, pgClients } from '@opengis/fastify-table/utils.js';
+
+export default async function updateSpace({ pg = pgClients.client, user, params, headers = {}, body = {} }, reply) {
+    return null;
+    // if (!params?.id) { return reply.status(400).send('not enough params: id'); }
+    if (!pg?.pk) { return reply.status(400).send('empty pg'); }
+    if (!pg?.pk?.['site.spaces']) { return reply.status(400).send('table not found: site.spaces'); }
+
+    const id = 'default';
+    const exists = await pg.query('select space_id from site.spaces where space_id=$1', [id]).then(el => el.rows?.[0]?.space_id);
+    if (!exists) { return reply.status(404).send('space not found: ' + id); }
+
+    const { referer } = headers;
+
+    const res = await dataUpdate({
+        pg,
+        table: 'site.spaces',
+        data: body,
+        id,
+        uid: user?.uid,
+        referer,
+    });
+
+    return { id, ...res || {} };
 }

package/server/routes/cmsSpace/index.mjs

@@ -1,20 +1,20 @@
-// space
-import getSpaces from './controllers/getSpaces.js';
-import insertSpace from './controllers/insertSpace.js';
-import updateSpace from './controllers/updateSpace.js';
-import deleteSpace from './controllers/deleteSpace.js';
-
-const params = {
-    config: {
-        policy: [
-            'public'
-        ]
-    }
-};
-
-export default async function route(app) {
-    app.get('/cms-space/:id?', params, getSpaces);
-    app.post('/cms-space/:id?', params, insertSpace);
-    app.put('/cms-space/:id?', params, updateSpace);
-    app.delete('/cms-space/:id', params, deleteSpace);
-}
+// space
+import getSpaces from './controllers/getSpaces.js';
+import insertSpace from './controllers/insertSpace.js';
+import updateSpace from './controllers/updateSpace.js';
+import deleteSpace from './controllers/deleteSpace.js';
+
+const params = {
+    config: {
+        policy: [
+            'public'
+        ]
+    }
+};
+
+export default async function route(app) {
+    app.get('/cms-space/:id?', params, getSpaces);
+    app.post('/cms-space/:id?', params, insertSpace);
+    app.put('/cms-space/:id?', params, updateSpace);
+    app.delete('/cms-space/:id', params, deleteSpace);
+}