@livequery/react 1.0.85 → 1.0.86

package/build/hooks/createContextFromHook.d.ts

@@ -1,2 +1,2 @@
 import React, { PropsWithChildren } from 'react';
-export declare const createContextFromHook: <T, K>(fn: (props?: T) => K) => [() => K, ({ children, ...props }: React.PropsWithChildren<T>) => React.JSX.Element];
+export declare const createContextFromHook: <T, K>(fn: ((props: T) => K) | (() => K)) => [() => K, ({ children, ...props }: React.PropsWithChildren<T>) => React.JSX.Element];

package/build/useCollectionData.d.ts

@@ -1,5 +1,6 @@
 import { LivequeryBaseEntity, QueryOption } from "@livequery/types";
-import { CollectionOption } from "@livequery/client";
+import { CollectionOption, SmartQueryItem } from "@livequery/client";
+import { Subject } from 'rxjs';
 export type useCollectionDataOptions<T extends LivequeryBaseEntity = LivequeryBaseEntity> = CollectionOption<T> & {
     lazy?: boolean;
     filters: Partial<QueryOption<T>>;
@@ -8,22 +9,28 @@ 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>>) => {
-    items: import("@livequery/client").SmartQueryItem<T>[];
-    loading: boolean;
-    error: import("@livequery/types").ErrorInfo;
+    items: SmartQueryItem<T>[];
+    loading: boolean | undefined;
+    error: import("@livequery/types").ErrorInfo | null | undefined;
     has_more: boolean;
-    empty: boolean;
-    filters: Partial<QueryOption<T>>;
-    add: (payload: Partial<T>) => Promise<{
+    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: <T_1>(name: string, payload?: object, trigger_document_id?: string) => Promise<T_1>;
-    update: ({ id: update_payload_id, ...payload }: Partial<T>) => Promise<any>;
-    $changes: import("rxjs").Subject<import("@livequery/types").UpdatedData<T>>;
+    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>>;
 };

package/build/useCollectionData.js

@@ -3,33 +3,42 @@ 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 { transporter } = useLiveQueryContext();
-    const client = useMemo(() => ref && new CollectionObservable(ref, { transporter, ...collection_options }), [ref]);
-    const { loading, has_more, error, items, options } = useObservable(client, { options: {}, items: [], has_more: false, loading: collection_options.lazy ? false : true });
+    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;
     useEffect(() => {
-        ref && !collection_options?.lazy && client.fetch_more();
+        try {
+            ref && !collection_options?.lazy && client?.fetch_more();
+        }
+        catch (e) {
+        }
     }, [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 && Object.keys(items).length == 0 && loading === false,
+        empty: ref && !error && items.length == 0 && loading === false,
         filters: (options || {}),
         add: assert(client?.add, client),
-        fetch_more: assert(client?.fetch_more, 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
+        $changes: client?.$changes || new Subject()
     };
 };

package/build/useDocumentData.d.ts

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

package/build/useMonitor.d.ts

@@ -1,8 +1,8 @@
 type PromiseType<T> = T extends PromiseLike<infer U> ? U : T;
 export declare const useMonitor: <T extends (...args: any) => any>(fn: T) => {
     excute: T;
-    loading: boolean;
-    data: PromiseType<ReturnType<T>>;
+    loading: boolean | undefined;
+    data: PromiseType<ReturnType<T>> | null | undefined;
     error: any;
     vaild: boolean;
 };

package/build/useObservable.d.ts

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

package/build/useObservable.js

@@ -1,16 +1,14 @@
 "use client";
 import { useEffect, useState } from 'react';
 export const useObservable = (o, default_value) => {
-    let mounting = true;
-    const [s, ss] = useState(default_value);
+    const [s, ss] = useState();
     useEffect(() => {
-        if (!o)
-            return;
-        const subcription = o?.subscribe(d => ss({ ...d }));
-        return () => {
-            subcription?.unsubscribe();
-            mounting = false;
-        };
+        if (o) {
+            const subcription = o.subscribe(d => ss(d));
+            return () => {
+                subcription.unsubscribe();
+            };
+        }
     }, [o]);
-    return s;
+    return s || default_value;
 };

package/package.json

@@ -4,7 +4,7 @@
         "url": "https://github.com/livequery/react"
     },
     "type": "module",
-    "version": "1.0.85",
+    "version": "1.0.86",
     "description": "",
     "main": "build/index.js",
     "types": "build/index.d.ts",
@@ -15,9 +15,9 @@
         "@livequery/client": "^1.0.53"
     },
     "devDependencies": {
-        "react": "^17.0.2",
-        "@livequery/types": "^1.0.34",
-        "@types/react": "^17.0.11"
+        "@livequery/types": "^1.0.82",
+        "@types/react": "^17.0.11",
+        "react": "^17.0.2"
     },
     "peerDependencies": {
         "react": "^17.0.2"
@@ -28,5 +28,13 @@
         "deploy": "yarn build; git add .; git commit -m \"Update\"; git push origin master; npm publish --access public"
     },
     "author": "",
-    "license": "ISC"
-}
+    "license": "ISC",
+    "exports": {
+        ".": {
+            "import": {
+                "types": "./build/src/index.d.ts",
+                "default": "./build/src/index.js"
+            }
+        }
+    }
+}