anote-server-libs 0.11.3 → 0.11.5

package/models/repository/BaseModelRepository.js

@@ -57,7 +57,7 @@ END`)
                 if (migrations.find(migration => migration.state !== 0))
                     process.exit(4);
                 fs.readdir(migrationsPath, (_, files) => {
-                    const migrationsAvailable = files
+                    let migrationsAvailable = files
                         .filter(file => /[0-9]+\.sql/.test(file))
                         .map(file => parseInt(file.split('.sql')[0], 10))
                         .filter(file => file > 0)
@@ -73,15 +73,19 @@ END`)
                     const minAvailableId = migrationsAvailable.length > 0 ? migrationsAvailable[0].id : 0;
                     const maxAvailableId = migrationsAvailable.length > 0 ? migrationsAvailable[migrationsAvailable.length - 1].id : Infinity;
                     migrations = migrations.filter(m => m.id >= minAvailableId && m.id <= maxAvailableId);
-                    if (onlyAboveOrEquals)
+                    if (onlyAboveOrEquals) {
                         migrations = migrations.filter(m => m.id >= onlyAboveOrEquals);
-                    if (onlyBelow)
+                        migrationsAvailable = migrationsAvailable.filter(m => m.id >= onlyAboveOrEquals);
+                    }
+                    if (onlyBelow) {
                         migrations = migrations.filter(m => m.id < onlyBelow);
+                        migrationsAvailable = migrationsAvailable.filter(m => m.id < onlyBelow);
+                    }
                     if (migrationsAvailable.length === 0 && migrations.length === 0)
                         process.exit(5);
                     if (migrationsAvailable.length && migrationsAvailable.length !== (migrationsAvailable[migrationsAvailable.length - 1].id - migrationsAvailable[0].id + 1))
                         process.exit(5);
-                    let highestCommon = onlyAboveOrEquals;
+                    let highestCommon = 0;
                     while (highestCommon < migrations.length && highestCommon < migrationsAvailable.length
                         && migrations[highestCommon].hash === migrationsAvailable[highestCommon].hash)
                         highestCommon++;

package/models/repository/BaseModelRepository.ts

@@ -58,7 +58,7 @@ END`)])).then(() => {
                 if(migrations.find(migration => migration.state !== 0)) process.exit(4); // Have to fix manually
                 // Read the new ones
                 fs.readdir(migrationsPath, (_, files) => {
-                    const migrationsAvailable = files
+                    let migrationsAvailable = files
                         .filter(file => /[0-9]+\.sql/.test(file))
                         .map(file => parseInt(file.split('.sql')[0], 10))
                         .filter(file => file > 0)
@@ -74,11 +74,11 @@ END`)])).then(() => {
                     const minAvailableId = migrationsAvailable.length > 0 ? migrationsAvailable[0].id : 0;
                     const maxAvailableId = migrationsAvailable.length > 0 ? migrationsAvailable[migrationsAvailable.length - 1].id : Infinity;
                     migrations = migrations.filter(m => m.id >= minAvailableId && m.id <= maxAvailableId);
-                    if(onlyAboveOrEquals) migrations = migrations.filter(m => m.id >= onlyAboveOrEquals);
-                    if(onlyBelow) migrations = migrations.filter(m => m.id < onlyBelow);
+                    if(onlyAboveOrEquals) { migrations = migrations.filter(m => m.id >= onlyAboveOrEquals); migrationsAvailable = migrationsAvailable.filter(m => m.id >= onlyAboveOrEquals); }
+                    if(onlyBelow) { migrations = migrations.filter(m => m.id < onlyBelow); migrationsAvailable = migrationsAvailable.filter(m => m.id < onlyBelow); }
                     if(migrationsAvailable.length === 0 && migrations.length === 0) process.exit(5);
                     if(migrationsAvailable.length && migrationsAvailable.length !== (migrationsAvailable[migrationsAvailable.length - 1].id - migrationsAvailable[0].id + 1)) process.exit(5);
-                    let highestCommon = onlyAboveOrEquals;
+                    let highestCommon = 0;
                     while(highestCommon < migrations.length && highestCommon < migrationsAvailable.length
                     && migrations[highestCommon].hash === migrationsAvailable[highestCommon].hash)
                         highestCommon++;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anote-server-libs",
-  "version": "0.11.3",
+  "version": "0.11.5",
   "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');
@@ -238,6 +237,7 @@ function getHtml(template, translationKeyValue) {
     const replacer = (_, key) => replacePlaceholders(translationKeyValue, key.split('.'), 0) ?? '';
     template = template.replace(pattern, replacer);
     template = template.replace(pattern, replacer);
+    template = template.replace(pattern, replacer);
     template = template.replace(new RegExp('\\[\\[\\s*([a-zA-Z._0-9:]+)\\s*\\]\\]', 'g'), (_, key) => {
         const keyParts = key.split(':');
         return (replacePlaceholders(translationKeyValue, keyParts[1].split('.'), 0) || [])
@@ -251,14 +251,14 @@ 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 defaultTranslations = defaultTemplateTranslations?.[lang] || defaultTemplateTranslations?.[0] || {};
-    const envSpecificTrans = envSpecificTranslations?.[name]?.[key]?.[lang]
-        || envSpecificTranslations?.[name]?.[key]?.[0]
-        || {};
+    const projectSpecificTrans = projectSpecificTranslations?.[config.app.product]?.[lang]?.[key] || projectSpecificTranslations?.[config.app.name]?.[0]?.[key] || {};
+    const envSpecificTrans = envSpecificTranslations?.[config.app.name]?.[lang]?.[key] || envSpecificTranslations?.[config.app.name]?.[0]?.[key] || {};
+    extraData = Object.fromEntries(Object.entries(extraData || {}).map(([k, v]) => [k, `{{${v}}}`]));
     const translationKeyValue = {
         ...defaultTranslations,
+        ...projectSpecificTrans,
         ...envSpecificTrans,
         ...extraData,
         domain: config.frontend,
@@ -279,11 +279,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

@@ -215,6 +215,7 @@ function getHtml(template: string, translationKeyValue: Record<string, any>): st
     const replacer = (_: string, key: string) => replacePlaceholders(translationKeyValue, key.split('.'), 0) ?? '';
     template = template.replace(pattern, replacer);
     template = template.replace(pattern, replacer);
+    template = template.replace(pattern, replacer);
     template = template.replace(new RegExp('\\[\\[\\s*([a-zA-Z._0-9:]+)\\s*\\]\\]', 'g'), (_, key) => {
         const keyParts = key.split(':');
         return (replacePlaceholders(translationKeyValue, keyParts[1].split('.'), 0) || [])
@@ -229,14 +230,22 @@ 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, any>}},
+                                templates: Record<string, string>,
+                                key: string, lang: number,
+                                defaultTemplateTranslations: Record<number, {[key: string]: string}> = {},
+                                projectSpecificTranslations: Record<string, Record<number, {[key: string]: string}>> = {},
+                                envSpecificTranslations?: Record<string, Record<number, {[key: string]: string}>>,
+                                extraData?: Record<string, any>,
+                                newPage?: boolean): string {
     const defaultTranslations = defaultTemplateTranslations?.[lang] || defaultTemplateTranslations?.[0] || {};
-    const envSpecificTrans = envSpecificTranslations?.[name]?.[key]?.[lang]
-        || envSpecificTranslations?.[name]?.[key]?.[0]
-        || {};
+    const projectSpecificTrans = projectSpecificTranslations?.[config.app.product]?.[lang]?.[key] || projectSpecificTranslations?.[config.app.name]?.[0]?.[key] || {};
+    const envSpecificTrans = envSpecificTranslations?.[config.app.name]?.[lang]?.[key] || envSpecificTranslations?.[config.app.name]?.[0]?.[key] || {};
+    // 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 +267,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, {[key: string]: string}> = {},
+                              projectSpecificTitles: Record<string, Record<number, {[key: string]: string}>> = {},
+                              envSpecificTitles: Record<string, Record<number, {[key: string]: 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);
 }