fix: properly handle esm exports when file has imports too

fixtures/typescript/export-class-declaration-with-imports/output.json

@@ -0,0 +1,9 @@
+{
+  "kind": "class",
+  "methods": [
+    {
+      "name": "foo",
+      "lineno": 4
+    }
+  ]
+}

fixtures/typescript/export-class-declaration-with-imports/source.ts

@@ -0,0 +1,9 @@
+import 'typescript'
+
+export default class UserController {
+  public foo () {
+    return this.bar()
+  }
+
+  private bar () {}
+}

fixtures/typescript/export-class-declaration/output.json

@@ -0,0 +1,9 @@
+{
+  "kind": "class",
+  "methods": [
+    {
+      "name": "foo",
+      "lineno": 2
+    }
+  ]
+}

fixtures/typescript/export-class-declaration/source.ts

@@ -0,0 +1,7 @@
+export default class UserController {
+  public foo () {
+    return this.bar()
+  }
+
+  private bar () {}
+}

fixtures/typescript/export-class-variable-declaration-with-imports/output.json

@@ -0,0 +1,9 @@
+{
+  "kind": "class",
+  "methods": [
+    {
+      "name": "foo",
+      "lineno": 4
+    }
+  ]
+}

fixtures/typescript/export-class-variable-declaration-with-imports/source.ts

@@ -0,0 +1,11 @@
+import 'typescript'
+
+class UserController {
+  public foo () {
+    return this.bar()
+  }
+
+  private bar () {}
+}
+
+export default UserController

fixtures/typescript/export-object-literal-declaration-with-imports/output.json

@@ -0,0 +1,9 @@
+{
+  "kind": "object",
+  "methods": [
+    {
+      "name": "foo",
+      "lineno": 4
+    }
+  ]
+}

fixtures/typescript/export-object-literal-declaration-with-imports/source.ts

@@ -0,0 +1,7 @@
+import 'typescript'
+
+const foo = {
+  foo () {},
+}
+
+export default foo

fixtures/typescript/export-object-literal-declaration/output.json

@@ -0,0 +1,9 @@
+{
+  "kind": "object",
+  "methods": [
+    {
+      "name": "foo",
+      "lineno": 2
+    }
+  ]
+}

fixtures/typescript/export-object-literal-declaration/source.ts

@@ -0,0 +1,4 @@
+const foo = {
+  foo () {},
+}
+export default foo

fixtures/typescript/export-object-literal-with-imports/output.json

@@ -0,0 +1,9 @@
+{
+  "kind": "object",
+  "methods": [
+    {
+      "name": "foo",
+      "lineno": 4
+    }
+  ]
+}

fixtures/typescript/export-object-literal-with-imports/source.ts

@@ -0,0 +1,5 @@
+import 'typescript'
+
+export default {
+  foo () {},
+}

fixtures/typescript/export-object-literal/output.json

@@ -0,0 +1,9 @@
+{
+  "kind": "object",
+  "methods": [
+    {
+      "name": "foo",
+      "lineno": 2
+    }
+  ]
+}

fixtures/typescript/export-object-literal/source.ts

@@ -0,0 +1,3 @@
+export default {
+  foo () {},
+}

src/Extractor.ts

@@ -61,26 +61,47 @@ export class Extractor {
   }
 
   /**
-   * Returns the expression next to commonjs or esm default export. Esm
-   * named exports are not entertained, since AdonisJs IoC container
-   * bindings doesn't allow them as well.
+   * Finds esm export expresions
    */
-  private _getExportExpression (source: ts.SourceFile): ts.Expression | ts.ClassDeclaration | null {
-    let expression: ts.Expression | null = null
+  private _findEsmExportExpression (node: ts.Statement): null | ts.ClassDeclaration | ts.Expression {
+    /**
+     * Export assignment expressions are returned as it is
+     */
+    if (ts.isExportAssignment(node)) {
+      return node.expression
+    }
+
+    /**
+     * Node is class declaration, so we need to check it's modifiers (if any)
+     * to see if it has `export default`
+     */
+    if (!ts.isClassDeclaration(node) || !node.modifiers) {
+      return null
+    }
 
     /**
-     * Return export defaults right away
+     * Has export default modifier
      */
-    if (source['externalModuleIndicator']) {
-      debug('located default export "%s"', source['externalModuleIndicator'].kind)
-      return source['externalModuleIndicator'] as (ts.Expression | ts.ClassDeclaration)
+    if (node.modifiers.find((modifier) => ts.SyntaxKind.DefaultKeyword === modifier.kind)) {
+      return node
     }
 
+    return null
+  }
+
+  /**
+   * Returns the expression next to commonjs or esm default export. Esm
+   * named exports are not entertained, since AdonisJs IoC container
+   * bindings doesn't allow them as well.
+   */
+  private _getExportExpression (source: ts.SourceFile): ts.Expression | ts.ClassDeclaration | null {
+    let expression: ts.Expression | ts.ClassDeclaration | null = null
+
     /**
      * Look for commonJs style module.exports and exports
      */
     for (let statement of source.statements) {
-      expression = this._findCommonJsExportExpression(statement)
+      expression = this._findCommonJsExportExpression(statement) || this._findEsmExportExpression(statement)
       if (expression) {
         break
       }