Merge pull request #33 from jdiazgon/bug_fix

Some bug fixing

Author: jdiazgon

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@oasp/ts-merger",
-  "version": "2.0.0",
+  "name": "@devonfw/ts-merger",
+  "version": "2.1.1",
   "description": "2-way TypeScript Merger",
   "author": {
     "name": "Capgemini",

src/components/classDeclaration/ClassDeclaration.ts

@@ -97,10 +97,15 @@ export class ClassDeclaration extends FileDeclaration {
   }
 
   parseComments(fileClass: ts.Node, sourceFile: ts.SourceFile) {
-    // getText() returns the first line without comments
-    let firstLine: string = sourceFile.getText();
-    // getFullText() returns also the comments, now I need the position of the declared class
-    let declarationPos: number = sourceFile.getFullText().indexOf(firstLine);
+    // Now I need the position of the declared class
+    let text: string = sourceFile.getFullText();
+    let regex: string = 'class +(' + this.getIdentifier() + ')';
+
+    let match = text.match(regex);
+
+    if (match == null) return;
+
+    let declarationPos: number = text.indexOf(match[0]);
     forEachComment(
       fileClass,
       (sourceFile, comment) => {
@@ -118,12 +123,6 @@ export class ClassDeclaration extends FileDeclaration {
 
   toString(): String {
     let classDeclaration: String[] = [];
-    this.decorators.forEach((decorator) => {
-      classDeclaration.push(decorator.toString(), '\n');
-    });
-    super.getModifiers().forEach((modifier) => {
-      classDeclaration.push(modifier, ' ');
-    });
 
     if (this.comments.length > 0) {
       this.comments.forEach((comment) => {
@@ -133,6 +132,13 @@ export class ClassDeclaration extends FileDeclaration {
     }
     classDeclaration.push('\n');
 
+    this.decorators.forEach((decorator) => {
+      classDeclaration.push(decorator.toString(), '\n');
+    });
+    super.getModifiers().forEach((modifier) => {
+      classDeclaration.push(modifier, ' ');
+    });
+
     classDeclaration.push('class ', this.getIdentifier());
     super.getHeritages().forEach((heritage) => {
       classDeclaration.push(heritage);

src/components/interfaceDeclaration/InterfaceDeclaration.ts

@@ -75,10 +75,15 @@ export class InterfaceDeclaration extends FileDeclaration {
   }
 
   parseComments(fileInterface: ts.Node, sourceFile: ts.SourceFile) {
-    // getText() returns the first line without comments
-    let firstLine: string = sourceFile.getText();
-    // getFullText() returns also the comments, now I need the position of the declared class
-    let declarationPos: number = sourceFile.getFullText().indexOf(firstLine);
+    // Now I need the position of the declared class
+    let text: string = sourceFile.getFullText();
+    let regex: string = 'interface +(' + this.getIdentifier() + ')';
+
+    let match = text.match(regex);
+
+    if (match == null) return;
+
+    let declarationPos: number = text.indexOf(match[0]);
     forEachComment(
       fileInterface,
       (sourceFile, comment) => {
@@ -96,9 +101,6 @@ export class InterfaceDeclaration extends FileDeclaration {
 
   toString(): String {
     let interfaceDeclaration: String[] = [];
-    super.getModifiers().forEach((modifier) => {
-      interfaceDeclaration.push(modifier, ' ');
-    });
 
     if (this.comments.length > 0) {
       this.comments.forEach((comment) => {
@@ -108,6 +110,10 @@ export class InterfaceDeclaration extends FileDeclaration {
     }
     interfaceDeclaration.push('\n');
 
+    super.getModifiers().forEach((modifier) => {
+      interfaceDeclaration.push(modifier, ' ');
+    });
+
     interfaceDeclaration.push('interface ', this.getIdentifier());
     super.getHeritages().forEach((heritage) => {
       interfaceDeclaration.push(heritage);