@dxos/util 0.6.13-main.ed424a1 → 0.6.13

package/src/safe-instanceof.test.ts

@@ -2,7 +2,8 @@
 // Copyright 2022 DXOS.org
 //
 
-import { describe, expect, test } from 'vitest';
+import { expect } from 'chai';
+import { describe, test } from 'vitest';
 
 import { safeInstanceof } from './safe-instanceof';
 

package/src/sort.test.ts

@@ -2,7 +2,8 @@
 // Copyright 2022 DXOS.org
 //
 
-import { describe, expect, test } from 'vitest';
+import { expect } from 'chai';
+import { describe, test } from 'vitest';
 
 import { compareMulti, compareScalar, compareObject, compareString } from './sort';
 

package/src/tracer.test.ts

@@ -2,7 +2,8 @@
 // Copyright 2023 DXOS.org
 //
 
-import { describe, expect, test } from 'vitest';
+import { expect } from 'chai';
+import { describe, test } from 'vitest';
 
 import { createBucketReducer, numericalValues, reduceGroupBy, reduceSeries, reduceSet } from './reducers';
 import { Tracer } from './tracer';

package/src/types.test.ts

@@ -2,7 +2,8 @@
 // Copyright 2022 DXOS.org
 //
 
-import { describe, expect, test } from 'vitest';
+import { expect } from 'chai';
+import { describe, test } from 'vitest';
 
 import { nonNullable } from './types';
 

package/src/typings.d.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+declare module 'xcase';

package/src/uint8array.test.ts

@@ -2,7 +2,8 @@
 // Copyright 2023 DXOS.org
 //
 
-import { test, expect, describe } from 'vitest';
+import { expect } from 'chai';
+import { test, describe } from 'vitest';
 
 import { arrayToBuffer, arrayToString, bufferToArray, stringToArray } from './uint8array';
 

package/src/weak.test.ts

@@ -2,14 +2,16 @@
 // Copyright 2023 DXOS.org
 //
 
-import { test, expect, describe } from 'vitest';
+import { expect } from 'chai';
+import { test, describe } from 'vitest';
+import waitForExpect from 'wait-for-expect';
 
 import { WeakDictionary } from './weak';
 
 describe('WeakDictionary', () => {
   // Skipped because it takes a long time for garbage collection to kick in (~8 sec)
   // but it works otherwise.
-  test.skip('unref item gets garbage collected', { timeout: 20_000 }, async () => {
+  test.skip('unref item gets garbage collected', async () => {
     const map = new WeakDictionary<string, any>();
     const key = 'key';
 
@@ -30,8 +32,10 @@ describe('WeakDictionary', () => {
 
     setValue();
     // Garbage collection should remove the item because no references exist.
-    await expect.poll(() => map.size, { timeout: 20_000 }).toEqual(0);
+    await waitForExpect(() => {
+      expect(map.size).to.equal(0);
+    }, 20000);
 
     expect(map.has(key)).to.equal(false);
-  });
+  }, 20_000);
 });

package/src/weak.ts

@@ -16,17 +16,17 @@ export class WeakDictionary<K, V extends object> implements Map<K, V> {
     entries?.forEach(([key, value]) => this._register(key, value));
   }
 
-  *entries(): SetIterator<[K, V]> {
+  *entries(): IterableIterator<[K, V]> {
     for (const [key, value] of this._internal) {
       yield [key, value.deref()!];
     }
   }
 
-  keys(): SetIterator<K> {
+  keys(): IterableIterator<K> {
     return this._internal.keys();
   }
 
-  *values(): SetIterator<V> {
+  *values(): IterableIterator<V> {
     for (const value of this._internal.values()) {
       const deref = value.deref();
       if (!deref) {
@@ -36,7 +36,7 @@ export class WeakDictionary<K, V extends object> implements Map<K, V> {
     }
   }
 
-  *[Symbol.iterator](): SetIterator<[K, V]> {
+  *[Symbol.iterator](): IterableIterator<[K, V]> {
     for (const [key, value] of this._internal) {
       yield [key, value.deref()!];
     }