Interface merging, no comment merging

Author: jdiazgon

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devonfw/ts-merger",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "description": "2-way TypeScript Merger",
   "author": {
     "name": "Capgemini",
@@ -19,7 +19,7 @@
     "test": "mocha-webpack --webpack-config webpack.config.js \"test/**/*_test.ts\"",
     "test-watch": "mocha-webpack --webpack-config webpack.config.js --watch \"test/**/*_test.ts\"",
     "prepublish": "npm run build && npm run test && npm run bundle",
-    "bundle": "webpack --define process.env.NODE_ENV=\"production\""
+    "bundle": "webpack -p"
   },
   "keywords": [
     "TypeScript",
@@ -28,22 +28,20 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@types/chai": "^3.4.35",
-    "@types/mocha": "^5.2.5",
-    "@types/node": "^10.12.21",
-    "chai": "^4.1.0",
+    "@types/mocha": "^2.2.39",
+    "@types/node": "^7.0.22",
+    "chai": "^3.5.0",
     "cpx": "^1.5.0",
-    "mocha": "^5.0.1",
+    "mocha": "^3.2.0",
     "mocha-webpack": "1.1.0",
     "source-map-support": "0.4.3",
     "ts-loader": "^2.1.0",
     "tslint": "^5.5.0",
     "tslint-language-service": "^0.9.6",
     "typescript": "^2.2.1",
-    "webpack": "^3.0.0"
-  },
-  "dependencies": {
-    "tsutils": "^3.8.0"
+    "webpack": "^3.4.1"
   },
+  "dependencies": {},
   "directories": {
     "test": "test"
   },

src/components/classDeclaration/ClassDeclaration.ts

@@ -3,8 +3,6 @@ import { PropertyDeclaration } from './members/property/PropertyDeclaration';
 import { Decorator } from '../decorator/Decorator';
 import { FileDeclaration } from '../general/FileDeclaration';
 import { Method } from './members/method/Method';
-import { forEachComment } from 'tsutils/util';
-import * as ts from 'typescript/lib/typescript';
 /**
  * Defines the structure of class objects
  *
@@ -15,7 +13,6 @@ export class ClassDeclaration extends FileDeclaration {
   private decorators: Decorator[];
   private methods: Method[];
   private properties: PropertyDeclaration[];
-  private comments: string[];
   private construct: Constructor;
 
   constructor() {
@@ -24,7 +21,6 @@ export class ClassDeclaration extends FileDeclaration {
     this.methods = [];
     this.properties = [];
     this.construct = new Constructor();
-    this.comments = [];
   }
 
   getConstructor() {
@@ -84,54 +80,9 @@ export class ClassDeclaration extends FileDeclaration {
     this.methods = methods;
   }
 
-  addComment(comment: string) {
-    this.comments.push(comment);
-  }
-
-  getComments() {
-    return this.comments;
-  }
-
-  setComments(comments: string[]) {
-    this.comments = comments;
-  }
-
-  parseComments(fileClass: ts.Node, sourceFile: ts.SourceFile) {
-    // 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) => {
-        if (comment.end < declarationPos) {
-          let commentText: string = sourceFile.substring(
-            comment.pos,
-            comment.end,
-          );
-          this.comments.push(commentText);
-        }
-      },
-      sourceFile,
-    );
-  }
-
   toString(): String {
     let classDeclaration: String[] = [];
 
-    if (this.comments.length > 0) {
-      this.comments.forEach((comment) => {
-        classDeclaration.push(comment);
-        classDeclaration.push('\n');
-      });
-    }
-    classDeclaration.push('\n');
-
     this.decorators.forEach((decorator) => {
       classDeclaration.push(decorator.toString(), '\n');
     });

src/components/interfaceDeclaration/InterfaceDeclaration.ts

@@ -1,8 +1,6 @@
 import { FileDeclaration } from '../general/FileDeclaration';
 import { InterfaceProperty } from './members/InterfaceProperty';
 import { InterfaceMethod } from './members/method/InterfaceMethod';
-import { forEachComment } from 'tsutils/util';
-import * as ts from 'typescript/lib/typescript';
 /**
  * Defines the structure of interface objects
  *
@@ -12,14 +10,12 @@ import * as ts from 'typescript/lib/typescript';
 export class InterfaceDeclaration extends FileDeclaration {
   private methods: InterfaceMethod[];
   private properties: InterfaceProperty[];
-  private comments: string[];
   private index: string;
 
   constructor() {
     super();
     this.methods = [];
     this.properties = [];
-    this.comments = [];
   }
 
   getIndex() {
@@ -62,54 +58,9 @@ export class InterfaceDeclaration extends FileDeclaration {
     this.methods = methods;
   }
 
-  addComment(comment: string) {
-    this.comments.push(comment);
-  }
-
-  getComments() {
-    return this.comments;
-  }
-
-  setComments(comments: string[]) {
-    this.comments = comments;
-  }
-
-  parseComments(fileInterface: ts.Node, sourceFile: ts.SourceFile) {
-    // 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) => {
-        if (comment.end < declarationPos) {
-          let commentText: string = sourceFile.substring(
-            comment.pos,
-            comment.end,
-          );
-          this.comments.push(commentText);
-        }
-      },
-      sourceFile,
-    );
-  }
-
   toString(): String {
     let interfaceDeclaration: String[] = [];
 
-    if (this.comments.length > 0) {
-      this.comments.forEach((comment) => {
-        interfaceDeclaration.push(comment);
-        interfaceDeclaration.push('\n');
-      });
-    }
-    interfaceDeclaration.push('\n');
-
     super.getModifiers().forEach((modifier) => {
       interfaceDeclaration.push(modifier, ' ');
     });

src/tools/MappingTools.ts

@@ -348,7 +348,6 @@ export function mapClass(
           break;
       }
     });
-    classTo.parseComments(fileClass, sourceFile);
   }
   return classTo;
 }
@@ -393,7 +392,6 @@ export function mapInterface(fileInterface: any, sourceFile: ts.SourceFile) {
           break;
       }
     });
-    interfaceTo.parseComments(fileInterface, sourceFile);
   }
   return interfaceTo;
 }

src/tools/MergerTools.ts

@@ -74,12 +74,6 @@ export function mergeClass(
     patchOverrides,
   );
 
-  mergeComments(
-    baseClass.getComments(),
-    patchClass.getComments(),
-    patchOverrides,
-  );
-
   mergeDecorators(
     baseClass.getDecorators(),
     patchClass.getDecorators(),
@@ -114,11 +108,6 @@ export function mergeInterface(
     patchOverrides,
   );
 
-  mergeComments(
-    baseInterface.getComments(),
-    patchInterface.getComments(),
-    patchOverrides,
-  );
   mergeInterfaceProperties(
     baseInterface.getProperties(),
     patchInterface.getProperties(),
@@ -265,26 +254,6 @@ export function mergeHeritages(
   }
 }
 
-export function mergeComments(
-  baseComments: string[],
-  patchComments: string[],
-  patchOverrides: boolean,
-) {
-  let exists: boolean;
-
-  patchComments.forEach((patchComment, index) => {
-    let isNotRemoved: boolean = true;
-    baseComments.forEach((baseComment) => {
-      if (patchOverrides) {
-        if (isNotRemoved) {
-          baseComments.splice(index, 1, patchComment);
-          isNotRemoved = false;
-        }
-      }
-    });
-  });
-}
-
 export function mergeInterfaceProperties(
   baseProperties: InterfaceProperty[],
   patchProperties: InterfaceProperty[],
@@ -392,4 +361,4 @@ export function mergeFunction(
   patchOverrides: boolean,
 ) {
   baseFunction.merge(patchFunction, patchOverrides);
-}
+}

test/class_test.ts

@@ -155,41 +155,4 @@ describe('Merging class declarations', () => {
     });
   });
 
-  describe('comments on class definitions', () => {
-    const base = `/* Test this */
-      // Bla test
-      class a { }`,
-      patch = `/* Test that */
-      // Ble test
-      class a {}`;
-
-    it('should be accumulated.', () => {
-      const result: String[] = merge(base, patch, false)
-        .split('\n') // get each individual line
-        .map((value) => value.trim()) // trim all lines (no white spaces at the beginning and end of a line)
-        .filter((value) => value != ''); // remove empty lines
-      expect(result.indexOf('/* Test this */')).to.be.greaterThan(
-        -1,
-        'first base comment should be present in class a',
-      );
-      expect(result.indexOf('// Bla test')).to.be.greaterThan(
-        0,
-        'second base comment should be present in class a',
-      );
-    });
-    it('should accumulate patch comments with patchOverride.', () => {
-      const result: String[] = merge(base, patch, true)
-        .split('\n') // get each individual line
-        .map((value) => value.trim()) // trim all lines (no white spaces at the beginning and end of a line)
-        .filter((value) => value != ''); // remove empty lines
-      expect(result.indexOf('/* Test that */')).to.be.greaterThan(
-        -1,
-        'first patch comment should be present in class',
-      );
-      expect(result.indexOf('// Ble test')).to.be.greaterThan(
-        0,
-        'second patch comment should be present in class',
-      );
-    });
-  });
 });

test/interface_test.ts

@@ -71,7 +71,7 @@ describe('Merging interface declarations', () => {
       let regex = /\s*interface\s+[ab]\s*\{\}\s*interface\s+[ab].*/;
       expect(regex.test(result.toString())).true;
     });
-    it('should be accumulated with patchOverride (should not make a difference).', () => {
+    it('should be accumulated with patchOverride (should not make any difference).', () => {
       const result: String = merge(patch, base, false)
         .split('\n')
         .map((value) => value.trim())
@@ -97,7 +97,7 @@ describe('Merging interface declarations', () => {
         ).length,
       ).to.be.equal(1, 'misformed class declaration');
     });
-    it('should be accumulated with patchOverride (should not make a difference).', () => {
+    it('should be accumulated with patchOverride (should not make any difference).', () => {
       const result: String[] = merge(base, patch, true)
         .split('\n') // get each individual line
         .map((value) => value.trim()) // trim all lines (no white spaces at the beginning and end of a line)
@@ -109,42 +109,4 @@ describe('Merging interface declarations', () => {
       ).to.be.equal(1, 'misformed class declaration');
     });
   });
-
-  describe('multiple comments on interface definitions', () => {
-    const base = `/* Test this */
-      // Bla test
-      interface a { }`,
-      patch = `/* Test that */
-      // Ble test
-      interface a {}`;
-
-    it('should be accumulated.', () => {
-      const result: String[] = merge(base, patch, false)
-        .split('\n') // get each individual line
-        .map((value) => value.trim()) // trim all lines (no white spaces at the beginning and end of a line)
-        .filter((value) => value != ''); // remove empty lines
-      expect(result.indexOf('/* Test this */')).to.be.greaterThan(
-        -1,
-        'first base comment should be present in interface a',
-      );
-      expect(result.indexOf('// Bla test')).to.be.greaterThan(
-        0,
-        'second base comment should be present in interface a',
-      );
-    });
-    it('should be accumulated with patchOverride (should not make a difference).', () => {
-      const result: String[] = merge(base, patch, true)
-        .split('\n') // get each individual line
-        .map((value) => value.trim()) // trim all lines (no white spaces at the beginning and end of a line)
-        .filter((value) => value != ''); // remove empty lines
-      expect(result.indexOf('/* Test that */')).to.be.greaterThan(
-        -1,
-        'first patch comment should be present in interface',
-      );
-      expect(result.indexOf('// Ble test')).to.be.greaterThan(
-        0,
-        'second patch comment should be present in interface',
-      );
-    });
-  });
 });

tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es2015",
+    "target": "es5",
     "noImplicitAny": false,
     "sourceMap": true,
     "outDir": "build",