Breaking: AST returns an object instead of an array.

BREAKING CHANGE: The documentation is no longer within Remark's AST.

Author: iwatakeshi

README.md

@@ -47,15 +47,19 @@ Example program:
 ```js
 // ...
 const xdoc = require('xdoc-parser');
-// Returns a Remark.js AST with an 'xdoc' property attached to each
-// child whose type is 'code'. Note that only the code blocks after
-// a heading, 'API', as well as any code block with
-// a language set to 'xdoc' would be parsed.
 const ast = xdoc(fs.readFileSync('...'));
 console.log(JSON.stringify(ast, null, 2));
 // ...
 ```
 
+In the example above, `xdoc()` will return an object containing `markdown` and `documentation`:
+```ts
+{
+  markdown: RemarkNode[],
+  documentation: Partial<DocumentationNode>
+}
+```
+
 You may also access the core parser class (or other classes) and simply parse the XDoc syntax if that's all you care for. For example:
 
 ```js

package-lock.json

@@ -19,17 +19,17 @@
     "@types/chai": "^4.1.4",
     "@types/lodash": "^4.14.116",
     "@types/mocha": "^5.2.5",
-    "@types/node": "^10.5.6",
+    "@types/node": "^10.7.0",
     "antlr4": "^4.7.1",
     "chai": "^4.1.2",
     "commitizen": "^2.10.1",
     "conventional-changelog-eslint": "^3.0.0",
     "cz-adapter-eslint": "^0.1.2",
     "mocha": "^5.2.0",
-    "semantic-release": "^15.9.5",
+    "semantic-release": "^15.9.8",
     "shelljs": "^0.8.2",
     "travis-deploy-once": "^5.0.2",
-    "ts-node": "^7.0.0",
+    "ts-node": "^7.0.1",
     "typescript": "^2.9.2"
   },
   "scripts": {

package.json

@@ -53,14 +53,16 @@ export default class XDocParser {
   }
 
   parse = () => {
-    return (new XDocCommentParser(this.source_))
-      .parse()
-      .filter(this.filter)
-      .map(this.parseMarkdown)
+    return {
+      markdown: (new XDocCommentParser(this.source))
+        .parse()
+        .filter(this.filter)
+        .map(this.parseMarkdown),
+      documentation: this.parseXDoc(this.source)
+    }
   }
 
   private parseMarkdown = (token: Token): RemarkNode => {
-    // console.log(marked.lexer(token.text, this.options.marked));
     let ast = remark()
       .data('settings', this.options.markdown.remark)
       .parse(token.text) as RemarkNode;
@@ -71,22 +73,24 @@ export default class XDocParser {
       if (node.type === 'code') {
         if (this.isAPI(ast.children[index - 1])) {
           if (!node.lang) node.lang = 'xdoc';
-          return this.parseXDoc(node)
+          return node;
         }
       }
       return node;
     })
     return ast;
   }
+
   private isAPI = (node) => {
     return node && node.type === "heading" && node.children[0].value.toLowerCase() === "api";
   }
-  private parseXDoc = (node) => {
-    const documentation = (new XDocASTGenerator(node.value)).generate();
-    node['xdoc'] = (new XDocASTVisitor(documentation, this.options.visitor)
+
+  private parseXDoc = (source: string) => {
+    const XDocRegex = /@(\w+)([^{[(\n]*)?([\{\[\(][\s\S]*[\}\]\)]([\s]*(=|-)>.*)?)?([\s]*-(.)*)?/gmi;
+    const documentation = (new XDocASTGenerator(source.match(XDocRegex).join('\n'))).generate();
+    return (new XDocASTVisitor(documentation, this.options.visitor)
       .visit()
     );
-    return node;
   }
 
   private filter = (token: Token) => {

src/XDocParser.ts

@@ -7,10 +7,6 @@ import { TagNode, DocumentationNode, createDocumentationNode, createBodyNode, cr
 const equal = chai.assert.deepEqual;
 const source = FS.readFileSync(`${process.cwd()}/test/markdown.comment.txt`, 'utf-8');
 const xdoc = (source: string) => (new XDocParser(source).parse());
-const getCode = () => xdoc(source).map(ast => {
-  let code = ast.children.filter(node => node.type === 'code')[0];
-  return code;
-})[0];
 
 const documentation = (annotations: TagNode[]): Partial<DocumentationNode> => createDocumentationNode(
   createBodyNode(
@@ -21,14 +17,10 @@ const documentation = (annotations: TagNode[]): Partial<DocumentationNode> => cr
 
 describe('XDoc Parser', () => {
   describe('parse markdown', () => {
-    describe('parse xdoc code block', () => {
-      it('shoud add an "xdoc" property to remark\'s markdown AST', () => {
-        let code = getCode();
-        chai.assert.exists(code['xdoc']);
-      });
+    describe('parse xdoc within markdown', () => {
 
       it('should parse @tag id', () => equal(
-        getCode()['xdoc'],
+        xdoc(source).documentation,
         documentation([
           createTagNode(
             createTagNameNode(