shelving 1.109.1 → 1.109.3

package/db/ItemStore.js

@@ -27,13 +27,14 @@ export class ItemStore extends Store {
     }
     constructor(provider, collection, id) {
         const memory = getOptionalSource(CacheProvider, provider)?.memory;
-        const time = memory ? memory.getItemTime(collection, id) : undefined;
-        super(memory && typeof time === "number" ? memory.getItem(collection, id) : NONE, time);
+        const time = memory?.getItemTime(collection, id);
+        const value = memory && typeof time === "number" ? memory.getItem(collection, id) : NONE; // Use the value in the memory provider if it's cached, or use mark this store as loading otherwise (which will trigger `refresh()` below.
+        super(value, time);
         this.provider = provider;
         this.collection = collection;
         this.id = id;
         // Queue a request to refresh the value if it doesn't exist.
-        if (this.loading)
+        if (typeof time !== "number")
             this.refresh();
     }
     /** Refresh this store from the source provider. */

package/db/QueryStore.js

@@ -45,13 +45,15 @@ export class QueryStore extends Store {
     }
     constructor(provider, collection, query) {
         const memory = getOptionalSource(CacheProvider, provider)?.memory;
-        super(memory?.getQuery(collection, query) || NONE, memory?.getQueryTime(collection, query));
+        const time = memory?.getQueryTime(collection, query);
+        const value = memory?.getQuery(collection, query) || NONE; // Always use any matching items currently in the memory store (this might update when we call `refresh()` below).
+        super(value, time);
         this.provider = provider;
         this.collection = collection;
         this.query = query;
         this.limit = getLimit(query) ?? Infinity;
         // Queue a request to refresh the value if it doesn't exist.
-        if (this.loading)
+        if (typeof time !== "number")
             this.refresh();
     }
     /** Refresh this store from the source provider. */

package/package.json

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

package/react/createDataContext.d.ts

@@ -11,8 +11,8 @@ import { type Optional } from "../util/optional.js";
 export declare function createDataContext<T extends Database>(provider: AbstractProvider<T>): {
     readonly useItem: <K extends DataKey<T>>(collection: K, id: string) => ItemStore<T, K>;
     readonly useQuery: <K extends DataKey<T>>(collection: K, query: ItemQuery<T[K]>) => QueryStore<T, K>;
-    readonly useOptionalItem: <K extends DataKey<T>>(collection: K, id: Optional<string>) => ItemStore<T, K> | undefined;
-    readonly useOptionalQuery: <K extends DataKey<T>>(collection: K, query: Optional<ItemQuery<T[K]>>) => QueryStore<T, K> | undefined;
+    readonly useOptionalItem: <K extends DataKey<T>>(collection: Optional<K>, id: Optional<string>) => ItemStore<T, K> | undefined;
+    readonly useOptionalQuery: <K extends DataKey<T>>(collection: Optional<K>, query: Optional<ItemQuery<T[K]>>) => QueryStore<T, K> | undefined;
     readonly DataProvider: ({ children }: {
         children: React.ReactNode;
     }) => React.ReactElement;