@livequery/react 2.0.1 → 2.0.6

package/build/useCollectionData.d.ts

@@ -8,8 +8,13 @@ export type useCollectionDataOptions<T extends LivequeryBaseEntity = LivequeryBa
 export type CollectionRef = string | undefined | '' | null | false;
 export type CollectionData<T extends LivequeryBaseEntity> = (CollectionStream<T> & Pick<CollectionObservable<T>, 'add' | 'fetch_more' | 'fetch_prev' | 'reset' | 'trigger' | 'update' | '$changes' | 'filter'> & {
     empty: boolean;
-    loaded: boolean;
     ref: CollectionRef;
     filters: CollectionStream<T>['options'];
 });
-export declare const useCollectionData: <T extends LivequeryBaseEntity>(ref: CollectionRef, collection_options?: Partial<useCollectionDataOptions<T>>) => CollectionData<T>;
+export declare const useCollectionData: <T extends LivequeryBaseEntity>(ref: CollectionRef, collection_options?: Partial<useCollectionDataOptions<T>>) => CollectionStream<T> & Pick<CollectionObservable<T>, "add" | "fetch_more" | "fetch_prev" | "reset" | "trigger" | "update" | "$changes" | "filter"> & {
+    empty: boolean;
+    ref: CollectionRef;
+    filters: Partial<QueryOption<T>>;
+} & {
+    state: number;
+};

package/build/useCollectionData.js

@@ -1,57 +1,49 @@
 "use client";
-import { useEffect, useRef, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { useLiveQueryContext } from "./LiveQueryContext.js";
 import { CollectionObservable } from "@livequery/client";
 import { Subject } from 'rxjs';
-import { useSyncMemo } from "./hooks/useSyncMemo.js";
 function assert(fn, thiss) {
     return (fn || (() => { })).bind(thiss);
 }
 export const useCollectionData = (ref, collection_options = {}) => {
     const { transporter } = useLiveQueryContext();
-    const n = useRef(0);
-    const lazy = collection_options.lazy;
-    const [, set_version] = useState(0);
-    const client = useSyncMemo(() => {
-        n.current = 0;
-        const client = new CollectionObservable(ref, { transporter, ...collection_options });
-        const a = client.$changes.subscribe(changes => {
-            n.current++;
-        });
-        const subscription = client.subscribe(data => {
-            if (!lazy && collection_options.load_all && data.paging.has?.next) {
+    const client = useMemo(() => new CollectionObservable(ref, { transporter, ...collection_options }), [ref]);
+    const [$, set_$] = useState(client.getValue());
+    const [state, set_state] = useState(0);
+    // Sync stream effect
+    useEffect(() => {
+        if (collection_options.lazy)
+            return;
+        client.fetch_more();
+        const s = client.subscribe(data => {
+            if (collection_options.load_all && data.paging.has?.next) {
                 client.fetch_more();
             }
             else {
-                set_version(Math.random());
+                set_$(data);
+                set_state(Date.now());
             }
         });
-        return [client, () => {
-                subscription.unsubscribe();
-                a.unsubscribe();
-            }];
-    }, [ref]);
-    const loaded = n.current > 0;
-    const $ = client.$.getValue();
-    const empty = loaded && !$.loading && $.items.length == 0;
+        return () => {
+            s.unsubscribe();
+        };
+    }, [client, set_$, collection_options.lazy, set_state]);
+    const empty = !!(!$.loading && $.items.length == 0);
     const result = {
         ...$,
-        loaded,
+        state,
         empty,
         filters: $.options,
         add: assert(client?.add, client),
         fetch_more: assert(client?.fetch_more, client),
         fetch_prev: assert(client?.fetch_prev, client),
         filter: assert(client?.filter, client),
-        // fetch_around_cursor: assert(client?.fetch_around_cursor, client),
         reset: assert(client?.reset, client),
         trigger: assert(client?.trigger, client),
         update: assert(client?.update, client),
         $changes: client?.$changes || new Subject(),
         ref
     };
-    useEffect(() => {
-        !lazy && !loaded && client.fetch_more();
-    }, [lazy]);
     return result;
 };

package/package.json

@@ -4,7 +4,7 @@
         "url": "https://github.com/livequery/react"
     },
     "type": "module",
-    "version": "2.0.1",
+    "version": "2.0.6",
     "description": "",
     "main": "build/index.js",
     "types": "build/index.d.ts",