patron-oop 1.41.0 → 1.43.0

package/src/Guest/Guest.ts

@@ -4,10 +4,10 @@ export interface GiveOptions {
   data?: unknown;
 }
 
-export type GuestExecutorType<T = any> = (
+export type GuestExecutorType<T = any, This = void> = (
   value: T,
   options?: GiveOptions,
-) => void;
+) => This;
 
 export interface GuestObjectType<T = any> {
   give(value: T, options?: GiveOptions): this;

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

@@ -5,7 +5,7 @@ import { GuestAwareAll } from "./GuestAwareAll";
 test("GuestAwareAll._twoValuesAfter.test", () => {
   const one = new Source(1);
   const two = new Source(2);
-  const all = new GuestAwareAll<{ one: number; two: number }>();
+  const all = new GuestAwareAll<{ one: number; two: number }>(["one", "two"]);
 
   all.value((value) => {
     expect(Object.values(value).join()).toBe("1,2");

package/src/Guest/GuestAwareAll.ts

@@ -16,14 +16,15 @@ export interface GuestAwareAllType<T = any> extends GuestAwareObjectType<T> {
 export class GuestAwareAll<T> implements GuestAwareAllType<T> {
   private theAll: Source<Record<string, unknown>>;
 
-  private keysKnown = new Set();
+  private keysKnown: Set<string>;
 
   private keysFilled = new Set();
 
   private filledAllPool = new GuestPool(this);
 
-  public constructor() {
+  public constructor(initialKnownKeys: string[] = []) {
     this.theAll = new Source<Record<string, unknown>>({});
+    this.keysKnown = new Set(initialKnownKeys);
   }
 
   public valueArray(guest: GuestType<T>) {
@@ -61,22 +62,19 @@ export class GuestAwareAll<T> implements GuestAwareAllType<T> {
   public guestKey<R>(key: string): GuestObjectType<R> {
     this.keysKnown.add(key);
     return new Guest((value) => {
-      // Обернул в очередь чтобы можно было синхронно наполнить очередь известных ключей
-      queueMicrotask(() => {
-        this.theAll.value(
-          new Guest((all: Record<string, unknown>) => {
-            this.keysFilled.add(key);
-            const lastAll = {
-              ...all,
-              [key]: value,
-            };
-            this.theAll.give(lastAll);
-            if (this.isAllFilled()) {
-              this.filledAllPool.give(lastAll);
-            }
-          }),
-        );
-      });
+      this.theAll.value(
+        new Guest((all: Record<string, unknown>) => {
+          this.keysFilled.add(key);
+          const lastAll = {
+            ...all,
+            [key]: value,
+          };
+          this.theAll.give(lastAll);
+          if (this.isAllFilled()) {
+            this.filledAllPool.give(lastAll);
+          }
+        }),
+      );
     });
   }