@dxos/async 0.6.13 → 0.6.14-main.1366248

package/src/observable.test.ts

@@ -2,9 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { expect } from 'chai';
-
-import { afterTest, describe, test } from '@dxos/test';
+import { describe, expect, onTestFinished, test } from 'vitest';
 
 import { Event } from './events';
 import { MulticastObservable, Observable, PushStream } from './observable';
@@ -23,7 +21,7 @@ describe('multicast observable', () => {
       expect(value).to.equal(1);
       trigger.wake();
     });
-    afterTest(() => subscription.unsubscribe());
+    onTestFinished(() => subscription.unsubscribe());
     await trigger.wait();
   });
 
@@ -46,8 +44,8 @@ describe('multicast observable', () => {
       }
     });
 
-    afterTest(() => subscription1.unsubscribe());
-    afterTest(() => subscription2.unsubscribe());
+    onTestFinished(() => subscription1.unsubscribe());
+    onTestFinished(() => subscription2.unsubscribe());
 
     const next = { new: 'value' };
     event.emit(next);
@@ -100,7 +98,7 @@ describe('multicast observable', () => {
     const subscription = mapped.subscribe((value) => {
       result.wake(value);
     });
-    afterTest(() => subscription.unsubscribe());
+    onTestFinished(() => subscription.unsubscribe());
     expect(await result.wait()).to.deep.equal(6);
   });
 
@@ -121,7 +119,7 @@ describe('multicast observable', () => {
     const subscription = reduced.subscribe((value) => {
       result.wake(value);
     });
-    afterTest(() => subscription.unsubscribe());
+    onTestFinished(() => subscription.unsubscribe());
     expect(await result.wait()).to.deep.equal(6);
   });
 

package/src/task-scheduling.test.ts

@@ -2,11 +2,9 @@
 // Copyright 2022 DXOS.org
 //
 
-import { expect } from 'chai';
-import waitForExpect from 'wait-for-expect';
+import { describe, expect, test } from 'vitest';
 
 import { Context } from '@dxos/context';
-import { describe, test } from '@dxos/test';
 
 import { DeferredTask, scheduleTask } from './task-scheduling';
 import { sleep } from './timeout';
@@ -25,9 +23,7 @@ describe('task-scheduling', () => {
         throw new Error('test');
       });
 
-      await waitForExpect(() => {
-        expect(error.message).to.eq('test');
-      });
+      await expect.poll(() => error.message).toBe('test');
     });
 
     test('cancelation', async () => {

package/src/task-scheduling.ts

@@ -61,6 +61,7 @@ export class DeferredTask {
     if (this._ctx.disposed) {
       throw new ContextDisposedError();
     }
+
     this.schedule();
     await this._nextTask.wait();
   }

package/src/test-stream.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2022 DXOS.org
 //
 
-import { test } from '@dxos/test';
+import { test } from 'vitest';
 
 import { TestStream } from './test-stream';
 

package/src/testing.test.ts

@@ -2,10 +2,9 @@
 // Copyright 2020 DXOS.org
 //
 
-import { expect } from 'chai';
+import { describe, expect, test } from 'vitest';
 
 import { expectToThrow } from '@dxos/debug';
-import { describe, test } from '@dxos/test';
 
 import { waitForCondition } from './testing';
 

package/src/timeout.test.ts

@@ -2,10 +2,7 @@
 // Copyright 2020 DXOS.org
 //
 
-import { expect } from 'chai';
-
-import { expectToThrow } from '@dxos/debug';
-import { describe, test } from '@dxos/test';
+import { describe, expect, test } from 'vitest';
 
 import { asyncTimeout, sleep } from './timeout';
 
@@ -18,7 +15,7 @@ describe('timeout', () => {
 
   test('fails', async () => {
     const promise = sleep(200).then(() => 'test');
-    await expectToThrow(() => asyncTimeout(promise, 100, new Error('timeout')));
+    await expect(() => asyncTimeout(promise, 100, new Error('timeout'))).rejects.toThrowError();
   });
 
   test('sleep', async () => {

package/src/trigger.test.ts

@@ -2,16 +2,11 @@
 // Copyright 2020 DXOS.org
 //
 
-import chai, { expect } from 'chai';
-import chaiAsPromised from 'chai-as-promised';
-
-import { describe, test } from '@dxos/test';
+import { describe, expect, test } from 'vitest';
 
 import { sleep } from './timeout';
 import { Trigger, TriggerState, trigger } from './trigger';
 
-chai.use(chaiAsPromised);
-
 describe('trigger', () => {
   test('trigger', async () => {
     const [value, setValue] = trigger<any>();
@@ -52,7 +47,7 @@ describe('trigger', () => {
       const error = new Error('Test error');
       const promise = trigger.wait();
       trigger.throw(error);
-      await expect(promise).to.be.rejectedWith(error);
+      await expect(promise).rejects.toThrowError(error);
       expect(trigger.state).to.equal(TriggerState.REJECTED);
       trigger.reset();
       expect(trigger.state).to.equal(TriggerState.WAITING);

package/src/trigger.ts

@@ -78,6 +78,9 @@ export class Trigger<T = void> {
    * NOOP if the trigger is already resolved.
    */
   wake(value: T) {
+    if (this._state !== TriggerState.WAITING) {
+      return this;
+    }
     this._state = TriggerState.RESOLVED;
     this._resolve(value);
     if (this._options.autoReset) {
@@ -106,6 +109,9 @@ export class Trigger<T = void> {
    * NOOP if the trigger is already resolved.
    */
   throw(error: Error) {
+    if (this._state !== TriggerState.WAITING) {
+      return this;
+    }
     this._state = TriggerState.REJECTED;
     this._reject(error);
     if (this._options.autoReset) {

package/src/until.test.ts

@@ -2,10 +2,7 @@
 // Copyright 2020 DXOS.org
 //
 
-import { expect } from 'chai';
-
-import { expectToThrow } from '@dxos/debug';
-import { describe, test } from '@dxos/test';
+import { describe, expect, test } from 'vitest';
 
 import { sleep } from './timeout';
 import { until } from './until';
@@ -22,29 +19,29 @@ describe('until', () => {
   });
 
   test('error', async () => {
-    await expectToThrow(async () => {
+    await expect(async () => {
       await until(async (resolve, reject) => {
         await sleep(100);
         reject(new Error());
       });
-    });
+    }).rejects.toThrowError();
   });
 
   test('catch', async () => {
-    await expectToThrow(async () => {
+    await expect(async () => {
       await until(async () => {
         await sleep(100);
         throw new Error();
       });
-    });
+    }).rejects.toThrowError();
   });
 
   test('timeout', async () => {
-    await expectToThrow(async () => {
+    await expect(async () => {
       await until(async (resolve) => {
         await sleep(500);
         resolve();
       }, 100); // Timeout before complete.
-    });
+    }).rejects.toThrowError();
   });
 });

package/src/update-scheduler.test.ts

@@ -2,10 +2,9 @@
 // Copyright 2023 DXOS.org
 //
 
-import { expect } from 'chai';
+import { describe, expect, test } from 'vitest';
 
 import { Context } from '@dxos/context';
-import { describe, test } from '@dxos/test';
 
 import { sleep } from './timeout';
 import { UpdateScheduler } from './update-scheduler';