fix(function-tree): fix name extraction for functions (#970)

Use Function.name property if available. Support async functions and functions from shorthand syntax when extracting the name.
cerebral · Jun 21, 2017 · 73ce5de · 73ce5de
1 parent 629c364
commit 73ce5de
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/packages/node_modules/function-tree/src/staticTree.js b/packages/node_modules/function-tree/src/staticTree.js
@@ -2,8 +2,15 @@ import { Sequence, Parallel, Primitive } from './primitives'
 import { FunctionTreeError } from './errors'
 
 function getFunctionName(fn) {
+  if (fn.name) return fn.name
+
   let ret = fn.toString()
-  ret = ret.substr('function '.length)
+
+  let startNameMatch
+  if (ret.startsWith('async function')) startNameMatch = 'async function '
+  else if (ret.startsWith('function')) startNameMatch = 'function '
+
+  ret = ret.substr(startNameMatch ? startNameMatch.length : 0)
   ret = ret.substr(0, ret.indexOf('('))
 
   return ret

diff --git a/packages/node_modules/function-tree/src/staticTree.test.js b/packages/node_modules/function-tree/src/staticTree.test.js
@@ -5,12 +5,13 @@ import assert from 'assert'
 
 describe('StaticTree', () => {
   it('should create a static tree of an array', () => {
-    const tree = staticTree([function test() {}])
+    const tree = staticTree([function test() {}, { shortHand() {} }.shortHand])
 
-    assert.equal(tree.items.length, 1)
+    assert.equal(tree.items.length, 2)
     assert.equal(tree._functionTreePrimitive, true)
     assert.equal(tree.type, 'sequence')
     assert.equal(tree.items[0].name, 'test')
+    assert.equal(tree.items[1].name, 'shortHand')
     assert.equal(tree.items[0].functionIndex, 0)
     assert.ok(tree.items[0].function)
   })