@dxos/app-graph 0.6.11-staging.e6894a4 → 0.6.11

package/dist/types/src/stories/EchoGraph.stories.d.ts

@@ -3,9 +3,8 @@ import React from 'react';
 declare const _default: {
     title: string;
     decorators: import("@storybook/react/*").Decorator[];
-};
-export default _default;
-export declare const Default: {
     render: () => React.JSX.Element;
 };
+export default _default;
+export declare const Default: {};
 //# sourceMappingURL=EchoGraph.stories.d.ts.map

package/dist/types/src/stories/EchoGraph.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EchoGraph.stories.d.ts","sourceRoot":"","sources":["../../../../src/stories/EchoGraph.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AAGrB,OAAO,KAA8B,MAAM,OAAO,CAAC;;;;;AAyBnD,wBAGE;AA6NF,eAAO,MAAM,OAAO;;CAEnB,CAAC"}
+{"version":3,"file":"EchoGraph.stories.d.ts","sourceRoot":"","sources":["../../../../src/stories/EchoGraph.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AAGrB,OAAO,KAA8B,MAAM,OAAO,CAAC;;;;;;AA0PnD,wBAaE;AAEF,eAAO,MAAM,OAAO,IAAK,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/app-graph",
-  "version": "0.6.11-staging.e6894a4",
+  "version": "0.6.11",
   "description": "Constructs knowledge graphs for the purpose of building applications on top of",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -26,13 +26,13 @@
   "dependencies": {
     "@preact/signals-core": "^1.6.0",
     "main-thread-scheduling": "^14.1.1",
-    "@dxos/async": "0.6.11-staging.e6894a4",
-    "@dxos/echo-schema": "0.6.11-staging.e6894a4",
-    "@dxos/debug": "0.6.11-staging.e6894a4",
-    "@dxos/echo-signals": "0.6.11-staging.e6894a4",
-    "@dxos/invariant": "0.6.11-staging.e6894a4",
-    "@dxos/log": "0.6.11-staging.e6894a4",
-    "@dxos/util": "0.6.11-staging.e6894a4"
+    "@dxos/async": "0.6.11",
+    "@dxos/debug": "0.6.11",
+    "@dxos/echo-schema": "0.6.11",
+    "@dxos/echo-signals": "0.6.11",
+    "@dxos/invariant": "0.6.11",
+    "@dxos/log": "0.6.11",
+    "@dxos/util": "0.6.11"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.1.5",
@@ -41,11 +41,11 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "^5.3.4",
-    "@dxos/random": "0.6.11-staging.e6894a4",
-    "@dxos/react-ui": "0.6.11-staging.e6894a4",
-    "@dxos/react-ui-theme": "0.6.11-staging.e6894a4",
-    "@dxos/storybook-utils": "0.6.11-staging.e6894a4",
-    "@dxos/react-client": "0.6.11-staging.e6894a4"
+    "@dxos/random": "0.6.11",
+    "@dxos/react-client": "0.6.11",
+    "@dxos/react-ui": "0.6.11",
+    "@dxos/react-ui-theme": "0.6.11",
+    "@dxos/storybook-utils": "0.6.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",

package/src/stories/EchoGraph.stories.tsx

@@ -10,7 +10,7 @@ import React, { useEffect, useState } from 'react';
 import { type EchoReactiveObject, create } from '@dxos/echo-schema';
 import { registerSignalRuntime } from '@dxos/echo-signals';
 import { faker } from '@dxos/random';
-import { Client } from '@dxos/react-client';
+import { type Client, useClient } from '@dxos/react-client';
 import {
   type Space,
   SpaceState,
@@ -20,32 +20,40 @@ import {
   type QueryOptions,
   type Query,
 } from '@dxos/react-client/echo';
-import { ClientRepeater, TestBuilder } from '@dxos/react-client/testing';
-import { Button, DensityProvider, Input, Select } from '@dxos/react-ui';
+import { withClientProvider } from '@dxos/react-client/testing';
+import { Button, DensityProvider, Input, Select, useAsyncEffect } from '@dxos/react-ui';
 import { getSize, mx } from '@dxos/react-ui-theme';
 import { withTheme } from '@dxos/storybook-utils';
 import { safeParseInt } from '@dxos/util';
 
 import { Tree } from './Tree';
+import { type Graph } from '../graph';
 import { GraphBuilder, cleanup, createExtension, memoize, toSignal } from '../graph-builder';
 import { type Node } from '../node';
 
-export default {
-  title: 'app-graph/EchoGraph',
-  decorators: [withTheme],
-};
-
 const DEFAULT_PERIOD = 500;
 
+const EMPTY_ARRAY: never[] = [];
+
 registerSignalRuntime();
-const testBuilder = new TestBuilder();
-const client = new Client({ services: testBuilder.createLocalClientServices() });
-await client.initialize();
-await client.halo.createIdentity();
-await client.spaces.create();
-await client.spaces.create();
 
-const EMPTY_ARRAY: never[] = [];
+enum Action {
+  CREATE_SPACE = 'CREATE_SPACE',
+  CLOSE_SPACE = 'CLOSE_SPACE',
+  RENAME_SPACE = 'RENAME_SPACE',
+  ADD_OBJECT = 'ADD_OBJECT',
+  REMOVE_OBJECT = 'REMOVE_OBJECT',
+  RENAME_OBJECT = 'RENAME_OBJECT',
+}
+
+const actionWeights = {
+  [Action.CREATE_SPACE]: 2,
+  [Action.CLOSE_SPACE]: 1,
+  [Action.RENAME_SPACE]: 2,
+  [Action.ADD_OBJECT]: 4,
+  [Action.REMOVE_OBJECT]: 3,
+  [Action.RENAME_OBJECT]: 4,
+};
 
 // TODO(wittjosiah): Factor out.
 const memoizeQuery = <T extends EchoReactiveObject<any>>(
@@ -67,67 +75,52 @@ const memoizeQuery = <T extends EchoReactiveObject<any>>(
   return query?.objects ?? EMPTY_ARRAY;
 };
 
-const spaceBuilderExtension = createExtension({
-  id: 'space',
-  filter: (node): node is Node<null> => node.id === 'root',
-  connector: ({ node }) => {
-    const spaces = toSignal(
-      (onChange) => client.spaces.subscribe(() => onChange()).unsubscribe,
-      () => client.spaces.get(),
-    );
-    if (!spaces) {
-      return;
-    }
+const createGraph = async (client: Client): Promise<Graph> => {
+  const spaceBuilderExtension = createExtension({
+    id: 'space',
+    filter: (node): node is Node<null> => node.id === 'root',
+    connector: ({ node }) => {
+      const spaces = toSignal(
+        (onChange) => client.spaces.subscribe(() => onChange()).unsubscribe,
+        () => client.spaces.get(),
+      );
+      if (!spaces) {
+        return;
+      }
 
-    return spaces
-      .filter((space) => space.state.get() === SpaceState.SPACE_READY)
-      .map((space) => ({
-        id: space.id,
-        type: 'dxos.org/type/Space',
-        properties: { label: space.properties.name },
-        data: space,
+      return spaces
+        .filter((space) => space.state.get() === SpaceState.SPACE_READY)
+        .map((space) => ({
+          id: space.id,
+          type: 'dxos.org/type/Space',
+          properties: { label: space.properties.name },
+          data: space,
+        }));
+    },
+  });
+
+  const objectBuilderExtension = createExtension({
+    id: 'object',
+    filter: (node): node is Node<Space> => isSpace(node.data),
+    connector: ({ node }) => {
+      const objects = memoizeQuery(node.data, { type: 'test' });
+      return objects.map((object) => ({
+        id: object.id,
+        type: 'dxos.org/type/test',
+        properties: { label: object.name },
+        data: object,
       }));
-  },
-});
-
-const objectBuilderExtension = createExtension({
-  id: 'object',
-  filter: (node): node is Node<Space> => isSpace(node.data),
-  connector: ({ node }) => {
-    const objects = memoizeQuery(node.data, { type: 'test' });
-    return objects.map((object) => ({
-      id: object.id,
-      type: 'dxos.org/type/test',
-      properties: { label: object.name },
-      data: object,
-    }));
-  },
-});
-
-const graph = new GraphBuilder().addExtension(spaceBuilderExtension).addExtension(objectBuilderExtension).graph;
-
-graph.subscribeTraverse({
-  visitor: (node) => {
-    void graph.expand(node);
-  },
-});
+    },
+  });
 
-enum Action {
-  CREATE_SPACE = 'CREATE_SPACE',
-  CLOSE_SPACE = 'CLOSE_SPACE',
-  RENAME_SPACE = 'RENAME_SPACE',
-  ADD_OBJECT = 'ADD_OBJECT',
-  REMOVE_OBJECT = 'REMOVE_OBJECT',
-  RENAME_OBJECT = 'RENAME_OBJECT',
-}
+  const graph = new GraphBuilder().addExtension(spaceBuilderExtension).addExtension(objectBuilderExtension).graph;
+  graph.subscribeTraverse({
+    visitor: (node) => {
+      void graph.expand(node);
+    },
+  });
 
-const actionWeights = {
-  [Action.CREATE_SPACE]: 2,
-  [Action.CLOSE_SPACE]: 1,
-  [Action.RENAME_SPACE]: 2,
-  [Action.ADD_OBJECT]: 4,
-  [Action.REMOVE_OBJECT]: 3,
-  [Action.RENAME_OBJECT]: 4,
+  return graph;
 };
 
 const randomAction = () => {
@@ -138,31 +131,30 @@ const randomAction = () => {
   return actionDistribution[Math.floor(Math.random() * actionDistribution.length)];
 };
 
-const getRandomSpace = (): Space | undefined => {
+const getRandomSpace = (client: Client): Space | undefined => {
   const spaces = client.spaces.get().filter((space) => space.state.get() === SpaceState.SPACE_READY);
-  const space = spaces[Math.floor(Math.random() * spaces.length)];
-  return space;
+  return spaces[Math.floor(Math.random() * spaces.length)];
 };
 
-const getSpaceWithObjects = async (): Promise<Space | undefined> => {
+const getSpaceWithObjects = async (client: Client): Promise<Space | undefined> => {
   const readySpaces = client.spaces.get().filter((space) => space.state.get() === SpaceState.SPACE_READY);
   const spaceQueries = await Promise.all(readySpaces.map((space) => space.db.query({ type: 'test' }).run()));
   const spaces = readySpaces.filter((space, index) => spaceQueries[index].objects.length > 0);
   return spaces[Math.floor(Math.random() * spaces.length)];
 };
 
-const runAction = async (action: Action) => {
+const runAction = async (client: Client, action: Action) => {
   switch (action) {
     case Action.CREATE_SPACE:
       void client.spaces.create();
       break;
 
     case Action.CLOSE_SPACE:
-      void getRandomSpace()?.close();
+      void getRandomSpace(client)?.close();
       break;
 
     case Action.RENAME_SPACE: {
-      const space = getRandomSpace();
+      const space = getRandomSpace(client);
       if (space) {
         space.properties.name = faker.commerce.productName();
       }
@@ -170,11 +162,11 @@ const runAction = async (action: Action) => {
     }
 
     case Action.ADD_OBJECT:
-      getRandomSpace()?.db.add(create({ type: 'test', name: faker.commerce.productName() }));
+      getRandomSpace(client)?.db.add(create({ type: 'test', name: faker.commerce.productName() }));
       break;
 
     case Action.REMOVE_OBJECT: {
-      const space = await getSpaceWithObjects();
+      const space = await getSpaceWithObjects(client);
       if (space) {
         const { objects } = await space.db.query({ type: 'test' }).run();
         space.db.remove(objects[Math.floor(Math.random() * objects.length)]);
@@ -183,7 +175,7 @@ const runAction = async (action: Action) => {
     }
 
     case Action.RENAME_OBJECT: {
-      const space = await getSpaceWithObjects();
+      const space = await getSpaceWithObjects(client);
       if (space) {
         const { objects } = await space.db.query({ type: 'test' }).run();
         objects[Math.floor(Math.random() * objects.length)].name = faker.commerce.productName();
@@ -193,19 +185,28 @@ const runAction = async (action: Action) => {
   }
 };
 
-const EchoGraphStory = () => {
+const Story = () => {
   const [generating, setGenerating] = useState(false);
   const [actionInterval, setActionInterval] = useState(String(DEFAULT_PERIOD));
   const [action, setAction] = useState<Action>();
 
+  const client = useClient();
+  const [graph, setGraph] = useState<Graph>();
+  useAsyncEffect(async () => {
+    setGraph(await createGraph(client));
+  }, [client]);
+
   useEffect(() => {
     if (!generating) {
       return;
     }
 
-    const interval = setInterval(() => runAction(randomAction()), safeParseInt(actionInterval) ?? DEFAULT_PERIOD);
+    const interval = setInterval(
+      () => runAction(client, randomAction()),
+      safeParseInt(actionInterval) ?? DEFAULT_PERIOD,
+    );
     return () => clearInterval(interval);
-  }, [generating, actionInterval]);
+  }, [client, generating, actionInterval]);
 
   return (
     <>
@@ -227,7 +228,7 @@ const EchoGraphStory = () => {
             </Input.Root>
             <Timer className={mx('absolute inline-end-1 block-start-1 mt-[6px]', getSize(3))} />
           </div>
-          <Button onClick={() => action && runAction(action)}>
+          <Button onClick={() => action && runAction(client, action)}>
             <Plus />
           </Button>
           <Select.Root value={action?.toString()} onValueChange={(action) => setAction(action as unknown as Action)}>
@@ -249,11 +250,24 @@ const EchoGraphStory = () => {
           </Select.Root>
         </DensityProvider>
       </div>
-      <Tree data={graph.toJSON()} />
+      {graph && <Tree data={graph.toJSON()} />}
     </>
   );
 };
 
-export const Default = {
-  render: () => <ClientRepeater component={EchoGraphStory} clients={[client]} className='flex flex-col' />,
+export default {
+  title: 'app-graph/EchoGraph',
+  decorators: [
+    withTheme,
+    withClientProvider({
+      createIdentity: true,
+      onInitialized: async (client: Client) => {
+        await client.spaces.create();
+        await client.spaces.create();
+      },
+    }),
+  ],
+  render: Story,
 };
+
+export const Default = {};