@fbltd/async 1.0.38 → 1.0.39

package/dist/bin/dependency/dependency.js

@@ -1,7 +1,7 @@
 import { PromiseConfiguration } from "../promise-configuration.js";
 import { baseComparer } from "./utils.js";
-import { observationState } from "./observe.state.js";
 import { symAI } from "../constants.js";
+import { observationState } from "./observe.state.js";
 export class Dependency {
     _value;
     reactionPromise;
@@ -38,7 +38,7 @@ export class Dependency {
         return this._value;
     }
     get done() {
-        return this.abortPromise.isFulfilled;
+        return !this.abortPromise || this.abortPromise.isFulfilled;
     }
     [symAI](thisStreamConfig = {}) {
         const externalPromises = [];
@@ -50,20 +50,18 @@ export class Dependency {
             externalPromises.push(firstPromise.promise);
         }
         const owner = this;
-        let done = false;
         return {
             owner,
-            dispose: owner.dispose.bind(owner),
+            dispose: () => { },
             get isDisposed() {
-                return done || owner.done;
+                return false;
             },
             next: async () => {
                 await Promise.race([
-                    ...externalPromises,
                     owner.next(),
+                    ...externalPromises,
                 ]);
                 if (this.done) {
-                    done = true;
                     return { done: true };
                 }
                 if (firstPromise) {
@@ -98,23 +96,24 @@ export class Dependency {
      * Another subscribe for current race
      */
     async next() {
+        const done = { done: true };
+        const owner = this;
+        if (this.done)
+            return done;
         await this.getOrCreateRace();
         this._race = undefined;
-        if (this.done) {
-            return { done: true };
-        }
+        if (this.done)
+            return done;
+        this.abortPromise = new PromiseConfiguration();
         return {
             done: false,
             get value() {
-                return this.value;
+                return owner.value;
             }
         };
     }
-    get disposePromise() {
-        return this.abortPromise.promise;
-    }
     dispose() {
-        this.abortPromise.resolve();
-        this.reactionPromise = undefined;
+        this.abortPromise?.resolve();
+        this.abortPromise = this.reactionPromise = undefined;
     }
 }

package/dist/bin/dependency/vanilla/reaction/reaction.js

@@ -13,7 +13,7 @@ export function reaction(fn, config) {
                         depsArray = Array.from(deps);
                         beforeValues = depsArray.map(dep => dep.value_unsafe);
                         const promises = depsArray.map(dep => dep.next());
-                        promises.push(dep.disposePromise);
+                        // promises.push(dep.disposePromise as Promise<any>);
                         await Promise.race(depsArray.map(dep => dep.next()));
                         if (dep.done)
                             return { done: true };

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

@@ -23,11 +23,10 @@ export declare class Dependency<T = any> {
      */
     next(): Promise<{
         done: true;
-        value?: never;
+        value: void;
     } | {
         done: boolean;
         readonly value: T;
     }>;
-    get disposePromise(): Promise<void>;
     dispose(this: Dependency<T>): void;
 }

package/package.json

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