@dxos/util 0.6.11 → 0.6.12-main.5a87ad5

package/src/complex.ts

@@ -78,21 +78,21 @@ export class ComplexSet<T> implements Set<T> {
     return this._values.size;
   }
 
-  [Symbol.iterator](): IterableIterator<T> {
+  [Symbol.iterator](): SetIterator<T> {
     return this._values.values();
   }
 
-  *entries(): IterableIterator<[T, T]> {
+  *entries(): SetIterator<[T, T]> {
     for (const value of this._values.values()) {
       yield [value, value];
     }
   }
 
-  keys(): IterableIterator<T> {
+  keys(): SetIterator<T> {
     return this[Symbol.iterator]();
   }
 
-  values(): IterableIterator<T> {
+  values(): SetIterator<T> {
     return this[Symbol.iterator]();
   }
 
@@ -218,22 +218,22 @@ export class ComplexMap<K, V> implements Map<K, V> {
     return this._keys.size;
   }
 
-  *[Symbol.iterator](): IterableIterator<[K, V]> {
+  *[Symbol.iterator](): SetIterator<[K, V]> {
     for (const [primitive, key] of this._keys) {
       const value = this._values.get(primitive) ?? raise(new Error('Map corrupted.'));
       yield [key, value];
     }
   }
 
-  entries(): IterableIterator<[K, V]> {
+  entries(): SetIterator<[K, V]> {
     return this[Symbol.iterator]();
   }
 
-  keys(): IterableIterator<K> {
+  keys(): SetIterator<K> {
     return this._keys.values();
   }
 
-  values(): IterableIterator<V> {
+  values(): SetIterator<V> {
     return this._values.values();
   }
 

package/src/defer.test.ts

@@ -2,8 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { expect } from 'chai';
-import { describe, test } from 'vitest';
+import { describe, expect, test } from 'vitest';
 
 import { defer, deferAsync } from './defer';
 

package/src/human-hash.test.ts

@@ -2,8 +2,7 @@
 // Copyright 2020 DXOS.org
 //
 
-import { expect } from 'chai';
-import { test } from 'vitest';
+import { expect, test } from 'vitest';
 
 import { createKeyPair, createId } from '@dxos/crypto';
 import { PublicKey } from '@dxos/keys';

package/src/index.ts

@@ -7,6 +7,8 @@ export * from './assign';
 export * from './binder';
 export * from './bitfield';
 export * from './callback';
+export * from './callback-collection';
+export * from './chunk-array';
 export * from './circular-buffer';
 export * from './complex';
 export * from './defer';
@@ -30,14 +32,12 @@ export * from './reducers';
 export * from './safe-await';
 export * from './safe-instanceof';
 export * from './safe-parse-json';
+export * from './sliding-window-summary';
 export * from './sort';
+export * from './sum';
 export * from './throw-unhandled-error';
 export * from './to-fallback';
 export * from './tracer';
 export * from './types';
 export * from './uint8array';
-export * from './sum';
 export * from './weak';
-export * from './sliding-window-summary';
-export * from './callback-collection';
-export * from './chunk-array';

package/src/join-tables.test.ts

@@ -2,8 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { expect } from 'chai';
-import { describe, test } from 'vitest';
+import { describe, expect, test } from 'vitest';
 
 import { joinTables } from './join-tables';
 

package/src/order.test.ts

@@ -2,8 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { expect } from 'chai';
-import { describe, test } from 'vitest';
+import { describe, expect, test } from 'vitest';
 
 import { inferObjectOrder, inferRecordOrder } from './order';
 

package/src/params.test.ts

@@ -3,8 +3,7 @@
 //
 
 import { Schema as S } from '@effect/schema';
-import { expect } from 'chai';
-import { describe, test } from 'vitest';
+import { describe, expect, test } from 'vitest';
 
 import { ParamKeyAnnotation, Params } from './params';
 

package/src/params.ts

@@ -13,7 +13,9 @@ import { decamelize } from 'xcase';
 // TODO(burdon): Change annotations.
 
 type ParamKeyAnnotationType = string;
+
 const ParamKeyAnnotationId = Symbol.for('@dxos/schema/annotation/ParamKeyAnnotation');
+
 export const ParamKeyAnnotation =
   (value: ParamKeyAnnotationType) =>
   <S extends Annotable.All>(self: S): Annotable.Self<S> =>

package/src/platform.browser.test.ts

@@ -0,0 +1,11 @@
+//
+// Copyright 2020 DXOS.org
+//
+
+import { expect, test } from 'vitest';
+
+import { isNode } from './platform';
+
+test('knows when running in node', () => {
+  expect(isNode()).to.be.false;
+});

package/src/platform.node.test.ts

@@ -0,0 +1,11 @@
+//
+// Copyright 2020 DXOS.org
+//
+
+import { expect, test } from 'vitest';
+
+import { isNode } from './platform';
+
+test('knows when running in node', () => {
+  expect(isNode()).to.be.true;
+});

package/src/reducers.test.ts

@@ -2,8 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { expect } from 'chai';
-import { describe, test } from 'vitest';
+import { describe, expect, test } from 'vitest';
 
 import { median, numericalValues } from './reducers';
 

package/src/safe-instanceof.test.ts

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

package/src/sort.test.ts

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

package/src/tracer.test.ts

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

package/src/types.test.ts

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

package/src/uint8array.test.ts

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

package/src/weak.test.ts

@@ -2,16 +2,14 @@
 // Copyright 2023 DXOS.org
 //
 
-import { expect } from 'chai';
-import { test, describe } from 'vitest';
-import waitForExpect from 'wait-for-expect';
+import { test, expect, describe } from 'vitest';
 
 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', async () => {
+  test.skip('unref item gets garbage collected', { timeout: 20_000 }, async () => {
     const map = new WeakDictionary<string, any>();
     const key = 'key';
 
@@ -32,10 +30,8 @@ describe('WeakDictionary', () => {
 
     setValue();
     // Garbage collection should remove the item because no references exist.
-    await waitForExpect(() => {
-      expect(map.size).to.equal(0);
-    }, 20000);
+    await expect.poll(() => map.size, { timeout: 20_000 }).toEqual(0);
 
     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(): IterableIterator<[K, V]> {
+  *entries(): SetIterator<[K, V]> {
     for (const [key, value] of this._internal) {
       yield [key, value.deref()!];
     }
   }
 
-  keys(): IterableIterator<K> {
+  keys(): SetIterator<K> {
     return this._internal.keys();
   }
 
-  *values(): IterableIterator<V> {
+  *values(): SetIterator<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](): IterableIterator<[K, V]> {
+  *[Symbol.iterator](): SetIterator<[K, V]> {
     for (const [key, value] of this._internal) {
       yield [key, value.deref()!];
     }

package/dist/types/src/platform.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=platform.test.d.ts.map

package/dist/types/src/platform.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"platform.test.d.ts","sourceRoot":"","sources":["../../../src/platform.test.ts"],"names":[],"mappings":""}

package/src/platform.test.ts

@@ -1,17 +0,0 @@
-//
-// Copyright 2020 DXOS.org
-//
-
-import { expect } from 'chai';
-import { test } from 'vitest';
-
-import { isNode } from './platform';
-
-// TODO(dmaretskyi): Broken with vitest conversion.
-test.skip('knows when running in node', () => {
-  if (mochaExecutor.environment === 'nodejs') {
-    expect(isNode()).to.be.true;
-  } else {
-    expect(isNode()).to.be.false;
-  }
-});

package/src/typings.d.ts

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