Merge branch 'master' into named-imports

Author: KnisterPeter

package.json

@@ -65,7 +65,7 @@
     "babel-generator": "6.24.0",
     "babylon": "6.16.1",
     "chalk": "1.1.3",
-    "dts-dom": "0.1.17",
+    "dts-dom": "0.1.18",
     "get-stdin": "5.0.1",
     "meow": "3.7.0",
     "pascal-case": "2.0.1",

src/typings.ts

@@ -82,6 +82,7 @@ function createExportedTypes(m: dom.ModuleDeclaration, ast: AstQuery, componentN
     const classDecl = dom.create.class(componentName);
     classDecl.baseType = dom.create.interface(`Component<${interf.name}, any>`);
     classDecl.flags = exportType;
+    classDecl.members.push(dom.create.method('render', [], dom.create.namedTypeReference('JSX.Element')));
     m.members.push(classDecl);
   } else {
     const funcDelc = dom.create.function(componentName, propTypes ? [dom.create.parameter('props', interf)] : [],
@@ -318,7 +319,7 @@ function getComponentNamesByStaticPropTypeAttribute(ast: AstQuery): string[] {
     ]
   `);
   if (res.length > 0) {
-    return res.map(match => match.id.name);
+    return res.map(match => match.id ? match.id.name : '');
   }
   return [];
 }
@@ -337,7 +338,7 @@ function getComponentNamesByJsxInBody(ast: AstQuery): string[] {
     ]
   `);
   if (res.length > 0) {
-    return res.map(match => match.id.name);
+    return res.map(match => match.id ? match.id.name : '');
   }
   return [];
 }
@@ -358,6 +359,19 @@ function getPropTypesFromAssignment(ast: AstQuery, componentName: string): any|u
 }
 
 function getPropTypesFromStaticAttribute(ast: AstQuery, componentName: string): any|undefined {
+  if (componentName === '') {
+    const res = ast.query(`
+      //ClassDeclaration
+      /:body *
+      //ClassProperty[
+        /:key Identifier[@name == 'propTypes']
+      ]
+      /:value*
+    `);
+    if (res.length > 0 && !res[0].id) {
+      return res[0];
+    }
+  }
   const res = ast.query(`
     //ClassDeclaration[
       /:id Identifier[@name == '${componentName}']
@@ -375,6 +389,19 @@ function getPropTypesFromStaticAttribute(ast: AstQuery, componentName: string):
 }
 
 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
@@ -424,6 +451,14 @@ function getComponentExportType(ast: AstQuery, componentName: string): dom.Decla
 
 function isClassComponent(ast: AstQuery, componentName: string,
     reactComponentName: string|undefined): boolean {
+  if (componentName === '') {
+    const res = ast.query(`
+        // ClassDeclaration
+    `);
+    if (res.length > 0 && !res[0].id) {
+      return true;
+    }
+  }
   const res = ast.query(`
       // ClassDeclaration
       /:id Identifier[@name == '${componentName}']

tests/component-without-proptyes.d.ts

@@ -5,6 +5,7 @@ declare module 'component' {
   }
 
   export default class Test extends Component<TestProps, any> {
+    render(): JSX.Element;
   }
 
   export function test(): JSX.Element;

tests/es6-class.d.ts

@@ -53,5 +53,6 @@ declare module 'component' {
   }
 
   export class Component extends Component<ComponentProps, any> {
+    render(): JSX.Element;
   }
 }

tests/es7-class-separate-export.d.ts

@@ -6,5 +6,6 @@ declare module 'component' {
   }
 
   export default class Component extends Component<ComponentProps, any> {
+    render(): JSX.Element;
   }
 }

tests/es7-class-top-level-module.d.ts

@@ -28,4 +28,5 @@ export interface ComponentProps {
 }
 
 export default class Component extends Component<ComponentProps, any> {
+  render(): JSX.Element;
 }

tests/es7-class.d.ts

@@ -29,5 +29,6 @@ declare module 'component' {
   }
 
   export default class Component extends Component<ComponentProps, any> {
+    render(): JSX.Element;
   }
 }

tests/instance-of-proptype-names.d.ts

@@ -7,5 +7,6 @@ declare module 'component' {
   }
 
   export class Test extends Component<TestProps, any> {
+    render(): JSX.Element;
   }
 }

tests/parsing-test.ts

@@ -82,3 +82,6 @@ test('Parsing should create definition from file without propTypes', t => {
 test('Parsing should create definition from file with references in propTypes', t => {
   compare(t, 'component', 'references-in-proptypes.jsx', 'references-in-proptypes.d.ts');
 });
+test('Parsing should create definition from file with unnamed default export', t => {
+  compare(t, 'path', 'unnamed-default-export.jsx', 'unnamed-default-export.d.ts');
+});

tests/references-in-proptypes.d.ts

@@ -13,5 +13,6 @@ declare module 'component' {
   }
 
   export default class SomeComponent extends Component<SomeComponentProps, any> {
+    render(): JSX.Element;
   }
 }