feat: around hooks deprecate await option

src/declare.ts

@@ -259,3 +259,12 @@ export interface IHookOptions {
   // Whether to wait for the hook (if the return value of the hook is a promise)
   await?: boolean;
 }
+
+export interface IAroundHookOptions {
+  /**
+   * @deprecated AroundHook will always await the promise, it act as the union model.
+   *
+   * Whether to wait for the hook (if the return value of the hook is a promise)
+   */
+  await?: boolean;
+}

src/decorator.ts

@@ -12,6 +12,7 @@ import {
   IHookOptions,
   IAfterReturningAspectHookFunction,
   IAfterThrowingAspectHookFunction,
+  IAroundHookOptions,
 } from './declare';
 import { markAsAspect, markAsHook } from './helper';
 
@@ -239,7 +240,7 @@ export function After<ThisType = any, Args extends any[] = any, Result = any>(
 export function Around<ThisType = any, Args extends any[] = any, Result = any>(
   token: Token,
   method: MethodName,
-  options: IHookOptions = {},
+  options: IAroundHookOptions = {},
 ) {
   return <T extends Record<K, IAroundAspectHookFunction<ThisType, Args, Result>>, K extends MethodName>(
     target: T,

src/helper/compose.ts

@@ -16,7 +16,6 @@ export interface Composed<C> {
 
 export interface Middleware<C> {
   (ctx: Context<C>): Promise<void> | void;
-  awaitPromise?: boolean;
 }
 
 function dispatch<C>(
@@ -36,14 +35,10 @@ function dispatch<C>(
   if (idx < middlewareList.length) {
     const middleware = middlewareList[idx];
 
-    const t = middleware({
+    maybePromise = middleware({
       ...ctx,
       proceed: () => dispatch(middlewareList, idx + 1, stack, ctx),
     } as Context<C>);
-
-    if (middleware.awaitPromise) {
-      maybePromise = Promise.resolve(t);
-    }
   } else if (ctx.proceed) {
     maybePromise = ctx.proceed();
   }

src/helper/hook-helper.ts

@@ -146,9 +146,6 @@ export function createHookedFunction<ThisType, Args extends any[], Result>(
     function runAroundHooks(): Promise<void> | void {
       const hooks = aroundHooks.map((v) => {
         const fn = v.hook as Middleware<IAroundJoinPoint<ThisType, Args, Result>>;
-        if (v.awaitPromise) {
-          fn.awaitPromise = true;
-        }
         return fn;
       });
       const composed = compose<IAroundJoinPoint<ThisType, Args, Result>>(hooks);
@@ -396,7 +393,6 @@ function runOneHook<
   P extends IJoinPoint,
 >(hook: T, joinPoint: P, promise: Promise<any> | undefined): Promise<void> | undefined {
   if (hook.awaitPromise) {
-    // 如果要求await hook，如果之前有promise，直接用，不然创建Promise给下一个使用
     promise = promise || Promise.resolve();
     promise = promise.then(() => {
       return hook.hook(joinPoint);

test/helper/compose.test.ts

@@ -17,7 +17,6 @@ describe('di compose', () => {
       console.log(`middleware1 result: ${result}`);
       console.log(`middleware1 after: ${name}`);
     };
-    middleware1.awaitPromise = true;
 
     const middleware2: Middleware<ExampleContext> = async (ctx) => {
       const name = ctx.getName();
@@ -28,7 +27,6 @@ describe('di compose', () => {
       console.log(`middleware2 result: ${result}`);
       console.log(`middleware2 after: ${name}`);
     };
-    middleware2.awaitPromise = true;
     const all = compose<ExampleContext>([middleware1, middleware2]);
     let ret = undefined as any;
     const result = all({
@@ -86,7 +84,7 @@ describe('di compose', () => {
         return ret;
       },
     });
-    expect(result).toBeFalsy();
+    expect(result).toBeInstanceOf(Promise);
   });
   it('will throw error when call proceed twice', async () => {
     interface ExampleContext {

test/injector.test.ts

@@ -544,7 +544,6 @@ describe('test injector work', () => {
       // Async hook on async target
       injector.createHooks([
         {
-          awaitPromise: true,
           hook: async (joinPoint) => {
             joinPoint.proceed();
             const result = await joinPoint.getResult();