feat: use es2022

Signed-off-by: Emilien Escalle <[email protected]>
reactionable · Nov 9, 2024 · d4c3679 · d4c3679
1 parent 9a34bb9
commit d4c3679
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 54 deletions.
diff --git a/src/services/file/JsonFile.ts b/src/services/file/JsonFile.ts
@@ -10,14 +10,10 @@ export interface JsonFileData {
 }
 
 export class JsonFile extends StdFile {
-  protected data?: JsonFileData;
-
-  getContent(): string {
-    return JSON.stringify(this.data, null, "  ");
-  }
+  protected declare data?: JsonFileData;
 
   appendContent(content: string): this {
-    return this.appendData(JSON.parse(content));
+    return this.appendData(this.parseContentToData(content));
   }
 
   appendData(data: JsonFileData): this {
@@ -45,16 +41,19 @@ export class JsonFile extends StdFile {
   }
 
   protected parseContent(content: string): string {
-    content = super.parseContent(content);
+    this.data = this.parseContentToData(super.parseContent(content));
+    return JSON.stringify(this.data, null, "  ");
+  }
+
+  protected parseContentToData(content: string): JsonFileData {
     try {
-      this.data = JSON.parse(content);
+      return JSON.parse(content);
     } catch (error) {
       throw new Error(
         `An error occurred while parsing file content "${this.file}": ${JSON.stringify(
           error instanceof Error ? error.message : error
         )} => "${content.trim()}"`
       );
     }
-    return content;
   }
 }
diff --git a/src/services/file/StdFile.ts b/src/services/file/StdFile.ts
@@ -9,6 +9,7 @@ import { FileService } from "./FileService";
 
 export class StdFile {
   protected content = "";
+
   constructor(
     protected readonly cliService: CliService,
     protected readonly directoryService: DirectoryService,

diff --git a/src/services/file/TomlFile.ts b/src/services/file/TomlFile.ts
@@ -4,24 +4,18 @@ import { all } from "deepmerge";
 import { StdFile } from "./StdFile";
 
 export class TomlFile extends StdFile {
-  protected data?: JsonMap;
-
-  protected parseContent(content: string): string {
-    content = super.parseContent(content);
-    this.data = parse(content);
-    return content;
-  }
+  protected declare data?: JsonMap;
 
   getContent(): string {
     return stringify(this.data || {});
   }
 
   appendContent(content: string): this {
-    return this.appendData(parse(content));
+    return this.appendData(this.parseContentToData(content));
   }
 
   appendData(data: JsonMap): this {
-    const overwriteMerge = (destinationArray, sourceArray) => sourceArray;
+    const overwriteMerge = (_, sourceArray) => sourceArray;
 
     const newData = all([(this.data || {}) as JsonMap, data as JsonMap], {
       arrayMerge: overwriteMerge,
@@ -37,4 +31,21 @@ export class TomlFile extends StdFile {
     }
     return property ? this.data[property] : this.data;
   }
+
+  protected parseContent(content: string): string {
+    this.data = this.parseContentToData(super.parseContent(content));
+    return stringify(this.data || {});
+  }
+
+  protected parseContentToData(content: string): JsonMap {
+    try {
+      return parse(content);
+    } catch (error) {
+      throw new Error(
+        `An error occurred while parsing file content "${this.file}": ${JSON.stringify(
+          error instanceof Error ? error.message : error
+        )} => "${content.trim()}"`
+      );
+    }
+  }
 }
diff --git a/src/services/file/TypescriptFile.ts b/src/services/file/TypescriptFile.ts
@@ -11,9 +11,40 @@ import { StdFile } from "./StdFile";
 import { ITypescriptImport, ITypescriptImportModules, TypescriptImport } from "./TypescriptImport";
 
 export class TypescriptFile extends StdFile {
-  protected imports?: Array<TypescriptImport>;
-  protected declarations?: Array<string>;
-  protected defaultDeclaration?: string | null;
+  protected declare imports?: Array<TypescriptImport>;
+  protected declare declarations?: Array<string>;
+  protected declare defaultDeclaration?: string | null;
+
+  setImports(
+    importsToAdd: Array<ITypescriptImport> = [],
+    importsToRemove: Array<ITypescriptImport> = []
+  ): this {
+    const importToAddItems = importsToAdd.map(
+      (importItem) => new TypescriptImport(importItem.packageName, importItem.modules)
+    );
+    const importToRemoveItems = importsToRemove.map(
+      (importItem) => new TypescriptImport(importItem.packageName, importItem.modules)
+    );
+
+    this.addImports(importToAddItems);
+    this.removeImports(importToRemoveItems);
+    return this;
+  }
+
+  getContent(): string {
+    let importLines: string[] = [];
+    if (this.imports) {
+      this.imports.sort(this.sortImports);
+      importLines = this.imports
+        .map((importItem) => importItem.toString())
+        .filter((line) => !!line.length);
+    }
+
+    return [importLines.join("\n"), (this.declarations || []).join("\n")]
+      .map((value) => value.trim())
+      .join("\n\n")
+      .trim();
+  }
 
   protected parseContent(content: string): string {
     this.imports = [];
@@ -29,7 +60,7 @@ export class TypescriptFile extends StdFile {
           this.parseImportDeclaration(bodyItem as ImportDeclaration);
           break;
         default:
-          this.declarations.push(content.substr(bodyItem.pos, bodyItem.end - bodyItem.pos));
+          this.declarations.push(content.substring(bodyItem.pos, bodyItem.end));
       }
     }
 
@@ -99,37 +130,6 @@ export class TypescriptFile extends StdFile {
     }
   }
 
-  getContent(): string {
-    let importLines: string[] = [];
-    if (this.imports) {
-      this.imports.sort(this.sortImports);
-      importLines = this.imports
-        .map((importItem) => importItem.toString())
-        .filter((line) => !!line.length);
-    }
-
-    return [importLines.join("\n"), (this.declarations || []).join("\n")]
-      .map((value) => value.trim())
-      .join("\n\n")
-      .trim();
-  }
-
-  setImports(
-    importsToAdd: Array<ITypescriptImport> = [],
-    importsToRemove: Array<ITypescriptImport> = []
-  ): this {
-    const importToAddItems = importsToAdd.map(
-      (importItem) => new TypescriptImport(importItem.packageName, importItem.modules)
-    );
-    const importToRemoveItems = importsToRemove.map(
-      (importItem) => new TypescriptImport(importItem.packageName, importItem.modules)
-    );
-
-    this.addImports(importToAddItems);
-    this.removeImports(importToRemoveItems);
-    return this;
-  }
-
   protected addImports(imports: TypescriptImport[]): void {
     if (!this.imports) {
       this.imports = [];

diff --git a/tsconfig.json b/tsconfig.json
@@ -7,7 +7,7 @@
     "noLib": false,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "target": "es2018",
+    "target": "es2022",
     "sourceMap": true,
     "strict": true,
     "outDir": "./dist",