@fbltd/async 1.0.36 → 1.0.38

package/dist/bin/dependency/dependency.js

@@ -49,9 +49,6 @@ export class Dependency {
             firstPromise.resolve();
             externalPromises.push(firstPromise.promise);
         }
-        if (thisStreamConfig.externalDispose) {
-            externalPromises.push(thisStreamConfig.externalDispose.promise);
-        }
         const owner = this;
         let done = false;
         return {
@@ -65,7 +62,7 @@ export class Dependency {
                     ...externalPromises,
                     owner.next(),
                 ]);
-                if (this.done || thisStreamConfig.externalDispose?.isFulfilled) {
+                if (this.done) {
                     done = true;
                     return { done: true };
                 }
@@ -101,8 +98,7 @@ export class Dependency {
      * Another subscribe for current race
      */
     async next() {
-        let race = this.getOrCreateRace();
-        await race;
+        await this.getOrCreateRace();
         this._race = undefined;
         if (this.done) {
             return { done: true };

package/dist/bin/dependency/dependency.stream.js

@@ -10,12 +10,23 @@ export class DependencyStream {
     constructor(owner) {
         this.owner = owner;
         this.selfDispose = new PromiseConfiguration();
-        this.iterator = owner[symAI]({ externalDispose: this.selfDispose });
+        this.iterator = owner[symAI]();
     }
     [symAI]() {
+        const done = { done: true };
         return {
-            next: () => {
-                return this.iterator.next();
+            next: async () => {
+                if (this.selfDispose.isFulfilled)
+                    return done;
+                const nextRes = this.iterator.next();
+                await Promise.race([
+                    this.selfDispose.promise,
+                    nextRes,
+                ]);
+                if (this.selfDispose.isFulfilled)
+                    return done;
+                this.selfDispose = new PromiseConfiguration();
+                return nextRes;
             }
         };
     }

package/dist/bin/dependency/vanilla/race.stream.js

@@ -6,7 +6,7 @@ export function raceStream(deps) {
         .entries(deps)
         .reduce((acc, [key, dep]) => {
         acc[0].push(key);
-        acc[1].push(dep[symAI]({ externalDispose }));
+        acc[1].push(dep[symAI]());
         return acc;
     }, [[], []]);
     function isDisposed() {
@@ -18,12 +18,20 @@ export function raceStream(deps) {
             return isDisposed();
         },
         [symAI]() {
+            const done = { done: true };
             return {
                 next: async () => {
-                    const res = await Promise.race(streams.map(s => s.next()));
-                    if (res.done) {
+                    if (externalDispose.isFulfilled)
+                        return done;
+                    const res = await Promise.race([
+                        externalDispose.promise,
+                        ...streams.map(s => s.next())
+                    ]);
+                    if (externalDispose.isFulfilled)
+                        return done;
+                    externalDispose = new PromiseConfiguration();
+                    if (res.done)
                         return res;
-                    }
                     const value = keys.reduce((acc, key) => {
                         acc[key] = deps[key].value;
                         return acc;

package/dist/bin/index.js

@@ -1,3 +1,4 @@
 export * from "./dependency/index.js";
 export * from "./delay.js";
 export * from "./promise-configuration.js";
+export * from "./debounce.js";

package/dist/types/dependency/contracts.d.ts

@@ -1,4 +1,3 @@
-import { PromiseConfiguration } from "../promise-configuration.js";
 import { Dependency } from "./dependency.ts";
 export interface IStreamIterator<TValue = any> {
     owner: Dependency;
@@ -29,9 +28,4 @@ export type IThisStreamConfig = Partial<{
      * stream dispose has priority over first reaction
      */
     withReactionOnSubscribe: boolean;
-    /**
-     * Dispose happens anyway right after current task,
-     * wherever value of dependency was changed
-     */
-    externalDispose: PromiseConfiguration<any>;
 }>;

package/dist/types/dependency/dependency.stream.d.ts

@@ -3,7 +3,7 @@ import { symAI } from "../constants.ts";
 import { Dependency } from "./dependency.ts";
 export declare class DependencyStream<T = any> implements IDependencyStream {
     readonly owner: Dependency;
-    private readonly selfDispose;
+    private selfDispose;
     private readonly iterator;
     get isDisposed(): boolean;
     constructor(owner: Dependency);

package/dist/types/index.d.ts

@@ -1,3 +1,4 @@
 export * from './dependency/index.ts';
 export * from './delay.ts';
 export * from './promise-configuration.ts';
+export * from './debounce.ts';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fbltd/async",
-  "version": "1.0.36",
+  "version": "1.0.38",
   "description": "Miscellaneous async utils",
   "homepage": "https://github.com/GlennMiller1991/async",
   "type": "module",