@livequery/react 1.0.88 → 1.0.91

package/build/useCollectionData.d.ts

@@ -1,6 +1,5 @@
 import { LivequeryBaseEntity, QueryOption } from "@livequery/types";
-import { CollectionOption, SmartQueryItem } from "@livequery/client";
-import { Subject } from 'rxjs';
+import { CollectionObservable, CollectionOption, SmartQueryItem } from "@livequery/client";
 export type useCollectionDataOptions<T extends LivequeryBaseEntity = LivequeryBaseEntity> = CollectionOption<T> & {
     lazy?: boolean;
     filters: Partial<QueryOption<T>>;
@@ -8,29 +7,12 @@ export type useCollectionDataOptions<T extends LivequeryBaseEntity = LivequeryBa
 };
 export declare const useCollectionData: <T extends {
     id: string;
-}>(ref: string | undefined | '' | null | 0 | false, collection_options?: Partial<useCollectionDataOptions<T>>) => {
+}>(ref: string | undefined | '' | null | false, collection_options?: Partial<useCollectionDataOptions<T>>) => CollectionObservable<T> & {
     items: SmartQueryItem<T>[];
-    loading: boolean | undefined;
-    error: import("@livequery/types").ErrorInfo | null | undefined;
+    error?: import("@livequery/types").ErrorInfo | undefined;
     has_more: boolean;
-    empty: boolean | "" | 0 | null | undefined;
-    filters: Partial<QueryOption<T>> | {};
-    add: <R = {
-        data: {
-            item: T;
-        };
-    }>(payload: Partial<T>) => Promise<R>;
-    fetch_more: () => void;
-    filter: (filters: Partial<QueryOption<T>>) => void;
-    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: Subject<import("@livequery/types").UpdatedData<T>>;
+    loading?: boolean | undefined;
+    options: Partial<QueryOption<T>>;
+} & {
+    empty: boolean | "" | null | undefined;
 };

package/build/useCollectionData.js

@@ -3,16 +3,14 @@ import { useEffect, useMemo } from "react";
 import { useLiveQueryContext } from "./LiveQueryContext";
 import { useObservable } from "./useObservable";
 import { CollectionObservable } from "@livequery/client";
-import { Subject } from 'rxjs';
 function assert(fn, thiss) {
     return (fn || (() => { })).bind(thiss);
 }
 export const useCollectionData = (ref, collection_options = {}) => {
-    const lqct = useLiveQueryContext();
-    const transporter = lqct;
-    const client = useMemo(() => ref ? new CollectionObservable(ref, { transporter, ...collection_options }) : null, [ref]);
-    const data = useObservable(client) || { options: {}, items: [], has_more: false, loading: false, error: null };
-    const { loading, has_more, error, items, options } = data;
+    const { transporter } = useLiveQueryContext();
+    const client = useMemo(() => new CollectionObservable(ref, { transporter, ...collection_options }), [ref]);
+    const stream = useObservable(client, { options: {}, items: [], has_more: false, loading: false, error: undefined });
+    const { loading, has_more, items } = stream;
     useEffect(() => {
         try {
             ref && !collection_options?.lazy && client?.fetch_more();
@@ -21,24 +19,9 @@ export const useCollectionData = (ref, collection_options = {}) => {
         }
     }, [ref]);
     useEffect(() => {
-        // collection_options.load_all && !loading && has_more && items.length > 0 && client.fetch_more()
+        collection_options.load_all && !loading && has_more && items.length > 0 && client?.fetch_more();
     }, [loading]);
-    return {
-        items,
-        loading,
-        error,
-        has_more,
-        empty: ref && !error && items.length == 0 && loading === false,
-        filters: (options || {}),
-        add: assert(client?.add, client),
-        fetch_more: () => {
-            alert('Fetch more');
-        },
-        filter: assert(client?.filter, client),
-        reload: assert(client?.reload, client),
-        reset: assert(client?.reset, client),
-        trigger: assert(client?.trigger, client),
-        update: assert(client?.update, client),
-        $changes: client?.$changes || new Subject()
-    };
+    return Object.assign(client, stream, {
+        empty: ref && !stream.error && stream.items.length == 0 && !stream.loading
+    });
 };

package/build/useDocumentData.d.ts

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

package/build/useObservable.d.ts

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

package/build/useObservable.js

@@ -9,6 +9,9 @@ export const useObservable = (o, default_value) => {
                 subcription.unsubscribe();
             };
         }
+        else {
+            ss(undefined);
+        }
     }, [o]);
     return s || default_value;
 };

package/package.json

@@ -4,7 +4,7 @@
         "url": "https://github.com/livequery/react"
     },
     "type": "module",
-    "version": "1.0.88",
+    "version": "1.0.91",
     "description": "",
     "main": "build/index.js",
     "types": "build/index.d.ts",
@@ -20,7 +20,7 @@
         "react": "^17.0.2"
     },
     "peerDependencies": {
-        "react": "^17.0.2"
+        "react": "^18.0.0"
     },
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",