@juulsgaard/signal-tools 18.0.2 → 18.0.4

package/dist/index.d.ts

@@ -497,6 +497,7 @@ declare abstract class IRequestState implements Subscribable<unknown> {
      * @param onError - Action to perform on error
      */
     abstract then(onValue: (value: unknown) => void, onError?: (error: Error) => void): this;
+    asPromise(): Promise<unknown>;
     /**
      * Perform an action if the request fails
      * @param onError
@@ -525,6 +526,7 @@ declare abstract class IValueRequestState<T> extends IRequestState implements Su
     then(onValue: (value: T) => void, onError?: (error: Error) => void): this;
     catch(onError: (error: Error) => void): this;
     finally(onComplete: (error?: Error) => void): this;
+    asPromise(): Promise<T>;
     /**
      * Cancel a running request
      * @param error - Optionally provide a custom error to throw when cancelling the request
@@ -642,6 +644,8 @@ declare const requestState: typeof valueRequestState & AltConstructors;
  * @category RequestState
  */
 declare class AsyncRequestState<T> extends IValueRequestState<T> {
+    private _completed;
+    get completed(): boolean;
     private readonly _request$;
     readonly request$: Observable<T>;
     private readonly _result$;
@@ -655,6 +659,9 @@ declare class AsyncRequestState<T> extends IValueRequestState<T> {
     readonly failed: _angular_core.Signal<boolean>;
     private readonly sub;
     constructor(request: Promise<T> | Observable<T>);
+    private onError;
+    private onValue;
+    private onCompleted;
     cancel(error?: string | Error | (() => Error)): boolean;
 }
 

package/dist/request-state/async-request-state.mjs

@@ -7,6 +7,7 @@ import { IValueRequestState } from './request-state.mjs';
 class AsyncRequestState extends IValueRequestState {
   constructor(request) {
     super();
+    this._completed = false;
     this._request$ = new ReplaySubject();
     this.request$ = this._request$.asObservable();
     this._result$ = new ReplaySubject();
@@ -19,28 +20,45 @@ class AsyncRequestState extends IValueRequestState {
     this.error = this._error.asReadonly();
     this.failed = computed(() => this._error() !== void 0);
     const request$ = isObservable(request) ? request.pipe(take(1)) : from(request);
-    this.sub = request$.subscribe(this._request$);
-    this.request$.subscribe({
-      next: (value) => {
-        this._result$.next(value);
-        this._result.set(value);
-      },
-      error: (error) => {
-        this._error.set(parseError(error));
-        this._result$.complete();
-        this._loading.set(false);
-      },
-      complete: () => {
-        this._result$.complete();
-        this._loading.set(false);
-      }
+    this.sub = request$.subscribe({
+      next: (x) => this.onValue(x),
+      error: (x) => this.onError(x),
+      complete: () => this.onCompleted()
     });
   }
+  get completed() {
+    return this._completed;
+  }
+  onError(error) {
+    if (this.completed) return;
+    this._completed = true;
+    this._request$.error(error);
+    this._result$.complete();
+    this._loading.set(false);
+    this._error.set(parseError(error));
+  }
+  onValue(value) {
+    if (this.completed) return;
+    this._completed = true;
+    this._request$.next(value);
+    this._request$.complete();
+    this._result$.next(value);
+    this._result$.complete();
+    this._loading.set(false);
+    this._result.set(value);
+  }
+  onCompleted() {
+    if (this.completed) return;
+    this._completed = true;
+    this._request$.complete();
+    this._result$.complete();
+    this._loading.set(false);
+  }
   cancel(error) {
-    if (this.sub.closed) return false;
+    if (this.completed) return false;
     this.sub.unsubscribe();
     const fullError = isString(error) ? new CancelledError(error) : isFunction(error) ? error() : error;
-    this._request$.error(fullError);
+    this.onError(fullError);
     return true;
   }
 }

package/dist/request-state/request-state.mjs

@@ -2,6 +2,9 @@ import { first } from 'rxjs';
 import { parseError } from '@juulsgaard/ts-tools';
 
 class IRequestState {
+  asPromise() {
+    return new Promise((resolve, reject) => this.then(resolve, reject));
+  }
   /**
    * Subscribe to the underlying request Observable
    * @param observer
@@ -34,6 +37,9 @@ class IValueRequestState extends IRequestState {
     });
     return this;
   }
+  asPromise() {
+    return new Promise((resolve, reject) => this.then(resolve, reject));
+  }
 }
 
 export { IRequestState, IValueRequestState };

package/dist/request-state/writable-request-state.mjs

@@ -57,6 +57,8 @@ class WritableRequestState extends IValueRequestState {
     this._completed = true;
     this._request$.next(value);
     this._request$.complete();
+    this._result$.next(value);
+    this._result$.complete();
     this._loading.set(false);
     this._result.set(value);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@juulsgaard/signal-tools",
-  "version": "18.0.2",
+  "version": "18.0.4",
   "description": "Tools for working with Angular signals",
   "repository": "git@github.com:Juulsgaard/signal-tools.git",
   "homepage": "https://juulsgaard.github.io/signal-tools/",