silentium-components 0.0.83 → 0.0.85

package/src/navigation/Router._firstMatch.test.ts

@@ -1,12 +1,6 @@
-import {
-  Applied,
-  Late,
-  Of,
-  Shared,
-  Tap,
-  TapMessage,
-} from "silentium";
+import { Applied, Late, Of, Shared } from "silentium";
 import { expect, test, vi } from "vitest";
+
 import { Router } from "../navigation/Router";
 
 const drop = (dropPart: string) => (value: string) => {
@@ -17,7 +11,7 @@ test("Router first matching route responds, not subsequent matches", () => {
   const $url = Late<string>("http://domain.com/page/general");
   const $urlPath = Shared(Applied($url, drop("http://domain.com")));
   const g = vi.fn();
-  $urlPath.pipe(Tap(g));
+  $urlPath.then(g);
 
   const firstRouteMock = vi.fn(() => Of("first-route-response"));
   const secondRouteMock = vi.fn(() => Of("second-route-response"));
@@ -27,17 +21,17 @@ test("Router first matching route responds, not subsequent matches", () => {
     Of([
       {
         pattern: "^/page/.*", // This matches /page/anything
-        message: TapMessage(firstRouteMock),
+        message: firstRouteMock,
       },
       {
         pattern: "^/page/specific$", // This also matches /page/specific
-        message: TapMessage(secondRouteMock),
+        message: secondRouteMock,
       },
     ]),
-    TapMessage(() => Of<string>("page/404.html")),
+    () => Of<string>("page/404.html"),
   );
   const g2 = vi.fn();
-  $router.pipe(Tap(g2));
+  $router.then(g2);
 
   // Initial URL should match first route
   expect(g2).toHaveBeenLastCalledWith("first-route-response");

package/src/navigation/Router._main.test.ts

@@ -1,12 +1,6 @@
-import {
-  Applied,
-  Late,
-  Of,
-  Shared,
-  Tap,
-  TapMessage,
-} from "silentium";
+import { Applied, Late, Of, Shared } from "silentium";
 import { expect, test, vi } from "vitest";
+
 import { Router } from "../navigation/Router";
 
 const drop = (dropPart: string) => (value: string) => {
@@ -17,24 +11,24 @@ test("Router._main.test", () => {
   const $url = Late<string>("http://domain.com/");
   const $urlPath = Shared(Applied($url, drop("http://domain.com")));
   const g = vi.fn();
-  $urlPath.pipe(Tap(g));
+  $urlPath.then(g);
 
   const $router = Router(
     $urlPath,
     Of([
       {
         pattern: "^/$",
-        message: TapMessage(() => Of("page/home.html")),
+        message: () => Of("page/home.html"),
       },
       {
         pattern: "/some/contacts",
-        message: TapMessage(() => Of("page/contacts.html")),
+        message: () => Of("page/contacts.html"),
       },
     ]),
-    TapMessage(() => Of<string>("page/404.html")),
+    () => Of<string>("page/404.html"),
   );
   const g2 = vi.fn();
-  $router.pipe(Tap(g2));
+  $router.then(g2);
 
   expect(g2).toHaveBeenLastCalledWith("page/home.html");
 

package/src/navigation/Router._nested.test.ts

@@ -1,11 +1,6 @@
-import {
-  LateShared,
-  Message,
-  Of,
-  Tap,
-  TapMessage,
-} from "silentium";
+import { LateShared, Message, Of } from "silentium";
 import { describe, expect, test } from "vitest";
+
 import { Detached } from "../behaviors/Detached";
 import { Router } from "../navigation/Router";
 
@@ -17,11 +12,11 @@ describe("Router._nested.test", () => {
       Of([
         {
           pattern: "^/$",
-          message: TapMessage(() => Of<string>("home")),
+          message: () => Of<string>("home"),
         },
         {
           pattern: "/admin.*",
-          message: TapMessage(() => {
+          message: () => {
             return Message((transport) => {
               // need to replace with detached component
               const localUrlSrc = Detached($url);
@@ -31,19 +26,19 @@ describe("Router._nested.test", () => {
                 Of([
                   {
                     pattern: "^/admin/articles$",
-                    message: TapMessage(() => Of("articles list")),
+                    message: () => Of("articles list"),
                   },
                   {
                     pattern: "^/admin/articles/create$",
-                    message: TapMessage(() => Of("articles create")),
+                    message: () => Of("articles create"),
                   },
                   {
                     pattern: "^/admin/articles/update$",
-                    message: TapMessage(() => Of("articles update")),
+                    message: () => Of("articles update"),
                   },
                   {
                     pattern: "^/admin/nested/.*$",
-                    message: TapMessage(() => {
+                    message: () => {
                       return Message((transport) => {
                         const localUrlSrc = Detached($url);
 
@@ -52,45 +47,39 @@ describe("Router._nested.test", () => {
                           Of([
                             {
                               pattern: "^/admin/nested/list$",
-                              message: TapMessage(() =>
-                                Of("admin nested list"),
-                              ),
+                              message: () => Of("admin nested list"),
                             },
                           ]),
-                          TapMessage(() =>
-                            Of<string>("admin nested not found"),
-                          ),
+                          () => Of<string>("admin nested not found"),
                         );
 
-                        r.pipe(transport);
+                        r.then(transport);
 
                         return function AdminDestroy() {
                           r.destroy();
                         };
                       });
-                    }),
+                    },
                   },
                 ]),
-                TapMessage(() => Of<string>("admin not found")),
+                () => Of<string>("admin not found"),
               );
 
-              r.pipe(transport);
+              r.then(transport);
 
               return function AdminDestroy() {
                 r.destroy();
               };
             });
-          }),
+          },
         },
       ]),
-      TapMessage(() => Of("not found")),
+      () => Of("not found"),
     );
     const d: string[] = [];
-    $router.pipe(
-      Tap((v) => {
-        d.push(v);
-      }),
-    );
+    $router.then((v) => {
+      d.push(v);
+    });
     const pd = () => d.join("\n");
 
     $url.use("/admin/articles");

package/src/navigation/Router.ts

@@ -1,66 +1,62 @@
 import {
   All,
+  ConstructorType,
   DestroyableType,
   DestroyContainer,
   Message,
   MessageType,
   Of,
-  Tap,
-  TapType,
 } from "silentium";
+
 import { RegexpMatched } from "../system";
 
 export interface Route<T> {
   pattern: string;
   patternFlags?: string;
-  message: TapType<void, MessageType<T>>;
+  message: ConstructorType<[], MessageType<T>>;
 }
 
 /**
  * Router component what will return template if url matches pattern
  * https://silentium-lab.github.io/silentium-components/#/navigation/router
  */
-export function Router<T = "string">(
+export function Router<T = string>(
   $url: MessageType<string>,
   $routes: MessageType<Route<T>[]>,
-  $default: TapType<void, MessageType<T>>,
+  $default: ConstructorType<[], MessageType<T>>,
 ): MessageType<T> & DestroyableType {
-  return Message<T>(function () {
+  return Message<T>(function RouterImpl(r) {
     const dc = DestroyContainer();
     const destructor = () => {
       dc.destroy();
     };
-    All($routes, $url).pipe(
-      Tap(([routes, url]) => {
-        destructor();
-        const $matches = All(
-          ...routes.map((r) =>
-            RegexpMatched(
-              Of(r.pattern),
-              Of(url),
-              r.patternFlags ? Of(r.patternFlags) : undefined,
-            ),
+    All($routes, $url).then(([routes, url]) => {
+      destructor();
+      const $matches = All(
+        ...routes.map((r) =>
+          RegexpMatched(
+            Of(r.pattern),
+            Of(url),
+            r.patternFlags ? Of(r.patternFlags) : undefined,
           ),
-        );
-        $matches.pipe(
-          Tap((matches) => {
-            const index = matches.findIndex((v) => v === true);
+        ),
+      );
+      $matches.then((matches) => {
+        const index = matches.findIndex((v) => v === true);
 
-            if (index === -1) {
-              const instance = $default.use();
-              dc.add(instance);
-              instance.pipe(this);
-            }
+        if (index === -1) {
+          const instance = $default();
+          dc.add(instance);
+          instance.then(r);
+        }
 
-            if (index > -1) {
-              const instance = routes[index].message.use();
-              dc.add(instance);
-              instance.pipe(this);
-            }
-          }),
-        );
-      }),
-    );
+        if (index > -1) {
+          const instance = routes[index].message();
+          dc.add(instance);
+          instance.then(r);
+        }
+      });
+    });
 
     return destructor;
   });

package/src/strings/Concatenated.test.ts

@@ -1,14 +1,15 @@
-import { Of, Tap } from "silentium";
-import { Concatenated } from "../strings/Concatenated";
+import { Of } from "silentium";
 import { expect, test, vi } from "vitest";
 
+import { Concatenated } from "../strings/Concatenated";
+
 test("Concatenated.test", () => {
   const $concatenated = Concatenated(
     [Of("one"), Of("two"), Of("three")],
     Of("-"),
   );
   const g = vi.fn();
-  $concatenated.pipe(Tap(g));
+  $concatenated.then(g);
 
   expect(g).toHaveBeenLastCalledWith("one-two-three");
 });

package/src/strings/Concatenated.ts

@@ -1,4 +1,4 @@
-import { All, Message, MessageType, Of, Tap } from "silentium";
+import { All, Message, MessageType, Of } from "silentium";
 
 /**
  * Join sources Of strings to one source
@@ -8,11 +8,9 @@ export function Concatenated(
   sources: MessageType<string>[],
   joinPartSrc: MessageType<string> = Of(""),
 ) {
-  return Message<string>(function () {
-    All(joinPartSrc, ...sources).pipe(
-      Tap(([joinPart, ...strings]) => {
-        this.use(strings.join(joinPart));
-      }),
-    );
+  return Message<string>(function ConcatenatedImpl(r) {
+    All(joinPartSrc, ...sources).then(([joinPart, ...strings]) => {
+      r(strings.join(joinPart));
+    });
   });
 }

package/src/strings/Template._main.test.ts

@@ -1,7 +1,8 @@
-import { Of, Tap } from "silentium";
+import { Of } from "silentium";
+import { expect, test, vi } from "vitest";
+
 import { Template } from "../strings/Template";
 import { Record } from "../structures";
-import { expect, test, vi } from "vitest";
 
 test("Template._main.test", () => {
   const tpl = Template(
@@ -11,7 +12,7 @@ test("Template._main.test", () => {
     }),
   );
   const g = vi.fn();
-  tpl.pipe(Tap(g));
+  tpl.then(g);
 
   expect(g).toHaveBeenLastCalledWith("<h1>one value</h1>");
 
@@ -22,7 +23,7 @@ test("Template._main.test", () => {
     }),
   );
   const g2 = vi.fn();
-  tpl2.pipe(Tap(g2));
+  tpl2.then(g2);
 
   expect(g2).toHaveBeenLastCalledWith("<h2>second value</h2>");
 });

package/src/strings/Template._place.test.ts

@@ -1,12 +1,13 @@
-import { Of, Tap } from "silentium";
-import { Template } from "../strings/Template";
+import { Of } from "silentium";
 import { expect, test, vi } from "vitest";
 
+import { Template } from "../strings/Template";
+
 test("Template._place.test", () => {
   const t = Template();
   t.template(`<div class="greeting">Hello ${t.var(Of("User"))}</div>`);
   const g = vi.fn();
-  t.pipe(Tap(g));
+  t.then(g);
 
   expect(g).toHaveBeenLastCalledWith('<div class="greeting">Hello User</div>');
 });

package/src/strings/Template.ts

@@ -1,13 +1,15 @@
 import {
   All,
   Applied,
+  ConstructorType,
   DestroyableType,
   DestroyContainer,
   isDestroyable,
   MessageType,
   Of,
-  TapType,
+  Rejections,
 } from "silentium";
+
 import { Record } from "../structures";
 
 /**
@@ -24,6 +26,7 @@ export function Template(
 
 class TemplateImpl implements MessageType<string>, DestroyableType {
   private dc = DestroyContainer();
+  private rejections = new Rejections();
   private vars: Record<string, MessageType> = {
     $TPL: Of("$TPL"),
   };
@@ -33,18 +36,22 @@ class TemplateImpl implements MessageType<string>, DestroyableType {
     private $places: MessageType<Record<string, unknown>> = Of({}),
   ) {}
 
-  public pipe(transport: TapType<string>): this {
+  public then(transport: ConstructorType<[string]>): this {
     const $vars = Record(this.vars);
     Applied(All(this.$src, this.$places, $vars), ([base, rules, vars]) => {
-      Object.entries(rules).forEach(([ph, val]) => {
-        base = base.replaceAll(ph, String(val));
-      });
-      Object.entries(vars).forEach(([ph, val]) => {
-        base = base.replaceAll(ph, String(val));
-      });
+      try {
+        Object.entries(rules).forEach(([ph, val]) => {
+          base = base.replaceAll(ph, String(val));
+        });
+        Object.entries(vars).forEach(([ph, val]) => {
+          base = base.replaceAll(ph, String(val));
+        });
+      } catch (e) {
+        this.rejections.reject(e);
+      }
 
       return base;
-    }).pipe(transport);
+    }).then(transport);
     return this;
   }
 
@@ -66,6 +73,11 @@ class TemplateImpl implements MessageType<string>, DestroyableType {
     return varName;
   }
 
+  public catch(rejected: ConstructorType<[unknown]>): this {
+    this.rejections.catch(rejected);
+    return this;
+  }
+
   public destroy(): this {
     this.dc.destroy();
     return this;

package/src/structures/HashTable.test.ts

@@ -1,12 +1,13 @@
-import { Late, Tap } from "silentium";
-import { HashTable } from "../structures/HashTable";
+import { Late } from "silentium";
 import { expect, test, vi } from "vitest";
 
+import { HashTable } from "../structures/HashTable";
+
 test("HashTable.test", () => {
   const $entry = Late<[string, string]>();
   const $hash = HashTable($entry);
   const g = vi.fn();
-  $hash.pipe(Tap(g));
+  $hash.then(g);
   $entry.use(["key-one", "value-one"]);
   $entry.use(["key-two", "value-two"]);
 

package/src/structures/HashTable.ts

@@ -1,4 +1,4 @@
-import { Message, MessageType, Tap } from "silentium";
+import { Message, MessageType } from "silentium";
 
 /**
  * By receiving a message with a key and value, collects a table
@@ -6,14 +6,12 @@ import { Message, MessageType, Tap } from "silentium";
  * https://silentium-lab.github.io/silentium-components/#/structures/hash-table
  */
 export function HashTable<T>($base: MessageType<[string, unknown]>) {
-  return Message<T>(function () {
+  return Message<T>(function HashTableImpl(r) {
     const record: Record<string, unknown> = {};
 
-    $base.pipe(
-      Tap(([key, value]) => {
-        record[key] = value;
-        this.use(record as T);
-      }),
-    );
+    $base.then(([key, value]) => {
+      record[key] = value;
+      r(record as T);
+    });
   });
 }

package/src/structures/Record._main.test.ts

@@ -1,5 +1,6 @@
-import { Late, Of, Tap } from "silentium";
+import { Late, Of } from "silentium";
 import { expect, test, vi } from "vitest";
+
 import { Record } from "./Record";
 
 test("Record._main.test", () => {
@@ -10,7 +11,7 @@ test("Record._main.test", () => {
     three: $three,
   });
   const g = vi.fn();
-  $record.pipe(Tap(g));
+  $record.then(g);
 
   expect(g).toHaveBeenLastCalledWith({
     one: "one",

package/src/structures/Record._mixed.test.ts

@@ -1,5 +1,6 @@
-import { Late, Tap } from "silentium";
+import { Late } from "silentium";
 import { expect, test, vi } from "vitest";
+
 import { Record } from "./Record";
 
 test("Record._mixed.test", () => {
@@ -10,7 +11,7 @@ test("Record._mixed.test", () => {
     three: $three,
   });
   const g = vi.fn();
-  $record.pipe(Tap(g));
+  $record.then(g);
 
   expect(g).toHaveBeenLastCalledWith({
     one: "one",

package/src/structures/Record.concatenated.test.ts

@@ -1,7 +1,8 @@
-import { Late, Of, Shared, Tap } from "silentium";
+import { Late, Of, Shared } from "silentium";
+import { expect, test, vi } from "vitest";
+
 import { Concatenated } from "../strings";
 import { Record } from "./Record";
-import { expect, test, vi } from "vitest";
 
 test("Record.concatenated.test", () => {
   const $three = Of<string>("three");
@@ -15,13 +16,11 @@ test("Record.concatenated.test", () => {
     }),
   );
   const g = vi.fn();
-  r.pipe(Tap(g));
+  r.then(g);
   let counter = 0;
-  r.pipe(
-    Tap(() => {
-      counter += 1;
-    }),
-  );
+  r.then(() => {
+    counter += 1;
+  });
 
   expect(g).toHaveBeenLastCalledWith({
     one: "one",

package/src/structures/Record.nested.test.ts

@@ -1,5 +1,6 @@
-import { Of, Tap } from "silentium";
+import { Of } from "silentium";
 import { expect, test, vi } from "vitest";
+
 import { Record } from "./Record";
 
 test("Record.nested.test", () => {
@@ -14,7 +15,7 @@ test("Record.nested.test", () => {
     }),
   });
   const g = vi.fn();
-  $record.pipe(Tap(g));
+  $record.then(g);
 
   expect(g).toHaveBeenLastCalledWith({
     one: "one",

package/src/structures/Record.ts

@@ -1,4 +1,4 @@
-import { All, isMessage, Message, MessageType, Of, Tap } from "silentium";
+import { ActualMessage, All, Message, MessageType } from "silentium";
 
 type UnWrap<T> = T extends MessageType<infer U> ? U : T;
 
@@ -7,21 +7,17 @@ type UnWrap<T> = T extends MessageType<infer U> ? U : T;
  * https://silentium-lab.github.io/silentium-components/#/structures/record
  */
 export function Record<T>(record: Record<string, T>) {
-  return Message<Record<string, UnWrap<T>>>(function () {
+  return Message<Record<string, UnWrap<T>>>(function RecordImpl(r) {
     const keys = Object.keys(record);
     keys.forEach((key) => {
-      if (!isMessage(record[key])) {
-        record[key] = Of(record[key]) as any;
-      }
+      record[key] = ActualMessage(record[key]) as any;
+    });
+    All(...(Object.values(record) as any)).then((entries) => {
+      const record: Record<string, any> = {};
+      entries.forEach((entry, index) => {
+        record[keys[index]] = entry;
+      });
+      r(record);
     });
-    All(...(Object.values(record) as any)).pipe(
-      Tap((entries) => {
-        const record: Record<string, any> = {};
-        entries.forEach((entry, index) => {
-          record[keys[index]] = entry;
-        });
-        this.use(record);
-      }),
-    );
   });
 }

package/src/system/RegexpMatch._group.test.ts

@@ -1,5 +1,6 @@
-import { Of, Tap } from "silentium";
+import { Of } from "silentium";
 import { expect, test, vi } from "vitest";
+
 import { Path } from "../behaviors";
 import { RegexpMatch } from "./RegexpMatch";
 
@@ -7,7 +8,7 @@ test("RegexpMatch._group.test", () => {
   const $url = Of<string>("http://domain.com/some/url/");
   const $matched = Path(RegexpMatch(Of("/(s\\w+)/"), $url), Of("1"));
   const g = vi.fn();
-  $matched.pipe(Tap(g));
+  $matched.then(g);
 
   expect(g).toHaveBeenLastCalledWith("some");
 });

package/src/system/RegexpMatch._main.test.ts

@@ -1,5 +1,6 @@
-import { Of, Tap } from "silentium";
+import { Of } from "silentium";
 import { expect, test, vi } from "vitest";
+
 import { Path } from "../behaviors";
 import { RegexpMatch } from "./RegexpMatch";
 
@@ -7,7 +8,7 @@ test("RegexpMatch._main.test", () => {
   const $url = Of<string>("http://domain.com/some/url/");
   const $matched = Path(RegexpMatch(Of("/(s\\w+)/"), $url), Of("0"));
   const g = vi.fn();
-  $matched.pipe(Tap(g));
+  $matched.then(g);
 
   expect(g).toHaveBeenLastCalledWith("/some/");
 });