Fix data documentation to also work when data is method

nbbj-digital · Jun 13, 2019 · 53c3b7e · 53c3b7e
1 parent 4fc4a7d
commit 53c3b7e
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 13 deletions.
diff --git a/packages/parser/lib/helper.ts b/packages/parser/lib/helper.ts
@@ -67,6 +67,10 @@ export function getValueFromGenerate(node: any) {
 }
 
 export function computesFromStore(node: any): boolean {
+  if (node === undefined) {
+    return false
+  }
+
   let fromStore = false
   if (bt.isObjectMethod(node)) {
     fromStore = computesFromStore(node.body)
@@ -88,3 +92,15 @@ export function computesFromStore(node: any): boolean {
 
   return fromStore
 }
+
+export function getLiteralValue(node: bt.Node): string {
+  let data = ''
+  if (
+    bt.isStringLiteral(node) ||
+    bt.isBooleanLiteral(node) ||
+    bt.isNumericLiteral(node)
+  ) {
+    data = node.value.toString()
+  }
+  return data
+}
diff --git a/packages/parser/lib/parseJavascript.ts b/packages/parser/lib/parseJavascript.ts
@@ -112,6 +112,15 @@ export function parseJavascript(ast: bt.File, options: ParserOptions = {}) {
             properties.forEach(node => {
               const commentsRes: CommentResult = getComments(node)
               const isFromStore: boolean = computesFromStore(node)
+
+              /*let type = ''
+              if (bt.isObjectMethod(node)) {
+                if (bt.isReturnStatement(node.body.body[0])) {
+                  let hi = (node.body.body[0]
+                    .type as bt.ReturnStatement).argument.type.toString()
+                }
+              }*/
+
               // Collect only computed that have @vuese annotations
               if (commentsRes.vuese) {
                 const result: ComputedResult = {
@@ -124,7 +133,6 @@ export function parseJavascript(ast: bt.File, options: ParserOptions = {}) {
             })
           }
 
-          // Processing data
           if (
             onData &&
             isVueOption(path, 'data') &&
@@ -208,6 +216,7 @@ export function parseJavascript(ast: bt.File, options: ParserOptions = {}) {
           }
         },
         ObjectMethod(path: NodePath<bt.ObjectMethod>) {
+          const { onData } = options
           // @Component: functional component - `ctx.children` in the render function
           if (
             options.onSlot &&
@@ -216,6 +225,32 @@ export function parseJavascript(ast: bt.File, options: ParserOptions = {}) {
           ) {
             determineChildren(path, options.onSlot)
           }
+
+          // Data can be represented as a component or a method
+          if (onData && isVueOption(path, 'data')) {
+            path.node.body.body.forEach(body => {
+              if (bt.isReturnStatement(body)) {
+                const properties = (body.argument as bt.ObjectExpression).properties.filter(
+                  n => bt.isObjectMethod(n) || bt.isObjectProperty(n)
+                ) as (bt.ObjectProperty)[]
+
+                properties.forEach(node => {
+                  const commentsRes: CommentResult = getComments(node)
+                  // Collect only data that have @vuese annotations
+                  if (commentsRes.vuese) {
+                    const result: DataResult = {
+                      name: node.key.name,
+                      type: '',
+                      describe: commentsRes.default,
+                      default: ''
+                    }
+                    processDataValue(node.value, result)
+                    onData(result)
+                  }
+                })
+              }
+            })
+          }
         },
         CallExpression(path: NodePath<bt.CallExpression>) {
           const node = path.node

diff --git a/packages/parser/lib/processData.ts b/packages/parser/lib/processData.ts
@@ -1,4 +1,5 @@
 import * as bt from '@babel/types'
+import { getLiteralValue } from './helper'
 import { DataResult } from './index'
 
 export function processDataValue(dataValueNode: bt.Node, result: DataResult) {
@@ -54,15 +55,3 @@ function literalToType(literal: string) {
     .replace('Numeric', 'Number')
   return type
 }
-
-function getLiteralValue(node: bt.Node): string {
-  let data = ''
-  if (
-    bt.isStringLiteral(node) ||
-    bt.isBooleanLiteral(node) ||
-    bt.isNumericLiteral(node)
-  ) {
-    data = node.value.toString()
-  }
-  return data
-}