@livequery/react 2.0.139 → 2.0.141

package/README.md

@@ -97,7 +97,7 @@ The hook must be used under a matching provider. If it is called outside the pro
 
 ## `useCollection`
 
-`useCollection<T>(ref, options)` creates one `LivequeryCollection<T>` for the component, initializes it when `ref` is truthy, and returns the collection instance.
+`useCollection<T>(ref, options)` creates a `LivequeryCollection<T>` for the current `ref`, initializes it when `ref` is truthy, and returns the collection instance. When `ref` changes, a fresh collection is created — its state is reset and reloaded for the new ref.
 
 Use it when a component needs the full collection API: reactive state plus methods such as querying or mutations.
 

package/dist/useCollection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useCollection.d.ts","sourceRoot":"","sources":["../src/useCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,KAAK,GAAG,EAAE,KAAK,0BAA0B,EAAE,MAAM,mBAAmB,CAAA;AAMlG,eAAO,MAAM,aAAa,GAAI,CAAC,SAAS,GAAG,EAAE,KAAK,MAAM,GAAG,SAAS,GAAG,EAAE,GAAG,IAAI,GAAG,KAAK,EAAE,UAAS,OAAO,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAM,2BAW7I,CAAA"}
+{"version":3,"file":"useCollection.d.ts","sourceRoot":"","sources":["../src/useCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,KAAK,GAAG,EAAE,KAAK,0BAA0B,EAAE,MAAM,mBAAmB,CAAA;AAMlG,eAAO,MAAM,aAAa,GAAI,CAAC,SAAS,GAAG,EAAE,KAAK,MAAM,GAAG,SAAS,GAAG,EAAE,GAAG,IAAI,GAAG,KAAK,EAAE,UAAS,OAAO,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAM,2BAa7I,CAAA"}

package/dist/useCollection.js

@@ -3,7 +3,9 @@ import { useMemo, useEffect } from "react";
 import { useLivequeryClient } from "./LivequeryClientContext.js";
 export const useCollection = (ref, options = {}) => {
     const client = useLivequeryClient();
-    const collection = useMemo(() => new LivequeryCollection(client, options), []);
+    // Recreate the collection whenever the ref (or client) changes so each ref gets a
+    // fresh, fully-reset instance instead of mutating one long-lived collection in place.
+    const collection = useMemo(() => new LivequeryCollection(client, options), [client, ref]);
     useEffect(() => {
         if (!ref || !client)
             return;

package/dist/useCollection.js.map

@@ -1 +1 @@
-{"version":3,"file":"useCollection.js","sourceRoot":"","sources":["../src/useCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAA6C,MAAM,mBAAmB,CAAA;AAClG,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAIhE,MAAM,CAAC,MAAM,aAAa,GAAG,CAAgB,GAA2C,EAAE,UAAkD,EAAE,EAAE,EAAE;IAC9I,MAAM,MAAM,GAAG,kBAAkB,EAAE,CAAA;IACnC,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,mBAAmB,CAAI,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAA;IACjF,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM;YAAE,OAAM;QAC3B,MAAM,MAAM,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;QACzC,OAAO,GAAG,EAAE;YACR,MAAM,EAAE,WAAW,EAAE,CAAA;QACzB,CAAC,CAAA;IACL,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,CAAA;IAC7B,OAAO,UAAU,CAAA;AACrB,CAAC,CAAA"}
+{"version":3,"file":"useCollection.js","sourceRoot":"","sources":["../src/useCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAA6C,MAAM,mBAAmB,CAAA;AAClG,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAIhE,MAAM,CAAC,MAAM,aAAa,GAAG,CAAgB,GAA2C,EAAE,UAAkD,EAAE,EAAE,EAAE;IAC9I,MAAM,MAAM,GAAG,kBAAkB,EAAE,CAAA;IACnC,kFAAkF;IAClF,sFAAsF;IACtF,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,mBAAmB,CAAI,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAA;IAC5F,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM;YAAE,OAAM;QAC3B,MAAM,MAAM,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;QACzC,OAAO,GAAG,EAAE;YACR,MAAM,EAAE,WAAW,EAAE,CAAA;QACzB,CAAC,CAAA;IACL,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,CAAA;IAC7B,OAAO,UAAU,CAAA;AACrB,CAAC,CAAA"}

package/dist/useObservable.d.ts

@@ -1,9 +1,10 @@
 import { Observable, BehaviorSubject } from "rxjs";
-export type MaybeFunction<T> = T | (() => T);
 type Source<T> = BehaviorSubject<T> | Observable<T>;
-type ObservableSource<T> = MaybeFunction<Source<T>> | undefined;
+type ObservableSource<T> = Source<T> | undefined;
+type Factory<T> = () => ObservableSource<T>;
+type Input<T> = ObservableSource<T> | Factory<T>;
 export declare function useObservable<T>(o: BehaviorSubject<T>): T;
-export declare function useObservable<T>(o: ObservableSource<T>): T | undefined;
-export declare function useObservable<T>(o: ObservableSource<T>, default_value: T): T;
+export declare function useObservable<T>(o: Input<T>): T | undefined;
+export declare function useObservable<T>(o: Input<T>, default_value: T): T;
 export {};
 //# sourceMappingURL=useObservable.d.ts.map

package/dist/useObservable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useObservable.d.ts","sourceRoot":"","sources":["../src/useObservable.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,eAAe,EAAO,MAAM,MAAM,CAAC;AAGxD,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;AAE5C,KAAK,MAAM,CAAC,CAAC,IAAI,eAAe,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA;AACnD,KAAK,gBAAgB,CAAC,CAAC,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA;AAU/D,wBAAgB,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;AAC1D,wBAAgB,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,SAAS,CAAA;AACvE,wBAAgB,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,GAAG,CAAC,CAAA"}
+{"version":3,"file":"useObservable.d.ts","sourceRoot":"","sources":["../src/useObservable.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,eAAe,EAAO,MAAM,MAAM,CAAC;AAGxD,KAAK,MAAM,CAAC,CAAC,IAAI,eAAe,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA;AACnD,KAAK,gBAAgB,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA;AAChD,KAAK,OAAO,CAAC,CAAC,IAAI,MAAM,gBAAgB,CAAC,CAAC,CAAC,CAAA;AAC3C,KAAK,KAAK,CAAC,CAAC,IAAI,gBAAgB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;AAiBhD,wBAAgB,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;AAC1D,wBAAgB,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,SAAS,CAAA;AAC5D,wBAAgB,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,GAAG,CAAC,CAAA"}

package/dist/useObservable.js

@@ -1,29 +1,41 @@
 import { useEffect, useRef, useState } from "react";
 import { Observable, BehaviorSubject, tap } from "rxjs";
 import { skip } from "rxjs/operators";
+// A value is "observable-like" if it exposes pipe/subscribe — this is what lets us tell a
+// real source (including the @livequery/rpc callable Proxy, which is a function that ALSO
+// exposes pipe/subscribe/getValue) apart from a plain lazy factory `() => source`.
+const isObservableLike = (x) => !!x && (typeof x === 'object' || typeof x === 'function')
+    && (typeof x.pipe === 'function' || typeof x.subscribe === 'function');
 const isBehaviorSubject = (source) => {
-    return typeof source?.getValue === 'function';
+    return isObservableLike(source) && typeof source.getValue === 'function';
 };
 const hasPipe = (source) => {
     return typeof source?.pipe === 'function';
 };
+// `o` is either the source directly (BehaviorSubject / Observable, incl. the callable RPC
+// proxy) or a lazy factory `() => source`. A plain function WITHOUT pipe/subscribe is treated
+// as a factory and resolved exactly once — so it subscribes a single time even when the caller
+// passes a fresh arrow on every render. While there is no value yet the hook returns
+// `default_value` (or `undefined`).
 export function useObservable(o, default_value) {
-    const lazySource = useRef(undefined);
-    const source = typeof o === 'function'
-        ? lazySource.current ?? (lazySource.current = o())
-        : o;
+    const isFactory = typeof o === 'function' && !isObservableLike(o);
+    const resolved = useRef(null);
+    if (isFactory && !resolved.current)
+        resolved.current = { source: o() };
+    const source = isFactory ? resolved.current.source : o;
     const prev = useRef(source);
-    const [v, s] = useState(() => isBehaviorSubject(source) ? source.getValue() : default_value);
+    const withDefault = (value) => value ?? default_value;
+    const [v, s] = useState(() => withDefault(isBehaviorSubject(source) ? source.getValue() : default_value));
     useEffect(() => {
         const diff = prev.current !== source;
         prev.current = source;
         if (!hasPipe(source))
             return;
-        const subscription = source.pipe(skip(isBehaviorSubject(source) && !diff ? 1 : 0), tap(s)).subscribe();
+        const subscription = source.pipe(skip(isBehaviorSubject(source) && !diff ? 1 : 0), tap((value) => s(withDefault(value)))).subscribe();
         return () => {
             subscription.unsubscribe();
         };
-    }, typeof o === 'function' ? [] : [o]);
+    }, [source]);
     return v;
 }
 //# sourceMappingURL=useObservable.js.map

package/dist/useObservable.js.map

@@ -1 +1 @@
-{"version":3,"file":"useObservable.js","sourceRoot":"","sources":["../src/useObservable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAOtC,MAAM,iBAAiB,GAAG,CAAI,MAA6B,EAAgC,EAAE;IACzF,OAAO,OAAQ,MAAkD,EAAE,QAAQ,KAAK,UAAU,CAAA;AAC9F,CAAC,CAAA;AAED,MAAM,OAAO,GAAG,CAAI,MAA6B,EAAuB,EAAE;IACtE,OAAO,OAAQ,MAA6C,EAAE,IAAI,KAAK,UAAU,CAAA;AACrF,CAAC,CAAA;AAMD,MAAM,UAAU,aAAa,CAAI,CAAsB,EAAE,aAAiB;IACtE,MAAM,UAAU,GAAG,MAAM,CAAwB,SAAS,CAAC,CAAA;IAC3D,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,UAAU;QAClC,CAAC,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC;QAClD,CAAC,CAAC,CAAC,CAAA;IACP,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAA;IAC3B,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,QAAQ,CAAgB,GAAG,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAA;IAE3G,SAAS,CAAC,GAAG,EAAE;QACX,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,KAAK,MAAM,CAAA;QACpC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;QAErB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;YAAE,OAAM;QAE5B,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAC5B,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAChD,GAAG,CAAC,CAAC,CAAC,CACT,CAAC,SAAS,EAAE,CAAA;QACb,OAAO,GAAG,EAAE;YACR,YAAY,CAAC,WAAW,EAAE,CAAA;QAC9B,CAAC,CAAA;IACL,CAAC,EAAE,OAAO,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAEtC,OAAO,CAAC,CAAA;AACZ,CAAC"}
+{"version":3,"file":"useObservable.js","sourceRoot":"","sources":["../src/useObservable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAOtC,0FAA0F;AAC1F,0FAA0F;AAC1F,mFAAmF;AACnF,MAAM,gBAAgB,GAAG,CAAC,CAAU,EAAoB,EAAE,CACtD,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,KAAK,UAAU,CAAC;OACtD,CAAC,OAAQ,CAAS,CAAC,IAAI,KAAK,UAAU,IAAI,OAAQ,CAAS,CAAC,SAAS,KAAK,UAAU,CAAC,CAAA;AAE5F,MAAM,iBAAiB,GAAG,CAAI,MAAe,EAAgC,EAAE;IAC3E,OAAO,gBAAgB,CAAC,MAAM,CAAC,IAAI,OAAQ,MAAc,CAAC,QAAQ,KAAK,UAAU,CAAA;AACrF,CAAC,CAAA;AAED,MAAM,OAAO,GAAG,CAAI,MAAe,EAAuB,EAAE;IACxD,OAAO,OAAQ,MAA6C,EAAE,IAAI,KAAK,UAAU,CAAA;AACrF,CAAC,CAAA;AAMD,0FAA0F;AAC1F,8FAA8F;AAC9F,+FAA+F;AAC/F,qFAAqF;AACrF,oCAAoC;AACpC,MAAM,UAAU,aAAa,CAAI,CAAW,EAAE,aAAiB;IAC3D,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,UAAU,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAA;IACjE,MAAM,QAAQ,GAAG,MAAM,CAAyC,IAAI,CAAC,CAAA;IACrE,IAAI,SAAS,IAAI,CAAC,QAAQ,CAAC,OAAO;QAAE,QAAQ,CAAC,OAAO,GAAG,EAAE,MAAM,EAAG,CAAgB,EAAE,EAAE,CAAA;IACtF,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAQ,CAAC,MAAM,CAAC,CAAC,CAAE,CAAyB,CAAA;IAEhF,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAA;IAC3B,MAAM,WAAW,GAAG,CAAC,KAA2B,EAAiB,EAAE,CAC/D,KAAK,IAAI,aAAa,CAAA;IAC1B,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,QAAQ,CAAgB,GAAG,EAAE,CACxC,WAAW,CAAC,iBAAiB,CAAI,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAChF,CAAA;IAED,SAAS,CAAC,GAAG,EAAE;QACX,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,KAAK,MAAM,CAAA;QACpC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;QAErB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;YAAE,OAAM;QAE5B,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAC5B,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAChD,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,KAA6B,CAAC,CAAC,CAAC,CAChE,CAAC,SAAS,EAAE,CAAA;QACb,OAAO,GAAG,EAAE;YACR,YAAY,CAAC,WAAW,EAAE,CAAA;QAC9B,CAAC,CAAA;IACL,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAA;IAEZ,OAAO,CAAC,CAAA;AACZ,CAAC"}

package/package.json

@@ -4,7 +4,7 @@
     "url": "https://github.com/livequery/react"
   },
   "type": "module",
-  "version": "2.0.139",
+  "version": "2.0.141",
   "description": "",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -49,14 +49,14 @@
     "dist/**/*"
   ],
   "devDependencies": {
-    "@livequery/client": "^2.0.139",
+    "@livequery/client": "^2.0.141",
     "@types/bun": "^1.3.14",
     "@types/react": "^19.2.14",
     "@types/react-test-renderer": "^19.1.0",
     "react-test-renderer": "^19.2.6"
   },
   "peerDependencies": {
-    "@livequery/client": "^2.0.139",
+    "@livequery/client": "^2.0.141",
     "react": "^19.2.5",
     "rxjs": "^7.8.2"
   },