@dxos/graph 0.7.5-labs.e27f9b9 → 0.7.5-main.2567c87

package/dist/types/src/graph.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../../src/graph.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAE,KAAK,SAAS,EAAE,KAAK,SAAS,EAAE,MAAM,SAAS,CAAC;AAKhE;;GAEG;AACH,qBAAa,kBAAkB,CAAC,IAAI,SAAS,SAAS,GAAG,GAAG,EAAE,IAAI,SAAS,SAAS,GAAG,GAAG;IACxF,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC;gBAErB,EAAE,KAAU,EAAE,KAAU,EAAE,GAAE,OAAO,CAAC,KAAK,CAAM;IAI3D,MAAM;IAON,IAAI,KAAK,IAAI,KAAK,CAEjB;IAED,IAAI,KAAK,IAAI,IAAI,EAAE,CAElB;IAED,IAAI,KAAK,IAAI,IAAI,EAAE,CAElB;IAED,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;IAIrC,QAAQ,CAAC,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE;IAIzC,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;IAIrC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE;CAM1D;AAED,qBAAa,UAAU,CAAC,IAAI,SAAS,SAAS,GAAG,GAAG,EAAE,IAAI,SAAS,SAAS,GAAG,GAAG,CAAE,SAAQ,kBAAkB,CAC5G,IAAI,EACJ,IAAI,CACL;IACC,KAAK,IAAI,IAAI;IAMb,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,IAAI;IAM7C,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,GAAG,IAAI;IAQjD,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAKzB,QAAQ,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI;IAK7B,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAKzB,QAAQ,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI;IAO7B,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC;IAM9C,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC;IAKlD,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC;IAK9C,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC;CAInD"}

package/dist/types/src/graph.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=graph.test.d.ts.map

package/dist/types/src/graph.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"graph.test.d.ts","sourceRoot":"","sources":["../../../src/graph.test.ts"],"names":[],"mappings":""}

package/dist/types/src/index.d.ts

@@ -1,4 +1,4 @@
-export * from './model';
+export * from './buidler';
+export * from './graph';
 export * from './types';
-export * from './util';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC"}

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

@@ -1,59 +1,41 @@
 import { S } from '@dxos/echo-schema';
-import { type Specialize } from '@dxos/util';
 export declare const BaseGraphNode: S.Struct<{
     id: typeof S.String;
     type: S.optional<typeof S.String>;
     data: S.optional<typeof S.Any>;
 }>;
-/** Raw base type. */
 export type BaseGraphNode = S.Schema.Type<typeof BaseGraphNode>;
-/** Typed node data. */
-export type GraphNode<Data = any, Optional extends boolean = false> = Specialize<BaseGraphNode, Optional extends true ? {
-    data?: Data;
-} : {
+export type GraphNode<Data extends object | void = void> = BaseGraphNode & {
     data: Data;
-}>;
-export declare namespace GraphNode {
-    type Optional<T = any> = GraphNode<T, true>;
-}
+};
 export declare const BaseGraphEdge: S.Struct<{
     id: typeof S.String;
     type: S.optional<typeof S.String>;
-    data: S.optional<typeof S.Any>;
     source: typeof S.String;
     target: typeof S.String;
+    data: S.optional<typeof S.Any>;
 }>;
-/** Raw base type. */
 export type BaseGraphEdge = S.Schema.Type<typeof BaseGraphEdge>;
-/** Typed edge data. */
-export type GraphEdge<Data = any, Optional extends boolean = false> = Specialize<BaseGraphEdge, Optional extends true ? {
-    data?: Data;
-} : {
+export type GraphEdge<Data extends object | void = void> = BaseGraphEdge & {
     data: Data;
-}>;
-export declare namespace GraphEdge {
-    type Optional<T = any> = GraphEdge<T, true>;
-}
+};
 /**
- * Generic graph.
+ * Generic graph abstraction.
  */
 export declare const Graph: S.Struct<{
-    id: S.optional<typeof S.String>;
-    nodes: S.mutable<S.Array$<S.extend<S.Struct<{
+    nodes: S.mutable<S.Array$<S.Struct<{
         id: typeof S.String;
         type: S.optional<typeof S.String>;
         data: S.optional<typeof S.Any>;
-    }>, S.TypeLiteral<{}, readonly [{
-        readonly key: typeof S.String;
-        readonly value: typeof S.Any;
-    }]>>>>;
+    }>>>;
     edges: S.mutable<S.Array$<S.Struct<{
         id: typeof S.String;
         type: S.optional<typeof S.String>;
-        data: S.optional<typeof S.Any>;
         source: typeof S.String;
         target: typeof S.String;
+        data: S.optional<typeof S.Any>;
     }>>>;
 }>;
 export type Graph = S.Schema.Type<typeof Graph>;
+export declare const emptyGraph: Graph;
 //# sourceMappingURL=types.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,mBAAmB,CAAC;AACtC,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,eAAO,MAAM,aAAa;;;;EAIxB,CAAC;AAEH,qBAAqB;AACrB,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,aAAa,CAAC,CAAC;AAChE,uBAAuB;AACvB,MAAM,MAAM,SAAS,CAAC,IAAI,GAAG,GAAG,EAAE,QAAQ,SAAS,OAAO,GAAG,KAAK,IAAI,UAAU,CAC9E,aAAa,EACb,QAAQ,SAAS,IAAI,GAAG;IAAE,IAAI,CAAC,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CACzD,CAAC;AAEF,MAAM,CAAC,OAAO,WAAW,SAAS,CAAC;IACjC,KAAY,QAAQ,CAAC,CAAC,GAAG,GAAG,IAAI,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;CACpD;AAED,eAAO,MAAM,aAAa;;;;;;EAMxB,CAAC;AAEH,qBAAqB;AACrB,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,aAAa,CAAC,CAAC;AAEhE,uBAAuB;AACvB,MAAM,MAAM,SAAS,CAAC,IAAI,GAAG,GAAG,EAAE,QAAQ,SAAS,OAAO,GAAG,KAAK,IAAI,UAAU,CAC9E,aAAa,EACb,QAAQ,SAAS,IAAI,GAAG;IAAE,IAAI,CAAC,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CACzD,CAAC;AAEF,MAAM,CAAC,OAAO,WAAW,SAAS,CAAC;IACjC,KAAY,QAAQ,CAAC,CAAC,GAAG,GAAG,IAAI,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;CACpD;AAOD;;GAEG;AACH,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;EAIhB,CAAC;AAEH,MAAM,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,KAAK,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,mBAAmB,CAAC;AAOtC,eAAO,MAAM,aAAa;;;;EAIxB,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,aAAa,CAAC,CAAC;AAChE,MAAM,MAAM,SAAS,CAAC,IAAI,SAAS,MAAM,GAAG,IAAI,GAAG,IAAI,IAAI,aAAa,GAAG;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC;AAE1F,eAAO,MAAM,aAAa;;;;;;EAMxB,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,aAAa,CAAC,CAAC;AAChE,MAAM,MAAM,SAAS,CAAC,IAAI,SAAS,MAAM,GAAG,IAAI,GAAG,IAAI,IAAI,aAAa,GAAG;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC;AAE1F;;GAEG;AACH,eAAO,MAAM,KAAK;;;;;;;;;;;;;EAGhB,CAAC;AAEH,MAAM,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,KAAK,CAAC,CAAC;AAEhD,eAAO,MAAM,UAAU,EAAE,KAAgC,CAAC"}

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

@@ -1,17 +1,2 @@
-import { type ReactiveEchoObject } from '@dxos/echo-db';
-import { GraphModel } from './model';
-import { type GraphNode } from './types';
-type EdgeMeta = {
-    source: string;
-    target: string;
-    relation?: string;
-};
-export declare const createEdgeId: ({ source, target, relation }: EdgeMeta) => string;
-export declare const parseEdgeId: (id: string) => EdgeMeta;
-/**
- * Creates a new reactive graph from a set of ECHO objects.
- * References are mapped onto graph edges.
- */
-export declare const createGraph: (objects: ReactiveEchoObject<any>[]) => GraphModel<GraphNode<ReactiveEchoObject<any>>>;
-export {};
+export declare const removeElements: <T>(array: T[], predicate: (element: T, index: number) => boolean) => T[];
 //# sourceMappingURL=util.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAOxD,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAS,KAAK,SAAS,EAAE,MAAM,SAAS,CAAC;AAKhD,KAAK,QAAQ,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtE,eAAO,MAAM,YAAY,iCAAkC,QAAQ,WAIlE,CAAC;AAEF,eAAO,MAAM,WAAW,OAAQ,MAAM,KAAG,QAIxC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,YAAa,kBAAkB,CAAC,GAAG,CAAC,EAAE,KAAG,UAAU,CAAC,SAAS,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAiC7G,CAAC"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,CAAC,EAAE,aAAa,CAAC,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,KAAG,CAAC,EASlG,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/graph",
-  "version": "0.7.5-labs.e27f9b9",
+  "version": "0.7.5-main.2567c87",
   "description": "Low-level graph API",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -32,25 +32,27 @@
   "dependencies": {
     "@effect/schema": "^0.75.5",
     "@preact/signals-core": "^1.6.0",
+    "graphology": "^0.25.4",
+    "graphology-shortest-path": "^2.1.0",
+    "graphology-types": "^0.24.8",
     "lodash.defaultsdeep": "^4.6.1",
-    "@dxos/async": "0.7.5-labs.e27f9b9",
-    "@dxos/echo-db": "0.7.5-labs.e27f9b9",
-    "@dxos/echo-schema": "0.7.5-labs.e27f9b9",
-    "@dxos/debug": "0.7.5-labs.e27f9b9",
-    "@dxos/invariant": "0.7.5-labs.e27f9b9",
-    "@dxos/live-object": "0.7.5-labs.e27f9b9",
-    "@dxos/log": "0.7.5-labs.e27f9b9",
-    "@dxos/node-std": "0.7.5-labs.e27f9b9",
-    "@dxos/schema": "0.7.5-labs.e27f9b9",
-    "@dxos/util": "0.7.5-labs.e27f9b9"
+    "@dxos/async": "0.7.5-main.2567c87",
+    "@dxos/debug": "0.7.5-main.2567c87",
+    "@dxos/echo-schema": "0.7.5-main.2567c87",
+    "@dxos/invariant": "0.7.5-main.2567c87",
+    "@dxos/live-object": "0.7.5-main.2567c87",
+    "@dxos/echo-db": "0.7.5-main.2567c87",
+    "@dxos/log": "0.7.5-main.2567c87",
+    "@dxos/schema": "0.7.5-main.2567c87",
+    "@dxos/util": "0.7.5-main.2567c87"
   },
   "devDependencies": {
     "@antv/graphlib": "^2.0.4",
     "@antv/layout": "^1.2.13",
     "@types/lodash.defaultsdeep": "^4.6.6",
-    "@dxos/echo-db": "0.7.5-labs.e27f9b9",
-    "@dxos/echo-schema": "0.7.5-labs.e27f9b9",
-    "@dxos/random": "0.7.5-labs.e27f9b9"
+    "@dxos/echo-db": "0.7.5-main.2567c87",
+    "@dxos/echo-schema": "0.7.5-main.2567c87",
+    "@dxos/random": "0.7.5-main.2567c87"
   },
   "publishConfig": {
     "access": "public"

package/src/buidler.ts

@@ -0,0 +1,62 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { type ReactiveEchoObject } from '@dxos/echo-db';
+import { FormatEnum } from '@dxos/echo-schema';
+import { invariant } from '@dxos/invariant';
+import { getSchema } from '@dxos/live-object';
+import { log } from '@dxos/log';
+import { getSchemaProperties } from '@dxos/schema';
+
+import { GraphModel } from './graph';
+import { type GraphNode } from './types';
+
+// NOTE: The `relation` is different from the `type`.
+type Edge = { source: string; target: string; relation: string };
+
+export const createEdgeId = ({ source, target, relation }: Edge) => `${source}-${relation}-${target}`;
+
+export const parseEdgeId = (id: string): Edge => {
+  const [source, relation, target] = id.split('-');
+  invariant(source && target && relation);
+  return { source, relation, target };
+};
+
+/**
+ * Maps an ECHO object graph onto a layout graph.
+ */
+export const createGraph = (objects: ReactiveEchoObject<any>[]): GraphModel<GraphNode<ReactiveEchoObject<any>>> => {
+  const graph = new GraphModel<GraphNode<ReactiveEchoObject<any>>>();
+
+  // Map objects.
+  objects.forEach((object) => {
+    graph.addNode({ id: object.id, type: object.typename, data: object });
+  });
+
+  // Find references.
+  objects.forEach((object) => {
+    const schema = getSchema(object);
+    if (!schema) {
+      log.info('no schema for object', { id: object.id.slice(0, 8) });
+      return;
+    }
+
+    // Parse schema to follow referenced objects.
+    for (const prop of getSchemaProperties(schema.ast, object)) {
+      if (prop.format === FormatEnum.Ref) {
+        const source = object;
+        const target = object[prop.name]?.target;
+        if (target) {
+          graph.addEdge({
+            id: createEdgeId({ source: source.id, target: target.id, relation: String(prop.name) }),
+            source: source.id,
+            target: target.id,
+          });
+        }
+      }
+    }
+  });
+
+  return graph;
+};

package/src/graph.test.ts

@@ -0,0 +1,56 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { describe, test } from 'vitest';
+
+import { createEdgeId } from './buidler';
+import { GraphModel } from './graph';
+import { type GraphNode } from './types';
+
+type TestData = { value: string };
+
+describe('Graph', () => {
+  test('empty', ({ expect }) => {
+    const { graph } = new GraphModel();
+    expect(graph.nodes).to.have.length(0);
+    expect(graph.edges).to.have.length(0);
+  });
+
+  test('add and remove subgraphs', ({ expect }) => {
+    const graph = new GraphModel<GraphNode<TestData>>()
+      .addNode({ id: 'node-1', data: { value: 'test' } })
+      .addNode({ id: 'node-2', data: { value: 'test' } })
+      .addNode({ id: 'node-3', data: { value: 'test' } })
+      .addEdge({
+        id: createEdgeId({ source: 'node-1', target: 'node-2', relation: 'test' }),
+        source: 'node-1',
+        target: 'node-2',
+      })
+      .addEdge({
+        id: createEdgeId({ source: 'node-2', target: 'node-3', relation: 'test' }),
+        source: 'node-2',
+        target: 'node-3',
+      });
+    expect(graph.nodes).to.have.length(3);
+    expect(graph.edges).to.have.length(2);
+    const pre = graph.toJSON();
+
+    const node: GraphNode<TestData> = graph.getNode('node-2')!;
+    expect(node).to.exist;
+
+    const removed = graph.removeNode('node-2');
+    expect(removed.nodes).to.have.length(1);
+    expect(removed.edges).to.have.length(2);
+    expect(graph.nodes).to.have.length(2);
+    expect(graph.edges).to.have.length(0);
+
+    graph.addGraph(removed);
+    const post = graph.toJSON();
+    expect(pre).to.deep.eq(post);
+
+    graph.clear();
+    expect(graph.nodes).to.have.length(0);
+    expect(graph.edges).to.have.length(0);
+  });
+});

package/src/graph.ts

@@ -0,0 +1,127 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { create } from '@dxos/live-object';
+
+import { Graph, type GraphNode, type GraphEdge } from './types';
+import { removeElements } from './util';
+
+// TODO(burdon): Traversal/visitor.
+
+/**
+ * Typed reactive object graph.
+ */
+export class ReadonlyGraphModel<Node extends GraphNode = any, Edge extends GraphEdge = any> {
+  protected readonly _graph: Graph;
+
+  constructor({ nodes = [], edges = [] }: Partial<Graph> = {}) {
+    this._graph = create(Graph, { nodes, edges });
+  }
+
+  toJSON() {
+    // Sort to enable stable comparisons.
+    this._graph.nodes.sort(({ id: a }, { id: b }) => a.localeCompare(b));
+    this._graph.edges.sort(({ id: a }, { id: b }) => a.localeCompare(b));
+    return JSON.parse(JSON.stringify(this._graph));
+  }
+
+  get graph(): Graph {
+    return this._graph;
+  }
+
+  get nodes(): Node[] {
+    return this._graph.nodes as Node[];
+  }
+
+  get edges(): Edge[] {
+    return this._graph.edges as Edge[];
+  }
+
+  getNode(id: string): Node | undefined {
+    return this.nodes.find((node) => node.id === id);
+  }
+
+  getNodes({ type }: Partial<Node>): Node[] {
+    return this.nodes.filter((node) => !type || type === node.type);
+  }
+
+  getEdge(id: string): Edge | undefined {
+    return this.edges.find((edge) => edge.id === id);
+  }
+
+  getEdges({ type, source, target }: Partial<Edge>): Edge[] {
+    return this.edges.filter(
+      (edge) =>
+        (!type || type === edge.type) && (!source || source === edge.source) && (!target || target === edge.target),
+    );
+  }
+}
+
+export class GraphModel<Node extends GraphNode = any, Edge extends GraphEdge = any> extends ReadonlyGraphModel<
+  Node,
+  Edge
+> {
+  clear(): this {
+    this._graph.nodes.length = 0;
+    this._graph.edges.length = 0;
+    return this;
+  }
+
+  addGraph(graph: GraphModel<Node, Edge>): this {
+    this.addNodes(graph.nodes);
+    this.addEdges(graph.edges);
+    return this;
+  }
+
+  addGraphs(graphs: GraphModel<Node, Edge>[]): this {
+    graphs.forEach((graph) => {
+      this.addNodes(graph.nodes);
+      this.addEdges(graph.edges);
+    });
+    return this;
+  }
+
+  addNode(node: Node): this {
+    this._graph.nodes.push(node);
+    return this;
+  }
+
+  addNodes(nodes: Node[]): this {
+    nodes.forEach((node) => this.addNode(node));
+    return this;
+  }
+
+  addEdge(edge: Edge): this {
+    this._graph.edges.push(edge);
+    return this;
+  }
+
+  addEdges(edges: Edge[]): this {
+    edges.forEach((edge) => this.addEdge(edge));
+    return this;
+  }
+
+  // TODO(burdon): Return graph.
+
+  removeNode(id: string): GraphModel<Node, Edge> {
+    const nodes = removeElements(this._graph.nodes, (node) => node.id === id);
+    const edges = removeElements(this._graph.edges, (edge) => edge.source === id || edge.target === id);
+    return new GraphModel<Node, Edge>({ nodes, edges });
+  }
+
+  removeNodes(ids: string[]): GraphModel<Node, Edge> {
+    const graphs = ids.map((id) => this.removeNode(id));
+    return new GraphModel<Node, Edge>().addGraphs(graphs);
+  }
+
+  removeEdge(id: string): GraphModel<Node, Edge> {
+    const edges = removeElements(this._graph.edges, (edge) => edge.id === id);
+    return new GraphModel<Node, Edge>({ edges });
+  }
+
+  removeEdges(ids: string[]): GraphModel<Node, Edge> {
+    const graphs = ids.map((id) => this.removeEdge(id));
+    return new GraphModel<Node, Edge>().addGraphs(graphs);
+  }
+}

package/src/index.ts

@@ -2,6 +2,6 @@
 // Copyright 2023 DXOS.org
 //
 
-export * from './model';
+export * from './buidler';
+export * from './graph';
 export * from './types';
-export * from './util';

package/src/types.ts

@@ -3,7 +3,11 @@
 //
 
 import { S } from '@dxos/echo-schema';
-import { type Specialize } from '@dxos/util';
+
+// Prior art:
+// - https://graphology.github.io (TS, tree-shakable, multiple packages for extensions)
+// - https://github.com/dagrejs/graphlib (mature, extensive)
+// - https://github.com/avoidwork/tiny-graph
 
 export const BaseGraphNode = S.Struct({
   id: S.String,
@@ -11,51 +15,28 @@ export const BaseGraphNode = S.Struct({
   data: S.optional(S.Any),
 });
 
-/** Raw base type. */
 export type BaseGraphNode = S.Schema.Type<typeof BaseGraphNode>;
-/** Typed node data. */
-export type GraphNode<Data = any, Optional extends boolean = false> = Specialize<
-  BaseGraphNode,
-  Optional extends true ? { data?: Data } : { data: Data }
->;
-
-export declare namespace GraphNode {
-  export type Optional<T = any> = GraphNode<T, true>;
-}
+export type GraphNode<Data extends object | void = void> = BaseGraphNode & { data: Data };
 
 export const BaseGraphEdge = S.Struct({
   id: S.String,
   type: S.optional(S.String),
-  data: S.optional(S.Any),
   source: S.String,
   target: S.String,
+  data: S.optional(S.Any),
 });
 
-/** Raw base type. */
 export type BaseGraphEdge = S.Schema.Type<typeof BaseGraphEdge>;
-
-/** Typed edge data. */
-export type GraphEdge<Data = any, Optional extends boolean = false> = Specialize<
-  BaseGraphEdge,
-  Optional extends true ? { data?: Data } : { data: Data }
->;
-
-export declare namespace GraphEdge {
-  export type Optional<T = any> = GraphEdge<T, true>;
-}
+export type GraphEdge<Data extends object | void = void> = BaseGraphEdge & { data: Data };
 
 /**
- * Allows any additional properties on graph nodes.
- */
-const ExtendableBaseGraphNode = S.extend(BaseGraphNode, S.Struct({}, { key: S.String, value: S.Any }));
-
-/**
- * Generic graph.
+ * Generic graph abstraction.
  */
 export const Graph = S.Struct({
-  id: S.optional(S.String),
-  nodes: S.mutable(S.Array(ExtendableBaseGraphNode)),
+  nodes: S.mutable(S.Array(BaseGraphNode)),
   edges: S.mutable(S.Array(BaseGraphEdge)),
 });
 
 export type Graph = S.Schema.Type<typeof Graph>;
+
+export const emptyGraph: Graph = { nodes: [], edges: [] };

package/src/util.ts

@@ -1,69 +1,17 @@
 //
-// Copyright 2023 DXOS.org
+// Copyright 2024 DXOS.org
 //
 
-import { type ReactiveEchoObject } from '@dxos/echo-db';
-import { FormatEnum } from '@dxos/echo-schema';
-import { invariant } from '@dxos/invariant';
-import { getSchema, create } from '@dxos/live-object';
-import { log } from '@dxos/log';
-import { getSchemaProperties } from '@dxos/schema';
+// TODO(burdon): GraphBuilder.
 
-import { GraphModel } from './model';
-import { Graph, type GraphNode } from './types';
-
-const KEY_REGEX = /\w+/;
-
-// NOTE: The `relation` is different from the `type`.
-type EdgeMeta = { source: string; target: string; relation?: string };
-
-export const createEdgeId = ({ source, target, relation }: EdgeMeta) => {
-  invariant(source.match(KEY_REGEX), `invalid source: ${source}`);
-  invariant(target.match(KEY_REGEX), `invalid target: ${target}`);
-  return [source, relation, target].join('_');
-};
-
-export const parseEdgeId = (id: string): EdgeMeta => {
-  const [source, relation, target] = id.split('_');
-  invariant(source.length && target.length);
-  return { source, relation: relation.length ? relation : undefined, target };
-};
-
-/**
- * Creates a new reactive graph from a set of ECHO objects.
- * References are mapped onto graph edges.
- */
-export const createGraph = (objects: ReactiveEchoObject<any>[]): GraphModel<GraphNode<ReactiveEchoObject<any>>> => {
-  const graph = new GraphModel<GraphNode<ReactiveEchoObject<any>>>(create(Graph, { nodes: [], edges: [] }));
-
-  // Map objects.
-  objects.forEach((object) => {
-    graph.addNode({ id: object.id, type: object.typename, data: object });
-  });
-
-  // Find references.
-  objects.forEach((object) => {
-    const schema = getSchema(object);
-    if (!schema) {
-      log.info('no schema for object', { id: object.id.slice(0, 8) });
-      return;
-    }
-
-    // Parse schema to follow referenced objects.
-    for (const prop of getSchemaProperties(schema.ast, object)) {
-      if (prop.format === FormatEnum.Ref) {
-        const source = object;
-        const target = object[prop.name]?.target;
-        if (target) {
-          graph.addEdge({
-            id: createEdgeId({ source: source.id, target: target.id, relation: String(prop.name) }),
-            source: source.id,
-            target: target.id,
-          });
-        }
-      }
+// TODO(burdon): Move to @dxos/live-object?
+export const removeElements = <T>(array: T[], predicate: (element: T, index: number) => boolean): T[] => {
+  const deleted: T[] = [];
+  for (let i = array.length - 1; i >= 0; i--) {
+    if (predicate(array[i], i)) {
+      deleted.push(...array.splice(i, 1));
     }
-  });
+  }
 
-  return graph;
+  return deleted;
 };