fix: allow woven of hierarchical structure

Fix #53
mgechev · Mar 2, 2018 · be529e3 · be529e3
1 parent c9b4345
commit be529e3
Show file tree

Hide file tree

Showing 8 changed files with 620 additions and 15 deletions.
diff --git a/demo/index.ts b/demo/index.ts
@@ -21,8 +21,7 @@ class CacheAspect {
   })
   before(meta: Metadata) {
     console.log(
-      `Inside CacheAspect.before for ${meta.className}.${meta.method
-        .name} with args ${meta.method.args.join(', ')}`
+      `Inside CacheAspect.before for ${meta.className}.${meta.method.name} with args ${meta.method.args.join(', ')}`
     );
   }
   @afterMethod({
@@ -35,8 +34,7 @@ class CacheAspect {
   })
   after(meta: Metadata) {
     console.log(
-      `Inside CacheAspect.after for ${meta.className}.${meta.method
-        .name} with args ${meta.method.args.join(', ')}`
+      `Inside CacheAspect.after for ${meta.className}.${meta.method.name} with args ${meta.method.args.join(', ')}`
     );
   }
 }

diff --git a/lib/src/core/pointcut.ts b/lib/src/core/pointcut.ts
@@ -3,20 +3,14 @@ import { Advice } from './advice';
 
 export class Pointcut {
   public jointPoints: JointPoint[];
-
   public advice: Advice;
-
   private _applications = new Set<Function>();
 
   public apply(fn: Function, woveMetadata: any) {
     if (this._applications.has(fn)) {
       return;
-    } else {
-      this._applications.add(fn);
     }
-    this.jointPoints.forEach(jp => {
-      let matches = jp.match(fn);
-      jp.wove({ fn, matches, woveMetadata }, this.advice);
-    });
+    this._applications.add(fn);
+    this.jointPoints.forEach(jp => jp.wove({ fn, matches: jp.match(fn), woveMetadata }, this.advice));
   }
 }
diff --git a/lib/src/core/wove.ts b/lib/src/core/wove.ts
@@ -1,7 +1,7 @@
 import { AspectRegistry, Targets } from './aspect';
 
 export function weave<TFunction extends Function>(target: TFunction, config?: any): TFunction {
-  if ((target as any).__woven__) {
+  if (target.hasOwnProperty('__woven__')) {
     return;
   }
 

diff --git a/lib/src/joint_points/method_call.ts b/lib/src/joint_points/method_call.ts
@@ -23,7 +23,7 @@ export class MethodCallJointPoint extends JointPoint {
         if (
           this.precondition.assert({
             classDefinition: target,
-            methodName: key,
+            methodName: key
           }) &&
           typeof descriptor.value === 'function'
         ) {