mblabs-roccato-backend-commons 1.0.40 → 1.0.42

package/dist/services/date.d.ts

@@ -11,7 +11,7 @@ declare class DateService {
     minusHours(start: Date, toRemove: number): Date;
     minusMinutes(start: Date, toRemove: number): Date;
     isValidDate(inp: string, format?: string): boolean;
-    getStartAndEndOfDay(inp: string): {
+    getStartAndEndOfDay(inp?: Date | string, useUTC?: boolean): {
         startOfDay: Date;
         endOfDay: Date;
     };

package/dist/services/date.js

@@ -51,11 +51,26 @@ class DateService {
     isValidDate(inp, format = 'yyyy-MM-dd') {
         return luxon_1.DateTime.fromFormat(inp, format).isValid;
     }
-    getStartAndEndOfDay(inp) {
-        const date = luxon_1.DateTime.fromISO(inp);
-        const startOfDay = date.startOf('day').toJSDate();
-        const endOfDay = date.endOf('day').toJSDate();
-        return { startOfDay, endOfDay };
+    getStartAndEndOfDay(inp = this.getCurrentDate(), useUTC = false) {
+        const date = inp instanceof Date
+            ? luxon_1.DateTime.fromJSDate(inp)
+            : luxon_1.DateTime.fromISO(inp);
+        if (!date.isValid) {
+            return {
+                startOfDay: luxon_1.DateTime.local().startOf('day').toJSDate(),
+                endOfDay: luxon_1.DateTime.local().endOf('day').toJSDate(),
+            };
+        }
+        if (useUTC) {
+            return {
+                startOfDay: date.toUTC().startOf('day').toJSDate(),
+                endOfDay: date.toUTC().endOf('day').toJSDate(),
+            };
+        }
+        return {
+            startOfDay: date.startOf('day').toJSDate(),
+            endOfDay: date.endOf('day').toJSDate(),
+        };
     }
     getStartOfDay(inp, format = constants_1.DATE.SYSTEM.FULL_DATETIME) {
         const date = luxon_1.DateTime.fromISO(inp);

package/dist/services/file.d.ts

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

package/dist/services/file.js

@@ -17,10 +17,10 @@ class FileService {
         });
         return promise;
     }
-    fillTemplate(template, replacements) {
+    fillTemplate(template, replacements, placeholderPattern = (key) => new RegExp(`\\{${key}\\}`, 'g')) {
         Object.keys(replacements).forEach((replacement) => {
-            const value = replacements[replacement] ? replacements[replacement] : '';
-            template = template.replace(new RegExp(`\\{${replacement}\\}`, 'g'), value);
+            const value = replacements[replacement] ?? '';
+            template = template.replace(placeholderPattern(replacement), String(value));
         });
         return template;
     }

package/package.json

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

package/src/services/date.ts

@@ -66,11 +66,32 @@ class DateService {
     return DateTime.fromFormat(inp, format).isValid;
   }
 
-  public getStartAndEndOfDay (inp: string) {
-    const date = DateTime.fromISO(inp);
-    const startOfDay = date.startOf('day').toJSDate();
-    const endOfDay = date.endOf('day').toJSDate();
-    return { startOfDay, endOfDay };
+  public getStartAndEndOfDay (
+    inp: Date | string = this.getCurrentDate(),
+    useUTC = false
+  ) {
+    const date = inp instanceof Date
+      ? DateTime.fromJSDate(inp)
+      : DateTime.fromISO(inp);
+
+    if (!date.isValid) {
+      return {
+        startOfDay: DateTime.local().startOf('day').toJSDate(),
+        endOfDay: DateTime.local().endOf('day').toJSDate(),
+      };
+    }
+
+    if (useUTC) {
+      return {
+        startOfDay: date.toUTC().startOf('day').toJSDate(),
+        endOfDay: date.toUTC().endOf('day').toJSDate(),
+      };
+    }
+
+    return {
+      startOfDay: date.startOf('day').toJSDate(),
+      endOfDay: date.endOf('day').toJSDate(),
+    };
   }
 
   public getStartOfDay (inp: string, format = DATE.SYSTEM.FULL_DATETIME): string {

package/src/services/file.ts

@@ -17,12 +17,15 @@ class FileService {
     return promise;
   }
 
-  public fillTemplate (template: any, replacements: Record<string, string | number | boolean>) {
+  public fillTemplate (
+    template: string,
+    replacements: Record<string, string | number | boolean>,
+    placeholderPattern: (key: string) => RegExp = (key) => new RegExp(`\\{${key}\\}`, 'g')
+  ): string {
 
     Object.keys(replacements).forEach((replacement) => {
-      const value = replacements[replacement] ? replacements[replacement] : '';
-
-      template = template.replace(new RegExp(`\\{${replacement}\\}`, 'g'), value);
+      const value = replacements[replacement] ?? '';
+      template = template.replace(placeholderPattern(replacement), String(value));
     });
 
     return template;