shelving 1.56.0 → 1.57.0

package/package.json

@@ -11,7 +11,7 @@
 		"state-management",
 		"query-builder"
 	],
-	"version": "1.56.0",
+	"version": "1.57.0",
 	"repository": "https://github.com/dhoulb/shelving",
 	"author": "Dave Houlbrooke <dave@shax.com>",
 	"license": "0BSD",

package/stream/LazyState.d.ts

@@ -1,12 +1,11 @@
-import type { Observer } from "../util/index.js";
+import { Observer } from "../util/index.js";
 import { State } from "./State.js";
 /**
  * State that tidies up after itself by completing itself after all its subscribers unsubscribe.
  * @param delay How long to wait (in ms) before the source subscription is stopped.
  */
 export declare class LazyState<T> extends State<T> {
-    private _delay;
-    private _timeout?;
-    constructor(delay?: number);
+    private _timeout;
+    constructor(delay?: number | null);
     _removeObserver(observer: Observer<T>): void;
 }

package/stream/LazyState.js

@@ -1,24 +1,23 @@
+import { Timeout } from "../util/index.js";
 import { State } from "./State.js";
 /**
  * State that tidies up after itself by completing itself after all its subscribers unsubscribe.
  * @param delay How long to wait (in ms) before the source subscription is stopped.
  */
 export class LazyState extends State {
-    constructor(delay = 0) {
+    constructor(delay = null) {
         super();
-        this._delay = delay;
+        this._timeout = delay ? new Timeout(delay) : null;
     }
     // Override to stop the source subscription when the last subscriber unsubscribes.
     _removeObserver(observer) {
         super._removeObserver(observer);
-        if (this._delay) {
+        if (this._timeout) {
             // Maybe stop in a bit (if there are still no subscribers).
-            if (this._timeout)
-                clearTimeout(this._timeout);
-            this._timeout = setTimeout(() => {
+            this._timeout.set(() => {
                 if (!this._observers.size && !this.closed)
                     this.complete();
-            }, this._delay);
+            });
         }
         else {
             // Stop now.

package/util/async.d.ts

@@ -59,7 +59,3 @@ export declare class Signal extends AbstractPromise<typeof DONE> {
     /** Send this signal now. */
     done(): void;
 }
-/** Resolve to `DONE` after a specified delay. */
-export declare class Timeout extends AbstractPromise<typeof DONE> {
-    constructor(ms: number);
-}

package/util/async.js

@@ -95,10 +95,3 @@ export class Signal extends AbstractPromise {
         this._resolve(DONE);
     }
 }
-/** Resolve to `DONE` after a specified delay. */
-export class Timeout extends AbstractPromise {
-    constructor(ms) {
-        super();
-        setTimeout(this._resolve, ms, DONE);
-    }
-}

package/util/index.d.ts

@@ -31,6 +31,7 @@ export * from "./serialise.js";
 export * from "./sort.js";
 export * from "./string.js";
 export * from "./template.js";
+export * from "./timeout.js";
 export * from "./transform.js";
 export * from "./undefined.js";
 export * from "./units.js";

package/util/index.js

@@ -31,6 +31,7 @@ export * from "./serialise.js";
 export * from "./sort.js";
 export * from "./string.js";
 export * from "./template.js";
+export * from "./timeout.js";
 export * from "./transform.js";
 export * from "./undefined.js";
 export * from "./units.js";

package/util/timeout.d.ts

@@ -0,0 +1,23 @@
+/**
+ * Create a new Timeout.
+ *
+ * Wrapper for `setTimeout()` that...
+ * - Keeps track of the reference returned from `setTimeout()`
+ * - Clears the any existing timeout when a new timeout is set.
+ * - Allows a default delay to be set that is applied to all new timeouts that don't have a delay set.
+ *
+ * @param ms The default delay for any created timeouts (in ms).
+ */
+export declare class Timeout {
+    private _ms;
+    private _timeout;
+    constructor(ms?: number);
+    /**
+     * Cancel any existing timeout and set a new one.
+     * @param callback
+     * @param ms The delay for this timeout (in ms).
+     */
+    set(callback: () => void, ms?: number): void;
+    /** Cancel any existing timeout.. */
+    clear(): void;
+}

package/util/timeout.js

@@ -0,0 +1,30 @@
+/**
+ * Create a new Timeout.
+ *
+ * Wrapper for `setTimeout()` that...
+ * - Keeps track of the reference returned from `setTimeout()`
+ * - Clears the any existing timeout when a new timeout is set.
+ * - Allows a default delay to be set that is applied to all new timeouts that don't have a delay set.
+ *
+ * @param ms The default delay for any created timeouts (in ms).
+ */
+export class Timeout {
+    constructor(ms = 0) {
+        this._timeout = undefined;
+        this._ms = ms;
+    }
+    /**
+     * Cancel any existing timeout and set a new one.
+     * @param callback
+     * @param ms The delay for this timeout (in ms).
+     */
+    set(callback, ms = this._ms) {
+        this.clear();
+        this._timeout = setTimeout(callback, ms);
+    }
+    /** Cancel any existing timeout.. */
+    clear() {
+        if (this._timeout)
+            this._timeout = void clearTimeout(this._timeout);
+    }
+}