anote-server-libs 0.11.4 → 0.11.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anote-server-libs",
-  "version": "0.11.4",
+  "version": "0.11.6",
   "description": "Helpers for express-TS servers",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

package/services/utils.js

@@ -15,7 +15,6 @@ exports.readEmailTemplates = readEmailTemplates;
 exports.replacePlaceholders = replacePlaceholders;
 exports.getHtmlReplaced = getHtmlReplaced;
 exports.getEmailTitle = getEmailTitle;
-exports.getEmailTranslation = getEmailTranslation;
 const fs = require("fs");
 function atob(str) {
     return Buffer.from(str, 'base64').toString('binary');
@@ -234,8 +233,8 @@ function replacePlaceholders(data, keys, depth) {
 function getHtml(template, translationKeyValue) {
     if (!template)
         return undefined;
-    const pattern = new RegExp('{{\\s*([a-zA-Z._0-9]+)\\s*}}', 'g');
-    const replacer = (_, key) => replacePlaceholders(translationKeyValue, key.split('.'), 0) ?? '';
+    const pattern = new RegExp('{{\\s*([^{}]+?)\\s*}}', 'g');
+    const replacer = (_, key) => replacePlaceholders(translationKeyValue, key.split('.'), 0) ?? key;
     template = template.replace(pattern, replacer);
     template = template.replace(pattern, replacer);
     template = template.replace(new RegExp('\\[\\[\\s*([a-zA-Z._0-9:]+)\\s*\\]\\]', 'g'), (_, key) => {
@@ -251,14 +250,21 @@ function getHtml(template, translationKeyValue) {
     });
     return template;
 }
-function getHtmlReplaced(config, templates, key, lang, defaultTemplateTranslations = {}, envSpecificTranslations, extraData, newPage) {
-    const name = config.app.name;
+function getHtmlReplaced(config, templates, key, lang, defaultTemplateTranslations = {}, projectSpecificTranslations = {}, envSpecificTranslations, extraData, newPage) {
+    const asTranslationMap = (value) => value && typeof value === 'object' ? value : {};
     const defaultTranslations = defaultTemplateTranslations?.[lang] || defaultTemplateTranslations?.[0] || {};
-    const envSpecificTrans = envSpecificTranslations?.[name]?.[key]?.[lang]
-        || envSpecificTranslations?.[name]?.[key]?.[0]
-        || {};
+    const projectSpecificTrans = {
+        ...asTranslationMap(projectSpecificTranslations?.[config.app.product]?.[lang] || projectSpecificTranslations?.[config.app.name]?.[0]),
+        ...asTranslationMap(projectSpecificTranslations?.[config.app.product]?.[key]?.[lang] || projectSpecificTranslations?.[config.app.name]?.[key]?.[0])
+    };
+    const envSpecificTrans = {
+        ...asTranslationMap(envSpecificTranslations?.[config.app.name]?.[lang] || envSpecificTranslations?.[config.app.name]?.[0]),
+        ...asTranslationMap(envSpecificTranslations?.[config.app.name]?.[key]?.[lang] || envSpecificTranslations?.[config.app.name]?.[key]?.[0])
+    };
+    extraData = Object.fromEntries(Object.entries(extraData || {}).map(([k, v]) => [k, `{{${v}}}`]));
     const translationKeyValue = {
         ...defaultTranslations,
+        ...projectSpecificTrans,
         ...envSpecificTrans,
         ...extraData,
         domain: config.frontend,
@@ -279,11 +285,10 @@ function getHtmlReplaced(config, templates, key, lang, defaultTemplateTranslatio
     }
     return html;
 }
-function getEmailTitle(key, lang, titles, overrideTitles, data) {
+function getEmailTitle(config, key, lang, defaultTitles = {}, projectSpecificTitles = {}, envSpecificTitles = {}, extraData = {}) {
     const pattern = new RegExp('{{\\s*([a-zA-Z._0-9]+)\\s*}}', 'g');
-    const title = overrideTitles?.[lang]?.[key] ?? titles[lang]?.[key];
-    return title?.replace(pattern, (_, placeholderKey) => data?.[placeholderKey]);
-}
-function getEmailTranslation(key, lang, translationKeyValue, defaultLang = 0) {
-    return translationKeyValue?.[lang]?.[key] ?? translationKeyValue?.[defaultLang]?.[key];
+    const title = envSpecificTitles?.[config.app.name]?.[lang]?.[key]
+        || projectSpecificTitles?.[config.app.product]?.[lang]?.[key]
+        || defaultTitles?.[lang]?.[key];
+    return title?.replace(pattern, (_, placeholderKey) => extraData?.[placeholderKey] || config.app.emailConfig?.[placeholderKey] || placeholderKey);
 }

package/services/utils.ts

@@ -211,8 +211,8 @@ export function replacePlaceholders(data: Record<string, any>, keys: string[], d
 
 function getHtml(template: string, translationKeyValue: Record<string, any>): string | undefined {
     if(!template) return undefined;
-    const pattern = new RegExp('{{\\s*([a-zA-Z._0-9]+)\\s*}}', 'g');
-    const replacer = (_: string, key: string) => replacePlaceholders(translationKeyValue, key.split('.'), 0) ?? '';
+    const pattern = new RegExp('{{\\s*([^{}]+?)\\s*}}', 'g');
+    const replacer = (_: string, key: string) => replacePlaceholders(translationKeyValue, key.split('.'), 0) ?? key;
     template = template.replace(pattern, replacer);
     template = template.replace(pattern, replacer);
     template = template.replace(new RegExp('\\[\\[\\s*([a-zA-Z._0-9:]+)\\s*\\]\\]', 'g'), (_, key) => {
@@ -229,14 +229,30 @@ function getHtml(template: string, translationKeyValue: Record<string, any>): st
     return template;
 }
 
-export function getHtmlReplaced(config: Record<string, any>, templates: Record<string, string>, key: string, lang: number, defaultTemplateTranslations: Record<number, any> = {}, envSpecificTranslations?: Record<string, any>, extraData?: Record<string, any>, newPage?: boolean): string {
-    const name = config.app.name;
+export function getHtmlReplaced(config: {frontend: string, app: {product: string, name: string, emailConfig: Record<string, string>}},
+                                templates: Record<string, string>,
+                                key: string, lang: number,
+                                defaultTemplateTranslations: Record<number, Record<string | number, string>> = {},
+                                projectSpecificTranslations: Record<string, Record<string | number, Record<string | number, string>>> = {},
+                                envSpecificTranslations?: Record<string, Record<string | number, Record<string | number, string>>>,
+                                extraData?: Record<string, any>,
+                                newPage?: boolean): string {
+    const asTranslationMap = (value: unknown): Record<string | number, string> =>
+        value && typeof value === 'object' ? value as Record<string | number, string> : {};
     const defaultTranslations = defaultTemplateTranslations?.[lang] || defaultTemplateTranslations?.[0] || {};
-    const envSpecificTrans = envSpecificTranslations?.[name]?.[key]?.[lang]
-        || envSpecificTranslations?.[name]?.[key]?.[0]
-        || {};
+    const projectSpecificTrans = {
+        ...asTranslationMap(projectSpecificTranslations?.[config.app.product]?.[lang] || projectSpecificTranslations?.[config.app.name]?.[0]),
+        ...asTranslationMap(projectSpecificTranslations?.[config.app.product]?.[key]?.[lang] || projectSpecificTranslations?.[config.app.name]?.[key]?.[0])
+    };
+    const envSpecificTrans = {
+        ...asTranslationMap(envSpecificTranslations?.[config.app.name]?.[lang] || envSpecificTranslations?.[config.app.name]?.[0]),
+        ...asTranslationMap(envSpecificTranslations?.[config.app.name]?.[key]?.[lang] || envSpecificTranslations?.[config.app.name]?.[key]?.[0])
+    };
+    // Add {{}} around all extraData values so that they will be auto translated in the template if needed
+    extraData = Object.fromEntries(Object.entries(extraData || {}).map(([k, v]) => [k, `{{${v}}}`]));
     const translationKeyValue = {
         ...defaultTranslations,
+        ...projectSpecificTrans,
         ...envSpecificTrans,
         ...extraData,
         domain: config.frontend,
@@ -258,12 +274,15 @@ export function getHtmlReplaced(config: Record<string, any>, templates: Record<s
     return html;
 }
 
-export function getEmailTitle(key: string, lang: number, titles: Record<number, any>, overrideTitles?: Record<number, any>, data?: Record<string, string>): string | undefined {
+export function getEmailTitle(config: {frontend: string, app: {product: string, name: string, emailConfig: Record<string, any>}},
+                              key: string, lang: number,
+                              defaultTitles: Record<number, Record<string | number, string>> = {},
+                              projectSpecificTitles: Record<string, Record<number, Record<string | number, string>>> = {},
+                              envSpecificTitles: Record<string, Record<number, Record<string | number, string>>> = {},
+                              extraData: Record<string, string> = {}): string | undefined {
     const pattern = new RegExp('{{\\s*([a-zA-Z._0-9]+)\\s*}}', 'g');
-    const title = overrideTitles?.[lang]?.[key] ?? titles[lang]?.[key];
-    return title?.replace(pattern, (_: string, placeholderKey: string) => data?.[placeholderKey]);
-}
-
-export function getEmailTranslation(key: string, lang: number, translationKeyValue: Record<number, any>, defaultLang: number = 0): string | undefined {
-    return translationKeyValue?.[lang]?.[key] ?? translationKeyValue?.[defaultLang]?.[key];
+    const title = envSpecificTitles?.[config.app.name]?.[lang]?.[key]
+        || projectSpecificTitles?.[config.app.product]?.[lang]?.[key]
+        || defaultTitles?.[lang]?.[key];
+    return title?.replace(pattern, (_: string, placeholderKey: string) => extraData?.[placeholderKey] || config.app.emailConfig?.[placeholderKey] || placeholderKey);
 }