@livequery/react 1.0.95 → 1.0.97

package/build/LiveQueryContext.js

@@ -1,3 +1,3 @@
 "use client";
-import { createContextFromHook } from './hooks/createContextFromHook';
+import { createContextFromHook } from './hooks/createContextFromHook.js';
 export const [useLiveQueryContext, LiveQueryContextProvider] = createContextFromHook((props) => props);

package/build/hooks/createStaticContext.js

@@ -1,3 +1,3 @@
 "use client";
-import { createContextFromHook } from './createContextFromHook';
+import { createContextFromHook } from './createContextFromHook.js';
 export const createStaticContext = () => createContextFromHook((props) => props.value);

package/build/index.d.ts

@@ -1,6 +1,6 @@
-export * from "./useDocumentData";
-export * from './useCollectionData';
-export * from './useMonitor';
-export * from "./LiveQueryContext";
-export * from './hooks/createContextFromHook';
-export * from './hooks/createStaticContext';
+export * from "./useDocumentData.js";
+export * from './useCollectionData.js';
+export * from './useMonitor.js';
+export * from "./LiveQueryContext.js";
+export * from './hooks/createContextFromHook.js';
+export * from './hooks/createStaticContext.js';

package/build/index.js

@@ -1,6 +1,6 @@
-export * from "./useDocumentData";
-export * from './useCollectionData';
-export * from './useMonitor';
-export * from "./LiveQueryContext";
-export * from './hooks/createContextFromHook';
-export * from './hooks/createStaticContext';
+export * from "./useDocumentData.js";
+export * from './useCollectionData.js';
+export * from './useMonitor.js';
+export * from "./LiveQueryContext.js";
+export * from './hooks/createContextFromHook.js';
+export * from './hooks/createStaticContext.js';

package/build/useCollectionData.d.ts

@@ -1,36 +1,12 @@
 import { LivequeryBaseEntity, QueryOption } from "@livequery/types";
-import { CollectionOption } from "@livequery/client";
+import { CollectionObservable, CollectionOption, CollectionStream } from "@livequery/client";
 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;
-    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: 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>>;
-};
+});
+export type CollectionRef = string | undefined | '' | null | false;
+export declare const useCollectionData: <T extends LivequeryBaseEntity>(ref: CollectionRef, collection_options?: Partial<useCollectionDataOptions<T>>) => CollectionData<T>;

package/build/useCollectionData.js

@@ -1,16 +1,34 @@
 "use client";
 import { useEffect, useMemo } from "react";
-import { useLiveQueryContext } from "./LiveQueryContext";
-import { useObservable } from "./useObservable";
+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') {
+        return {
+            $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: {},
+        filters: {},
         items: [],
         has_more: false,
         loading: collection_options.lazy ? false : true,
@@ -28,9 +46,8 @@ export const useCollectionData = (ref, collection_options = {}) => {
         collection_options.load_all && !loading && has_more && items.length > 0 && client?.fetch_more();
     }, [loading]);
     const empty = !!(ref && !error && items.length == 0 && !loading);
-    return {
+    const result = {
         ...stream,
-        filters: stream.options,
         loading: !!stream.loading,
         empty,
         add: assert(client?.add, client),
@@ -42,4 +59,5 @@ export const useCollectionData = (ref, collection_options = {}) => {
         update: assert(client?.update, client),
         $changes: client?.$changes
     };
+    return result;
 };

package/build/useDocumentData.d.ts

@@ -7,7 +7,7 @@ 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>>;

package/build/useDocumentData.js

@@ -1,5 +1,5 @@
 "use client";
-import { useCollectionData } from "./useCollectionData";
+import { useCollectionData } from "./useCollectionData.js";
 export const useDocumentData = (ref, options) => {
     const { items, loading, error, reload, $changes } = useCollectionData(ref, options);
     return {

package/package.json

@@ -4,7 +4,7 @@
         "url": "https://github.com/livequery/react"
     },
     "type": "module",
-    "version": "1.0.95",
+    "version": "1.0.97",
     "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",