silentium 0.0.183 → 0.0.185

package/src/components/Applied.test.ts

@@ -39,4 +39,14 @@ describe("Applied.test", () => {
 
     expect(g).not.toHaveBeenCalled();
   });
+
+  test("applier returns a message", () => {
+    const base = Of(2);
+    const applied = Applied(base, (x) => Of(x * 3));
+
+    const g = vi.fn();
+    applied.then(g);
+
+    expect(g).toBeCalledWith(6);
+  });
 });

package/src/components/Applied.ts

@@ -1,5 +1,7 @@
 import { ActualMessage } from "base/ActualMessage";
+import { DestroyContainer } from "base/DestroyContainer";
 import { Message } from "base/Message";
+import { isMessage } from "helpers/guards";
 import { ConstructorType } from "types/ConstructorType";
 import { MaybeMessage } from "types/MessageType";
 
@@ -9,13 +11,20 @@ import { MaybeMessage } from "types/MessageType";
  */
 export function Applied<const T, R>(
   base: MaybeMessage<T>,
-  applier: ConstructorType<[T], R>,
+  applier: ConstructorType<[T], MaybeMessage<R>>,
 ) {
   const $base = ActualMessage(base);
   return Message<R>(function AppliedImpl(resolve, reject) {
+    const dc = DestroyContainer();
     $base.catch(reject);
     $base.then((v) => {
-      resolve(applier(v));
+      const result = applier(v);
+      if (isMessage(result)) {
+        dc.destroy();
+        result.catch(reject).then(resolve);
+      } else {
+        resolve(result);
+      }
     });
   });
 }