feat: ✨ Several yield are allowed in middleware

Author: remimd

cq/_core/middleware.py

@@ -19,7 +19,7 @@ def __stack(self) -> Iterator[Middleware[P, T]]:
         return iter(self.__middlewares)
 
     def add(self, *middlewares: Middleware[P, T]) -> Self:
-        self.__middlewares.extend(middlewares)
+        self.__middlewares.extend(reversed(middlewares))
         return self
 
     async def invoke(
@@ -44,12 +44,13 @@ async def wrapper(*args: P.args, **kwargs: P.kwargs) -> T:
             try:
                 await anext(generator)
 
-                try:
-                    value = await handler(*args, **kwargs)
-                except BaseException as exc:
-                    await generator.athrow(exc)
-                else:
-                    await generator.asend(value)
+                while True:
+                    try:
+                        value = await handler(*args, **kwargs)
+                    except BaseException as exc:
+                        await generator.athrow(exc)
+                    else:
+                        await generator.asend(value)
 
             except StopAsyncIteration:
                 ...

tests/core/test_middleware.py

@@ -65,6 +65,20 @@ async def handler() -> str:
         assert isinstance(record.result, ValueError)
         assert record.status == _Status.FAILED
 
+    async def test_invoke_with_multiple_yield_return_any(
+        self,
+        group: MiddlewareGroup[..., Any],
+        history: _HistoryMiddleware,
+    ) -> None:
+        async def handler() -> str:
+            return "I'm a handler..."
+
+        group.add(_exec_2_times_middleware, history)
+        await group.invoke(handler)
+
+        records = history.records
+        assert len(records) == 2
+
 
 class _Status(IntEnum):
     SUCCESS = 1
@@ -95,3 +109,8 @@ async def __call__(self, /, *args: Any, **kwargs: Any) -> MiddlewareResult[Any]:
             record = _Record(args, kwargs, result, _Status.SUCCESS)
 
         self.__records.append(record)
+
+
+async def _exec_2_times_middleware(*args: Any, **kwargs: Any) -> MiddlewareResult[Any]:
+    yield
+    yield