@fbltd/async 1.0.23 → 1.0.24

package/README.md

@@ -71,6 +71,7 @@ setInterval(() => {
 ##### onceStream
 ##### raceStream
 ##### next
+##### reaction
 
 #### Framework integrations
 ##### React

package/dist/bin/dependency/dependency.js

@@ -1,7 +1,7 @@
 import { PromiseConfiguration } from "../promise-configuration.js";
 import { DependencyStream } from "./dependency.stream.js";
 import { baseComparer } from "./utils.js";
-import { setDep } from "./global.js";
+import { collectDep } from "./global.js";
 export class Dependency {
     _value;
     reactionPromise;
@@ -29,7 +29,7 @@ export class Dependency {
         this._set(v);
     }
     get value() {
-        setDep(this);
+        collectDep(this);
         return this._value;
     }
     getStream() {
@@ -57,10 +57,7 @@ export class Dependency {
                 return isDisposed;
             },
             next: async () => {
-                if (!this.reactionPromise) {
-                    this.reactionPromise = new PromiseConfiguration();
-                    this._set(this._value);
-                }
+                this.reactionPromise = this.reactionPromise ?? new PromiseConfiguration();
                 await Promise.race([
                     ...externalPromises,
                     this.reactionPromise.promise,
@@ -82,6 +79,30 @@ export class Dependency {
             }
         };
     }
+    _race;
+    async next(ref = {}) {
+        const abortPromise = this.abortPromise;
+        if (!this._race) {
+            this.reactionPromise = this.reactionPromise ?? new PromiseConfiguration();
+            this._race = Promise.race([
+                abortPromise.promise,
+                this.reactionPromise.promise,
+            ]);
+        }
+        let race = this._race;
+        await race;
+        this._race = undefined;
+        if (abortPromise.isFulfilled) {
+            ref.done = true;
+            return { done: true };
+        }
+        return {
+            done: false,
+            get value() {
+                return this.value;
+            }
+        };
+    }
     dispose() {
         this.abortPromise.resolve();
         this.abortPromise = new PromiseConfiguration();

package/dist/bin/dependency/global.js

@@ -3,7 +3,7 @@ const global = {
     dependencies: null
 };
 const notImplemented = new Error('Watching while watching is not implemented');
-export function watchDeps(fn) {
+export function runFnWithDepCollection(fn) {
     if (global.watchFlag) {
         throw notImplemented;
     }
@@ -17,7 +17,7 @@ export function watchDeps(fn) {
         result, deps
     };
 }
-export function setDep(dep) {
+export function collectDep(dep) {
     if (!global.watchFlag)
         return;
     global.dependencies.add(dep);

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

@@ -1,18 +1,21 @@
-import { watchDeps } from "../global.js";
-import { symAI } from "../../constants.js";
+import { runFnWithDepCollection } from "../global.js";
 /**
  * @deprecated
  */
 export function reaction(fn) {
+    const ref = { done: false };
     return {
         [Symbol.asyncIterator]: () => {
-            let { result, deps } = watchDeps(fn);
+            let { result, deps } = runFnWithDepCollection(fn);
             return {
                 next: async () => {
-                    const dependencies = Array.from(deps);
-                    const streams = dependencies.map(dep => dep[symAI]());
-                    await Promise.race(streams.map(s => s.next()));
-                    ({ result, deps } = watchDeps(fn));
+                    await Promise
+                        .race(Array
+                        .from(deps)
+                        .map(dep => dep.next(ref)));
+                    if (ref.done)
+                        return ref;
+                    ({ result, deps } = runFnWithDepCollection(fn));
                     return { done: false, value: result };
                 }
             };

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

@@ -11,5 +11,15 @@ export declare class Dependency<T = any> {
     get value(): T;
     getStream(this: Dependency<T>): DependencyStream<T>;
     [Symbol.asyncIterator](this: Dependency<T>, thisStreamConfig?: IThisStreamConfig): IStreamIterator<T>;
+    private _race;
+    next(ref?: {
+        done?: boolean;
+    }): Promise<{
+        done: true;
+        value?: never;
+    } | {
+        done: boolean;
+        readonly value: T;
+    }>;
     dispose(this: Dependency<T>): void;
 }

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

@@ -3,9 +3,9 @@ declare const global: {
     watchFlag: boolean;
     dependencies: Set<Dependency>;
 };
-export declare function watchDeps<T>(fn: () => T): {
+export declare function runFnWithDepCollection<T>(fn: () => T): {
     result: T;
     deps: typeof global.dependencies;
 };
-export declare function setDep(dep: Dependency): void;
+export declare function collectDep(dep: Dependency): void;
 export {};

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

@@ -4,6 +4,9 @@
 export declare function reaction<T>(fn: () => T): {
     [Symbol.asyncIterator]: () => {
         next: () => Promise<{
+            done: true;
+            value?: never;
+        } | {
             done: boolean;
             value: T;
         }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fbltd/async",
-  "version": "1.0.23",
+  "version": "1.0.24",
   "description": "Miscellaneous async utils",
   "homepage": "https://github.com/GlennMiller1991/async",
   "type": "module",
@@ -21,8 +21,8 @@
     "tsconfig.json"
   ],
   "scripts": {
-    "clearDist": "rm dist -r || true",
-    "clearModules": "rm node_modules -r || true",
+    "clearDist": "rm -r dist || true",
+    "clearModules": "rm -r node_modules || true",
     "clearAll": "npm run clearDist && npm run clearModules",
     "build": "npm run clearAll && npm i && mkdir dist && tsc",
     "test": "node --expose-gc node_modules/.bin/jest --config=./__tests__/jest.config.cjs",