feat: add aop (#640)

midwayjs · Sep 18, 2020 · c3e15b3 · c3e15b3
1 parent 26ee626
commit c3e15b3
Show file tree

Hide file tree

Showing 78 changed files with 1,211 additions and 489 deletions.
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
     "next": "sh scripts/publish.sh --npm-tag next",
     "release": "rm -f ./packages/.DS* && sh scripts/publish.sh",
     "bootstrap": "rm -f ./packages/.DS* && lerna bootstrap",
-    "clean": "lerna clean --yes && rm -rf ./packages/**/package-lock.json",
+    "clean": "lerna clean --yes && rm -rf ./packages/**/package-lock.json && rm -f package-lock.json",
     "build": "sh scripts/build.sh",
     "authors": "git log --format='%aN <%aE>' | sort -u > AUTHORS",
     "postinstall": "opencollective-postinstall",

diff --git a/packages/bootstrap/src/bootstrap.ts b/packages/bootstrap/src/bootstrap.ts
@@ -26,7 +26,7 @@ export class BootstrapStarter {
   }
 
   public async init() {
-    this.appDir =  this.globalOptions.baseDir;
+    this.appDir = this.globalOptions.baseDir;
     await Promise.all(
       this.getActions('initialize', {
         ...this.globalOptions,
@@ -37,15 +37,11 @@ export class BootstrapStarter {
   }
 
   public async run() {
-    await Promise.all(
-      this.getActions('run', {})
-    );
+    await Promise.all(this.getActions('run', {}));
   }
 
   public async stop() {
-    await Promise.all(
-      this.getActions('stop', {})
-    );
+    await Promise.all(this.getActions('stop', {}));
   }
 
   public getActions(action: string, args?): any[] {
@@ -93,14 +89,10 @@ export class Bootstrap {
 
   static async run() {
     await this.getStarter().init();
-    return this.getStarter().run().catch(
-      console.error
-    );
+    return this.getStarter().run().catch(console.error);
   }
 
   static async stop() {
-    return this.getStarter().stop().catch(
-      console.error
-    );
+    return this.getStarter().stop().catch(console.error);
   }
 }
diff --git a/packages/bootstrap/src/index.ts b/packages/bootstrap/src/index.ts
@@ -1 +1,5 @@
-export { isTypeScriptEnvironment, Bootstrap, BootstrapStarter } from './bootstrap';
+export {
+  isTypeScriptEnvironment,
+  Bootstrap,
+  BootstrapStarter,
+} from './bootstrap';
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -30,6 +30,7 @@
   "dependencies": {
     "@midwayjs/decorator": "^2.2.5",
     "@midwayjs/glob": "^1.0.2",
+    "class-transformer": "^0.3.1",
     "debug": "^4.1.1",
     "extend2": "^1.0.0",
     "is-type-of": "^1.2.1",
@@ -39,6 +40,7 @@
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",
     "lodash.template": "^4.4.0",
+    "picomatch": "^2.2.2",
     "reflect-metadata": "^0.1.13"
   },
   "author": "Harry Chen <czy88840616@gmail.com>",

diff --git a/packages/core/src/baseFramework.ts b/packages/core/src/baseFramework.ts
@@ -3,7 +3,8 @@ import {
   IMidwayApplication,
   IMidwayBootstrapOptions,
   IMidwayContainer,
-  IMidwayFramework, MidwayFrameworkType,
+  IMidwayFramework,
+  MidwayFrameworkType,
 } from './interface';
 import { ContainerLoader } from './';
 import { APPLICATION_KEY, CONFIG_KEY } from '@midwayjs/decorator';
@@ -95,23 +96,19 @@ export abstract class BaseFramework<T extends IConfigurationOptions>
     await this.containerLoader.stop();
   }
 
-  protected async beforeStop(): Promise<void> {
-  }
+  protected async beforeStop(): Promise<void> {}
 
   protected async beforeInitialize(
     options: Partial<IMidwayBootstrapOptions>
-  ): Promise<void> {
-  };
+  ): Promise<void> {}
 
   protected async beforeDirectoryLoad(
     options: Partial<IMidwayBootstrapOptions>
-  ): Promise<void> {
-  };
+  ): Promise<void> {}
 
   protected async afterDirectoryLoad(
     options: Partial<IMidwayBootstrapOptions>
-  ): Promise<void> {
-  };
+  ): Promise<void> {}
 
   protected abstract async afterInitialize(
     options: Partial<IMidwayBootstrapOptions>

diff --git a/packages/core/src/common/constants.ts b/packages/core/src/common/constants.ts
@@ -41,7 +41,7 @@ export const KEYS = {
   ASPECT_ELEMENT: 'aspect',
   AROUND_ELEMENT: 'around',
   EXPRESSION_ATTRIBUTE: 'expression',
-  EXECUTE_ATTRIBUTE: 'execute'
+  EXECUTE_ATTRIBUTE: 'execute',
 };
 
 export const VALUE_TYPE = {
@@ -52,5 +52,5 @@ export const VALUE_TYPE = {
   TEMPLATE: 'template',
   MANAGED: 'managed',
   OBJECT: 'object', // 仅仅在解析时使用
-  BOOLEAN: 'boolean'
+  BOOLEAN: 'boolean',
 };
diff --git a/packages/core/src/common/lodashWrap.ts b/packages/core/src/common/lodashWrap.ts
@@ -1,4 +1,3 @@
-
 import * as assign from 'lodash.assign';
 import * as get from 'lodash.get';
 import * as set from 'lodash.set';
@@ -8,12 +7,4 @@ import * as defaultsDeep from 'lodash.defaultsdeep';
 
 const isArray = Array.isArray;
 
-export {
-  assign,
-  set,
-  get,
-  isArray,
-  template,
-  cloneDeep,
-  defaultsDeep,
-};
+export { assign, set, get, isArray, template, cloneDeep, defaultsDeep };
diff --git a/packages/core/src/common/notFoundError.ts b/packages/core/src/common/notFoundError.ts
@@ -10,7 +10,9 @@ export class NotFoundError extends Error {
     this[NotFoundError.type] = NotFoundError.type;
   }
   updateErrorMsg(className: string): void {
-    const identifier = this.message.split(' is not valid in current context')[0];
+    const identifier = this.message.split(
+      ' is not valid in current context'
+    )[0];
     const msg = `${identifier} in class ${className} is not valid in current context`;
     this.message = msg;
   }

diff --git a/packages/core/src/common/reflectTool.ts b/packages/core/src/common/reflectTool.ts
@@ -64,7 +64,11 @@ export function recursiveGetPrototypeOf(target: any): any[] {
  * @param metadataKey metadata's key
  * @param target the target of metadataKey
  */
-export function recursiveGetMetadata(metadataKey: any, target: any, propertyKey?: string | symbol): ReflectResult[] {
+export function recursiveGetMetadata(
+  metadataKey: any,
+  target: any,
+  propertyKey?: string | symbol
+): ReflectResult[] {
   const metadatas: ReflectResult[] = [];
 
   // get metadata value of a metadata key on the prototype

diff --git a/packages/core/src/common/util.ts b/packages/core/src/common/util.ts
@@ -13,6 +13,7 @@ export const safeRequire = p => {
 };
 
 export const isPath = (p): boolean => {
+  // eslint-disable-next-line no-useless-escape
   if (/(^[\.\/])|:|\\/.test(p)) {
     return true;
   }

diff --git a/packages/core/src/context/applicationContext.ts b/packages/core/src/context/applicationContext.ts
@@ -8,7 +8,7 @@ import {
   IObjectDefinition,
   IObjectDefinitionRegistry,
   IObjectFactory,
-  ObjectDependencyTree
+  ObjectDependencyTree,
 } from '../interface';
 import { ObjectProperties } from '../definitions/properties';
 import { ManagedResolverFactory } from './managedResolverFactory';
@@ -17,7 +17,9 @@ import { parsePrefix, isPathEqual } from '../common/util';
 
 const PREFIX = '_id_default_';
 
-export class ObjectDefinitionRegistry extends Map implements IObjectDefinitionRegistry {
+export class ObjectDefinitionRegistry
+  extends Map
+  implements IObjectDefinitionRegistry {
   private singletonIds = [];
 
   get identifiers() {
@@ -49,7 +51,10 @@ export class ObjectDefinitionRegistry extends Map implements IObjectDefinitionRe
     return definitions;
   }
 
-  registerDefinition(identifier: ObjectIdentifier, definition: IObjectDefinition) {
+  registerDefinition(
+    identifier: ObjectIdentifier,
+    definition: IObjectDefinition
+  ) {
     if (definition.isSingletonScope()) {
       this.singletonIds.push(identifier);
     }
@@ -96,7 +101,8 @@ export class ObjectDefinitionRegistry extends Map implements IObjectDefinitionRe
   }
 }
 
-export class BaseApplicationContext implements IApplicationContext, IObjectFactory {
+export class BaseApplicationContext
+  implements IApplicationContext, IObjectFactory {
   protected readied = false;
   private _resolverFactory: ManagedResolverFactory = null;
   private _registry: IObjectDefinitionRegistry = null;
@@ -145,8 +151,7 @@ export class BaseApplicationContext implements IApplicationContext, IObjectFacto
   /**
    * 继承实现时需要调用super
    */
-  protected init(): void {
-  }
+  protected init(): void {}
 
   async stop(): Promise<void> {
     await this.getManagedResolverFactory().destroyCache();
@@ -159,8 +164,7 @@ export class BaseApplicationContext implements IApplicationContext, IObjectFacto
     this.readied = true;
   }
 
-  protected loadDefinitions(): void {
-  }
+  protected loadDefinitions(): void {}
 
   isAsync(identifier: ObjectIdentifier): boolean {
     if (this.registry.hasDefinition(identifier)) {
@@ -224,11 +228,16 @@ export class BaseApplicationContext implements IApplicationContext, IObjectFacto
    * @param {ObjectIdentifier} identifier
    * @param {IObjectDefinition} definition
    */
-  registerDefinition(identifier: ObjectIdentifier, definition: IObjectDefinition) {
+  registerDefinition(
+    identifier: ObjectIdentifier,
+    definition: IObjectDefinition
+  ) {
     if (!this.disableConflictCheck && this.registry.hasDefinition(identifier)) {
       const def = this.registry.getDefinition(identifier);
       if (!isPathEqual(definition.srcPath, def.srcPath)) {
-        throw new Error(`${identifier} path = ${definition.srcPath} is exist (${def.srcPath})!`);
+        throw new Error(
+          `${identifier} path = ${definition.srcPath} is exist (${def.srcPath})!`
+        );
       }
     }
     this.registry.registerDefinition(identifier, definition);
@@ -248,34 +257,53 @@ export class BaseApplicationContext implements IApplicationContext, IObjectFacto
    * register handler after instance create
    * @param fn
    */
-  afterEachCreated(fn: (ins: any, context: IApplicationContext, definition?: IObjectDefinition) => void) {
+  afterEachCreated(
+    fn: (
+      ins: any,
+      context: IApplicationContext,
+      definition?: IObjectDefinition
+    ) => void
+  ) {
     this.getManagedResolverFactory().afterEachCreated(fn);
   }
 
   /**
    * register handler before instance create
    * @param fn
    */
-  beforeEachCreated(fn: (Clzz: any, constructorArgs: any[], context: IApplicationContext) => void) {
+  beforeEachCreated(
+    fn: (
+      Clzz: any,
+      constructorArgs: any[],
+      context: IApplicationContext
+    ) => void
+  ) {
     this.getManagedResolverFactory().beforeEachCreated(fn);
   }
 
   protected createObjectDependencyTree(identifier, definition) {
     if (!this.dependencyMap.has(identifier)) {
-
       let constructorArgs = definition.constructorArgs || [];
-      constructorArgs = constructorArgs.map((ref) => {
-        return ref.name;
-      }).filter(name => {
-        return !!name;
-      });
-
-      const properties = (definition.properties && definition.properties.keys().map((key) => {
-        return definition.properties.get(key).name;
-      })) || [];
+      constructorArgs = constructorArgs
+        .map(ref => {
+          return ref.name;
+        })
+        .filter(name => {
+          return !!name;
+        });
+
+      const properties =
+        (definition.properties &&
+          definition.properties.keys().map(key => {
+            return definition.properties.get(key).name;
+          })) ||
+        [];
 
       this.dependencyMap.set(identifier, {
-        name: typeof definition.path !== 'string' ? definition.path.name : identifier,
+        name:
+          typeof definition.path !== 'string'
+            ? definition.path.name
+            : identifier,
         scope: definition.scope,
         constructorArgs,
         properties,