@peerbit/react 0.0.31 → 0.0.33

package/lib/esm/__tests__/useQuery.dom.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/esm/__tests__/useQuery.dom.test.js

@@ -0,0 +1,433 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import { describe, it, beforeEach, afterEach, expect } from "vitest";
+import { Peerbit } from "peerbit";
+import { field, variant } from "@dao-xyz/borsh";
+import { Documents } from "@peerbit/document";
+import { Program } from "@peerbit/program";
+import React, { useEffect } from "react";
+import { render, act, waitFor } from "@testing-library/react";
+import { useQuery } from "../useQuery.js";
+import sodium from "libsodium-wrappers";
+// Minimal Post model and Program with Documents for integration-like tests
+let Post = class Post {
+    id;
+    message;
+    constructor(props) {
+        if (!props)
+            return; // borsh
+        this.id = props.id ?? `${Date.now()}-${Math.random()}`;
+        this.message = props.message ?? "";
+    }
+};
+__decorate([
+    field({ type: "string" }),
+    __metadata("design:type", String)
+], Post.prototype, "id", void 0);
+__decorate([
+    field({ type: "string" }),
+    __metadata("design:type", String)
+], Post.prototype, "message", void 0);
+Post = __decorate([
+    variant(0),
+    __metadata("design:paramtypes", [Object])
+], Post);
+let PostIndexed = class PostIndexed {
+    id;
+    indexedMessage;
+    constructor(props) {
+        if (!props)
+            return; // borsh
+        this.id = props.id ?? `${Date.now()}-${Math.random()}`;
+        this.indexedMessage = props.message ?? "";
+    }
+};
+__decorate([
+    field({ type: "string" }),
+    __metadata("design:type", String)
+], PostIndexed.prototype, "id", void 0);
+__decorate([
+    field({ type: "string" }),
+    __metadata("design:type", String)
+], PostIndexed.prototype, "indexedMessage", void 0);
+PostIndexed = __decorate([
+    variant(0),
+    __metadata("design:paramtypes", [Post])
+], PostIndexed);
+let PostsDB = class PostsDB extends Program {
+    posts;
+    constructor() {
+        super();
+        this.posts = new Documents();
+    }
+    async open(args) {
+        await this.posts.open({
+            type: Post,
+            index: { type: PostIndexed },
+            replicate: args?.replicate ? { factor: 1 } : false,
+        });
+    }
+};
+__decorate([
+    field({ type: Documents }),
+    __metadata("design:type", Documents)
+], PostsDB.prototype, "posts", void 0);
+PostsDB = __decorate([
+    variant("posts-db"),
+    __metadata("design:paramtypes", [])
+], PostsDB);
+describe("useQuery (integration with Documents)", () => {
+    let peerWriter;
+    let peerReader;
+    let peerReader2;
+    let dbWriter;
+    let dbReader;
+    let dbReader2;
+    let autoUnmount;
+    beforeEach(async () => {
+        await sodium.ready;
+        peerWriter = await Peerbit.create();
+        peerReader = await Peerbit.create();
+        peerReader2 = undefined;
+        dbReader2 = undefined;
+    });
+    const setupConnected = async () => {
+        await peerWriter.dial(peerReader);
+        dbWriter = await peerWriter.open(new PostsDB(), {
+            existing: "reuse",
+            args: { replicate: true },
+        });
+        dbReader = await peerReader.open(dbWriter.address, {
+            args: { replicate: false },
+        });
+        // ensure reader knows about writer as replicator for the log
+        await dbReader.posts.log.waitForReplicator(peerWriter.identity.publicKey);
+    };
+    const setupDisconnected = async () => {
+        dbWriter = await peerWriter.open(new PostsDB(), {
+            existing: "reuse",
+            args: { replicate: true },
+        });
+        dbReader = await peerReader.open(dbWriter.clone(), {
+            args: { replicate: false },
+        });
+    };
+    afterEach(async () => {
+        // Unmount React trees before tearing down peers
+        autoUnmount?.();
+        autoUnmount = undefined;
+        await peerWriter?.stop();
+        await peerReader?.stop();
+        await peerReader2?.stop();
+    });
+    function renderUseQuery(db, options) {
+        const result = {};
+        function HookCmp({ opts, }) {
+            const hook = useQuery(db.posts, opts);
+            useEffect(() => {
+                result.current = hook;
+            }, [hook]);
+            return null;
+        }
+        const api = render(React.createElement(HookCmp, { opts: options }));
+        const rerender = (opts) => api.rerender(React.createElement(HookCmp, { opts }));
+        let hasUnmounted = false;
+        const doUnmount = () => {
+            if (hasUnmounted)
+                return;
+            hasUnmounted = true;
+            api.unmount();
+            if (autoUnmount === doUnmount) {
+                // clear outer reference if we still own it
+                autoUnmount = undefined;
+            }
+        };
+        // Expose to outer afterEach so tests don't need to remember calling unmount
+        autoUnmount = doUnmount;
+        return { result, rerender, unmount: doUnmount };
+    }
+    it("local query", async () => {
+        await setupConnected();
+        await dbWriter.posts.put(new Post({ message: "hello" }));
+        const { result } = renderUseQuery(dbWriter, {
+            query: {},
+            resolve: true,
+            local: true,
+            prefetch: true,
+        });
+        await waitFor(() => expect(result.current?.items?.length ?? 0).toBe(1));
+        await act(async () => {
+            expect(result.current.items.length).toBe(1);
+            expect(result.current.items[0].message).toBe("hello");
+        });
+    });
+    it("does not mutate the options object passed in", async () => {
+        await setupConnected();
+        const cfg = {
+            query: {},
+            resolve: true,
+            local: true,
+            remote: { reach: { eager: true }, wait: { timeout: 10_000 } },
+            prefetch: false,
+            batchSize: 10,
+        };
+        const cfgOrg = { ...cfg };
+        renderUseQuery(dbReader, cfg);
+        // expect that cfg has not been modified
+        expect(cfg).to.deep.equal(cfgOrg);
+    });
+    it("respects remote warmup before iterating", async () => {
+        await setupConnected();
+        await dbWriter.posts.put(new Post({ message: "hello" }));
+        const cfg = {
+            query: {},
+            resolve: true,
+            local: true,
+            remote: { reach: { eager: true }, wait: { timeout: 10_000 } },
+            prefetch: false,
+            batchSize: 10,
+        };
+        const { result, rerender } = renderUseQuery(dbReader, cfg);
+        await waitFor(() => {
+            if (!result.current)
+                throw new Error("no result yet");
+            return true;
+        });
+        expect(result.current.items.length).toBe(0);
+        await act(async () => {
+            await result.current.loadMore();
+        });
+        expect(result.current.items.length).toBe(1);
+        expect(result.current.items[0].message).toBe("hello");
+        await act(async () => {
+            rerender(cfg);
+        });
+        await act(async () => {
+            await result.current.loadMore();
+        });
+        await waitFor(() => expect(result.current.items.length).toBe(1));
+    });
+    it("honors remote.wait.timeout by resolving after connection", async () => {
+        // create isolated peers not connected yet
+        await setupDisconnected();
+        const { result } = renderUseQuery(dbReader, {
+            query: {},
+            resolve: true,
+            local: false,
+            remote: {
+                reach: { eager: true },
+                wait: { behavior: "block", timeout: 5_000 },
+            },
+            prefetch: true,
+        });
+        await waitFor(() => expect(result.current).toBeDefined());
+        // Now connect and write
+        await act(async () => {
+            await dbReader.node.dial(dbWriter.node.getMultiaddrs());
+            await dbWriter.posts.put(new Post({ message: "late" }));
+            await dbReader.posts.log.waitForReplicator(dbWriter.node.identity.publicKey);
+        });
+        await waitFor(() => expect(result.current.items.length).toBe(1));
+        expect(result.current.items[0].message).toBe("late");
+    });
+    it("pushes remote writes from replicator to non-replicator", async () => {
+        await setupConnected();
+        const { result } = renderUseQuery(dbReader, {
+            query: {},
+            resolve: true,
+            local: false,
+            remote: { reach: { eager: true } },
+            updates: { merge: true },
+            prefetch: false,
+        });
+        await waitFor(() => {
+            expect(result.current).toBeDefined();
+        });
+        expect(result.current.items.length).toBe(0);
+        await act(async () => {
+            await dbWriter.posts.put(new Post({ message: "replicator-push" }));
+        });
+        await act(async () => {
+            await result.current.loadMore();
+        });
+        await waitFor(() => expect(result.current.items.map((p) => p.message)).toContain("replicator-push"), { timeout: 10_000 });
+    });
+    it("fanouts pushed updates to multiple observers", async () => {
+        await setupConnected();
+        peerReader2 = await Peerbit.create();
+        await peerReader2.dial(peerWriter);
+        dbReader2 = await peerReader2.open(dbWriter.address, {
+            args: { replicate: false },
+        });
+        await dbReader2.posts.log.waitForReplicator(peerWriter.identity.publicKey);
+        const hookOne = renderUseQuery(dbReader, {
+            query: {},
+            resolve: true,
+            local: false,
+            remote: { reach: { eager: true } },
+            updates: { merge: true },
+            prefetch: false,
+        });
+        const hookTwo = renderUseQuery(dbReader2, {
+            query: {},
+            resolve: true,
+            local: false,
+            remote: { reach: { eager: true } },
+            updates: { merge: true },
+            prefetch: false,
+        });
+        await waitFor(() => {
+            expect(hookOne.result.current).toBeDefined();
+            expect(hookTwo.result.current).toBeDefined();
+        });
+        await act(async () => {
+            await dbWriter.posts.put(new Post({ message: "broadcast" }));
+        });
+        await act(async () => {
+            await hookOne.result.current.loadMore();
+            await hookTwo.result.current.loadMore();
+        });
+        await waitFor(() => expect(hookOne.result.current.items.some((p) => p.message === "broadcast")).toBe(true), { timeout: 10_000 });
+        await waitFor(() => expect(hookTwo.result.current.items.some((p) => p.message === "broadcast")).toBe(true), { timeout: 10_000 });
+        await act(async () => {
+            await dbReader.posts.put(new Post({ message: "observer-origin" }));
+        });
+        await act(async () => {
+            await hookOne.result.current.loadMore();
+            await hookTwo.result.current.loadMore();
+        });
+        await waitFor(() => expect(hookTwo.result.current.items.some((p) => p.message === "observer-origin")).toBe(true), { timeout: 10_000 });
+        hookOne.unmount();
+        hookTwo.unmount();
+    });
+    describe("merge", () => {
+        const checkAsResolvedResults = async (out, resolved) => {
+            const { result } = out;
+            await waitFor(() => expect(result.current).toBeDefined());
+            // Initially empty
+            expect(result.current.items.length).toBe(0);
+            // Create a post on writer and expect reader hook to merge it automatically
+            const id = `${Date.now()}-merge`;
+            await act(async () => {
+                // the reader actually does the put (a user)
+                await dbReader.posts.put(new Post({ id, message: "first" }));
+            });
+            await waitFor(() => expect(result.current.items.length).toBe(1), {
+                timeout: 1e4,
+            });
+            if (resolved) {
+                expect(result.current.items[0].message).toBe("first");
+                expect(result.current.items[0]).to.be.instanceOf(Post);
+            }
+            else {
+                expect(result.current.items[0].indexedMessage).toBe("first");
+                expect(result.current.items[0]).to.be.instanceOf(PostIndexed);
+            }
+        };
+        it("updates.merge merges new writes into state without manual iteration, as resolved", async () => {
+            await setupConnected();
+            // resolved undefined means we should resolve
+            await checkAsResolvedResults(renderUseQuery(dbReader, {
+                query: {},
+                local: false,
+                remote: { reach: { eager: true } },
+                prefetch: false,
+                updates: { merge: true },
+            }), true);
+            // resolved true means we should resolve
+            await checkAsResolvedResults(renderUseQuery(dbReader, {
+                query: {},
+                local: false,
+                resolve: true,
+                remote: { reach: { eager: true } },
+                prefetch: false,
+                updates: { merge: true },
+            }), true);
+            // resolved false means we should NOT resolve
+            await checkAsResolvedResults(renderUseQuery(dbReader, {
+                query: {},
+                local: false,
+                resolve: false,
+                remote: { reach: { eager: true } },
+                prefetch: false,
+                updates: { merge: true },
+            }), false);
+        });
+    });
+    /*
+    it("updates.merge reflects document mutation in hook state", async () => {
+        await setupConnected();
+
+        const id = `${Date.now()}-mut`;
+        await dbWriter.posts.put(new Post({ id, message: "v1" }));
+
+        const { result } = renderUseQuery(dbReader, {
+            query: {},
+            resolve: true,
+            local: false,
+            remote: { reach: { eager: true } },
+            prefetch: true,
+            updates: { merge: true },
+        });
+
+        await waitFor(() => expect(result.current.items.length).toBe(1), {
+            timeout: 1e4,
+        });
+        expect(result.current.items[0].message).toBe("v1");
+
+        // Mutate by putting a new version with the same id
+        await act(async () => {
+            // the reader actually does the put (a user)
+            await dbReader.posts.put(new Post({ id, message: "v2" }));
+        });
+
+        // Expect the hook state to reflect the updated content
+        await waitFor(
+            () => {
+                const found = result.current.items.find((p) => p.id === id);
+                expect(found?.message).toBe("v2");
+            },
+            { timeout: 1e4 }
+        );
+    });
+    */
+    it("clears results when props change (e.g. reverse toggled)", async () => {
+        await setupConnected();
+        await dbWriter.posts.put(new Post({ message: "one" }));
+        await dbWriter.posts.put(new Post({ message: "two" }));
+        const { result, rerender } = renderUseQuery(dbReader, {
+            query: {},
+            resolve: true,
+            local: true,
+            remote: false,
+            prefetch: true,
+            reverse: false,
+        });
+        await waitFor(() => expect(result.current.items.length).toBeGreaterThan(0));
+        // Toggle a prop that triggers iterator rebuild
+        await act(async () => {
+            rerender({
+                query: {},
+                resolve: true,
+                local: true,
+                remote: false,
+                prefetch: false,
+                reverse: true,
+            });
+        });
+        // After reset we expect cleared results until re-fetched
+        await waitFor(() => expect(result.current.items.length).toBe(0));
+        await act(async () => {
+            await result.current.loadMore();
+        });
+        await waitFor(() => expect(result.current.items.length).toBeGreaterThan(0));
+    });
+});
+//# sourceMappingURL=useQuery.dom.test.js.map

package/lib/esm/__tests__/useQuery.dom.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useQuery.dom.test.js","sourceRoot":"","sources":["../../../src/__tests__/useQuery.dom.test.ts"],"names":[],"mappings":"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"}

package/lib/esm/usePeer.d.ts

@@ -52,7 +52,7 @@ export type NetworkOption = {
 type NodeOptions = {
     type?: "node";
     network: "local" | "remote" | NetworkOption;
-    waitForConnnected?: boolean;
+    waitForConnnected?: boolean | "in-flight";
     keypair?: Ed25519Keypair;
     host?: boolean;
     singleton?: boolean;

package/lib/esm/usePeer.js

@@ -9,8 +9,8 @@ import sodium from "libsodium-wrappers";
 import { useMount } from "./useMount.js";
 import { createClient, createHost } from "@peerbit/proxy-window";
 import { webSockets } from "@libp2p/websockets";
-import * as filters from "@libp2p/websockets/filters";
 import { detectIncognito } from "detectincognitojs";
+import { waitFor } from "@testing-library/dom";
 const isInStandaloneMode = () => window.matchMedia("(display-mode: standalone)").matches ||
     window.navigator["standalone"] ||
     document.referrer.includes("android-app://");
@@ -183,21 +183,24 @@ export const PeerProvider = (options) => {
                                     denyDialMultiaddr: () => false,
                                 },
                                 transports: [
-                                    webSockets({ filter: filters.all }) /* ,
-                                  circuitRelayTransport(), */,
+                                    webSockets({}) /* ,
+                                    circuitRelayTransport(), */,
                                 ],
                             }
                             : {
+                                connectionGater: {
+                                    denyDialMultiaddr: () => false, // TODO do right here, dont allow local dials except bootstrap
+                                },
                                 transports: [
                                     webSockets() /* ,
-                                  circuitRelayTransport(), */,
+                                    circuitRelayTransport(), */,
                                 ],
                             }) /*
-                  services: {
-                      pubsub: (c) =>
-                          new DirectSub(c, { canRelayMessage: true }),
-                      identify: identify(),
-                  }, */,
+                    services: {
+                        pubsub: (c) =>
+                            new DirectSub(c, { canRelayMessage: true }),
+                        identify: identify(),
+                    }, */,
                     },
                     directory,
                 });
@@ -242,7 +245,7 @@ export const PeerProvider = (options) => {
                         }
                         // 3) Remote default: use bootstrap service (no explicit bootstrap provided)
                         else {
-                            await newPeer["bootstrap"]?.();
+                            await newPeer.bootstrap?.();
                         }
                         setConnectionState("connected");
                     }
@@ -277,9 +280,30 @@ export const PeerProvider = (options) => {
                     }
                     catch { }
                 });
-                if (nodeOptions.waitForConnnected !== false) {
+                if (nodeOptions.waitForConnnected === true) {
                     await promise;
                 }
+                else if (nodeOptions.waitForConnnected === "in-flight") {
+                    // wait for dialQueue to not be empty or connections to contains the peerId
+                    // or done
+                    let isDone = false;
+                    promise.finally(() => {
+                        isDone = true;
+                    });
+                    await waitFor(() => {
+                        if (isDone) {
+                            return true;
+                        }
+                        const libp2p = newPeer;
+                        if (libp2p.getDialQueue().length > 0) {
+                            return true;
+                        }
+                        if (libp2p.getConnections().length > 0) {
+                            return true;
+                        }
+                        return false;
+                    });
+                }
             }
             else {
                 // When in proxy mode (iframe), use the provided targetOrigin.

package/lib/esm/usePeer.js.map

@@ -1 +1 @@
-{"version":3,"file":"usePeer.js","sourceRoot":"","sources":["../../src/usePeer.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,EAAO,UAAU,EAAE,MAAM,OAAO,CAAC;AAE/C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EACH,cAAc,EACd,WAAW,EACX,QAAQ,EACR,0BAA0B,GAC7B,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,EAAE,IAAI,IAAI,EAAE,MAAM,MAAM,CAAC;AAElC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,MAAM,MAAM,oBAAoB,CAAC;AAExC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEjE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,KAAK,OAAO,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAC5B,MAAM,CAAC,UAAU,CAAC,4BAA4B,CAAC,CAAC,OAAO;IACvD,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC;IAC9B,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;AAEjD,MAAM,OAAO,eAAgB,SAAQ,KAAK;IACtC,YAAY,OAAe;QACvB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;IACpC,CAAC;CACJ;AAkCD,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACf,MAAM,CAAC,IAAI,GAAG,IAAI,EAAE,CAAC;AACzB,CAAC;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,CAAC,aAAa,CAAe,EAAS,CAAC,CAAC;AACxE,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;AAqCrD,MAAM,iBAAiB,GAAG,CAAC,EAAa,EAAE,EAAE;IACxC,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IACxC,MAAM,CAAC,gBAAgB,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;AAChD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,OAAoB,EAAE,EAAE;IACjD,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,KAAK,CAAC,QAAQ,CAClC,SAAS,CACZ,CAAC;IACF,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,KAAK,CAAC,QAAQ,CACxC,SAAS,CACZ,CAAC;IACF,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAU,KAAK,CAAC,CAAC;IACjE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAU,IAAI,CAAC,CAAC;IAC5D,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,GACvC,KAAK,CAAC,QAAQ,CAAmB,cAAc,CAAC,CAAC;IAErD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAS,CAAC,CAAC,CAAC,CAAC;IAE3D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAoB,SAAS,CAAC,CAAC,CAAC,kBAAkB;IAE1F,mEAAmE;IACnE,mFAAmF;IACnF,MAAM,WAAW,GACb,OACH,CAAC,GAAG;QACD,CAAC,CAAC,QAAQ,EAAE;YACR,CAAC,CAAE,OAA+B,CAAC,MAAM;YACzC,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,GAAI,OAA+B,CAAC,GAAG,EAAE,CAAC,mHAAmH;QACjL,CAAC,CAAE,OAAsB,CAAC;IAE9B,yDAAyD;IACzD,MAAM,oBAAoB,GACtB,WAAW,CAAC,IAAI,KAAK,OAAO;QACxB,CAAC,CAAE,WAA6B,CAAC,YAAY;QAC7C,CAAC,CAAC,SAAS,CAAC;IAEpB,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAe,GAAG,EAAE;QAC1C,IAAI,WAAW,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC/B,OAAO;gBACH,IAAI,EAAE,OAAO;gBACb,IAAI;gBACJ,OAAO;gBACP,OAAO;gBACP,MAAM,EAAE,eAAe;gBACvB,SAAS;gBACT,YAAY,EAAE,oBAA8B;gBAC5C,KAAK;aACR,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,OAAO;gBACH,IAAI,EAAE,MAAM;gBACZ,IAAI;gBACJ,OAAO;gBACP,OAAO;gBACP,MAAM,EAAE,eAAe;gBACvB,SAAS;gBACT,QAAQ;gBACR,KAAK;aACR,CAAC;QACN,CAAC;IACL,CAAC,EAAE;QACC,OAAO;QACP,OAAO;QACP,eAAe;QACf,IAAI;QACJ,SAAS;QACT,QAAQ;QACR,oBAAoB;QACpB,KAAK;KACR,CAAC,CAAC;IAEH,QAAQ,CAAC,GAAG,EAAE;QACV,UAAU,CAAC,IAAI,CAAC,CAAC;QACjB,MAAM,EAAE,GAAG,KAAK,IAAI,EAAE;YAClB,MAAM,MAAM,CAAC,KAAK,CAAC;YACnB,IAAI,OAAsB,CAAC;YAC3B,2DAA2D;YAC3D,IAAI,iBAAiB,GAAG,KAAK,CAAC;YAC9B,0EAA0E;YAC1E,MAAM,YAAY,GAAG,EAAE,OAAO,EAAE,IAAI,EAA0B,CAAC;YAE/D,IAAI,WAAW,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAC/B,MAAM,gBAAgB,GAAG,0BAA0B,EAAE,CAAC;gBAEtD,MAAM,SAAS,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;gBACzC,MAAM,KAAK,GAAG,IAAI,SAAS,CAAC;oBACxB,QAAQ,EAAE,SAAS;oBACnB,OAAO,EAAE,GAAG;iBACf,CAAC,CAAC;gBACH,IAAI,WAAW,CAAC,SAAS,EAAE,CAAC;oBACxB,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;oBACrC,IAAI,CAAC;wBACD,MAAM,OAAO,GAAG,OAAO,GAAG,YAAY,CAAC;wBACvC,iBAAiB,CAAC;4BACd,kCAAkC;4BAClC,YAAY,CAAC,OAAO,GAAG,KAAK,CAAC;4BAC7B,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;wBAC3B,CAAC,CAAC,CAAC;wBACH,gFAAgF;wBAChF,MAAM,YAAY,GAAG,GAAG,EAAE;4BACtB,IAAI,QAAQ,CAAC,eAAe,KAAK,QAAQ,EAAE,CAAC;gCACxC,YAAY,CAAC,OAAO,GAAG,KAAK,CAAC;gCAC7B,sCAAsC;gCACtC,IAAI,CAAC;oCACD,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gCAC3B,CAAC;gCAAC,MAAM,CAAC,CAAA,CAAC;4BACd,CAAC;wBACL,CAAC,CAAC;wBACF,QAAQ,CAAC,gBAAgB,CACrB,kBAAkB,EAClB,YAAY,CACf,CAAC;wBACF,IAAI,kBAAkB,EAAE,EAAE,CAAC;4BACvB,yCAAyC;4BACzC,YAAY,CAAC,OAAO,GAAG,KAAK,CAAC;4BAC7B,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;wBAC3B,CAAC;wBACD,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE;4BAClD,mBAAmB,EAAE,IAAI;yBAC5B,CAAC,CAAC;oBACP,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACb,OAAO,CAAC,KAAK,CAAC,iCAAiC,EAAE,KAAK,CAAC,CAAC;wBACxD,MAAM,IAAI,eAAe,CACrB,8BAA8B,CACjC,CAAC;oBACN,CAAC;gBACL,CAAC;gBAED,IAAI,MAAsB,CAAC;gBAC3B,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;oBACtB,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC;gBACjC,CAAC;qBAAM,CAAC;oBACJ,MAAM,EAAE,GAAG,MAAM,cAAc,CAC3B,EAAE,EACF,KAAK,EACL,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,EAC1B;wBACI,gBAAgB;wBAChB,mBAAmB,EAAE,IAAI;qBAC5B,CACJ,CAAC;oBACF,iBAAiB,CAAC;wBACd,YAAY,CAAC,OAAO,GAAG,KAAK,CAAC;wBAC7B,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;oBAC3B,CAAC,CAAC,CAAC;oBACH,MAAM,GAAG,EAAE,CAAC,GAAG,CAAC;oBAChB,WAAW,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;gBAC1B,CAAC;gBACD,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;gBAEjC,IAAI,SAAS,GAAuB,SAAS,CAAC;gBAC9C,IACI,CAAE,WAA0B,CAAC,QAAQ;oBACrC,CAAC,CAAC,MAAM,eAAe,EAAE,CAAC,CAAC,SAAS,EACtC,CAAC;oBACC,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;oBACpD,YAAY,CAAC,SAAS,CAAC,CAAC;oBACxB,iBAAiB,GAAG,SAAS,CAAC;oBAC9B,IAAI,CAAC,SAAS,EAAE,CAAC;wBACb,YAAY,CAAC,KAAK,CAAC,CAAC;wBACpB,OAAO,CAAC,KAAK,CACT,gEAAgE,CACnE,CAAC;oBACN,CAAC;yBAAM,CAAC;wBACJ,SAAS,GAAG,UAAU,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC;oBAC/C,CAAC;gBACL,CAAC;gBAED,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;gBAC7B,OAAO,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;oBAC3B,MAAM,EAAE;wBACJ,SAAS,EAAE;4BACP,MAAM,EAAE;4BACJ,oBAAoB;6BACvB;yBACJ;wBACD,oBAAoB,EAAE,CAAC,KAAK,EAAE,CAAC;wBAC/B,MAAM;wBACN,iBAAiB,EAAE,EAAE,cAAc,EAAE,GAAG,EAAE;wBAC1C,iBAAiB,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;wBACrC,GAAG,CAAC,WAAW,CAAC,OAAO,KAAK,OAAO;4BAC/B,CAAC,CAAC;gCACI,eAAe,EAAE;oCACb,iBAAiB,EAAE,GAAG,EAAE,CAAC,KAAK;iCACjC;gCACD,UAAU,EAAE;oCACR,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;6DACX;iCAC5B;6BACJ;4BACH,CAAC,CAAC;gCACI,UAAU,EAAE;oCACR,UAAU,EAAE,CAAC;6DACY;iCAC5B;6BACJ,CAAC,CAAC;;;;;uBAKJ;qBACR;oBACD,SAAS;iBACZ,CAAC,CAAC;gBACH,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE;oBAC1B,SAAS;oBACT,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAC,QAAQ,EAAE;oBAChD,OAAO,EACH,WAAW,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ;iBAC3D,CAAC,CAAC;gBAEF,MAAc,CAAC,UAAU,GAAG;oBACzB,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAC,QAAQ,EAAE;oBAChD,SAAS,EAAE,iBAAiB;iBAC/B,CAAC;gBACF,MAAM,CAAC,aAAa,CAChB,IAAI,WAAW,CAAC,YAAY,EAAE;oBAC1B,MAAM,EAAG,MAAc,CAAC,UAAU;iBACrC,CAAC,CACL,CAAC;gBAEF,kBAAkB,CAAC,YAAY,CAAC,CAAC;gBAEjC,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE;oBACzB,IAAI,CAAC;wBACD,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC;wBAEpC,kDAAkD;wBAClD,IACI,OAAO,OAAO,KAAK,QAAQ;4BAC1B,OAAe,EAAE,SAAS,KAAK,SAAS,EAC3C,CAAC;4BACC,MAAM,IAAI,GAAI,OAAe,CAAC,SAG3B,CAAC;4BACJ,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gCACpB,wEAAwE;gCACxE,OAAO,CAAC,GAAG,CACP,2CAA2C,CAC9C,CAAC;4BACN,CAAC;iCAAM,CAAC;gCACJ,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;oCACtB,MAAM,OAAO,CAAC,IAAI,CAAC,IAAW,CAAC,CAAC;gCACpC,CAAC;4BACL,CAAC;wBACL,CAAC;wBACD,iDAAiD;6BAC5C,IACD,OAAO,KAAK,OAAO;4BACnB,CAAC,OAAO,OAAO,KAAK,QAAQ;gCACvB,OAAe,EAAE,IAAI,KAAK,OAAO,CAAC,EACzC,CAAC;4BACC,MAAM,YAAY,GACd,iCAAiC;gCACjC,CAAC,MAAM,CACH,MAAM,KAAK,CAAC,+BAA+B,CAAC,CAC/C,CAAC,IAAI,EAAE,CAAC,CAAC;4BACd,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,YAAY,CAAC,CAAC;4BACnD,MAAM,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;wBACrC,CAAC;wBACD,4EAA4E;6BACvE,CAAC;4BACF,MAAM,OAAO,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC;wBACnC,CAAC;wBACD,kBAAkB,CAAC,WAAW,CAAC,CAAC;oBACpC,CAAC;oBAAC,OAAO,GAAQ,EAAE,CAAC;wBAChB,OAAO,CAAC,KAAK,CACT,qCAAqC,GAAG,GAAG,EAAE,OAAO,CACvD,CAAC;wBACF,kBAAkB,CAAC,QAAQ,CAAC,CAAC;oBACjC,CAAC;oBAED,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC;wBACnB,OAAO,GAAG,MAAM,UAAU,CAAC,OAAkB,CAAC,CAAC;oBACnD,CAAC;gBACL,CAAC,CAAC;gBAEF,MAAM,WAAW,GAAG,IAAI,eAAe,CACnC,MAAM,CAAC,QAAQ,CAAC,MAAM,CACzB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBACd,MAAM,EAAE,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;gBAC7B,MAAM,KAAK,GAA2B,EAAE,CAAC;gBACzC,MAAM,QAAQ,GAAG,CAAC,KAAa,EAAE,EAAE;oBAC/B,KAAK,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC;gBAC1C,CAAC,CAAC;gBAEF,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;gBAClC,MAAM,OAAO,GAAG,SAAS,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;oBAClC,QAAQ,CAAC,cAAc,CAAC,CAAC;gBAC7B,CAAC,CAAC,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE;oBACd,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;oBAC9B,IAAI,CAAC;wBACD,IAAI,WAAW,EAAE,CAAC;4BACd,MAAM,OAAO,GAAG,EAAE,GAAG,KAAK,EAAS,CAAC;4BACpC,OAAO,CAAC,IAAI,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;4BAC/C,MAAM,CAAC,aAAa,CAChB,IAAI,WAAW,CAAC,WAAW,EAAE;gCACzB,MAAM,EAAE,OAAO;6BAClB,CAAC,CACL,CAAC;wBACN,CAAC;oBACL,CAAC;oBAAC,MAAM,CAAC,CAAA,CAAC;gBACd,CAAC,CAAC,CAAC;gBACH,IAAI,WAAW,CAAC,iBAAiB,KAAK,KAAK,EAAE,CAAC;oBAC1C,MAAM,OAAO,CAAC;gBAClB,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,8DAA8D;gBAC9D,OAAO,GAAG,MAAM,YAAY,CACvB,WAA6B,CAAC,YAAY,CAC9C,CAAC;gBACF,IAAI,CAAC;oBACA,MAAc,CAAC,UAAU,GAAG;wBACzB,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAC,QAAQ,EAAE;wBAChD,SAAS,EAAE,KAAK;qBACnB,CAAC;oBACF,MAAM,CAAC,aAAa,CAChB,IAAI,WAAW,CAAC,YAAY,EAAE;wBAC1B,MAAM,EAAG,MAAc,CAAC,UAAU;qBACrC,CAAC,CACL,CAAC;gBACN,CAAC;gBAAC,MAAM,CAAC,CAAA,CAAC;YACd,CAAC;YAED,OAAO,CAAC,OAAO,CAAC,CAAC;YACjB,UAAU,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC,CAAC;QACF,MAAM,mBAAmB,GAAG,KAAK,IAAI,EAAE;YACnC,IAAI,CAAC;gBACD,MAAM,EAAE,EAAE,CAAC;YACf,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBAClB,QAAQ,CAAC,KAAK,CAAC,CAAC;gBAChB,UAAU,CAAC,KAAK,CAAC,CAAC;YACtB,CAAC;QACL,CAAC,CAAC;QACF,UAAU,CAAC,mBAAmB,EAAE,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,OAAO,CACH,KAAC,WAAW,CAAC,QAAQ,IAAC,KAAK,EAAE,IAAI,YAC5B,OAAO,CAAC,QAAQ,GACE,CAC1B,CAAC;AACN,CAAC,CAAC"}
+{"version":3,"file":"usePeer.js","sourceRoot":"","sources":["../../src/usePeer.tsx"],"names":[],"mappings":"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"}

package/lib/esm/useQuery.d.ts

@@ -1,6 +1,7 @@
-import { Documents, DocumentsChange, WithContext } from "@peerbit/document";
+import { AbstractSearchRequest, AbstractSearchResult, Documents, RemoteQueryOptions, WithContext } from "@peerbit/document";
 import * as indexerTypes from "@peerbit/indexer-interface";
 import { WithIndexedContext } from "@peerbit/document";
+import { UpdateOptions } from "@peerbit/document";
 type QueryOptions = {
     query: QueryLike;
     id?: string;
@@ -15,29 +16,17 @@ export type QueryLike = {
  * All the non-DB-specific options supported by the original single-DB hook.
  * They stay fully backward-compatible.
  */
-export type UseQuerySharedOptions<T, I, R extends boolean | undefined, RT> = {
+export type UseQuerySharedOptions<T, I, R extends boolean | undefined, RT = R extends false ? WithContext<I> : WithIndexedContext<T, I>> = {
     resolve?: R;
     transform?: (r: RT) => Promise<RT>;
     debounce?: number;
-    debug?: boolean | {
-        id: string;
-    };
+    debug?: boolean | string;
     reverse?: boolean;
     batchSize?: number;
     prefetch?: boolean;
-    ignoreUpdates?: boolean;
-    onChange?: {
-        merge?: boolean | ((c: DocumentsChange<T, I>) => DocumentsChange<T, I> | Promise<DocumentsChange<T, I>> | undefined);
-        update?: (prev: RT[], change: DocumentsChange<T, I>) => RT[] | Promise<RT[]>;
-    };
+    updates?: UpdateOptions<T, I, R>;
     local?: boolean;
-    remote?: boolean | {
-        warmup?: number;
-        joining?: {
-            waitFor?: number;
-        };
-        eager?: boolean;
-    };
+    remote?: boolean | RemoteQueryOptions<AbstractSearchRequest, AbstractSearchResult, any>;
 } & QueryOptions;
 /**
  * `useQuery` – unified hook that accepts **either**