✨ Give FunctionExpression names if possible (#14)

fisker · web-flow · commit c5574cee3fab · 2021-05-14T11:11:06.000+09:00
diff --git a/docs/api/ast-utils.md b/docs/api/ast-utils.md
@@ -160,6 +160,12 @@ Get the name and kind of a given function node.
 - `const foo = async () => {}`  ........... `async arrow function 'foo'`
 - `foo = () => {}`  ....................... `arrow function 'foo'`
 - `foo = async () => {}`  ................. `async arrow function 'foo'`
+- `const foo = function() {}`  ............ `function 'foo'`
+- `const foo = function* () {}`  .......... `generator function 'foo'`
+- `const foo = async function() {}`  ...... `async function 'foo'`
+- `foo = function() {}`  .................. `function 'foo'`
+- `foo = function* () {}`  ................ `generator function 'foo'`
+- `foo = async function() {}`  ............ `async function 'foo'`
 - `({ foo: function foo() {} })`  ......... `method 'foo'`
 - `({ foo: function() {} })`  ............. `method 'foo'`
 - `({ ['foo']: function() {} })`  ......... `method 'foo'`
diff --git a/src/get-function-name-with-kind.js b/src/get-function-name-with-kind.js
@@ -49,7 +49,10 @@ export function getFunctionNameWithKind(node) {
         }
     }
 
-    if (node.type === "ArrowFunctionExpression") {
+    if (
+        node.type === "ArrowFunctionExpression" ||
+        (node.type === "FunctionExpression" && node.id === null)
+    ) {
         if (
             parent.type === "VariableDeclarator" &&
             parent.id &&
diff --git a/test/get-function-name-with-kind.js b/test/get-function-name-with-kind.js
@@ -18,6 +18,17 @@ describe("The 'getFunctionNameWithKind' function", () => {
         "foo = async () => {}": "async arrow function 'foo'",
         "foo.bar = () => {}": "arrow function",
         "foo.bar = async () => {}": "async arrow function",
+        "const foo = function() {}": "function 'foo'",
+        "const foo = function* () {}": "generator function 'foo'",
+        "const foo = async function() {}": "async function 'foo'",
+        "foo = function() {}": "function 'foo'",
+        "foo = function* () {}": "generator function 'foo'",
+        "foo = async function() {}": "async function 'foo'",
+        "const foo = function bar() {}": "function 'bar'",
+        "foo = function bar() {}": "function 'bar'",
+        "foo.bar = function() {}": "function",
+        "foo.bar = function* () {}": "generator function",
+        "foo.bar = async function() {}": "async function",
         "({ foo: function foo() {} })": "method 'foo'",
         "({ foo: function() {} })": "method 'foo'",
         "({ ['foo']: function() {} })": "method 'foo'",

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,10 @@ export function getFunctionNameWithKind(node) {`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
`52`		`- if (node.type === "ArrowFunctionExpression") {`
	`52`	`+ if (`
	`53`	`+ node.type === "ArrowFunctionExpression" \|\|`
	`54`	`+ (node.type === "FunctionExpression" && node.id === null)`
	`55`	`+ ) {`
`53`	`56`	`if (`
`54`	`57`	`parent.type === "VariableDeclarator" &&`
`55`	`58`	`parent.id &&`