@dxos/async 0.8.2-main.30e4dbb → 0.8.2-main.4c6cf53

package/src/testing.ts

@@ -2,7 +2,7 @@
 // Copyright 2020 DXOS.org
 //
 
-import { asyncTimeout, sleep } from './timeout';
+import { sleep } from './timeout';
 import { Trigger } from './trigger';
 
 /**
@@ -19,11 +19,13 @@ export const waitForCondition = <FunctionType extends (...args: any) => any>({
   timeout = 0,
   interval = 10,
   error,
+  breakOnError = false,
 }: {
   condition: FunctionType;
   timeout?: number;
   interval?: number;
   error?: Error;
+  breakOnError?: boolean;
 }) => {
   const stopTime = timeout ? Date.now() + timeout : 0;
   const trigger = new Trigger<ReturnType<FunctionType>>();
@@ -37,8 +39,10 @@ export const waitForCondition = <FunctionType extends (...args: any) => any>({
           trigger.wake(value);
           break;
         }
-      } catch (err) {
-        // Pass...
+      } catch (err: any) {
+        if (breakOnError === true) {
+          trigger.throw(err);
+        }
       }
 
       // eslint-disable-next-line no-await-in-loop
@@ -48,5 +52,5 @@ export const waitForCondition = <FunctionType extends (...args: any) => any>({
 
   setTimeout(waiter, 0);
 
-  return timeout ? asyncTimeout(trigger.wait(), timeout, error ?? new Error('Timeout')) : trigger.wait();
+  return trigger.wait({ timeout });
 };

package/src/timer.ts

@@ -27,7 +27,7 @@ export class Timer {
     return !!this._timer;
   }
 
-  start(options: TimerOptions, cb?: () => void) {
+  start(options: TimerOptions, cb?: () => void): this {
     if (isNaN(options.count) || isNaN(options.interval)) {
       throw new Error(`Invalid options: ${JSON.stringify(options)}`);
     }
@@ -61,7 +61,7 @@ export class Timer {
     return this;
   }
 
-  stop() {
+  stop(): this {
     clearInterval(this._timer);
     this._timer = undefined;
     this._state.emit(false);

package/src/trigger.ts

@@ -77,7 +77,7 @@ export class Trigger<T = void> {
    * Wake blocked callers (if any).
    * NOOP if the trigger is already resolved.
    */
-  wake(value: T) {
+  wake(value: T): this {
     if (this._state !== TriggerState.WAITING) {
       return this;
     }
@@ -93,7 +93,7 @@ export class Trigger<T = void> {
   /**
    * Reset promise (new waiters will wait).
    */
-  reset() {
+  reset(): this {
     this._state = TriggerState.WAITING;
     this._promise = new Promise<T>((resolve, reject) => {
       this._resolve = resolve;
@@ -108,7 +108,7 @@ export class Trigger<T = void> {
    * Throw error to blocked callers (if any).
    * NOOP if the trigger is already resolved.
    */
-  throw(error: Error) {
+  throw(error: Error): this {
     if (this._state !== TriggerState.WAITING) {
       return this;
     }

package/src/update-scheduler.ts

@@ -38,7 +38,7 @@ export class UpdateScheduler {
     });
   }
 
-  trigger() {
+  trigger(): void {
     if (this._scheduled) {
       return;
     }
@@ -87,7 +87,7 @@ export class UpdateScheduler {
     this._scheduled = true;
   }
 
-  forceTrigger() {
+  forceTrigger(): void {
     scheduleMicroTask(this._ctx, async () => {
       this._callback().catch((err) => this._ctx.raise(err));
     });
@@ -97,14 +97,14 @@ export class UpdateScheduler {
    * Waits for the current task to finish if it is running.
    * Does not schedule a new task.
    */
-  async join() {
+  async join(): Promise<void> {
     await this._promise;
   }
 
   /**
    * Force schedule the task to run and wait for it to finish.
    */
-  async runBlocking() {
+  async runBlocking(): Promise<void> {
     // The previous task might still be running, so we need to wait for it to finish.
     await this._promise; // Can't be rejected.
     this._promise = this._callback();