shelving 1.68.5 → 1.69.0

package/package.json

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

package/state/SelfClosingState.js

@@ -18,7 +18,10 @@ export class SelfClosingState extends State {
 export class DelayedSelfClosingState extends State {
     constructor(delay, ...args) {
         super(...args);
-        this._timeout = new Timeout(delay);
+        this._timeout = new Timeout(() => {
+            if (!this.closed)
+                this.complete();
+        }, delay);
     }
     // Override to clear the timeout when an observer is added.
     _addFirstObserver() {
@@ -26,9 +29,6 @@ export class DelayedSelfClosingState extends State {
     }
     // Override to close this state when the last observer is removed.
     _removeLastObserver() {
-        this._timeout.set(() => {
-            if (!this.closed)
-                this.complete();
-        });
+        this._timeout.set();
     }
 }

package/util/async.js

@@ -69,7 +69,7 @@ export async function callAsyncParallel(callback, items, ...args) {
 // Internal way for us to save `resolve()` and `reject()` from a new Promise used by `Deferred` and `ExtendablePromise`
 let resolve; // eslint-disable-line @typescript-eslint/no-explicit-any
 let reject;
-function saveResolveReject(x, // eslint-disable-line @typescript-eslint/no-explicit-any
+function _saveResolveReject(x, // eslint-disable-line @typescript-eslint/no-explicit-any
 y) {
     resolve = x;
     reject = y;
@@ -77,7 +77,7 @@ y) {
 /** Type of `Promise` with its `resolve()` and `reject()` methods exposed publicly. */
 export class Deferred extends Promise {
     constructor() {
-        super(saveResolveReject);
+        super(_saveResolveReject);
         this.resolve = resolve;
         this.reject = reject;
     }
@@ -90,7 +90,7 @@ export class Deferred extends Promise {
 /** Type of `Promise` with `._resolve()` and `._reject()` methods available. */
 export class AbstractPromise extends Promise {
     constructor() {
-        super(saveResolveReject);
+        super(_saveResolveReject);
         this._resolve = resolve;
         this._reject = reject;
     }

package/util/timeout.d.ts

@@ -1,3 +1,4 @@
+import type { Dispatch } from "./function.js";
 /**
  * Create a new Timeout.
  *
@@ -9,9 +10,10 @@
  * @param ms The default delay for any created timeouts (in ms).
  */
 export declare class Timeout {
+    private _callback;
     private _ms;
     private _timeout;
-    constructor(ms?: number);
+    constructor(callback?: Dispatch | null, ms?: number);
     /** Is a timeout currently set? */
     get exists(): boolean;
     /**
@@ -19,7 +21,8 @@ export declare class Timeout {
      * @param callback
      * @param ms The delay for this timeout (in ms).
      */
-    set(callback: () => void, ms?: number): void;
+    set(callback?: Dispatch | null, ms?: number): void;
+    private _run;
     /** Cancel any existing timeout.. */
     clear(): void;
 }

package/util/timeout.js

@@ -9,8 +9,14 @@
  * @param ms The default delay for any created timeouts (in ms).
  */
 export class Timeout {
-    constructor(ms = 0) {
-        this._timeout = undefined;
+    constructor(callback = null, ms = 0) {
+        this._timeout = null;
+        this._run = () => {
+            this._timeout = null;
+            if (this._callback)
+                this._callback();
+        };
+        this._callback = callback;
         this._ms = ms;
     }
     /** Is a timeout currently set? */
@@ -22,16 +28,22 @@ export class Timeout {
      * @param callback
      * @param ms The delay for this timeout (in ms).
      */
-    set(callback, ms = this._ms) {
+    set(callback = this._callback, ms = this._ms) {
         this.clear();
-        this._timeout = setTimeout(() => {
-            this._timeout = undefined;
-            callback();
-        }, ms);
+        this._timeout = setTimeout(_executeTimeout, ms, this, callback);
     }
     /** Cancel any existing timeout.. */
     clear() {
-        if (this._timeout)
-            this._timeout = void clearTimeout(this._timeout);
+        const timeout = this._timeout;
+        if (timeout) {
+            this._timeout = null;
+            clearTimeout(timeout);
+        }
     }
 }
+/** Actually execute the timeout. */
+function _executeTimeout(timeout, callback) {
+    timeout.clear();
+    if (callback)
+        callback();
+}