X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Futils%2FFileUtils.ts;h=49f10a785b9c549f95f425a6cdfe6a4bf8c1a2a0;hb=4c5e87ae4e007b3cb0a8636515da8c3fe2bccff3;hp=87a8733b08f7e9108eb39f81b4d809200fb016d6;hpb=6d8b0b0e25a198e2328d165b9413f6f4d13db2e7;p=e-mobility-charging-stations-simulator.git

diff --git a/src/utils/FileUtils.ts b/src/utils/FileUtils.ts
index 87a8733b..49f10a78 100644
--- a/src/utils/FileUtils.ts
+++ b/src/utils/FileUtils.ts
@@ -1,42 +1,38 @@
-import fs from 'fs';
+import fs from 'node:fs';
 
 import chalk from 'chalk';
 
-import logger from './Logger';
-import Utils from './Utils';
-import type { EmptyObject } from '../types/EmptyObject';
-import type { HandleErrorParams } from '../types/Error';
-import type { FileType } from '../types/FileType';
-import type { JsonType } from '../types/JsonType';
+import { Utils, logger } from './internal';
+import type { EmptyObject, FileType, HandleErrorParams, JsonType } from '../types';
 
-export default class FileUtils {
+export class FileUtils {
   private constructor() {
     // This is intentional
   }
 
   public static watchJsonFile<T extends JsonType>(
-    logPrefix: string,
-    fileType: FileType,
     file: string,
+    fileType: FileType,
+    logPrefix: string,
     refreshedVariable?: T,
     listener: fs.WatchListener<string> = (event, filename) => {
-      if (filename && event === 'change') {
+      if (Utils.isNotEmptyString(filename) && event === 'change') {
         try {
-          logger.debug(`${logPrefix} ${fileType} file ${file} + ' have changed, reload'`);
+          logger.debug(`${logPrefix} ${fileType} file ${file} have changed, reload`);
           refreshedVariable && (refreshedVariable = JSON.parse(fs.readFileSync(file, 'utf8')) as T);
         } catch (error) {
-          FileUtils.handleFileException(logPrefix, fileType, file, error as NodeJS.ErrnoException, {
+          FileUtils.handleFileException(file, fileType, error as NodeJS.ErrnoException, logPrefix, {
             throwError: false,
           });
         }
       }
     }
-  ): fs.FSWatcher {
-    if (file) {
+  ): fs.FSWatcher | undefined {
+    if (Utils.isNotEmptyString(file)) {
       try {
         return fs.watch(file, listener);
       } catch (error) {
-        FileUtils.handleFileException(logPrefix, fileType, file, error as NodeJS.ErrnoException, {
+        FileUtils.handleFileException(file, fileType, error as NodeJS.ErrnoException, logPrefix, {
           throwError: false,
         });
       }
@@ -46,13 +42,13 @@ export default class FileUtils {
   }
 
   public static handleFileException(
-    logPrefix: string,
-    fileType: FileType,
     file: string,
+    fileType: FileType,
     error: NodeJS.ErrnoException,
+    logPrefix: string,
     params: HandleErrorParams<EmptyObject> = { throwError: true, consoleOut: false }
   ): void {
-    const prefix = !Utils.isEmptyString(logPrefix) ? logPrefix + ' ' : '';
+    const prefix = Utils.isNotEmptyString(logPrefix) ? `${logPrefix} ` : '';
     let logMsg: string;
     switch (error.code) {
       case 'ENOENT':