Merge branch 'v3-dev'

# Conflicts:
#	package.json
#	src/Documentation.js
#	src/utils/getFlowType.js
#	src/utils/getPropertyName.js
#	yarn.lock

Author: danez

.babelrc

@@ -1,6 +1,10 @@
 {
   "presets": [
-    "env",
+    ["env", {
+      "targets": {
+        "node": 6
+      }
+    }],
     "flow"
   ],
   "plugins": [

.travis.yml

@@ -1,12 +1,9 @@
 sudo: false
 language: node_js
 node_js:
-  - "4"
-  - "6"
+  - "10"
   - "8"
-before_install:
-  - curl -o- -L https://yarnpkg.com/install.sh | bash
-  - export PATH="$HOME/.yarn/bin:$PATH"
+  - "6"
 cache:
   yarn: true
   directories:

README.md

@@ -2,7 +2,7 @@
 
 `react-docgen` is a CLI and toolbox to help extracting information from [React][] components, and generate documentation from it.
 
-It uses [recast][] and [babylon][] to parse the source into an AST and provides methods to process this AST to extract the desired information. The output / return value is a JSON blob / JavaScript object.
+It uses [recast][] and [@babel/parser][] to parse the source into an AST and provides methods to process this AST to extract the desired information. The output / return value is a JSON blob / JavaScript object.
 
 It provides a default implementation for React components defined via
 `React.createClass`, [ES2015 class definitions][classes] or functions
@@ -223,6 +223,7 @@ type Props = {
   literalsAndUnion: 'string' | 'otherstring' | number,
   arr: Array<any>,
   func?: (value: string) => void,
+  noParameterName?: string => void,
   obj?: { subvalue: ?boolean },
 };
 
@@ -287,6 +288,20 @@ we are getting this output:
       },
       "required":false
     },
+    "noParameterName":{
+      "flowType":{
+        "name":"signature",
+        "type":"function",
+        "raw":"string => void",
+        "signature":{
+          "arguments":[
+            { "name":"", "type":{ "name":"string" } }
+          ],
+          "return":{ "name":"void" }
+        }
+      },
+      "required":false
+    },
     "obj":{
       "flowType":{
         "name":"signature",
@@ -366,5 +381,5 @@ The structure of the JSON blob / JavaScript object is as follows:
 [react]: http://facebook.github.io/react/
 [flow]: http://flowtype.org/
 [recast]: https://github.com/benjamn/recast
-[babylon]: https://github.com/babel/babylon
+[@babel/parser]: https://github.com/babel/babel/tree/master/packages/babel-parser
 [classes]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes

bin/react-docgen.js

@@ -41,6 +41,9 @@ argv
         'Filename or regex to exclude. Default: ' + JSON.stringify(defaultExclude),
         collect,
         [])
+    .option(
+        '--legacy-decorators',
+        'Enable parsing of legacy decorators proposal. By default only the new decorators syntax will be parsable.')
     .option(
         '-i, --ignore <path>',
         'Folders to ignore. Default: ' + JSON.stringify(defaultIgnore),
@@ -100,7 +103,7 @@ if (argv.resolver) {
 }
 
 function parse(source) {
-  return parser.parse(source, resolver);
+  return parser.parse(source, resolver, null, { legacyDecorators: argv.legacyDecorators });
 }
 
 function writeError(msg, filePath) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-docgen",
-  "version": "2.21.0",
+  "version": "3.0.0-beta12",
   "description": "A CLI and toolkit to extract information from React components for documentation generation.",
   "repository": {
     "type": "git",
@@ -15,6 +15,9 @@
     "dist",
     "PATENTS"
   ],
+  "engines": {
+    "node": ">=6"
+  },
   "main": "dist/main.js",
   "scripts": {
     "build": "rimraf dist/ && babel src/ --out-dir dist/ --ignore __tests__,__mocks__",
@@ -32,29 +35,29 @@
   "author": "Felix Kling",
   "license": "BSD-3-Clause",
   "dependencies": {
+    "@babel/parser": "7.0.0-beta.51",
     "async": "^2.1.4",
     "babel-runtime": "^6.9.2",
-    "babylon": "~5.8.3",
     "commander": "^2.9.0",
     "doctrine": "^2.0.0",
     "node-dir": "^0.1.10",
-    "recast": "^0.12.6"
+    "recast": "^0.15.0"
   },
   "devDependencies": {
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.0",
     "babel-eslint": "^8.2.2",
-    "babel-jest": "^21.2.0",
+    "babel-jest": "^23.0.1",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-env": "^1.6.1",
     "babel-preset-flow": "^6.23.0",
-    "cross-spawn": "^5.0.0",
-    "eslint": "^4.18.1",
-    "flow-bin": "^0.59.0",
-    "jest": "^21.2.1",
-    "jest-diff": "^21.2.1",
-    "jest-matcher-utils": "^21.2.1",
+    "cross-spawn": "^6.0.4",
+    "eslint": "^5.0.1",
+    "flow-bin": "^0.75.0",
+    "jest": "^23.1.0",
+    "jest-diff": "^23.0.1",
+    "jest-matcher-utils": "^23.0.1",
     "rimraf": "^2.3.2",
     "temp": "^0.8.1"
   },

src/Documentation.js

@@ -71,14 +71,18 @@ class Documentation {
     if (this._props.size > 0) {
       obj.props = {};
       for (var [propName, propDescriptor] of this._props) {
-        obj.props[propName] = propDescriptor;
+        if (Object.keys(propDescriptor).length > 0) {
+          obj.props[propName] = propDescriptor;
+        }
       }
     }
 
     if (this._context.size > 0) {
       obj.context = {};
       for (var [contextName, contextDescriptor] of this._context) {
-        obj.context[contextName] = contextDescriptor;
+        if (Object.keys(contextDescriptor).length > 0) {
+          obj.context[contextName] = contextDescriptor;
+        }
       }
     }
 

src/__tests__/__snapshots__/main-test.js.snap

@@ -298,6 +298,40 @@ Object {
 `;
 
 exports[`main fixtures processes component "component_11.js" without errors 1`] = `
+Object {
+  "composes": Array [
+    "OtherProps",
+  ],
+  "description": "",
+  "displayName": "MyComponent",
+  "methods": Array [],
+  "props": Object {
+    "fooProp": Object {
+      "description": "fooProp is spread in from a locally resolved type",
+      "flowType": Object {
+        "name": "string",
+      },
+      "required": false,
+    },
+    "prop1": Object {
+      "description": "The first prop",
+      "flowType": Object {
+        "name": "string",
+      },
+      "required": true,
+    },
+    "prop2": Object {
+      "description": "The second, covariant prop",
+      "flowType": Object {
+        "name": "number",
+      },
+      "required": true,
+    },
+  },
+}
+`;
+
+exports[`main fixtures processes component "component_12.js" without errors 1`] = `
 Object {
   "description": "",
   "displayName": "Foo",

src/__tests__/fixtures/component_11.js

@@ -1,38 +1,54 @@
 /*
- * Copyright (c) 2015, Facebook, Inc.
- * All rights reserved.
+ *  Copyright (c) 2015, Facebook, Inc.
+ *  All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *  This source code is licensed under the BSD-style license found in the
+ *  LICENSE file in the root directory of this source tree. An additional grant
+ *  of patent rights can be found in the PATENTS file in the same directory.
  *
  */
 
- /**
-  * Test for documentation of React components with Flow annotations for props.
-  */
+/**
+ * Testing component using Flow
+ */
 
 import React from 'react';
 
-type Props = {
-    prop1: string,
-    prop2: string,
-};
-
-class Foo extends React.Component<Props> {
-    render() {
-        return (
-            <div>
-                {this.props.prop1}
-                I am Foo!
-                {this.props.prop2}
-            </div>
-        );
-    }
-}
+import { OtherComponentProps as OtherProps } from 'NonExistentFile';
+
+type OtherLocalProps = {|
+   /**
+   * fooProp is spread in from a locally resolved type
+   */
+  fooProp?: string,
+|}
+
+type Props = {|
+  /**
+   * Spread props defined locally
+   */
+  ...OtherLocalProps,
 
-Foo.defaultProps = {
-    prop2: 'bar',
-};
+  /**
+   * Spread props from another file
+   */
+  ...OtherProps,
+
+  /**
+   * The first prop
+   */
+  prop1: string,
+
+  /**
+   * The second, covariant prop
+   */
+  +prop2: number
+|}
+
+class MyComponent extends React.Component<Props> {
+  render() {
+    return null;
+  }
+}
 
-export default Foo;
+export default MyComponent;

src/__tests__/fixtures/component_12.js

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2015, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ */
+
+/**
+ * Test for documentation of React components with Flow annotations for props.
+ */
+
+import React from 'react';
+
+type Props = {
+   prop1: string,
+   prop2: string,
+};
+
+class Foo extends React.Component<Props> {
+   render() {
+       return (
+           <div>
+               {this.props.prop1}
+               I am Foo!
+               {this.props.prop2}
+           </div>
+       );
+   }
+}
+
+Foo.defaultProps = {
+   prop2: 'bar',
+};
+
+export default Foo;