Switch from babylon to babel-core. Fixes #201

tmcw · tmcw · commit 8886ac6157fc · 2015-10-30T12:37:56.000-04:00
diff --git a/lib/parsers/javascript.js b/lib/parsers/javascript.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var babylon = require('babylon'),
+var babel = require('babel-core'),
   types = require('ast-types'),
   extend = require('extend'),
   isJSDocComment = require('../../lib/is_jsdoc_comment'),
@@ -20,21 +20,10 @@ function commentShebang(code) {
 }
 
 var parseOpts = {
-  allowImportExportEverywhere: true,
-  allowReturnOutsideFunction: true,
-  allowHashBang: true,
-  ecmaVersion: 7,
-  strictMode: true,
-  sourceType: 'module',
+  code: false,
+  stage: 0,
   locations: true,
-  ranges: true,
-  features: {
-    'es7.classProperties': true
-  },
-  plugins: {
-    jsx: true,
-    flow: true
-  }
+  ranges: true
 };
 
 /**
@@ -48,7 +37,7 @@ var parseOpts = {
 module.exports = function (data) {
   var results = [];
   var code = commentShebang(data.source),
-    ast = babylon.parse(code, parseOpts);
+    ast = babel.parse(code, parseOpts);
 
   var visited = {};
 
diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
   "dependencies": {
     "ast-types": "^0.8.12",
     "babelify": "^6.3.0",
-    "babylon": "^5.8.23",
+    "babel-core": "^5.0.0",
     "brfs": "^1.4.0",
     "concat-stream": "^1.5.0",
     "doctrine": "^0.7.0",
@@ -74,6 +74,7 @@
   },
   "scripts": {
     "lint": "eslint bin lib index.js test",
+    "doc": "documentation index.js -f md > docs/NODE_API.md",
     "test": "npm run lint && tap --coverage test/*.js test/lib test/misc test/streams"
   }
 }
diff --git a/test/fixture/bad/syntax.output.json b/test/fixture/bad/syntax.output.json
@@ -4,6 +4,5 @@
     "line": 1,
     "column": 0
   },
-  "_babel": true,
-  "codeFrame": "> 1 | *\n    | ^\n  2 | "
-}
+  "_babel": true
+}
diff --git a/test/fixture/es6-import.output.custom.md b/test/fixture/es6-import.output.custom.md
@@ -32,6 +32,12 @@ This method says hello
 
 
 
+# foo
+
+This is an async method
+
+
+
 # multiply
 
 This function returns the number one.
diff --git a/test/fixture/es6-import.output.json b/test/fixture/es6-import.output.json
@@ -23,7 +23,7 @@
           "column": 1
         }
       },
-      "code": "/**\n * This function returns the number one.\n * @returns {Number} numberone\n */\nvar multiply = (a, b) => a * b;\n\n/**\n * This is a sink\n */\nclass Sink {\n  /**\n   * This is a property of the sink.\n   */\n  staticProp = 42;\n\n  /**\n   * Is it empty\n   */\n  empty() {\n    return 1;\n  }\n\n  /**\n   * This method says hello\n   */\n  static hello() {\n    return 'hello';\n  }\n\n  /**\n   * @param {number} height the height of the thing\n   * @param {number} width the width of the thing\n   */\n  constructor(height, width) {\n    this.height = height;\n    this.width = width;\n  }\n}\n\nexport default multiply;\n"
+      "code": "/**\n * This function returns the number one.\n * @returns {Number} numberone\n */\nvar multiply = (a, b) => a * b;\n\n/**\n * This is a sink\n */\nclass Sink {\n  /**\n   * This is a property of the sink.\n   */\n  staticProp = 42;\n\n  /**\n   * Is it empty\n   */\n  empty() {\n    return 1;\n  }\n\n  /**\n   * This method says hello\n   */\n  static hello() {\n    return 'hello';\n  }\n\n  /**\n   * @param {number} height the height of the thing\n   * @param {number} width the width of the thing\n   */\n  constructor(height, width) {\n    this.height = height;\n    this.width = width;\n  }\n}\n\n/**\n * This is an async method\n */\nasync function foo() { }\n\nexport default multiply;\n"
     },
     "errors": [],
     "name": "Sink",
@@ -75,7 +75,7 @@
                 "column": 3
               }
             },
-            "code": "/**\n * This function returns the number one.\n * @returns {Number} numberone\n */\nvar multiply = (a, b) => a * b;\n\n/**\n * This is a sink\n */\nclass Sink {\n  /**\n   * This is a property of the sink.\n   */\n  staticProp = 42;\n\n  /**\n   * Is it empty\n   */\n  empty() {\n    return 1;\n  }\n\n  /**\n   * This method says hello\n   */\n  static hello() {\n    return 'hello';\n  }\n\n  /**\n   * @param {number} height the height of the thing\n   * @param {number} width the width of the thing\n   */\n  constructor(height, width) {\n    this.height = height;\n    this.width = width;\n  }\n}\n\nexport default multiply;\n"
+            "code": "/**\n * This function returns the number one.\n * @returns {Number} numberone\n */\nvar multiply = (a, b) => a * b;\n\n/**\n * This is a sink\n */\nclass Sink {\n  /**\n   * This is a property of the sink.\n   */\n  staticProp = 42;\n\n  /**\n   * Is it empty\n   */\n  empty() {\n    return 1;\n  }\n\n  /**\n   * This method says hello\n   */\n  static hello() {\n    return 'hello';\n  }\n\n  /**\n   * @param {number} height the height of the thing\n   * @param {number} width the width of the thing\n   */\n  constructor(height, width) {\n    this.height = height;\n    this.width = width;\n  }\n}\n\n/**\n * This is an async method\n */\nasync function foo() { }\n\nexport default multiply;\n"
           },
           "errors": [],
           "params": [
@@ -137,7 +137,7 @@
                 "column": 3
               }
             },
-            "code": "/**\n * This function returns the number one.\n * @returns {Number} numberone\n */\nvar multiply = (a, b) => a * b;\n\n/**\n * This is a sink\n */\nclass Sink {\n  /**\n   * This is a property of the sink.\n   */\n  staticProp = 42;\n\n  /**\n   * Is it empty\n   */\n  empty() {\n    return 1;\n  }\n\n  /**\n   * This method says hello\n   */\n  static hello() {\n    return 'hello';\n  }\n\n  /**\n   * @param {number} height the height of the thing\n   * @param {number} width the width of the thing\n   */\n  constructor(height, width) {\n    this.height = height;\n    this.width = width;\n  }\n}\n\nexport default multiply;\n"
+            "code": "/**\n * This function returns the number one.\n * @returns {Number} numberone\n */\nvar multiply = (a, b) => a * b;\n\n/**\n * This is a sink\n */\nclass Sink {\n  /**\n   * This is a property of the sink.\n   */\n  staticProp = 42;\n\n  /**\n   * Is it empty\n   */\n  empty() {\n    return 1;\n  }\n\n  /**\n   * This method says hello\n   */\n  static hello() {\n    return 'hello';\n  }\n\n  /**\n   * @param {number} height the height of the thing\n   * @param {number} width the width of the thing\n   */\n  constructor(height, width) {\n    this.height = height;\n    this.width = width;\n  }\n}\n\n/**\n * This is an async method\n */\nasync function foo() { }\n\nexport default multiply;\n"
           },
           "errors": [],
           "name": "empty",
@@ -179,7 +179,7 @@
                 "column": 3
               }
             },
-            "code": "/**\n * This function returns the number one.\n * @returns {Number} numberone\n */\nvar multiply = (a, b) => a * b;\n\n/**\n * This is a sink\n */\nclass Sink {\n  /**\n   * This is a property of the sink.\n   */\n  staticProp = 42;\n\n  /**\n   * Is it empty\n   */\n  empty() {\n    return 1;\n  }\n\n  /**\n   * This method says hello\n   */\n  static hello() {\n    return 'hello';\n  }\n\n  /**\n   * @param {number} height the height of the thing\n   * @param {number} width the width of the thing\n   */\n  constructor(height, width) {\n    this.height = height;\n    this.width = width;\n  }\n}\n\nexport default multiply;\n"
+            "code": "/**\n * This function returns the number one.\n * @returns {Number} numberone\n */\nvar multiply = (a, b) => a * b;\n\n/**\n * This is a sink\n */\nclass Sink {\n  /**\n   * This is a property of the sink.\n   */\n  staticProp = 42;\n\n  /**\n   * Is it empty\n   */\n  empty() {\n    return 1;\n  }\n\n  /**\n   * This method says hello\n   */\n  static hello() {\n    return 'hello';\n  }\n\n  /**\n   * @param {number} height the height of the thing\n   * @param {number} width the width of the thing\n   */\n  constructor(height, width) {\n    this.height = height;\n    this.width = width;\n  }\n}\n\n/**\n * This is an async method\n */\nasync function foo() { }\n\nexport default multiply;\n"
           },
           "errors": [],
           "name": "hello",
@@ -201,6 +201,43 @@
       "Sink"
     ]
   },
+  {
+    "description": "This is an async method",
+    "tags": [],
+    "loc": {
+      "start": {
+        "line": 40,
+        "column": 0
+      },
+      "end": {
+        "line": 42,
+        "column": 3
+      }
+    },
+    "context": {
+      "loc": {
+        "start": {
+          "line": 43,
+          "column": 0
+        },
+        "end": {
+          "line": 43,
+          "column": 24
+        }
+      },
+      "code": "/**\n * This function returns the number one.\n * @returns {Number} numberone\n */\nvar multiply = (a, b) => a * b;\n\n/**\n * This is a sink\n */\nclass Sink {\n  /**\n   * This is a property of the sink.\n   */\n  staticProp = 42;\n\n  /**\n   * Is it empty\n   */\n  empty() {\n    return 1;\n  }\n\n  /**\n   * This method says hello\n   */\n  static hello() {\n    return 'hello';\n  }\n\n  /**\n   * @param {number} height the height of the thing\n   * @param {number} width the width of the thing\n   */\n  constructor(height, width) {\n    this.height = height;\n    this.width = width;\n  }\n}\n\n/**\n * This is an async method\n */\nasync function foo() { }\n\nexport default multiply;\n"
+    },
+    "errors": [],
+    "name": "foo",
+    "kind": "function",
+    "members": {
+      "instance": [],
+      "static": []
+    },
+    "path": [
+      "foo"
+    ]
+  },
   {
     "description": "This function returns the number one.",
     "tags": [
@@ -235,7 +272,7 @@
           "column": 31
         }
       },
-      "code": "/**\n * This function returns the number one.\n * @returns {Number} numberone\n */\nvar multiply = (a, b) => a * b;\n\n/**\n * This is a sink\n */\nclass Sink {\n  /**\n   * This is a property of the sink.\n   */\n  staticProp = 42;\n\n  /**\n   * Is it empty\n   */\n  empty() {\n    return 1;\n  }\n\n  /**\n   * This method says hello\n   */\n  static hello() {\n    return 'hello';\n  }\n\n  /**\n   * @param {number} height the height of the thing\n   * @param {number} width the width of the thing\n   */\n  constructor(height, width) {\n    this.height = height;\n    this.width = width;\n  }\n}\n\nexport default multiply;\n"
+      "code": "/**\n * This function returns the number one.\n * @returns {Number} numberone\n */\nvar multiply = (a, b) => a * b;\n\n/**\n * This is a sink\n */\nclass Sink {\n  /**\n   * This is a property of the sink.\n   */\n  staticProp = 42;\n\n  /**\n   * Is it empty\n   */\n  empty() {\n    return 1;\n  }\n\n  /**\n   * This method says hello\n   */\n  static hello() {\n    return 'hello';\n  }\n\n  /**\n   * @param {number} height the height of the thing\n   * @param {number} width the width of the thing\n   */\n  constructor(height, width) {\n    this.height = height;\n    this.width = width;\n  }\n}\n\n/**\n * This is an async method\n */\nasync function foo() { }\n\nexport default multiply;\n"
     },
     "errors": [],
     "returns": [
@@ -360,7 +397,7 @@
           "column": 18
         }
       },
-      "code": "/**\n * This function returns the number one.\n * @returns {Number} numberone\n */\nvar multiply = (a, b) => a * b;\n\n/**\n * This is a sink\n */\nclass Sink {\n  /**\n   * This is a property of the sink.\n   */\n  staticProp = 42;\n\n  /**\n   * Is it empty\n   */\n  empty() {\n    return 1;\n  }\n\n  /**\n   * This method says hello\n   */\n  static hello() {\n    return 'hello';\n  }\n\n  /**\n   * @param {number} height the height of the thing\n   * @param {number} width the width of the thing\n   */\n  constructor(height, width) {\n    this.height = height;\n    this.width = width;\n  }\n}\n\nexport default multiply;\n"
+      "code": "/**\n * This function returns the number one.\n * @returns {Number} numberone\n */\nvar multiply = (a, b) => a * b;\n\n/**\n * This is a sink\n */\nclass Sink {\n  /**\n   * This is a property of the sink.\n   */\n  staticProp = 42;\n\n  /**\n   * Is it empty\n   */\n  empty() {\n    return 1;\n  }\n\n  /**\n   * This method says hello\n   */\n  static hello() {\n    return 'hello';\n  }\n\n  /**\n   * @param {number} height the height of the thing\n   * @param {number} width the width of the thing\n   */\n  constructor(height, width) {\n    this.height = height;\n    this.width = width;\n  }\n}\n\n/**\n * This is an async method\n */\nasync function foo() { }\n\nexport default multiply;\n"
     },
     "errors": [],
     "name": "staticProp",
diff --git a/test/fixture/es6-import.output.md b/test/fixture/es6-import.output.md
@@ -32,6 +32,12 @@ This method says hello
 
 
 
+# foo
+
+This is an async method
+
+
+
 # multiply
 
 This function returns the number one.
diff --git a/test/fixture/es6-import.output.md.json b/test/fixture/es6-import.output.md.json
@@ -397,6 +397,67 @@
         }
       ]
     },
+    {
+      "type": "root",
+      "children": [
+        {
+          "depth": 1,
+          "type": "heading",
+          "children": [
+            {
+              "type": "text",
+              "value": "foo"
+            }
+          ]
+        },
+        {
+          "type": "root",
+          "children": [
+            {
+              "type": "paragraph",
+              "children": [
+                {
+                  "type": "text",
+                  "value": "This is an async method",
+                  "position": {
+                    "start": {
+                      "line": 1,
+                      "column": 1
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 24
+                    },
+                    "indent": []
+                  }
+                }
+              ],
+              "position": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 24
+                },
+                "indent": []
+              }
+            }
+          ],
+          "position": {
+            "start": {
+              "line": 1,
+              "column": 1
+            },
+            "end": {
+              "line": 1,
+              "column": 24
+            }
+          }
+        }
+      ]
+    },
     {
       "type": "root",
       "children": [
diff --git a/test/fixture/es6.input.js b/test/fixture/es6.input.js
@@ -37,4 +37,9 @@ class Sink {
   }
 }
 
+/**
+ * This is an async method
+ */
+async function foo() { }
+
 export default multiply;
diff --git a/test/fixture/es6.output.custom.md b/test/fixture/es6.output.custom.md
@@ -32,6 +32,12 @@ This method says hello
 
 
 
+# foo
+
+This is an async method
+
+
+
 # multiply
 
 This function returns the number one.
diff --git a/test/fixture/es6.output.json b/test/fixture/es6.output.json
diff --git a/test/fixture/es6.output.md b/test/fixture/es6.output.md
diff --git a/test/fixture/es6.output.md.json b/test/fixture/es6.output.md.json
diff --git a/test/test.js b/test/test.js

Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,9 @@ class Sink {`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
	`40`	`+/**`
	`41`	`+ * This is an async method`
	`42`	`+ */`
	`43`	`+async function foo() { }`
	`44`	`+`
`40`	`45`	`export default multiply;`