shelving 1.150.13 → 1.150.15

package/package.json

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

package/sequence/DeferredSequence.d.ts

@@ -20,6 +20,8 @@ export declare class DeferredSequence<T = void> extends AbstractSequence<T, void
     /** Reject the current deferred in the sequence. */
     reject(reason: unknown): void;
     private _nextReason;
+    /** Cancel the current resolution or rejection. */
+    cancel(): void;
     /** Fulfill the current deferred by resolving or rejecting it. */
     private _fulfill;
     next(): Promise<IteratorResult<T, void>>;

package/sequence/DeferredSequence.js

@@ -33,17 +33,25 @@ export class DeferredSequence extends AbstractSequence {
         queueMicrotask(() => this._fulfill());
     }
     _nextReason = _NOVALUE;
+    /** Cancel the current resolution or rejection. */
+    cancel() {
+        this._nextValue = _NOVALUE;
+        this._nextReason = _NOVALUE;
+    }
     /** Fulfill the current deferred by resolving or rejecting it. */
     _fulfill() {
         const { _deferred, _nextReason, _nextValue } = this;
-        this._deferred = undefined;
         this._nextReason = _NOVALUE;
         this._nextValue = _NOVALUE;
         if (_deferred) {
-            if (_nextReason !== _NOVALUE)
+            if (_nextReason !== _NOVALUE) {
+                this._deferred = undefined;
                 _deferred.reject(_nextReason);
-            else if (_nextValue !== _NOVALUE)
+            }
+            else if (_nextValue !== _NOVALUE) {
+                this._deferred = undefined;
                 _deferred.resolve(_nextValue);
+            }
         }
     }
     // Implement `AsyncIterator`

package/store/Store.d.ts

@@ -18,7 +18,7 @@ export declare class Store<T> implements AsyncIterable<T> {
     readonly next: DeferredSequence<T>;
     /** Current value of the store (or throw a promise that resolves when this store receives its next value or error). */
     get value(): T;
-    set value(value: T);
+    set value(value: T | typeof NONE);
     private _value;
     /** Is there a current value, or is it still loading. */
     get loading(): boolean;

package/store/Store.js

@@ -25,8 +25,13 @@ export class Store {
     }
     set value(value) {
         this._reason = undefined;
-        this._time = Date.now();
-        if (this._value === NONE || !this.equal(value, this._value)) {
+        if (value === NONE) {
+            this._time = undefined;
+            this._value = value;
+            this.next.cancel();
+        }
+        else if (this._value === NONE || !this.equal(value, this._value)) {
+            this._time = Date.now();
             this._value = value;
             this.next.resolve(value);
         }