fix: parse single arg lambda shorthand

nikku · Mar 3, 2022 · d53f631 · d53f631
1 parent 988f8ce
commit d53f631
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/lib/annotation.js b/lib/annotation.js
@@ -43,7 +43,7 @@ export function annotate() {
 // of a nested class, too.
 
 var CONSTRUCTOR_ARGS = /constructor\s*[^(]*\(\s*([^)]*)\)/m;
-var FN_ARGS = /^(?:async\s+)?(?:function\s*)?[^(]*\(\s*([^)]*)\)/m;
+var FN_ARGS = /^(?:async\s+)?(?:function\s*[^(]*)?(?:\(\s*([^)]*)\)|(\w+))/m;
 var FN_ARG = /\/\*([^*]*)\*\//m;
 
 /**
@@ -64,8 +64,10 @@ export function parseAnnotations(fn) {
     return [];
   }
 
-  return match[1] && match[1].split(',').map(function(arg) {
-    match = arg.match(FN_ARG);
-    return match ? match[1].trim() : arg.trim();
+  var args = match[1] || match[2];
+
+  return args && args.split(',').map(function(arg) {
+    var argMatch = arg.match(FN_ARG);
+    return (argMatch && argMatch[1] || arg).trim();
   }) || [];
 }
diff --git a/test/annotation.spec.js b/test/annotation.spec.js
@@ -88,6 +88,16 @@ describe('annotation', function() {
           parseAnnotations((a, b) => a + b)
         ).to.eql([ 'a', 'b' ]);
 
+        expect(
+          parseAnnotations(a => a + 1)
+        ).to.eql([ 'a' ]);
+
+        expect(
+          parseAnnotations(a => {
+            return a + 1;
+          })
+        ).to.eql([ 'a' ]);
+
         expect(
           parseAnnotations(() => 1)
         ).to.eql([ ]);
@@ -103,6 +113,16 @@ describe('annotation', function() {
           parseAnnotations(async (a, b) => a + b)
         ).to.eql([ 'a', 'b' ]);
 
+        expect(
+          parseAnnotations(async a => a + 1)
+        ).to.eql([ 'a' ]);
+
+        expect(
+          parseAnnotations(async a => {
+            return a + 1;
+          })
+        ).to.eql([ 'a' ]);
+
         expect(
           parseAnnotations(async () => 1)
         ).to.eql([ ]);