Fix parsing of some parameter formats in argscheck.checkArgs (#200)

apache · May 2, 2019 · f0dfd36 · f0dfd36
1 parent e1b2a49
commit f0dfd36
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/common/argscheck.js b/src/common/argscheck.js
@@ -33,7 +33,7 @@ var typeMap = {
 };
 
 function extractParamName (callee, argIndex) {
-    return (/.*?\((.*?)\)/).exec(callee)[1].split(', ')[argIndex];
+    return (/\(\s*([^)]*?)\s*\)/).exec(callee)[1].split(/\s*,\s*/)[argIndex];
 }
 
 function checkArgs (spec, functionName, args, opt_callee) {

diff --git a/test/test.argscheck.js b/test/test.argscheck.js
@@ -78,4 +78,22 @@ describe('argscheck', function () {
         argscheck.enableChecks = false;
         testFunc();
     });
+    it('Test#012 : should be able to extract from all kinds of parameter formats', () => {
+        const check = args => argscheck.checkArgs('ss', 'testFn', args);
+
+        function sparse (
+            a,
+            b
+        ) { check(arguments); }
+        expect(() => sparse(null, '')).toThrowError(/parameter "a"/);
+        expect(() => sparse('', null)).toThrowError(/parameter "b"/);
+
+        // eslint-disable-next-line comma-spacing
+        function dense (a,b) { check(arguments); }
+        expect(() => dense('', null)).toThrowError(/parameter "b"/);
+
+        // eslint-disable-next-line comma-spacing, space-in-parens
+        function funky ( a ,b ) { check(arguments); }
+        expect(() => funky(null, '')).toThrowError(/parameter "a"/);
+    });
 });