@dxos/app-graph 0.8.2-main.fbd8ed0 → 0.8.2-staging.4d6ad0f

package/src/graph.ts

@@ -389,7 +389,7 @@ export class Graph implements WritableGraph {
   //   }
   // }
 
-  expand(id: string, relation: Relation = 'outbound') {
+  expand(id: string, relation: Relation = 'outbound'): void {
     const key = `${id}$${relation}`;
     const expanded = Record.get(this._expanded, key).pipe(Option.getOrElse(() => false));
     log('expand', { key, expanded });
@@ -399,13 +399,13 @@ export class Graph implements WritableGraph {
     }
   }
 
-  addNodes(nodes: NodeArg<any, Record<string, any>>[]) {
+  addNodes(nodes: NodeArg<any, Record<string, any>>[]): void {
     Rx.batch(() => {
       nodes.map((node) => this.addNode(node));
     });
   }
 
-  addNode({ nodes, edges, ...nodeArg }: NodeArg<any, Record<string, any>>) {
+  addNode({ nodes, edges, ...nodeArg }: NodeArg<any, Record<string, any>>): void {
     const { id, type, data = null, properties = {} } = nodeArg;
     const nodeRx = this._node(id);
     const node = this._registry.get(nodeRx);
@@ -414,7 +414,7 @@ export class Graph implements WritableGraph {
         const typeChanged = node.type !== type;
         const dataChanged = node.data !== data;
         const propertiesChanged = Object.keys(properties).some((key) => node.properties[key] !== properties[key]);
-        log('existing node', { typeChanged, dataChanged, propertiesChanged });
+        log('existing node', { id, typeChanged, dataChanged, propertiesChanged });
         if (typeChanged || dataChanged || propertiesChanged) {
           log('updating node', { id, type, data, properties });
           const newNode = Option.some({ ...node, type, data, properties: { ...node.properties, ...properties } });
@@ -443,13 +443,13 @@ export class Graph implements WritableGraph {
     }
   }
 
-  removeNodes(ids: string[], edges = false) {
+  removeNodes(ids: string[], edges = false): void {
     Rx.batch(() => {
       ids.map((id) => this.removeNode(id, edges));
     });
   }
 
-  removeNode(id: string, edges = false) {
+  removeNode(id: string, edges = false): void {
     const nodeRx = this._node(id);
     // TODO(wittjosiah): Is there a way to mark these rx values for garbage collection?
     this._registry.set(nodeRx, Option.none());
@@ -468,13 +468,13 @@ export class Graph implements WritableGraph {
     this._onRemoveNode?.(id);
   }
 
-  addEdges(edges: Edge[]) {
+  addEdges(edges: Edge[]): void {
     Rx.batch(() => {
       edges.map((edge) => this.addEdge(edge));
     });
   }
 
-  addEdge(edgeArg: Edge) {
+  addEdge(edgeArg: Edge): void {
     const sourceRx = this._edges(edgeArg.source);
     const source = this._registry.get(sourceRx);
     if (!source.outbound.includes(edgeArg.target)) {
@@ -490,13 +490,13 @@ export class Graph implements WritableGraph {
     }
   }
 
-  removeEdges(edges: Edge[], removeOrphans = false) {
+  removeEdges(edges: Edge[], removeOrphans = false): void {
     Rx.batch(() => {
       edges.map((edge) => this.removeEdge(edge, removeOrphans));
     });
   }
 
-  removeEdge(edgeArg: Edge, removeOrphans = false) {
+  removeEdge(edgeArg: Edge, removeOrphans = false): void {
     const sourceRx = this._edges(edgeArg.source);
     const source = this._registry.get(sourceRx);
     if (source.outbound.includes(edgeArg.target)) {
@@ -527,7 +527,7 @@ export class Graph implements WritableGraph {
     }
   }
 
-  sortEdges(id: string, relation: Relation, order: string[]) {
+  sortEdges(id: string, relation: Relation, order: string[]): void {
     const edgesRx = this._edges(id);
     const edges = this._registry.get(edgesRx);
     const unsorted = edges[relation].filter((id) => !order.includes(id)) ?? [];
@@ -579,7 +579,7 @@ export class Graph implements WritableGraph {
   async waitForPath(
     params: { source?: string; target: string },
     { timeout = 5_000, interval = 500 }: { timeout?: number; interval?: number } = {},
-  ) {
+  ): Promise<string[]> {
     const path = this.getPath(params);
     if (Option.isSome(path)) {
       return path.value;

package/src/signals-integration.test.ts

@@ -88,7 +88,7 @@ describe('signals integration', () => {
       await peer.reload();
       {
         await using db = await peer.openLastDatabase();
-        const outer = (await db.query({ id: outerId }).first()) as any;
+        const outer = (await db.query(Filter.ids(outerId)).first()) as any;
         const innerRx = rxFromSignal(() => outer.inner.target);
 
         const loaded = new Trigger();
@@ -128,7 +128,7 @@ describe('signals integration', () => {
 
       {
         await using db = await peer.openLastDatabase();
-        const outer = (await db.query({ id: outerId }).first()) as any;
+        const outer = (await db.query(Filter.ids(outerId)).first()) as any;
         const innerRx = rxFromSignal(() => outer.inner.target);
         const inner = registry.get(innerRx);
         expect(inner).to.eq(undefined);

package/src/stories/EchoGraph.stories.tsx

@@ -9,7 +9,17 @@ import { Pause, Play, Plus, Timer } from '@phosphor-icons/react';
 import { Option, pipe } from 'effect';
 import React, { useEffect, useMemo, useState } from 'react';
 
-import { live, isSpace, Query, type QueryResult, type Space, SpaceState, Expando, type Live } from '@dxos/client/echo';
+import {
+  live,
+  isSpace,
+  Query,
+  type QueryResult,
+  type Space,
+  SpaceState,
+  Expando,
+  type Live,
+  Filter,
+} from '@dxos/client/echo';
 import { faker } from '@dxos/random';
 import { type Client, useClient } from '@dxos/react-client';
 import { withClientProvider } from '@dxos/react-client/testing';
@@ -117,7 +127,9 @@ const getRandomSpace = (client: Client): 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 spaceQueries = await Promise.all(
+    readySpaces.map((space) => space.db.query(Filter.type(Expando, { type: 'test' })).run()),
+  );
   const spaces = readySpaces.filter((space, index) => spaceQueries[index].objects.length > 0);
   return spaces[Math.floor(Math.random() * spaces.length)];
 };
@@ -147,7 +159,7 @@ const runAction = async (client: Client, action: Action) => {
     case Action.REMOVE_OBJECT: {
       const space = await getSpaceWithObjects(client);
       if (space) {
-        const { objects } = await space.db.query({ type: 'test' }).run();
+        const { objects } = await space.db.query(Filter.type(Expando, { type: 'test' })).run();
         space.db.remove(objects[Math.floor(Math.random() * objects.length)]);
       }
       break;
@@ -156,7 +168,7 @@ const runAction = async (client: Client, action: Action) => {
     case Action.RENAME_OBJECT: {
       const space = await getSpaceWithObjects(client);
       if (space) {
-        const { objects } = await space.db.query({ type: 'test' }).run();
+        const { objects } = await space.db.query(Filter.type(Expando, { type: 'test' })).run();
         objects[Math.floor(Math.random() * objects.length)].name = faker.commerce.productName();
       }
       break;