@livequery/react 1.0.96 → 1.0.99

package/build/useCollectionData.d.ts

@@ -1,36 +1,28 @@
 import { LivequeryBaseEntity, QueryOption } from "@livequery/types";
-import { CollectionOption } from "@livequery/client";
+import { CollectionObservable, CollectionOption, CollectionStream } from "@livequery/client";
+import { Subject } from 'rxjs';
 export type useCollectionDataOptions<T extends LivequeryBaseEntity = LivequeryBaseEntity> = CollectionOption<T> & {
     lazy?: boolean;
     filters: Partial<QueryOption<T>>;
     load_all: boolean;
 };
-export declare const useCollectionData: <T extends {
-    id: string;
-}>(ref: string | undefined | '' | null | false, collection_options?: Partial<useCollectionDataOptions<T>>) => {
-    filters: Partial<QueryOption<T>>;
-    loading: boolean;
+export type CollectionData<T extends LivequeryBaseEntity> = (CollectionStream<T> & Pick<CollectionObservable<T>, 'add' | 'fetch_more' | 'filter' | 'reload' | 'reset' | 'trigger' | 'update' | '$changes'> & {
+    empty: boolean;
+});
+export type CollectionRef = string | undefined | '' | null | false;
+export declare const useCollectionData: <T extends LivequeryBaseEntity>(ref: CollectionRef, collection_options?: Partial<useCollectionDataOptions<T>>) => CollectionData<T> | {
+    error: undefined;
+    $changes: Subject<unknown>;
+    add: () => void;
     empty: boolean;
-    add: <R = {
-        data: {
-            item: T;
-        };
-    }>(payload: Partial<T>) => Promise<R>;
+    filter: () => void;
     fetch_more: () => void;
-    filter: (filters: Partial<QueryOption<T>>) => void;
+    filters: {};
+    has_more: boolean;
+    items: never[];
     reload: () => void;
     reset: () => void;
-    trigger: <R_1>(name: string, payload?: object | undefined, trigger_document_id?: string | undefined, query?: {
-        [key: string]: string | number | boolean;
-    } | undefined) => Promise<R_1 | undefined>;
-    update: <R_2 = {
-        data: {
-            item: T;
-        };
-    }>({ id: update_payload_id, ...payload }: Partial<T>) => Promise<R_2 | undefined>;
-    $changes: import("rxjs").Subject<import("@livequery/types").UpdatedData<T>>;
-    items: import("@livequery/client").SmartQueryItem<T>[];
-    error?: import("@livequery/types").ErrorInfo | undefined;
-    has_more: boolean;
-    options: Partial<QueryOption<T>>;
+    trigger: () => void;
+    update: () => void;
+    loading: boolean;
 };

package/build/useCollectionData.js

@@ -1,36 +1,53 @@
 "use client";
-import { useEffect, useMemo } from "react";
+import { useEffect, useRef, useState } from "react";
 import { useLiveQueryContext } from "./LiveQueryContext.js";
-import { useObservable } from "./useObservable.js";
 import { CollectionObservable } from "@livequery/client";
+import { Subject } from 'rxjs';
 function assert(fn, thiss) {
     return (fn || (() => { })).bind(thiss);
 }
 export const useCollectionData = (ref, collection_options = {}) => {
+    if (typeof window == 'undefined' || !ref) {
+        return {
+            error: undefined,
+            $changes: new Subject(),
+            add: (() => { }),
+            empty: false,
+            filter: (() => { }),
+            fetch_more: (() => { }),
+            filters: {},
+            has_more: false,
+            items: [],
+            reload: (() => { }),
+            reset: (() => { }),
+            trigger: (() => { }),
+            update: (() => { }),
+            loading: false
+        };
+    }
     const { transporter } = useLiveQueryContext();
-    const client = useMemo(() => new CollectionObservable(ref, { transporter, ...collection_options }), [ref]);
-    const stream = useObservable(client, {
-        options: {},
+    const [stream, ss] = useState({
+        filters: {},
         items: [],
         has_more: false,
         loading: collection_options.lazy ? false : true,
         error: undefined
     });
-    const { loading, has_more, items, error } = stream;
+    const collection_ref = useRef();
     useEffect(() => {
-        try {
-            ref && !collection_options?.lazy && client?.fetch_more();
-        }
-        catch (e) {
-        }
+        const collection = collection_ref.current = new CollectionObservable(ref, { transporter, ...collection_options });
+        const subscription = collection.subscribe(data => {
+            collection_options.load_all && data.loading == false && data.has_more && collection?.fetch_more();
+            ss(data);
+        });
+        !collection_options?.lazy && collection?.fetch_more();
+        return () => subscription.unsubscribe();
     }, [ref]);
-    useEffect(() => {
-        collection_options.load_all && !loading && has_more && items.length > 0 && client?.fetch_more();
-    }, [loading]);
-    const empty = !!(ref && !error && items.length == 0 && !loading);
-    return {
+    const client = collection_ref.current;
+    const empty = !!(stream.loading && stream.items.length == 0);
+    const result = {
         ...stream,
-        filters: stream.options,
+        error: stream.error,
         loading: !!stream.loading,
         empty,
         add: assert(client?.add, client),
@@ -40,6 +57,7 @@ export const useCollectionData = (ref, collection_options = {}) => {
         reset: assert(client?.reset, client),
         trigger: assert(client?.trigger, client),
         update: assert(client?.update, client),
-        $changes: client?.$changes
+        $changes: client?.$changes || new Subject()
     };
+    return result;
 };

package/build/useDocumentData.d.ts

@@ -7,8 +7,8 @@ export declare const useDocumentData: <T extends {
     id: string;
 }>(ref: string | undefined | '' | null | false, options?: useDocumentDataOptions) => {
     item: import("@livequery/client").SmartQueryItem<T>;
-    loading: boolean;
+    loading: boolean | undefined;
     error: import("@livequery/types").ErrorInfo | undefined;
-    reload: () => void;
-    $changes: import("rxjs").Subject<import("@livequery/types").UpdatedData<T>>;
+    reload: (() => void) | (() => void);
+    $changes: import("rxjs").Subject<unknown> | import("rxjs").Subject<import("@livequery/types").UpdatedData<T>>;
 };

package/package.json

@@ -4,7 +4,7 @@
         "url": "https://github.com/livequery/react"
     },
     "type": "module",
-    "version": "1.0.96",
+    "version": "1.0.99",
     "description": "",
     "main": "build/index.js",
     "types": "build/index.d.ts",
@@ -12,7 +12,7 @@
         "build/**/*"
     ],
     "dependencies": {
-        "@livequery/client": "^1.0.53"
+        "@livequery/client": "^1.0.93"
     },
     "devDependencies": {
         "@livequery/types": "^1.0.82",

package/build/useObservable.d.ts

@@ -1,2 +0,0 @@
-import { Observable } from 'rxjs';
-export declare const useObservable: <T>(o: Observable<T> | null, default_value: T) => T;

package/build/useObservable.js

@@ -1,17 +0,0 @@
-"use client";
-import { useEffect, useState } from 'react';
-export const useObservable = (o, default_value) => {
-    const [s, ss] = useState();
-    useEffect(() => {
-        if (o) {
-            const subcription = o.subscribe(d => ss({ ...d }));
-            return () => {
-                subcription.unsubscribe();
-            };
-        }
-        else {
-            ss(undefined);
-        }
-    }, [o]);
-    return s || default_value;
-};