patron-oop 1.34.0 → 1.36.0

package/src/Guest/GuestCast.ts

@@ -3,6 +3,7 @@ import {
   MaybeDisposableType,
 } from "./GuestDisposable";
 import { give, GiveOptions, GuestType } from "./Guest";
+import { PoolAwareOptions } from "../Patron/PatronOnce";
 
 /**
  * @url https://kosukhin.github.io/patron.site/#/guest/guest-cast
@@ -24,7 +25,13 @@ export class GuestCast<T> implements GuestDisposableType<T> {
   }
 
   public give(value: T, options?: GiveOptions): this {
-    give(value, this.targetGuest, options);
+    give(value, this.targetGuest, {
+      ...options,
+      data: {
+        ...(options?.data ?? {}),
+        castedGuest: (options?.data as PoolAwareOptions)?.castedGuest ?? this,
+      }
+    });
     return this;
   }
 

package/src/Patron/PatronOnce.sourceEmpty.test.ts

@@ -0,0 +1,35 @@
+import { afterEach, beforeEach, expect, test, vi } from "vitest";
+import { PatronOnce } from "./PatronOnce";
+import { SourceEmpty } from "../Source/SourceEmpty";
+
+beforeEach(() => {
+  vi.useFakeTimers({ shouldAdvanceTime: true });
+});
+
+afterEach(() => {
+  vi.runOnlyPendingTimers();
+  vi.useRealTimers();
+});
+
+const wait = (ms: number) => new Promise(resolve => {
+  setTimeout(() => { resolve(1) }, ms);
+})
+
+test("PatronOnce.sourceEmpty.test", async () => {
+  const source = new SourceEmpty();
+  let calls = 0;
+  const patron = new PatronOnce((v) => {
+    calls += 1;
+  });
+  source.value(patron);
+
+  await wait(10);
+  source.give(22);
+  await wait(10);
+  source.give(32);
+  await wait(10);
+  source.give(42);
+  await wait(10);
+
+  expect(calls).toBe(1);
+});

package/src/Patron/PatronOnce.test.ts

@@ -1,17 +1,35 @@
-import { expect, test } from "vitest";
-import { PatronOnce } from "./PatronOnce";
+import { afterEach, beforeEach, expect, test, vi } from "vitest";
 import { Source } from "../Source/Source";
+import { PatronOnce } from "./PatronOnce";
+
+beforeEach(() => {
+  vi.useFakeTimers({ shouldAdvanceTime: true });
+});
+
+afterEach(() => {
+  vi.runOnlyPendingTimers();
+  vi.useRealTimers();
+});
+
+const wait = (ms: number) => new Promise(resolve => {
+  setTimeout(() => { resolve(1) }, ms);
+})
 
-test("PatronOnce.test", () => {
-  const source = new Source(42);
+test("PatronOnce.test", async () => {
+  const source = new Source(12);
   let calls = 0;
-  const patron = new PatronOnce(() => {
+  const patron = new PatronOnce((v) => {
     calls += 1;
   });
   source.value(patron);
+
+  await wait(10);
   source.give(22);
-  source.give(22);
-  source.give(22);
+  await wait(10);
+  source.give(32);
+  await wait(10);
+  source.give(42);
+  await wait(10);
 
   expect(calls).toBe(1);
 });

package/src/Patron/PatronOnce.ts

@@ -1,12 +1,13 @@
 import { PoolType } from "./PatronPool";
-import { give, GuestType, GiveOptions } from "../Guest/Guest";
+import { give, GuestType, GiveOptions, GuestObjectType } from "../Guest/Guest";
 import {
   GuestDisposableType,
   MaybeDisposableType,
 } from "../Guest/GuestDisposable";
 
-type PoolAware = {
+export type PoolAwareOptions = {
   pool?: PoolType;
+  castedGuest?: GuestObjectType;
 };
 
 /**
@@ -25,9 +26,10 @@ export class PatronOnce<T> implements GuestDisposableType<T> {
     if (!this.received) {
       give(value, this.baseGuest, options);
     }
-    const data = options?.data as PoolAware;
+    const data = options?.data as PoolAwareOptions;
+
     if (data?.pool) {
-      data.pool.remove(this);
+      data.pool.remove(data?.castedGuest ?? this);
     }
     return this;
   }

package/src/Source/SourceEmpty.ts

@@ -11,9 +11,9 @@ export class SourceEmpty<T> implements SourceType<T> {
 
   public value(guest: GuestType<T>) {
     this.baseSource.value(
-      new GuestCast(guest as GuestType, (value) => {
+      new GuestCast(guest as GuestType, (value, options) => {
         if (value !== null) {
-          give(value, guest);
+          give(value, guest, options);
         }
       }),
     );

package/src/index.ts

@@ -5,7 +5,7 @@ export * from "./Guest/GuestAwareRace";
 export * from "./Guest/GuestAwareActive";
 export * from "./Guest/Guest";
 export * from "./Guest/GuestCast";
-export * from "./Guest/GuestChain";
+export * from "./Guest/GuestAwareAll";
 export * from "./Guest/GuestPool";
 export * from "./Guest/GuestSync";
 export * from "./Guest/GuestObject";

package/examples/elegant_objects.html

@@ -1,118 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <title>Document</title>
-</head>
-<body>
-<h1>Elegant Objects</h1>
-<p>Композиция объектов описывает поведение</p>
-<p>Умножение: num1 * num2 = result</p>
-<div>
-    <label>
-        num1:
-        <input type="number" class="input-1"/>
-    </label>
-</div>
-<div>
-    <label>
-        num2:
-        <input type="number" class="input-2"/>
-    </label>
-</div>
-<div>result = <b class="result"></b></div>
-<script type="module">
-  import 'https://cdn.jsdelivr.net/npm/patron-oop@1.8.0/dist/patron.min.js';
-
-  const {
-    Patron,
-    Source,
-    GuestChain,
-    GuestCast,
-    GuestInTheMiddle,
-  } = window.GUEST_LIBRARY;
-
-  class TextInDocument {
-    constructor(selector) {
-      this.element = document.querySelector(selector);
-    }
-
-    receive(value) {
-      this.element.innerText = value;
-    }
-  }
-
-  class Input {
-    constructor(source, selector) {
-      this.source = source;
-      const el = document.querySelector(selector);
-      this.source.value(
-          new Patron((value) => {
-            el.value = value;
-          }),
-      );
-      el.addEventListener('keyup', (e) => {
-        this.give(e.target.value);
-      });
-      el.addEventListener('change', (e) => {
-        this.give(e.target.value);
-      });
-    }
-
-    receiving(guest) {
-      this.source.value(guest);
-      return this;
-    }
-
-    receive(value) {
-      this.source.give(value);
-      return this;
-    }
-  }
-
-  class NumberOf {
-    constructor(source) {
-      this.source = source;
-    }
-
-    number(guest) {
-      this.source.value(guest);
-      return this;
-    }
-
-    receive(value) {
-      this.source.give(value);
-    }
-  }
-
-  class Mul {
-    constructor(num1, num2) {
-      this.num1 = num1;
-      this.num2 = num2;
-    }
-
-    result(guest) {
-      const chain = new GuestChain();
-      this.num1.number(new GuestCast(guest, chain.receiveKey('num1')));
-      this.num2.number(new GuestCast(guest, chain.receiveKey('num2')));
-      chain.result(
-          new GuestInTheMiddle(guest, ({num1, num2}) => {
-            guest.give(num1 * num2);
-          }),
-      );
-    }
-  }
-
-  const input1 = new Input(new Source(2), '.input-1');
-  const input2 = new Input(new Source(2), '.input-2');
-  const multiplication = new Mul(
-      new NumberOf(input1),
-      new NumberOf(input2),
-  );
-  multiplication.result(
-      new Patron(new TextInDocument('.result')),
-  );
-</script>
-</body>
-</html>

package/examples/reactive.html

@@ -1,65 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <title>Reactive Patron</title>
-</head>
-<body>
-<h1>Reactive example</h1>
-<div>
-    <label>
-        Поле ввода:
-        <input class="input-1"/>
-    </label>
-</div>
-<div>Результат ввода: <span class="result"></span></div>
-<script type="module">
-  import 'https://cdn.jsdelivr.net/npm/patron-oop@1.8.0/dist/patron.min.js';
-
-  const {Patron, Source} = window.GUEST_LIBRARY;
-
-  class Input {
-    constructor(source, selector) {
-      this.source = source;
-      const el = document.querySelector(selector);
-      this.source.value(
-          new Patron((value) => {
-            el.value = value;
-          }),
-      );
-      el.addEventListener('keyup', (e) => {
-        this.give(e.target.value);
-      });
-      el.addEventListener('change', (e) => {
-        this.give(e.target.value);
-      });
-    }
-
-    receiving(guest) {
-      this.source.value(guest);
-      return this;
-    }
-
-    receive(value) {
-      this.source.give(value);
-      return this;
-    }
-  }
-
-  class Text {
-    constructor(selector) {
-      this.element = document.querySelector(selector);
-    }
-
-    receive(value) {
-      this.element.innerText = value;
-    }
-  }
-
-  new Input(new Source(2), '.input-1').value(
-      new Patron(new Text('.result')),
-  );
-</script>
-</body>
-</html>

package/src/Guest/GuestChain._twoValuesAfter.test.ts

@@ -1,16 +0,0 @@
-import { expect, test } from "vitest";
-import { Source } from "../Source/Source";
-import { GuestChain } from "./GuestChain";
-
-test("GuestChain._twoValuesAfter.test", () => {
-  const one = new Source(1);
-  const two = new Source(2);
-  const chain = new GuestChain<{ one: number; two: number }>();
-
-  chain.result((value) => {
-    expect(Object.values(value).join()).toBe("1,2");
-  });
-
-  one.value(chain.receiveKey("one"));
-  two.value(chain.receiveKey("two"));
-});

package/src/Guest/GuestChain._twoValuesBefore.test.ts

@@ -1,16 +0,0 @@
-import { expect, test } from "vitest";
-import { Source } from "../Source/Source";
-import { GuestChain } from "./GuestChain";
-
-test("GuestChain._twoValuesBefore.test", () => {
-  const one = new Source(1);
-  const two = new Source(2);
-  const chain = new GuestChain<{ one: number; two: number }>();
-
-  one.value(chain.receiveKey("one"));
-  two.value(chain.receiveKey("two"));
-
-  chain.result((value) => {
-    expect(Object.values(value).join()).toBe("1,2");
-  });
-});

package/src/Guest/GuestChain.ts

@@ -1,88 +0,0 @@
-import { GuestCast } from "./GuestCast";
-import { Source } from "../Source/Source";
-import { Guest, GuestObjectType, GuestType } from "./Guest";
-import { GuestObject } from "./GuestObject";
-import { GuestPool } from "./GuestPool";
-
-export interface ChainType<T = any> {
-  result(guest: GuestObjectType<T>): this;
-  resultArray(guest: GuestObjectType<T>): this;
-  receiveKey<R>(key: string): GuestObjectType<R>;
-}
-
-/**
- * @url https://kosukhin.github.io/patron.site/#/guest/guest-chain
- */
-export class GuestChain<T> implements ChainType<T> {
-  private theChain: Source<Record<string, unknown>>;
-
-  private keysKnown = new Set();
-
-  private keysFilled = new Set();
-
-  private filledChainPool = new GuestPool(this);
-
-  public constructor() {
-    this.theChain = new Source<Record<string, unknown>>({});
-  }
-
-  public resultArray(guest: GuestType<T>) {
-    const guestObject = new GuestObject(guest);
-    this.filledChainPool.add(
-      new GuestCast(guestObject, (value: Record<string, unknown>) => {
-        guestObject.give(Object.values(value) as T);
-      }),
-    );
-    if (this.isChainFilled()) {
-      this.theChain.value(
-        new Guest((chain: Record<string, unknown>) => {
-          this.filledChainPool.give(Object.values(chain));
-        }),
-      );
-    }
-    return this;
-  }
-
-  public result(guest: GuestType<T>) {
-    const guestObject = new GuestObject(guest);
-    if (this.isChainFilled()) {
-      this.filledChainPool.add(guestObject);
-      this.theChain.value(
-        new Guest((chain) => {
-          this.filledChainPool.give(chain);
-        }),
-      );
-    } else {
-      this.filledChainPool.add(guestObject);
-    }
-    return this;
-  }
-
-  public receiveKey<R>(key: string): GuestObjectType<R> {
-    this.keysKnown.add(key);
-    return new Guest((value) => {
-      // Обернул в очередь чтобы можно было синхронно наполнить очередь известных ключей
-      queueMicrotask(() => {
-        this.theChain.value(
-          new Guest((chain: Record<string, unknown>) => {
-            this.keysFilled.add(key);
-            const lastChain = {
-              ...chain,
-              [key]: value,
-            };
-            this.theChain.give(lastChain);
-            if (this.isChainFilled()) {
-              this.filledChainPool.give(lastChain);
-            }
-          }),
-        );
-      });
-    });
-  }
-
-  private isChainFilled() {
-    return (
-      this.keysFilled.size > 0 && this.keysFilled.size === this.keysKnown.size
-    );
-  }
-}