silentium-components 0.0.89 → 0.0.91

package/src/strings/Template.ts

@@ -1,10 +1,15 @@
 import {
+  ActualMessage,
   All,
   Applied,
   ConstructorType,
   DestroyableType,
   DestroyContainer,
   isDestroyable,
+  isMessage,
+  LateShared,
+  MaybeMessage,
+  Message,
   MessageType,
   Of,
   Rejections,
@@ -18,10 +23,28 @@ import { Record } from "../structures";
  * the template value will change
  */
 export function Template(
-  $src: MessageType<string> = Of(""),
-  $places: MessageType<Record<string, unknown>> = Of({}),
+  src: MaybeMessage<string> | ((t: TemplateImpl) => string) = "",
+  $places: MaybeMessage<Record<string, unknown>> = Of({}),
 ) {
-  return new TemplateImpl($src, $places);
+  const $src = LateShared<string>();
+  if (typeof src === "string" || isMessage(src)) {
+    $src.chain(ActualMessage(src));
+  }
+
+  const t = new TemplateImpl(
+    $src,
+    $places ? ActualMessage($places) : undefined,
+  );
+
+  if (typeof src === "function") {
+    $src.chain(
+      Message((r) => {
+        r(src(t));
+      }),
+    );
+  }
+
+  return t;
 }
 
 class TemplateImpl implements MessageType<string>, DestroyableType {
@@ -64,8 +87,9 @@ class TemplateImpl implements MessageType<string>, DestroyableType {
    * in concrete place Of template
    */
   public var(src: MessageType<string>) {
-    const places = Object.keys(this.vars).length;
-    const varName = `$var${places}`;
+    const hash =
+      Date.now().toString(36) + Math.random().toString(36).substring(2);
+    const varName = `$var${hash}`;
     if (isDestroyable(src)) {
       this.dc.add(src);
     }

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

@@ -1,29 +0,0 @@
-import { Of } from "silentium";
-import { expect, test, vi } from "vitest";
-
-import { Template } from "../strings/Template";
-import { Record } from "../structures";
-
-test("Template._main.test", () => {
-  const tpl = Template(
-    Of("<h1>$1</h1>"),
-    Record({
-      $1: Of("one value"),
-    }),
-  );
-  const g = vi.fn();
-  tpl.then(g);
-
-  expect(g).toHaveBeenLastCalledWith("<h1>one value</h1>");
-
-  const tpl2 = Template(
-    Of("<h2>$1</h2>"),
-    Record({
-      $1: Of("second value"),
-    }),
-  );
-  const g2 = vi.fn();
-  tpl2.then(g2);
-
-  expect(g2).toHaveBeenLastCalledWith("<h2>second value</h2>");
-});

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

@@ -1,13 +0,0 @@
-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.then(g);
-
-  expect(g).toHaveBeenLastCalledWith('<div class="greeting">Hello User</div>');
-});