fix(factory): work to export instance

``` export class Foo {} export default new Foo() ```
esdoc · Apr 23, 2017 · 43b9207 · 43b9207
1 parent d656ff5
commit 43b9207
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 15 deletions.
diff --git a/src/Factory/DocFactory.js b/src/Factory/DocFactory.js
@@ -124,21 +124,23 @@ export default class DocFactory {
           break;
       }
 
-      const classNode = ASTUtil.findClassDeclarationNode(targetClassName, this._ast);
+      const {classNode, exported} = ASTUtil.findClassDeclarationNode(targetClassName, this._ast);
       if (classNode) {
-        const pseudoExportNode1 = this._copy(exportNode);
-        pseudoExportNode1.declaration = this._copy(classNode);
-        pseudoExportNode1.leadingComments = null;
-        pseudoExportNode1.declaration.__PseudoExport__ = pseudoClassExport;
-        pseudoExportNodes.push(pseudoExportNode1);
+        if (!exported) {
+          const pseudoExportNode1 = this._copy(exportNode);
+          pseudoExportNode1.declaration = this._copy(classNode);
+          pseudoExportNode1.leadingComments = null;
+          pseudoExportNode1.declaration.__PseudoExport__ = pseudoClassExport;
+          pseudoExportNodes.push(pseudoExportNode1);
+          ASTUtil.sanitize(classNode);
+        }
 
         if (targetVariableName) {
           const pseudoExportNode2 = this._copy(exportNode);
           pseudoExportNode2.declaration = ASTUtil.createVariableDeclarationAndNewExpressionNode(targetVariableName, targetClassName, exportNode.loc);
           pseudoExportNodes.push(pseudoExportNode2);
         }
 
-        ASTUtil.sanitize(classNode);
         ASTUtil.sanitize(exportNode);
       }
 
@@ -196,8 +198,8 @@ export default class DocFactory {
         for (const declaration of exportNode.declaration.declarations) {
           if (!declaration.init || declaration.init.type !== 'NewExpression') continue;
 
-          const classNode = ASTUtil.findClassDeclarationNode(declaration.init.callee.name, this._ast);
-          if (classNode) {
+          const {classNode, exported} = ASTUtil.findClassDeclarationNode(declaration.init.callee.name, this._ast);
+          if (classNode && !exported) {
             const pseudoExportNode = this._copy(exportNode);
             pseudoExportNode.declaration = this._copy(classNode);
             pseudoExportNode.leadingComments = null;
@@ -231,8 +233,8 @@ export default class DocFactory {
           pseudoClassExport = false;
         }
 
-        const classNode = ASTUtil.findClassDeclarationNode(targetClassName, this._ast);
-        if (classNode) {
+        const {classNode, exported} = ASTUtil.findClassDeclarationNode(targetClassName, this._ast);
+        if (classNode && !exported) {
           const pseudoExportNode = this._copy(exportNode);
           pseudoExportNode.declaration = this._copy(classNode);
           pseudoExportNode.leadingComments = null;

diff --git a/src/Util/ASTUtil.js b/src/Util/ASTUtil.js
@@ -85,16 +85,20 @@ export default class ASTUtil {
    * find ClassDeclaration node.
    * @param {string} name - class name.
    * @param {AST} ast - find in this ast.
-   * @returns {ASTNode|null} found ast node.
+   * @returns {{classNode: ASTNode|null, exported: boolean|null}} found ast node.
    */
   static findClassDeclarationNode(name, ast) {
-    if (!name) return null;
+    if (!name) return {classNode: null, exported: null};
 
     for (const node of ast.program.body) {
-      if (node.type === 'ClassDeclaration' && node.id.name === name) return node;
+      if (node.type === 'ClassDeclaration' && node.id.name === name) return {classNode: node, exported: false};
+
+      if (node.type === 'ExportDefaultDeclaration' || node.type === 'ExportNamedDeclaration') {
+        if (node.declaration && node.declaration.type === 'ClassDeclaration' && node.declaration.id.name === name) return {classNode: node, exported: true};
+      }
     }
 
-    return null;
+    return {classNode: null, exported: null};
   }
 
   /**

diff --git a/test/fixture/package/src/Export/NewExpressionAndExported.js b/test/fixture/package/src/Export/NewExpressionAndExported.js
@@ -0,0 +1,19 @@
+/**
+ * this is TestExportNewExpressionAndExported.
+ */
+export class TestExportNewExpressionAndExported {}
+
+/**
+ * this is instance of TestExportNewExpressionAndExported.
+ */
+export default new TestExportNewExpressionAndExported();
+
+/**
+ * this is TestExportNewExpressionAndExported2.
+ */
+export class TestExportNewExpressionAndExported2 {}
+
+/**
+ * this is instance of TestExportNewExpressionAndExported2.
+ */
+export const testExportNewExpressionAndExported2 = new TestExportNewExpressionAndExported2();