@dxos/react-client 0.6.12-main.ed7cda7 → 0.6.12-staging.0b4bb48

package/dist/types/src/testing/withClientProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withClientProvider.d.ts","sourceRoot":"","sources":["../../../../src/testing/withClientProvider.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAKlD,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE/C,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,OAAO,EAAkB,KAAK,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAErE,KAAK,eAAe,GAAG;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,KAAK,CAAA;KAAE,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;CAClF,CAAC;AA8BF,MAAM,MAAM,uBAAuB,GAAG,eAAe,GAAG,mBAAmB,CAAC;AAE5E;;GAEG;AACH,eAAO,MAAM,kBAAkB,8EAM5B,uBAAuB,KAAQ,SAcjC,CAAC;AAKF,MAAM,MAAM,4BAA4B,GAAG,eAAe,GAAG,mBAAmB,GAAG;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE3G;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,yFAOjC,4BAA4B,KAAG,SAuCjC,CAAC"}
+{"version":3,"file":"withClientProvider.d.ts","sourceRoot":"","sources":["../../../../src/testing/withClientProvider.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAKlD,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE/C,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,OAAO,EAAkB,KAAK,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAErE,KAAK,eAAe,GAAG;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;CACvE,CAAC;AA4BF,MAAM,MAAM,uBAAuB,GAAG,eAAe,GAAG,mBAAmB,CAAC;AAE5E;;GAEG;AACH,eAAO,MAAM,kBAAkB,8EAM5B,uBAAuB,KAAQ,SAYjC,CAAC;AAKF,MAAM,MAAM,4BAA4B,GAAG,eAAe,GAAG,mBAAmB,GAAG;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE3G;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,yFAOjC,4BAA4B,KAAG,SAuCjC,CAAC"}

package/dist/types/src/testing/withClientProvider.stories.d.ts

@@ -2,12 +2,11 @@ import '@dxos-theme';
 import React from 'react';
 declare const _default: {
     title: string;
-    render: () => React.JSX.Element | null;
-};
-export default _default;
-export declare const Default: {
+    component: () => React.JSX.Element | null;
     decorators: import("@storybook/react/*").Decorator[];
 };
+export default _default;
+export declare const Default: {};
 export declare const Multiple: {
     decorators: import("@storybook/react/*").Decorator[];
 };

package/dist/types/src/testing/withClientProvider.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withClientProvider.stories.d.ts","sourceRoot":"","sources":["../../../../src/testing/withClientProvider.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AAErB,OAAO,KAAK,MAAM,OAAO,CAAC;;;;;AAgC1B,wBAGE;AAaF,eAAO,MAAM,OAAO;;CAEnB,CAAC;AAEF,eAAO,MAAM,QAAQ;;CAMpB,CAAC"}
+{"version":3,"file":"withClientProvider.stories.d.ts","sourceRoot":"","sources":["../../../../src/testing/withClientProvider.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AAErB,OAAO,KAAK,MAAM,OAAO,CAAC;;;;;;AA+B1B,wBAIE;AAEF,eAAO,MAAM,OAAO,IAAK,CAAC;AAE1B,eAAO,MAAM,QAAQ;;CAUpB,CAAC"}

package/package.json

@@ -1,73 +1,65 @@
 {
   "name": "@dxos/react-client",
-  "version": "0.6.12-main.ed7cda7",
+  "version": "0.6.12-staging.0b4bb48",
   "description": "React client API",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
   "license": "MIT",
   "author": "DXOS.org",
   "exports": {
+    ".": {
+      "browser": "./dist/lib/browser/index.mjs",
+      "node": {
+        "default": "./dist/lib/node/index.cjs"
+      },
+      "types": "./dist/types/src/index.d.ts"
+    },
     "./devtools": {
       "browser": "./dist/lib/browser/devtools/index.mjs",
       "node": {
-        "require": "./dist/lib/node/devtools/index.cjs",
-        "default": "./dist/lib/node-esm/devtools/index.mjs"
+        "default": "./dist/lib/node/devtools/index.cjs"
       },
       "types": "./dist/types/src/devtools/index.d.ts"
     },
     "./echo": {
       "browser": "./dist/lib/browser/echo/index.mjs",
       "node": {
-        "require": "./dist/lib/node/echo/index.cjs",
-        "default": "./dist/lib/node-esm/echo/index.mjs"
+        "default": "./dist/lib/node/echo/index.cjs"
       },
       "types": "./dist/types/src/echo/index.d.ts"
     },
     "./halo": {
       "browser": "./dist/lib/browser/halo/index.mjs",
       "node": {
-        "require": "./dist/lib/node/halo/index.cjs",
-        "default": "./dist/lib/node-esm/halo/index.mjs"
+        "default": "./dist/lib/node/halo/index.cjs"
       },
       "types": "./dist/types/src/halo/index.d.ts"
     },
-    ".": {
-      "browser": "./dist/lib/browser/index.mjs",
-      "node": {
-        "require": "./dist/lib/node/index.cjs",
-        "default": "./dist/lib/node-esm/index.mjs"
-      },
-      "types": "./dist/types/src/index.d.ts"
-    },
     "./invitations": {
       "browser": "./dist/lib/browser/invitations/index.mjs",
       "node": {
-        "require": "./dist/lib/node/invitations/index.cjs",
-        "default": "./dist/lib/node-esm/invitations/index.mjs"
+        "default": "./dist/lib/node/invitations/index.cjs"
       },
       "types": "./dist/types/src/invitations/index.d.ts"
     },
     "./mesh": {
       "browser": "./dist/lib/browser/mesh/index.mjs",
       "node": {
-        "require": "./dist/lib/node/mesh/index.cjs",
-        "default": "./dist/lib/node-esm/mesh/index.mjs"
+        "default": "./dist/lib/node/mesh/index.cjs"
       },
       "types": "./dist/types/src/mesh/index.d.ts"
     },
     "./testing": {
       "browser": "./dist/lib/browser/testing/index.mjs",
       "node": {
-        "require": "./dist/lib/node/testing/index.cjs",
-        "default": "./dist/lib/node-esm/testing/index.mjs"
+        "default": "./dist/lib/node/testing/index.cjs"
       },
       "types": "./dist/types/src/testing/index.d.ts"
     },
     "./worker": {
       "browser": "./dist/lib/browser/worker.mjs",
       "node": {
-        "require": "./dist/lib/node/worker.cjs",
-        "default": "./dist/lib/node-esm/worker.mjs"
+        "default": "./dist/lib/node/worker.cjs"
       },
       "types": "./dist/types/src/worker.d.ts"
     }
@@ -100,19 +92,19 @@
   },
   "dependencies": {
     "react-error-boundary": "^4.0.13",
-    "@dxos/async": "0.6.12-main.ed7cda7",
-    "@dxos/client": "0.6.12-main.ed7cda7",
-    "@dxos/codec-protobuf": "0.6.12-main.ed7cda7",
-    "@dxos/echo-schema": "0.6.12-main.ed7cda7",
-    "@dxos/invariant": "0.6.12-main.ed7cda7",
-    "@dxos/config": "0.6.12-main.ed7cda7",
-    "@dxos/log": "0.6.12-main.ed7cda7",
-    "@dxos/echo-signals": "0.6.12-main.ed7cda7",
-    "@dxos/debug": "0.6.12-main.ed7cda7",
-    "@dxos/node-std": "0.6.12-main.ed7cda7",
-    "@dxos/react-hooks": "0.6.12-main.ed7cda7",
-    "@dxos/protocols": "0.6.12-main.ed7cda7",
-    "@dxos/util": "0.6.12-main.ed7cda7"
+    "@dxos/async": "0.6.12-staging.0b4bb48",
+    "@dxos/codec-protobuf": "0.6.12-staging.0b4bb48",
+    "@dxos/debug": "0.6.12-staging.0b4bb48",
+    "@dxos/client": "0.6.12-staging.0b4bb48",
+    "@dxos/config": "0.6.12-staging.0b4bb48",
+    "@dxos/echo-schema": "0.6.12-staging.0b4bb48",
+    "@dxos/echo-signals": "0.6.12-staging.0b4bb48",
+    "@dxos/invariant": "0.6.12-staging.0b4bb48",
+    "@dxos/log": "0.6.12-staging.0b4bb48",
+    "@dxos/node-std": "0.6.12-staging.0b4bb48",
+    "@dxos/protocols": "0.6.12-staging.0b4bb48",
+    "@dxos/react-hooks": "0.6.12-staging.0b4bb48",
+    "@dxos/util": "0.6.12-staging.0b4bb48"
   },
   "devDependencies": {
     "@testing-library/dom": "^8.17.1",
@@ -122,21 +114,20 @@
     "@types/react-dom": "~18.2.0",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/random": "0.6.12-main.ed7cda7",
-    "@dxos/react-ui": "0.6.12-main.ed7cda7",
-    "@dxos/storybook-utils": "0.6.12-main.ed7cda7",
-    "@dxos/react-ui-syntax-highlighter": "0.6.12-main.ed7cda7",
-    "@dxos/react-ui-theme": "0.6.12-main.ed7cda7",
-    "@dxos/test-utils": "0.6.12-main.ed7cda7"
+    "@dxos/random": "0.6.12-staging.0b4bb48",
+    "@dxos/react-ui-theme": "0.6.12-staging.0b4bb48",
+    "@dxos/react-ui": "0.6.12-staging.0b4bb48",
+    "@dxos/react-ui-syntax-highlighter": "0.6.12-staging.0b4bb48",
+    "@dxos/storybook-utils": "0.6.12-staging.0b4bb48"
   },
   "peerDependencies": {
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui-theme": "0.6.12-main.ed7cda7",
-    "@dxos/react-ui": "0.6.12-main.ed7cda7"
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0",
+    "@dxos/react-ui": "0.6.12-staging.0b4bb48",
+    "@dxos/react-ui-theme": "0.6.12-staging.0b4bb48"
   },
   "optionalDependencies": {
-    "@dxos/random": "0.6.12-main.ed7cda7"
+    "@dxos/random": "0.6.12-staging.0b4bb48"
   },
   "publishConfig": {
     "access": "public"

package/project.json

@@ -26,13 +26,32 @@
       "dependsOn": [
         "^compile",
         "stories:mkdist"
-      ]
+      ],
+      "options": {
+        "playwrightConfigPath": "{projectRoot}/src/playwright/playwright.config.ts",
+        "serve": "stories:storybook-e2e",
+        "testPatterns": [
+          "{projectRoot}/src/playwright/**/*.spec.{ts,js}"
+        ],
+        "timeout": 60000,
+        "watchPatterns": [
+          "{projectRoot}/src/**/*"
+        ]
+      }
     },
     "lint": {},
-    "test": {}
+    "test": {
+      "options": {
+        "ciEnvironments": [
+          "nodejs"
+        ],
+        "domRequired": true,
+        "forceExit": true
+      }
+    }
   },
   "implicitDependencies": [
     "esbuild",
-    "node-std"
+    "test"
   ]
 }

package/src/client/ClientProvider.test.tsx

@@ -2,13 +2,14 @@
 // Copyright 2020 DXOS.org
 //
 
-import { renderHook, screen, render, act, cleanup } from '@testing-library/react';
+import { renderHook, screen, render, act } from '@testing-library/react';
+import expect from 'expect';
 import React, { Component, type PropsWithChildren } from 'react';
-import { afterEach, beforeEach, describe, expect, test } from 'vitest';
 
 import { waitForCondition } from '@dxos/async';
 import { Client, Config, SystemStatus, fromHost } from '@dxos/client';
 import { log } from '@dxos/log';
+import { describe, test } from '@dxos/test';
 
 import { ClientProvider } from './ClientProvider';
 import { useClient } from './useClient';
@@ -96,10 +97,6 @@ describe('ClientProvider', () => {
     await client.halo.createIdentity({ displayName: 'test-user' });
   });
 
-  afterEach(() => {
-    cleanup();
-  });
-
   test('Renders with children', async () => {
     render(
       <ClientProvider client={client}>
@@ -151,7 +148,7 @@ describe('ClientProvider', () => {
 
     await act(async () => {
       await waitForCondition({
-        condition: () => !client.initialized && newClient.status.get() === SystemStatus.ACTIVE,
+        condition: () => newClient.status.get() === SystemStatus.ACTIVE && !client.initialized,
       });
     });
     expect(client.initialized).toBe(false);

package/src/client/ClientProvider.tsx

@@ -2,19 +2,12 @@
 // Copyright 2020 DXOS.org
 //
 
-import React, {
-  forwardRef,
-  type FunctionComponent,
-  type ReactNode,
-  useEffect,
-  useImperativeHandle,
-  useState,
-} from 'react';
+import React, { type FunctionComponent, type ReactNode, useEffect, useMemo, useState } from 'react';
 
 import { Client, type ClientOptions, type ClientServicesProvider, SystemStatus } from '@dxos/client';
 import { type Config } from '@dxos/config';
 import { type S } from '@dxos/echo-schema';
-import { registerSignalRuntime } from '@dxos/echo-signals/react';
+import { registerSignalFactory } from '@dxos/echo-signals/react';
 import { log } from '@dxos/log';
 import { useControlledValue } from '@dxos/react-hooks';
 import { getAsyncProviderValue, type MaybePromise, type Provider } from '@dxos/util';
@@ -30,30 +23,29 @@ export type ClientProviderProps = Pick<ClientContextProps, 'status'> &
     children?: ReactNode;
 
     /**
-     * Client object or async provider to enable to caller to do custom initialization.
-     *
-     * NOTE: For advanced use cases only.
+     * Config object or async provider.
      */
-    client?: Client | Provider<Promise<Client>>;
+    config?: Config | Provider<Promise<Config>>;
 
     /**
-     * Config object or async provider.
+     * Client object or async provider to enable to caller to do custom initialization.
      *
-     * NOTE: If a `client` is provided then `config` is ignored.
+     * Most apps won't need this.
      */
-    config?: Config | Provider<Promise<Config>>;
+    // TODO(wittjosiah): Remove async and just use to keep reference to client?
+    //   (Preferring `onInitialized` for custom initialization.)
+    // TODO(burdon): Use useImperativeHandle to expose client.
+    client?: Client | Provider<Promise<Client>>;
 
     /**
      * Callback to enable the caller to create a custom ClientServicesProvider.
      *
-     * NOTE: If a `client` is provided then `services` is ignored.
+     * Most apps won't need this.
      */
     services?: ClientServicesProvider | ((config?: Config) => MaybePromise<ClientServicesProvider>);
 
     /**
      * List of schema to register.
-     *
-     * NOTE: If a `client` is provided then `types` will not be added until after the children are first rendered.
      */
     types?: S.Schema<any>[];
 
@@ -63,16 +55,10 @@ export type ClientProviderProps = Pick<ClientContextProps, 'status'> &
     fallback?: FunctionComponent<Partial<ClientContextProps>>;
 
     /**
-     * Set to false to stop default signal runtime from being registered.
-     *
-     * The signals runtime is used to provide reactive updates to ECHO objects.
-     */
-    registerSignalRuntime?: boolean;
-
-    /**
-     * Skip the DXOS banner print.
+     * Set to false to stop default signal factory from being registered.
      */
-    disableBanner?: boolean;
+    // TODO(burdon): Move to options.
+    registerSignalFactory?: boolean;
 
     /**
      * Post initialization hook to enable to caller to do custom initialization.
@@ -86,111 +72,85 @@ export type ClientProviderProps = Pick<ClientContextProps, 'status'> &
  * Root component that provides the DXOS client instance to child components.
  * To be used with the `useClient` hook.
  */
-export const ClientProvider = forwardRef<Client | undefined, ClientProviderProps>(
-  (
-    {
-      children,
-      config: configProvider,
-      client: clientProvider,
-      services: servicesProvider,
-      types,
-      status: controlledStatus,
-      fallback: Fallback = () => null,
-      registerSignalRuntime: _registerSignalRuntime = true,
-      disableBanner,
-      onInitialized,
-      ...options
-    },
-    forwardedRef,
-  ) => {
-    useEffect(() => {
-      // TODO(wittjosiah): Ideally this should be imported asynchronously because it is optional.
-      //   Unfortunately, async import seemed to break signals React instrumentation.
-      _registerSignalRuntime && registerSignalRuntime();
-    }, [_registerSignalRuntime]);
-
-    // The client is initialized asynchronously.
-    // If an error occurs during initialization, it is caught and the state is set.
-    // This allows the error to be thrown in the render method.
-    // The assumption is that a client initialization error is fatal to the app.
-    // This error will be caught by the nearest error boundary.
-    const [error, setError] = useState();
-    if (error) {
-      throw error;
+export const ClientProvider = ({
+  children,
+  config: configProvider,
+  client: clientProvider,
+  services: servicesProvider,
+  types,
+  status: controlledStatus,
+  fallback: Fallback = () => null,
+  registerSignalFactory: _registerSignalFactory = true,
+  onInitialized,
+  ...options
+}: ClientProviderProps) => {
+  useMemo(() => {
+    // TODO(wittjosiah): Ideally this should be imported asynchronously because it is optional.
+    //   Unfortunately, async import seemed to break signals React instrumentation.
+    _registerSignalFactory && registerSignalFactory();
+  }, []);
+
+  const [client, setClient] = useState(clientProvider instanceof Client ? clientProvider : undefined);
+
+  const [error, setError] = useState();
+  if (error) {
+    throw error;
+  }
+
+  // Status subscription.
+  const [status, setStatus] = useControlledValue(controlledStatus);
+  useEffect(() => {
+    if (!client) {
+      return;
     }
 
-    const [client, setClient] = useState(clientProvider instanceof Client ? clientProvider : undefined);
-
-    // Provide external access.
-    useImperativeHandle(forwardedRef, () => client, [client]);
+    const subscription = client.status.subscribe((status) => setStatus(status));
+    return () => subscription.unsubscribe();
+  }, [client, setStatus]);
+
+  // Initialize client.
+  useEffect(() => {
+    const done = async (client: Client) => {
+      await client.initialize().catch(setError);
+      log('client ready');
+      await onInitialized?.(client);
+      log('initialization complete');
+      if (types) {
+        client.addTypes(types);
+      }
 
-    // Client status subscription.
-    const [status, setStatus] = useControlledValue(controlledStatus);
-    useEffect(() => {
-      if (!client) {
-        return;
+      setClient(client);
+      setStatus(client.status.get() ?? SystemStatus.ACTIVE);
+      printBanner(client);
+    };
+
+    const t = setTimeout(async () => {
+      if (clientProvider) {
+        // Asynchronously request client.
+        const client = await getAsyncProviderValue(clientProvider);
+        await done(client);
+      } else {
+        // Asynchronously construct client (config may be undefined).
+        const config = await getAsyncProviderValue(configProvider);
+        log('resolved config', { config });
+        const services = await getAsyncProviderValue(servicesProvider, config);
+        log('created services', { services });
+        const client = new Client({ config, services, ...options });
+        log('created client');
+        await done(client);
       }
+    });
 
-      const subscription = client.status.subscribe((status) => setStatus(status));
-      return () => subscription.unsubscribe();
-    }, [client]);
-
-    // Create and/or initialize client.
-    useEffect(() => {
-      const initialize = async (client: Client) => {
-        if (!client.initialized) {
-          await client.initialize().catch(setError);
-          log('client ready');
-          if (types) {
-            client.addTypes(types);
-          }
-          await onInitialized?.(client);
-          log('initialization complete');
-        } else if (types) {
-          client.addTypes(types);
-        }
-
-        setClient(client);
-
-        if (!disableBanner) {
-          printBanner(client);
-        }
-      };
-
-      let client: Client;
-      const t = setTimeout(async () => {
-        if (clientProvider) {
-          // Asynchronously request client.
-          client = await getAsyncProviderValue(clientProvider);
-          await initialize(client);
-        } else {
-          // Asynchronously construct client (config may be undefined).
-          const config = await getAsyncProviderValue(configProvider);
-          log('resolved config', { config });
-          const services = await getAsyncProviderValue(servicesProvider, config);
-          log('created services', { services });
-          client = new Client({ config, services, ...options });
-          log('created client');
-          await initialize(client);
-        }
-      });
-
-      return () => {
-        log('clean up');
-        clearTimeout(t);
-        void client
-          ?.destroy()
-          .then(() => {
-            log('destroyed');
-          })
-          .catch((err) => log.catch(err));
-      };
-    }, [configProvider, clientProvider, servicesProvider, disableBanner]);
-
-    if (!client?.initialized || status !== SystemStatus.ACTIVE) {
-      return <Fallback client={client} status={status} />;
-    }
+    return () => {
+      log('clean up');
+      clearTimeout(t);
+      void client?.destroy().catch((err) => log.catch(err));
+    };
+  }, [clientProvider, configProvider, servicesProvider]);
+
+  if (!client || status !== SystemStatus.ACTIVE) {
+    return <Fallback client={client} status={status} />;
+  }
 
-    return <ClientContext.Provider value={{ client, status }}>{children}</ClientContext.Provider>;
-  },
-);
+  return <ClientContext.Provider value={{ client, status }}>{children}</ClientContext.Provider>;
+};

package/src/client/context.ts

@@ -4,17 +4,17 @@
 
 import { type Context, createContext } from 'react';
 
-import { type Client, type SystemStatus } from '@dxos/client';
+import { type Client, type ClientServices, type SystemStatus } from '@dxos/client';
 
 export type ClientContextProps = {
   client: Client;
 
+  // Optionally expose services (e.g., for devtools).
+  services?: ClientServices;
+
   status?: SystemStatus | null;
 };
 
-/**
- * @internal Use ClientProvider to create or initialize the Client.
- */
 export const ClientContext: Context<ClientContextProps | undefined> = createContext<ClientContextProps | undefined>(
   undefined,
 );

package/src/client/index.ts

@@ -4,9 +4,12 @@
 
 export * from './AgentHostingProvider';
 export * from './ClientProvider';
+
+// TODO(burdon): Remove.
 export * from './context';
 
 export * from './useClient';
+export * from './useClientServices';
 export * from './useClientStatus';
 export * from './useConfig';
 export * from './useShell';

package/src/client/useClientServices.ts

@@ -0,0 +1,15 @@
+//
+// Copyright 2022 DXOS.org
+//
+
+import { useContext } from 'react';
+
+import { type ClientServices } from '@dxos/client';
+import { raise } from '@dxos/debug';
+
+import { ClientContext } from './context';
+
+export const useClientServices = (): ClientServices | undefined => {
+  const { services } = useContext(ClientContext) ?? raise(new Error('Missing ClientContext.'));
+  return services;
+};

package/src/client/useConfig.test.tsx

@@ -3,13 +3,15 @@
 //
 
 import { act, renderHook } from '@testing-library/react';
-import { describe, expect, test } from 'vitest';
+import expect from 'expect';
+import React from 'react';
 
 import { waitForCondition } from '@dxos/async';
-import { Config, SystemStatus } from '@dxos/client';
+import { Client, Config, SystemStatus, fromHost } from '@dxos/client';
+import { describe, test } from '@dxos/test';
 
+import { ClientProvider } from './ClientProvider';
 import { useConfig } from './useConfig';
-import { createClient, createClientContextProvider } from '../testing/util';
 
 describe('Config hook', () => {
   const render = () => useConfig();
@@ -20,8 +22,9 @@ describe('Config hook', () => {
   });
 
   test('should return default client config when no config is passed in a context', async () => {
-    const { client } = await createClient();
-    const wrapper = await createClientContextProvider(client);
+    const client = new Client({ services: fromHost() });
+    await client.initialize();
+    const wrapper = ({ children }: any) => <ClientProvider client={client}>{children}</ClientProvider>;
     const { result } = renderHook(render, { wrapper });
     await act(async () => {
       await waitForCondition({ condition: () => client.status.get() === SystemStatus.ACTIVE });
@@ -40,8 +43,9 @@ describe('Config hook', () => {
         },
       },
     });
-    const { client } = await createClient({ config });
-    const wrapper = await createClientContextProvider(client);
+    const client = new Client({ config, services: fromHost(config) });
+    await client.initialize();
+    const wrapper = ({ children }: any) => <ClientProvider client={client}>{children}</ClientProvider>;
     const { result } = renderHook(render, { wrapper });
     await act(async () => {
       await waitForCondition({ condition: () => client.status.get() === SystemStatus.ACTIVE });

package/src/echo/useQuery.ts

@@ -5,7 +5,6 @@
 import { useMemo, useSyncExternalStore } from 'react';
 
 import {
-  Filter,
   isSpace,
   type Echo,
   type EchoReactiveObject,
@@ -42,14 +41,18 @@ export const useQuery = <T extends EchoReactiveObject<any>>(
       },
       getObjects: () => (subscribed && query ? query.objects : EMPTY_ARRAY),
     };
-  }, [spaceOrEcho, ...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.
   return useSyncExternalStore<T[] | undefined>(subscribe, getObjects) ?? [];
 };
 
-const filterToDepsArray = (filter?: FilterSource<any>) => [JSON.stringify(Filter.from(filter).toProto())];
+// TODO(dmaretskyi): Serialize the filter here instead.
+const filterToDepsArray = (filter?: FilterSource<any>) =>
+  Object.entries(filter ?? {})
+    .flat(10)
+    .map((x) => (typeof x === 'function' || typeof x === 'object' ? null : x));
 
 const noop = () => {};