@dxos/react-client 0.7.5-labs.ea4b4c2 → 0.7.5-labs.f400bbc

package/dist/types/src/halo/Passkey.stories.d.ts

@@ -1,11 +1,10 @@
 import '@dxos-theme';
-import React from 'react';
 declare const _default: {
     title: string;
-    render: () => React.JSX.Element;
+    render: () => import("react/jsx-runtime").JSX.Element;
 };
 export default _default;
 export declare const Default: {
-    decorators: import("@storybook/react/*").Decorator[];
+    decorators: import("@storybook/react").Decorator[];
 };
 //# sourceMappingURL=Passkey.stories.d.ts.map

package/dist/types/src/halo/Passkey.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Passkey.stories.d.ts","sourceRoot":"","sources":["../../../../src/halo/Passkey.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AAErB,OAAO,KAAsB,MAAM,OAAO,CAAC;;;;;AAqH3C,wBAGE;AAsBF,eAAO,MAAM,OAAO;;CAEnB,CAAC"}
+{"version":3,"file":"Passkey.stories.d.ts","sourceRoot":"","sources":["../../../../src/halo/Passkey.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;;;;;AAyHrB,wBAGE;AAsBF,eAAO,MAAM,OAAO;;CAEnB,CAAC"}

package/dist/types/src/playwright/{playwright.config.d.ts → playwright.config.d.cts}

@@ -1,3 +1,3 @@
 declare const _default: import("@playwright/test").PlaywrightTestConfig<{}, {}>;
 export default _default;
-//# sourceMappingURL=playwright.config.d.ts.map
+//# sourceMappingURL=playwright.config.d.cts.map

package/dist/types/src/playwright/playwright.config.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"playwright.config.d.cts","sourceRoot":"","sources":["../../../../src/playwright/playwright.config.cts"],"names":[],"mappings":";AASA,wBAQG"}

package/dist/types/src/testing/ClientRepeater.d.ts

@@ -1,4 +1,4 @@
-import React, { type FC } from 'react';
+import { type FC } from 'react';
 import { Client, type PublicKey } from '@dxos/client';
 import { type TypedObject } from '@dxos/echo-schema';
 import { type WithClientProviderProps } from './withClientProvider';
@@ -24,5 +24,5 @@ export type ClientRepeaterProps<P extends ClientRepeatedComponentProps> = {
  * The `Component` property is rendered n times, once for each peer.
  * @deprecated use `withClientProvider`.
  */
-export declare const ClientRepeater: <P extends ClientRepeatedComponentProps>(props: ClientRepeaterProps<P>) => React.JSX.Element | null;
+export declare const ClientRepeater: <P extends ClientRepeatedComponentProps>(props: ClientRepeaterProps<P>) => import("react/jsx-runtime").JSX.Element | null;
 //# sourceMappingURL=ClientRepeater.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ClientRepeater.d.ts","sourceRoot":"","sources":["../../../../src/testing/ClientRepeater.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,EAAY,KAAK,EAAE,EAAqB,MAAM,OAAO,CAAC;AAEpE,OAAO,EAAE,MAAM,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAEtD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAIrD,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAGpE,MAAM,MAAM,4BAA4B,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,CAAC;AAE/F,MAAM,MAAM,2BAA2B,GAAG;IAAE,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAGhE,MAAM,MAAM,mBAAmB,CAAC,CAAC,SAAS,4BAA4B,IAAI;IACxE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,EAAE,CAAC,4BAA4B,CAAC,CAAC;IAC5C,QAAQ,CAAC,EAAE,EAAE,CAAC,2BAA2B,CAAC,CAAC;IAC3C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,WAAW,EAAE,CAAC;IACtB,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC;CAChC,GAAG,IAAI,CAAC,uBAAuB,EAAE,gBAAgB,GAAG,aAAa,GAAG,gBAAgB,CAAC,CAAC;AAEvF;;;;GAIG;AAMH,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,4BAA4B,SAAS,mBAAmB,CAAC,CAAC,CAAC,6BA2DnG,CAAC"}
+{"version":3,"file":"ClientRepeater.d.ts","sourceRoot":"","sources":["../../../../src/testing/ClientRepeater.tsx"],"names":[],"mappings":"AAIA,OAAc,EAAY,KAAK,EAAE,EAAqB,MAAM,OAAO,CAAC;AAEpE,OAAO,EAAE,MAAM,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAEtD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAIrD,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAGpE,MAAM,MAAM,4BAA4B,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,CAAC;AAE/F,MAAM,MAAM,2BAA2B,GAAG;IAAE,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAGhE,MAAM,MAAM,mBAAmB,CAAC,CAAC,SAAS,4BAA4B,IAAI;IACxE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,EAAE,CAAC,4BAA4B,CAAC,CAAC;IAC5C,QAAQ,CAAC,EAAE,EAAE,CAAC,2BAA2B,CAAC,CAAC;IAC3C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,WAAW,EAAE,CAAC;IACtB,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC;CAChC,GAAG,IAAI,CAAC,uBAAuB,EAAE,gBAAgB,GAAG,aAAa,GAAG,gBAAgB,CAAC,CAAC;AAEvF;;;;GAIG;AAMH,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,4BAA4B,SAAS,mBAAmB,CAAC,CAAC,CAAC,mDA2DnG,CAAC"}

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

@@ -1,14 +1,13 @@
 import '@dxos-theme';
-import React from 'react';
 declare const _default: {
     title: string;
-    decorators: import("@storybook/react/*").Decorator[];
+    decorators: import("@storybook/react").Decorator[];
 };
 export default _default;
 export declare const Default: {
-    render: () => React.JSX.Element;
+    render: () => import("react/jsx-runtime").JSX.Element;
 };
 export declare const Space: {
-    render: () => React.JSX.Element;
+    render: () => import("react/jsx-runtime").JSX.Element;
 };
 //# sourceMappingURL=ClientRepeater.stories.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ClientRepeater.stories.d.ts","sourceRoot":"","sources":["../../../../src/testing/ClientRepeater.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AAErB,OAAO,KAAK,MAAM,OAAO,CAAC;;;;;AAU1B,wBAGE;AAgCF,eAAO,MAAM,OAAO;;CAEnB,CAAC;AAEF,eAAO,MAAM,KAAK;;CAEjB,CAAC"}
+{"version":3,"file":"ClientRepeater.stories.d.ts","sourceRoot":"","sources":["../../../../src/testing/ClientRepeater.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;;;;;AAYrB,wBAGE;AAgCF,eAAO,MAAM,OAAO;;CAEnB,CAAC;AAEF,eAAO,MAAM,KAAK;;CAEjB,CAAC"}

package/dist/types/src/testing/util.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { Client, type Config } from '@dxos/client';
 import { type Space } from '@dxos/client/echo';
 export declare const createClient: ({ config, createIdentity, createSpace, }?: {
@@ -9,6 +8,6 @@ export declare const createClient: ({ config, createIdentity, createSpace, }?: {
     client: Client;
     space: Space | undefined;
 }>;
-export declare const createClientContextProvider: (client: Client) => Promise<({ children }: any) => React.JSX.Element>;
-export declare const createClientProvider: (client: Client) => Promise<({ children }: any) => React.JSX.Element>;
+export declare const createClientContextProvider: (client: Client) => Promise<({ children }: any) => import("react/jsx-runtime").JSX.Element>;
+export declare const createClientProvider: (client: Client) => Promise<({ children }: any) => import("react/jsx-runtime").JSX.Element>;
 //# sourceMappingURL=util.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/testing/util.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,MAAM,EAAE,KAAK,MAAM,EAAY,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAK/C,eAAO,MAAM,YAAY,8CAItB;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE;;;EActE,CAAC;AAEF,eAAO,MAAM,2BAA2B,WAAkB,MAAM,4BACxC,GAAG,uBAC1B,CAAC;AAEF,eAAO,MAAM,oBAAoB,WAAkB,MAAM,4BACjC,GAAG,uBAC1B,CAAC"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/testing/util.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,EAAE,KAAK,MAAM,EAAY,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAK/C,eAAO,MAAM,YAAY,8CAItB;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE;;;EActE,CAAC;AAEF,eAAO,MAAM,2BAA2B,WAAkB,MAAM,4BACxC,GAAG,6CAC1B,CAAC;AAEF,eAAO,MAAM,oBAAoB,WAAkB,MAAM,4BACjC,GAAG,6CAC1B,CAAC"}

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

@@ -1,14 +1,13 @@
 import '@dxos-theme';
-import React from 'react';
 declare const _default: {
     title: string;
-    render: () => React.JSX.Element | null;
+    render: () => import("react/jsx-runtime").JSX.Element | null;
 };
 export default _default;
 export declare const Default: {
-    decorators: import("@storybook/react/*").Decorator[];
+    decorators: import("@storybook/react").Decorator[];
 };
 export declare const Multiple: {
-    decorators: import("@storybook/react/*").Decorator[];
+    decorators: import("@storybook/react").Decorator[];
 };
 //# sourceMappingURL=withClientProvider.stories.d.ts.map

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;;;;;AAkCrB,wBAGE;AAaF,eAAO,MAAM,OAAO;;CAEnB,CAAC;AAEF,eAAO,MAAM,QAAQ;;CAMpB,CAAC"}

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@dxos/react-client",
-  "version": "0.7.5-labs.ea4b4c2",
+  "version": "0.7.5-labs.f400bbc",
   "description": "React client API",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
   "license": "MIT",
   "author": "DXOS.org",
   "sideEffects": true,
+  "type": "module",
   "exports": {
     "./devtools": {
       "types": "./dist/types/src/devtools/index.d.ts",
@@ -77,40 +78,40 @@
   },
   "dependencies": {
     "react-error-boundary": "^4.0.13",
-    "@dxos/async": "0.7.5-labs.ea4b4c2",
-    "@dxos/client": "0.7.5-labs.ea4b4c2",
-    "@dxos/codec-protobuf": "0.7.5-labs.ea4b4c2",
-    "@dxos/config": "0.7.5-labs.ea4b4c2",
-    "@dxos/debug": "0.7.5-labs.ea4b4c2",
-    "@dxos/echo-schema": "0.7.5-labs.ea4b4c2",
-    "@dxos/invariant": "0.7.5-labs.ea4b4c2",
-    "@dxos/log": "0.7.5-labs.ea4b4c2",
-    "@dxos/echo-signals": "0.7.5-labs.ea4b4c2",
-    "@dxos/react-hooks": "0.7.5-labs.ea4b4c2",
-    "@dxos/node-std": "0.7.5-labs.ea4b4c2",
-    "@dxos/protocols": "0.7.5-labs.ea4b4c2",
-    "@dxos/util": "0.7.5-labs.ea4b4c2"
+    "@dxos/async": "0.7.5-labs.f400bbc",
+    "@dxos/client": "0.7.5-labs.f400bbc",
+    "@dxos/codec-protobuf": "0.7.5-labs.f400bbc",
+    "@dxos/config": "0.7.5-labs.f400bbc",
+    "@dxos/debug": "0.7.5-labs.f400bbc",
+    "@dxos/invariant": "0.7.5-labs.f400bbc",
+    "@dxos/echo-signals": "0.7.5-labs.f400bbc",
+    "@dxos/log": "0.7.5-labs.f400bbc",
+    "@dxos/node-std": "0.7.5-labs.f400bbc",
+    "@dxos/protocols": "0.7.5-labs.f400bbc",
+    "@dxos/echo-schema": "0.7.5-labs.f400bbc",
+    "@dxos/react-hooks": "0.7.5-labs.f400bbc",
+    "@dxos/util": "0.7.5-labs.f400bbc"
   },
   "devDependencies": {
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/random": "0.7.5-labs.ea4b4c2",
-    "@dxos/react-ui-syntax-highlighter": "0.7.5-labs.ea4b4c2",
-    "@dxos/react-ui-theme": "0.7.5-labs.ea4b4c2",
-    "@dxos/react-ui": "0.7.5-labs.ea4b4c2",
-    "@dxos/storybook-utils": "0.7.5-labs.ea4b4c2",
-    "@dxos/test-utils": "0.7.5-labs.ea4b4c2"
+    "@dxos/random": "0.7.5-labs.f400bbc",
+    "@dxos/react-ui": "0.7.5-labs.f400bbc",
+    "@dxos/react-ui-syntax-highlighter": "0.7.5-labs.f400bbc",
+    "@dxos/storybook-utils": "0.7.5-labs.f400bbc",
+    "@dxos/react-ui-theme": "0.7.5-labs.f400bbc",
+    "@dxos/test-utils": "0.7.5-labs.f400bbc"
   },
   "peerDependencies": {
     "react": "~18.2.0",
     "react-dom": "~18.2.0"
   },
   "optionalDependencies": {
-    "@dxos/random": "0.7.5-labs.ea4b4c2",
-    "@dxos/react-ui": "0.7.5-labs.ea4b4c2",
-    "@dxos/react-ui-theme": "0.7.5-labs.ea4b4c2"
+    "@dxos/random": "0.7.5-labs.f400bbc",
+    "@dxos/react-ui": "0.7.5-labs.f400bbc",
+    "@dxos/react-ui-theme": "0.7.5-labs.f400bbc"
   },
   "publishConfig": {
     "access": "public"

package/project.json

@@ -29,6 +29,7 @@
       ]
     },
     "lint": {},
+    "pack": {},
     "test": {}
   },
   "implicitDependencies": [

package/src/echo/useQuery.ts

@@ -5,11 +5,11 @@
 import { useMemo, useSyncExternalStore } from 'react';
 
 import {
-  Filter,
   isSpace,
   type Echo,
-  type ReactiveEchoObject,
   type FilterSource,
+  Filter,
+  type ReactiveEchoObject,
   type Query,
   type QueryOptions,
   type Space,
@@ -25,13 +25,14 @@ export const useQuery = <T extends ReactiveEchoObject<any>>(
   options?: QueryOptions,
   deps?: any[],
 ): T[] => {
-  const { subscribe, getObjects } = useMemo(() => {
+  const { getObjects, subscribe } = useMemo(() => {
+    let subscribed = false;
     const query = isSpace(spaceOrEcho)
       ? spaceOrEcho.db.query(filter, options)
       : (spaceOrEcho?.query(filter, options) as Query<T> | undefined);
-    let subscribed = false;
 
     return {
+      getObjects: () => (subscribed && query ? query.objects : EMPTY_ARRAY),
       subscribe: (cb: () => void) => {
         subscribed = true;
         const unsubscribe = query?.subscribe(cb) ?? noop;
@@ -40,13 +41,13 @@ export const useQuery = <T extends ReactiveEchoObject<any>>(
           subscribed = false;
         };
       },
-      getObjects: () => (subscribed && query ? query.objects : EMPTY_ARRAY),
     };
   }, [spaceOrEcho, ...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) ?? [];
+  // NOTE: This hook will resubscribe whenever the callback passed to the first argument changes; make sure it is stable.
+  const objects = useSyncExternalStore<T[] | undefined>(subscribe, getObjects);
+  return objects ?? [];
 };
 
 const filterToDepsArray = (filter?: FilterSource<any>) => [JSON.stringify(Filter.from(filter).toProto())];

package/src/halo/Passkey.stories.tsx

@@ -35,6 +35,7 @@ const Test = () => {
   const handleCreatePassKey = useCallback(async () => {
     invariant(identity, 'Identity not available');
     const challenge = getNewChallenge();
+    const lookupKey = PublicKey.random();
     // https://developer.mozilla.org/en-US/docs/Web/API/PublicKeyCredentialCreationOptions
     const credential = await navigator.credentials
       .create({
@@ -42,7 +43,7 @@ const Test = () => {
           challenge: new TextEncoder().encode(challenge),
           rp: { id: location.hostname, name: 'Test' },
           user: {
-            id: new TextEncoder().encode(identity.did),
+            id: lookupKey.asUint8Array(),
             name: identity.did,
             displayName: identity.profile?.displayName ?? '',
           },
@@ -68,6 +69,7 @@ const Test = () => {
     await client.services.services.IdentityService.createRecoveryCredential({
       recoveryKey,
       algorithm,
+      lookupKey,
     });
   }, [client, identity]);
 
@@ -86,10 +88,10 @@ const Test = () => {
         },
       })
       .catch(log.error);
-    const identityDid = new TextDecoder().decode((credential as any).response.userHandle);
+    const lookupKey = PublicKey.from(new Uint8Array((credential as any).response.userHandle));
     await client.services.services.IdentityService.recoverIdentity({
       external: {
-        identityDid,
+        lookupKey,
         deviceKey,
         controlFeedKey,
         signature: Buffer.from((credential as any).response.signature),
@@ -138,8 +140,8 @@ const config = new Config({
     },
     services: {
       edge: {
-        // url: 'wss://edge.dxos.workers.dev/',
-        url: 'ws://localhost:8787',
+        url: 'wss://edge-main.dxos.workers.dev/',
+        // url: 'ws://localhost:8787',
       },
       iceProviders: [{ urls: 'https://edge-production.dxos.workers.dev/ice' }],
     },

package/tsconfig.json

@@ -1,13 +1,7 @@
 {
   "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
-    "jsx": "react",
-    "lib": [
-      "DOM",
-      "ESNext"
-    ],
-    "module": "ESNext",
-    "outDir": "./dist/types"
+    "module": "ESNext"
   },
   "include": [
     "playwright",

package/dist/types/src/playwright/playwright.config.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"playwright.config.d.ts","sourceRoot":"","sources":["../../../../src/playwright/playwright.config.ts"],"names":[],"mappings":";AASA,wBAQG"}