shelving 1.65.0 → 1.65.1

package/package.json

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

package/react/useDocument.js

@@ -16,7 +16,7 @@ export class DocumentState extends State {
         this._table = findSourceProvider(ref.db.provider, CacheProvider).memory.getTable(ref);
         this.ref = ref;
         // If the result is cached use it as the initial value.
-        const isCached = this._table.getDocumentTime(ref.id) !== undefined;
+        const isCached = typeof this._table.getDocumentTime(ref.id) === "number";
         if (isCached)
             this.next(this._table.getDocument(ref.id)); // Use the existing cached value.
         else

package/react/useQuery.js

@@ -56,7 +56,7 @@ export class QueryState extends State {
         this.ref = ref;
         this.limit = (_a = ref.limit) !== null && _a !== void 0 ? _a : Infinity;
         // If the result is cached use it as the initial value.
-        const isCached = this._table.getQueryTime(ref) !== undefined;
+        const isCached = typeof this._table.getQueryTime(ref) === "number";
         if (isCached)
             this.next(this._table.getQuery(ref)); // Use the existing cached value.
         else
@@ -117,7 +117,5 @@ const _getQueryState = (previous, ref) => !ref ? undefined : previous && isSameR
 export function useQuery(ref) {
     const state = useReduce(_getQueryState, ref);
     useSubscribe(state);
-    if (state && !state.exists)
-        dispatch(state.refresh); // Load the query if it isn't cached already.
     return state;
 }

package/react/useSubscribe.js

@@ -11,6 +11,6 @@ import { BLACKHOLE } from "../util/function.js";
  * - Memoise this value to persist the subscription for the lifetime of the component.
  */
 export function useSubscribe(subscribable) {
-    const setState = useState(subscribable instanceof State && subscribable.exists ? subscribable.value : NOVALUE)[1];
+    const setState = useState(subscribable instanceof State && !subscribable.loading ? subscribable.value : NOVALUE)[1];
     useEffect(subscribable ? () => subscribe(subscribable, { next: setState, error: setState }) : BLACKHOLE, [subscribable]);
 }

package/state/DataState.js

@@ -28,7 +28,7 @@ export class OptionalDataState extends State {
     get data() {
         if (this.reason !== NOERROR)
             throw this.reason;
-        if (!this.exists)
+        if (this.loading)
             throw awaitNext(this).then(getData);
         return getData(this.value);
     }

package/state/State.d.ts

@@ -23,7 +23,7 @@ export declare class State<T> extends Subject<T> implements Matchable<T, void> {
     /** State is initiated with an initial state. */
     constructor(...args: [] | [T]);
     /** Is there a current value, or is it still loading. */
-    get exists(): boolean;
+    get loading(): boolean;
     next(value: T): void;
     error(reason: Error | unknown): void;
     protected _addObserver(observer: Observer<T>): void;

package/state/State.js

@@ -30,8 +30,8 @@ export class State extends Subject {
         return this._value;
     }
     /** Is there a current value, or is it still loading. */
-    get exists() {
-        return this._value !== NOVALUE;
+    get loading() {
+        return this._value === NOVALUE;
     }
     // Override to only dispatch if the value changes.
     next(value) {