@dxos/react-client 0.8.4-main.74a063c4e0 → 0.8.4-main.765dc60934

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-client",
-  "version": "0.8.4-main.74a063c4e0",
+  "version": "0.8.4-main.765dc60934",
   "description": "React client API",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "sideEffects": false,
   "type": "module",
@@ -63,46 +63,22 @@
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "devtools": [
-        "dist/types/src/devtools/index.d.ts"
-      ],
-      "echo": [
-        "dist/types/src/echo/index.d.ts"
-      ],
-      "halo": [
-        "dist/types/src/halo/index.d.ts"
-      ],
-      "invitations": [
-        "dist/types/src/invitations/index.d.ts"
-      ],
-      "mesh": [
-        "dist/types/src/mesh/index.d.ts"
-      ],
-      "testing": [
-        "dist/types/src/testing/index.d.ts"
-      ],
-      "worker": [
-        "dist/types/src/worker.d.ts"
-      ]
-    }
-  },
   "dependencies": {
-    "@dxos/async": "0.8.4-main.74a063c4e0",
-    "@dxos/codec-protobuf": "0.8.4-main.74a063c4e0",
-    "@dxos/config": "0.8.4-main.74a063c4e0",
-    "@dxos/client": "0.8.4-main.74a063c4e0",
-    "@dxos/context": "0.8.4-main.74a063c4e0",
-    "@dxos/debug": "0.8.4-main.74a063c4e0",
-    "@dxos/echo-react": "0.8.4-main.74a063c4e0",
-    "@dxos/invariant": "0.8.4-main.74a063c4e0",
-    "@dxos/echo": "0.8.4-main.74a063c4e0",
-    "@dxos/log": "0.8.4-main.74a063c4e0",
-    "@dxos/node-std": "0.8.4-main.74a063c4e0",
-    "@dxos/util": "0.8.4-main.74a063c4e0",
-    "@dxos/react-hooks": "0.8.4-main.74a063c4e0",
-    "@dxos/protocols": "0.8.4-main.74a063c4e0"
+    "@dxos/async": "0.8.4-main.765dc60934",
+    "@dxos/client": "0.8.4-main.765dc60934",
+    "@dxos/config": "0.8.4-main.765dc60934",
+    "@dxos/context": "0.8.4-main.765dc60934",
+    "@dxos/debug": "0.8.4-main.765dc60934",
+    "@dxos/echo-react": "0.8.4-main.765dc60934",
+    "@dxos/echo": "0.8.4-main.765dc60934",
+    "@dxos/invariant": "0.8.4-main.765dc60934",
+    "@dxos/keys": "0.8.4-main.765dc60934",
+    "@dxos/log": "0.8.4-main.765dc60934",
+    "@dxos/codec-protobuf": "0.8.4-main.765dc60934",
+    "@dxos/node-std": "0.8.4-main.765dc60934",
+    "@dxos/protocols": "0.8.4-main.765dc60934",
+    "@dxos/react-hooks": "0.8.4-main.765dc60934",
+    "@dxos/util": "0.8.4-main.765dc60934"
   },
   "devDependencies": {
     "@types/react": "~19.2.7",
@@ -110,21 +86,21 @@
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
     "typedoc": "0.28.1",
-    "@dxos/random": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.74a063c4e0",
-    "@dxos/storybook-utils": "0.8.4-main.74a063c4e0",
-    "@dxos/ui-theme": "0.8.4-main.74a063c4e0",
-    "@dxos/test-utils": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui": "0.8.4-main.74a063c4e0"
+    "@dxos/random": "0.8.4-main.765dc60934",
+    "@dxos/react-ui": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.765dc60934",
+    "@dxos/storybook-utils": "0.8.4-main.765dc60934",
+    "@dxos/test-utils": "0.8.4-main.765dc60934",
+    "@dxos/ui-theme": "0.8.4-main.765dc60934"
   },
   "peerDependencies": {
     "react": "~19.2.3",
     "react-dom": "~19.2.3"
   },
   "optionalDependencies": {
-    "@dxos/react-ui": "0.8.4-main.74a063c4e0",
-    "@dxos/ui-theme": "0.8.4-main.74a063c4e0",
-    "@dxos/random": "0.8.4-main.74a063c4e0"
+    "@dxos/random": "0.8.4-main.765dc60934",
+    "@dxos/react-ui": "0.8.4-main.765dc60934",
+    "@dxos/ui-theme": "0.8.4-main.765dc60934"
   },
   "publishConfig": {
     "access": "public"

package/src/echo/index.ts

@@ -6,7 +6,6 @@ export * from '@dxos/client/echo';
 export * from '@dxos/echo-react';
 
 export * from './useMembers';
-export * from './useQueue';
 export * from './useSpaces';
 export * from './useSpaceInvitations';
 export * from './useSpaceProperties';

package/src/echo/useSpaceInvitations.ts

@@ -6,7 +6,7 @@ import { useMemo } from 'react';
 
 import { MulticastObservable } from '@dxos/async';
 import { type PublicKey } from '@dxos/client';
-import { type SpaceId } from '@dxos/client/echo';
+import { type SpaceId } from '@dxos/keys';
 import { useMulticastObservable } from '@dxos/react-hooks';
 
 import { type CancellableInvitationObservable, useInvitationStatus } from '../invitations';

package/src/echo/useSpaces.test.tsx

@@ -33,7 +33,7 @@ describe('useSpace', () => {
   test('returns undefined when no id provided', async () => {
     const { client } = await createClient({ createIdentity: true });
     const wrapper = await createClientContextProvider(client);
-    const { result } = renderHook(() => useSpace(), { wrapper });
+    const { result } = renderHook(() => useSpace(undefined), { wrapper });
     expect(result.current).to.be.undefined;
   });
 

package/src/echo/useSpaces.ts

@@ -3,7 +3,8 @@
 //
 
 import { PublicKey } from '@dxos/client';
-import { type Space, type SpaceId, SpaceState } from '@dxos/client/echo';
+import { type Space, SpaceState } from '@dxos/client/echo';
+import { type SpaceId } from '@dxos/keys';
 import { useMulticastObservable } from '@dxos/react-hooks';
 
 import { useClient } from '../client';
@@ -21,7 +22,6 @@ import { useClient } from '../client';
 export const useSpace = (spaceId?: SpaceId | PublicKey): Space | undefined => {
   const client = useClient();
   const spaces = useMulticastObservable<Space[]>(client.spaces);
-
   if (!spaceId) {
     return undefined;
   }
@@ -42,6 +42,7 @@ export const useSpace = (spaceId?: SpaceId | PublicKey): Space | undefined => {
  * Requires a ClientProvider somewhere in the parent tree.
  *
  * @param spaceId the id of the space to look for.
+ * @deprecated Use useSpace.
  */
 export const useDatabase = (spaceId?: SpaceId): Space['db'] | undefined => {
   const space = useSpace(spaceId);

package/src/halo/Passkey.stories.tsx

@@ -9,7 +9,7 @@ import { Config, PublicKey } from '@dxos/client';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import { Button } from '@dxos/react-ui';
-import { SyntaxHighlighter } from '@dxos/react-ui-syntax-highlighter';
+import { JsonHighlighter } from '@dxos/react-ui-syntax-highlighter';
 import { withTheme } from '@dxos/react-ui/testing';
 
 import { useClient } from '../client';
@@ -116,9 +116,7 @@ const Test = () => {
         </Button>
       </div>
       <div className='flex flex-col min-w-[28rem] divide-y divide-separator border border-separator rounded-sm'>
-        <SyntaxHighlighter language='json'>
-          {JSON.stringify({ identity, credentials: credentials.length }, null, 2)}
-        </SyntaxHighlighter>
+        <JsonHighlighter data={{ identity, credentials: credentials.length }} />
       </div>
     </>
   );

package/src/testing/ClientRepeater.stories.tsx

@@ -7,7 +7,7 @@ import React from 'react';
 
 import { Obj } from '@dxos/echo';
 import { Input } from '@dxos/react-ui';
-import { SyntaxHighlighter } from '@dxos/react-ui-syntax-highlighter';
+import { JsonHighlighter } from '@dxos/react-ui-syntax-highlighter';
 import { withTheme } from '@dxos/react-ui/testing';
 
 import { useClient } from '../client';
@@ -23,9 +23,7 @@ export default meta;
 
 type Story = StoryObj<typeof meta>;
 
-const JsonPanel = ({ value }: { value: any }) => (
-  <SyntaxHighlighter language='json'>{JSON.stringify(value, undefined, 2)}</SyntaxHighlighter>
-);
+const JsonPanel = ({ value }: { value: any }) => <JsonHighlighter data={value} />;
 
 const ClientStory = () => {
   const client = useClient();
@@ -46,7 +44,7 @@ const ClientSpace = ({ spaceId }: ClientRepeatedComponentProps) => {
           placeholder='Name'
           value={space.properties.name}
           onChange={(event) =>
-            Obj.change(space.properties, (obj) => {
+            Obj.update(space.properties, (obj) => {
               obj.name = event.target.value;
             })
           }

package/src/testing/ClientRepeater.tsx

@@ -7,11 +7,11 @@ import React, { type FC, useRef, useState } from 'react';
 import { Client } from '@dxos/client';
 import { TestBuilder, performInvitation } from '@dxos/client/testing';
 import { type Type } from '@dxos/echo';
+import { type SpaceId } from '@dxos/keys';
 import { random } from '@dxos/random';
 import { useAsyncEffect } from '@dxos/react-hooks';
 
 import { ClientProvider } from '../client';
-import { type SpaceId } from '../echo';
 import { type WithClientProviderProps } from './withClientProvider';
 
 export type ClientRepeatedComponentProps = { id: number; count: number; spaceId?: SpaceId };

package/src/testing/context.tsx

@@ -4,8 +4,9 @@
 
 import { createContext, useContext } from 'react';
 
-import { type Space, type SpaceId } from '@dxos/client/echo';
+import { type Space } from '@dxos/client/echo';
 import { raise } from '@dxos/debug';
+import { type SpaceId } from '@dxos/keys';
 
 export type ClientStory = {
   index?: number;

package/src/testing/withClientProvider.stories.tsx

@@ -7,7 +7,7 @@ import React from 'react';
 import { expect, within } from 'storybook/test';
 
 import { log } from '@dxos/log';
-import { SyntaxHighlighter } from '@dxos/react-ui-syntax-highlighter';
+import { JsonHighlighter } from '@dxos/react-ui-syntax-highlighter';
 import { withLayout, withTheme, Loading } from '@dxos/react-ui/testing';
 
 import { useClient } from '../client';
@@ -16,7 +16,7 @@ import { type WithClientProviderProps, withClientProvider, withMultiClientProvid
 
 const SpaceInfo = ({ space }: { space: Space }) => {
   const name = space.isOpen ? space.properties.name : '';
-  return <SyntaxHighlighter language='json'>{JSON.stringify({ id: space.id, name }, null, 2)}</SyntaxHighlighter>;
+  return <JsonHighlighter data={{ id: space.id, name }} />;
 };
 
 const DefaultStory = () => {
@@ -28,7 +28,7 @@ const DefaultStory = () => {
 
   return (
     <div className='flex flex-col divide-y divide-separator border border-separator'>
-      <SyntaxHighlighter language='json'>{JSON.stringify(client.toJSON(), null, 2)}</SyntaxHighlighter>
+      <JsonHighlighter data={client.toJSON()} />
       {spaces.map((space) => (
         <SpaceInfo key={space.id} space={space} />
       ))}

package/src/testing/withClientProvider.tsx

@@ -7,8 +7,9 @@ import React, { useCallback, useMemo, useRef, useState } from 'react';
 
 import { Trigger } from '@dxos/async';
 import { type Client } from '@dxos/client';
-import { type Space, type SpaceId } from '@dxos/client/echo';
+import { type Space } from '@dxos/client/echo';
 import { TestBuilder, performInvitation } from '@dxos/client/testing';
+import { type SpaceId } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { ErrorBoundary } from '@dxos/react-ui';
 import { type MaybePromise } from '@dxos/util';

package/tsconfig.json

@@ -23,6 +23,9 @@
     {
       "path": "../../common/invariant"
     },
+    {
+      "path": "../../common/keys"
+    },
     {
       "path": "../../common/log"
     },

package/dist/types/src/echo/useQueue.d.ts

@@ -1,12 +0,0 @@
-import { type Queue } from '@dxos/client/echo';
-import { type Entity } from '@dxos/echo';
-import { type DXN } from '@dxos/keys';
-export type UseQueueOptions = {
-    pollInterval?: number;
-};
-/**
- * Polls the given Edge queue.
- * @deprecated Use `useQuery` instead.
- */
-export declare const useQueue: <T extends Entity.Unknown>(queueDxn?: DXN, options?: UseQueueOptions) => Queue<T> | undefined;
-//# sourceMappingURL=useQueue.d.ts.map

package/dist/types/src/echo/useQueue.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useQueue.d.ts","sourceRoot":"","sources":["../../../../src/echo/useQueue.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE/C,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;AAMtC,MAAM,MAAM,eAAe,GAAG;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;;;GAGG;AAKH,eAAO,MAAM,QAAQ,GAAI,CAAC,SAAS,MAAM,CAAC,OAAO,EAC/C,WAAW,GAAG,EACd,UAAS,eAAoB,KAC5B,KAAK,CAAC,CAAC,CAAC,GAAG,SA4Cb,CAAC"}

package/src/echo/useQueue.ts

@@ -1,75 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { useEffect, useMemo, useRef } from 'react';
-
-import { type Queue } from '@dxos/client/echo';
-import { raise } from '@dxos/debug';
-import { type Entity } from '@dxos/echo';
-import { type DXN } from '@dxos/keys';
-
-import { useClient } from '../client';
-
-const MIN_POLL_INTERVAL = 1_000;
-
-export type UseQueueOptions = {
-  pollInterval?: number;
-};
-
-/**
- * Polls the given Edge queue.
- * @deprecated Use `useQuery` instead.
- */
-// TODO(burdon): Replace polling with socket?
-// TODO(dmaretskyi): Move into client package.
-// TODO(dmaretskyi): Consider passing the space into the hook to support queue DXNs without space id.
-// TODO(ZaymonFC): If queue is unchanged returned object should be refferentially stable on poll.
-export const useQueue = <T extends Entity.Unknown>(
-  queueDxn?: DXN,
-  options: UseQueueOptions = {},
-): Queue<T> | undefined => {
-  const client = useClient();
-  const mountedRef = useRef(true);
-
-  const queue = useMemo<Queue<T> | undefined>(() => {
-    if (!queueDxn) {
-      return undefined;
-    }
-
-    const { spaceId } = queueDxn.asQueueDXN() ?? raise(new TypeError('Invalid queue DXN'));
-    return client.spaces.get(spaceId)?.queues.get<T>(queueDxn);
-  }, [client, queueDxn?.toString()]);
-
-  useEffect(() => {
-    void queue?.refresh();
-  }, [queue]);
-
-  useEffect(() => {
-    let timeout: NodeJS.Timeout;
-    mountedRef.current = true;
-
-    const poll = () => {
-      if (!mountedRef.current) {
-        return;
-      }
-
-      void queue?.refresh().finally(() => {
-        if (mountedRef.current && options.pollInterval) {
-          timeout = setTimeout(poll, Math.max(options.pollInterval ?? 0, MIN_POLL_INTERVAL));
-        }
-      });
-    };
-
-    if (options.pollInterval) {
-      poll();
-    }
-
-    return () => {
-      mountedRef.current = false;
-      clearTimeout(timeout);
-    };
-  }, [queue, options.pollInterval]);
-
-  return queue;
-};