fix: get function args error (#725)

midwayjs · Nov 19, 2020 · 7ec5317 · 7ec5317
1 parent 9697834
commit 7ec5317
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 3 deletions.
diff --git a/packages/decorator/src/util/index.ts b/packages/decorator/src/util/index.ts
@@ -75,7 +75,6 @@ export function sleep(sleepTime = 1000) {
 }
 
 const STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/gm;
-const ARGUMENT_NAMES = /([^\s,]+)/g;
 
 /**
  * get parameter name from function
@@ -85,8 +84,12 @@ export function getParamNames(func): string[] {
   const fnStr = func.toString().replace(STRIP_COMMENTS, '');
   let result = fnStr
     .slice(fnStr.indexOf('(') + 1, fnStr.indexOf(')'))
-    .match(ARGUMENT_NAMES);
-  if (result === null) {
+    .split(',')
+    .map(content => {
+      return content.trim().replace(/\s?=.*$/, '');
+    });
+
+  if (result.length === 1 && result[0] === '') {
     result = [];
   }
   return result;

diff --git a/packages/decorator/test/common/decoratorManager.test.ts b/packages/decorator/test/common/decoratorManager.test.ts
@@ -81,6 +81,18 @@ describe('/test/common/decoratorManager.test.ts', () => {
 
     args = getParamNames(() => {});
     assert(args.length === 0);
+
+    args = getParamNames((a) => {});
+    assert(args.length === 1);
+
+    args = getParamNames((a,b) => {});
+    assert(args.length === 2);
+
+    args = getParamNames((a, b=1) => {});
+    assert(args.length === 2);
+
+    args = getParamNames((a = 1, b =2, c) => {});
+    assert(args.length === 3);
   });
 
   it('should get attach data from method', () => {

diff --git a/packages/decorator/test/util/index.test.ts b/packages/decorator/test/util/index.test.ts
@@ -0,0 +1,40 @@
+import {
+  isAsyncFunction,
+  isClass,
+  isFunction,
+  isGeneratorFunction,
+  isMap,
+  isPromise,
+  isObject,
+  isNumber,
+  isSet,
+  isRegExp,
+  sleep,
+  isProxy
+} from '../../src/util';
+
+describe('/test/util/index.test.ts', () => {
+  it('should test util method', async () => {
+    expect(isAsyncFunction(async () => {
+    })).toBeTruthy();
+    expect(isClass(class A {
+    })).toBeTruthy();
+    expect(isFunction(() => {
+    })).toBeTruthy();
+    expect(isGeneratorFunction(function* () {
+    })).toBeTruthy();
+    expect(isMap(new Map())).toBeTruthy();
+    expect(isPromise(new Promise(() => {
+    }))).toBeTruthy();
+
+    expect(isObject({})).toBeTruthy();
+
+    expect(isNumber(2)).toBeTruthy();
+    expect(isSet(new Set())).toBeTruthy();
+    expect(isRegExp(/^a/)).toBeTruthy();
+    expect(isProxy(new Proxy({}, {}))).toBeTruthy();
+    const startTime = Date.now();
+    await sleep(500);
+    expect(Date.now() - startTime).toBeGreaterThanOrEqual(500);
+  });
+});