@livequery/react 1.0.110 → 2.0.0

package/build/LiveQueryContext.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Transporter } from '@livequery/types';
 export type LiveQueryContextOption = {
     transporter: Transporter;

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)) => [() => K, ({ children, ...props }: React.PropsWithChildren<T>) => React.JSX.Element];
+export declare const createContextFromHook: <T, K>(fn: ((props: T) => K) | (() => K)) => [() => K, ({ children, ...props }: PropsWithChildren<T>) => React.JSX.Element];

package/build/hooks/createStaticContext.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export declare const createStaticContext: <T extends {}>() => [() => T, ({ children, ...props }: import("react").PropsWithChildren<{
     value: T;
 }>) => import("react").JSX.Element];

package/build/useCollectionData.d.ts

@@ -2,14 +2,14 @@ import { LivequeryBaseEntity, QueryOption } from "@livequery/types";
 import { CollectionObservable, CollectionOption, CollectionStream } from "@livequery/client";
 export type useCollectionDataOptions<T extends LivequeryBaseEntity = LivequeryBaseEntity> = CollectionOption<T> & {
     lazy?: boolean;
-    filters: Partial<QueryOption<T>>;
+    options: Partial<QueryOption<T>>;
     load_all: boolean;
 };
-export type CollectionData<T extends LivequeryBaseEntity> = (CollectionStream<T> & Pick<CollectionObservable<T>, 'add' | 'fetch_more' | 'filter' | 'reload' | 'reset' | 'trigger' | 'update' | '$changes'> & {
+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 type CollectionRef = string | undefined | '' | null | false;
-export declare const useCollectionData: <T extends LivequeryBaseEntity>(ref: CollectionRef, collection_options?: Partial<useCollectionDataOptions<T>> & {
-    vkl?: any;
-}) => CollectionData<T>;
+export declare const useCollectionData: <T extends LivequeryBaseEntity>(ref: CollectionRef, collection_options?: Partial<useCollectionDataOptions<T>>) => CollectionData<T>;

package/build/useCollectionData.js

@@ -11,12 +11,12 @@ export const useCollectionData = (ref, collection_options = {}) => {
     const { transporter } = useLiveQueryContext();
     const n = useRef(0);
     const lazy = collection_options.lazy;
-    const [version, set_version] = useState(0);
+    const [, set_version] = useState(0);
     const client = useSyncMemo(() => {
         const client = new CollectionObservable(ref, { transporter, ...collection_options });
         n.current = 0;
         const subscription = client.subscribe(data => {
-            if (collection_options.load_all && data.has_more) {
+            if (collection_options.load_all && data.paging.has?.next) {
                 client.fetch_more();
             }
             else {
@@ -30,19 +30,23 @@ export const useCollectionData = (ref, collection_options = {}) => {
         return [client, () => subscription.unsubscribe()];
     }, [ref]);
     const loaded = n.current > 0;
-    const empty = loaded && !client.value.loading && client.value.items.length == 0;
+    const $ = client.$.getValue();
+    const empty = loaded && !$.loading && $.items.length == 0;
     const result = {
-        ...client.value,
+        ...$,
         loaded,
         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),
-        reload: assert(client?.reload, 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
     };
     return result;
 };

package/build/useDocumentData.d.ts

@@ -1,13 +1,9 @@
-import { CollectionOption } from "@livequery/client";
+import { useCollectionDataOptions } from "./useCollectionData.js";
 import { LivequeryBaseEntity } from "@livequery/types";
-export type useDocumentDataOptions<T extends LivequeryBaseEntity = LivequeryBaseEntity> = Omit<CollectionOption<T>, 'filters'> & {
-    lazy?: boolean;
-};
-export declare const useDocumentData: <T extends {
-    id: string;
-}>(ref: string | undefined | '' | null | false, options?: useDocumentDataOptions) => {
+export type useDocumentDataOptions<T extends LivequeryBaseEntity = LivequeryBaseEntity> = Partial<Omit<useCollectionDataOptions<T>, 'filters'>>;
+export declare const useDocumentData: <T extends LivequeryBaseEntity>(ref: string | undefined | "" | null | false, config?: useDocumentDataOptions<T>) => {
     item: import("@livequery/client").SmartQueryItem<T>;
-    loading: boolean | undefined;
-    error: import("@livequery/types").ErrorInfo | undefined;
+    loading: import("@livequery/client").LoadingIndicator | undefined;
+    error: boolean | undefined;
     $changes: import("rxjs").Subject<import("@livequery/types").UpdatedData<T>>;
 };

package/build/useDocumentData.js

@@ -1,7 +1,7 @@
 "use client";
 import { useCollectionData } from "./useCollectionData.js";
-export const useDocumentData = (ref, options) => {
-    const { items, loading, error, $changes } = useCollectionData(ref, options);
+export const useDocumentData = (ref, config = {}) => {
+    const { items, loading, error, $changes } = useCollectionData(ref, config);
     return {
         item: items[0],
         loading,

package/package.json

@@ -4,7 +4,7 @@
         "url": "https://github.com/livequery/react"
     },
     "type": "module",
-    "version": "1.0.110",
+    "version": "2.0.0",
     "description": "",
     "main": "build/index.js",
     "types": "build/index.d.ts",
@@ -12,12 +12,14 @@
         "build/**/*"
     ],
     "dependencies": {
-        "@livequery/client": "^1.0.93"
+        "@livequery/client": "^2.0.0",
+        "rxjs": "^7.8.1"
     },
     "devDependencies": {
-        "@livequery/types": "^1.0.82",
+        "@livequery/types": "^2.0.0",
         "@types/react": "^17.0.11",
-        "react": "^17.0.2"
+        "react": "^17.0.2",
+        "typescript": "5.5.2"
     },
     "peerDependencies": {
         "react": "^18.0.0"