@dxos/async 0.8.4-main.3f58842 → 0.8.4-main.548089c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/async",
-  "version": "0.8.4-main.3f58842",
+  "version": "0.8.4-main.548089c",
   "description": "Async utilities.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,12 +10,12 @@
   "type": "module",
   "exports": {
     ".": {
+      "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": {
         "require": "./dist/lib/node/index.cjs",
         "default": "./dist/lib/node-esm/index.mjs"
-      },
-      "types": "./dist/types/src/index.d.ts"
+      }
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -29,12 +29,12 @@
   "dependencies": {
     "zen-observable": "^0.10.0",
     "zen-push": "^0.3.1",
-    "@dxos/debug": "0.8.4-main.3f58842",
-    "@dxos/context": "0.8.4-main.3f58842",
-    "@dxos/invariant": "0.8.4-main.3f58842",
-    "@dxos/log": "0.8.4-main.3f58842",
-    "@dxos/util": "0.8.4-main.3f58842",
-    "@dxos/node-std": "0.8.4-main.3f58842"
+    "@dxos/context": "0.8.4-main.548089c",
+    "@dxos/debug": "0.8.4-main.548089c",
+    "@dxos/invariant": "0.8.4-main.548089c",
+    "@dxos/node-std": "0.8.4-main.548089c",
+    "@dxos/log": "0.8.4-main.548089c",
+    "@dxos/util": "0.8.4-main.548089c"
   },
   "devDependencies": {
     "@types/zen-observable": "^0.8.3"

package/src/debounce.ts

@@ -4,6 +4,32 @@
 
 type Callback = (...args: any[]) => void;
 
+/**
+ * Delay callback execution by a specified time.
+ * Unlike debounce, subsequent calls during the delay period are ignored.
+ *
+ * @param cb Callback to invoke.
+ * @param delay Time to wait before invoking the callback.
+ * @returns A new function that schedules the callback once and ignores subsequent calls until executed.
+ */
+export const delay = <CB extends Callback>(cb: CB, delay = 100): CB => {
+  let pending = false;
+  return ((...args: any[]) => {
+    if (pending) {
+      return;
+    }
+
+    pending = true;
+    setTimeout(() => {
+      try {
+        cb(...args);
+      } finally {
+        pending = false;
+      }
+    }, delay);
+  }) as CB;
+};
+
 /**
  * Debounce callback.
  *
@@ -39,12 +65,34 @@ export const throttle = <CB extends Callback>(cb: CB, delay = 100): CB => {
 
 /**
  * Debounce and throttle callback.
+ * Executes immediately on the first call (throttle), prevents calls during the throttle window,
+ * and ensures a final call happens after activity stops (debounce).
+ *
+ * @param cb Callback to invoke.
+ * @param delay Time window for both throttle and debounce.
+ * @returns A new function that combines throttle and debounce behavior.
  */
 export const debounceAndThrottle = <CB extends Callback>(cb: CB, delay = 100): CB => {
-  const debounced = debounce(cb, delay);
-  const throttled = throttle(cb, delay);
+  let timeout: ReturnType<typeof setTimeout>;
+  let lastCall = 0;
+
   return ((...args: any[]) => {
-    debounced(...args);
-    throttled(...args);
+    const now = Date.now();
+    const delta = now - lastCall;
+
+    // Clear any pending debounced call.
+    clearTimeout(timeout);
+
+    // Throttle: execute immediately if enough time has passed.
+    if (delta >= delay) {
+      cb(...args);
+      lastCall = now;
+    } else {
+      // Debounce: schedule to execute after the remaining time.
+      timeout = setTimeout(() => {
+        cb(...args);
+        lastCall = Date.now();
+      }, delay - delta);
+    }
   }) as CB;
 };

package/src/event-emitter.test.ts

@@ -3,6 +3,7 @@
 //
 
 import { EventEmitter } from 'node:events';
+
 import { describe, expect, test } from 'vitest';
 
 import { onEvent, waitForEvent } from './event-emitter';

package/src/persistent-lifecycle.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { describe, expect, test, onTestFinished } from 'vitest';
+import { describe, expect, onTestFinished, test } from 'vitest';
 
 import { log } from '@dxos/log';
 

package/src/task-scheduling.ts

@@ -2,7 +2,7 @@
 // Copyright 2022 DXOS.org
 //
 
-import { ContextDisposedError, type Context } from '@dxos/context';
+import { type Context, ContextDisposedError } from '@dxos/context';
 import { StackTrace } from '@dxos/debug';
 import { type MaybePromise } from '@dxos/util';
 

package/src/testing.test.ts

@@ -6,7 +6,7 @@ import { describe, expect, test } from 'vitest';
 
 import { expectToThrow, raise } from '@dxos/debug';
 
-import { waitForCondition, until } from './testing';
+import { until, waitForCondition } from './testing';
 import { sleep } from './timeout';
 
 describe('waitForCondition', () => {