fixes #61: "joint point" should be "join point" (#62)

mgechev · Oct 8, 2018 · 06fdb29 · 06fdb29
1 parent 16a81e4
commit 06fdb29
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -90,7 +90,7 @@ ts-node demo/index.ts
 
 # API
 
-The library offers the following combinations of advices and joint points:
+The library offers the following combinations of advices and join points:
 
 ## Method calls
 
@@ -185,7 +185,7 @@ Here's a UML class diagram which shows the relations between the individual abst
     - [x] Throwing
     - [x] Returning
   - [x] Around
-- [x] Implement the following joint points:
+- [x] Implement the following join points:
   - [x] Method execution
   - [x] Static method execution
   - [x] Filed get

diff --git a/lib/index.ts b/lib/index.ts
@@ -1,4 +1,4 @@
-import {MethodSelector, MemberSelector} from './src/joint_points/selectors';
+import {MethodSelector, MemberSelector} from './src/join_points/selectors';
 import {
   BeforeAdvice,
   AroundAdvice,
@@ -7,11 +7,11 @@ import {
 
   AsyncOnThrowAdvice,
 } from './src/advices';
-import {makeMethodCallAdviceDecorator, makeStaticMethodAdviceDecorator} from './src/joint_points';
-import {makeFieldGetAdviceDecorator, makeFieldSetAdviceDecorator} from './src/joint_points';
+import {makeMethodCallAdviceDecorator, makeStaticMethodAdviceDecorator} from './src/join_points';
+import {makeFieldGetAdviceDecorator, makeFieldSetAdviceDecorator} from './src/join_points';
 
 export {Wove, Metadata, MethodMetadata, AspectRegistry as _AspectRegistry, Targets as _Targets} from './src/core';
-export {MemberPrecondition} from './src/joint_points';
+export {MemberPrecondition} from './src/join_points';
 
 export const beforeMethod = makeMethodCallAdviceDecorator(BeforeAdvice);
 export const afterMethod = makeMethodCallAdviceDecorator(AfterAdvice);

diff --git a/lib/src/core.ts b/lib/src/core.ts
@@ -1,6 +1,6 @@
 export * from './core/advice';
 export * from './core/aspect';
-export * from './core/joint_point';
+export * from './core/join_point';
 export * from './core/metadata';
 export * from './core/pointcut';
 export * from './core/wove';

diff --git a/lib/src/core/joint_point.ts → lib/src/core/join_point.ts b/lib/src/core/joint_point.ts → lib/src/core/join_point.ts
diff --git a/lib/src/core/pointcut.ts b/lib/src/core/pointcut.ts
@@ -1,8 +1,8 @@
-import { JointPoint } from './joint_point';
+import { JointPoint } from './join_point';
 import { Advice } from './advice';
 
 export class Pointcut {
-  public jointPoints: JointPoint[];
+  public joinPoints: JointPoint[];
   public advice: Advice;
   private _applications = new Set<Function>();
 
@@ -11,6 +11,6 @@ export class Pointcut {
       return;
     }
     this._applications.add(fn);
-    this.jointPoints.forEach(jp => jp.wove({ fn, matches: jp.match(fn), woveMetadata }, this.advice));
+    this.joinPoints.forEach(jp => jp.wove({ fn, matches: jp.match(fn), woveMetadata }, this.advice));
   }
 }
diff --git a/lib/src/join_points.ts b/lib/src/join_points.ts
@@ -0,0 +1,7 @@
+export * from './join_points/preconditions';
+export * from './join_points/selectors';
+
+export * from './join_points/method_call';
+export * from './join_points/accessor_use';
+export * from './join_points/static_method';
+
diff --git a/lib/src/joint_points/accessor_use.ts → lib/src/join_points/accessor_use.ts b/lib/src/joint_points/accessor_use.ts → lib/src/join_points/accessor_use.ts
@@ -1,4 +1,4 @@
-import { JointPoint, Precondition } from '../core/joint_point';
+import { JointPoint, Precondition } from '../core/join_point';
 import { Advice } from '../core/advice';
 import { Pointcut } from '../core/pointcut';
 import { AspectRegistry, Targets, Aspect } from '../core/aspect';
@@ -52,12 +52,12 @@ export class AccessorJointPoint extends JointPoint {
 export function makeFieldGetAdviceDecorator(constr: new (...args: any[]) => Advice) {
   return function(...selectors: MemberSelector[]): MethodDecorator {
     return function<T>(target: Object, prop: string | symbol, descriptor: TypedPropertyDescriptor<T>) {
-      const jointpoints = selectors.map(selector => {
+      const joinpoints = selectors.map(selector => {
         return new AccessorJointPoint(new MemberPrecondition(selector), 'get');
       });
       const pointcut = new Pointcut();
       pointcut.advice = <Advice>new constr(target, descriptor.value);
-      pointcut.jointPoints = jointpoints;
+      pointcut.joinPoints = joinpoints;
       const aspectName = target.constructor.name;
       const aspect = AspectRegistry.get(aspectName) || new Aspect();
       aspect.pointcuts.push(pointcut);
@@ -70,12 +70,12 @@ export function makeFieldGetAdviceDecorator(constr: new (...args: any[]) => Advi
 export function makeFieldSetAdviceDecorator(constr: new (...args: any[]) => Advice) {
   return function(...selectors: MemberSelector[]): MethodDecorator {
     return function<T>(target: Object, prop: string | symbol, descriptor: TypedPropertyDescriptor<T>) {
-      const jointpoints = selectors.map(selector => {
+      const joinpoints = selectors.map(selector => {
         return new AccessorJointPoint(new MemberPrecondition(selector), 'set');
       });
       const pointcut = new Pointcut();
       pointcut.advice = <Advice>new constr(target, descriptor.value);
-      pointcut.jointPoints = jointpoints;
+      pointcut.joinPoints = joinpoints;
       const aspectName = target.constructor.name;
       const aspect = AspectRegistry.get(aspectName) || new Aspect();
       aspect.pointcuts.push(pointcut);

diff --git a/lib/src/joint_points/method_call.ts → lib/src/join_points/method_call.ts b/lib/src/joint_points/method_call.ts → lib/src/join_points/method_call.ts
@@ -1,4 +1,4 @@
-import { Precondition, JointPoint } from '../core/joint_point';
+import { Precondition, JointPoint } from '../core/join_point';
 import { Advice } from '../core/advice';
 import { Pointcut } from '../core/pointcut';
 import { AspectRegistry, Targets, Aspect } from '../core/aspect';
@@ -50,12 +50,12 @@ export class MethodCallJointPoint extends JointPoint {
 export function makeMethodCallAdviceDecorator(constr: any) {
   return function(...selectors: MethodSelector[]): MethodDecorator {
     return function<T>(target: Object, prop: symbol | string, descriptor: TypedPropertyDescriptor<T>) {
-      let jointpoints = selectors.map(selector => {
+      let joinpoints = selectors.map(selector => {
         return new MethodCallJointPoint(new MethodPrecondition(selector));
       });
       let pointcut = new Pointcut();
       pointcut.advice = <Advice>new constr(target, descriptor.value);
-      pointcut.jointPoints = jointpoints;
+      pointcut.joinPoints = joinpoints;
       let aspectName = target.constructor.name;
       let aspect = AspectRegistry.get(aspectName) || new Aspect();
       aspect.pointcuts.push(pointcut);

diff --git a/lib/src/joint_points/preconditions.ts → lib/src/join_points/preconditions.ts b/lib/src/joint_points/preconditions.ts → lib/src/join_points/preconditions.ts
@@ -1,4 +1,4 @@
-import { Precondition } from '../core/joint_point';
+import { Precondition } from '../core/join_point';
 import { MethodSelector, MemberSelector } from './selectors';
 import { weave } from '../core/wove';
 

diff --git a/lib/src/joint_points/selectors.ts → lib/src/join_points/selectors.ts b/lib/src/joint_points/selectors.ts → lib/src/join_points/selectors.ts
diff --git a/lib/src/joint_points/static_method.ts → lib/src/join_points/static_method.ts b/lib/src/joint_points/static_method.ts → lib/src/join_points/static_method.ts
@@ -1,4 +1,4 @@
-import { Precondition, JointPoint } from '../core/joint_point';
+import { Precondition, JointPoint } from '../core/join_point';
 import { Advice } from '../core/advice';
 import { Pointcut } from '../core/pointcut';
 import { AspectRegistry, Targets, Aspect } from '../core/aspect';
@@ -43,12 +43,12 @@ export class StaticMethodJointPoint extends JointPoint {
 export function makeStaticMethodAdviceDecorator(constr: any) {
   return function(...selectors: MethodSelector[]): MethodDecorator {
     return function<T>(target: Object, prop: symbol | string, descriptor: TypedPropertyDescriptor<T>) {
-      let jointpoints = selectors.map(selector => {
+      let joinpoints = selectors.map(selector => {
         return new StaticMethodJointPoint(new MethodPrecondition(selector));
       });
       let pointcut = new Pointcut();
       pointcut.advice = <Advice>new constr(target, descriptor.value);
-      pointcut.jointPoints = jointpoints;
+      pointcut.joinPoints = joinpoints;
       let aspectName = target.constructor.name;
       let aspect = AspectRegistry.get(aspectName) || new Aspect();
       aspect.pointcuts.push(pointcut);

diff --git a/lib/src/joint_points.ts b/lib/src/joint_points.ts
diff --git a/package.json b/package.json
@@ -22,7 +22,8 @@
     "javascript",
     "decorators",
     "pointcut",
-    "joint point"
+    "join point",
+    "joinpoint"
   ],
   "author": "Minko Gechev <mgechev@gmail.com>",
   "license": "MIT",

diff --git a/test/core/pointcut.spec.ts b/test/core/pointcut.spec.ts
@@ -34,7 +34,7 @@ describe('Pointcut', () => {
 
     jp2 = new SimpleJP(new SimplePrecondition());
     jp2.precondition = new SimplePrecondition();
-    pc.jointPoints = [jp1, jp2];
+    pc.joinPoints = [jp1, jp2];
   });
   it('Match should be invoked', done => {
     let bak = jp1.match;

diff --git a/test/core/preconditions.spec.ts b/test/core/preconditions.spec.ts
@@ -1,5 +1,5 @@
-import { MemberSelector } from './../../lib/src/joint_points/selectors';
-import { MemberPrecondition } from './../../lib/src/joint_points/preconditions';
+import { MemberSelector } from './../../lib/src/join_points/selectors';
+import { MemberPrecondition } from './../../lib/src/join_points/preconditions';
 
 import { expect } from 'chai';