Index signature merged

Author: jdiazgon

src/components/interfaceDeclaration/InterfaceDeclaration.ts

@@ -78,6 +78,10 @@ export class InterfaceDeclaration extends FileDeclaration {
       });
     }
 
+    if (this.index != null && this.index.length > 0) {
+      interfaceDeclaration.push(this.index);
+    }
+
     interfaceDeclaration.push('\n}\n');
 
     return interfaceDeclaration.join('');

src/tools/MergerTools.ts

@@ -109,10 +109,12 @@ export function mergeInterface(
     patchInterface.getMethods(),
     patchOverrides,
   );
-  mergeIndexSignature(
-    baseInterface.getIndex(),
-    patchInterface.getIndex(),
-    patchOverrides,
+  baseInterface.setIndex(
+    mergeIndexSignature(
+      baseInterface.getIndex(),
+      patchInterface.getIndex(),
+      patchOverrides,
+    ),
   );
 }
 
@@ -191,7 +193,12 @@ export function mergeIndexSignature(
   baseIndex: string,
   patchIndex: string,
   patchOverrides: boolean,
-) {}
+): string {
+  if (patchOverrides) {
+    baseIndex = patchIndex;
+  }
+  return baseIndex;
+}
 
 export function mergeInterfaceProperties(
   baseProperties: InterfaceProperty[],

test/export_test.ts

@@ -3,11 +3,6 @@ import { expect } from 'chai';
 import 'mocha';
 
 describe('Merging exports', () => {
-  let testResources = './test/resources/export/';
-  let baseTestResources = testResources + 'base/';
-  let patchTestResources = testResources + 'patch/';
-  let outputTestTempResources = testResources + 'output/';
-
   describe('should accumulate exports from', () => {
     describe('disjunct export sets', () => {
       const base = `export { a } from 'b';

test/interface_field_test.ts

@@ -80,4 +80,30 @@ describe('Merging interface fields', () => {
       );
     });
   });
+
+  describe('should add the index signature from', () => {
+    const base = `interface a { [key: string]: any; }`,
+      patch = `interface a { [key: string]: string; }`;
+
+    it('from the patch.', () => {
+      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('[key: string]: any;')).to.be.greaterThan(
+        0,
+        'base index should be present in interface a',
+      );
+    });
+    it('from the patch with patchOverride.', () => {
+      const result: String[] = merge(base, patch, true)
+        .split('\n')
+        .map((value) => value.trim())
+        .filter((value) => value != '');
+      expect(result.indexOf('[key: string]: string;')).to.be.greaterThan(
+        0,
+        'declaration should be present in interface a',
+      );
+    });
+  });
 });