@dxos/react-client 0.4.10-main.4c7b3fa → 0.4.10-main.4d26ea7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-client",
-  "version": "0.4.10-main.4c7b3fa",
+  "version": "0.4.10-main.4d26ea7",
   "description": "React client API",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -11,49 +11,57 @@
       "browser": "./dist/lib/browser/index.mjs",
       "import": "./dist/lib/browser/index.mjs",
       "require": "./dist/lib/node/index.cjs",
-      "node": "./dist/lib/node/index.cjs"
+      "node": "./dist/lib/node/index.cjs",
+      "types": "./dist/types/src/index.d.ts"
     },
     "./devtools": {
       "browser": "./dist/lib/browser/devtools/index.mjs",
       "import": "./dist/lib/browser/devtools/index.mjs",
       "require": "./dist/lib/node/devtools/index.cjs",
-      "node": "./dist/lib/node/devtools/index.cjs"
+      "node": "./dist/lib/node/devtools/index.cjs",
+      "types": "./dist/types/src/devtools/index.d.ts"
     },
     "./echo": {
       "browser": "./dist/lib/browser/echo/index.mjs",
       "import": "./dist/lib/browser/echo/index.mjs",
       "require": "./dist/lib/node/echo/index.cjs",
-      "node": "./dist/lib/node/echo/index.cjs"
+      "node": "./dist/lib/node/echo/index.cjs",
+      "types": "./dist/types/src/echo/index.d.ts"
     },
     "./halo": {
       "browser": "./dist/lib/browser/halo/index.mjs",
       "import": "./dist/lib/browser/halo/index.mjs",
       "require": "./dist/lib/node/halo/index.cjs",
-      "node": "./dist/lib/node/halo/index.cjs"
+      "node": "./dist/lib/node/halo/index.cjs",
+      "types": "./dist/types/src/halo/index.d.ts"
     },
     "./invitations": {
       "browser": "./dist/lib/browser/invitations/index.mjs",
       "import": "./dist/lib/browser/invitations/index.mjs",
       "require": "./dist/lib/node/invitations/index.cjs",
-      "node": "./dist/lib/node/invitations/index.cjs"
+      "node": "./dist/lib/node/invitations/index.cjs",
+      "types": "./dist/types/src/invitations/index.d.ts"
     },
     "./mesh": {
       "browser": "./dist/lib/browser/mesh/index.mjs",
       "import": "./dist/lib/browser/mesh/index.mjs",
       "require": "./dist/lib/node/mesh/index.cjs",
-      "node": "./dist/lib/node/mesh/index.cjs"
+      "node": "./dist/lib/node/mesh/index.cjs",
+      "types": "./dist/types/src/mesh/index.d.ts"
     },
     "./testing": {
       "browser": "./dist/lib/browser/testing/index.mjs",
       "import": "./dist/lib/browser/testing/index.mjs",
       "require": "./dist/lib/node/testing/index.cjs",
-      "node": "./dist/lib/node/testing/index.cjs"
+      "node": "./dist/lib/node/testing/index.cjs",
+      "types": "./dist/types/src/testing/index.d.ts"
     },
     "./worker": {
       "browser": "./dist/lib/browser/worker.mjs",
       "import": "./dist/lib/browser/worker.mjs",
       "require": "./dist/lib/node/worker.cjs",
-      "node": "./dist/lib/node/worker.cjs"
+      "node": "./dist/lib/node/worker.cjs",
+      "types": "./dist/types/src/worker.d.ts"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -83,17 +91,17 @@
     }
   },
   "dependencies": {
-    "@dxos/async": "0.4.10-main.4c7b3fa",
-    "@dxos/client": "0.4.10-main.4c7b3fa",
-    "@dxos/config": "0.4.10-main.4c7b3fa",
-    "@dxos/codec-protobuf": "0.4.10-main.4c7b3fa",
-    "@dxos/debug": "0.4.10-main.4c7b3fa",
-    "@dxos/echo-signals": "0.4.10-main.4c7b3fa",
-    "@dxos/invariant": "0.4.10-main.4c7b3fa",
-    "@dxos/log": "0.4.10-main.4c7b3fa",
-    "@dxos/node-std": "0.4.10-main.4c7b3fa",
-    "@dxos/react-async": "0.4.10-main.4c7b3fa",
-    "@dxos/util": "0.4.10-main.4c7b3fa"
+    "@dxos/async": "0.4.10-main.4d26ea7",
+    "@dxos/client": "0.4.10-main.4d26ea7",
+    "@dxos/codec-protobuf": "0.4.10-main.4d26ea7",
+    "@dxos/echo-signals": "0.4.10-main.4d26ea7",
+    "@dxos/debug": "0.4.10-main.4d26ea7",
+    "@dxos/config": "0.4.10-main.4d26ea7",
+    "@dxos/invariant": "0.4.10-main.4d26ea7",
+    "@dxos/log": "0.4.10-main.4d26ea7",
+    "@dxos/react-async": "0.4.10-main.4d26ea7",
+    "@dxos/node-std": "0.4.10-main.4d26ea7",
+    "@dxos/util": "0.4.10-main.4d26ea7"
   },
   "devDependencies": {
     "@testing-library/dom": "^8.17.1",
@@ -104,10 +112,10 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "yjs": "^13.6.10",
-    "@dxos/random": "0.4.10-main.4c7b3fa",
-    "@dxos/react-ui": "0.4.10-main.4c7b3fa",
-    "@dxos/storybook-utils": "0.4.10-main.4c7b3fa",
-    "@dxos/react-ui-theme": "0.4.10-main.4c7b3fa"
+    "@dxos/random": "0.4.10-main.4d26ea7",
+    "@dxos/react-ui": "0.4.10-main.4d26ea7",
+    "@dxos/react-ui-theme": "0.4.10-main.4d26ea7",
+    "@dxos/storybook-utils": "0.4.10-main.4d26ea7"
   },
   "peerDependencies": {
     "react": "*",
@@ -115,7 +123,7 @@
   },
   "optionalDependencies": {
     "yjs": "^13.6.10",
-    "@dxos/random": "0.4.10-main.4c7b3fa"
+    "@dxos/random": "0.4.10-main.4d26ea7"
   },
   "publishConfig": {
     "access": "public"

package/project.json

@@ -1,6 +1,9 @@
 {
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "name": "react-client",
+  "tags": [
+    "scope:sdk"
+  ],
   "sourceRoot": "packages/sdk/react-client/src",
   "projectType": "library",
   "targets": {

package/src/client/useAgentHostingProvider.ts

@@ -4,7 +4,7 @@
 
 import {
   type AgentHostingProviderClient,
-  EldonAgentHostingProviderClient,
+  DXOSAgentHostingProviderClient,
   FakeAgentHostingProvider,
 } from '@dxos/client/services';
 import { type Config } from '@dxos/config';
@@ -33,5 +33,5 @@ export const useAgentHostingProviderClient = (config: Config): AgentHostingProvi
     return new FakeAgentHostingProvider(config);
   }
 
-  return new EldonAgentHostingProviderClient(config);
+  return new DXOSAgentHostingProviderClient(config);
 };

package/src/echo/useQuery.ts

@@ -4,11 +4,19 @@
 
 import { useMemo, useSyncExternalStore } from 'react';
 
-import type { QueryOptions, Query, FilterSource, Space, EchoReactiveObject } from '@dxos/client/echo';
+import {
+  type QueryOptions,
+  type Query,
+  type FilterSource,
+  type Space,
+  type EchoReactiveObject,
+  type Echo,
+  isSpace,
+} from '@dxos/client/echo';
 
 type UseQuery = {
   <T extends EchoReactiveObject<any>>(
-    space?: Space,
+    spaceOrEcho?: Space | Echo,
     filter?: FilterSource<T>,
     options?: QueryOptions,
     deps?: any[],
@@ -20,19 +28,29 @@ type UseQuery = {
  */
 // TODO(burdon): Support typed operator filters (e.g., Note.filter(note => ...)).
 export const useQuery: UseQuery = <T extends EchoReactiveObject<any>>(
-  space?: Space,
+  spaceOrEcho?: Space | Echo,
   filter?: FilterSource<T>,
   options?: QueryOptions,
   deps?: any[],
 ) => {
   const { subscribe, getObjects } = useMemo(() => {
-    const query = space?.db.query(filter, options) as Query<T> | undefined;
+    const query = isSpace(spaceOrEcho)
+      ? spaceOrEcho.db.query(filter, options)
+      : (spaceOrEcho?.query(filter, options) as Query<T> | undefined);
+    let subscribed = false;
 
     return {
-      subscribe: (cb: () => void) => query?.subscribe(cb) ?? noop,
-      getObjects: () => query?.objects ?? EMPTY_ARRAY,
+      subscribe: (cb: () => void) => {
+        subscribed = true;
+        const unsubscribe = query?.subscribe(cb) ?? noop;
+        return () => {
+          unsubscribe?.();
+          subscribed = false;
+        };
+      },
+      getObjects: () => (subscribed && query ? query.objects : EMPTY_ARRAY),
     };
-  }, [space?.db, ...(typeof filter === 'function' ? [] : filterToDepsArray(filter)), ...(deps ?? [])]);
+  }, [spaceOrEcho, ...(typeof filter === 'function' ? [] : filterToDepsArray(filter)), ...(deps ?? [])]);
 
   // https://beta.reactjs.org/reference/react/useSyncExternalStore
   // NOTE: This hook will resubscribe whenever the callback passed to the first argument changes -- make sure it is stable.

package/src/halo/useHaloInvitations.ts

@@ -7,7 +7,7 @@ import { useMemo } from 'react';
 import { useMulticastObservable } from '@dxos/react-async';
 
 import { useClient } from '../client';
-import { type CancellableInvitationObservable, useInvitationStatus } from '../invitations';
+import { useInvitationStatus, type CancellableInvitationObservable } from '../invitations';
 
 export const useHaloInvitations = (): CancellableInvitationObservable[] => {
   const client = useClient();