silentium-components 0.0.83 → 0.0.85

package/src/system/RegexpMatch.ts

@@ -1,20 +1,21 @@
-import { All, Message, MessageType, Of, Tap } from "silentium";
+import { ActualMessage, All, MaybeMessage, Message, Of } from "silentium";
 
 /**
  * First match Of regexp
  * https://silentium-lab.github.io/silentium-components/#/system/regexp-matched
  */
 export function RegexpMatch(
-  patternSrc: MessageType<string>,
-  valueSrc: MessageType<string>,
-  flagsSrc: MessageType<string> = Of(""),
+  patternSrc: MaybeMessage<string>,
+  valueSrc: MaybeMessage<string>,
+  flagsSrc: MaybeMessage<string> = Of(""),
 ) {
-  return Message<string[]>(function () {
-    All(patternSrc, valueSrc, flagsSrc).pipe(
-      Tap(([pattern, value, flags]) => {
-        const result = new RegExp(pattern, flags).exec(value);
-        this.use(result ?? []);
-      }),
-    );
+  const $pattern = ActualMessage(patternSrc);
+  const $value = ActualMessage(valueSrc);
+  const $flags = ActualMessage(flagsSrc);
+  return Message<string[]>(function RegexpMatchImpl(r) {
+    All($pattern, $value, $flags).then(([pattern, value, flags]) => {
+      const result = new RegExp(pattern, flags).exec(value);
+      r(result ?? []);
+    });
   });
 }

package/src/system/RegexpMatched.test.ts

@@ -1,12 +1,13 @@
-import { Late, Of, Tap } from "silentium";
-import { RegexpMatched } from "../system/RegexpMatched";
+import { Late, Of } from "silentium";
 import { expect, test, vi } from "vitest";
 
+import { RegexpMatched } from "../system/RegexpMatched";
+
 test("RegexpMatched.test", () => {
   const $url = Late<string>("http://domain.com/some/url/");
   const $matched = RegexpMatched(Of("/some/url"), $url);
   const g = vi.fn();
-  $matched.pipe(Tap(g));
+  $matched.then(g);
 
   expect(g).toHaveBeenLastCalledWith(true);
 

package/src/system/RegexpMatched.ts

@@ -1,19 +1,20 @@
-import { All, Message, MessageType, Of, Tap } from "silentium";
+import { ActualMessage, All, MaybeMessage, Message, Of } from "silentium";
 
 /**
  * Boolean source what checks what string matches pattern
  * https://silentium-lab.github.io/silentium-components/#/system/regexp-matched
  */
 export function RegexpMatched(
-  patternSrc: MessageType<string>,
-  valueSrc: MessageType<string>,
-  flagsSrc: MessageType<string> = Of(""),
+  patternSrc: MaybeMessage<string>,
+  valueSrc: MaybeMessage<string>,
+  flagsSrc: MaybeMessage<string> = Of(""),
 ) {
-  return Message<boolean>(function () {
-    All(patternSrc, valueSrc, flagsSrc).pipe(
-      Tap(([pattern, value, flags]) => {
-        this.use(new RegExp(pattern, flags).test(value));
-      }),
-    );
+  const $pattern = ActualMessage(patternSrc);
+  const $value = ActualMessage(valueSrc);
+  const $flags = ActualMessage(flagsSrc);
+  return Message<boolean>(function RegexpMatchedImpl(r) {
+    All($pattern, $value, $flags).then(([pattern, value, flags]) => {
+      r(new RegExp(pattern, flags).test(value));
+    });
   });
 }

package/src/system/RegexpReplaced.test.ts

@@ -1,12 +1,13 @@
-import { Late, Of, Tap } from "silentium";
-import { RegexpReplaced } from "../system/RegexpReplaced";
+import { Late, Of } from "silentium";
 import { expect, test, vi } from "vitest";
 
+import { RegexpReplaced } from "../system/RegexpReplaced";
+
 test("RegexpReplaced.test", () => {
   const $url = Late<string>("http://domain.com/some/url/");
   const $matched = RegexpReplaced($url, Of("some/url/"), Of(""));
   const g = vi.fn();
-  $matched.pipe(Tap(g));
+  $matched.then(g);
 
   expect(g).toHaveBeenLastCalledWith("http://domain.com/");
 

package/src/system/RegexpReplaced.ts

@@ -1,4 +1,4 @@
-import { All, Message, MessageType, Of, Tap } from "silentium";
+import { All, Message, MessageType, Of } from "silentium";
 
 /**
  * Returns string replaced by regular expression pattern
@@ -10,13 +10,11 @@ export function RegexpReplaced(
   replaceValueSrc: MessageType<string>,
   flagsSrc: MessageType<string> = Of(""),
 ) {
-  return Message<string>(function () {
-    All(patternSrc, valueSrc, replaceValueSrc, flagsSrc).pipe(
-      Tap(([pattern, value, replaceValue, flags]) => {
-        this.use(
-          String(value).replace(new RegExp(pattern, flags), replaceValue),
-        );
-      }),
+  return Message<string>(function RegexpReplacedImpl(r) {
+    All(patternSrc, valueSrc, replaceValueSrc, flagsSrc).then(
+      ([pattern, value, replaceValue, flags]) => {
+        r(String(value).replace(new RegExp(pattern, flags), replaceValue));
+      },
     );
   });
 }

package/src/system/Set.test.ts

@@ -1,7 +1,8 @@
-import { Late, Of, Tap } from "silentium";
-import { Set } from "../system/Set";
+import { Late, Of } from "silentium";
 import { expect, test, vi } from "vitest";
 
+import { Set } from "../system/Set";
+
 test("Set.test", () => {
   const $value = Late<string>();
   const object = {
@@ -9,7 +10,7 @@ test("Set.test", () => {
   };
   const obj = Set(Of(object), Of("value"), $value);
   const g = vi.fn();
-  obj.pipe(Tap(g));
+  obj.then(g);
 
   expect(object.value).toBe("hello");
 

package/src/system/Set.ts

@@ -1,4 +1,4 @@
-import { All, Message, MessageType, Tap } from "silentium";
+import { ActualMessage, All, Message, MessageType } from "silentium";
 
 /**
  * Ability to mutate some object, helpful when integrate to procedure systems
@@ -9,12 +9,13 @@ export function Set<T extends Record<string, unknown>>(
   keySrc: MessageType<string>,
   valueSrc: MessageType<unknown>,
 ) {
-  return Message<T>(function () {
-    All(baseSrc, keySrc, valueSrc).pipe(
-      Tap(([base, key, value]) => {
-        (base as Record<string, unknown>)[key] = value;
-        this.use(base);
-      }),
-    );
+  const $base = ActualMessage(baseSrc);
+  const $key = ActualMessage(keySrc);
+  const $value = ActualMessage(valueSrc);
+  return Message<T>(function SetImpl(r) {
+    All($base, $key, $value).then(([base, key, value]) => {
+      (base as Record<string, unknown>)[key] = value;
+      r(base);
+    });
   });
 }

package/src/system/index.ts

@@ -1,4 +1,4 @@
+export * from "./RegexpMatch";
 export * from "./RegexpMatched";
 export * from "./RegexpReplaced";
-export * from "./RegexpMatch";
 export * from "./Set";

package/src/behaviors/Branch.dontRespondAfterRespond.test.ts

@@ -1,35 +0,0 @@
-import { Applied, Late, Of, Shared, Tap } from "silentium";
-import { expect, test, vi } from "vitest";
-import { Branch } from "../behaviors/Branch";
-
-test("Branch.dontRespondAfterRespond.test", () => {
-  const l = Late<number>(1);
-  const ti = Of<any>("then");
-  const branchI = Shared(
-    Branch(
-      Applied(l, (t) => t === 2),
-      ti,
-    ),
-    true,
-  );
-  const g = vi.fn();
-  branchI.pipe(Tap(g));
-
-  l.use(2);
-  expect(g).toHaveBeenLastCalledWith("then");
-
-  const g2 = vi.fn();
-  branchI.pipe(Tap(g2));
-  l.use(1);
-  expect(g2).not.toHaveBeenCalled();
-
-  const g3 = vi.fn();
-  branchI.pipe(Tap(g3));
-  l.use(2);
-  expect(g3).toHaveBeenLastCalledWith("then");
-
-  const g4 = vi.fn();
-  branchI.pipe(Tap(g4));
-  l.use(3);
-  expect(g4).not.toHaveBeenCalled();
-});

package/src/behaviors/Transaction.test.ts

@@ -1,44 +0,0 @@
-import { All, Applied, LateShared, Primitive } from "silentium";
-import { Transaction } from "../behaviors/Transaction";
-import { describe, expect, test } from "vitest";
-
-describe("Transaction.test", () => {
-  test("value inside transaction", () => {
-    const $base = LateShared(1);
-
-    const t = Transaction($base, ($b) => {
-      return Applied($b, (x) => x * 2);
-    });
-
-    expect(Primitive(t).primitiveWithException()).toBe(2);
-  });
-
-  test("value inside transaction", () => {
-    const $base = LateShared(1);
-    const $mult = LateShared(2);
-
-    const t = Transaction(
-      $base,
-      ($b, $m) => {
-        return Applied(All($b, $m), ([x, m]) => x * m);
-      },
-      $mult,
-    );
-
-    expect(Primitive(t).primitiveWithException()).toBe(2);
-
-    $base.use(2);
-
-    expect(Primitive(t).primitiveWithException()).toBe(4);
-
-    $base.use(3);
-    $mult.use(3);
-
-    expect(Primitive(t).primitiveWithException()).toBe(9);
-
-    // $mult is of value 3, hence result will be 12
-    $base.use(4);
-
-    expect(Primitive(t).primitiveWithException()).toBe(12);
-  });
-});

package/src/behaviors/Transaction.ts

@@ -1,42 +0,0 @@
-import {
-  ConstructorType,
-  DestroyableType,
-  LateShared,
-  Message,
-  MessageType,
-  Of,
-  Tap,
-} from "silentium";
-import { Detached } from "../behaviors/Detached";
-
-/**
- * Do something on message value.
- * Each message value will create new builder instance
- */
-export function Transaction<T, R = unknown>(
-  $base: MessageType<T>,
-  builder: ConstructorType<
-    [MessageType<T>, ...MessageType<any>[]],
-    MessageType<R>
-  >,
-  ...args: MessageType[]
-) {
-  return Message<R>(function () {
-    const $res = LateShared<R>();
-    const destructors: DestroyableType[] = [];
-
-    $base.pipe(
-      Tap((v) => {
-        const $msg = builder(Of(v), ...args.map((a) => Detached(a)));
-        destructors.push($msg as unknown as DestroyableType);
-        $msg.pipe($res);
-      }),
-    );
-    $res.pipe(this);
-
-    return () => {
-      destructors.forEach((d) => d?.destroy());
-      destructors.length = 0;
-    };
-  });
-}