@fbltd/async 1.0.10 → 1.0.11

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

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -36,20 +36,22 @@ class DependencyStream {
     }
     [Symbol.asyncIterator](thisStreamConfig = {}) {
         const totalDispose = this.abortPromise;
-        const selfDispose = (0, get_promise_1.getPromise)();
-        const externalPromises = [totalDispose.promise, selfDispose.promise];
+        const externalPromises = [totalDispose.promise];
         let firstPromise;
-        if (this.config.withReactionOnSubscribe || thisStreamConfig.withReactionOnSubscribe) {
+        const withReactionOnSubscribe = this.config.withReactionOnSubscribe || thisStreamConfig.withReactionOnSubscribe;
+        if (withReactionOnSubscribe) {
             firstPromise = (0, get_promise_1.getPromise)();
             firstPromise.resolve(this.value);
             externalPromises.push(firstPromise.promise);
         }
-        ;
+        if (thisStreamConfig.externalDispose) {
+            externalPromises.push(thisStreamConfig.externalDispose.promise);
+        }
         let isDisposed = false;
         const owner = this;
         return {
             owner,
-            dispose: () => selfDispose.resolve(),
+            dispose: owner.dispose.bind(owner),
             get isDisposed() {
                 return isDisposed;
             },
@@ -62,7 +64,7 @@ class DependencyStream {
                     ...externalPromises,
                     this.reactionPromise.promise,
                 ]);
-                if (totalDispose.isFulfilled || selfDispose.isFulfilled) {
+                if (totalDispose.isFulfilled || thisStreamConfig.externalDispose?.isFulfilled) {
                     isDisposed = true;
                     return { done: true };
                 }

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

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./dependency-stream"), exports);
 __exportStar(require("./utils"), exports);
 __exportStar(require("./integrations"), exports);
+__exportStar(require("./contracts"), exports);

package/dist/bin/dependency-stream/utils/race.stream.js

@@ -4,22 +4,22 @@ exports.raceStream = raceStream;
 const constants_1 = require("../../constants");
 const get_promise_1 = require("../../get-promise");
 function raceStream(...deps) {
-    const streams = deps.map((dep) => dep[constants_1.symAI]());
     let selfDisposePromise = (0, get_promise_1.getPromise)();
     let isDisposed = false;
+    const streams = deps.map((dep) => dep[constants_1.symAI]({
+        externalDispose: selfDisposePromise
+    }));
     return {
-        dispose: selfDisposePromise.resolve,
+        dispose: () => selfDisposePromise.resolve({ done: true, value: void 0 }),
         get isDisposed() {
             return isDisposed;
         },
         [constants_1.symAI]() {
             return {
                 next: async () => {
-                    await Promise.race([selfDisposePromise.promise, streams.map(s => s.next())]);
-                    if (selfDisposePromise.isFulfilled || streams.some(s => s.isDisposed)) {
-                        isDisposed = true;
-                        return { done: true };
-                    }
+                    const res = await Promise.race([selfDisposePromise.promise, ...streams.map(s => s.next())]);
+                    if (res.done)
+                        return res;
                     return { done: false, value: streams.map(s => s.owner.value) };
                 }
             };

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

@@ -0,0 +1,10 @@
+export interface IIteratorOwner<TValue = any> {
+    value: TValue;
+    dispose(): void;
+}
+export interface IStreamIterator<TValue = any> {
+    owner: IIteratorOwner<TValue>;
+    dispose(): void;
+    readonly isDisposed: boolean;
+    next(): Promise<IteratorResult<TValue, void>>;
+}

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

@@ -1,3 +1,5 @@
+import { IPromiseConfiguration } from "../get-promise";
+import { IIteratorOwner, IStreamIterator } from "./contracts";
 interface IIsEquals<T> {
     (prev: T, cur: T): boolean;
 }
@@ -7,8 +9,9 @@ type IAllStreamConfig<T> = {
 };
 type IThisStreamConfig = Partial<{
     withReactionOnSubscribe: boolean;
+    externalDispose: IPromiseConfiguration<any>;
 }>;
-export declare class DependencyStream<T = any> {
+export declare class DependencyStream<T = any> implements IIteratorOwner<T> {
     private _value;
     private reactionPromise;
     private abortPromise;
@@ -17,18 +20,7 @@ export declare class DependencyStream<T = any> {
     private _set;
     set value(v: T);
     get value(): T;
-    [Symbol.asyncIterator](this: DependencyStream<T>, thisStreamConfig?: IThisStreamConfig): {
-        owner: DependencyStream<T>;
-        dispose: () => void;
-        readonly isDisposed: boolean;
-        next: () => Promise<{
-            done: boolean;
-            readonly value?: undefined;
-        } | {
-            done: boolean;
-            readonly value: T;
-        }>;
-    };
+    [Symbol.asyncIterator](this: DependencyStream<T>, thisStreamConfig?: IThisStreamConfig): IStreamIterator<T>;
     dispose(this: DependencyStream<T>): void;
 }
 export {};

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

@@ -1,3 +1,4 @@
 export * from './dependency-stream';
 export * from './utils';
 export * from './integrations';
+export * from './contracts';

package/dist/types/dependency-stream/utils/once.d.ts

@@ -1,10 +1,7 @@
 import { DependencyStream } from "../dependency-stream";
 export declare function once(dep: DependencyStream): {
     [Symbol.asyncIterator](): {
-        next: () => Promise<{
-            done: boolean;
-            readonly value: any;
-        } | {
+        next: () => Promise<IteratorYieldResult<any> | IteratorReturnResult<void> | {
             done: boolean;
         }>;
     };

package/dist/types/dependency-stream/utils/race.stream.d.ts

@@ -1,13 +1,10 @@
 import { DependencyStream } from "../dependency-stream";
 import { symAI } from "../../constants";
-export declare function raceStream(...deps: DependencyStream[]): {
-    dispose: (value: void) => void;
+export declare function raceStream<TArray extends DependencyStream[]>(...deps: NoInfer<TArray>): {
+    dispose: () => void;
     readonly isDisposed: boolean;
     [Symbol.asyncIterator](): {
-        next: () => Promise<{
-            done: boolean;
-            readonly value?: undefined;
-        } | {
+        next: () => Promise<IteratorReturnResult<void> | {
             done: boolean;
             value: any[];
         }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fbltd/async",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "Miscellaneous async utils",
   "homepage": "https://github.com/GlennMiller1991/async",
   "keywords": [