@dxos/react-client 0.8.4-main.a4bbb77 → 0.8.4-main.ae835ea

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-client",
-  "version": "0.8.4-main.a4bbb77",
+  "version": "0.8.4-main.ae835ea",
   "description": "React client API",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -86,43 +86,42 @@
   },
   "dependencies": {
     "react-error-boundary": "^4.0.13",
-    "@dxos/async": "0.8.4-main.a4bbb77",
-    "@dxos/client": "0.8.4-main.a4bbb77",
-    "@dxos/codec-protobuf": "0.8.4-main.a4bbb77",
-    "@dxos/context": "0.8.4-main.a4bbb77",
-    "@dxos/config": "0.8.4-main.a4bbb77",
-    "@dxos/echo": "0.8.4-main.a4bbb77",
-    "@dxos/debug": "0.8.4-main.a4bbb77",
-    "@dxos/echo-schema": "0.8.4-main.a4bbb77",
-    "@dxos/echo-signals": "0.8.4-main.a4bbb77",
-    "@dxos/invariant": "0.8.4-main.a4bbb77",
-    "@dxos/log": "0.8.4-main.a4bbb77",
-    "@dxos/node-std": "0.8.4-main.a4bbb77",
-    "@dxos/protocols": "0.8.4-main.a4bbb77",
-    "@dxos/react-hooks": "0.8.4-main.a4bbb77",
-    "@dxos/util": "0.8.4-main.a4bbb77"
+    "@dxos/async": "0.8.4-main.ae835ea",
+    "@dxos/codec-protobuf": "0.8.4-main.ae835ea",
+    "@dxos/config": "0.8.4-main.ae835ea",
+    "@dxos/debug": "0.8.4-main.ae835ea",
+    "@dxos/context": "0.8.4-main.ae835ea",
+    "@dxos/echo": "0.8.4-main.ae835ea",
+    "@dxos/echo-signals": "0.8.4-main.ae835ea",
+    "@dxos/client": "0.8.4-main.ae835ea",
+    "@dxos/invariant": "0.8.4-main.ae835ea",
+    "@dxos/log": "0.8.4-main.ae835ea",
+    "@dxos/node-std": "0.8.4-main.ae835ea",
+    "@dxos/protocols": "0.8.4-main.ae835ea",
+    "@dxos/react-hooks": "0.8.4-main.ae835ea",
+    "@dxos/util": "0.8.4-main.ae835ea"
   },
   "devDependencies": {
-    "@types/react": "~19.2.0",
-    "@types/react-dom": "~19.2.0",
+    "@types/react": "~19.2.2",
+    "@types/react-dom": "~19.2.2",
     "react": "~19.2.0",
     "react-dom": "~19.2.0",
     "typedoc": "0.28.1",
-    "@dxos/react-ui": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.a4bbb77",
-    "@dxos/random": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-theme": "0.8.4-main.a4bbb77",
-    "@dxos/storybook-utils": "0.8.4-main.a4bbb77",
-    "@dxos/test-utils": "0.8.4-main.a4bbb77"
+    "@dxos/random": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.ae835ea",
+    "@dxos/react-ui": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-theme": "0.8.4-main.ae835ea",
+    "@dxos/storybook-utils": "0.8.4-main.ae835ea",
+    "@dxos/test-utils": "0.8.4-main.ae835ea"
   },
   "peerDependencies": {
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
   "optionalDependencies": {
-    "@dxos/react-ui": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-theme": "0.8.4-main.a4bbb77",
-    "@dxos/random": "0.8.4-main.a4bbb77"
+    "@dxos/random": "0.8.4-main.ae835ea",
+    "@dxos/react-ui": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-theme": "0.8.4-main.ae835ea"
   },
   "publishConfig": {
     "access": "public"

package/src/echo/useQuery.test.tsx

@@ -5,7 +5,8 @@
 import { renderHook } from '@testing-library/react';
 import { describe, expect, test } from 'vitest';
 
-import { Expando, Filter, live } from '@dxos/client/echo';
+import { Expando, Filter } from '@dxos/client/echo';
+import { Obj, Type } from '@dxos/echo';
 
 import { createClient, createClientContextProvider } from '../testing/util';
 
@@ -19,9 +20,9 @@ describe('useQuery', () => {
     const wrapper = await createClientContextProvider(client);
 
     // Create 3 test objects: Alice, Bob, Charlie.
-    const alice = live(Expando, { name: 'Alice' });
-    const bob = live(Expando, { name: 'Bob' });
-    const charlie = live(Expando, { name: 'Charlie' });
+    const alice = Obj.make(Type.Expando, { name: 'Alice' });
+    const bob = Obj.make(Type.Expando, { name: 'Bob' });
+    const charlie = Obj.make(Type.Expando, { name: 'Charlie' });
 
     space!.db.add(alice);
     space!.db.add(bob);
@@ -82,7 +83,7 @@ describe('useQuery', () => {
     const wrapper = await createClientContextProvider(client);
 
     // Create 10 test objects: 1, 2, 3, ..., 10.
-    const objects = Array.from({ length: 10 }, (_, i) => live(Expando, { value: i + 1 }));
+    const objects = Array.from({ length: 10 }, (_, i) => Obj.make(Type.Expando, { value: i + 1 }));
 
     objects.forEach((obj) => space!.db.add(obj));
     await space!.db.flush();

package/src/echo/useQuery.ts

@@ -4,16 +4,7 @@
 
 import { useMemo, useSyncExternalStore } from 'react';
 
-import {
-  type Echo,
-  Filter,
-  type Live,
-  Query,
-  type Queryable,
-  type Queue,
-  type Space,
-  isSpace,
-} from '@dxos/client/echo';
+import { type Echo, Filter, type Live, Query, type Queryable, type Space, isSpace } from '@dxos/client/echo';
 
 const EMPTY_ARRAY: never[] = [];
 
@@ -22,13 +13,13 @@ const noop = () => {};
 // TODO(dmaretskyi): Queries are fully serializable, so we can remove `deps` argument.
 interface UseQueryFn {
   <Q extends Query.Any>(
-    spaceOrEcho: Space | Echo | Queue<any> | undefined,
+    spaceOrEcho: Space | Echo | Queryable | undefined,
     query: Q,
     deps?: any[],
   ): Live<Query.Type<Q>>[];
 
   <F extends Filter.Any>(
-    spaceOrEcho: Space | Echo | Queue<any> | undefined,
+    spaceOrEcho: Space | Echo | Queryable | undefined,
     filter: F,
     deps?: any[],
   ): Live<Filter.Type<F>>[];
@@ -38,8 +29,8 @@ interface UseQueryFn {
  * Create subscription.
  */
 export const useQuery: UseQueryFn = (
-  // TODO(burdon): Remove Space and just requre Queryable?
-  resource: Space | Queryable | undefined,
+  // TODO(burdon): Remove Space and just requre Queryable.
+  resource: Space | Echo | Queryable | undefined,
   queryOrFilter: Query.Any | Filter.Any,
   deps?: any[],
 ): Live<unknown>[] => {

package/src/echo/useSchema.ts

@@ -2,12 +2,12 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Schema } from 'effect';
+import type * as Schema from 'effect/Schema';
 import { useMemo, useSyncExternalStore } from 'react';
 
 import { type Client } from '@dxos/client';
 import { type Space } from '@dxos/client/echo';
-import { type BaseSchema } from '@dxos/echo-schema';
+import { type BaseSchema } from '@dxos/echo/internal';
 
 /**
  * Subscribe to and retrieve schema changes from a space's schema registry.

package/src/testing/ClientRepeater.tsx

@@ -6,7 +6,7 @@ import React, { type FC, useEffect, useRef, useState } from 'react';
 
 import { Client, type PublicKey } from '@dxos/client';
 import { TestBuilder, performInvitation } from '@dxos/client/testing';
-import { type TypedObject } from '@dxos/echo-schema';
+import { type TypedObject } from '@dxos/echo/internal';
 import { registerSignalsRuntime } from '@dxos/echo-signals/react';
 import { faker } from '@dxos/random';
 import { useAsyncEffect } from '@dxos/react-hooks';

package/src/testing/withClientProvider.stories.tsx

@@ -6,7 +6,7 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
 import { log } from '@dxos/log';
-import { withTheme } from '@dxos/react-ui/testing';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { SyntaxHighlighter } from '@dxos/react-ui-syntax-highlighter';
 import { render } from '@dxos/storybook-utils';
 
@@ -66,11 +66,9 @@ export const Default: Story = {
 };
 
 export const Multiple: Story = {
-  decorators: [withMultiClientProvider({ ...clientProps, numClients: 3 })],
-  parameters: {
-    layout: {
-      type: 'fullscreen',
-      classNames: 'grid grid-cols-3',
-    },
-  },
+  decorators: [
+    withTheme,
+    withLayout({ classNames: 'grid grid-cols-3' }),
+    withMultiClientProvider({ ...clientProps, numClients: 3 }),
+  ],
 };

package/tsconfig.json

@@ -44,9 +44,6 @@
     {
       "path": "../../core/echo/echo"
     },
-    {
-      "path": "../../core/echo/echo-schema"
-    },
     {
       "path": "../../core/echo/echo-signals"
     },