mblabs-roccato-backend-commons 1.0.42 → 1.0.44

package/dist/services/file.d.ts

@@ -1,6 +1,6 @@
 declare class FileService {
     readTemplate(path: string, encoding: string): Promise<unknown>;
-    fillTemplate(template: string, replacements: Record<string, string | number | boolean>, placeholderPattern?: (key: string) => RegExp): string;
+    fillTemplate(template: string, replacements: Record<string, string | number | boolean>, delimiters: [string, string][]): string;
     getBase64Metadata(file: string): {
         buffer: Buffer<ArrayBuffer>;
         extension: string;

package/dist/services/file.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = require("fs");
+const utils_1 = require("../utils");
 const date_1 = __importDefault(require("./date"));
 class FileService {
     readTemplate(path, encoding) {
@@ -17,11 +18,13 @@ class FileService {
         });
         return promise;
     }
-    fillTemplate(template, replacements, placeholderPattern = (key) => new RegExp(`\\{${key}\\}`, 'g')) {
-        Object.keys(replacements).forEach((replacement) => {
-            const value = replacements[replacement] ?? '';
-            template = template.replace(placeholderPattern(replacement), String(value));
-        });
+    fillTemplate(template, replacements, delimiters) {
+        for (const [key, value] of Object.entries(replacements)) {
+            for (const [open, close] of delimiters) {
+                const regex = new RegExp(`${(0, utils_1.parseRegex)(open)}${key}${(0, utils_1.parseRegex)(close)}`, 'g');
+                template = template.replace(regex, String(value ?? ''));
+            }
+        }
         return template;
     }
     getBase64Metadata(file) {

package/dist/utils/parser.d.ts

@@ -1 +1,2 @@
 export declare function parseRecord<T>(record: string): T | string;
+export declare function parseRegex(text: string): string;

package/dist/utils/parser.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseRecord = parseRecord;
+exports.parseRegex = parseRegex;
 function parseRecord(record) {
     let parsed;
     try {
@@ -11,3 +12,6 @@ function parseRecord(record) {
     }
     return parsed;
 }
+function parseRegex(text) {
+    return text.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mblabs-roccato-backend-commons",
-  "version": "1.0.42",
+  "version": "1.0.44",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/services/file.ts

@@ -1,5 +1,6 @@
 import { readFile } from 'fs';
 
+import { parseRegex } from '../utils';
 import DateService from './date';
 
 class FileService {
@@ -20,13 +21,17 @@ class FileService {
   public fillTemplate (
     template: string,
     replacements: Record<string, string | number | boolean>,
-    placeholderPattern: (key: string) => RegExp = (key) => new RegExp(`\\{${key}\\}`, 'g')
+    delimiters: [string, string][]
   ): string {
-
-    Object.keys(replacements).forEach((replacement) => {
-      const value = replacements[replacement] ?? '';
-      template = template.replace(placeholderPattern(replacement), String(value));
-    });
+    for (const [ key, value ] of Object.entries(replacements)) {
+      for (const [ open, close ] of delimiters) {
+        const regex = new RegExp(
+          `${parseRegex(open)}${key}${parseRegex(close)}`,
+          'g'
+        );
+        template = template.replace(regex, String(value ?? ''));
+      }
+    }
 
     return template;
   }

package/src/utils/parser.ts

@@ -9,3 +9,7 @@ export function parseRecord<T> (record: string): T | string {
 
   return parsed;
 }
+
+export function parseRegex (text: string): string {
+  return text.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+}