feat: support named exports as default

Author: unstubbable

Diff for: src/typings.ts

@@ -460,49 +460,41 @@ function getReferencedPropTypesComponentName(ast: AstQuery, propTypes: any|undef
 }
 
 function getComponentExportType(ast: AstQuery, componentName: string): dom.DeclarationFlags|undefined {
-  if (componentName === '') {
-    // case: unnamed default export
-    const res = ast.query(`
-      // ExportDefaultDeclaration[
-          // ClassDeclaration
-        ||
-          // FunctionDeclaration
-      ]
-    `);
-    if (res.length > 0 && !res[0].id) {
-      return dom.DeclarationFlags.ExportDefault;
-    }
-  }
-  let res = ast.query(`
-      // ExportDefaultDeclaration[
-          // ClassDeclaration
-          /:id Identifier[@name == '${componentName}']
-        ||
-          // FunctionDeclaration
-          /:id Identifier[@name == '${componentName}']
-        ||
-          // VariableDeclaration
-          / VariableDeclarator
-          /:id Identifier[@name == '${componentName}']
-        ||
-          /Identifier[@name == '${componentName}']
-      ]
-    ,
-      // AssignmentExpression[
-          /:left MemberExpression[
-              /:object Identifier[@name == 'exports']
-            &&
-              /:property Identifier[@name == 'default']
-          ]
-        &&
-          /:right Identifier[@name == '${componentName}']
-      ]
-  `);
-  if (res.length > 0) {
+  if (isDefaultExport(ast, componentName)) {
     return dom.DeclarationFlags.ExportDefault;
   }
-  res = ast.query(`
-    // ExportNamedDeclaration[
+
+  if (isNamedExport(ast, componentName)) {
+    return dom.DeclarationFlags.Export;
+  }
+
+  return undefined;
+}
+
+function isDefaultExport(ast: AstQuery, componentName: string): boolean {
+  return isUnnamedDefaultExport(ast, componentName) || isNamedDefaultExport(ast, componentName) ||
+    isNamedExportAsDefault(ast, componentName);
+}
+
+function isUnnamedDefaultExport(ast: AstQuery, componentName: string): boolean {
+  if (componentName !== '') {
+    return false;
+  }
+
+  const res = ast.query(`
+    // ExportDefaultDeclaration[
+        // ClassDeclaration
+      ||
+        // FunctionDeclaration
+    ]
+  `);
+
+  return res.length > 0 && !res[0].id;
+}
+
+function isNamedDefaultExport(ast: AstQuery, componentName: string): boolean {
+  const res = ast.query(`
+    // ExportDefaultDeclaration[
         // ClassDeclaration
         /:id Identifier[@name == '${componentName}']
       ||
@@ -513,14 +505,55 @@ function getComponentExportType(ast: AstQuery, componentName: string): dom.Decla
         / VariableDeclarator
         /:id Identifier[@name == '${componentName}']
       ||
-        // ExportSpecifier
-        /:exported Identifier[@name == '${componentName}']
+        /Identifier[@name == '${componentName}']
+    ]
+  ,
+    // AssignmentExpression[
+        /:left MemberExpression[
+            /:object Identifier[@name == 'exports']
+          &&
+            /:property Identifier[@name == 'default']
+        ]
+      &&
+        /:right Identifier[@name == '${componentName}']
     ]
   `);
-  if (res.length > 0) {
-    return dom.DeclarationFlags.Export;
-  }
-  return undefined;
+
+  return res.length > 0;
+}
+
+function isNamedExportAsDefault(ast: AstQuery, componentName: string): boolean {
+  const res = ast.query(`
+    // ExportNamedDeclaration[
+      // ExportSpecifier [
+        /:local Identifier[@name == '${componentName}'] &&
+        /:exported Identifier[@name == 'default']
+      ]
+    ]
+  `);
+
+  return res.length > 0;
+}
+
+function isNamedExport(ast: AstQuery, componentName: string): boolean {
+  const res = ast.query(`
+    // ExportNamedDeclaration[
+      // ClassDeclaration
+      /:id Identifier[@name == '${componentName}']
+    ||
+      // FunctionDeclaration
+      /:id Identifier[@name == '${componentName}']
+    ||
+      // VariableDeclaration
+      / VariableDeclarator
+      /:id Identifier[@name == '${componentName}']
+    ||
+      // ExportSpecifier
+      /:exported Identifier[@name == '${componentName}']
+    ]
+  `);
+
+  return res.length > 0;
 }
 
 function isClassComponent(ast: AstQuery, componentName: string,

Diff for: tests/parsing-test.ts

@@ -108,3 +108,6 @@ test('Parsing should suppport props-types repo', t => {
 test('Parsing should suppport props-types repo (with a default import)', t => {
   compare(t, 'path', 'prop-types-default-import.jsx', 'prop-types.d.ts', {});
 });
+test('Parsing should support an SFC with default export babeled to es6', t => {
+  compare(t, 'component', 'stateless-export-as-default.js', 'stateless-export-as-default.d.ts');
+});

Diff for: tests/stateless-export-as-default.d.ts

@@ -0,0 +1,8 @@
+declare module 'component' {
+  export interface ComponentProps {
+    text: string;
+    className?: string;
+  }
+
+  export default function Component(props: ComponentProps): JSX.Element;
+}

Diff for: tests/stateless-export-as-default.js

@@ -0,0 +1,17 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+const Component = ({ className, text }) => React.createElement(
+  'div',
+  { className: className },
+  text
+);
+
+Component.displayName = 'Component';
+
+Component.propTypes = {
+  text: PropTypes.string.isRequired,
+  className: PropTypes.string
+};
+
+export { Component as default };