fix: extends interface inside namespace (#106)

fabien0102 · Jan 10, 2023 · 958d5a5 · 958d5a5
1 parent c226c4f
commit 958d5a5
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 1 deletion.
diff --git a/src/utils/resolveModules.test.ts b/src/utils/resolveModules.test.ts
@@ -63,13 +63,21 @@ describe("resolveModules", () => {
         hasPower: boolean;
         weakness: Weakness;
       }
+
+      export interface Clark {
+        hasGlasses: boolean
+      }
       
       export type SupermanBis = {
         fullName: Name;
         name: { first: Name; last: Name };
         hasPower: boolean;
         weakness: Weakness;
       }
+
+      export interface ExtendedSuperman extends Superman, Clark {
+        hasEvenMorePower: boolean;
+      }
     }`;
 
     expect(print(resolveModules(sourceText))).toMatchInlineSnapshot(`
@@ -85,6 +93,9 @@ describe("resolveModules", () => {
           hasPower: boolean;
           weakness: Weakness;
       }
+      export interface MetropolisClark {
+          hasGlasses: boolean;
+      }
       export type MetropolisSupermanBis = {
           fullName: MetropolisName;
           name: {
@@ -94,6 +105,9 @@ describe("resolveModules", () => {
           hasPower: boolean;
           weakness: Weakness;
       };
+      export interface MetropolisExtendedSuperman extends MetropolisSuperman, MetropolisClark {
+          hasEvenMorePower: boolean;
+      }
       "
     `);
   });

diff --git a/src/utils/resolveModules.ts b/src/utils/resolveModules.ts
@@ -138,11 +138,33 @@ const moduleToPrefix = (
         node.modifiers,
         f.createIdentifier(pascal(moduleName) + pascal(node.name.text)),
         node.typeParameters,
-        node.heritageClauses,
+        ts.visitNodes(
+          node.heritageClauses,
+          prefixInterfacesAndTypes(moduleName)
+        ),
         ts.visitNodes(node.members, prefixInterfacesAndTypes(moduleName))
       );
     }
 
+    if (ts.isHeritageClause(node)) {
+      return f.updateHeritageClause(
+        node,
+        ts.visitNodes(node.types, prefixInterfacesAndTypes(moduleName))
+      );
+    }
+
+    if (
+      ts.isExpressionWithTypeArguments(node) &&
+      ts.isIdentifier(node.expression) &&
+      (declarationNames.get(moduleName) || []).includes(node.expression.text)
+    ) {
+      return f.updateExpressionWithTypeArguments(
+        node,
+        f.createIdentifier(pascal(moduleName) + pascal(node.expression.text)),
+        node.typeArguments
+      );
+    }
+
     if (ts.isEnumDeclaration(node)) {
       return f.updateEnumDeclaration(
         node,