@dxos/async 0.8.4-main.d05673bc65 → 0.8.4-main.e00bdcdb52

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (33) hide show
  1. package/dist/lib/browser/index.mjs +14 -83
  2. package/dist/lib/browser/index.mjs.map +3 -3
  3. package/dist/lib/browser/meta.json +1 -1
  4. package/dist/lib/node-esm/index.mjs +14 -83
  5. package/dist/lib/node-esm/index.mjs.map +3 -3
  6. package/dist/lib/node-esm/meta.json +1 -1
  7. package/dist/types/src/callback.d.ts.map +1 -1
  8. package/dist/types/src/chain.d.ts.map +1 -1
  9. package/dist/types/src/cleanup.d.ts +0 -1
  10. package/dist/types/src/cleanup.d.ts.map +1 -1
  11. package/dist/types/src/debounce.d.ts.map +1 -1
  12. package/dist/types/src/errors.d.ts.map +1 -1
  13. package/dist/types/src/event-emitter.d.ts.map +1 -1
  14. package/dist/types/src/events.d.ts.map +1 -1
  15. package/dist/types/src/mutex.d.ts.map +1 -1
  16. package/dist/types/src/observable-value.d.ts.map +1 -1
  17. package/dist/types/src/observable.d.ts.map +1 -1
  18. package/dist/types/src/persistent-lifecycle.d.ts.map +1 -1
  19. package/dist/types/src/stream-to-array.d.ts.map +1 -1
  20. package/dist/types/src/task-scheduling.d.ts.map +1 -1
  21. package/dist/types/src/test-stream.d.ts.map +1 -1
  22. package/dist/types/src/testing.d.ts.map +1 -1
  23. package/dist/types/src/timeout.d.ts +1 -1
  24. package/dist/types/src/timeout.d.ts.map +1 -1
  25. package/dist/types/src/timer.d.ts.map +1 -1
  26. package/dist/types/src/track-leaks.d.ts.map +1 -1
  27. package/dist/types/src/trigger.d.ts.map +1 -1
  28. package/dist/types/src/update-scheduler.d.ts.map +1 -1
  29. package/dist/types/tsconfig.tsbuildinfo +1 -1
  30. package/package.json +7 -10
  31. package/src/cleanup.ts +0 -1
  32. package/src/event-emitter.test.ts +0 -1
  33. package/src/timeout.ts +6 -9
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dxos/async",
3
- "version": "0.8.4-main.d05673bc65",
3
+ "version": "0.8.4-main.e00bdcdb52",
4
4
  "description": "Async utilities.",
5
5
  "homepage": "https://dxos.org",
6
6
  "bugs": "https://github.com/dxos/dxos/issues",
@@ -23,9 +23,6 @@
23
23
  }
24
24
  },
25
25
  "types": "dist/types/src/index.d.ts",
26
- "typesVersions": {
27
- "*": {}
28
- },
29
26
  "files": [
30
27
  "dist",
31
28
  "src"
@@ -33,12 +30,12 @@
33
30
  "dependencies": {
34
31
  "zen-observable": "^0.10.0",
35
32
  "zen-push": "^0.3.1",
36
- "@dxos/context": "0.8.4-main.d05673bc65",
37
- "@dxos/debug": "0.8.4-main.d05673bc65",
38
- "@dxos/invariant": "0.8.4-main.d05673bc65",
39
- "@dxos/log": "0.8.4-main.d05673bc65",
40
- "@dxos/node-std": "0.8.4-main.d05673bc65",
41
- "@dxos/util": "0.8.4-main.d05673bc65"
33
+ "@dxos/context": "0.8.4-main.e00bdcdb52",
34
+ "@dxos/debug": "0.8.4-main.e00bdcdb52",
35
+ "@dxos/invariant": "0.8.4-main.e00bdcdb52",
36
+ "@dxos/node-std": "0.8.4-main.e00bdcdb52",
37
+ "@dxos/util": "0.8.4-main.e00bdcdb52",
38
+ "@dxos/log": "0.8.4-main.e00bdcdb52"
42
39
  },
43
40
  "devDependencies": {
44
41
  "@types/zen-observable": "^0.8.3"
package/src/cleanup.ts CHANGED
@@ -40,7 +40,6 @@ type EventMap<T> = T extends Window
40
40
  /**
41
41
  * Add the event listener and return a cleanup function.
42
42
  * Can be used in effect hooks in conjunction with `combine`.
43
- * @deprecated use bind-event-listener
44
43
  */
45
44
  export const addEventListener = <T extends EventTarget, K extends keyof EventMap<T>>(
46
45
  target: T,
package/src/event-emitter.test.ts CHANGED
@@ -3,7 +3,6 @@
3
3
  //
4
4
 
5
5
  import { EventEmitter } from 'node:events';
6
-
7
6
  import { describe, expect, test } from 'vitest';
8
7
 
9
8
  import { onEvent, waitForEvent } from './event-emitter';
package/src/timeout.ts CHANGED
@@ -4,7 +4,6 @@
4
4
 
5
5
  import { type Context, ContextDisposedError } from '@dxos/context';
6
6
 
7
- import { promiseFromCallback } from './callback';
8
7
  import { TimeoutError } from './errors';
9
8
 
10
9
  /**
@@ -57,12 +56,11 @@ export const asyncReturn = () => sleep(0);
57
56
  /**
58
57
  * Wait for promise or throw error.
59
58
  */
60
- export const asyncTimeout = async <T>(
61
- // TODO(dmaretskyi): This callback API is unintuitive and leads to bugs.
62
- promise: Promise<T> | (() => Promise<T>),
63
- timeout: number,
64
- err?: Error | string,
65
- ): Promise<T> => {
59
+ export const asyncTimeout = async <T>(promise: Promise<T>, timeout: number, err?: Error | string): Promise<T> => {
60
+ if (typeof promise === 'function') {
61
+ throw new Error('First argument must be a promise.');
62
+ }
63
+
66
64
  let timeoutId: NodeJS.Timeout;
67
65
  const throwable = err === undefined || typeof err === 'string' ? new TimeoutError(timeout, err) : err;
68
66
  const timeoutPromise = new Promise<T>((resolve, reject) => {
@@ -73,8 +71,7 @@ export const asyncTimeout = async <T>(
73
71
  unrefTimeout(timeoutId);
74
72
  });
75
73
 
76
- const conditionTimeout = typeof promise === 'function' ? promiseFromCallback<T>(promise) : promise;
77
- return await Promise.race([conditionTimeout, timeoutPromise]).finally(() => {
74
+ return await Promise.race([promise, timeoutPromise]).finally(() => {
78
75
  clearTimeout(timeoutId);
79
76
  });
80
77
  };